diff options
Diffstat (limited to 'pkgs')
6176 files changed, 141136 insertions, 66017 deletions
diff --git a/pkgs/README.md b/pkgs/README.md index 31a590e43d8d8..0649d9415a26c 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -470,7 +470,7 @@ Preferred source hash type is sha256. There are several ways to get it. in the package expression, attempt build and extract correct hash from error messages. - > **Warning** + > [!Warning] > You must use one of these four fake hashes and not some arbitrarily-chosen hash. > See [here][secure-hashes] diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 3858de921592e..cc8e21b924563 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "contrast"; - version = "0.0.8"; + version = "0.0.10"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { owner = "design"; repo = "contrast"; rev = version; - hash = "sha256-5OFmLsP+Xk3sKJcUG/s8KwedvfS8ri+JoinliyJSmrY="; + hash = "sha256-Y0CynBvnCOBesONpxUicR7PgMJgmM0ZQX/uOwIppj7w="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-8WukhoKMyApkwqPQ6KeWMsL40sMUcD4I4l7UqXf2Ld0="; + hash = "sha256-BdwY2YDJyDApGgE0Whz3xRU/0gRbkwbKUvPbWEObXE8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 4d45de86f3a1f..2bee147978159 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -5,27 +5,20 @@ , autoconf , automake , libtool -, faad2 -, mp4v2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "aacgain"; - version = "2.0.0"; + version = "2.0.0-unstable-2022-07-12"; src = fetchFromGitHub { owner = "dgilman"; - repo = pname; - rev = version; - sha256 = "sha256-9Y23Zh7q3oB4ha17Fpm1Hu2+wtQOA1llj6WDUAO2ARU="; + repo = "aacgain"; + rev = "9f9ae95a20197d1072994dbd89672bba2904bdb5"; + hash = "sha256-WqL9rKY4lQD7wQSZizoM3sHNzLIG0E9xZtjw8y7fgmE="; + fetchSubmodules = true; }; - postPatch = '' - cp -R ${faad2.src}/* 3rdparty/faad2 - cp -R ${mp4v2.src}/* 3rdparty/mp4v2 - chmod -R +w 3rdparty - ''; - nativeBuildInputs = [ cmake autoconf diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 1c5fc57181420..e688e0edccdf9 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -30,7 +30,7 @@ in nativeBuildInputs = [ makeWrapper ]; - buildInputs = with perlPackages; [ perl MusicBrainz MusicBrainzDiscID ]; + buildInputs = with perlPackages; [ perl MusicBrainz MusicBrainzDiscID IOSocketSSL ]; installFlags = [ "sysconfdir=$(out)/etc" ]; diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index f46f3053a2846..a5a8965eee40b 100644 --- a/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "22.0"; + version = "26.2"; src = fetchFromSourcehut { owner = "~hannes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u62wLRrJ45ap981Q8JmMnanc8AWQb1MJHK32PEr10I4="; + sha256 = "sha256-GpfglGC7zD275lm9OsBmqDC90E/vVUqslm7HjPgm74M="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 6b001ce85ae62..d6267aff3fef5 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -64,14 +64,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "8.1"; + version = "8.2"; # 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-T1o1E5+974dNUwEFW/Pw0RzbGifva2FdJPrCusWMk0E="; + hash = "sha256-Ito1gy7k7nzTN7Co/ddXYbAvobiZO0V0J5uymsm756k="; }; bundledContent = fetchzip { @@ -169,7 +169,12 @@ stdenv.mkDerivation rec { "--ptformat" "--run-tests" "--test" - "--use-external-libs" + # since we don't have https://github.com/agfline/LibAAF yet, + # we need to use some of ardours internal libs, see: + # https://discourse.ardour.org/t/ardour-8-2-released/109615/6 + # and + # https://discourse.ardour.org/t/ardour-8-2-released/109615/8 + # "--use-external-libs" ] ++ lib.optional optimize "--optimize"; postInstall = '' diff --git a/pkgs/applications/audio/cheesecutter/default.nix b/pkgs/applications/audio/cheesecutter/default.nix index 6c14cc67f81fa..8e2877c40c7bb 100644 --- a/pkgs/applications/audio/cheesecutter/default.nix +++ b/pkgs/applications/audio/cheesecutter/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { mkdir -p $out/share/cheesecutter/example_tunes cp -r tunes/* $out/share/cheesecutter/example_tunes + + install -Dm444 arch/fd/ccutter.desktop -t $out/share/applications + for res in $(ls icons | sed -e 's/cc//g' -e 's/.png//g'); do + install -Dm444 icons/cc$res.png $out/share/icons/hicolor/''${res}x''${res}/apps/cheesecutter.png + done ''; postFixup = diff --git a/pkgs/applications/audio/diopser/default.nix b/pkgs/applications/audio/diopser/default.nix index 339eae1a7ca93..67b95aef923f1 100644 --- a/pkgs/applications/audio/diopser/default.nix +++ b/pkgs/applications/audio/diopser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config , libjack2, alsa-lib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor }: @@ -38,6 +38,14 @@ in stdenv.mkDerivation rec { sha256 = "06y1h895yxh44gp4vxzrna59lf7nlfw7aacd3kk4l1g56jhy9pdx"; }; + patches = [ + (fetchpatch { + name = "fix-gcc-11-build.patch"; + url = "https://github.com/robbert-vdh/diopser/commit/a7284439bd4e23455132e7806a214f9db12efae9.patch"; + hash = "sha256-r3yxhnhPUQ47srhfAKeurpe2xyEBdSvqIbgqs9/6gD4="; + }) + ]; + postUnpack = '' ( cd "$sourceRoot" diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index d6f468dbc563d..08183c004fd6e 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsa-lib, expat, glib, libjack2, libXext, libX11, libpng +{ lib, stdenv, fetchurl, fetchDebianPatch, alsa-lib, expat, glib, libjack2, libXext, libX11, libpng , libpthreadstubs, libsmf, libsndfile, lv2, pkg-config, zita-resampler }: @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-AF8gQLiB29j963uI84TyNHIC0qwEWOCqmZIUWGq8V2o="; }; + patches = [ + (fetchDebianPatch { + pname = "drumgizmo"; + version = "0.9.20"; + debianRevision = "3"; + patch = "0005-fix_ftbfs_with_gcc13.patch"; + hash = "sha256-y5NDZ+3t6GkBeF/5UY8dwtH8k0cuM+5SGBGPSV7AX7M="; + }) + ]; + configureFlags = [ "--enable-lv2" ]; nativeBuildInputs = [ pkg-config ]; @@ -21,7 +31,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "An LV2 sample based drum plugin"; homepage = "https://www.drumgizmo.org"; license = licenses.lgpl3Plus; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 4ecf879460cdc..b087639ff8788 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -23,13 +23,13 @@ with lib.strings; let - version = "2.59.6"; + version = "2.69.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-m6dimBxI9C3KDhUxbJAn2Pf9z+LRahjrzD34W/bf1XA="; + sha256 = "sha256-V2oDP17omIU9Waz5zrOyEHnWrVIfdDRM4KxHb01eyd8="; fetchSubmodules = true; }; @@ -63,16 +63,6 @@ let ncurses_static ]; - patches = [ - # make preset management thread safe - # needed for magnetophonDSP.VoiceOfFaust - # see: https://github.com/grame-cncm/faust/issues/899 - (fetchpatch { - url = "https://github.com/grame-cncm/faust/commit/a1c3a515abbcafea0a6e4e2ec7ecb0f092de5349.patch"; - hash = "sha256-1Ndm+CgxvGEbS6TKGggeu9hW7N3pC+d1kluT2vhGzL8="; - }) - ]; - passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; }; preConfigure = '' diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index a9a9ab519db86..d5e15a1902352 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.68.1"; + version = "2.69.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-jD6/ZeS0xdtajCg5e95E0Jo2lfXOn4OIVf4LJgAfPbo="; + sha256 = "sha256-E7cHDeQV7NVKyoCgI8P3gennpBidk7JmdnFGSIulvvQ="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 7fcfeb32fd3a2..fdcf944220488 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -36,6 +36,17 @@ mkDerivation rec { PREFIXSHORTCUT=$out" ''; + postInstall = '' + mkdir -p $out/share/applications + ln -s $out/fmit.desktop $out/share/applications/fmit.desktop + + mkdir -p $out/share/icons/hicolor/128x128/apps + ln -s $out/fmit.png $out/share/icons/hicolor/128x128/apps/fmit.png + + mkdir -p $out/share/icons/hicolor/scalable/apps + ln -s $out/fmit.svg $out/share/icons/hicolor/scalable/apps/fmit.svg + ''; + meta = with lib; { description = "Free Musical Instrument Tuner"; longDescription = '' diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 50993b056a842..895b39bb9cc26 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.73"; + version = "1.74"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-f5deXMSyZIDKPO7hsNONes/kTFLFodx4nuEjZzkR5Aw="; + hash = "sha256-plr5vmtYL0adeocY4/3hRI2RQ7lDkLvBbQPq2Jw6MvU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/g4music/default.nix b/pkgs/applications/audio/g4music/default.nix index 9063a8351a188..a0a9f5f828a5a 100644 --- a/pkgs/applications/audio/g4music/default.nix +++ b/pkgs/applications/audio/g4music/default.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "g4music"; - version = "3.3"; + version = "3.4-1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-sajA8+G1frQA0p+8RK84hvh2P36JaarmSZx/sxMoFqo="; + hash = "sha256-uklgxhyrnFQSUcttXvYQtm2BybRkdTK1IfaRpOp0sOE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index 72b1fe61296b4..15fcf05405835 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = version; - sha256 = "sha256-q3Lu3UaEKfS7F59G6rPx+5cKcsaXk+xcdtJRIXPwVIs="; + sha256 = "sha256-tONxVxzOFbwnuaW6YoHVZOmgd5S11qz38hcI+yQgjrQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/applications/audio/goodvibes/default.nix index b4800889de109..111cad65a013d 100644 --- a/pkgs/applications/audio/goodvibes/default.nix +++ b/pkgs/applications/audio/goodvibes/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , glib +, glib-networking , gtk3 , libsoup , keybinder3 @@ -36,6 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib + # for libsoup TLS support + glib-networking gtk3 libsoup keybinder3 diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/applications/audio/gspeech/default.nix index a48aa22809b4f..f2216ed7d2560 100644 --- a/pkgs/applications/audio/gspeech/default.nix +++ b/pkgs/applications/audio/gspeech/default.nix @@ -55,6 +55,11 @@ python3.pkgs.buildPythonApplication rec { librsvg ]; + postInstall = '' + install -Dm444 gspeech.desktop -t $out/share/applications + install -Dm444 icons/*.svg -t $out/share/icons/hicolor/scalable/apps + ''; + postFixup = '' wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts sox ]} wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts sox ]} diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/applications/audio/gtkcord4/default.nix index 7242245a3ea9a..1a4001d670d72 100644 --- a/pkgs/applications/audio/gtkcord4/default.nix +++ b/pkgs/applications/audio/gtkcord4/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "gtkcord4"; - version = "0.0.12"; + version = "0.0.16-1"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - hash = "sha256-x//PST2f501QuxRdPe3cYbpL66/zLJWmscED9SbxsTk="; + hash = "sha256-GDQ11X202RIoJUZ2eJ9ukHalhXtKYn9C8lcvAzzaB+4="; }; nativeBuildInputs = [ @@ -52,17 +52,17 @@ buildGoModule rec { ]; postInstall = '' - install -D -m 444 -t $out/share/applications nix/xyz.diamondb.gtkcord4.desktop - install -D -m 444 internal/icons/svg/logo.svg $out/share/icons/hicolor/scalable/apps/gtkcord4.svg - install -D -m 444 internal/icons/png/logo.png $out/share/icons/hicolor/256x256/apps/gtkcord4.png + install -D -m 444 -t $out/share/applications nix/so.libdb.gtkcord4.desktop + install -D -m 444 internal/icons/hicolor/scalable/apps/logo.svg $out/share/icons/hicolor/scalable/apps/gtkcord4.svg ''; - vendorHash = "sha256-LCLZBcYiexffvCr4vdZdIwNKo0s4mqPc6KxRumRhf1Y="; + vendorHash = "sha256-ZQBYi5t6ntukoHP2FtwpZrpFd7b2opPC8tOSU9j3jUM="; meta = with lib; { - description = "GTK4 Discord client in Go, attempt #4."; + description = "GTK4 Discord client in Go, attempt #4"; homepage = "https://github.com/diamondburned/gtkcord4"; license = licenses.gpl3Only; + mainProgram = "gtkcord4"; maintainers = with maintainers; [ hmenke urandom aleksana ]; }; } diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/applications/audio/in-formant/default.nix index 6801e3641852d..3df72add7f6bf 100644 --- a/pkgs/applications/audio/in-formant/default.nix +++ b/pkgs/applications/audio/in-formant/default.nix @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp in-formant $out/bin + install -Dm444 $src/dist-res/in-formant.desktop -t $out/share/applications + install -Dm444 $src/dist-res/in-formant.png -t $out/share/icons/hicolor/512x512/apps ''; meta = with lib; { diff --git a/pkgs/applications/audio/jack-passthrough/default.nix b/pkgs/applications/audio/jack-passthrough/default.nix new file mode 100644 index 0000000000000..93f41f1b59529 --- /dev/null +++ b/pkgs/applications/audio/jack-passthrough/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libjack2 +, meson +, ninja +, fmt_9 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "jack-passthrough"; + version = "2021-9-25"; + + # https://github.com/guysherman/jack-passthrough + src = fetchFromGitHub { + owner = "guysherman"; + repo = finalAttrs.pname; + rev = "aad03b7c5ccc4a4dcb8fa38c49aa64cb9d628660"; + hash = "sha256-9IsNaLW5dYAqiwe+vX0+D3oIKFP2TIfy1q1YaqmS6wE="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ fmt_9 libjack2 ]; + + meta = with lib; { + description = "A simple app to help with JACK apps that behave strangely."; + longDescription = '' + Creates a JACK passthrough client with an arbitrary name and number of + ports. Common uses include tricking stubborn applications into creating + more ports than they normally would or to prevent them from + auto-connecting to certain things. + ''; + # license unknown: https://github.com/guysherman/jack-passthrough/issues/2 + license = licenses.unfree; + maintainers = [ maintainers.PowerUser64 ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index 84a839aeb02b5..d7e96c84c6a59 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -21,14 +21,14 @@ assert lib.asserts.assertMsg (usePipewire != usePulseaudio) "You need to enable stdenv.mkDerivation (finalAttrs: { pname = "jamesdsp"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Audio4Linux"; repo = "JDSP4Linux"; fetchSubmodules = true; rev = finalAttrs.version; - hash = "sha256-XYJl94/PstWG5qaBQ2rXc/nG9bDeP3Q62zDYHmZvPaw="; + hash = "sha256-eVndqIqJ3DRceuFMT++g2riXq0CL5r+TWbvzvaYIfZ8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index 8055683a3fcf4..34f7be934c2ec 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i 's@/usr/@$(out)/@g' Makefile + substituteInPlace Makefile \ + --replace /tmp/test.wav $NIX_BUILD_TOP/${sourceRoot}/test.wav ''; makeFlags = [ diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index 31e7d23f75df7..a1a4cf3b33c6f 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -5,18 +5,18 @@ python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.80"; + version = "2.0.86"; pyproject= true; src = fetchPypi { inherit pname version; - hash = "sha256-vwLk3EpXqUSAwzY2oX0ZpXrmH2cT0GdYdL/Mifav6mU="; + hash = "sha256-miOGMsrvK3A3SYnd+i/lqB+9GOHtO4F3RW8NkxDgFqU="; }; postPatch = '' substituteInPlace setup.py \ --replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \ - --replace '"sentry-sdk==1.14.0",' "sentry-sdk" \ + --replace "sentry-sdk==1.38.0" "sentry-sdk" \ --replace "~=" ">=" ''; @@ -32,12 +32,14 @@ python3.pkgs.buildPythonPackage rec { cython flux-led icmplib + mss multidict numpy openrgb-python paho-mqtt pillow psutil + pybase64 pyserial pystray python-mbedtls diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 43e5338cb9bb0..c3df2ecd30d4e 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, makeWrapper +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, makeWrapper , libsndfile, jack2 , libGLU, libGL, lv2, cairo , ladspaH, php, libXrandr }: stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.13"; + version = "1.2.14"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-eJO+1fCNzqjTdGrPlhIrHc3UimkJOydRqTq49IN+Iwo="; + sha256 = "sha256-GjNZ7ouKgpcb1+nuq+Q/WM5rSkeT2F+xb5exAOTt7po="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index f634539a9f61c..ffa2e3697c6d5 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.28"; + version = "10.38"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - sha256 = "sha256-9EFZvD3CicT68hBcc/fS73zonQKDwbV/iNY0CbBmhtE="; + sha256 = "sha256-cVWwbzKyoBYiSPjMVzCGhPr2gPPWp+ateBqzPZojRP0="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 417dd8e41a651..3e75eef6dc2f1 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "unstable-2023-11-01"; + version = "unstable-2023-12-20"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-spotify"; - rev = "48faaaa2642647b0152231798b46ccd9631694f5"; - hash = "sha256-RwkUdcbDU7/ndVnPteG/iXB2dloljvCHQlvPk4tacuA="; + rev = "2d26b54900bc1fdb974f571036f7101f6e6a3846"; + hash = "sha256-T5lWgjDhYCUe/mWAM1SFHzWbxyJ7US1fn0sPTVi/s2s="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index fb80c10f046fe..642d1057b483e 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , cmake +, extra-cmake-modules , pkg-config , qttools , wrapQtAppsHook @@ -27,18 +28,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "muse-sequencer"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "muse-sequencer"; repo = "muse"; rev = finalAttrs.version; - hash = "sha256-JPvoximDL4oKO8reXW7alMegwUyUTSAcdq3ueXeUMMY="; + hash = "sha256-LxibuqopMHuKEfTWXSEXc1g3wTm2F3NQRiV71FHvaY0="; }; sourceRoot = "${finalAttrs.src.name}/src"; - nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + qttools + wrapQtAppsHook + ]; buildInputs = [ alsa-lib diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index d42117e1babe7..3dbb9c7884f1b 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -48,35 +48,14 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-jXievVIA0tqLdKLy6oPaOHPIbDoFstveEQBri9M0Aoo="; + sha256 = "sha256-vNA1VPCHLt5kuhIix8kgeq1VlbuIX1lOY3nJaufvuyc="; }; - patches = [ - # Upstream from some reason wants to install qml files from qtbase in - # installPhase, this patch removes this behavior. See: - # https://github.com/musescore/MuseScore/issues/18665 - (fetchpatch { - url = "https://github.com/doronbehar/MuseScore/commit/f48448a3ede46f5a7ef470940072fbfb6742487c.patch"; - hash = "sha256-UEc7auscnW0KMfWkLKQtm+UstuTNsuFeoNJYIidIlwM="; - }) - # Upstream removed the option to use system freetype library in v4.1.0, - # causing the app to crash on systems when the outdated bundled freetype - # tries to load the Noto Sans font. For more info on the crash itself, - # see #244409 and https://github.com/musescore/MuseScore/issues/18795. - # For now, re-add the option ourselves. The fix has been merged upstream, - # so we can remove this patch with the next version. In the future, we - # may replace the other bundled thirdparty libs with system libs, see - # https://github.com/musescore/MuseScore/issues/11572. - (fetchpatch { - url = "https://github.com/musescore/MuseScore/commit/9ab6b32b1c3b990cfa7bb172ee8112521dc2269c.patch"; - hash = "sha256-5GA29Z+o3I/uDTTDbkauZ8/xSdCE6yY93phMSY0ea7s="; - }) - ]; cmakeFlags = [ "-DMUSESCORE_BUILD_MODE=release" diff --git a/pkgs/applications/audio/muzika/default.nix b/pkgs/applications/audio/muzika/default.nix index 6605ebc9dcca7..86a3f19619831 100644 --- a/pkgs/applications/audio/muzika/default.nix +++ b/pkgs/applications/audio/muzika/default.nix @@ -17,46 +17,56 @@ , wrapGAppsHook4 , yarn , nodejs +, blueprint-compiler +, libsecret }: stdenv.mkDerivation rec { pname = "muzika"; - version = "unstable-2023-06-07"; + version = "unstable-2023-11-07"; src = fetchFromGitHub { owner = "vixalien"; repo = "muzika"; - rev = "d0ca7eebad67082e73513ebd7ca04edb1fdec7ce"; - hash = "sha256-ycnHpyYaUJZgproTLCWCVzsvnUisXlq3fqlij1KryWA="; + rev = "69c25e066297c45f4ce42d84d5d4c200789fbedf"; + hash = "sha256-Uof72o6HG4pYj1KZ8KgCwQA+0m778ezZxmt3TohNZcY="; fetchSubmodules = true; }; + postPatch = '' + # Remove git command from version query + sed -i '2d' meson.build + ''; + nativeBuildInputs = [ + blueprint-compiler desktop-file-utils gobject-introspection meson ninja nodejs pkg-config + prefetch-yarn-deps wrapGAppsHook4 yarn - prefetch-yarn-deps ]; buildInputs = [ gjs glib-networking + gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-rs gtk4 libadwaita + libsecret libsoup_3 ]; yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-FvPEbYIydgfyKKsf2jnXUbPEhIboPi3wR7BWzEuo72Q="; + hash = "sha256-/NkLfBmQGvgufF9ajgs7DQsBkWUUK4Bslhy7VmCBrGg="; }; preConfigure = '' diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index 3e130b0855d40..3b2765367d66c 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 = "13.0.0"; + version = "13.0.6"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-cYoGjge2VtU+QqIURGd/EpkSQ4fhvsdnYZYyESAd56U="; + sha256 = "sha256-7yqpm2qMDHWVM5m5FueYlkEFY+VIW8Cx+aRa1iY2vZ4="; }; nativeBuildInputs = [ @@ -63,5 +63,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.doronbehar ]; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; + mainProgram = "mympd"; }; }) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index f98f45a1b5cbd..553e50f16654f 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.13.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - hash = "sha256-pYPUYy/ODzg9HN0/PTGZkV1NFBPmluhEwoJjYuZ6DTg="; + hash = "sha256-NHrpJC6cF/YAcyqZ4bRQdSdjDNhkEV7U2P/S4LSADao="; }; - cargoHash = "sha256-FdXk6SzW0f3jkTfxMd8TMzfJGTRaZjG4qp56yHqDAuw="; + cargoHash = "sha256-HT084XewXwZByL5KZhyymqU7sy99SAjYIWysm3qGvWU="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 39b8ecf7a6afb..f6f2ba3f73c9f 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { ladspaH liblo libsigcxx lrdf ]; + env.CXXFLAGS = "-std=c++14"; + meta = { description = "Lightweight and lightning fast modular Digital Audio Workstation"; homepage = "http://non.tuxfamily.org"; diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix index fb37c93e10fea..b8d29af7abdf4 100644 --- a/pkgs/applications/audio/noson/default.nix +++ b/pkgs/applications/audio/noson/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "noson"; - version = "5.6.0"; + version = "5.6.3"; src = fetchFromGitHub { owner = "janbar"; repo = "noson-app"; rev = finalAttrs.version; - hash = "sha256-ZOAnH7pdhlTbqHOM0kiCWcHYJvnskigWdz3N9WjtM0M="; + hash = "sha256-Yv5p9yAEhJHm9ZDZlR76z10oGBNpdifR7ITXcAHIb54="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index e0d284bc951e2..08b1a106a3d59 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -1,4 +1,14 @@ -{ lib, buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, electron, python3, nix-update-script }: +{ lib +, buildNpmPackage +, fetchFromGitHub +, makeBinaryWrapper +, makeDesktopItem +, copyDesktopItems +, nodejs_18 +, electron +, python3 +, nix-update-script +}: buildNpmPackage rec { pname = "open-stage-control"; @@ -18,10 +28,11 @@ buildNpmPackage rec { npmDepsHash = "sha256-UqjYNXdNoQmirIgU9DRgkp14SIrawfrfi9mD2h6ACyU="; + nodejs = nodejs_18; + nativeBuildInputs = [ copyDesktopItems makeBinaryWrapper - python3 ]; buildInputs = [ diff --git a/pkgs/applications/audio/osdlyrics/default.nix b/pkgs/applications/audio/osdlyrics/default.nix index 15d6aeee10dd4..d0f12a59125da 100644 --- a/pkgs/applications/audio/osdlyrics/default.nix +++ b/pkgs/applications/audio/osdlyrics/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "osdlyrics"; - version = "0.5.14"; + version = "0.5.15"; src = fetchFromGitHub { owner = "osdlyrics"; repo = "osdlyrics"; rev = version; - sha256 = "sha256-NVUQLmddXnpryt1AuHSwgPnWkgxWMBNJac09TJ12Yzo="; + hash = "sha256-4jEF1LdMwaLNF6zvzAuGW8Iu4dzhrFLutX69LwSjTAI="; }; nativeBuildInputs = [ @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { (python3.withPackages (pp: with pp; [ chardet dbus-python - future pycurl pygobject3 ])) @@ -81,7 +80,7 @@ stdenv.mkDerivation rec { description = "Standalone lyrics fetcher/displayer"; homepage = "https://github.com/osdlyrics/osdlyrics"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pedrohlc ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index 6aa92a3a99fa4..23fb4380a2e55 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -2,14 +2,11 @@ , stdenv , fetchFromGitHub , appstream-glib -, dbus , desktop-file-utils , gettext , glib -, gobject-introspection -, gsettings-desktop-schemas , gst_all_1 -, gtk3 +, gtk4 , hicolor-icon-theme , isocodes , itstool @@ -23,20 +20,19 @@ stdenv.mkDerivation rec { pname = "parlatype"; - version = "3.1"; + version = "4.0"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "1a4xlsbszb50vnz1g7kf7hl7aywp7s7xaravkcx13csn0a7l3x45"; + sha256 = "1iyjxss6sgc9gx6ij30zz97bl31qix8pxklzn4kknh1b0j7hhbwq"; }; nativeBuildInputs = [ appstream-glib desktop-file-utils gettext - gobject-introspection itstool libxml2 meson @@ -47,16 +43,14 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - dbus glib - gsettings-desktop-schemas gst_all_1.gst-libav gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-ugly gst_all_1.gstreamer - gtk3 + gtk4 hicolor-icon-theme isocodes ]; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index ed861f12468bf..6de3da92db8a3 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { pname = "pithos"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-cFmsdQXfGxgpKe32dw1lgoANU9Drhu5Mecyz37BVP4g="; + hash = "sha256-GPDbFlwiGT/B2paX33d3mUCV77q+fPM0LMaKFsQQjjQ="; }; format = "other"; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 1e9e26cb18a4b..bb43ae075dccc 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.3.20"; + version = "6.4.01"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-hVQPLRyDXrqpheAqzC/hQ/ZaFxP1c7ClAJQs3wlEcGc="; + hash = "sha256-6g9oDPcJpI/udX+GKyCUkv+mjGoTbHU2YfTYaTVRwu4="; }; nativeBuildInputs = [ @@ -47,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall install -Dt $out/bin praat + install -Dm444 main/praat.desktop -t $out/share/applications + install -Dm444 main/praat-32.ico $out/share/icons/hicolor/32x32/apps/praat.ico + install -Dm444 main/praat-256.ico $out/share/icons/hicolor/256x256/apps/praat.ico + install -Dm444 main/praat-480.png $out/share/icons/hicolor/480x480/apps/praat.png + install -Dm444 main/praat-480.svg $out/share/icons/hicolor/scalable/apps/praat.svg runHook postInstall ''; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 276fdbf32e2c4..b6fa1ce2d0d46 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsa-lib; + postInstall = '' + install -Dm444 "$src/release/other/Freedesktop.org Resources/ProTracker 2 clone.desktop" \ + -t $out/share/applications + install -Dm444 "$src/release/other/Freedesktop.org Resources/ProTracker 2 clone.png" \ + -t $out/share/icons/hicolor/512x512/apps + ''; + passthru.tests = { pt2-clone-opens = nixosTests.pt2-clone; }; diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 44a285c7b65a4..bab3d8c9b4ee5 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-wJ+vUw16yBBFjMdJogF1nkLnAh3o2ndN9+0png8ZVJ4="; + sha256 = "sha256-oB8/q0igSZoaDzKzgmGAECU0qJwO67t9qWw+fB2vfxg="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 3196d492fb500..63e2bd7f2dccd 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -17,7 +17,9 @@ , libxdg_basedir , wxGTK # GStreamer +, glib-networking , gst_all_1 +, libsoup_3 # User-agent info , lsb-release # rt2rtng @@ -58,6 +60,8 @@ stdenv.mkDerivation rec { libxdg_basedir lsb-release wxGTK + # for https gstreamer / libsoup + glib-networking ] ++ gstInputs ++ pythonInputs; @@ -89,6 +93,8 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ dbus ]}) wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH + # for GStreamer + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.getLib libsoup_3}/lib") ''; meta = with lib; { diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 01ccc65d5f63f..6490a15755fac 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.05"; + version = "7.06"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-jaT+3cIFVfBopgeeTkpNs9rFX50unlPJogdhkI9bsWU=" else { - x86_64-linux = "sha256-P/PnbJPr4ErDz5ho1/dLERhqkKjdetHzKpCpfVZAYb0="; - aarch64-linux = "sha256-PdnBVlHwoEEv2SPq/p5oyiOlduCEqL35gAY+QIJU1Ys="; + hash = if stdenv.isDarwin then "sha256-4ANi5KhNbJvDCO2iPX/oayGf/ZeIMfkhp0FQRrBYowo=" else { + x86_64-linux = "sha256-tq0K2HSDTZg7iw6ypS5oUuQi3HIYzbl9DWo2SOKGDVY="; + aarch64-linux = "sha256-MGpfdSQsMykp6QNq1JqxIsFqdhNyefPnEIyC4t1S6Vs="; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix index 0af80c991c2ea..23cc0577c688c 100644 --- a/pkgs/applications/audio/rubyripper/default.nix +++ b/pkgs/applications/audio/rubyripper/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { ruby ]; + postInstall = '' + cp -r share $out/ + ''; + postFixup = '' wrapProgram $out/bin/rrip_cli \ --prefix PATH : ${lib.makeBinPath [ cddiscid cdparanoia ruby ]} diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 3e485e9de4c30..31fa497022033 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -2,38 +2,49 @@ , lib , fetchFromGitHub , nix-update-script -, autoreconfHook -, perl -, pkg-config -, libsidplayfp , alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib +, autoreconfHook , pulseSupport ? stdenv.hostPlatform.isLinux , libpulseaudio +, libsidplayfp , out123Support ? stdenv.hostPlatform.isDarwin , mpg123 +, perl +, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; - rev = "v${version}"; - sha256 = "sha256-ECHtHJrkJ5Y0YvDNdMM3VB+s7I/8JCPZiwsPYLM/oig="; + rev = "v${finalAttrs.version}"; + hash = "sha256-oV7ZPWgMEsNlsF2OoOvf7Ah5ZLcVkIDyC+PrPIJGyzQ="; }; - nativeBuildInputs = [ autoreconfHook perl pkg-config ]; + strictDeps = true; - buildInputs = [ libsidplayfp ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional out123Support mpg123; + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + ]; + + buildInputs = [ + libsidplayfp + ] ++ lib.optionals alsaSupport [ + alsa-lib + ] ++ lib.optionals pulseSupport [ + libpulseaudio + ] ++ lib.optionals out123Support [ + mpg123 + ]; - configureFlags = lib.optionals out123Support [ - "--with-out123" + configureFlags = [ + (lib.strings.withFeature out123Support "out123") ]; enableParallelBuilding = true; @@ -46,7 +57,8 @@ stdenv.mkDerivation rec { description = "A SID player using libsidplayfp"; homepage = "https://github.com/libsidplayfp/sidplayfp"; license = with licenses; [ gpl2Plus ]; + mainProgram = "sidplayfp"; maintainers = with maintainers; [ dezgeg OPNA2608 ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 78c17d09e0de3..e5aa901801201 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -72,6 +72,5 @@ in buildPythonApplication rec { homepage = "https://www.nongnu.org/sonata/"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.rvl ]; }; } diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 5bbdde57a3240..a73c00a8fb9d2 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -2,7 +2,7 @@ , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon -, pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu +, pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu, libGL # High-DPI support: Spotify's --force-device-scale-factor argument # not added if `null`, otherwise, should be a number. , deviceScaleFactor ? null @@ -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.25.1011.g0348b2ea"; + version = "1.2.26.1187.g36b715a1"; # 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 = "73"; + rev = "74"; deps = [ alsa-lib @@ -44,6 +44,7 @@ let libdbusmenu libdrm libgcrypt + libGL libnotify libpng libpulseaudio @@ -86,7 +87,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"; - hash = "sha512-93A+0YfP2/HnQOhSMw3UZ374bpS5ccQqb7a+e4RPSKvyT54wcI6hpmRn8CVo02oLo0yI2hho3Bu3ggsJLVgzbw=="; + hash = "sha512-Muurn4ih54oVTvLGuRfTPCgGSRImE8O0S5k7gZ4Utgrz3TKgVrthY9AXldP8v+qLcfIrrYwixJy2WGuur9E0jg=="; }; nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ]; diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index b10b52e7d1c48..7c36c190128dc 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -17,7 +17,7 @@ let juce-lv2 = stdenv.mkDerivation { pname = "juce-lv2"; - version = "unstable-2022-03-30"; + version = "unstable-2023-03-04"; # lv2 branch src = fetchFromGitHub { @@ -37,14 +37,14 @@ let in stdenv.mkDerivation rec { pname = "surge-XT"; - version = "1.2.0"; + version = "1.2.3"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = "surge"; rev = "release_xt_${version}"; fetchSubmodules = true; - sha256 = "sha256-LRYKkzeEuuRbMmvU3E0pHAnotOd4DyIJ7rTb+fpW0H4="; + sha256 = "sha256-DGzdzoCjMGEDltEwlPvLk2tyMVRH1Ql2Iq1ypogw/m0="; }; nativeBuildInputs = [ @@ -64,6 +64,8 @@ stdenv.mkDerivation rec { libXrandr ]; + enableParallelBuilding = true; + cmakeFlags = [ "-DJUCE_SUPPORTS_LV2=ON" "-DSURGE_JUCE_PATH=${juce-lv2}" diff --git a/pkgs/applications/audio/vgmstream/default.nix b/pkgs/applications/audio/vgmstream/default.nix index 6b5e6460172dd..2dae5a5f0d379 100644 --- a/pkgs/applications/audio/vgmstream/default.nix +++ b/pkgs/applications/audio/vgmstream/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "vgmstream"; - version = "1879"; + version = "1896"; src = fetchFromGitHub { owner = "vgmstream"; repo = "vgmstream"; rev = "refs/tags/r${version}"; - sha256 = "sha256-m7M9oIEym/jzuw2HAbjdF6fZsfTew1KK0g1D4SePiiE="; + sha256 = "sha256-1BWJgV631MxxzdUtK8f+XRb9cqfhjlwN2LgWI0VmIHE="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index 18e6ba9e5c12a..fc135c199bd1f 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -2,45 +2,89 @@ , fetchFromGitHub , buildNpmPackage , makeWrapper -, electron_25 +, electron , python3 , stdenv +, stdenvNoCC , copyDesktopItems +, moreutils +, cacert +, jq +, nodePackages , makeDesktopItem }: let pname = "youtube-music"; - version = "2.1.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "th-ch"; repo = pname; rev = "v${version}"; - hash = "sha256-aYEEUv+dybzcH0aNJlZ19XF++8cswFunrU0H+ZaKm4Y="; + hash = "sha256-6ZiftpdCwxCkJzcHryVrUKzM+mM1eQpdLNFl0Dja59Q="; }; - electron = electron_25; - in -buildNpmPackage { +stdenv.mkDerivation (finalAttrs: { inherit pname version src; - nativeBuildInputs = [ makeWrapper python3 ] - ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]; + pnpmDeps = stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-pnpm-deps"; + inherit (finalAttrs) src version ELECTRON_SKIP_BINARY_DOWNLOAD; + + nativeBuildInputs = [ jq moreutils nodePackages.pnpm cacert ]; + + installPhase = '' + export HOME=$(mktemp -d) - npmDepsHash = "sha256-XGV0mTywYYxpMitojzIILB/Eu/8dfk/aCvUxIkx4SDQ="; - makeCacheWritable = true; + pnpm config set store-dir $out + pnpm install --frozen-lockfile --ignore-script - env = { - ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + rm -rf $out/v3/tmp + for f in $(find $out -name "*.json"); do + sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f + jq --sort-keys . $f | sponge $f + done + ''; + + dontBuild = true; + dontFixup = true; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = { + x86_64-linux = "sha256-Oy11V7FXfVhLUR9gX0sjQEFuVPFpbaVdT518oOSLcvA="; + aarch64-linux = "sha256-6nXemaGiQjp2stjjKItPJ62VcH5Q5pRf63qKtl2haXI="; + x86_64-darwin = "sha256-jSMAw+AMD63vqPckZjblw4EDngA4E8h0WlsZu3hUShY="; + aarch64-darwin = "sha256-zujXURpIcw7IOw63AW167h6cywYXydhHZMzA2apGZAs="; + }.${stdenv.system} or (throw "Unsupported platform"); }; + nativeBuildInputs = + [ makeWrapper python3 nodePackages.pnpm nodePackages.nodejs ] + ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]; + + + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + + preBuild = '' + export HOME=$(mktemp -d) + export STORE_PATH=$(mktemp -d) + + cp -Tr "$pnpmDeps" "$STORE_PATH" + chmod -R +w "$STORE_PATH" + + pnpm config set store-dir "$STORE_PATH" + pnpm install --offline --frozen-lockfile --ignore-script + patchShebangs node_modules/{*,.*} + ''; + postBuild = lib.optionalString stdenv.isDarwin '' cp -R ${electron}/Applications/Electron.app Electron.app chmod -R u+w Electron.app '' + '' - npm exec electron-builder -- \ + pnpm build + ./node_modules/.bin/electron-builder \ --dir \ -c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \ -c.electronVersion=${electron.version} @@ -83,7 +127,7 @@ buildNpmPackage { icon = "youtube-music"; desktopName = "Youtube Music"; startupWMClass = "Youtube Music"; - categories = ["AudioVideo"]; + categories = [ "AudioVideo" ]; }) ]; @@ -93,6 +137,6 @@ buildNpmPackage { license = licenses.mit; maintainers = [ maintainers.aacebedo ]; mainProgram = "youtube-music"; - platforms = platforms.all; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; -} +}) diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 1980fae8e194e..49c5cadc89f2d 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -20,16 +20,16 @@ , duplicity }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "deja-dup"; - version = "45.1"; + version = "45.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "deja-dup"; - rev = version; - hash = "sha256-2vNAppy8fYYcxH3ci4B6bUIl2sO5NC6yA13y9iU4V/A="; + rev = finalAttrs.version; + hash = "sha256-nscswpWX6UB1zuv6TXcT3YE1wkREJYDGQrEPryyUYUM="; }; patches = [ @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "deja-dup"; }; -} +}) diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index f83f16a4e4569..cba677e6e16ad 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "mtkennerly"; repo = pname; rev = "v${version}"; - hash = "sha256-eEuaDMfFxWcNM9+5TvZZXLgbDuGbyIAIuzEMVWbvYbg="; + hash = "sha256-FVM/HJpBd9G161JTaVTeWQhz4p5uDgQtohaIw1iNOJo="; }; - cargoSha256 = "sha256-ENo562Y6K238NNEtgYoPw6EXjbcuxPuXiftIp/bGYYU="; + cargoHash = "sha256-5RhFyC4e4OOdnhwk4sgG6mmRVa1gLaBUA8DW5XW6E14="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/backup/proxmox-backup-client/default.nix b/pkgs/applications/backup/proxmox-backup-client/default.nix index 77b674d9a1d13..e074c131e39e1 100644 --- a/pkgs/applications/backup/proxmox-backup-client/default.nix +++ b/pkgs/applications/backup/proxmox-backup-client/default.nix @@ -150,6 +150,6 @@ rustPlatform.buildRustPackage { license = licenses.agpl3Only; maintainers = with maintainers; [ cofob christoph-heiss ]; platforms = platforms.linux; - mainProgram = pname; + mainProgram = "proxmox-backup-client"; }; } diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 878c57fa9c0d1..bcf6ff6af7211 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "23.07.1"; + version = "23.12.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - sha256 = "RnArZTzvH+mdT7zAHTRem8+Z8CFjWVvd3p/HwZC/v+U="; + sha256 = "xeO1/YQGRTCCGMRPr6Dqb9+89lP24fPBDBJpvtcr2X0="; }; patches = [ diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index 2f164adcea12d..8dacb4b4082a9 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -49,7 +49,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/ep1cman/unifi-protect-backup"; changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ajs124 ]; + maintainers = teams.helsinki-systems.members; mainProgram = "unifi-protect-backup"; }; } diff --git a/pkgs/applications/blockchains/atomic-swap/default.nix b/pkgs/applications/blockchains/atomic-swap/default.nix index ed5869f2fc495..a2e2e9efbffb9 100644 --- a/pkgs/applications/blockchains/atomic-swap/default.nix +++ b/pkgs/applications/blockchains/atomic-swap/default.nix @@ -1,9 +1,8 @@ -{ lib, buildGo120Module, fetchFromGitHub, nix-update-script, makeWrapper, monero-cli }: +{ lib, buildGoModule, fetchFromGitHub, nix-update-script, makeWrapper, monero-cli }: let pname = "atomic-swap"; - version = "0.4.2"; - buildGoModule = buildGo120Module; + version = "0.4.3"; in buildGoModule { inherit pname version; @@ -12,10 +11,10 @@ buildGoModule { owner = "AthanorLabs"; repo = "atomic-swap"; rev = "v${version}"; - hash = "sha256-JnbKaGmpTDwQMSDR4Y8Q2JTtuQV5GGuovxeIYs0KgQI="; + hash = "sha256-MOylUZ6BrvlxUrsZ5gg3JzW9ROG5UXeGhq3YoPZKdHs="; }; - vendorHash = "sha256-acBnXGy1kVBwB+j8VqGyinabnI/boTtbFNyjE6EHVes="; + vendorHash = "sha256-fGQ6MI+3z7wRL0y7AUERVtN0V2rcRa+vqeB8+3FMzzc="; subPackages = [ "cmd/swapcli" diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index d1e419425570a..ace8329bb876b 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; - version = "23.0.knots20220529"; + version = "25.1.knots20231115"; src = fetchurl { - url = "https://bitcoinknots.org/files/23.x/${version}/bitcoin-${version}.tar.gz"; - sha256 = "0c6l4bvj4ck8gp5vm4dla3l32swsp6ijk12fyf330wgry4mhqxyi"; + url = "https://bitcoinknots.org/files/25.x/${version}/bitcoin-${version}.tar.gz"; + sha256 = "b6251beee95cf6701c6ebc443b47fb0e99884880f2661397f964a8828add4002"; }; nativeBuildInputs = @@ -68,10 +68,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.tests = { - smoke-test = nixosTests.bitcoind-knots; - }; - meta = with lib; { description = "A derivative of Bitcoin Core with a collection of improvements"; homepage = "https://bitcoinknots.org/"; diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 1d0736244b68a..f31fea1527105 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - version = "25.1"; + version = "26.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "bec2a598d8dfa8c2365b77f13012a733ec84b8c30386343b7ac1996e901198c9"; + sha256 = "ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1"; }; nativeBuildInputs = @@ -55,9 +55,9 @@ stdenv.mkDerivation rec { ++ lib.optionals withGui [ qrencode qtbase qttools ]; postInstall = '' - installShellCompletion --cmd bitcoin-cli --bash contrib/completions/bash/bitcoin-cli.bash-completion - installShellCompletion --cmd bitcoind --bash contrib/completions/bash/bitcoind.bash-completion - installShellCompletion --cmd bitcoin-tx --bash contrib/completions/bash/bitcoin-tx.bash-completion + installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash + installShellCompletion --bash contrib/completions/bash/bitcoind.bash + installShellCompletion --bash contrib/completions/bash/bitcoin-tx.bash installShellCompletion --fish contrib/completions/fish/bitcoin-cli.fish installShellCompletion --fish contrib/completions/fish/bitcoind.fish @@ -72,6 +72,10 @@ stdenv.mkDerivation rec { install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png ''; + preConfigure = lib.optionalString stdenv.isDarwin '' + export MACOSX_DEPLOYMENT_TARGET=10.13 + ''; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index d4fa4c68fe266..9b0e069bef581 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -22,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "23.11"; + version = "23.11.2"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "sha256:1q1plg9qhwlrcvljnrv8yd1gaz9a98pxgql7bqxjq37vk3lfggw6"; + sha256 = "sha256-n1+9Q493N/N5sr7sVpzhObtbKpEejsNUUhhbYPukveg="; }; # when building on darwin we need dawin.cctools to provide the correct libtool diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index 0fa8ddd46dc58..68dfa2be0579a 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = if withGui then "elements" else "elementsd"; - version = "22.1.1"; + version = "23.2.1"; src = fetchFromGitHub { owner = "ElementsProject"; repo = "elements"; rev = "elements-${version}"; - sha256 = "sha256-V8Ym4dGshf2E6KsboALXn1DJ5nL3QQvMmVMNdjSw7B8="; + sha256 = "sha256-qHtSgfZGZ4Beu5fsJAOZm8ejj7wfHBbOS6WAjOrCuw4="; }; nativeBuildInputs = diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index d630ce55383c3..04a4f8c6f73b4 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.15"; + version = "5.0.18"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-/VMuye6uCQghjwotjmWEe55RADVwHCpH6PelZXVXSzM="; + sha256 = "sha256-WwchK7qyy+J7TiWj4exBMLGkLmbPFDA7yNQVZ779nmk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index d73a916b0de36..ae77b64c7b04a 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.54.0"; + version = "2.55.1"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-1kgbIg/3SvVT83UfwAYUixs1RQk4PP1quiOcI1mzbZ0="; + hash = "sha256-ttBJIx2QR3H5JFyquoGwZpWwT10r7X7GnGE4uEzuRZA="; fetchSubmodules = true; }; - vendorHash = "sha256-Gr9mrME8/ZDxp2ORKessNhfguklDf+jC4RSpzLOSBhQ="; + vendorHash = "sha256-QLuWxec1gwMnVo0Zw8z4Ef8vzxc4xFpLL/TT986Sljo="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 2abfe5f16d549..178267f293b5b 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "exodus"; - version = "23.10.24"; + version = "23.12.7"; src = fetchurl { name = "exodus-linux-x64-${version}.zip"; url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; - sha256 = "sha256-g28jSQaqjnM34sCpyYLSipUoU3pqAcXQIyWhlrR4xz4="; + sha256 = "sha256-qx0p+4jAuv2koaOuEgQ42jpJ5HysRX81PPrMOWp2Snw="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index 6e7cb1d58cd36..78389b28c9543 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config +, installShellFiles , util-linux , hexdump , autoSignDarwinBinariesHook @@ -32,16 +33,16 @@ let in stdenv.mkDerivation rec { pname = if withGui then "groestlcoin" else "groestlcoind"; - version = "25.0"; + version = "26.0"; src = fetchFromGitHub { owner = "Groestlcoin"; repo = "groestlcoin"; rev = "v${version}"; - sha256 = "03w5n3qjha63mgj7zk8q17x5j63la3i4li7bf5i1yw59ijqpmnqg"; + sha256 = "00qvaf53jszsk1rr029zmq60v8w0r92192ab65k2krkmh7ybla9l"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ] + nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] ++ lib.optionals stdenv.isLinux [ util-linux ] ++ lib.optionals stdenv.isDarwin [ hexdump ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] @@ -51,12 +52,26 @@ stdenv.mkDerivation rec { ++ lib.optionals withWallet [ db53 sqlite ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; - postInstall = lib.optionalString withGui '' + postInstall = '' + installShellCompletion --bash contrib/completions/bash/groestlcoin-cli.bash + installShellCompletion --bash contrib/completions/bash/groestlcoind.bash + installShellCompletion --bash contrib/completions/bash/groestlcoin-tx.bash + + for file in contrib/completions/fish/groestlcoin-*.fish; do + installShellCompletion --fish $file + done + '' + lib.optionalString withGui '' + installShellCompletion --fish contrib/completions/fish/groestlcoin-qt.fish + install -Dm644 ${desktop} $out/share/applications/groestlcoin-qt.desktop substituteInPlace $out/share/applications/groestlcoin-qt.desktop --replace "Icon=groestlcoin128" "Icon=groestlcoin" install -Dm644 share/pixmaps/groestlcoin256.png $out/share/pixmaps/groestlcoin.png ''; + preConfigure = lib.optionalString stdenv.isDarwin '' + export MACOSX_DEPLOYMENT_TARGET=10.13 + ''; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 5f96baba174bb..50ae11f7496db 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.71.0"; + version = "2.73.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-boZ28o8bg2TXZcc1mx4ZlPIPRFK9wy4+MTbYLT5XCQU="; + hash = "sha256-/eFzIIjHCAYskc68CGTyUKW04spX8YN69/3cPQ0Qtc0="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/lndinit/default.nix b/pkgs/applications/blockchains/lndinit/default.nix index 4d982183a36cb..839d3402acc42 100644 --- a/pkgs/applications/blockchains/lndinit/default.nix +++ b/pkgs/applications/blockchains/lndinit/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { meta = with lib; { description = "Wallet initializer utility for lnd"; homepage = "https://github.com/lightninglabs/lndinit"; - mainProgram = pname; + mainProgram = "lndinit"; license = licenses.mit; maintainers = with maintainers; [aldoborrero]; }; diff --git a/pkgs/applications/blockchains/optimism/geth.nix b/pkgs/applications/blockchains/optimism/geth.nix index a028c8e858448..66a446d526ad6 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.101304.0"; + version = "1.101304.2"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "op-geth"; rev = "v${version}"; - hash = "sha256-MpLkAAYQmceabVChixF1yqvGSoRm+A9p9mOeKHhqxQE="; + hash = "sha256-cGCgcwP/9xSpVo2UJAArptF5KEflo7SSdfg5WYUMuxY="; fetchSubmodules = true; }; @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/utils" ]; - vendorHash = "sha256-JIuS2qWFf9g5MIJP6jVTSAkPG15XCDeMHcoYeJQz7Og="; + vendorHash = "sha256-F0OANE4S7WJDYKpJ6mCnR38CPyOov0Hxc0gK1MGHcIg="; # 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 deleted file mode 100644 index 5c8cbbbbcdd5d..0000000000000 --- a/pkgs/applications/blockchains/oxen/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, pkg-config -, boost, openssl, unbound -, pcsclite, readline, libsodium, hidapi -, rapidjson -, curl, sqlite -, trezorSupport ? true -, libusb1 -, protobuf -, python3 -}: - -stdenv.mkDerivation rec { - pname = "oxen"; - version = "9.1.3"; - - src = fetchFromGitHub { - owner = "oxen-io"; - repo = "oxen-core"; - rev = "v${version}"; - sha256 = "11g3wqn0syk47yfcsdql5737kpad8skwdxhifn2yaz9zy8n3xqqb"; - fetchSubmodules = true; - }; - - # 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"; - hash = "sha512-TBjXhAhRecWx/LdTqTgTCVoSyNNJcPLhv8pkmb5snWd2nHHGi3ylT/GBsgOQBDFw6Jczwi92/x6kZJSBT3CVsQ=="; - }; - - postPatch = '' - # remove vendored libraries - rm -r external/rapidjson - sed -i s,/lib/,/lib64/, external/loki-mq/cmake/local-libzmq//LocalLibzmq.cmake - ''; - - postInstall = '' - rm -R $out/lib $out/include - ''; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ - boost openssl unbound - pcsclite readline - libsodium hidapi rapidjson - protobuf curl sqlite - ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; - - cmakeFlags = [ - # "-DUSE_DEVICE_TREZOR=ON" - # "-DBUILD_GUI_DEPS=ON" - "-DReadline_ROOT_DIR=${readline.dev}" - # It build with shared libs but doesn't install them. Fail. - # "-DBUILD_SHARED_LIBS=ON" - "-DLIBZMQ_TARBALL_URL=${lbzmqsrc}" - ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; - - meta = with lib; { - description = "Private cryptocurrency based on Monero"; - homepage = "https://oxen.io/"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ maintainers.viric ]; - # Fails to build on gcc-10 due to boost being built with gcc-12. - broken = true; - }; -} diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index a171500577bef..f78e06a77fac5 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -544,7 +544,7 @@ dependencies = [ [[package]] name = "ark-secret-scalar" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=cbc342e#cbc342e95d3cbcd3c5ba8d45af7200eb58e63502" +source = "git+https://github.com/w3f/ring-vrf?rev=2019248#2019248785389b3246d55b1c3b0e9bdef4454cb7" dependencies = [ "ark-ec", "ark-ff", @@ -552,7 +552,7 @@ dependencies = [ "ark-std", "ark-transcript", "digest 0.10.7", - "rand_core 0.6.4", + "getrandom_or_panic", "zeroize", ] @@ -593,7 +593,7 @@ dependencies = [ [[package]] name = "ark-transcript" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=cbc342e#cbc342e95d3cbcd3c5ba8d45af7200eb58e63502" +source = "git+https://github.com/w3f/ring-vrf?rev=2019248#2019248785389b3246d55b1c3b0e9bdef4454cb7" dependencies = [ "ark-ff", "ark-serialize", @@ -731,150 +731,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[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", - "log", - "pallet-asset-conversion", - "pallet-asset-conversion-tx-payment", - "pallet-assets", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-message-queue", - "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", - "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-genesis-builder", - "sp-inherents", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "sp-weights", - "staging-parachain-info", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "substrate-wasm-builder", -] - -[[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", - "log", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-message-queue", - "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", - "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-genesis-builder", - "sp-inherents", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "sp-weights", - "staging-parachain-info", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "substrate-wasm-builder", -] - -[[package]] name = "asset-hub-rococo-emulated-chain" version = "0.0.0" dependencies = [ @@ -905,7 +761,6 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", - "penpal-runtime", "rococo-runtime", "rococo-system-emulated-network", "sp-runtime", @@ -924,7 +779,6 @@ dependencies = [ "bp-bridge-hub-rococo", "bp-bridge-hub-westend", "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", @@ -1050,7 +904,6 @@ dependencies = [ "bp-bridge-hub-rococo", "bp-bridge-hub-westend", "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", @@ -1290,7 +1143,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1307,7 +1160,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1369,8 +1222,8 @@ dependencies = [ [[package]] name = "bandersnatch_vrfs" -version = "0.0.3" -source = "git+https://github.com/w3f/ring-vrf?rev=cbc342e#cbc342e95d3cbcd3c5ba8d45af7200eb58e63502" +version = "0.0.4" +source = "git+https://github.com/w3f/ring-vrf?rev=2019248#2019248785389b3246d55b1c3b0e9bdef4454cb7" dependencies = [ "ark-bls12-381", "ark-ec", @@ -1483,7 +1336,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1585,16 +1438,15 @@ dependencies = [ [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec 0.7.4", "cc", "cfg-if", "constant_time_eq 0.3.0", - "digest 0.10.7", ] [[package]] @@ -1966,141 +1818,20 @@ dependencies = [ ] [[package]] -name = "bp-xcm-bridge-hub-router" +name = "bp-xcm-bridge-hub" 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", - "log", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-message-queue", - "pallet-multisig", - "pallet-session", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-utility", - "pallet-xcm", - "pallet-xcm-benchmarks", - "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-genesis-builder", - "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "staging-parachain-info", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "substrate-wasm-builder", ] [[package]] -name = "bridge-hub-polkadot-runtime" +name = "bp-xcm-bridge-hub-router" 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", - "log", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-message-queue", - "pallet-multisig", - "pallet-session", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-utility", - "pallet-xcm", - "pallet-xcm-benchmarks", - "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-genesis-builder", - "sp-inherents", - "sp-io", - "sp-offchain", "sp-runtime", - "sp-session", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "staging-parachain-info", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "substrate-wasm-builder", ] [[package]] @@ -2159,7 +1890,6 @@ dependencies = [ "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", @@ -2192,6 +1922,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", + "pallet-xcm-bridge-hub", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -2309,6 +2040,7 @@ dependencies = [ name = "bridge-hub-westend-runtime" version = "0.1.0" dependencies = [ + "bp-asset-hub-rococo", "bp-asset-hub-westend", "bp-bridge-hub-rococo", "bp-bridge-hub-westend", @@ -2323,7 +2055,6 @@ dependencies = [ "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", @@ -2356,6 +2087,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", + "pallet-xcm-bridge-hub", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -2399,6 +2131,7 @@ dependencies = [ "bp-relayers", "bp-runtime", "bp-test-utils", + "bp-xcm-bridge-hub", "bp-xcm-bridge-hub-router", "frame-support", "frame-system", @@ -2701,7 +2434,7 @@ checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143" dependencies = [ "core2", "multibase", - "multihash", + "multihash 0.17.0", "serde", "unsigned-varint", ] @@ -2773,23 +2506,23 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" dependencies = [ "clap_builder", - "clap_derive 4.4.2", + "clap_derive 4.4.7", ] [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.1", + "clap_lex 0.6.0", "strsim", "terminal_size", ] @@ -2800,7 +2533,7 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", ] [[package]] @@ -2818,14 +2551,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2839,9 +2572,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "coarsetime" @@ -2866,83 +2599,10 @@ dependencies = [ ] [[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", - "log", - "pallet-alliance", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-collective", - "pallet-collective-content", - "pallet-core-fellowship", - "pallet-message-queue", - "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", - "parachains-common", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-runtime-common", - "scale-info", - "smallvec", - "sp-api", - "sp-arithmetic", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "staging-parachain-info", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "substrate-wasm-builder", -] - -[[package]] name = "collectives-westend-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", @@ -3065,7 +2725,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#edd1e90b847e560bf60fc2e8712235ccfa11a9a9" +source = "git+https://github.com/w3f/ring-proof#61e7b528bc0170d6bf541be32440d569b784425d" dependencies = [ "ark-ec", "ark-ff", @@ -3073,6 +2733,7 @@ dependencies = [ "ark-serialize", "ark-std", "fflonk", + "getrandom_or_panic", "merlin 3.0.0", "rand_chacha 0.3.1", ] @@ -3183,7 +2844,6 @@ dependencies = [ "pallet-balances", "pallet-collator-selection", "pallet-contracts", - "pallet-contracts-primitives", "pallet-insecure-randomness-collective-flip", "pallet-message-queue", "pallet-multisig", @@ -3449,7 +3109,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.6", + "clap 4.4.10", "criterion-plot", "futures", "is-terminal", @@ -3624,7 +3284,7 @@ dependencies = [ name = "cumulus-client-cli" version = "0.1.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "parity-scale-codec", "sc-chain-spec", "sc-cli", @@ -3845,6 +3505,7 @@ dependencies = [ "cumulus-client-network", "cumulus-client-pov-recovery", "cumulus-primitives-core", + "cumulus-primitives-proof-size-hostfunction", "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", "cumulus-relay-chain-minimal-node", @@ -3914,6 +3575,7 @@ dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-primitives-proof-size-hostfunction", "cumulus-test-client", "cumulus-test-relay-sproof-builder", "environmental", @@ -3945,16 +3607,17 @@ dependencies = [ "sp-version", "staging-xcm", "trie-db", + "trie-standardmap", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4094,6 +3757,18 @@ dependencies = [ ] [[package]] +name = "cumulus-primitives-proof-size-hostfunction" +version = "0.1.0" +dependencies = [ + "sp-core", + "sp-externalities 0.19.0", + "sp-io", + "sp-runtime-interface 17.0.0", + "sp-state-machine", + "sp-trie", +] + +[[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" dependencies = [ @@ -4179,11 +3854,13 @@ dependencies = [ "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "futures", + "parking_lot 0.12.1", "polkadot-availability-recovery", "polkadot-collator-protocol", "polkadot-core-primitives", "polkadot-network-bridge", "polkadot-node-collation-generation", + "polkadot-node-core-chain-api", "polkadot-node-core-prospective-parachains", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", @@ -4191,16 +3868,19 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-authority-discovery", + "sc-client-api", "sc-network", "sc-network-common", "sc-service", "sc-tracing", "sc-utils", "sp-api", + "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-runtime", "substrate-prometheus-endpoint", + "tokio", "tracing", ] @@ -4234,6 +3914,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-storage 13.0.0", + "sp-version", "thiserror", "tokio", "tokio-util", @@ -4247,6 +3928,7 @@ version = "0.1.0" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-primitives-proof-size-hostfunction", "cumulus-test-relay-sproof-builder", "cumulus-test-runtime", "cumulus-test-service", @@ -4323,7 +4005,7 @@ name = "cumulus-test-service" version = "0.1.0" dependencies = [ "async-trait", - "clap 4.4.6", + "clap 4.4.10", "criterion 0.5.1", "cumulus-client-cli", "cumulus-client-consensus-common", @@ -4446,7 +4128,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4486,7 +4168,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4503,7 +4185,7 @@ checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4802,7 +4484,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4814,7 +4496,7 @@ checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" [[package]] name = "dleq_vrf" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=cbc342e#cbc342e95d3cbcd3c5ba8d45af7200eb58e63502" +source = "git+https://github.com/w3f/ring-vrf?rev=2019248#2019248785389b3246d55b1c3b0e9bdef4454cb7" dependencies = [ "ark-ec", "ark-ff", @@ -4824,7 +4506,6 @@ dependencies = [ "ark-std", "ark-transcript", "arrayvec 0.7.4", - "rand_core 0.6.4", "zeroize", ] @@ -4864,7 +4545,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.38", + "syn 2.0.39", "termcolor", "toml 0.7.6", "walkdir", @@ -4953,15 +4634,16 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek 4.0.0", "ed25519", "rand_core 0.6.4", "serde", "sha2 0.10.7", + "subtle 2.4.1", "zeroize", ] @@ -5119,7 +4801,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5130,7 +4812,17 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", +] + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "log", + "regex", ] [[package]] @@ -5148,9 +4840,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -5275,7 +4967,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5333,7 +5025,7 @@ checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd" dependencies = [ "expander 0.0.4", "indexmap 1.9.3", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -5342,11 +5034,12 @@ dependencies = [ [[package]] name = "fdlimit" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b" +checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5" dependencies = [ "libc", + "thiserror", ] [[package]] @@ -5388,7 +5081,7 @@ dependencies = [ [[package]] name = "fflonk" version = "0.1.0" -source = "git+https://github.com/w3f/fflonk#26a5045b24e169cffc1f9328ca83d71061145c40" +source = "git+https://github.com/w3f/fflonk#1beb0585e1c8488956fac7f05da061f9b41e8948" dependencies = [ "ark-ec", "ark-ff", @@ -5410,7 +5103,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ - "env_logger 0.10.0", + "env_logger 0.10.1", "log", ] @@ -5595,7 +5288,7 @@ dependencies = [ "Inflector", "array-bytes 6.1.0", "chrono", - "clap 4.4.6", + "clap 4.4.10", "comfy-table", "frame-benchmarking", "frame-support", @@ -5656,12 +5349,12 @@ dependencies = [ "frame-election-provider-support", "frame-support", "parity-scale-codec", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "scale-info", "sp-arithmetic", - "syn 2.0.38", + "syn 2.0.39", "trybuild", ] @@ -5687,7 +5380,7 @@ dependencies = [ name = "frame-election-solution-type-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "frame-election-provider-solution-type", "frame-election-provider-support", "frame-support", @@ -5813,7 +5506,7 @@ dependencies = [ "proc-macro2", "quote", "sp-core-hashing", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5821,10 +5514,10 @@ name = "frame-support-procedural-tools" version = "4.0.0-dev" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5833,7 +5526,7 @@ version = "3.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5904,6 +5597,7 @@ version = "4.0.0-dev" dependencies = [ "cfg-if", "criterion 0.4.0", + "docify", "frame-support", "log", "parity-scale-codec", @@ -5973,9 +5667,9 @@ dependencies = [ [[package]] name = "fs4" -version = "0.6.6" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" +checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7" dependencies = [ "rustix 0.38.21", "windows-sys 0.48.0", @@ -6065,7 +5759,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6190,6 +5884,16 @@ dependencies = [ ] [[package]] +name = "getrandom_or_panic" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" +dependencies = [ + "rand 0.8.5", + "rand_core 0.6.4", +] + +[[package]] name = "ghash" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6246,51 +5950,6 @@ dependencies = [ ] [[package]] -name = "glutton-runtime" -version = "1.0.0" -dependencies = [ - "cumulus-pallet-aura-ext", - "cumulus-pallet-parachain-system", - "cumulus-pallet-xcm", - "cumulus-primitives-aura", - "cumulus-primitives-core", - "cumulus-primitives-timestamp", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "pallet-aura", - "pallet-glutton", - "pallet-message-queue", - "pallet-sudo", - "pallet-timestamp", - "parachains-common", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "staging-parachain-info", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "substrate-wasm-builder", -] - -[[package]] name = "glutton-westend-runtime" version = "1.0.0" dependencies = [ @@ -7090,7 +6749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" dependencies = [ "heck", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -7214,7 +6873,6 @@ dependencies = [ "pallet-child-bounties", "pallet-collective", "pallet-contracts", - "pallet-contracts-primitives", "pallet-conviction-voting", "pallet-core-fellowship", "pallet-democracy", @@ -7408,6 +7066,17 @@ dependencies = [ ] [[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] name = "libloading" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7495,7 +7164,7 @@ dependencies = [ "libp2p-identity", "log", "multiaddr", - "multihash", + "multihash 0.17.0", "multistream-select", "once_cell", "parking_lot 0.12.1", @@ -7555,7 +7224,7 @@ dependencies = [ "ed25519-dalek", "log", "multiaddr", - "multihash", + "multihash 0.17.0", "quick-protobuf", "rand 0.8.5", "sha2 0.10.7", @@ -7802,7 +7471,7 @@ dependencies = [ "libp2p-identity", "libp2p-noise", "log", - "multihash", + "multihash 0.17.0", "quick-protobuf", "quick-protobuf-codec", "rand 0.8.5", @@ -8094,7 +7763,7 @@ dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -8108,7 +7777,7 @@ dependencies = [ "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -8119,7 +7788,7 @@ checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -8130,7 +7799,7 @@ checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -8181,9 +7850,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memfd" @@ -8299,7 +7968,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" name = "minimal-node" version = "4.0.0-dev" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "frame", "futures", "futures-timer", @@ -8469,7 +8138,7 @@ dependencies = [ "data-encoding", "log", "multibase", - "multihash", + "multihash 0.17.0", "percent-encoding", "serde", "static_assertions", @@ -8499,19 +8168,87 @@ dependencies = [ "blake3", "core2", "digest 0.10.7", - "multihash-derive", + "multihash-derive 0.8.0", "sha2 0.10.7", "sha3", "unsigned-varint", ] [[package]] +name = "multihash" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" +dependencies = [ + "core2", + "digest 0.10.7", + "multihash-derive 0.8.0", + "sha2 0.10.7", + "unsigned-varint", +] + +[[package]] +name = "multihash" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" +dependencies = [ + "core2", + "unsigned-varint", +] + +[[package]] +name = "multihash-codetable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d815ecb3c8238d00647f8630ede7060a642c9f704761cd6082cb4028af6935" +dependencies = [ + "blake2b_simd", + "blake2s_simd", + "blake3", + "core2", + "digest 0.10.7", + "multihash-derive 0.9.0", + "ripemd", + "serde", + "sha1", + "sha2 0.10.7", + "sha3", + "strobe-rs", +] + +[[package]] name = "multihash-derive" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "multihash-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "890e72cb7396cb99ed98c1246a97b243cc16394470d94e0bc8b0c2c11d84290e" +dependencies = [ + "core2", + "multihash 0.19.1", + "multihash-derive-impl", +] + +[[package]] +name = "multihash-derive-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38685e08adb338659871ecfc6ee47ba9b22dcc8abcf6975d379cc49145c3040" +dependencies = [ + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -8705,7 +8442,7 @@ name = "node-bench" version = "0.9.0-dev" dependencies = [ "array-bytes 6.1.0", - "clap 4.4.6", + "clap 4.4.10", "derive_more", "fs_extra", "futures", @@ -8780,7 +8517,7 @@ dependencies = [ name = "node-runtime-generate-bags" version = "3.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "generate-bags", "kitchensink-runtime", ] @@ -8789,7 +8526,7 @@ dependencies = [ name = "node-template" version = "4.0.0-dev" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "frame-benchmarking", "frame-benchmarking-cli", "frame-system", @@ -8833,14 +8570,14 @@ dependencies = [ name = "node-template-release" version = "3.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "flate2", "fs_extra", "glob", "itertools 0.10.5", "tar", "tempfile", - "toml_edit", + "toml_edit 0.19.14", ] [[package]] @@ -8914,7 +8651,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-timestamp", - "staging-node-executor", + "staging-node-cli", "substrate-test-client", "tempfile", ] @@ -9155,7 +8892,7 @@ dependencies = [ "itertools 0.11.0", "layout-rs", "petgraph", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -9755,8 +9492,8 @@ dependencies = [ "pallet-assets", "pallet-balances", "pallet-contracts-fixtures", - "pallet-contracts-primitives", "pallet-contracts-proc-macro", + "pallet-contracts-uapi", "pallet-insecure-randomness-collective-flip", "pallet-message-queue", "pallet-proxy", @@ -9787,12 +9524,22 @@ dependencies = [ name = "pallet-contracts-fixtures" version = "1.0.0" dependencies = [ + "anyhow", + "cfg-if", "frame-system", + "parity-wasm", "sp-runtime", + "tempfile", + "toml 0.8.8", + "twox-hash", "wat", ] [[package]] +name = "pallet-contracts-fixtures-common" +version = "1.0.0" + +[[package]] name = "pallet-contracts-mock-network" version = "1.0.0" dependencies = [ @@ -9803,8 +9550,8 @@ dependencies = [ "pallet-balances", "pallet-contracts", "pallet-contracts-fixtures", - "pallet-contracts-primitives", "pallet-contracts-proc-macro", + "pallet-contracts-uapi", "pallet-insecure-randomness-collective-flip", "pallet-message-queue", "pallet-proxy", @@ -9831,24 +9578,22 @@ dependencies = [ ] [[package]] -name = "pallet-contracts-primitives" -version = "24.0.0" +name = "pallet-contracts-proc-macro" +version = "4.0.0-dev" dependencies = [ - "bitflags 1.3.2", - "parity-scale-codec", - "scale-info", - "sp-runtime", - "sp-std 8.0.0", - "sp-weights", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] -name = "pallet-contracts-proc-macro" +name = "pallet-contracts-uapi" version = "4.0.0-dev" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", + "bitflags 1.3.2", + "parity-scale-codec", + "paste", + "scale-info", ] [[package]] @@ -10407,6 +10152,7 @@ dependencies = [ "pallet-nfts", "parity-scale-codec", "sp-api", + "sp-std 8.0.0", ] [[package]] @@ -10779,6 +10525,7 @@ dependencies = [ name = "pallet-safe-mode" version = "4.0.0-dev" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -10812,6 +10559,24 @@ dependencies = [ ] [[package]] +name = "pallet-sassafras" +version = "0.3.5-dev" +dependencies = [ + "array-bytes 6.1.0", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-consensus-sassafras", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 8.0.0", +] + +[[package]] name = "pallet-scheduler" version = "4.0.0-dev" dependencies = [ @@ -10956,11 +10721,11 @@ dependencies = [ name = "pallet-staking-reward-curve" version = "4.0.0-dev" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "sp-runtime", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -11182,6 +10947,7 @@ dependencies = [ name = "pallet-tx-pause" version = "4.0.0-dev" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -11318,6 +11084,31 @@ dependencies = [ ] [[package]] +name = "pallet-xcm-bridge-hub" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-messages", + "bp-runtime", + "bp-xcm-bridge-hub", + "bridge-runtime-common", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "pallet-bridge-messages", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] name = "pallet-xcm-bridge-hub-router" version = "0.1.0" dependencies = [ @@ -11340,7 +11131,7 @@ dependencies = [ name = "parachain-template-node" version = "0.1.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "color-print", "cumulus-client-cli", "cumulus-client-collator", @@ -11521,9 +11312,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8" +checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f" dependencies = [ "blake2 0.10.6", "crc32fast", @@ -11541,9 +11332,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.4" +version = "3.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8e946cc0cc711189c0b0249fb8b599cbeeab9784d83c415719368bb8d4ac64" +checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -11556,11 +11347,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.4" +version = "3.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a296c3079b5fefbc499e1de58dc26c09b1b9a5952d26694ee89f04a43ebbb3e" +checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -11728,6 +11519,7 @@ dependencies = [ "serde_json", "sp-core", "sp-runtime", + "westend-emulated-chain", ] [[package]] @@ -11827,7 +11619,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -11868,7 +11660,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -11951,7 +11743,7 @@ dependencies = [ [[package]] name = "polkadot" -version = "1.4.0" +version = "1.5.0" dependencies = [ "assert_cmd", "color-eyre", @@ -12089,7 +11881,8 @@ dependencies = [ name = "polkadot-cli" version = "1.1.0" dependencies = [ - "clap 4.4.6", + "cfg-if", + "clap 4.4.10", "frame-benchmarking-cli", "futures", "log", @@ -12215,6 +12008,7 @@ dependencies = [ "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-util", "polkadot-primitives", + "quickcheck", "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", @@ -12431,6 +12225,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", + "polkadot-node-subsystem-types", "polkadot-primitives", "sc-client-api", "sc-consensus-babe", @@ -12555,6 +12350,7 @@ version = "1.0.0" dependencies = [ "always-assert", "assert_matches", + "blake3", "cfg-if", "criterion 0.4.0", "futures", @@ -12578,6 +12374,7 @@ dependencies = [ "rand 0.8.5", "rococo-runtime", "rusty-fork", + "sc-sysinfo", "slotmap", "sp-core", "sp-maybe-compressed-blob", @@ -12585,6 +12382,7 @@ dependencies = [ "tempfile", "test-parachain-adder", "test-parachain-halt", + "thiserror", "tokio", "tracing-gum", ] @@ -12633,6 +12431,7 @@ dependencies = [ "sp-externalities 0.19.0", "sp-io", "sp-tracing 10.0.0", + "substrate-build-script-utils", "tempfile", "thiserror", "tracing-gum", @@ -12657,6 +12456,7 @@ dependencies = [ name = "polkadot-node-core-pvf-prepare-worker" version = "1.0.0" dependencies = [ + "blake3", "cfg-if", "criterion 0.4.0", "libc", @@ -12835,7 +12635,9 @@ dependencies = [ "smallvec", "sp-api", "sp-authority-discovery", + "sp-blockchain", "sp-consensus-babe", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -12911,20 +12713,15 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.4.0" +version = "1.5.0" dependencies = [ "assert_cmd", - "asset-hub-kusama-runtime", - "asset-hub-polkadot-runtime", "asset-hub-rococo-runtime", "asset-hub-westend-runtime", "async-trait", - "bridge-hub-kusama-runtime", - "bridge-hub-polkadot-runtime", "bridge-hub-rococo-runtime", "bridge-hub-westend-runtime", - "clap 4.4.6", - "collectives-polkadot-runtime", + "clap 4.4.10", "collectives-westend-runtime", "color-print", "contracts-rococo-runtime", @@ -12941,14 +12738,18 @@ dependencies = [ "cumulus-relay-chain-interface", "frame-benchmarking", "frame-benchmarking-cli", + "frame-support", + "frame-system-rpc-runtime-api", + "frame-try-runtime", "futures", - "glutton-runtime", "glutton-westend-runtime", "hex-literal", "jsonrpsee", "log", "nix 0.26.2", + "pallet-transaction-payment", "pallet-transaction-payment-rpc", + "pallet-transaction-payment-rpc-runtime-api", "parachains-common", "parity-scale-codec", "penpal-runtime", @@ -12980,14 +12781,18 @@ dependencies = [ "sp-blockchain", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", + "sp-inherents", "sp-io", "sp-keystore", "sp-offchain", "sp-runtime", "sp-session", + "sp-std 8.0.0", "sp-timestamp", "sp-tracing 10.0.0", "sp-transaction-pool", + "sp-version", "staging-xcm", "substrate-build-script-utils", "substrate-frame-rpc-system", @@ -13207,6 +13012,45 @@ dependencies = [ ] [[package]] +name = "polkadot-sdk-docs" +version = "0.0.1" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-parachain-system", + "docify", + "frame", + "kitchensink-runtime", + "pallet-aura", + "pallet-default-config-example", + "pallet-examples", + "pallet-timestamp", + "parity-scale-codec", + "sc-cli", + "sc-client-db", + "sc-consensus-aura", + "sc-consensus-babe", + "sc-consensus-beefy", + "sc-consensus-grandpa", + "sc-consensus-manual-seal", + "sc-consensus-pow", + "sc-network", + "sc-rpc", + "sc-rpc-api", + "scale-info", + "simple-mermaid", + "sp-api", + "sp-core", + "sp-io", + "sp-keyring", + "sp-runtime", + "staging-chain-spec-builder", + "staging-node-cli", + "staging-parachain-info", + "subkey", + "substrate-wasm-builder", +] + +[[package]] name = "polkadot-service" version = "1.0.0" dependencies = [ @@ -13232,6 +13076,7 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "parity-db", "parity-scale-codec", + "parking_lot 0.12.1", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", @@ -13347,7 +13192,6 @@ dependencies = [ "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", @@ -13409,7 +13253,7 @@ version = "1.0.0" dependencies = [ "assert_matches", "async-trait", - "clap 4.4.6", + "clap 4.4.10", "color-eyre", "futures", "futures-timer", @@ -13556,7 +13400,7 @@ dependencies = [ name = "polkadot-voter-bags" version = "1.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "generate-bags", "sp-io", "westend-runtime", @@ -13734,7 +13578,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -13775,7 +13619,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.14", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", ] [[package]] @@ -13816,7 +13669,7 @@ checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -13888,7 +13741,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -14030,6 +13883,8 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ + "env_logger 0.8.4", + "log", "rand 0.8.5", ] @@ -14239,6 +14094,15 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] name = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -14279,7 +14143,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -14296,14 +14160,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", - "regex-syntax 0.7.4", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -14320,10 +14184,16 @@ name = "regex-automata" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.8.2", ] [[package]] @@ -14334,15 +14204,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "remote-ext-tests-bags-list" version = "1.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "frame-system", "log", "pallet-bags-list-remote-tests", @@ -14426,7 +14296,7 @@ dependencies = [ [[package]] name = "ring" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#edd1e90b847e560bf60fc2e8712235ccfa11a9a9" +source = "git+https://github.com/w3f/ring-proof#61e7b528bc0170d6bf541be32440d569b784425d" dependencies = [ "ark-ec", "ark-ff", @@ -14455,6 +14325,15 @@ dependencies = [ ] [[package]] +name = "ripemd" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +dependencies = [ + "digest 0.10.7", +] + +[[package]] name = "rle-decode-fast" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -14509,6 +14388,7 @@ dependencies = [ "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-ping", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-utility", "frame-benchmarking", @@ -15008,7 +14888,8 @@ dependencies = [ "ip_network", "libp2p", "log", - "multihash", + "multihash 0.18.1", + "multihash-codetable", "parity-scale-codec", "prost", "prost-build", @@ -15065,6 +14946,7 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", + "sp-trie", "substrate-test-runtime-client", ] @@ -15100,10 +14982,10 @@ dependencies = [ name = "sc-chain-spec-derive" version = "4.0.0-dev" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -15113,7 +14995,7 @@ dependencies = [ "array-bytes 6.1.0", "bip39", "chrono", - "clap 4.4.6", + "clap 4.4.10", "fdlimit", "futures", "futures-timer", @@ -15685,6 +15567,7 @@ dependencies = [ "array-bytes 4.2.0", "arrayvec 0.7.4", "blake2 0.10.6", + "bytes", "futures", "futures-timer", "libp2p-identity", @@ -15750,6 +15633,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", + "tokio-stream", "tokio-test", "tokio-util", "unsigned-varint", @@ -15805,10 +15689,12 @@ name = "sc-network-gossip" version = "0.10.0-dev" dependencies = [ "ahash 0.8.3", + "async-trait", "futures", "futures-timer", "libp2p", "log", + "parity-scale-codec", "quickcheck", "sc-network", "sc-network-common", @@ -16095,6 +15981,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", + "sp-externalities 0.19.0", "sp-maybe-compressed-blob", "sp-rpc", "sp-runtime", @@ -16252,7 +16139,7 @@ dependencies = [ name = "sc-storage-monitor" version = "0.1.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "fs4", "log", "sc-client-db", @@ -16328,6 +16215,7 @@ dependencies = [ "lazy_static", "libc", "log", + "parity-scale-codec", "parking_lot 0.12.1", "regex", "rustc-hash", @@ -16350,10 +16238,10 @@ dependencies = [ name = "sc-tracing-proc-macro" version = "4.0.0-dev" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -16440,7 +16328,7 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -16583,18 +16471,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.24.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" +checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.6.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" +checksum = "09e67c467c38fd24bd5499dc9a18183b31575c12ee549197e3e20d57aa4fe3b7" dependencies = [ "cc", ] @@ -16707,22 +16595,22 @@ checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -16747,9 +16635,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -16788,7 +16676,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -17224,10 +17112,10 @@ dependencies = [ "assert_matches", "blake2 0.10.6", "expander 2.0.0", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -17535,6 +17423,16 @@ dependencies = [ ] [[package]] +name = "sp-core-fuzz" +version = "0.0.0" +dependencies = [ + "lazy_static", + "libfuzzer-sys", + "regex", + "sp-core", +] + +[[package]] name = "sp-core-hashing" version = "9.0.0" dependencies = [ @@ -17552,7 +17450,7 @@ version = "9.0.0" dependencies = [ "quote", "sp-core-hashing", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -17578,7 +17476,7 @@ dependencies = [ [[package]] name = "sp-crypto-ec-utils" version = "0.4.1" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "ark-bls12-377", "ark-bls12-377-ext", @@ -17610,17 +17508,17 @@ version = "8.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "sp-debug-derive" version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -17636,7 +17534,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.19.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "environmental", "parity-scale-codec", @@ -17780,7 +17678,7 @@ dependencies = [ name = "sp-npos-elections-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "honggfuzz", "rand 0.8.5", "sp-npos-elections", @@ -17819,6 +17717,7 @@ dependencies = [ name = "sp-runtime" version = "24.0.0" dependencies = [ + "docify", "either", "hash256-std-hasher", "impl-trait-for-tuples", @@ -17829,6 +17728,7 @@ dependencies = [ "scale-info", "serde", "serde_json", + "simple-mermaid", "sp-api", "sp-application-crypto", "sp-arithmetic", @@ -17868,7 +17768,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -17888,22 +17788,23 @@ name = "sp-runtime-interface-proc-macro" version = "11.0.0" dependencies = [ "Inflector", - "proc-macro-crate", + "expander 2.0.0", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "Inflector", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -18025,7 +17926,7 @@ version = "8.0.0" [[package]] name = "sp-std" version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" [[package]] name = "sp-storage" @@ -18042,7 +17943,7 @@ dependencies = [ [[package]] name = "sp-storage" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "impl-serde", "parity-scale-codec", @@ -18091,7 +17992,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "10.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "parity-scale-codec", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)", @@ -18140,6 +18041,7 @@ dependencies = [ "scale-info", "schnellru", "sp-core", + "sp-externalities 0.19.0", "sp-runtime", "sp-std 8.0.0", "thiserror", @@ -18174,7 +18076,7 @@ dependencies = [ "proc-macro2", "quote", "sp-version", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -18192,7 +18094,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -18206,12 +18108,12 @@ dependencies = [ name = "sp-weights" version = "20.0.0" dependencies = [ + "bounded-collections", "parity-scale-codec", "scale-info", "serde", "smallvec", "sp-arithmetic", - "sp-core", "sp-debug-derive 8.0.0", "sp-std 8.0.0", ] @@ -18284,18 +18186,11 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" name = "staging-chain-spec-builder" version = "2.0.0" dependencies = [ - "ansi_term", - "clap 4.4.6", - "kitchensink-runtime", + "clap 4.4.10", "log", - "rand 0.8.5", "sc-chain-spec", - "sc-keystore", "serde_json", - "sp-core", - "sp-keystore", "sp-tracing 10.0.0", - "staging-node-cli", ] [[package]] @@ -18304,10 +18199,12 @@ version = "3.0.0-dev" dependencies = [ "array-bytes 6.1.0", "assert_cmd", - "clap 4.4.6", + "clap 4.4.10", "clap_complete", "criterion 0.4.0", + "frame-benchmarking", "frame-benchmarking-cli", + "frame-support", "frame-system", "frame-system-rpc-runtime-api", "futures", @@ -18317,13 +18214,20 @@ dependencies = [ "nix 0.26.2", "node-primitives", "node-rpc", + "node-testing", "pallet-asset-conversion-tx-payment", "pallet-asset-tx-payment", "pallet-assets", "pallet-balances", + "pallet-contracts", + "pallet-glutton", "pallet-im-online", + "pallet-root-testing", "pallet-skip-feeless-payment", + "pallet-sudo", "pallet-timestamp", + "pallet-transaction-payment", + "pallet-treasury", "parity-scale-codec", "platforms", "rand 0.8.5", @@ -18358,27 +18262,31 @@ dependencies = [ "sc-telemetry", "sc-transaction-pool", "sc-transaction-pool-api", + "scale-info", "serde", "serde_json", "soketto", "sp-api", + "sp-application-crypto", "sp-authority-discovery", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-grandpa", "sp-core", + "sp-externalities 0.19.0", "sp-inherents", "sp-io", "sp-keyring", "sp-keystore", "sp-mixnet", "sp-runtime", + "sp-state-machine", "sp-statement-store", "sp-timestamp", "sp-tracing 10.0.0", "sp-transaction-storage-proof", - "staging-node-executor", + "sp-trie", "staging-node-inspect", "substrate-build-script-utils", "substrate-cli-test-utils", @@ -18389,44 +18297,6 @@ dependencies = [ "tokio-util", "try-runtime-cli", "wait-timeout", -] - -[[package]] -name = "staging-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", - "serde_json", - "sp-application-crypto", - "sp-consensus-babe", - "sp-core", - "sp-externalities 0.19.0", - "sp-keyring", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-statement-store", - "sp-tracing 10.0.0", - "sp-trie", "wat", ] @@ -18434,14 +18304,16 @@ dependencies = [ name = "staging-node-inspect" version = "0.9.0-dev" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "parity-scale-codec", "sc-cli", "sc-client-api", "sc-service", "sp-blockchain", "sp-core", + "sp-io", "sp-runtime", + "sp-statement-store", "thiserror", ] @@ -18591,6 +18463,19 @@ dependencies = [ ] [[package]] +name = "strobe-rs" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabb238a1cccccfa4c4fb703670c0d157e1256c1ba695abf1b93bd2bb14bab2d" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "keccak", + "subtle 2.4.1", + "zeroize", +] + +[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -18641,28 +18526,8 @@ dependencies = [ name = "subkey" version = "3.0.0" dependencies = [ - "clap 4.4.6", - "sc-cli", -] - -[[package]] -name = "substrate" -version = "1.0.0" -dependencies = [ - "frame-support", - "sc-chain-spec", + "clap 4.4.10", "sc-cli", - "sc-consensus-aura", - "sc-consensus-babe", - "sc-consensus-beefy", - "sc-consensus-grandpa", - "sc-consensus-manual-seal", - "sc-consensus-pow", - "sc-service", - "simple-mermaid", - "sp-runtime", - "staging-chain-spec-builder", - "subkey", ] [[package]] @@ -18703,7 +18568,7 @@ dependencies = [ name = "substrate-frame-cli" version = "4.0.0-dev" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "frame-support", "frame-system", "sc-cli", @@ -19058,9 +18923,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -19125,13 +18990,13 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand 2.0.0", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -19178,7 +19043,7 @@ dependencies = [ name = "test-parachain-adder-collator" version = "1.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "futures", "futures-timer", "log", @@ -19226,7 +19091,7 @@ dependencies = [ name = "test-parachain-undying-collator" version = "1.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "futures", "futures-timer", "log", @@ -19293,9 +19158,9 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] @@ -19322,13 +19187,13 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -19500,7 +19365,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -19594,14 +19459,26 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.14", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -19620,6 +19497,30 @@ dependencies = [ ] [[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.0.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] name = "tower" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -19681,14 +19582,14 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -19720,10 +19621,10 @@ version = "1.0.0" dependencies = [ "assert_matches", "expander 2.0.0", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -19876,7 +19777,7 @@ version = "0.10.0-dev" dependencies = [ "assert_cmd", "async-trait", - "clap 4.4.6", + "clap 4.4.10", "frame-remote-externalities", "frame-try-runtime", "hex", @@ -20278,7 +20179,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] @@ -20312,7 +20213,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -21467,6 +21368,7 @@ dependencies = [ "frame-support", "frame-system", "futures", + "pallet-transaction-payment", "pallet-xcm", "parity-scale-codec", "polkadot-test-client", @@ -21488,7 +21390,8 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.38", + "staging-xcm", + "syn 2.0.39", "trybuild", ] @@ -21608,7 +21511,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index e1b042aadbb63..d46117edc1dab 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -11,13 +11,15 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; - rev = "v${version}"; - hash = "sha256-Tblknr9nU6X4lKMW8ZPOo7jZ/MoE8e8G58NnLITzhxY="; + # NOTE: temporary tag with fix for building with nix + # `-nix` suffix should be removed in the next release + rev = "polkadot-v${version}-nix"; + hash = "sha256-pjny1aw9l2m9t8VyUB+EaQaPtYPypC6WqOwAco1kxNU="; # 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. @@ -41,12 +43,12 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ark-secret-scalar-0.0.2" = "sha256-rnU9+rf0POv4GuxKUp9Wv4/eNXi5gfGq+XhJLxpmSzU="; - "common-0.1.0" = "sha256-ru++KG2ZZqa/wDGnKF/VfWnazHRSpOAD0WYb7rHlpCU="; - "fflonk-0.1.0" = "sha256-MNvlePHQdY8DiOq6w7Hc1pgn7G58GDTeghCKHJdUy7E="; + "ark-secret-scalar-0.0.2" = "sha256-ytwKeUkiXIcwJLo9wpWSIjL4LBZJDbeED5Yqxso9l74="; + "common-0.1.0" = "sha256-9vTJNKsL6gK8MM8dUKrShEvL9Ac9YQg1q8iVE9+deak="; + "fflonk-0.1.0" = "sha256-PC7eJEOo/RN9Gk27CcTIyGMA9XZeFAJkO2FK02JVzN0="; "simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w="; "sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8="; - "sp-crypto-ec-utils-0.4.1" = "sha256-cv2mr5K6mAKiACVzS7mPOIpoyt8iUfGZXsqVuiGXbL0="; + "sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI="; }; }; @@ -69,6 +71,10 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + # NOTE: disable building `core`/`std` in wasm environment since rust-src isn't + # available for `rustc-wasm32` + WASM_BUILD_STD = 0; + # 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"; diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index 8513eb6de413b..a60f414bf1237 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "snarkos"; - version = "2.2.4"; + version = "2.2.7"; src = fetchFromGitHub { owner = "AleoHQ"; repo = "snarkOS"; rev = "v${version}"; - sha256 = "sha256-sq99lJqSJ436wdSjdOlooGD2PysZzbyb7hTfJ9OUg/U="; + sha256 = "sha256-+z9dgg5HdR+Gomug03gI1zdCU6t4SBHkl1Pxoq69wrc="; }; - cargoHash = "sha256-0x/YKPLh5yf3y/CjrQF18yDfPJ8IlArVVczgyVPzpEI="; + cargoHash = "sha256-qW/ZV4JqpNqqh8BYc+/d5g8junwhdZ38NhHclx+k/0M="; # buildAndTestSubdir = "cli"; diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index be6b93407ab39..32b8066ff42ec 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -21,11 +21,11 @@ let pname = "sparrow"; - version = "1.7.9"; + version = "1.8.1"; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; - sha256 = "0bz8mx6mszqadx7nlb4ini45r2r57grdgmrq6k9lxgrgcpd8gasy"; + sha256 = "sha256-dpYGMclYMjxjUbIcSZ7V54I1LTVfHxAKH9+7CaprD4U="; }; launcher = writeScript "sparrow" '' diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index 3e7fb1ae5f327..a65a1428df0e1 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -9,17 +9,18 @@ , openssl , readline , zlib +, nix-update-script }: stdenv.mkDerivation rec { pname = "ton"; - version = "2023.06"; + version = "2023.10"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - sha256 = "sha256-mDYuOokCGS1sDP6fHDXhGboDjn4JeyA5ea4/6RRt9x4="; + sha256 = "sha256-K1RhhW7EvwYV7/ng3NPjSGdHEQvJZ7K97YXd7s5wghc="; fetchSubmodules = true; }; @@ -39,6 +40,8 @@ stdenv.mkDerivation rec { zlib ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "A fully decentralized layer-1 blockchain designed by Telegram"; homepage = "https://ton.org/"; diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index bff5cad84e4f9..3e1ddcb1ae77a 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "23.10.1"; + version = "23.12.3"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-MR9BYg6R+Oof3zh02KSh48V2m6J7JpsrYpi6gj5kTvKuCU5Ci5AwPEAvnTjHAR6xlappvoNQmeA5nCEoTWaL7A=="; - x86_64-linux = "sha512-BqdfhYLG4z+9B7KbJGWGPml7U2fl/RQ1nZK0vdeA/cKhG0SjH0K8er9bemg60RPBXj0AeuK80v/6vMbDtyEnRQ=="; + aarch64-linux = "sha512-miD4SzLzETW+2cLj2VwRy9ZuL8nTw8kKG1uU9EmLRJPukyhY9Od3yeMmxztEafodqE7wv6TxEx4Fi/XIbyC2lQ=="; + x86_64-linux = "sha512-IZZmRaWU0POy+Ufx6Ct4/fLzRy+NbSmI+YqdMZd9uTUh0jhPf3BQ2JLwANlUUFZzM+USSTUCjFl0PQ4QQpjI6Q=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix index d49689255b983..feec201a1c0e2 100644 --- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - sha256 = "sha256-2iwH8npCfo4z1K4WQNP2Pd32PJTkCX/rT0+1RTrBO8E="; + sha256 = "sha256-fbdoYnnMu2YT2gdA1s523kzucc3MG0Pw/hyAYtsy+dY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 26dded34fefd3..2cd1dff33c729 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -222,9 +222,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ alapshin ]; - beta = [ alapshin ]; - canary = [ alapshin ]; + stable = [ alapshin msfjarvis ]; + beta = [ alapshin msfjarvis ]; + canary = [ alapshin msfjarvis ]; dev = canary; }."${channel}"; mainProgram = pname; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ec5bc924f0caf..82519e494452a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,16 +10,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2022.3.1.20"; # "Android Studio Giraffe (2022.3.1) Patch 2" - sha256Hash = "sha256-IkxOt6DI4cBPUOztEBNJV0DHGruJjVdJ0skxcue+rdg="; + version = "2023.1.1.26"; # "Android Studio Hedgehog | 2023.1.1" + sha256Hash = "sha256-l36KmFVBT31BFX8L4OEPt0DEK9M392PV2Ws+BZeAZj0="; }; betaVersion = { - version = "2023.1.1.25"; # "Android Studio Hedgehog | 2023.1.1 RC 3" - sha256Hash = "sha256-jOqTAHYAk8j9+Ir01TLBsp20u7/iBKV8T/joZLITDs4="; + version = "2023.2.1.19"; # "Android Studio Iguana | 2023.2.1 Beta 1" + sha256Hash = "sha256-lfJBX7RLIziiuv805+gdt8xfJkFjy0bSh77/bjkNFH4="; }; latestVersion = { - version = "2023.2.1.14"; # "Android Studio Iguana | 2023.2.1 Canary 14" - sha256Hash = "sha256-8szERftch1JWJ66BclJBq5DZcH1Xf1cyVj08WknLoS8="; + version = "2023.2.1.18"; # "Android Studio Iguana | 2023.2.1 Canary 18" + sha256Hash = "sha256-QvyA/1IvqIgGkBWryY0Q7LqGA6I1f9Xn8GA1g19jt+w="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 36415d076d9d8..92d8771383dc6 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -14,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "aseprite"; - version = "1.2.40"; + version = "1.3.2"; src = fetchFromGitHub { owner = "aseprite"; repo = "aseprite"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-KUdJA6HTAKrLT8xrwFikVDbc5RODysclcsEyQekMRZo="; + hash = "sha256-8PXqMDf2ATxmtFqyZlGip+DhGrdK8M6Ztte7fGH6Fmo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index a90cfba529fb6..32dc84f33a699 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://www.bluej.org/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2ClasspathPlus; - mainProgram = pname; + mainProgram = "bluej"; maintainers = with maintainers; [ chvp ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/codux/default.nix b/pkgs/applications/editors/codux/default.nix index 314f639f10603..4f853593e3a8a 100644 --- a/pkgs/applications/editors/codux/default.nix +++ b/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.14.0"; + version = "15.16.2"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-GTp9wJrL0TA0Jee1aXKAqmyHfotm7u7gxq/6W8+ermY="; + sha256 = "sha256-GKn8T3MEh+MnOqUnxruTqbnfxUcjGh6EAt+6LHTNCiY="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 72ecd8e094f4d..dd33558e06f65 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -226,6 +226,6 @@ in rec { ### Plugins - plugins = callPackage ./plugins.nix { }; + plugins = callPackage ./plugins.nix { } // { __attrsFailEvaluation = true; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 60c257e365ced..3d0073bf81432 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -89,4 +89,4 @@ self: let in elpaDevelPackages // { inherit elpaBuild; }); -in generateElpa { } +in (generateElpa { }) // { __attrsFailEvaluation = true; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 2a6cb016cdc8a..112445453abb4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -181,4 +181,4 @@ self: let in elpaPackages // { inherit elpaBuild; }); -in generateElpa { } +in (generateElpa { }) // { __attrsFailEvaluation = true; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index d53ee7056a890..bd0f1114b1cd1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -113,4 +113,6 @@ in emacsSessionManagement = self.session-management-for-emacs; rectMark = self.rect-mark; sunriseCommander = self.sunrise-commander; + + __attrsFailEvaluation = true; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacspeak/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacspeak/default.nix index 927605676cfdf..5294623584da0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacspeak/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacspeak/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "emacspeak"; - version = "56.0"; + version = "58.0"; src = fetchFromGitHub { owner = "tvraman"; repo = pname; rev = version; - hash= "sha256-juy+nQ7DrG818/uTH6Dv/lrrzu8qzPWwi0sX7JrhHK8="; + hash= "sha256-5pWC17nvy3ZuG0bR//LqDVpKsH5hFSFf63Q33a1BfBk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix index 29157c802411a..67b1b600390e1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix @@ -9,13 +9,13 @@ }: let - version = "unstable-2023-10-30"; + version = "unstable-2023-12-01"; src = fetchFromGitHub { owner = "zbelial"; repo = "lspce"; - rev = "34c59787bcdbf414c92d9b3bf0a0f5306cb98d64"; - hash = "sha256-kUHGdeJo2zXA410FqXGclgXmgWrll30Zv8fSprcmnIo="; + rev = "1958b6fcdfb6288aa17fa42360315d6c4aa85991"; + hash = "sha256-HUIRm1z6xNJWgX7ykujzniBrOTh76D3dJHrm0LR3nuQ="; }; meta = { @@ -30,17 +30,19 @@ let inherit version src meta; pname = "lspce-module"; - cargoHash = "sha256-eqSromwJrFhtJWedDVJivfbKpAtSFEtuCP098qOxFgI="; + cargoHash = "sha256-qMLwdZwqrK7bPXL1bIbOqM7xQPpeiO8FDoje0CEJeXQ="; checkFlags = [ # flaky test "--skip=msg::tests::serialize_request_with_null_params" ]; - postFixup = '' + postInstall = '' + mkdir -p $out/share/emacs/site-lisp for f in $out/lib/*; do - mv $f $out/lib/lspce-module.''${f##*.} + mv $f $out/share/emacs/site-lisp/lspce-module.''${f##*.} done + rmdir $out/lib ''; }; in @@ -48,25 +50,16 @@ trivialBuild rec { inherit version src meta; pname = "lspce"; - preBuild = '' - ln -s ${lspce-module}/lib/lspce-module* . - - # Fix byte-compilation - substituteInPlace lspce-util.el \ - --replace "(require 'yasnippet)" "(require 'yasnippet)(require 'url-util)" - substituteInPlace lspce-calltree.el \ - --replace "(require 'compile)" "(require 'compile)(require 'cl-lib)" - ''; - buildInputs = propagatedUserEnvPkgs; propagatedUserEnvPkgs = [ f markdown-mode yasnippet + lspce-module ]; - postInstall = '' - install lspce-module* $LISPDIR - ''; + passthru = { + inherit lspce-module; + }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 3c8f89bd44d67..bb45c383487cc 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -477,6 +477,13 @@ let ox-rss = buildWithGit super.ox-rss; + python-isort = super.python-isort.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace python-isort.el \ + --replace '-isort-command "isort"' '-isort-command "${lib.getExe pkgs.isort}"' + ''; + }); + # upstream issue: missing file header mhc = super.mhc.override { inherit (self.melpaPackages) calfw; @@ -728,4 +735,5 @@ let in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super); in -generateMelpa { } +(generateMelpa { }) +// { __attrsFailEvaluation = true; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix index cd32a8bd39754..beca93ea4c35f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -20,12 +20,12 @@ self: let generated ? ./nongnu-generated.nix }: let - imported = import generated { + imported = (import generated { callPackage = pkgs: args: self.callPackage pkgs (args // { # Use custom elpa url fetcher with fallback/uncompress fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; }); - }; + }) // { __attrsFailEvaluation = true; }; super = imported; diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index cc195fbeb1166..4a3ae555f21ea 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://www.greenfoot.org/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2ClasspathPlus; - mainProgram = pname; + mainProgram = "greenfoot"; maintainers = [ maintainers.chvp ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index 030c6666e11dd..9406604413c4d 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { description = "A general purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface"; license = licenses.mit; maintainers = with maintainers; [ pacien ]; + mainProgram = "howl"; # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/editors/jetbrains/darwin.nix b/pkgs/applications/editors/jetbrains/bin/darwin.nix index 747f03f55d5e9..747f03f55d5e9 100644 --- a/pkgs/applications/editors/jetbrains/darwin.nix +++ b/pkgs/applications/editors/jetbrains/bin/darwin.nix diff --git a/pkgs/applications/editors/jetbrains/bin/ides.json b/pkgs/applications/editors/jetbrains/bin/ides.json new file mode 100644 index 0000000000000..b503a7c6759c9 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/bin/ides.json @@ -0,0 +1,172 @@ +{ + "clion": { + "product": "CLion", + "wmClass": "jetbrains-clion", + "meta": { + "isOpenSource": false, + "description": "C/C++ IDE from JetBrains", + "maintainers": [ "edwtjo", "mic92", "tymscar" ], + "longDescription": "Enhancing productivity for every C and C++ developer on Linux, macOS and Windows.", + "homepage": "https://www.jetbrains.com/clion/" + } + }, + "datagrip": { + "product": "DataGrip", + "wmClass": "jetbrains-datagrip", + "meta": { + "isOpenSource": false, + "description": "Database IDE from JetBrains", + "maintainers": [ ], + "longDescription": "DataGrip is a new IDE from JetBrains built for database admins. It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more.", + "homepage": "https://www.jetbrains.com/datagrip/" + } + }, + "dataspell": { + "product": "DataSpell", + "wmClass": "jetbrains-dataspell", + "meta": { + "isOpenSource": false, + "description": "Data science IDE from JetBrains", + "maintainers": [ "leona" ], + "longDescription": "DataSpell is a new IDE from JetBrains built for Data Scientists. Mainly it integrates Jupyter notebooks in the IntelliJ platform.", + "homepage": "https://www.jetbrains.com/dataspell/" + } + }, + "gateway": { + "product": "JetBrains Gateway", + "productShort": "Gateway", + "wmClass": "jetbrains-gateway", + "meta": { + "isOpenSource": false, + "description": "Remote development for JetBrains products", + "maintainers": [ ], + "longDescription": "JetBrains Gateway is a lightweight launcher that connects a remote server with your local machine, downloads necessary components on the backend, and opens your project in JetBrains Client.", + "homepage": "https://www.jetbrains.com/remote-development/gateway/" + } + }, + "goland": { + "product": "Goland", + "wmClass": "jetbrains-goland", + "meta": { + "isOpenSource": false, + "description": "Go IDE from JetBrains", + "maintainers": [ "tymscar" ], + "longDescription": "Goland is the codename for a new commercial IDE by JetBrains aimed at providing an ergonomic environment for Go development.\n The new IDE extends the IntelliJ platform with the coding assistance and tool integrations specific for the Go language", + "homepage": "https://www.jetbrains.com/go/" + } + }, + "idea-community": { + "product": "IntelliJ IDEA CE", + "productShort": "IDEA", + "wmClass": "jetbrains-idea-ce", + "meta": { + "isOpenSource": true, + "description": "Free Java, Kotlin, Groovy and Scala IDE from jetbrains", + "maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "AnatolyPopov", "tymscar" ], + "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", + "homepage": "https://www.jetbrains.com/idea/" + } + }, + "idea-ultimate": { + "product": "IntelliJ IDEA", + "productShort": "IDEA", + "wmClass": "jetbrains-idea", + "meta": { + "isOpenSource": false, + "description": "Paid-for Java, Kotlin, Groovy and Scala IDE from jetbrains", + "maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "AnatolyPopov", "tymscar" ], + "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", + "homepage": "https://www.jetbrains.com/idea/" + } + }, + "mps": { + "product": "MPS", + "wmClass": "jetbrains-MPS", + "meta": { + "isOpenSource": false, + "description": "IDE for building domain-specific languages from JetBrains", + "maintainers": [ "rasendubi" ], + "longDescription": "A metaprogramming system which uses projectional editing which allows users to overcome the limits of language parsers, and build DSL editors, such as ones with tables and diagrams.", + "homepage": "https://www.jetbrains.com/mps/" + } + }, + "phpstorm": { + "product": "PhpStorm", + "wmClass": "jetbrains-phpstorm", + "meta": { + "isOpenSource": false, + "description": "PHP IDE from JetBrains", + "maintainers": [ "dritter", "tymscar" ], + "longDescription": "PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. ", + "homepage": "https://www.jetbrains.com/phpstorm/" + } + }, + "pycharm-community": { + "product": "PyCharm CE", + "productShort": "PyCharm", + "wmClass": "jetbrains-pycharm-ce", + "meta": { + "isOpenSource": true, + "description": "Free Python IDE from JetBrains", + "maintainers": [ "genericnerdyusername", "tymscar" ], + "longDescription": "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!", + "homepage": "https://www.jetbrains.com/pycharm/" + } + }, + "pycharm-professional": { + "product": "PyCharm", + "productShort": "PyCharm", + "wmClass": "jetbrains-pycharm", + "meta": { + "isOpenSource": false, + "description": "Paid-for Python IDE from JetBrains", + "maintainers": [ "genericnerdyusername", "tymscar" ], + "longDescription": "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!", + "homepage": "https://www.jetbrains.com/pycharm/" + } + }, + "rider": { + "product": "Rider", + "wmClass": "jetbrains-rider", + "meta": { + "isOpenSource": false, + "description": ".NET IDE from JetBrains", + "maintainers": [ "raphaelr" ], + "longDescription": "JetBrains Rider is a new .NET IDE based on the IntelliJ platform and ReSharper. Rider supports .NET Core, .NET Framework and Mono based projects. This lets you develop a wide array of applications including .NET desktop apps, services and libraries, Unity games, ASP.NET and ASP.NET Core web applications.", + "homepage": "https://www.jetbrains.com/rider/" + } + }, + "ruby-mine": { + "product": "RubyMine", + "wmClass": "jetbrains-rubymine", + "meta": { + "isOpenSource": false, + "description": "Ruby IDE from JetBrains", + "maintainers": [ "edwtjo", "tymscar"], + "longDescription": "Ruby IDE from JetBrains", + "homepage": "https://www.jetbrains.com/ruby/" + } + }, + "rust-rover": { + "product": "RustRover", + "wmClass": "jetbrains-rustrover", + "meta": { + "isOpenSource": false, + "description": "Rust IDE from JetBrains", + "maintainers": [ "genericnerdyusername"], + "longDescription": "Rust IDE from JetBrains", + "homepage": "https://www.jetbrains.com/rust/" + } + }, + "webstorm": { + "product": "WebStorm", + "wmClass": "jetbrains-webstorm", + "meta": { + "isOpenSource": false, + "description": "Web IDE from JetBrains", + "maintainers": [ "abaldeau", "tymscar"], + "longDescription": "WebStorm provides an editor for HTML, JavaScript (incl. Node.js), and CSS with on-the-fly code analysis, error prevention and automated refactorings for JavaScript code.", + "homepage": "https://www.jetbrains.com/webstorm/" + } + } +} diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/bin/linux.nix index 46cf00ea2131e..d26fb9847dfcf 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/bin/linux.nix @@ -14,6 +14,7 @@ , udev , e2fsprogs , python3 +, autoPatchelfHook , vmopts ? null }: @@ -26,8 +27,11 @@ , buildNumber , jdk , meta +, libdbm +, fsnotifier , extraLdPath ? [ ] , extraWrapperArgs ? [ ] +, extraBuildInputs ? [ ] }@args: let @@ -56,38 +60,16 @@ with stdenv; lib.makeOverridable mkDerivation (rec { vmoptsFile = lib.optionalString (vmopts != null) (writeText vmoptsName vmopts); - nativeBuildInputs = [ makeWrapper patchelf unzip ]; + nativeBuildInputs = [ makeWrapper patchelf unzip autoPatchelfHook ]; + buildInputs = extraBuildInputs; postPatch = '' - get_file_size() { - local fname="$1" - echo $(ls -l $fname | cut -d ' ' -f5) - } - - munge_size_hack() { - local fname="$1" - local size="$2" - strip $fname - truncate --size=$size $fname - } - rm -rf jbr # When using the IDE as a remote backend using gateway, it expects the jbr directory to contain the jdk ln -s ${jdk.home} jbr - interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2) - if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then - target_size=$(get_file_size bin/fsnotifier64) - patchelf --set-interpreter "$interpreter" bin/fsnotifier64 - munge_size_hack bin/fsnotifier64 $target_size - else - target_size=$(get_file_size bin/fsnotifier) - patchelf --set-interpreter "$interpreter" bin/fsnotifier - munge_size_hack bin/fsnotifier $target_size - fi - if [ -d "plugins/remote-dev-server" ]; then - patch -p1 < ${./JetbrainsRemoteDev.patch} + patch -p1 < ${../patches/jetbrains-remote-dev.patch} fi vmopts_file=bin/linux/${vmoptsName} @@ -109,18 +91,19 @@ with stdenv; lib.makeOverridable mkDerivation (rec { installPhase = '' runHook preInstall - mkdir -p $out/{bin,$pname,share/pixmaps,libexec/${pname},share/icons/hicolor/scalable/apps} + mkdir -p $out/{bin,$pname,share/pixmaps,share/icons/hicolor/scalable/apps} cp -a . $out/$pname [[ -f $out/$pname/bin/${loName}.png ]] && ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png [[ -f $out/$pname/bin/${loName}.svg ]] && ln -s $out/$pname/bin/${loName}.svg $out/share/pixmaps/${pname}.svg \ && ln -s $out/$pname/bin/${loName}.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg - mv bin/fsnotifier* $out/libexec/${pname}/. + cp ${libdbm}/lib/libdbm.so $out/$pname/bin/libdbm.so + cp ${fsnotifier}/bin/fsnotifier $out/$pname/bin/fsnotifier jdk=${jdk.home} item=${desktopItem} wrapProgram "$out/$pname/bin/${loName}.sh" \ - --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --prefix PATH : "${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --suffix PATH : "${lib.makeBinPath [ python3 ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \ ${lib.concatStringsSep " " extraWrapperArgs} \ @@ -132,6 +115,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { --set-default ${hiName}_VM_OPTIONS ${vmoptsFile} ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname + rm -rf $out/$pname/plugins/remote-dev-server/selfcontained/ echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh chmod +x $out/$pname/bin/remote-dev-server-wrapped.sh ln -s "$out/$pname/bin/remote-dev-server-wrapped.sh" $out/bin/$pname-remote-dev-server diff --git a/pkgs/applications/editors/jetbrains/update_ides.py b/pkgs/applications/editors/jetbrains/bin/update_bin.py index c15f6d7f2c3f9..31271d1dffed9 100755 --- a/pkgs/applications/editors/jetbrains/update_ides.py +++ b/pkgs/applications/editors/jetbrains/bin/update_bin.py @@ -126,6 +126,6 @@ logging.info("#### Committing changes... ####") subprocess.run(['git', 'commit', f'-m{commitMessage}', '--', f'{versions_file_path}'], check=True) logging.info("#### Updating plugins ####") -plugin_script = current_path.joinpath("plugins/update_plugins.py").resolve() +plugin_script = current_path.joinpath("../plugins/update_plugins.py").resolve() subprocess.call(plugin_script) diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index 5bbbd9dfc7b66..79e85f6f8022b 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -3,492 +3,492 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "941036313c618dcfc62cc36b605ce680a36add52a7e37ee9b1981e52e35e52a3", - "url": "https://download.jetbrains.com/cpp/CLion-2023.2.2.tar.gz", - "build_number": "232.9921.42" + "version": "2023.3.1", + "sha256": "3cde2fc25c759d4e114c5a768547e1d3083710e0fbe2591084a4ad4934490fc9", + "url": "https://download.jetbrains.com/cpp/CLion-2023.3.1.tar.gz", + "build_number": "233.11799.287" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "5917b88c9deeeee6019c1e5d82e4a90174bf2d9299a4bc8dac286029e4ae5d03", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2.tar.gz", - "build_number": "232.10072.15" + "version": "2023.3.1", + "sha256": "4177882deb0380fba9b426c2580baea7dc4297bddefdd7bfb094433ff4cbb7b8", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.1.tar.gz", + "build_number": "233.11799.296" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2023.2.3", - "sha256": "3f1ddc7290af60df6c58ebc5b27b3f10bda972920508bed00182487a6c57f1cc", - "url": "https://download.jetbrains.com/python/dataspell-2023.2.3.tar.gz", - "build_number": "232.10072.29" + "version": "2023.3.1", + "sha256": "0b5196dcc146cb163b1c9797986c46c651ad8132d3ee78dca92f9f9081f9f7e9", + "url": "https://download.jetbrains.com/python/dataspell-2023.3.1.tar.gz", + "build_number": "233.11799.285" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2023.2.3", - "sha256": "ec10da775003055527c9b2cbf64d49524be878d06e18510acde2065ce0736b99", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3.tar.gz", - "build_number": "232.10072.27" + "version": "2023.3", + "sha256": "ecf0cdc671d83ba6b9251ab1ad0d40bc6ca86ea577437aa2d4b9fe5aa0449fad", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.tar.gz", + "build_number": "233.11799.240" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2023.2.3", - "sha256": "b34fd9a42d82bcc61052f72ed75f6c1e1d7e37163de38933ee0f124ef6e6bb60", - "url": "https://download.jetbrains.com/go/goland-2023.2.3.tar.gz", - "build_number": "232.10072.27" + "version": "2023.3.1", + "sha256": "2fafd8f76979b174c598e58b6e39d2d796eef8e69d28da28abcb7a5c260992d6", + "url": "https://download.jetbrains.com/go/goland-2023.3.1.tar.gz", + "build_number": "233.11799.286" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2023.2.3", - "sha256": "4b34fdaabb5907656ac87d50df85f13ace804d8684f3886dac07f62a93706b2e", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3.tar.gz", - "build_number": "232.10072.27" + "version": "2023.3.1", + "sha256": "7afd70b71e1fcb8280393d59ec58ab72f2ccf369f5d6e0035e6b265600531e4a", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.1.tar.gz", + "build_number": "233.11799.300" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2023.2.3", - "sha256": "b395e37c797c10c0fd0c4ccf6e735852fb40bec5fbbc98705f481f6f068c7993", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3.tar.gz", - "build_number": "232.10072.27" + "version": "2023.3.1", + "sha256": "0a80d971e430786492acfd04e4ba73eda2e4ee60f752e3f9494a4476c6cad761", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.1.tar.gz", + "build_number": "233.11799.300" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2022.3", - "sha256": "6a8640ef9613fa562513788ae33d66c535ec230564d000cea61f7684a2f4042b", - "url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3.tar.gz", - "build_number": "223.8836.1185" + "version": "2023.2", + "sha256": "10d85eee914e23691f8512745eaa044ee33e0ca784fb84a1b0a39852d5ec1014", + "url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2.tar.gz", + "build_number": "232.10072.781" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2023.2.3", - "sha256": "dd8d771508b277ab2a713b8f546c2ec6dbb261ba8c23072e46ec6ce2ea9ab2a0", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3.tar.gz", - "build_number": "232.10072.32", + "version": "2023.3.1", + "sha256": "c8b034014e17c58def72aa351e44a441ca516403f795acef5325e964d5179983", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.1.tar.gz", + "build_number": "233.11799.297", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2023.2.3", - "sha256": "d59dd88c1eb51cdd756433d415588c573ca944ebf6f08844b8ac8cd2e3d9937b", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3.tar.gz", - "build_number": "232.10072.31" + "version": "2023.3.1", + "sha256": "95a03ad8abf2400e9691bb10b13d47407abfcbc25192cf3773e1a2dab42c0499", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.1.tar.gz", + "build_number": "233.11799.298" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2023.2.3", - "sha256": "e625fea80b72c9e12f986a8eb918425c6ef1d3f7b31117b40d122e3ce76046b1", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3.tar.gz", - "build_number": "232.10072.31" + "version": "2023.3.1", + "sha256": "f3a09cd2aebd2ffbc42f927467a613e55430d3ff76d57c263d31ccee3c1de110", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.1.tar.gz", + "build_number": "233.11799.298" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2023.2.2", - "sha256": "a32b2d0682613f3afacd11eac1a79f022c99e17ef9ab23fe26c5d8d34b093ad8", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2.tar.gz", - "build_number": "232.9921.83" + "version": "2023.3.1", + "sha256": "07dfbdc277d2befdb2700f515167b9bcb6464dd6d9fe59f98147c03233b6aa75", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.1.tar.gz", + "build_number": "233.11799.303" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2023.2.3", - "sha256": "068b8c486cd61755787538ea036608a9aa590a3b49cd9003dd5edce28d322c02", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3.tar.gz", - "build_number": "232.10072.21" + "version": "2023.3.1", + "sha256": "35cd23c7a0f73add6ba05f246707e2f2550185033172f5d42a6b02e750253115", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.1.tar.gz", + "build_number": "233.11799.290" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", "version": "2023.3 EAP", - "sha256": "3dd8e99b066164efc11e86e3289e444c5238dfce8e9142fe2d3a8c340eeeb175", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22.tar.gz", - "build_number": "233.8264.22" + "sha256": "07524c044de4565cbf052f9980044aa6c6e28064eefb3033587afa1e09ff69bf", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.11799.284.tar.gz", + "build_number": "233.11799.284" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2023.2.3", - "sha256": "b57f4a71361a224aeb0e80f2f311f632ab1757356a2de3627ade3e9dd4ee0899", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3.tar.gz", - "build_number": "232.10072.28" + "version": "2023.3.1", + "sha256": "26a3acc9864c2c7715d377059d3b52b1085b90b708b254ec2d52b80f625eb442", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.1.tar.gz", + "build_number": "233.11799.293" } }, "aarch64-linux": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2023.2.2", - "sha256": "9ceeda2fc4f99e160f7402e0cc0712e480eaa1c12b86feac028bb0d191806d41", - "url": "https://download.jetbrains.com/cpp/CLion-2023.2.2-aarch64.tar.gz", - "build_number": "232.9921.42" + "version": "2023.3.1", + "sha256": "8aa207ee92f518fafc93b5a3bece67f15ce65ee18b8e6c28a393e8dbc0a5ef4f", + "url": "https://download.jetbrains.com/cpp/CLion-2023.3.1-aarch64.tar.gz", + "build_number": "233.11799.287" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "version": "2023.2.2", - "sha256": "8b4372405832cf377cf4e4af4b240383231f62397249c9aee7eda54052410bd2", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2-aarch64.tar.gz", - "build_number": "232.10072.15" + "version": "2023.3.1", + "sha256": "dd76187e8598fd0e450b76e54767ca321e3e61f11d745a191b9039f71914b003", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.1-aarch64.tar.gz", + "build_number": "233.11799.296" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2023.2.3", - "sha256": "43f9f4e7c1d19c077aa0cfc76561477955f7b61414ec4fa12b7079870ef0bf1b", - "url": "https://download.jetbrains.com/python/dataspell-2023.2.3-aarch64.tar.gz", - "build_number": "232.10072.29" + "version": "2023.3.1", + "sha256": "ad49e53b159e321f07dc7b9f53a25a3a936cf49b5bffcf46357e5a80b1913ea9", + "url": "https://download.jetbrains.com/python/dataspell-2023.3.1-aarch64.tar.gz", + "build_number": "233.11799.285" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2023.2.3", - "sha256": "c186170fd0d6322a61cb1233c2827691aebd86ab06f3cd1b3733dcc422c9290e", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3-aarch64.tar.gz", - "build_number": "232.10072.27" + "version": "2023.3", + "sha256": "053f72669c30583b0cc4dce08b56cfcdd3252087e8f4b71986178e364c69b585", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3-aarch64.tar.gz", + "build_number": "233.11799.240" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2023.2.3", - "sha256": "60ef96e70ee2fab3ce04f30ba887cc7f4f62d499811e2050f534ede06a23cbb6", - "url": "https://download.jetbrains.com/go/goland-2023.2.3-aarch64.tar.gz", - "build_number": "232.10072.27" + "version": "2023.3.1", + "sha256": "87276008be7143efa3ad965194b4e5baf9528e59f9db5f6e5f856f0e0bb1554f", + "url": "https://download.jetbrains.com/go/goland-2023.3.1-aarch64.tar.gz", + "build_number": "233.11799.286" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2023.2.3", - "sha256": "9e6402c323d74f9c88aaea13d0fb0027786a1ac3dbee232794d071132bf7a5ce", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3-aarch64.tar.gz", - "build_number": "232.10072.27" + "version": "2023.3.1", + "sha256": "3a53972b56c9135c8ad1fb0c0d9d3ded2c79120f8e5461de272954f58c3637b4", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.1-aarch64.tar.gz", + "build_number": "233.11799.300" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2023.2.3", - "sha256": "b895aebe1803a1d8d58f8ae29a5072bcd496ca75ecdf8f554390a2c90b76fa3b", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3-aarch64.tar.gz", - "build_number": "232.10072.27" + "version": "2023.3.1", + "sha256": "cf6e7dc7d6ba1a7e807d80316364e51ee2e23aa471ab19ada93aff8fc9b1627d", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.1-aarch64.tar.gz", + "build_number": "233.11799.300" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2022.3", - "sha256": "6a8640ef9613fa562513788ae33d66c535ec230564d000cea61f7684a2f4042b", - "url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3.tar.gz", - "build_number": "223.8836.1185" + "version": "2023.2", + "sha256": "10d85eee914e23691f8512745eaa044ee33e0ca784fb84a1b0a39852d5ec1014", + "url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2.tar.gz", + "build_number": "232.10072.781" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2023.2.3", - "sha256": "577bea15c1208e0b842bcdb2ff0f0205144a8800fcadf87f873af7c067e0ce73", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3-aarch64.tar.gz", - "build_number": "232.10072.32", + "version": "2023.3.1", + "sha256": "c3c04f463beb798da48d08188980cde1505795c6f2cfaf788c9bca94f0f3c2d7", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.1-aarch64.tar.gz", + "build_number": "233.11799.297", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2023.2.3", - "sha256": "6fdc5238ffa4767834b11b52b650107f1c64d6a53d0e2bbc23581b6c90b67ab5", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3-aarch64.tar.gz", - "build_number": "232.10072.31" + "version": "2023.3.1", + "sha256": "1b9a0c950d232d4a0418203dbbff19ba73279cbc933789d11c2a81ce80d0b485", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.1-aarch64.tar.gz", + "build_number": "233.11799.298" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2023.2.3", - "sha256": "578ecbd059ccb010682cf602e959454b296ec2e741202f236fbdb38897b296dd", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3-aarch64.tar.gz", - "build_number": "232.10072.31" + "version": "2023.3.1", + "sha256": "eb649602ebd2212575631db51569029e3683a9f4842b5e506c1f2b573a777749", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.1-aarch64.tar.gz", + "build_number": "233.11799.298" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2023.2.2", - "sha256": "a41f97a86c84157cb36b085ad3c526263414e6c8157be311f38491e715631daa", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2-aarch64.tar.gz", - "build_number": "232.9921.83" + "version": "2023.3.1", + "sha256": "0a8328ce72821dc779724b4eb46ff8da98a374e178f5f0830141667371231ba6", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.1-aarch64.tar.gz", + "build_number": "233.11799.303" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2023.2.3", - "sha256": "613732ccdb38e1bc0d2ecd2ead464c74ed643f1b6d99695987c1bcc78784fbf3", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3-aarch64.tar.gz", - "build_number": "232.10072.21" + "version": "2023.3.1", + "sha256": "6c77b39006410a580d9e46bb7a44b8a524414b1e38e61042be839eff10021fac", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.1-aarch64.tar.gz", + "build_number": "233.11799.290" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", "version": "2023.3 EAP", - "sha256": "812c33f46f8c7e309e777f10b6806b3658d7f90f95aa1a776c686aafabb290e7", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22-aarch64.tar.gz", - "build_number": "233.8264.22" + "sha256": "62b276acfb0c0233e84dd332cad95d84dc5d751e04e51cad6f0675e676674594", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.11799.284-aarch64.tar.gz", + "build_number": "233.11799.284" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2023.2.3", - "sha256": "2b0ead390f94c6b1d2069a078d6882e7ff3d0af280ff15b8481606d3f500fe0d", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3-aarch64.tar.gz", - "build_number": "232.10072.28" + "version": "2023.3.1", + "sha256": "2de348e4df2ce5fb4f9da1b2f17fa30c359a97aec499329aaea8d1bdf12fd4eb", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.1-aarch64.tar.gz", + "build_number": "233.11799.293" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2023.2.2", - "sha256": "a4049fd02a9ebe459634ceb47f389a6f8536fcdeb162587d6896991b94023c3f", - "url": "https://download.jetbrains.com/cpp/CLion-2023.2.2.dmg", - "build_number": "232.9921.42" + "version": "2023.3.1", + "sha256": "199745463dee1f1a0c7f52b4fa5cc6a68121311d951a594cb4ce77fa4ed5ce2d", + "url": "https://download.jetbrains.com/cpp/CLion-2023.3.1.dmg", + "build_number": "233.11799.287" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2023.2.2", - "sha256": "cafd9cfbdd4453a587674324e617977c9f9536bbe7aa290cc39b0c3c5c842bba", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2.dmg", - "build_number": "232.10072.15" + "version": "2023.3.1", + "sha256": "eb37ad83ecd5a74cbbdca5300e57e18ff9f946b0986b023921da07691b54498d", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.1.dmg", + "build_number": "233.11799.296" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2023.2.3", - "sha256": "f8d4b3a7a36fbbd77a4b6e965cd159f4adeff54933df1e8caf2e4f341e3443c7", - "url": "https://download.jetbrains.com/python/dataspell-2023.2.3.dmg", - "build_number": "232.10072.29" + "version": "2023.3.1", + "sha256": "4d6874a2bfecd3625808f1d6ce23c49974ce10cec482ed3a42e001bc6f7c720b", + "url": "https://download.jetbrains.com/python/dataspell-2023.3.1.dmg", + "build_number": "233.11799.285" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2023.2.3", - "sha256": "25780bcbb57ebc1a7a05bec24abf21b2a96b22f80a91de89c94926799da3183f", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3.dmg", - "build_number": "232.10072.27" + "version": "2023.3", + "sha256": "17fb60d9a13fc561e24054a651b2576426df43e4ec6ea6a07a7ce65648d9df5d", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.dmg", + "build_number": "233.11799.240" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2023.2.3", - "sha256": "5e78a73a69481fd63ad53d99371b3e7e534731c6116ee6d7fee127c533bc644a", - "url": "https://download.jetbrains.com/go/goland-2023.2.3.dmg", - "build_number": "232.10072.27" + "version": "2023.3.1", + "sha256": "56c2e20dcac8b86da4cd4d9a52c061fd9839b968ee0f2960084a52ac1c2dfbbf", + "url": "https://download.jetbrains.com/go/goland-2023.3.1.dmg", + "build_number": "233.11799.286" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2023.2.3", - "sha256": "dbdda6a0df334a402103d3ee1e70cd5f514cc9353efcdd49395a736c9a640730", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3.dmg", - "build_number": "232.10072.27" + "version": "2023.3.1", + "sha256": "e65b75aa6fa957880f5e0b435d8eaea570a9f4408caa7e7475a90b5e1017cd2a", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.1.dmg", + "build_number": "233.11799.300" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2023.2.3", - "sha256": "fddefd00d6a96ec8c3bd81f9183f3b70d4df71d460f9c704519abffb95246e0f", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3.dmg", - "build_number": "232.10072.27" + "version": "2023.3.1", + "sha256": "06cddba143c5e5c6fdf9a733a79d05e3f9c41eb96469000dbd7577d74686747c", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.1.dmg", + "build_number": "233.11799.300" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", - "version": "2022.3", - "sha256": "17cb973af11118c246d4144ba0071ce31fe3f276be7029f613cdb0fa60b752cc", - "url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3-macos.dmg", - "build_number": "223.8836.1185" + "version": "2023.2", + "sha256": "11a635432beaca5809fe0253303d07444a0bfd6fac287c72e7b03e7a9f1a59e4", + "url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2-macos.dmg", + "build_number": "232.10072.781" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2023.2.3", - "sha256": "7ce4ff6b344ff8ce18ef8a821ba3fd1d222f9222a9b3e65744a796379d92417e", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3.dmg", - "build_number": "232.10072.32", + "version": "2023.3.1", + "sha256": "dbf18efa0be9a029e09ecbc7f82f901643d81c2f96e75f73ec5ef12092c1008a", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.1.dmg", + "build_number": "233.11799.297", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2023.2.3", - "sha256": "b914bd3c0018f951bef5da9c04907355a88546ce983dcf4115bbf11556015ec7", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3.dmg", - "build_number": "232.10072.31" + "version": "2023.3.1", + "sha256": "48aabc8cc464c02a868527cda7a0fec7c3cb0339c1a6ad46590e2e2aa1530317", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.1.dmg", + "build_number": "233.11799.298" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2023.2.3", - "sha256": "b33bbd30222363cdc3091aee923ed1c309edba799616a3a681cd9a1ca94e822a", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3.dmg", - "build_number": "232.10072.31" + "version": "2023.3.1", + "sha256": "ddb6f52803e1774bcf1d965b0dece128d152579a8c773dc65b06b44b70a0b395", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.1.dmg", + "build_number": "233.11799.298" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2023.2.2", - "sha256": "8fa1c224eccfffe896de8b375160e5d9f63103912f935748199cca758448fc9e", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2.dmg", - "build_number": "232.9921.83" + "version": "2023.3.1", + "sha256": "b076dfca4fbe732190176d62defb0c5a99885861a1aeab72a6d105b66e4a47ca", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.1.dmg", + "build_number": "233.11799.303" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2023.2.3", - "sha256": "eb0db28facbe7aed6de99dc97053cdfbeea845ce73b6b9efa6c95caaf68204e9", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3.dmg", - "build_number": "232.10072.21" + "version": "2023.3.1", + "sha256": "4cce817269f230684ff08318ace108d54b9dded525048faf4a1787eff8ba4dc0", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.1.dmg", + "build_number": "233.11799.290" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", "version": "2023.3 EAP", - "sha256": "889ed748efbd44b76da03186efac063baf36c2208d919550dd97cf2dae8f40e3", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22.dmg", - "build_number": "233.8264.22" + "sha256": "2ec2563a94abf3b873709c27cb81692fb0fbff44ee42b275cc38d0dc3c74e7af", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.11799.284.dmg", + "build_number": "233.11799.284" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2023.2.3", - "sha256": "918bb2061d623f736c73b67db929ced2a83013f64d57406af09f5c9df9c7d8cd", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3.dmg", - "build_number": "232.10072.28" + "version": "2023.3.1", + "sha256": "94cfc4db7574607555039c65a4bc6ecbb900192c19744bf9082ce9dfea5c7667", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.1.dmg", + "build_number": "233.11799.293" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "2820b59efbb028a861c3912b83a659fc22a136396a7199dd887f7dc28d6fba61", - "url": "https://download.jetbrains.com/cpp/CLion-2023.2.2-aarch64.dmg", - "build_number": "232.9921.42" + "version": "2023.3.1", + "sha256": "d8b0dfeb8a4b15339f296c90b0535cdc5b0b25ba3cbbfe2601f04a24a4289b95", + "url": "https://download.jetbrains.com/cpp/CLion-2023.3.1-aarch64.dmg", + "build_number": "233.11799.287" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "30458ba96e1a518a40c0fc89d35f70ea96803cccd5ce8aca72e2363745214c87", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2-aarch64.dmg", - "build_number": "232.10072.15" + "version": "2023.3.1", + "sha256": "c8a3d4c3679da1961f186d0d4fedc6510d8f967ceebe0cd34d867249f5729f34", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.1-aarch64.dmg", + "build_number": "233.11799.296" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2023.2.3", - "sha256": "4f26303afa3d2359ea4b0bcee875b605dcaadaece3d1b0e16e5c37b8ea46afe3", - "url": "https://download.jetbrains.com/python/dataspell-2023.2.3-aarch64.dmg", - "build_number": "232.10072.29" + "version": "2023.3.1", + "sha256": "0dbdfe1c24334dc2b4e27c0390862343041c07fb4abeb00b0eeb6db5b7171e83", + "url": "https://download.jetbrains.com/python/dataspell-2023.3.1-aarch64.dmg", + "build_number": "233.11799.285" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2023.2.3", - "sha256": "b4c1167303ed8985c5439d6a07f9d2970074e3748c21e9155b2c76a508fe0a15", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3-aarch64.dmg", - "build_number": "232.10072.27" + "version": "2023.3", + "sha256": "917a01af3f455fc8c6e72f838b9fe449f100ff0b7c93631cb7e778c5edee09ba", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3-aarch64.dmg", + "build_number": "233.11799.240" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2023.2.3", - "sha256": "3ad91c136fd840dbc596f2873ccc4c2df14f7ec2a435f8a61acfdc3a97660e32", - "url": "https://download.jetbrains.com/go/goland-2023.2.3-aarch64.dmg", - "build_number": "232.10072.27" + "version": "2023.3.1", + "sha256": "b0e29f8a5470c7b5de7565faacf90f206e6a353f1afaecc239899d66dbae48d8", + "url": "https://download.jetbrains.com/go/goland-2023.3.1-aarch64.dmg", + "build_number": "233.11799.286" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2023.2.3", - "sha256": "563d2189f1ae0310abd108f256edca786ca732100344b3519a7201245e4af781", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3-aarch64.dmg", - "build_number": "232.10072.27" + "version": "2023.3.1", + "sha256": "0630913d6730073f8f06a26ef51a6b2e0599d93a5809718e74046bfea3023a86", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.1-aarch64.dmg", + "build_number": "233.11799.300" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2023.2.3", - "sha256": "4ee862a5f5b2f8d9276744bd67cd024a5c6740601e2168a985a5c66cb43e18ea", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3-aarch64.dmg", - "build_number": "232.10072.27" + "version": "2023.3.1", + "sha256": "3f9bb300298dc900da342ee437e9475e762997095408c8b725ab499fec49e7bf", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.1-aarch64.dmg", + "build_number": "233.11799.300" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", - "version": "2022.3", - "url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3-macos-aarch64.dmg", - "sha256": "40d8a928a1c1703544c9905a3f8e6a7d0ade3b17302782da2ed68fd1dcdafef9", - "build_number": "223.8836.1185" + "version": "2023.2", + "url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2-macos-aarch64.dmg", + "sha256": "a19ecd8a109783e9d2260cc18f48ac97e52a0bc00ee29df5ccf711a80d1701eb", + "build_number": "232.10072.781" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2023.2.3", - "sha256": "68d543fb2a79cd0b07ddb94a4c00d8c0c1aca7f604bc838ac92e232e763489b3", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3-aarch64.dmg", - "build_number": "232.10072.32", + "version": "2023.3.1", + "sha256": "15cc0735cd2073d9e5a9bbbefa8d973cf05eabfd8fab0f77bd137e72cfd7f31c", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.1-aarch64.dmg", + "build_number": "233.11799.297", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2023.2.3", - "sha256": "08c45adbb0dca219955f511993ca8150dcca235bdba3ac24c67ae035c68ba992", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3-aarch64.dmg", - "build_number": "232.10072.31" + "version": "2023.3.1", + "sha256": "d4c425bb640dd8984706abd1e875db037feec5828737bf050e09f0ee7af4732c", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.1-aarch64.dmg", + "build_number": "233.11799.298" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2023.2.3", - "sha256": "63d68b20963575f76937ca0ce18a8150639c47b8cf8f3d6e96fa3306191cd076", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3-aarch64.dmg", - "build_number": "232.10072.31" + "version": "2023.3.1", + "sha256": "c57ebac6ab0d7b01b53a600da675a16c8eb853d7bba9c9324d16f99f5a198874", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.1-aarch64.dmg", + "build_number": "233.11799.298" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2023.2.2", - "sha256": "89c30f905216480ba0e379705542d81beac6e7467d26fe3aa882e9b008de42c2", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2-aarch64.dmg", - "build_number": "232.9921.83" + "version": "2023.3.1", + "sha256": "ddb85ddf7636c45f911848a76daa92a6ba7cd3c428f28d7d89ecf44db2b93bdc", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.1-aarch64.dmg", + "build_number": "233.11799.303" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2023.2.3", - "sha256": "db571f72488e299d700670c546fb5ae9e1b1bc1eff3f2b26ef8520a22b1fb407", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3-aarch64.dmg", - "build_number": "232.10072.21" + "version": "2023.3.1", + "sha256": "5999eefdce0738a5599ce7f35455e228e5c964b26924f947c6839a9aee561204", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.1-aarch64.dmg", + "build_number": "233.11799.290" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", "version": "2023.3 EAP", - "sha256": "9c4f26089697f6cb394e971dac8ef4fe974b5ecffd63311fcf0be66d4b4aec59", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22-aarch64.dmg", - "build_number": "233.8264.22" + "sha256": "beff1ad500e58cb150ef05ab66de69dab2b609ff7da836a4ee04d701d9d41e76", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.11799.284-aarch64.dmg", + "build_number": "233.11799.284" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2023.2.3", - "sha256": "8811624166bf11d591bcf24fee0087861c3193a79aecb7159cced17737d88517", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3-aarch64.dmg", - "build_number": "232.10072.28" + "version": "2023.3.1", + "sha256": "daca106f82dcefe66f00c1d34ed628f7b03db596c8852d855a1dfdd7066fd659", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.1-aarch64.dmg", + "build_number": "233.11799.293" } } } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 2034da80c658d..e40fa4c68d721 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -2,245 +2,86 @@ , stdenv , callPackage , fetchurl + , jdk -, cmake -, gdb , zlib , python3 , lldb , dotnet-sdk_7 , maven -, autoPatchelfHook -, libdbusmenu -, patchelf , openssl , expat +, libxcrypt , libxcrypt-legacy , fontconfig , libxml2 +, runCommand +, musl +, R +, libgcc +, lttng-ust_2_12 , xz +, xorg +, libGL + , vmopts ? null }: let - platforms = lib.platforms.linux ++ [ "x86_64-darwin" "aarch64-darwin" ]; - ideaPlatforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" "aarch64-darwin" "aarch64-linux" ]; - inherit (stdenv.hostPlatform) system; - versions = builtins.fromJSON (lib.readFile (./versions.json)); + # `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata + # `versions.json` contains everything generated/needed by the update script version numbers, build numbers and tarball hashes + ideInfo = lib.importJSON ./bin/ides.json; + versions = lib.importJSON ./bin/versions.json; products = versions.${system} or (throw "Unsupported system: ${system}"); - package = if stdenv.isDarwin then ./darwin.nix else ./linux.nix; - mkJetBrainsProduct = callPackage package { inherit vmopts; }; - - # Sorted alphabetically - - buildClion = { pname, version, src, license, description, wmClass, buildNumber, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber; - product = "CLion"; - meta = with lib; { - homepage = "https://www.jetbrains.com/clion/"; - inherit description license platforms; - longDescription = '' - Enhancing productivity for every C and C++ - developer on Linux, macOS and Windows. - ''; - maintainers = with maintainers; [ edwtjo tymscar ]; - }; - }).overrideAttrs (attrs: { - nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ - autoPatchelfHook - ]; - buildInputs = (attrs.buildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ - python3 - stdenv.cc.cc - libdbusmenu - openssl.out - expat - libxcrypt-legacy - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ - libxml2 - xz - ]; - dontAutoPatchelf = true; - postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' - ( - cd $out/clion - - # I think the included gdb has a couple of patches, so we patch it instead of replacing - ls -d $PWD/bin/gdb/linux/*/lib/python3.8/lib-dynload/* | - xargs patchelf \ - --replace-needed libssl.so.10 libssl.so \ - --replace-needed libcrypto.so.10 libcrypto.so - - ls -d $PWD/bin/lldb/linux/*/lib/python3.8/lib-dynload/* | - xargs patchelf \ - --replace-needed libssl.so.10 libssl.so \ - --replace-needed libcrypto.so.10 libcrypto.so - - autoPatchelf $PWD/bin - ) - ''; - }); - - buildDataGrip = { pname, version, src, license, description, wmClass, buildNumber, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber; - product = "DataGrip"; - meta = with lib; { - homepage = "https://www.jetbrains.com/datagrip/"; - inherit description license platforms; - longDescription = '' - DataGrip is a new IDE from JetBrains built for database admins. - It allows you to quickly migrate and refactor relational databases, - construct efficient, statically checked SQL queries and much more. - ''; - maintainers = with maintainers; [ ]; - }; - }); - - buildDataSpell = { pname, version, src, license, description, wmClass, buildNumber, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber; - product = "DataSpell"; - meta = with lib; { - homepage = "https://www.jetbrains.com/dataspell/"; - inherit description license platforms; - longDescription = '' - DataSpell is a new IDE from JetBrains built for Data Scientists. - Mainly it integrates Jupyter notebooks in the IntelliJ platform. - ''; - maintainers = with maintainers; [ leona ]; - }; - }); + package = if stdenv.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; + mkJetBrainsProductCore = callPackage package { inherit vmopts; }; + mkMeta = meta: fromSource: { + inherit (meta) homepage longDescription; + description = meta.description + lib.optionalString meta.isOpenSource (if fromSource then " (built from source)" else " (patched binaries from jetbrains)"); + maintainers = map (x: lib.maintainers."${x}") meta.maintainers; + license = if meta.isOpenSource then lib.licenses.asl20 else lib.licenses.unfree; + }; - buildGateway = { pname, version, src, license, description, wmClass, buildNumber, product, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber product; - productShort = "Gateway"; - meta = with lib; { - homepage = "https://www.jetbrains.com/remote-development/gateway/"; - inherit description license platforms; - longDescription = '' - JetBrains Gateway is a lightweight launcher that connects a remote - server with your local machine, downloads necessary components on the - backend, and opens your project in JetBrains Client. - ''; - maintainers = with maintainers; [ ]; + mkJetBrainsProduct = + { pname + , fromSource ? false + , extraWrapperArgs ? [ ] + , extraLdPath ? [ ] + , extraBuildInputs ? [ ] + }: + mkJetBrainsProductCore { + inherit pname jdk extraWrapperArgs extraLdPath extraBuildInputs; + src = if fromSource then communitySources."${pname}" else + fetchurl { + url = products."${pname}".url; + sha256 = products."${pname}".sha256; }; - }); + inherit (products."${pname}") version; + buildNumber = products."${pname}".build_number; + inherit (ideInfo."${pname}") wmClass product; + productShort = ideInfo."${pname}".productShort or ideInfo."${pname}".product; + meta = mkMeta ideInfo."${pname}".meta fromSource; + libdbm = if ideInfo."${pname}".meta.isOpenSource then communitySources."${pname}".libdbm else communitySources.idea-community.libdbm; + fsnotifier = if ideInfo."${pname}".meta.isOpenSource then communitySources."${pname}".fsnotifier else communitySources.idea-community.fsnotifier; + }; - buildGoland = { pname, version, src, license, description, wmClass, buildNumber, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber; - product = "Goland"; - extraWrapperArgs = [ - # fortify source breaks build since delve compiles with -O0 - ''--prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"'' - ]; - meta = with lib; { - homepage = "https://www.jetbrains.com/go/"; - inherit description license platforms; - longDescription = '' - Goland is the codename for a new commercial IDE by JetBrains - aimed at providing an ergonomic environment for Go development. - The new IDE extends the IntelliJ platform with the coding assistance - and tool integrations specific for the Go language - ''; - maintainers = with maintainers; [ tymscar ]; - }; - }).overrideAttrs (attrs: { - postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' - interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv - chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv - ''; - }); + communitySources = callPackage ./source { }; - buildIdea = { pname, version, src, license, description, wmClass, buildNumber, product, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber product; - productShort = "IDEA"; + buildIdea = args: + mkJetBrainsProduct (args // { extraLdPath = [ zlib ]; extraWrapperArgs = [ ''--set M2_HOME "${maven}/maven"'' ''--set M2 "${maven}/maven/bin"'' ]; - meta = with lib; { - homepage = "https://www.jetbrains.com/idea/"; - inherit description license; - longDescription = '' - IDE for Java SE, Groovy & Scala development Powerful - environment for building Google Android apps Integration - with JUnit, TestNG, popular SCMs, Ant & Maven. Also known - as IntelliJ. - ''; - maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot AnatolyPopov tymscar ]; - platforms = ideaPlatforms; - }; - }); - - buildMps = { pname, version, src, license, description, wmClass, product, buildNumber, ... }: - (mkJetBrainsProduct rec { - inherit pname version src wmClass jdk buildNumber product; - productShort = "MPS"; - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - homepage = "https://www.jetbrains.com/mps/"; - inherit license description platforms; - longDescription = '' - A metaprogramming system which uses projectional editing - which allows users to overcome the limits of language - parsers, and build DSL editors, such as ones with tables and - diagrams. - ''; - maintainers = with maintainers; [ rasendubi ]; - }; }); - buildPhpStorm = { pname, version, src, license, description, wmClass, buildNumber, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber; - product = "PhpStorm"; - meta = with lib; { - homepage = "https://www.jetbrains.com/phpstorm/"; - inherit description license platforms; - longDescription = '' - PhpStorm provides an editor for PHP, HTML and JavaScript - with on-the-fly code analysis, error prevention and - automated refactorings for PHP and JavaScript code. - ''; - maintainers = with maintainers; [ dritter tymscar ]; - }; - }); - - buildPycharm = { pname, version, src, license, description, wmClass, buildNumber, product, cythonSpeedup ? stdenv.isLinux, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber product; - productShort = "PyCharm"; - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - homepage = "https://www.jetbrains.com/pycharm/"; - inherit description license platforms; - longDescription = '' - Python IDE with complete set of tools for productive - development with Python programming language. In addition, the - IDE provides high-class capabilities for professional Web - development with Django framework and Google App Engine. It - has powerful coding assistance, navigation, a lot of - refactoring features, tight integration with various Version - Control Systems, Unit testing, powerful all-singing - all-dancing Debugger and entire customization. PyCharm is - developer driven IDE. It was developed with the aim of - providing you almost everything you need for your comfortable - and productive development! - ''; - maintainers = with maintainers; [ genericnerdyusername tymscar ]; - }; - }).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs cythonSpeedup { - buildInputs = with python3.pkgs; [ python3 setuptools ]; + buildPycharm = args: + (mkJetBrainsProduct args).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs stdenv.isLinux { + buildInputs = with python3.pkgs; (previousAttrs.buildInputs or []) ++ [ python3 setuptools ]; preInstall = '' echo "compiling cython debug speedups" if [[ -d plugins/python-ce ]]; then @@ -252,349 +93,162 @@ let # See https://www.jetbrains.com/help/pycharm/2022.1/cython-speedups.html }); - buildRider = { pname, version, src, license, description, wmClass, buildNumber, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber; - product = "Rider"; - meta = with lib; { - homepage = "https://www.jetbrains.com/rider/"; - inherit description license platforms; - longDescription = '' - JetBrains Rider is a new .NET IDE based on the IntelliJ - platform and ReSharper. Rider supports .NET Core, - .NET Framework and Mono based projects. This lets you - develop a wide array of applications including .NET desktop - apps, services and libraries, Unity games, ASP.NET and - ASP.NET Core web applications. - ''; - maintainers = with maintainers; [ raphaelr ]; - }; - }).overrideAttrs (attrs: { - nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ - autoPatchelfHook - ]; - buildInputs = (attrs.buildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ - stdenv.cc.cc - zlib - fontconfig # plugins/dotTrace/DotFiles/linux-*/libSkiaSharp.so - ]; - dontAutoPatchelf = true; - postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' - ( - cd $out/rider - - # Remove dotnet copy first so it's not considered by autoPatchElf - rm -rf lib/ReSharperHost/linux-*/dotnet - autoPatchelf \ - lib/ReSharperHost/linux-*/ \ - plugins/dotCommon/DotFiles/linux-*/ \ - plugins/dotTrace/DotFiles/linux-*/ - - for dir in lib/ReSharperHost/linux-*; do - ln -s ${dotnet-sdk_7} $dir/dotnet - done - ) - ''; - }); - - buildRubyMine = { pname, version, src, license, description, wmClass, buildNumber, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber; - product = "RubyMine"; - meta = with lib; { - homepage = "https://www.jetbrains.com/ruby/"; - inherit description license platforms; - longDescription = description; - maintainers = with maintainers; [ edwtjo tymscar ]; - }; - }); - - buildRustRover = { pname, version, src, license, description, wmClass, buildNumber, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber; - product = "RustRover"; - meta = with lib; { - homepage = "https://www.jetbrains.com/rust/"; - inherit description license platforms; - longDescription = description; - }; - }).overrideAttrs (attrs: { - nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ - autoPatchelfHook - ]; - buildInputs = (attrs.buildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ - python3 - stdenv.cc.cc - libdbusmenu - openssl.out - libxcrypt-legacy - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ - expat - libxml2 - xz - ]; - dontAutoPatchelf = true; - postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' - ( - cd $out/rust-rover - - # Copied over from clion (gdb seems to have a couple of patches) - ls -d $PWD/bin/gdb/linux/*/lib/python3.8/lib-dynload/* | - xargs patchelf \ - --replace-needed libssl.so.10 libssl.so \ - --replace-needed libcrypto.so.10 libcrypto.so +in +rec { + # Sorted alphabetically - ls -d $PWD/bin/lldb/linux/*/lib/python3.8/lib-dynload/* | - xargs patchelf \ - --replace-needed libssl.so.10 libssl.so \ - --replace-needed libcrypto.so.10 libcrypto.so + clion = (mkJetBrainsProduct { + pname = "clion"; + extraBuildInputs = lib.optionals (stdenv.isLinux) [ + python3 + stdenv.cc.cc + openssl + libxcrypt-legacy + musl + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + expat + libxml2 + xz + ]; + }).overrideAttrs (attrs: { + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' + ( + cd $out/clion + + # I think the included gdb has a couple of patches, so we patch it instead of replacing + ls -d $PWD/bin/gdb/linux/*/lib/python3.8/lib-dynload/* | + xargs patchelf \ + --replace-needed libssl.so.10 libssl.so \ + --replace-needed libcrypto.so.10 libcrypto.so + + ls -d $PWD/bin/lldb/linux/*/lib/python3.8/lib-dynload/* | + xargs patchelf \ + --replace-needed libssl.so.10 libssl.so \ + --replace-needed libcrypto.so.10 libcrypto.so + ) + ''; + }); + + datagrip = mkJetBrainsProduct { pname = "datagrip"; extraBuildInputs = [ stdenv.cc.cc ]; }; + + dataspell = let + libr = runCommand "libR" {} '' + mkdir -p $out/lib + ln -s ${R}/lib/R/lib/libR.so $out/lib/libR.so + ''; + in mkJetBrainsProduct { + pname = "dataspell"; + extraBuildInputs = [ libgcc libr stdenv.cc.cc ]; + }; - autoPatchelf $PWD/bin + gateway = mkJetBrainsProduct { pname = "gateway"; }; - interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper - chmod +x $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper - ) + goland = (mkJetBrainsProduct { + pname = "goland"; + extraWrapperArgs = [ + # fortify source breaks build since delve compiles with -O0 + ''--prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"'' + ]; + extraBuildInputs = [ libgcc stdenv.cc.cc ]; + }).overrideAttrs + (attrs: { + postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' + interp="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv + chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv ''; }); - buildWebStorm = { pname, version, src, license, description, wmClass, buildNumber, ... }: - (mkJetBrainsProduct { - inherit pname version src wmClass jdk buildNumber; - product = "WebStorm"; - meta = with lib; { - homepage = "https://www.jetbrains.com/webstorm/"; - inherit description license platforms; - longDescription = '' - WebStorm provides an editor for HTML, JavaScript (incl. Node.js), - and CSS with on-the-fly code analysis, error prevention and - automated refactorings for JavaScript code. - ''; - maintainers = with maintainers; [ abaldeau tymscar ]; - }; - }); + idea-community-bin = buildIdea { pname = "idea-community"; extraBuildInputs = [ stdenv.cc.cc ]; }; -in - -{ - # Sorted alphabetically - - clion = buildClion rec { - pname = "clion"; - version = products.clion.version; - buildNumber = products.clion.build_number; - description = "C/C++ IDE. New. Intelligent. Cross-platform"; - license = lib.licenses.unfree; - src = fetchurl { - url = products.clion.url; - sha256 = products.clion.sha256; - }; - wmClass = "jetbrains-clion"; - update-channel = products.clion.update-channel; - }; + idea-community-src = buildIdea { pname = "idea-community"; extraBuildInputs = [ stdenv.cc.cc ]; fromSource = true; }; - datagrip = buildDataGrip rec { - pname = "datagrip"; - version = products.datagrip.version; - buildNumber = products.datagrip.build_number; - description = "Your Swiss Army Knife for Databases and SQL"; - license = lib.licenses.unfree; - src = fetchurl { - url = products.datagrip.url; - sha256 = products.datagrip.sha256; - }; - wmClass = "jetbrains-datagrip"; - update-channel = products.datagrip.update-channel; - }; + idea-community = if stdenv.isDarwin || stdenv.isAarch64 then idea-community-bin else idea-community-src; - dataspell = buildDataSpell rec { - pname = "dataspell"; - version = products.dataspell.version; - buildNumber = products.dataspell.build_number; - description = "The IDE for Professional Data Scientists"; - license = lib.licenses.unfree; - src = fetchurl { - url = products.dataspell.url; - sha256 = products.dataspell.sha256; - }; - wmClass = "jetbrains-dataspell"; - update-channel = products.dataspell.update-channel; - }; + idea-ultimate = buildIdea { pname = "idea-ultimate"; extraBuildInputs = [ stdenv.cc.cc lldb musl ]; }; - gateway = buildGateway rec { - pname = "gateway"; - product = "JetBrains Gateway"; - version = products.gateway.version; - buildNumber = products.gateway.build_number; - description = "Your single entry point to all remote development environments"; - license = lib.licenses.unfree; - src = fetchurl { - url = products.gateway.url; - sha256 = products.gateway.sha256; - }; - wmClass = "jetbrains-gateway"; - update-channel = products.gateway.update-channel; - }; + mps = mkJetBrainsProduct { pname = "mps"; }; - goland = buildGoland rec { - pname = "goland"; - version = products.goland.version; - buildNumber = products.goland.build_number; - description = "Up and Coming Go IDE"; - license = lib.licenses.unfree; - src = fetchurl { - url = products.goland.url; - sha256 = products.goland.sha256; - }; - wmClass = "jetbrains-goland"; - update-channel = products.goland.update-channel; - }; + phpstorm = mkJetBrainsProduct { pname = "phpstorm"; extraBuildInputs = [ stdenv.cc.cc musl ]; }; - idea-community = buildIdea rec { - pname = "idea-community"; - product = "IntelliJ IDEA CE"; - version = products.idea-community.version; - buildNumber = products.idea-community.build_number; - description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; - license = lib.licenses.asl20; - src = fetchurl { - url = products.idea-community.url; - sha256 = products.idea-community.sha256; - }; - wmClass = "jetbrains-idea-ce"; - update-channel = products.idea-community.update-channel; - }; + pycharm-community-bin = buildPycharm { pname = "pycharm-community"; }; - idea-ultimate = buildIdea rec { - pname = "idea-ultimate"; - product = "IntelliJ IDEA"; - version = products.idea-ultimate.version; - buildNumber = products.idea-ultimate.build_number; - description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; - license = lib.licenses.unfree; - src = fetchurl { - url = products.idea-ultimate.url; - sha256 = products.idea-ultimate.sha256; - }; - wmClass = "jetbrains-idea"; - update-channel = products.idea-ultimate.update-channel; - }; + pycharm-community-src = buildPycharm { pname = "pycharm-community"; fromSource = true; }; - mps = buildMps rec { - pname = "mps"; - product = "MPS ${products.mps.version}"; - version = products.mps.version; - buildNumber = products.mps.build_number; - description = "Create your own domain-specific language"; - license = lib.licenses.asl20; - src = fetchurl { - url = products.mps.url; - sha256 = products.mps.sha256; - }; - wmClass = "jetbrains-mps"; - update-channel = products.mps.update-channel; - }; + pycharm-community = if stdenv.isDarwin then pycharm-community-bin else pycharm-community-src; - phpstorm = buildPhpStorm rec { - pname = "phpstorm"; - version = products.phpstorm.version; - buildNumber = products.phpstorm.build_number; - description = "Professional IDE for Web and PHP developers"; - license = lib.licenses.unfree; - src = fetchurl { - url = products.phpstorm.url; - sha256 = products.phpstorm.sha256; - }; - wmClass = "jetbrains-phpstorm"; - update-channel = products.phpstorm.update-channel; - }; + pycharm-professional = buildPycharm { pname = "pycharm-professional"; extraBuildInputs = [ musl ]; }; - pycharm-community = buildPycharm rec { - pname = "pycharm-community"; - product = "PyCharm CE"; - version = products.pycharm-community.version; - buildNumber = products.pycharm-community.build_number; - description = "PyCharm Community Edition"; - license = lib.licenses.asl20; - src = fetchurl { - url = products.pycharm-community.url; - sha256 = products.pycharm-community.sha256; - }; - wmClass = "jetbrains-pycharm-ce"; - update-channel = products.pycharm-community.update-channel; - }; + rider = (mkJetBrainsProduct { + pname = "rider"; + extraBuildInputs = [ + fontconfig + stdenv.cc.cc + openssl + libxcrypt + lttng-ust_2_12 + musl + ]; + }).overrideAttrs (attrs: { + postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.isLinux) '' + ( + cd $out/rider - pycharm-professional = buildPycharm rec { - pname = "pycharm-professional"; - product = "PyCharm"; - version = products.pycharm-professional.version; - buildNumber = products.pycharm-community.build_number; - description = "PyCharm Professional Edition"; - license = lib.licenses.unfree; - src = fetchurl { - url = products.pycharm-professional.url; - sha256 = products.pycharm-professional.sha256; - }; - wmClass = "jetbrains-pycharm"; - update-channel = products.pycharm-professional.update-channel; - }; + ls -d $PWD/plugins/cidr-debugger-plugin/bin/lldb/linux/*/lib/python3.8/lib-dynload/* | + xargs patchelf \ + --replace-needed libssl.so.10 libssl.so \ + --replace-needed libcrypto.so.10 libcrypto.so \ + --replace-needed libcrypt.so.1 libcrypt.so - rider = buildRider rec { - pname = "rider"; - version = products.rider.version; - buildNumber = products.rider.build_number; - description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; - license = lib.licenses.unfree; - src = fetchurl { - url = products.rider.url; - sha256 = products.rider.sha256; - }; - wmClass = "jetbrains-rider"; - update-channel = products.rider.update-channel; - }; + for dir in lib/ReSharperHost/linux-*; do + rm -rf $dir/dotnet + ln -s ${dotnet-sdk_7} $dir/dotnet + done + ) + ''; + }); - ruby-mine = buildRubyMine rec { - pname = "ruby-mine"; - version = products.ruby-mine.version; - buildNumber = products.ruby-mine.build_number; - description = "The Most Intelligent Ruby and Rails IDE"; - license = lib.licenses.unfree; - src = fetchurl { - url = products.ruby-mine.url; - sha256 = products.ruby-mine.sha256; - }; - wmClass = "jetbrains-rubymine"; - update-channel = products.ruby-mine.update-channel; - }; + ruby-mine = mkJetBrainsProduct { pname = "ruby-mine"; extraBuildInputs = [ stdenv.cc.cc musl ]; }; - rust-rover = buildRustRover rec { + rust-rover = (mkJetBrainsProduct { pname = "rust-rover"; - version = products.rust-rover.version; - buildNumber = products.rust-rover.build_number; - description = "Rust IDE"; - license = lib.licenses.unfree; - src = fetchurl { - url = products.rust-rover.url; - sha256 = products.rust-rover.sha256; - }; - wmClass = "jetbrains-rustrover"; - update-channel = products.rust-rover.update-channel; - }; + extraBuildInputs = lib.optionals (stdenv.isLinux) [ + python3 + openssl + libxcrypt-legacy + fontconfig + xorg.libX11 + libGL + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + expat + libxml2 + xz + ]; + }).overrideAttrs (attrs: { + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' + ( + cd $out/rust-rover + + # Copied over from clion (gdb seems to have a couple of patches) + ls -d $PWD/bin/gdb/linux/*/lib/python3.8/lib-dynload/* | + xargs patchelf \ + --replace-needed libssl.so.10 libssl.so \ + --replace-needed libcrypto.so.10 libcrypto.so + + ls -d $PWD/bin/lldb/linux/*/lib/python3.8/lib-dynload/* | + xargs patchelf \ + --replace-needed libssl.so.10 libssl.so \ + --replace-needed libcrypto.so.10 libcrypto.so - webstorm = buildWebStorm rec { - pname = "webstorm"; - version = products.webstorm.version; - buildNumber = products.webstorm.build_number; - description = "Professional IDE for Web and JavaScript development"; - license = lib.licenses.unfree; - src = fetchurl { - url = products.webstorm.url; - sha256 = products.webstorm.sha256; - }; - wmClass = "jetbrains-webstorm"; - update-channel = products.webstorm.update-channel; - }; + interp="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter $interp $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper + chmod +x $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper + ) + ''; + }); + + webstorm = mkJetBrainsProduct { pname = "webstorm"; extraBuildInputs = [ stdenv.cc.cc musl ]; }; - plugins = callPackage ./plugins { }; + plugins = callPackage ./plugins { } // { __attrsFailEvaluation = true; }; } diff --git a/pkgs/applications/editors/jetbrains/JetbrainsRemoteDev.patch b/pkgs/applications/editors/jetbrains/patches/jetbrains-remote-dev.patch index e525512fe495c..e525512fe495c 100644 --- a/pkgs/applications/editors/jetbrains/JetbrainsRemoteDev.patch +++ b/pkgs/applications/editors/jetbrains/patches/jetbrains-remote-dev.patch diff --git a/pkgs/applications/editors/jetbrains/patches/kotlinc-path.patch b/pkgs/applications/editors/jetbrains/patches/kotlinc-path.patch new file mode 100644 index 0000000000000..2106611bb4121 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/patches/kotlinc-path.patch @@ -0,0 +1,23 @@ +--- a/src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt ++++ b/src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt +@@ -14,19 +14,7 @@ + "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies" + + fun downloadAndExtractKotlinCompiler(communityRoot: BuildDependenciesCommunityRoot): Path { +- // We already have kotlin JPS in the classpath, fetch version from it +- val kotlincVersion = javaClass.classLoader.getResourceAsStream("META-INF/compiler.version") +- .use { inputStream -> inputStream!!.readAllBytes().decodeToString() } +- info("Kotlin compiler version is $kotlincVersion") +- +- val kotlincUrl = getUriForMavenArtifact( +- KOTLIN_IDE_MAVEN_REPOSITORY_URL, +- "org.jetbrains.kotlin", +- "kotlin-dist-for-ide", +- kotlincVersion, +- "jar") +- val kotlincDist = downloadFileToCacheLocation(communityRoot, kotlincUrl) +- val kotlinc = extractFileToCacheLocation(communityRoot, kotlincDist) ++ val kotlinc = Path.of("KOTLIN_PATH_HERE") + verbose("Kotlin compiler is at $kotlinc") + return kotlinc + } diff --git a/pkgs/applications/editors/jetbrains/patches/libdbm-headers.patch b/pkgs/applications/editors/jetbrains/patches/libdbm-headers.patch new file mode 100644 index 0000000000000..8c7805ff6bfd1 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/patches/libdbm-headers.patch @@ -0,0 +1,52 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,7 +2,7 @@ + project(dbm) + + include(CheckCXXSourceCompiles) +-include (CheckCXXCompilerFlag) ++include(CheckCXXCompilerFlag) + + check_cxx_compiler_flag(-fvisibility=hidden __DBUSMENU_HAVE_GCC_VISIBILITY) + if (__DBUSMENU_HAVE_GCC_VISIBILITY AND NOT WIN32) +@@ -19,27 +19,13 @@ + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") + endif (__DBUSMENU_HAVE_W_ALL) + +- +-find_library(LIB_GLIB NAMES glib libglib libglib-2.0.so.0) +-MESSAGE("LIB_GLIB: " ${LIB_GLIB}) +- +-find_library(LIB_GIO NAMES libgio-2.0.so.0) +-MESSAGE("LIB_GIO: " ${LIB_GIO}) +- +-find_library(LIB_GOBJ NAMES libgobject-2.0.so.0) +-MESSAGE("LIB_GOBJ: " ${LIB_GOBJ}) ++find_package(PkgConfig REQUIRED) ++pkg_search_module(GLIB REQUIRED glib-2.0) ++pkg_search_module(LIBDBUSMENU REQUIRED dbusmenu-glib-0.4) + + # use patched library, you may build it from https://github.com/JetBrains/libdbusmenu + set(LIB_DBUSMENU "${PROJECT_SOURCE_DIR}/libdbusmenu-glib.a") + +-set(GLIB_INCLUDE_DIRS /usr/include/glib-2.0 /usr/lib64/glib-2.0/include) +-set(DBUSMENU_GLIB_INCLUDE_DIRS /usr/include/libdbusmenu-glib-0.4) +- +-include_directories( +- ${GLIB_INCLUDE_DIRS} +- ${DBUSMENU_GLIB_INCLUDE_DIRS} +-) +- + set(CMAKE_C_STANDARD 11) + set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +@@ -47,7 +33,8 @@ + set(SOURCE_FILES DbusMenuWrapper.c) + + add_library(dbm SHARED ${SOURCE_FILES}) +-target_link_libraries(dbm ${LIB_GLIB} ${LIB_GIO} ${LIB_DBUSMENU} ${LIB_GOBJ}) ++target_link_libraries(dbm ${LIB_DBUSMENU} ${GLIB_LDFLAGS}) ++include_directories(dbm ${GLIB_INCLUDE_DIRS} ${LIBDBUSMENU_INCLUDE_DIRS}) + + if (TESTS_ENABLED) + find_library(LIB_GTK NAMES libgtk-3.so) diff --git a/pkgs/applications/editors/jetbrains/patches/no-download.patch b/pkgs/applications/editors/jetbrains/patches/no-download.patch new file mode 100644 index 0000000000000..4e3c4cd337255 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/patches/no-download.patch @@ -0,0 +1,128 @@ +--- a/build/deps/src/org/jetbrains/intellij/build/impl/BundledMavenDownloader.kt ++++ b/build/deps/src/org/jetbrains/intellij/build/impl/BundledMavenDownloader.kt +@@ -87,13 +87,13 @@ + } + val targetFile = root.resolve("${split[1]}-${split[2]}.jar") + val uri = BuildDependenciesDownloader.getUriForMavenArtifact( +- mavenRepository = BuildDependenciesConstants.MAVEN_CENTRAL_URL, ++ mavenRepository = "MAVEN_REPO_HERE", + groupId = split[0], + artifactId = split[1], + version = split[2], + packaging = "jar" + ) +- targetFile to downloadFileToCacheLocation(uri.toString(), communityRoot) ++ targetFile to Path.of(uri.toString()) + } + } + }.asSequence().map { it.getCompleted() }.toMap() +@@ -133,21 +133,6 @@ + } + + suspend fun downloadMavenDistribution(communityRoot: BuildDependenciesCommunityRoot): Path { +- val extractDir = communityRoot.communityRoot.resolve("plugins/maven/maven36-server-impl/lib/maven3") +- val properties = BuildDependenciesDownloader.getDependenciesProperties(communityRoot) +- val bundledMavenVersion = properties.property("bundledMavenVersion") +- mutex.withLock { +- val uri = BuildDependenciesDownloader.getUriForMavenArtifact( +- mavenRepository = BuildDependenciesConstants.MAVEN_CENTRAL_URL, +- groupId = "org.apache.maven", +- artifactId = "apache-maven", +- version = bundledMavenVersion, +- classifier = "bin", +- packaging = "zip" +- ) +- val zipPath = downloadFileToCacheLocation(uri.toString(), communityRoot) +- BuildDependenciesDownloader.extractFile(zipPath, extractDir, communityRoot, BuildDependenciesExtractOptions.STRIP_ROOT) +- } +- return extractDir ++ return Path.of("MAVEN_PATH_HERE") + } + } +--- a/platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt ++++ b/platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt +@@ -25,11 +25,7 @@ + } + + fun getJdkHome(communityRoot: BuildDependenciesCommunityRoot, os: OS, arch: Arch, infoLog: (String) -> Unit): Path { +- val jdkUrl = getUrl(communityRoot, os, arch) +- val jdkArchive = BuildDependenciesDownloader.downloadFileToCacheLocation(communityRoot, jdkUrl) +- val jdkExtracted = BuildDependenciesDownloader.extractFileToCacheLocation( +- communityRoot, jdkArchive, BuildDependenciesExtractOptions.STRIP_ROOT) +- infoLog("jps-bootstrap JDK is at $jdkExtracted") ++ val jdkExtracted = Path.of("JDK_PATH_HERE") + + val jdkHome: Path = if (os == OS.MACOSX) { + jdkExtracted.resolve("Contents").resolve("Home") +--- a/platform/build-scripts/src/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt ++++ b/platform/build-scripts/src/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt +@@ -43,12 +43,12 @@ + /** + * If `true` a separate *-no-jbr.tar.gz artifact without runtime will be produced. + */ +- var buildTarGzWithoutBundledRuntime = false ++ var buildTarGzWithoutBundledRuntime = true + + /** + * If `true`, the only *-no-jbr.tar.gz will be produced, no other binaries for Linux will be built. + */ +- var buildOnlyBareTarGz = false ++ var buildOnlyBareTarGz = true + + /** + * Set both properties if a .snap package should be produced. +--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt ++++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt +@@ -11,6 +11,7 @@ + import java.nio.file.Files + import java.nio.file.Path + import java.util.* ++import kotlin.io.path.readText + + private const val MARKETPLACE_BROKEN_PLUGINS_URL = "https://plugins.jetbrains.com/files/brokenPlugins.json" + +@@ -22,7 +23,7 @@ + + val allBrokenPlugins = try { + val jsonFormat = Json { ignoreUnknownKeys = true } +- val content = downloadAsText(MARKETPLACE_BROKEN_PLUGINS_URL) ++ val content = Path.of("BROKEN_PLUGINS_HERE").readText() + jsonFormat.decodeFromString(ListSerializer(MarketplaceBrokenPlugin.serializer()), content) + } + catch (e: Exception) { +--- a/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt ++++ b/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt +@@ -23,31 +23,11 @@ + + object KotlinCompilerDependencyDownloader { + fun downloadAndExtractKotlinCompiler(communityRoot: BuildDependenciesCommunityRoot): Path { +- val kotlinJpsPluginVersion = getKotlinJpsPluginVersion(communityRoot) +- val kotlinDistUrl = getUriForMavenArtifact(MAVEN_REPOSITORY_URL, ARTIFACT_GROUP_ID, "kotlin-dist-for-ide", kotlinJpsPluginVersion, "jar") +- val kotlinDistJar = downloadFileToCacheLocation(communityRoot, kotlinDistUrl) +- return extractFileToCacheLocation(communityRoot, kotlinDistJar) ++ return Path.of("KOTLIN_PATH_HERE") + } + + suspend fun downloadKotlinJpsPlugin(communityRoot: BuildDependenciesCommunityRoot): Path = withContext(Dispatchers.IO) { +- val kotlinJpsPluginVersion = getKotlinJpsPluginVersion(communityRoot) +- val kotlinJpsPluginUrl = getUriForMavenArtifact(MAVEN_REPOSITORY_URL, ARTIFACT_GROUP_ID, "kotlin-jps-plugin-classpath", kotlinJpsPluginVersion, "jar") +- +- val cacheLocation = getTargetFile(communityRoot, kotlinJpsPluginUrl.toString()) +- if (cacheLocation.exists()) { +- return@withContext cacheLocation +- } +- +- // Download file by hand since calling entire ktor/cio/coroutines stuff *before* loading JPS plugin into classpath +- // leads to funny kotlin-reflect failures later in Kotlin JPS plugin +- // Ideal solution would be to move compilation to other process altogether and do not modify current process classpath +- println(" * Downloading $kotlinJpsPluginUrl") +- val tmpLocation = Files.createTempFile(cacheLocation.parent, cacheLocation.name, ".tmp") +- suspendingRetryWithExponentialBackOff { +- FileUtils.copyURLToFile(kotlinJpsPluginUrl.toURL(), tmpLocation.toFile()) +- } +- Files.move(tmpLocation, cacheLocation, StandardCopyOption.ATOMIC_MOVE) +- return@withContext cacheLocation ++ return@withContext Path.of("JPS_PLUGIN_CLASSPATH_HERE") + } + + fun getKotlinJpsPluginVersion(communityRoot: BuildDependenciesCommunityRoot): String { diff --git a/pkgs/applications/editors/jetbrains/patches/pycharm-build-fix.patch b/pkgs/applications/editors/jetbrains/patches/pycharm-build-fix.patch new file mode 100644 index 0000000000000..f101876378221 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/patches/pycharm-build-fix.patch @@ -0,0 +1,41 @@ +--- a/python/build/src/PyCharmCommunityInstallersBuildTarget.kt ++++ b/python/build/src/PyCharmCommunityInstallersBuildTarget.kt +@@ -2,9 +2,11 @@ + + import kotlinx.coroutines.Dispatchers + import kotlinx.coroutines.runBlocking ++import org.jetbrains.intellij.build.BuildOptions + import org.jetbrains.intellij.build.BuildTasks + import org.jetbrains.intellij.build.IdeaProjectLoaderUtil + import org.jetbrains.intellij.build.impl.BuildContextImpl ++import org.jetbrains.intellij.build.pycharm.PyCharmBuildUtils + import org.jetbrains.intellij.build.pycharm.PyCharmCommunityProperties + + // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +@@ -12,13 +14,26 @@ + @JvmStatic + fun main(args: Array<String>) { + runBlocking(Dispatchers.Default) { ++ val options = BuildOptions().apply { ++ // we cannot provide consistent build number for PyCharm Community if it's built separately so use *.SNAPSHOT number to avoid confusion ++ buildNumber = null ++ ++ // do not bother external users about clean/incremental ++ // just remove out/ directory for clean build ++ incrementalCompilation = true ++ useCompiledClassesFromProjectOutput = false ++ buildStepsToSkip.addAll(listOf( ++ BuildOptions.MAC_SIGN_STEP, ++ )) ++ } + val communityHome = IdeaProjectLoaderUtil.guessCommunityHome(javaClass) + val context = BuildContextImpl.createContext( + communityHome = communityHome, + projectHome = communityHome.communityRoot, + productProperties = PyCharmCommunityProperties(communityHome.communityRoot), ++ options = options, + ) + BuildTasks.create(context).buildDistributions() + } + } + } diff --git a/pkgs/applications/editors/jetbrains/plugins/default.nix b/pkgs/applications/editors/jetbrains/plugins/default.nix index bf160e2aa3651..40c7fdbc18533 100644 --- a/pkgs/applications/editors/jetbrains/plugins/default.nix +++ b/pkgs/applications/editors/jetbrains/plugins/default.nix @@ -112,7 +112,7 @@ rec { sed "s|${ide.outPath}|$out|" \ -i $(realpath $out/bin/${meta.mainProgram}) \ -i $(realpath $out/bin/${meta.mainProgram}-remote-dev-server) - autoPatchelf $out/${meta.mainProgram}/bin + autoPatchelf $out ''; }; } diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 353d4a5d4b0b8..17e26e6bba5e7 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -17,16 +17,17 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip", - "232.10072.15": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.10072.31": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "232.10072.32": "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.83": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", - "233.8264.22": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip" + "232.10072.781": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip", + "233.11799.284": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip", + "233.11799.286": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip", + "233.11799.287": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip", + "233.11799.290": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip", + "233.11799.293": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip", + "233.11799.296": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip", + "233.11799.297": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip", + "233.11799.298": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip", + "233.11799.303": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip" }, "name": "ideavim" }, @@ -35,37 +36,19 @@ "idea-ultimate" ], "builds": { - "232.10072.27": "https://plugins.jetbrains.com/files/631/414912/python-232.10072.27.zip" + "233.11799.300": "https://plugins.jetbrains.com/files/631/453254/python-233.11799.300.zip" }, "name": "python" }, "6954": { "compatible": [ - "clion", - "datagrip", - "goland", "idea-community", "idea-ultimate", - "mps", - "phpstorm", - "pycharm-community", - "pycharm-professional", - "rider", - "ruby-mine", - "rust-rover", - "webstorm" + "mps" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/6954/381727/kotlin-plugin-223-1.9.10-release-459-IJ8836.35.zip", - "232.10072.15": null, - "232.10072.21": null, - "232.10072.27": null, - "232.10072.28": null, - "232.10072.31": null, - "232.10072.32": null, - "232.9921.42": null, - "232.9921.83": null, - "233.8264.22": null + "232.10072.781": "https://plugins.jetbrains.com/files/6954/442937/kotlin-plugin-232-1.9.21-release-633-IJ10072.27.zip", + "233.11799.300": null }, "name": "kotlin" }, @@ -86,16 +69,17 @@ "webstorm" ], "builds": { - "223.8836.1185": null, - "232.10072.15": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", - "232.10072.31": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", - "232.10072.32": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", - "232.9921.83": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip", - "233.8264.22": "https://plugins.jetbrains.com/files/6981/407738/ini-233.8264.9.zip" + "232.10072.781": null, + "233.11799.284": "https://plugins.jetbrains.com/files/6981/453409/ini-233.11799.300.zip", + "233.11799.286": "https://plugins.jetbrains.com/files/6981/453409/ini-233.11799.300.zip", + "233.11799.287": "https://plugins.jetbrains.com/files/6981/453409/ini-233.11799.300.zip", + "233.11799.290": "https://plugins.jetbrains.com/files/6981/453409/ini-233.11799.300.zip", + "233.11799.293": "https://plugins.jetbrains.com/files/6981/453409/ini-233.11799.300.zip", + "233.11799.296": "https://plugins.jetbrains.com/files/6981/453409/ini-233.11799.300.zip", + "233.11799.297": "https://plugins.jetbrains.com/files/6981/453409/ini-233.11799.300.zip", + "233.11799.298": "https://plugins.jetbrains.com/files/6981/453409/ini-233.11799.300.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/6981/453409/ini-233.11799.300.zip", + "233.11799.303": "https://plugins.jetbrains.com/files/6981/453409/ini-233.11799.300.zip" }, "name": "ini" }, @@ -105,8 +89,8 @@ "phpstorm" ], "builds": { - "232.10072.27": "https://plugins.jetbrains.com/files/7219/419684/Symfony_Plugin-2022.1.259.zip", - "232.10072.32": "https://plugins.jetbrains.com/files/7219/419684/Symfony_Plugin-2022.1.259.zip" + "233.11799.297": "https://plugins.jetbrains.com/files/7219/447835/Symfony_Plugin-2022.1.261.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/7219/447835/Symfony_Plugin-2022.1.261.zip" }, "name": "symfony-support" }, @@ -116,8 +100,8 @@ "phpstorm" ], "builds": { - "232.10072.27": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", - "232.10072.32": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" + "233.11799.297": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" }, "name": "php-annotations" }, @@ -130,10 +114,11 @@ "rust-rover" ], "builds": { - "232.10072.15": "https://plugins.jetbrains.com/files/7322/414919/python-ce-232.10072.27.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/7322/414919/python-ce-232.10072.27.zip", - "232.9921.83": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip", - "233.8264.22": "https://plugins.jetbrains.com/files/7322/405773/python-ce-233.8264.8.zip" + "233.11799.284": "https://plugins.jetbrains.com/files/7322/453268/python-ce-233.11799.300.zip", + "233.11799.286": "https://plugins.jetbrains.com/files/7322/453268/python-ce-233.11799.300.zip", + "233.11799.296": "https://plugins.jetbrains.com/files/7322/453268/python-ce-233.11799.300.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/7322/453268/python-ce-233.11799.300.zip", + "233.11799.303": "https://plugins.jetbrains.com/files/7322/453268/python-ce-233.11799.300.zip" }, "name": "python-community-edition" }, @@ -153,15 +138,16 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip", - "232.10072.15": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.10072.31": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "232.10072.32": "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.83": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip" + "232.10072.781": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "233.11799.286": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "233.11799.287": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "233.11799.290": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "233.11799.293": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "233.11799.296": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "233.11799.297": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "233.11799.298": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", + "233.11799.303": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip" }, "name": "-deprecated-rust" }, @@ -181,15 +167,16 @@ "webstorm" ], "builds": { - "223.8836.1185": null, - "232.10072.15": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.10072.31": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.10072.32": "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.83": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" + "232.10072.781": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "233.11799.286": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "233.11799.287": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "233.11799.290": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "233.11799.293": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "233.11799.296": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "233.11799.297": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "233.11799.298": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "233.11799.303": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" }, "name": "-deprecated-rust-beta" }, @@ -204,10 +191,11 @@ "webstorm" ], "builds": { - "232.10072.21": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", - "232.10072.31": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip" + "233.11799.286": "https://plugins.jetbrains.com/files/8554/445635/featuresTrainer-233.11799.172.zip", + "233.11799.290": "https://plugins.jetbrains.com/files/8554/445635/featuresTrainer-233.11799.172.zip", + "233.11799.293": "https://plugins.jetbrains.com/files/8554/445635/featuresTrainer-233.11799.172.zip", + "233.11799.298": "https://plugins.jetbrains.com/files/8554/445635/featuresTrainer-233.11799.172.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/8554/445635/featuresTrainer-233.11799.172.zip" }, "name": "ide-features-trainer" }, @@ -228,16 +216,17 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.10072.15": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.10072.31": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.10072.32": "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.83": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "233.8264.22": null + "232.10072.781": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", + "233.11799.284": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", + "233.11799.286": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", + "233.11799.287": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", + "233.11799.290": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", + "233.11799.293": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", + "233.11799.296": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", + "233.11799.297": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", + "233.11799.298": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", + "233.11799.303": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip" }, "name": "nixidea" }, @@ -246,7 +235,7 @@ "idea-ultimate" ], "builds": { - "232.10072.27": "https://plugins.jetbrains.com/files/9568/414896/go-plugin-232.10072.27.zip" + "233.11799.300": "https://plugins.jetbrains.com/files/9568/445967/go-plugin-233.11799.196.zip" }, "name": "go" }, @@ -267,16 +256,17 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/10037/417700/CSVEditor-3.2.2-223.zip", - "232.10072.15": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", - "232.10072.31": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", - "232.10072.32": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", - "232.9921.83": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip", - "233.8264.22": "https://plugins.jetbrains.com/files/10037/417702/CSVEditor-3.2.2-233.zip" + "232.10072.781": "https://plugins.jetbrains.com/files/10037/432491/CSVEditor-3.2.3-232.zip", + "233.11799.284": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", + "233.11799.286": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", + "233.11799.287": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", + "233.11799.290": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", + "233.11799.293": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", + "233.11799.296": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", + "233.11799.297": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", + "233.11799.298": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", + "233.11799.303": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip" }, "name": "csv-editor" }, @@ -297,16 +287,17 @@ "webstorm" ], "builds": { - "223.8836.1185": null, - "232.10072.15": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.10072.31": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.10072.32": "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.83": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "233.8264.22": "https://plugins.jetbrains.com/files/12062/405118/keymap-vscode-233.8264.3.zip" + "232.10072.781": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "233.11799.284": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", + "233.11799.286": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", + "233.11799.287": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", + "233.11799.290": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", + "233.11799.293": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", + "233.11799.296": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", + "233.11799.297": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", + "233.11799.298": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", + "233.11799.303": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip" }, "name": "vscode-keymap" }, @@ -327,16 +318,17 @@ "webstorm" ], "builds": { - "223.8836.1185": null, - "232.10072.15": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.10072.31": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.10072.32": "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.83": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "233.8264.22": "https://plugins.jetbrains.com/files/12559/405631/keymap-eclipse-233.8264.9.zip" + "232.10072.781": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "233.11799.284": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", + "233.11799.286": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", + "233.11799.287": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", + "233.11799.290": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", + "233.11799.293": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", + "233.11799.296": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", + "233.11799.297": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", + "233.11799.298": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", + "233.11799.303": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip" }, "name": "eclipse-keymap" }, @@ -357,16 +349,17 @@ "webstorm" ], "builds": { - "223.8836.1185": null, - "232.10072.15": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.10072.31": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.10072.32": "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.83": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "233.8264.22": "https://plugins.jetbrains.com/files/13017/405636/keymap-visualStudio-233.8264.9.zip" + "232.10072.781": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "233.11799.284": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", + "233.11799.286": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", + "233.11799.287": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", + "233.11799.290": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", + "233.11799.293": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", + "233.11799.296": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", + "233.11799.297": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", + "233.11799.298": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", + "233.11799.303": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip" }, "name": "visual-studio-keymap" }, @@ -387,16 +380,17 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.10072.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.10072.21": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.10072.27": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.10072.28": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.10072.31": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.10072.32": "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.83": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.8264.22": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "232.10072.781": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.11799.284": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.11799.286": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.11799.287": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.11799.290": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.11799.293": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.11799.296": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.11799.297": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.11799.298": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.11799.300": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.11799.303": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -417,16 +411,17 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", - "232.10072.15": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", - "232.10072.31": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", - "232.10072.32": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", - "232.9921.83": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip", - "233.8264.22": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip" + "232.10072.781": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip", + "233.11799.284": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip", + "233.11799.286": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip", + "233.11799.287": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip", + "233.11799.290": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip", + "233.11799.293": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip", + "233.11799.296": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip", + "233.11799.297": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip", + "233.11799.298": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip", + "233.11799.303": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip" }, "name": "github-copilot" }, @@ -447,16 +442,17 @@ "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.10072.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.10072.21": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.10072.27": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.10072.28": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.10072.31": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.10072.32": "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.83": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.8264.22": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "232.10072.781": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.11799.284": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.11799.286": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.11799.287": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.11799.290": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.11799.293": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.11799.296": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.11799.297": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.11799.298": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.11799.303": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -467,45 +463,38 @@ "rust-rover" ], "builds": { - "232.10072.27": "https://plugins.jetbrains.com/files/22407/414874/intellij-rust-232.18264.22.zip", - "232.9921.42": "https://plugins.jetbrains.com/files/22407/414874/intellij-rust-232.18264.22.zip", - "233.8264.22": "https://plugins.jetbrains.com/files/22407/414871/intellij-rust-233.18264.22.zip" + "233.11799.284": "https://plugins.jetbrains.com/files/22407/452893/intellij-rust-233.21799.284.zip", + "233.11799.287": "https://plugins.jetbrains.com/files/22407/452893/intellij-rust-233.21799.284.zip", + "233.11799.300": "https://plugins.jetbrains.com/files/22407/452893/intellij-rust-233.21799.284.zip" }, "name": "rust" } }, "files": { - "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip": "sha256-3bHSRhzvVO07mvuD6tpkiKFXTF66zCK/wpXFVb8IkfY=", - "https://plugins.jetbrains.com/files/10037/417700/CSVEditor-3.2.2-223.zip": "sha256-4Y/DZpCWKljaslJFsaqItq1DVJVVRlQjWpM6GLRo8QA=", - "https://plugins.jetbrains.com/files/10037/417702/CSVEditor-3.2.2-233.zip": "sha256-n4psF9fFFU8ohtbOndRx6i20EntjEzL3BvMObAZyOOw=", + "https://plugins.jetbrains.com/files/10037/432491/CSVEditor-3.2.3-232.zip": "sha256-H/LRD/5Q9qtYCq4CSonqQcJ4IcdefI/vg2Jlmc0vaJY=", + "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip": "sha256-qbQ2ArW1NcER+LbiVqpB+Sdmi5s78u8jfNmEb+2Nmrg=", "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=", - "https://plugins.jetbrains.com/files/12062/405118/keymap-vscode-233.8264.3.zip": "sha256-cB3DTeWhDgAwHlxwYogd0/DuYBzo5DqaRtBvEC/p8I4=", + "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip": "sha256-9keDJ73bSHkzAEq8nT96I5sp05BgMZ08/4BzarOjO5g=", "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=", - "https://plugins.jetbrains.com/files/12559/405631/keymap-eclipse-233.8264.9.zip": "sha256-d54ipHXOwl3AZD5k72s1vTHzevRA4v+WfGUItGtUIn8=", + "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip": "sha256-IsmoWuUroAp1LLuphp4F1dun4tQOOitZxoG+Nxs5pYk=", "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=", - "https://plugins.jetbrains.com/files/13017/405636/keymap-visualStudio-233.8264.9.zip": "sha256-A3qx1stw9cTaD/dUmJ8q4j7yLnlvdq6yINZGuA9zDBQ=", + "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip": "sha256-Nb2tSxL+mAY1qJ3waipgV8ep+0R/BaYnzz7zfwtLHmk=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", - "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=", - "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip": "sha256-eFKMFSkzQ0rJKuTUjFo8Yj5Z/mdGoF6REtpSqg/WkNc=", - "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip": "sha256-K+crYlCWZaHfBYXM4gFhEcEVW00EznfFibPo2ycAIAs=", + "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip": "sha256-MiF8MVWBEQqupoYyI+QOyXhSvJcoSgptePENByURphI=", + "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip": "sha256-JmME4MEN6nK1ueiz12VefCQHaE629jXYqYM5jxIyfGQ=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", - "https://plugins.jetbrains.com/files/22407/414871/intellij-rust-233.18264.22.zip": "sha256-5gTCC+3ZhxQtu2dxc1U5WuYY6NswaSs29n+EOnVn/1U=", - "https://plugins.jetbrains.com/files/22407/414874/intellij-rust-232.18264.22.zip": "sha256-V8xmXBe9R/lOyk6ryaUxCr9UCZTxDiFFp7iR9KH0G/A=", - "https://plugins.jetbrains.com/files/631/414912/python-232.10072.27.zip": "sha256-avd+FtL7thr3btczmG/d5tsXzi7pVLd6B1mQhL/U6ts=", - "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/407738/ini-233.8264.9.zip": "sha256-E3xWjwTxtLkOtm9748BbkKGaS4l8SlZOkj3w6VgqlFQ=", - "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip": "sha256-XIdhTQMxl/nJnntfQlHLlcyA79IS3hnGEGrXhKBFgY0=", - "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip": "sha256-eC5Zs6ph/4C3Xf6e07DfyqhBmsG3bAFLnvae1JiFzpE=", - "https://plugins.jetbrains.com/files/7219/419684/Symfony_Plugin-2022.1.259.zip": "sha256-3UxSPvEXXhAf3zYg2H/jja4F5fuDFWQ6SWFRvcWJ0Iw=", + "https://plugins.jetbrains.com/files/22407/452893/intellij-rust-233.21799.284.zip": "sha256-NKKCWf0g1k/20f2ZUAWlCT9EojXwUdo8wkozTLKgT14=", + "https://plugins.jetbrains.com/files/631/453254/python-233.11799.300.zip": "sha256-4CfaxRTO/GdTWYAnoz2TSqOGcsCKC7huNkJpCa8lhIU=", + "https://plugins.jetbrains.com/files/6954/442937/kotlin-plugin-232-1.9.21-release-633-IJ10072.27.zip": "sha256-fDIY4qolt/XZ3EMSKm3qCvrvknoLrxUd8XgiyMkYRto=", + "https://plugins.jetbrains.com/files/6981/453409/ini-233.11799.300.zip": "sha256-AGMs/SNFsWkcW+MD3SR+Qb6akdDdJJxCVY0PecVw1fU=", + "https://plugins.jetbrains.com/files/7219/447835/Symfony_Plugin-2022.1.261.zip": "sha256-aHD22UQFtBjT9g6ZUe+jGvmpNtYXSVnREm8vljFx2eM=", "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=", - "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip": "sha256-cr4LxSz8xVzC+Zm+6LnWGLbF6aGBVLW56crCIQOawhc=", - "https://plugins.jetbrains.com/files/7322/405773/python-ce-233.8264.8.zip": "sha256-LjN0BkcnX8mVHh2dPULddVwooi9fcABkrRVhTPA7XSo=", - "https://plugins.jetbrains.com/files/7322/414919/python-ce-232.10072.27.zip": "sha256-R+5/E65OaEZxHY4FBUJtJUvcNYfrNHKID497FNc/R3g=", - "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=", + "https://plugins.jetbrains.com/files/7322/453268/python-ce-233.11799.300.zip": "sha256-dJIGcrHJUXuZ4u8nAVfajCmpY1lk3W700uNXksLi38M=", "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/373256/intellij-rust-0.4.200.5421-232.zip": "sha256-NeAF3umfaSODjpd6J1dT8Ei5hF8g8OA+sgk7VjBodoU=", "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip": "sha256-pVwBEyUCx/DJET9uIm8vxFeChE8FskWyfLjDpfg2mAE=", - "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip": "sha256-HpdQdWJLTWuoYnHFmDB8JIlcuiu+hVfvUsRwvMcQqzw=", - "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip": "sha256-pq9gFDjNmgZAXe11f6SNdN6g0xu18h/06J5L2lxUwgk=", - "https://plugins.jetbrains.com/files/9568/414896/go-plugin-232.10072.27.zip": "sha256-uWAy/ugmFQBvYEQvSuuNS7xDYkzZgYGyQdSQbuvt0Lk=" + "https://plugins.jetbrains.com/files/8554/445635/featuresTrainer-233.11799.172.zip": "sha256-xN0FUCIa4KcqFAGwaOWf74qpIEY2f/QtksEeNTKG7zw=", + "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip": "sha256-Dwitpu5yLPWx+IUilpN5iqnN8FkKgaxUNjroBEx5lkM=", + "https://plugins.jetbrains.com/files/9568/445967/go-plugin-233.11799.196.zip": "sha256-d8O5VRNdw7ru20l0VOicVJRUcVxje5A2Gua1O9yXogM=" } } diff --git a/pkgs/applications/editors/jetbrains/plugins/tests.nix b/pkgs/applications/editors/jetbrains/plugins/tests.nix index 31c31ce3a7727..4b07cc5f8818c 100644 --- a/pkgs/applications/editors/jetbrains/plugins/tests.nix +++ b/pkgs/applications/editors/jetbrains/plugins/tests.nix @@ -24,4 +24,6 @@ paths = builtins.concatStringsSep " " ides; in writeText "jb-ides" paths; + + clion-with-vim = jetbrains.plugins.addPlugins jetbrains.clion [ "ideavim" ]; } diff --git a/pkgs/applications/editors/jetbrains/plugins/update_plugins.py b/pkgs/applications/editors/jetbrains/plugins/update_plugins.py index dee1c9ad6b40f..4b713c7dad92d 100755 --- a/pkgs/applications/editors/jetbrains/plugins/update_plugins.py +++ b/pkgs/applications/editors/jetbrains/plugins/update_plugins.py @@ -21,7 +21,7 @@ TOKENS = { } SNAPSHOT_VALUE = 99999 PLUGINS_FILE = Path(__file__).parent.joinpath("plugins.json").resolve() -IDES_FILE = Path(__file__).parent.joinpath("../versions.json").resolve() +IDES_FILE = Path(__file__).parent.joinpath("../bin/versions.json").resolve() # The plugin compatibility system uses a different naming scheme to the ide update system. # These dicts convert between them FRIENDLY_TO_PLUGIN = { diff --git a/pkgs/applications/editors/jetbrains/readme.md b/pkgs/applications/editors/jetbrains/readme.md new file mode 100644 index 0000000000000..a8a78007ed314 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/readme.md @@ -0,0 +1,65 @@ +This directory contains the build expressions needed to build any of the jetbrains IDEs. +The jdk is in `pkgs/development/compilers/jetbrains-jdk`. +To test the build process of every IDE (as well as the process for adding plugins), build `jetbrains.plugins.tests.default`. + +## How to use plugins: + - Get the ide you want and call `jetbrains.plugins.addPlugins` with a list of plugins you want to add. + - The list of plugins can be a list of ids or names (as in `plugins/plugins.json`) + - Example: `jetbrains.plugins.addPlugins jetbrains.pycharm-professional [ "nixidea" ]` + - The list can also contain a drv giving a `.jar` or `.zip` (this is how you use a plugin not added to nixpkgs) + +### How to add a new plugin to nixpkgs + - Find the page for the plugin on https://plugins.jetbrains.com + - Find the id (it's the number after https://plugins.jetbrains.com/plugin/) + - Run `plugins/update_plugins.py` add (plugin id) + - If binaries need patch or some other special treatment, add an entry to `plugins/specialPlugins.nix` + +## How to update stuff: + - Run ./bin/update_bin.py + - This will update binary IDEs and plugins, and automatically commit them + - Source builds need a bit more effort, as they aren't automated at the moment: + - Find the build of the stable release you want to target (usually different for pycharm and idea, should have three components) + - I find this at https://jetbrains.com/updates/updates.xml (search for `fullNumber`) + - Update the `buildVer` field in source/default.nix + - Empty the `ideaHash`, `androidHash` and `jpsHash` (only `ideaHash` changes on a regular basis) fields and try to build to get the new hashes + - Run `nix build .#jetbrains.(idea/pycharm)-community-source.src`, then `./source/build_maven.py source/idea_maven_artefacts.json result/` + - Update `source/brokenPlugins.json` (from https://plugins.jetbrains.com/files/brokenPlugins.json) + - Do a test build + - If it succeeds, make a PR/merge + - If it fails, ping/message GenericNerdyUsername + +## How to add an IDE: + - Make dummy entries in `bin/versions.json` (make sure to set the version to something older than the real one) + - Run `bin/update_bin.py` + - Add an entry in `bin/ides.json` + - Add an entry in `default.nix` + +### TODO: + - move/copy plugin docs to nixpkgs manual + - replace `libxcrypt-legacy` with `libxcrypt` when supported + - make `jetbrains-remote-dev.patch` cleaner + - is extraLdPath needed for IDEA? + - set meta.sourceProvenance for everything + - from source builds: + - remove timestamps in output `.jar` of `jps-bootstrap` + - automated update scripts + - fetch `.jar` s from stuff built in nixpkgs when available + - what stuff built in nixpkgs provides `.jar`s we care about? + - kotlin + - make `configurePhase` respect `$NIX_BUILD_CORES` + - make the subdir of the resulting tar.gz always have a release number (2023.2.2) instead of a build number (232.9921.89) + - jdk: + - build on darwin + - use chromium stuff built by nixpkgs for jcef? + - make `buildPhase` respect `$NIX_BUILD_CORES` + - automated update script? + - on `aarch64-linux`: + - test plugins + - from source build + - see if build (binary or source) works without expat + - on `x86_64-darwin`: + - test plugins + - from source build + - on `aarch64-darwin`: + - test plugins + - from source build diff --git a/pkgs/applications/editors/jetbrains/source/brokenPlugins.json b/pkgs/applications/editors/jetbrains/source/brokenPlugins.json new file mode 100644 index 0000000000000..73f47ae24f7d0 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/source/brokenPlugins.json @@ -0,0 +1 @@ +[{"id":"com.procyk.maciej.tcgenerator","version":"0.0.1","since":"202.*","until":"202.*","originalSince":"193.0","originalUntil":"202.*"},{"id":"com.github.xiaolyuh.mrtf-git-flow-4idea","version":"1.0.12","since":"181.0","until":"202.*","originalSince":"181.0","originalUntil":"302.*"},{"id":"Pythonid","version":"2016.1.145.86","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.phpuaca","version":"1.3.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.9.5","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.9","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Codota","version":"3.0.5","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Retrotranslator","version":"0.2.5","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"132.1045","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.8.3","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.vladsch.idea.multimarkdown","version":"1.4.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.intellij.clojure","version":"0.2.1.178","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"1.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"131.17","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Docker","version":"173.2605","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.php","version":"131.98","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.0.7","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"0.1.9","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"1.0.4","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"PythonCore","version":"2016.3.163.125","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.intellij.appcode-ui-designer","version":"1.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"1.7.5","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Pythonid","version":"2016.2.162.37","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Classic Icon","version":"1.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"0.3.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.9.3","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Codota","version":"3.0.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.covscript","version":"1.8.3","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.6.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.3","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.0.3","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"133.432","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.9.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.plugins.ruby","version":"8.0.0.20180821","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.0.8","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"PythonCore","version":"2016.2.162.37","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Pythonid","version":"2016.3.163.125","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"130.1494","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.php","version":"131.235","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"1.0.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.bitbucket.connector","version":"1.1.12","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.vuejs","version":"1.1.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.3.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Pythonid","version":"2016.1.145.266","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"0.1.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Node.js Remote Interpreter","version":"192.6262.9","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"PythonCore","version":"2017.1.171.4","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.alicannklc.codeigniter.snippets","version":"1.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.5.5","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.6","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.0.10","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Sencha Ext JS","version":"6.0.12.563","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"zielu.gittoolbox","version":"13.1.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Codota","version":"3.0.6","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.6.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.15","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"143.294","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.8.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.ice1000.julia","version":"0.1.8","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.92.145","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.vladsch.idea.multimarkdown","version":"1.4.7","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"1.3","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"143.147","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.0.4","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Pythonid","version":"2017.1.171.4","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.bitbucket.connector","version":"1.2.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"1.7.6","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Classic Icon","version":"1.3","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"0.2.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.8","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Codota","version":"3.0.3","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.intellij.swift","version":"144.SNAPSHOT","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Log Support","version":"1.0.11-11_and_newer","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.4","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.91.162","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.php","version":"131.205","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"132.835","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.8.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.0.9","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.22","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"1.4.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"143.379.14","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.0.6","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.vuejs","version":"1.0.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"0.1.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Classic Icon","version":"1.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"0.3.4","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.9.6","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"zielu.gittoolbox","version":"13.5.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Codota","version":"3.0.7","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Pythonid","version":"2016.1.145.234","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.93.171","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"who did it","version":"2018.2_20181029","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"1.5","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"133.239","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.5.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.0.5","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"1.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.php","version":"133.51","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.bitbucket.connector","version":"1.1.10","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Bazel","version":"2018.12.03.0.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.0.4","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.3","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"AEM Support","version":"0.7","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"0.1.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.9.4","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Codota","version":"3.0.4","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.5","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.91.145","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Pythonid","version":"2016.2.162.43","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"132.207","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.9.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.92.162","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"0.10.555","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.vladsch.idea.multimarkdown","version":"2.9.5","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"1.3.3","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"133.726","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.huawei.ide","version":"1.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.91","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.php","version":"133.326","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Pythonid","version":"2016.3.163.80","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"1.0.3","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.php","version":"131.332","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"0.7.1376","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.intellij.appcode-ui-designer","version":"1.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.7.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Classic Icon","version":"1.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"0.3.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.7","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"0.8.1615","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Codota","version":"3.0.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.7.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.0.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"PythonCore","version":"2016.2.162.43","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"JRebel for IntelliJ","version":"2019.1.6","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"1.6","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"130.549","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.6.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Dart","version":"0.5.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"1.0.1","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.php","version":"130.1176","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.bitbucket.connector","version":"1.2","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"org.vuejs","version":"1.0.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"Bazel","version":"2018.11.12.0.4","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.4","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.php","version":"133.679","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"0.3.0","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"net.nicoulaj.idea.markdown","version":"0.9.7","since":"181.1991","until":"181.1991","originalSince":"171.9119","originalUntil":null},{"id":"io.snyk.snyk-intellij-plugin","version":"0.2.3.102-develop","since":"191.0","until":"202","originalSince":"191.0","originalUntil":null},{"id":"SmartJump","version":"2020.10.1","since":"193","until":"211.0","originalSince":"181.0","originalUntil":"211.0"},{"id":"com.genuitec.codetogether","version":"3.0.0-00605","since":"192.*","until":"202.*","originalSince":"191.5532.39","originalUntil":null},{"id":"com.github.wangji92.arthas.plugin","version":"2.21","since":"182","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.intellij.plugins.thrift","version":"0.9.5","since":"145.1","until":"145.*","originalSince":"145.1","originalUntil":null},{"id":"com.intellij.plugins.thrift","version":"0.9.4","since":"132.1","until":"132.*","originalSince":"132.1","originalUntil":null},{"id":"com.intellij.plugins.thrift","version":"0.9.3","since":"132.1","until":"132.*","originalSince":"132.1","originalUntil":null},{"id":"com.intellij.plugins.thrift","version":"0.9.2","since":"132.1","until":"132.*","originalSince":"132.1","originalUntil":null},{"id":"com.intellij.plugins.thrift","version":"0.9","since":"132.1","until":"132.*","originalSince":"132.1","originalUntil":null},{"id":"tech.kinori.epsilon.grammars","version":"1.0.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.liuzhihang.doc-view","version":"1.0.1","since":"201.0","until":"202.*","originalSince":"201.0","originalUntil":"203.*"},{"id":"com.sharedaka.idea.swagger-helper","version":"0.0.4","since":"193.0","until":"","originalSince":"191.0","originalUntil":null},{"id":"com.intellj.plugin.SpringBootBannerPlugin","version":"0.2.7","since":"202.*","until":"202.*","originalSince":"202.7319","originalUntil":"202.*"},{"id":"com.intellj.plugin.SpringBootBannerPlugin","version":"0.2.6","since":"202.*","until":"202.*","originalSince":"202.7319","originalUntil":"202.*"},{"id":"Go To Implementation Plugin","version":"1.1.2","since":"193.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.common.collect.plugin.idea.box","version":"1.6.12","since":"201.0","until":"","originalSince":"183.0","originalUntil":null},{"id":"com.cap.generator.plugin.online","version":"1.0.0","since":"183.0","until":"","originalSince":"172.0","originalUntil":null},{"id":"cc.yyf.MarkDownNoteYYF","version":"1.0-SNAPSHOT","since":"193.7288.26","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.suiyiwen.plugin.idea.apidoc","version":"1.8-6","since":"182.0","until":"191.*","originalSince":"162.0","originalUntil":"191.*"},{"id":"vip.okfood.liam.plugin.i18n","version":"1.0.1","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.codeWithMe","version":"203.5981.5","since":"203.5981.5","until":"203.5981.5","originalSince":"203.5981","originalUntil":"203.5981.*"},{"id":"c0nstantx.phpstorm.silex.plugin.id","version":"1.0.1","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"c0nstantx.phpstorm.silex.plugin.id","version":"1.0.0","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"reasonml","version":"0.49","since":"143.0","until":"180.*","originalSince":"143.0","originalUntil":null},{"id":"reasonml","version":"0.48.1","since":"143.0","until":"180.*","originalSince":"143.0","originalUntil":null},{"id":"reasonml","version":"0.51","since":"143.0","until":"180.*","originalSince":"143.0","originalUntil":null},{"id":"reasonml","version":"0.55","since":"143.0","until":"180.*","originalSince":"143.0","originalUntil":null},{"id":"se.clau.intellij-lux","version":"1.0","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"se.clau.intellij-lux","version":"1.1","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"se.clau.intellij-lux","version":"1.2","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"se.clau.intellij-lux","version":"1.3","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"MultiHighlight","version":"2.1.0","since":"202.3","until":"","originalSince":"202.2","originalUntil":null},{"id":"com.dengzii.plugin.adb","version":"2.9","since":"193.7288.26","until":"","originalSince":"183.4284.148","originalUntil":null},{"id":"com.pandocker","version":"0.7","since":"201","until":"202.*","originalSince":"173.0","originalUntil":"202.*"},{"id":"com.thoughtworks.gauge","version":"0.3.4.nightly-2017-05-30","since":"163.0","until":"172.99999","originalSince":"163.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.4.nightly-2017-06-01","since":"163.0","until":"172.99999","originalSince":"163.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.4.nightly-2017-06-08","since":"163.0","until":"172.99999","originalSince":"163.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.4.nightly-2017-06-13","since":"163.0","until":"172.99999","originalSince":"163.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.4.nightly-2017-06-14","since":"163.0","until":"172.99999","originalSince":"163.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.4.nightly-2017-06-16","since":"163.0","until":"172.99999","originalSince":"163.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.5.nightly-2017-06-20","since":"163.0","until":"172.99999","originalSince":"163.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.5.nightly-2017-06-28","since":"163.0","until":"172.99999","originalSince":"163.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.5.nightly-2017-07-14","since":"163.0","until":"172.99999","originalSince":"163.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.5.nightly-2017-07-20","since":"163.0","until":"172.99999","originalSince":"163.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.5.nightly-2017-07-21","since":"163.0","until":"172.99999","originalSince":"163.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.5.nightly-2017-07-24","since":"163.0","until":"172.99999","originalSince":"163.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"8.1.30331","since":"90.10000","until":"117.105","originalSince":"90.10000","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"9.0.32570","since":"117.105","until":"143.2200","originalSince":"117.105","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"10.0.42318","since":"133.1800","until":"143.2200","originalSince":"133.1800","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"10.0.42241","since":"133.1800","until":"143.2200","originalSince":"133.1800","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"10.0.42538","since":"133.1800","until":"143.2200","originalSince":"133.1800","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"10.0.42576","since":"133.1800","until":"143.2200","originalSince":"133.1800","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2017.1.46654","since":"133.1800","until":"143.2200","originalSince":"133.1800","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2018.1.58406","since":"143.2200","until":"171.4249","originalSince":"143.2200","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2.1.05","since":"60.6000","until":"90.10000","originalSince":"60.6000","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"4.0.0.9103","since":"60.6000","until":"90.10000","originalSince":"60.6000","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"4.0.0.9140","since":"60.6000","until":"90.10000","originalSince":"60.6000","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"5.13550","since":"60.6000","until":"90.10000","originalSince":"60.6000","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"8.1.30332","since":"88.10000","until":"117.105","originalSince":"88.10000","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"9.1.37645","since":"117.105","until":"143.2200","originalSince":"117.105","originalUntil":null},{"id":"org.cacticouncil.amphibian","version":"1.0","since":"203.0","until":"","originalSince":"202.0","originalUntil":null},{"id":"com.github.odinggg.NewYapiUpload","version":"1.03","since":"183.*","until":"203.*","originalSince":"162.0","originalUntil":"203.*"},{"id":"com.isuwang.plugin","version":"2.1.6","since":"ui-193.0","until":"203.*","originalSince":"193.0","originalUntil":"203.*"},{"id":"com.github.ausmarton.cucumber-scala","version":"2019.3.1","since":"193.0","until":"203.0","originalSince":"193.0","originalUntil":""},{"id":"com.yonghui.httprunner.plugin.HttpRunnerEditor","version":"1.0.5","since":"203","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.yonghui.httprunner.plugin.HttpRunnerEditor","version":"1.0.4","since":"182","until":"","originalSince":"171.0","originalUntil":null},{"id":"dev.aid.commit-helper","version":"0.0.3","since":"145.0","until":"","originalSince":"135.0","originalUntil":null},{"id":"io.zhile.research.ide-eval-resetter","version":"2.1.10","since":"145.258","until":"145.258","originalSince":"145.258","originalUntil":null},{"id":"com.github.madwareru.intellijronremix","version":"0.1.4","since":"203.0","until":"203.*","originalSince":"201.0","originalUntil":"203.*"},{"id":"WS.CI.plugin","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"WS.CI.plugin","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.lsl.plugin","version":"1.0.0-release","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2020.2.85882","since":"193.1","until":"193.1","originalSince":"193.7288","originalUntil":null},{"id":"io.jmix.studio","version":"0.3.NIGHTLY495-202","since":"202.6250.13","until":"211","originalSince":"202.6250.13","originalUntil":null},{"id":"io.jmix.studio","version":"0.3.NIGHTLY496-202","since":"202.6250.13","until":"211","originalSince":"202.6250.13","originalUntil":null},{"id":"com.garawaa.unique.plugin.id","version":"0.1","since":"143.0","until":"194.0","originalSince":"143.0","originalUntil":null},{"id":"io.jmix.studio","version":"0.3.NIGHTLY497-202","since":"202.6250.13","until":"211","originalSince":"202.6250.13","originalUntil":null},{"id":"com.redhat.devtools.intellij.kubernetes","version":"0.1.0","since":"183.3975.18","until":"211","originalSince":"183.3975.18","originalUntil":null},{"id":"DeepBugsPython","version":"0.5","since":"201.0","until":"201.*","originalSince":"201.0","originalUntil":null},{"id":"DeepBugsPython","version":"0.4","since":"192.5728","until":"193.*","originalSince":"192.5728","originalUntil":"201.*"},{"id":"DeepBugsPython","version":"0.3","since":"192.5728","until":"193.*","originalSince":"192.5728","originalUntil":null},{"id":"DeepBugsPython","version":"0.2","since":"192.6603","until":"193.*","originalSince":"192.6603","originalUntil":null},{"id":"DeepBugsPython","version":"0.1","since":"181.0","until":"193.*","originalSince":"181.0","originalUntil":null},{"id":"io.jmix.studio","version":"0.3.NIGHTLY498-202","since":"202.6250.13","until":"211","originalSince":"202.6250.13","originalUntil":null},{"id":"com.sensei.solutions","version":"4.23.1","since":"162.0","until":"202","originalSince":"162.0","originalUntil":null},{"id":"com.github.mustfun.plugin.mybatis","version":"1.1.11","since":"193.4213","until":"202.*","originalSince":"191.4213","originalUntil":"202.*"},{"id":"cn.nucun.CodeChat","version":"1.0.2-SNAPSHOT","since":"201.0","until":"202.8194.8","originalSince":"191.0","originalUntil":null},{"id":"com.mesmer.plugin","version":"1.0-SNAPSHOT","since":"183.0","until":"201.*","originalSince":"145.0","originalUntil":"201.*"},{"id":"info.dong4j.idea.plugin.markdown.image.kit","version":"1.0.0","since":"191.0","until":"","originalSince":"183.0","originalUntil":null},{"id":"nl.rubensten.texifyidea","version":"0.7.4-alpha.2","since":"211.5538.10","until":"","originalSince":"203.5251.39","originalUntil":null},{"id":"CUBA","version":"15.0.NIGHTLY467-202","since":"202.6250.13","until":"211","originalSince":"202.6250.13","originalUntil":null},{"id":"CUBA","version":"15.0.NIGHTLY468-202","since":"202.6250.13","until":"211","originalSince":"202.6250.13","originalUntil":null},{"id":"dev.nocalhost.nocalhost-intellij-plugin","version":"0.0.5","since":"203.0","until":"211.0","originalSince":"203.0","originalUntil":null},{"id":"com.hjf.redis.manager.redis-manager","version":"1.1.7","since":"184.*","until":"301.*","originalSince":"183.*","originalUntil":"301.*"},{"id":"izhangzhihao.rainbow.brackets","version":"6.17","since":"202.8194.7","until":"","originalSince":"201.6668","originalUntil":null},{"id":"23.bytecode-disassembler","version":"1.0.9","since":"191.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.zoulejiu.mybatis.smart.plugin","version":"1.0.2","since":"192","until":"203.*","originalSince":"192.0","originalUntil":"203.*"},{"id":"com.delfi.xmobile","version":"1.0.0-dev","since":"193.5233.102","until":"","originalSince":"160.0","originalUntil":null},{"id":"CUBA","version":"15.0.NIGHTLY469-202","since":"202.6250.13","until":"211","originalSince":"202.6250.13","originalUntil":null},{"id":"com.fundtool.plugin.id","version":"1.5","since":"191","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.outbina.pogo","version":"1.0","since":"201.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.outbina.pogo","version":"1.0.1","since":"201.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.kimen.plugin","version":"1.1.1","since":"201.*","until":"203.*","originalSince":"173.*","originalUntil":"203.*"},{"id":"com.promyze.promyze_plugin","version":"2.1.1","since":"193.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"ArthasHotSwap","version":"1.2-2020.2.3.community-RELEASE","since":"172.0","until":"202.0","originalSince":"162.0","originalUntil":null},{"id":"com.dtyunxi.plugin.idea.x-maker","version":"1.0.6","since":"192","until":"","originalSince":"181.0","originalUntil":null},{"id":"org.anilmisirlioglu.keystroke.idea-keystroke-counter","version":"1.1.0","since":"203","until":"211.*","originalSince":"193.0","originalUntil":"211.*"},{"id":"com.ytanikin.datasetnavigator","version":"0.2","since":"202.*","until":"211.*","originalSince":"183.*","originalUntil":"211.*"},{"id":"me.mbolotov.cypress.pro","version":"2.0","since":"211.0","until":"211.*","originalSince":"201.0","originalUntil":"211.*"},{"id":"com.starxg.browserfx","version":"1.0.4","since":"173.0","until":"202","originalSince":"173.0","originalUntil":null},{"id":"com.starxg.browserfx","version":"1.1.0","since":"202.8","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.tulv.templateplugin","version":"1.0.2","since":"202.0","until":"203.*","originalSince":"201.0","originalUntil":"203.*"},{"id":"com.jetbrains.recommenders.twooh","version":"0.0.44-super-early-bird","since":"203.3.2","until":"211.*","originalSince":"203.3.2","originalUntil":"213.*"},{"id":"de.mariushoefler.flutter_enhancement_suite","version":"1.5.0","since":"203.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.kevinlinxp.sublimeSnippetsSupport","version":"1.3.0","since":"193.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.codesync","version":"1.4.0","since":"201.0","until":"203.*","originalSince":"171.0","originalUntil":"203.*"},{"id":"com.jetbrains.annotations.preloader","version":"1.0.3","since":"145","until":"212.2689","originalSince":"145","originalUntil":"212.2689"},{"id":"com.intellij.STAintellij.intellij_plugin","version":"21.3.214","since":"201.*","until":"211.*","originalSince":"173.3","originalUntil":"211.*"},{"id":"com.jetbrains.edu.kotlin","version":"3.1","since":"163.7743.44","until":"163.*","originalSince":"163.7743.44","originalUntil":"163.9999"},{"id":"com.jetbrains.edu.kotlin","version":"3.0.1","since":"162.1447","until":"162.*","originalSince":"162.1447","originalUntil":"162.9999"},{"id":"com.jetbrains.edu.kotlin","version":"3.0","since":"162.1447.26","until":"162.*","originalSince":"162.1447.26","originalUntil":"162.9999"},{"id":"com.jetbrains.edu.interactivelearning","version":"3.1","since":"163.7743.44","until":"163.*","originalSince":"163.7743.44","originalUntil":"163.9999"},{"id":"com.jetbrains.edu.interactivelearning","version":"3.0","since":"162.1447.26","until":"162.*","originalSince":"162.1447.26","originalUntil":"162.9999"},{"id":"com.intellij.scala.play2template","version":"0.42.25","since":"138.1283","until":"138.1695","originalSince":"138.1283","originalUntil":"139.0"},{"id":"com.intellij.scala.play2template","version":"0.42.23","since":"138.1283","until":"138.1695","originalSince":"138.1283","originalUntil":"139.0"},{"id":"com.intellij.scala.play2template","version":"0.40.20","since":"138.1029","until":"138.1695","originalSince":"138.1029","originalUntil":"139.0"},{"id":"com.intellij.scala.play2template","version":"0.40.18","since":"138.0","until":"138.1695","originalSince":"138.0","originalUntil":"139.0"},{"id":"XmlSearchAndReplace","version":"0.0.7","since":"111.69","until":"111.277","originalSince":"111.69","originalUntil":null},{"id":"XmlSearchAndReplace","version":"0.0.6","since":"96.1130","until":"111.0","originalSince":"96.1130","originalUntil":null},{"id":"XmlSearchAndReplace","version":"0.0.4","since":"96.1130","until":"111.0","originalSince":"96.1130","originalUntil":null},{"id":"XmlSearchAndReplace","version":"0.0.3","since":"96.1130","until":"111.0","originalSince":"96.1130","originalUntil":null},{"id":"org.example.IntelliJ Rekoder Plugin","version":"0.0.1","since":"203.0","until":"203.*","originalSince":"202.0","originalUntil":"203.*"},{"id":"com.bytedance.lynx","version":"0.0.1","since":"211.0","until":"","originalSince":"203.0","originalUntil":null},{"id":"com.github.lkqm.mongodoc-gen","version":"0.0.3","since":"201.0","until":"","originalSince":"191.0","originalUntil":null},{"id":"idea-yapi","version":"2.1.0","since":"203.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.smilingrob.gitpair","version":"1.0","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.smilingrob.gitpair","version":"1.1","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.smilingrob.gitpair","version":"1.2","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.zoulejiu.mybatis.smart.plugin","version":"1.1.2","since":"203.5981.155","until":"211.7442.40","originalSince":"202.1","originalUntil":"211.*"},{"id":"ConditionalOperatorConverter","version":"1.3","since":"","until":"93.1","originalSince":null,"originalUntil":"93.1"},{"id":"com.github.jisoo0817.hongbogtemplate","version":"1.0.1","since":"202.0","until":"211.*","originalSince":"201.0","originalUntil":"211.*"},{"id":"enseidler","version":"1.00","since":"192.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.goodforgod.dummymapper","version":"1.0.4","since":"202.0","until":"211.*","originalSince":"193.0","originalUntil":"211.*"},{"id":"com.itcodebox.leewyatt.notebooks.id","version":"1.01","since":"201.8743.12","until":"203.8084.24","originalSince":"201.8743.12","originalUntil":null},{"id":"com.speacode.video","version":"1.0.2","since":"2020.1.4","until":"","originalSince":"193.5233.102","originalUntil":null},{"id":"com.checkmarx.intellij","version":"9.00.21","since":"172","until":"","originalSince":"111.69","originalUntil":null},{"id":"com.intellij.appcode.kmm","version":"212-1.4.32-release-AC4321.37","since":"212.4321.37","until":"212.4321.*","originalSince":"212.4321","originalUntil":"212.4321.*"},{"id":"org.jetbrains.plugins.ninefix","version":"1.0.0","since":"202","until":"202.*","originalSince":"193.0","originalUntil":"202.*"},{"id":"chapter_reader","version":"1.0.5","since":"143.2370.31","until":"","originalSince":"141.3058","originalUntil":null},{"id":"leetcode-editor","version":"5.3","since":"163.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"leetcode-editor-pro","version":"2021.1.0","since":"202.0","until":"","originalSince":"163.0","originalUntil":null},{"id":"com.codebay.intellij-plugin","version":"1.0.0","since":"192","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.kindermax.intellijlets","version":"0.0.6","since":"201","until":"211.*","originalSince":"193.0","originalUntil":"211.*"},{"id":"org.tiandongbo.duowan.LayoutInspectorPr","version":"1.1","since":"2020.2.3","until":"","originalSince":"192.121","originalUntil":null},{"id":"org.tiandongbo.duowan.LayoutInspectorPr","version":"1.2","since":"192.121","until":"203.8084.24","originalSince":"192.121","originalUntil":null},{"id":"org.tiandongbo.duowan.LayoutInspectorPr","version":"1.0","since":"2021.1.2","until":"","originalSince":"192.121","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.39","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.37","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.36-20200210.141036","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.36-20200221.204548","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.36-20200221.210808","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.38-20200226.204103","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.38-20200319.011916","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.43-20200524.042104","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.43-20200523.221911","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.40-20200523.221752","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.40-20200522.020703","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.40-20200506.125454","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.40-20200505.131815","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.40-20200427.011009","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.38-20200331.003328","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.38-20200330.134803","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.38-20200323.191752","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"com.daveme.intellij.chocolateCakePHP","version":"0.7.0","since":"202.*","until":"211.*","originalSince":"193.0","originalUntil":null},{"id":"com.hd123.jetbrains.jira.workinghours","version":"1.0.193","since":"193","until":"201.0","originalSince":"183.0","originalUntil":"201.0"},{"id":"com.fz.strings.plugin.id","version":"1.0.9","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.misset.OMT","version":"4.9","since":"211.*","until":"212.*","originalSince":"203.5981","originalUntil":"212.*"},{"id":"training","version":"0.8.67","since":"173.0","until":"183.*","originalSince":"173.0","originalUntil":null},{"id":"CleverTap.CleverTap","version":"0.3","since":"201","until":"","originalSince":"201.*","originalUntil":null},{"id":"CleverTap.CleverTap","version":"0.2","since":"201","until":"","originalSince":"201.*","originalUntil":null},{"id":"one.goranson.logboot","version":"1.2","since":"193.0","until":"300.*","originalSince":"162.0","originalUntil":"300.*"},{"id":"com.ifengxue.plugin.jpa-support","version":"2.0.8-RC1","since":"193.7288.26","until":"","originalSince":"183.3795.13","originalUntil":null},{"id":"com.github.jrd77.codecheck.id","version":"1.1","since":"193.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.stepsize.tech-debt-reporter","version":"1.0.8-203+","since":"203.0","until":"","originalSince":"202.0","originalUntil":null},{"id":"io.buildman.Buildman","version":"0.7.5","since":"193","until":"","originalSince":"193.*","originalUntil":null},{"id":"AviatorScript","version":"2021.2","since":"212.*","until":"212.*","originalSince":"212.4746","originalUntil":"212.*"},{"id":"io.github.danthe1st.ij2gdocs","version":"1.1.0","since":"203.0","until":"212.*","originalSince":"202.0","originalUntil":"212.*"},{"id":"chapter_reader","version":"2.0.1","since":"143.2370.31","until":"213","originalSince":"143.2370.31","originalUntil":null},{"id":"com.gitlab.lae.intellij.actions.tree","version":"0.5.5","since":"212.5080","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.github.enokiy.go-struct-to-json-intellij-plugin","version":"1.0-SNAPSHOT","since":"203.0","until":"212.*","originalSince":"201.0","originalUntil":"212.*"},{"id":"edu.vub.ideAT","version":"2.0.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"edu.vub.ideAT","version":"2.0.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"edu.vub.ideAT","version":"2.0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"edu.vub.ideAT","version":"2.0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"edu.vub.ideAT","version":"2.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"edu.vub.ideAT","version":"2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"edu.vub.ideAT","version":"1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"edu.vub.ideAT","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.yusufugurozbek.testcontainers.port.updater","version":"0.0.5","since":"203.0","until":"212.*","originalSince":"202.0","originalUntil":"212.*"},{"id":"com.lx.xml2excel.conversion.action.Xml2ExcelBatchConversionTool","version":"1.0","since":"171","until":"","originalSince":"171.0","originalUntil":null},{"id":"ZsmpPlugin","version":"1.0.1","since":"193.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"dal-mpe","version":"1.192.202103","since":"181.5684.4","until":"","originalSince":"173.2099.1","originalUntil":null},{"id":"dal-mpe","version":"1.204.2106","since":"181.5684.4","until":"","originalSince":"173.2099.1","originalUntil":null},{"id":"dal-mpe","version":"1.202.2105","since":"181.5684.4","until":"","originalSince":"173.2099.1","originalUntil":null},{"id":"org.amdatu.idea","version":"1.0.1","since":"181.0","until":"181.0","originalSince":"181.0","originalUntil":null},{"id":"org.amdatu.idea","version":"1.0.2","since":"181.0","until":"181.0","originalSince":"181.0","originalUntil":null},{"id":"com.github.zzzj1233.yaml.checker","version":"1.0.0-alpha","since":"201","until":"","originalSince":"181.0","originalUntil":null},{"id":"io.github.newhoo.restkit","version":"1.0.6","since":"193.0","until":"202.*","originalSince":"191.0","originalUntil":"202.*"},{"id":"com.lansoft.custom_mybatis_plugin","version":"1.0.2-SNAPSHOT","since":"202.7319.50","until":"","originalSince":"191.8026.42","originalUntil":null},{"id":"com.sourceplusplus.plugin.intellij","version":"0.2.4","since":"191.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"com.alexey-anufriev.scopes-manager-intellij-plugin","version":"1.6.0","since":"203.*","until":"213.*","originalSince":"201.7223","originalUntil":"213.*"},{"id":"com.github.kawamataryo.copygithublink","version":"0.2.2","since":"212.*","until":"212.*","originalSince":"211.*","originalUntil":"212.*"},{"id":"org.river.nuls.contract.tool","version":"1.1.4.6","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.yapi.generator.qiyun.YApiImporter","version":"1.0.0","since":"181.*","until":"212.*","originalSince":"1.0","originalUntil":"212.*"},{"id":"com.capital.cloud.liufuqiang","version":"1.0.5","since":"203.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.1.9","since":"212.4746","until":"213.*","originalSince":"202.3824","originalUntil":"213.*"},{"id":"com.wsy.smartndkstack","version":"1.1","since":"202","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.google.developers.certification.tensorflow","version":"0.1.14","since":"213.0","until":"213.*","originalSince":"212.0","originalUntil":"213.*"},{"id":"com.AbsolCharles.plugin.id","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.synopsys.sig.desktop.idea","version":"2021.8.1.2487504","since":"193.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.blueline.idea.plugin.packagejar","version":"1.0.1","since":"203.0","until":"211.*","originalSince":"203.0","originalUntil":"212.*"},{"id":"com.jetbrains.TabFormat","version":"0.4","since":"203.0","until":"212.*","originalSince":"173.0","originalUntil":"212.*"},{"id":"com.github.beansoftapp.visualgc.plugin","version":"2021.3.0","since":"201.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.ingTools","version":"1.0.11","since":"183.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.ingTools","version":"20211125","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"yy-dev-tools","version":"2021.0.1","since":"211.0","until":"211.3.*","originalSince":"211.0","originalUntil":"213.*"},{"id":"nikolay2022.idea.plugin.drumroll","version":"1.0","since":"193.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.jetbrains.plugins.go","version":"213.5744.223","since":"213.5744.223","until":"213.*","originalSince":"213.5744","originalUntil":"213.*"},{"id":"com.stepsize.tech-debt-reporter","version":"1.12.1-203+","since":"203.0","until":"","originalSince":"202.0","originalUntil":null},{"id":"top.walterInKitchen.gitDiffShort","version":"1.0.8","since":"193.*","until":"212.*","originalSince":"191.*","originalUntil":"212.*"},{"id":"org.tonybaloney.security.pycharm-security","version":"1.25.0","since":"213.*","until":"221.*","originalSince":"211.*","originalUntil":"221.*"},{"id":"io.github.mudongjing.InjectClass.plugin.id","version":"1.0","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"InnerBuilder","version":"1.1.5","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"InnerBuilder","version":"1.1.2","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"cn.cloud.auto.restful.tool","version":"1.4.5","since":"212","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.billy.dubbo-box","version":"1.0.3","since":"193.0","until":"","originalSince":"183.0","originalUntil":null},{"id":"me.him188.kotlin-dynamic-delegation","version":"213-0.1.0-160.1-1","since":"201.0","until":"213.*","originalSince":"201.0","originalUntil":"225.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"6.0.0","since":"211.5581","until":"211.*","originalSince":"211.5538","originalUntil":"211.*"},{"id":"com.libra.plugin.JavaGenerate","version":"1.0.1-SNAPSHOT","since":"182.0","until":"214.0","originalSince":"181.0","originalUntil":"214.0"},{"id":"com.yanglx","version":"1.3.0","since":"183","until":"","originalSince":"171.3780.107","originalUntil":null},{"id":"coderead.IdeaPlugins.maven","version":"1.1","since":"172.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"com.github.cooker.cjava","version":"1.1.0","since":"202.0","until":"213","originalSince":"202.0","originalUntil":"213.*"},{"id":"com.mnw.stickyselection","version":"3.2","since":"203.0","until":"","originalSince":"191.0","originalUntil":null},{"id":"cn.vove7.ide.plugin.rest","version":"2.2.5","since":"182.0","until":"211","originalSince":"182.0","originalUntil":null},{"id":"cn.vove7.ide.plugin.rest","version":"2.2.4","since":"182.0","until":"211","originalSince":"182.0","originalUntil":null},{"id":"org.jetbrains.corda","version":"0.0.4","since":"212.0","until":"214.0","originalSince":"193.0","originalUntil":"214.0"},{"id":"com.study.plugin.translate","version":"1.0","since":"193.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"net.plpgsql.ideadebugger","version":"1.0.0-alpha","since":"213.0","until":"213.*","originalSince":"211.0","originalUntil":"213.*"},{"id":"github.com.cq1228.JCode5","version":"1.0-SNAPSHOT","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"github.com.cq1228.JCode5","version":"1.0","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.roomj.simpletitles","version":"1.4","since":"193.0","until":"","originalSince":"131.0","originalUntil":null},{"id":"com.chesterccw.excelreader","version":"2.1.1","since":"203.8084.24","until":"","originalSince":"201.6668.113","originalUntil":null},{"id":"org.reloadium","version":"0.6.0","since":"212.0","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.magento.idea.magento2plugin","version":"4.2.3-alpha-2022-02-01-18-46","since":"212.5080.55","until":"213.*","originalSince":"212.5080.55","originalUntil":null},{"id":"com.vk.admstorm","version":"0.0.1","since":"213","until":"213.*","originalSince":"203.0","originalUntil":null},{"id":"io.github.newhoo.restkit.ext.jax-rs","version":"1.0.0","since":"211.0","until":"211","originalSince":"211.0","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"2.0.0","since":"213.0","until":"","originalSince":"203.0","originalUntil":null},{"id":"org.metersphere.Metersphere","version":"1.0.5","since":"203.*","until":"213.*","originalSince":"173.*","originalUntil":"213.*"},{"id":"cn.wuzhizhan.idea.mybatis.free-idea-mybatis","version":"2022.02.28","since":"203.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"KeOnesWorkbench","version":"1.3","since":"172.0","until":"213.2","originalSince":"172.0","originalUntil":null},{"id":"com.josesamuel.logviewer","version":"3.3","since":"211","until":"","originalSince":"213.0","originalUntil":null},{"id":"io.jmix.studio","version":"0.3.NIGHTLY469-202","since":"202.6250.13","until":"211","originalSince":"202.6250.13","originalUntil":null},{"id":"se.clau.intellij-lux","version":"1.5","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.jin.beanStructure","version":"1.0.0","since":"211.*","until":"","originalSince":"203.0","originalUntil":null},{"id":"de.femtopedia.openocd","version":"0.1.4","since":"212.0","until":"213.*","originalSince":"203.0","originalUntil":"213.*"},{"id":"de.ax.powermode","version":"101.101","since":"211.0","until":"213.7172.25","originalSince":"211.0","originalUntil":null},{"id":"se.clau.intellij-lux","version":"1.7","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.tan.jutils.plugin.id","version":"1.0.4","since":"173.0","until":"213","originalSince":"173.0","originalUntil":null},{"id":"com.tan.jutils.plugin.id","version":"1.0.3","since":"192","until":"211","originalSince":"173.0","originalUntil":null},{"id":"software.amazon.smithy.intellij","version":"1.4.0","since":"213.0","until":"213.*","originalSince":"211.0","originalUntil":"213.*"},{"id":"org.easysoc.firrtl","version":"1.0.1","since":"193.0","until":"202.*","originalSince":"193.0","originalUntil":"203.*"},{"id":"com.haulmont.jpab","version":"0.1.SNAPSHOT2147-201","since":"201.6668.121","until":"203.*","originalSince":"201.6668.121","originalUntil":null},{"id":"com.haulmont.jpab","version":"0.1.SNAPSHOT2168-201","since":"201.6668.121","until":"203.*","originalSince":"201.6668.121","originalUntil":null},{"id":"com.haulmont.jpab","version":"0.2.SNAPSHOT2254-201","since":"201.6668.121","until":"203.*","originalSince":"201.6668.121","originalUntil":null},{"id":"com.haulmont.jpab","version":"0.2.ALPHA1-201","since":"201.6668.121","until":"203.*","originalSince":"201.6668.121","originalUntil":null},{"id":"com.haulmont.jpab","version":"3.2.1-211","since":"211.6432.0","until":"211.*","originalSince":"211.6432.0","originalUntil":null},{"id":"dev.eltonsandre.intellij.spring.assistant.plugin","version":"1.4.0","since":"211.0","until":"213.*","originalSince":"203.0","originalUntil":"213.*"},{"id":"dev.eltonsandre.intellij.spring.assistant.plugin","version":"1.4.1","since":"211.0","until":"213.*","originalSince":"203.0","originalUntil":"213.*"},{"id":"com.codeyzer","version":"1.3.3","since":"191.2147483647","until":"201.*","originalSince":"191.*","originalUntil":"201.*"},{"id":"com.codeyzer","version":"1.3.1","since":"191.2147483647","until":"201.*","originalSince":"191.*","originalUntil":"201.*"},{"id":"com.codeyzer","version":"1.3.0","since":"191.2147483647","until":"201.*","originalSince":"191.*","originalUntil":"201.*"},{"id":"com.codeyzer","version":"1.1.3","since":"191.2147483647","until":"201.*","originalSince":"191.*","originalUntil":"201.*"},{"id":"com.codeyzer","version":"1.1.1","since":"191.2147483647","until":"201.*","originalSince":"191.*","originalUntil":"201.*"},{"id":"com.github.grishberg.android.yamp","version":"29.03.22.0","since":"201.0","until":"211","originalSince":"201.0","originalUntil":null},{"id":"chapter_reader","version":"2.0.4","since":"145.*","until":"213.*","originalSince":"143.2370.31","originalUntil":"213.*"},{"id":"com.bash.cmd","version":"1.0.0","since":"193.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.danbai225.pwlchat","version":"0.1.4","since":"211.0","until":"221.*","originalSince":"203.0","originalUntil":"221.*"},{"id":"com.zhikan.agile.liga_plugin_intellij","version":"2.0.0","since":"211.0","until":"211.*","originalSince":"201.0","originalUntil":"211.*"},{"id":"com.sonatype.nexus-iq","version":"4.3.0-01","since":"212.0","until":"213.3","originalSince":"212.0","originalUntil":null},{"id":"me.foreverigor.streamtips","version":"1.0","since":"202.5800","until":"212.*","originalSince":"202.5800","originalUntil":null},{"id":"com.bamboo","version":"1.0.0","since":"211.0","until":"","originalSince":"213.0","originalUntil":null},{"id":"ru.mideev.mitheme","version":"1.0.0","since":"191.0","until":"221.0","originalSince":"191.0","originalUntil":null},{"id":"com.gitee.threefish.idea.plugins.rancher","version":"1.0","since":"211","until":"","originalSince":"193.5233.102","originalUntil":null},{"id":"com.hjf.redis.manager.redis-manager","version":"1.4.1","since":"193.*","until":"301.*","originalSince":"190.*","originalUntil":"301.*"},{"id":"com.bamboo","version":"1.0.1","since":"212.5","until":"","originalSince":"212.0","originalUntil":null},{"id":"com.bamboo","version":"1.0","since":"212.5","until":"","originalSince":"212.0","originalUntil":null},{"id":"intellij-scheme","version":"0.1.8","since":"133","until":"","originalSince":"103.0","originalUntil":null},{"id":"com.dlts.code.tools","version":"1.4","since":"203","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.dlts.code.tools","version":"1.3","since":"201","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.yk.company.table.md.id","version":"1.1","since":"193.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"com.yk.company.table.md.id","version":"1.2","since":"201.0","until":"","originalSince":"183.0","originalUntil":null},{"id":"OpenGL-Plugin","version":"0.9.4","since":"213.*","until":"213.*","originalSince":"213.0","originalUntil":"213.*"},{"id":"com.jetbrains.recommenders.twooh","version":"0.0.54-super-early-bird","since":"211.1","until":"213.*","originalSince":"203.3.2","originalUntil":"213.*"},{"id":"com.jetbrains.typoscript","version":"0.1.1","since":"126.319","until":"131.0","originalSince":"126.319","originalUntil":null},{"id":"com.jetbrains.typoscript","version":"0.1.0","since":"107.89","until":"126.319","originalSince":"107.89","originalUntil":null},{"id":"com.alayouni.ansiHighlight","version":"1.2.4","since":"163.0","until":"221.*","originalSince":"163.0","originalUntil":null},{"id":"org.gerryhjs.favacts","version":"1.0","since":"192.3000","until":"222","originalSince":"192.3000","originalUntil":null},{"id":"edu.vanderbilt.grader.tools","version":"1.1","since":"212","until":"212.*","originalSince":"203.0","originalUntil":"221.*"},{"id":"io.senya.editor.intellij.plugin","version":"1.2.2","since":"183.3647","until":"201.*","originalSince":"183.3647","originalUntil":null},{"id":"com.nasller.CodeGlancePro","version":"1.2.8","since":"203.6682.168","until":"213.7172.25","originalSince":"203.6682.168","originalUntil":null},{"id":"org.example.tool","version":"1.0.1","since":"200.0","until":"222.*","originalSince":"200.0","originalUntil":"299.*"},{"id":"com.qalens.corr","version":"1.1.0","since":"40.2020","until":"","originalSince":"40.2019","originalUntil":null},{"id":"com.github.mounthuaguo.monkeyking","version":"0.1.5","since":"221","until":"232.*","originalSince":"211.0","originalUntil":"232.*"},{"id":"com.byte_stefan.collect_util","version":"1.0-SNAPSHOT","since":"212.5712.43","until":"222.*","originalSince":"203.7717","originalUntil":"222.*"},{"id":"Infinitest","version":"5.3.0","since":"183","until":"","originalSince":"85.9732","originalUntil":null},{"id":"nl.rubensten.texifyidea","version":"0.7.21-alpha.2","since":"222.0","until":"","originalSince":"213.0","originalUntil":null},{"id":"com.mesour.intellij.latte","version":"1.0.0","since":"213.0","until":"222.*","originalSince":"213.0","originalUntil":"292.*"},{"id":"com.toocol.plugin.anisEscapeTooltip","version":"1.0.2","since":"201.0","until":"223.*","originalSince":"162.0","originalUntil":"223.*"},{"id":"me.oddlyoko.odoo","version":"0.0.2","since":"213.0","until":"221.*","originalSince":"210.0","originalUntil":"221.*"},{"id":"AutoYApi","version":"1.0.362","since":"192.0","until":"222.*","originalSince":"191.0","originalUntil":"222.*"},{"id":"com.intellij.rider.godot","version":"2020.3.44","since":"203.4818.10","until":"","originalSince":"203.0","originalUntil":null},{"id":"miniApp","version":"1.0.0","since":"191.0","until":"194","originalSince":"191.0","originalUntil":null},{"id":"miniApp","version":"1.0.4","since":"201.0","until":"","originalSince":"191.0","originalUntil":null},{"id":"com.github.houkunlin.database.generator","version":"2.6.1","since":"193","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.rookout.intellij-plugin","version":"1.16.0","since":"193.5233.102","until":"193.*","originalSince":"193.5233.102","originalUntil":null},{"id":"com.rookout.intellij-plugin","version":"1.15.0","since":"193.5233.102","until":"193.*","originalSince":"193.5233.102","originalUntil":null},{"id":"com.rookout.intellij-plugin","version":"1.14.0","since":"193.5233.102","until":"193.*","originalSince":"193.5233.102","originalUntil":null},{"id":"com.rookout.intellij-plugin","version":"1.13.0","since":"193.5233.102","until":"193.*","originalSince":"193.5233.102","originalUntil":null},{"id":"com.rookout.intellij-plugin","version":"0.4.0-alpha","since":"221.*","until":"","originalSince":"212.0","originalUntil":null},{"id":"com.triple.tools.plugins.dbmerger","version":"1.0","since":"173.0","until":"213.3","originalSince":"173.0","originalUntil":null},{"id":"dev.buijs.klutter.jetbrains","version":"0.2.3","since":"221.0","until":"222.*","originalSince":"212.0","originalUntil":"222.*"},{"id":"com.jetbrains.rider.plugins.ilruntimedebugger","version":"213.2.2","since":"213.5744","until":"213.5744","originalSince":"213.5744","originalUntil":"213.*"},{"id":"com.mybatis.smart.pro.plugin","version":"2022.2.4","since":"213.7172.25","until":"221.*","originalSince":"212.4746.92","originalUntil":"221.*"},{"id":"merger4ideaPlugin","version":"2.2.4","since":"170.0.0","until":"201.4865.12","originalSince":"170.0.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"2.2.5","since":"170.0.0","until":"201.4865.12","originalSince":"170.0.0","originalUntil":null},{"id":"com.github.lzy.lets-hotfix-idea-plugin","version":"0.0.15","since":"181.*","until":"999.*","originalSince":"162.539.11","originalUntil":"999.*"},{"id":"com.v","version":"1.0.0","since":"201.8743","until":"201.8743","originalSince":"201.0","originalUntil":"203.*"},{"id":"com.hz.ypzj.djy.easy.fbi","version":"1.0.1","since":"192.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"F9FrameWorkSupport","version":"1.4","since":"201.7846.76","until":"201.7846.76","originalSince":"173.0","originalUntil":null},{"id":"com.haulmont.rcb","version":"0.1.SNAPSHOT12-211","since":"212.5080","until":"","originalSince":"211.7628","originalUntil":null},{"id":"slinky.core.intellij","version":"0.6.8","since":"203.6682.168","until":"220.0.0","originalSince":"203.6682.168","originalUntil":"999.9999.999"},{"id":"com.hd123.jetbrains.jira.workinghours","version":"1.1","since":"193.0","until":"201.0","originalSince":"183.0","originalUntil":"201.0"},{"id":"sql-json-to-go-struct","version":"1.0.8.2","since":"184.0","until":"202.*","originalSince":"141.0","originalUntil":"202.*"},{"id":"cn.mama.pregnant","version":"1.0","since":"203","until":"211.*","originalSince":"191.0","originalUntil":"211.*"},{"id":"com.ciii.bob.plugin.android.adbwifi","version":"1.7.1","since":"203.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"sk.tuke.kpi.arena.intellij","version":"0.4.0","since":"212.5712","until":"213.*","originalSince":"203.5981","originalUntil":"213.*"},{"id":"sk.tuke.kpi.arena.intellij","version":"0.4.0-SNAPSHOT-20220118-175444","since":"212.5712","until":"213.*","originalSince":"203.5981","originalUntil":"213.*"},{"id":"com.github.vitalibo.bitbake-intellij-plugin","version":"1.1","since":"203.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.tuqi.Byr","version":"1.1","since":"203.0","until":"223.*","originalSince":"202.0","originalUntil":"223.*"},{"id":"org.gerryhjs.favacts","version":"1.1","since":"201.*","until":"","originalSince":"192.3000","originalUntil":null},{"id":"com.gerry.redis.en","version":"1.0","since":"201","until":"","originalSince":"201.8743.12","originalUntil":null},{"id":"org.example.my-first-plugin","version":"1.0.3","since":"213","until":"222.*","originalSince":"213.0","originalUntil":"222.*"},{"id":"org.example.tool","version":"1.0.0","since":"200.0","until":"222.*","originalSince":"200.0","originalUntil":"299.*"},{"id":"org.example.tool","version":"1.1.0","since":"200.0","until":"222.*","originalSince":"200.0","originalUntil":"299.*"},{"id":"org.example.tool","version":"1.1.1","since":"200.0","until":"222.*","originalSince":"200.0","originalUntil":"299.*"},{"id":"org.example.tool","version":"1.1.2","since":"200.0","until":"222.*","originalSince":"200.0","originalUntil":"299.*"},{"id":"org.example.tool","version":"1.2.0","since":"200.0","until":"222.*","originalSince":"200.0","originalUntil":"299.*"},{"id":"com.redhat.devtools.intellij.quarkus","version":"0.0.1","since":"183.0","until":"","originalSince":"173.2099.1","originalUntil":null},{"id":"org.asciidoctor.intellij.asciidoc","version":"0.31.1","since":"202.0","until":"","originalSince":"193.5662","originalUntil":null},{"id":"org.asciidoctor.intellij.asciidoc","version":"0.30.80","since":"193.5662","until":"202.0","originalSince":"193.5662","originalUntil":null},{"id":"org.asciidoctor.intellij.asciidoc","version":"0.30.81","since":"193.5662","until":"202.0","originalSince":"193.5662","originalUntil":null},{"id":"org.asciidoctor.intellij.asciidoc","version":"0.30.82","since":"193.5662","until":"202.0","originalSince":"193.5662","originalUntil":null},{"id":"FileAssociations","version":"1.0","since":"111","until":"223.*","originalSince":null,"originalUntil":null},{"id":"io.codelink.plugins.jetbrains","version":"1.0.1","since":"212","until":"222.*","originalSince":"203.0","originalUntil":"222.*"},{"id":"UDCv2","version":"2.0.1","since":"193","until":"","originalSince":"191.*","originalUntil":null},{"id":"cn.neday.excavator","version":"1.8","since":"192.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.google.home.ide","version":"0.2.8-prod+0.5","since":"212.0","until":"","originalSince":"211.0","originalUntil":null},{"id":"icu.weboys.SundriesPlugin","version":"1.0.1","since":"222.*","until":"222.*","originalSince":"222.3739","originalUntil":"222.*"},{"id":"chapter_reader","version":"2.1.3","since":"145.*","until":"202.*","originalSince":"145.*","originalUntil":"213.*"},{"id":"chapter_reader","version":"2.1.3-203-last","since":"203","until":"","originalSince":"203.0","originalUntil":null},{"id":"com.zenuml.jetbrains","version":"2021.4","since":"212.4746.92","until":"","originalSince":"202.6397.94","originalUntil":null},{"id":"com.zenuml.jetbrains","version":"2021.3","since":"202.6397.94","until":"211.7628.21","originalSince":"202.6397.94","originalUntil":null},{"id":"com.zenuml.jetbrains","version":"2020.2","since":"202.6397.94","until":"202.8194","originalSince":"202.6397.94","originalUntil":null},{"id":"com.zenuml.jetbrains","version":"2019.1.3","since":"191.6707.31","until":"201.8743.12","originalSince":"191.6707.31","originalUntil":null},{"id":"com.zenuml.jetbrains","version":"2019.1.2","since":"191.6707.31","until":"201.8743.12","originalSince":"191.6707.31","originalUntil":null},{"id":"com.zenuml.jetbrains","version":"1.0.1","since":"191.6707.31","until":"201.8743.12","originalSince":"191.6707.31","originalUntil":null},{"id":"com.zenuml.jetbrains","version":"1.0.0","since":"191.6707.31","until":"201.8743.12","originalSince":"191.6707.31","originalUntil":null},{"id":"Kunpeng Foundation","version":"2.2.5","since":"201.6668.113","until":"203.*","originalSince":"201.6668.113","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.6.2","since":"123.72","until":"139.0","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.6.1","since":"123.72","until":"139.0","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.5.0","since":"123.72","until":"139.0","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.4.0","since":"123.72","until":"139.0","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.3.2","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.3.0","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.3.0-RC.1","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.2","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.1","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.1-RC2","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.1-RC1","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.0","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.0-RC5","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.0-RC4","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.0-RC3","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.0-RC2","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.0-RC1","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.1.1","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.1.0","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.1.0-RC.2","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.1.0-RC.1","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.nodesecurity","version":"0.2.0","since":"123.72","until":"212","originalSince":"123.72","originalUntil":null},{"id":"io.github.md2conf.idea-markdown-copy-as-plugin","version":"0.0.4","since":"213.0","until":"998.0","originalSince":"213.0","originalUntil":"999.0"},{"id":"com.xxkj.zjxDevTools","version":"1.1-SNAPSHOT","since":"212.0","until":"221.*","originalSince":"212.0","originalUntil":"222.*"},{"id":"com.hiberbee.intellij.hiberbee-theme","version":"2022.11.19.0023","since":"191","until":"","originalSince":"223.0","originalUntil":null},{"id":"com.foldright.auto-pipeline.auto-pipeline-idea-plugin","version":"0.1.0","since":"221.0","until":"223.*","originalSince":"213.0","originalUntil":"223.*"},{"id":"com.jetbrains.gerryPurpleTheme","version":"1.8","since":"191.0","until":"211.*","originalSince":"191.0","originalUntil":null},{"id":"com.jetbrains.gerryPurpleTheme","version":"3.5","since":"191.0","until":"211.*","originalSince":"191.0","originalUntil":"221.*"},{"id":"20485","version":"4.4.3","since":"","until":"","originalSince":null,"originalUntil":null},{"id":"com.jetbrains.gerryPurpleTheme","version":"2.3","since":"191.0","until":"211.*","originalSince":"191.0","originalUntil":null},{"id":"com.jetbrains.gerryPurpleTheme","version":"3.16","since":"191.0","until":"211.*","originalSince":"191.0","originalUntil":"222.*"},{"id":"com.jetbrains.gerryPurpleTheme","version":"3.17","since":"191.0","until":"211.*","originalSince":"191.0","originalUntil":"311.*"},{"id":"com.jetbrains.gerryPurpleTheme","version":"3.15","since":"191.0","until":"211.*","originalSince":"191.0","originalUntil":"222.*"},{"id":"ConcurrentChecker","version":"2021.3","since":"213.0","until":"213.2","originalSince":"213.0","originalUntil":"213.7"},{"id":"com.google.gct.core","version":"0.9.2.3-beta","since":"143.1821","until":"143.*","originalSince":"143.1821","originalUntil":null},{"id":"com.google.gct.core","version":"0.9.7-beta","since":"143.2370","until":"143.*","originalSince":"143.2370","originalUntil":null},{"id":"com.google.gct.core","version":"0.9.6-beta","since":"143.1821","until":"143.*","originalSince":"143.1821","originalUntil":null},{"id":"com.google.gct.core","version":"0.9.7.5-beta","since":"143.2370","until":"143.*","originalSince":"143.2370","originalUntil":null},{"id":"com.google.gct.core","version":"1.0-BETA-0.2","since":"143.2370","until":"143.*","originalSince":"143.2370","originalUntil":null},{"id":"com.google.gct.core","version":"0.9.2.4-beta","since":"143.1821","until":"143.*","originalSince":"143.1821","originalUntil":null},{"id":"com.google.gct.core","version":"0.9.3-beta","since":"143.1821","until":"143.*","originalSince":"143.1821","originalUntil":null},{"id":"com.google.gct.core","version":"0.9.4-beta","since":"143.1821","until":"143.*","originalSince":"143.1821","originalUntil":null},{"id":"com.google.gct.core","version":"0.9.7.2-beta","since":"143.2370","until":"143.*","originalSince":"143.2370","originalUntil":null},{"id":"com.google.gct.core","version":"16.10.4","since":"143.2370","until":"143.*","originalSince":"143.2370","originalUntil":null},{"id":"com.google.gct.core","version":"16.10.5","since":"143.2370","until":"143.*","originalSince":"143.2370","originalUntil":null},{"id":"com.google.gct.core","version":"16.11.6","since":"143.2370","until":"143.*","originalSince":"143.2370","originalUntil":null},{"id":"com.google.gct.core","version":"20.5.1","since":"192.0","until":"201.*","originalSince":"192.0","originalUntil":"202.*"},{"id":"com.pqixing.modularization.idea","version":"2.2.0","since":"201","until":"","originalSince":"181.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"2.2.6","since":"170.0.0","until":"201.4865.12","originalSince":"170.0.0","originalUntil":null},{"id":"SidePanelSwitcher","version":"1.0.0","since":"201.*","until":"221.*","originalSince":"191.0","originalUntil":"221.*"},{"id":"vin.plugins.pom","version":"1.0.0","since":"211.0","until":"233.*","originalSince":"201.0","originalUntil":"233.*"},{"id":"com.gerry.redis","version":"2.4","since":"211","until":"311.*","originalSince":"201.8743.12","originalUntil":"311.*"},{"id":"com.gerry.redis","version":"2.1","since":"211","until":"311.*","originalSince":"201.8743.12","originalUntil":"311.*"},{"id":"com.gerry.redis","version":"2.0","since":"211","until":"222.*","originalSince":"201.8743.12","originalUntil":"311.*"},{"id":"com.gerry.redis","version":"2.5","since":"211","until":"311.*","originalSince":"201.8743.12","originalUntil":null},{"id":"com.gerry.redis","version":"2.3","since":"211","until":"311.*","originalSince":"201.8743.12","originalUntil":"311.*"},{"id":"com.gerry.redis","version":"2.2","since":"211","until":"311.*","originalSince":"201.8743.12","originalUntil":"311.*"},{"id":"com.github.camork.fix.fileExpander","version":"1.7.3","since":"192.*","until":"","originalSince":"173.0","originalUntil":null},{"id":"top.fallenangel.jimmer-generator","version":"0.2.0","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"top.fallenangel.jimmer-generator","version":"0.1.1","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"top.fallenangel.jimmer-generator","version":"0.1.0","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"top.fallenangel.jimmer-generator","version":"0.0.2","since":"213.0","until":"222.*","originalSince":"213.0","originalUntil":"223.*"},{"id":"top.fallenangel.jimmer-generator","version":"0.0.1","since":"213.0","until":"222.*","originalSince":"213.0","originalUntil":"223.*"},{"id":"com.tinyweb.dm-mdx-editor-idea-plugin","version":"1.0-SNAPSHOT","since":"213.*","until":"223.*","originalSince":"213.0","originalUntil":"223.*"},{"id":"com.github.zxj5470.wxapp","version":"0.2.0","since":"183.0","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.huawei.ide","version":"1.2.1","since":"181.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.huawei.ide","version":"1.2.2","since":"181.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.huawei.ide","version":"1.2.3","since":"181.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.huawei.ide","version":"1.2.4","since":"181.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.huawei.ide","version":"2.0.201901","since":"181.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.huawei.ide","version":"2.0.2019011","since":"181.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.huawei.ide","version":"2.0.2019020","since":"181.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.huawei.ide","version":"2.0.2019040","since":"181.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.weex.darin","version":"1.0","since":"141.2147483647","until":"","originalSince":"141.*","originalUntil":null},{"id":"com.weex.darin","version":"1.1","since":"141.2147483647","until":"","originalSince":"141.*","originalUntil":null},{"id":"cn.kevin.mybatis.hepler","version":"1.2.1","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"net.kenro.ji.jin.intellij.purescript","version":"v0.65.0","since":"223.0","until":"223.*","originalSince":"221.0","originalUntil":"223.*"},{"id":"fr.devcafeine.implement_interface_dart","version":"0.1.0","since":"222.0","until":"222.*","originalSince":"212.0","originalUntil":"222.*"},{"id":"12589","version":"64340","since":"","until":"","originalSince":null,"originalUntil":null},{"id":"12453","version":"62874","since":"","until":"","originalSince":null,"originalUntil":null},{"id":"com.profoundinventions.houdini","version":"2022.2","since":"221.0","until":"223.*","originalSince":"221.0","originalUntil":null},{"id":"com.lowgular.intellij","version":"0.11.2-SNAPSHOT-223","since":"223.0","until":"223.*","originalSince":"212.0","originalUntil":"223.*"},{"id":"com.oyjg.tools.plugin.reviewboard","version":"3.0.8","since":"211.0","until":"211.7628","originalSince":"211.0","originalUntil":null},{"id":"com.hxw.newmapperext","version":"1.0.3","since":"201.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.tech.MapStructPlugin","version":"0.0.2","since":"221.*","until":"231.*","originalSince":"221.0","originalUntil":"231.*"},{"id":"org.rri.ideals","version":"1.0-SNAPSHOT","since":"223.0","until":"223.*","originalSince":"221.0","originalUntil":"223.*"},{"id":"ActionScript Profiler","version":"133.79","since":"133.79","until":"201","originalSince":"133.79","originalUntil":null},{"id":"ActionScript Profiler","version":"0.2.9","since":"123.1","until":"201","originalSince":"123.1","originalUntil":null},{"id":"ActionScript Profiler","version":"0.2.8","since":"122.666","until":"201","originalSince":"122.666","originalUntil":null},{"id":"ActionScript Profiler","version":"0.2.7","since":"114.243","until":"201","originalSince":"114.243","originalUntil":null},{"id":"ActionScript Profiler","version":"0.2.5","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"ActionScript Profiler","version":"0.2.3","since":"93.13","until":"201","originalSince":"93.13","originalUntil":null},{"id":"ActionScript Profiler","version":"0.2.2","since":"80.8000","until":"201","originalSince":"80.8000","originalUntil":null},{"id":"ActionScript Profiler","version":"0.2.1","since":"80.8000","until":"201","originalSince":"80.8000","originalUntil":null},{"id":"ActionScript Profiler","version":"0.1.5","since":"80.8000","until":"201","originalSince":"80.8000","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"183.3795.13","since":"183.3795","until":"183.3795","originalSince":"183.3795","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"171.2687","since":"171.2687","until":"201.*","originalSince":"171.2687","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"1.5","since":"141.1532","until":"170.*","originalSince":"141.1532","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"1.4.138","since":"138.0","until":"140.*","originalSince":"138.0","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"1.4.135.1","since":"135.475","until":"135.*","originalSince":"135.475","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"1.3.135","since":"135.475","until":"135.*","originalSince":"135.475","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"1.3.133.1","since":"133.696","until":"133.*","originalSince":"133.696","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"1.3.133","since":"134.818","until":"134.*","originalSince":"134.818","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"1.3.132","since":"132.839","until":"132.*","originalSince":"132.839","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"1.3.130","since":"130.1619","until":"130.*","originalSince":"130.1619","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"1.2.130","since":"130.1030","until":"130.*","originalSince":"130.1030","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"1.1.130","since":"130.1030","until":"130.*","originalSince":"130.1030","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.9.4","since":"130.555","until":"130.*","originalSince":"130.555","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"1.0","since":"130.1030","until":"130.*","originalSince":"130.1030","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.9.3","since":"130.555","until":"130.*","originalSince":"130.555","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.9.2","since":"129.111","until":"130.*","originalSince":"129.111","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.9.1","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.9","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.8.9","since":"120.11","until":"120.*","originalSince":"120.11","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.6.9","since":"111.167","until":"111.*","originalSince":"111.167","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.6.8","since":"110.187","until":"110.*","originalSince":"110.187","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.6.7","since":"110.187","until":"110.*","originalSince":"110.187","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.6.6","since":"110.187","until":"110.*","originalSince":"110.187","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.6.5","since":"110.187","until":"110.*","originalSince":"110.187","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.6.4","since":"110.187","until":"110.*","originalSince":"110.187","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.6.3","since":"110.187","until":"110.*","originalSince":"110.187","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.6.2","since":"110.187","until":"110.*","originalSince":"110.187","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.6.1","since":"108.1452","until":"108.*","originalSince":"108.1452","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.5.5","since":"107.322","until":"107.*","originalSince":"107.322","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.5.4","since":"106.491","until":"106.*","originalSince":"106.491","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.5.3","since":"106.491","until":"106.*","originalSince":"106.491","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.5.2","since":"106.491","until":"106.*","originalSince":"106.491","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.5.1","since":"106.491","until":"106.*","originalSince":"106.491","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.5","since":"106.491","until":"106.*","originalSince":"106.491","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4.11","since":"106.491","until":"106.*","originalSince":"106.491","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4.10","since":"106.149","until":"106.*","originalSince":"106.149","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4.9","since":"106.149","until":"106.*","originalSince":"106.149","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4.8","since":"106.149","until":"106.*","originalSince":"106.149","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4.7","since":"106.149","until":"106.*","originalSince":"106.149","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4.6","since":"106.149","until":"106.*","originalSince":"106.149","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4.5","since":"106.149","until":"106.*","originalSince":"106.149","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4.4","since":"106.149","until":"106.*","originalSince":"106.149","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4.3","since":"104.0","until":"104.*","originalSince":"104.0","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4.2","since":"103.14","until":"103.*","originalSince":"103.14","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4.1.1","since":"98.294","until":"103.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4.1","since":"98.294","until":"98.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.4","since":"103.14","until":"103.*","originalSince":"103.14","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.3.8","since":"98.294","until":"98.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.3.6","since":"98.294","until":"98.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.3.5","since":"98.294","until":"98.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.3.4.2","since":"98.294","until":"98.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.3.4.1","since":"98.294","until":"98.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.3.4","since":"98.294","until":"98.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.3.3.1","since":"98.294","until":"98.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.3.3","since":"98.294","until":"98.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.3.2","since":"98.294","until":"98.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.3.1","since":"98.294","until":"98.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.3","since":"98.294","until":"98.*","originalSince":"98.294","originalUntil":null},{"id":"com.intellij.flex.uiDesigner","version":"0.2","since":"","until":"201","originalSince":null,"originalUntil":null},{"id":"com.xxxtai.coding.SmartInputSourceIntelliJ","version":"1.0-211-newest","since":"211.0","until":"223.*","originalSince":"211.0","originalUntil":"999.*"},{"id":"pl.semidude.tree-view-by-default","version":"1.0.2","since":"213.0","until":"213.*","originalSince":"213.0","originalUntil":"223.*"},{"id":"pl.semidude.tree-view-by-default","version":"1.0","since":"213.0","until":"213.*","originalSince":"213.0","originalUntil":"223.*"},{"id":"com.hxw.newmapperext","version":"1.0.4","since":"201","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.hxw.newmapperext","version":"1.0.7","since":"201.*","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.sourceplusplus.plugin.intellij","version":"0.7.7","since":"221.5080.210","until":"223.8617.56","originalSince":"221.5080.210","originalUntil":null},{"id":"com.sourceplusplus.plugin.intellij","version":"0.7.7.1","since":"221.5080.210","until":"223.8617.56","originalSince":"221.5080.210","originalUntil":null},{"id":"com.fuhrer.intellij.jumpy","version":"1.0","since":"222.0","until":"231.*","originalSince":"221.0","originalUntil":"231.*"},{"id":"com.github.nghiatm.robotframeworkplugin","version":"1.2.0","since":"202","until":"","originalSince":"202.2","originalUntil":null},{"id":"MetricsReloaded","version":"0.3.1","since":"","until":"212.*","originalSince":null,"originalUntil":null},{"id":"online.viestudio.idea-paper-kit","version":"1.0.2","since":"221.4842.29","until":"222.*","originalSince":"221.4842.29","originalUntil":"231.*"},{"id":"com.previewjs.intellij.plugin","version":"1.17.3","since":"212.0","until":"999","originalSince":"212.0","originalUntil":"999.0"},{"id":"io.github.binarybeing.hotcat.plugin","version":"1.3.4","since":"211.0","until":"212.3","originalSince":"210.0","originalUntil":"212.3"},{"id":"com.injectionforxcode.injection.plugin.id","version":"3.6","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.injectionforxcode.injection.plugin.id","version":"3.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.injectionforxcode.injection.plugin.id","version":"3.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.ntilde.androidinput","version":"1.0","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"com.talkingdata.my.favorite.code","version":"1.0.1","since":"173.0","until":"193.*","originalSince":"173.0","originalUntil":null},{"id":"com.tang","version":"1.3.9-IDEA231","since":"231.0","until":"231.*","originalSince":"223.0","originalUntil":"231.*"},{"id":"com.gerry.redis","version":"3.0","since":"211","until":"223.*","originalSince":"201.8743.12","originalUntil":null},{"id":"com.github.daputzy.intellij-sops-plugin","version":"1.0.0","since":"221.*","until":"231.*","originalSince":"221.0","originalUntil":"231.*"},{"id":"com.find.reference.FindReference","version":"1.0","since":"211.0","until":"221","originalSince":"212.0","originalUntil":null},{"id":"com.xiaolan.happyCode","version":"1.2-SNAPSHOT","since":"202.0","until":"231.*","originalSince":"173.0","originalUntil":null},{"id":"EditorGroups","version":"0.19","since":"181.4892","until":"203","originalSince":"181.4892","originalUntil":null},{"id":"EditorGroups","version":"0.26","since":"192.5728.12","until":"203","originalSince":"192.5728.12","originalUntil":null},{"id":"EditorGroups","version":"0.28","since":"192.5728.12","until":"202","originalSince":"192.5728.12","originalUntil":null},{"id":"EditorGroups","version":"0.32","since":"193.6911.18","until":"202.0","originalSince":"193.6911.18","originalUntil":null},{"id":"EditorGroups","version":"0.34","since":"202.0","until":"211","originalSince":"202.0","originalUntil":null},{"id":"org.jspresso.plugin.tmar","version":"2.12.3","since":"192.0","until":"211.*","originalSince":"192.0","originalUntil":null},{"id":"com.github.nthykier.debpkg","version":"0.0.19","since":"212.0","until":"222.*","originalSince":"211.0","originalUntil":"222.*"},{"id":"com.yonyou.yy-tool","version":"1.0-SNAPSHOT","since":"210.0","until":"231.*","originalSince":"182.0","originalUntil":"231.*"},{"id":"com.intellij.idea.plugin.sap.commerce","version":"1908.2","since":"192.0","until":"192.*","originalSince":"192.0","originalUntil":null},{"id":"com.intellij.idea.plugin.sap.commerce","version":"1908.3","since":"192.0","until":"192.*","originalSince":"192.0","originalUntil":null},{"id":"pers.wjx.plugin.yourProgressBar","version":"1.0","since":"211.*","until":"","originalSince":"192.0","originalUntil":null},{"id":"IntelliStripes","version":"0.7.5.584","since":"72.7361","until":"75.0","originalSince":"72.7361","originalUntil":null},{"id":"IntelliStripes","version":"0.7.1.576","since":"72.7361","until":"75.0","originalSince":"72.7361","originalUntil":null},{"id":"IntelliStripes","version":"0.6.2.364","since":"72.7361","until":"75.0","originalSince":"72.7361","originalUntil":null},{"id":"IntelliStripes","version":"0.4.4.364","since":"72.7361","until":"75.0","originalSince":"72.7361","originalUntil":null},{"id":"IntelliStripes","version":"0.4.3.364","since":"72.7361","until":"75.0","originalSince":"72.7361","originalUntil":null},{"id":"IntelliStripes","version":"0.4.1.294","since":"69.7123","until":"75.0","originalSince":"69.7123","originalUntil":null},{"id":"IntelliStripes","version":"0.3.1.294","since":"69.7123","until":"75.0","originalSince":"69.7123","originalUntil":null},{"id":"IntelliStripes","version":"0.1.3.241","since":"69.7123","until":"75.0","originalSince":"69.7123","originalUntil":null},{"id":"IntelliStripes","version":"0.1.1.111","since":"69.7096","until":"75.0","originalSince":"69.7096","originalUntil":null},{"id":"IntelliStripes","version":"0.1.0.097","since":"69.7096","until":"75.0","originalSince":"69.7096","originalUntil":null},{"id":"com.phpuaca","version":"1.2.1","since":"133.0","until":"181.0","originalSince":"133.0","originalUntil":null},{"id":"com.linkkou.plugin.intellij.assistant","version":"3.0.3","since":"222.0","until":"","originalSince":"212.0","originalUntil":null},{"id":"com.hellogroup.plugin.lua","version":"1.0.15-Stable","since":"213.0","until":"213.*","originalSince":"213.0","originalUntil":"223.*"},{"id":"io.github.prgrmz07.QuickRequest","version":"2022.06.01","since":"212.*","until":"212.*","originalSince":"212.5284","originalUntil":"212.*"},{"id":"com.github.warfaj.paxintellijplugin","version":"0.0.4","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"251.*"},{"id":"com.kalessil.phpStorm.phpInspectionsEA","version":"4.0.6.5","since":"162.1889","until":"213.*","originalSince":"162.1889","originalUntil":null},{"id":"com.github.bofa1ex.wizardgpt","version":"0.0.1","since":"223.0","until":"231.*","originalSince":"213.0","originalUntil":"231.*"},{"id":"com.google.home.ide","version":"0.2.8-prod+0.8","since":"212.0","until":"213.*","originalSince":"212.0","originalUntil":null},{"id":"ai.bloop.extension.webstormplugin","version":"0.0.1","since":"211","until":"221.*","originalSince":"211.0","originalUntil":"999.0"},{"id":"com.eitanliu.dart.mappable","version":"1.0.3","since":"203.0","until":"231","originalSince":"203.0","originalUntil":null},{"id":"com.eitanliu.dart.mappable","version":"1.1.1","since":"221.0","until":"231","originalSince":"221.0","originalUntil":null},{"id":"com.eitanliu.dart.mappable","version":"1.0.0","since":"221.4","until":"","originalSince":"213.0","originalUntil":null},{"id":"color.scheme.Ddark","version":"0.3","since":"191.0","until":"","originalSince":"142.0","originalUntil":null},{"id":"com.jereksel.jailbreakk","version":"0.0.2","since":"193.0","until":"203.*","originalSince":"193.0","originalUntil":null},{"id":"com.jereksel.jailbreakk","version":"0.0.1","since":"193.0","until":"193.*","originalSince":"193.0","originalUntil":null},{"id":"pt.ist.fenixframework.plugin","version":"1.0.1","since":"212.0","until":"232.*","originalSince":"212.0","originalUntil":"255.*"},{"id":"com.github.bridgecrewio.prismacloud","version":"1.0.3","since":"203","until":"","originalSince":"201.0","originalUntil":null},{"id":"dal-mpe","version":"1.199.202105","since":"181.5684.4","until":"","originalSince":"173.2099.1","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2020.8.2","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2020.9.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2020.7.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2020.8.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2020.6.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2020.4.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2020.3.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2020.5.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.11.2","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.12.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.10.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.11.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.9.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.7.2","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.7.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.6.2","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.5.1","since":"181.0","until":"211.*","originalSince":"181.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.6.1","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.4.1","since":"181.0","until":"211.*","originalSince":"181.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.3.1","since":"181.0","until":"211.*","originalSince":"181.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.3.2","since":"181.0","until":"211.*","originalSince":"181.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.3.3","since":"181.0","until":"211.*","originalSince":"181.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.2.1","since":"181.0","until":"211.*","originalSince":"181.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.3.0","since":"181.0","until":"211.*","originalSince":"181.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.1.1","since":"181.0","until":"211.*","originalSince":"181.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2019.2.0","since":"181.0","until":"211.*","originalSince":"181.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"2018.12.0","since":"181.0","until":"211.*","originalSince":"181.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"1.1.0","since":"181.0","until":"211.*","originalSince":"173.0","originalUntil":null},{"id":"com.alibabacloud.intellij.toolkit-intellij","version":"1.1.1","since":"181.0","until":"211.*","originalSince":"173.0","originalUntil":null},{"id":"com.alibaba.p3c.smartfox","version":"1.0.6","since":"141.0","until":"231","originalSince":"141.0","originalUntil":null},{"id":"com.alibaba.p3c.smartfox","version":"1.0.5","since":"141.0","until":"231","originalSince":"141.0","originalUntil":null},{"id":"com.alibaba.p3c.smartfox","version":"1.0.4","since":"141.0","until":"231","originalSince":"141.0","originalUntil":null},{"id":"com.alibaba.p3c.smartfox","version":"1.0.3","since":"141.0","until":"231","originalSince":"141.0","originalUntil":null},{"id":"com.alibaba.p3c.smartfox","version":"1.0.2","since":"141.0","until":"231","originalSince":"141.0","originalUntil":null},{"id":"com.alibaba.p3c.smartfox","version":"1.0.1","since":"141.0","until":"231","originalSince":"141.0","originalUntil":null},{"id":"com.potterhsu.jsonviewer","version":"0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.microsoft.tooling.msservices.intellij.azure","version":"1.5.4","since":"141.0","until":"163.0","originalSince":"141.0","originalUntil":null},{"id":"me.fingerart.idea.apidebugger","version":"1.0.0","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.1.6","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.1.5","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"org.eclipse.xtend.idea","version":"2.9.0","since":"131.0","until":"163.1","originalSince":"131.0","originalUntil":null},{"id":"kodebeagleidea","version":"0.1.4","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"kodebeagleidea","version":"0.1.3","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.0","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"kodebeagleidea","version":"0.1.1","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.checkmarx.intellij","version":"7.1.3.7","since":"111.69","until":"200.0","originalSince":"111.69","originalUntil":null},{"id":"gw.vark","version":"0.5","since":"117.418","until":"201.0","originalSince":"117.418","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.3.1","since":"110.0","until":"201.0","originalSince":"110.0","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"gw.vark","version":"0.5-alpha08","since":"117.418","until":"201.0","originalSince":"117.418","originalUntil":null},{"id":"wide-task-browser","version":"0.1.1","since":"80.8000","until":"231.*","originalSince":"80.8000","originalUntil":null},{"id":"JMeter plugin","version":"1.0","since":"111.277","until":"203","originalSince":"111.277","originalUntil":null},{"id":"coffeescript-idea","version":"0.1-1-gae5a","since":"80.8000","until":"181.0","originalSince":"80.8000","originalUntil":null},{"id":"com.apibility.voicerecognition","version":"0.2Beta","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"GrepCode.com Code Search","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.microsoft.tooling.msservices.intellij.azure","version":"1.4.1","since":"141.0","until":"163.0","originalSince":"141.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.6","since":"123.72","until":"200.0","originalSince":"123.72","originalUntil":null},{"id":"com.bulenkov.idea.Idea11IconPack","version":"1.1","since":"122.519","until":"162.1000","originalSince":"122.519","originalUntil":null},{"id":"JFormDesigner-Marketplace-Edition","version":"7.0.2.3","since":"191.0","until":"","originalSince":"IU-191.0","originalUntil":null},{"id":"JFormDesigner-Marketplace-Edition","version":"7.0.2","since":"191.0","until":"201.0","originalSince":"IU-191.0","originalUntil":null},{"id":"JFormDesigner-Marketplace-Edition","version":"7.0.1","since":"191.0","until":"201.0","originalSince":"IU-191.0","originalUntil":null},{"id":"JFormDesigner-Marketplace-Edition","version":"7.0.0.6","since":"191.0","until":"","originalSince":"IU-191.0","originalUntil":null},{"id":"JFormDesigner-Marketplace-Edition","version":"7.0.0.5","since":"191.0","until":"201.0","originalSince":"IU-191.0","originalUntil":null},{"id":"JFormDesigner-Marketplace-Edition","version":"7.0.0.4","since":"191.0","until":"201.0","originalSince":"IU-191.0","originalUntil":null},{"id":"JFormDesigner-Marketplace-Edition","version":"7.0.0.3","since":"191.0","until":"201.0","originalSince":"IU-191.0","originalUntil":null},{"id":"JFormDesigner-Marketplace-Edition","version":"7.0.0.2","since":"191.0","until":"201.0","originalSince":"IU-191.0","originalUntil":null},{"id":"JFormDesigner-Marketplace-Edition","version":"7.0.0.1","since":"191.0","until":"201.0","originalSince":"IU-191.0","originalUntil":null},{"id":"PerforceIC","version":"0.9.4","since":"135.1286","until":"181.0","originalSince":"135.1286","originalUntil":null},{"id":"PerforceIC","version":"0.9.3","since":"135.1286","until":"181.0","originalSince":"135.1286","originalUntil":null},{"id":"PerforceIC","version":"0.9.2","since":"135.1286","until":"181.0","originalSince":"135.1286","originalUntil":null},{"id":"PerforceIC","version":"0.9.1","since":"135.1286","until":"181.0","originalSince":"135.1286","originalUntil":null},{"id":"PerforceIC","version":"0.9.0","since":"135.1286","until":"181.0","originalSince":"135.1286","originalUntil":null},{"id":"PerforceIC","version":"0.8.7","since":"135.1286","until":"181.0","originalSince":"135.1286","originalUntil":null},{"id":"SpellChecker-Dict-Spanish","version":"1.0","since":"72.7269","until":"201.0","originalSince":"72.7269","originalUntil":null},{"id":"com.davidgjm.idea.plugins","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.6","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"JRebelPlugin","version":"6.4.5","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.hal.phpmetrics.id","version":"0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"CodeLock 1.2","version":"1.2","since":"123.94","until":"201","originalSince":"123.94","originalUntil":null},{"id":"info.bem.bemmet","version":"0.1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"net.petitviolet.idea.scala.minimal-cake-pattern-generator","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.kodokux.github","version":"1.0.1.7","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"SyncEdit 2","version":"2.0","since":"123.94","until":"201","originalSince":"123.94","originalUntil":null},{"id":"de.monticore.lang.montisecarc.MontiSecArcLanguagePlugin","version":"0.8.12","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.4.2","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.4.1","since":"143.0","until":"231.*","originalSince":"143.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.4.0","since":"143.0","until":"231.*","originalSince":"143.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.3.0","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.2.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.2.0.1","since":"139.0","until":"231.*","originalSince":"139.0","originalUntil":null},{"id":"KiwiScrap","version":"1.3","since":"40.1100","until":"191.0","originalSince":"40.1100","originalUntil":null},{"id":"com.pawsql.IndexAdvisor","version":"1.0.109","since":"201.0","until":"232","originalSince":"201.0","originalUntil":null},{"id":"com.pawsql.IndexAdvisor","version":"1.0.110","since":"201.0","until":"232","originalSince":"201.0","originalUntil":null},{"id":"com.pawsql.IndexAdvisor","version":"1.0.121","since":"201.0","until":"232","originalSince":"201.0","originalUntil":null},{"id":"com.pawsql.IndexAdvisor","version":"1.0.120","since":"201.0","until":"232","originalSince":"201.0","originalUntil":null},{"id":"com.pawsql.IndexAdvisor","version":"0.9.202","since":"201.0","until":"232","originalSince":"201.0","originalUntil":null},{"id":"com.pawsql.IndexAdvisor","version":"1.0.106","since":"201.0","until":"232","originalSince":"201.0","originalUntil":null},{"id":"com.pawsql.IndexAdvisor","version":"1.0.130","since":"201.0","until":"232","originalSince":"201.0","originalUntil":null},{"id":"TrackLink","version":"0.1","since":"40.3405","until":"201.0","originalSince":"40.3405","originalUntil":null},{"id":"Raven","version":"1.0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Raven","version":"1.0.2","since":"40.2200","until":"201.0","originalSince":"40.2200","originalUntil":null},{"id":"Raven","version":"1.0.3","since":"40.2200","until":"201.0","originalSince":"40.2200","originalUntil":null},{"id":"Raven","version":"1.0.4","since":"40.2200","until":"201.0","originalSince":"40.2200","originalUntil":null},{"id":"Raven","version":"1.1.0","since":"40.3400","until":"201.0","originalSince":"40.3400","originalUntil":null},{"id":"Raven","version":"1.2","since":"40.3400","until":"201.0","originalSince":"40.3400","originalUntil":null},{"id":"Raven","version":"1.2.1","since":"40.3400","until":"201.0","originalSince":"40.3400","originalUntil":null},{"id":"Inca X","version":"3.9.3","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Inca X","version":"4.2.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"GenerateSerialVersionUID","version":"1.1-b83","since":"","until":"","originalSince":null,"originalUntil":null},{"id":"OpenExplorer","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"OpenExplorer","version":"1.0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"OpenExplorer","version":"1.0.2","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"IDETalk","version":"0.1.2","since":"40.2230","until":"181.0","originalSince":"40.2230","originalUntil":null},{"id":"SimpleIntentions","version":"1.4.0","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.5.0","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"GWT Studio","version":"0.1.2","since":"55.5300","until":"201.0","originalSince":"55.5300","originalUntil":null},{"id":"QuickBuild Monitor","version":"1.0","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"WicketForge","version":"0.1.2","since":"40.3000","until":"42","originalSince":"40.3000","originalUntil":null},{"id":"WicketForge","version":"0.4.0","since":"69.7124","until":"70","originalSince":"69.7124","originalUntil":null},{"id":"IvyDependencyImportor","version":"2.2final","since":"40.3000","until":"203","originalSince":"40.3000","originalUntil":null},{"id":"Poison Inspection","version":"0.1","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"JavaDoc Sync Plugin 8","version":"2.0.1","since":"80.8823","until":"222.*","originalSince":"80.8823","originalUntil":null},{"id":"ReferenceScanner Plugin","version":"5.2","since":"60.6100","until":"201.0","originalSince":"60.6100","originalUntil":null},{"id":"WicketForge","version":"0.6.0","since":"90.10000","until":"91","originalSince":"90.10000","originalUntil":null},{"id":"WicketForge","version":"0.6.1","since":"90.10000","until":"91","originalSince":"90.10000","originalUntil":null},{"id":"OCamlSupport","version":"0.9","since":"90.10000","until":"201","originalSince":"90.10000","originalUntil":null},{"id":"OCamlSupport","version":"0.9.5","since":"90.10000","until":"201","originalSince":"90.10000","originalUntil":null},{"id":"OCamlSupport","version":"0.9.6","since":"90.10000","until":"201","originalSince":"90.10000","originalUntil":null},{"id":"OCamlSupport","version":"0.9.7","since":"90.10000","until":"201","originalSince":"90.10000","originalUntil":null},{"id":"OCamlSupport","version":"0.9.8","since":"90.10000","until":"201","originalSince":"90.10000","originalUntil":null},{"id":"QuickZip","version":"0.1.0","since":"80.8000","until":"201","originalSince":"80.8000","originalUntil":null},{"id":"SVN Revision Graph","version":"1.1","since":"99.18","until":"181.0","originalSince":"99.18","originalUntil":null},{"id":"SVN Revision Graph","version":"1.2","since":"99.18","until":"181.0","originalSince":"99.18","originalUntil":null},{"id":"SVN Revision Graph","version":"1.3","since":"99.18","until":"181.0","originalSince":"99.18","originalUntil":null},{"id":"SVN Revision Graph","version":"1.4","since":"111.41","until":"181.0","originalSince":"111.41","originalUntil":null},{"id":"SVN Revision Graph","version":"1.5","since":"111.41","until":"181.0","originalSince":"111.41","originalUntil":null},{"id":"SVN Revision Graph","version":"1.6","since":"111.41","until":"181.0","originalSince":"111.41","originalUntil":null},{"id":"Finder Restarter","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"SVN Revision Graph","version":"1.6.1","since":"111.41","until":"181.0","originalSince":"111.41","originalUntil":null},{"id":"JCompilo Java Compiler","version":"91","since":"107.105","until":"211","originalSince":"107.105","originalUntil":null},{"id":"JCompilo Java Compiler","version":"93","since":"107.105","until":"211","originalSince":"107.105","originalUntil":null},{"id":"SVN Revision Graph","version":"1.6.2","since":"123.23","until":"181.0","originalSince":"123.23","originalUntil":null},{"id":"SVN Revision Graph","version":"1.6.3","since":"123.23","until":"181.0","originalSince":"123.23","originalUntil":null},{"id":"JCompilo Java Compiler","version":"121","since":"107.105","until":"211","originalSince":"107.105","originalUntil":null},{"id":"JCompilo Java Compiler","version":"126","since":"107.105","until":"211","originalSince":"107.105","originalUntil":null},{"id":"com.kodokux.github","version":"1.0.1.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.kodokux.github","version":"1.0.1.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.kodokux.github","version":"1.0.1.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.kodokux.github","version":"1.0.1.6","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.livescriptidea","version":"0.1.2","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"org.livescriptidea","version":"0.1.3","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"org.livescriptidea","version":"0.1.4","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"com.genymotion.idea","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.0","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.1","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.1a","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.genymotion.idea","version":"1.0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.2","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.2.1","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.2.2","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.3.0","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.3.1","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.3.2","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"de.halirutan.mathematica","version":"0.1.8","since":"123.94","until":"123.*","originalSince":"123.94","originalUntil":null},{"id":"pl.charmas.parcelablegenerator","version":"0.3","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.4.0","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.genymotion.idea","version":"1.0.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"JCompilo Java Compiler","version":"dev.build","since":"133.696","until":"211","originalSince":"133.696","originalUntil":null},{"id":"JCompilo Java Compiler","version":"173","since":"133.696","until":"211","originalSince":"133.696","originalUntil":null},{"id":"jballant.CommonJSAutoComplete","version":"0.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.4.2","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.8.1","since":"132.400","until":"211","originalSince":"132.400","originalUntil":null},{"id":"CodeOutline2","version":"0.5.2","since":"123.72","until":"201","originalSince":"123.72","originalUntil":null},{"id":"Twelf Plugin","version":"1.1.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"org.elixir_lang","version":"0.2.0","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"IdeaVIM","version":"0.38","since":"135.0","until":"181.0","originalSince":"135.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.0.0","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"14.7.132.637","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.flageolett.eZ.completion","version":"1.0.2","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.2.0.3","since":"140.2285","until":"231.*","originalSince":"140.2285","originalUntil":null},{"id":"JRebelPlugin","version":"6.1.1-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.contentful.ideagenerator","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.busybusy.Taiga.io.Task","version":"1.1.2","since":"131.0","until":"201.*","originalSince":"131.0","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"6.0.0.390","since":"141.0","until":"213","originalSince":"141.0","originalUntil":null},{"id":"CUBA","version":"2.8.0.14","since":"139.224","until":"211","originalSince":"139.224","originalUntil":null},{"id":"com.github.shiraji.createintentinspection","version":"0.0.1","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"com.github.shiraji.newinstanceinspection","version":"0.0.1","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"ua.pp.madcap.codingame.plugin","version":"0.1","since":"140.0","until":"201.0","originalSince":"140.0","originalUntil":null},{"id":"ru.oldtown.idea.workflowplugin","version":"1.0","since":"80.8000","until":"201","originalSince":"80.8000","originalUntil":null},{"id":"ua.pp.madcap.codingame.plugin","version":"0.2","since":"140.0","until":"201.0","originalSince":"140.0","originalUntil":null},{"id":"ru.mipt.acsl.decode.idea.plugin","version":"0.4.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.github.maddouri.intellij.OnlineSearch","version":"1.1.0","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"Mongo Plugin","version":"0.9.2016","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.idea.plugin.sap.commerce","version":"1908.4","since":"192.0","until":"192.*","originalSince":"192.0","originalUntil":null},{"id":"org.kdb.inside.brains.KdbInsideBrains","version":"3.1.0","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"org.kdb.inside.brains.KdbInsideBrains","version":"3.6.0","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"org.kdb.inside.brains.KdbInsideBrains","version":"3.6.1","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"org.kdb.inside.brains.KdbInsideBrains","version":"3.5.0","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"org.kdb.inside.brains.KdbInsideBrains","version":"3.2.0","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"com.compileToClass.xq","version":"1.0","since":"173.0","until":"192","originalSince":"173.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.14.1-1588332201.045","since":"163.0","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.19.0-1588710262.946","since":"163.0","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.19.0-1588714356.596","since":"163.0","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.mybatisflex.bigtian","version":"1.3-RELEASE","since":"222.*","until":"232.*","originalSince":"193.*","originalUntil":"232.*"},{"id":"com.pawsql.IndexAdvisor","version":"1.0.141","since":"201.0","until":"232","originalSince":"201.0","originalUntil":null},{"id":"de.hypoport.plugins.DozerPlugin","version":"2.0.1","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"de.hypoport.plugins.DozerPlugin","version":"2.0","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.amandaprocoder.GoogleSearch","version":"1.3-SNAPSHOT","since":"221","until":"221","originalSince":"221","originalUntil":"231.*"},{"id":"com.kotcrab.quicklaunch","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.copysourcegraphlink","version":"0.1.0","since":"173.0","until":"212","originalSince":"173.0","originalUntil":null},{"id":"com.copysourcegraphlink","version":"0.1.1","since":"173.0","until":"212","originalSince":"173.0","originalUntil":null},{"id":"com.simple.plugin","version":"1.0.0","since":"193.5662","until":"231.9225","originalSince":"193.5662","originalUntil":null},{"id":"com.github.linrenen.uniappsupport","version":"1.1.16-232.8","since":"232.1","until":"232.1","originalSince":"232.1","originalUntil":"999.0"},{"id":"com.clutcher.comments_highlighter","version":"2023.7.6","since":"231.0","until":"231.*","originalSince":"223.0","originalUntil":null},{"id":"im.simo.rubymine.sorbet-lsp","version":"1.0","since":"232.0","until":"232.*","originalSince":"222.0","originalUntil":"232.*"},{"id":"com.zelaux.arcplugin","version":"0.31","since":"222.*","until":"223.*","originalSince":"213.0","originalUntil":"223.*"},{"id":"pkunk.hoi4","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"io.fig.jetbrains","version":"2.0.0","since":"203","until":"203","originalSince":"203","originalUntil":"999"},{"id":"com.zelaux.arcplugin","version":"0.7.7","since":"222.3345.118","until":"232.9392.1","originalSince":"222.3345.118","originalUntil":"232.*"},{"id":"com.zhutmost.svlsp","version":"0.0.1","since":"232.0","until":"232.*","originalSince":"222.0","originalUntil":"232.*"},{"id":"me.jaffe2718.devkit","version":"1.0.0","since":"232.9559.34","until":"232.*","originalSince":"222.0","originalUntil":"232.*"},{"id":"com.github.seayon.jsonrpchelper","version":"0.1.6","since":"213","until":"232.*","originalSince":"211.*","originalUntil":"232.*"},{"id":"fr.imacaron.keylogger","version":"1.0","since":"231.*","until":"232.*","originalSince":"222.0","originalUntil":"232.*"},{"id":"com.softwareco.intellij.plugin","version":"2.4.6","since":"172","until":"","originalSince":"164.0","originalUntil":null},{"id":"fr.imacaron.keylogger","version":"1.1","since":"231.*","until":"232.*","originalSince":"222.0","originalUntil":"232.*"},{"id":"com.hth.pojo2sql","version":"20230906-bate-1.0.0","since":"221.0","until":"232.*","originalSince":"201.0","originalUntil":"232.*"},{"id":"com.gitlab.plugin","version":"0.3.0","since":"232.7754.73","until":"232.9559.62","originalSince":"232.7754.73","originalUntil":"232.*"},{"id":"io.mend.advisecode","version":"1.0.0","since":"222.*","until":"232.*","originalSince":"221.0","originalUntil":"232.*"},{"id":"com.ipaylinks.code-master","version":"2.4.8-SNAPSHOT","since":"222.2","until":"232.*","originalSince":"201.0","originalUntil":"232.*"},{"id":"CodeQualityAnalysisPlugin","version":"1.0.1","since":"203.0","until":"232.*","originalSince":"203.0","originalUntil":"240.0"},{"id":"com.cherryleafroad.rust.playground","version":"1.0.2","since":"211.6693","until":"211.7142.45","originalSince":"211.6693","originalUntil":"211.*"},{"id":"com.cherryleafroad.rust.playground","version":"1.0.1","since":"211.6693","until":"211.7142.45","originalSince":"211.6693","originalUntil":"211.*"},{"id":"Valkyrie","version":"0.0.5","since":"232.0","until":"232.*","originalSince":"232.0","originalUntil":"240.*"},{"id":"com.luomacode.ChatMoss","version":"1.0.9","since":"203.0","until":"232.*","originalSince":"203.0","originalUntil":"999.*"},{"id":"com.intechcore.scell.ideaplugin","version":"1.3.2-java11-DEMO-0.0.3-beta","since":"231.*","until":"231.*","originalSince":"231.9011","originalUntil":"231.*"},{"id":"ColourChooser","version":"0.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"ColourChooser","version":"0.3","since":"40.3200","until":"201.0","originalSince":"40.3200","originalUntil":null},{"id":"ColourChooser","version":"0.4","since":"40.2235","until":"201.0","originalSince":"40.2235","originalUntil":null},{"id":"ColourChooser","version":"0.4b","since":"40.3370","until":"201.0","originalSince":"40.3370","originalUntil":null},{"id":"ColourChooser","version":"0.4d","since":"40.3370","until":"201.0","originalSince":"40.3370","originalUntil":null},{"id":"ColourChooser","version":"0.4e","since":"40.2250","until":"40.2998","originalSince":"40.2250","originalUntil":"40.2999"},{"id":"SvgViewer","version":"2.2.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"SvgViewer","version":"2.2.3","since":"40.2000","until":"201.0","originalSince":"40.2000","originalUntil":null},{"id":"SvgViewer","version":"2.2.4","since":"40.2000","until":"201.0","originalSince":"40.2000","originalUntil":null},{"id":"SvgViewer","version":"2.2.7","since":"40.2000","until":"201.0","originalSince":"40.2000","originalUntil":null},{"id":"SvgViewer","version":"2.2.8","since":"40.2000","until":"201.0","originalSince":"40.2000","originalUntil":null},{"id":"ImageView","version":"0.1","since":"40.2200","until":"201.0","originalSince":"40.2200","originalUntil":null},{"id":"ChatPlugin","version":"1.6","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"ChatPlugin","version":"1.6.1","since":"40.642","until":"201.0","originalSince":"40.642","originalUntil":null},{"id":"ChatPlugin","version":"1.6.2","since":"40.642","until":"201.0","originalSince":"40.642","originalUntil":null},{"id":"ChatPlugin","version":"1.6.3","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"ChatPlugin","version":"2.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"ChatPlugin","version":"1.6.4","since":"40.2169","until":"201.0","originalSince":"40.2169","originalUntil":null},{"id":"ChatPlugin","version":"2.0.1","since":"40.2169","until":"201.0","originalSince":"40.2169","originalUntil":null},{"id":"HexView","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"HexView","version":"1.1","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"JarSpyPlugin","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Log4JPlugin","version":"0.9.3","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Log4JPlugin","version":"0.9.4","since":"40.3311","until":"201.0","originalSince":"40.3311","originalUntil":null},{"id":"Macros Manager","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"PooCookie","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"PreconditionPlugin","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"RegexPlugin","version":"0.5.7","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"RegexPlugin","version":"0.5.8","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"RegexPlugin","version":"0.5.9","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"RegexPlugin","version":"0.5.10","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"RegexPlugin","version":"0.5.11","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"SamePlugin","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"SequencePlugin","version":"0.5.3","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"IdeProcessPriority","version":"1.2","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"IdeProcessPriority","version":"1.3","since":"40.2244","until":"201.0","originalSince":"40.2244","originalUntil":null},{"id":"IdeProcessPriority","version":"1.3.1","since":"40.3432","until":"201.0","originalSince":"40.3432","originalUntil":null},{"id":"ShowEncodingPlugin","version":"1.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"SwitchFile","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"com.nicity.plugins.idea.TimePlugin","version":"0.2","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Time Convertor Plugin","version":"1.0.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Time Convertor Plugin","version":"1.0.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Time Convertor Plugin","version":"1.0.2","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"RSSPlugin","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"RSSPlugin","version":"1.0.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"RSSPlugin","version":"1.1","since":"40.2169","until":"201.0","originalSince":"40.2169","originalUntil":null},{"id":"RSSPlugin","version":"1.1.1","since":"40.2169","until":"201.0","originalSince":"40.2169","originalUntil":null},{"id":"CompileWithoutDependencies","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Module Dependency Graph","version":"0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Module Dependency Graph","version":"0.1.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Module Dependency Graph","version":"0.1.2","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Hagrid","version":"0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Hagrid","version":"0.2","since":"40.2000","until":"201","originalSince":"40.2000","originalUntil":null},{"id":"SimplePowerPack","version":"0.0.1","since":"40.3273","until":"201.0","originalSince":"40.3273","originalUntil":null},{"id":"SimplePowerPack","version":"0.0.2","since":"40.3273","until":"201.0","originalSince":"40.3273","originalUntil":null},{"id":"SimplePowerPack","version":"0.0.3","since":"40.3273","until":"201.0","originalSince":"40.3273","originalUntil":null},{"id":"SimplePowerPack","version":"0.0.4","since":"40.3273","until":"201.0","originalSince":"40.3273","originalUntil":null},{"id":"Open containing folder in a File Explorer","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Open containing folder in a File Explorer","version":"1.0.1","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"Open containing folder in a File Explorer","version":"1.0.2","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"Open containing folder in a File Explorer","version":"1.0.3","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"Native2Ascii","version":"1.0","since":"40.3378","until":"181","originalSince":"40.3378","originalUntil":null},{"id":"Native2Ascii","version":"1.0.1","since":"40.3378","until":"181","originalSince":"40.3378","originalUntil":null},{"id":"Native2Ascii","version":"1.0.2","since":"40.3378","until":"181","originalSince":"40.3378","originalUntil":null},{"id":"Native2Ascii","version":"1.0.4","since":"40.3378","until":"181","originalSince":"40.3378","originalUntil":null},{"id":"Native2Ascii","version":"1.0.5","since":"50.4049","until":"181","originalSince":"50.4049","originalUntil":null},{"id":"Native2Ascii","version":"1.0.6","since":"50.4055","until":"181","originalSince":"50.4055","originalUntil":null},{"id":"Native2Ascii","version":"1.0.7","since":"50.4089","until":"181","originalSince":"50.4089","originalUntil":null},{"id":"Native2Ascii","version":"1.0.8","since":"55.5131","until":"181","originalSince":"55.5131","originalUntil":null},{"id":"XFiles","version":"0.1","since":"40.3461","until":"201.0","originalSince":"40.3461","originalUntil":null},{"id":"RSS/Atom feed reader","version":"0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"RSS/Atom feed reader","version":"0.15","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"RSS/Atom feed reader","version":"0.16","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"RSS/Atom feed reader","version":"0.17","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"RSS/Atom feed reader","version":"0.2","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"RSS/Atom feed reader","version":"0.21","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"ProjectTitlePlugin","version":"1.0","since":"40.3269","until":"201.0","originalSince":"40.3269","originalUntil":null},{"id":"DocTree","version":"0.1","since":"55.5231","until":"201.0","originalSince":"55.5231","originalUntil":null},{"id":"DocTree","version":"0.11","since":"55.5231","until":"201.0","originalSince":"55.5231","originalUntil":null},{"id":"DocTree","version":"0.2","since":"55.5231","until":"201.0","originalSince":"55.5231","originalUntil":null},{"id":"Time Tracker Plugin","version":"0.1","since":"55.5181","until":"201.0","originalSince":"55.5181","originalUntil":null},{"id":"Time Tracker Plugin","version":"0.2","since":"55.5181","until":"201.0","originalSince":"55.5181","originalUntil":null},{"id":"Time Tracker Plugin","version":"0.3","since":"55.5181","until":"201.0","originalSince":"55.5181","originalUntil":null},{"id":"Time Tracker Plugin","version":"0.5","since":"55.5181","until":"201.0","originalSince":"55.5181","originalUntil":null},{"id":"VMOptions","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"VMOptions","version":"1.0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"OpenWith","version":"1.0","since":"55.5231","until":"201","originalSince":"55.5231","originalUntil":null},{"id":"PrivateWriteInspection","version":"0.1","since":"40.3341","until":"201.0","originalSince":"40.3341","originalUntil":null},{"id":"Inspection-JS for Demetra","version":"1.0.0","since":"40.3400","until":"183.0","originalSince":"40.3400","originalUntil":null},{"id":"Inspection-JS for Demetra","version":"1.0.1","since":"55.5000","until":"183.0","originalSince":"55.5000","originalUntil":null},{"id":"AutoBoxing","version":"0.8.6","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"CamouflagePlugin","version":"0.10b","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"SimpleIntentions","version":"1.0","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.0.1","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.0.2","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.0.3","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.1.0","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.1.1","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.1.2","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.2.0","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.2.1","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.2.2","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.2.3","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.2.4","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.2.5","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.2.6","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.2.7","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.2.8","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.2.9","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.3.0","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.3.1","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.3.2","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.3.3","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.3.4","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"SVN Report for IntelliJ IDEA","version":"1.0.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"SVN Report for IntelliJ IDEA","version":"1.0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"SVN Report for IntelliJ IDEA","version":"1.0.2","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"CVS Report for IntelliJ IDEA","version":"1.0.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"CVS Report for IntelliJ IDEA","version":"1.1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"CVS Report for IntelliJ IDEA","version":"1.1.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"CVS Report for IntelliJ IDEA","version":"1.1.2","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"CVS Report for IntelliJ IDEA","version":"1.1.3","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"CM Synergy Integration","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"MKS","version":"0.2","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"MKS","version":"0.2.1","since":"40.1178","until":"201.0","originalSince":"40.1178","originalUntil":null},{"id":"MKS","version":"0.3","since":"40.3075","until":"201.0","originalSince":"40.3075","originalUntil":null},{"id":"MKS","version":"0.3.1","since":"40.3117","until":"201.0","originalSince":"40.3117","originalUntil":null},{"id":"MKS","version":"0.3.2","since":"40.3214","until":"201.0","originalSince":"40.3214","originalUntil":null},{"id":"MKS","version":"0.3.4","since":"40.3326","until":"201.0","originalSince":"40.3326","originalUntil":null},{"id":"BackgroundImage","version":"0.3","since":"","until":"231","originalSince":null,"originalUntil":null},{"id":"BackgroundImage","version":"0.4","since":"","until":"231","originalSince":null,"originalUntil":null},{"id":"BackgroundImage","version":"0.5","since":"","until":"231","originalSince":null,"originalUntil":null},{"id":"BackgroundImage","version":"0.6","since":"","until":"231","originalSince":null,"originalUntil":null},{"id":"BackgroundImage","version":"0.7","since":"40.1162","until":"231","originalSince":"40.1162","originalUntil":null},{"id":"BackgroundImage","version":"0.8","since":"40.1162","until":"231","originalSince":"40.1162","originalUntil":null},{"id":"BackgroundImage","version":"0.9","since":"40.1162","until":"231","originalSince":"40.1162","originalUntil":null},{"id":"BackgroundImage","version":"0.9.1","since":"40.3326","until":"231","originalSince":"40.3326","originalUntil":null},{"id":"SkinLFPlugin","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"ToolbarManager","version":"1.1.3","since":"","until":"201","originalSince":null,"originalUntil":null},{"id":"IdeaMouseGestures","version":"1.5","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"IdeaMouseGestures","version":"1.6","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"API Comparator","version":"0.2.1.2","since":"50.4000","until":"183.0","originalSince":"50.4000","originalUntil":null},{"id":"API Comparator","version":"0.2.1.3","since":"40.3000","until":"183.0","originalSince":"40.3000","originalUntil":null},{"id":"ContextViewer","version":"0.7.4","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"CopyFQNPlugin","version":"1.0.5","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"CopyFQNPlugin","version":"1.0.6","since":"40.2200","until":"201.0","originalSince":"40.2200","originalUntil":null},{"id":"Ideascript","version":"0.5.6","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Ideascript","version":"2.0.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Ideascript","version":"2.0.1","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"Ideascript","version":"2.0.2","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"Ideascript","version":"2.0.3","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"Ideascript","version":"2.0.4","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"Ideascript","version":"2.0.5","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"Ideascript","version":"2.0.6","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"Ideascript","version":"2.0.7","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"scrappy","version":"1.0.3","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"scrappy","version":"1.0.4","since":"40.2239","until":"201.0","originalSince":"40.2239","originalUntil":null},{"id":"scrappy","version":"1.0.5","since":"40.2239","until":"201.0","originalSince":"40.2239","originalUntil":null},{"id":"MetricsReloaded","version":"0.4","since":"40.2210","until":"212.*","originalSince":"40.2210","originalUntil":null},{"id":"MetricsReloaded","version":"0.5","since":"40.3000","until":"212.*","originalSince":"40.3000","originalUntil":null},{"id":"MetricsReloaded","version":"0.5.1","since":"40.3000","until":"212.*","originalSince":"40.3000","originalUntil":null},{"id":"MetricsReloaded","version":"0.6","since":"40.3400","until":"212.*","originalSince":"40.3400","originalUntil":null},{"id":"MetricsReloaded","version":"0.6.0.1","since":"40.3400","until":"212.*","originalSince":"40.3400","originalUntil":null},{"id":"MetricsReloaded","version":"0.7","since":"55.5000","until":"212.*","originalSince":"55.5000","originalUntil":null},{"id":"MetricsReloaded","version":"0.8","since":"55.5000","until":"212.*","originalSince":"55.5000","originalUntil":null},{"id":"ToggleKeyword","version":"1.2","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"KiwiScrap","version":"1.0","since":"40.1100","until":"191.0","originalSince":"40.1100","originalUntil":null},{"id":"KiwiScrap","version":"1.1","since":"40.1100","until":"191.0","originalSince":"40.1100","originalUntil":null},{"id":"KiwiScrap","version":"1.2","since":"40.1100","until":"191.0","originalSince":"40.1100","originalUntil":null},{"id":"ProGuard Unscramble Plugin","version":"1.0","since":"40.3089","until":"201.0","originalSince":"40.3089","originalUntil":null},{"id":"Emma Code Coverage","version":"2.0.4217/1","since":"40.2244","until":"201.0","originalSince":"40.2244","originalUntil":null},{"id":"Emma Code Coverage","version":"plugin 0.1 / emma 2.0.4217","since":"40.2244","until":"201.0","originalSince":"40.2244","originalUntil":null},{"id":"IdeaSpring","version":"1.0-beta1","since":"40.1200","until":"51.0","originalSince":"40.1200","originalUntil":null},{"id":"IdeaSpring","version":"1.0-beta2","since":"40.1200","until":"51.0","originalSince":"40.1200","originalUntil":null},{"id":"IdeaSpring","version":"1.0-beta3","since":"40.1200","until":"51.0","originalSince":"40.1200","originalUntil":null},{"id":"IdeaSpring","version":"1.0","since":"40.1200","until":"51.0","originalSince":"40.1200","originalUntil":null},{"id":"IdeaSpring","version":"1.2.1","since":"40.3542","until":"51.0","originalSince":"40.3542","originalUntil":null},{"id":"IdeaSpring","version":"1.2.3","since":"40.3542","until":"51.0","originalSince":"40.3542","originalUntil":null},{"id":"IdeaSpring","version":"1.2.4","since":"40.3542","until":"51.0","originalSince":"40.3542","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.0","since":"40.3436","until":"201.0","originalSince":"40.3436","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.0.1","since":"40.3436","until":"201.0","originalSince":"40.3436","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.1","since":"40.3436","until":"201.0","originalSince":"40.3436","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.1.1","since":"40.3436","until":"201.0","originalSince":"40.3436","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.2","since":"40.3436","until":"201.0","originalSince":"40.3436","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.2.1","since":"40.3436","until":"201.0","originalSince":"40.3436","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.2.2","since":"40.3448","until":"201.0","originalSince":"40.3448","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.2.3","since":"40.3448","until":"201.0","originalSince":"40.3448","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.3","since":"40.3448","until":"201.0","originalSince":"40.3448","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.3.1","since":"40.3448","until":"201.0","originalSince":"40.3448","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.3.2","since":"40.3448","until":"201.0","originalSince":"40.3448","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.3.3","since":"40.3448","until":"201.0","originalSince":"40.3448","originalUntil":null},{"id":"Struts Navigator Plugin","version":"1.3.4","since":"40.3448","until":"201.0","originalSince":"40.3448","originalUntil":null},{"id":"DeclarationsTools","version":"0.5","since":"40.3436","until":"201.0","originalSince":"40.3436","originalUntil":null},{"id":"Connect4","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Tetris","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"DERViewer","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"dashboard","version":"1.0.2","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"DevPartner","version":"3.0.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"IdeaJad","version":"2111","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"IdeaJad","version":"2169.1","since":"40.2169","until":"201.0","originalSince":"40.2169","originalUntil":null},{"id":"MavenPlugin","version":"0.1.3","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"MavenPlugin","version":"0.1.4","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.8","since":"40.2250","until":"201.0","originalSince":"40.2250","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5","since":"40.3084","until":"201.0","originalSince":"40.3084","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.1","since":"40.3084","until":"201.0","originalSince":"40.3084","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.2","since":"40.3084","until":"201.0","originalSince":"40.3084","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.3","since":"40.2250","until":"201.0","originalSince":"40.2250","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.4","since":"40.2250","until":"201.0","originalSince":"40.2250","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.5","since":"40.2250","until":"201.0","originalSince":"40.2250","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.6","since":"40.2250","until":"201.0","originalSince":"40.2250","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.7","since":"40.2250","until":"201.0","originalSince":"40.2250","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.9","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.10","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.11","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.12","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.13","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.14","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"MavenPlugin","version":"0.1.5.15","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"OptimizeIt 5 Plugin","version":"0.1.3","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Xp4IdeaProjectPlugin","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"XPlanner plugin","version":"0.5","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"XPlanner plugin","version":"0.6.3","since":"40.2013","until":"201.0","originalSince":"40.2013","originalUntil":null},{"id":"XPlanner plugin","version":"0.6.4","since":"40.2013","until":"201.0","originalSince":"40.2013","originalUntil":null},{"id":"XPlanner plugin","version":"0.6.4a","since":"40.2013","until":"201.0","originalSince":"40.2013","originalUntil":null},{"id":"XPlanner plugin","version":"0.6.4b","since":"40.2013","until":"201.0","originalSince":"40.2013","originalUntil":null},{"id":"XPlanner plugin","version":"0.6.6","since":"40.3311","until":"201.0","originalSince":"40.3311","originalUntil":null},{"id":"XPlanner plugin","version":"0.6.5","since":"40.2013","until":"201.0","originalSince":"40.2013","originalUntil":null},{"id":"XPlanner plugin","version":"0.6.5a","since":"40.2013","until":"201.0","originalSince":"40.2013","originalUntil":null},{"id":"XPlanner plugin","version":"0.7","since":"40.3311","until":"201.0","originalSince":"40.3311","originalUntil":null},{"id":"XPlanner plugin","version":"0.7b4","since":"40.3311","until":"201.0","originalSince":"40.3311","originalUntil":null},{"id":"XPlanner plugin","version":"0.7b5","since":"40.3311","until":"201.0","originalSince":"40.3311","originalUntil":null},{"id":"IvyDependencyImportor","version":"1.0","since":"40.3000","until":"203","originalSince":"40.3000","originalUntil":null},{"id":"IvyDependencyImportor","version":"2.0","since":"40.3000","until":"203","originalSince":"40.3000","originalUntil":null},{"id":"TrackLink","version":"0.2","since":"40.2250","until":"201.0","originalSince":"40.2250","originalUntil":null},{"id":"Retrotranslator Integration","version":"0.1.1","since":"50.4155","until":"50.4999","originalSince":"50.4155","originalUntil":null},{"id":"Retrotranslator Integration","version":"0.1.2","since":"50.4155","until":"50.4999","originalSince":"50.4155","originalUntil":null},{"id":"Retrotranslator Integration","version":"0.2.0","since":"50.4155","until":"50.4999","originalSince":"50.4155","originalUntil":null},{"id":"Retrotranslator Integration","version":"0.2.1","since":"50.4155","until":"50.4999","originalSince":"50.4155","originalUntil":null},{"id":"Retrotranslator Integration","version":"0.2.2","since":"50.4155","until":"50.4999","originalSince":"50.4155","originalUntil":null},{"id":"Retrotranslator Integration","version":"0.2.3","since":"50.4155","until":"50.4999","originalSince":"50.4155","originalUntil":null},{"id":"Retrotranslator Integration","version":"0.2.4","since":"50.4155","until":"50.4999","originalSince":"50.4155","originalUntil":null},{"id":"Retrotranslator Integration","version":"0.2.5","since":"50.4155","until":"50.4999","originalSince":"50.4155","originalUntil":null},{"id":"unitTest","version":"0.25","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"unitTest","version":"0.27","since":"40.2000","until":"201.0","originalSince":"40.2000","originalUntil":null},{"id":"unitTest","version":"0.27.1","since":"40.2000","until":"201.0","originalSince":"40.2000","originalUntil":null},{"id":"unitTest","version":"0.27.1a","since":"40.2000","until":"201.0","originalSince":"40.2000","originalUntil":null},{"id":"unitTest","version":"0.27.1b","since":"40.3245","until":"201.0","originalSince":"40.3245","originalUntil":null},{"id":"unitTest","version":"0.27.1c","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"unitTest","version":"0.27.1d","since":"40.3354","until":"201.0","originalSince":"40.3354","originalUntil":null},{"id":"unitTest","version":"0.27e","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"unitTest","version":"0.27.1f","since":"40.3354","until":"201.0","originalSince":"40.3354","originalUntil":null},{"id":"unitTest","version":"0.29 build 10","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"unitTest","version":"0.29a","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"unitTest","version":"0.29b","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"unitTest","version":"0.29c","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"unitTest","version":"0.301","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"unitTest","version":"0.302","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"unitTest","version":"0.303","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"JUnitGenerator","version":"1.1.4","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"JUnitGenerator","version":"1.1.2","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"JUnitGenerator","version":"1.1.3","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"JUnitGenerator","version":"1.1.5","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"JUnitGenerator","version":"1.1.6","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"JUnitGenerator","version":"1.1.7","since":"40.2233","until":"201.0","originalSince":"40.2233","originalUntil":null},{"id":"FaTPlug","version":"0.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Axis TCP Monitor Plugin","version":"1.0.2","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Axis TCP Monitor Plugin","version":"1.0.8","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Axis TCP Monitor Plugin","version":"1.0.4","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Axis TCP Monitor Plugin","version":"1.0.5","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Axis TCP Monitor Plugin","version":"1.0.6","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Axis TCP Monitor Plugin","version":"1.0.7","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Auto-Format Text","version":"1.4.3","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Auto-Format Text","version":"1.4.5","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Code Outline","version":"0.0.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Code Outline","version":"0.0.2","since":"40.2178","until":"201.0","originalSince":"40.2178","originalUntil":null},{"id":"Code Outline","version":"0.0.3","since":"40.2178","until":"201.0","originalSince":"40.2178","originalUntil":null},{"id":"Code Outline","version":"0.0.4","since":"40.2178","until":"201.0","originalSince":"40.2178","originalUntil":null},{"id":"Code Outline","version":"0.0.5","since":"40.3396","until":"201.0","originalSince":"40.3396","originalUntil":null},{"id":"LineMover","version":"0.4b","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"LineMover","version":"0.4b Pallada","since":"40.1000","until":"201.0","originalSince":"40.1000","originalUntil":null},{"id":"LineMover","version":"1.0","since":"40.3177","until":"201.0","originalSince":"40.3177","originalUntil":null},{"id":"LineMover","version":"0.4f","since":"40.3177","until":"201.0","originalSince":"40.3177","originalUntil":null},{"id":"LineMover","version":"0.4g","since":"40.3177","until":"201.0","originalSince":"40.3177","originalUntil":null},{"id":"LineMover","version":"1.1","since":"40.3177","until":"201.0","originalSince":"40.3177","originalUntil":null},{"id":"LineMover","version":"1.1b","since":"40.3177","until":"201.0","originalSince":"40.3177","originalUntil":null},{"id":"Modifier Modifier Plugin","version":"0.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Modifier Modifier Plugin","version":"0.1.1","since":"40.2178","until":"201.0","originalSince":"40.2178","originalUntil":null},{"id":"Modifier Modifier Plugin","version":"0.1.2","since":"40.2178","until":"201.0","originalSince":"40.2178","originalUntil":null},{"id":"Modifier Modifier Plugin","version":"0.9","since":"40.3100","until":"201.0","originalSince":"40.3100","originalUntil":null},{"id":"MoveElement","version":"0.2","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Reformat","version":"0.7.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"SelectWord","version":"0.2","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Stringify","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Tagify","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"GenerateToString","version":"2.20","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"File status bar","version":"0.1","since":"40.2210","until":"201.0","originalSince":"40.2210","originalUntil":null},{"id":"TabReorder","version":"1.1","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"TabReorder","version":"1.2","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"TabReorder","version":"1.2.1","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"TabReorder","version":"1.2.2","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"TabReorder","version":"1.2.3","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"UndoCloseFile","version":"1.0","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"UndoCloseFile","version":"1.0.1","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"MiniWiki","version":"0.1","since":"40.3117","until":"201.0","originalSince":"40.3117","originalUntil":null},{"id":"MiniWiki","version":"0.2","since":"40.3117","until":"201.0","originalSince":"40.3117","originalUntil":null},{"id":"MiniWiki","version":"0.3","since":"40.3117","until":"201.0","originalSince":"40.3117","originalUntil":null},{"id":"MiniWiki","version":"0.4","since":"40.3117","until":"201.0","originalSince":"40.3117","originalUntil":null},{"id":"Lysosome","version":"1.0","since":"40.2235","until":"201","originalSince":"40.2235","originalUntil":null},{"id":"Lysosome","version":"1.0.1","since":"40.2235","until":"201","originalSince":"40.2235","originalUntil":null},{"id":"Lysosome","version":"1.1","since":"40.2235","until":"201","originalSince":"40.2235","originalUntil":null},{"id":"Lysosome","version":"1.1.1","since":"40.2235","until":"201","originalSince":"40.2235","originalUntil":null},{"id":"StringEditor","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"StringEditor","version":"1.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"File Info","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"File Info","version":"0.99","since":"40.2246","until":"201.0","originalSince":"40.2246","originalUntil":null},{"id":"File Info","version":"1.0.1","since":"40.3354","until":"201.0","originalSince":"40.3354","originalUntil":null},{"id":"File Info","version":"1.0.2","since":"40.3354","until":"201.0","originalSince":"40.3354","originalUntil":null},{"id":"File Info","version":"1.1","since":"55.5131","until":"201.0","originalSince":"55.5131","originalUntil":null},{"id":"File Info","version":"1.1.1","since":"55.5131","until":"201.0","originalSince":"55.5131","originalUntil":null},{"id":"Toggle Camel-humps","version":"1.0","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"MyCamelHumps","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"MyCamelHumps","version":"1.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"MyCamelHumps","version":"1.2","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"MyCamelHumps","version":"1.3","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"MyCamelHumps","version":"1.4","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Less Hungry Backspace","version":"0.1","since":"40.3386","until":"201.0","originalSince":"40.3386","originalUntil":null},{"id":"Less Hungry Backspace","version":"0.2","since":"40.3386","until":"201.0","originalSince":"40.3386","originalUntil":null},{"id":"Locale Utility","version":"1.0.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Character Browser","version":"0.1.0-5.x","since":"40.3461","until":"145.*","originalSince":"40.3461","originalUntil":null},{"id":"Character Browser","version":"0.2.0-5.x","since":"40.3461","until":"145.*","originalSince":"40.3461","originalUntil":null},{"id":"Character Browser","version":"0.3.0-5.x","since":"40.3461","until":"145.*","originalSince":"40.3461","originalUntil":null},{"id":"Character Browser","version":"0.3.0-Demetra","since":"55.5131","until":"145.*","originalSince":"55.5131","originalUntil":null},{"id":"TabStack","version":"1.0","since":"50.4109","until":"201","originalSince":"50.4109","originalUntil":null},{"id":"Permute Plugin","version":"0.8.0","since":"50.4000","until":"201","originalSince":"50.4000","originalUntil":null},{"id":"OrdbogenSearch","version":"1.0","since":"50.4155","until":"183.0","originalSince":"50.4155","originalUntil":null},{"id":"FunkySearch","version":"2.3","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"FunkySearch","version":"2.4","since":"40.2000","until":"201.0","originalSince":"40.2000","originalUntil":null},{"id":"FunkySearch","version":"2.5","since":"40.3185","until":"201.0","originalSince":"40.3185","originalUntil":null},{"id":"IgnoreFilesFolders","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Resin","version":"1.0.1","since":"","until":"202","originalSince":null,"originalUntil":null},{"id":"Resin","version":"2.9.2","since":"40.3311","until":"202","originalSince":"40.3311","originalUntil":null},{"id":"Resin","version":"1.9.1","since":"","until":"202","originalSince":null,"originalUntil":null},{"id":"Resin","version":"1.9.2","since":"40.2159","until":"202","originalSince":"40.2159","originalUntil":null},{"id":"Resin","version":"1.9.3","since":"40.2159","until":"202","originalSince":"40.2159","originalUntil":null},{"id":"Resin","version":"1.9.5","since":"40.2159","until":"202","originalSince":"40.2159","originalUntil":null},{"id":"Resin","version":"1.9.4","since":"40.2159","until":"202","originalSince":"40.2159","originalUntil":null},{"id":"Resin","version":"1.9.6","since":"40.2159","until":"202","originalSince":"40.2159","originalUntil":null},{"id":"Resin","version":"1.9.7","since":"40.2159","until":"202","originalSince":"40.2159","originalUntil":null},{"id":"Resin","version":"2.9.1","since":"40.3214","until":"202","originalSince":"40.3214","originalUntil":null},{"id":"Resin","version":"2.9.3","since":"40.3431","until":"202","originalSince":"40.3431","originalUntil":null},{"id":"Resin","version":"2.9.4","since":"40.3431","until":"202","originalSince":"40.3431","originalUntil":null},{"id":"Resin","version":"2.9.5","since":"40.3431","until":"202","originalSince":"40.3431","originalUntil":null},{"id":"Resin","version":"3.9.0","since":"55.5231","until":"202","originalSince":"55.5231","originalUntil":null},{"id":"AndyTesters","version":"1.0","since":"","until":"222","originalSince":null,"originalUntil":null},{"id":"Code queries","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"PsiViewer","version":"2.20 build 4 20031021","since":"","until":"110.*","originalSince":null,"originalUntil":null},{"id":"PsiViewer","version":"2.21.1","since":"40.2000","until":"110.*","originalSince":"40.2000","originalUntil":null},{"id":"PsiViewer","version":"2.22.1","since":"40.2000","until":"110.*","originalSince":"40.2000","originalUntil":null},{"id":"PsiViewer","version":"2.23.16","since":"40.3144","until":"110.*","originalSince":"40.3144","originalUntil":null},{"id":"PsiViewer","version":"2.25.4","since":"40.3185","until":"110.*","originalSince":"40.3185","originalUntil":null},{"id":"PsiViewer","version":"2.24.1","since":"40.3144","until":"110.*","originalSince":"40.3144","originalUntil":null},{"id":"PsiViewer","version":"2.25.1","since":"40.3185","until":"110.*","originalSince":"40.3185","originalUntil":null},{"id":"PsiViewer","version":"2.25.2","since":"40.3185","until":"110.*","originalSince":"40.3185","originalUntil":null},{"id":"PsiViewer","version":"2.25.3","since":"40.3185","until":"110.*","originalSince":"40.3185","originalUntil":null},{"id":"MailPlugin","version":"0.0.3","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Net client","version":"1.1101","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"IDETalk","version":"0.1.1","since":"40.2230","until":"181.0","originalSince":"40.2230","originalUntil":null},{"id":"IDETalk","version":"0.5.4","since":"40.2230","until":"181.0","originalSince":"40.2230","originalUntil":null},{"id":"IDETalk","version":"0.5","since":"40.2230","until":"181.0","originalSince":"40.2230","originalUntil":null},{"id":"IDETalk","version":"0.5.1","since":"40.2230","until":"181.0","originalSince":"40.2230","originalUntil":null},{"id":"IDETalk","version":"0.5.2","since":"40.2230","until":"181.0","originalSince":"40.2230","originalUntil":null},{"id":"IDETalk","version":"0.5.3","since":"40.2230","until":"181.0","originalSince":"40.2230","originalUntil":null},{"id":"IDETalk","version":"0.5.5","since":"40.2230","until":"181.0","originalSince":"40.2230","originalUntil":null},{"id":"IDETalk","version":"0.5.6","since":"40.2230","until":"181.0","originalSince":"40.2230","originalUntil":null},{"id":"IDETalk","version":"0.5.6.1","since":"40.2230","until":"181.0","originalSince":"40.2230","originalUntil":null},{"id":"IDETalk","version":"0.5.6.2","since":"40.2230","until":"181.0","originalSince":"40.2230","originalUntil":null},{"id":"TMatePlugin","version":"1.5.2","since":"40.2239","until":"113.29","originalSince":"40.2239","originalUntil":null},{"id":"TMatePlugin","version":"1.5.1","since":"40.2239","until":"113.29","originalSince":"40.2239","originalUntil":null},{"id":"TMatePlugin","version":"1.5.3","since":"40.2239","until":"113.29","originalSince":"40.2239","originalUntil":null},{"id":"TMatePlugin","version":"1.5.4","since":"40.2239","until":"113.29","originalSince":"40.2239","originalUntil":null},{"id":"TMatePlugin","version":"1.5.5","since":"40.2239","until":"113.29","originalSince":"40.2239","originalUntil":null},{"id":"TMatePlugin","version":"1.5.6","since":"40.2239","until":"113.29","originalSince":"40.2239","originalUntil":null},{"id":"TMatePlugin","version":"1.5.7","since":"40.3436","until":"113.29","originalSince":"40.3436","originalUntil":null},{"id":"TMatePlugin","version":"1.5.8","since":"40.3436","until":"113.29","originalSince":"40.3436","originalUntil":null},{"id":"TMatePlugin","version":"1.6.0","since":"40.3436","until":"113.29","originalSince":"40.3436","originalUntil":null},{"id":"TMatePlugin","version":"2.0.0","since":"40.3436","until":"113.29","originalSince":"40.3436","originalUntil":null},{"id":"Rob Keyboard","version":"-0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Rob Keyboard","version":"-0.1.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"XMLBean Generator","version":"0.0.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"XMLBean Generator","version":"0.0.2","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"XMLBean Generator","version":"0.0.3","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"XMLBean Generator","version":"0.0.4","since":"40.2253","until":"201.0","originalSince":"40.2253","originalUntil":null},{"id":"simpleUML","version":"0.28a","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"simpleUML","version":"0.29b","since":"40.2132","until":"201.0","originalSince":"40.2132","originalUntil":null},{"id":"simpleUML","version":"0.29c","since":"40.3354","until":"201.0","originalSince":"40.3354","originalUntil":null},{"id":"simpleUML","version":"0.29d","since":"40.3354","until":"201.0","originalSince":"40.3354","originalUntil":null},{"id":"simpleUML","version":"0.29e","since":"40.3354","until":"201.0","originalSince":"40.3354","originalUntil":null},{"id":"DiamondSpin","version":"1.6","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"ReferenceScanner Plugin","version":"1.0.2","since":"40.1100","until":"201.0","originalSince":"40.1100","originalUntil":null},{"id":"ZipTo(G)mail Backup","version":"0.1","since":"40.3394","until":"201.0","originalSince":"40.3394","originalUntil":null},{"id":"ZipTo(G)mail Backup","version":"0.1a","since":"40.3394","until":"201.0","originalSince":"40.3394","originalUntil":null},{"id":"yGuard Unscramble plugin","version":"0.1","since":"40.3235","until":"201.0","originalSince":"40.3235","originalUntil":null},{"id":"Jar Manifest","version":"0.1","since":"40.3235","until":"201.0","originalSince":"40.3235","originalUntil":null},{"id":"Jar Manifest","version":"0.1.1","since":"40.3245","until":"201.0","originalSince":"40.3245","originalUntil":null},{"id":"Jar Manifest","version":"0.1.2","since":"40.3273","until":"201.0","originalSince":"40.3273","originalUntil":null},{"id":"Jar Manifest","version":"0.2","since":"40.3281","until":"201.0","originalSince":"40.3281","originalUntil":null},{"id":"Jar Manifest","version":"0.3","since":"40.3370","until":"201.0","originalSince":"40.3370","originalUntil":null},{"id":"Jar Manifest","version":"0.4","since":"40.3542","until":"201.0","originalSince":"40.3542","originalUntil":null},{"id":"SQL script editor","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Batch Scripts Support","version":"1.0","since":"55.5231","until":"182.*","originalSince":"55.5231","originalUntil":null},{"id":"Javascript Compressor","version":"0.9","since":"40.3542","until":"201.0","originalSince":"40.3542","originalUntil":null},{"id":"Javascript Compressor","version":"0.9.1","since":"40.3542","until":"201.0","originalSince":"40.3542","originalUntil":null},{"id":"Javascript Compressor","version":"0.9.2","since":"40.3542","until":"201.0","originalSince":"40.3542","originalUntil":null},{"id":"Javascript Compressor","version":"1.0","since":"40.3542","until":"201.0","originalSince":"40.3542","originalUntil":null},{"id":"Javascript Compressor","version":"1.0.1","since":"40.3542","until":"201.0","originalSince":"40.3542","originalUntil":null},{"id":"Javascript Compressor","version":"1.1.0","since":"40.3542","until":"201.0","originalSince":"40.3542","originalUntil":null},{"id":"LYCAY","version":"0.5","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"LYCAY","version":"0.51","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"LYCAY","version":"0.512","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"DocTree","version":"0.22","since":"50.4192","until":"201.0","originalSince":"50.4192","originalUntil":null},{"id":"SimpleIntentions","version":"1.5.2","since":"55.5289","until":"181","originalSince":"55.5289","originalUntil":null},{"id":"ReferenceScanner Plugin","version":"2.7","since":"40.3100","until":"201.0","originalSince":"40.3100","originalUntil":null},{"id":"Research","version":"0.1","since":"55.5321","until":"201","originalSince":"55.5321","originalUntil":null},{"id":"DragNDrop","version":"1.0","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"SeleniumRC Server","version":"1.0","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Yahoo Search","version":"1.0","since":"50.4192","until":"201.0","originalSince":"50.4192","originalUntil":null},{"id":"yWorks Ant Explorer","version":"1.0.2","since":"40.3400","until":"201.0","originalSince":"40.3400","originalUntil":null},{"id":"Jsp Internationalizer","version":"1.3","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"JAXB 2.0 XJC generator","version":"1.0","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"reportmill","version":"9.0.5","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"Maven Dependency Manager","version":"1.0","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"DragNDrop","version":"1.1","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"TrackLink","version":"1.1.85","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"DocTree","version":"0.23","since":"50.4192","until":"201.0","originalSince":"50.4192","originalUntil":null},{"id":"File Info","version":"1.1.2","since":"55.5131","until":"201.0","originalSince":"55.5131","originalUntil":null},{"id":"Native2Ascii","version":"1.0.9","since":"55.5557","until":"222.*","originalSince":"55.5557","originalUntil":null},{"id":"Problems View","version":"1.0","since":"55.5557","until":"181","originalSince":"55.5557","originalUntil":null},{"id":"TrackLink","version":"1.1.91","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"Maven Dependency Manager","version":"1.01","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"JavaDoc Browser","version":"0.2.2","since":"50.4192","until":"201.0","originalSince":"50.4192","originalUntil":null},{"id":"Eclipse Dependency Sync","version":"0.9","since":"55.5581","until":"201.0","originalSince":"55.5581","originalUntil":null},{"id":"Color Browser","version":"0.1.0-5.x","since":"40.3461","until":"181","originalSince":"40.3461","originalUntil":null},{"id":"Eclipse Dependency Sync","version":"0.9.1","since":"55.5581","until":"201.0","originalSince":"55.5581","originalUntil":null},{"id":"Color Browser","version":"0.1.0-6.x","since":"55.5000","until":"181","originalSince":"55.5000","originalUntil":null},{"id":"Color Browser","version":"0.2.0-5.x","since":"40.3461","until":"181","originalSince":"40.3461","originalUntil":null},{"id":"Color Browser","version":"0.2.0-6.x","since":"55.5000","until":"181","originalSince":"55.5000","originalUntil":null},{"id":"IDEA Doc","version":"1.0RC1","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"Color Browser","version":"0.2.1-5.x","since":"40.3461","until":"181","originalSince":"40.3461","originalUntil":null},{"id":"Color Browser","version":"0.2.1-6.x","since":"55.5000","until":"222.*","originalSince":"55.5000","originalUntil":null},{"id":"DocTree","version":"0.24","since":"50.4192","until":"201.0","originalSince":"50.4192","originalUntil":null},{"id":"ScratchPad","version":"0.11","since":"50.4192","until":"201.0","originalSince":"50.4192","originalUntil":null},{"id":"ScratchPad","version":"0.12","since":"50.4192","until":"201.0","originalSince":"50.4192","originalUntil":null},{"id":"ScratchPad","version":"0.13","since":"50.4192","until":"201.0","originalSince":"50.4192","originalUntil":null},{"id":"Key promoter_obsolete","version":"0.5","since":"40.3000","until":"92.0","originalSince":"40.3000","originalUntil":null},{"id":"Key promoter_obsolete","version":"0.6","since":"40.3000","until":"92.0","originalSince":"40.3000","originalUntil":null},{"id":"Key promoter_obsolete","version":"0.7","since":"40.3000","until":"92.0","originalSince":"40.3000","originalUntil":null},{"id":"SVN Report for IntelliJ IDEA","version":"1.0.3","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"CVS Report for IntelliJ IDEA","version":"1.1.4","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"HexView","version":"1.2","since":"40.2233","until":"201","originalSince":"40.2233","originalUntil":null},{"id":"HotPlugin","version":"0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Key promoter_obsolete","version":"0.8","since":"40.3000","until":"92.0","originalSince":"40.3000","originalUntil":null},{"id":"BeanShell Box","version":"0.1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Key promoter_obsolete","version":"0.9","since":"40.3000","until":"92.0","originalSince":"40.3000","originalUntil":null},{"id":"BeanShell Box","version":"0.2","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Batch Generator","version":"1.0","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"MantisConnect for Idea","version":"1.0","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"MantisConnect for Idea","version":"1.0a","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"MantisConnect for Idea","version":"1.0b","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"MantisConnect for Idea","version":"1.0RC1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"IDEAStickyPaper","version":"1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"MantisConnect for Idea","version":"1.0RC2","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Key promoter_obsolete","version":"1.0","since":"40.3000","until":"92.0","originalSince":"40.3000","originalUntil":null},{"id":"Batch Generator","version":"1.1 RC1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Batch Generator","version":"1.1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"IDEAStickyPaper","version":"1.0-1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"CCMonitor","version":"0.8","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"IDEAStickyPaper","version":"1.0-2","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"IntelliLang","version":"0.8","since":"55.5706","until":"60.*","originalSince":"55.5706","originalUntil":null},{"id":"Key promoter_obsolete","version":"1.0.1","since":"40.3000","until":"92.0","originalSince":"40.3000","originalUntil":null},{"id":"CodeDependency","version":"1.1","since":"55.5600","until":"201.0","originalSince":"55.5600","originalUntil":null},{"id":"simpleUML","version":"0.31","since":"55.5766","until":"201.0","originalSince":"55.5766","originalUntil":null},{"id":"Resin","version":"3.9.2","since":"55.5231","until":"202","originalSince":"55.5231","originalUntil":null},{"id":"Key promoter_obsolete","version":"1.0.2","since":"40.3000","until":"92.0","originalSince":"40.3000","originalUntil":null},{"id":"FaTPlug","version":"0.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Batch Generator","version":"1.1.1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Resin","version":"3.9.3","since":"55.5231","until":"202","originalSince":"55.5231","originalUntil":null},{"id":"IntelliLang","version":"0.9","since":"55.5755","until":"60.*","originalSince":"55.5755","originalUntil":null},{"id":"CodeDependency","version":"1.2","since":"55.5600","until":"201.0","originalSince":"55.5600","originalUntil":null},{"id":"MiscCommand","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Refactor-J for IDEA 6.0","version":"2.0","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"Refactor-J for IDEA 6.0","version":"2.01","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"Refactor-J for IDEA 6.0","version":"2.02","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"Refactor-X for IDEA 6.0","version":"2.01","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"EasyPluginInstaller","version":"0.5","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"Refactor-J for IDEA 6.0","version":"2.03","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"Harvest Integration","version":"1.0","since":"40.3000","until":"183.0","originalSince":"40.3000","originalUntil":null},{"id":"IntelliLang","version":"1.0","since":"55.5784","until":"60.*","originalSince":"55.5784","originalUntil":null},{"id":"SVN Report for IntelliJ IDEA","version":"1.0.4","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"EasyPluginInstaller","version":"0.6","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"KonaWorks PowerPack","version":"1.0","since":"55.5131","until":"211","originalSince":"55.5131","originalUntil":null},{"id":"RegexPlugin","version":"0.6.0","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"NaviActionPad","version":"0.3","since":"55.5766","until":"193.0","originalSince":"55.5766","originalUntil":null},{"id":"Image Design Editor","version":"1.0","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"KonaWorks PowerPack","version":"1.1","since":"55.5131","until":"211","originalSince":"55.5131","originalUntil":null},{"id":"Harvest Integration","version":"1.0","since":"40.3000","until":"183.0","originalSince":"40.3000","originalUntil":null},{"id":"KonaWorks PowerPack","version":"1.2","since":"55.5131","until":"211","originalSince":"55.5131","originalUntil":null},{"id":"Problems View","version":"1.0.1","since":"55.5557","until":"181","originalSince":"55.5557","originalUntil":null},{"id":"Refactor-J for IDEA 6.0","version":"2.03","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"Refactor-J for IDEA 6.0","version":"2.04","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"CodeDependency","version":"1.3","since":"55.5600","until":"201.0","originalSince":"55.5600","originalUntil":null},{"id":"FQN Improved","version":"1.0","since":"55.5784","until":"201.0","originalSince":"55.5784","originalUntil":null},{"id":"CodeDependency","version":"1.3.1","since":"55.5600","until":"201.0","originalSince":"55.5600","originalUntil":null},{"id":"Class Hunter","version":"0.1","since":"55.5766","until":"201.0","originalSince":"55.5766","originalUntil":null},{"id":"IntelliLang","version":"1.1","since":"55.5784","until":"60.*","originalSince":"55.5784","originalUntil":null},{"id":"SimpleIntentions","version":"1.5.5","since":"55.5000","until":"181","originalSince":"55.5000","originalUntil":null},{"id":"AutoConstructor","version":"0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"AutoConstructor","version":"0.2","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Batch Generator","version":"1.1.2","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"iSnippet","version":"1.0","since":"55.5661","until":"201.0","originalSince":"55.5661","originalUntil":null},{"id":"Kiwi Generator","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"KonaWorks PowerPack","version":"1.3","since":"55.5131","until":"211","originalSince":"55.5131","originalUntil":null},{"id":"Maven1.x Repository Updater","version":"1.1","since":"55.5766","until":"201.0","originalSince":"55.5766","originalUntil":null},{"id":"Maven1.x Repository Updater","version":"1.0","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"Puzzle","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Key promoter_obsolete","version":"1.0.3","since":"40.3000","until":"92.0","originalSince":"40.3000","originalUntil":null},{"id":"Kiwi Generator","version":"1.0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Kiwi Generator","version":"1.0.2","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"NaviActionPad","version":"0.4","since":"55.5766","until":"193.0","originalSince":"55.5766","originalUntil":null},{"id":"EasyPluginInstaller","version":"1.0","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"ThreadMon Plugin","version":"1.0","since":"55.5766","until":"222.*","originalSince":"55.5766","originalUntil":null},{"id":"IntelliLang","version":"1.2","since":"55.5784","until":"60.*","originalSince":"55.5784","originalUntil":null},{"id":"MidStream","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Ant Tracer Plugin","version":"1.0","since":"55.5766","until":"222.*","originalSince":"55.5766","originalUntil":null},{"id":"Jar Juggler","version":"0.1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Jar Juggler","version":"0.2","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Jar Juggler","version":"0.3","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Jar Juggler","version":"0.3","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Jar Juggler","version":"0.5","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Class Hunter","version":"0.1.1","since":"55.5766","until":"201.0","originalSince":"55.5766","originalUntil":null},{"id":"Code Review","version":"1.0","since":"60.6068","until":"222.*","originalSince":"60.6068","originalUntil":null},{"id":"Jar Juggler","version":"0.6","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Jar Juggler","version":"0.7","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"NaviActionPad","version":"0.5","since":"55.5766","until":"193.0","originalSince":"55.5766","originalUntil":null},{"id":"ssh","version":"1.0","since":"55.5784","until":"133.0","originalSince":"55.5784","originalUntil":null},{"id":"GenerateToString","version":"3.27","since":"50.4200","until":"201.0","originalSince":"50.4200","originalUntil":null},{"id":"Switch Structure","version":"1.0","since":"55.5600","until":"183.0","originalSince":"55.5600","originalUntil":null},{"id":"Refactor-J for IDEA 6.0","version":"2.05","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"PluginErrorReportSubmitter","version":"1.0.1","since":"40.3000","until":"201","originalSince":"40.3000","originalUntil":null},{"id":"SimpleIntentions","version":"1.5.6","since":"55.5000","until":"222.*","originalSince":"55.5000","originalUntil":null},{"id":"PluginErrorReportSubmitter","version":"1.0.3","since":"55.5000","until":"201","originalSince":"55.5000","originalUntil":null},{"id":"ssh","version":"1.0.1","since":"55.5784","until":"133.0","originalSince":"55.5784","originalUntil":null},{"id":"Changes Bar","version":"1.1","since":"55.5766","until":"85.*","originalSince":"55.5766","originalUntil":null},{"id":"WDK View","version":"1.0","since":"40.3000","until":"201","originalSince":"40.3000","originalUntil":null},{"id":"PluginErrorReportSubmitter","version":"1.0.4","since":"55.5000","until":"201","originalSince":"55.5000","originalUntil":null},{"id":"Maven Dependency Manager","version":"1.02","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"IntelliLang","version":"1.2.1","since":"55.5784","until":"60.*","originalSince":"55.5784","originalUntil":null},{"id":"Jar Juggler","version":"0.7","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Jar Juggler","version":"0.8","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Jar Juggler","version":"0.9","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Jar Juggler","version":"0.9b","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"CodeDependency","version":"1.4","since":"55.5600","until":"201.0","originalSince":"55.5600","originalUntil":null},{"id":"Refactor-J for IDEA 6.0","version":"2.06","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"Code Review","version":"1.1.0","since":"60.6068","until":"222.*","originalSince":"60.6068","originalUntil":null},{"id":"Kiwi Generator","version":"1.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"SVNbar","version":"1.0","since":"55.5784","until":"201.0","originalSince":"55.5784","originalUntil":null},{"id":"FileAttribChanger","version":"0.9","since":"50.4035","until":"201.0","originalSince":"50.4035","originalUntil":null},{"id":"IvyDependencyImportor","version":"2.1","since":"40.3000","until":"203","originalSince":"40.3000","originalUntil":null},{"id":"Class Hunter","version":"0.1.2","since":"55.5766","until":"201.0","originalSince":"55.5766","originalUntil":null},{"id":"Class Hunter","version":"0.1.3","since":"55.5766","until":"201.0","originalSince":"55.5766","originalUntil":null},{"id":"IdeaMouseGestures","version":"1.7","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"Key promoter_obsolete","version":"1.0.4","since":"40.3000","until":"92.0","originalSince":"40.3000","originalUntil":null},{"id":"SQL script editor","version":"1.01","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"SQL script editor","version":"1.02","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"NaviActionPad","version":"0.6","since":"55.5766","until":"193.0","originalSince":"55.5766","originalUntil":null},{"id":"Event Sounds","version":"1.00","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"PluginErrorReportSubmitter","version":"1.0.5","since":"55.5000","until":"201","originalSince":"55.5000","originalUntil":null},{"id":"SimpleIntentions","version":"1.5.7","since":"55.5000","until":"222.*","originalSince":"55.5000","originalUntil":null},{"id":"Voorkantifyer","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"PluginUpdateNotifier","version":"1.0.0","since":"55.5000","until":"222.*","originalSince":"55.5000","originalUntil":null},{"id":"IntelliLang","version":"1.2.2","since":"60.6107","until":"60.*","originalSince":"60.6107","originalUntil":null},{"id":"PluginUpdateNotifier","version":"1.0.1","since":"55.5000","until":"222.*","originalSince":"55.5000","originalUntil":null},{"id":"SimpleIntentions","version":"1.5.8","since":"55.5000","until":"222.*","originalSince":"55.5000","originalUntil":null},{"id":"PluginUpdateNotifier","version":"1.0.2","since":"55.5000","until":"222.*","originalSince":"55.5000","originalUntil":null},{"id":"PluginErrorReportSubmitter","version":"1.0.6","since":"55.5000","until":"201","originalSince":"55.5000","originalUntil":null},{"id":"JUnit 4 Synchronizer","version":"0.1","since":"60.6107","until":"222.*","originalSince":"60.6107","originalUntil":null},{"id":"JUnit 4 Synchronizer","version":"0.1.1","since":"60.6107","until":"222.*","originalSince":"60.6107","originalUntil":null},{"id":"JUnit 4 Synchronizer","version":"0.1.1","since":"60.6107","until":"222.*","originalSince":"60.6107","originalUntil":null},{"id":"PluginUpdateNotifier","version":"1.0.3","since":"55.5000","until":"222.*","originalSince":"55.5000","originalUntil":null},{"id":"File Info","version":"1.2","since":"60.6667","until":"201.0","originalSince":"60.6667","originalUntil":null},{"id":"Accessors Plugin","version":"0.9.1","since":"50.4000","until":"201.0","originalSince":"50.4000","originalUntil":null},{"id":"org.intellij.jibx","version":"1.1.3","since":"60.6667","until":"201.0","originalSince":"60.6667","originalUntil":null},{"id":"ToggleTest","version":"0.81","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"CruiseWatcher","version":"0.6","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"SimpleIntentions","version":"1.5.9","since":"55.5000","until":"222.*","originalSince":"55.5000","originalUntil":null},{"id":"PluginUpdateNotifier","version":"1.0.4","since":"55.5000","until":"222.*","originalSince":"55.5000","originalUntil":null},{"id":"PluginErrorReportSubmitter","version":"1.0.7","since":"55.5000","until":"201","originalSince":"55.5000","originalUntil":null},{"id":"File Info","version":"1.3","since":"60.6708","until":"201.0","originalSince":"60.6708","originalUntil":null},{"id":"CodeCompletionLive","version":"0.1","since":"50.4267","until":"222.*","originalSince":"50.4267","originalUntil":null},{"id":"CodeCompletionLive","version":"0.2","since":"50.4267","until":"222.*","originalSince":"50.4267","originalUntil":null},{"id":"LockSmith","version":"1.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"NaviActionPad","version":"0.7","since":"55.5766","until":"193.0","originalSince":"55.5766","originalUntil":null},{"id":"ThreadMon Plugin","version":"1.0","since":"55.5766","until":"222.*","originalSince":"55.5766","originalUntil":null},{"id":"LJFriendListReader","version":"1.2.5","since":"40.3500","until":"201.0","originalSince":"40.3500","originalUntil":null},{"id":"GuiceyIDEA","version":"1.0","since":"55.5600","until":"99.0","originalSince":"55.5600","originalUntil":"1.0"},{"id":"Refactor-J for IDEA 6.0","version":"2.07","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"AlphaTab","version":"1.0","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"DeleteMultiLines","version":"1.0","since":"40.3000","until":"201","originalSince":"40.3000","originalUntil":null},{"id":"Key promoter_obsolete","version":"1.0.5","since":"60.6767","until":"92.0","originalSince":"60.6767","originalUntil":null},{"id":"Key promoter_obsolete","version":"1.0.6","since":"60.6767","until":"92.0","originalSince":"60.6767","originalUntil":null},{"id":"LJFriendListReader","version":"1.2.6","since":"40.3500","until":"201.0","originalSince":"40.3500","originalUntil":null},{"id":"Changes Bar","version":"1.2.2","since":"60.6808","until":"85.*","originalSince":"60.6808","originalUntil":null},{"id":"Changes Bar","version":"1.2.3","since":"60.6808","until":"85.*","originalSince":"60.6808","originalUntil":null},{"id":"LibraryManager","version":"0.1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Bindows Plugin","version":"1.0b","since":"55.5784","until":"201.0","originalSince":"55.5784","originalUntil":null},{"id":"Changes Bar","version":"1.3","since":"60.6808","until":"85.*","originalSince":"60.6808","originalUntil":null},{"id":"Changes Bar","version":"1.3.1","since":"60.6808","until":"85.*","originalSince":"60.6808","originalUntil":null},{"id":"Firefox Search","version":"0.4","since":"60.6180","until":"222.*","originalSince":"60.6180","originalUntil":null},{"id":"Firefox Search","version":"0.5","since":"60.6180","until":"222.*","originalSince":"60.6180","originalUntil":null},{"id":"org.intellij.jibx","version":"1.1.4","since":"60.6667","until":"201.0","originalSince":"60.6667","originalUntil":null},{"id":"Firefox Search","version":"0.6","since":"60.6180","until":"222.*","originalSince":"60.6180","originalUntil":null},{"id":"MKS","version":"0.5","since":"60.6667","until":"201.0","originalSince":"60.6667","originalUntil":null},{"id":"CodeDependency","version":"1.4.1","since":"55.5600","until":"201.0","originalSince":"55.5600","originalUntil":null},{"id":"SmartCopy","version":"1.0","since":"60.6180","until":"201.0","originalSince":"60.6180","originalUntil":null},{"id":"FileBrowser","version":"1.0","since":"60.6827","until":"193.0","originalSince":"60.6827","originalUntil":null},{"id":"FileBrowser","version":"1.0.1","since":"60.6827","until":"193.0","originalSince":"60.6827","originalUntil":null},{"id":"FileBrowser","version":"1.0.2","since":"60.6827","until":"193.0","originalSince":"60.6827","originalUntil":null},{"id":"SmartCopy","version":"0.9","since":"50.4069","until":"201.0","originalSince":"50.4069","originalUntil":null},{"id":"CCMonitor","version":"0.9","since":"60.6180","until":"201.0","originalSince":"60.6180","originalUntil":null},{"id":"CCMonitor","version":"0.91","since":"60.6180","until":"201.0","originalSince":"60.6180","originalUntil":null},{"id":"CCMonitor","version":"1.0","since":"60.6180","until":"201.0","originalSince":"60.6180","originalUntil":null},{"id":"GenerateToString","version":"4.0.2","since":"60.6827","until":"201.0","originalSince":"60.6827","originalUntil":null},{"id":"JSUnitTest plugin","version":"1.0","since":"40.3000","until":"202","originalSince":"40.3000","originalUntil":null},{"id":"API Comparator","version":"0.3","since":"","until":"183.0","originalSince":null,"originalUntil":null},{"id":"CVS - Multi-Project updater","version":"1.0.0","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"FileBrowser","version":"1.1.0","since":"60.6827","until":"193.0","originalSince":"60.6827","originalUntil":null},{"id":"CVS - Multi-Project updater","version":"1.0.1","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"CVS - Multi-Project updater","version":"1.0.2","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"FileBrowser","version":"1.2.0","since":"60.6827","until":"193.0","originalSince":"60.6827","originalUntil":null},{"id":"TrackLink","version":"1.1.121","since":"60.6500","until":"201.0","originalSince":"60.6500","originalUntil":null},{"id":"FileBrowser","version":"1.2.1","since":"60.6827","until":"193.0","originalSince":"60.6827","originalUntil":null},{"id":"CVS - Multi-Project updater","version":"1.0.3","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"Firefox Search","version":"0.7","since":"60.6180","until":"222.*","originalSince":"60.6180","originalUntil":null},{"id":"InspectorGeneral","version":"1.0","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"InspectorGeneral","version":"1.0.1","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"InspectorGeneral","version":"1.0.2","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"iBATIS Plugin","version":"0.1","since":"69.6950","until":"120","originalSince":"69.6950","originalUntil":null},{"id":"InspectorGeneral","version":"1.0.3","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"Bindows Plugin","version":"1.0b2","since":"55.5784","until":"201.0","originalSince":"55.5784","originalUntil":null},{"id":"SQL script editor","version":"1.03","since":"69.6913","until":"201.0","originalSince":"69.6913","originalUntil":null},{"id":"SerializeMe","version":"0.1","since":"60.6827","until":"201.0","originalSince":"60.6827","originalUntil":null},{"id":"Changes Bar","version":"1.4","since":"60.6808","until":"85.*","originalSince":"60.6808","originalUntil":null},{"id":"FileBrowser","version":"1.3.0","since":"60.6827","until":"193.0","originalSince":"60.6827","originalUntil":null},{"id":"SerializeMe","version":"0.2","since":"60.6827","until":"201.0","originalSince":"60.6827","originalUntil":null},{"id":"SerializeMe","version":"0.3","since":"60.6827","until":"201.0","originalSince":"60.6827","originalUntil":null},{"id":"CodeDependency","version":"1.4.2","since":"55.5600","until":"201.0","originalSince":"55.5600","originalUntil":null},{"id":"InspectorGeneral","version":"1.0.4","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"InspectorGeneral","version":"1.0.5","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"LockSmith","version":"1.2","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Instant Calculator","version":"1.0","since":"60.6148","until":"201.0","originalSince":"60.6148","originalUntil":null},{"id":"Telelogic Synergy","version":"0.9.2","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"iBATIS Plugin","version":"0.2","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"InspectorGeneral","version":"1.0.6","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"Firefox Search","version":"0.8","since":"60.6180","until":"222.*","originalSince":"60.6180","originalUntil":null},{"id":"FileBrowser","version":"1.4.0","since":"60.6827","until":"193.0","originalSince":"60.6827","originalUntil":null},{"id":"Final modifier","version":"1.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"XMLNavigate","version":"1.0.6","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"SVNbar","version":"1.1","since":"60.6819","until":"201.0","originalSince":"60.6819","originalUntil":null},{"id":"Research","version":"0.2","since":"69.7041","until":"201","originalSince":"69.7041","originalUntil":null},{"id":"TabStack","version":"1.1","since":"69.7041","until":"201","originalSince":"69.7041","originalUntil":null},{"id":"EncodingPlugin","version":"1.0","since":"55.5784","until":"201.0","originalSince":"55.5784","originalUntil":null},{"id":"org.intellij.jibx","version":"1.1.5","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"unitTest","version":"1.0283","since":"60.6833","until":"201.0","originalSince":"60.6833","originalUntil":null},{"id":"File Info","version":"1.4","since":"60.6708","until":"201.0","originalSince":"60.6708","originalUntil":null},{"id":"org.intellij.jibx","version":"1.1.6","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"Bindows Plugin","version":"1.0b3rev1","since":"69.7087","until":"201.0","originalSince":"69.7087","originalUntil":null},{"id":"org.intellij.jibx","version":"2.0.1","since":"60.6180","until":"201.0","originalSince":"60.6180","originalUntil":null},{"id":"IdeaMouseGestures","version":"1.9","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"FileBrowser","version":"1.5.0","since":"60.6827","until":"193.0","originalSince":"60.6827","originalUntil":null},{"id":"Changes Bar","version":"1.5","since":"60.6808","until":"85.*","originalSince":"60.6808","originalUntil":null},{"id":"Bindows Plugin","version":"1.0b4","since":"69.7087","until":"201.0","originalSince":"69.7087","originalUntil":null},{"id":"org.intellij.jibx","version":"2.0.2","since":"60.6180","until":"201.0","originalSince":"60.6180","originalUntil":null},{"id":"AlphaTab","version":"1.1","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"InspectorGeneral","version":"1.0.7","since":"55.5000","until":"201.0","originalSince":"55.5000","originalUntil":null},{"id":"MKS","version":"0.6","since":"69.7002","until":"201.0","originalSince":"69.7002","originalUntil":null},{"id":"Log4j Plugin","version":"1.0","since":"69.7000","until":"181.0","originalSince":"69.7000","originalUntil":null},{"id":"Log4j Plugin","version":"1.0.1","since":"69.7000","until":"181.0","originalSince":"69.7000","originalUntil":null},{"id":"Log4j Plugin","version":"1.1.0","since":"69.7000","until":"181.0","originalSince":"69.7000","originalUntil":null},{"id":"iBATIS Plugin","version":"0.3","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"Log4j Plugin","version":"1.1.1","since":"69.7000","until":"181.0","originalSince":"69.7000","originalUntil":null},{"id":"Berkeley DB Java Edition","version":"1.0","since":"69.7118","until":"201.0","originalSince":"69.7118","originalUntil":null},{"id":"TrackLink","version":"2.0.211","since":"69.6900","until":"201.0","originalSince":"69.6900","originalUntil":null},{"id":"Berkeley DB Java Edition","version":"1.1","since":"69.7118","until":"201.0","originalSince":"69.7118","originalUntil":null},{"id":"JDocs","version":"0.4","since":"60.6189","until":"201.0","originalSince":"60.6189","originalUntil":null},{"id":"XPlanner plugin","version":"0.8","since":"40.3311","until":"201.0","originalSince":"40.3311","originalUntil":null},{"id":"JDocs","version":"0.4.1","since":"60.6189","until":"201.0","originalSince":"60.6189","originalUntil":null},{"id":"XMLNavigate","version":"1.0.7","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"XPlanner plugin","version":"0.8.1","since":"40.3311","until":"201.0","originalSince":"40.3311","originalUntil":null},{"id":"Batch Scripts Support","version":"1.0.1","since":"55.5231","until":"182.*","originalSince":"55.5231","originalUntil":null},{"id":"OpenWith","version":"1.0.1","since":"55.5231","until":"201","originalSince":"55.5231","originalUntil":null},{"id":"iBATIS Plugin","version":"0.4","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"IdeaAmp","version":"1.3.2","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"Log4j Plugin","version":"1.1.2","since":"69.7000","until":"181.0","originalSince":"69.7000","originalUntil":null},{"id":"IdeaMouseGestures","version":"1.10","since":"40.1162","until":"201.0","originalSince":"40.1162","originalUntil":null},{"id":"GenerateToString","version":"4.0.4","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"simpleUML","version":"0.32","since":"72.7274","until":"201.0","originalSince":"72.7274","originalUntil":null},{"id":"Changes Bar","version":"1.6","since":"69.7126","until":"85.*","originalSince":"69.7126","originalUntil":null},{"id":"Changes Bar","version":"1.6.1","since":"69.7126","until":"85.*","originalSince":"69.7126","originalUntil":null},{"id":"Winstone Integration Plugin","version":"1.0","since":"69.7126","until":"181.1","originalSince":"69.7126","originalUntil":null},{"id":"SerializeMe","version":"0.4","since":"60.6833","until":"201.0","originalSince":"60.6833","originalUntil":null},{"id":"XMLNavigate","version":"1.0.8","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"SpellChecker","version":"0.1","since":"72.7269","until":"181","originalSince":"72.7269","originalUntil":null},{"id":"Bindows Plugin","version":"1.0b5","since":"69.7087","until":"201.0","originalSince":"69.7087","originalUntil":null},{"id":"PluginUpdateNotifier","version":"2.0.0","since":"55.5000","until":"222.*","originalSince":"55.5000","originalUntil":null},{"id":"PluginUpdateNotifier","version":"2.0.1","since":"69.7126","until":"222.*","originalSince":"69.7126","originalUntil":null},{"id":"File Info","version":"1.4.1","since":"60.6708","until":"201.0","originalSince":"60.6708","originalUntil":null},{"id":"File Info","version":"1.4.2","since":"60.6708","until":"201.0","originalSince":"60.6708","originalUntil":null},{"id":"iBATIS Plugin","version":"0.4.2","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"simpleUML","version":"0.33","since":"72.7274","until":"201.0","originalSince":"72.7274","originalUntil":null},{"id":"File Info","version":"1.4.3","since":"60.6708","until":"201.0","originalSince":"60.6708","originalUntil":null},{"id":"SpellChecker","version":"0.2","since":"72.7269","until":"181","originalSince":"72.7269","originalUntil":null},{"id":"JS Debugger","version":"1.0","since":"40.3000","until":"170.0","originalSince":"40.3000","originalUntil":null},{"id":"Winstone Integration Plugin","version":"1.01","since":"69.7126","until":"181.1","originalSince":"69.7126","originalUntil":null},{"id":"iBATIS Plugin","version":"0.5.0","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"Bindows Plugin","version":"1.0b5rev1","since":"69.7087","until":"201.0","originalSince":"69.7087","originalUntil":null},{"id":"Build Feedback Plugin","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"BuildFeedback.FreeTTS","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"BuildFeedback.JavaxSound","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"SVNbar","version":"1.2","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"MavenProjectHelper","version":"0.1","since":"60.6800","until":"201.0","originalSince":"60.6800","originalUntil":null},{"id":"MavenProjectHelper","version":"0.2","since":"60.6800","until":"201.0","originalSince":"60.6800","originalUntil":null},{"id":"MavenProjectHelper","version":"0.3","since":"60.6800","until":"201.0","originalSince":"60.6800","originalUntil":null},{"id":"iBATIS Plugin","version":"0.5.1","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"Refactor-J for IDEA 7.0","version":"2.08","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"MavenProjectHelper","version":"0.4","since":"60.6800","until":"201.0","originalSince":"60.6800","originalUntil":null},{"id":"iBATIS Plugin","version":"0.5.2","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"MavenProjectHelper","version":"0.5","since":"60.6800","until":"201.0","originalSince":"60.6800","originalUntil":null},{"id":"PluginUpdateNotifier","version":"2.0.2","since":"69.7126","until":"222.*","originalSince":"69.7126","originalUntil":null},{"id":"Maven Repo Search","version":"1.0","since":"69.7000","until":"180.0","originalSince":"69.7000","originalUntil":null},{"id":"iBATIS Plugin","version":"0.6.0","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"Maven Repo Search","version":"1.01","since":"69.7000","until":"180.0","originalSince":"69.7000","originalUntil":null},{"id":"Winstone Integration Plugin","version":"1.02","since":"69.7126","until":"181.1","originalSince":"69.7126","originalUntil":null},{"id":"OpenInIDEA","version":"0.5.1","since":"69.7000","until":"201","originalSince":"69.7000","originalUntil":null},{"id":"Bindows Plugin","version":"1.0b6","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"MavenProjectHelper","version":"0.6","since":"60.6800","until":"201.0","originalSince":"60.6800","originalUntil":null},{"id":"OpenInIDEA","version":"0.5.2","since":"69.7000","until":"201","originalSince":"69.7000","originalUntil":null},{"id":"Maven Repo Search","version":"1.02","since":"69.7000","until":"180.0","originalSince":"69.7000","originalUntil":null},{"id":"AAHack","version":"0.1","since":"40.3000","until":"181.0","originalSince":"40.3000","originalUntil":null},{"id":"MavenProjectHelper","version":"0.7","since":"60.6800","until":"201.0","originalSince":"60.6800","originalUntil":null},{"id":"Apache Tiles 2.0 plugin","version":"0.1","since":"69.7000","until":"181","originalSince":"69.7000","originalUntil":null},{"id":"PluginUpdateNotifier","version":"2.0.3","since":"69.7126","until":"222.*","originalSince":"69.7126","originalUntil":null},{"id":"CVS Revision Graph","version":"1.0","since":"72.7364","until":"201.0","originalSince":"72.7364","originalUntil":null},{"id":"iBATIS Plugin","version":"0.6.1","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"CVS Revision Graph","version":"1.1","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"CVS Revision Graph","version":"1.3","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"CVS Revision Graph","version":"1.4","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"CVS Revision Graph","version":"1.41","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"DefinitionEqualizer","version":"1.0","since":"60.6180","until":"201.0","originalSince":"60.6180","originalUntil":null},{"id":"CVS Revision Graph","version":"1.50","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"SpellChecker","version":"0.3","since":"72.7269","until":"181","originalSince":"72.7269","originalUntil":null},{"id":"IvyDependencyImportor","version":"2.2final","since":"40.3000","until":"203","originalSince":"40.3000","originalUntil":null},{"id":"CVS Revision Graph","version":"1.60","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"MavenProjectHelper","version":"0.8","since":"60.6800","until":"201.0","originalSince":"60.6800","originalUntil":null},{"id":"CVS Revision Graph","version":"1.70","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"SpellChecker","version":"0.3.1","since":"72.7269","until":"181","originalSince":"72.7269","originalUntil":null},{"id":"MavenProjectHelper","version":"0.9","since":"60.6800","until":"201.0","originalSince":"60.6800","originalUntil":null},{"id":"File Info","version":"1.4.4","since":"60.6708","until":"201.0","originalSince":"60.6708","originalUntil":null},{"id":"CVS Revision Graph","version":"1.80","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"Apache Tiles 2.0 plugin","version":"0.2","since":"69.7000","until":"181","originalSince":"69.7000","originalUntil":null},{"id":"Changes Bar","version":"1.6.2","since":"69.7126","until":"85.*","originalSince":"69.7126","originalUntil":null},{"id":"CVS Revision Graph","version":"2.00","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"InspectorGroovy","version":"0.1","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"CVS Revision Graph","version":"2.10","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"Excelsior JET","version":"1.0.1","since":"55.5784","until":"111.167","originalSince":"55.5784","originalUntil":null},{"id":"CVS Revision Graph","version":"2.11","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"org.kohsuke.idea.mbt","version":"1.0","since":"60.6800","until":"222.*","originalSince":"60.6800","originalUntil":null},{"id":"org.kohsuke.idea.mbt","version":"1.0","since":"60.6800","until":"222.*","originalSince":"60.6800","originalUntil":null},{"id":"Carret Inspector","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"CVS Revision Graph","version":"2.20","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"ANTLRWorks","version":"1.1.5","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"IntelliHeap","version":"1.0","since":"40.3000","until":"183","originalSince":"40.3000","originalUntil":null},{"id":"iBATIS Plugin","version":"0.6.2","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"MavenProjectHelper","version":"1.0","since":"60.6800","until":"201.0","originalSince":"60.6800","originalUntil":null},{"id":"Vcs Revision Graph","version":"1.00","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"Vcs Revision Graph","version":"1.01","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"SVNbar","version":"1.0.1","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"SVNbar","version":"1.2.1","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"SpellChecker","version":"0.3.2","since":"75.7531","until":"181","originalSince":"75.7531","originalUntil":null},{"id":"SpellChecker-Dict-Russian","version":"1.0","since":"72.7269","until":"221.*","originalSince":"72.7269","originalUntil":null},{"id":"SpellChecker","version":"1.0","since":"75.7531","until":"181.0","originalSince":"75.7531","originalUntil":null},{"id":"IntelliPort","version":"1.0","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"CodeLock","version":"1.0","since":"72.7364","until":"200","originalSince":"72.7364","originalUntil":null},{"id":"IntelliBrowser","version":"1.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Grok","version":"1.0","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Grok","version":"1.0.1","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Grok","version":"1.0.2","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Seam Maven 2 Studio for IDEA","version":"1.0","since":"40.2000","until":"201.0","originalSince":"40.2000","originalUntil":null},{"id":"CVS Revision Graph","version":"2.30","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"InspectorGroovy","version":"1.0","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"Grok","version":"1.0.3","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Grok","version":"1.0.4","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Seam Maven 2 Studio for IDEA","version":"1.0.1 Alpha","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"Seam Maven 2 Studio for IDEA","version":"1.0.1 Beta","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"Rio","version":"0.5","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"Seam Maven 2 Studio for IDEA","version":"1.0.1 Beta 0.1","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"TrackLink","version":"2.1.221","since":"69.6900","until":"181.0","originalSince":"69.6900","originalUntil":null},{"id":"Vcs Revision Graph","version":"1.10","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"iBATIS Plugin","version":"0.6.3","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"Prefontaine","version":"0.5","since":"60.6197","until":"201.0","originalSince":"60.6197","originalUntil":null},{"id":"IntelliPROF","version":"1.0","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"iBATIS Plugin","version":"0.8","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"GenerateToString","version":"4.0.5","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"Best Web Search","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Resin","version":"3.9.4","since":"55.5231","until":"202","originalSince":"55.5231","originalUntil":null},{"id":"Resin","version":"4.2.1","since":"72.7361","until":"202","originalSince":"72.7361","originalUntil":null},{"id":"Resin","version":"4.3","since":"72.7361","until":"202","originalSince":"72.7361","originalUntil":null},{"id":"GWT ImageBundle","version":"0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"JumpToCode","version":"0.1","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"ANTLRWorks","version":"1.1.6","since":"60.6197","until":"201.0","originalSince":"60.6197","originalUntil":null},{"id":"QuickPathManager","version":"1.0.0.2","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"QuickPathManager","version":"1.0.0.4","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"Base64","version":"1.0","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"Code Search","version":"0.99","since":"55.5784","until":"181.0","originalSince":"55.5784","originalUntil":null},{"id":"ANTLRWorks","version":"1.1.7","since":"60.6197","until":"201.0","originalSince":"60.6197","originalUntil":null},{"id":"Buildr","version":"0.1","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Buildr","version":"0.1.5","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Rio","version":"0.6","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"CodeLock","version":"1.1","since":"72.7364","until":"200","originalSince":"72.7364","originalUntil":null},{"id":"Buildr","version":"0.1.6","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Buildr","version":"0.2","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Changes Bar","version":"1.6.3","since":"69.7126","until":"85.*","originalSince":"69.7126","originalUntil":null},{"id":"Accessors Plugin","version":"0.9.2","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"SVNbar","version":"1.2.1","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"iBATIS Plugin","version":"0.8.1","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"AlphaTab","version":"1.2","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"SVNbar","version":"1.2.2","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"AlphaTab","version":"1.2.1","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"Snipplr API","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Search YouTube Plugin","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"JumpToCode","version":"0.2","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Rio","version":"0.7","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"iBATIS Plugin","version":"0.8.2","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"JumpToCode","version":"0.3","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Arc","version":"0.1","since":"75.7718","until":"201.0","originalSince":"75.7718","originalUntil":null},{"id":"JumpToCode","version":"0.4","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"IdeaAmp","version":"2.0","since":"40.3000","until":"181","originalSince":"40.3000","originalUntil":null},{"id":"org.kohsuke.idea.mbt","version":"1.1","since":"75.7757","until":"222.*","originalSince":"75.7757","originalUntil":null},{"id":"Base64","version":"1.1","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"OpenDSPInclude","version":"1.0","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"OpenDSPInclude","version":"1.1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"com.jalapeno.idea","version":"1.3.17","since":"55.5581","until":"201.0","originalSince":"55.5581","originalUntil":null},{"id":"Translator","version":"0.1","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"plugin proxy","version":"1.0","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"org.kohsuke.idea.mbt","version":"1.2","since":"75.7757","until":"222.*","originalSince":"75.7757","originalUntil":null},{"id":"Translator","version":"0.9","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"Translator","version":"1.0","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"Translator","version":"1.1","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"Arc","version":"0.3","since":"75.7718","until":"201.0","originalSince":"75.7718","originalUntil":null},{"id":"com.jalapeno.idea","version":"1.3.18","since":"55.5581","until":"201.0","originalSince":"55.5581","originalUntil":null},{"id":"plugin proxy","version":"1.0.1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"OpenDSPInclude","version":"1.2","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"com.jalapeno.idea","version":"1.3.19","since":"55.5581","until":"201.0","originalSince":"55.5581","originalUntil":null},{"id":"iBATIS Plugin","version":"0.8.3","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"iBATIS Plugin","version":"0.8.4","since":"69.7000","until":"120","originalSince":"69.7000","originalUntil":null},{"id":"Lilith","version":"0.0.1","since":"75.7757","until":"201.0","originalSince":"75.7757","originalUntil":null},{"id":"Lilith","version":"0.0.2","since":"75.7757","until":"201.0","originalSince":"75.7757","originalUntil":null},{"id":"Rio","version":"0.8","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"IdeaAmp","version":"2.1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"SVNbar","version":"1.2.3","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"REST Client plugin","version":"0.1","since":"80.8000","until":"222.*","originalSince":"80.8000","originalUntil":null},{"id":"JumpToCode","version":"0.5","since":"72.7364","until":"201.0","originalSince":"72.7364","originalUntil":null},{"id":"MKS","version":"0.7","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"MKS","version":"0.7_Diana","since":"80.8280","until":"201.0","originalSince":"80.8280","originalUntil":null},{"id":"com.jalapeno.idea","version":"1.3.21","since":"55.5581","until":"201.0","originalSince":"55.5581","originalUntil":null},{"id":"Code Review","version":"1.2.0","since":"69.7000","until":"222.*","originalSince":"69.7000","originalUntil":null},{"id":"Ivy Plugin","version":"2.5.1","since":"50.4000","until":"135","originalSince":"50.4000","originalUntil":null},{"id":"Amazon EC2","version":"0.6","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"Amazon EC2","version":"0.7","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"Amazon EC2","version":"0.8","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"Amazon EC2","version":"1.0","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"Amazon EC2","version":"1.0.1","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"Shortcut Keys List","version":"1.001","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"unitTest","version":"1.0294","since":"75.7757","until":"201.0","originalSince":"75.7757","originalUntil":null},{"id":"com.jalapeno.idea","version":"1.3.22","since":"55.5581","until":"201.0","originalSince":"55.5581","originalUntil":null},{"id":"Amazon EC2","version":"1.0.2","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"ATG Inspections","version":"1.0","since":"75.7757","until":"222.*","originalSince":"75.7757","originalUntil":null},{"id":"ATG Inspections","version":"1.2","since":"69.7000","until":"222.*","originalSince":"69.7000","originalUntil":null},{"id":"ATG Inspections","version":"1.2.1","since":"69.7000","until":"222.*","originalSince":"69.7000","originalUntil":null},{"id":"ToggleTest","version":"0.9","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"CruiseWatcher","version":"0.10","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"Code Review","version":"1.2.1","since":"69.7000","until":"222.*","originalSince":"69.7000","originalUntil":null},{"id":"JarDoc","version":"1.0","since":"75.7757","until":"201.0","originalSince":"75.7757","originalUntil":null},{"id":"ResourcePlugin","version":"1.0","since":"60.6148","until":"201.0","originalSince":"60.6148","originalUntil":null},{"id":"iBATIS Plugin","version":"0.9","since":"80.8418","until":"120","originalSince":"80.8418","originalUntil":null},{"id":"GenerateToString","version":"4.0.6","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"GenerateToString","version":"4.0.7","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"com.jalapeno.idea","version":"1.4.3","since":"55.5581","until":"201.0","originalSince":"55.5581","originalUntil":null},{"id":"org.intellij.plugins.junitgen","version":"2.0.6","since":"40.2233","until":"212.*","originalSince":"40.2233","originalUntil":null},{"id":"org.intellij.plugins.junitgen","version":"2.0.7","since":"40.2233","until":"212.*","originalSince":"40.2233","originalUntil":null},{"id":"iBATIS Plugin","version":"0.9.1","since":"80.8600","until":"120","originalSince":"80.8600","originalUntil":null},{"id":"Javadoc Helper","version":"1.0","since":"72.7361","until":"222.*","originalSince":"72.7361","originalUntil":null},{"id":"plugin proxy","version":"1.1.0","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"plugin proxy","version":"1.1.1","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"Translator","version":"1.4.1","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"EasyPatch","version":"2.2.2","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"EasyPatch","version":"2.2.3","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"MavenProjectHelper","version":"1.0","since":"60.6800","until":"201.0","originalSince":"60.6800","originalUntil":null},{"id":"iBATIS Plugin","version":"0.9.4","since":"80.8730","until":"120","originalSince":"80.8730","originalUntil":null},{"id":"API Comparator","version":"0.4","since":"69.7065","until":"183.0","originalSince":"69.7065","originalUntil":null},{"id":"GWT ImageBundle","version":"0.2","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"GWT ImageBundle","version":"0.3","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"OpenDSPInclude","version":"1.3","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"OpenDSPInclude","version":"1.3","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"ANTLRWorks","version":"1.2","since":"60.6197","until":"201.0","originalSince":"60.6197","originalUntil":null},{"id":"CheckThread","version":"1.0.7 (Beta), Requires Intellij 7","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"iBATIS Plugin","version":"0.9.6","since":"80.8768","until":"120","originalSince":"80.8768","originalUntil":null},{"id":"CheckThread","version":"1.0.7.1 (Beta), Requires Intellij 7","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"com.jalapeno.idea","version":"1.4.5","since":"55.5581","until":"201.0","originalSince":"55.5581","originalUntil":null},{"id":"Paste Multiple","version":"1.0","since":"72.7361","until":"201","originalSince":"72.7361","originalUntil":null},{"id":"Code Consultant","version":"1.1","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"Code Consultant","version":"1.2","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"SVNbar","version":"2.0","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"Resin","version":"5.0","since":"72.7361","until":"202","originalSince":"72.7361","originalUntil":null},{"id":"Surround each line","version":"1.0","since":"72.7361","until":"201","originalSince":"72.7361","originalUntil":null},{"id":"RevealInFinder","version":"1.0","since":"72.7200","until":"201.0","originalSince":"72.7200","originalUntil":null},{"id":"Javadoc Helper","version":"1.1","since":"72.7361","until":"222.*","originalSince":"72.7361","originalUntil":null},{"id":"JavaDoc Sync Plugin 8","version":"2.0","since":"80.8823","until":"222.*","originalSince":"80.8823","originalUntil":null},{"id":"Equals/hashCode field inspection","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Equals/hashCode field inspection","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Resin","version":"5.1","since":"72.7361","until":"202","originalSince":"72.7361","originalUntil":null},{"id":"Resin","version":"5.1","since":"72.7361","until":"202","originalSince":"72.7361","originalUntil":null},{"id":"SVNbar","version":"2.0","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"Message key usage plugin","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Message key usage plugin","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"eSnippet Pro plugin_obsolete","version":"1.0","since":"80.8000","until":"211","originalSince":"80.8000","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"0.91","since":"40.3000","until":"203","originalSince":"40.3000","originalUntil":null},{"id":"CheckThread","version":"1.0.8 (Beta), Requires Intellij 7","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"eSnippet Pro plugin_obsolete","version":"1.0.1","since":"80.8000","until":"211","originalSince":"80.8000","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"0.92","since":"75.7941","until":"203","originalSince":"75.7941","originalUntil":null},{"id":"salve-idea","version":"0.10.0","since":"80.8940","until":"201.0","originalSince":"80.8940","originalUntil":null},{"id":"salve-idea","version":"0.10.1","since":"80.8940","until":"201.0","originalSince":"80.8940","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"0.93","since":"75.7941","until":"203","originalSince":"75.7941","originalUntil":null},{"id":"salve-idea","version":"0.10.2","since":"80.8940","until":"201.0","originalSince":"80.8940","originalUntil":null},{"id":"salve-idea","version":"0.10.3","since":"80.8940","until":"201.0","originalSince":"80.8940","originalUntil":null},{"id":"Check My Vars","version":"1.0","since":"72.7361","until":"222.*","originalSince":"72.7361","originalUntil":null},{"id":"Check My Vars","version":"1.0.1","since":"72.7361","until":"222.*","originalSince":"72.7361","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"0.94","since":"75.7941","until":"203","originalSince":"75.7941","originalUntil":null},{"id":"eSnippet Pro plugin_obsolete","version":"1.1","since":"80.8000","until":"211","originalSince":"80.8000","originalUntil":null},{"id":"Idea file rename","version":"1.0","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"salve-idea","version":"0.10.4","since":"80.8940","until":"201.0","originalSince":"80.8940","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"0.95","since":"75.7941","until":"203","originalSince":"75.7941","originalUntil":null},{"id":"Equals/hashCode field inspection","version":"1.01","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Idea file rename","version":"1.1","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"ANTLRWorks","version":"1.2.2","since":"60.6197","until":"201.0","originalSince":"60.6197","originalUntil":null},{"id":"Lilith","version":"0.0.4","since":"75.7757","until":"201.0","originalSince":"75.7757","originalUntil":null},{"id":"HotOrNot Plugin","version":"1.0","since":"80.8000","until":"181","originalSince":"80.8000","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"0.96","since":"75.7941","until":"203","originalSince":"75.7941","originalUntil":null},{"id":"HotOrNot Plugin","version":"1.1","since":"80.8000","until":"181","originalSince":"80.8000","originalUntil":null},{"id":"Buildr","version":"8.11.22","since":"80.9013","until":"201.0","originalSince":"80.9013","originalUntil":null},{"id":"HotOrNot Plugin","version":"1.2","since":"80.8000","until":"181","originalSince":"80.8000","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"0.97","since":"75.7941","until":"203","originalSince":"75.7941","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"0.98","since":"75.7941","until":"203","originalSince":"75.7941","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"0.99","since":"75.7941","until":"203","originalSince":"75.7941","originalUntil":null},{"id":"Winstone Integration Plugin","version":"1.10","since":"80.8000","until":"181.1","originalSince":"80.8000","originalUntil":null},{"id":"Code-Amnesia","version":"0.25","since":"40.3000","until":"222.*","originalSince":"40.3000","originalUntil":null},{"id":"SendTo","version":"1.2","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"CheckThread","version":"1.0.8 (Beta), Requires Intellij 7","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"HotOrNot Plugin","version":"1.3","since":"80.8000","until":"181","originalSince":"80.8000","originalUntil":null},{"id":"com.jalapeno.idea","version":"1.5.1","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Unvoid Methods 7","version":"1.0","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"Unvoid Methods 8","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"HotOrNot Plugin","version":"1.4","since":"80.8000","until":"181","originalSince":"80.8000","originalUntil":null},{"id":"Apache Tiles 2.0 plugin","version":"0.3","since":"80.8000","until":"181","originalSince":"80.8000","originalUntil":null},{"id":"Unvoid Methods 8","version":"1.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Reformat++","version":"1.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Gismeteo Plugin","version":"1.0","since":"72.7361","until":"201.0","originalSince":"72.7361","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.1-dev","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.2-dev","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"eSnippet Pro plugin_obsolete","version":"1.1.1","since":"80.8000","until":"211","originalSince":"80.8000","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.21-dev","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"eSnippet Pro plugin_obsolete","version":"1.1.2","since":"80.8000","until":"211","originalSince":"80.8000","originalUntil":null},{"id":"MKS","version":"0.7.4-Diana","since":"80.8890","until":"201.0","originalSince":"80.8890","originalUntil":null},{"id":"JarDoc","version":"1.0.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"IntelliJ IDEA Mark Plugin","version":"0.1-alpha","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"IntelliJ IDEA Mark Plugin","version":"0.2-alpha","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.30-dev","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"org.kohsuke.idea.mbt","version":"1.3","since":"80.9000","until":"222.*","originalSince":"80.9000","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"0.100","since":"75.7941","until":"203","originalSince":"75.7941","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.31-dev","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"iBATIS Plugin","version":"0.9.7","since":"85.9677","until":"120","originalSince":"85.9677","originalUntil":null},{"id":"TabReorder","version":"1.3","since":"81.9164","until":"201.0","originalSince":"81.9164","originalUntil":null},{"id":"eSnippet Pro plugin_obsolete","version":"1.2","since":"85.9677","until":"211","originalSince":"85.9677","originalUntil":null},{"id":"com.jalapeno.idea","version":"1.5.3","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"OpenDSPInclude","version":"2.0","since":"81.9164","until":"222.*","originalSince":"81.9164","originalUntil":null},{"id":"com.jalapeno.idea","version":"1.5.4","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"Ivy Plugin","version":"2.5.2","since":"81.9164","until":"135","originalSince":"81.9164","originalUntil":null},{"id":"TabReorder","version":"1.4","since":"81.9164","until":"201.0","originalSince":"81.9164","originalUntil":null},{"id":"Class Names in Comments","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"FIT-ifier","version":"0.2","since":"50.4000","until":"201.0","originalSince":"50.4000","originalUntil":null},{"id":"iBATIS Plugin","version":"0.9.8","since":"85.9677","until":"120","originalSince":"85.9677","originalUntil":null},{"id":"Code Consultant","version":"1.3","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"ProGuard Unscramble Plugin","version":"1.2","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"ANTLRWorks","version":"1.2.3","since":"75.7941","until":"201.0","originalSince":"75.7941","originalUntil":null},{"id":"Code snippets","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.81-dev","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"Code snippets","version":"1.0.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"ThisInserter","version":"1.0","since":"80.9013","until":"201","originalSince":"80.9013","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.82-dev","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.83-dev","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"1.0","since":"85.9732","until":"203","originalSince":"85.9732","originalUntil":null},{"id":"Unitils plugin","version":"0.1","since":"80.8000","until":"222.*","originalSince":"80.8000","originalUntil":null},{"id":"Fantom Support","version":"0.0.2","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"com.jalapeno.idea","version":"8.5.3.beta","since":"85.9732","until":"201.0","originalSince":"85.9732","originalUntil":null},{"id":"SourceViewerService Plugin","version":"1.0","since":"81.9164","until":"201.0","originalSince":"81.9164","originalUntil":null},{"id":"CheckThread","version":"1.0.9, Requires Intellij 7 with JRE 1.6 or greater","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Xcordion","version":"0.9","since":"80.8000","until":"201","originalSince":"80.8000","originalUntil":null},{"id":"Xcordion","version":"0.9","since":"80.8000","until":"201","originalSince":"80.8000","originalUntil":null},{"id":"Fantom Support","version":"0.0.3","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"CheckThread","version":"1.0.9.1, Tested on Intellij 7,8 running with JRE 1.6 or greater","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"1.01","since":"85.9732","until":"203","originalSince":"85.9732","originalUntil":null},{"id":"fireworks","version":"1.40","since":"85.9732","until":"181.*","originalSince":"85.9732","originalUntil":null},{"id":"Intellij BashOrg","version":"0.1","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"Intellij BashOrg","version":"0.2","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"salve-idea","version":"1.0","since":"80.8940","until":"201.0","originalSince":"80.8940","originalUntil":null},{"id":"Intellij BashOrg","version":"0.2.1","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"salve-idea","version":"1.0.1","since":"80.8940","until":"201.0","originalSince":"80.8940","originalUntil":null},{"id":"salve-idea","version":"1.0.2","since":"80.8940","until":"201.0","originalSince":"80.8940","originalUntil":null},{"id":"salve-idea","version":"1.0.3","since":"80.8940","until":"201.0","originalSince":"80.8940","originalUntil":null},{"id":"JumpToCode","version":"0.7","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"ThisInserter","version":"1.1","since":"80.9013","until":"201","originalSince":"80.9013","originalUntil":null},{"id":"eSnippet Pro plugin","version":"1.3","since":"92.9677","until":"211","originalSince":"92.9677","originalUntil":null},{"id":"Buffer It","version":"1.0","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"Buffer It","version":"1.1","since":"50.4267","until":"201.0","originalSince":"50.4267","originalUntil":null},{"id":"Bulk Load Modules","version":"1.00","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"QuickPathManager","version":"1.0.1.0","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"Intellij BashOrg","version":"0.3.0","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"Arc","version":"0.4","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"Run Emulator plugin","version":"1.0","since":"50.4155","until":"201.0","originalSince":"50.4155","originalUntil":null},{"id":"Apache Tiles 2.0 plugin","version":"0.3.1","since":"85.9880","until":"181","originalSince":"85.9880","originalUntil":null},{"id":"Xcordion","version":"0.9","since":"80.8000","until":"201","originalSince":"80.8000","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.84-dev","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":"85.*"},{"id":"bzr4idea","version":"2.0-M3-SNAPSHOT","since":"85.9732","until":"90","originalSince":"85.9732","originalUntil":null},{"id":"ArgoUML.Integration","version":"0.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Code Review","version":"1.3.0","since":"69.7000","until":"222.*","originalSince":"69.7000","originalUntil":null},{"id":"salve2-idea","version":"2.0.0","since":"90.10372","until":"201.0","originalSince":"90.10372","originalUntil":null},{"id":"salve2-idea","version":"2.0.1","since":"90.10372","until":"201.0","originalSince":"90.10372","originalUntil":null},{"id":"Ebean weaver","version":"1.0","since":"85.9886","until":"200","originalSince":"85.9886","originalUntil":null},{"id":"Fantom Support","version":"0.0.4","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"Identifier Highlighter","version":"3.61","since":"90.10666","until":"201.0","originalSince":"90.10666","originalUntil":null},{"id":"Key promoter","version":"1.0.8","since":"92.8000","until":"171","originalSince":"92.8000","originalUntil":null},{"id":"unitTest","version":"1.03","since":"85.9886","until":"201.0","originalSince":"85.9886","originalUntil":null},{"id":"salve2-idea","version":"2.0.2","since":"90.10372","until":"201.0","originalSince":"90.10372","originalUntil":null},{"id":"Fantom Support","version":"0.0.5","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.9","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"eSnippet Pro plugin_obsolete","version":"1.3.1","since":"85.9677","until":"211","originalSince":"85.9677","originalUntil":null},{"id":"eSnippet Pro plugin","version":"1.3.1","since":"92.9677","until":"211","originalSince":"92.9677","originalUntil":null},{"id":"Dto-Wrapper-Builder Generator","version":"0.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"ANTLRWorks","version":"1.3","since":"75.7941","until":"201.0","originalSince":"75.7941","originalUntil":null},{"id":"Dto-Wrapper-Builder Generator","version":"0.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.91","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"salve2-idea","version":"2.0.3","since":"90.10372","until":"201.0","originalSince":"90.10372","originalUntil":null},{"id":"salve2-idea","version":"2.0.4","since":"90.10372","until":"201.0","originalSince":"90.10372","originalUntil":null},{"id":"salve2-idea","version":"2.0.5","since":"90.10372","until":"201.0","originalSince":"90.10372","originalUntil":null},{"id":"Dto-Wrapper-Builder Generator","version":"0.3","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"eSnippet Pro plugin_obsolete","version":"1.4.0","since":"90.10000","until":"211","originalSince":"90.10000","originalUntil":null},{"id":"eSnippet Pro plugin","version":"1.4.0","since":"92.9677","until":"211","originalSince":"92.9677","originalUntil":null},{"id":"salve-idea","version":"1.0.4","since":"80.8940","until":"201.0","originalSince":"80.8940","originalUntil":null},{"id":"salve2-idea","version":"2.0.7","since":"90.10372","until":"201.0","originalSince":"90.10372","originalUntil":null},{"id":"Snipplr API","version":"1.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Snipplr API","version":"2.0","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"Bindows Tools","version":"1.0b","since":"80.9013","until":"201.0","originalSince":"80.9013","originalUntil":null},{"id":"Osmorc","version":"1.0.0","since":"","until":"201","originalSince":null,"originalUntil":null},{"id":"Simple Helpers","version":"1.0","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Simple Helpers","version":"1.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Osmorc","version":"1.1.0","since":"","until":"201","originalSince":null,"originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.92","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"Identifier Highlighter","version":"3.62","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"Code Review","version":"1.3.2","since":"","until":"222.*","originalSince":null,"originalUntil":null},{"id":"Code Review","version":"1.3.3","since":"","until":"222.*","originalSince":null,"originalUntil":null},{"id":"ANTLRWorks","version":"1.3.1","since":"","until":"201.0","originalSince":null,"originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-2.6.3-v20091123140000","since":"","until":"183.0","originalSince":null,"originalUntil":null},{"id":"com.intellij.dmserver","version":"0.1.1","since":"","until":"201","originalSince":null,"originalUntil":null},{"id":"IdeaServerPlugin","version":"1.0","since":"92.81","until":"181.0","originalSince":"92.81","originalUntil":null},{"id":"Ebean weaver","version":"1.2","since":"90.10000","until":"200","originalSince":"90.10000","originalUntil":null},{"id":"Winstone Integration Plugin(CE)","version":"1.11","since":"93.13","until":"180.0","originalSince":"93.13","originalUntil":null},{"id":"Fantom Support","version":"0.0.6","since":"93.13","until":"201.0","originalSince":"93.13","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.93","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.2.0","since":"90.10000","until":"201","originalSince":"90.10000","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.94","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"bzr4intellij","version":"2.1.0","since":"91.13","until":"181.0","originalSince":"91.13","originalUntil":null},{"id":"Reformat++","version":"1.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"bzr4intellij","version":"2.1.1","since":"91.13","until":"181.0","originalSince":"91.13","originalUntil":null},{"id":"Bulk Load Modules","version":"1.01","since":"90.0","until":"201.0","originalSince":"90.0","originalUntil":null},{"id":"Buildr","version":"9.0.0","since":"93.1","until":"201.0","originalSince":"93.1","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.3.0","since":"90.10000","until":"201","originalSince":"90.10000","originalUntil":null},{"id":"iTest","version":"1.0.0","since":"81.9313","until":"201.0","originalSince":"81.9313","originalUntil":null},{"id":"MKS","version":"0.8","since":"93.13","until":"201.0","originalSince":"93.13","originalUntil":null},{"id":"ArgoUML.Integration","version":"0.1.1","since":"80.8000","until":"181.0","originalSince":"80.8000","originalUntil":null},{"id":"RegexPlugin","version":"0.6.1","since":"91.13","until":"201.0","originalSince":"91.13","originalUntil":null},{"id":"iBATIS Plugin","version":"1.0.0","since":"91.13","until":"120","originalSince":"91.13","originalUntil":null},{"id":"org.intellij.jibx","version":"3.1","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"com.jalapeno.idea","version":"8.5.3.beta","since":"85.9732","until":"201.0","originalSince":"85.9732","originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-2.6.3.2-v20100205120000","since":"72.7200","until":"183.0","originalSince":"72.7200","originalUntil":null},{"id":"ArgoUML.Integration","version":"0.1.2","since":"80.8000","until":"181.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"JBoss jBPM","version":"1.0.0","since":"80.8000","until":"124.0","originalSince":"80.8000","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.4.0","since":"90.10000","until":"201","originalSince":"90.10000","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.4.2","since":"90.10000","until":"201","originalSince":"90.10000","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.95","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"Ebean weaver","version":"1.3","since":"90.10000","until":"200","originalSince":"90.10000","originalUntil":null},{"id":"bzr4intellij","version":"2.3.0","since":"91.13","until":"181.0","originalSince":"91.13","originalUntil":null},{"id":"bzr4intellij","version":"2.3.1","since":"91.13","until":"181.0","originalSince":"91.13","originalUntil":null},{"id":"unitTest","version":"1.04","since":"93.94","until":"201.0","originalSince":"93.94","originalUntil":null},{"id":"IntelliJ Open Files Copier","version":"1.0","since":"60.6197","until":"201.0","originalSince":"60.6197","originalUntil":null},{"id":"com.jalapeno.idea","version":"1.5.9","since":"75.7590","until":"201.0","originalSince":"75.7590","originalUntil":null},{"id":"com.jalapeno.idea","version":"8.5.4.beta","since":"85.9732","until":"201.0","originalSince":"85.9732","originalUntil":null},{"id":"RegexPlugin","version":"0.6.2","since":"91.13","until":"201.0","originalSince":"91.13","originalUntil":null},{"id":"Osmorc","version":"1.1.1","since":"90.10","until":"201","originalSince":"90.10","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.5.0","since":"90.10000","until":"201","originalSince":"90.10000","originalUntil":null},{"id":"iTest","version":"1.0.1","since":"81.9313","until":"201.0","originalSince":"81.9313","originalUntil":null},{"id":"MKS","version":"0.8.1","since":"94.426","until":"201.0","originalSince":"94.426","originalUntil":null},{"id":"RelaxNG-Support","version":"1.5.4","since":"95.4","until":"96.0","originalSince":"95.4","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.5.0","since":"90.10000","until":"201","originalSince":"90.10000","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.6.5","since":"90.10000","until":"201","originalSince":"90.10000","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.3","since":"80.8000","until":"141.3058","originalSince":"80.8000","originalUntil":null},{"id":"simpleUMLCE","version":"0.01","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"iBATIS Plugin","version":"1.0.1","since":"91.13","until":"120","originalSince":"91.13","originalUntil":null},{"id":"bzr4intellij","version":"2.4.0","since":"95.66","until":"181.0","originalSince":"95.66","originalUntil":null},{"id":"LogSupport","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"LogSupport","version":"1.0.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"LogSupport","version":"1.0.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.6.7","since":"90.10000","until":"95.0","originalSince":"90.10000","originalUntil":null},{"id":"XPlanner plugin","version":"0.9.1","since":"90.10000","until":"201.0","originalSince":"90.10000","originalUntil":null},{"id":"Buildr","version":"9.0.0-2010.05.07","since":"93.1","until":"201.0","originalSince":"93.1","originalUntil":null},{"id":"XSLT-Debugger","version":"1.2.3","since":"95.4","until":"201","originalSince":"95.4","originalUntil":null},{"id":"TJSCompressor","version":"1.0","since":"69.7000","until":"201.0","originalSince":"69.7000","originalUntil":null},{"id":"WaspTool","version":"3.0","since":"90.0","until":"181","originalSince":"90.0","originalUntil":null},{"id":"bzr4intellij","version":"2.4.1","since":"95.66","until":"181.0","originalSince":"95.66","originalUntil":null},{"id":"PList File Support","version":"1.0","since":"80.8000","until":"181.0","originalSince":"80.8000","originalUntil":null},{"id":"SBT","version":"1.0.0","since":"95.66","until":"143.0","originalSince":"95.66","originalUntil":null},{"id":"PList File Support","version":"1.1","since":"80.8000","until":"181.0","originalSince":"80.8000","originalUntil":null},{"id":"RelaxNG-Support","version":"1.5.5","since":"95.4","until":"96.0","originalSince":"95.4","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.8.0","since":"90.10000","until":"95.0","originalSince":"90.10000","originalUntil":null},{"id":"com.jalapeno.idea","version":"9.0.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.jalapeno.idea.javaee","version":"1.0","since":"95.66","until":"201.0","originalSince":"95.66","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.8.1","since":"90.10000","until":"96.0","originalSince":"90.10000","originalUntil":null},{"id":"bzr4intellij","version":"2.4.2","since":"95.66","until":"181.0","originalSince":"95.66","originalUntil":null},{"id":"Osmorc","version":"1.2.1","since":"90.10","until":"201","originalSince":"90.10","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.1 (alpha)","since":"95.66","until":"191.6708","originalSince":"95.66","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.1.1 (alpha)","since":"95.66","until":"191.6708","originalSince":"95.66","originalUntil":null},{"id":"ru.crazycoder.plugins.tabdir","version":"1.0","since":"95.429","until":"231.*","originalSince":"95.429","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.8.2","since":"94.495","until":"97.0","originalSince":"94.495","originalUntil":null},{"id":"UDDI Tools","version":"1.0","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"ru.crazycoder.plugins.tabdir","version":"1.1","since":"95.429","until":"231.*","originalSince":"95.429","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.2 (alpha)","since":"95.66","until":"191.6708","originalSince":"95.66","originalUntil":null},{"id":"Winstone Integration Plugin(CE)","version":"1.2","since":"93.13","until":"180.0","originalSince":"93.13","originalUntil":null},{"id":"UDDI Tools","version":"1.0.1","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.3 (alpha)","since":"95.66","until":"191.6708","originalSince":"95.66","originalUntil":null},{"id":"JBoss jBPM","version":"1.0.10","since":"96.516","until":"124.0","originalSince":"96.516","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.9.0","since":"96.1121","until":"99.0","originalSince":"96.1121","originalUntil":null},{"id":"XSLT-Debugger","version":"1.2.4","since":"95.311","until":"201","originalSince":"95.311","originalUntil":null},{"id":"JBoss jBPM","version":"1.0.10","since":"96.516","until":"124.0","originalSince":"96.516","originalUntil":null},{"id":"IntelliHeap","version":"1.0.1","since":"40.3000","until":"183","originalSince":"40.3000","originalUntil":null},{"id":"com.intellij.tcserver","version":"1.0","since":"95.429","until":"201","originalSince":"95.429","originalUntil":null},{"id":"bzr4intellij","version":"2.4.3","since":"95.66","until":"181.0","originalSince":"95.66","originalUntil":null},{"id":"DataNucleusIntegration","version":"1.0.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"PList File Support","version":"1.2","since":"80.8000","until":"181.0","originalSince":"80.8000","originalUntil":null},{"id":"ThisInserter","version":"1.2","since":"93.13","until":"201","originalSince":"93.13","originalUntil":null},{"id":"Copy Src","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.9.1","since":"96.1121","until":"99.0","originalSince":"96.1121","originalUntil":null},{"id":"Ivy Plugin","version":"3.0","since":"95.429","until":"135","originalSince":"95.429","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.9.2","since":"96.1121","until":"99.0","originalSince":"96.1121","originalUntil":null},{"id":"File Listener Server","version":"1.0","since":"80.8000","until":"183.0","originalSince":"80.8000","originalUntil":null},{"id":"Google Closure Soy Templates","version":"0.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.96","since":"80.9013","until":"181.*","originalSince":"80.9013","originalUntil":null},{"id":"com.jalapeno.idea","version":"9.0.4","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"WicketForge","version":"0.7.2","since":"90.10000","until":"91","originalSince":"90.10000","originalUntil":null},{"id":"Buildr","version":"9.0.4-2010.11.16","since":"93.1","until":"201.0","originalSince":"93.1","originalUntil":null},{"id":"com.intellij.dmserver","version":"0.9.3","since":"98.311","until":"103.39","originalSince":"98.311","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"5.13602","since":"60.6000","until":"90.10000","originalSince":"60.6000","originalUntil":null},{"id":"XSLT-Debugger","version":"1.2.5","since":"95.311","until":"201","originalSince":"95.311","originalUntil":null},{"id":"Google Closure Soy Templates","version":"0.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"DocTree","version":"0.25","since":"50.4192","until":"201.0","originalSince":"50.4192","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.4","since":"80.8000","until":"141.3058","originalSince":"80.8000","originalUntil":null},{"id":"My Runner","version":"0.9","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"6.15772","since":"69.7000","until":"90.10000","originalSince":"69.7000","originalUntil":null},{"id":"SBT","version":"1.1.0","since":"95.66","until":"143.0","originalSince":"95.66","originalUntil":null},{"id":"JBehaveBddPlugin","version":"0.2.1","since":"93.94","until":"201.0","originalSince":"93.94","originalUntil":null},{"id":"Ivy Plugin","version":"3.1","since":"95.429","until":"135","originalSince":"95.429","originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-3.0.2-v20101207100000","since":"72.7200","until":"183.0","originalSince":"72.7200","originalUntil":null},{"id":"ScratchPad","version":"0.14","since":"50.4192","until":"201.0","originalSince":"50.4192","originalUntil":null},{"id":"Ivy Plugin","version":"3.2","since":"95.429","until":"135","originalSince":"95.429","originalUntil":null},{"id":"Osmorc","version":"1.3.2","since":"98.0","until":"201","originalSince":"98.0","originalUntil":null},{"id":"Buildr","version":"10.0.0-2010.12.10","since":"99.18","until":"201.0","originalSince":"99.18","originalUntil":null},{"id":"com.intellij.aspectj","version":"0.7","since":"95.521","until":"181.0","originalSince":"95.521","originalUntil":"96.0"},{"id":"Libretto","version":"0.1-5734","since":"93.13","until":"201.0","originalSince":"93.13","originalUntil":null},{"id":"WicketForge","version":"0.8.2","since":"90.10000","until":"91","originalSince":"90.10000","originalUntil":null},{"id":"Ivy Plugin","version":"3.3","since":"95.429","until":"135","originalSince":"95.429","originalUntil":null},{"id":"Ivy Plugin","version":"3.4","since":"95.429","until":"135","originalSince":"95.429","originalUntil":null},{"id":"ru.crazycoder.plugins.tabdir","version":"1.2","since":"95.429","until":"231.*","originalSince":"95.429","originalUntil":null},{"id":"Ivy Plugin","version":"3.5","since":"95.429","until":"135","originalSince":"95.429","originalUntil":null},{"id":"MetricsReloaded","version":"0.9.1","since":"80.8500","until":"212.*","originalSince":"80.8500","originalUntil":null},{"id":"XSLT-Debugger","version":"1.2.7","since":"95.311","until":"201","originalSince":"95.311","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"1.02","since":"99.32","until":"203","originalSince":"99.32","originalUntil":null},{"id":"com.kalistick.client.idea","version":"1.0","since":"90.10000","until":"201.0","originalSince":"90.10000","originalUntil":null},{"id":"Ivy Plugin","version":"3.6","since":"95.429","until":"135","originalSince":"95.429","originalUntil":null},{"id":"com.jalapeno.idea","version":"10.0.0","since":"99.0","until":"201.0","originalSince":"99.0","originalUntil":null},{"id":"com.kalistick.client.idea","version":"1.0.1","since":"90.10000","until":"201.0","originalSince":"90.10000","originalUntil":null},{"id":"IdeaServerPlugin","version":"1.0.2","since":"104.177","until":"181.0","originalSince":"104.177","originalUntil":null},{"id":"RESTClient","version":"1.0","since":"80.8000","until":"143.*","originalSince":"80.8000","originalUntil":null},{"id":"bzr4intellij","version":"2.6.0","since":"103.72","until":"181.0","originalSince":"103.72","originalUntil":null},{"id":"bzr4intellij","version":"2.6.1","since":"103.72","until":"181.0","originalSince":"103.72","originalUntil":null},{"id":"MetricsReloaded","version":"0.9.2","since":"80.8500","until":"212.*","originalSince":"80.8500","originalUntil":null},{"id":"com.intellij.tcserver","version":"1.1","since":"99.0","until":"201","originalSince":"99.0","originalUntil":null},{"id":"TestDox","version":"1.1.14 (IDEA X)","since":"90.116","until":"181","originalSince":"90.116","originalUntil":null},{"id":"schemely","version":"0.0.1","since":"103.72","until":"145.0","originalSince":"103.72","originalUntil":null},{"id":"com.kalistick.client.idea","version":"2.0-RC1","since":"90.10000","until":"201.0","originalSince":"90.10000","originalUntil":null},{"id":"AribaWeb Plugin","version":"5.0GA","since":"40.3000","until":"201.0","originalSince":"40.3000","originalUntil":null},{"id":"XMLNavigate","version":"1.0.10","since":"85.9932","until":"201.0","originalSince":"85.9932","originalUntil":null},{"id":"com.kalistick.client.idea","version":"2.0.2","since":"90.10000","until":"201.0","originalSince":"90.10000","originalUntil":null},{"id":"ru.crazycoder.plugins.tabdir","version":"1.3","since":"95.429","until":"231.*","originalSince":"95.429","originalUntil":null},{"id":"tea","version":"0.5","since":"103.72","until":"191.1","originalSince":"103.72","originalUntil":null},{"id":"schemely","version":"0.0.2","since":"103.72","until":"145.0","originalSince":"103.72","originalUntil":null},{"id":"TabFolder","version":"1.0","since":"50.4155","until":"181.0","originalSince":"50.4155","originalUntil":null},{"id":"tea","version":"0.6","since":"103.72","until":"191.1","originalSince":"103.72","originalUntil":null},{"id":"schemely","version":"0.0.3","since":"103.72","until":"145.0","originalSince":"103.72","originalUntil":null},{"id":"Jalopy Plugin for Idea 10","version":"1.0","since":"90.10000","until":"201.0","originalSince":"90.10000","originalUntil":null},{"id":"Log4JPlugin","version":"1.0","since":"85.9852","until":"201.0","originalSince":"85.9852","originalUntil":null},{"id":"Log4JPlugin","version":"1.01","since":"85.9852","until":"201.0","originalSince":"85.9852","originalUntil":null},{"id":"SonOfExternalCodeFormatter","version":"1.0.5-SNAPSHOT","since":"80.9000","until":"200","originalSince":"80.9000","originalUntil":null},{"id":"Remote call","version":"1.0","since":"80.8000","until":"223.*","originalSince":"80.8000","originalUntil":null},{"id":"Install Plugin Locally","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"WicketForge","version":"0.9.2","since":"90.10000","until":"91","originalSince":"90.10000","originalUntil":null},{"id":"Log4JPlugin","version":"1.02","since":"85.9852","until":"201.0","originalSince":"85.9852","originalUntil":null},{"id":"DataNucleusIntegration","version":"1.0.3","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"DataNucleusIntegration","version":"1.0.4","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.4.1","since":"90.10000","until":"141.3058","originalSince":"90.10000","originalUntil":null},{"id":"SBT","version":"1.2.0","since":"103.255","until":"143.0","originalSince":"103.255","originalUntil":null},{"id":"ThisInserter","version":"1.3","since":"99.18","until":"201","originalSince":"99.18","originalUntil":null},{"id":"schemely","version":"0.1.0","since":"103.72","until":"145.0","originalSince":"103.72","originalUntil":null},{"id":"PsiViewer","version":"2.27.0","since":"40.3461","until":"110.*","originalSince":"40.3461","originalUntil":null},{"id":"IdeaVIM","version":"0.15.59","since":"106.500","until":"181.0","originalSince":"106.500","originalUntil":null},{"id":"XMLNavigate","version":"1.0.11","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"Javascript Uploader","version":"2.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"XMLNavigate","version":"1.0.12","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"Runtime java completion","version":"0.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"BuildWatcher","version":"1.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Runtime java completion","version":"0.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"DataNucleusIntegration","version":"1.0.5","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"IdeaVIM","version":"0.16.60","since":"107.100","until":"181.0","originalSince":"107.100","originalUntil":null},{"id":"LogSupport","version":"1.0.3","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"eSnippet Pro plugin_obsolete","version":"1.4.1","since":"103.72","until":"211","originalSince":"103.72","originalUntil":null},{"id":"RegexPlugin","version":"0.6.3","since":"100.0","until":"201.0","originalSince":"100.0","originalUntil":null},{"id":"eSnippet Pro plugin_obsolete","version":"1.4.2","since":"103.72","until":"211","originalSince":"103.72","originalUntil":null},{"id":"LogSupport","version":"1.0.5","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"LogSupport","version":"1.0.6","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"SequencePluginReload","version":"1.0.0","since":"107.105","until":"202","originalSince":"107.105","originalUntil":null},{"id":"SonOfExternalCodeFormatter","version":"1.0.5","since":"80.9000","until":"200","originalSince":"80.9000","originalUntil":null},{"id":"Remote call","version":"1.1","since":"80.8000","until":"223.*","originalSince":"80.8000","originalUntil":null},{"id":"SequencePluginReload","version":"1.0.0","since":"107.105","until":"202","originalSince":"107.105","originalUntil":null},{"id":"Javadoc Utility","version":"1.2","since":"80.8000","until":"211","originalSince":"80.8000","originalUntil":null},{"id":"LogSupport","version":"1.0.7","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Remote call","version":"1.2","since":"80.8000","until":"223.*","originalSince":"80.8000","originalUntil":null},{"id":"LogSupport","version":"1.0.8","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"BackgroundImage","version":"0.10.1","since":"99.18","until":"231","originalSince":"99.18","originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-3.1.0.v20110531000000","since":"72.7200","until":"183.0","originalSince":"72.7200","originalUntil":null},{"id":"Libretto","version":"0.1-6000","since":"93.13","until":"201.0","originalSince":"93.13","originalUntil":null},{"id":"WicketForge","version":"1.0.0","since":"90.10000","until":"91","originalSince":"90.10000","originalUntil":null},{"id":"CSS-X-Fire","version":"1.19","since":"93.13","until":"201","originalSince":"93.13","originalUntil":null},{"id":"TabFolder","version":"1.0.1","since":"50.4155","until":"181.0","originalSince":"50.4155","originalUntil":null},{"id":"PsiViewer","version":"2.27.25","since":"40.3461","until":"110.*","originalSince":"40.3461","originalUntil":null},{"id":"SBT","version":"1.3.0","since":"103.255","until":"143.0","originalSince":"103.255","originalUntil":null},{"id":"SVN Revision Graph","version":"1.0","since":"99.18","until":"181.0","originalSince":"99.18","originalUntil":null},{"id":"WicketForge","version":"1.0.1","since":"90.10000","until":"91","originalSince":"90.10000","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"6.17795","since":"90.10000","until":"133.1800","originalSince":"90.10000","originalUntil":null},{"id":"SonOfExternalCodeFormatter","version":"1.6.0","since":"80.9000","until":"200","originalSince":"80.9000","originalUntil":null},{"id":"CSS-X-Fire","version":"1.20","since":"93.13","until":"201","originalSince":"93.13","originalUntil":null},{"id":"SequencePluginReload","version":"1.0.0","since":"95.267","until":"202","originalSince":"95.267","originalUntil":null},{"id":"PsiViewer","version":"2.27.34","since":"40.3461","until":"110.*","originalSince":"40.3461","originalUntil":null},{"id":"LogSupport","version":"1.0.9","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"GeneratePropertyNameConstants","version":"0.03","since":"102.0","until":"231.*","originalSince":"102.0","originalUntil":null},{"id":"LogSupport","version":"1.0.10","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"CodeOutline2","version":"0.5","since":"93.13","until":"201","originalSince":"93.13","originalUntil":null},{"id":"IdeaServerPlugin","version":"1.0.3","since":"104.177","until":"181.0","originalSince":"104.177","originalUntil":null},{"id":"CVS Revision Graph Plus","version":"2.31","since":"99.5","until":"201","originalSince":"99.5","originalUntil":null},{"id":"SBT","version":"1.3.1","since":"103.255","until":"143.0","originalSince":"103.255","originalUntil":null},{"id":"SonOfExternalCodeFormatter","version":"1.6.1","since":"80.9000","until":"200","originalSince":"80.9000","originalUntil":null},{"id":"CSS-X-Fire","version":"1.21","since":"93.13","until":"201","originalSince":"93.13","originalUntil":null},{"id":"com.intellij.tcserver","version":"1.1.1","since":"108.0","until":"201","originalSince":"108.0","originalUntil":null},{"id":"CodeOutline2","version":"0.5.1","since":"93.13","until":"201","originalSince":"93.13","originalUntil":null},{"id":"ideah","version":"0.1","since":"99.18","until":"107.*","originalSince":"99.18","originalUntil":null},{"id":"QuickJump","version":"4.2.1","since":"108.1333","until":"213.*","originalSince":"108.1333","originalUntil":null},{"id":"BEM Support","version":"1.0.8","since":"99.18","until":"201.0","originalSince":"99.18","originalUntil":null},{"id":"BEM Support","version":"1.0.9","since":"99.18","until":"201.0","originalSince":"99.18","originalUntil":null},{"id":"BEM Support","version":"1.0.10","since":"99.18","until":"201.0","originalSince":"99.18","originalUntil":null},{"id":"BEM Support","version":"1.0.11","since":"99.18","until":"201.0","originalSince":"99.18","originalUntil":null},{"id":"ru.crazycoder.plugins.tabdir","version":"1.3.1","since":"95.429","until":"231.*","originalSince":"95.429","originalUntil":null},{"id":"pl.project13.intellij.kanbanery","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"BEM Support","version":"1.0.12","since":"99.18","until":"201.0","originalSince":"99.18","originalUntil":null},{"id":"Google Closure Soy Templates","version":"0.2.1","since":"107.587","until":"201.0","originalSince":"107.587","originalUntil":null},{"id":"Key promoter","version":"1.0.9","since":"107.587","until":"171","originalSince":"107.587","originalUntil":null},{"id":"CVS Revision Graph Plus","version":"2.40","since":"99.5","until":"201","originalSince":"99.5","originalUntil":null},{"id":"Key promoter","version":"1.0.10","since":"107.587","until":"171","originalSince":"107.587","originalUntil":null},{"id":"ru.crazycoder.plugins.tabdir","version":"1.4","since":"95.429","until":"231.*","originalSince":"95.429","originalUntil":null},{"id":"PsiViewer","version":"3.27.52","since":"110.129","until":"110.*","originalSince":"110.129","originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-3.1.1.v20111104130900","since":"72.7200","until":"183.0","originalSince":"72.7200","originalUntil":null},{"id":"CSS-X-Fire","version":"1.23","since":"93.13","until":"201","originalSince":"93.13","originalUntil":null},{"id":"com.jalapeno.idea","version":"10.5.0","since":"99.0","until":"201.0","originalSince":"99.0","originalUntil":null},{"id":"QuickJump","version":"4.3","since":"110.365","until":"213.*","originalSince":"110.365","originalUntil":null},{"id":"PsiViewer","version":"3.27.55","since":"110.129","until":"110.*","originalSince":"110.129","originalUntil":null},{"id":"PsiViewer","version":"3.27.56","since":"110.129","until":"110.*","originalSince":"110.129","originalUntil":null},{"id":"BEM Support","version":"1.0.13","since":"99.18","until":"201.0","originalSince":"99.18","originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-3.1.2.v20111107000000","since":"72.7200","until":"183.0","originalSince":"72.7200","originalUntil":null},{"id":"SonOfExternalCodeFormatter","version":"1.6.2","since":"80.9000","until":"200","originalSince":"80.9000","originalUntil":null},{"id":"Buildr","version":"10.5.4-2011.12.05","since":"107.777","until":"201.0","originalSince":"107.777","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.0","since":"111.14","until":"231.*","originalSince":"111.14","originalUntil":null},{"id":"IdeaVIM","version":"0.20.75","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"SonOfExternalCodeFormatter","version":"1.6.3","since":"80.9000","until":"200","originalSince":"80.9000","originalUntil":null},{"id":"CSS-X-Fire","version":"1.24","since":"93.13","until":"201","originalSince":"93.13","originalUntil":null},{"id":"IntelliJBehave","version":"0.9.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"R4Intellij","version":"0.1","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"R4Intellij","version":"0.2","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"R4Intellij","version":"0.3","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.3.1 (alpha)","since":"111.1","until":"191.6708","originalSince":"111.1","originalUntil":null},{"id":"IdeaVIM","version":"0.20.80","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"LogSupport","version":"1.0.11-11_and_newer","since":"111.69","until":"201.0","originalSince":"111.69","originalUntil":null},{"id":"IntelliJBehave","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"R4Intellij","version":"0.4","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"com.intellij.tcserver","version":"1.1.2","since":"110.0","until":"201","originalSince":"110.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.0.1","since":"111.14","until":"231.*","originalSince":"111.14","originalUntil":null},{"id":"RESTClient","version":"1.1","since":"80.8000","until":"143.*","originalSince":"80.8000","originalUntil":null},{"id":"IntelliJBehave","version":"1.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Buildr","version":"11.0-2011.12.20","since":"107.777","until":"201.0","originalSince":"107.777","originalUntil":null},{"id":"OpenJpaIntegration","version":"1.0.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"DataNucleusIntegration","version":"1.0.6","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Heroku Integration","version":"0.1","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"Heroku Integration","version":"0.2","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"Heroku Integration","version":"0.3","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"Heroku Integration","version":"0.3.1","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"Heroku Integration","version":"0.3.2","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"Heroku Integration","version":"0.3.3","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"Identifier_Highlighter","version":"4.20","since":"64.0","until":"201.0","originalSince":"64.0","originalUntil":null},{"id":"Heroku Integration","version":"0.3.3","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"Heroku Integration","version":"0.3.4","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"Vaadin Support","version":"1.0.0","since":"111.69","until":"114.0","originalSince":"111.69","originalUntil":null},{"id":"Heroku Integration","version":"0.3.5","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"Heroku Integration","version":"0.3.7","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"Heroku Integration","version":"0.3.8","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"Assets Compressor","version":"1.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Vaadin Support","version":"1.0.1","since":"111.69","until":"114.0","originalSince":"111.69","originalUntil":null},{"id":"Compare Tab With Editor","version":"0.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Vaadin Support","version":"1.0.1.1","since":"111.69","until":"114.0","originalSince":"111.69","originalUntil":null},{"id":"Javadoc Utility","version":"1.3","since":"90.10000","until":"211","originalSince":"90.10000","originalUntil":null},{"id":"org.intellij.plugins.junitgen","version":"2.0.8","since":"80.8000","until":"212.*","originalSince":"80.8000","originalUntil":null},{"id":"R4Intellij","version":"0.5","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"GrepCode.com Code Search","version":"2.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Google Closure Soy Templates","version":"0.2.2","since":"107.587","until":"201.0","originalSince":"107.587","originalUntil":null},{"id":"Vaadin Support","version":"1.2.0","since":"111.69","until":"114.0","originalSince":"111.69","originalUntil":null},{"id":"IntelliJBehave","version":"1.2","since":"80.8000","until":"181.*","originalSince":"80.8000","originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-3.1.3.v20120117000000","since":"72.7200","until":"183.0","originalSince":"72.7200","originalUntil":null},{"id":"IdeaVIM","version":"0.21.86","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"Vaadin Support","version":"1.2.1","since":"111.69","until":"114.0","originalSince":"111.69","originalUntil":"1.0"},{"id":"wide-task-browser","version":"0.1","since":"80.8000","until":"231.*","originalSince":"80.8000","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.0.2","since":"111.222","until":"231.*","originalSince":"111.222","originalUntil":null},{"id":"ideah","version":"0.2.11","since":"111.69","until":"135.479","originalSince":"111.69","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.5.0","since":"111.0","until":"181.0","originalSince":"111.0","originalUntil":"111.*"},{"id":"XMLNavigate","version":"1.0.13","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.3.2 (alpha)","since":"111.1","until":"191.6708","originalSince":"111.1","originalUntil":null},{"id":"XMLNavigate","version":"1.0.13","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"XMLNavigate","version":"1.0.14","since":"60.6107","until":"201.0","originalSince":"60.6107","originalUntil":null},{"id":"SonOfExternalCodeFormatter","version":"1.6.4","since":"80.9000","until":"200","originalSince":"80.9000","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.0.3","since":"111.222","until":"231.*","originalSince":"111.222","originalUntil":null},{"id":"CSS-X-Fire","version":"1.25","since":"93.13","until":"201","originalSince":"93.13","originalUntil":null},{"id":"Remote call","version":"1.3","since":"80.8000","until":"223.*","originalSince":"80.8000","originalUntil":null},{"id":"Wicket Source","version":"1.0","since":"80.8000","until":"202","originalSince":"80.8000","originalUntil":null},{"id":"SonOfExternalCodeFormatter","version":"1.6.5","since":"80.9000","until":"200","originalSince":"80.9000","originalUntil":null},{"id":"FestSupport","version":"1.1","since":"55.5784","until":"201.0","originalSince":"55.5784","originalUntil":null},{"id":"R4Intellij","version":"0.6","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"FestSupport","version":"1.3","since":"55.5784","until":"201.0","originalSince":"55.5784","originalUntil":null},{"id":"FestSupport","version":"1.3.1","since":"55.5784","until":"201.0","originalSince":"55.5784","originalUntil":null},{"id":"R4Intellij","version":"0.6.1","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"Wicket Source","version":"1.1","since":"80.8000","until":"202","originalSince":"80.8000","originalUntil":null},{"id":"IdeaVIM","version":"0.22.90","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"Wicket Source","version":"1.2","since":"80.8000","until":"202","originalSince":"80.8000","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.4.0 (beta)","since":"111.1","until":"191.6708","originalSince":"111.1","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.4.1 (beta)","since":"111.1","until":"191.6708","originalSince":"111.1","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"114.158","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.phing","version":"114.158","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"CSS-X-Fire","version":"1.26","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-3.1.4.v20120227000000","since":"72.7200","until":"183.0","originalSince":"72.7200","originalUntil":null},{"id":"EDTOnlyInspection","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Pull up method refactoring extension","version":"0.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.intellij.tcserver","version":"1.1.3","since":"110.0","until":"201","originalSince":"110.0","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"114.282","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.phing","version":"114.282","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"114.282","since":"112.0","until":"201","originalSince":"112.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"7.21241","since":"90.10000","until":"133.1800","originalSince":"90.10000","originalUntil":null},{"id":"Finder Restarter","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"ru.crazycoder.plugins.tabdir","version":"1.5","since":"95.429","until":"231.*","originalSince":"95.429","originalUntil":null},{"id":"FestSupport","version":"1.3.2","since":"55.5784","until":"201.0","originalSince":"55.5784","originalUntil":null},{"id":"FestSupport","version":"1.3.3","since":"55.5784","until":"201.0","originalSince":"55.5784","originalUntil":null},{"id":"Remote call","version":"1.4","since":"80.8000","until":"223.*","originalSince":"80.8000","originalUntil":null},{"id":"Pomodoro-tm-cd","version":"2.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Pull up method refactoring extension","version":"0.2","since":"111.277","until":"201.0","originalSince":"111.277","originalUntil":null},{"id":"Pull up method refactoring extension","version":"0.2a","since":"111.277","until":"201.0","originalSince":"111.277","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.0.4","since":"116.108","until":"231.*","originalSince":"116.108","originalUntil":null},{"id":"IdeaVIM","version":"0.23.93","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.4.2 (beta)","since":"111.1","until":"191.6708","originalSince":"111.1","originalUntil":null},{"id":"WicketForge","version":"1.1.0","since":"111.69","until":"112","originalSince":"111.69","originalUntil":null},{"id":"Assets Compressor","version":"1.2","since":"93.13","until":"201.0","originalSince":"93.13","originalUntil":null},{"id":"CVS Revision Graph Plus","version":"2.41","since":"114.0","until":"201","originalSince":"114.0","originalUntil":null},{"id":"com.jalapeno.idea","version":"11.0.0","since":"111.0","until":"201.0","originalSince":"111.0","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"117.132","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.phing","version":"117.132","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"117.132","since":"112.0","until":"201","originalSince":"112.0","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.5.0 (beta)","since":"111.1","until":"191.6708","originalSince":"111.1","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.5.1","since":"111.0","until":"181.0","originalSince":"111.0","originalUntil":"111.*"},{"id":"WicketForge","version":"1.1.1","since":"111.69","until":"112","originalSince":"111.69","originalUntil":null},{"id":"SonOfExternalCodeFormatter","version":"1.6.6","since":"80.9000","until":"200","originalSince":"80.9000","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"117.222","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.phing","version":"117.222","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"117.222","since":"112.0","until":"201","originalSince":"112.0","originalUntil":null},{"id":"CSS-X-Fire","version":"1.27","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"Heroku Integration","version":"0.3.9","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"org.jetbrains.idea.grammar","version":"1.0.5","since":"116.108","until":"231.*","originalSince":"116.108","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.5.1","since":"90.10000","until":"141.3058","originalSince":"90.10000","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"0.1","since":"112.0","until":"201","originalSince":"112.0","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"117.257","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.phing","version":"117.257","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"117.257","since":"112.0","until":"201","originalSince":"112.0","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"0.2","since":"112.0","until":"115.0","originalSince":"112.0","originalUntil":null},{"id":"AngularJS","version":"0.1.2","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"0.3","since":"112.0","until":"115.0","originalSince":"112.0","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"0.4","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"0.5","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"0.6","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"BuildWatcher","version":"1.2.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"BuildWatcher","version":"1.2.3","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-3.1.5.v20120425000000","since":"72.7200","until":"183.0","originalSince":"72.7200","originalUntil":null},{"id":"com.esn.idea.liquibaseejb","version":"1.03","since":"117.117","until":"203","originalSince":"117.117","originalUntil":null},{"id":"BuildWatcher","version":"1.2.4","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"CSS-X-Fire","version":"1.28","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"AngularJS","version":"0.1.3","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"0.7","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"0.8","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"0.8.1","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"WicketForge","version":"1.0.2","since":"90.10000","until":"91","originalSince":"90.10000","originalUntil":null},{"id":"WicketForge","version":"1.1.2","since":"111.69","until":"112","originalSince":"111.69","originalUntil":null},{"id":"JMeter plugin","version":"1.1.1","since":"111.277","until":"203","originalSince":"111.277","originalUntil":null},{"id":"Key promoter","version":"1.0.11","since":"107.587","until":"171","originalSince":"107.587","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"0.9","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"org.intellij.plugins.junitgen","version":"2.0.9","since":"80.8000","until":"212.*","originalSince":"80.8000","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"117.501","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.phing","version":"117.501","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"117.501","since":"112.0","until":"201","originalSince":"112.0","originalUntil":null},{"id":"SortSelection","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"DERViewer","version":"1.1","since":"111.24","until":"201.0","originalSince":"111.24","originalUntil":null},{"id":"ColorTree","version":"1.0","since":"111.69","until":"171.*","originalSince":"111.69","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"0.9.1","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"JMeter plugin","version":"1.2","since":"111.69","until":"203","originalSince":"111.69","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"1.0","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"LESS CSS Compiler","version":"1.8.2","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"SBBrowser","version":"1.05","since":"69.7000","until":"222.0","originalSince":"69.7000","originalUntil":null},{"id":"LESS CSS Compiler","version":"1.8.3","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"1.8.4","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"1.9.0","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"1.0.1","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-3.1.6.v20120619000000","since":"72.7200","until":"183.0","originalSince":"72.7200","originalUntil":null},{"id":"Keymap exporter","version":"1.0","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"Keymap exporter","version":"1.0","since":"117.418","until":"201","originalSince":"117.418","originalUntil":null},{"id":"Keymap exporter","version":"1.0","since":"111.69","until":"201","originalSince":"111.69","originalUntil":null},{"id":"Keymap exporter","version":"1.0","since":"111.69","until":"201","originalSince":"111.69","originalUntil":null},{"id":"Keymap exporter","version":"1.0","since":"111.69","until":"201","originalSince":"111.69","originalUntil":null},{"id":"Keymap exporter","version":"1.1","since":"111.69","until":"201","originalSince":"111.69","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"1.0.2","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"gen-javadoc","version":"1.0","since":"117.418","until":"201.0","originalSince":"117.418","originalUntil":null},{"id":"Springirun","version":"0.1","since":"107.105","until":"231.*","originalSince":"107.105","originalUntil":null},{"id":"JMeter plugin","version":"1.3","since":"111.69","until":"203","originalSince":"111.69","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"1.0.3","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"Assets Compressor","version":"1.2.1","since":"93.13","until":"201.0","originalSince":"93.13","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.0.6","since":"116.108","until":"231.*","originalSince":"116.108","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"117.694","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.phing","version":"117.694","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"117.694","since":"112.0","until":"201","originalSince":"112.0","originalUntil":null},{"id":"Winstone Integration Plugin(CE)","version":"1.3","since":"110.3","until":"180.0","originalSince":"110.3","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"1.0.4","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"IdeaServerPlugin","version":"1.0.4","since":"119.11","until":"181.0","originalSince":"119.11","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"1.0.5","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"117.746","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.phing","version":"117.746","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"PatchIde","version":"1.0","since":"107.105","until":"123.0","originalSince":"107.105","originalUntil":null},{"id":"PatchIde","version":"1.1","since":"107.105","until":"123.0","originalSince":"107.105","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.2.23","since":"120.11","until":"124.0","originalSince":"120.11","originalUntil":null},{"id":"PatchIde","version":"1.2","since":"107.105","until":"123.0","originalSince":"107.105","originalUntil":null},{"id":"PatchIde","version":"1.3","since":"107.105","until":"123.0","originalSince":"107.105","originalUntil":null},{"id":"PatchIde","version":"1.3.1","since":"111.69","until":"123.0","originalSince":"111.69","originalUntil":null},{"id":"CSS-X-Fire","version":"1.29","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.1","since":"111.0","until":"181.0","originalSince":"111.0","originalUntil":"111.*"},{"id":"ro.redeul.google.go","version":"0.9.2","since":"111.0","until":"181.0","originalSince":"111.0","originalUntil":"111.*"},{"id":"com.intellij.plugins.html.instantEditing","version":"0.2.24","since":"120.152","until":"124.0","originalSince":"120.152","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.0.7","since":"116.108","until":"231.*","originalSince":"116.108","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.2.25","since":"120.152","until":"124.0","originalSince":"120.152","originalUntil":null},{"id":"MKS","version":"0.9.1-X","since":"107.777","until":"201.0","originalSince":"107.777","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.3","since":"111.0","until":"181.0","originalSince":"111.0","originalUntil":"111.*"},{"id":"ro.redeul.google.go","version":"0.9.4","since":"111.0","until":"181.0","originalSince":"111.0","originalUntil":"111.*"},{"id":"com.intellij.plugins.html.instantEditing","version":"0.2.27","since":"120.152","until":"124.0","originalSince":"120.152","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.5","since":"111.0","until":"181.0","originalSince":"111.0","originalUntil":"111.*"},{"id":"ro.redeul.google.go","version":"0.9.6","since":"111.0","until":"181.0","originalSince":"111.0","originalUntil":"111.*"},{"id":"QuickJump","version":"4.3","since":"120.0","until":"213.*","originalSince":"120.0","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.3","since":"120.152","until":"124.0","originalSince":"120.152","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"121.12","since":"112.0","until":"201","originalSince":"112.0","originalUntil":null},{"id":"com.jetbrains.php","version":"121.12","since":"118.430","until":"121.*","originalSince":"118.430","originalUntil":null},{"id":"com.intellij.phing","version":"121.12","since":"120.0","until":"181.0","originalSince":"120.0","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"121.12","since":"120.0","until":"181.0","originalSince":"120.0","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"1.0.6","since":"121.0","until":"181.0","originalSince":"121.0","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.3.1","since":"120.152","until":"124.0","originalSince":"120.152","originalUntil":null},{"id":"CSS-X-Fire","version":"1.30","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.3.2","since":"120.152","until":"124.0","originalSince":"120.152","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.3.3","since":"120.152","until":"124.0","originalSince":"120.152","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"121.62","since":"120.0","until":"181.0","originalSince":"120.0","originalUntil":null},{"id":"com.intellij.phing","version":"121.62","since":"120.0","until":"181.0","originalSince":"120.0","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"121.62","since":"112.0","until":"201","originalSince":"112.0","originalUntil":null},{"id":"ru.crazycoder.plugins.tabdir","version":"1.6","since":"111.69","until":"231.*","originalSince":"111.69","originalUntil":null},{"id":"com.jetbrains.php","version":"121.62","since":"118.430","until":"121.*","originalSince":"118.430","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.3.5","since":"120.152","until":"124.0","originalSince":"120.152","originalUntil":null},{"id":"ru.crazycoder.plugins.tabdir","version":"1.6.1","since":"122.0","until":"231.*","originalSince":"122.0","originalUntil":null},{"id":"Magicento","version":"0.5","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.9","since":"111.0","until":"181.0","originalSince":"111.0","originalUntil":"111.*"},{"id":"Magicento","version":"0.55","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"Magicento","version":"0.56","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-3.1.7.v20120831000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.3.6","since":"122.222","until":"124.0","originalSince":"122.222","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.10","since":"111.0","until":"181.0","originalSince":"111.0","originalUntil":"111.*"},{"id":"Magicento","version":"0.6","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"com.jetbrains.plugins.jade","version":"121.185","since":"121.0","until":"181.0","originalSince":"121.0","originalUntil":null},{"id":"com.intellij.tcserver","version":"1.1.4","since":"110.0","until":"201","originalSince":"110.0","originalUntil":null},{"id":"DataNucleusIntegration","version":"1.0.7","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"TFS","version":"121.185","since":"121.185","until":"181.0","originalSince":"121.185","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.3.7","since":"122.327","until":"124.0","originalSince":"122.327","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.3.7","since":"122.327","until":"124.0","originalSince":"122.327","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"121.215","since":"120.0","until":"181.0","originalSince":"120.0","originalUntil":null},{"id":"com.intellij.phing","version":"121.215","since":"120.0","until":"181.0","originalSince":"120.0","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"121.215","since":"112.0","until":"201","originalSince":"112.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.0.8","since":"116.108","until":"231.*","originalSince":"116.108","originalUntil":null},{"id":"com.jetbrains.php","version":"121.215","since":"118.430","until":"121.*","originalSince":"118.430","originalUntil":null},{"id":"Plugin name here","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"CSS-X-Fire","version":"1.31","since":"121.1","until":"201","originalSince":"121.1","originalUntil":null},{"id":"PsiViewer","version":"3.27.57","since":"110.129","until":"110.*","originalSince":"110.129","originalUntil":null},{"id":"RTC4Idea","version":"2.0.0_09","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Magicento","version":"0.8","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"SBT","version":"1.4.0","since":"103.255","until":"143.0","originalSince":"103.255","originalUntil":null},{"id":"SBT","version":"1.5.0","since":"122.327","until":"143.0","originalSince":"122.327","originalUntil":null},{"id":"JMeter plugin","version":"1.4","since":"111.69","until":"203","originalSince":"111.69","originalUntil":null},{"id":"ru.crazycoder.plugins.tabdir","version":"1.6.1","since":"120.59","until":"231.*","originalSince":"120.59","originalUntil":null},{"id":"Magicento","version":"0.8.2","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"MoreUnit","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"MoreUnit","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"DataNucleusIntegration","version":"1.0.8","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.0.9","since":"116.108","until":"231.*","originalSince":"116.108","originalUntil":null},{"id":"ThisInserter","version":"1.4","since":"111.69","until":"201","originalSince":"111.69","originalUntil":null},{"id":"Magicento","version":"0.9","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"DataNucleusIntegration","version":"1.1.0-beta1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.3.8","since":"122.519","until":"124.0","originalSince":"122.519","originalUntil":null},{"id":"AngularJS","version":"0.1.4","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"AngularJS","version":"0.1.5","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"JaggeryEditorSupport","version":"1.0","since":"107.105","until":"193.0","originalSince":"107.105","originalUntil":null},{"id":"Create Jira Ticket","version":"1.1.1","since":"99.18","until":"183","originalSince":"99.18","originalUntil":null},{"id":"Create Jira Ticket","version":"1.2.1","since":"99.18","until":"183","originalSince":"99.18","originalUntil":null},{"id":"OpenJpaIntegration","version":"1.1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.3.9","since":"122.592","until":"124.0","originalSince":"122.592","originalUntil":null},{"id":"Aquarium","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.3.10","since":"122.639","until":"124.0","originalSince":"122.639","originalUntil":null},{"id":"Magicento","version":"0.9.7","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"Magicento","version":"0.9.8","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"LESS CSS Compiler","version":"1.9.5","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.0.0","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.1.0","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.1.1","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"com.jetbrains.plugins.jade","version":"122.668","since":"122.639","until":"181.0","originalSince":"122.639","originalUntil":null},{"id":"JaggeryEditorSupport","version":"1.0","since":"107.105","until":"193.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.1.2","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.2.0","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.3.0","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.3.1","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"com.jetbrains.plugins.jade","version":"121.390","since":"121.0","until":"181.0","originalSince":"121.0","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"121.390","since":"112.0","until":"201","originalSince":"112.0","originalUntil":null},{"id":"com.intellij.phing","version":"121.390","since":"120.0","until":"181.0","originalSince":"120.0","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"121.390","since":"120.0","until":"181.0","originalSince":"120.0","originalUntil":null},{"id":"com.jetbrains.php","version":"121.390","since":"118.430","until":"121.*","originalSince":"118.430","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.3.2","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.3.3","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"JaggeryEditorSupport","version":"1.0","since":"107.105","until":"193.0","originalSince":"107.105","originalUntil":null},{"id":"CollabNet Tools","version":"0.1.3","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"CollabNet Tools","version":"0.1.5","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"net.org.selector.idea.plugins.LTFunctions","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"iceScrum for Intellij","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"iceScrum for Intellij","version":"1.0.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"IdeaVIM","version":"0.23.111","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"iceScrum for Intellij","version":"1.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.4.0","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.4.0","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.4.0","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.4.1","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"Magicento","version":"1.0","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"Magicento","version":"1.0.1","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-3.1.8.v20121113000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.5.1","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.5.4","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.5.5","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"IdeaVIM","version":"0.23.115","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"DeltaTabs","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.6.0","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"CollabNet Tools","version":"0.1.7","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"DeltaTabs","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.6.1","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"DeltaTabs","version":"1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"DeltaTabs","version":"1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"DeltaTabs","version":"1.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"DeltaTabs","version":"1.3.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"DeltaUtils","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"CollabNet Tools","version":"0.1.9","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"com.jetbrains.php","version":"122.875","since":"122.850","until":"122.*","originalSince":"122.850","originalUntil":null},{"id":"DeltaUtils","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"DeltaUtils","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"DeltaUtils","version":"1.1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"DeltaUtils","version":"1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"DeltaUtils","version":"1.2.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"R4Intellij","version":"0.8","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"MyTranslator","version":"1.0","since":"95.627","until":"201.0","originalSince":"95.627","originalUntil":null},{"id":"MySearch","version":"1.0","since":"95.627","until":"201.0","originalSince":"95.627","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"0.4","since":"123.45","until":"124.0","originalSince":"123.45","originalUntil":null},{"id":"MySearch","version":"1.50","since":"95.627","until":"201.0","originalSince":"95.627","originalUntil":null},{"id":"DeltaUtils","version":"1.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"Heroku Integration","version":"0.4.0","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"com.intellij.plugins.html.instantEditing","version":"0.4.1","since":"123.45","until":"124.0","originalSince":"123.45","originalUntil":null},{"id":"im.jeanfrancois.ideaplugins.ideafullscreen","version":"0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"IdeaVIM","version":"0.24-148","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"MyTranslator","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"MySearch","version":"1.50","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.jetbrains.php","version":"123.66","since":"122.850","until":"123.*","originalSince":"122.850","originalUntil":null},{"id":"CollabNet Tools","version":"1.0.0","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"Mongo Plugin","version":"0.1.0","since":"117.963","until":"201","originalSince":"117.963","originalUntil":null},{"id":"Mongo Plugin","version":"0.1.1","since":"117.963","until":"201","originalSince":"117.963","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.11","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":"123.*"},{"id":"ro.redeul.google.go","version":"0.9.12","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":"123.*"},{"id":"TFS","version":"124.218","since":"124.0","until":"181.0","originalSince":"124.0","originalUntil":null},{"id":"Mongo Plugin","version":"0.1.2","since":"117.963","until":"201","originalSince":"117.963","originalUntil":null},{"id":"com.squareup.ideaplugin","version":"1.0","since":"117.105","until":"201.0","originalSince":"117.105","originalUntil":null},{"id":"SBBrowser","version":"1.06","since":"69.7000","until":"222.0","originalSince":"69.7000","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.13","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":"123.*"},{"id":"JaggeryEditorSupport","version":"2.0","since":"123.72","until":"193.0","originalSince":"123.72","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.5.2","since":"90.10000","until":"141.3058","originalSince":"90.10000","originalUntil":null},{"id":"Magicento","version":"1.2.0","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"TFS","version":"124.297","since":"124.0","until":"181.0","originalSince":"124.0","originalUntil":null},{"id":"TFS","version":"121.390","since":"121.0","until":"181.0","originalSince":"121.0","originalUntil":null},{"id":"IdeaVIM","version":"0.25","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"Compare Directories","version":"1.0.5","since":"120.0","until":"183.0","originalSince":"120.0","originalUntil":null},{"id":"Java2SQL","version":"0.3.1","since":"111.167","until":"201.0","originalSince":"111.167","originalUntil":null},{"id":"ru.crazycoder.plugins.tabdir","version":"1.6.6","since":"123.72","until":"231.*","originalSince":"123.72","originalUntil":null},{"id":"TFS","version":"124.344","since":"124.0","until":"181.0","originalSince":"124.0","originalUntil":null},{"id":"com.intellij.phing","version":"124.347","since":"123.93","until":"181.0","originalSince":"123.93","originalUntil":null},{"id":"IdeaVIM","version":"0.26","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"TabSwitcherExtreme","version":"1.0.1","since":"99.18","until":"181","originalSince":"99.18","originalUntil":null},{"id":"TabSwitcherExtreme","version":"1.0.2","since":"99.18","until":"181","originalSince":"99.18","originalUntil":null},{"id":"Java2SQL","version":"0.4","since":"111.167","until":"201.0","originalSince":"111.167","originalUntil":null},{"id":"com.alexeyhanin.intellij.jalopyplugin","version":"1.0.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"Magicento","version":"1.3.0","since":"111.296","until":"181","originalSince":"111.296","originalUntil":null},{"id":"TabSwitcherExtreme","version":"1.0.3","since":"99.18","until":"181","originalSince":"99.18","originalUntil":null},{"id":"com.kukido.eclipser","version":"0.1","since":"107.105","until":"193.0","originalSince":"107.105","originalUntil":null},{"id":"AspectJ weaver","version":"3.0.0","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"Mongo Plugin","version":"0.2.0","since":"117.963","until":"201","originalSince":"117.963","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.97","since":"90.10781","until":"181.*","originalSince":"90.10781","originalUntil":null},{"id":"com.atlassian.clover","version":"idea7-3.1.10.v20130108000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"SyncEdit 2","version":"2.0.1","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"123.66","since":"123.26","until":"181.0","originalSince":"123.26","originalUntil":null},{"id":"com.squareup.ideaplugin","version":"1.0.1","since":"117.105","until":"201.0","originalSince":"117.105","originalUntil":null},{"id":"Mongo Plugin","version":"0.2.1","since":"117.963","until":"201","originalSince":"117.963","originalUntil":null},{"id":"CSS-X-Fire","version":"1.32","since":"124.373","until":"201","originalSince":"124.373","originalUntil":null},{"id":"TFS","version":"124.533","since":"124.0","until":"181.0","originalSince":"124.0","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.5.3","since":"111.69","until":"141.3058","originalSince":"111.69","originalUntil":null},{"id":"be.mavicon.intellij.ppimport","version":"0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"UsefulActions","version":"0.9","since":"122.639","until":"232","originalSince":"122.639","originalUntil":null},{"id":"SvgViewer 2","version":"2.0","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.5.3","since":"111.69","until":"141.3058","originalSince":"111.69","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.5.4","since":"111.69","until":"141.3058","originalSince":"111.69","originalUntil":null},{"id":"com.taobao.wuzheng","version":"1.0","since":"93.13","until":"201.0","originalSince":"93.13","originalUntil":null},{"id":"WicketForge","version":"1.1.3","since":"111.69","until":"112","originalSince":"111.69","originalUntil":null},{"id":"Code Review","version":"1.3.4","since":"123.123","until":"222.*","originalSince":"123.123","originalUntil":null},{"id":"Code Review","version":"1.3.5","since":"123.123","until":"222.*","originalSince":"123.123","originalUntil":null},{"id":"com.webfont.ideaplugin","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.webfont.ideaplugin","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.webfont.ideaplugin","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"SvgViewer 2","version":"2.0.1","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"CSS-X-Fire","version":"1.33","since":"126.92","until":"201","originalSince":"126.92","originalUntil":null},{"id":"com.alexeyhanin.intellij.jalopyplugin","version":"1.0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"WFA console","version":"1.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"np.intellij.epochconverter","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.6.2","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"Mongo Plugin","version":"0.3.0","since":"117.963","until":"201","originalSince":"117.963","originalUntil":null},{"id":"com.alexeyhanin.intellij.jalopyplugin","version":"1.0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"CSS-X-Fire","version":"1.34","since":"125.57","until":"201","originalSince":"125.57","originalUntil":null},{"id":"SvgViewer 2","version":"2.0.2","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"IdeaServerPlugin","version":"1.0.7","since":"126.100","until":"181.0","originalSince":"126.100","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.1.0","since":"123.45","until":"231.*","originalSince":"123.45","originalUntil":null},{"id":"com.jetbrains.php.framework.structure","version":"123.66","since":"123.0","until":"140.0","originalSince":"123.0","originalUntil":null},{"id":"com.jetbrains.php.framework.structure","version":"124.295","since":"124.295","until":"140.0","originalSince":"124.295","originalUntil":null},{"id":"BuildrPlugin","version":"12.0-2013.02.14","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"BuildrPlugin","version":"12.0-2013.02.14","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"BuildrPlugin","version":"12.0-2013.02.14","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"BuildrPlugin","version":"12.0-2013.02.14","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"BuildrPlugin","version":"12.0.1","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"TFS","version":"126.254","since":"124.0","until":"181.0","originalSince":"124.0","originalUntil":null},{"id":"UsefulActions","version":"1.0","since":"125.0","until":"232","originalSince":"125.0","originalUntil":null},{"id":"WFA console","version":"1.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.jetbrains.php","version":"126.334","since":"126.330","until":"126.*","originalSince":"126.330","originalUntil":null},{"id":"LazySpring","version":"1.1.0","since":"107.105","until":"211","originalSince":"107.105","originalUntil":null},{"id":"LazySpring","version":"1.1.0","since":"107.105","until":"211","originalSince":"107.105","originalUntil":null},{"id":"LazySpring","version":"1.1.0","since":"107.105","until":"211","originalSince":"107.105","originalUntil":null},{"id":"TFS","version":"126.309","since":"124.0","until":"181.0","originalSince":"124.0","originalUntil":null},{"id":"LazySpring","version":"1.1.1","since":"107.105","until":"211","originalSince":"107.105","originalUntil":null},{"id":"LazySpring","version":"1.1.1","since":"107.105","until":"211","originalSince":"107.105","originalUntil":null},{"id":"TFS","version":"127.14","since":"124.0","until":"181.0","originalSince":"124.0","originalUntil":null},{"id":"com.kukido.eclipser","version":"0.2","since":"126.232","until":"193.0","originalSince":"126.232","originalUntil":null},{"id":"WicketForge","version":"2.0.0","since":"111.69","until":"112","originalSince":"111.69","originalUntil":null},{"id":"com.alexeyhanin.intellij.jalopyplugin","version":"1.0.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"SyncEdit 2","version":"2.0.2","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"org.intellij.plugins.junitgen","version":"2.0.10","since":"80.8000","until":"212.*","originalSince":"80.8000","originalUntil":null},{"id":"com.intellij.phing","version":"127.67","since":"123.93","until":"181.0","originalSince":"123.93","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"127.67","since":"126.103","until":"181.0","originalSince":"126.103","originalUntil":null},{"id":"com.jetbrains.php","version":"127.67","since":"126.330","until":"127.*","originalSince":"126.330","originalUntil":null},{"id":"WFA console","version":"1.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"WFA console","version":"1.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Heroku Integration","version":"0.4.1","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"org.jetbrains.idea.grammar","version":"1.1.1","since":"129.0","until":"231.*","originalSince":"129.0","originalUntil":null},{"id":"com.jetbrains.php","version":"127.100","since":"126.330","until":"127.*","originalSince":"126.330","originalUntil":null},{"id":"TabSwitcherExtreme","version":"1.0.4","since":"99.18","until":"181","originalSince":"99.18","originalUntil":null},{"id":"WFA console","version":"1.3","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"WFA console","version":"1.3","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"WicketForge","version":"2.1.0","since":"111.69","until":"112","originalSince":"111.69","originalUntil":null},{"id":"WFA console","version":"1.4","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"WFA console","version":"1.5","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"WFA console","version":"1.6","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.idamobile.android.toolbox","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.jetbrains.php","version":"129.91","since":"129.1","until":"129.*","originalSince":"129.1","originalUntil":null},{"id":"com.atlassian.clover","version":"idea-3.1.11.v20130325000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"Randori Compiler","version":"0.2.0","since":"123.169","until":"181.0","originalSince":"123.169","originalUntil":null},{"id":"TFS","version":"129.105","since":"124.0","until":"181.0","originalSince":"124.0","originalUntil":null},{"id":"Randori Compiler","version":"0.2.1","since":"123.169","until":"181.0","originalSince":"123.169","originalUntil":null},{"id":"copy.on.steroids","version":"3.1","since":"123.69","until":"181.0","originalSince":"123.69","originalUntil":"137.*"},{"id":"WicketForge","version":"2.2.0","since":"111.69","until":"129.161","originalSince":"111.69","originalUntil":null},{"id":"Randori Compiler","version":"0.2.3","since":"123.169","until":"181.0","originalSince":"123.169","originalUntil":null},{"id":"IdeaVIM","version":"0.27","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.6","since":"128.1","until":"211","originalSince":"128.1","originalUntil":null},{"id":"IdeaVIM","version":"0.28","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"iceScrum for Intellij","version":"1.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"WFA console","version":"1.7","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"WFA console","version":"1.7","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Magicento","version":"1.4.1","since":"117.105","until":"181","originalSince":"117.105","originalUntil":null},{"id":"JMeter plugin","version":"1.5","since":"129.161","until":"203","originalSince":"129.161","originalUntil":null},{"id":"DeltaTabs","version":"1.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"Magicento","version":"1.4.2","since":"117.105","until":"181","originalSince":"117.105","originalUntil":null},{"id":"DeltaUtils","version":"1.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"WFA console","version":"1.8","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"DeltaUtils","version":"1.4.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"codeReview4idea","version":"0.1","since":"129.60","until":"181","originalSince":"129.60","originalUntil":null},{"id":"WFA console","version":"1.9","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Redline Smalltalk","version":"1.0","since":"129.239","until":"181.0","originalSince":"129.239","originalUntil":null},{"id":"Redline Smalltalk","version":"1.0.1","since":"129.239","until":"181.0","originalSince":"129.239","originalUntil":null},{"id":"wide-task-browser","version":"0.1.2","since":"80.8000","until":"231.*","originalSince":"80.8000","originalUntil":null},{"id":"Randori Compiler","version":"0.2.4","since":"123.169","until":"181.0","originalSince":"123.169","originalUntil":null},{"id":"Mongo Plugin","version":"0.4.0","since":"117.963","until":"201","originalSince":"117.963","originalUntil":null},{"id":"com.jetbrains.php","version":"129.362","since":"129.1","until":"129.*","originalSince":"129.1","originalUntil":null},{"id":"eSnippet Pro plugin_obsolete","version":"1.4.3","since":"129.1","until":"211","originalSince":"129.1","originalUntil":null},{"id":"eSnippet Pro plugin","version":"1.4.3","since":"129.1","until":"211","originalSince":"129.1","originalUntil":null},{"id":"jenv-idea-plugin","version":"0.0.1","since":"129.1","until":"181.0","originalSince":"129.1","originalUntil":null},{"id":"Nette framework helpers","version":"0.1","since":"129.1","until":"192.0","originalSince":"129.1","originalUntil":null},{"id":"CSS-X-Fire","version":"1.35","since":"125.57","until":"201","originalSince":"125.57","originalUntil":null},{"id":"codeReview4idea","version":"0.2","since":"130.323","until":"181","originalSince":"130.323","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"1.0","since":"107.105","until":"107.*","originalSince":"107.105","originalUntil":null},{"id":"Mongo Plugin","version":"0.4.1","since":"117.963","until":"201","originalSince":"117.963","originalUntil":null},{"id":"CSS-X-Fire","version":"1.36","since":"125.57","until":"201","originalSince":"125.57","originalUntil":null},{"id":"CSS-X-Fire","version":"1.37","since":"129.1","until":"201","originalSince":"129.1","originalUntil":null},{"id":"com.jetbrains.php.gae","version":"129.487","since":"129.487","until":"181.0","originalSince":"129.487","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.jacksingleton.tabtonextsplitter","version":"0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"IdeaVIM","version":"0.29","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"LazySpring","version":"1.2.1","since":"129.161","until":"211","originalSince":"129.161","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.1.2","since":"129.0","until":"231.*","originalSince":"129.0","originalUntil":null},{"id":"com.jacksingleton.tabtonextsplitter","version":"0.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"Create Jira Ticket","version":"1.2.2","since":"99.18","until":"183","originalSince":"99.18","originalUntil":null},{"id":"dcevm","version":"1.0","since":"129.524","until":"201.0","originalSince":"129.524","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"0.1","since":"107.105","until":"222.4459.*","originalSince":"107.105","originalUntil":null},{"id":"CUBA","version":"2.0","since":"123.72","until":"211","originalSince":"123.72","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"129.672","since":"126.103","until":"181.0","originalSince":"126.103","originalUntil":null},{"id":"com.jetbrains.php","version":"129.672","since":"129.1","until":"129.*","originalSince":"129.1","originalUntil":null},{"id":"com.intellij.phing","version":"129.672","since":"123.93","until":"181.0","originalSince":"123.93","originalUntil":null},{"id":"org.intellij.tasks.navigation","version":"0.3.1","since":"129.0","until":"212.*","originalSince":"129.0","originalUntil":null},{"id":"CUBA","version":"2.0.1","since":"123.72","until":"211","originalSince":"123.72","originalUntil":null},{"id":"WicketForge","version":"3.0.0","since":"129.161","until":"130","originalSince":"129.161","originalUntil":null},{"id":"com.jacksingleton.tabtonextsplitter","version":"0.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.squareup.intellij.plugin.copy-as-github-path","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"wide-task-browser","version":"0.1.3","since":"80.8000","until":"231.*","originalSince":"80.8000","originalUntil":null},{"id":"dcevm","version":"1.1","since":"129.524","until":"201.0","originalSince":"129.524","originalUntil":null},{"id":"dcevm","version":"1.2","since":"129.524","until":"201.0","originalSince":"129.524","originalUntil":null},{"id":"WicketForge","version":"3.0.1","since":"129.161","until":"130","originalSince":"129.161","originalUntil":null},{"id":"net.eunjae.plugins.androidhelper","version":"0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.bitard.concordion","version":"1.0_alpha1","since":"107.105","until":"211","originalSince":"107.105","originalUntil":null},{"id":"org.livescriptidea","version":"0.1.2","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"com.bitard.concordion","version":"1.0_alpha2","since":"107.105","until":"211","originalSince":"107.105","originalUntil":null},{"id":"ro.catalin.prata.tfuploader","version":"1.0","since":"107.105","until":"200","originalSince":"107.105","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"0.2","since":"107.105","until":"222.4459.*","originalSince":"107.105","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"0.2","since":"107.105","until":"222.4459.*","originalSince":"107.105","originalUntil":null},{"id":"jbehave-support-plugin","version":"1.0","since":"80.8000","until":"213","originalSince":"80.8000","originalUntil":null},{"id":"dcevm","version":"1.3","since":"129.524","until":"201.0","originalSince":"129.524","originalUntil":null},{"id":"dcevm","version":"1.3","since":"129.524","until":"201.0","originalSince":"129.524","originalUntil":null},{"id":"Mongo Plugin","version":"0.4.2","since":"117.963","until":"201","originalSince":"117.963","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"1.1","since":"107.105","until":"107.*","originalSince":"107.105","originalUntil":null},{"id":"LazySpring","version":"1.3.0","since":"129.161","until":"211","originalSince":"129.161","originalUntil":null},{"id":"DeltaShareXP","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"0.3","since":"107.105","until":"222.4459.*","originalSince":"107.105","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"1.2","since":"107.105","until":"107.*","originalSince":"107.105","originalUntil":null},{"id":"SvgViewer 2","version":"2.0.2","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"SvgViewer 2","version":"2.0.3","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"DeltaShareXP","version":"1.0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"RTC4Idea","version":"3.0.0_01","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"0.4","since":"107.105","until":"222.4459.*","originalSince":"107.105","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"0.4","since":"107.105","until":"222.4459.*","originalSince":"107.105","originalUntil":null},{"id":"DeltaUtils","version":"1.5.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"0.5","since":"107.105","until":"222.4459.*","originalSince":"107.105","originalUntil":null},{"id":"codeReview4idea","version":"0.2.2","since":"130.323","until":"181","originalSince":"130.323","originalUntil":null},{"id":"DeltaUtils","version":"1.5.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"0.6","since":"107.105","until":"222.4459.*","originalSince":"107.105","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.5.0","since":"129.713","until":"181.0","originalSince":"129.713","originalUntil":"129.713"},{"id":"AWS Elastic Beanstalk","version":"0.5.0","since":"129.713","until":"181.0","originalSince":"129.713","originalUntil":"129.713"},{"id":"com.atlassian.clover","version":"idea-3.1.12.v20130627000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"com.jetbrains.php","version":"129.814","since":"129.1","until":"129.*","originalSince":"129.1","originalUntil":null},{"id":"Mongo Plugin","version":"0.4.3","since":"117.963","until":"201","originalSince":"117.963","originalUntil":null},{"id":"AngularJS","version":"0.1.8","since":"107.105","until":"181.0","originalSince":"107.105","originalUntil":null},{"id":"Magicento","version":"2.0.0","since":"117.105","until":"181","originalSince":"117.105","originalUntil":null},{"id":"org.livescriptidea","version":"0.1.4","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.5.1","since":"129.713","until":"181.0","originalSince":"129.713","originalUntil":"129.859"},{"id":"dcevm","version":"1.4","since":"129.524","until":"201.0","originalSince":"129.524","originalUntil":null},{"id":"codeReview4idea","version":"0.2.3","since":"130.323","until":"181","originalSince":"130.323","originalUntil":null},{"id":"org.intellij.tasks.navigation","version":"0.3.2","since":"129.0","until":"212.*","originalSince":"129.0","originalUntil":null},{"id":"dcevm","version":"1.5","since":"129.524","until":"201.0","originalSince":"129.524","originalUntil":null},{"id":"DeltaUtils","version":"1.5.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"WicketForge","version":"3.1.0","since":"129.161","until":"130","originalSince":"129.161","originalUntil":null},{"id":"inc.chaos.mps.tool.maven.run","version":"1.0","since":"117.9448","until":"201.0","originalSince":"117.9448","originalUntil":null},{"id":"LivePlugin","version":"0.3 beta","since":"122.600","until":"213.*","originalSince":"122.600","originalUntil":null},{"id":"LivePlugin","version":"0.3 beta","since":"122.600","until":"213.*","originalSince":"122.600","originalUntil":null},{"id":"LivePlugin","version":"0.3.1 beta","since":"122.600","until":"213.*","originalSince":"122.600","originalUntil":null},{"id":"com.kukido.eclipser","version":"0.3","since":"126.232","until":"193.0","originalSince":"126.232","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"130.1176","since":"112.0","until":"181.0","originalSince":"112.0","originalUntil":null},{"id":"Keymap exporter","version":"1.1","since":"130.1167","until":"201","originalSince":"130.1167","originalUntil":null},{"id":"org.livescriptidea","version":"0.1.5","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"org.livescriptidea","version":"0.1.5","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"com.dooapp.codesearch","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.dooapp.codesearch","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.dooapp.codesearch","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.livescriptidea","version":"0.1.5","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"org.livescriptidea","version":"0.1.6","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"ro.catalin.prata.tfuploader","version":"1.5","since":"107.105","until":"200","originalSince":"107.105","originalUntil":null},{"id":"org.livescriptidea","version":"0.1.7","since":"80.9000","until":"201.0","originalSince":"80.9000","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"0.6.1","since":"107.105","until":"222.4459.*","originalSince":"107.105","originalUntil":null},{"id":"codeReview4idea","version":"0.2.3","since":"130.323","until":"181","originalSince":"130.323","originalUntil":null},{"id":"codeReview4idea","version":"0.2.4","since":"130.323","until":"181","originalSince":"130.323","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.5.2","since":"129.713","until":"181.0","originalSince":"129.713","originalUntil":"129.859"},{"id":"DeltaUtils","version":"1.6.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"DeltaUtils","version":"1.6.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.duncanjauncey.autosysplugin","version":"1.0","since":"117.105","until":"201.0","originalSince":"117.105","originalUntil":null},{"id":"com.dooapp.codesearch","version":"1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"Randori Compiler","version":"0.3.0","since":"129.713","until":"181.0","originalSince":"129.713","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.5.3","since":"129.713","until":"181.0","originalSince":"129.713","originalUntil":"130.1179"},{"id":"com.duncanjauncey.autosysplugin","version":"1.1","since":"117.105","until":"201.0","originalSince":"117.105","originalUntil":null},{"id":"Heroku Integration","version":"0.4.2","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"AWS Elastic Beanstalk","version":"0.5.4","since":"129.713","until":"181.0","originalSince":"129.713","originalUntil":"130.1179"},{"id":"dcevm","version":"1.6","since":"129.524","until":"201.0","originalSince":"129.524","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"0.7","since":"107.105","until":"222.4459.*","originalSince":"107.105","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"0.7.1","since":"107.105","until":"222.4459.*","originalSince":"107.105","originalUntil":null},{"id":"ro.catalin.prata.tfuploader","version":"2.0","since":"107.105","until":"200","originalSince":"107.105","originalUntil":null},{"id":"codeReview4idea","version":"0.2.5","since":"130.323","until":"181","originalSince":"130.323","originalUntil":null},{"id":"codeReview4idea","version":"0.3","since":"130.323","until":"181","originalSince":"130.323","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"0.8","since":"130.754","until":"222.4459.*","originalSince":"130.754","originalUntil":null},{"id":"com.idamobile.android.toolbox","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.idamobile.android.toolbox","version":"1.1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"CVS Revision Graph Plus","version":"2.42","since":"114.0","until":"201","originalSince":"114.0","originalUntil":null},{"id":"WFA console","version":"2.0","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.jetbrains.php.gae","version":"130.1481","since":"130.1365","until":"181.0","originalSince":"130.1365","originalUntil":null},{"id":"com.jetbrains.php","version":"130.1481","since":"130.1365","until":"130.*","originalSince":"130.1365","originalUntil":null},{"id":"org.editorconfig.editorconfigjetbrains","version":"0.1.3","since":"120.0","until":"135.*","originalSince":"120.0","originalUntil":null},{"id":"CUBA","version":"2.0.2","since":"123.72","until":"211","originalSince":"123.72","originalUntil":null},{"id":"com.jetbrains.plugins.jade","version":"130.1520","since":"130.957","until":"181.0","originalSince":"130.957","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"130.1481","since":"130.1365","until":"181.0","originalSince":"130.1365","originalUntil":null},{"id":"wide-task-browser","version":"0.1.4","since":"130.1250","until":"231.*","originalSince":"130.1250","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"1.3","since":"123.72","until":"123.*","originalSince":"123.72","originalUntil":null},{"id":"codeReview4idea","version":"0.3.1","since":"130.323","until":"181","originalSince":"130.323","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"1.3","since":"123.72","until":"123.*","originalSince":"123.72","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"1.3.1","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"wide-task-browser","version":"0.1.4.1","since":"130.1250","until":"231.*","originalSince":"130.1250","originalUntil":null},{"id":"LivePlugin","version":"0.3.2 beta","since":"122.600","until":"213.*","originalSince":"122.600","originalUntil":null},{"id":"PsiViewer","version":"3.27.63","since":"130.0","until":"130.*","originalSince":"130.0","originalUntil":null},{"id":"com.jetbrains.php","version":"130.1639","since":"130.1365","until":"130.*","originalSince":"130.1365","originalUntil":null},{"id":"codeReview4idea","version":"0.3.2","since":"130.323","until":"181","originalSince":"130.323","originalUntil":null},{"id":"pl.projectspace.idea.plugins.php.behat","version":"0.3.1","since":"129.757","until":"201.0","originalSince":"129.757","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.2.3","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.github.dgt79.plugin.eclipseactions","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.github.dgt79.plugin.eclipseactions","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"Camelry","version":"0.1","since":"107.105","until":"181","originalSince":"107.105","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.98","since":"90.10781","until":"181.*","originalSince":"90.10781","originalUntil":null},{"id":"wide-task-browser","version":"0.1.4.1","since":"130.1250","until":"231.*","originalSince":"130.1250","originalUntil":null},{"id":"com.jetbrains.twig","version":"130.1639","since":"130.1","until":"130.1","originalSince":"130.1","originalUntil":null},{"id":"pl.projectspace.idea.plugins.php.behat","version":"0.3.2","since":"129.757","until":"201.0","originalSince":"129.757","originalUntil":null},{"id":"Camelry","version":"0.1.1","since":"107.105","until":"181","originalSince":"107.105","originalUntil":null},{"id":"dcevm","version":"1.7","since":"129.524","until":"201.0","originalSince":"129.524","originalUntil":null},{"id":"com.jetbrains.lang.ejs","version":"131.12","since":"131.1","until":"131.*","originalSince":"131.1","originalUntil":null},{"id":"org.intellij.tasks.navigation","version":"0.3.3","since":"129.0","until":"212.*","originalSince":"129.0","originalUntil":null},{"id":"com.jetbrains.lang.ejs","version":"131.17","since":"131.1","until":"132.*","originalSince":"131.1","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.6.8","since":"130.1485","until":"211","originalSince":"130.1485","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.6.9","since":"132.1","until":"211","originalSince":"132.1","originalUntil":null},{"id":"Heroku Integration","version":"0.4.3","since":"80.8000","until":"133.0","originalSince":"80.8000","originalUntil":"1.0"},{"id":"org.jetbrains.kannotator","version":"0.2.420","since":"123.4","until":"181.0","originalSince":"123.4","originalUntil":null},{"id":"com.squareup.intellij.plugin.copy-as-github-path","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"131.61","since":"112.0","until":"201","originalSince":"112.0","originalUntil":null},{"id":"com.svdb.idea.whitespace.plugin.id","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.svdb.idea.whitespace.plugin.id","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"CUBA","version":"2.0.3","since":"123.72","until":"211","originalSince":"123.72","originalUntil":null},{"id":"MetricsReloaded","version":"1.0 alpha","since":"80.8500","until":"212.*","originalSince":"80.8500","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"131.105","since":"131.1","until":"131.*","originalSince":"131.1","originalUntil":null},{"id":"IdeaServerPlugin","version":"1.0.8","since":"132.140","until":"181.0","originalSince":"132.140","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.1.4","since":"130.1365","until":"231.*","originalSince":"130.1365","originalUntil":null},{"id":"com.kodokux.github","version":"1.0.1.8","since":"131.48","until":"201.0","originalSince":"131.48","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"131.98","since":"130.1726","until":"181.0","originalSince":"130.1726","originalUntil":null},{"id":"fr.azelart.intellij.plugin.cnf","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"ru.trylogic.idea.gitlab.integration","version":"1.0","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"ro.catalin.prata.tfuploader","version":"2.5","since":"107.105","until":"200","originalSince":"107.105","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"0.1","since":"129.713","until":"181.3494","originalSince":"129.713","originalUntil":null},{"id":"WicketForge","version":"3.1.1","since":"129.161","until":"130","originalSince":"129.161","originalUntil":null},{"id":"WicketForge","version":"3.1.2","since":"129.161","until":"138","originalSince":"129.161","originalUntil":null},{"id":"WicketForge","version":"4.0.0.EAP-4","since":"132.325","until":"138","originalSince":"132.325","originalUntil":null},{"id":"AngularJS","version":"0.1.9","since":"107.105","until":"181.0","originalSince":"107.105","originalUntil":null},{"id":"org.intellij.tasks.navigation","version":"0.3.4","since":"129.0","until":"212.*","originalSince":"129.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"0.2","since":"129.713","until":"181.3494","originalSince":"129.713","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.7","since":"132.400","until":"211","originalSince":"132.400","originalUntil":null},{"id":"ua.com.web100.tools.gxt.idea.plugin","version":"0.03","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"JCompilo Java Compiler","version":"153","since":"129.1328","until":"211","originalSince":"129.1328","originalUntil":null},{"id":"JCompilo Java Compiler","version":"154","since":"129.1328","until":"211","originalSince":"129.1328","originalUntil":null},{"id":"org.dylanfoundry.deft","version":"0.1","since":"129.239","until":"201.0","originalSince":"129.239","originalUntil":null},{"id":"JCompilo Java Compiler","version":"155","since":"129.1328","until":"211","originalSince":"129.1328","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"0.3","since":"129.713","until":"181.3494","originalSince":"129.713","originalUntil":null},{"id":"JCompilo Java Compiler","version":"157","since":"129.1328","until":"211","originalSince":"129.1328","originalUntil":null},{"id":"org.dylanfoundry.deft","version":"0.1.1","since":"129.239","until":"201.0","originalSince":"129.239","originalUntil":null},{"id":"com.webschik.doT","version":"1.1","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.webschik.doT","version":"1.1","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"org.dylanfoundry.deft","version":"0.2","since":"129.239","until":"201.0","originalSince":"129.239","originalUntil":null},{"id":"com.crownpartners.intellivault","version":"0.9.2","since":"107.105","until":"203","originalSince":"107.105","originalUntil":null},{"id":"com.hartmanster.compareToGenerator","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"SBT","version":"1.5.1","since":"122.327","until":"143.0","originalSince":"122.327","originalUntil":null},{"id":"org.dylanfoundry.deft","version":"0.3","since":"129.239","until":"201.0","originalSince":"129.239","originalUntil":null},{"id":"com.atlassian.clover","version":"idea-3.2.0.v20131021000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"com.jetbrains.php","version":"131.374","since":"132.719","until":"181.0","originalSince":"132.719","originalUntil":"1.0"},{"id":"com.jetbrains.php.framework","version":"131.374","since":"132.719","until":"181.0","originalSince":"132.719","originalUntil":null},{"id":"com.intellij.phing","version":"131.374","since":"132.719","until":"181.0","originalSince":"132.719","originalUntil":null},{"id":"MetricsReloaded","version":"1.0 alpha 2","since":"123.72","until":"212.*","originalSince":"123.72","originalUntil":null},{"id":"TFSTask integration","version":"1.0","since":"109.105","until":"201.0","originalSince":"109.105","originalUntil":null},{"id":"ru.trylogic.idea.gitlab.integration","version":"1.0.1","since":"132.719","until":"201","originalSince":"132.719","originalUntil":null},{"id":"PsiViewer","version":"3.28.65","since":"130.0","until":"130.*","originalSince":"130.0","originalUntil":null},{"id":"DeltaTabs","version":"1.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"ru.trylogic.idea.gitlab.integration","version":"1.0.2","since":"132.719","until":"201","originalSince":"132.719","originalUntil":null},{"id":"de.halirutan.mathematica","version":"0.1.8","since":"123.94","until":"123.*","originalSince":"123.94","originalUntil":null},{"id":"com.crownpartners.intellivault","version":"0.9.3","since":"107.105","until":"203","originalSince":"107.105","originalUntil":null},{"id":"TFSTask integration","version":"1.0.1","since":"109.105","until":"201.0","originalSince":"109.105","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.3.2","since":"110.0","until":"201.0","originalSince":"110.0","originalUntil":null},{"id":"wide-task-browser","version":"0.1.6","since":"130.1250","until":"231.*","originalSince":"130.1250","originalUntil":null},{"id":"WicketForge","version":"3.2.0","since":"129.161","until":"138","originalSince":"129.161","originalUntil":null},{"id":"WicketForge","version":"4.0.0.EAP-5","since":"132.325","until":"138","originalSince":"132.325","originalUntil":null},{"id":"org.dylanfoundry.deft","version":"0.4","since":"129.239","until":"201.0","originalSince":"129.239","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.5","since":"123.72","until":"200.0","originalSince":"123.72","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.6.0 (beta)","since":"123.0","until":"191.6708","originalSince":"123.0","originalUntil":null},{"id":"org.dylanfoundry.deft","version":"0.4.1","since":"129.239","until":"201.0","originalSince":"129.239","originalUntil":null},{"id":"de.halirutan.mathematica","version":"0.1.8.1","since":"123.94","until":"123.*","originalSince":"123.94","originalUntil":null},{"id":"de.sandstormmedia.flowstorm","version":"0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"ScratchPad","version":"0.15","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"IdeaVIM","version":"0.30","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"IdeaVIM","version":"0.31","since":"110.0","until":"181.0","originalSince":"110.0","originalUntil":null},{"id":"org.dylanfoundry.deft","version":"0.4.2","since":"129.239","until":"201.0","originalSince":"129.239","originalUntil":null},{"id":"IdeaVIM","version":"0.32","since":"120.0","until":"181.0","originalSince":"120.0","originalUntil":null},{"id":"JSTestDriver Plugin","version":"134.31","since":"134.0","until":"181.0","originalSince":"134.0","originalUntil":"135.0"},{"id":"org.mayevskiy.intellij.sonar","version":"1.3.2","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"org.jetbrains.testnames","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.jetbrains.testnames","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.jetbrains.plugins.jade","version":"133.74","since":"130.957","until":"181.0","originalSince":"130.957","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"1.3.3","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"com.hoho.conkitty","version":"0.0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"1.4.0","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"133.51","since":"133.50","until":"181.0","originalSince":"133.50","originalUntil":null},{"id":"com.intellij.phing","version":"133.51","since":"133.50","until":"181.0","originalSince":"133.50","originalUntil":null},{"id":"Error-prone plugin","version":"1.0.8","since":"129.105","until":"131.0","originalSince":"129.105","originalUntil":null},{"id":"LivePlugin","version":"0.3.3 beta","since":"122.600","until":"213.*","originalSince":"122.600","originalUntil":null},{"id":"com.jetbrains.twig","version":"133.51","since":"130.1","until":"130.1","originalSince":"130.1","originalUntil":null},{"id":"Error-prone plugin","version":"1.0.8b","since":"129.105","until":"133.0","originalSince":"129.105","originalUntil":null},{"id":"com.scalaImportsOrganizer","version":"0.1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"0.4","since":"130.1","until":"181.3494","originalSince":"130.1","originalUntil":null},{"id":"com.jetbrains.php.drupal","version":"133.51","since":"133.50","until":"181.0","originalSince":"133.50","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.1.5","since":"133.93","until":"231.*","originalSince":"133.93","originalUntil":null},{"id":"SmoothScroll","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"JCompilo Java Compiler","version":"160","since":"129.1328","until":"211","originalSince":"129.1328","originalUntil":null},{"id":"org.jetbrains.plugins.localization","version":"134.SNAPSHOT","since":"130.1","until":"201","originalSince":"130.1","originalUntil":null},{"id":"org.jetbrains.plugins.rest","version":"134.SNAPSHOT","since":"130.1","until":"201","originalSince":"130.1","originalUntil":null},{"id":"JRebelPlugin","version":"5.4.2-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"Compare Directories","version":"1.0.6","since":"130.0","until":"183.0","originalSince":"130.0","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.5.5","since":"123.0","until":"141.3058","originalSince":"123.0","originalUntil":null},{"id":"CUBA","version":"2.0.4.13","since":"133.79","until":"211","originalSince":"133.79","originalUntil":null},{"id":"com.hoho.conkitty","version":"0.0.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"MKS","version":"0.10","since":"129.1328","until":"201.0","originalSince":"129.1328","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"8.0.27692","since":"90.10000","until":"133.1800","originalSince":"90.10000","originalUntil":null},{"id":"pl.projectspace.idea.plugins.php.behat","version":"0.4","since":"129.757","until":"201.0","originalSince":"129.757","originalUntil":null},{"id":"com.makeapp.cocos2dx","version":"1.0-alpha1","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"org.intellij.featureSuggester","version":"0.2.2","since":"133.193","until":"193.0","originalSince":"133.193","originalUntil":null},{"id":"JythonHelper","version":"1.0","since":"117.105","until":"203","originalSince":"117.105","originalUntil":null},{"id":"com.intellij.tcserver","version":"1.2","since":"133.193","until":"201","originalSince":"133.193","originalUntil":null},{"id":"com.scalaImportsOrganizer","version":"0.1.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"MKS","version":"0.10.1","since":"129.1328","until":"201.0","originalSince":"129.1328","originalUntil":null},{"id":"Batch Scripts Support","version":"1.0.4","since":"133.193","until":"182.*","originalSince":"133.193","originalUntil":null},{"id":"JSTestDriver Plugin","version":"134.307","since":"134.297","until":"181.0","originalSince":"134.297","originalUntil":"135.0"},{"id":"Mongo Plugin","version":"0.5.1","since":"131.130","until":"201","originalSince":"131.130","originalUntil":null},{"id":"Code Review","version":"1.3.6","since":"123.123","until":"222.*","originalSince":"123.123","originalUntil":null},{"id":"com.amigold.auto.parcel","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.3.3","since":"110.0","until":"201.0","originalSince":"110.0","originalUntil":null},{"id":"org.editorconfig.editorconfigjetbrains","version":"0.2.0","since":"120.0","until":"135.*","originalSince":"120.0","originalUntil":null},{"id":"Pull up method refactoring extension","version":"0.3a","since":"129.1359","until":"201.0","originalSince":"129.1359","originalUntil":null},{"id":"fr.vdl.android.holocolors","version":"1.0","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.makeapp.cocos2dx","version":"1.0-alpha2","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"CUBA","version":"2.1.0.13","since":"133.79","until":"211","originalSince":"133.79","originalUntil":null},{"id":"OracleCloud","version":"0.5","since":"133.193","until":"183.1","originalSince":"133.193","originalUntil":null},{"id":"JRebelPlugin","version":"5.5.0-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"ro.redeul.google.go","version":"0.9.15.1","since":"133.326","until":"181.0","originalSince":"133.326","originalUntil":"133.*"},{"id":"jp.funnything.offing_harbor","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"jp.funnything.offing_harbor","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"ch.mjava.intellij.tapestry.4","version":"0.1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"ch.mjava.intellij.tapestry.4","version":"0.1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.15.2","since":"133.326","until":"181.0","originalSince":"133.326","originalUntil":"133.*"},{"id":"LESS CSS Compiler","version":"2.6.3","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.6.4","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.6.5","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.6.6","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.6.7","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"com.kukido.eclipser","version":"0.4","since":"133.0","until":"193.0","originalSince":"133.0","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.6.8","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"LESS CSS Compiler","version":"2.6.9","since":"107.105","until":"145.0","originalSince":"107.105","originalUntil":null},{"id":"com.kukido.eclipser","version":"0.4.1","since":"129.0","until":"193.0","originalSince":"129.0","originalUntil":null},{"id":"io.nlopez.androidannotations.viewbyid","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.15.3","since":"133.326","until":"181.0","originalSince":"133.326","originalUntil":"133.*"},{"id":"com.codexplo.intellij.android","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.atlassian.clover","version":"idea-3.2.1.v20140110000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"com.jetbrains.php.framework.structure","version":"133.326","since":"133.0","until":"140.0","originalSince":"133.0","originalUntil":null},{"id":"com.codexplo.intellij.android","version":"1.01","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.codexplo.intellij.android","version":"1.01","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.codexplo.intellij.android","version":"1.01","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"de.halirutan.mathematica","version":"0.2","since":"123.94","until":"123.*","originalSince":"123.94","originalUntil":null},{"id":"CollabNet Tools","version":"1.0.1","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"LivePlugin","version":"0.3.4 beta","since":"122.600","until":"213.*","originalSince":"122.600","originalUntil":null},{"id":"LivePlugin","version":"0.3.5 beta","since":"122.600","until":"213.*","originalSince":"122.600","originalUntil":null},{"id":"JSTestDriver Plugin","version":"134.686","since":"134.670","until":"181.0","originalSince":"134.670","originalUntil":"135.0"},{"id":"MKS","version":"0.10.2","since":"129.1328","until":"201.0","originalSince":"129.1328","originalUntil":null},{"id":"LivePlugin","version":"0.3.6 beta","since":"122.600","until":"213.*","originalSince":"122.600","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.1","since":"133.633","until":"181.0","originalSince":"133.633","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.1","since":"133.633","until":"181.0","originalSince":"133.633","originalUntil":null},{"id":"ch.mjava.intellij.tapestry.4","version":"0.1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.makeapp.cocos2dx","version":"1.0-beta","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"1","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"com.kukido.eclipser","version":"0.4.2","since":"129.0","until":"193.0","originalSince":"129.0","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.3.4","since":"110.0","until":"201.0","originalSince":"110.0","originalUntil":null},{"id":"com.hoho.conkitty","version":"0.0.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.millennialmedia.intellibot","version":"0.2","since":"107.105","until":"222.*","originalSince":"107.105","originalUntil":null},{"id":"com.millennialmedia.intellibot","version":"0.2.1","since":"107.105","until":"222.*","originalSince":"107.105","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"2","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"com.junbo.idea.codenarc","version":"0.0.1-SNAPSHOT","since":"133.331","until":"201.0","originalSince":"133.331","originalUntil":null},{"id":"com.jetbrains.twig","version":"133.737","since":"133.620","until":"133.620","originalSince":"133.620","originalUntil":null},{"id":"com.jetbrains.lang.ejs","version":"133.745","since":"133.620","until":"162.*","originalSince":"133.620","originalUntil":null},{"id":"Pull up method refactoring extension","version":"0.3b","since":"133.330","until":"201.0","originalSince":"133.330","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.1","since":"133.696","until":"181.0","originalSince":"133.696","originalUntil":null},{"id":"jbehave-support-plugin","version":"1.1","since":"80.8000","until":"213","originalSince":"80.8000","originalUntil":null},{"id":"LazySpring","version":"1.3.1","since":"133.696","until":"211","originalSince":"133.696","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.1.7","since":"133.696","until":"231.*","originalSince":"133.696","originalUntil":null},{"id":"UsefulActions","version":"1.5.1","since":"132.27","until":"232","originalSince":"132.27","originalUntil":null},{"id":"org.intellij.scala","version":"0.32.512","since":"134.846","until":"181.0","originalSince":"134.846","originalUntil":"135.0"},{"id":"R4Intellij","version":"0.8.1","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"com.duncanjauncey.autosysplugin","version":"1.1","since":"117.105","until":"201.0","originalSince":"117.105","originalUntil":null},{"id":"com.jasonnz.bootstrap","version":"0.1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"LazySpring","version":"1.3.2","since":"133.696","until":"211","originalSince":"133.696","originalUntil":null},{"id":"org.intellij.scala","version":"0.32.520","since":"134.846","until":"181.0","originalSince":"134.846","originalUntil":"135.0"},{"id":"com.atlassian.clover","version":"idea-3.2.2.v20140207000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"2","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"3","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"JCR Content Editor","version":"1.1.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"jp.tomorrowkey.intellij.injectlogtag","version":"1.0.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"jp.tomorrowkey.intellij.injectlogtag","version":"1.0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.mextor.intellij.plugin.search","version":"1.0","since":"129.1359","until":"129.1561","originalSince":"129.1359","originalUntil":"139.*"},{"id":"JSTestDriver Plugin","version":"134.1039","since":"134.1015","until":"181.0","originalSince":"134.1015","originalUntil":"135.0"},{"id":"CUBA","version":"2.2.0.13","since":"133.79","until":"211","originalSince":"133.79","originalUntil":null},{"id":"org.jetbrains.plugins.ruby","version":"6.0.0.20140207","since":"134.1007","until":"181.0","originalSince":"134.1007","originalUntil":"134.*"},{"id":"Pythonid","version":"3.1","since":"134.1007","until":"181.0","originalSince":"134.1007","originalUntil":"134.*"},{"id":"cucumber-java","version":"134.1007","since":"134.1007","until":"201","originalSince":"134.1007","originalUntil":null},{"id":"cucumber-groovy","version":"134.1007","since":"134.1007","until":"201","originalSince":"134.1007","originalUntil":null},{"id":"Pythonid","version":"3.1","since":"133.818","until":"181.0","originalSince":"133.818","originalUntil":"133.*"},{"id":"com.dirzys.phpstormzf1","version":"1.0.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"AngularJS","version":"134.1094","since":"134.1","until":"181.0","originalSince":"134.1","originalUntil":null},{"id":"Magicento","version":"2.4.0","since":"117.105","until":"181","originalSince":"117.105","originalUntil":null},{"id":"pl.charmas.parcelablegenerator","version":"0.5","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"org.intellij.scala","version":"0.32.550","since":"134.846","until":"181.0","originalSince":"134.846","originalUntil":"135.0"},{"id":"com.mextor.intellij.plugin.search","version":"1.2","since":"","until":"129.1561","originalSince":null,"originalUntil":null},{"id":"com.millennialmedia.intellibot","version":"0.3","since":"107.105","until":"222.*","originalSince":"107.105","originalUntil":null},{"id":"WicketForge","version":"4.0.1","since":"132.325","until":"138","originalSince":"132.325","originalUntil":null},{"id":"com.hoho.coocoo","version":"0.0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.hoho.coocoo","version":"0.0.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.intellij.scala","version":"0.32.558","since":"134.846","until":"181.0","originalSince":"134.846","originalUntil":"135.0"},{"id":"JSTestDriver Plugin","version":"134.1163","since":"134.1160","until":"181.0","originalSince":"134.1160","originalUntil":"135.0"},{"id":"BuildrPlugin","version":"13.0.0","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"Pull up method refactoring extension","version":"0.3c","since":"133.696","until":"201.0","originalSince":"133.696","originalUntil":null},{"id":"com.denimgroup.threadfix.plugins.intellij","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.intellij.scala","version":"0.32.562","since":"134.846","until":"181.0","originalSince":"134.846","originalUntil":"135.0"},{"id":"org.root.GoogleIt","version":"0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.root.GoogleIt","version":"0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.3.5","since":"110.0","until":"201.0","originalSince":"110.0","originalUntil":null},{"id":"com.jetbrains.chronon","version":"134.1221","since":"134.1160","until":"181.0","originalSince":"134.1160","originalUntil":null},{"id":"de.espend.idea.android","version":"0.1","since":"131.0","until":"191.5000","originalSince":"131.0","originalUntil":null},{"id":"org.root.GoogleIt","version":"0.11","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"de.espend.idea.android","version":"0.2","since":"131.0","until":"191.5000","originalSince":"131.0","originalUntil":null},{"id":"RegexPlugin","version":"0.7.1","since":"100.0","until":"201.0","originalSince":"100.0","originalUntil":null},{"id":"RegexPlugin","version":"0.7.2","since":"100.0","until":"201.0","originalSince":"100.0","originalUntil":null},{"id":"AngularJS","version":"134.1243","since":"134.1172","until":"181.0","originalSince":"134.1172","originalUntil":null},{"id":"com.jetbrains.php","version":"133.982","since":"133.620","until":"181.0","originalSince":"133.620","originalUntil":"1.0"},{"id":"JRebelPlugin","version":"5.5.1-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"Railways","version":"0.7.0","since":"122.633","until":"181.0","originalSince":"122.633","originalUntil":null},{"id":"Railways for IDEA","version":"0.7.0","since":"122.633","until":"181.0","originalSince":"122.633","originalUntil":null},{"id":"com.hoho.coocoo","version":"0.0.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"Railways","version":"0.7.0","since":"122.633","until":"181.0","originalSince":"122.633","originalUntil":null},{"id":"Railways for IDEA","version":"0.7.0","since":"122.633","until":"181.0","originalSince":"122.633","originalUntil":null},{"id":"org.intellij.scala","version":"0.32.593","since":"134.846","until":"181.0","originalSince":"134.846","originalUntil":"135.0"},{"id":"org.kevoree.idea.plugin","version":"4","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"AngularJS","version":"134.1341","since":"134.1172","until":"181.0","originalSince":"134.1172","originalUntil":null},{"id":"com.jetbrains.chronon","version":"134.1414","since":"134.1160","until":"181.0","originalSince":"134.1160","originalUntil":null},{"id":"com.jetbrains.php","version":"134.1456","since":"134.1300","until":"134.*","originalSince":"134.1300","originalUntil":null},{"id":"com.hoho.coocoo","version":"0.0.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"MKS","version":"0.11","since":"129.1359","until":"201.0","originalSince":"129.1359","originalUntil":null},{"id":"org.vayafulano.relativeLineNumbers","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"amailp.intellij.robot","version":"0.6","since":"123.72","until":"123.*","originalSince":"123.72","originalUntil":null},{"id":"com.jetbrains.chronon","version":"134.1618","since":"134.1160","until":"181.0","originalSince":"134.1160","originalUntil":null},{"id":"MKS","version":"0.11.1","since":"129.1359","until":"201.0","originalSince":"129.1359","originalUntil":null},{"id":"amailp.intellij.robot","version":"0.7","since":"123.72","until":"123.*","originalSince":"123.72","originalUntil":null},{"id":"cucumber-javascript","version":"134.1459","since":"134.1456","until":"201","originalSince":"134.1456","originalUntil":null},{"id":"amailp.intellij.robot","version":"0.7.1","since":"123.72","until":"123.*","originalSince":"123.72","originalUntil":null},{"id":"JSTestDriver Plugin","version":"136.1141","since":"136.0","until":"181.0","originalSince":"136.0","originalUntil":"137.0"},{"id":"AngularJS","version":"134.1444","since":"134.1172","until":"181.0","originalSince":"134.1172","originalUntil":null},{"id":"jbehave-support-plugin","version":"1.2","since":"133.0","until":"213","originalSince":"133.0","originalUntil":null},{"id":"info.darbha.plugins","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.bsb.intellij.plugins.xmlbeans","version":"2.1.1","since":"133.696","until":"181","originalSince":"133.696","originalUntil":null},{"id":"Railways","version":"0.7.1","since":"122.633","until":"181.0","originalSince":"122.633","originalUntil":null},{"id":"Railways for IDEA","version":"0.7.1","since":"122.633","until":"181.0","originalSince":"122.633","originalUntil":null},{"id":"Railways for IDEA","version":"0.7.1","since":"122.633","until":"181.0","originalSince":"122.633","originalUntil":null},{"id":"com.jetbrains.chronon","version":"135.476","since":"134.1160","until":"181.0","originalSince":"134.1160","originalUntil":null},{"id":"CUBA","version":"2.3.0.13","since":"133.79","until":"211","originalSince":"133.79","originalUntil":null},{"id":"JRebelPlugin","version":"5.5.2-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.ueqt.idea.plugin.GeneratePropAction","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"QAPlug","version":"1.3.7","since":"133.193","until":"211","originalSince":"133.193","originalUntil":null},{"id":"QAPlug - Hammurapi","version":"1.3.3","since":"133.193","until":"191.6184","originalSince":"133.193","originalUntil":null},{"id":"iceScrum for Intellij","version":"1.3","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.2","since":"135.445","until":"181.0","originalSince":"135.445","originalUntil":"135.*"},{"id":"JMeter plugin","version":"1.6","since":"133.696","until":"203","originalSince":"133.696","originalUntil":null},{"id":"jp.funnything.offing_harbor","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"jp.funnything.offing_harbor","version":"1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"jp.funnything.offing_harbor","version":"1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.genymotion.idea","version":"1.0.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"de.espend.idea.android","version":"0.2.1","since":"131.0","until":"191.5000","originalSince":"131.0","originalUntil":null},{"id":"Error-prone plugin","version":"136.1285","since":"134.1425","until":"137.0","originalSince":"134.1425","originalUntil":null},{"id":"actiBPM","version":"1.E-10","since":"123.1","until":"192.0","originalSince":"123.1","originalUntil":null},{"id":"jbehave-support-plugin","version":"1.3","since":"133.0","until":"213","originalSince":"133.0","originalUntil":null},{"id":"org.vayafulano.relativeLineNumbers","version":"1.0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.hoho.coocoo","version":"0.0.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"AngularJS","version":"135.565","since":"134.1172","until":"181.0","originalSince":"134.1172","originalUntil":null},{"id":"com.atlassian.clover","version":"idea-3.3.0.v20140331000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"com.idamobile.android.toolbox","version":"1.1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"EclipseCodeFormatter","version":"14.0.132.637","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.jetbrains.chronon","version":"135.666","since":"134.1160","until":"181.0","originalSince":"134.1160","originalUntil":null},{"id":"io.nlopez.androidannotations.viewbyid","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"JMeter plugin","version":"1.6.1","since":"133.696","until":"203","originalSince":"133.696","originalUntil":null},{"id":"com.dirzys.phpstormzf1","version":"1.0.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.codexplo.intellij.android","version":"1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.codexplo.intellij.android","version":"1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.1","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.1","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.1","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.0.1","since":"131.1","until":"201.0","originalSince":"131.1","originalUntil":null},{"id":"org.verily.intellij.plugin","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"EclipseCodeFormatter","version":"14.1.132.637","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.0.1","since":"131.1","until":"201.0","originalSince":"131.1","originalUntil":null},{"id":"jbehave-support-plugin","version":"1.4","since":"133.0","until":"213","originalSince":"133.0","originalUntil":null},{"id":"iceScrum for Intellij","version":"1.3.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"R4Intellij","version":"0.8.2","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"JCR Content Editor","version":"1.1.3","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"RESTClient","version":"1.2","since":"80.8000","until":"143.*","originalSince":"80.8000","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.2","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"org.editorconfig.editorconfigjetbrains","version":"0.2.1","since":"120.0","until":"135.*","originalSince":"120.0","originalUntil":null},{"id":"fr.assoba.open.sel.plugin","version":"1.0","since":"120.0","until":"201.0","originalSince":"120.0","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.7.1","since":"132.400","until":"211","originalSince":"132.400","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"1.0.1","since":"131.0","until":"181.3494","originalSince":"131.0","originalUntil":null},{"id":"com.mycila.intellij.plugin.gmavenplus","version":"1.0","since":"123.169","until":"201.8538.17","originalSince":"123.169","originalUntil":null},{"id":"JythonHelper","version":"1.1","since":"117.105","until":"203","originalSince":"117.105","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.3.0","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"de.espend.idea.android","version":"0.3","since":"131.0","until":"191.5000","originalSince":"131.0","originalUntil":null},{"id":"edu.gmu.cs.plugin.aeon","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.3.1","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.3.2","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"Compare Directories","version":"1.0.7","since":"130.0","until":"183.0","originalSince":"130.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.3.3","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php","version":"136.1672","since":"136.0","until":"136.*","originalSince":"136.0","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.0","since":"131.1","until":"181.0","originalSince":"131.1","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.0","since":"131.1","until":"181.0","originalSince":"131.1","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.1","since":"131.1","until":"201.0","originalSince":"131.1","originalUntil":null},{"id":"JRebelPlugin","version":"5.5.3-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.webschik.doT","version":"1.2","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.2","since":"131.1","until":"201.0","originalSince":"131.1","originalUntil":null},{"id":"com.webschik.doT","version":"1.3","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.3","since":"131.1","until":"201.0","originalSince":"131.1","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.4.1","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.twig","version":"136.1770","since":"136.1","until":"136.1","originalSince":"136.1","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.4","since":"131.1","until":"201.0","originalSince":"131.1","originalUntil":null},{"id":"com.jetbrains.php","version":"136.1768","since":"136.0","until":"136.*","originalSince":"136.0","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.5","since":"131.1","until":"201.0","originalSince":"131.1","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.6","since":"131.1","until":"201.0","originalSince":"131.1","originalUntil":null},{"id":"com.neon.intellij.plugins.gitlab","version":"1.0","since":"131.0","until":"162.0","originalSince":"131.0","originalUntil":null},{"id":"com.webschik.doT","version":"1.4","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.webschik.doT","version":"1.4","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.webschik.doT","version":"1.5","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"amailp.intellij.robot","version":"0.8","since":"123.72","until":"123.*","originalSince":"123.72","originalUntil":null},{"id":"Insert Final Modifier","version":"1.0","since":"131.0","until":"221","originalSince":"131.0","originalUntil":null},{"id":"TFS","version":"133.1378","since":"133.0","until":"181.0","originalSince":"133.0","originalUntil":null},{"id":"IdeaVIM","version":"0.33","since":"120.0","until":"181.0","originalSince":"120.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.5.0","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.7","since":"131.1","until":"181.0","originalSince":"131.1","originalUntil":null},{"id":"com.neon.intellij.plugins.gitlab","version":"1.0.1","since":"131.0","until":"162.0","originalSince":"131.0","originalUntil":null},{"id":"JSTestDriver Plugin","version":"138.21","since":"138.0","until":"181.0","originalSince":"138.0","originalUntil":"139.0"},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.8","since":"131.1","until":"181.0","originalSince":"131.1","originalUntil":null},{"id":"IdeaVIM","version":"0.34","since":"120.0","until":"181.0","originalSince":"120.0","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.8","since":"131.1","until":"181.0","originalSince":"131.1","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.5.1","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"Haskell","version":"0.1 Beta","since":"135.480","until":"181","originalSince":"135.480","originalUntil":null},{"id":"amailp.intellij.robot","version":"0.8.1","since":"123.72","until":"123.*","originalSince":"123.72","originalUntil":null},{"id":"eu.broth.intellilab","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"eu.broth.intellilab","version":"0.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"eu.broth.intellilab","version":"0.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"eu.broth.intellilab","version":"0.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"eu.broth.intellilab","version":"0.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"eu.broth.intellilab","version":"0.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"eu.broth.intellilab","version":"0.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"eu.broth.intellilab","version":"0.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"eu.broth.intellilab","version":"0.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.9","since":"131.1","until":"181.0","originalSince":"131.1","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"1.1","since":"131.0","until":"181.3494","originalSince":"131.0","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.10","since":"131.1","until":"201.0","originalSince":"131.1","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.2","since":"135.815","until":"181.0","originalSince":"135.815","originalUntil":"138.*"},{"id":"Haskell","version":"0.1.1 Beta","since":"135.480","until":"181","originalSince":"135.480","originalUntil":null},{"id":"Ebean enhancer","version":"1.0","since":"90.10000","until":"145.0","originalSince":"90.10000","originalUntil":null},{"id":"com.webschik.doT","version":"1.5.1","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.webschik.doT","version":"1.5.2","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.hoho.conkitty","version":"0.5.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"amailp.intellij.robot","version":"0.9","since":"123.72","until":"123.*","originalSince":"123.72","originalUntil":null},{"id":"jenv-idea-plugin","version":"0.0.2","since":"135.1","until":"181.0","originalSince":"135.1","originalUntil":null},{"id":"com.jetbrains.php.wordPress","version":"136.1382","since":"136.1382","until":"181.0","originalSince":"136.1382","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"136.1382","since":"136.1382","until":"181.0","originalSince":"136.1382","originalUntil":null},{"id":"com.jetbrains.php.drupal","version":"134.1456","since":"134.1456","until":"181.0","originalSince":"134.1456","originalUntil":null},{"id":"AngularJS","version":"135.831","since":"134.1172","until":"181.0","originalSince":"134.1172","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.11","since":"131.1","until":"181.0","originalSince":"131.1","originalUntil":null},{"id":"amailp.intellij.robot","version":"0.9.1","since":"123.72","until":"123.*","originalSince":"123.72","originalUntil":null},{"id":"Haskell","version":"0.1.2 Beta","since":"135.480","until":"181","originalSince":"135.480","originalUntil":null},{"id":"com.webschik.doT","version":"1.5.3","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"org.bigtesting.jbehave.buddy","version":"0.1","since":"129.0","until":"201.0","originalSince":"129.0","originalUntil":null},{"id":"ru.hyoo.jin.tree","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ru.hyoo.jin.tree","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.6.0","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.6.0","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"ru.hyoo.jin.tree","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"edu.gmu.cs.plugin.aeon","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"amailp.intellij.robot","version":"0.9.2","since":"123.72","until":"123.*","originalSince":"123.72","originalUntil":null},{"id":"org.jetbrains.plugins.ruby","version":"6.5.2.20140512","since":"135.863","until":"181.0","originalSince":"135.863","originalUntil":"135.*"},{"id":"com.aspose.intellijplugin.id","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.aspose.intellijplugin.id","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"SBT","version":"1.6.0","since":"135.690","until":"143.0","originalSince":"135.690","originalUntil":null},{"id":"SBT","version":"1.6.1","since":"135.475","until":"143.0","originalSince":"135.475","originalUntil":null},{"id":"TestDox","version":"1.1.15","since":"117.84","until":"181.*","originalSince":"117.84","originalUntil":null},{"id":"IdeaVIM","version":"0.35","since":"120.0","until":"181.0","originalSince":"120.0","originalUntil":null},{"id":"com.aspose.intellijplugin.id","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.lang.puppet","version":"6.5.0.20140515","since":"135.809","until":"201","originalSince":"135.809","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.12","since":"131.1","until":"181.0","originalSince":"131.1","originalUntil":null},{"id":"intellij.frontendalignment","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"collabs","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Remote call","version":"1.5","since":"129.1","until":"223.*","originalSince":"129.1","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.7.0","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"PairHero","version":"1.0","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"CUBA","version":"2.4.0.13","since":"133.79","until":"211","originalSince":"133.79","originalUntil":null},{"id":"collabs","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.mistraltech.smogen","version":"0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"PairHero","version":"1.0","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"PairHero","version":"1.0","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.13","since":"131.1","until":"181.0","originalSince":"131.1","originalUntil":null},{"id":"Haskell","version":"0.2.0 Beta","since":"135.480","until":"181","originalSince":"135.480","originalUntil":null},{"id":"com.aspose.intellijplugin.id","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"JSTestDriver Plugin","version":"138.317","since":"138.255","until":"181.0","originalSince":"138.255","originalUntil":"139.0"},{"id":"de.halirutan.mathematica","version":"0.2.4","since":"123.94","until":"123.*","originalSince":"123.94","originalUntil":null},{"id":"org.intellij.featureSuggester","version":"0.2.3","since":"135.760","until":"193.0","originalSince":"135.760","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.14","since":"131.1","until":"181.0","originalSince":"131.1","originalUntil":null},{"id":"intellij.frontendalignment","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.8.0","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.8.1","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"Haskell","version":"0.2.1 Beta","since":"135.480","until":"181","originalSince":"135.480","originalUntil":null},{"id":"fossil4idea","version":"0.1","since":"123.0","until":"192.*","originalSince":"123.0","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"1.4.1","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"JRebelPlugin","version":"5.5.4-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"AngularJS","version":"135.937","since":"134.1172","until":"181.0","originalSince":"134.1172","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.3.6","since":"110.0","until":"201.0","originalSince":"110.0","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"5","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"com.codeOrchestra.colt.js.webStormPlugin","version":"1.1.15","since":"131.1","until":"181.0","originalSince":"131.1","originalUntil":null},{"id":"fossil4idea","version":"0.1.1","since":"123.0","until":"192.*","originalSince":"123.0","originalUntil":null},{"id":"R4Intellij","version":"0.8.3","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"fossil4idea","version":"0.1.1","since":"123.0","until":"192.*","originalSince":"123.0","originalUntil":null},{"id":"com.github.nrudenko.plugin.ormgenerator","version":"1.3.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"fossil4idea","version":"0.1.2","since":"123.0","until":"192.*","originalSince":"123.0","originalUntil":null},{"id":"IDEA Doc","version":"1.0RC2","since":"135.690","until":"201.0","originalSince":"135.690","originalUntil":null},{"id":"com.steve.plugins.mavenversion","version":"1.1","since":"107.105","until":"231.*","originalSince":"107.105","originalUntil":null},{"id":"com.smartbear.soapui.idea.plugin","version":"5.0-beta1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.webschik.doT","version":"1.5.4","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"1.2","since":"131.0","until":"181.3494","originalSince":"131.0","originalUntil":null},{"id":"PairHero","version":"1.0","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"Haskell","version":"0.2.2 Beta","since":"135.480","until":"181","originalSince":"135.480","originalUntil":null},{"id":"me.tatarka.androidunittest.idea","version":"1.0","since":"131.0","until":"142.0","originalSince":"131.0","originalUntil":"1.0"},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.8.2","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"0.8.2","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"UsefulActions","version":"1.6","since":"135.667","until":"232","originalSince":"135.667","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"6","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"CssAlphabeticalRearranger","version":"0.2","since":"130.754","until":"183.0","originalSince":"130.754","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"7","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"1.3","since":"131.0","until":"181.3494","originalSince":"131.0","originalUntil":null},{"id":"CssAlphabeticalRearranger","version":"0.3","since":"130.754","until":"183.0","originalSince":"130.754","originalUntil":null},{"id":"iceScrum for Intellij","version":"1.3.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"info.darbha.plugins","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.3.7","since":"110.0","until":"201.0","originalSince":"110.0","originalUntil":null},{"id":"pl.charmas.parcelablegenerator","version":"0.6","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"WicketForge","version":"4.0.2","since":"132.325","until":"138","originalSince":"132.325","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.1","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.2","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.3","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.mextor.intellij.plugin.search","version":"1.2","since":"","until":"129.1561","originalSince":null,"originalUntil":null},{"id":"uk.co.neylan.plugins.makeiteasy","version":"1.0","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.mextor.intellij.plugin.search","version":"1.2","since":"","until":"129.1561","originalSince":null,"originalUntil":null},{"id":"uk.co.neylan.plugins.makeiteasy","version":"1.0","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"pl.charmas.parcelablegenerator","version":"0.6.1","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"8","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"SVN Revision Graph","version":"1.6.4","since":"133.982","until":"181.0","originalSince":"133.982","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.6","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"SVN Revision Graph","version":"1.6.5","since":"133.982","until":"181.0","originalSince":"133.982","originalUntil":null},{"id":"com.civ.androidStringsTools","version":"1.0","since":"93.13","until":"201.0","originalSince":"93.13","originalUntil":null},{"id":"JRebelPlugin","version":"5.6.0-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"org.intellij.scala","version":"0.40.16","since":"138.0","until":"181.0","originalSince":"138.0","originalUntil":"139.0"},{"id":"PsiViewer","version":"3.28.72","since":"130.0","until":"130.*","originalSince":"130.0","originalUntil":null},{"id":"com.jetbrains.php","version":"138.826","since":"136.0","until":"138.*","originalSince":"136.0","originalUntil":null},{"id":"com.mextor.intellij.plugin.search","version":"1.3.4","since":"123.72","until":"129.1561","originalSince":"123.72","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.7","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"138.826","since":"138.0","until":"181.0","originalSince":"138.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"0.7.1360","since":"138.515","until":"181.0","originalSince":"138.515","originalUntil":"138.*"},{"id":"org.editorconfig.editorconfigjetbrains","version":"0.4.0","since":"134.543","until":"141.0","originalSince":"134.543","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"9","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"com.kukido.eclipser","version":"0.5.0","since":"129.0","until":"193.0","originalSince":"129.0","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"138.872","since":"138.0","until":"201","originalSince":"138.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.8","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"PsiViewer","version":"3.28.73","since":"130.0","until":"130.*","originalSince":"130.0","originalUntil":null},{"id":"Haskell","version":"0.3.0 Beta","since":"135.480","until":"181","originalSince":"135.480","originalUntil":null},{"id":"org.intellij.scala","version":"0.40.18","since":"138.777","until":"181.0","originalSince":"138.777","originalUntil":"139.0"},{"id":"jp.funnything.offing_harbor","version":"1.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"AngularJS","version":"135.1063","since":"134.1172","until":"181.0","originalSince":"134.1172","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"0.8.7","since":"138.515","until":"181.0","originalSince":"138.515","originalUntil":"138.*"},{"id":"com.wix.eslint","version":"1.0.9","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"amailp.intellij.robot","version":"0.10","since":"123.72","until":"123.*","originalSince":"123.72","originalUntil":null},{"id":"LivePlugin","version":"0.3.7 beta","since":"134.0","until":"213.*","originalSince":"134.0","originalUntil":null},{"id":"org.jetbrains.plugins.ruby","version":"7.0.0.20140704","since":"138.777","until":"181.0","originalSince":"138.777","originalUntil":"138.*"},{"id":"LivePlugin","version":"0.3.8 beta","since":"134.0","until":"213.*","originalSince":"134.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.10","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.neon.intellij.plugins.gitlab","version":"1.0.3","since":"133.0","until":"162.0","originalSince":"133.0","originalUntil":null},{"id":"com.neon.intellij.plugins.gitlab","version":"1.0.4","since":"133.0","until":"162.0","originalSince":"133.0","originalUntil":null},{"id":"Mongo Plugin","version":"0.6.0","since":"131.130","until":"201","originalSince":"131.130","originalUntil":null},{"id":"uk.co.neylan.plugins.makeiteasy","version":"1.1","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"uk.co.neylan.plugins.makeiteasy","version":"1.1","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"de.sgalinski.typoscript.plugin.id","version":"1.2","since":"133.0","until":"231","originalSince":"133.0","originalUntil":null},{"id":"org.jetbrains.plugins.ruby","version":"7.0.0.20140707","since":"138.1004","until":"181.0","originalSince":"138.1004","originalUntil":"138.*"},{"id":"com.neon.intellij.plugins.gitlab","version":"1.0.5","since":"133.0","until":"162.0","originalSince":"133.0","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.5.6","since":"123.0","until":"141.3058","originalSince":"123.0","originalUntil":null},{"id":"com.alibaba.intl.urp","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.alibaba.intl.urp","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Mongo Plugin","version":"0.6.1","since":"131.130","until":"201","originalSince":"131.130","originalUntil":null},{"id":"Mongo Plugin","version":"0.6.1","since":"135.0","until":"201","originalSince":"135.0","originalUntil":null},{"id":"Mongo Plugin","version":"0.6.0","since":"131.130","until":"201","originalSince":"131.130","originalUntil":null},{"id":"Mongo Plugin","version":"0.6.1","since":"135.0","until":"201","originalSince":"135.0","originalUntil":null},{"id":"com.scalaImportsOrganizer","version":"0.1.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.scalaImportsOrganizer","version":"0.1.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"uk.co.drache.intellij.guavaPostfixCompletion","version":"1.0.0","since":"131.0","until":"139.1116","originalSince":"131.0","originalUntil":null},{"id":"org.weebly.generator","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"0.40.20","since":"138.1029","until":"181.0","originalSince":"138.1029","originalUntil":"139.0"},{"id":"com.atlassian.clover","version":"idea-4.0.0.v20140711000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"Pythonid","version":"4.0.25","since":"138.1029","until":"181.0","originalSince":"138.1029","originalUntil":"138.*"},{"id":"com.wix.eslint","version":"1.0.11","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"YiiStorm","version":"0.9.16.1","since":"138.0","until":"201.0","originalSince":"138.0","originalUntil":null},{"id":"org.jetbrains.code-golf","version":"0.2.2","since":"129.1","until":"182.0","originalSince":"129.1","originalUntil":null},{"id":"org.jetbrains.code-golf","version":"0.2.2","since":"129.1","until":"182.0","originalSince":"129.1","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.5.6","since":"133.0","until":"141.3058","originalSince":"133.0","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.5.6","since":"133.0","until":"141.3058","originalSince":"133.0","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.5.7","since":"133.0","until":"141.3058","originalSince":"133.0","originalUntil":null},{"id":"JRebelPlugin","version":"5.6.0.1-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"R4Intellij","version":"0.8.4","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"EclipseCodeFormatter","version":"14.2.132.637","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.4.1","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.12","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"YiiStorm","version":"0.9.16.2","since":"138.0","until":"201.0","originalSince":"138.0","originalUntil":null},{"id":"com.jetbrains.php","version":"138.1161","since":"136.1029","until":"138.*","originalSince":"136.1029","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"138.937","since":"138.937","until":"138.*","originalSince":"138.937","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.13","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.14","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"YiiStorm","version":"0.9.16.3","since":"138.0","until":"201.0","originalSince":"138.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.15","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.16","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.17","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"TFS","version":"138.1183","since":"135.0","until":"181.0","originalSince":"135.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.1.9","since":"138.1029","until":"231.*","originalSince":"138.1029","originalUntil":null},{"id":"actiBPM","version":"1.E-9","since":"123.1","until":"192.0","originalSince":"123.1","originalUntil":null},{"id":"AngularJS","version":"138.1242","since":"138.1029","until":"181.0","originalSince":"138.1029","originalUntil":null},{"id":"jballant.CommonJSAutoComplete","version":"0.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"jballant.CommonJSAutoComplete","version":"0.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"amailp.intellij.robot","version":"0.10.1","since":"123.72","until":"123.*","originalSince":"123.72","originalUntil":null},{"id":"JRebelPlugin","version":"5.6.1-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"org.intellij.scala","version":"0.42.23","since":"138.1283","until":"181.0","originalSince":"138.1283","originalUntil":"139.0"},{"id":"org.jetbrains.plugins.ruby","version":"7.0.0.20140724","since":"138.1283","until":"181.0","originalSince":"138.1283","originalUntil":"138.*"},{"id":"jballant.CommonJSAutoComplete","version":"0.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"138.1281","since":"138.1029","until":"163.0","originalSince":"138.1029","originalUntil":null},{"id":"com.jetbrains.php.behat","version":"138.1281","since":"138.1029","until":"181.0","originalSince":"138.1029","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.8","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.81","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.82","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.83","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.84","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"jballant.CommonJSAutoComplete","version":"0.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.0.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.85","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.87","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.88","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"org.elixir_lang","version":"0.0.2","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.1.10","since":"138.1029","until":"231.*","originalSince":"138.1029","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.89","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.90","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.91","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"org.editorconfig.editorconfigjetbrains","version":"0.4.1","since":"138.1293","until":"141.0","originalSince":"138.1293","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.0","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"assert-deluxe","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ru.spb.kupchinolabs.drozd.idea.plugin","version":"0.1","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.92","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"assert-deluxe","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.0.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.twig","version":"138.1505","since":"138.1","until":"138.1","originalSince":"138.1","originalUntil":null},{"id":"assert-deluxe","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"138.1495","since":"138.1495","until":"201","originalSince":"138.1495","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.93","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.jetbrains.php","version":"138.1505","since":"138.1404","until":"138.*","originalSince":"138.1404","originalUntil":null},{"id":"org.jetbrains.plugins.ruby","version":"7.0.0.20140807","since":"138.1503","until":"181.0","originalSince":"138.1503","originalUntil":"138.*"},{"id":"com.jetbrains.php.wordPress","version":"138.1505","since":"136.1382","until":"181.0","originalSince":"136.1382","originalUntil":null},{"id":"org.intellij.scala","version":"0.42.28","since":"138.1503","until":"181.0","originalSince":"138.1503","originalUntil":"139.0"},{"id":"com.robotium.recorder.intellij","version":"0.94","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.95","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.96","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"org.elixir_lang","version":"0.0.3","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.97","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.98","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"0.99","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"Pythonid","version":"4.0.26","since":"138.1029","until":"181.0","originalSince":"138.1029","originalUntil":"138.*"},{"id":"JRebelPlugin","version":"5.6.1.1-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.jimulabs.mirror.plugin","version":"2.0.7","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.0-beta-1","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.0-beta-2","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.1","since":"130.1","until":"221","originalSince":"130.1","originalUntil":null},{"id":"WicketForge","version":"4.1.0","since":"132.325","until":"138","originalSince":"132.325","originalUntil":null},{"id":"de.halirutan.mathematica","version":"0.3.2","since":"135.1230","until":"135.*","originalSince":"135.1230","originalUntil":null},{"id":"Twelf Plugin","version":"1.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"Haskell","version":"0.3.1 Beta","since":"135.480","until":"181","originalSince":"135.480","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.0-beta-3","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"me.tatarka.androidunittest.idea","version":"1.1","since":"131.0","until":"142.0","originalSince":"131.0","originalUntil":"1.0"},{"id":"com.robotium.recorder.intellij","version":"1.0.0","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"assert-deluxe","version":"1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.1","since":"131.0","until":"139","originalSince":"131.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.1","since":"131.0","until":"139","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.19","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.0.8","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.1","since":"131.0","until":"139","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.0.13","since":"138.1696","until":"181.0","originalSince":"138.1696","originalUntil":"139.0"},{"id":"org.intellij.scala","version":"1.0.14","since":"138.1696","until":"181.0","originalSince":"138.1696","originalUntil":"139.0"},{"id":"de.sgalinski.typoscript.plugin.id","version":"1.3","since":"133.0","until":"231","originalSince":"133.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.1","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.arasthel.swissknife.plugin","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.intellij.scala","version":"1.0.16","since":"138.1696","until":"181.0","originalSince":"138.1696","originalUntil":"139.0"},{"id":"com.arasthel.swissknife.plugin","version":"1.0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.linkedin.intellij.dust","version":"0.3.8","since":"110.0","until":"201.0","originalSince":"110.0","originalUntil":null},{"id":"builder-deluxe","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php","version":"138.1751","since":"138.1404","until":"138.*","originalSince":"138.1404","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"1.4","since":"131.0","until":"181.3494","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php","version":"138.1806","since":"138.1404","until":"138.*","originalSince":"138.1404","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.2","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.jetbrains.plugins.jade","version":"138.1744","since":"138.1744","until":"181.0","originalSince":"138.1744","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.3","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.1","since":"131.0","until":"139","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.4","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.5","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"WicketForge","version":"4.1.1","since":"132.325","until":"138","originalSince":"132.325","originalUntil":null},{"id":"WicketForge","version":"5.0.0.EAP-1","since":"138.0","until":"201","originalSince":"138.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.1","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.1.1","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"com.aspose.intellijplugin.id","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.2","since":"130.1","until":"221","originalSince":"130.1","originalUntil":null},{"id":"com.aspose.intellijplugin.id","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"10","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"JRebelPlugin","version":"5.6.2-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.jetbrains.php.wordPress","version":"138.1901","since":"136.1382","until":"181.0","originalSince":"136.1382","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.20","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.code-golf","version":"0.2.3","since":"129.1","until":"182.0","originalSince":"129.1","originalUntil":null},{"id":"com.aspose.intellijplugin.id","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.6","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.7","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.8","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"org.jetbrains.plugins.ruby","version":"7.0.0.20140901","since":"138.1696","until":"181.0","originalSince":"138.1696","originalUntil":"138.*"},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.2","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"com.atlassian.clover","version":"idea-4.0.1.v20140901000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"org.intellij.scala","version":"1.0.58","since":"138.1980","until":"181.0","originalSince":"138.1980","originalUntil":"139.0"},{"id":"CodeOutline2","version":"0.5.3","since":"123.72","until":"201","originalSince":"123.72","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.2.1","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.3","since":"138.1000","until":"221","originalSince":"138.1000","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.2.2","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"com.kodokux.github","version":"1.0.1.9","since":"131.48","until":"181.*","originalSince":"131.48","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"138.1980","since":"138.1980","until":"201","originalSince":"138.1980","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.9","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"fossil4idea","version":"0.1.3","since":"123.0","until":"192.*","originalSince":"123.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.10","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.11","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"anton_dev_ua.PipeTableFormatter","version":"0.2.1","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"fossil4idea","version":"0.1.4","since":"123.0","until":"192.*","originalSince":"123.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.4","since":"138.1000","until":"221","originalSince":"138.1000","originalUntil":null},{"id":"anton_dev_ua.PipeTableFormatter","version":"0.2.2","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"com.aspose.intellijplugin.id","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"138.1981","since":"138.1980","until":"201","originalSince":"138.1980","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.12","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.13","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.21","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.21","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"5.6.3-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.wix.jscs","version":"1.0.0","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"14.3.132.637","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.wix.jscs","version":"1.0.1","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.0.93.4.EAP","since":"138.2206","until":"181.0","originalSince":"138.2206","originalUntil":"139.0"},{"id":"EclipseCodeFormatter","version":"14.4.132.637","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"info.darbha.plugins","version":"2.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"pl.cmil.wuff.plugin","version":"0.1.0","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"org.elixir_lang","version":"0.1.0","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.14","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"AngularJS","version":"138.1988","since":"138.1988","until":"181.0","originalSince":"138.1988","originalUntil":null},{"id":"CUBA","version":"2.5.0.13","since":"133.79","until":"211","originalSince":"133.79","originalUntil":null},{"id":"org.jetbrains.plugins.ruby","version":"7.0.0.20140915","since":"138.2210","until":"181.0","originalSince":"138.2210","originalUntil":"138.*"},{"id":"org.intellij.scala","version":"1.0.93.9.EAP","since":"138.2206","until":"181.0","originalSince":"138.2206","originalUntil":"139.0"},{"id":"com.intellij.checker-framework","version":"1.0","since":"135.0","until":"181.0","originalSince":"135.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.0.93.10.EAP","since":"138.2206","until":"181.0","originalSince":"138.2206","originalUntil":"139.0"},{"id":"com.magnet.r2m","version":"0.9.0","since":"94.539","until":"142.0","originalSince":"94.539","originalUntil":null},{"id":"JRebelPlugin","version":"5.6.3a-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.magnet.r2m","version":"0.9.1","since":"94.539","until":"142.0","originalSince":"94.539","originalUntil":null},{"id":"com.magnet.r2m","version":"0.9.1","since":"94.539","until":"142.0","originalSince":"94.539","originalUntil":null},{"id":"com.jetbrains.php","version":"138.2000.2262","since":"138.1404","until":"138.*","originalSince":"138.1404","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.3","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"MetricsReloaded","version":"1.0 alpha 3","since":"123.72","until":"212.*","originalSince":"123.72","originalUntil":null},{"id":"com.magnet.r2m","version":"1.0.0","since":"94.539","until":"142.0","originalSince":"94.539","originalUntil":null},{"id":"com.magnet.r2m","version":"1.0.0","since":"94.539","until":"142.0","originalSince":"94.539","originalUntil":null},{"id":"org.elixir_lang","version":"0.1.1","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.3.1","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.5","since":"138.1000","until":"221","originalSince":"138.1000","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.5","since":"138.1000","until":"221","originalSince":"138.1000","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.3.2","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"me.tatarka.androidunittest.idea","version":"1.2","since":"131.0","until":"142.0","originalSince":"131.0","originalUntil":"1.0"},{"id":"com.jimulabs.mirror.plugin","version":"2.1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"1.4.1","since":"131.0","until":"181.3494","originalSince":"131.0","originalUntil":null},{"id":"Remote call","version":"1.6","since":"129.1","until":"223.*","originalSince":"129.1","originalUntil":null},{"id":"com.squareup.intellij.plugins.builder","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.idea.plugin.builder","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"138.2071","since":"138.2071","until":"201","originalSince":"138.2071","originalUntil":null},{"id":"com.jetbrains.chronon","version":"135.1291","since":"134.1160","until":"181.0","originalSince":"134.1160","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"11","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"org.elixir_lang","version":"0.1.2","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.3","since":"138.2458","until":"181.0","originalSince":"138.2458","originalUntil":"138.*"},{"id":"com.robotium.recorder.intellij","version":"1.0.15","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"138.2502","since":"138.0","until":"181.0","originalSince":"138.0","originalUntil":null},{"id":"com.jetbrains.php","version":"138.2502","since":"138.1404","until":"138.*","originalSince":"138.1404","originalUntil":null},{"id":"com.jetbrains.php.blade","version":"138.2502","since":"138.1000","until":"181.0","originalSince":"138.1000","originalUntil":null},{"id":"Twelf Plugin","version":"1.1.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.6","since":"138.1000","until":"221","originalSince":"138.1000","originalUntil":null},{"id":"com.arasthel.groovy.override-completion","version":"1.0.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"138.2502","since":"138.1503","until":"181.0","originalSince":"138.1503","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"138.2502","since":"138.1980","until":"163.0","originalSince":"138.1980","originalUntil":null},{"id":"com.jetbrains.php.behat","version":"138.2502","since":"138.1980","until":"181.0","originalSince":"138.1980","originalUntil":null},{"id":"CodeOutline2","version":"0.5.4","since":"123.72","until":"201","originalSince":"123.72","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.0","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.0","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"1.5.1","since":"131.0","until":"181.3494","originalSince":"131.0","originalUntil":null},{"id":"actiBPM","version":"1.E-8","since":"123.1","until":"192.0","originalSince":"123.1","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.1.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.7.2","since":"135.909","until":"181.0","originalSince":"135.909","originalUntil":"135.*"},{"id":"de.balpha.varsity","version":"0.3.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.1.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"wide-task-browser","version":"0.1.7","since":"130.1250","until":"231.*","originalSince":"130.1250","originalUntil":null},{"id":"wide-task-browser","version":"0.1.8","since":"130.1250","until":"231.*","originalSince":"130.1250","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.7.3","since":"138.2332","until":"181.0","originalSince":"138.2332","originalUntil":"138.*"},{"id":"com.robotium.recorder.intellij","version":"1.0.16","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"jballant.CommonJSAutoComplete","version":"0.1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.tagmycode.intellij","version":"1.1","since":"133.696","until":"231","originalSince":"133.696","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.2","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.17","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"Remote call","version":"1.7","since":"129.1","until":"223.*","originalSince":"129.1","originalUntil":null},{"id":"Remote call","version":"1.7","since":"129.1","until":"223.*","originalSince":"129.1","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.18","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.19","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.20","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"0.3.3","since":"135.1230","until":"135.*","originalSince":"135.1230","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.21","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.22","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.23","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"CVSToolBox","version":"1.4.13","since":"138.0","until":"201","originalSince":"138.0","originalUntil":null},{"id":"me.tatarka.androidunittest.idea","version":"1.2.1","since":"131.0","until":"142.0","originalSince":"131.0","originalUntil":"1.0"},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.0","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.24","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"AngularJS","version":"139.12","since":"139.12","until":"181.0","originalSince":"139.12","originalUntil":null},{"id":"org.jetbrains.plugins.ruby","version":"7.0.0.20141010","since":"139.1","until":"181.0","originalSince":"139.1","originalUntil":"139.*"},{"id":"com.intellij.plugins.webcomponents","version":"139.1","since":"139.1","until":"139.*","originalSince":"139.1","originalUntil":null},{"id":"anton_dev_ua.PipeTableFormatter","version":"0.2.3","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"com.jetbrains.twig","version":"139.58","since":"139.1","until":"139.1","originalSince":"139.1","originalUntil":null},{"id":"com.atlassian.clover","version":"idea-4.0.2.v20141013000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"IdeaVIM","version":"0.36","since":"135.0","until":"181.0","originalSince":"135.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.25","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"org.elixir_lang","version":"0.1.3","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"com.neon.intellij.plugins.gitlab","version":"1.0.6","since":"133.0","until":"162.0","originalSince":"133.0","originalUntil":null},{"id":"UsefulActions","version":"1.7","since":"135.667","until":"232","originalSince":"135.667","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"139.63","since":"139.63","until":"201","originalSince":"139.63","originalUntil":null},{"id":"IdeaVIM","version":"0.37","since":"135.0","until":"181.0","originalSince":"135.0","originalUntil":null},{"id":"LazySpring","version":"1.3.2","since":"133.696","until":"211","originalSince":"133.696","originalUntil":null},{"id":"cucumber-java","version":"139.69","since":"139.69","until":"201","originalSince":"139.69","originalUntil":null},{"id":"cucumber-groovy","version":"139.69","since":"139.69","until":"201","originalSince":"139.69","originalUntil":null},{"id":"actiBPM","version":"2.E-8","since":"123.1","until":"192.0","originalSince":"123.1","originalUntil":null},{"id":"org.jetbrains.settingsRepository","version":"2.0-beta1","since":"140.143","until":"141.0","originalSince":"140.143","originalUntil":null},{"id":"org.jetbrains.settingsRepository","version":"2.0-beta2","since":"140.143","until":"141.0","originalSince":"140.143","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.3","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php","version":"139.105","since":"138.1404","until":"139.*","originalSince":"138.1404","originalUntil":null},{"id":"com.morcinek.android.codegenerator.plugin.intellij","version":"1.2","since":"131.0","until":"201.*","originalSince":"131.0","originalUntil":null},{"id":"leviysoft.rainbowpony","version":"1.0","since":"131.0","until":"180.*","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.3","since":"139.69","until":"181.0","originalSince":"139.69","originalUntil":"139.*"},{"id":"com.jetbrains.plugins.jade","version":"140.216","since":"139.69","until":"181.0","originalSince":"139.69","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.26","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"14.5.132.637","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"EclipseCodeFormatter","version":"14.5.132.637.1","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.27","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"org.jetbrains.settingsRepository","version":"2.0.0.140","since":"140.143","until":"141.0","originalSince":"140.143","originalUntil":null},{"id":"Log4JPlugin","version":"1.03","since":"85.9852","until":"201.0","originalSince":"85.9852","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.28","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"JCR Content Editor","version":"1.1.4","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"org.jetbrains.settingsRepository","version":"2.0.2.140","since":"140.143","until":"141.0","originalSince":"140.143","originalUntil":null},{"id":"Log4JPlugin","version":"1.04","since":"85.9852","until":"201.0","originalSince":"85.9852","originalUntil":null},{"id":"CssAlphabeticalRearranger","version":"0.4","since":"138.0","until":"183.0","originalSince":"138.0","originalUntil":null},{"id":"com.jetbrains.php","version":"139.173","since":"138.1404","until":"139.*","originalSince":"138.1404","originalUntil":null},{"id":"com.magnet.r2m","version":"1.1.0","since":"94.539","until":"142.0","originalSince":"94.539","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.29","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"JCR Content Editor","version":"1.1.5","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"builder-deluxe","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Haskell","version":"0.4.0 Beta","since":"135.909","until":"181","originalSince":"135.909","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.1","since":"139.223","until":"213","originalSince":"139.223","originalUntil":null},{"id":"JRebelPlugin","version":"6.0.0-idea13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.robotium.recorder.intellij","version":"1.0.30","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.1","since":"139.223","until":"213","originalSince":"139.223","originalUntil":null},{"id":"com.arasthel.groovy.override-completion","version":"1.0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"pl.cmil.wuff.plugin","version":"0.2.0.alpha","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"14.6.132.637","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"de.sgalinski.typoscript.plugin.id","version":"1.4","since":"133.0","until":"231","originalSince":"133.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.magnet.r2m","version":"1.1.4","since":"94.539","until":"142.0","originalSince":"94.539","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.1","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"SVN Revision Graph","version":"1.7","since":"139.1","until":"181.0","originalSince":"139.1","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.7.4","since":"135.909","until":"181.0","originalSince":"135.909","originalUntil":"135.*"},{"id":"AWS Elastic Beanstalk","version":"0.7.5","since":"139.224","until":"181.0","originalSince":"139.224","originalUntil":"139.*"},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.2","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.9","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.morcinek.android.codegenerator.plugin.intellij","version":"1.3","since":"131.0","until":"201.*","originalSince":"131.0","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.5.8","since":"133.0","until":"141.3058","originalSince":"133.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.10","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.3","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"1.0.31","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.solveforall.clients.IdeaPlugin","version":"1.0","since":"93.0","until":"201.0","originalSince":"93.0","originalUntil":null},{"id":"com.solveforall.clients.IdeaPlugin","version":"1.0","since":"93.0","until":"201.0","originalSince":"93.0","originalUntil":null},{"id":"actiBPM","version":"3.E-8","since":"123.1","until":"192.0","originalSince":"123.1","originalUntil":null},{"id":"Haskell","version":"0.4.1 Beta","since":"135.909","until":"181","originalSince":"135.909","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.4","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"io.github.sirlantis.rubymine.rubocop","version":"0.0.2","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"info.darbha.plugins","version":"3.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.solveforall.clients.IdeaPlugin","version":"1.0.2","since":"93.0","until":"201.0","originalSince":"93.0","originalUntil":null},{"id":"luonq.ScrollFromSource","version":"1.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"pl.cmil.wuff.plugin","version":"0.2.0","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"MKS","version":"0.12","since":"129.1359","until":"201.0","originalSince":"129.1359","originalUntil":null},{"id":"cucumber-java","version":"139.225","since":"139.225","until":"201","originalSince":"139.225","originalUntil":null},{"id":"cucumber-groovy","version":"139.225","since":"139.225","until":"201","originalSince":"139.225","originalUntil":null},{"id":"cucumber-javascript","version":"139.369","since":"139.369","until":"201","originalSince":"139.369","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.4","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php.drupal","version":"138.2001.2328","since":"138.2001","until":"181.0","originalSince":"138.2001","originalUntil":null},{"id":"io.github.sirlantis.rubymine.rubocop","version":"1.0.0","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.mistraltech.smogen","version":"0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.morcinek.android.codegenerator.plugin.intellij","version":"1.4","since":"131.0","until":"201.*","originalSince":"131.0","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.7","since":"138.1000","until":"221","originalSince":"138.1000","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"LivePlugin","version":"0.4.0 beta","since":"138.0","until":"213.*","originalSince":"138.0","originalUntil":null},{"id":"jbehave-support-plugin","version":"1.52","since":"133.0","until":"213","originalSince":"133.0","originalUntil":null},{"id":"com.mistraltech.smogen","version":"0.3","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.5","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.3","since":"139.225","until":"181.0","originalSince":"139.225","originalUntil":"139.*"},{"id":"org.jetbrains.idea.grammar","version":"1.2.0","since":"139.0","until":"231.*","originalSince":"139.0","originalUntil":null},{"id":"Wrap in StringBuilder","version":"1.0","since":"95.67","until":"201.0","originalSince":"95.67","originalUntil":null},{"id":"com.jetbrains.php","version":"139.496","since":"138.1404","until":"139.*","originalSince":"138.1404","originalUntil":null},{"id":"com.appstrakt.syncTranslation","version":"1.3.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.aspose.maven.intellijplugin.id","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"fossil4idea","version":"0.1.5","since":"137.0","until":"192.*","originalSince":"137.0","originalUntil":null},{"id":"AWSCloudFormation","version":"0.3.9","since":"139.224","until":"181.0","originalSince":"139.224","originalUntil":"139.660"},{"id":"ExploreTrace","version":"0.1","since":"139.224","until":"201.0","originalSince":"139.224","originalUntil":null},{"id":"ExploreTrace","version":"0.1","since":"139.224","until":"201.0","originalSince":"139.224","originalUntil":null},{"id":"ExploreTrace","version":"0.1.1","since":"139.224","until":"201.0","originalSince":"139.224","originalUntil":null},{"id":"fossil4idea","version":"0.1.5","since":"137.0","until":"192.*","originalSince":"137.0","originalUntil":null},{"id":"me.tatarka.androidunittest.idea","version":"1.3.0","since":"131.0","until":"142.0","originalSince":"131.0","originalUntil":"1.0"},{"id":"com.kukido.eclipser","version":"0.6.0","since":"139.0","until":"193.0","originalSince":"139.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.11","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.0 beta","since":"134.0","until":"213.*","originalSince":"134.0","originalUntil":null},{"id":"JSTestDriver Plugin","version":"140.727","since":"140.727","until":"181.0","originalSince":"140.727","originalUntil":"141.0"},{"id":"CSS-X-Fire","version":"1.38","since":"138.1","until":"201","originalSince":"138.1","originalUntil":null},{"id":"org.jetbrains.testnames","version":"1.0.1","since":"139.463","until":"201.0","originalSince":"139.463","originalUntil":null},{"id":"CUBA","version":"2.6.0.14","since":"139.224","until":"211","originalSince":"139.224","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.1","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"AWS Elastic Beanstalk","version":"0.7.6","since":"135.909","until":"181.0","originalSince":"135.909","originalUntil":"135.*"},{"id":"AWS Elastic Beanstalk","version":"0.7.7","since":"139.463","until":"181.0","originalSince":"139.463","originalUntil":"139.*"},{"id":"JRebelPlugin","version":"6.0.1-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.aspose.maven.intellijplugin.id","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.13","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"IdeaVIM","version":"0.39","since":"135.0","until":"181.0","originalSince":"135.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.14","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.aspose.intellijplugin.id","version":"1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.22","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php","version":"139.659","since":"138.1404","until":"139.*","originalSince":"138.1404","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.0.1","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.classes.export.plugin.id","version":"1.1","since":"131.0","until":"192","originalSince":"131.0","originalUntil":null},{"id":"com.emblem.unique.plugin.idid234234","version":"0.1","since":"121.0","until":"201.0","originalSince":"121.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.5","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"me.tatarka.androidunittest.idea","version":"1.4.0","since":"131.0","until":"142.0","originalSince":"131.0","originalUntil":"1.0"},{"id":"Magicento","version":"2.4.0","since":"117.105","until":"181","originalSince":"117.105","originalUntil":null},{"id":"Railways","version":"0.8.0","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"Railways for IDEA","version":"0.8.0","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"Compare Directories","version":"1.1.0","since":"130.0","until":"183.0","originalSince":"130.0","originalUntil":null},{"id":"com.solveforall.clients.IdeaPlugin","version":"1.0.3","since":"93.0","until":"201.0","originalSince":"93.0","originalUntil":null},{"id":"wide-task-browser","version":"0.1.9","since":"139.658","until":"231.*","originalSince":"139.658","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.1","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.0.2","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.emblem.unique.plugin.idid234234","version":"0.1","since":"121.0","until":"201.0","originalSince":"121.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.15","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.16","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.1 beta","since":"134.0","until":"213.*","originalSince":"134.0","originalUntil":null},{"id":"QAPlug","version":"1.3.8","since":"139.659","until":"211","originalSince":"139.659","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"139.732","since":"139.224","until":"181.0","originalSince":"139.224","originalUntil":null},{"id":"com.intellij.phing","version":"139.732","since":"139.224","until":"181.0","originalSince":"139.224","originalUntil":null},{"id":"com.jetbrains.php.gae","version":"139.732","since":"139.224","until":"181.0","originalSince":"139.224","originalUntil":null},{"id":"com.jetbrains.php.drupal","version":"139.732","since":"139.224","until":"181.0","originalSince":"139.224","originalUntil":null},{"id":"com.jetbrains.php","version":"139.732","since":"139.658","until":"181.0","originalSince":"139.658","originalUntil":"139.*"},{"id":"com.jetbrains.php.wordPress","version":"139.732","since":"139.224","until":"181.0","originalSince":"139.224","originalUntil":null},{"id":"com.jetbrains.php.blade","version":"139.732","since":"139.224","until":"181.0","originalSince":"139.224","originalUntil":null},{"id":"CollabNet Tools","version":"1.0.2","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"0.1.0","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.0.3","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.17","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.solveforall.clients.IdeaPlugin","version":"1.0.4","since":"93.0","until":"201.0","originalSince":"93.0","originalUntil":null},{"id":"com.hashmem.idea","version":"1.0","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"krasa.nonProjectFilesUnlocker","version":"1.0","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"krasa.nonProjectFilesUnlocker","version":"1.1","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.1","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"com.transround.nativeradmin","version":"1.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"0.1.1","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"139.789","since":"139.658","until":"181.0","originalSince":"139.658","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"139.789","since":"139.658","until":"163.0","originalSince":"139.658","originalUntil":null},{"id":"com.jetbrains.php.behat","version":"139.789","since":"139.658","until":"181.0","originalSince":"139.658","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.2","since":"131.0","until":"139","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"0.10.4","since":"138.977","until":"181.0","originalSince":"138.977","originalUntil":"140.*"},{"id":"com.codota.csp.intellij","version":"0.8","since":"131.0","until":"211.0","originalSince":"131.0","originalUntil":null},{"id":"org.startica.meeniex.intellij.plugin.eclipseLikeEnterInStringLiteralHandler","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.8.1","since":"131.0","until":"211.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.23","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.hashmem.idea","version":"1.1.133","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.hashmem.idea","version":"1.1.139","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.2","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"anton_dev_ua.PipeTableFormatter","version":"0.3","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.2.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.3.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.transround.nativeradmin","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.plugins.jade","version":"140.1212","since":"139.659","until":"181.0","originalSince":"139.659","originalUntil":null},{"id":"com.transround.nativeradmin","version":"1.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.hashmem.idea","version":"1.2.133","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.hashmem.idea","version":"1.2.139","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"repl.simple.mathematica.id","version":"0.0.2","since":"107.105","until":"212.*","originalSince":"107.105","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"0.1.2","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.3.3","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"Railways","version":"0.8.1","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"Railways for IDEA","version":"0.8.1","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.4","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"fir.im.plug.idea","version":"0.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.jetbrains.action-tracker","version":"0.1","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.8.2","since":"131.0","until":"211.0","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.0.2-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.dubreuia","version":"0.1","since":"131.0","until":"223","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.2","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.3","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"fir.im.plug.idea","version":"0.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.intellij.lang.javascript.es67","version":"1.0","since":"131.0","until":"193.0","originalSince":"131.0","originalUntil":null},{"id":"Error-prone plugin","version":"139.887","since":"139.0","until":"143.0","originalSince":"139.0","originalUntil":null},{"id":"com.intellij.lang.javascript.es67","version":"1.0.1","since":"131.0","until":"193.0","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"0.2.0","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"com.flageolett.eZ.completion","version":"1.0","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.1.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.aspose.maven.intellijplugin.id","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.dubreuia","version":"0.2","since":"131.0","until":"223","originalSince":"131.0","originalUntil":null},{"id":"com.hashmem.idea","version":"1.3.133","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.hashmem.idea","version":"1.3.139","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.transround.nativeradmin","version":"1.0.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.flageolett.eZ.completion","version":"1.0.1","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.konifar.material_icon_generator","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.konifar.material_icon_generator","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.7.1","since":"138.1000","until":"221","originalSince":"138.1000","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.7.2","since":"138.1000","until":"221","originalSince":"138.1000","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.9","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.8.3","since":"131.0","until":"211.0","originalSince":"131.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.3.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.5","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"0.2.1","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.6","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"JythonHelper","version":"1.2","since":"117.105","until":"203","originalSince":"117.105","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.7","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.7.1","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.4","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.11","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.1.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.18","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"12","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"13","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"com.thanosp.phpstorm.inheritdoc","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.kukido.eclipser","version":"0.6.1","since":"139.0","until":"193.0","originalSince":"139.0","originalUntil":null},{"id":"com.emblem.unique.plugin.idid234234","version":"0.1.1","since":"121.0","until":"201.0","originalSince":"121.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.7.2","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.7.2.1","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"GsonFormat","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"codeReview4idea","version":"0.5","since":"130.323","until":"181","originalSince":"130.323","originalUntil":null},{"id":"com.transround.nativeradmin","version":"1.0.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"0.2.2","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"com.mycila.intellij.plugin.gmavenplus","version":"2.0","since":"123.169","until":"201.8538.17","originalSince":"123.169","originalUntil":null},{"id":"com.thanosp.phpstorm.inheritdoc","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.5","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"JSTestDriver Plugin","version":"140.1669","since":"140.1669","until":"181.0","originalSince":"140.1669","originalUntil":"141.0"},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.1","since":"123.72","until":"191.*","originalSince":"123.72","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.1","since":"123.72","until":"191.*","originalSince":"123.72","originalUntil":null},{"id":"ro.bogdananton.testNameGenerator","version":"1.0","since":"121.0","until":"201.0","originalSince":"121.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"0.3.4","since":"135.1230","until":"135.*","originalSince":"135.1230","originalUntil":null},{"id":"com.thanosp.phpstorm.inheritdoc","version":"1.2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.jscs","version":"1.0.2","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"com.thanosp.phpstorm.inheritdoc","version":"1.2.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.7.3","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"com.emblem.unique.plugin.idid234234","version":"0.1.1","since":"121.0","until":"201.0","originalSince":"121.0","originalUntil":null},{"id":"com.transround.nativeradmin","version":"1.0.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.6","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"org.kevoree.idea.plugin","version":"14","since":"133.0","until":"181.*","originalSince":"133.0","originalUntil":null},{"id":"com.thanosp.phpstorm.inheritdoc","version":"1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.6","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.0.4","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"ru.hyoo.jin.tree","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ru.hyoo.jin.tree","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.3.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.kukido.eclipser","version":"0.6.2","since":"139.0","until":"193.0","originalSince":"139.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.1.0","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"AngularJS","version":"139.1112","since":"139.1112","until":"181.0","originalSince":"139.1112","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.8.4","since":"131.0","until":"211.0","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.7","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"wide-task-browser","version":"0.1.10","since":"139.658","until":"231.*","originalSince":"139.658","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.2.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"wide-task-browser","version":"0.1.11","since":"139.658","until":"231.*","originalSince":"139.658","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"1.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"ru.trylogic.idea.gitlab.integration","version":"1.0.4","since":"136.16","until":"201","originalSince":"136.16","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"1.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"wide-task-browser","version":"0.1.12","since":"139.658","until":"231.*","originalSince":"139.658","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"1.1","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.2 beta","since":"134.0","until":"213.*","originalSince":"134.0","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.6","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.3.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ru.hyoo.jin.tree","version":"1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.kukido.eclipser","version":"0.6.3","since":"139.0","until":"193.0","originalSince":"139.0","originalUntil":null},{"id":"io.dwak.reactor.intellij.plugin","version":"0.2","since":"123.72","until":"193.*","originalSince":"123.72","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.0","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"com.davidmis.elmplugin","version":"0.1","since":"131.0","until":"141.0","originalSince":"131.0","originalUntil":null},{"id":"io.dwak.reactor.intellij.plugin","version":"0.4","since":"123.72","until":"193.*","originalSince":"123.72","originalUntil":null},{"id":"org.kitdroid.jnihelper","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"1.2","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.davidmis.elmplugin","version":"0.2","since":"131.0","until":"141.0","originalSince":"131.0","originalUntil":null},{"id":"AngularJS","version":"140.1968","since":"140.1968","until":"181.0","originalSince":"140.1968","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.2","since":"123.72","until":"191.*","originalSince":"123.72","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.3.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.davidmis.elmplugin","version":"0.2.1","since":"131.0","until":"141.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.12","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.rwteam.gscrum","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"wide-task-browser","version":"0.1.13","since":"139.658","until":"231.*","originalSince":"139.658","originalUntil":null},{"id":"com.atlassian.clover","version":"idea-4.0.3.v20150129000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"EclipseCodeFormatter","version":"14.8.132.637","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.2.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.2.1","since":"123.72","until":"191.*","originalSince":"123.72","originalUntil":null},{"id":"JRebelPlugin","version":"6.0.3-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.jetbrains.chronon","version":"139.1220","since":"138.2210","until":"182.3700","originalSince":"138.2210","originalUntil":null},{"id":"com.magnet.r2m","version":"1.1.7","since":"94.539","until":"142.0","originalSince":"94.539","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.2.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.13","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.monkeyscriptplugin","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.14","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"1.3","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.nmatveev.idea-plugin-protobuf","version":"0.5.9","since":"133.0","until":"141.3058","originalSince":"133.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"1.4","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"pl.klamborowski.plugin.jacksongenerator","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.8.5","since":"131.0","until":"211.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.2.67.3.EAP","since":"140.2110","until":"181.0","originalSince":"140.2110","originalUntil":"141.0"},{"id":"com.jetbrains.plugins.jade","version":"140.2144","since":"140.1","until":"181.0","originalSince":"140.1","originalUntil":null},{"id":"JSTestDriver Plugin","version":"140.2109","since":"140.2109","until":"181.0","originalSince":"140.2109","originalUntil":"141.0"},{"id":"org.jetbrains.plugins.ruby","version":"7.0.0.20150204","since":"140.2110","until":"181.0","originalSince":"140.2110","originalUntil":"140.*"},{"id":"org.intellij.scala","version":"1.3.2-14.1","since":"140.2110","until":"181.0","originalSince":"140.2110","originalUntil":"141.0"},{"id":"UsefulActions","version":"1.9","since":"135.667","until":"232","originalSince":"135.667","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.15","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.transround.nativeradmin","version":"1.1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.1.1","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.8","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"org.kitdroid.jnihelper","version":"1.0.1","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.appstrakt.syncTranslation","version":"1.4.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.appstrakt.syncTranslation","version":"1.4.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.appstrakt.syncTranslation","version":"1.4.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.appstrakt.syncTranslation","version":"1.5.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.16","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.1.2","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.7","since":"123.72","until":"200.0","originalSince":"123.72","originalUntil":null},{"id":"com.crownpartners.intellivault","version":"0.9.4","since":"107.105","until":"203","originalSince":"107.105","originalUntil":null},{"id":"fr.javatronic.damapping.intellij.plugin.integration","version":"14-0.1.0","since":"139.1117","until":"201.0","originalSince":"139.1117","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"1.5","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.appstrakt.syncTranslation","version":"1.6.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.crownpartners.intellivault","version":"0.9.5","since":"107.105","until":"203","originalSince":"107.105","originalUntil":null},{"id":"org.jetbrains.action-tracker","version":"0.2","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.eunut.android.plugin.selectors.generate","version":"1.0.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.eunut.android.plugin.selectors.generate","version":"1.0.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.eunut.android.plugin.selectors.generate","version":"1.0.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.sherchen.idea.plugin.injectcomment","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.9","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"1.6","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.3.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.3.3-14.1","since":"140.2110","until":"181.0","originalSince":"140.2110","originalUntil":"141.0"},{"id":"com.transround.nativeradmin","version":"1.2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.3","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"com.github.masahirosuzuka.PhoneGapIntelliJPlugin","version":"140.2167","since":"140.2167","until":"140.*","originalSince":"140.2167","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"1.7","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"uk.co.drache.intellij.guavaPostfixCompletion","version":"1.1.0","since":"139.1117","until":"141.176","originalSince":"139.1117","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.8","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.1","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.7.1","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.10","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"org.jetbrains.plugins.ruby","version":"7.0.0.20150216","since":"140.2493","until":"181.0","originalSince":"140.2493","originalUntil":"140.*"},{"id":"com.manolenso.intellij.foundation5","version":"1.8","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.davidmis.elmplugin","version":"0.2.2","since":"131.0","until":"141.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.17","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.17","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"fr.javatronic.damapping.intellij.plugin.integration","version":"14-0.1.1","since":"139.1117","until":"201.0","originalSince":"139.1117","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.1.3","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.11","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.1.4","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.magnet.r2m","version":"1.1.12","since":"94.539","until":"142.0","originalSince":"94.539","originalUntil":null},{"id":"com.emblem.unique.plugin.idid234234","version":"0.1.2","since":"121.0","until":"201.0","originalSince":"121.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.3.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.transround.nativeradmin","version":"1.3.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.testnames","version":"1.1","since":"139.463","until":"201.0","originalSince":"139.463","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.18","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.3 beta","since":"140.2493","until":"213.*","originalSince":"140.2493","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"1.9","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"MoreUnit","version":"0.0.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.7","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.12","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"MoreUnit","version":"0.0.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"net.yeahlol","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Mongo Plugin","version":"0.7.0","since":"138.0","until":"201","originalSince":"138.0","originalUntil":null},{"id":"com.konifar.material_icon_generator","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"MoreUnit","version":"0.0.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"MoreUnit","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.jscs","version":"1.0.3","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.1.0-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.pulyaevskiy.phpstorm.phpdi","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Haskell","version":"0.5.0","since":"139.225","until":"181","originalSince":"139.225","originalUntil":null},{"id":"jballant.CommonJSAutoComplete","version":"0.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php","version":"140.2765","since":"140.2285","until":"140.*","originalSince":"140.2285","originalUntil":null},{"id":"com.aconex.codelitter","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.aconex.codelitter","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.12","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"com.unvired.sdk.plugin","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"2.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"2.1","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.13","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"R4Intellij","version":"0.9","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"R4Intellij","version":"0.9.1","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.4","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"141.15","since":"141.15","until":"141.*","originalSince":"141.15","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.1.5","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.transround.nativeradmin","version":"1.3.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"MoreUnit","version":"1.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.brainwy.pyvmmonitor","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.brainwy.pyvmmonitor","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.2","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"AngularJS","version":"141.2","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"141.2","since":"141.2","until":"141.*","originalSince":"141.2","originalUntil":null},{"id":"Pythonid","version":"4.1 141.4 EAP","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"142.0"},{"id":"org.jetbrains.action-tracker","version":"0.3","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.13","since":"141.2","until":"213","originalSince":"141.2","originalUntil":null},{"id":"jballant.CommonJSAutoComplete","version":"0.1.3","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.3.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.ftinc.plugin.generator.sectionblock","version":"1.0.0","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"Railways","version":"0.8.2","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"Railways for IDEA","version":"0.8.2","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.8","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.8.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"eu.meshuga.pudelek","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.8","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"1.6","since":"131.0","until":"181.3494","originalSince":"131.0","originalUntil":null},{"id":"eu.meshuga.pudelek","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.1.6","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.1.7","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.19","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.bpellint.idea","version":"0.1-alpha","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.bpellint.idea","version":"0.2-alpha","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"eu.meshuga.pudelek","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.9.1","since":"139.1","until":"211","originalSince":"139.1","originalUntil":null},{"id":"luonq.ScrollFromSource","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"blue.stack.j2Smali","version":"2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.9.2","since":"139.1","until":"211","originalSince":"139.1","originalUntil":null},{"id":"com.apiary.abm","version":"2.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"blue.stack.SerializableParcelableGenerator","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.19","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.14","since":"139.560","until":"213","originalSince":"139.560","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.5","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"com.idamobile.android.toolbox","version":"1.1.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.9.2 for IDEA 14","since":"139.1","until":"211","originalSince":"139.1","originalUntil":null},{"id":"se.trifork.intellij.whitey","version":"1.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"pl.cmil.buildFinishedNotifier","version":"0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"info.darbha.plugins","version":"3.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.mistraltech.smogen","version":"0.4","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.lxl.unique.plugin.id","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.saffrontech.idea.thop","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.fuxy.android.ide.plugin","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"blue.stack.SerializableParcelableGenerator","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.apiary.abm","version":"2.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.lxl.unique.plugin.id","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.apiary.abm","version":"2.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.81","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.6","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.15","since":"141.176","until":"213","originalSince":"141.176","originalUntil":null},{"id":"com.fuxy.android.ide.plugin","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.saffrontech.idea.thop","version":"1.2.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.8.7","since":"131.0","until":"211.0","originalSince":"131.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.9","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"CUBA","version":"2.7.0.14","since":"139.224","until":"211","originalSince":"139.224","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.3","since":"140.2110","until":"181.0","originalSince":"140.2110","originalUntil":null},{"id":"org.dlangplugin","version":"0.0.8","since":"139.1","until":"201.0","originalSince":"139.1","originalUntil":null},{"id":"JRebelPlugin","version":"6.1.1-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"IDETalk","version":"141.177.4","since":"141.177","until":"181.0","originalSince":"141.177","originalUntil":"142.0"},{"id":"com.codota.csp.intellij","version":"0.8.8","since":"131.0","until":"211.0","originalSince":"131.0","originalUntil":null},{"id":"com.emblem.unique.plugin.idid234234","version":"0.1.3","since":"121.0","until":"201.0","originalSince":"121.0","originalUntil":null},{"id":"uk.co.drache.intellij.guavaPostfixCompletion","version":"1.1.1","since":"141.177","until":"141.177","originalSince":"141.177","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.220","since":"139.1111","until":"181.0","originalSince":"139.1111","originalUntil":"139.*"},{"id":"ro.redeul.google.go","version":"0.9.201","since":"139.1111","until":"181.0","originalSince":"139.1111","originalUntil":"139.*"},{"id":"ro.redeul.google.go","version":"0.9.221","since":"139.1111","until":"181.0","originalSince":"139.1111","originalUntil":"139.*"},{"id":"ro.redeul.google.go","version":"0.9.223","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"ro.redeul.google.go","version":"0.9.223","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"Compare Directories","version":"1.1.1","since":"130.0","until":"183.0","originalSince":"130.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.16","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"com.jetbrains.php","version":"141.332","since":"141.1","until":"141.*","originalSince":"141.1","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"141.388","since":"141.1","until":"181.0","originalSince":"141.1","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"141.388","since":"141.1","until":"173.0","originalSince":"141.1","originalUntil":null},{"id":"com.jetbrains.php.behat","version":"141.388","since":"141.1","until":"181.0","originalSince":"141.1","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.230","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"ro.redeul.google.go","version":"0.9.231","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"com.konifar.material_icon_generator","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.konifar.material_icon_generator","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"2.6","since":"141.115","until":"181.3494","originalSince":"141.115","originalUntil":null},{"id":"de.espend.idea.android","version":"0.3.1","since":"131.0","until":"191.5000","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.3","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.7.4","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.234","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"com.haskforce","version":"0.3-beta.20","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.20","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.macchiatow.plugin.tomato","version":"1.0.3","since":"120.0","until":"201.0","originalSince":"120.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.1.8","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"WicketForge","version":"5.0.1","since":"138.0","until":"201","originalSince":"138.0","originalUntil":null},{"id":"jballant.CommonJSAutoComplete","version":"0.1.5","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.238","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"com.codota.csp.intellij","version":"0.8.9","since":"135.0","until":"211.0","originalSince":"135.0","originalUntil":null},{"id":"io.github.sirlantis.rubymine.rubocop","version":"2.0.0","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"142.601","since":"142.381","until":"201","originalSince":"142.381","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.241","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"CUBA","version":"2.7.1.14","since":"139.224","until":"211","originalSince":"139.224","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.7","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.242","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"ro.redeul.google.go","version":"0.9.244","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"org.weebly.generator","version":"2.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.249","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.7.4.1","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.3.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.boniatillo.phaserchains","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.elixir_lang","version":"0.2.1","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"com.apiary.abm","version":"2.0.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.250","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"ro.redeul.google.go","version":"0.9.250","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"com.siberika.idea.pascal","version":"0.82","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.armandakopian.lifecyclesorter","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.251","since":"141.2","until":"181.0","originalSince":"141.2","originalUntil":"141.*"},{"id":"com.wix.react-templates","version":"1.0.21","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.21","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.anathan.zf2modulecreator","version":"0.1","since":"138.0","until":"201.0","originalSince":"138.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.17","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"QAPlug","version":"1.3.9","since":"141.178","until":"211","originalSince":"141.178","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.18","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"JRebelPlugin","version":"6.1.2-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.sencha.idea.IdeaPlugin","version":"0.1.210 (SenchaCon 2015 EA)","since":"140.0","until":"213","originalSince":"140.0","originalUntil":null},{"id":"com.intellij.lang.javascript.es67","version":"1.1.0","since":"141.0","until":"193.0","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.plugins.jade","version":"141.506","since":"140.1","until":"181.0","originalSince":"140.1","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.5.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.4","since":"141.498","until":"181.0","originalSince":"141.498","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.8","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.9","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"0.1.210.1 (SenchaCon 2015 EA)","since":"140.0","until":"213","originalSince":"140.0","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"0.1.211 (SenchaCon 2015 EA)","since":"140.0","until":"213","originalSince":"140.0","originalUntil":null},{"id":"com.jetbrains.php.blade","version":"141.582","since":"140.1295","until":"181.0","originalSince":"140.1295","originalUntil":null},{"id":"org.elixir_lang","version":"0.3.0","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"com.wix.jscs","version":"1.0.4","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"com.dubreuia","version":"0.3","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.19","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"cn.robin.vectorIconPack","version":"1.0","since":"131.0","until":"221.*","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"141.660","since":"141.450","until":"181.0","originalSince":"141.450","originalUntil":null},{"id":"com.jetbrains.php.drupal","version":"141.660","since":"140.1082","until":"181.0","originalSince":"140.1082","originalUntil":null},{"id":"com.jetbrains.php.wordPress","version":"141.660","since":"141.450","until":"181.0","originalSince":"141.450","originalUntil":null},{"id":"org.anathan.zf2modulecreator","version":"0.2","since":"138.0","until":"201.0","originalSince":"138.0","originalUntil":null},{"id":"com.jetbrains.php.gae","version":"141.582","since":"140.1295","until":"181.0","originalSince":"140.1295","originalUntil":null},{"id":"com.brainwy.pyvmmonitor","version":"1.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"cucumber-java","version":"141.178","since":"141.178","until":"201","originalSince":"141.178","originalUntil":null},{"id":"cucumber-groovy","version":"141.178","since":"141.178","until":"201","originalSince":"141.178","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.9.3 for IDEA 14","since":"139.1","until":"211","originalSince":"139.1","originalUntil":null},{"id":"SequencePluginReload","version":"1.0.2","since":"107.587","until":"202","originalSince":"107.587","originalUntil":null},{"id":"com.unvired.sdk.plugin","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.aconex.codelitter","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"SBT","version":"1.7.0","since":"141.177","until":"143.0","originalSince":"141.177","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.1.9","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.85","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"org.anathan.zf2modulecreator","version":"0.2.1","since":"138.0","until":"201.0","originalSince":"138.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.1.6","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"141.690","since":"141.1","until":"173.0","originalSince":"141.1","originalUntil":null},{"id":"com.thanosp.phpstorm.inheritdoc","version":"1.3.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.thanosp.phpstorm.inheritdoc","version":"1.4.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"MoreUnit","version":"1.0.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.dubreuia","version":"0.4","since":"131.0","until":"223","originalSince":"131.0","originalUntil":null},{"id":"com.apiary.abm","version":"2.0.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.2.7","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.atlassian.clover","version":"idea-4.0.4.v20150416000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.22","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.roomj.simpletitles","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.ldriscoll.slf4jlogformat.intention.plugin","version":"1.0","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.1.7","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"com.ldriscoll.slf4jlogformat.intention.plugin","version":"1.1","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.1.10","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.1.8","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.1.9","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"MoreUnit","version":"1.0.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.20","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"siani.dev.itrules","version":"1.1.10","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"net.andrevus.jetbrains.tasks.targetprocess","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.plugins.junitgen","version":"2.0.11","since":"80.8000","until":"212.*","originalSince":"80.8000","originalUntil":null},{"id":"Haskell","version":"0.5.1","since":"139.1659","until":"181","originalSince":"139.1659","originalUntil":null},{"id":"com.lxl.unique.plugin.id","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.apiary.abm","version":"2.1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.1.11","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"net.andrevus.jetbrains.tasks.targetprocess","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.4","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.9","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"org.elixir_lang","version":"0.3.1","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"org.editorconfig.editorconfigjetbrains","version":"142.1464","since":"141.1","until":"145.0","originalSince":"141.1","originalUntil":null},{"id":"Ebean enhancer","version":"1.1","since":"90.10000","until":"145.0","originalSince":"90.10000","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"0.2.251 (SenchaCon 2015 EA)","since":"141.0","until":"213","originalSince":"141.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.1.13","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"SequencePluginReload","version":"1.0.3","since":"107.587","until":"202","originalSince":"107.587","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.5.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"nl.mmeiboom.fitnesseplugin","version":"1.0.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.elixir_lang","version":"0.3.2","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"1.9.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"dcevm","version":"1.8","since":"129.524","until":"201.0","originalSince":"129.524","originalUntil":null},{"id":"siani.dev.itrules","version":"1.1.14","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"WFA console","version":"2.2","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"de.sgalinski.typoscript.plugin.id","version":"1.5","since":"133.0","until":"231","originalSince":"133.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.91","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.2.9","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.aspose.intellijplugin.id","version":"1.3.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"me.ele.napos.miracle.plugin.executor.ExecutorGen","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.1.3-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"org.intellij.plugins.junitgen","version":"2.0.12","since":"80.8000","until":"212.*","originalSince":"80.8000","originalUntil":null},{"id":"SequencePluginReload","version":"1.0.4","since":"139.1117","until":"202","originalSince":"139.1117","originalUntil":null},{"id":"AngularJS","version":"141.991","since":"141.991","until":"181.0","originalSince":"141.991","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"141.991","since":"141.991","until":"141.*","originalSince":"141.991","originalUntil":null},{"id":"jenv-idea-plugin","version":"0.0.3","since":"141.0","until":"181.0","originalSince":"141.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.3.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.8","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"com.bft.control.idea","version":"1.0","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.5","since":"141.1009","until":"181.0","originalSince":"141.1009","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.92","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.bft.control.idea","version":"1.1","since":"135.0","until":"201.*","originalSince":"135.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.2.0","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"Nette framework helpers","version":"0.2.0","since":"130.1","until":"192.0","originalSince":"130.1","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.1.11","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.idamobile.android.toolbox","version":"1.1.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.24","since":"140.0","until":"211","originalSince":"140.0","originalUntil":null},{"id":"org.elixir_lang","version":"0.3.3","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"Railways","version":"0.8.3","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"Railways for IDEA","version":"0.8.3","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"com.ws.unique.plugin.id","version":"0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.5","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"0.3.312 (SenchaCon 2015 EA)","since":"141.0","until":"213","originalSince":"141.0","originalUntil":null},{"id":"com.wix.jscs","version":"1.0.5","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"jVb_Designer","version":"0.11","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.6","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.21","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"com.apiary.abm","version":"2.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.4.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.armandakopian.lifecyclesorter","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.25","since":"140.0","until":"211","originalSince":"140.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.22","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"YAML/Ansible support","version":"0.5","since":"111.0","until":"222","originalSince":"111.0","originalUntil":null},{"id":"com.ws.unique.plugin.id","version":"0.11","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.2.0-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"cat.kanbanapps.gradlekiller","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.5.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.ws.unique.plugin.id","version":"0.12","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"YAML/Ansible support","version":"0.6","since":"111.0","until":"222","originalSince":"111.0","originalUntil":null},{"id":"com.ylt.appcan.plugin","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"AngularJS","version":"141.1237","since":"141.1237","until":"181.0","originalSince":"141.1237","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"141.1237","since":"141.1237","until":"141.*","originalSince":"141.1237","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.8","since":"138.1000","until":"221","originalSince":"138.1000","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"0.3.323 (SenchaCon 2015 EA)","since":"141.0","until":"213","originalSince":"141.0","originalUntil":null},{"id":"com.ws.unique.plugin.id","version":"0.13","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.9","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"YAML/Ansible support","version":"0.7","since":"111.0","until":"222","originalSince":"111.0","originalUntil":null},{"id":"codeReview4idea","version":"0.5.1","since":"141.177","until":"203","originalSince":"141.177","originalUntil":null},{"id":"com.intellij.lang.javascript.es67","version":"1.2.0","since":"141.0","until":"193.0","originalSince":"141.0","originalUntil":null},{"id":"codeReview4idea","version":"0.5.2","since":"141.177","until":"203","originalSince":"141.177","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.3.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"2.0","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.pandawarrior.androidXMLConverter","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"GsonFormat","version":"1.1.0","since":"107.110","until":"201.0","originalSince":"107.110","originalUntil":null},{"id":"AngularJS","version":"142.1935","since":"142.1935","until":"181.0","originalSince":"142.1935","originalUntil":null},{"id":"org.foxsly.idea.extended.generate.actions","version":"0.2","since":"129.451","until":"201.0","originalSince":"129.451","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.2.0","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.9","since":"135.0","until":"211.0","originalSince":"135.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.26","since":"140.0","until":"211","originalSince":"140.0","originalUntil":null},{"id":"com.pandawarrior.androidXMLConverter","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"collabs","version":"2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Nette framework helpers","version":"0.2.1","since":"130.1","until":"192.0","originalSince":"130.1","originalUntil":null},{"id":"org.foxsly.idea.extended.generate.actions","version":"0.3","since":"129.451","until":"201.0","originalSince":"129.451","originalUntil":null},{"id":"UsefulActions","version":"2.0","since":"135.667","until":"232","originalSince":"135.667","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.95","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"JSTestDriver Plugin","version":"142.2064","since":"142.2064","until":"181.0","originalSince":"142.2064","originalUntil":"143.0"},{"id":"GsonFormat","version":"1.1.1","since":"107.111","until":"201.0","originalSince":"107.111","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.9.4 for IDEA 14.1.3","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"com.busybusy.Taiga.io.Task","version":"1.0.0","since":"131.0","until":"201.*","originalSince":"131.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"1.8","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.2.1","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"GsonFormat","version":"1.1.2","since":"107.112","until":"201.0","originalSince":"107.112","originalUntil":null},{"id":"com.contentful.ideagenerator","version":"1.1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"JsonFormat","version":"1.0.0","since":"107.112","until":"201.0","originalSince":"107.112","originalUntil":null},{"id":"pl.charmas.parcelablegenerator","version":"0.6.2","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.1.2","since":"141.0","until":"192.*","originalSince":"141.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.5.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.elixir_lang","version":"0.3.4","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.1.3","since":"141.0","until":"192.*","originalSince":"141.0","originalUntil":null},{"id":"collabs","version":"2.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.1.4","since":"141.0","until":"192.*","originalSince":"141.0","originalUntil":null},{"id":"YAML/Ansible support","version":"0.7.2","since":"111.0","until":"222","originalSince":"111.0","originalUntil":null},{"id":"com.busybusy.Taiga.io.Task","version":"1.1.0","since":"131.0","until":"201.*","originalSince":"131.0","originalUntil":null},{"id":"com.kgmyshin.ideaplugin.eventbus","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.kgmyshin.ideaplugin.eventbus","version":"1.1","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.kgmyshin.ideaplugin.eventbus3","version":"1.0","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.23","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"com.busybusy.Taiga.io.Task","version":"1.1.1","since":"131.0","until":"201.*","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.2.0","since":"141.0","until":"192.*","originalSince":"141.0","originalUntil":null},{"id":"collabs","version":"2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.appstrakt.syncTranslation","version":"1.7.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"2.2","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"IdeaVIM","version":"0.40","since":"135.0","until":"181.0","originalSince":"135.0","originalUntil":null},{"id":"IdeaVIM","version":"0.41","since":"135.0","until":"181.0","originalSince":"135.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.2.1","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.2.2","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.2.3","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.2.2","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"pl.lksztmczk.openinterminal","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.10","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"141.1518","since":"141.1518","until":"141.*","originalSince":"141.1518","originalUntil":null},{"id":"com.pandawarrior.androidXMLConverter","version":"1.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.2.4","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"JSTestDriver Plugin","version":"142.2492","since":"142.2492","until":"181.0","originalSince":"142.2492","originalUntil":"143.0"},{"id":"EclipseCodeFormatter","version":"14.9.132.637","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"org.jetbrains.plugins.ruby","version":"8.0.0.20150616","since":"142.2491","until":"181.0","originalSince":"142.2491","originalUntil":"142.*"},{"id":"org.intellij.scala","version":"1.6.0","since":"142.0","until":"181.0","originalSince":"142.0","originalUntil":"143.0"},{"id":"YAML/Ansible support","version":"0.7.3","since":"111.0","until":"222","originalSince":"111.0","originalUntil":null},{"id":"com.kgmyshin.ideaplugin.eventbus","version":"1.2","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.96","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.saffrontech.idea.thop","version":"1.3.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.2.1-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.jetbrains.plugins.meteor","version":"142.2481","since":"142.2481","until":"181.0","originalSince":"142.2481","originalUntil":"143.0"},{"id":"AngularJS","version":"142.2481","since":"142.2481","until":"181.0","originalSince":"142.2481","originalUntil":null},{"id":"Pythonid","version":"4.1","since":"142.2491","until":"181.0","originalSince":"142.2491","originalUntil":"143.0"},{"id":"com.jimulabs.mirror.plugin","version":"2.5.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"FrozenIdea","version":"0.0.2.5","since":"139.1","until":"193.*","originalSince":"139.1","originalUntil":null},{"id":"intellij.buck.plugin","version":"1.0","since":"131.0","until":"172.*","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.2.1","since":"141.0","until":"192.*","originalSince":"141.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"15.0.132.637.1","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.2.2","since":"141.0","until":"192.*","originalSince":"141.0","originalUntil":null},{"id":"intellij.buck.plugin","version":"1.1","since":"131.0","until":"172.*","originalSince":"131.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"2.3","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.24","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"org.intellij.scala","version":"1.6.1","since":"142.2670","until":"181.0","originalSince":"142.2670","originalUntil":"143.0"},{"id":"org.jetbrains.plugins.ruby","version":"8.0.0.20150624","since":"142.2670","until":"181.0","originalSince":"142.2670","originalUntil":"142.*"},{"id":"com.jetbrains.php","version":"142.2716","since":"142.2600","until":"142.*","originalSince":"142.2600","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"142.2716","since":"142.2700","until":"173.0","originalSince":"142.2700","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.25","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"2.0","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"org.perfcake.pc4idea","version":"4.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.9.1","since":"135.0","until":"211.0","originalSince":"135.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"pl.lksztmczk.openinterminal","version":"1.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"net.nerrd.intellij.plugin.dpicalculator","version":"1.0","since":"141.201","until":"201.0","originalSince":"141.201","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.illuminatedcloud.intellij","version":"1.0.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"allotria/removeusage","version":"0.9","since":"129.0","until":"201.0","originalSince":"129.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.21","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"allotria/removeusage","version":"1.0","since":"129.0","until":"201.0","originalSince":"129.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.2-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.illuminatedcloud.intellij","version":"1.0.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.97","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"NRGvlanghelPlugin","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"1.2.0.4","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"Pythonid","version":"142.176 v4.5","since":"142.2887","until":"181.0","originalSince":"142.2887","originalUntil":"143.0"},{"id":"net.nerrd.intellij.plugin.dpicalculator","version":"1.1","since":"141.201","until":"201.0","originalSince":"141.201","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.2b-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.2b-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"2.1","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"net.nerrd.intellij.plugin.dpicalculator","version":"1.2","since":"141.201","until":"201.0","originalSince":"141.201","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.3-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.ylt.appcan.plugin","version":"1.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.26","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"0.4.325 (SenchaCon 2015 EA)","since":"141.0","until":"213","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.4-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"net.orekyuu.bitbucketissues","version":"1.0.1","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"TabSwitcherExtreme","version":"1.0.5","since":"99.18","until":"181.*","originalSince":"99.18","originalUntil":null},{"id":"com.pandawarrior.androidXMLConverter","version":"1.2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Shuffler","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.5-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.illuminatedcloud.intellij","version":"1.0.5b-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.5b-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"Shuffler","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"siani.dev.itrules","version":"1.2.3","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"com.konifar.material_icon_generator","version":"1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.6-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.illuminatedcloud.intellij","version":"1.0.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.7-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.jetbrains.plugins.ruby","version":"8.0.0.20150708","since":"142.3050","until":"181.0","originalSince":"142.3050","originalUntil":"142.*"},{"id":"com.pandawarrior.androidXMLConverter","version":"1.2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.elixir_lang","version":"0.3.5","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"Shuffler","version":"1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"find.me.tagged","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.pulyaevskiy.phpstorm.phpdi","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"0.3.6","since":"135.1230","until":"135.*","originalSince":"135.1230","originalUntil":null},{"id":"siani.dev.itrules","version":"1.2.4","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"2.2","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"com.mistraltech.smogen","version":"0.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.11","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.hackathon2015.S","version":"1.0.1","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"com.floobits.unique.plugin.id","version":"1.5.9","since":"131.0","until":"193.*","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.9.5 for IDEA 14.1.3","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"org.zkoss.zkidea","version":"0.1.1","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.layernet.plugin.adbwifi","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.8-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.intellij.scala","version":"1.6.2","since":"142.3050","until":"181.0","originalSince":"142.3050","originalUntil":"143.0"},{"id":"com.illuminatedcloud.intellij","version":"1.0.8b-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.8b-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.illuminatedcloud.intellij","version":"1.0.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.0.9-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"SequencePluginReload","version":"1.0.6","since":"139.1117","until":"202","originalSince":"139.1117","originalUntil":null},{"id":"com.busybusy.Taiga.io.Task","version":"1.1.3","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"6.0.1.396","since":"141.0","until":"213","originalSince":"141.0","originalUntil":null},{"id":"ThinkStorm","version":"0.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.kgmyshin.ideaplugin.eventbus","version":"1.3","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.7","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"GsonFormat","version":"1.1.3","since":"107.113","until":"201.0","originalSince":"107.113","originalUntil":null},{"id":"com.atlassian.clover","version":"idea-4.0.5.v20150720000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.2.3","since":"141.0","until":"192.*","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.1.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.1.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.oneskyapp.intellij","version":"1.3.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"15.1.132.637.1","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"marcglasberg.HibernateInspectionsPlugin","version":"1.0","since":"139.0","until":"181.*","originalSince":"139.0","originalUntil":null},{"id":"com.floobits.unique.plugin.id","version":"1.5.10","since":"131.0","until":"193.*","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.1.0b-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.1.0b-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.ritesh.intellij.plugin.reviewboard","version":"0.1.0-beta","since":"131.0","until":"193","originalSince":"131.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"2.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.androhi.androiddrawableviewer","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"0.3.7","since":"135.1230","until":"135.*","originalSince":"135.1230","originalUntil":null},{"id":"siani.dev.itrules","version":"1.2.5","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.7.2","since":"142.3050","until":"181.0","originalSince":"142.3050","originalUntil":"143.0"},{"id":"com.jetbrains.intellij.api.watcher","version":"1.1","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"com.dmytrodanylyk.fold","version":"1.0","since":"131.0","until":"200","originalSince":"131.0","originalUntil":null},{"id":"com.ritesh.intellij.plugin.reviewboard","version":"0.1.1-beta","since":"131.0","until":"193","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.2.5","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"jp.funnything.offing_harbor","version":"1.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"net.orekyuu.bitbucketissues","version":"1.0.2","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"ThinkStorm","version":"0.0.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.zkoss.zkidea","version":"0.1.2","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.ritesh.intellij.plugin.reviewboard","version":"0.1.2-beta","since":"131.0","until":"193","originalSince":"131.0","originalUntil":null},{"id":"org.elixir_lang","version":"1.0.0","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.4 beta","since":"140.2493","until":"213.*","originalSince":"140.2493","originalUntil":null},{"id":"com.onkiup.minedroid","version":"1.0.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.2.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.2.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"jballant.CommonJSAutoComplete","version":"0.2.1","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"ThinkStorm","version":"0.0.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"1.2","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"1.3","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"1.4","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.27","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"org.zkoss.zkidea","version":"0.1.3","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"1.4.1","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"1.4.2","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.7.4","since":"142.3553","until":"181.0","originalSince":"142.3553","originalUntil":"143.0"},{"id":"org.zkoss.zkidea","version":"0.1.4","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.androhi.androiddrawableviewer","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"1.4.3","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"1.4.4","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"com.layernet.plugin.adbwifi","version":"1.0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"JRebelPlugin","version":"6.2.2-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.jetbrains.intellij.api.watcher","version":"1.4.5","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"com.genymotion.idea","version":"1.0.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"1.4.6","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"2.0","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"org.zkoss.zkidea","version":"0.1.5","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.elixir_lang","version":"1.1.0","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"2.1","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"com.jotc.nsis.plugin.nsis","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.2.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.2.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"Nette framework helpers","version":"0.3.0","since":"130.1","until":"192.0","originalSince":"130.1","originalUntil":null},{"id":"phplint","version":"1.0","since":"131.0","until":"141.0","originalSince":"131.0","originalUntil":null},{"id":"com.fedot.idea.requirejs","version":"0.24","since":"141.0","until":"181.0","originalSince":"141.0","originalUntil":null},{"id":"intellij.buck.plugin","version":"2.0","since":"131.0","until":"172.*","originalSince":"131.0","originalUntil":null},{"id":"org.typowriter.intellij.plugins.backgroundchibichara","version":"1.0.6","since":"131.0","until":"182.0","originalSince":"131.0","originalUntil":null},{"id":"cucumber-java","version":"142.3553","since":"142.3553","until":"201","originalSince":"142.3553","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"2.2","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"intellij.buck.plugin","version":"2.01","since":"131.0","until":"172.*","originalSince":"131.0","originalUntil":null},{"id":"intellij.buck.plugin","version":"2.02","since":"131.0","until":"172.*","originalSince":"131.0","originalUntil":null},{"id":"org.siprop.android.opencl.OpenCLCLGenerator","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.siprop.android.opencl.OpenCLCLGenerator","version":"1.01","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"2.4","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"Nette framework helpers","version":"0.3.1","since":"130.1","until":"192.0","originalSince":"130.1","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"2.5","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"io.github.francoiscambell.clionarduinoplugin","version":"1.0","since":"131.0","until":"163.0","originalSince":"131.0","originalUntil":null},{"id":"io.github.francoiscambell.clionarduinoplugin","version":"1.0.1","since":"131.0","until":"163.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.mmin18.layoutcast.ide","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.github.francoiscambell.clionarduinoplugin","version":"1.0.2","since":"131.0","until":"163.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"2.6","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"com.androhi.androiddrawableviewer","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.3.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.3.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.siprop.android.opencl.OpenCLCLGenerator","version":"1.02","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.3.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.3.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.thoughtworks.gauge","version":"0.0.12","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php.behat","version":"141.2325","since":"141.1708","until":"181.0","originalSince":"141.1708","originalUntil":null},{"id":"com.jetbrains.php.blade","version":"141.2325","since":"140.1295","until":"181.0","originalSince":"140.1295","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"141.2325","since":"141.450","until":"181.0","originalSince":"141.450","originalUntil":null},{"id":"com.jetbrains.php.drupal","version":"141.2325","since":"140.1082","until":"181.0","originalSince":"140.1082","originalUntil":null},{"id":"com.jetbrains.php.gae","version":"141.2325","since":"140.1295","until":"181.0","originalSince":"140.1295","originalUntil":null},{"id":"com.jetbrains.twig","version":"141.2325","since":"141.1","until":"141.1","originalSince":"141.1","originalUntil":null},{"id":"com.intellij.phing","version":"141.2325","since":"139.224","until":"181.0","originalSince":"139.224","originalUntil":null},{"id":"com.jetbrains.php.wordPress","version":"141.2325","since":"141.450","until":"181.0","originalSince":"141.450","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"142.3742","since":"142.381","until":"201","originalSince":"142.381","originalUntil":null},{"id":"fir.im.plug.idea","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"EclipseCodeFormatter","version":"15.2.132.637.1","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"uk.co.drache.intellij.guavaPostfixCompletion","version":"1.1.2","since":"141.177","until":"141.177","originalSince":"141.177","originalUntil":null},{"id":"org.siprop.android.opencl.OpenCLCLGenerator","version":"1.03","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.github.francoiscambell.clionarduinoplugin","version":"1.1.0","since":"131.0","until":"163.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.mmin18.layoutcast.ide","version":"1.1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"fir.im.plug.idea","version":"1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.roomj.simpletitlesprojectonly","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.mmin18.layoutcast.ide","version":"1.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.mmin18.layoutcast.ide","version":"1.1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.02","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"6.0.2.414","since":"141.0","until":"213","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.4.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.4.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"fir.im.plug.idea","version":"1.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.jetbrains.php.gae","version":"141.2402","since":"140.1295","until":"181.0","originalSince":"140.1295","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"142.3969","since":"142.2888","until":"173.0","originalSince":"142.2888","originalUntil":null},{"id":"com.jetbrains.php","version":"142.3969","since":"142.2888","until":"142.*","originalSince":"142.2888","originalUntil":null},{"id":"fir.im.plug.idea","version":"1.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"CollabNet Tools","version":"1.0.3","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"CollabNet Tools","version":"1.0.4","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"com.przemyslawj.mockito.generator","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.3.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.13","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"kodebeagleidea","version":"0.1.2-bug-fix","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"15.2.132.637.2","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"CollabNet Tools","version":"1.0.5","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.4.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.4.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.illuminatedcloud.intellij","version":"1.4.1.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.4.1.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"fir.im.plug.idea","version":"1.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"in.xiv.cs","version":"0.1","since":"131.0","until":"223","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.03","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"Haskell","version":"0.5.2","since":"139.1659","until":"181","originalSince":"139.1659","originalUntil":null},{"id":"fir.im.plug.idea","version":"1.6","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"io.codecook","version":"0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"2.6.1","since":"141.115","until":"181.3494","originalSince":"141.115","originalUntil":null},{"id":"com.mulgasoft.emacsplus","version":"0.1.057","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.454","since":"141.1532","until":"141.*","originalSince":"141.1532","originalUntil":"142.*"},{"id":"org.zkoss.zkidea","version":"0.1.6","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"2.8","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"com.hotels.intellij.plugins.sharedviews","version":"1.1","since":"131.0","until":"201.*","originalSince":"131.0","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.462","since":"141.1532","until":"141.*","originalSince":"141.1532","originalUntil":"142.*"},{"id":"com.przemyslawj.mockito.generator","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.98","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"org.nextras.orm.intellij","version":"0.1","since":"131.0","until":"181.3494","originalSince":"131.0","originalUntil":null},{"id":"CollabNet Tools","version":"1.0.6","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"fir.im.plug.idea","version":"1.7","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.sssta.androidtools","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"fir.im.plug.idea","version":"1.8","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"ro.redeul.google.go","version":"0.9.466","since":"141.1532","until":"141.*","originalSince":"141.1532","originalUntil":"142.*"},{"id":"com.thoughtworks.gauge","version":"0.0.14","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.04","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"CollabNet Tools","version":"1.0.7","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.05","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.przemyslawj.mockito.generator","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"intellij.buck.plugin","version":"2.03","since":"131.0","until":"172.*","originalSince":"131.0","originalUntil":null},{"id":"fir.im.plug.idea","version":"1.9","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"pl.klamborowski.plugin.jacksongenerator","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.8.0","since":"142.3926","until":"181.0","originalSince":"142.3926","originalUntil":"143.0"},{"id":"org.intellij.scala","version":"1.8.0","since":"142.3926","until":"181.0","originalSince":"142.3926","originalUntil":"143.0"},{"id":"AngularJS","version":"142.4081","since":"142.4081","until":"181.0","originalSince":"142.4081","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"142.4081","since":"142.4081","until":"142.*","originalSince":"142.4081","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.4.2.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.4.2.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.visprogramming.armory","version":"1.06","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.2.6","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.2.7","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.przemyslawj.mockito.generator","version":"1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ro.bogdananton.testNameGenerator","version":"1.3.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.androhi.androiddrawableviewer","version":"1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.07","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.github.mmin18.layoutcast.ide","version":"1.1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"fir.im.plug.idea","version":"2.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"JRebelPlugin","version":"6.2.3-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"CollabNet Tools","version":"1.0.8","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"GsonFormat","version":"1.2.0","since":"107.117","until":"201.0","originalSince":"107.117","originalUntil":null},{"id":"org.sssta.androidtools","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"CollabNet Tools","version":"1.0.9","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"org.sssta.androidtools","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"2.9","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"com.aspose.words.java.intellij.maven","version":"1.0.0.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"Shuffler","version":"1.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"Shuffler","version":"1.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.mulgasoft.emacsplus","version":"0.1.065","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"0.12.1235.Idea141.1","since":"141.2","until":"141.*","originalSince":"141.2","originalUntil":"141.*"},{"id":"CollabNet Tools","version":"1.1.0","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"CollabNet Tools","version":"1.1.1","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.08","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"org.intellij.tasks.navigation","version":"0.4.0","since":"131.0","until":"212.*","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.8.2","since":"142.4245","until":"181.0","originalSince":"142.4245","originalUntil":"143.0"},{"id":"org.intellij.scala","version":"1.8.2","since":"142.4245","until":"181.0","originalSince":"142.4245","originalUntil":"143.0"},{"id":"com.jetbrains.intellij.api.watcher","version":"3.0.0","since":"141.1532","until":"223.*","originalSince":"141.1532","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.5.0.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.5.0.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"me.guichaguri.additionaltools","version":"1.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.09","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"1.0","since":"135.1230","until":"135.*","originalSince":"135.1230","originalUntil":null},{"id":"com.aconex.codelitter","version":"1.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.busybusy.Taiga.io.Task","version":"1.1.4","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.vuonghv2.vpmt.plugin.yumeplugin","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.mulgasoft.emacsplus","version":"0.2.002","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"3.1.0","since":"141.1532","until":"223.*","originalSince":"141.1532","originalUntil":null},{"id":"com.fishy.plugin.idea.ponytail","version":"1.0.0","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.9.6 for IDEA 14.1.3","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"ua.pp.madcap.codingame.plugin","version":"0.1.1","since":"140.0","until":"201.0","originalSince":"140.0","originalUntil":null},{"id":"JBehaveBddPlugin","version":"0.2.2","since":"93.94","until":"201.0","originalSince":"93.94","originalUntil":null},{"id":"PsiViewer","version":"3.28.76","since":"130.0","until":"130.*","originalSince":"130.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.5.1.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.5.1.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.visprogramming.armory","version":"1.10","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.php","version":"142.4491","since":"142.2888","until":"142.*","originalSince":"142.2888","originalUntil":null},{"id":"PsiViewer","version":"3.28.77","since":"130.0","until":"130.*","originalSince":"130.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.28","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"com.aspose.Cells.java.intellij.maven","version":"1.0.0.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.alaster.soa.requests","version":"1.03","since":"123.0","until":"193.0","originalSince":"123.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.5.2.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.5.2.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.intellij.plugins.hcl","version":"0.2.8","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"fir.im.plug.idea","version":"2.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.perl5","version":"1.004","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.plugins.jade","version":"142.4651","since":"142.4651","until":"181.0","originalSince":"142.4651","originalUntil":null},{"id":"AngularJS","version":"142.4651","since":"142.4651","until":"181.0","originalSince":"142.4651","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.2.9","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.ec2manager","version":"1.0.5","since":"133.193","until":"181.0","originalSince":"133.193","originalUntil":"133.193"},{"id":"org.root.HoogleIt","version":"0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.root.HoogleIt","version":"0.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.22","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"org.root.HoogleIt","version":"0.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.tapper.splittingup","version":"1.0","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.5.2.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.5.2.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.intellij.scala","version":"1.8.4","since":"142.4465","until":"181.0","originalSince":"142.4465","originalUntil":"143.0"},{"id":"org.intellij.scala","version":"1.8.4","since":"142.4465","until":"181.0","originalSince":"142.4465","originalUntil":"143.0"},{"id":"com.aspose.slides.java.intellij.maven","version":"1.0.0.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.5.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"1.2.1","since":"135.1230","until":"135.*","originalSince":"135.1230","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.8","since":"139.0","until":"193.*","originalSince":"139.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"1.2.2","since":"135.1230","until":"135.*","originalSince":"135.1230","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.5.2.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.5.2.2-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.mulgasoft.emacsplus","version":"0.3.000","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.2","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"3.2.0","since":"141.1532","until":"223.*","originalSince":"141.1532","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"3.3.0","since":"141.1532","until":"223.*","originalSince":"141.1532","originalUntil":null},{"id":"de.halirutan.mathematica","version":"1.2.3","since":"135.1230","until":"135.*","originalSince":"135.1230","originalUntil":null},{"id":"JRebelPlugin","version":"6.2.4-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"jp.tomorrowkey.intellij.injectlogtag","version":"1.0.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.d0as8.perlrun","version":"0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"fir.im.plug.idea","version":"2.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"me.guichaguri.additionaltools","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.hasintech.intellij.angularTemplates","version":"1.0.2","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.8.5","since":"142.4859","until":"181.0","originalSince":"142.4859","originalUntil":"143.0"},{"id":"com.visprogramming.armory","version":"1.21","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.8.5","since":"142.4859","until":"181.0","originalSince":"142.4859","originalUntil":"143.0"},{"id":"lsfusion.idea.plugin","version":"1.0.29","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"com.vuonghv2.vpmt.plugin.yumeplugin","version":"2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.2.6","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"3.4.0","since":"141.1532","until":"223.*","originalSince":"141.1532","originalUntil":null},{"id":"com.aspose.slides.java.intellij.maven","version":"1.0.0.1","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.atlassian.clover","version":"idea-4.0.6.v20150918000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"com.mulgasoft.emacsplus","version":"0.3.100","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.floobits.unique.plugin.id","version":"1.5.11","since":"131.0","until":"193.*","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.5.2.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.5.2.3-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"AngularJS","version":"142.5028","since":"142.5028","until":"181.0","originalSince":"142.5028","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.2.5","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.2.8","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.3.0","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.lxl.unique.plugin.id","version":"1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.baidu.penny","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"me.piotrbuda.intellij.pony","version":"0.1.0","since":"141.178","until":"201","originalSince":"141.178","originalUntil":null},{"id":"me.guichaguri.additionaltools","version":"1.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.hewy.esnippets","version":"0.0.2.","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.hewy.esnippets","version":"0.0.3.","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.2.9","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.3.1","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.3.2","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.0.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.0.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.oneskyapp.intellij","version":"1.3.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.vuonghv2.vpmt.plugin.yumeplugin","version":"3.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"RTC4Idea","version":"4.0.0_02","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"142.5266","since":"142.4912","until":"181.0","originalSince":"142.4912","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"3.5.0","since":"141.1532","until":"223.*","originalSince":"141.1532","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.3.3","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.php","version":"142.5282","since":"142.5068","until":"142.*","originalSince":"142.5068","originalUntil":null},{"id":"com.jetbrains.php.behat","version":"142.5282","since":"142.2888","until":"181.0","originalSince":"142.2888","originalUntil":null},{"id":"com.intellij.phing","version":"142.5282","since":"142.1","until":"181.0","originalSince":"142.1","originalUntil":null},{"id":"com.jetbrains.php.gae","version":"142.5282","since":"142.1","until":"181.0","originalSince":"142.1","originalUntil":null},{"id":"com.jetbrains.twig","version":"142.5282","since":"142.1","until":"142.1","originalSince":"142.1","originalUntil":null},{"id":"com.jetbrains.php.drupal","version":"142.5282","since":"142.1","until":"181.0","originalSince":"142.1","originalUntil":null},{"id":"com.jetbrains.php.blade","version":"142.5282","since":"142.1","until":"181.0","originalSince":"142.1","originalUntil":null},{"id":"com.jetbrains.php.wordPress","version":"142.5282","since":"142.4912","until":"181.0","originalSince":"142.4912","originalUntil":null},{"id":"com.eltonkola.androidsnippets","version":"1.0","since":"123.0","until":"193.0","originalSince":"123.0","originalUntil":null},{"id":"il.co.falk.buildAndLint","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.michaelbulava.TFSVCS","version":"0.1.3.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Beaker Test Runner","version":"0.1.0","since":"131.0","until":"172.*","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"3.6.0","since":"141.1532","until":"223.*","originalSince":"141.1532","originalUntil":null},{"id":"com.genymotion.idea","version":"1.0.6","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"JRebelPlugin","version":"6.2.5-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"siani.dev.itrules","version":"1.4.0","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.2.6","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.5.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.vuonghv2.vpmt.plugin.yumeplugin","version":"4.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.aspose.barcode.java.intellij.maven","version":"1.0.0.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.0","since":"139.0","until":"149","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.1.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.1.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.sencha.idea.IdeaPlugin","version":"6.0.3.430","since":"141.0","until":"213","originalSince":"141.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.3.4","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.directfn.unique.plugin.logmanger","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.plugins.meteor","version":"143.88","since":"143.88","until":"181.0","originalSince":"143.88","originalUntil":"144.0"},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.3 beta","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"143.88","since":"143.88","until":"143.*","originalSince":"143.88","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"142.5282","since":"142.1","until":"181.0","originalSince":"142.1","originalUntil":null},{"id":"pl.maja.nativetounicode","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.2.7","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.5.7","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.vuonghv2.vpmt.plugin.yumeplugin","version":"5.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.directfn.unique.plugin.logmanger","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"claims.bold.intellij.avro","version":"0.2.0","since":"131.0","until":"202.*","originalSince":"131.0","originalUntil":null},{"id":"AngularJS","version":"143.110","since":"143.110","until":"181.0","originalSince":"143.110","originalUntil":null},{"id":"org.intellij.scala","version":"1.9.2","since":"143.116","until":"181.0","originalSince":"143.116","originalUntil":"144.0"},{"id":"Pythonid","version":"5.0.142.2","since":"143.116","until":"181.0","originalSince":"143.116","originalUntil":null},{"id":"PythonCore","version":"5.0.142.2","since":"143.116","until":"181.0","originalSince":"143.116","originalUntil":null},{"id":"org.intellij.scala","version":"1.9.2","since":"143.116","until":"181.0","originalSince":"143.116","originalUntil":"144.0"},{"id":"org.jetbrains.plugins.ruby","version":"8.0.0.20151005","since":"143.85","until":"181.0","originalSince":"143.85","originalUntil":"143.*"},{"id":"org.jetbrains.plugins.vagrant","version":"0.6.143.3","since":"143.116","until":"181.0","originalSince":"143.116","originalUntil":null},{"id":"pro.alex_zaitsev.androidstyler","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php","version":"143.129","since":"142.5068","until":"143.*","originalSince":"142.5068","originalUntil":null},{"id":"org.intellij.scala","version":"1.9.133","since":"143.116","until":"181.0","originalSince":"143.116","originalUntil":"144.0"},{"id":"com.haskforce","version":"0.3-beta.23","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"jp.funnything.offing_harbor","version":"1.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.aspose.pdf.java.intellij.maven","version":"1.0.0.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.30","since":"141.177","until":"213","originalSince":"141.177","originalUntil":null},{"id":"org.intellij.scala","version":"1.9.140","since":"143.116","until":"181.0","originalSince":"143.116","originalUntil":"144.0"},{"id":"anton_dev_ua.PipeTableFormatter","version":"0.3.1","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"org.turbanov.execution.cmd","version":"1.0","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"1.3","since":"135.1230","until":"135.*","originalSince":"135.1230","originalUntil":null},{"id":"org.turbanov.execution.cmd","version":"1.1","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.busybusy.Taiga.io.Task","version":"1.1.5","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"io.github.francoiscambell.clionarduinoplugin","version":"1.2.0","since":"131.0","until":"162.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.9.147","since":"143.116","until":"181.0","originalSince":"143.116","originalUntil":"144.0"},{"id":"com.atsebak.ui5","version":"2.04","since":"133.0","until":"193.*","originalSince":"133.0","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.0.1","since":"139.0","until":"149","originalSince":"139.0","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.3.1","since":"123.72","until":"191.*","originalSince":"123.72","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.2.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.2.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.intellij.scala","version":"1.9.151","since":"143.116","until":"181.0","originalSince":"143.116","originalUntil":"144.0"},{"id":"com.busybusy.Taiga.io.Task","version":"1.1.6","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"3.7.0","since":"141.1532","until":"223.*","originalSince":"141.1532","originalUntil":null},{"id":"com.michaelbulava.TFSVCS","version":"0.1.3.7","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.9.2.2","since":"143.116","until":"181.0","originalSince":"143.116","originalUntil":"144.0"},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.5.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php","version":"143.279","since":"142.5068","until":"143.*","originalSince":"142.5068","originalUntil":null},{"id":"com.mulgasoft.emacsplus","version":"0.3.110","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.3.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.3.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"co.leantechniques.idea-js-test-finder","version":"0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"6.0.4.438","since":"141.0","until":"213","originalSince":"141.0","originalUntil":null},{"id":"com.directfn.unique.plugin.logmanger","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.3.2","since":"123.72","until":"191.*","originalSince":"123.72","originalUntil":null},{"id":"YAML/Ansible support","version":"0.8.0","since":"111.0","until":"222","originalSince":"111.0","originalUntil":null},{"id":"com.dmitz.intellij.plugin.websocket.client","version":"0.1","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.performancePlugin","version":"1.1","since":"142.4848","until":"181.0","originalSince":"142.4848","originalUntil":null},{"id":"com.floobits.unique.plugin.id","version":"1.5.12","since":"131.0","until":"193.*","originalSince":"131.0","originalUntil":null},{"id":"com.aspose.email.java.intellij.maven","version":"1.0.0.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.github.pedrovgs.androidwifiadb","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.sap.hcp.WebStormPlugin","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"anton_dev_ua.PipeTableFormatter","version":"0.4","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"com.sap.hcp.WebStormPlugin","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.sap.hcp.WebStormPlugin","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"4.1.0","since":"141.1532","until":"223.*","originalSince":"141.1532","originalUntil":null},{"id":"org.evosuite.plugin.intellij","version":"1.0.1","since":"131.0","until":"200","originalSince":"131.0","originalUntil":null},{"id":"com.perl5","version":"1.110","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.5.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.raj.unique.plugin.id","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.raj.unique.plugin.id","version":"1.0.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.ritesh.intellij.plugin.reviewboard","version":"0.1.0","since":"131.0","until":"193","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.9.4","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":"144.0"},{"id":"org.intellij.scala","version":"1.9.4","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":"144.0"},{"id":"Beaker Test Runner","version":"0.1.1","since":"131.0","until":"172.*","originalSince":"131.0","originalUntil":null},{"id":"org.turbanov.execution.cmd","version":"1.2","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"3.0","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"org.intellij.scala","version":"1.9.4.1","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":"144.0"},{"id":"JRebelPlugin","version":"6.2.6-idea-13-14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.jetbrains.plugins.meteor","version":"143.360","since":"143.360","until":"181.0","originalSince":"143.360","originalUntil":"144.0"},{"id":"com.hewy.esnippets","version":"0.0.5.","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.pulyaevskiy.phpstorm.phpdi","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"pro.alex_zaitsev.androidstyler","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"PythonCore","version":"5.0.143.61","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":null},{"id":"Pythonid","version":"5.0.143.53","since":"143.249","until":"181.0","originalSince":"143.249","originalUntil":null},{"id":"PythonCore","version":"5.0.143.53","since":"143.249","until":"181.0","originalSince":"143.249","originalUntil":null},{"id":"GsonFormat","version":"1.2.1","since":"107.118","until":"201.0","originalSince":"107.118","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.1","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.22","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.floobits.unique.plugin.id","version":"1.6.1","since":"131.0","until":"193.*","originalSince":"131.0","originalUntil":null},{"id":"com.github.pedrovgs.androidwifiadb","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.3.5","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"0.5.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.2","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.3","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"143.434","since":"142.2888","until":"173.0","originalSince":"142.2888","originalUntil":null},{"id":"Pythonid","version":"5.0.142.1060","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":null},{"id":"PythonCore","version":"5.0.142.1060","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.6.143.71","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":null},{"id":"com.jetbrains.plugins.meteor","version":"143.379","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":"144.0"},{"id":"org.intellij.plugins.hcl","version":"0.4.0","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.github.pedrovgs.androidwifiadb","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.5","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.squareup.intellij.plugin.copy-as-github-path","version":"2.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.4.1","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"AngularJS","version":"143.379.19","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":null},{"id":"com.spicedroid.xmltrans","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.4.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.4.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.beust.kobalt.intellij","version":"1.6","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.4beta","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.4.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.4.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"io.github.francoiscambell.clionarduinoplugin","version":"1.2.1","since":"131.0","until":"162.0","originalSince":"131.0","originalUntil":null},{"id":"com.spicedroid.xmltrans","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Beaker Test Runner","version":"0.1.2","since":"131.0","until":"172.*","originalSince":"131.0","originalUntil":null},{"id":"mopedjc","version":"0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.4.2","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.0.1","since":"131.0","until":"232","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.23","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.layernet.plugin.adbwifi","version":"1.0.2","since":"93.13","until":"201.0","originalSince":"93.13","originalUntil":null},{"id":"siani.dev.itrules","version":"1.4.1","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"com.aspose.tasks.java.intellij.maven","version":"1.0.0.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.4.2","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.1.0","since":"131.0","until":"232","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.7","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.vv.adbuninstall","version":"1.1.3","since":"93.13","until":"183","originalSince":"93.13","originalUntil":null},{"id":"de.sgalinski.typoscript.plugin.id","version":"1.6","since":"141.0","until":"231","originalSince":"141.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.9","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.24","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.busybusy.Taiga.io.Task","version":"1.1.7","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"1.3.2","since":"135.1230","until":"135.*","originalSince":"135.1230","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"4.2.0","since":"141.1532","until":"223.*","originalSince":"141.1532","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.3.3","since":"123.72","until":"191.*","originalSince":"123.72","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.9.2","since":"135.0","until":"211.0","originalSince":"135.0","originalUntil":null},{"id":"com.spicedroid.xmltrans","version":"1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Pythonid","version":"5.0.143.95","since":"143.380","until":"181.0","originalSince":"143.380","originalUntil":null},{"id":"PythonCore","version":"5.0.143.95","since":"143.380","until":"181.0","originalSince":"143.380","originalUntil":null},{"id":"com.kukido.eclipser","version":"0.7.0","since":"143.0","until":"193.0","originalSince":"143.0","originalUntil":null},{"id":"fir.im.plug.idea","version":"2.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.2.0","since":"131.0","until":"232","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.10","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.github.gcds.global.template.variables","version":"1.0.2","since":"93.13","until":"211.*","originalSince":"93.13","originalUntil":null},{"id":"IdeaVIM","version":"0.42","since":"143.0","until":"181.0","originalSince":"143.0","originalUntil":null},{"id":"anton_dev_ua.PipeTableFormatter","version":"0.4.1","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"IdeaVIM","version":"0.43","since":"143.0","until":"181.0","originalSince":"143.0","originalUntil":null},{"id":"Pythonid","version":"5.0.143.100","since":"143.381","until":"181.0","originalSince":"143.381","originalUntil":null},{"id":"PythonCore","version":"5.0.143.100","since":"143.381","until":"181.0","originalSince":"143.381","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.5 beta","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"IdeaVIM","version":"0.44","since":"143.0","until":"181.0","originalSince":"143.0","originalUntil":null},{"id":"Pythonid","version":"5.0.143.103","since":"143.381","until":"181.0","originalSince":"143.381","originalUntil":null},{"id":"PythonCore","version":"5.0.143.103","since":"143.381","until":"181.0","originalSince":"143.381","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.5.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.5.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.jetbrains.php.framework","version":"143.381.48","since":"142.1","until":"181.0","originalSince":"142.1","originalUntil":null},{"id":"com.intellij.phing","version":"143.381.48","since":"142.1","until":"181.0","originalSince":"142.1","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"143.381.48","since":"142.381","until":"201","originalSince":"142.381","originalUntil":null},{"id":"com.jetbrains.php","version":"143.381.48","since":"142.5068","until":"143.*","originalSince":"142.5068","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"143.381.48","since":"142.4912","until":"181.0","originalSince":"142.4912","originalUntil":null},{"id":"com.jetbrains.php.gae","version":"143.381.48","since":"142.1","until":"181.0","originalSince":"142.1","originalUntil":null},{"id":"com.jetbrains.twig","version":"143.381.48","since":"142.1","until":"142.1","originalSince":"142.1","originalUntil":null},{"id":"com.jetbrains.php.drupal","version":"143.381.48","since":"142.1","until":"181.0","originalSince":"142.1","originalUntil":null},{"id":"com.jetbrains.php.wordPress","version":"143.381.48","since":"142.4912","until":"181.0","originalSince":"142.4912","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"143.381.48","since":"142.2888","until":"173.0","originalSince":"142.2888","originalUntil":null},{"id":"com.jetbrains.php.behat","version":"143.381.48","since":"142.2888","until":"181.0","originalSince":"142.2888","originalUntil":null},{"id":"com.jetbrains.php.blade","version":"143.381.48","since":"142.1","until":"181.0","originalSince":"142.1","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.11","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.perl5","version":"1.111","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.perl5","version":"1.112","since":"143.0","until":"162.*","originalSince":"143.0","originalUntil":null},{"id":"com.bryansharpe.slackstorm","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"1.0","since":"123.72","until":"145.*","originalSince":"123.72","originalUntil":null},{"id":"com.fir.im.android.plugin.id","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.25","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.31","since":"143.381","until":"213","originalSince":"143.381","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"1.1","since":"123.72","until":"145.*","originalSince":"123.72","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"1.2","since":"123.72","until":"145.*","originalSince":"123.72","originalUntil":null},{"id":"io.github.sirlantis.rubymine.rubocop","version":"3.0.0","since":"143.0","until":"181.0","originalSince":"143.0","originalUntil":null},{"id":"com.davy307.androidassetimporter","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.davy307.androidassetimporter","version":"1.01","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.bryansharpe.slackstorm","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.davy307.androidassetimporter","version":"1.02","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.michaelbulava.TFSVCS","version":"0.1.3.8","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.davy307.androidassetimporter","version":"1.03","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.davy307.androidassetimporter","version":"1.031","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.davy307.androidassetimporter","version":"1.032","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.elixir_lang","version":"1.2.0","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"0.9.7 for IDEA 14.1.4","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.13","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.14","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.magento.idea.magento2plugin","version":"0.0.7","since":"131.0","until":"223.*","originalSince":"131.0","originalUntil":null},{"id":"cucumber-java","version":"143.381","since":"143.381","until":"201","originalSince":"143.381","originalUntil":null},{"id":"cucumber-groovy","version":"143.381","since":"143.381","until":"201","originalSince":"143.381","originalUntil":null},{"id":"com.jawspeak.joined-tab-scrolling","version":"0.1-alpha","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.2.1","since":"131.0","until":"232","originalSince":"131.0","originalUntil":null},{"id":"com.floobits.unique.plugin.id","version":"1.6.2","since":"131.0","until":"193.*","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.32","since":"143.381","until":"213","originalSince":"143.381","originalUntil":null},{"id":"com.aspose.diagram.java.intellij.maven","version":"1.0.0.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.4.3","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.26","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"org.elixir_lang","version":"1.2.1","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"fossil4idea","version":"0.1.6","since":"143.0","until":"192.*","originalSince":"143.0","originalUntil":null},{"id":"SerialPortMonitor","version":"0.1","since":"141.0","until":"170.*","originalSince":"141.0","originalUntil":null},{"id":"SerialPortMonitor","version":"0.1.1","since":"141.0","until":"170.*","originalSince":"141.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.2.7-idea-13-15","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"CUBA","version":"2.9.0.15","since":"143.381","until":"211","originalSince":"143.381","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.5.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.5.5-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"pl.lksztmczk.openinterminal","version":"1.5.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"SerialPortMonitor","version":"0.2","since":"141.0","until":"170.*","originalSince":"141.0","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.7 beta","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.8 beta","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.15","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.16","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.17","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.10","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"JSTestDriver Plugin","version":"144.988","since":"144.988","until":"181.0","originalSince":"144.988","originalUntil":"145.0"},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.11","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"com.jetbrains.php","version":"143.382.38","since":"142.5068","until":"143.*","originalSince":"142.5068","originalUntil":null},{"id":"com.aspose.ocr.java.intellij.maven","version":"1.0.0.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"Pythonid","version":"5.0.142.1177","since":"143.747","until":"181.0","originalSince":"143.747","originalUntil":null},{"id":"PythonCore","version":"5.0.142.1177","since":"143.747","until":"181.0","originalSince":"143.747","originalUntil":null},{"id":"com.bryansharpe.slackstorm","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.floobits.unique.plugin.id","version":"1.6.3","since":"131.0","until":"193.*","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.25","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.php","version":"143.790","since":"143.383","until":"143.*","originalSince":"143.383","originalUntil":null},{"id":"jbehave-support-plugin-extension","version":"1.00","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"6.0.6.456","since":"143.0","until":"213","originalSince":"143.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.18","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"jp.codic.plugins.intellij","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"jp.codic.plugins.intellij","version":"1.01","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"jp.codic.plugins.intellij","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"cucumber-java","version":"143.382","since":"143.382","until":"201","originalSince":"143.382","originalUntil":null},{"id":"cucumber-groovy","version":"143.382","since":"143.382","until":"201","originalSince":"143.382","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.6.1 (beta)","since":"143.0","until":"191.6708","originalSince":"143.0","originalUntil":null},{"id":"org.antlr.jetbrains.st4plugin","version":"0.1","since":"133.0","until":"173.*","originalSince":"133.0","originalUntil":null},{"id":"jp.codic.plugins.intellij","version":"1.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.antlr.jetbrains.st4plugin","version":"0.2","since":"133.0","until":"173.*","originalSince":"133.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.26","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.27","since":"143.0","until":"211","originalSince":"143.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.27","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.magento.idea.magento2plugin","version":"0.0.8","since":"131.0","until":"223.*","originalSince":"131.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.0.0","since":"143.0","until":"211","originalSince":"143.0","originalUntil":null},{"id":"org.antlr.jetbrains.st4plugin","version":"0.3","since":"133.0","until":"173.*","originalSince":"133.0","originalUntil":null},{"id":"cat.kanbanapps.gradlekiller","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"SerialPortMonitor","version":"0.3","since":"141.0","until":"170.*","originalSince":"141.0","originalUntil":null},{"id":"jbehave-support-plugin-extension","version":"1.01","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"Pythonid","version":"5.0.143.116","since":"143.747","until":"181.0","originalSince":"143.747","originalUntil":null},{"id":"PythonCore","version":"5.0.143.116","since":"143.747","until":"181.0","originalSince":"143.747","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.33","since":"143.381","until":"213","originalSince":"143.381","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.6.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.6.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.illuminatedcloud.intellij","version":"1.6.6.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.6.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.visprogramming.armory","version":"1.27","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.19","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.vladsch.idea.multimarkdown","version":"1.2.2","since":"133.1711","until":"212.0","originalSince":"133.1711","originalUntil":null},{"id":"jbehave-support-plugin-extension","version":"1.02","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"HybrisPlugin","version":"1.2.0","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"1.3","since":"123.72","until":"145.*","originalSince":"123.72","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.20","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.davy307.androidassetimporter","version":"2.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.2.2","since":"131.0","until":"232","originalSince":"131.0","originalUntil":null},{"id":"com.davy307.androidassetimporter","version":"2.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.davy307.androidassetimporter","version":"2.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.21","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.22","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.23","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"cat.kanbanapps.gradlekiller","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.aspose.imaging.java.intellij.maven","version":"1.0.0.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.davy307.androidassetimporter","version":"2.0.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Pythonid","version":"5.0.2.143.121","since":"143.869","until":"181.0","originalSince":"143.869","originalUntil":null},{"id":"PythonCore","version":"5.0.2.143.121","since":"143.869","until":"181.0","originalSince":"143.869","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.6.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.6.2-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.idamobile.android.toolbox","version":"1.1.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.antlr.jetbrains.st4plugin","version":"0.4","since":"133.0","until":"173.*","originalSince":"133.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"1.4","since":"123.72","until":"145.*","originalSince":"123.72","originalUntil":null},{"id":"jp.codic.plugins.intellij","version":"1.0.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Mongo Plugin","version":"0.7.3","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.24","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.idamobile.android.toolbox","version":"1.1.6","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.34","since":"143.381","until":"213","originalSince":"143.381","originalUntil":null},{"id":"com.layernet.plugin.adbwifi","version":"1.0.3","since":"93.13","until":"201.0","originalSince":"93.13","originalUntil":null},{"id":"com.mulgasoft.emacsplus","version":"0.3.200","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.coursehero.helper","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.microsoft.tooling.msservices.intellij.azure","version":"1.0","since":"141.0","until":"163.0","originalSince":"141.0","originalUntil":null},{"id":"anton_dev_ua.PipeTableFormatter","version":"0.4.2","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"Batch Scripts Support","version":"1.0.6","since":"141.0","until":"182.*","originalSince":"141.0","originalUntil":null},{"id":"SerialPortMonitor","version":"0.4","since":"141.0","until":"170.*","originalSince":"141.0","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.0.2","since":"139.0","until":"149","originalSince":"139.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.0.2","since":"133.0","until":"211","originalSince":"133.0","originalUntil":null},{"id":"SerialPortMonitor","version":"0.4.1","since":"141.0","until":"170.*","originalSince":"141.0","originalUntil":null},{"id":"com.ritesh.intellij.plugin.reviewboard","version":"0.1.1","since":"131.0","until":"193","originalSince":"131.0","originalUntil":null},{"id":"com.magento.idea.magento2plugin","version":"0.0.9","since":"131.0","until":"223.*","originalSince":"131.0","originalUntil":null},{"id":"com.jawspeak.joined-tab-scrolling","version":"0.3-alpha","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation5","version":"2.4","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"HybrisPlugin","version":"1.2.1","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.6.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.6.3-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.kukido.eclipser","version":"0.7.1","since":"143.0","until":"193.0","originalSince":"143.0","originalUntil":null},{"id":"Vue.js","version":"1.0.0","since":"141.0","until":"181.0","originalSince":"141.0","originalUntil":null},{"id":"wide-task-browser","version":"0.1.14","since":"139.658","until":"231.*","originalSince":"139.658","originalUntil":null},{"id":"com.floobits.unique.plugin.id","version":"1.6.5","since":"131.0","until":"193.*","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.plugins.meteor","version":"143.1088","since":"143.1088","until":"181.0","originalSince":"143.1088","originalUntil":"144.0"},{"id":"com.aspose.intellijplugin.id","version":"1.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.2.8","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.2.9","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.github.mohamedkomalo.envVarsInPathVars","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Batch Scripts Support","version":"1.0.7","since":"141.0","until":"182.*","originalSince":"141.0","originalUntil":null},{"id":"SerialPortMonitor","version":"0.4.5","since":"141.0","until":"170.*","originalSince":"141.0","originalUntil":null},{"id":"com.softdream.intellij.plugin","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.0.3","since":"133.0","until":"211","originalSince":"133.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"4.3.0","since":"141.1532","until":"223.*","originalSince":"141.1532","originalUntil":null},{"id":"com.widerwille.afterglow","version":"1.0","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.24","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.squareup.intellij.plugin.copy-as-github-path","version":"2.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.25","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"io.imdone.imdone-plugin","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.3.0-idea-13-15","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"HybrisPlugin","version":"1.2.2","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.widerwille.afterglow","version":"1.0.1","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.3.0","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"ru.oldtown.idea.workflowplugin","version":"1.1","since":"80.8000","until":"201","originalSince":"80.8000","originalUntil":null},{"id":"com.layernet.plugin.adbwifi","version":"1.0.4","since":"93.13","until":"201.0","originalSince":"93.13","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.0.15","since":"131.0","until":"144","originalSince":"131.0","originalUntil":null},{"id":"org.eclipse.xtext.idea","version":"2.9.0","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.8.3 beta","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.28","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.25","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.992","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.26","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"xyz.marcato.ideaplugin.methodscount","version":"1.0.0","since":"139.0","until":"145.*","originalSince":"139.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.29","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.microsoft.tooling.msservices.android","version":"1.0","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"35e38c06-9762-11e5-8dd3-54a050ace290","version":"1.1","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"SBT","version":"1.8.0","since":"143.381","until":"171.0","originalSince":"143.381","originalUntil":null},{"id":"com.chairbender.object_calisthenics_analyzer","version":"0.8","since":"133.0","until":"201.*","originalSince":"133.0","originalUntil":null},{"id":"com.softdream.intellij.plugin","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.aspose.intellijplugin.id","version":"1.4.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.plugins.meteor","version":"143.1183","since":"143.1183","until":"181.0","originalSince":"143.1183","originalUntil":"144.0"},{"id":"com.bobz.OpenTerminalHere","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.profeg.IntelliJGettersCheckInspections","version":"1.0","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"com.chairbender.object_calisthenics_analyzer","version":"0.82","since":"133.0","until":"201.*","originalSince":"133.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.2-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.chairbender.object_calisthenics_analyzer","version":"0.9","since":"133.0","until":"201.*","originalSince":"133.0","originalUntil":null},{"id":"com.chairbender.object_calisthenics_analyzer","version":"0.91","since":"133.0","until":"201.*","originalSince":"133.0","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.4.3","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.oneskyapp.intellij","version":"1.3.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.28","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.9","since":"138.1000","until":"221","originalSince":"138.1000","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.0.3","since":"139.0","until":"149","originalSince":"139.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.29","since":"143.0","until":"211","originalSince":"143.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.29","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.2.3","since":"131.0","until":"232","originalSince":"131.0","originalUntil":null},{"id":"io.github.sirlantis.rubymine.rubocop","version":"3.0.1","since":"143.0","until":"181.0","originalSince":"143.0","originalUntil":null},{"id":"xyz.marcato.ideaplugin.methodscount","version":"1.1.0","since":"139.0","until":"145.*","originalSince":"139.0","originalUntil":null},{"id":"com.atlassian.clover","version":"idea-4.1.1.v20151207000000","since":"93.13","until":"183.0","originalSince":"93.13","originalUntil":null},{"id":"xyz.marcato.ideaplugin.methodscount","version":"1.1.1","since":"139.0","until":"145.*","originalSince":"139.0","originalUntil":null},{"id":"com.perl5","version":"1.218","since":"143.0","until":"162.*","originalSince":"143.0","originalUntil":null},{"id":"xyz.marcato.ideaplugin.methodscount","version":"1.1.2","since":"139.0","until":"145.*","originalSince":"139.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.5 beta","since":"143.0","until":"213.*","originalSince":"143.0","originalUntil":null},{"id":"HybrisPlugin","version":"1.2.3","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.aconex.codelitter","version":"1.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.weebly.generator","version":"2.1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.27","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.9.1","since":"138.1000","until":"221","originalSince":"138.1000","originalUntil":null},{"id":"com.floobits.unique.plugin.id","version":"1.6.6","since":"131.0","until":"193.*","originalSince":"131.0","originalUntil":null},{"id":"com.genymotion.idea","version":"1.0.7","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.4.4","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.bryansharpe.slackstorm","version":"1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.0.4","since":"139.0","until":"149","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.php","version":"143.1184.87","since":"142.5068","until":"143.*","originalSince":"142.5068","originalUntil":null},{"id":"org.weebly.generator","version":"2.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.28","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.29","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.0.0","since":"143.0","until":"202.*","originalSince":"143.0","originalUntil":null},{"id":"com.github.pedrovgs.androidwifiadb","version":"2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.30","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.35","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"2.2","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.3-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"JSTestDriver Plugin","version":"144.2131","since":"144.2131","until":"181.0","originalSince":"144.2131","originalUntil":"145.0"},{"id":"com.beust.kobalt.intellij","version":"1.31","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.github.pedrovgs.androidwifiadb","version":"2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.line.plugin.auto.align","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.dmarcotte.handlebars","version":"144.2131","since":"144.2131","until":"201","originalSince":"144.2131","originalUntil":null},{"id":"cucumber-javascript","version":"144.2159","since":"144.2159","until":"201","originalSince":"144.2159","originalUntil":null},{"id":"cucumber-javascript","version":"143.1449","since":"143.1184","until":"201","originalSince":"143.1184","originalUntil":null},{"id":"com.github.pedrovgs.androidwifiadb","version":"2.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"amailp.intellij.robot","version":"0.13","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"com.chairbender.object_calisthenics_analyzer","version":"0.92","since":"133.0","until":"201.*","originalSince":"133.0","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.4-37.1","since":"141.2735","until":"191.*","originalSince":"141.2735","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.36","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.9.3","since":"135.0","until":"211.0","originalSince":"135.0","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.4-39.1","since":"141.2735","until":"191.*","originalSince":"141.2735","originalUntil":null},{"id":"QAPlug","version":"1.3.10","since":"143.1184","until":"211","originalSince":"143.1184","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"8.1.30325","since":"136.0","until":"171.4249","originalSince":"136.0","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.0.0","since":"133.0","until":"223.*","originalSince":"133.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.9.4","since":"135.0","until":"211.0","originalSince":"135.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.4-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.chairbender.object_calisthenics_analyzer","version":"0.95","since":"133.0","until":"201.*","originalSince":"133.0","originalUntil":null},{"id":"com.ylt.appcan.plugin","version":"1.0.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.ylt.appcan.plugin","version":"1.0.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.30","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.37","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"QAPlug","version":"1.3.11","since":"143.1184","until":"211","originalSince":"143.1184","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.32","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.ylt.appcan.plugin","version":"1.0.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.33","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.34","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.eclipse.xtext.idea","version":"2.9.1","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"org.eclipse.xtend.idea","version":"2.9.1","since":"131.0","until":"163.1","originalSince":"131.0","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.4-54","since":"141.2735","until":"191.*","originalSince":"141.2735","originalUntil":null},{"id":"com.bugvm.intellij","version":"1.0.7","since":"143.1184","until":"201.0","originalSince":"143.1184","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.35","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.coolsharp.codesection","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"RTC4Idea","version":"4.0.0_03","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"phpfmt","version":"1.0.3","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.3.1-idea-13-15","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.5-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"Vue.js","version":"1.0.1","since":"141.0","until":"181.0","originalSince":"141.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"0.993","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"jp.codic.plugins.intellij","version":"1.0.4","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.coolsharp.codesection","version":"1.2","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"uk.me.jeffsutton.pojogen","version":"1.2","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"phpfmt","version":"1.0.4","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"uk.me.jeffsutton.pojogen","version":"1.2.1","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"Pythonid","version":"5.0.142.1557","since":"144.2151","until":"181.0","originalSince":"144.2151","originalUntil":null},{"id":"PythonCore","version":"5.0.142.1557","since":"144.2151","until":"181.0","originalSince":"144.2151","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.6-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.jetbrains.kotlin","version":"1.0.0-beta-4583-IJ143-11","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":"144.*"},{"id":"com.ppolivka.gitlabprojects","version":"1.3.0","since":"131.0","until":"232","originalSince":"131.0","originalUntil":null},{"id":"uk.me.jeffsutton.pojogen","version":"1.2.2","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"com.coolsharp.codesection","version":"1.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.30","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.12","since":"144.0","until":"201","originalSince":"144.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.0.0-beta-4584-IJ143-12","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":"144.*"},{"id":"com.boredream.plugin.espressocreator","version":"1.0","since":"103.0","until":"201.0","originalSince":"103.0","originalUntil":null},{"id":"com.boredream.plugin.layoutcreator","version":"1.0","since":"103.0","until":"201.0","originalSince":"103.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.6 beta","since":"143.0","until":"213.*","originalSince":"143.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.13","since":"144.0","until":"201","originalSince":"144.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.17","since":"144.0","until":"201","originalSince":"144.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.9","since":"143.0","until":"193.*","originalSince":"143.0","originalUntil":null},{"id":"jp.codic.plugins.intellij","version":"1.0.5","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"io.github.sirlantis.rubymine.rubocop","version":"3.1.0","since":"143.0","until":"181.0","originalSince":"143.0","originalUntil":null},{"id":"com.heaven7.plugin.android.databinding","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.evosuite.plugin.intellij","version":"1.0.2","since":"143.0","until":"200","originalSince":"143.0","originalUntil":null},{"id":"com.magento.idea.magento2plugin","version":"0.1","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"anton_dev_ua.PipeTableFormatter","version":"0.5.0","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.9.5","since":"135.0","until":"211.0","originalSince":"135.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.7-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.intellij.stats.completion","version":"0.0.19","since":"144.0","until":"201","originalSince":"144.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.11","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.ritesh.intellij.plugin.reviewboard","version":"v0.1.2","since":"131.0","until":"193","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.20","since":"144.0","until":"201","originalSince":"144.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.8-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.intellij.stats.completion","version":"0.0.22","since":"144.0","until":"201","originalSince":"144.0","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.4-56","since":"141.2735","until":"191.*","originalSince":"141.2735","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.12","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.shiraji.createintentinspection","version":"0.0.2","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"com.bmesta.powermode","version":"0.9","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.4.3","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.fatfractal.plugins.idea.ffdl","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"MetricsReloaded","version":"1.1","since":"139.0","until":"212.*","originalSince":"139.0","originalUntil":null},{"id":"com.hasintech.intellij.angularTemplates","version":"1.1.2","since":"138.1029","until":"181.0","originalSince":"138.1029","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"1.5","since":"123.72","until":"145.*","originalSince":"123.72","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.10","since":"143.0","until":"193.*","originalSince":"143.0","originalUntil":null},{"id":"com.widerwille.afterglow","version":"1.0.2","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.widerwille.afterglow","version":"1.0.3","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.github.shiraji.newinstanceinspection","version":"0.0.2","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"com.doglandia.GpsEmulator","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.doglandia.GpsEmulator","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.nextras.orm.intellij","version":"0.2","since":"131.0","until":"181.3494","originalSince":"131.0","originalUntil":null},{"id":"com.navmine.classdiagrams","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.michaelbulava.TFSVCS","version":"0.2.0.150","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.microsoft.tooling.msservices.intellij.azure","version":"1.1","since":"141.0","until":"163.0","originalSince":"141.0","originalUntil":null},{"id":"com.bryansharpe.slackstorm","version":"1.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.softdream.intellij.plugin","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.michaelbulava.TFSVCS","version":"0.2.1.200","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.bryansharpe.slackstorm","version":"1.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.1.0","since":"139.0","until":"149","originalSince":"139.0","originalUntil":null},{"id":"com.widerwille.quicklook","version":"0.8","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"phpfmt","version":"1.0.5","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.7.9-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.elixir_lang","version":"2.0.0-pre","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"2.2.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"SnakeYAML plugin","version":"1.15.1","since":"111.0","until":"223","originalSince":"111.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"3.1","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"com.jintin.droidlane","version":"1.2.0","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.konifar.material_icon_generator","version":"1.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.lopesdasilva.wcs.plugin","version":"0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.breeze.plugin.reprotoc","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"io.github.takuaraki.dvc","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"4.4.0","since":"141.1532","until":"223.*","originalSince":"141.1532","originalUntil":null},{"id":"com.magento.idea.magento2plugin","version":"0.2.0","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"jballant.CommonJSAutoComplete","version":"0.2.2","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"org.elixir_lang","version":"2.1.0","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"codeReview4idea","version":"0.5.3","since":"141.177","until":"203","originalSince":"141.177","originalUntil":null},{"id":"com.jetbrains.plugins.jade","version":"144.2931","since":"144.2016","until":"181.0","originalSince":"144.2016","originalUntil":null},{"id":"com.intellij.phing","version":"143.1770","since":"142.1","until":"181.0","originalSince":"142.1","originalUntil":null},{"id":"com.jetbrains.php","version":"143.1770","since":"142.5068","until":"143.*","originalSince":"142.5068","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.smilingrob.gitpair","version":"1.3","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"Pythonid","version":"5.0.144.1598","since":"144.2925","until":"181.0","originalSince":"144.2925","originalUntil":null},{"id":"PythonCore","version":"5.0.144.1598","since":"144.2925","until":"181.0","originalSince":"144.2925","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"2.0.12","since":"123.0","until":"123.*","originalSince":"123.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.5.8","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.weebly.generator","version":"2.1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"jp.codic.plugins.intellij","version":"1.0.6","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.lopesdasilva.wcs.plugin","version":"0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"JSTestDriver Plugin","version":"144.2911","since":"144.2911","until":"181.0","originalSince":"144.2911","originalUntil":"145.0"},{"id":"org.jetbrains.comparisonChainwootool","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.23","since":"144.0","until":"201","originalSince":"144.0","originalUntil":null},{"id":"com.zf.androidplugin.selectdrawable_generator","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"cucumber-javascript","version":"144.2957","since":"144.2957","until":"201","originalSince":"144.2957","originalUntil":null},{"id":"JRebelPlugin","version":"6.3.2-idea-13-15","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.zf.androidplugin.shapedrawable_template","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.zf.androidplugin.selectdrawable_generator","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"1.6","since":"123.72","until":"145.*","originalSince":"123.72","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.1.0","since":"139.0","until":"163","originalSince":"139.0","originalUntil":null},{"id":"AngularJS","version":"144.2925.4","since":"144.2925","until":"181.0","originalSince":"144.2925","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.38","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.fatfractal.plugins.idea.ffdl","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"MetricsReloaded","version":"1.2","since":"139.0","until":"212.*","originalSince":"139.0","originalUntil":null},{"id":"com.zf.androidplugin.selectdrawable_generator","version":"1.0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.zf.androidplugin.selectdrawable_generator","version":"1.0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.zf.androidplugin.shapedrawable_template","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.magento.idea.magento2plugin","version":"0.2.1","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"io.github.takuaraki.dvc","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.26","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.zf.androidplugin.shapedrawable_template","version":"1.0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.boredream.plugin.layoutcreator","version":"1.2","since":"103.0","until":"201.0","originalSince":"103.0","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"144.2925.4","since":"144.2925","until":"144.*","originalSince":"144.2925","originalUntil":null},{"id":"phpfmt","version":"1.0.6","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"phpfmt","version":"1.0.7","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.performancePlugin","version":"1.3","since":"144.1000","until":"181.0","originalSince":"144.1000","originalUntil":null},{"id":"Docker","version":"1.7.5","since":"143.999","until":"143.*","originalSince":"143.999","originalUntil":"144.2925"},{"id":"org.jetbrains.kotlin","version":"1.0.0-beta-4589-IJ143-16","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":"144.*"},{"id":"dbgsprw.apm","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.zf.androidplugin.shapedrawable_template","version":"1.0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.zf.androidplugin.shapedrawable_template","version":"1.0.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.31","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.zf.androidplugin.shapedrawable_template","version":"1.0.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.zf.androidplugin.shapedrawable_template","version":"1.0.6","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.zf.androidplugin.selectdrawable_generator","version":"1.0.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"phpfmt","version":"1.0.8","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.24","since":"144.0","until":"201","originalSince":"144.0","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"144.3168","since":"144.3143","until":"173.0","originalSince":"144.3143","originalUntil":null},{"id":"com.jetbrains.php.behat","version":"144.3168","since":"144.3143","until":"181.0","originalSince":"144.3143","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.0","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.jetbrains.php","version":"144.3168","since":"144.3142","until":"144.*","originalSince":"144.3142","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.bryansharpe.slackstorm","version":"1.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.shandiangou.plugin.csveditor","version":"V0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.39","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"6.0.8.477","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"dbgsprw.apm","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.rd.app.plugin.","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.1.0","since":"133.0","until":"223.*","originalSince":"133.0","originalUntil":null},{"id":"me.zheteng.idea.reverse","version":"1.0","since":"117.0","until":"201.0","originalSince":"117.0","originalUntil":null},{"id":"me.zheteng.idea.reverse","version":"1.0.1","since":"117.0","until":"201.0","originalSince":"117.0","originalUntil":null},{"id":"phpfmt","version":"1.0.9","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.8.4","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.2.0","since":"133.0","until":"223.*","originalSince":"133.0","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.2.1","since":"133.0","until":"223.*","originalSince":"133.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.0.0-rc-1007-IJ143-11","since":"143.379","until":"181.0","originalSince":"143.379","originalUntil":"144.*"},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"3.1.1","since":"135.0","until":"211","originalSince":"135.0","originalUntil":null},{"id":"nl.tudelft.watchdog","version":"1.7.0","since":"139.0","until":"200","originalSince":"139.0","originalUntil":null},{"id":"R4Intellij","version":"0.10","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"EclipseCodeFormatter","version":"15.4.132.637.0","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"dbgsprw.apm","version":"1.1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.4.4","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"com.xgheaven.splitString","version":"0.1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.xgheaven.splitString","version":"0.1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"claims.bold.intellij.avro","version":"0.2.1","since":"131.0","until":"202.*","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.36","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"2.1","since":"143.2","until":"145.*","originalSince":"143.2","originalUntil":null},{"id":"Railways","version":"0.8.4","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"Railways for IDEA","version":"0.8.4","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"io.github.takuaraki.dvc","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.2.0","since":"143.0","until":"183","originalSince":"143.0","originalUntil":null},{"id":"com.thoughtworks.tools.idea.templatenav","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.4.5","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"com.emberjs","version":"1.4.0","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"3.1.2","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.1.0","since":"143.0","until":"202.*","originalSince":"143.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"2.6.2","since":"141.115","until":"181.3494","originalSince":"141.115","originalUntil":null},{"id":"MetricsReloaded","version":"1.2.1","since":"139.0","until":"212.*","originalSince":"139.0","originalUntil":null},{"id":"SnakeYAML plugin","version":"1.15.2","since":"111.0","until":"223","originalSince":"111.0","originalUntil":null},{"id":"SnakeYAML plugin","version":"1.15.3","since":"111.0","until":"223","originalSince":"111.0","originalUntil":null},{"id":"com.zf.androidplugin.selectdrawable_generator","version":"1.0.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.zf.androidplugin.shapedrawable_template","version":"1.0.7","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"dbgsprw.apm","version":"1.1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.emberjs","version":"1.4.1","since":"141.*","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.20","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.40","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.perl5","version":"1.328","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.2-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.21","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"dbgsprw.apm","version":"1.2.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.morcinek.android.codegenerator.plugin.intellij","version":"1.5","since":"131.0","until":"201.*","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.41","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"wide-task-browser","version":"0.1.15","since":"139.658","until":"231.*","originalSince":"139.658","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.8.5","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.tom-power.close-tab-left-right","version":"1.0","since":"141.0","until":"183.1044","originalSince":"141.0","originalUntil":null},{"id":"com.github.tom-power.close-tab-left-right","version":"1.0.1","since":"141.0","until":"183.1044","originalSince":"141.0","originalUntil":null},{"id":"com.morcinek.android.codegenerator.plugin.intellij","version":"1.6","since":"131.0","until":"201.*","originalSince":"131.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.3.11","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.boredream.plugin.layoutcreator","version":"1.3","since":"103.0","until":"201.0","originalSince":"103.0","originalUntil":null},{"id":"com.github.tom-power.close-tab-left-right","version":"1.0.2","since":"141.0","until":"183.1044","originalSince":"141.0","originalUntil":null},{"id":"cucumber-javascript","version":"143.2092","since":"143.1184","until":"201","originalSince":"143.1184","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.1.1","since":"143.0","until":"202.*","originalSince":"143.0","originalUntil":null},{"id":"Pythonid","version":"5.0.144.1645","since":"144.3600","until":"181.0","originalSince":"144.3600","originalUntil":null},{"id":"PythonCore","version":"5.0.144.1645","since":"144.3600","until":"181.0","originalSince":"144.3600","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"4.0","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"jp.codic.plugins.intellij","version":"1.0.8","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"jp.codic.plugins.intellij","version":"1.0.9","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"jp.codic.plugins.intellij","version":"1.0.10","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"cucumber-javascript","version":"141.1551","since":"141.1550","until":"201","originalSince":"141.1550","originalUntil":null},{"id":"cucumber-javascript","version":"143.2093","since":"143.1559","until":"201","originalSince":"143.1559","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.8.6","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation6","version":"1.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.3.3-idea-13-15","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.manolenso.intellij.foundation6","version":"1.1","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.42","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.jetbrains.php","version":"144.3656","since":"144.3600","until":"144.*","originalSince":"144.3600","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"144.3713","since":"144.3713","until":"181.0","originalSince":"144.3713","originalUntil":null},{"id":"OptimizeImportsForScope","version":"1.0","since":"143.1821","until":"201.0","originalSince":"143.1821","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"4.0.1","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.4.4","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.28-SNAPSHOT","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"phpfmt","version":"1.0.10","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.minutephp.framework","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.perl5","version":"1.331","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.github.tom-power.close-tab-left-right","version":"1.1","since":"141.0","until":"183.1044","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.5-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"Pythonid","version":"5.1.144.1661","since":"144.3891","until":"181.0","originalSince":"144.3891","originalUntil":null},{"id":"PythonCore","version":"5.1.144.1661","since":"144.3891","until":"181.0","originalSince":"144.3891","originalUntil":null},{"id":"com.dubreuia","version":"0.5","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"com.dubreuia","version":"0.6","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation6","version":"1.2","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.onkiup.minedroid","version":"1.3.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.onkiup.minedroid","version":"1.3.2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php","version":"144.3891.12","since":"144.3891","until":"144.*","originalSince":"144.3891","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.2.1.0","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.line.plugin.auto.align","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.dubreuia","version":"0.7","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"com.konifar.material_icon_generator","version":"1.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"xyz.marcato.ideaplugin.methodscount","version":"1.1.3","since":"139.0","until":"145.*","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.6-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"4.1","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"dbgsprw.apm","version":"1.3.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"5.0.0","since":"143.380","until":"223.*","originalSince":"143.380","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.3.1","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.coursehero.helper","version":"2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.coursehero.helper","version":"2.01","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.28","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"0.1.0","since":"134.549","until":"232.*","originalSince":"134.549","originalUntil":null},{"id":"com.squareup.sqldelight","version":"0.1.1","since":"134.549","until":"232.*","originalSince":"134.549","originalUntil":null},{"id":"com.squareup.sqldelight","version":"0.1.2","since":"134.549","until":"232.*","originalSince":"134.549","originalUntil":null},{"id":"Nette framework helpers","version":"0.4.0","since":"139.0","until":"192.0","originalSince":"139.0","originalUntil":null},{"id":"com.zenefits.hopefully","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.zenefits.hopefully","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"4.2","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.4.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"dbgsprw.apm","version":"1.3.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.7-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"MetricsReloaded","version":"1.3","since":"139.0","until":"212.*","originalSince":"139.0","originalUntil":null},{"id":"com.perl5","version":"1.333","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.performancePlugin","version":"1.3.1","since":"144.1000","until":"181.0","originalSince":"144.1000","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.3.0","since":"133.0","until":"223.*","originalSince":"133.0","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.3.0.0","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.widerwille.afterglow","version":"1.0.4","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.zenefits.hopefully","version":"1.0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.zenefits.hopefully","version":"1.0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.6.143.1","since":"143.1821","until":"181.0","originalSince":"143.1821","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.6.143.80","since":"143.2167","until":"181.0","originalSince":"143.2167","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.29","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"phpfmt","version":"1.0.11","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.2.3-beta","since":"143.1821","until":"163","originalSince":"143.1821","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.2.3-beta","since":"143.1821","until":"163","originalSince":"143.1821","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"4.2.1","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.8-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.develmagic.spoj.submitter","version":"1.8","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.github.francoiscambell.clionarduinoplugin","version":"1.2.2","since":"131.0","until":"163.0","originalSince":"131.0","originalUntil":null},{"id":"MetricsReloaded","version":"1.3.1","since":"139.0","until":"212.*","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.php","version":"144.4199.11","since":"144.4199","until":"144.*","originalSince":"144.4199","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"144.4199.11","since":"144.4199","until":"173.0","originalSince":"144.4199","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.8.9-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.3.1","since":"133.0","until":"223.*","originalSince":"133.0","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.3.1.0","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"xyz.marcato.ideaplugin.methodscount","version":"1.1.4","since":"139.0","until":"145.*","originalSince":"139.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.32","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.9.6","since":"135.0","until":"211.0","originalSince":"135.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.4.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.idea.android.superplugins.plugins","version":"1.0.0","since":"131.0","until":"191.0","originalSince":"131.0","originalUntil":null},{"id":"tirke.cupPlugin","version":"0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.widerwille.afterglow","version":"1.0.5","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.9","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.plugins.vagrant","version":"0.6.144.1701","since":"144.4199","until":"181.0","originalSince":"144.4199","originalUntil":null},{"id":"tirke.cupPlugin","version":"0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.9.7","since":"135.0","until":"211.0","originalSince":"135.0","originalUntil":null},{"id":"org.evosuite.plugin.intellij","version":"1.0.3","since":"143.0","until":"200","originalSince":"143.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.0.4","since":"133.0","until":"211","originalSince":"133.0","originalUntil":null},{"id":"WicketForge","version":"5.0.2","since":"138.0","until":"201","originalSince":"138.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"0.9.8","since":"135.0","until":"211.0","originalSince":"135.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.43","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.2.4-beta","since":"143.1821","until":"163","originalSince":"143.1821","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.2.4-beta","since":"143.1821","until":"163","originalSince":"143.1821","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.33","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"edu.gmu.cs.plugin.aeon","version":"1.14.1.3.7","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"tirke.cupPlugin","version":"0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.0","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.emberjs","version":"1.4.2","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"ca.rightsomegoodgames.mayacharm","version":"2.1","since":"131.0","until":"193.0","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.37","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.38","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"145.52","since":"145.52","until":"201","originalSince":"145.52","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.4-58","since":"141.2735","until":"191.*","originalSince":"141.2735","originalUntil":null},{"id":"com.footprint.asplugin.plugin.viewgenerator","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.footprint.asplugin.plugin.viewgenerator","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"tirke.cupPlugin","version":"0.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"VectorDrawableImporter","version":"0.1","since":"130.1619","until":"201.0","originalSince":"130.1619","originalUntil":null},{"id":"com.footprint.asplugin.plugin.viewgenerator","version":"1.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"VectorDrawableImporter","version":"0.2","since":"130.1619","until":"201.0","originalSince":"130.1619","originalUntil":null},{"id":"luonq.ScrollFromSource","version":"1.1.0","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"tirke.cupPlugin","version":"0.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.perl5","version":"1.340","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.footprint.asplugin.plugin.viewgenerator","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.11","since":"143.0","until":"193.*","originalSince":"143.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation6","version":"1.3","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"tirke.cupPlugin","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"MetricsReloaded","version":"1.4","since":"139.0","until":"212.*","originalSince":"139.0","originalUntil":null},{"id":"com.perl5","version":"1.341","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.nes.intellij.plugin.id","version":"1.3","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.intellij.plugins.translate","version":"1.0","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"pl.jgorowski.transplug","version":"0.2.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.12","since":"143.0","until":"193.*","originalSince":"143.0","originalUntil":null},{"id":"luonq.ScrollFromSource","version":"1.1.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.intellij.apacheConfig","version":"143.2287.2","since":"143.2287","until":"144.0","originalSince":"143.2287","originalUntil":null},{"id":"com.sbmpost","version":"0.1","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.philipleder.plugin.painpoint","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.philipleder.plugin.painpoint","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.philipleder.plugin.painpoint","version":"1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.4.0-idea-13-15","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.magento.idea.magento2plugin","version":"0.2.2","since":"139.0","until":"223.*","originalSince":"139.0","originalUntil":null},{"id":"pl.jgorowski.transplug","version":"0.3.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"pl.jgorowski.transplug","version":"0.3.1","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"org.elixir_lang","version":"2.2.0","since":"131.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.9.1","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"pl.jgorowski.transplug","version":"0.4.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.1.0-RC2","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.coursehero.helper","version":"2.10","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"2.2","since":"143.2","until":"145.*","originalSince":"143.2","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"1.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.eclipse.xtext.idea","version":"2.9.2","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"org.eclipse.xtend.idea","version":"2.9.2","since":"131.0","until":"163.1","originalSince":"131.0","originalUntil":null},{"id":"com.perl5","version":"1.342","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.flageolett.eZ.completion","version":"1.0.3","since":"131.0","until":"201","originalSince":"131.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.5.9","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.nes.intellij.plugin.id","version":"1.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.nes.intellij.plugin.id","version":"1.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.1","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.konifar.material_icon_generator","version":"1.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"SnakeYAML plugin","version":"1.17.0","since":"134.625","until":"223","originalSince":"134.625","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.2-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"uk.ac.glasgow.scclippy","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.ritesh.intellij.plugin.reviewboard","version":"0.1.3","since":"131.0","until":"193","originalSince":"131.0","originalUntil":null},{"id":"org.zkoss.zkidea","version":"0.1.7","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.3-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.intellij.stats.completion","version":"0.0.26","since":"144.0","until":"201","originalSince":"144.0","originalUntil":null},{"id":"ru.mipt.acsl.decode.idea.plugin","version":"0.3.0-SNAPSHOT","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Railways","version":"0.8.5","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"Railways for IDEA","version":"0.8.5","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"ch.uzh.ifi.batteryAwareTransformations","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"edu.ua.highbay.binderplugin","version":"0.5.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.footprint.asplugin.plugin.viewgenerator","version":"1.2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.1.2","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.5-60","since":"139.1603","until":"191.*","originalSince":"139.1603","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.5-63","since":"139.1603","until":"191.*","originalSince":"139.1603","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.5-65","since":"139.1603","until":"191.*","originalSince":"139.1603","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.9.2","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"CUBA","version":"3.0.0.15","since":"143.381","until":"211","originalSince":"143.381","originalUntil":null},{"id":"Pythonid","version":"5.1.145.45","since":"145.256","until":"181.0","originalSince":"145.256","originalUntil":null},{"id":"com.jetbrains.performancePlugin","version":"1.3.2","since":"144.1000","until":"181.0","originalSince":"144.1000","originalUntil":null},{"id":"PythonCore","version":"5.1.145.45","since":"145.256","until":"181.0","originalSince":"145.256","originalUntil":null},{"id":"com.jintin.droidlane","version":"2.0.0","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.3.2","since":"133.0","until":"223.*","originalSince":"133.0","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.3.1.1","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"ru.mipt.acsl.decode.idea.plugin","version":"0.4.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ru.mipt.acsl.decode.idea.plugin","version":"0.4.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.39","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"Compare Directories","version":"1.1.2","since":"140.0","until":"183.0","originalSince":"140.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.1.3","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.aqqxa.plugin.aligner","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"MetricsReloaded","version":"1.5","since":"139.0","until":"212.*","originalSince":"139.0","originalUntil":null},{"id":"YAML/Ansible support","version":"0.9.0","since":"111.0","until":"222","originalSince":"111.0","originalUntil":null},{"id":"com.aspose.Note.java.intellij.maven","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.aspose.Note.java.intellij.maven","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.aspose.Note.java.intellij.maven","version":"1.0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jintin.droidlane","version":"2.0.1","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.4-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"YAML/Ansible support","version":"0.9.1","since":"111.0","until":"222","originalSince":"111.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.40","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.2.0","since":"143.0","until":"202.*","originalSince":"143.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.41","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.zf.androidplugin.selectdrawable_generator","version":"1.0.6","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"1.3.4","since":"135.1230","until":"135.*","originalSince":"135.1230","originalUntil":null},{"id":"YAML/Ansible support","version":"0.9.2","since":"111.0","until":"222","originalSince":"111.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.42","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"GsonFormat","version":"1.2.2","since":"107.119","until":"201.0","originalSince":"107.119","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.43","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"pl.charmas.parcelablegenerator","version":"0.6.3","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.aspose.Note.java.intellij.maven","version":"1.0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.44","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.zf.androidplugin.selectdrawable_generator","version":"1.0.7","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.44","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.45","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"6.0.9.517","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.7 beta","since":"143.0","until":"213.*","originalSince":"143.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.4.1-idea-13-15","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"cucumber-javascript","version":"145.258.3","since":"145.258","until":"201","originalSince":"145.258","originalUntil":null},{"id":"siani.dev.itrules","version":"1.6.0","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.45","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"Osmorc","version":"1.4.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.46","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.nes.intellij.plugin.id","version":"1.6","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.30","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php","version":"145.258.2","since":"145.258","until":"145.*","originalSince":"145.258","originalUntil":null},{"id":"com.jetbrains.php.framework","version":"145.258.2","since":"145.258","until":"181.0","originalSince":"145.258","originalUntil":null},{"id":"com.intellij.phing","version":"145.258.2","since":"145.258","until":"181.0","originalSince":"145.258","originalUntil":null},{"id":"com.jetbrains.plugins.ini4idea","version":"145.258.2","since":"145.258","until":"201","originalSince":"145.258","originalUntil":null},{"id":"com.jetbrains.twig","version":"145.258.2","since":"145.258","until":"145.258","originalSince":"145.258","originalUntil":null},{"id":"com.jetbrains.php.drupal","version":"145.258.2","since":"145.258","until":"181.0","originalSince":"145.258","originalUntil":null},{"id":"com.jetbrains.php.wordPress","version":"145.258.2","since":"145.258","until":"181.0","originalSince":"145.258","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"145.258.2","since":"145.258","until":"173.0","originalSince":"145.258","originalUntil":null},{"id":"com.jetbrains.php.behat","version":"145.258.2","since":"145.258","until":"181.0","originalSince":"145.258","originalUntil":null},{"id":"com.jetbrains.php.blade","version":"145.258.2","since":"145.258","until":"181.0","originalSince":"145.258","originalUntil":null},{"id":"com.jetbrains.php.gae","version":"145.258.2","since":"145.258","until":"181.0","originalSince":"145.258","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"0.4.2","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.46","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.1.4","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.47","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.34","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.philipleder.plugin.painpoint","version":"1.17.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.4.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"SerialPortMonitor","version":"0.4.6","since":"141.245","until":"170.*","originalSince":"141.245","originalUntil":null},{"id":"com.konifar.material_icon_generator","version":"1.7","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.sylfra.idea.plugins.revu","version":"2.7.3","since":"133.193","until":"163.*","originalSince":"133.193","originalUntil":null},{"id":"codeReview4idea","version":"0.5.4","since":"141.177","until":"203","originalSince":"141.177","originalUntil":null},{"id":"SerialPortMonitor","version":"0.4.7","since":"141.245","until":"170.*","originalSince":"141.245","originalUntil":null},{"id":"com.philipleder.plugin.painpoint","version":"1.17.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"pl.psi.jls.wuff.plugin","version":"0.3.2","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.philipleder.plugin.painpoint","version":"1.17.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"pl.psi.jls.wuff.plugin","version":"0.3.3","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"IDETalk","version":"145.258.11","since":"145.258","until":"181.0","originalSince":"145.258","originalUntil":null},{"id":"pl.psi.jls.wuff.plugin","version":"0.3.4","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"GsonFormat","version":"1.2.3","since":"107.120","until":"201.0","originalSince":"107.120","originalUntil":null},{"id":"com.philipleder.plugin.painpoint","version":"1.17.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.philipleder.plugin.painpoint","version":"1.17.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.3.2.0","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.4.0","since":"133.0","until":"223.*","originalSince":"133.0","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.4.0.0","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.perl5","version":"1.401","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"ru.mobiledev.plugins.uigd","version":"1.0","since":"143.0","until":"201.6668","originalSince":"143.0","originalUntil":null},{"id":"com.billguard.appcodeplusplus","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.billguard.appcodeplusplus","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"phpfmt","version":"1.0.12","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.microsoft.tooling.msservices.intellij.azure","version":"1.2","since":"141.0","until":"163.0","originalSince":"141.0","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.2.1","since":"143.0","until":"183","originalSince":"143.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.13","since":"143.0","until":"193.*","originalSince":"143.0","originalUntil":null},{"id":"org.elixir_lang","version":"3.0.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"eu.inmite.android.plugin.preioc","version":"1.0.0","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.2","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"com.billguard.appcodeplusplus","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"MetricsReloaded","version":"1.6","since":"139.0","until":"212.*","originalSince":"139.0","originalUntil":null},{"id":"MetricsReloaded","version":"1.6.1","since":"139.0","until":"212.*","originalSince":"139.0","originalUntil":null},{"id":"RunTaskAction","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.bmesta.powermode","version":"0.9.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"Compare Directories","version":"1.1.3","since":"140.0","until":"183.0","originalSince":"140.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.31","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.philipleder.plugin.painpoint","version":"1.17.8","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.lopesdasilva.wcs.plugin","version":"0.3.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"pl.psi.jls.wuff.plugin","version":"0.3.5","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"ua.pp.madcap.codingame.plugin","version":"0.2.1","since":"140.0","until":"201.0","originalSince":"140.0","originalUntil":null},{"id":"ru.mipt.acsl.decode.idea.plugin","version":"0.4.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ru.mipt.acsl.decode.idea.plugin","version":"0.4.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.philipleder.plugin.painpoint","version":"1.17.9","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Compare Directories","version":"1.1.4","since":"140.0","until":"183.0","originalSince":"140.0","originalUntil":null},{"id":"ru.mipt.acsl.decode.idea.plugin","version":"0.4.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Vue.js","version":"1.1.0","since":"141.0","until":"181.0","originalSince":"141.0","originalUntil":null},{"id":"ru.mipt.acsl.decode.idea.plugin","version":"0.4.7","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"online.devliving.stepbuilder.generator","version":"1.0","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"CUBA","version":"3.1.0.16","since":"145.258","until":"211","originalSince":"145.258","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.5-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.widerwille.afterglow","version":"1.0.6","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"online.devliving.stepbuilder.generator","version":"1.0.1","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"org.typowriter.intellij.plugins.wallpaper","version":"0.0.2","since":"141.0","until":"173.0","originalSince":"141.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.0","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"com.lopesdasilva.wcs.plugin","version":"0.3.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.perl5","version":"1.402","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.widerwille.quicklook","version":"0.8.1","since":"145.0","until":"203","originalSince":"145.0","originalUntil":null},{"id":"com.widerwille.quicklook","version":"0.9","since":"145.0","until":"203","originalSince":"145.0","originalUntil":null},{"id":"phpfmt","version":"1.0.13","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"org.elixir_lang","version":"3.0.1","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.48","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"YAML/Ansible support","version":"0.9.3","since":"111.0","until":"222","originalSince":"111.0","originalUntil":null},{"id":"jp.codic.plugins.intellij","version":"1.0.11","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"com.dim.plugin.adbduang","version":"0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.emberjs","version":"1.5.0","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"org.buffagon.intellij.catberry","version":"0.4.1","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.atsebak.ui5","version":"2.05","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"com.infoedge.plugins.gcmtester","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.fuzz.internal.hooks","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"cucumber-java","version":"145.258","since":"145.258","until":"201","originalSince":"145.258","originalUntil":null},{"id":"cucumber-groovy","version":"145.258","since":"145.258","until":"201","originalSince":"145.258","originalUntil":null},{"id":"org.buffagon.intellij.catberry","version":"0.4.2","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"tirke.cupPlugin","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.3-beta","since":"143.1821","until":"163","originalSince":"143.1821","originalUntil":null},{"id":"JRebelPlugin","version":"6.4.2_13-16","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"gt.tool.plugins.org.json.gen","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"RunTaskAction","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"4.2.2","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.php.joomla","version":"145.844","since":"145.800","until":"201","originalSince":"145.800","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.3-beta","since":"143.1821","until":"163","originalSince":"143.1821","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.3.1","since":"131.0","until":"232","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.4.2a_13-16","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.lopesdasilva.wcs.plugin","version":"0.3.2.1-alpha","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.9.3","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.1","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.1.1","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.1.2","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.1.3","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"SequencePluginReload","version":"1.0.7","since":"139.1117","until":"202","originalSince":"139.1117","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"4.3","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"5.1.0","since":"143.380","until":"223.*","originalSince":"143.380","originalUntil":null},{"id":"com.widerwille.afterglow","version":"1.0.7","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.lopesdasilva.wcs.plugin","version":"0.3.2.2-alpha","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.sbmpost","version":"0.2","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"io.github.maddouri.intellij.OnlineSearch","version":"1.0","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"io.github.maddouri.intellij.OnlineSearch","version":"1.0.1","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"3.0","since":"145.0","until":"181.3494","originalSince":"145.0","originalUntil":null},{"id":"xyz.marcato.ideaplugin.methodscount","version":"1.1.5","since":"139.0","until":"145.*","originalSince":"139.0","originalUntil":null},{"id":"com.michaelbulava.TFSVCS","version":"0.2.2.250","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation6","version":"1.5","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"online.devliving.stepbuilder.generator","version":"1.0.2","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"3.0.1","since":"145.0","until":"181.3494","originalSince":"145.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation6","version":"1.5.1","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"me.drakeet.layoutformatter","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"me.drakeet.layoutformatter","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.49","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.2.0","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"org.turbanov.execution.cmd","version":"1.3","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"0.1.8","since":"122.519","until":"232.*","originalSince":"122.519","originalUntil":null},{"id":"com.line.plugin.auto.align","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lu.uni.clion.cproject","version":"1.0","since":"145.597","until":"201.0","originalSince":"145.597","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"0.4.3","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.6.9.6-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.scalafmt.ScalaFmt","version":"0.2.1","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.bugvm.intellij","version":"1.0.9","since":"143.1184","until":"201.0","originalSince":"143.1184","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.9.4","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"com.line.plugin.auto.align","version":"1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.widerwille.afterglow","version":"1.0.8","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"luonq.ScrollFromSource","version":"1.1.2","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.emberjs","version":"1.5.1","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"io.github.maddouri.intellij.OnlineSearch","version":"1.1.1","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"com.philipleder.plugin.marks","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.github.maddouri.intellij.OnlineSearch","version":"1.1.2","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"me.drakeet.layoutformatter","version":"1.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.pguardiola.androidresresizer","version":"0.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.codemind.wordcount","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.50","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.konifar.material_icon_generator","version":"1.8","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"me.drakeet.layoutformatter","version":"1.0.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"RunTaskAction","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"RunTaskAction","version":"1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.idamobile.android.toolbox","version":"1.1.7","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"IdeaVIM","version":"0.45-eap-321","since":"143.0","until":"181.0","originalSince":"143.0","originalUntil":null},{"id":"RunTaskAction","version":"1.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.32","since":"144.0","until":"201","originalSince":"144.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.0.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.0.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.google.gct.login","version":"0.9.4-beta","since":"143.1821","until":"163","originalSince":"143.1821","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.396","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"com.beust.kobalt.intellij","version":"1.51","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.52","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"fr.idapps.intellij.plugin.android.gotolayout","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.2.18","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"163.0"},{"id":"com.millennialmedia.intellibot","version":"0.9.107.105","since":"107.105","until":"222.*","originalSince":"107.105","originalUntil":null},{"id":"com.millennialmedia.intellibot","version":"0.9.143.381","since":"143.381","until":"222.*","originalSince":"143.381","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.53","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.54","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.398","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"nl.tudelft.watchdog","version":"2.0.0","since":"139.0","until":"200","originalSince":"139.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"8.1.30331","since":"136.0","until":"171.4249","originalSince":"88.10000","originalUntil":null},{"id":"IdeaVIM","version":"0.45-eap-323","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.399","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"com.shahab.rewatch","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.400","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"com.line.plugin.auto.align","version":"1.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"me.drakeet.layoutformatter","version":"1.1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"me.drakeet.layoutformatter","version":"1.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.4.3","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.google.gct.login","version":"0.9.4-beta","since":"143.1821","until":"163","originalSince":"143.1821","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.0.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.0.2-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.beust.kobalt.intellij","version":"1.55","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.402","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"org.intellij.scala","version":"3.0.2.20","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"163.0"},{"id":"com.beust.kobalt.intellij","version":"1.56","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.microsoft.tooling.msservices.intellij.azure","version":"1.3","since":"141.0","until":"163.0","originalSince":"141.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.57","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.405","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"me.drakeet.layoutformatter","version":"1.1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"yan.intellij.plugin.grailsTools","version":"0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.perl5","version":"1.500","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"GenerateTests","version":"1.0","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"GenerateTests","version":"1.0.1","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.0.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.0.3-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.intellij.scala","version":"3.0.406","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"me.drakeet.layoutformatter","version":"1.1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.3","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"163.0"},{"id":"org.intellij.scala","version":"3.0.3","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"163.0"},{"id":"org.intellij.plugins.hcl","version":"0.5.3","since":"139.0","until":"192.*","originalSince":"139.0","originalUntil":null},{"id":"IdeaVIM","version":"0.45-eap-324","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"IdeaVIM","version":"0.45-eap-325","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.407","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"lsfusion.idea.plugin","version":"1.0.47","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"IdeaVIM","version":"0.45-eap-326","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.409","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"com.jiyuanime.ActivatePowerModeApplicationPlugin","version":"0.0.8","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"IdeaVIM","version":"0.45-eap-327","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"com.shahab.rewatch","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.410","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"com.siberika.idea.pascal","version":"1.01","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.intellij.scala","version":"3.0.412","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"com.philipleder.plugin.marks","version":"1.2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.softdream.intellij.plugin","version":"1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.4.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.bryansharpe.slackstorm","version":"1.7","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.33","since":"144.0","until":"201","originalSince":"144.0","originalUntil":null},{"id":"com.perl5","version":"1.505","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.1.4","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"GenerateTests","version":"1.0.2","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"io.github.jhsx.GoJetPlugin","version":"0.0","since":"143.379","until":"201.0","originalSince":"143.379","originalUntil":null},{"id":"com.vpedak.testsrecorder.plugin.id","version":"0.9.5","since":"131.0","until":"145.0","originalSince":"131.0","originalUntil":null},{"id":"io.github.jhsx.GoJetPlugin","version":"0.2","since":"143.379","until":"201.0","originalSince":"143.379","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.3.22","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"163.0"},{"id":"com.msiddeek.webpstinks","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.msiddeek.webpstinks","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.msiddeek.webpstinks","version":"1.1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.msiddeek.webpstinks","version":"1.1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.msiddeek.webpstinks","version":"1.1.3git a","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.msiddeek.webpstinks","version":"1.1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.dubreuia","version":"0.8","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.413","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"EclipseCodeFormatter","version":"15.5.132.637.1","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.layernet.plugin.adbwifi","version":"1.0.5","since":"143.1184","until":"201.0","originalSince":"143.1184","originalUntil":null},{"id":"com.intellij.plugins.html.instantEditing","version":"162.5","since":"162.5","until":"181.0","originalSince":"162.5","originalUntil":"162.*"},{"id":"org.scalafmt.ScalaFmt","version":"0.2.3","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.3.2","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.robotium.recorder.intellij","version":"2.3.3","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.3.4","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.3.5","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.dubreuia","version":"0.9","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"15.5.132.637.2","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.github.shiraji.createintentinspection","version":"0.1.0","since":"131.0","until":"213.*","originalSince":"131.0","originalUntil":null},{"id":"MetricsReloaded","version":"1.7","since":"139.0","until":"212.*","originalSince":"139.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.8 beta","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.1","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"com.github.shiraji.newinstanceinspection","version":"0.1.0","since":"131.0","until":"213.*","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.419","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"cucumber-java","version":"145.597","since":"145.597","until":"201","originalSince":"145.597","originalUntil":null},{"id":"cucumber-groovy","version":"145.597","since":"145.597","until":"201","originalSince":"145.597","originalUntil":null},{"id":"com.fueled.mvp","version":"0.1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.2","since":"145.258","until":"201","originalSince":"145.258","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.420","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"com.beust.kobalt.intellij","version":"1.100","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.jmg.codecomment","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"pl.charmas.parcelablegenerator","version":"0.7.0","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.jetbrains.php","version":"145.970.40","since":"145.970","until":"145.*","originalSince":"145.970","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.2-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.beust.kobalt.intellij","version":"1.101","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.1.5","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"com.dim.plugin.adbduang","version":"0.2","since":"142.0","until":"201.0","originalSince":"142.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.1.6","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.3.25","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"163.0"},{"id":"org.intellij.scala","version":"3.0.422","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"org.jetbrains.kotlin","version":"1.0.2-release-IJ141-54","since":"141.1009","until":"141.*","originalSince":"141.1009","originalUntil":"141.*"},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.3-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.beust.kobalt.intellij","version":"1.102","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.scala","version":"3.0.425","since":"145.184","until":"181.0","originalSince":"145.184","originalUntil":"162.*"},{"id":"com.neueda4j.intellij.plugin.cypher","version":"1.0.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.jmg.codecomment","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"145.970.40","since":"145.970","until":"173.0","originalSince":"145.970","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.3.6","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"4.3.1","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.1.7","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.4.4","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"org.scalafmt.ScalaFmt","version":"0.2.4","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"Nette framework helpers","version":"0.4.1","since":"139.0","until":"192.0","originalSince":"139.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.8.0","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.5-68","since":"139.1603","until":"191.*","originalSince":"139.1603","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.5-69","since":"139.1603","until":"191.*","originalSince":"139.1603","originalUntil":null},{"id":"Pull up method refactoring extension","version":"0.3e","since":"141.3056","until":"201.0","originalSince":"141.3056","originalUntil":null},{"id":"pl.psi.jls.wuff.plugin","version":"0.3.6","since":"135.0","until":"201.0","originalSince":"135.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.2.5","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.4-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.softbank.robot.sdkplugin","version":"0.9.0","since":"141.1532","until":"211.*","originalSince":"141.1532","originalUntil":null},{"id":"com.jetbrains.php.blade","version":"145.970.40","since":"145.970","until":"181.0","originalSince":"145.970","originalUntil":null},{"id":"com.jetbrains.php.behat","version":"145.970.40","since":"145.970","until":"181.0","originalSince":"145.970","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.5-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.coursehero.helper","version":"3.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"5.2.0","since":"143.380","until":"223.*","originalSince":"143.380","originalUntil":null},{"id":"com.shahab.rewatch","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.6-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.sked.yorklogcat","version":"3.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.sked.soft.crater","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.3.0","since":"143.0","until":"202.*","originalSince":"143.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.0.1","since":"162.0","until":"211.0","originalSince":"162.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.0.2","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.7-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.philipleder.plugin.marks","version":"1.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.android.newclassdialog","version":"1.2","since":"141.0","until":"193.*","originalSince":"141.0","originalUntil":null},{"id":"com.coursehero.helper","version":"3.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"UDC","version":"0.9","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.csky.manifestmodify","version":"2.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.103","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.plugins.jade","version":"162.427","since":"162.300","until":"162.*","originalSince":"162.74","originalUntil":"162.*"},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.8-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.iTimeTrack.intellij.plugin","version":"7.0.5","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.104","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"UDC","version":"0.9.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.michaelbulava.TFSVCS","version":"0.3.0.300","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"org.eclipse.xtext.idea","version":"2.10.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.eclipse.xtend.idea","version":"2.10.0","since":"145.0","until":"173.1","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.0.3","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.php","version":"162.426.10","since":"162.426","until":"162.426","originalSince":"162.426","originalUntil":null},{"id":"com.dubreuia","version":"0.10","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"com.dubreuia","version":"0.11","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"com.sjtu.chenzhongpu.sparkexamplexmvn","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"nl.tudelft.watchdog","version":"2.0.1","since":"139.0","until":"200","originalSince":"139.0","originalUntil":null},{"id":"com.philipleder.plugin.marks","version":"1.3.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.sjtu.chenzhongpu.sparkexamplexmvn","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.998","since":"143.0","until":"181.*","originalSince":"143.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.0.4","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.0.5","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"2.3","since":"143.2","until":"145.*","originalSince":"143.2","originalUntil":null},{"id":"com.sjtu.chenzhongpu.sparkexamplexmvn","version":"1.2.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.perl5","version":"2.0","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.105","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.perl5","version":"2.001","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"UDC","version":"0.9.2","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.bugvm.intellij","version":"1.1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jmg.codecomment","version":"2.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"FindBugs-IDEA","version":"0.9.999","since":"143.0","until":"181.*","originalSince":"143.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.1.9-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.beust.kobalt.intellij","version":"1.107","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"ru.hungrymole.kotlin","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"5.3.0","since":"143.380","until":"223.*","originalSince":"143.380","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.0.6","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.108","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"FindBugs-IDEA","version":"1.0.0","since":"143.0","until":"181.*","originalSince":"143.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.32","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"ru.hungrymole.kotlin","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation6","version":"1.6.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"UDC","version":"0.9.3","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"xyz.marcato.ideaplugin.methodscount","version":"1.2.0","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"UDC","version":"0.9.3.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"UDC","version":"0.9.3.2","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.0.7","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.0-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.beust.kobalt.intellij","version":"1.109","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.millennialmedia.intellibot","version":"0.10.107.105","since":"107.105","until":"222.*","originalSince":"107.105","originalUntil":null},{"id":"com.millennialmedia.intellibot","version":"0.10.143.381","since":"143.381","until":"222.*","originalSince":"143.381","originalUntil":null},{"id":"com.csky.manifestmodify","version":"3.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"me.drakeet.layoutformatter","version":"1.1.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.lichfaker.plugin.id","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"UDC","version":"0.9.3.3","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.mglaman.drupal_run_tests","version":"1.0-alpha1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.110","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.mglaman.drupal_run_tests","version":"1.0-alpha2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.mglaman.drupal_run_tests","version":"1.0-alpha3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.php","version":"162.646.18","since":"162.646","until":"162.646","originalSince":"162.646","originalUntil":null},{"id":"com.widerwille.quicklook","version":"0.9.1","since":"145.0","until":"203","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.0.8","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"com.pengli","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"jss.JumpSourceSpec","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.111","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.php.joomla","version":"162.646.18","since":"162.646","until":"162.646","originalSince":"162.646","originalUntil":null},{"id":"jss.JumpSourceSpec","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"jss.JumpSourceSpec","version":"1.0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.perl5","version":"2.005","since":"141.0","until":"162.*","originalSince":"141.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"4.3.2","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.3.2","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"com.denis.zaichenko.angular.2.ws.live.templates","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.2.0","since":"143.2370","until":"211","originalSince":"143.2370","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.0.9","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.1.0","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.1.1","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.48","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"phpfmt","version":"1.1.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.1-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"phpfmt","version":"1.1.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.denis.zaichenko.angular.2.ws.live.templates","version":"1.0.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.02","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.112","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.denis.zaichenko.angular.2.ws.live.templates","version":"1.0.2","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.0.30","since":"143.0","until":"211","originalSince":"143.0","originalUntil":null},{"id":"UDC","version":"0.9.4","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"UDC","version":"0.9.4.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.michaelbulava.TFSVCS","version":"0.3.0.301","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.mglaman.drupal_run_tests","version":"1.0-beta1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.sked.yorklogcat","version":"3.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"Mongo Plugin","version":"0.7.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"0.5.0","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.1.2","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"com.mglaman.drupal_run_tests","version":"1.0-beta2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.0.5.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.shiraji.hidetoolwindowsex","version":"0.0.4","since":"131.0","until":"193.*","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.3.1","since":"143.0","until":"202.*","originalSince":"143.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.33","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.corrector","version":"1.2.1","since":"145.0","until":"146.0","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.corrector","version":"1.2.2","since":"145.0","until":"146.0","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.49","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"EclipseCodeFormatter","version":"15.6.132.637.1","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"software.amazon.ion.intellj","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"nl.tudelft.watchdog","version":"2.0.2","since":"139.0","until":"200","originalSince":"139.0","originalUntil":null},{"id":"com.jmg.codecomment","version":"2.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.universityandroid.tutorial","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.Deadleg.idea-openresty-lua-support","version":"0.0.3","since":"141.0","until":"203.*","originalSince":"141.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.0.5.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.samsonova.scala.sd.id","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.0.5.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.philipleder.plugin.marks","version":"1.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.strv.linecounter","version":"1.2","since":"135.1286","until":"201.0","originalSince":"135.1286","originalUntil":null},{"id":"com.octogog.idea.bazel-build-formatter","version":"0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.octogog.idea.bazel-build-formatter","version":"0.1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"UDC","version":"0.9.5","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"UDC","version":"0.9.5.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.universityandroid.tutorial","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.0.5.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.2.0","since":"143.0","until":"163","originalSince":"143.0","originalUntil":null},{"id":"org.jetbrains.gsearch","version":"0.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.rbf.unique.plugin.id","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.octogog.idea.bazel-build-formatter","version":"0.1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.octogog.idea.bazel-build-formatter","version":"0.1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.octogog.idea.bazel-build-formatter","version":"0.1.3.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.octogog.idea.bazel-build-formatter","version":"0.1.3.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.octogog.idea.bazel-build-formatter","version":"0.1.3.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.octogog.idea.bazel-build-formatter","version":"0.1.3.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.50","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.2-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"org.jetbrains.gsearch","version":"0.11","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.gsearch","version":"0.12","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.0.5.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.elixir_lang","version":"4.0.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.taobao.wuzheng","version":"1.1","since":"162","until":"","originalSince":"93.13","originalUntil":null},{"id":"com.bugvm.intellij","version":"1.1.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.0.5.7","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.widerwille.quicklook","version":"0.9.2","since":"162.0","until":"203","originalSince":"162.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.113","since":"145.1617","until":"211","originalSince":"145.1617","originalUntil":null},{"id":"com.codewaves.intellij.plugin.iconcreator","version":"0.9","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.codewaves.intellij.plugin.iconcreator","version":"0.9.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"UDC","version":"1.0.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.universityandroid.tutorial","version":"1.1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.3-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.samsonova.scala.sd.id","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.perl5","version":"2.100","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.0.5.8","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.strv.linecounter","version":"1.3","since":"135.1286","until":"201.0","originalSince":"135.1286","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.51","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.flageolett.eZ.completion","version":"1.0.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.10.1","since":"145.0","until":"221","originalSince":"145.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.34","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.2.6","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"GsonOrXmlFormat","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.4-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"com.google.gct.login","version":"0.9.5-beta","since":"143.1821","until":"163","originalSince":"143.1821","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.3.2","since":"143.0","until":"202.*","originalSince":"143.0","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.6-beta","since":"143.1821","until":"163","originalSince":"143.1821","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.6-beta","since":"143.1821","until":"163","originalSince":"143.1821","originalUntil":null},{"id":"A move tab left and right using the keyboard plugin - by momomo.com","version":"3.25","since":"111","until":"","originalSince":"101.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.5-idea12","since":"129.1525","until":"129.*","originalSince":"129.1525","originalUntil":"129.*"},{"id":"lsfusion.idea.plugin","version":"1.0.52","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.2.8","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.2.2","since":"143.0","until":"183","originalSince":"143.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.35","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.4.6","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.robotium.recorder.intellij","version":"2.4.0","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.4.1","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.53","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"Error-prone plugin","version":"162.1120","since":"143.0","until":"171.0","originalSince":"143.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.michaelbulava.TFSVCS","version":"0.3.0.302","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.droidtestlab.espressoblackbox.id","version":"1.0 beta","since":"143.0","until":"145.0","originalSince":"143.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"4.0","since":"145.0","until":"181.3494","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"162.1115","since":"162.1024","until":"201","originalSince":"162.1024","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.0.5.10","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.31","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.sked.soft.crater","version":"1.0.10","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.0.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.114","since":"145.1617","until":"211","originalSince":"145.1617","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.2.9","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"de.sgalinski.typoscript.plugin.id","version":"1.7","since":"143.0","until":"231","originalSince":"143.0","originalUntil":null},{"id":"com.microsoft.tooling.msservices.intellij.azure","version":"1.4","since":"141.0","until":"163.0","originalSince":"141.0","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.0.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.2.10","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.jantvrdik.intellij.latte","version":"0.3.3","since":"139.0","until":"201.*","originalSince":"139.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.0.5.11","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.perl5","version":"2.111","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"0.8.0","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"15.7.132.637.1","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.4.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.1.0","since":"143.0","until":"211","originalSince":"143.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.9.7-beta-SNAPSHOT","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.9.7-beta-SNAPSHOT","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.4","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.4","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"15.7.132.637.2","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.54","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.0.6.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.0.6.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.2.1","since":"143.0","until":"163","originalSince":"143.0","originalUntil":null},{"id":"LogSupportLite","version":"0.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.32","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.33","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"LogSupportLite","version":"0.4.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.writeoncereadmany.semantichighlighting","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"IdeaVIM","version":"0.46","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"IdeaVIM","version":"0.46","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"com.tagmycode.intellij","version":"2.0","since":"133.696","until":"231","originalSince":"133.696","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.2.11","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.vladsch.idea.multimarkdown","version":"1.8.1","since":"141.1532","until":"212.0","originalSince":"141.1532","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.4.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.14","since":"143.0","until":"193.*","originalSince":"143.0","originalUntil":null},{"id":"com.boohee.plugin.translation","version":"1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.boredream.plugin.layoutcreator","version":"1.4","since":"103.0","until":"201.0","originalSince":"103.0","originalUntil":null},{"id":"com.sum.qiu","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.droidtestlab.espressoblackbox.id","version":"1.0","since":"143.0","until":"145.0","originalSince":"143.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.2.1","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.7-beta","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.7-beta","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"com.github.tom-power.close-tab-left-right","version":"1.1.1","since":"141.0","until":"183.1044","originalSince":"141.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"0.2.0","since":"122.519","until":"232.*","originalSince":"122.519","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"Royll.ID","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.ykfs.plugin.generate","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.2.2","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.4.6.1","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.perl5","version":"2.117","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.getsensibill.stylecreator","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.2.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"CollabNet Tools","version":"1.1.2","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"com.gutils.android.autocode.plugin.intellij","version":"1.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.2.3","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.dim.plugin.adbduang","version":"0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"5.4.0","since":"143.380","until":"223.*","originalSince":"143.380","originalUntil":null},{"id":"EclipseCodeFormatter","version":"15.8.132.637.1","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"PsiViewer","version":"3.28.79","since":"130.0","until":"130.*","originalSince":"130.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.5-SNAPSHOT","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"PsiViewer","version":"3.28.85","since":"130.0","until":"130.*","originalSince":"130.0","originalUntil":null},{"id":"cn.magicwindow.sdk","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.3.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"cn.magicwindow.sdk","version":"1.1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.34","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.115","since":"162.1121.32","until":"211","originalSince":"162.1121.32","originalUntil":null},{"id":"cn.magicwindow.sdk","version":"1.1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"bigfootindie.log_generator","version":"0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"bigfootindie.log_generator","version":"0.31","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.3.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"162.1439","since":"162.1439","until":"201","originalSince":"162.1439","originalUntil":null},{"id":"com.umu.langtip","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.116","since":"162.1121.32","until":"211","originalSince":"162.1121.32","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.117","since":"162.1121.32","until":"211","originalSince":"162.1121.32","originalUntil":null},{"id":"com.github.alvaromarco.CleanArchitecturePlugin","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"Railways","version":"0.8.6","since":"134.231","until":"170.*","originalSince":"134.231","originalUntil":null},{"id":"Railways for IDEA","version":"0.8.6","since":"134.231","until":"181.0","originalSince":"134.231","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.3.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.universityandroid.tutorial","version":"1.1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"cn.magicwindow.sdk","version":"1.1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.3.3","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.1.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.15","since":"143.0","until":"193.*","originalSince":"143.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.1.1","since":"143.0","until":"211","originalSince":"143.0","originalUntil":null},{"id":"com.github.pedrovgs.androidwifiadb","version":"2.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"cn.magicwindow.sdk","version":"1.1.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.ivoryartwork.plugin.folivora","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.ivoryartwork.plugin.folivora","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.thbs.materialdesign","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.3.4","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"cn.magicwindow.sdk","version":"1.1.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.javils.ThemeSwitcher","version":"1.0","since":"131.0","until":"171.*","originalSince":"131.0","originalUntil":null},{"id":"com.javils.ThemeSwitcher","version":"1.1","since":"131.0","until":"171.*","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.annotations.preloader","version":"1.0.3","since":"145.0","until":"212.2689","originalSince":"145.0","originalUntil":null},{"id":"io.halik.intellij-plugin","version":"0.2.4","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.perl5","version":"2.200","since":"139.0","until":"162.*","originalSince":"139.0","originalUntil":null},{"id":"com.writeoncereadmany.semantichighlighting","version":"0.1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"net.kotek.multidpi","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"4.0.1","since":"145.0","until":"181.3494","originalSince":"145.0","originalUntil":null},{"id":"com.emberjs","version":"1.5.2","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"com.github.alvaromarco.CleanArchitecturePlugin","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.emberjs","version":"2.0.0","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.4.7","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"Jetbrains TeamCity Plugin","version":"9.1.37645","since":"136.0","until":"171.4249","originalSince":"117.105","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.3.5","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.4","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"com.github.alvaromarco.CleanArchitecturePlugin","version":"1.0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.javils.ThemeSwitcher","version":"1.2","since":"131.0","until":"171.*","originalSince":"131.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.3.6","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.36","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.github.aayvazyan","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.aayvazyan","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"AWSCloudFormation","version":"0.4.30","since":"145.1","until":"163.*","originalSince":"145.1","originalUntil":"163.99999"},{"id":"org.intellij.plugins.hcl","version":"0.5.5","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"ca.rightsomegoodgames.mayacharm","version":"2.1.1","since":"131.0","until":"193.0","originalSince":"131.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.1.4","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.55","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.github.aayvazyan","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.thbs.materialdesign","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.alvaromarco.CleanArchitecturePlugin","version":"1.0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.56","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.necisstudio.adbwifiandroid","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.6","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"org.elixir_lang","version":"4.1.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"4.1","since":"145.0","until":"181.3494","originalSince":"145.0","originalUntil":null},{"id":"org.turbanov.execution.cmd","version":"1.4","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.necisstudio.logisys","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.dynatrace.integration.idea","version":"2.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.thbs.materialdesign","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.57","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.3.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"4.1.1","since":"145.0","until":"181.3494","originalSince":"145.0","originalUntil":null},{"id":"YAML/Ansible support","version":"0.9.4","since":"111.0","until":"222","originalSince":"111.0","originalUntil":null},{"id":"HybrisPlugin","version":"1.2.4","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.sencha.idea.IdeaPlugin","version":"6.0.11.531","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.119","since":"162.1121.32","until":"211","originalSince":"162.1121.32","originalUntil":null},{"id":"com.dynatrace.integration.idea","version":"2.0.2","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"org.mayevskiy.intellij.sonar","version":"2.1.0","since":"162.0","until":"162.*","originalSince":"162.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.4.2","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.thbs.materialdesign","version":"1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.flow.intellij","version":"0.0.3","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":"999.99999"},{"id":"com.google.gct.login","version":"0.9.7.1-beta","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.7.2-beta","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"cucumber-javascript","version":"163.2600","since":"163.2600","until":"201","originalSince":"163.2600","originalUntil":null},{"id":"com.dynatrace.integration.idea","version":"2.0.3","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.58","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"tw.yalan.android.plugin.findviewbyidtobindview","version":"1.0","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"tw.yalan.android.plugin.findviewbyidtobindview","version":"1.1","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"org.elixir_lang","version":"4.2.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.konifar.stringssearch","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.9 beta","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.37","since":"144.0","until":"201","originalSince":"144.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.59","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"LivePlugin","version":"0.5.10 beta","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.7","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"tw.yalan.android.plugin.findviewbyidtobindview","version":"1.2","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.gogh.android.plugin.translation","version":"1.04.06","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"blast.browser","version":"1.0","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"com.gogh.android.plugin.easytranslation","version":"1.04.06","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.3.0","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.3.3","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.gogh.android.plugin.easytranslation","version":"1.04.07","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.gogh.android.plugin.translation","version":"1.04.07","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.4.8","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"org.jetbrains.plugins.sample.ToolWindow","version":"10-1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"5.5.0","since":"143.380","until":"223.*","originalSince":"143.380","originalUntil":null},{"id":"com.ludditelabs.autodocintellij.plugin","version":"0.1.0","since":"141.0","until":"145.*","originalSince":"141.0","originalUntil":null},{"id":"com.dubreuia","version":"0.12","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"com.ludditelabs.autodocintellij.plugin","version":"0.1.1","since":"141.0","until":"145.*","originalSince":"141.0","originalUntil":null},{"id":"net.coding.git","version":"1.0.0-beta","since":"162.0","until":"193","originalSince":"162.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.3.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.shang.android.layoutformat","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.shang.android.layoutformat","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.3.1","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.60","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"4.1.2","since":"145.0","until":"181.3494","originalSince":"145.0","originalUntil":null},{"id":"JSSorter","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"UDC","version":"1.0.2","since":"139.0","until":"183.*","originalSince":"139.0","originalUntil":null},{"id":"com.ludditelabs.autodocintellij.plugin","version":"0.1.2","since":"141.0","until":"145.*","originalSince":"141.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.4.7","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.flow.intellij","version":"0.0.4","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":"999.99999"},{"id":"AureliaStorm","version":"0.2","since":"162.1628","until":"213.0","originalSince":"162.1628","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"1.2","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.7.3-beta","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.3.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.google.gct.login","version":"0.9.7.5-beta","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"org.moe","version":"1.1.0","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.juanfelippo.translator","version":"1.0","since":"141.0","until":"193.*","originalSince":"141.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.4.0","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"com.denis.zaichenko.angular.2.ws.live.templates","version":"1.0.3","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.4.0","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.pdehaan.idea-plugin-flatbuffers","version":"0.0.1","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"com.farbluer.intellij.plugin.p4Intellij","version":"1.1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"me.pkhope.plugin.library_manager","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"15.9.163.3094.1","since":"163.3094","until":"202","originalSince":"163.3094","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"1.2.1","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"de.caluga.intellij.plugin.gpe","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"cn.magicwindow.sdk","version":"1.1.6","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.8","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.05","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.roysom.closeallprocesses","version":"0.1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"kodebeagleidea","version":"0.1.5","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"163.3512.9","since":"163.3512.9","until":"201","originalSince":"163.3512.9","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.3.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"IdeaVIM","version":"0.46.1","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.3.0","since":"143.2370","until":"211","originalSince":"143.2370","originalUntil":null},{"id":"com.alexanderpa.flyway.migration.creator","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.microsoft.tooling.msservices.intellij.azure","version":"1.5","since":"141.0","until":"163.0","originalSince":"141.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.11","since":"145.0","until":"221","originalSince":"145.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.2.3","since":"144.0","until":"163","originalSince":"144.0","originalUntil":null},{"id":"cn.pinmix.shaohui.ACNPlugin","version":"0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"MetricsReloaded","version":"1.8","since":"139.0","until":"212.*","originalSince":"139.0","originalUntil":null},{"id":"cn.pinmix.shaohui.ACNPlugin","version":"0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"2.4","since":"143.2","until":"145.*","originalSince":"143.2","originalUntil":null},{"id":"com.shang.android.layoutformat","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.exynap.plugin","version":"1.0.0 beta","since":"143.290","until":"201.0","originalSince":"143.290","originalUntil":null},{"id":"com.exynap.plugin","version":"1.0.1 beta","since":"143.290","until":"201.0","originalSince":"143.290","originalUntil":null},{"id":"com.basisjs","version":"0.1.3","since":"162.0","until":"181.0","originalSince":"162.0","originalUntil":null},{"id":"org.elixir_lang","version":"4.3.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"CUBA","version":"3.2.0.16","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"AureliaStorm","version":"0.3","since":"162.1628","until":"213.0","originalSince":"162.1628","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.3.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"JSSorter","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.ryan.MvpClassesGenerator","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.ryan.MvpClassesGenerator","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.ryan.MvpClassesGenerator","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.likfe.ideaplugin.eventbus3","version":"1.1","since":"136.0","until":"223.*","originalSince":"136.0","originalUntil":null},{"id":"CUBA","version":"3.2.1.16","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"cn.pinmix.shaohui.ACNPlugin","version":"0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.basisjs","version":"0.1.4.1","since":"162.0","until":"181.0","originalSince":"162.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"16.0.163.3094","since":"163.3094","until":"202","originalSince":"163.3094","originalUntil":null},{"id":"cn.pinmix.shaohui.ACNPlugin","version":"0.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.thea.plugin.imagecompression","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"AtlasTool","version":"2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"AtlasTool","version":"2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.flow.intellij","version":"0.0.5","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":"999.99999"},{"id":"nix-idea","version":"0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.ivoryartwork.plugin.folivora","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"cn.leeii.plugin.annotation","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"cn.leeii.plugin.annotation","version":"1.6.0-SNAPSHOT","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"org.moe","version":"1.1.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.flow.intellij","version":"0.0.6","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":"999.99999"},{"id":"com.exynap.plugin","version":"1.1.0 beta","since":"143.290","until":"201.0","originalSince":"143.290","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.4.1","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"co.lujun.plugin.betranslate","version":"0.9.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.mglaman.drupal_run_tests","version":"1.0-rc1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"nix-idea","version":"0.2.0.1","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"gradle_cleaner_intellij_plugin","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"1.1.5","since":"145.0","until":"211.0","originalSince":"145.0","originalUntil":null},{"id":"com.tencent.bugly.plugin.idea","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.0.0","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"com.ioncodes.pasta","version":"0.9","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.lang.ejs","version":"163.3512.13","since":"163.3512.13","until":"163.*","originalSince":"163.3512.13","originalUntil":null},{"id":"com.microsoft.tooling.msservices.intellij.azure","version":"1.5.1","since":"141.0","until":"163.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.3.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"AtlasTool","version":"2.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"cn.leeii.plugin.annotation","version":"1.0.1","since":"2.0","until":"201.0","originalSince":"2.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.5.0","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.ioncodes.pasta","version":"0.9.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.flow.intellij","version":"0.0.7","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":"999.99999"},{"id":"com.intellij.stats.completion","version":"0.0.39","since":"144.0","until":"145","originalSince":"144.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.35","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.18","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.4.4","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"co.lujun.plugin.betranslate","version":"1.0.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"co.lujun.plugin.betranslate","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.emberjs","version":"2.1.0-0","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"co.lujun.plugin.betranslate","version":"1.0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.4.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"AtlasTool","version":"2.2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"AtlasTool","version":"2.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.0.3","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.0.4","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"co.lujun.plugin.betranslate","version":"1.0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.0.5","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.0.5.1","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"com.google.gct.login","version":"1.0-BETA-0.1","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"163.4330","since":"163.4330","until":"201","originalSince":"163.4330","originalUntil":null},{"id":"com.ankama.intellij.uuidmaker","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.intellij.plugins.ceylon.ide","version":"1.3.0-201609152231","since":"143.0","until":"213.*","originalSince":"143.0","originalUntil":null},{"id":"com.google.gct.login","version":"1.0-BETA-0.2","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"com.github.shchurov.prefseditor","version":"1.01","since":"143.1184","until":"211","originalSince":"143.1184","originalUntil":null},{"id":"com.konifar.material_icon_generator","version":"1.9","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"luonq.ScrollFromSource","version":"1.1.3","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.0.6","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"com.service-now.plugin.idea","version":"0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.service-now.plugin.idea","version":"0.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.elixir_lang","version":"4.4.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.github.shchurov.prefseditor","version":"1.02","since":"143.1184","until":"211","originalSince":"143.1184","originalUntil":null},{"id":"de.sgalinski.typoscript.plugin.id","version":"1.8.0","since":"143.0","until":"231","originalSince":"143.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.0.6.2","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.0.6.3","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"1.0","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.40","since":"144.0","until":"154","originalSince":"144.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.41","since":"144.0","until":"181.0","originalSince":"144.0","originalUntil":null},{"id":"com.flow.intellij","version":"0.0.8","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":"999.99999"},{"id":"ai.deckard.intellij.plugin","version":"0.2.1","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.4.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"ai.deckard.intellij.plugin","version":"0.2.2","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.0.7","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"1.1","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.9","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"merger4ideaPlugin","version":"1.1.1","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"ai.deckard.intellij.plugin","version":"0.2.11","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"io.nativetap.plugin","version":"1.2.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.4.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"1.1.2","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.4.5","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.growingio.sdkHelper","version":"0.8.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"Shuffler","version":"1.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"io.nativetap.plugin","version":"1.2.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.0.8","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"10.0.42241","since":"136.0","until":"171.4249","originalSince":"133.1800","originalUntil":null},{"id":"ai.deckard.intellij.plugin","version":"0.2.12","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.0.9","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.4.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"1.1.3","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.06","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"1.1.4","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"merger4ideaPlugin","version":"1.1.5","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"AtlasTool","version":"2.3.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"AtlasTool","version":"2.3.2.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"AtlasTool","version":"2.3.2.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"1.1.6","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.0.9.1","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"Shuffler","version":"1.6","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.5.0","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.5.1","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.exynap.plugin","version":"1.1.1 beta","since":"143.290","until":"201.0","originalSince":"143.290","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"4.2","since":"145.0","until":"181.3494","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.4.2","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.20","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.4.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"me.drakeet.layoutformatter","version":"1.1.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"1.2.2","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"IntelliJ-Shortcuts-For-AEM","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"IntelliJ-Shortcuts-For-AEM","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.4.1","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"AtlasTool","version":"2.3.2.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"AtlasTool","version":"2.3.2.4","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.flow.intellij","version":"0.0.9","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.4.2","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.yellow5a5","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"CUBA","version":"3.2.2.16","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"com.lypeer.matchmaker","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"io.nativetap.plugin","version":"1.2.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.5.1","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.illuminatedcloud.intellij","version":"1.7.4.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.lypeer.matchmaker","version":"1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.intellij.plugins.ceylon.ide","version":"1.3.0-201609301555","since":"143.0","until":"213.*","originalSince":"143.0","originalUntil":null},{"id":"IdeaVIM","version":"0.46.5","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"org.moe","version":"1.2.0","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.6","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.4.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.7","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.7","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"ru.mipt.acsl.decode.idea.plugin","version":"0.5.0.SNAPSHOT","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.flow.intellij","version":"v20161003170420","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.rybkin.jbehave.example-table-formatter","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.bryansharpe.slackstorm","version":"1.8","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.shchurov.prefseditor","version":"1.03","since":"143.1184","until":"211","originalSince":"143.1184","originalUntil":null},{"id":"tu.wenbo.easyliteral","version":"0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.christofferklang.pyxl","version":"1.2","since":"131.0","until":"201.8538.6","originalSince":"131.0","originalUntil":null},{"id":"com.flow.intellij","version":"v20161004135529","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"tu.wenbo.easyliteral","version":"0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"tu.wenbo.easyliteral","version":"0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.moe","version":"1.2.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.flow.intellij","version":"v20161005144639","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"10.0.42277","since":"136.0","until":"171.4249","originalSince":"133.1800","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.4.3","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"163.5642","since":"163.5642","until":"201","originalSince":"163.5642","originalUntil":null},{"id":"uk.co.drache.intellij.guavaPostfixCompletion","version":"1.1.3","since":"141.177","until":"181.3741.1","originalSince":"141.177","originalUntil":null},{"id":"com.stylint","version":"0.1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.exynap.plugin","version":"1.1.2 beta","since":"143.290","until":"201.0","originalSince":"143.290","originalUntil":null},{"id":"gherkin","version":"163.5644","since":"163.5644","until":"163.*","originalSince":"163.5644","originalUntil":null},{"id":"cucumber-java","version":"163.5644","since":"163.5644","until":"201","originalSince":"163.5644","originalUntil":null},{"id":"cucumber-groovy","version":"163.5644","since":"163.5644","until":"201","originalSince":"163.5644","originalUntil":null},{"id":"com.flow.intellij","version":"v20161007133102","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.flow.intellij","version":"v20161007133554","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.flow.intellij","version":"v20161007141251","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.stylint","version":"0.2.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.shchurov.prefseditor","version":"1.04","since":"143.1184","until":"211","originalSince":"143.1184","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.4.4","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"PsiViewer","version":"3.28.88","since":"130.0","until":"130.*","originalSince":"130.0","originalUntil":null},{"id":"PsiViewer","version":"3.28.89","since":"130.0","until":"130.*","originalSince":"130.0","originalUntil":null},{"id":"com.thomas.needham.neurophidea","version":"1.0.0","since":"141.0","until":"183.1","originalSince":"141.0","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.5-71","since":"139.1603","until":"191.*","originalSince":"139.1603","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.5-73","since":"139.1603","until":"191.*","originalSince":"139.1603","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.5-76","since":"139.1603","until":"191.*","originalSince":"139.1603","originalUntil":null},{"id":"com.thomas.needham.neurophidea","version":"1.0.1","since":"141.0","until":"183.1","originalSince":"141.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"5.0","since":"143.0","until":"211","originalSince":"143.0","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"163.5644.1","since":"163.5644","until":"201","originalSince":"163.5644","originalUntil":null},{"id":"com.jetbrains.lang.ejs","version":"163.5644.1","since":"163.5644","until":"163.*","originalSince":"163.5644","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"163.5644.1","since":"163.5644","until":"163.*","originalSince":"163.5644","originalUntil":null},{"id":"TFS","version":"163.5644.1","since":"163.5644","until":"191.*","originalSince":"163.5644","originalUntil":null},{"id":"cucumber-javascript","version":"163.5644.1","since":"163.5644","until":"201","originalSince":"163.5644","originalUntil":null},{"id":"CUBA","version":"3.2.3.16","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"5.0.1","since":"143.0","until":"211","originalSince":"143.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.4.5","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.github.shchurov.prefseditor","version":"1.05","since":"143.1184","until":"211","originalSince":"143.1184","originalUntil":null},{"id":"ua.pp.madcap.codingame.plugin","version":"0.2.2","since":"140.0","until":"201.0","originalSince":"140.0","originalUntil":null},{"id":"com.google.gct.login","version":"16.10.1","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.61","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.62","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.4.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"haxe.checkstyle","version":"1.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.flow.intellij","version":"v20161011181301","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.microsoft.tooling.msservices.intellij.azure","version":"1.5.2","since":"141.0","until":"163.0","originalSince":"141.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"1.3.0","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.10","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"5.6.0","since":"143.380","until":"223.*","originalSince":"143.380","originalUntil":null},{"id":"com.flow.intellij","version":"v20161012122353","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"org.intellij.plugins.ceylon.ide","version":"1.3.0-201610121525","since":"143.0","until":"213.*","originalSince":"143.0","originalUntil":null},{"id":"com.google.gct.login","version":"16.10.2","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"com.flow.intellij","version":"v20161012154735","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.google.gct.login","version":"16.10.3","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"com.google.gct.login","version":"16.10.4","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"com.github.shchurov.prefseditor","version":"1.06","since":"143.1184","until":"211","originalSince":"143.1184","originalUntil":null},{"id":"Mongo Plugin","version":"0.8.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.flow.intellij","version":"v20161013095003","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"co.lujun.plugin.colorpanelhelper","version":"1.0.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.flow.intellij","version":"v20161013172126","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.github.shchurov.prefseditor","version":"1.07","since":"143.1184","until":"211","originalSince":"143.1184","originalUntil":null},{"id":"com.philipleder.plugin.marks","version":"1.4.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.atlassian.clover","version":"idea-4.1.2","since":"111.69","until":"183.0","originalSince":"111.69","originalUntil":null},{"id":"siani.dev.itrules","version":"1.9.0","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"cucumber-javascript","version":"163.6110.28","since":"163.6110","until":"201","originalSince":"163.6110","originalUntil":null},{"id":"TFS","version":"163.6110.28","since":"163.6110","until":"191.*","originalSince":"163.6110","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.0.5-eap-66-IJ2016.3-1","since":"163.1","until":"181.0","originalSince":"163.1","originalUntil":"171.*"},{"id":"com.github.shchurov.prefseditor","version":"1.08","since":"143.1184","until":"211","originalSince":"143.1184","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.2.3","since":"143.0","until":"183","originalSince":"143.0","originalUntil":null},{"id":"com.github.shchurov.gradlestop","version":"1.0","since":"143.1184","until":"211","originalSince":"143.1184","originalUntil":null},{"id":"FindBugs-IDEA","version":"1.0.1","since":"143.0","until":"181.*","originalSince":"143.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"1.0","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.4.7","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"siani.dev.itrules","version":"1.9.1","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"5.1.2","since":"143.0","until":"211","originalSince":"143.0","originalUntil":null},{"id":"com.alibaba.baichuan","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"OdpsStudio","version":"2.0.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"1.0.1","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"me.aheadlcx.dimenhelper","version":"1.0","since":"1.0","until":"201.0","originalSince":"1.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"10.0.42318","since":"133.1800","until":"171.4249","originalSince":"133.1800","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.16","since":"143.0","until":"193.*","originalSince":"143.0","originalUntil":null},{"id":"me.aheadlcx.dimenhelper","version":"1.1","since":"1.0","until":"201.0","originalSince":"1.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"1.0.2","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"JRebelPlugin","version":"6.5.2","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"siani.dev.itrules","version":"1.9.2","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"IdeaVIM","version":"0.47","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"IdeaVIM","version":"0.47","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":">me.drakeet.plugin.multitype","version":"1.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"codes.ai.java.intellij","version":"0.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"0.5.0","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"codes.ai.java.intellij","version":"0.4.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.argus.cit.intellij","version":"1.0.2","since":"162.0","until":"181.0","originalSince":"162.0","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.1.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"163.6512.13","since":"163.6512","until":"201","originalSince":"163.6512","originalUntil":null},{"id":"TFS","version":"163.6512.13","since":"163.6512","until":"191.*","originalSince":"163.6512","originalUntil":null},{"id":"com.google.gct.login","version":"16.10.5","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.63","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"IdeaVIM","version":"0.47.1","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"adb.wifi.woaiwhz","version":"1.0-SNAPSHOT","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.shchurov.gradlestop","version":"1.1","since":"143.1184","until":"211","originalSince":"143.1184","originalUntil":null},{"id":"com.flow.intellij","version":"v20161023174627","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.5.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"codes.ai.java.intellij","version":"0.4.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"10.0.42318","since":"133.1800","until":"143.2200","originalSince":"133.1800","originalUntil":null},{"id":"com.mglaman.drupal_run_tests","version":"1.0-rc2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.argus.cit.intellij","version":"1.0.3","since":"162.0","until":"181.0","originalSince":"162.0","originalUntil":"162.*"},{"id":"com.squareup.sqldelight","version":"0.5.1","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"1.1","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"me.aleph0.androidexporter","version":"0.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.flow.intellij","version":"v20161025145105","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"cucumber-javascript","version":"163.6957.3","since":"163.6957","until":"201","originalSince":"163.6957","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"163.6957.3","since":"163.6957","until":"163.*","originalSince":"163.6957","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"163.6957.3","since":"163.6957","until":"201","originalSince":"163.6957","originalUntil":null},{"id":"TFS","version":"163.6957.3","since":"163.6957","until":"191.*","originalSince":"163.6957","originalUntil":null},{"id":"CssAlphabeticalRearranger","version":"0.5","since":"138.0","until":"183.0","originalSince":"138.0","originalUntil":null},{"id":"adb.wifi.woaiwhz","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"1.1.1","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.5.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":">me.drakeet.plugin.multitype","version":"1.0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.4.8","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.4.8.1","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.microsoft.tooling.msservices.intellij.azure","version":"1.5.3","since":"141.0","until":"163.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.5.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.xdandroid.scaterknife","version":"1.0.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.resharper.unity","version":"1.4.0.1","since":"163.7179","until":"171.0","originalSince":"163.7179","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"5.2","since":"143.0","until":"211","originalSince":"143.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.4.3","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"org.hexu.getcode","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.hexu.getcode","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"fr.tolc.jahia.intellij.plugin","version":"1.0","since":"107.105","until":"212.*","originalSince":"107.105","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.64","since":"143.1184","until":"213","originalSince":"143.1184","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.42","since":"144.0","until":"181.0","originalSince":"144.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.5.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.flow.intellij","version":"v20161031161145","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.intellij.resharper.HeapAllocationsViewer","version":"1.2.1.0","since":"163.7179","until":"172","originalSince":"163.7179","originalUntil":null},{"id":"com.cnfol.mrz","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"1.2.0","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"org.hexu.getcode","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"TRTIdea","version":"1.0","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.resharper.unity","version":"1.4.0.2","since":"163.7179","until":"163.*","originalSince":"163.7179","originalUntil":null},{"id":"com.intellij.resharper.unity","version":"1.4.0.3","since":"163.7179","until":"163.*","originalSince":"163.7179","originalUntil":null},{"id":"com.emberjs","version":"2016.2.1-0","since":"162.0","until":"162.*","originalSince":"162.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.65","since":"162.2228.15","until":"213","originalSince":"162.2228.15","originalUntil":null},{"id":"cucumber-javascript","version":"163.7342.11","since":"163.7342","until":"201","originalSince":"163.7342","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"163.7342.11","since":"163.7342","until":"201","originalSince":"163.7342","originalUntil":null},{"id":"TFS","version":"163.7342.11","since":"163.7342","until":"191.*","originalSince":"163.7342","originalUntil":null},{"id":"com.growingio.sdkHelper","version":"0.8.12","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"me.aheadlcx.dimenhelper","version":"1.2","since":"1.0","until":"201.0","originalSince":"1.0","originalUntil":null},{"id":"OdpsStudio","version":"2.0.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.alibaba.baichuan","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"ru.basecode.ide.rest.plugin","version":"0.1","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"ru.basecode.ide.rest.plugin","version":"0.1.1","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"com.emberjs","version":"2016.2.2-0","since":"162.0","until":"162.*","originalSince":"162.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"5.3.1","since":"143.0","until":"211","originalSince":"143.0","originalUntil":null},{"id":"com.emberjs","version":"2016.2.3-0","since":"162.0","until":"162.*","originalSince":"162.0","originalUntil":null},{"id":"com.flow.intellij","version":"v20161106201607","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.itheima.sz.plugin.commoncode","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"1.3.1","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.emberjs","version":"2016.2.4-0","since":"162.0","until":"162.*","originalSince":"162.0","originalUntil":null},{"id":"com.siimkinks.sqlitemagic","version":"0.5.0","since":"138.0","until":"201.0","originalSince":"138.0","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.4","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"GsonFormat","version":"1.3.0","since":"107.121","until":"201.0","originalSince":"107.121","originalUntil":null},{"id":"GsonFormat","version":"1.3.0","since":"107.121","until":"201.0","originalSince":"107.121","originalUntil":null},{"id":"fr.tolc.jahia.intellij.plugin","version":"1.1","since":"107.105","until":"212.*","originalSince":"107.105","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.6.0","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.itheima.sz.plugin.commoncode","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.5.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"cucumber-javascript","version":"163.7743.13","since":"163.7743","until":"201","originalSince":"163.7743","originalUntil":null},{"id":"TFS","version":"163.7743.13","since":"163.7743","until":"191.*","originalSince":"163.7743","originalUntil":null},{"id":"fr.tolc.jahia.intellij.plugin","version":"1.1.1","since":"107.105","until":"212.*","originalSince":"107.105","originalUntil":null},{"id":"com.phonegap.tools.plugin","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.66","since":"162.2228.15","until":"213","originalSince":"162.2228.15","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.5","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"eu.sim642.idea.zalgofy","version":"1.3","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.4.10","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"intellij.buck.plugin","version":"2.7.3","since":"139.0","until":"172.*","originalSince":"139.0","originalUntil":null},{"id":"com.ludditelabs.autodocintellij.plugin","version":"0.1.3","since":"141.0","until":"145.*","originalSince":"141.0","originalUntil":null},{"id":"org.jetbrains.memory.view","version":"0.93.145","since":"145.0","until":"181.0","originalSince":"145.0","originalUntil":"145.*"},{"id":"org.jetbrains.memory.view","version":"0.93.162","since":"162.0","until":"181.0","originalSince":"162.0","originalUntil":"163.*"},{"id":"co.lujun.plugin.betranslate","version":"1.0.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.elixir_lang","version":"4.6.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.5.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.flow.intellij","version":"20161114175417","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.phonegap.tools.plugin","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.flow.intellij","version":"20161114224808","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.e16din.incl","version":"0.1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.rd.filtertranslate","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.0","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"co.lujun.plugin.betranslate","version":"1.0.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"pl.jgorowski.transplug","version":"0.5.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.flow.intellij","version":"20161115205104","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"0.6.1","since":"143.2370","until":"162.*","originalSince":"143.2370","originalUntil":null},{"id":"de.monticore.lang.montisecarc.MontiSecArcLanguagePlugin","version":"0.7.8.SNAPSHOT","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"de.monticore.lang.montisecarc.MontiSecArcLanguagePlugin","version":"0.7.8.SNAPSHOT","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jamhub.appaie.plugin.dbot","version":"2.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.znshadow.viewbinder","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.robotium.recorder.intellij","version":"2.5.0","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"0.6.2","since":"143.2370","until":"162.*","originalSince":"143.2370","originalUntil":null},{"id":"cucumber-javascript","version":"163.7743.25","since":"163.7743","until":"201","originalSince":"163.7743","originalUntil":null},{"id":"TFS","version":"163.7743.25","since":"163.7743","until":"191.*","originalSince":"163.7743","originalUntil":null},{"id":"loopeer","version":"0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"0.2.2","since":"143.0","until":"232.*","originalSince":"143.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.1","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.5-78","since":"139.1603","until":"191.*","originalSince":"139.1603","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.5-79","since":"139.1603","until":"191.*","originalSince":"139.1603","originalUntil":null},{"id":"de.mprengemann.intellij.plugin.androidicons","version":"0.5-81","since":"139.1603","until":"191.*","originalSince":"139.1603","originalUntil":null},{"id":"info.bem.bemmet","version":"0.1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"A move tab left and right using the keyboard plugin - by momomo.com","version":"3.85","since":"111","until":"","originalSince":"101.0","originalUntil":null},{"id":"com.flow.intellij","version":"20161120211242","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"0.7.0","since":"143.2370","until":"162.*","originalSince":"143.2370","originalUntil":null},{"id":"info.bem.bemmet","version":"0.1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"io.hansel.androidstudioplugin","version":"1.0.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"ai.deckard.intellij.plugin","version":"0.2.13","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"A move tab left and right using the keyboard plugin - by momomo.com","version":"4.95","since":"111","until":"","originalSince":"101.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.5.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"me.chunsheng.plugin.shortcut","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"me.chunsheng.plugin.shortcut","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"me.chunsheng.plugin.shortcut","version":"1.0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"me.chunsheng.plugin.shortcut","version":"1.0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.intellij.plugins.ceylon.ide","version":"1.3.1","since":"143.0","until":"213.*","originalSince":"143.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.67","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"IdeaVIM","version":"0.47.2","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"com.github.jpmossin","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.argus.cit.intellij","version":"1.0.4","since":"163.0","until":"181.0","originalSince":"163.0","originalUntil":"163.*"},{"id":"com.rd.filtertranslate","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.68","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.69","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"com.jokerzoid.intellij.plugin.stylelint","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.2","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"org.zkoss.zkidea","version":"0.1.8","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.1-M03-release-IJ2016.2-1","since":"145.257","until":"162.*","originalSince":"145.257","originalUntil":"171.*"},{"id":"org.slayer.testLinkIntegration","version":"2.1.8","since":"163.0","until":"211.*","originalSince":"163.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.1.9","since":"163.0","until":"211.*","originalSince":"163.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.1.2","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"com.upsolver.PreCommitHook","version":"0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"fr.tolc.jahia.intellij.plugin","version":"1.2","since":"107.105","until":"212.*","originalSince":"107.105","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.70","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.1-M03-release-IJ2016.2-2","since":"145.257","until":"162.*","originalSince":"145.257","originalUntil":"171.*"},{"id":"com.jokerzoid.intellij.plugin.stylelint","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.0.6-eap-60-IJ2016.3-1","since":"163.1","until":"181.0","originalSince":"163.1","originalUntil":"171.*"},{"id":"com.bpleslie.idea.BradsTheme","version":"0.2.2","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"io.alef.vypa","version":"0.0.1-alpha","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.21","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.upsolver.PreCommitHook","version":"0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.flow.intellij","version":"20161127125149","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.2.4","since":"144.0","until":"163","originalSince":"144.0","originalUntil":null},{"id":"CUBA","version":"3.2.4.163","since":"163.0","until":"211","originalSince":"163.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.1.2.1","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.4.4","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.07","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"1.2.1","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.0.1","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"1.3.2","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.5.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"IdeaVIM","version":"0.47.3","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"com.upsolver.PreCommitHook","version":"0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"tiny.unique.plugin.id","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.11","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"com.xingren.fc.rangers-logging-intellij-plugin","version":"1.0.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.jpmossin","version":"1.1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"TFS","version":"163.9166.8","since":"163.9166","until":"191.*","originalSince":"163.9166","originalUntil":null},{"id":"cucumber-javascript","version":"163.9166.8","since":"163.9166","until":"201","originalSince":"163.9166","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.11.1","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"com.yuyh.reactnative.tools","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.71","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.3","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"org.jetbrains.plugins.ruby","version":"2017.1.20161201","since":"171.1374","until":"181.0","originalSince":"171.1374","originalUntil":"171.9999"},{"id":"com.wangzai.plugin.findViewById","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.flow.intellij","version":"20161202144252","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.flow.intellij","version":"20161202164934","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.google.gct.login","version":"16.11.1","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"org.avallach.daedalus.ide","version":"0.5","since":"141.0","until":"191.*","originalSince":"141.0","originalUntil":null},{"id":"MoreUnit","version":"1.0.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.alef.vypa","version":"0.0.2-alpha","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.1","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"gherkin","version":"163.7743.44","since":"163.7743.44","until":"163.*","originalSince":"163.7743.44","originalUntil":null},{"id":"cucumber-java","version":"163.7743.44","since":"163.7743.44","until":"201","originalSince":"163.7743.44","originalUntil":null},{"id":"cucumber-groovy","version":"163.7743.44","since":"163.7743.44","until":"201","originalSince":"163.7743.44","originalUntil":null},{"id":"com.google.gct.login","version":"16.11.2","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"com.google.gct.login","version":"16.11.3","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"org.elixir_lang","version":"4.7.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"lx","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.1.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"cucumber-java","version":"163.9693","since":"163.7743.44","until":"201","originalSince":"163.7743.44","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.1.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.yuyh.reactnative.tools","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"QAPlug","version":"1.3.12","since":"163.7743","until":"211","originalSince":"163.7743","originalUntil":null},{"id":"com.growingio.sdkHelper","version":"0.8.13","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.1.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.1.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.google.gct.login","version":"16.11.4","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.0.6-eap-77-IJ2016.3-1","since":"163.1","until":"181.0","originalSince":"163.1","originalUntil":"171.*"},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.2.0","since":"163.0","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.google.gct.login","version":"16.11.5","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"CUBA","version":"3.2.5.163","since":"163.0","until":"211","originalSince":"163.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.1.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.5.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.1.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.1.7","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.google.gct.login","version":"16.11.6","since":"143.2370","until":"163","originalSince":"143.2370","originalUntil":null},{"id":"CUBA","version":"3.2.6.163","since":"163.0","until":"211","originalSince":"163.0","originalUntil":null},{"id":"com.upsolver.PreCommitHook","version":"0.3.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.1.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"2.0.10","since":"163.7743.44","until":"163.*","originalSince":"163.7743.44","originalUntil":null},{"id":"com.yellow5a5","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.36","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"0.8.0","since":"143.2370","until":"162.*","originalSince":"143.2370","originalUntil":null},{"id":"com.davidgjm.idea.plugins","version":"1.1","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.flow.intellij","version":"20161210132208","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.6","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"Nette framework helpers","version":"0.4.2","since":"139.0","until":"192.0","originalSince":"139.0","originalUntil":null},{"id":"cn.leeii.plugin.annotation","version":"1.1.0","since":"2.0","until":"201.0","originalSince":"2.0","originalUntil":null},{"id":"cn.leeii.plugin.annotation","version":"1.1.1","since":"2.0","until":"201.0","originalSince":"2.0","originalUntil":null},{"id":"com.dachmx.android.checkcite.file","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.xujiaji.plugin.MVPManager","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"moe.studio.formatter","version":"0.1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.growingio.sdkHelper","version":"0.8.14","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"fr.tolc.jahia.intellij.plugin","version":"1.2.1","since":"107.105","until":"212.*","originalSince":"107.105","originalUntil":null},{"id":"info.bem.bemmet","version":"0.1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"2.0.11","since":"163.7743.44","until":"163.*","originalSince":"163.7743.44","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.2.5","since":"144.0","until":"163","originalSince":"144.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.72","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"com.zx.mvphelper.unique.plugin.id","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation6","version":"1.6.1","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.37","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"0.8.2","since":"143.2370","until":"162.*","originalSince":"143.2370","originalUntil":null},{"id":"Royll.SimpleXmlFormat.ID","version":"1.01","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.ferrius.phpStorm.phpattention","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":">me.drakeet.plugin.multitype","version":"1.1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.12","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"com.wangzai.plugin.findViewById","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.wangzai.plugin.findViewById","version":"1.1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.moe","version":"1.3.0-beta-1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"cucumber-javascript","version":"163.10154.19","since":"163.10154","until":"201","originalSince":"163.10154","originalUntil":null},{"id":"TFS","version":"163.10154.19","since":"163.10154","until":"191.*","originalSince":"163.10154","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.0.6-eap-112-IJ2016.3-1","since":"163.1","until":"181.0","originalSince":"163.1","originalUntil":"171.*"},{"id":"com.jiyuanime.ActivatePowerModeApplicationPlugin","version":"0.1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.a8sport.translate.unique.a8translate","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.11 beta","since":"163.0","until":"213.*","originalSince":"163.0","originalUntil":null},{"id":"PsiViewer","version":"3.28.93","since":"130.0","until":"130.*","originalSince":"130.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.4.0","since":"139.1803","until":"211","originalSince":"139.1803","originalUntil":null},{"id":"com.lany.plugin","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.flow.intellij","version":"20161218192713","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.0.2","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"org.a8sport.translate.unique.a8translate","version":"1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.22","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.a8sport.translate.unique.a8translate","version":"1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.a8sport.translate.unique.a8translate","version":"1.4","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.tinselspoon.intellij.kubernetes","version":"0.1","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.08","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"kim.uno.templates","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"loopeer","version":"0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.antlr.jetbrains.st4plugin","version":"0.5","since":"133.0","until":"173.*","originalSince":"133.0","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.7","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"10.0.42538","since":"133.1800","until":"171.4249","originalSince":"133.1800","originalUntil":null},{"id":"cucumber-javascript","version":"171.1834.8","since":"171.1834","until":"201","originalSince":"171.1834","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"171.1834.8","since":"171.1834","until":"201","originalSince":"171.1834","originalUntil":null},{"id":"TFS","version":"171.1834.8","since":"171.1834","until":"191.*","originalSince":"171.1834","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"171.1834.8","since":"171.1834","until":"171.*","originalSince":"171.1834","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.5.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.6.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.5.0","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.5.1","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.thibaulthelsmoortel.pastebin","version":"0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"1.0.0","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.1.9","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.0.6-eap-123-IJ2016.3-1","since":"163.1","until":"181.0","originalSince":"163.1","originalUntil":"171.*"},{"id":"org.openmastery.ideaflow","version":"0.8","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.observly.recorderplugin","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.9","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"EclipseCodeFormatter","version":"16.0.171.1834.0","since":"171.1834","until":"202","originalSince":"171.1834","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.10","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.taobao.weex.lang","version":"1.2.2","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"com.thibaulthelsmoortel.pastebin","version":"0.1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"1.1.1","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.shang.android.layoutformat","version":"1.2.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"name.kropp.intellij.makefile","version":"0.5.1","since":"171.0","until":"211.5538","originalSince":"171.0","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.11","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.12","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"life.iuni.android.plugin.butterknife","version":"1.0.0-SNAPSHOT","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.liu.lang","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.nukc.plugin.apkmultichannel","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.liu.lang","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"pl.klamborowski.plugin.jacksongenerator","version":"1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"pl.klamborowski.plugin.jacksongenerator","version":"1.2.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.2014.24","since":"171.2014","until":"201","originalSince":"171.2014","originalUntil":null},{"id":"pl.klamborowski.plugin.jacksongenerator","version":"1.2.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"TFS","version":"171.2014.24","since":"171.2014","until":"191.*","originalSince":"171.2014","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.24","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.4.1","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.12","since":"145.0","until":"221","originalSince":"145.0","originalUntil":null},{"id":"com.youmeek.plugin.chinesetypography","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.13","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"adb.wifi.woaiwhz","version":"1.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.2.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.2.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.2.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.resharper.unity","version":"1.5.0.0","since":"163.10479","until":"163.*","originalSince":"163.10479","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.2.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.flow.intellij","version":"20170102210412","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.intellij.resharper.unity","version":"1.5.0.1","since":"163.10479","until":"163.*","originalSince":"163.10479","originalUntil":null},{"id":"com.taobao.weex.lang","version":"1.2.3","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"com.lozi.android.plugin.search_resource","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.2","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.intellij.bigdecimal-folding","version":"0.2.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.github.tinselspoon.intellij.kubernetes","version":"0.2","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.2.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.jokerzoid.intellij.plugin.stylelint","version":"1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.tinselspoon.intellij.kubernetes","version":"0.3","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.2.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.2.7","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.2.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.2.9","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.3.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.3.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.3.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.12.1","since":"145.0","until":"221","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.6.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"me.leefeng.mvphelper","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"me.leefeng.mvphelper","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.3.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.3.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.3.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.3.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.3.7","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"xyz.belvi.kingsmentor.resourceType.plugin.organiser","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.0.3","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.6.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.NASMSupport","version":"0.1.13","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.6.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.09","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.14","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.15","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"0.8.3","since":"143.2370","until":"162.*","originalSince":"143.2370","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.25","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.flow.intellij","version":"20170109090644","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.12.2","since":"145.0","until":"221","originalSince":"145.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.12.3","since":"145.0","until":"221","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.3.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.youmeek.plugin.chinesetypography","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.26","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"R4Intellij","version":"0.11","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"R4Intellij","version":"0.11.1","since":"80.8000","until":"193.0","originalSince":"80.8000","originalUntil":null},{"id":"com.worldline.vbu.testrecorder.intellij","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.tinselspoon.intellij.kubernetes","version":"0.4","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"com.ironman.me","version":"1.1.5","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.8","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.intellij.plugin","version":"0.8","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.8","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.microsoft.tooling.msservices.intellij.azure","version":"1.5.5","since":"141.0","until":"163.0","originalSince":"141.0","originalUntil":null},{"id":"com.aemtools","version":"0.3","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.yii2support","version":"0.2.2","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.lozi.android.plugin.search_resource","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"171.2262","since":"171.2262","until":"201","originalSince":"171.2262","originalUntil":null},{"id":"com.aemtools","version":"0.3.1","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"4.3","since":"145.0","until":"181.3494","originalSince":"145.0","originalUntil":null},{"id":"com.codewaves.intellij.plugin.iconcreator","version":"0.9.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"16.1.132.637.0","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.sanyinchen","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"de.monticore.lang.montisecarc.MontiSecArcLanguagePlugin","version":"0.8.9.SNAPSHOT","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.nevaryyy.fvg","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.2272.15","since":"171.2272","until":"201","originalSince":"171.2272","originalUntil":null},{"id":"TFS","version":"171.2272.15","since":"171.2272","until":"191.*","originalSince":"171.2272","originalUntil":null},{"id":"ru.adelf.idea.dingo","version":"0.1","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"net.javaru.idea.frc","version":"0.1","since":"163.0","until":"163.*","originalSince":"163.0","originalUntil":null},{"id":"net.petitviolet.idea.scala.minimal-cake-pattern-generator","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.bjansen.intellij.pebble","version":"0.1","since":"143.0","until":"212.*","originalSince":"143.0","originalUntil":null},{"id":"com.stfalcon.mvvmgenerator","version":"0.5.1","since":"141.0","until":"223.*","originalSince":"141.0","originalUntil":null},{"id":"com.jiyuanime.ActivatePowerModeApplicationPlugin","version":"0.1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"4.3.1","since":"145.0","until":"181.3494","originalSince":"145.0","originalUntil":null},{"id":"org.moe","version":"1.3.0-beta-2","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.doglandia.GpsEmulator","version":"1.2","since":"141.0","until":"203.*","originalSince":"141.0","originalUntil":null},{"id":"IdeaVIM","version":"0.48","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"IdeaVIM","version":"0.48","since":"143.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.16","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.5.0","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"ru.adelf.idea.dingo","version":"0.1.1","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"com.wangzai.plugin.findViewById","version":"1.1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"10.0.42576","since":"133.1800","until":"171.4249","originalSince":"133.1800","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.73","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.12.4","since":"145.0","until":"221","originalSince":"145.0","originalUntil":null},{"id":"wangyi.plugin.singleton","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"IdeaVIM","version":"0.48.4","since":"171.0","until":"201","originalSince":"171.0","originalUntil":null},{"id":"me.leefeng.mvphelper","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"net.javaru.idea.frc","version":"0.2","since":"163.0","until":"163.*","originalSince":"163.0","originalUntil":null},{"id":"com.github.nukc.plugin.apkmultichannel","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.nukc.plugin.apkmultichannel","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.yii2support","version":"0.2.7","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.7.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"2.0.20","since":"163.0","until":"163.*","originalSince":"163.0","originalUntil":null},{"id":"com.yii2support","version":"0.2.7.2","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"org.turbanov.execution.cmd","version":"1.5","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.2455.4","since":"171.2455","until":"201","originalSince":"171.2455","originalUntil":null},{"id":"TFS","version":"171.2455.4","since":"171.2455","until":"191.*","originalSince":"171.2455","originalUntil":null},{"id":"com.naughtyserver","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.120","since":"162.1121.32","until":"211","originalSince":"162.1121.32","originalUntil":null},{"id":"com.jiyuanime.ActivatePowerModeApplicationPlugin","version":"0.1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"ImportPlugin","version":"0.1","since":"162.0","until":"172.0","originalSince":"162.0","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.3.0","since":"163.0","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"1.2.4","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"GsonFormat","version":"1.5.0","since":"107.121","until":"201.0","originalSince":"107.121","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.5.2","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.dubreuia","version":"0.13","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"lx","version":"1.0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.naughtyserver","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.youmeek.plugin.chinesetypography","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.flow.intellij","version":"20170123101652","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.3","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.aemtools","version":"0.3.2","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"cucumber-javascript","version":"163.12024.7","since":"163.12024","until":"201","originalSince":"163.12024","originalUntil":null},{"id":"TFS","version":"163.12024.7","since":"163.12024","until":"191.*","originalSince":"163.12024","originalUntil":null},{"id":"SerialPortMonitor","version":"0.5","since":"141.245","until":"170.*","originalSince":"141.245","originalUntil":null},{"id":"ImportPlugin","version":"0.1.1","since":"162.0","until":"172.0","originalSince":"162.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"2.0.22","since":"163.0","until":"163.*","originalSince":"163.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.5.4","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.3.9","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.2613.14","since":"171.2613","until":"201","originalSince":"171.2613","originalUntil":null},{"id":"TFS","version":"171.2613.14","since":"171.2613","until":"191.*","originalSince":"171.2613","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.10","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.12.1","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"CUBA","version":"3.3.0.163","since":"163.0","until":"211","originalSince":"163.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"1.9.7","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"net.javaru.idea.frc","version":"0.3","since":"163.0","until":"163.*","originalSince":"163.0","originalUntil":null},{"id":"io.harply.plugin","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"net.javaru.idea.frc","version":"0.3.1","since":"163.0","until":"163.*","originalSince":"163.0","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.5.1","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"ThreadDumpVisualizer","version":"0.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.38","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.5.0","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.github.jpmossin","version":"1.1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.4.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.4.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.4","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"io.cloudslang.intellij.plugin","version":"1.0.0","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.aemtools","version":"0.4","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.scireum.rythmengine.detector","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.yii2support","version":"0.2.9.7","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.flow.intellij","version":"20170201110543","since":"144.4199","until":"231.*","originalSince":"144.4199","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.5.5","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"reasonml","version":"0.1","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.5","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"TFS","version":"171.2822.13","since":"171.2822","until":"191.*","originalSince":"171.2822","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"171.2822.13","since":"171.2822","until":"201","originalSince":"171.2822","originalUntil":null},{"id":"cucumber-javascript","version":"171.2822.13","since":"171.2822","until":"201","originalSince":"171.2822","originalUntil":null},{"id":"cco.atoth.intellij.plugin.chucknorris","version":"1.0","since":"145.0","until":"181.0","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.1.0-beta-38-IJ2016.2-1","since":"162.0","until":"163.0","originalSince":"145.257","originalUntil":"171.*"},{"id":"org.jetbrains.kotlin","version":"1.1.0-beta-38-IJ2016.3-1","since":"163.1","until":"171.0","originalSince":"163.1","originalUntil":"171.*"},{"id":"com.yii2support","version":"0.2.10.9","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"de.monticore.lang.montisecarc.MontiSecArcLanguagePlugin","version":"0.8.10.SNAPSHOT","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"2.0.24","since":"163.0","until":"163.*","originalSince":"163.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.13","since":"145.0","until":"221","originalSince":"145.0","originalUntil":null},{"id":"cco.atoth.intellij.plugin.chucknorris","version":"1.1","since":"162.0","until":"181.0","originalSince":"162.0","originalUntil":"171.*"},{"id":"cn.yiiguxing.plugin.translate","version":"1.3.3","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.3.1","since":"163.0","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.aemtools","version":"0.4.1","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"SerialPortMonitor","version":"0.5.1","since":"141.245","until":"201.*","originalSince":"141.245","originalUntil":null},{"id":"com.aemtools","version":"0.4.2","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.andyken.ormlite.rawsqlgenerator","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"core.plugin.monkey","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.3.2","since":"163.0","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.4.2","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"com.andyken.ormlite.rawsqlgenerator","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.andyken.ormlite.rawsqlgenerator","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.fueled.mvp","version":"0.1.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.fueled.mvp","version":"0.1.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.bmesta.mvntoolkit","version":"0.1.0-SNAPSHOT","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.yii2support","version":"0.2.10.11","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.1.3","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.37","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.boohee.plugin.translation","version":"1.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.nukc.plugin.apkmultichannel","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"AureliaStorm","version":"0.4","since":"162.1628","until":"213.0","originalSince":"162.1628","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.8.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.13.1","since":"145.0","until":"221","originalSince":"145.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.5.6","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.3019.10","since":"171.3019","until":"201","originalSince":"171.3019","originalUntil":null},{"id":"TFS","version":"171.3019.10","since":"171.3019","until":"191.*","originalSince":"171.3019","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.4","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.dubreuia","version":"0.14","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"4.3.2","since":"145.0","until":"181.3494","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.5.1","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"2.3","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.0.0","since":"143.2370","until":"162.*","originalSince":"143.2370","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.27","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.1.2","since":"162.2147483647","until":"171.*","originalSince":"162.*","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.8.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.bmesta.mvntoolkit","version":"0.1.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.5.12.2","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"reasonml","version":"0.2","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"de.sgalinski.fluid.plugin.demo.id","version":"1.0.0","since":"143.0","until":"231","originalSince":"143.0","originalUntil":null},{"id":"de.sgalinski.fluid.plugin.demo.id","version":"1.0.1","since":"143.0","until":"231","originalSince":"143.0","originalUntil":null},{"id":"com.weirddev.testme","version":"1.0.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.12","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.1.3","since":"162.2147483647","until":"171.*","originalSince":"162.*","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.0.4","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.3224.7","since":"171.3224","until":"201","originalSince":"171.3224","originalUntil":null},{"id":"TFS","version":"171.3224.7","since":"171.3224","until":"191.*","originalSince":"171.3224","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.8.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.17","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.8.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.apkfuns.plugin.freeline","version":"1.1.4","since":"141.0","until":"182.0","originalSince":"141.0","originalUntil":null},{"id":"com.reverie.revlocalization","version":"0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.zkoss.zkidea","version":"0.1.9","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.andyken.ormlite.rawsqlgenerator","version":"1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.0","since":"144.0","until":"163.0","originalSince":"144.0","originalUntil":null},{"id":"io.nativetap.plugin","version":"1.2.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.bmesta.mvntoolkit","version":"0.1.2","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.wjs.shortcut","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"net.javaru.idea.frc","version":"0.4","since":"163.0","until":"163.*","originalSince":"163.0","originalUntil":null},{"id":"com.naughtyserver","version":"1.1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.1","since":"144.0","until":"163.0","originalSince":"144.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.4.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.resharper.unity","version":"1.5.1.0","since":"171.3085","until":"171.3654","originalSince":"171.3085","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.4.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.8.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.6","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.4.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.4.0","since":"163.0","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"3.0","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.weirddev.testme","version":"1.0.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.poratu.idea.plugins.tomcat","version":"1.0","since":"141.0","until":"191.0","originalSince":"141.0","originalUntil":null},{"id":"com.appcloud.test","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.aemtools","version":"0.5","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.cainiao.scriptGenerator.plugin.20170220","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"ThreadDumpVisualizer","version":"0.1.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.0","since":"145.0","until":"145.0","originalSince":"145.0","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.1","since":"145.0","until":"145.0","originalSince":"145.0","originalUntil":null},{"id":"com.aemtools","version":"0.5.1","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"MoreUnit","version":"1.0.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.18","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"com.cainiao.fktools","version":"1.0.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.4.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.4.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.74","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.8.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.2","since":"145.0","until":"145.0","originalSince":"145.0","originalUntil":null},{"id":"com.loren.generater","version":"1.0.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.aemtools","version":"0.5.2","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.3","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.3566.29","since":"171.3566","until":"201","originalSince":"171.3566","originalUntil":null},{"id":"TFS","version":"171.3566.29","since":"171.3566","until":"191.*","originalSince":"171.3566","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"171.3566.29","since":"171.3566","until":"171.*","originalSince":"171.3566","originalUntil":null},{"id":"com.vimtools.ideaexactionbar","version":"0.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.alexanderpa.flyway.migration.creator","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.4","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"1.1.7","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"Show REST Services","version":"1.0","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"CssAlphabeticalRearranger","version":"0.6","since":"138.0","until":"183.0","originalSince":"138.0","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.5","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.4.7","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"3.1","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.4.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.4.9","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation6","version":"1.7.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.5.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.5.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.5.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.vimtools.ideaexactionbar","version":"0.0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"net.coding.git","version":"1.0.1-beta","since":"145.0","until":"193","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.75","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.6","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.76","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.5.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.5.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.aemtools","version":"0.5.3","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.5.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.resharper.HeapAllocationsViewer","version":"1.2.2.0","since":"171.3085","until":"172","originalSince":"171.3085","originalUntil":null},{"id":"ru.adelf.idea.dingo","version":"0.1.2","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"1.11.3","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.vimtools.ideaexactionbar","version":"0.0.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.4.5","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.4.6","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.2.4","since":"143.0","until":"183","originalSince":"143.0","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.4.1","since":"163.0","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.4.3","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"1.1.8","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"MultiHighlight","version":"1.0.0","since":"141.0","until":"162.0","originalSince":"141.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.13.2","since":"145.0","until":"221","originalSince":"145.0","originalUntil":null},{"id":"com.miui.gallery.dao.generator","version":"1.0","since":"0.0","until":"201.0","originalSince":"0.0","originalUntil":null},{"id":"vette.neos","version":"0.1.5.SNAPSHOT","since":"162.0","until":"203.3645.34","originalSince":"162.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.14","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.weirddev.testme","version":"1.1.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"OdpsStudio","version":"2.6.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.5.7","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.5.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.2.0","since":"162.2147483647","until":"171.*","originalSince":"162.*","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.5.9","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.6.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.6.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"6.0","since":"163.9166","until":"211","originalSince":"163.9166","originalUntil":null},{"id":"com.mglaman.drupal_run_tests","version":"1.0-rc3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.chakki_works.watchme","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.reverie.revlocalization","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.shenjiajun.TinyPic","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.shenjiajun.TinyPic","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"5.7.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"6.0.1","since":"163.9166","until":"211","originalSince":"163.9166","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.6.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"5.8.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"io.nativetap.plugin","version":"1.2.7","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.nativetap.plugin","version":"1.2.7.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"6.0.2","since":"163.9166","until":"211","originalSince":"163.9166","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.7","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"3.2","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.hxsmart.zhangbh.JNIVAR2C.id","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.hxsmart.zhangbh.JNIVAR2C.id","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.hxsmart.zhangbh.JNIVAR2C.id","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.5","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"lsfusion.idea.plugin","version":"1.0.77","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.121","since":"162.1121.32","until":"211","originalSince":"162.1121.32","originalUntil":null},{"id":"ru.adelf.idea.dotenv","version":"0.1","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.3691.10","since":"171.3691","until":"201","originalSince":"171.3691","originalUntil":null},{"id":"TFS","version":"171.3691.10","since":"171.3691","until":"191.*","originalSince":"171.3691","originalUntil":null},{"id":"com.intellij.resharper.unity","version":"1.6.0.0","since":"171.3085","until":"171.3654","originalSince":"171.3085","originalUntil":null},{"id":"com.webfont.ideaplugin","version":"2.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.intellij.plugins.ceylon.ide","version":"1.3.2","since":"143.0","until":"213.*","originalSince":"143.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.7","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"com.github.bjansen.intellij.pebble","version":"0.2","since":"143.0","until":"212.*","originalSince":"143.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.5.8","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"de.monticore.lang.montisecarc.MontiSecArcLanguagePlugin","version":"0.8.13","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.your.ELICE.eliceplugin","version":"0.1(beta)","since":"163.0","until":"201.0","originalSince":"163.0","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.8","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.chakki_works.watchme","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"0.6.0","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.manolenso.intellij.foundation6","version":"1.7.1","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"vette.neos","version":"0.1.6-SNAPSHOT","since":"162.0","until":"203.3645.34","originalSince":"162.0","originalUntil":null},{"id":"com.weirddev.testme","version":"1.2.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.6.1","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.chakki_works.watchme","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.28","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.baijiahulian.tianxiao.action","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"edu.gmu.cs.plugin.aeon","version":"1.14.2","since":"131.0","until":"181.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"5.11.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.6.2","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.coursehero.hodor","version":"1.0.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.nes.intellij.plugin.id","version":"1.7","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.intellij.resharper.unity","version":"1.6.1.0","since":"171.3085","until":"171.3654","originalSince":"171.3085","originalUntil":null},{"id":"com.talkingdata.orm.tool","version":"1.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.ledongli.GGTemplate.TemplateCreator","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.ledongli.GGTemplate.TemplateCreator","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.wangzai.plugin.findViewById","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"io.intino.plugin","version":"2.5.1","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.3780.21","since":"171.3780","until":"201","originalSince":"171.3780","originalUntil":null},{"id":"TFS","version":"171.3780.21","since":"171.3780","until":"191.*","originalSince":"171.3780","originalUntil":null},{"id":"com.poratu.idea.plugins.tomcat","version":"1.5","since":"141.0","until":"191.0","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.8.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.ledongli.GGTemplate.TemplateCreator","version":"1.2.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.ledongli.GGTemplate.TemplateCreator","version":"1.2.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.ledongli.GGTemplate.TemplateCreator","version":"1.2.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.cainiao.fktools","version":"1.0.7","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.baijiahulian.tianxiao.action","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.shenjiajun.TinyPic","version":"1.0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.dianping.unique.plugin.id","version":"1.5","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.ledongli.GGTemplate.TemplateCreator","version":"1.2.4","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.6.1","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"Show REST Services","version":"1.1","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"com.ayvytr.easyimportandroidproject","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.5.0","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"info.novatec.testit.livingdoc.intellij","version":"1.3.2","since":"163.0","until":"193.*","originalSince":"163.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"2.4","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.9","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"ms.konovalov.intellij.hidpi-profiles","version":"2017.1.1","since":"171.0","until":"222","originalSince":"171.0","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.5.1","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.wangzai.plugin.findViewById","version":"1.2.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.6.3","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.baijiahulian.tianxiao.action","version":"1.0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.dianping.unique.plugin.id","version":"1.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.netease.hearttouch.as_nei_plugin","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.talkingdata.orm.tool","version":"1.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.78","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"com.talkingdata.orm.tool","version":"1.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.wangzai.plugin.findViewById","version":"1.2.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.10","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"org.moe","version":"1.3.0","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.16","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.headwire.aem.tooling.intellij","version":"1.0","since":"162.0","until":"203","originalSince":"162.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.0","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.11","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"jp.funnything.offing_harbor","version":"1.6","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.0.0","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"claims.bold.intellij.avro","version":"0.3.0","since":"131.0","until":"202.*","originalSince":"131.0","originalUntil":null},{"id":"wuhaowen.mvpkillerID","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.5.2","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.1","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.wangzai.plugin.findViewById","version":"1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.0.1","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"cucumber-javascript","version":"171.3780.63","since":"171.3780","until":"201","originalSince":"171.3780","originalUntil":null},{"id":"TFS","version":"171.3780.63","since":"171.3780","until":"191.*","originalSince":"171.3780","originalUntil":null},{"id":"com.naughtyserver","version":"1.1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"fr.tolc.jahia.intellij.plugin","version":"1.3","since":"107.105","until":"212.*","originalSince":"107.105","originalUntil":null},{"id":"com.weirddev.testme","version":"1.3.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.senthil.codesearch","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.aemtools","version":"0.6","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.120","since":"162.1121.32","until":"211","originalSince":"162.1121.32","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.79","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"cucumber-javascript","version":"171.3780.79","since":"171.3780","until":"201","originalSince":"171.3780","originalUntil":null},{"id":"TFS","version":"171.3780.79","since":"171.3780","until":"191.*","originalSince":"171.3780","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"0.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"jbehave-syntax-support","version":"1.6","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"6.1","since":"163.9166","until":"211","originalSince":"163.9166","originalUntil":null},{"id":"uk.ac.glasgow.microissues","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.0.2","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.80","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"0.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.5.0","since":"163.0","until":"201","originalSince":"163.0","originalUntil":null},{"id":"wide-task-browser","version":"0.1.16","since":"139.658","until":"231.*","originalSince":"139.658","originalUntil":null},{"id":"io.t28.json2java","version":"0.1.0","since":"160.0","until":"181.0","originalSince":"160.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.0.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"wuhaowen.mvpkillerID","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.12 beta","since":"163.0","until":"213.*","originalSince":"163.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"3.3","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.8.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.canoo.dolphinplattform.intellij","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.yii2support","version":"0.3.17.0","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"0.6.1","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.2","since":"144.0","until":"163.0","originalSince":"144.0","originalUntil":null},{"id":"com.baijiahulian.tianxiao.action","version":"1.0.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.exynap.plugin","version":"1.2","since":"143.290","until":"201.0","originalSince":"143.290","originalUntil":null},{"id":"com.your.ELICE.eliceplugin","version":"0.2.0(beta)","since":"163.0","until":"201.0","originalSince":"163.0","originalUntil":null},{"id":"com.writeoncereadmany.semantichighlighting","version":"0.1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.81","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.82","since":"163.7743.44","until":"213","originalSince":"163.7743.44","originalUntil":null},{"id":"cn.isaac.codelines","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.122","since":"162.1121.32","until":"211","originalSince":"162.1121.32","originalUntil":null},{"id":"io.intino.plugin","version":"2.6.1","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"it.droidcon.androidstudioplugin","version":"1.0.1","since":"160.0","until":"201.0","originalSince":"160.0","originalUntil":null},{"id":"com.yii2support","version":"0.3.17.2","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.83","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.keshasosiska.easymock-expect-builder","version":"1.0.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"jbehave-syntax-support","version":"1.61-b","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":">me.drakeet.plugin.multitype","version":"1.2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.5.2","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"com.dragon.mvphelp","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"vette.neos","version":"0.1.7-SNAPSHOT","since":"162.0","until":"203.3645.34","originalSince":"162.0","originalUntil":null},{"id":"me.aheadlcx.dimenhelper","version":"1.3","since":"1.3","until":"201.0","originalSince":"1.3","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.6.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.6.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.6.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.3.0","since":"162.2147483647","until":"171.*","originalSince":"162.*","originalUntil":null},{"id":"com.tagmycode.intellij","version":"2.0.1","since":"133.696","until":"231","originalSince":"133.696","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.8.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"net.javaru.idea.frc","version":"0.5","since":"163.0","until":"172.*","originalSince":"163.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.84","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.123","since":"162.1121.32","until":"211","originalSince":"162.1121.32","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.6.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.6.7","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.6.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.6.9","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"Show REST Services","version":"1.2","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.85","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.0.3","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"com.eflabs.plugin.efcommon","version":"3.0","since":"171.1","until":"201.0","originalSince":"171.1","originalUntil":null},{"id":"com.yii2support","version":"0.3.17.5","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"vette.neos","version":"0.1.8-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"com.bobz.OpenTerminalHere","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.intino.plugin","version":"2.6.2","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.eflabs.plugin.efcommon","version":"3.1","since":"171.1","until":"201.0","originalSince":"171.1","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.86","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.87","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.7.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.4073.15","since":"171.4073","until":"201","originalSince":"171.4073","originalUntil":null},{"id":"TFS","version":"171.4073.15","since":"171.4073","until":"191.*","originalSince":"171.4073","originalUntil":null},{"id":"GeneratePropertyNameConstants","version":"0.15","since":"150.0","until":"231.*","originalSince":"150.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.7.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.3","since":"163.0","until":"172.0","originalSince":"163.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.7.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.7.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.github.tinselspoon.intellij.kubernetes","version":"0.5","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.14","since":"171.3780","until":"221","originalSince":"171.3780","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.2","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.14.1","since":"171.3780","until":"221","originalSince":"171.3780","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.2","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.88","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.9","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.9","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.89","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.aemtools","version":"0.6.1","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.3","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"reasonml","version":"0.3","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"16.3.132.637.0","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.39","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.3.1","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.canking.coderhealth","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.7.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.124","since":"162.1121.32","until":"211","originalSince":"162.1121.32","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.49","since":"171.0","until":"172","originalSince":"171.0","originalUntil":null},{"id":"intellij.buck.plugin","version":"2.7.7","since":"162.0","until":"172.*","originalSince":"162.0","originalUntil":null},{"id":"com.maihaoche.mazda","version":"1.0","since":"161.0","until":"201.0","originalSince":"161.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.90","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.yii2support","version":"0.3.17.9","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.4073.31","since":"171.4073","until":"201","originalSince":"171.4073","originalUntil":null},{"id":"TFS","version":"171.4073.31","since":"171.4073","until":"191.*","originalSince":"171.4073","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.17","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.6.7","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.growingio.sdkHelper","version":"0.8.15","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.7.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"0.3","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.1.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"vette.neos","version":"0.1.9-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.19","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"com.keshasosiska.easymock-expect-builder","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"jp.co.future.ideausqlfmt","version":"0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bubiu.plugin.uniqueres","version":"1.0.4.7","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bubiu.plugin.uniqueres","version":"1.1.4.7","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.125","since":"171.3780.107","until":"211","originalSince":"171.3780.107","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.7.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.8.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"jp.co.future.ideausqlfmt","version":"0.1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"0.4","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"Railways","version":"0.8.7","since":"171.0","until":"172.*","originalSince":"171.0","originalUntil":null},{"id":"Railways for IDEA","version":"0.8.7","since":"171.0","until":"181.0","originalSince":"171.0","originalUntil":null},{"id":"ModuleLibraries","version":"0.4","since":"145.0","until":"201.*","originalSince":"145.0","originalUntil":null},{"id":"com.github.tinselspoon.intellij.kubernetes","version":"0.6","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"reasonml","version":"0.4","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"io.intino.plugin","version":"2.6.5","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.7.7","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"jbehave-syntax-support","version":"1.62","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.91","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.maihaoche.mazda","version":"2.0","since":"161.0","until":"201.0","originalSince":"161.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.7","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"org.jetbrains.plugin.lightbulbtoggle","version":"1.0","since":"131.0","until":"173.320","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.plugin.lightbulbtoggle","version":"1.0.1","since":"131.0","until":"173.320","originalSince":"131.0","originalUntil":null},{"id":"org.moe","version":"1.3.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2017.1.46533","since":"133.1800","until":"171.4249","originalSince":"133.1800","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.7.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"vette.neos","version":"0.1.10-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"com.keshasosiska.easymock-expect-builder","version":"1.0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.diydyq.miapp","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"0.5","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.92","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"TFS","version":"171.4073.40","since":"171.4073","until":"191.*","originalSince":"171.4073","originalUntil":null},{"id":"cucumber-javascript","version":"171.4073.40","since":"171.4073","until":"201","originalSince":"171.4073","originalUntil":null},{"id":"reasonml","version":"0.5","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"jp.co.future.ideausqlfmt","version":"0.2.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.9.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.93","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.1.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.94","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.phonegap.tools.plugin","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.95","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"codeReview4idea","version":"0.5.6","since":"172.767","until":"203","originalSince":"172.767","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.1.12","since":"171.0","until":"171.*","originalSince":"171.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.20","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.plugin.applescript","version":"0.115","since":"144.0","until":"172.1909","originalSince":"144.0","originalUntil":null},{"id":"io.t28.json2java","version":"0.2.0","since":"160.0","until":"181.0","originalSince":"160.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.14.2","since":"171.3780","until":"221","originalSince":"171.3780","originalUntil":null},{"id":"org.elixir_lang","version":"5.0.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.7.0","since":"143.0","until":"191.6708","originalSince":"143.0","originalUntil":null},{"id":"ai.deckard.intellij.plugin","version":"0.2.14","since":"123.0","until":"201.0","originalSince":"123.0","originalUntil":null},{"id":"com.bubiu.plugin.uniqueres","version":"1.4.17","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"1.3.4","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.22","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"6.2","since":"163.0","until":"211","originalSince":"163.0","originalUntil":null},{"id":"vette.neos","version":"0.1.11-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.126","since":"171.3780.107","until":"211","originalSince":"171.3780.107","originalUntil":null},{"id":"io.ballerina","version":"0.8.3","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"Non-Dairy Soy Plugin","version":"0.7.1","since":"143.0","until":"191.6708","originalSince":"143.0","originalUntil":null},{"id":"R4Intellij","version":"1.0","since":"145.258","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"R4Intellij","version":"1.0.1","since":"145.258","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"com.aurimasniekis.phpclasstemplates","version":"1.0.2","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"R4Intellij","version":"1.0.2","since":"145.258","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"Error-prone plugin","version":"171.4342","since":"171.4342","until":"173.3726","originalSince":"171.4342","originalUntil":null},{"id":"ru.adelf.idea.dotenv","version":"0.2","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"vette.neos","version":"0.1.12-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.4249.16","since":"171.4249","until":"201","originalSince":"171.4249","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"171.4249.16","since":"171.4249","until":"201","originalSince":"171.4249","originalUntil":null},{"id":"TFS","version":"171.4249.16","since":"171.4249","until":"191.*","originalSince":"171.4249","originalUntil":null},{"id":"io.intino.plugin","version":"2.6.6","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.1","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"com.flageolett.eZ.completion","version":"1.0.4.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.flageolett.eZ.completion","version":"1.0.4.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"R4Intellij","version":"1.0.3","since":"145.258","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"io.github.vcuswimlab.stackintheflow","version":"0.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.your.ELICE.eliceplugin","version":"0.3.2(beta)","since":"163.0","until":"201.0","originalSince":"163.0","originalUntil":null},{"id":"CUBA","version":"3.4.0.163","since":"163.0","until":"211","originalSince":"163.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.6.2","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.poratu.idea.plugins.tomcat","version":"1.6","since":"141.0","until":"191.0","originalSince":"141.0","originalUntil":null},{"id":"br.com.br.com.breakpoint.breakpoint.toogleAll","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.jpmossin","version":"1.2.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.yii2support","version":"0.4.28.1","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"br.com.br.com.breakpoint.breakpoint.toogleAll","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.tagmycode.intellij","version":"2.0.2","since":"133.696","until":"231","originalSince":"133.696","originalUntil":null},{"id":"br.com.br.com.breakpoint.breakpoint.toogleAll","version":"1.1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.7.0","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"br.com.br.com.breakpoint.breakpoint.toogleAll","version":"1.1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"0.6.7","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.24","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"org.elixir_lang","version":"5.1.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.2.0","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.7.9","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"R4Intellij","version":"1.0.4","since":"145.258","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"com.yii2support","version":"0.4.30.3","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.2.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.2.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.4","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"cz.k2.eshop","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.meizu.flyme.mall.XmlToJson","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.9.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.2","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"cucumber-javascript","version":"171.4424.10","since":"171.4424","until":"201","originalSince":"171.4424","originalUntil":null},{"id":"TFS","version":"171.4424.10","since":"171.4424","until":"191.*","originalSince":"171.4424","originalUntil":null},{"id":"com.yii2support","version":"0.4.30.4","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"2.1.0.beta1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.6.2","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.phonegap.tools.plugin","version":"1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.lwfwind.automation.plugin.aping","version":"3.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"cyningxu.findviewbyx","version":"1.0","since":"93.0","until":"201.0","originalSince":"93.0","originalUntil":null},{"id":"com.bubiu.plugin.uniqueres","version":"1.4.28","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.2.1","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"2.1.0.final","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.127","since":"171.3780.107","until":"211","originalSince":"171.3780.107","originalUntil":null},{"id":"com.naughtyserver","version":"1.1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2017.1.46654","since":"133.1800","until":"171.4249","originalSince":"133.1800","originalUntil":null},{"id":"com.dim.plugin.adbduang","version":"0.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.96","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"5.0","since":"171.3780","until":"181.3494","originalSince":"171.3780","originalUntil":null},{"id":"de.espend.idea.php.phpunit","version":"2.0","since":"171.3780","until":"173.2099","originalSince":"171.3780","originalUntil":null},{"id":"de.espend.idea.php.phpunit","version":"2.1","since":"171.3780","until":"173.2099","originalSince":"171.3780","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.10","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.10","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.97","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.weirddev.testme","version":"1.4.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.netease.hearttouch.as_nei_plugin","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.29","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.2.2","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.8","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"cz.k2.eshop","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.7.1","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"de.espend.idea.php.phpunit","version":"2.2","since":"171.3780","until":"173.2099","originalSince":"171.3780","originalUntil":null},{"id":"com.github.lwfwind.automation.plugin.aping","version":"4.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"5.13.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.8.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.potterhsu.jsonviewer","version":"0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"io.intino.plugin","version":"2.6.7","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"171.4424.20","since":"171.4424","until":"201","originalSince":"171.4424","originalUntil":null},{"id":"TFS","version":"171.4424.20","since":"171.4424","until":"191.*","originalSince":"171.4424","originalUntil":null},{"id":"com.mabdurrahman.intellij.customtitle","version":"0.0.1","since":"145.0","until":"181.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.lwfwind.automation.plugin.aping","version":"5.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"2.1.1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.519","since":"171.0","until":"172.0","originalSince":"171.0","originalUntil":null},{"id":"com.apksecure.plug1234.plugin.id","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.netease.hearttouch.as_nei_plugin","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.dafa.plugin.easyperfs","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.dafa.plugin.easyperfs","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.8.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"R4Intellij","version":"1.0.5","since":"145.258","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"172.1909.7","since":"172.1909","until":"172.*","originalSince":"172.1909","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"172.1909.7","since":"172.1909","until":"201","originalSince":"172.1909","originalUntil":null},{"id":"cucumber-javascript","version":"172.1909.7","since":"172.1909","until":"201","originalSince":"172.1909","originalUntil":null},{"id":"TFS","version":"172.1909.7","since":"172.1909","until":"191.*","originalSince":"172.1909","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"3.4","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.9.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.flow.intellij","version":"20170507175902","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.2.3","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.your.ELICE.eliceplugin","version":"0.3.6(beta)","since":"163.0","until":"201.0","originalSince":"163.0","originalUntil":null},{"id":"cyningxu.findviewbyx","version":"1.1","since":"93.0","until":"201.0","originalSince":"93.0","originalUntil":null},{"id":"com.flow.intellij","version":"20170508101913","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"io.allandequeiroz.random.image.background","version":"1.0.0","since":"162.0","until":"223","originalSince":"162.0","originalUntil":null},{"id":"com.dafa.plugin.easyperfs","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.apksecure.plug1234.plugin.id","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.dafa.plugin.easyperfs","version":"1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.26","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.8.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.8.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"io.allandequeiroz.random.image.background","version":"1.0.1","since":"162.0","until":"223","originalSince":"162.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.8.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.8.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"fr.tolc.jahia.intellij.plugin","version":"1.3.1","since":"107.105","until":"212.*","originalSince":"107.105","originalUntil":null},{"id":"com.automation.mtop.plugin.mtop-ng","version":"5.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"io.ballerina","version":"0.8.4","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"TFS","version":"172.2103.10","since":"172.2103","until":"191.*","originalSince":"172.2103","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"172.2103.10","since":"172.2103","until":"201","originalSince":"172.2103","originalUntil":null},{"id":"cucumber-javascript","version":"172.2103.10","since":"172.2103","until":"201","originalSince":"172.2103","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.3","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"ru.adelf.idea.dotenv","version":"0.3","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.debugger.streams","version":"0.1.0","since":"171.0","until":"173.*","originalSince":"171.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.8.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"2.6.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.8.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.naughtyserver","version":"1.1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"io.allandequeiroz.random.image.background","version":"1.2.0","since":"162.0","until":"223","originalSince":"162.0","originalUntil":null},{"id":"org.jetbrains.fortran","version":"1.0","since":"141.0","until":"170.*","originalSince":"141.0","originalUntil":null},{"id":"com.kesselring.valuegenerator","version":"1.1","since":"94.539","until":"201.0","originalSince":"94.539","originalUntil":null},{"id":"com.your.ELICE.eliceplugin","version":"0.3.8(beta)","since":"163.0","until":"201.0","originalSince":"163.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.2.4","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.mabdurrahman.intellij.customtitle","version":"0.0.2","since":"145.0","until":"181.0","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.98","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"OdpsStudio","version":"2.6.2.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.plugin.applescript","version":"0.116","since":"172.2241","until":"173.2290","originalSince":"172.2241","originalUntil":null},{"id":"com.flow.intellij","version":"20170515205337","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"cn.isaac.codelines","version":"1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.debugger.streams","version":"0.1.1","since":"171.0","until":"173.*","originalSince":"171.0","originalUntil":null},{"id":"com.bubiu.plugin.uniqueres","version":"1.5.16","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.8.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.resharper.HeapAllocationsViewer","version":"1.2.3.0","since":"171.4455","until":"172","originalSince":"171.4455","originalUntil":null},{"id":"vette.neos","version":"0.1.13-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.8.7","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.zen.idea.plugin.adt","version":"0.1","since":"143.2370","until":"201.0","originalSince":"143.2370","originalUntil":null},{"id":"com.zen.idea.plugin.adt","version":"0.1.1-rc1","since":"143.2370","until":"201.0","originalSince":"143.2370","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.3.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.3.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"171.4424.63","since":"171.4424","until":"201","originalSince":"171.4424","originalUntil":null},{"id":"TFS","version":"171.4424.63","since":"171.4424","until":"191.*","originalSince":"171.4424","originalUntil":null},{"id":"io.ballerina","version":"0.8.5","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.1.3-eap-34-IJ2017.1-1","since":"171.1","until":"171.*","originalSince":"171.1","originalUntil":"172.*"},{"id":"com.zen.idea.plugin.adt","version":"0.1.1","since":"143.2370","until":"201.0","originalSince":"143.2370","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.128","since":"171.3780.107","until":"211","originalSince":"171.3780.107","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"2.1.2","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"TFS","version":"172.2273.2","since":"172.2273","until":"191.*","originalSince":"172.2273","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"172.2273.2","since":"172.2273","until":"172.*","originalSince":"172.2273","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"172.2273.2","since":"172.2273","until":"201","originalSince":"172.2273","originalUntil":null},{"id":"cucumber-javascript","version":"172.2273.2","since":"172.2273","until":"201","originalSince":"172.2273","originalUntil":null},{"id":"com.zen.idea.plugin.adt","version":"0.1.2","since":"143.2370","until":"201.0","originalSince":"143.2370","originalUntil":null},{"id":"com.dafa.plugin.easyperfs","version":"1.4","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"ch.dasoft.iconviewer","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.pandawarrior.androidXMLConverter","version":"2.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.fortran","version":"1.0.1","since":"141.0","until":"193.0","originalSince":"141.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.9","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.illuminatedcloud.intellij","version":"1.7.9.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"ch.dasoft.iconviewer","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.8.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.8.9","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.zen.idea.plugin.adt","version":"0.1.3","since":"143.2370","until":"201.0","originalSince":"143.2370","originalUntil":null},{"id":"com.denis.zaichenko.angular.2.ws.live.templates","version":"2.0.0","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"ru.scratty.generatetomap","version":"0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"UDC","version":"1.0.3","since":"139.0","until":"183.*","originalSince":"139.0","originalUntil":null},{"id":"OdpsStudio","version":"2.6.2.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"ch.dasoft.iconviewer","version":"1.11","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.gheorman.radu.connascence.detection","version":"0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.zen.idea.plugin.adt","version":"0.1.4","since":"143.2370","until":"201.0","originalSince":"143.2370","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"172.2465.2","since":"172.2465","until":"201","originalSince":"172.2465","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"172.2465.2","since":"172.2465","until":"172.*","originalSince":"172.2465","originalUntil":null},{"id":"TFS","version":"172.2465.2","since":"172.2465","until":"191.*","originalSince":"172.2465","originalUntil":null},{"id":"cucumber-javascript","version":"172.2465.2","since":"172.2465","until":"201","originalSince":"172.2465","originalUntil":null},{"id":"com.maihaoche.cx5","version":"1.0","since":"161.0","until":"201.0","originalSince":"161.0","originalUntil":null},{"id":"com.maihaoche.cx5","version":"1.1","since":"161.0","until":"201.0","originalSince":"161.0","originalUntil":null},{"id":"com.maihaoche.cx5","version":"1.2","since":"161.0","until":"201.0","originalSince":"161.0","originalUntil":null},{"id":"com.weirddev.testme","version":"1.5.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.30","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"vette.neos","version":"0.1.14-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.0.4","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"de.espend.idea.php.phpunit","version":"2.2.1","since":"171.3780","until":"173.2099","originalSince":"171.3780","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.0.4.1","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.0.5","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.99","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.your.ELICE.eliceplugin","version":"0.5.0(beta)","since":"163.0","until":"201.0","originalSince":"163.0","originalUntil":null},{"id":"com.dubreuia","version":"0.15","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.0.6","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.21.1","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.2.5","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.gheorman.radu.connascence.detection","version":"0.1.3.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.packer.as.plugin","version":"1.0.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.flow.intellij","version":"20170531202529","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"YAML/Ansible support","version":"0.9.5","since":"141.713","until":"222","originalSince":"141.713","originalUntil":null},{"id":"ca.rightsomegoodgames.mayacharm","version":"2.1.2","since":"131.0","until":"193.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.0.6.1","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.30","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"LivePlugin","version":"0.5.13 beta","since":"163.0","until":"213.*","originalSince":"163.0","originalUntil":null},{"id":"com.gheorman.radu.connascence.detection","version":"0.1.3.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"CUBA","version":"3.4.1.163","since":"163.0","until":"211","originalSince":"163.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.aemtools","version":"0.7","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.intellij.flashcards","version":"0.0.1-alpha","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"172.2656.13","since":"172.2656","until":"201","originalSince":"172.2656","originalUntil":null},{"id":"TFS","version":"172.2656.13","since":"172.2656","until":"191.*","originalSince":"172.2656","originalUntil":null},{"id":"org.moe","version":"2.0.0-alpha-1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"marcglasberg.HibernateInspectionsPlugin","version":"1.1","since":"139.0","until":"181.*","originalSince":"139.0","originalUntil":null},{"id":"org.turbanov.execution.cmd","version":"1.6","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.14.0","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"com.potterhsu.jsonviewer","version":"0.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.your.ELICE.eliceplugin","version":"0.5.2","since":"163.0","until":"201.0","originalSince":"163.0","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.2.5","since":"143.0","until":"183","originalSince":"143.0","originalUntil":null},{"id":"awesome.aurora.borealis.zupersearch.plugin.intellij","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"OdpsStudio","version":"2.6.2.3","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.meizu.flyme.mall.XmlToJson","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"2.1.1","since":"163.0","until":"163.*","originalSince":"163.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.0.7","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"2.1.3","since":"143.0","until":"181.*","originalSince":"143.0","originalUntil":null},{"id":"fr.tolc.jahia.intellij.plugin","version":"1.3.2","since":"107.105","until":"212.*","originalSince":"107.105","originalUntil":null},{"id":"com.weirddev.testme","version":"1.5.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.headwire.aem.tooling.intellij","version":"1.0.1","since":"162.0","until":"203","originalSince":"162.0","originalUntil":null},{"id":"org.intellij.xquery.marklogic","version":"0.9.0-BETA","since":"163.7743","until":"212.*","originalSince":"163.7743","originalUntil":null},{"id":"com.gheorman.radu.connascence.detection","version":"0.1.4.4","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.gheorman.radu.connascence.detection","version":"0.1.4.5","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"TFS","version":"172.2827.22","since":"172.2827","until":"191.*","originalSince":"172.2827","originalUntil":null},{"id":"cucumber-javascript","version":"172.2827.22","since":"172.2827","until":"201","originalSince":"172.2827","originalUntil":null},{"id":"cucumber-javascript","version":"171.4694.29","since":"171.4694","until":"201","originalSince":"171.4694","originalUntil":null},{"id":"TFS","version":"171.4694.29","since":"171.4694","until":"191.*","originalSince":"171.4694","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.16.0","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"com.stfalcon.mvpgenerator","version":"0.1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.xujiaji.plugin.MVPManager","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.sunary.options-completion-phpstorm-plugin","version":"1.0.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.xujiaji.plugin.MVPManager","version":"1.1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"io.ballerina","version":"0.8.6","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.21","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"net.rentalhost.idea.laravelInsight","version":"0.2.0","since":"171.0","until":"172.0","originalSince":"145.0","originalUntil":null},{"id":"edu.jetbrains.plugin.lt","version":"1.0","since":"171.4694.23","until":"201.0","originalSince":"171.4694.23","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"2.6.2.4","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"6.3","since":"172.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.10","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.yii2support","version":"0.5.32.1","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.yii2support","version":"0.5.32.2","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.tang","version":"1.1.5","since":"171.0","until":"171.*","originalSince":"171.0","originalUntil":null},{"id":"edu.jetbrains.plugin.lt","version":"1.01","since":"171.4694.23","until":"201.0","originalSince":"171.4694.23","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.4.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.4.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"2.1.4","since":"143.0","until":"181.*","originalSince":"143.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.9.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.stfalcon.mvpgenerator","version":"0.2.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.5.3","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.stfalcon.mvpgenerator","version":"0.2.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"fr.ensimag.deca.intellijplugin.id","version":"0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.debugger.streams","version":"0.1.2","since":"171.0","until":"173.*","originalSince":"171.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"1.0.0-RC3","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.3.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"org.tinygroup.studio.template","version":"20170614.2.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.sunary.options-completion-phpstorm-plugin","version":"1.0.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"cucumber-javascript","version":"172.2953.12","since":"172.2953","until":"201","originalSince":"172.2953","originalUntil":null},{"id":"TFS","version":"172.2953.12","since":"172.2953","until":"191.*","originalSince":"172.2953","originalUntil":null},{"id":"br.com.matheusfm.jsonutils","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.24.9","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.xujiaji.plugin.MVPManager","version":"1.5.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"de.espend.idea.php.phpunit","version":"2.3","since":"171.3780","until":"173.2099","originalSince":"171.3780","originalUntil":null},{"id":"ru.itis.androidplugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.yii2support","version":"0.5.32.4","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"brown.bat","version":"1.3.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.5.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"com.thoughtworks.gauge","version":"0.3.4","since":"163.0","until":"172.0","originalSince":"163.0","originalUntil":null},{"id":"br.com.matheusfm.jsonutils","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.leeiidesu.gen.GenerateMVP","version":"2.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"brown.bat","version":"1.3.0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.yii2support","version":"0.5.32.5","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"Gitflow","version":"0.6.1","since":"171.0","until":"172.*","originalSince":"162.0","originalUntil":"172.*"},{"id":"com.taobao.atlas","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"io.ballerina","version":"0.8.7","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"org.tinygroup.studio.template","version":"20170621.2.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.leeiidesu.gen.GenerateMVP","version":"2.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"A move tab left and right using the keyboard plugin - by momomo.com","version":"5.20","since":"111","until":"","originalSince":"101.0","originalUntil":null},{"id":"A move tab left and right using the keyboard plugin - by momomo.com","version":"6.20","since":"111","until":"","originalSince":"101.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.4.0.1","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.4.0.1","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"cucumber-javascript","version":"172.3095.13","since":"172.3095","until":"201","originalSince":"172.3095","originalUntil":null},{"id":"TFS","version":"172.3095.13","since":"172.3095","until":"191.*","originalSince":"172.3095","originalUntil":null},{"id":"com.testvagrant.optimus.elements","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"net.rentalhost.idea.laravelInsight","version":"0.3.0","since":"171.0","until":"172.0","originalSince":"145.0","originalUntil":null},{"id":"com.dubreuia","version":"0.16","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.5","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.2.6","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"org.jetbrains.debugger.streams","version":"0.1.3","since":"171.0","until":"173.*","originalSince":"171.0","originalUntil":null},{"id":"com.testvagrant.optimus.elements","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.flow.intellij","version":"20170624103721","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.yii2support","version":"0.5.32.6","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"1.3.5","since":"145.0","until":"223.*","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.9.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"name.kropp.intellij.makefile","version":"1.2","since":"163.0","until":"211.5538","originalSince":"163.0","originalUntil":null},{"id":"de.espend.idea.php.phpunit","version":"2.4","since":"171.3780","until":"173.2099","originalSince":"171.3780","originalUntil":null},{"id":"com.smartbit8.laravelStorm.intellij","version":"0.9","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cn.windfantasy.plugin.parcelablegenerator","version":"0.0.1","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"cz.jiripudil.intellij.nette.tester","version":"2.0.0-beta.3","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"2.2.0.final","since":"143.0","until":"181.*","originalSince":"143.0","originalUntil":null},{"id":"com.qiaoshouliang","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"2.4.1","since":"163.0","until":"163.*","originalSince":"163.0","originalUntil":null},{"id":"OdpsStudio","version":"2.6.2.5","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.taobao.atlas","version":"1.05","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.taobao.atlas","version":"1.06","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"2.0","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.qiaoshouliang","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"brown.bat","version":"1.3.0.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"0.6","since":"162.0","until":"231.*","originalSince":"162.0","originalUntil":null},{"id":"com.lmax.intellijLint","version":"0.1","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"brown.bat","version":"1.3.0.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.2.7","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.100","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"io.ballerina","version":"0.8.8","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"mr.intellij.plugin.autofactory","version":"0.0.1","since":"162.0","until":"181.*","originalSince":"162.0","originalUntil":null},{"id":"mr.intellij.plugin.autofactory","version":"0.1.0","since":"162.0","until":"181.*","originalSince":"162.0","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.6","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.yii2support","version":"0.5.33.7","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.yii2support","version":"0.5.33.7","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.tinselspoon.intellij.kubernetes","version":"0.7","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"mr.intellij.plugin.autofactory","version":"0.1.1","since":"163.0","until":"181.*","originalSince":"163.0","originalUntil":null},{"id":"com.poratu.idea.plugins.tomcat","version":"1.7","since":"141.0","until":"191.0","originalSince":"141.0","originalUntil":null},{"id":"mr.intellij.plugin.autofactory","version":"0.2.2","since":"163.0","until":"181.*","originalSince":"163.0","originalUntil":null},{"id":"mr.intellij.plugin.autofactory","version":"0.2.3","since":"163.0","until":"181.*","originalSince":"163.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.6.0","since":"172.1601","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"mr.intellij.plugin.autofactory","version":"0.2.4","since":"163.0","until":"211.*","originalSince":"163.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"2.4.2","since":"163.0","until":"163.*","originalSince":"163.0","originalUntil":null},{"id":"org.jetbrains.debugger.streams","version":"0.1.4","since":"171.0","until":"173.*","originalSince":"171.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.5.4","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"org.jetbrains.fortran","version":"1.1","since":"141.0","until":"193.0","originalSince":"141.0","originalUntil":null},{"id":"org.jetbrains.fortran","version":"1.1.1","since":"141.0","until":"193.0","originalSince":"141.0","originalUntil":null},{"id":"org.yxdroid.plugin.yxdroidtools","version":"1.0.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"172.3198.20","since":"172.3198","until":"201","originalSince":"172.3198","originalUntil":null},{"id":"TFS","version":"172.3198.20","since":"172.3198","until":"191.*","originalSince":"172.3198","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"ca.rightsomegoodgames.mayacharm","version":"2.1.3","since":"131.0","until":"193.0","originalSince":"131.0","originalUntil":null},{"id":"R4Intellij","version":"1.0.6","since":"145.258","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"0.7","since":"162.0","until":"231.*","originalSince":"162.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"2.0.3","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.5.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.5.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"net.rentalhost.idea.laravelInsight","version":"0.3.1","since":"171.0","until":"172.0","originalSince":"145.0","originalUntil":null},{"id":"org.yxdroid.plugin.yxdroidtools","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.7.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"com.morphling.builder.plugin","version":"3.0.0-1.0.0","since":"171.4249.39","until":"201.0","originalSince":"171.4249.39","originalUntil":null},{"id":"com.aandk.plugin.log","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.smartbit8.laravelStorm.intellij","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.101","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"1.3.6","since":"145.0","until":"223.*","originalSince":"145.0","originalUntil":null},{"id":"org.jeto.taskfocus","version":"0.9.1","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.8.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.9.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.102","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"ch.dasoft.iconviewer","version":"1.12","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"172.3317.8","since":"172.3317","until":"201","originalSince":"172.3317","originalUntil":null},{"id":"TFS","version":"172.3317.8","since":"172.3317","until":"191.*","originalSince":"172.3317","originalUntil":null},{"id":"com.ztf.talk","version":"1.0","since":"145.258","until":"201.0","originalSince":"145.258","originalUntil":null},{"id":"EclipseCodeFormatter","version":"17.0.132.637.1","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"org.moe","version":"1.3.2","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.10.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"0.8","since":"162.0","until":"231.*","originalSince":"162.0","originalUntil":null},{"id":"com.suhininalex.cloneDetection.plugin.id","version":"1.0","since":"171.0","until":"201","originalSince":"171.0","originalUntil":null},{"id":"R4Intellij","version":"1.0.7","since":"145.258","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"Karma","version":"173.622","since":"173.622","until":"181.0","originalSince":"173.622","originalUntil":"173.*"},{"id":"com.endoidou.copy_current_activity","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.nextras.orm.intellij","version":"0.4.2","since":"131.0","until":"181.3494","originalSince":"131.0","originalUntil":null},{"id":"com.yii2support","version":"0.5.33.8","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"de.espend.idea.php.phpunit","version":"2.5","since":"171.3780","until":"173.2099","originalSince":"171.3780","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"1.1.0","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.github.novotnyr.jwt-intellij-plugin","version":"0.1","since":"143.0","until":"222.*","originalSince":"143.0","originalUntil":null},{"id":"org.intellij.xquery.marklogic","version":"0.9.1-BETA","since":"163.7743","until":"212.*","originalSince":"163.7743","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"0.8.1","since":"162.0","until":"231.*","originalSince":"162.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.2.8","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.me.speachme.intelliSpeach","version":"0.7","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.xquery.marklogic","version":"0.9.2-BETA","since":"163.7743","until":"212.*","originalSince":"163.7743","originalUntil":null},{"id":"com.djk.yyy.kotterknife","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.tang","version":"1.1.6","since":"171.0","until":"171.*","originalSince":"171.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.12","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"ch.raffael.mddoclet.integrations.idea.MarkdownDocletIdea","version":"1.4-0","since":"171.0","until":"191.*","originalSince":"171.0","originalUntil":null},{"id":"cz.k2.eshop","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2017.1.46915","since":"133.1800","until":"143.2200","originalSince":"133.1800","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2017.1.46915","since":"133.1800","until":"171.4249","originalSince":"133.1800","originalUntil":null},{"id":"cucumber-javascript","version":"172.3317.48","since":"172.3317","until":"201","originalSince":"172.3317","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.31","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"TFS","version":"172.3317.48","since":"172.3317","until":"191.*","originalSince":"172.3317","originalUntil":null},{"id":"cz.k2.eshop","version":"1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.4","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"com.yii2support","version":"0.5.33.10","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.yii2support","version":"0.5.33.11","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"intellij.buck.plugin","version":"2.9","since":"162.0","until":"172.*","originalSince":"162.0","originalUntil":null},{"id":"com.nd.sdp.common.CustomUIToolWindow","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.103","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"2.2.1","since":"143.0","until":"181.*","originalSince":"143.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"0.8.2","since":"162.0","until":"231.*","originalSince":"162.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"17.1.132.637.0","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.nd.sdp.common.CustomUIToolWindow","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cz.k2.eshop","version":"1.4","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.beame.io.insta.ssl","version":"1.0.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"io.t28.json2java","version":"0.2.1","since":"160.0","until":"181.0","originalSince":"160.0","originalUntil":null},{"id":"com.lmax.intellijLint","version":"0.1.1","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"Osmorc","version":"1.4.9","since":"163.0","until":"201","originalSince":"163.0","originalUntil":null},{"id":"Osmorc","version":"1.4.10","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.4.0","since":"162.2147483647","until":"172.*","originalSince":"162.*","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.11","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.11","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.9.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"intellij.buck.plugin","version":"3.0","since":"171.3019","until":"172.*","originalSince":"171.3019","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.9.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.taobao.atlas","version":"1.13.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.flow.intellij","version":"20170718200811","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"org.leblanc.CodeNarcNG","version":"3.1","since":"80.8000","until":"201.0","originalSince":"80.8000","originalUntil":null},{"id":"ru.hiq.butterknifesharper","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.zkoss.zkidea","version":"0.1.10","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.104","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"EclipseCodeFormatter","version":"16.5.132.637.0.Eclipse_4.6.3","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.11.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"org.intellij.plugins.ceylon.ide","version":"1.3.2-1","since":"171.0","until":"213.*","originalSince":"171.0","originalUntil":null},{"id":"org.jetbrains.fortran","version":"1.2.0","since":"171.0","until":"193.0","originalSince":"171.0","originalUntil":null},{"id":"ru.adelf.idea.dotenv","version":"0.4","since":"172.0","until":"192.*","originalSince":"172.0","originalUntil":null},{"id":"io.t28.json2java","version":"0.2.2","since":"160.0","until":"201.0","originalSince":"160.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.7","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"io.ballerina","version":"0.8.9","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"2.4.4","since":"172.0","until":"182.0","originalSince":"172.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.5","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.6","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.endoidou.copy_current_activity","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.jiyuanime.ActivatePowerModeApplicationPlugin","version":"0.1.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.yii2support","version":"0.5.33.12","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"CodeWithMe plugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"2.7.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"org.nextras.orm.intellij","version":"0.4.3","since":"131.0","until":"181.3494","originalSince":"131.0","originalUntil":null},{"id":"com.suhininalex.cloneDetection.plugin.id","version":"1.1","since":"171.0","until":"201","originalSince":"171.0","originalUntil":null},{"id":"org.jeto.taskfocus","version":"0.9.5","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"0.9","since":"171.0","until":"173.1","originalSince":"171.0","originalUntil":null},{"id":"Show REST Services","version":"1.3","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"0.9.1","since":"162.0","until":"171.1","originalSince":"162.0","originalUntil":null},{"id":"com.softbank.robot.sdkplugin","version":"1.0.8","since":"143.381","until":"211.*","originalSince":"143.381","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.129","since":"171.3780.107","until":"211","originalSince":"171.3780.107","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.6.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.6.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"cucumber-javascript","version":"172.3544.10","since":"172.3544","until":"201","originalSince":"172.3544","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"172.3544.10","since":"172.3544","until":"201","originalSince":"172.3544","originalUntil":null},{"id":"TFS","version":"172.3544.10","since":"172.3544","until":"191.*","originalSince":"172.3544","originalUntil":null},{"id":"com.github.novotnyr.jwt-intellij-plugin","version":"0.2","since":"143.0","until":"222.*","originalSince":"143.0","originalUntil":null},{"id":"ren.helloworld.mvp.plugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.souyidai.common.plugin.generators","version":"1.2.11","since":"139.0","until":"201.*","originalSince":"139.0","originalUntil":null},{"id":"com.mabdurrahman.intellij.customtitle","version":"0.0.3","since":"145.0","until":"181.0","originalSince":"145.0","originalUntil":null},{"id":"com.qiaoshouliang.mvpPlugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.qiaoshouliang.mvpPlugin","version":"2.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.qiaoshouliang.mvpPlugin","version":"2.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"5.1","since":"171.3780","until":"181.3494","originalSince":"171.3780","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.4.5","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.7","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"2.7.0.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.105","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.3.0","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.9","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.glagol","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.8","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.4.6","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"0.9.2","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.9","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.qiaoshouliang","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"0.8.3","since":"162.0","until":"231.*","originalSince":"162.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"2.2.2","since":"143.0","until":"181.*","originalSince":"143.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.4.7","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"com.retryu","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.retryu","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.retryu","version":"1.11","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.floobits.unique.plugin.id","version":"1.6.7","since":"131.0","until":"193.*","originalSince":"131.0","originalUntil":null},{"id":"com.retryu","version":"1.12","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"0.9.3","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"com.retryu","version":"1.13","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"0.8.4","since":"162.0","until":"231.*","originalSince":"162.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"2.0.4","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.13","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.10","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.weirddev.testme","version":"1.5.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.qiaoshouliang.CreateAdapter","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.33","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.3.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.3.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.3.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.3.4","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.plugins.go","version":"172.3757.2","since":"172.3757","until":"172.*","originalSince":"172.3317","originalUntil":"172.*"},{"id":"TFS","version":"172.3544.34","since":"172.3544","until":"191.*","originalSince":"172.3544","originalUntil":null},{"id":"cucumber-javascript","version":"172.3544.34","since":"172.3544","until":"201","originalSince":"172.3544","originalUntil":null},{"id":"com.inflectra.SpiraTeam","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"0.9.4","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"cn.ieclipse.aorm.as","version":"1.0.1","since":"141.0","until":"193.*","originalSince":"141.0","originalUntil":null},{"id":"org.bitvault.plugin.dpkplugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"AngularJS","version":"173.1310","since":"173.1310","until":"181.0","originalSince":"173.1310","originalUntil":"173.*"},{"id":"cucumber-javascript","version":"173.1310","since":"173.1310","until":"201","originalSince":"173.1310","originalUntil":null},{"id":"Karma","version":"173.1310","since":"173.1310","until":"181.0","originalSince":"173.1310","originalUntil":"173.*"},{"id":"com.jetbrains.plugins.meteor","version":"173.1310","since":"173.1310","until":"181.0","originalSince":"173.1310","originalUntil":"173.*"},{"id":"org.jetbrains.plugins.stylus","version":"173.1310","since":"173.1310","until":"201","originalSince":"173.1310","originalUntil":null},{"id":"TFS","version":"173.1310","since":"173.1310","until":"191.*","originalSince":"173.1310","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"173.1310","since":"173.1310","until":"173.*","originalSince":"173.1310","originalUntil":null},{"id":"EclipseCodeFormatter","version":"16.6.132.637.0.Eclipse_4.6.3","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"EclipseCodeFormatter","version":"17.2.132.637.0.Eclipse_4.7","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.flageolett.roc","version":"1.0","since":"145.0","until":"201.*","originalSince":"145.0","originalUntil":null},{"id":"UDC","version":"1.0.4","since":"139.0","until":"183.*","originalSince":"139.0","originalUntil":null},{"id":"org.tsxuehu.gen-api-doc","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.flageolett.roc","version":"1.0.1","since":"145.0","until":"201.*","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.5","since":"141.3000","until":"192.*","originalSince":"141.3000","originalUntil":null},{"id":"com.asif.gsonpojogenerator","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.3.5","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.3.6","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"top.jsmzr.cipher.component.CipherTools","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.pgyer.as.plugin","version":"1.4.1","since":"131.0","until":"201.4515.24","originalSince":"131.0","originalUntil":null},{"id":"com.haskforce","version":"0.3-beta.38","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"fr.tolc.jahia.intellij.plugin","version":"1.3.3","since":"107.105","until":"212.*","originalSince":"107.105","originalUntil":null},{"id":"com.taobao.weex.lang","version":"2.0.5","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.3.7","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.flageolett.roc","version":"1.0.2","since":"145.0","until":"201.*","originalSince":"145.0","originalUntil":null},{"id":"com.zcolin.zplug","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"me.aristotll.ruby.rdoc.adder","version":"0.01","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"me.aristotll.ruby.rdoc.adder","version":"0.02","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.9.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.12","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.12","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"cucumber-java","version":"172.3317","since":"172.3317","until":"201","originalSince":"172.3317","originalUntil":null},{"id":"de.misi.idea.plugins.junit5helper","version":"0.1","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"2.0.6","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"cn.nekocode.plugin.parcelablegenerator","version":"0.7.2","since":"123.72","until":"201.0","originalSince":"123.72","originalUntil":null},{"id":"com.harmonycloud.mars.unique.plugin.id","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.liyijiang.androidpx2dp","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.9.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.talkingdata.orm.tool","version":"1.3","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.dubreuia","version":"0.18","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"com.inflectra.SpiraTeam","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.flow.intellij","version":"20170808201811","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"1.2.0","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"de.misi.idea.plugins.junit5helper","version":"0.2","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"com.ws.unique.plugin.id","version":"0.15","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"cucumber-javascript","version":"172.3757.32","since":"172.3757","until":"201","originalSince":"172.3757","originalUntil":null},{"id":"TFS","version":"172.3757.32","since":"172.3757","until":"191.*","originalSince":"172.3757","originalUntil":null},{"id":"ru.makkarpov.ucl","version":"0.1","since":"171.0","until":"181.0","originalSince":"171.0","originalUntil":null},{"id":"ru.makkarpov.ucl","version":"0.1.1","since":"171.0","until":"181.0","originalSince":"171.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"0.0.34","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.11","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.ws.unique.plugin.id","version":"0.16","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"me.fingerart.idea.apidebugger","version":"2.0.0","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"io.ballerina","version":"0.9.0","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.djk.yyy.kotterknife","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"1.2.0","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"R4Intellij","version":"1.0.8","since":"145.258","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"org.elixir_lang","version":"6.0.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.0.0","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.0.1","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"com.aemtools","version":"0.8","since":"131.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.elixir_lang","version":"6.1.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.3.8","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.nd.sdp.common.CustomUIToolWindow","version":"1.0.4","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"2.2.3","since":"143.0","until":"181.*","originalSince":"143.0","originalUntil":null},{"id":"Appetizer.io","version":"1.1.1","since":"129.1","until":"201.0","originalSince":"129.1","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.7.9.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.applariat.idea.plugin.id","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.nd.sdp.common.CustomUIToolWindow","version":"1.0.5","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.7.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.7.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"cucumber-javascript","version":"172.3757.55","since":"172.3757","until":"201","originalSince":"172.3757","originalUntil":null},{"id":"TFS","version":"172.3757.55","since":"172.3757","until":"191.*","originalSince":"172.3757","originalUntil":null},{"id":"ru.makkarpov.ucl","version":"0.1.2","since":"171.0","until":"181.0","originalSince":"171.0","originalUntil":null},{"id":"vette.neos","version":"0.1.15-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"ru.hiq.butterknifesharper","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cn.yzl.activityintentcreater","version":"1.4","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.bitvault.plugin.dpkplugin","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave","version":"0.13","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.intellij.plugin","version":"0.13","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.raml","version":"0.13","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"fortify.fod","version":"17.3.0200","since":"162.0","until":"213.*","originalSince":"162.0","originalUntil":null},{"id":"reasonml","version":"0.11","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"reasonml","version":"0.12","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"QAPlug","version":"1.3.13","since":"172.3757","until":"211","originalSince":"172.3757","originalUntil":null},{"id":"de.misi.idea.plugins.junit5helper","version":"0.3","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"cn.yzl.activityintentcreater","version":"1.5","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.ydzy.test","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.ydzy.tangchaoSqlToJava","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.ydzy.tangchaoGui","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"PerforceIC","version":"0.9.5","since":"135.1286","until":"181.0","originalSince":"135.1286","originalUntil":null},{"id":"org.elixir_lang","version":"6.1.1","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.dingxiang.plugin.StringEncryptor","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"reasonml","version":"0.13","since":"141.0","until":"141.*","originalSince":"141.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.12","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"org.jbooster.jbooster-logging-intellij-plugin","version":"1.0","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"com.glagol","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.1.0-RC.1","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.3.1","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.9.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.basisjs","version":"0.1.5","since":"162.0","until":"181.0","originalSince":"162.0","originalUntil":null},{"id":"vette.neos","version":"0.1.16-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"cn.yzl.activityintentcreater","version":"1.6","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.luciozhang.plugin.id","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.plugins.ceylon.ide","version":"1.3.3","since":"171.0","until":"213.*","originalSince":"171.0","originalUntil":null},{"id":"com.github.nuclearg.smartgs","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.1.0-RC.2","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":">me.drakeet.plugin.multitype","version":"1.3.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.14","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.manolenso.intellij.foundation6","version":"1.8.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"AureliaStorm","version":"0.5","since":"162.1628","until":"213.0","originalSince":"162.1628","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.0.2","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.1.0","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"com.yang.dialog","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.3.9","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.4.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.4.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.1.1","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":null},{"id":"io.ballerina","version":"0.9.1","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"cucumber-javascript","version":"172.3968.20","since":"172.3968","until":"201","originalSince":"172.3968","originalUntil":null},{"id":"TFS","version":"172.3968.20","since":"172.3968","until":"191.*","originalSince":"172.3968","originalUntil":null},{"id":"org.jbooster.jbooster-logging-intellij-plugin","version":"1.0.1","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.4.4","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.4.5","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.4.6","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"2.7.0.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.shenjiajun.TinyPic","version":"1.0.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"net.coding.git","version":"1.0.2","since":"171.0","until":"193","originalSince":"171.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.4.7","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"me.drakeet.layoutformatter","version":"1.2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.13","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.dubreuia","version":"0.19","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.4.8","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"0.8.2","since":"171.2953.9","until":"232.*","originalSince":"171.2953.9","originalUntil":null},{"id":"com.canoo.dolphinplattform.intellij","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.samsung.srr.dex.adb_tool","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.inflectra.SpiraTeam","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.stoneplugin.unique.plugin.id","version":"1.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"Nette framework helpers","version":"0.4.3","since":"171.0","until":"192.0","originalSince":"171.0","originalUntil":null},{"id":"net.rentalhost.idea.laravelInsight","version":"0.3.2","since":"171.0","until":"172.0","originalSince":"145.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.14","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.hadihariri.pathtitle","version":"0.1","since":"131.0","until":"231.*","originalSince":"131.0","originalUntil":null},{"id":"SerialPortMonitor","version":"0.5.2","since":"141.245","until":"201","originalSince":"141.245","originalUntil":null},{"id":"com.xu","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"MyPlugin.CreateDialog","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.samsung.srr.dex.adb_tool","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.kamikx.adbdatetime","version":"1.0","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"com.xingren.fc.rangers-logging-intellij-plugin","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.1","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"com.samsung.srr.dex.adb_tool","version":"1.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.bitvault.plugin.bvkplugin","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.xingren.fc.rangers-logging-intellij-plugin","version":"1.0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.taobao.weex.lang","version":"2.0.7","since":"141.0","until":"181.*","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.0.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.bolex.recitewords","version":"1.2","since":"107.121","until":"201.0","originalSince":"107.121","originalUntil":null},{"id":"io.harply.plugin","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.12.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"io.github.francoiscambell.clionarduinoplugin2017","version":"1.2.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"Check-In Policies for TFS (Team Foundation Server)","version":"1.0","since":"140.0","until":"193.*","originalSince":"140.0","originalUntil":null},{"id":"TFS","version":"172.3968.27","since":"172.3968","until":"191.*","originalSince":"172.3968","originalUntil":null},{"id":"gw.in.ij","version":"1.0.0","since":"141.1010","until":"201.0","originalSince":"141.1010","originalUntil":null},{"id":"ModuleColorPlugin","version":"1.0","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"cn.yzl.activityintentcreater","version":"1.7","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"vette.neos","version":"0.1.17-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"krasa.translatorGenerator","version":"0.3","since":"172.0","until":"192.7142","originalSince":"172.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.0.8","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"com.me.speachme.intelliSpeach","version":"0.9.6","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"com.dubreuia","version":"0.20","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"TFS","version":"172.4155.10","since":"172.4155","until":"191.*","originalSince":"172.4155","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.6","since":"143.2000","until":"192.*","originalSince":"143.2000","originalUntil":null},{"id":"com.musical.ly.plugin.muse-mvp-plugin","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.15","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.0-RC1","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"vette.neos","version":"0.1.18-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.0-RC2","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.0-RC3","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"edu.umd.cs.cpm","version":"1.0.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.0.9","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"top.jsmzr.cipher.component.CipherTools","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.0-RC4","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.0-RC5","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"com.nd.sdp.common.CustomUIToolWindow","version":"1.0.7","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.0","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.130","since":"171.3780.107","until":"211","originalSince":"171.3780.107","originalUntil":null},{"id":"vette.neos","version":"0.1.19-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"com.daveme.intellij.chocolateCakePHP","version":"0.1","since":"171.3780","until":"173.*","originalSince":"171.3780","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.3.2","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"OdpsStudio","version":"2.8.0.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.8.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.8.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"cucumber-javascript","version":"173.2099.6","since":"173.2099","until":"201","originalSince":"173.2099","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"173.2099.6","since":"173.2099","until":"201","originalSince":"173.2099","originalUntil":null},{"id":"XSLT-Debugger","version":"173.2099.6","since":"173.2099","until":"201","originalSince":"173.2099","originalUntil":null},{"id":"TFS","version":"173.2099.6","since":"173.2099","until":"191.*","originalSince":"173.2099","originalUntil":null},{"id":"AngularJS","version":"173.2099.6","since":"173.2099","until":"181.0","originalSince":"173.2099","originalUntil":"173.*"},{"id":"com.jetbrains.plugins.meteor","version":"173.2099.6","since":"173.2099","until":"181.0","originalSince":"173.2099","originalUntil":"173.*"},{"id":"OdpsStudio","version":"2.8.0.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.dubreuia","version":"0.21","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"top.jsmzr.cipher.component.CipherTools","version":"1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.ctrip.wireless.android.build","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.1-RC1","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"com.cxp.plugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.cxp.plugin","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"ch.dasoft.iconviewer","version":"1.13","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.cxp.plugin","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.17","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.2.0","since":"171.3780","until":"171.*","originalSince":"171.3780","originalUntil":null},{"id":"gw.in.ij","version":"1.0.1","since":"141.1010","until":"201.0","originalSince":"141.1010","originalUntil":null},{"id":"com.nd.sdp.common.CustomUIToolWindow","version":"1.0.8","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.taobao.atlas","version":"2.0.0","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.taobao.atlas","version":"2.0.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.deadlock.scsyntax","version":"1.0.4","since":"172.3317","until":"201","originalSince":"172.3317","originalUntil":null},{"id":"com.ctrip.wireless.android.build","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.typ0520.plugin.fastdex","version":"1.0.0","since":"141.0","until":"183.0","originalSince":"141.0","originalUntil":null},{"id":"com.peng.myproguard","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"si.deno.converter.cyrillic","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"zhushou","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.aemtools","version":"0.8.1","since":"173.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.fortran","version":"1.3.0","since":"171.0","until":"193.0","originalSince":"171.0","originalUntil":null},{"id":"com.ctrip.wireless.android.build","version":"1.0.3","since":"111.0","until":"201.0","originalSince":"111.0","originalUntil":null},{"id":"org.jetbrains.fortran","version":"1.3.1","since":"171.0","until":"193.0","originalSince":"171.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.0.15","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"intellij.zeppelin.","version":"1.0","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.2.1","since":"171.3780","until":"171.*","originalSince":"171.3780","originalUntil":null},{"id":"com.github.typ0520.plugin.fastdex","version":"1.0.1","since":"141.0","until":"183.0","originalSince":"141.0","originalUntil":null},{"id":"com.panshen.me.QuickSearch","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"io.intino.plugin","version":"3.1.2","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"de.misi.idea.plugins.junit5helper","version":"0.4","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"org.reneYang.texas.encrypt","version":"1.5","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"0.10.3","since":"171.2953.9","until":"232.*","originalSince":"171.2953.9","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.2.2","since":"171.3780","until":"171.*","originalSince":"171.3780","originalUntil":null},{"id":"com.naughtyserver","version":"1.1.4","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.0.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"0.10.4","since":"171.2953.9","until":"232.*","originalSince":"171.2953.9","originalUntil":null},{"id":"TFS","version":"172.4155.35","since":"172.4155","until":"191.*","originalSince":"172.4155","originalUntil":null},{"id":"com.yuyashuai.plugin.dictionary","version":"1.0","since":"139.0","until":"201.0","originalSince":"139.0","originalUntil":null},{"id":"com.ppdai.booster.ppdai-logging-intellij-plugin","version":"1.0","since":"145.0","until":"212.*","originalSince":"145.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"3.5","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"172.4155.35","since":"172.4155","until":"201","originalSince":"172.4155","originalUntil":null},{"id":"com.deadlock.scsyntax","version":"1.0.5","since":"172.3317","until":"201","originalSince":"172.3317","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.2.3","since":"171.3780","until":"171.*","originalSince":"171.3780","originalUntil":null},{"id":"edu.umd.cs.cpm","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.2","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"2.8.0.3","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.1-RC2","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.1","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.40","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.github.Deadleg.idea-openresty-lua-support","version":"0.0.4","since":"141.0","until":"203.*","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.106","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.github.typ0520.plugin.fastdex","version":"1.0.2","since":"141.0","until":"183.0","originalSince":"141.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.17.0","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"cn.bestwu.gdph","version":"0.1.0","since":"145.258","until":"191.5000","originalSince":"145.258","originalUntil":null},{"id":"com.fooock.experimental.and.beta.icons","version":"1.0.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.ls.translate","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"5.2","since":"171.3780","until":"181.3494","originalSince":"171.3780","originalUntil":null},{"id":"com.weirddev.testme","version":"1.6","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"vette.neos","version":"0.1.20-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.3","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"com.haskforce","version":"0.3.39","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"com.aconex.test.namer","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"de.dieploegers.develop.idea.shellfilter","version":"1.0.0","since":"172.0","until":"181.5684","originalSince":"172.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.0.0 (201709181025)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"com.mallowigi","version":"1.0","since":"173.0","until":"221.*","originalSince":"173.0","originalUntil":null},{"id":"com.mallowigi","version":"1.0.1","since":"173.0","until":"221.*","originalSince":"173.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.0.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.fooock.experimental.and.beta.icons","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.7","since":"143.2000","until":"192.*","originalSince":"143.2000","originalUntil":null},{"id":"com.alexanderpa.flyway.migration.creator","version":"2.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.ctrip.wireless.android.build","version":"1.0.4","since":"111.0","until":"201.0","originalSince":"111.0","originalUntil":null},{"id":"com.mallowigi","version":"1.0.2","since":"171.0","until":"221.*","originalSince":"171.0","originalUntil":null},{"id":"com.yii2support","version":"0.6.34.12","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.plugin.applescript","version":"0.117","since":"173.2463","until":"191.*","originalSince":"173.2463","originalUntil":null},{"id":"com.peng.myproguard","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"de.dieploegers.develop.idea.shellfilter","version":"1.0.1","since":"172.0","until":"181.5684","originalSince":"172.0","originalUntil":null},{"id":"com.qianniu.plugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.thomas.needham.neurophidea","version":"1.1.0","since":"141.0","until":"183.1","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.6.0","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"io.g13.ideaplugins.time","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.qburst.plugins.android","version":"1.1.1","since":"145.0","until":"212.*","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"173.2463.22","since":"173.2463","until":"201","originalSince":"173.2463","originalUntil":null},{"id":"AngularJS","version":"173.2463.22","since":"173.2463","until":"181.0","originalSince":"173.2463","originalUntil":"173.*"},{"id":"TFS","version":"173.2463.22","since":"173.2463","until":"191.*","originalSince":"173.2463","originalUntil":null},{"id":"com.github.typ0520.plugin.fastdex","version":"1.0.3","since":"141.0","until":"183.0","originalSince":"141.0","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.4","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"Appetizer.io","version":"1.1.2","since":"129.1","until":"201.0","originalSince":"129.1","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.0.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"intellij.buck.plugin","version":"3.2","since":"171.3019","until":"172.*","originalSince":"171.3019","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.18","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.13.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.5","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"de.escalon.idea.plugin.svelte","version":"0.0.4","since":"162.0","until":"191.0","originalSince":"162.0","originalUntil":null},{"id":"vette.neos","version":"0.1.21-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.6","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"com.wix.react-templates","version":"1.1.2","since":"143.0","until":"211","originalSince":"143.0","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.6.1","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"1.3.0","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.3.3","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"net.askarin.mpbots.idea.mpbotsideplugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.mallowigi","version":"1.0.3","since":"162.0","until":"221.*","originalSince":"162.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"intellij.zeppelin.","version":"0.2","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"io.github.xusida.idea.plugins.formatyaml","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.9.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.9.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.undo_software.clion.reverse","version":"2.0.0","since":"172.0","until":"181.0","originalSince":"172.0","originalUntil":null},{"id":"com.github.typ0520.plugin.fastdex","version":"1.0.4","since":"141.0","until":"183.0","originalSince":"141.0","originalUntil":null},{"id":"com.cedricziel.idea.typo3","version":"0.2.4","since":"171.3780","until":"171.*","originalSince":"171.3780","originalUntil":null},{"id":"com.zhaoyanjun.AndroidTranslate","version":"1.0.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"TFS","version":"173.2696.21","since":"173.2696","until":"191.*","originalSince":"173.2696","originalUntil":null},{"id":"com.ppolivka.plugin.gitcleaner","version":"1.0.0","since":"144.0","until":"171.0","originalSince":"144.0","originalUntil":null},{"id":"com.yii2support","version":"0.6.34.13","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.4.8","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"brown.bat","version":"1.3.4","since":"162.2147483647","until":"201.0","originalSince":"162.*","originalUntil":null},{"id":"JRebelPlugin","version":"7.1.0","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.mallowigi","version":"1.0.4","since":"145.0","until":"221.*","originalSince":"145.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.4.9","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"com.vaadin.designer.intellij","version":"1.4.4","since":"143.0","until":"211.7628.21","originalSince":"143.0","originalUntil":null},{"id":"com.yii2support","version":"0.6.34.13","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.7","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.fortran","version":"1.5.0","since":"171.0","until":"193.0","originalSince":"171.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.2.2362.5","since":"171.1233","until":"222","originalSince":"171.1233","originalUntil":null},{"id":"org.openmastery.ideaflow","version":"0.19","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"vette.neos","version":"0.1.22-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"AureliaStorm","version":"0.6","since":"162.1628","until":"213.0","originalSince":"162.1628","originalUntil":null},{"id":"com.zhuomeng.unique.plugin.id","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.zhuomeng.unique.plugin.id","version":"1.0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.4.1","since":"139.1803","until":"211","originalSince":"139.1803","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"4.0.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.8","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"0.12.1","since":"173.2290.1","until":"232.*","originalSince":"173.2290.1","originalUntil":null},{"id":"com.amintado.bootstrap","version":"0.1.1","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.asta.mobi.generate.ca.code","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.2.2367.5","since":"171.1233","until":"222","originalSince":"171.1233","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"4.0.2","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"4.0.3","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.softbank.robot.sdkplugin","version":"1.0.23","since":"143.381","until":"211.*","originalSince":"143.381","originalUntil":null},{"id":"cn.bestwu.gdph","version":"0.1.1","since":"145.258","until":"191.5000","originalSince":"145.258","originalUntil":null},{"id":"de.espend.idea.php.phpunit","version":"2.6","since":"171.3780","until":"173.2099","originalSince":"171.3780","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"4.0.4","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.0.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.senthil","version":"0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.bitvault.plugin.bvkplugin","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.2.2370.5","since":"171.1233","until":"222","originalSince":"171.1233","originalUntil":null},{"id":"XSLT-Debugger","version":"173.2941.6","since":"173.2941","until":"201","originalSince":"173.2941","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"173.2941.6","since":"173.2941","until":"201","originalSince":"173.2941","originalUntil":null},{"id":"TFS","version":"173.2941.6","since":"173.2941","until":"191.*","originalSince":"173.2941","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"173.2941.6","since":"173.2941","until":"173.*","originalSince":"173.2941","originalUntil":null},{"id":"com.jetbrains.plugins.meteor","version":"173.2941.6","since":"173.2941","until":"181.0","originalSince":"173.2941","originalUntil":"173.*"},{"id":"Git Scope","version":"1.0.0","since":"171.0","until":"202.*","originalSince":"171.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.6.1","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"claims.bold.intellij.avro","version":"0.3.1","since":"143.0","until":"202.*","originalSince":"143.0","originalUntil":null},{"id":"de.sgalinski.typoscript.plugin.id","version":"1.9.0","since":"143.0","until":"231","originalSince":"143.0","originalUntil":null},{"id":"org.jetbrains.fortran","version":"1.5.1","since":"171.0","until":"193.0","originalSince":"171.0","originalUntil":null},{"id":"com.haskforce","version":"0.3.40","since":"131.0","until":"203.*","originalSince":"131.0","originalUntil":null},{"id":"Gitflow","version":"0.6.3","since":"171.0","until":"173.*","originalSince":"162.0","originalUntil":"173.*"},{"id":"com.illuminatedcloud.intellij","version":"1.8.0.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.18.0","since":"145.0","until":"171.4694","originalSince":"145.0","originalUntil":null},{"id":"com.alibaba.p3c.smartfox","version":"1.0.0","since":"141.0","until":"231","originalSince":"141.0","originalUntil":null},{"id":"com.github.nokia.pyvenv","version":"1.0","since":"145.0","until":"203","originalSince":"145.0","originalUntil":null},{"id":"com.mingyuanyun.appcloud.jetbrains.plugin.buildtool","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"ru.adelf.idea.dotenv","version":"0.5","since":"172.0","until":"192.*","originalSince":"172.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.2.2394.5","since":"171.1233","until":"222","originalSince":"171.1233","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.19","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"org.jbooster.jbooster-logging-intellij-plugin","version":"1.2","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"com.ppdai.booster.ppdai-logging-intellij-plugin","version":"1.1","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"artsiomch.cmake","version":"0.0.1","since":"145.0","until":"173","originalSince":"145.0","originalUntil":null},{"id":"com.yii2support","version":"0.6.34.16","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.0.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.2.2","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"3.6","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.2.2398.5","since":"171.1233","until":"222","originalSince":"171.1233","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.2.2398.5","since":"171.1233","until":"222","originalSince":"171.1233","originalUntil":null},{"id":"com.mingyuanyun.appcloud.jetbrains.plugin.buildtool","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.plugins.meteor","version":"173.3188.31","since":"173.3188","until":"181.0","originalSince":"173.3188","originalUntil":"173.*"},{"id":"cucumber-javascript","version":"173.3188.31","since":"173.3188","until":"201","originalSince":"173.3188","originalUntil":null},{"id":"JBClearcasePlugin","version":"2.0","since":"173.3188","until":"201","originalSince":"173.3188","originalUntil":null},{"id":"SourceSafe","version":"173.3188","since":"173.3188","until":"201","originalSince":"173.3188","originalUntil":null},{"id":"MultiHighlight","version":"1.0.1","since":"162.0","until":"202.1","originalSince":"162.0","originalUntil":null},{"id":"com.duseev.intellij.preservelayout","version":"1.0","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"2.0","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"org.elixir_lang","version":"6.2.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"me.lotabout.codegenerator","version":"1.0","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"2.8.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.20","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.xujiaji.plugin.MVPManager","version":"2.0.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.0","since":"172.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"com.zhaoyanjun.AndroidTranslate","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.0.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"2.0.2","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"me.scana.okgradle","version":"0.0.1","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"brown.bat","version":"1.3.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"brown.bat","version":"1.3.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.10.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.10.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.zhaoyanjun.AndroidTranslate","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"me.lotabout.codegenerator","version":"1.2","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"com.huangyuanlove.transform.VariableNameStyleTransfer","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.resharper.HeapAllocationsViewer","version":"1.2.4.0","since":"172.4144","until":"172.4145","originalSince":"172.4144","originalUntil":"172.4145"},{"id":"com.duseev.intellij.preservelayout","version":"1.1","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"com.fashare.smallhelper","version":"1.0-SNAPSHOT","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.yx.plugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.1.1","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.simon.plus.NotesTranslation.Translation","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"173.3302.13","since":"173.3302","until":"201","originalSince":"173.3302","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"173.3302.13","since":"173.3302","until":"201","originalSince":"173.3302","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.0.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.0.1","since":"172.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.107","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.21","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.18.1","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"com.taobao.atlas","version":"2.0.3","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"gherkin","version":"173.3302","since":"172.4343","until":"172.*","originalSince":"172.4343","originalUntil":null},{"id":"cucumber-java","version":"173.3302","since":"173.1","until":"173.*","originalSince":"172.4343","originalUntil":null},{"id":"cucumber-groovy","version":"173.3302","since":"172.4343","until":"201","originalSince":"172.4343","originalUntil":null},{"id":"TFS","version":"172.4343.25","since":"172.4343","until":"191.*","originalSince":"172.4343","originalUntil":null},{"id":"cucumber-javascript","version":"172.4343.25","since":"172.4343","until":"201","originalSince":"172.4343","originalUntil":null},{"id":"org.elixir_lang","version":"6.3.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.0.2","since":"172.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.22","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.23","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.9.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.9.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"io.ballerina","version":"0.9.2","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.0.3","since":"172.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"Git Scope","version":"1.0.1","since":"171.0","until":"202.*","originalSince":"171.0","originalUntil":null},{"id":"com.github.tinselspoon.intellij.kubernetes","version":"0.8","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.1","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"imp.ffs.mde.helper","version":"0.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"OdpsStudio","version":"2.8.1.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.1.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.bmesta.mvntoolkit","version":"0.1.3-SNAPSHOT","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.intellij.resharper.ConfigurationSense","version":"2017.2.2.0","since":"172.4144","until":"172.4145","originalSince":"172.4144","originalUntil":"172.4145"},{"id":"com.baomidou.plugin.idea.mybatisx","version":".0.1.0","since":"145.0","until":"192.0","originalSince":"145.0","originalUntil":null},{"id":"com.xiuyukeji.plugin.translation","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.fashare.smallhelper","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"4.0","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.xiuyukeji.plugin.translation","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.bmesta.mvntoolkit","version":"0.1.3","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.wangzai.plugin.findViewById","version":"1.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.108","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"me.lotabout.codegenerator","version":"1.3","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.1.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.zq.plugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.109","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.guohe.selector","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.2.2441.5","since":"171.1233","until":"222","originalSince":"171.1233","originalUntil":null},{"id":"com.dubreuia","version":"0.23","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"TFS","version":"173.3415.27","since":"173.3415","until":"191.*","originalSince":"173.3415","originalUntil":null},{"id":"cucumber-javascript","version":"173.3415.27","since":"173.3415","until":"201","originalSince":"173.3415","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.2.0","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"com.mnw.navigateidentifier","version":"1.1","since":"141.0","until":"231.9011","originalSince":"141.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"4.1","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"de.espend.idea.php.phpunit","version":"2.7","since":"171.3780","until":"173.2099","originalSince":"171.3780","originalUntil":null},{"id":"com.mnw.tabmover","version":"1.3.0","since":"135.0","until":"213","originalSince":"135.0","originalUntil":null},{"id":"org.elixir_lang","version":"6.4.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.wangzai.plugin.findViewById","version":"1.4.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"xyz.elmot.clion.armsupport.prj","version":"0.4.alpha","since":"173.0","until":"173.3530","originalSince":"173.0","originalUntil":"173.*"},{"id":"com.github.bjansen.intellij.pebble","version":"0.3","since":"143.0","until":"212.*","originalSince":"143.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.24","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.25","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.jiyuanime.ActivatePowerModeApplicationPlugin","version":"0.1.5","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.3.0-RC.1","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"cat.helm.clean","version":"0.1.0-SNAPSHOT","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"cat.helm.clean","version":"0.1.1-SNAPSHOT","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"com.github.novotnyr.jwt-intellij-plugin","version":"0.3","since":"143.0","until":"222.*","originalSince":"143.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.4.10","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.28.3","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"Beaker Test Runner","version":"0.1.3","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"IdeaVIM","version":"0.48.5","since":"171.0","until":"201","originalSince":"171.0","originalUntil":null},{"id":"com.xiuyukeji.plugin.translation","version":"1.0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.guohe.selector","version":"1.0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"me.lotabout.codegenerator","version":"1.3.1","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.110","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.1.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"JBClearcasePlugin","version":"2.0.1","since":"173.3188","until":"201","originalSince":"173.3188","originalUntil":null},{"id":"cucumber-javascript","version":"173.3531.1","since":"173.3531","until":"201","originalSince":"173.3531","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"173.3531.1","since":"173.3531","until":"201","originalSince":"173.3531","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.0.4","since":"172.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.8","since":"143.2000","until":"192.*","originalSince":"143.2000","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.3.0","since":"123.72","until":"181.0","originalSince":"123.72","originalUntil":null},{"id":"com.bianxiaoyan.selector","version":"1.0.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.asif.gsonpojogenerator","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"me.fingerart.idea.apidebugger","version":"2.0.1","since":"141.0","until":"201","originalSince":"141.0","originalUntil":null},{"id":"com.inflectra.SpiraTeam","version":"1.3","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"IdeaVIM","version":"0.48.6","since":"171.0","until":"201","originalSince":"171.0","originalUntil":null},{"id":"com.fanhl.intellij.postfix","version":"0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.fanhl.intellij.postfix","version":"0.1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.pokkt.management.tool","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"io.ballerina","version":"0.9.3","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.26","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"net.codeweavers.rider.autoattach","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.elixir_lang","version":"6.5.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.daveme.intellij.chocolateCakePHP","version":"0.2","since":"171.3780","until":"173.*","originalSince":"171.3780","originalUntil":null},{"id":"com.stoneplugin.unique.plugin.id","version":"2.0","since":"107.105","until":"201.0","originalSince":"107.105","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.0","since":"107.0","until":"223.*","originalSince":"107.0","originalUntil":null},{"id":"com.fanhl.intellij.postfix","version":"0.1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.tboox.xmake","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.tboox.xmake","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.fanhl.intellij.postfix","version":"0.1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"2.8.1.3","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.4.0","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.0.2","since":"107.0","until":"223.*","originalSince":"107.0","originalUntil":null},{"id":"com.tagmycode.intellij","version":"2.1.0","since":"133.696","until":"231","originalSince":"133.696","originalUntil":null},{"id":"com.weirddev.testme","version":"1.7","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.0.3","since":"107.0","until":"223.*","originalSince":"107.0","originalUntil":null},{"id":"com.yinjin.intellij.translation","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.elixir_lang","version":"6.5.1","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"org.tboox.xmake","version":"1.0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.0.0 (201710030149)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"org.tboox.xmake","version":"1.0.2.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.tboox.xmake","version":"1.0.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.11.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.11.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.7","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"ExceptionCatcher","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"artsiomch.cmake","version":"0.0.2","since":"145.0","until":"191.0","originalSince":"145.0","originalUntil":null},{"id":"com.yyx.kotlinmvp","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"tushar.checkForPull","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.27","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"org.github.feiwongreed","version":"1.0.8","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.taobao.atlas","version":"2.0.5","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.28","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.29","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.agilezhu.bundledatabuilder","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.wangzai.plugin.findViewById","version":"1.4.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.yii2support","version":"0.6.34.18","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.1.2","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.viartemev.requestmapper","version":"0.8","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.536","since":"172.0","until":"173.0","originalSince":"172.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"2.0.3","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.30","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.samsung.srr.dex.adb_tool","version":"1.4","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"intellij-scheme","version":"0.1.1","since":"103.72","until":"193.0","originalSince":"103.72","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"2017.1.1","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.0.4","since":"107.0","until":"223.*","originalSince":"107.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"3.1.0","since":"171.0","until":"211","originalSince":"171.0","originalUntil":null},{"id":"cucumber-javascript","version":"173.3622.29","since":"173.3622","until":"201","originalSince":"173.3622","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"173.3622.29","since":"173.3622","until":"173.*","originalSince":"173.3622","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.29.2","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"3.1.1","since":"171.0","until":"211","originalSince":"171.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.9.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.1.0","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"1.3.0","since":"173.2290.1","until":"232.*","originalSince":"173.2290.1","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"1.3.0-beta1","since":"173.2290.1","until":"232.*","originalSince":"173.2290.1","originalUntil":null},{"id":"name.kropp.intellij.makefile","version":"1.2.1","since":"163.0","until":"211.5538","originalSince":"163.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"1.3.0-beta6","since":"173.2290.1","until":"232.*","originalSince":"173.2290.1","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"1.3.0-beta7","since":"173.2290.1","until":"232.*","originalSince":"173.2290.1","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"1.3.0-beta9","since":"173.3622.25","until":"232.*","originalSince":"173.3622.25","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"1.3.0-beta10","since":"173.3622.1","until":"232.*","originalSince":"173.3622.1","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"1.3.0-173.3622","since":"173.3622.1","until":"232.*","originalSince":"173.3622.1","originalUntil":null},{"id":"es.n10.clean.plugin.id","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.0.5","since":"172.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"com.wangzai.plugin.findViewById","version":"1.4.3","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"idrabenia.solidity-solhint","version":"1.0","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.4.1","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"idrabenia.solidity-solhint","version":"1.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"idrabenia.solidity-solhint","version":"1.2","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.9.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.github.jpmossin","version":"1.3.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.djk.yyy.kotterknife","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.19.1","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"com.winwin.idea.plugin.gotodeclaration","version":"1.0.0","since":"173.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"eu.gillissen.rider.usersecrets","version":"0.0.1","since":"145.0","until":"183.0","originalSince":"145.0","originalUntil":null},{"id":"com.tencent.qgame.lintsample","version":"1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.9.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"ExceptionCatcher","version":"1.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.yyx.kotlinmvp","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.2.2492.5","since":"171.1233","until":"222","originalSince":"171.1233","originalUntil":null},{"id":"com.intellij.bigdecimal-folding","version":"0.9.9.7","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"QAPlug","version":"1.3.14","since":"172.3757","until":"211","originalSince":"172.3757","originalUntil":null},{"id":"cucumber-javascript","version":"173.3727.2","since":"173.3727","until":"201","originalSince":"173.3727","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.31","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.flow.intellij","version":"20171115204348","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.thanosp.phpstorm.inheritdoc","version":"1.5.0","since":"173.3475","until":"201.0","originalSince":"173.3475","originalUntil":null},{"id":"com.yinjin.intellij.translation","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"SvgViewer 2","version":"2.1","since":"111.1","until":"201","originalSince":"111.1","originalUntil":null},{"id":"io.nativetap.plugin","version":"1.2.8","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"idrabenia.solidity-solhint","version":"1.3","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"io.nativetap.plugin","version":"1.2.8.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"idrabenia.solidity-solhint","version":"1.4","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"idrabenia.solidity-solhint","version":"1.5","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.3.2","since":"123.72","until":"139.0","originalSince":"123.72","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.3.2","since":"123.72","until":"203","originalSince":"123.72","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.9","since":"143.2000","until":"192.*","originalSince":"143.2000","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"1.3.1","since":"173.3655.1","until":"232.*","originalSince":"173.3655.1","originalUntil":null},{"id":"com.dubreuia","version":"0.24","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"unspecified.173.3655.1","since":"173.3655.1","until":"232.*","originalSince":"173.3655.1","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"1.3.1.173.3655.1","since":"173.3655.1","until":"232.*","originalSince":"173.3655.1","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.9.1","since":"143.2000","until":"192.*","originalSince":"143.2000","originalUntil":null},{"id":"coral.plugins","version":"0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"2.0.4","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.1.1","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.32","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"org.tboox.xmake","version":"1.0.4","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"4.2","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.0.5","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.gopkgm.plugin","version":"0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"eu.gillissen.rider.usersecrets","version":"0.1.0","since":"145.0","until":"183.0","originalSince":"145.0","originalUntil":null},{"id":"es.n10.clean.plugin.id","version":"1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.znshadow.viewbinder","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.znshadow.viewbinder","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.yyx.kotlinmvp","version":"1.0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"xyz.belvi.droid_snippet","version":"1.0.0-alpha","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.yangsimin.android.lifecycle.plugin.id","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.2","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"xyz.belvi.droid_snippet","version":"1.0.0-beta","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.2.2514.5","since":"171.1233","until":"222","originalSince":"171.1233","originalUntil":null},{"id":"com.testvagrant.optimus.elements","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.gtache.lsp","version":"1.0","since":"173.0","until":"203.*","originalSince":"145.0","originalUntil":null},{"id":"net.olegg.bodylookin","version":"0.0.4","since":"145.0","until":"202.*","originalSince":"145.0","originalUntil":null},{"id":"com.meizu.flyme.mall.XmlToJson","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"idrabenia.solidity-solhint","version":"1.6","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"idrabenia.solidity-solhint","version":"1.7","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"idrabenia.solidity-solhint","version":"1.8","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.4.2","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"idrabenia.solidity-solhint","version":"1.9","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"3.1.2","since":"171.0","until":"211","originalSince":"171.0","originalUntil":null},{"id":"com.github.gtache.lsp","version":"1.1","since":"173.0","until":"203.*","originalSince":"145.0","originalUntil":null},{"id":"io.ballerina","version":"0.9.4","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.abby.plugin.gradledependencyhelper","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.537","since":"172.0","until":"173.0","originalSince":"172.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.33","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.br.quicksloth","version":"1.0-beta.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.br.quicksloth","version":"1.0-beta.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.34","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"izhangzhihao.rainbow.brackets","version":"2.6","since":"139.0","until":"172","originalSince":"139.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.35","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.yangsm.android.lifecycle.plugin.id","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.yangsm.android.lifecycle.plugin.id","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"5.0","since":"163.0","until":"163.*","originalSince":"163.0","originalUntil":null},{"id":"java.com.lz.autogs","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"io.github.kongeor.p4n","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"3.2.0","since":"171.0","until":"211","originalSince":"171.0","originalUntil":null},{"id":"io.github.kongeor.p4n","version":"1.0.2","since":"172.0","until":"201.0","originalSince":"172.0","originalUntil":null},{"id":"xyz.belvi.droid_snippet","version":"1.0.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"fortify.fod","version":"17.4.0","since":"162.0","until":"213.*","originalSince":"162.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2017.2.50574","since":"133.1800","until":"171.4249","originalSince":"133.1800","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.2.2514.5","since":"171.1233","until":"222","originalSince":"171.1233","originalUntil":null},{"id":"com.schibsted.protein","version":"0.5.0","since":"141.0","until":"172.*","originalSince":"141.0","originalUntil":"172.*"},{"id":"com.zzy.plugin.MvpFileCreator","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.schibsted.protein","version":"0.6.0","since":"141.0","until":"172.*","originalSince":"141.0","originalUntil":"172.*"},{"id":"com.schibsted.protein","version":"0.6.1","since":"141.0","until":"172.*","originalSince":"141.0","originalUntil":"172.*"},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.12.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.12.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"de.espend.idea.php.annotation","version":"5.2.1","since":"171.3780","until":"181.3494","originalSince":"171.3780","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.6.2","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"xyz.belvi.droid_snippet","version":"1.0.2","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"2.1.1","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.1.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.intellij.plugin.applescript","version":"0.118","since":"173.2463","until":"191.*","originalSince":"173.2463","originalUntil":null},{"id":"ExceptionCatcher","version":"1.2","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.uddernetworks.codehelp","version":"1.0","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.2.0","since":"145.2147483647","until":"201","originalSince":"145.*","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.1.0","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"com.fqxyi.plugin.butter.knife.code","version":"1.0.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.schibsted.protein","version":"0.6.2","since":"141.0","until":"172.*","originalSince":"141.0","originalUntil":"172.*"},{"id":"com.schibsted.protein","version":"0.6.3","since":"141.0","until":"172.*","originalSince":"141.0","originalUntil":"172.*"},{"id":"JRebelPlugin","version":"7.1.3","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.schibsted.protein","version":"0.6.4","since":"141.0","until":"172.*","originalSince":"141.0","originalUntil":"172.*"},{"id":"de.endrullis.idea.postfixtemplates","version":"1.2.0","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.3.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.3.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.3.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"AsyncConverter.AsyncConverter","version":"1.1.8.3","since":"172.4144","until":"172.4145","originalSince":"172.4144","originalUntil":"172.4145"},{"id":"com.yii2support","version":"0.6.34.19","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"QAPlug","version":"1.3.15","since":"172.3757","until":"211","originalSince":"171.4408","originalUntil":null},{"id":"LivePlugin","version":"0.6.0 beta","since":"163.0","until":"213.*","originalSince":"163.0","originalUntil":null},{"id":"com.nengjun.geek","version":"0.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.19.2","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.2.1","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"com.vladsch.idea.multimarkdown","version":"2.4.0","since":"143.2370","until":"212.0","originalSince":"143.2370","originalUntil":null},{"id":"org.elixir_lang","version":"6.6.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.2.2","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.2.3","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"com.uddernetworks.codehelp","version":"1.1","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"com.nengjun.geek","version":"0.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.4.3","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.semihunaldi.intellij.ideacurrency.plugin","version":"0.1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.111","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":">me.drakeet.plugin.multitype","version":"1.4.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.github.gtache.lsp","version":"1.2","since":"173.0","until":"203.*","originalSince":"171.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.9.3","since":"143.2000","until":"192.*","originalSince":"143.2000","originalUntil":null},{"id":"Error-prone plugin","version":"173.4031","since":"173.3727","until":"181.0","originalSince":"173.3727","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.36","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"org.moe","version":"1.4.0","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"org.elixir_lang","version":"6.7.0","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"qdrzwd@sina.com","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"CollabNet Tools","version":"1.1.3","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"qdrzwd@sina.com","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"CollabNet Tools","version":"1.1.4","since":"107.105","until":"181.*","originalSince":"107.105","originalUntil":null},{"id":"com.semihunaldi.intellij.ideacurrency.plugin","version":"0.1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"2.8.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.semihunaldi.intellij.ideacurrency.plugin","version":"0.1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cz.k2.eshop","version":"1.5","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.31.1","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"ASM Bytecode Outline 2017","version":"0.3.5.2017.12.10","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.3.0","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"io.ballerina","version":"0.9.5","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.4.4","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"cn.bestwu.gdph","version":"0.1.2","since":"145.258","until":"191.5000","originalSince":"145.258","originalUntil":null},{"id":"com.hikesoft.idea.plugin.microservice.matrix","version":"2.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"3.3.0","since":"171.0","until":"211","originalSince":"171.0","originalUntil":null},{"id":"LivePlugin","version":"0.6.1 beta","since":"163.0","until":"213.*","originalSince":"163.0","originalUntil":null},{"id":"com.yii2support","version":"0.7.35.1","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"merger4ideaPlugin","version":"2.2","since":"143.2287","until":"201.4865.12","originalSince":"143.2287","originalUntil":null},{"id":"IdeaVIM","version":"0.49","since":"171.0","until":"201","originalSince":"171.0","originalUntil":null},{"id":"IdeaVIM","version":"0.49","since":"171.0","until":"201","originalSince":"171.0","originalUntil":null},{"id":"uk.co.itmoore.intellisubsteps","version":"1.1.1","since":"173.0","until":"182.*","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2598.5","since":"171.1233","until":"222","originalSince":"171.1233","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2598.5","since":"171.1233","until":"222","originalSince":"171.1233","originalUntil":null},{"id":"OdpsStudio","version":"2.8.2.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"IdeaVIM","version":"0.49.1","since":"171.0","until":"201","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.0.0","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.112","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.1.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.0.1 (201712140206)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"reasonml","version":"0.30","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"com.daylerees.rainglow","version":"1.0.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"intellij.buck.plugin","version":"3.4","since":"172.1294","until":"172.*","originalSince":"172.1294","originalUntil":null},{"id":"com.github.gtache.lsp","version":"1.3.0","since":"173.0","until":"203.*","originalSince":"171.0","originalUntil":null},{"id":"org.elm.klazuka","version":"0.9.0","since":"162.0","until":"172.*","originalSince":"162.0","originalUntil":null},{"id":"org.elixir_lang","version":"7.0.0","since":"163.15529.5","until":"211.*","originalSince":"163.15529.5","originalUntil":null},{"id":"com.haskforce","version":"0.3.41","since":"173.0","until":"203.*","originalSince":"173.0","originalUntil":null},{"id":"com.yangding","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.daylerees.rainglow","version":"1.1.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"IdeaVIM","version":"0.49.2","since":"171.0","until":"201","originalSince":"171.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.14.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"io.ballerina","version":"0.9.6","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"reasonml","version":"0.31","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.4.5","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.0.1","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"ms.konovalov.intellij.hidpi-profiles","version":"2017.1.2","since":"171.0","until":"222","originalSince":"171.0","originalUntil":null},{"id":"nix-idea","version":"0.2.1.0","since":"172.0","until":"201.0","originalSince":"172.0","originalUntil":null},{"id":"com.yangding","version":"1.0.1","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.yangding","version":"1.0.2","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"Osmorc","version":"1.4.11","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"3.3.1","since":"171.0","until":"211","originalSince":"171.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.0.2","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"org.moe","version":"1.4.1","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.daylerees.rainglow","version":"1.2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.zhuomeng.unique.plugin.id","version":"1.0.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"10.13.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"10.13.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"JRebelPlugin","version":"7.1.4","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"cz.k2.eshop","version":"1.6","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.1.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"reasonml","version":"0.32","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.20.0","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"nosi.xmlpojo_plugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"de.arktis.breeze-connector","version":"0.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"1.0","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"edu.umontreal.hatchery","version":"0.1","since":"143.379","until":"193","originalSince":"143.379","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"1.1","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"com.flow.intellij","version":"20171222154034","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"1.0","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"1.0.1","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"com.daylerees.rainglow","version":"1.3.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.daylerees.rainglow","version":"1.3.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.23","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.daylerees.rainglow","version":"1.3.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.daylerees.rainglow","version":"1.3.3","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2627.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"org.spilth.rubymine.migrations","version":"1.0","since":"173.0","until":"231","originalSince":"173.0","originalUntil":null},{"id":"artsiomch.cmake","version":"0.1.0","since":"145.0","until":"191.0","originalSince":"145.0","originalUntil":null},{"id":"cn.yzl.kotlin.ex.click","version":"1.2","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"1.0.2","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"1.0.3","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"com.nd.sdp.common.CustomUIToolWindow","version":"1.1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.wxisme.unique.plugin.id","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.wxisme.unique.plugin.id","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.debugger.streams.kotlin","version":"0.0.1","since":"173.0","until":"181.0","originalSince":"173.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.4.6","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.0.3","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.1.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.yii2support","version":"0.7.35.2","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.0.4","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.xin.update.bmob","version":"1.1.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.1","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.github.wxisme.unique.plugin.id","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"IdeaVIM","version":"0.49.3","since":"171.0","until":"201","originalSince":"171.0","originalUntil":null},{"id":"com.daylerees.rainglow","version":"1.4.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"1.0.4","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"1.0.5","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2634.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"cn.yzl.kotlin.ex.click","version":"1.3","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.0.5","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"QAPlug","version":"1.3.16","since":"173.4127","until":"211","originalSince":"172.0","originalUntil":null},{"id":"com.github.tinselspoon.intellij.kubernetes","version":"0.9","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"org.elm.klazuka","version":"0.9.1","since":"162.0","until":"172.*","originalSince":"162.0","originalUntil":null},{"id":"org.elixir_lang","version":"7.1.0","since":"163.15529.5","until":"211.*","originalSince":"163.15529.5","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.15","since":"173.4127","until":"221","originalSince":"173.4127","originalUntil":null},{"id":"io.allandequeiroz.random.image.background","version":"1.2.1","since":"162","until":"223","originalSince":"162.0","originalUntil":null},{"id":"org.elixir_lang","version":"7.2.0","since":"163.15529.5","until":"211.*","originalSince":"163.15529.5","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"1.4.0","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"io.ballerina","version":"0.9.7","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.6.3","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.daylerees.rainglow","version":"1.5.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.jiyuanime.ActivatePowerModeApplicationPlugin","version":"0.1.6","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"net.javaru.idea.frc","version":"0.6","since":"173.0","until":"173.*","originalSince":"173.0","originalUntil":null},{"id":"idrabenia.solidity-solhint","version":"1.10","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.jiyuanime.ActivatePowerModeApplicationPlugin","version":"0.1.7","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.strixsoftware.intellij.format","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.daylerees.rainglow","version":"1.5.1","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.20.1","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"1.0.6","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.33","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.4.0","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"vette.neos","version":"0.1.23-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"com.daylerees.rainglow","version":"1.5.2","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"name.kropp.intellij.makefile","version":"1.2.2","since":"163.0","until":"211.5538","originalSince":"163.0","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.0.6","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"edu.umontreal.hatchery","version":"0.2","since":"143.379","until":"193","originalSince":"143.379","originalUntil":null},{"id":"org.ngs.adapter.plugin","version":"0.001","since":"133.0","until":"201.0","originalSince":"133.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.4.2","since":"162.2147483647","until":"181.*","originalSince":"162.*","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.37","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.github.bassaer.kotlin_variable_completion_plugin","version":"0.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.elixir_lang","version":"7.2.1","since":"163.15529.5","until":"211.*","originalSince":"163.15529.5","originalUntil":null},{"id":"me.scana.okgradle","version":"0.0.2","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"com.linsir","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.wxisme.unique.plugin.id","version":"1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"Properties Compare","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"suphuyquansu.plugin.translation.GoogleTranslation","version":"1.0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"suphuyquansu.plugin.translation.GoogleTranslation","version":"1.0.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"18.1.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"18.1.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"Properties Compare","version":"1.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"gw.in.ij","version":"1.0.2","since":"141.1010","until":"201.0","originalSince":"141.1010","originalUntil":null},{"id":"edu.umontreal.hatchery","version":"0.2.1","since":"143.379","until":"193","originalSince":"143.379","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.0.7","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.dubreuia","version":"0.25","since":"135.0","until":"223","originalSince":"135.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.0.6","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.magento.idea.magento2plugin","version":"0.2.3","since":"172.0","until":"223.*","originalSince":"172.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.1.1","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"com.tagmycode.intellij","version":"2.1.1","since":"133.696","until":"231","originalSince":"133.696","originalUntil":null},{"id":"cz.malevic.plugins.characterposition","version":"1.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"gw.in.ij","version":"1.0.3","since":"141.1010","until":"201.0","originalSince":"141.1010","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.4.1","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"com.asif.gsonpojogenerator","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.erstens.gaosi.unique.plugin.id","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.1.2","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"reasonml","version":"0.34","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"ru.adelf.idea.dotenv","version":"0.6","since":"172.0","until":"192.*","originalSince":"172.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.4.0","since":"123.72","until":"139.0","originalSince":"123.72","originalUntil":null},{"id":"com.sonnk.iterm","version":"0.0.8","since":"162.0","until":"203.*","originalSince":"162.0","originalUntil":null},{"id":"com.gmail.blueboxware.extsee","version":"1.0","since":"171.0","until":"221","originalSince":"171.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"1.0.7","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"1.0.8","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.1.1","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.5.0","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.4","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.ng-zorro.live-templates.plugin","version":"0.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.kennedyoliveira.ultimatepastebin","version":"1.5.2","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"org.concordion.plugin.idea.lang","version":"0.12.0","since":"141.1","until":"183.*","originalSince":"141.1","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.0","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.24","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.hpe.mc.androidhelper","version":"1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"io.ballerina","version":"0.9.8","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"nosi.xmlpojo_plugin","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"vette.neos","version":"0.1.24-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"com.github.fartherp.plugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"cucumber-java","version":"173.4301","since":"173.4127","until":"173.*","originalSince":"173.4127","originalUntil":null},{"id":"cucumber-groovy","version":"173.4301","since":"173.4127","until":"201","originalSince":"173.4127","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.9.4","since":"143.2000","until":"192.*","originalSince":"143.2000","originalUntil":null},{"id":"com.ng-zorro.live-templates.plugin","version":"0.0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"net.javaru.idea.frc","version":"0.6.1","since":"173.0","until":"181.*","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2706.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"ThinkTank","version":"1.3.2","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"1.0.9","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"1.2","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"1.2.1","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"com.lsjwzh.plugin.tinypng","version":"1.1","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"nosi.xmlpojo_plugin","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"1.2.2","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"reasonml","version":"0.35","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"OdpsStudio","version":"2.8.2.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.1.5","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"Properties Compare","version":"1.2","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.5.1","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"com.lomoye.plugin.codeGenerator","version":"1.0.1","since":"145.0","until":"192.0","originalSince":"145.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.1.3","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.113","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.gem.gdis.disl-run","version":"1.0.0","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"cucumber-javascript","version":"181.2784.29","since":"181.2784","until":"201","originalSince":"181.2784","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"181.2784.29","since":"181.2784","until":"201","originalSince":"181.2784","originalUntil":null},{"id":"TFS","version":"181.2784.29","since":"181.2784","until":"191.*","originalSince":"181.2784","originalUntil":null},{"id":"XSLT-Debugger","version":"181.2784.29","since":"181.2784","until":"201","originalSince":"181.2784","originalUntil":null},{"id":"ImportPlugin","version":"0.1.2","since":"162.0","until":"174.0","originalSince":"162.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.0.1","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"com.glagol","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"1.2.3","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.6.0","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"net.javaru.idea.frc","version":"0.7","since":"173.0","until":"191.*","originalSince":"173.0","originalUntil":null},{"id":"com.lsjwzh.plugin.tinypng","version":"1.2","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.4.7","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"io.ballerina","version":"0.9.9","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.15.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"ThinkTank","version":"1.3.2.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.38","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2720.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.idescout.sqlite","version":"4.0.0","since":"171.0","until":"211","originalSince":"171.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.114","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.2.21-release-Studio3.1-1","since":"173.1","until":"173.4547","originalSince":"173.1","originalUntil":"173.*"},{"id":"lsfusion.idea.plugin","version":"1.0.115","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.github.fartherp.plugin","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"io.solo.squash.intellij","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.ng-zorro.live-templates.plugin","version":"0.0.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"brown.bat.redisCli","version":"1.0.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.lr.helper","version":"1.0","since":"145.0","until":"203.*","originalSince":"145.0","originalUntil":null},{"id":"com.haku.less.Babylon","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"181.3007.17","since":"181.3007","until":"201","originalSince":"181.3007","originalUntil":null},{"id":"TFS","version":"181.3007.17","since":"181.3007","until":"191.*","originalSince":"181.3007","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"181.3007.17","since":"181.3007","until":"181.*","originalSince":"181.3007","originalUntil":null},{"id":"XSLT-Debugger","version":"181.3007.17","since":"181.3007","until":"201","originalSince":"181.3007","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.116","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"Show REST Services","version":"1.4","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.0.7","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.1.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.8","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"com.aswitcher","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.21.0","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"com.lomoye.plugin.codeGenerator","version":"1.0.2","since":"145.0","until":"192.0","originalSince":"145.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.5","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.dubreuia","version":"0.26","since":"163.0","until":"223","originalSince":"163.0","originalUntil":null},{"id":"org.wso2.siddhi","version":"1.1.0","since":"172.0","until":"201.4515.24","originalSince":"172.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.4.8","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"io.scheinecker.intellij.coco","version":"1.0.0","since":"173.0","until":"181.*","originalSince":"173.0","originalUntil":null},{"id":"com.lomoye.plugin.codeGenerator","version":"1.0.3","since":"145.0","until":"192.0","originalSince":"145.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.35.4","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.50","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"com.taobao.idlefish.alleria","version":"0.0.3","since":"141.0","until":"183.0","originalSince":"141.0","originalUntil":null},{"id":"io.ballerina","version":"0.9.10","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.117","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"18.2.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"18.2.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"ArchitectureReloaded","version":"0.1","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"CollabNet Tools","version":"1.1.5","since":"181.3007","until":"181.*","originalSince":"181.3007","originalUntil":null},{"id":"reasonml","version":"0.36","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"intellij-scheme","version":"0.1.2","since":"103.72","until":"193.0","originalSince":"103.72","originalUntil":null},{"id":"com.aswitcher","version":"2.0","since":"172.0","until":"201.0","originalSince":"172.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.118","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2759.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"brown.bat.redisCli","version":"1.0.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"xyz.elmot.clion.armsupport.prj","version":"1.0.beta3","since":"173.3531","until":"173.*","originalSince":"173.3531","originalUntil":"183.*"},{"id":"Jetbrains TeamCity Plugin","version":"2017.2.50909","since":"133.1800","until":"171.4249","originalSince":"133.1800","originalUntil":null},{"id":"cn.yan.android.devkit","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.21.1","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.119","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"reasonml","version":"0.37","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"Keymap exporter","version":"2.0","since":"130.1167","until":"201","originalSince":"130.1167","originalUntil":null},{"id":"TFS","version":"181.3263.21","since":"181.3263","until":"191.*","originalSince":"181.3263","originalUntil":null},{"id":"XSLT-Debugger","version":"181.3263.21","since":"181.3263","until":"201","originalSince":"181.3263","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.0.9","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.0.8","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.smilingrob.gitpair","version":"1.4","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"OdpsStudio","version":"2.8.2.3","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"io.ballerina","version":"0.9.11","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.vivalab.create.module","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.16.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.120","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.fabio","version":"1.0","since":"135.0","until":"","originalSince":"121.0","originalUntil":null},{"id":"com.github.keraton.jumblej","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.shenhua.idea.plugin.quoit","version":"1.0.3","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.6","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.4.9","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"io.intino.plugin","version":"3.2.0","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.headwire.aem.tooling.intellij","version":"1.0.3.1","since":"162.0","until":"203","originalSince":"162.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.2.2","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.lomoye.plugin.codeGenerator","version":"1.0.4","since":"145.0","until":"192.0","originalSince":"145.0","originalUntil":null},{"id":"com.zhishan.java.zhishanMvc","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2774.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2774.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"JRebelPlugin","version":"7.1.6","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"mobi.hsz.idea.nodesecurity","version":"0.3.0","since":"123.72","until":"212","originalSince":"123.72","originalUntil":null},{"id":"io.cloudslang.intellij.plugin","version":"1.0.3","since":"129.451","until":"211","originalSince":"129.451","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.1.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"reasonml","version":"0.38","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"org.elixir_lang","version":"7.3.0","since":"163.15529.5","until":"211.*","originalSince":"163.15529.5","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.0.2","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.4.10","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"io.cloudslang.intellij.plugin","version":"1.0.4","since":"129.451","until":"211","originalSince":"129.451","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.17.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.9","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.androhi.androiddrawableviewer","version":"2.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.moe","version":"1.4.2","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.7","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.zhishan.java.zhishanMvc","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.ctrip.zt.gaok.plugin.generateModelPlugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.kengajs.winnie.actions","version":"0.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.0.9","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"ThinkTank","version":"1.3.3","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.axellience.vuegwt","version":"0.0.1","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.2.3","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.ctrip.zt.gaok.plugin.generateModelPlugin","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.mvnsearch.rest-editor-client-contrib","version":"0.3.0","since":"173.0","until":"203.*","originalSince":"173.0","originalUntil":null},{"id":"com.thanosp.phpstorm.inheritdoc","version":"1.5.1","since":"173.3475","until":"201.0","originalSince":"173.3475","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.121","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.taobao.idlefish.alleria","version":"0.0.4","since":"141.0","until":"183.0","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2804.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.122","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.1.0","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.1.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.4.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.4.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.4.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"0.7.0","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.5.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.5.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.5.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"io.ballerina","version":"0.961.0","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.haku.less.Babylon","version":"1.01","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.6.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.6.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.6.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"cucumber-javascript","version":"181.3741.1","since":"181.3741","until":"201","originalSince":"181.3741","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"181.3741.1","since":"181.3741","until":"201","originalSince":"181.3741","originalUntil":null},{"id":"TFS","version":"181.3741.1","since":"181.3741","until":"191.*","originalSince":"181.3741","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"181.3741.1","since":"181.3741","until":"181.*","originalSince":"181.3741","originalUntil":null},{"id":"XSLT-Debugger","version":"181.3741.1","since":"181.3741","until":"201","originalSince":"181.3741","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.7.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.7.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.7.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"fortify.fod","version":"18.1.0114","since":"162.0","until":"213.*","originalSince":"162.0","originalUntil":null},{"id":"com.jimulabs.mirror.plugin","version":"2.6","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.2.30-eap-47-Studio3.1-1","since":"173.1","until":"173.4547","originalSince":"173.1","originalUntil":"173.*"},{"id":"org.jetbrains.plugins.dired","version":"1.0.14","since":"182.79","until":"182.*","originalSince":"182.79","originalUntil":"183.*"},{"id":"com.jetbrains.plugin.idea.nonsource.comments","version":"1.0","since":"147.4127","until":"201.0","originalSince":"147.4127","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.2","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.25","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"ch.ricardo.plugins.intellij.mockery","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"18.3.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"18.3.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"AccuRev","version":"2018.1","since":"80.8000","until":"191","originalSince":"80.8000","originalUntil":null},{"id":"ch.ricardo.plugins.intellij.mockery","version":"1.0.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2850.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.jetbrains.TabFormat","version":"0.1","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.1.1","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.2.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2855.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.123","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.0.538","since":"173.0","until":"181.0","originalSince":"173.0","originalUntil":null},{"id":"com.baislsl.ideaplugin.encryptor","version":"1.0","since":"173.0","until":"191.*","originalSince":"173.0","originalUntil":null},{"id":"io.github.qeesung.component.HighlightBracketPair","version":"1.0","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.1.4","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.2.4","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"reasonml","version":"0.39","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2862.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"gherkin","version":"181.3870.7","since":"181.3870","until":"181.*","originalSince":"181.3870","originalUntil":null},{"id":"cucumber-java","version":"181.3870.7","since":"181.3870","until":"181.*","originalSince":"181.3870","originalUntil":null},{"id":"cucumber-groovy","version":"181.3870.7","since":"181.3870","until":"181.*","originalSince":"181.3870","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.8","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.schibsted.protein","version":"0.7.0","since":"141.0","until":"172.*","originalSince":"141.0","originalUntil":"172.*"},{"id":"me.kingtux.motivation","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"IdeaVIM","version":"0.49.4","since":"171.0","until":"201","originalSince":"171.0","originalUntil":null},{"id":"com.headwire.aem.tooling.intellij","version":"1.0.3.2","since":"162.0","until":"203","originalSince":"162.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.8.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.8.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.8.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.9.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.9.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.9.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"com.mrz.showversion","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.10","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.2","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.1.0 (201802231235)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.10.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.10.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.10.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"org.intellij.plugins.touchbar_support","version":"0.0.1","since":"162.0","until":"201","originalSince":"162.0","originalUntil":null},{"id":"io.github.qeesung.component.HighlightBracketPair","version":"1.0.1","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.neo.test.plugin.Translate","version":"1.0","since":"130.0","until":"201.0","originalSince":"130.0","originalUntil":null},{"id":"org.intellij.plugins.touchbar_support","version":"0.0.2","since":"162.0","until":"201","originalSince":"162.0","originalUntil":null},{"id":"io.github.qeesung.component.HighlightBracketPair","version":"1.0.3","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.4.2","since":"139.1803","until":"211","originalSince":"139.1803","originalUntil":null},{"id":"io.github.qeesung.component.HighlightBracketPair","version":"1.0.4","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"nosi.xmlpojo_plugin","version":"1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.ctrip.zt.gaok.plugin.easyJavaBeanPlugins","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.zhishan.java.zhishanMvc","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.plugins.touchbar_support","version":"0.0.3","since":"162.0","until":"201","originalSince":"162.0","originalUntil":null},{"id":"com.schibsted.protein","version":"0.7.1","since":"141.0","until":"172.*","originalSince":"141.0","originalUntil":"172.*"},{"id":"com.yang.dialog","version":"2.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.embeddedProjectJdk","version":"1.0","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"io.ballerina","version":"0.962.0","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.124","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.9.5","since":"143.2000","until":"192.*","originalSince":"143.2000","originalUntil":null},{"id":"darthorimar.cbt","version":"0.1","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"io.ballerina","version":"0.963.0","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.boredream.plugin.androidcodegenerator","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.kubernetes","version":"181.3986.7","since":"181.3986","until":"181.4031","originalSince":"181.3986","originalUntil":"181.*"},{"id":"io.github.qeesung.component.HighlightBracketPair","version":"1.0.5","since":"162.0","until":"201","originalSince":"162.0","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.9","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.52","since":"133.0","until":"200.0","originalSince":"133.0","originalUntil":null},{"id":"nl.tudelft.watchdog","version":"2.0.3","since":"139.0","until":"200","originalSince":"139.0","originalUntil":null},{"id":"org.jetbrains.plugins.dired","version":"1.0.15","since":"173.3727","until":"182.*","originalSince":"173.3727","originalUntil":"183.*"},{"id":"nl.tudelft.watchdog","version":"2.0.4","since":"139.0","until":"200","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.18.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"com.bulletjet.StartupTimer","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"JRebelPlugin","version":"7.1.7","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"Error-prone plugin","version":"181.3986.9","since":"181.3986","until":"182.0","originalSince":"181.3986","originalUntil":null},{"id":"com.yii2support","version":"0.8","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"io.github.qeesung.component.HighlightBracketPair","version":"1.0.6","since":"162.0","until":"201","originalSince":"162.0","originalUntil":null},{"id":"com.jetbrains.embeddedProjectJdk","version":"1.1","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.embeddedProjectJdk","version":"1.1.1","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"plugintest","version":"0.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2888.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2888.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.1.0","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.aswitcher","version":"3.0","since":"172.0","until":"201.0","originalSince":"172.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"1.1","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"PerforceIC","version":"0.9.6","since":"135.1286","until":"181.0","originalSince":"135.1286","originalUntil":null},{"id":"org.intellij.xquery.marklogic","version":"1.0","since":"173.3727.127","until":"212.*","originalSince":"173.3727.127","originalUntil":null},{"id":"com.poratu.idea.plugins.tomcat","version":"1.9","since":"141.0","until":"191.0","originalSince":"141.0","originalUntil":null},{"id":"io.github.qeesung.component.HighlightBracketPair","version":"1.0.7","since":"162.0","until":"201","originalSince":"162.0","originalUntil":null},{"id":"io.github.qeesung.component.HighlightBracketPair","version":"1.0.8","since":"162.0","until":"201","originalSince":"162.0","originalUntil":null},{"id":"io.github.qeesung.component.HighlightBracketPair","version":"1.0.9","since":"162.0","until":"201","originalSince":"162.0","originalUntil":null},{"id":"io.github.qeesung.component.HighlightBracketPair","version":"1.1.0","since":"162.0","until":"201","originalSince":"162.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.7.0","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.yii2support","version":"0.8.38","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"mobi.hsz.idea.nodesecurity","version":"0.4.0","since":"123.72","until":"212","originalSince":"123.72","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2017.3.2905.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.1.2","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.2.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.person.controlFlowGraph","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"io.github.qeesung.component.HighlightBracketPair","version":"1.1.1","since":"162.0","until":"201","originalSince":"162.0","originalUntil":null},{"id":"com.yii2support","version":"0.8.38.1","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"com.mrz.showversion","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"io.ballerina","version":"0.964.0","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.mrz.showversion","version":"1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.40.1","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.2.30-release-Studio3.1-1","since":"173.1","until":"173.4301","originalSince":"173.1","originalUntil":"173.*"},{"id":"org.jetbrains.kotlin","version":"1.2.30-release-Studio3.1-1","since":"173.1","until":"173.4302","originalSince":"173.1","originalUntil":"173.*"},{"id":"org.jetbrains.plugins.stylus","version":"181.4096.12","since":"181.4096","until":"201","originalSince":"181.4096","originalUntil":null},{"id":"cucumber-javascript","version":"181.4096.12","since":"181.4096","until":"201","originalSince":"181.4096","originalUntil":null},{"id":"com.aswitcher","version":"3.1","since":"172.0","until":"201.0","originalSince":"172.0","originalUntil":null},{"id":"vette.neos","version":"0.1.25-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"org.elixir_lang","version":"7.4.0","since":"163.15529.5","until":"211.*","originalSince":"163.15529.5","originalUntil":null},{"id":"me.lotabout.codegenerator","version":"1.3.3","since":"163.0","until":"231.*","originalSince":"163.0","originalUntil":null},{"id":"com.xzdz.codereview","version":"1.0.4","since":"141.177","until":"201.0","originalSince":"141.177","originalUntil":null},{"id":"com.androhi.androiddrawableviewer","version":"3.0","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.4.11","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.4.11","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.4.6","since":"162.2147483647","until":"181.*","originalSince":"162.*","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.39","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.savion.hello.plugin","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.1.5","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"org.tboox.xmake","version":"1.0.5","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.semihunaldi.intellij.ideacurrency.plugin","version":"0.1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"vette.neos","version":"0.1.26-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.5.0","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"net.lagerwey.cucumber-kotlin","version":"1.0.0","since":"162.0","until":"162.0","originalSince":"162.0","originalUntil":null},{"id":"reasonml","version":"0.41","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"net.lagerwey.cucumber-kotlin","version":"1.0.1","since":"162.0","until":"162.0","originalSince":"162.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.5.1","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.5.2","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"ca.rightsomegoodgames.mayacharm","version":"2.1.4","since":"131.0","until":"193.0","originalSince":"131.0","originalUntil":null},{"id":"com.meicloud.plugin.setting","version":"2.7","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.aswitcher","version":"3.1.1","since":"172.0","until":"201.0","originalSince":"172.0","originalUntil":null},{"id":"io.ballerina","version":"0.964.1","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.vladsch.git-file-case-fixer","version":"1.0.0","since":"163.15529","until":"202.*","originalSince":"163.15529","originalUntil":null},{"id":"com.vladsch.git-file-case-fixer","version":"1.0.4","since":"163.15529","until":"202.*","originalSince":"163.15529","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.1.6","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"WindowPlugin","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.44.6","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.6.1","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"com.yii2support","version":"0.8.42","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"com.zhishan.java.zhishanMvc","version":"1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.schibsted.protein","version":"0.8.0","since":"141.0","until":"172.*","originalSince":"141.0","originalUntil":"172.*"},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.2.6","since":"145.0","until":"183","originalSince":"145.0","originalUntil":null},{"id":"com.schibsted.protein","version":"0.8.1","since":"141.0","until":"172.*","originalSince":"141.0","originalUntil":"172.*"},{"id":"com.yii2support","version":"0.8.42.3","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"com.djordjem.idea.plugin.cirilizator","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.djordjem.idea.plugin.cirilizator","version":"1.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.upsolver.PreCommitHook","version":"0.4.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.6.2","since":"162.0","until":"173.*","originalSince":"162.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.9","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.djordjem.idea.plugin.cirilizator","version":"1.2","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"2.0","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"R4Intellij","version":"1.0.9","since":"145.258","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.11","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"reasonml","version":"0.42","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"com.schibsted.protein","version":"0.8.2","since":"141.0","until":"173.*","originalSince":"141.0","originalUntil":"173.*"},{"id":"com.thinkwide.plugin.wizard","version":"1.0","since":"105.0","until":"201.0","originalSince":"105.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"2017.1.2","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.2.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.1.3","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.11.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.11.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.11.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"com.schibsted.protein","version":"0.8.3","since":"141.0","until":"173.*","originalSince":"141.0","originalUntil":"173.*"},{"id":"mohammad.src","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"cz.k2.eshop","version":"1.7","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"ms.konovalov.intellij.hidpi-profiles","version":"2017.1.3","since":"171.0","until":"222","originalSince":"171.0","originalUntil":null},{"id":"com.sollyu.java.idea.touchbar.support","version":"1.0.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.yii2support","version":"0.8.42.5","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"com.schibsted.protein","version":"0.8.4","since":"141.0","until":"173.*","originalSince":"141.0","originalUntil":"173.*"},{"id":"brown.bat.redisCli","version":"1.0.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.125","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.126","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"io.ballerina","version":"0.964.2","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.tukeping.dt.vars.plugin","version":"0.0.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"2.0.1","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.43","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"com.schibsted.protein","version":"0.8.5","since":"141.0","until":"173.*","originalSince":"141.0","originalUntil":"173.*"},{"id":"com.fireline.plugin.id","version":"1.5.0","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.person.controlFlowGraph","version":"1.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.TabFormat","version":"0.2","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"color.scheme.GapStyle","version":"1.0","since":"173.0","until":"","originalSince":"142.0","originalUntil":null},{"id":"org.ziglang","version":"0.0.1","since":"145.0","until":"193","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.plugins.touchbar_support","version":"0.0.4","since":"162.0","until":"201","originalSince":"162.0","originalUntil":null},{"id":"cn.levey.binding_layout","version":"1.0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"us.egek.searchstackoverflow","version":"1.0.3","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.5.3","since":"144.0","until":"232","originalSince":"144.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.5.0","since":"123.72","until":"139.0","originalSince":"123.72","originalUntil":null},{"id":"color.scheme.GapStyle","version":"1.1","since":"173.0","until":"","originalSince":"142.0","originalUntil":null},{"id":"color.scheme.GapStyle","version":"1.2","since":"173.0","until":"","originalSince":"142.0","originalUntil":null},{"id":"Gitflow","version":"0.6.4","since":"171.0","until":"171.*","originalSince":"162.0","originalUntil":"181.*"},{"id":"awesome.aurora.borealis.zupersearch.plugin.intellij","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"org.ziglang","version":"0.0.2","since":"145.0","until":"193","originalSince":"145.0","originalUntil":null},{"id":"com.crownpartners.intellivault","version":"0.10.0","since":"145.0","until":"203","originalSince":"145.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.5.1","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"4.1.0","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.schibsted.protein","version":"0.8.6","since":"141.0","until":"173.*","originalSince":"141.0","originalUntil":"173.*"},{"id":"com.illuminatedcloud2.intellij","version":"2.0.1.4","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.2.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.pablogsal.black","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.pablogsal.black","version":"1.0.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.5.2","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.thinkwide.plugin.wizard","version":"1.0","since":"105.0","until":"201.0","originalSince":"105.0","originalUntil":null},{"id":"com.thinkwide.plugin.wizard","version":"1.1","since":"105.0","until":"201.0","originalSince":"105.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.6.0","since":"181.0","until":"232","originalSince":"181.0","originalUntil":null},{"id":"us.egek.searchstackoverflow","version":"1.0.4","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.2.0 (201803260924)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"com.pablogsal.black","version":"1.0.2","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.pablogsal.black","version":"1.0.3","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"org.ziglang","version":"0.0.3","since":"145.0","until":"181.0","originalSince":"145.0","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.12","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"net.vektah.codeglance","version":"1.5.4","since":"107.105","until":"201","originalSince":"107.105","originalUntil":null},{"id":"io.intino.plugin","version":"3.2.2","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.pablogsal.black","version":"1.0.4","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.5.3","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"reasonml","version":"0.44","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"li.niwato.motivational.gif","version":"1.0","since":"111.1","until":"201.0","originalSince":"111.1","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.127","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.pablogsal.black","version":"1.0.5","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.redefiningproductions.com.api-key-watcher","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"2.0.2","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"1.9","since":"181.0","until":"222.4459.*","originalSince":"181.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.128","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"google-java-format","version":"1.5.1","since":"173.0","until":"181.*","originalSince":"171.0","originalUntil":"181.*"},{"id":"io.github.donkirkby.livepycharm","version":"2.22.0","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"xyz.elmot.clion.armsupport.prj","version":"1.1.alpha1","since":"181.0","until":"181.*","originalSince":"173.3531","originalUntil":"181.*"},{"id":"com.visprogramming.armory","version":"1.40","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"me.aristotll.ruby.rdoc.adder","version":"0.0.3","since":"181.0","until":"211","originalSince":"181.0","originalUntil":null},{"id":"Git Scope","version":"2.0.0","since":"181.2784","until":"202.*","originalSince":"181.2784","originalUntil":null},{"id":"OdpsStudio","version":"2.9.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"JRebelPlugin","version":"2018.1.0","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.flow.intellij","version":"20180402084528","since":"14.1","until":"231.*","originalSince":"14.1","originalUntil":null},{"id":"com.ntilde.androidinput","version":"1.1","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"Error-prone plugin","version":"181.4488","since":"181.4488","until":"182.0","originalSince":"181.4488","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.1.5","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.bmapleaf.mvvm","version":"1.4.9","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.129","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.6.3","since":"162.0","until":"181.1","originalSince":"162.0","originalUntil":null},{"id":"io.ghostbuster91.nspek-intellij-plugin","version":"0.0.21","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.10","since":"143.2000","until":"192.*","originalSince":"143.2000","originalUntil":null},{"id":"jetbrains.mps.build","version":"2018.1","since":"181.1","until":"182.*","originalSince":"173.1","originalUntil":"182.*"},{"id":"jetbrains.mps.testing","version":"2018.1","since":"181.1","until":"182.*","originalSince":"173.1","originalUntil":"182.*"},{"id":"me.codeboy.plugin.reverse-lines","version":"1.0.0","since":"10.0","until":"201.0","originalSince":"10.0","originalUntil":null},{"id":"me.codeboy.plugin.reverse-lines","version":"1.0.1","since":"10.0","until":"201.0","originalSince":"10.0","originalUntil":null},{"id":"me.aristotll.ruby.rdoc.adder","version":"0.0.4","since":"181.0","until":"211","originalSince":"181.0","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.13","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"org.moe","version":"1.4.3","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.1.6","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"jenkis.build.with.retry","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.amadeus.SearchBySegmentfault","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.41","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"com.amadeus.SearchByBaidu","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.40","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.6.4","since":"162.0","until":"181.1","originalSince":"162.0","originalUntil":null},{"id":"com.jetbrains.TabFormat","version":"0.3","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"4.1.1","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.2.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"org.jeto.taskfocus","version":"0.9.8","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"org.gdlplugin","version":"0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"net.ruixin.rx-plugin","version":"1.0","since":"143.0","until":"201.0","originalSince":"143.0","originalUntil":null},{"id":"dk.lost_world.intellij-touch","version":"0.1","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.2.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"artsiomch.cmake","version":"0.2.1","since":"173.0","until":"191.0","originalSince":"173.0","originalUntil":null},{"id":"dk.lost_world.intellij-touch","version":"0.2","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"io.intino.plugin","version":"3.2.3","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"dongfg.coolhub","version":"1.0","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.12.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.12.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"in.1ton.idea.spring.assistant.plugin","version":"0.12.0","since":"172.0","until":"201","originalSince":"172.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.3.5","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"org.elm.klazuka","version":"1.0.0","since":"162.0","until":"181.*","originalSince":"162.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.19.0","since":"171.3566.24","until":"223.*","originalSince":"171.3566.24","originalUntil":null},{"id":"com.idescout.sqlite","version":"4.1.2","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"Springirun","version":"0.2","since":"181.0","until":"231.*","originalSince":"181.0","originalUntil":null},{"id":"dk.lost_world.intellij-touch","version":"0.3","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"dk.lost_world.intellij-touch","version":"0.4","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"project_manager","version":"1.0","since":"145.0","until":"181.0","originalSince":"145.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.6.5","since":"162.0","until":"181.1","originalSince":"162.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.1.0","since":"173.0","until":"181.0","originalSince":"173.0","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.6.1","since":"123.72","until":"139.0","originalSince":"123.72","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.6.6","since":"181.0","until":"183.1","originalSince":"181.0","originalUntil":null},{"id":"com.yii2support","version":"0.8.42.6","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.50.13","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"org.gdlplugin","version":"0.2.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.poratu.idea.plugins.tomcat","version":"2.0","since":"141.0","until":"191.0","originalSince":"141.0","originalUntil":null},{"id":"myFolders plugin for IntelliJ IDEA","version":"1.2","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.7.0","since":"181.0","until":"183.1","originalSince":"181.0","originalUntil":null},{"id":"sk.stuba.fiit.mock_manager","version":"0.1","since":"145.0","until":"183.0","originalSince":"145.0","originalUntil":null},{"id":"de.hszemi.rmsplugin","version":"0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"4.1.0","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"sk.stuba.fiit.mock_manager","version":"0.2","since":"145.0","until":"183.0","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.4.5","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"nl.jworks.intellij.bootstrap3","version":"4.1.1","since":"131.0","until":"183.*","originalSince":"131.0","originalUntil":null},{"id":"com.ebay.sd.jbehave","version":"2.0-SNAPSHOT","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.ebay.sd.jbehave","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"hongSir.plugin","version":"2.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.47","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"com.strixsoftware.intellij.format","version":"1.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"artsiomch.cmake","version":"0.2.2","since":"173.0","until":"182.0","originalSince":"173.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.4.6","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"io.github.vcuswimlab.stackintheflow","version":"0.2.2","since":"162.1121","until":"201.0","originalSince":"162.1121","originalUntil":null},{"id":"hongSir.plugin","version":"2.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"hongSir.plugin","version":"2.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"hongSir.plugin","version":"2.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.1.7","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.2.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.8.0","since":"181.0","until":"183.1","originalSince":"181.0","originalUntil":null},{"id":"color.scheme.Tempo-theme","version":"0.1","since":"142.0","until":"201.0","originalSince":"142.0","originalUntil":null},{"id":"com.elmottaki","version":"0.0.1-SNAPSHOT","since":"131.0","until":"201.0","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.1.1","since":"173.0","until":"181.0","originalSince":"173.0","originalUntil":null},{"id":"org.jetbrains.plugins.iasemenov.idea-git-extensions","version":"1.0","since":"181.0","until":"191.7961","originalSince":"18.1","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.0.3","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"dk.lost_world.intellij-touch","version":"0.5","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"OdpsStudio","version":"2.9.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.8.1","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"sk.stuba.fiit.mock_manager","version":"0.3","since":"145.0","until":"183.0","originalSince":"145.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.4.8","since":"162.2147483647","until":"181.*","originalSince":"162.*","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.8.1","since":"181.0","until":"183.1","originalSince":"181.0","originalUntil":null},{"id":"com.fooock.experimental.and.beta.icons","version":"1.1.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.8.2","since":"181.0","until":"183.1","originalSince":"181.0","originalUntil":null},{"id":"com.gmail.blueboxware.extsee","version":"1.0.1","since":"171.0","until":"221","originalSince":"171.0","originalUntil":null},{"id":"com.perfectomobile.intellijidea.androidstudio","version":"18.6.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"com.perfectomobile.intellijidea","version":"18.6.0.0","since":"14.1","until":"201.0","originalSince":"14.1","originalUntil":null},{"id":"QAPlug - Hammurapi","version":"1.3.4","since":"181.4445","until":"191.6184","originalSince":"181.4445","originalUntil":null},{"id":"QAPlug","version":"1.3.17","since":"181.4445","until":"211","originalSince":"181.4445","originalUntil":null},{"id":"cc.duduhuo.git-conflict","version":"0.0.1-rc","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"InternalWiki","version":"1.0.0","since":"173.0","until":"223.*","originalSince":"173.0","originalUntil":null},{"id":"sk.zlatohlavek.iway.project_switcher","version":"1.3","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"1.5.0","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.meicloud.plugin.setting","version":"2.8","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.189.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"OdpsStudio","version":"2.9.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"org.metaborg.spt.testrunner.intellij","version":"0.2","since":"170.0","until":"","originalSince":"170.0","originalUntil":null},{"id":"cc.duduhuo.git-conflict","version":"0.0.1","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.11","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.80","since":"134.1050","until":"200.0","originalSince":"134.1050","originalUntil":null},{"id":"com.pablogsal.black","version":"1.0.6","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"br.com.diegomelodev","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"org.ziglang","version":"0.1.0","since":"145.0","until":"193","originalSince":"145.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.5.4","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"3.0.0.final","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.0","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"com.ebay.sd.jbehave","version":"2.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"ria-intellij-plugin","version":"0.7.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.235.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"sk.stuba.fiit.mock_manager","version":"0.4","since":"145.0","until":"183.0","originalSince":"145.0","originalUntil":null},{"id":"io.ballerina","version":"0.970.0","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.1.8","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.41","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"1.5.1","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"2017.1.3","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"cc.duduhuo.git-conflict","version":"1.0.0","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.8.3","since":"181.0","until":"183.1","originalSince":"181.0","originalUntil":null},{"id":"org.argus.intellij","version":"1.0.1","since":"173.0","until":"202.*","originalSince":"173.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.5.7","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.5.8","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"color.scheme.Defcula","version":"0.1.1","since":"142.0","until":"201.0","originalSince":"142.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.2.1 (201804271202)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.4.3","since":"139.1803","until":"211","originalSince":"139.1803","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.1.9","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.2.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.130","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.14","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"dk.lost_world.intellij-touch","version":"0.5.2","since":"172.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"181.4892.29","since":"181.4892","until":"201","originalSince":"181.4892","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.131","since":"173.3727.127","until":"211","originalSince":"173.3727.127","originalUntil":null},{"id":"io.intino.plugin","version":"3.2.4","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"io.intino.plugin","version":"3.2.5","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.131","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.aemtools","version":"0.9","since":"173.0","until":"211","originalSince":"131.0","originalUntil":null},{"id":"com.ritesh.intellij.plugin.reviewboard","version":"0.1.4","since":"181.2218","until":"193.*","originalSince":"181.2218","originalUntil":null},{"id":"io.ghostbuster91.nspek-intellij-plugin","version":"0.2.1","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"io.ghostbuster91.nspek-intellij-plugin","version":"0.5.0","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.8.4","since":"181.0","until":"183.1","originalSince":"181.0","originalUntil":null},{"id":"JRebelPlugin","version":"2018.1.1","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"com.jetbrains.upsource","version":"2018.1.308.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"reasonml","version":"0.50","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.42","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.1.2","since":"173.0","until":"181.0","originalSince":"173.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.2.6.001","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.3.0.001","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"18.0.132.637.0-Eclipse_4.6.3","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"EclipseCodeFormatter","version":"18.0.132.637.0-Eclipse_4.7.3a","since":"132.637","until":"202","originalSince":"132.637","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"3.0.1","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"nl.tudelft.watchdog","version":"3.0.0","since":"139.0","until":"200","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.2.0","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.3.1","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"2.9.3","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.2.1","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.2.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"SourceSafe","version":"182.2258","since":"182.2258","until":"201","originalSince":"182.2258","originalUntil":null},{"id":"JBClearcasePlugin","version":"2.0.2","since":"182.2258","until":"212.*","originalSince":"182.2258","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.3","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.elm.klazuka","version":"1.1.0","since":"162.0","until":"181.*","originalSince":"162.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.3.2","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.3.2","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.12","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"2.9.3.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-SNAPSHOT","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.42018-05-11T12:53Z","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180511.130357","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.7.1","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.2.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.2.2","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.3.3.1","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"com.poratu.idea.plugins.tomcat","version":"2.5","since":"141.0","until":"191.0","originalSince":"141.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.3.3.2","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.6.9","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180511.230422","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180512.010914","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.3.3.8","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"1.2.4","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"io.ballerina","version":"0.970.1","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.ruin.lsp","version":"0.3.0","since":"181.0","until":"191.4500","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180512.190829","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180512.193710","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180513.002827","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.7.10","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.3.5","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"2.0.3","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"com.hpe.mc.androidhelper","version":"1.4","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"Git Scope","version":"2.1.0","since":"181.2784","until":"202.*","originalSince":"181.2784","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180514.194319","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180514.211413","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.3.6.3","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"org.elm.klazuka","version":"1.1.1","since":"162.0","until":"181.*","originalSince":"162.0","originalUntil":null},{"id":"com.intellij.plugin.adernov.powershell","version":"1.1.0","since":"172.4574","until":"182.*","originalSince":"172.4574","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180515.204140","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.357.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.357.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"0.1.1","since":"172.0","until":"212.*","originalSince":"172.0","originalUntil":null},{"id":"org.jetbrains.plugins.ruby-chef","version":"182.2371","since":"182.2371","until":"182.2371","originalSince":"182.2371","originalUntil":"182.*"},{"id":"org.jetbrains.plugins.ruby","version":"2018.2.20180515","since":"182.2371","until":"182.2371","originalSince":"182.2371","originalUntil":"182.*"},{"id":"EclipseCodeFormatter","version":"18.1.181.000.0-Eclipse_4.6.3","since":"181.0","until":"202","originalSince":"181.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"18.1.181.000.0-Eclipse_4.7.3a","since":"181.0","until":"202","originalSince":"181.0","originalUntil":null},{"id":"cucumber-javascript","version":"182.2371.6","since":"182.2371","until":"201","originalSince":"182.2371","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"182.2371.6","since":"182.2371","until":"182.*","originalSince":"182.2371","originalUntil":null},{"id":"TFS","version":"182.2371.6","since":"182.2371","until":"191.*","originalSince":"182.2371","originalUntil":null},{"id":"XSLT-Debugger","version":"182.2371.6","since":"182.2371","until":"201","originalSince":"182.2371","originalUntil":null},{"id":"AngularJS","version":"182.2371.6","since":"182.2371","until":"182.2371","originalSince":"182.2371","originalUntil":"182.*"},{"id":"lsfusion.idea.plugin","version":"1.0.132","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.5.5","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.368.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.369.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.2.1","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"XSLT-Debugger","version":"182.2371.25","since":"182.2371","until":"201","originalSince":"182.2371","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.2.2","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"com.yii2support","version":"0.9.50","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"reasonml","version":"0.51.1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180518.131824","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"artsiomch.cmake","version":"0.2.4","since":"173.0","until":"191.0","originalSince":"173.0","originalUntil":null},{"id":"com.poratu.idea.plugins.tomcat","version":"2.6","since":"141.0","until":"191.0","originalSince":"141.0","originalUntil":null},{"id":"hu.rb.cs.generator","version":"1.0","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"2.0.4","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.133","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"mobi.hsz.idea.gitignore","version":"2.6.2","since":"123.72","until":"139.0","originalSince":"123.72","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.8.2","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"4.2.0","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"hu.rb.cs.generator","version":"1.1","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.369.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.6.1","since":"182.0","until":"232","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180523.203713","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180524.012616","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"5.1","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"3.0.2","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.52","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.383.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"JRebelPlugin","version":"2018.1.2","since":"132.1","until":"213.*","originalSince":"132.1","originalUntil":"999.*"},{"id":"io.github.qeesung.component.HighlightBracketPair","version":"1.1.2","since":"162.0","until":"201","originalSince":"162.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"2017.1.4","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"io.loli.browserfx","version":"1.1.4","since":"173.0","until":"201.*","originalSince":"173.0","originalUntil":null},{"id":"io.ballerina","version":"0.972.0","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.8.11","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"1.5.1","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"1.6.0-RC1","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"cz.k2.eshop","version":"1.8","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.yii2support","version":"0.9.54.5","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"com.yhuang.code-smell-detector","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"2.9.4","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.2.3","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.3.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.2.2 (201805250920)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.7.2","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.0-alpha1","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"net.coding.git","version":"1.1.0","since":"145.0","until":"193","originalSince":"145.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.2.4","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.0-alpha2","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.0-alpha3","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180530.185936","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.5.6","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"AngularJS","version":"182.2757.12","since":"182.2757","until":"182.2757","originalSince":"182.2757","originalUntil":"182.*"},{"id":"reasonml","version":"0.53","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"cz.k2.eshop","version":"1.9","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180531.184427","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180531.193233","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180531.194330","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180531.194941","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180531.195010","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"com.yii2support","version":"0.9.54.9","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180601.005921","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180601.142315","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180601.215216","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.10","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"org.elixir_lang","version":"7.5.0","since":"163.15529.5","until":"211.*","originalSince":"163.15529.5","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.11","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"ca.rightsomegoodgames.mayacharm","version":"2.1.5","since":"131.0","until":"193.0","originalSince":"131.0","originalUntil":null},{"id":"com.wustor.nulltodie","version":"1.0.2","since":"173.0","until":"181.*","originalSince":"145.0","originalUntil":"181.*"},{"id":"org.intellij.plugins.hcl","version":"0.6.11","since":"143.2000","until":"192.*","originalSince":"143.2000","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.8.5","since":"181.0","until":"183.1","originalSince":"181.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.2.4","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.3.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.github.gtache.lsp","version":"1.4.0","since":"173.0","until":"203.*","originalSince":"173.0","originalUntil":null},{"id":"io.ballerina","version":"0.973.0","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.134","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"1.6.0-RC2","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"io.acari.DDLCTheme","version":"0.1.0-beta","since":"181.3494.1","until":"182.0","originalSince":"181.3494.1","originalUntil":null},{"id":"io.acari.DDLCTheme","version":"0.1.1-beta","since":"181.3494.1","until":"182.0","originalSince":"181.3494.1","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"3.0.3","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180606.181013","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"ca.rightsomegoodgames.mayacharm","version":"2.1.6","since":"131.0","until":"193.0","originalSince":"131.0","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.12","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.54","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.2.5","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180607.212310","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180607.214444","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180607.235415","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"cn.kevin.mybatis.hepler","version":"1.2.3","since":"181.0","until":"182.*","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.419.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.jlupin.plugin.nextserver.intellij","version":"1.2.7","since":"172.0","until":"193.*","originalSince":"172.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180608.183910","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180608.193845","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180608.194753","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"com.mario.WSAnything.plugin","version":"1.0","since":"1.0","until":"193.*","originalSince":"1.0","originalUntil":null},{"id":"com.mario.WSAnything.plugin","version":"1.1","since":"1.0","until":"193.*","originalSince":"1.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"4.3.0","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.2.5","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.3.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"1.7.0","since":"181.0","until":"232","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180611.190952","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"hu.rb.cs.generator","version":"1.2","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"io.acari.DDLCTheme","version":"0.1.2-beta","since":"181.3494.1","until":"182.0","originalSince":"181.3494.1","originalUntil":null},{"id":"xyz.ihac.derrick","version":"0.2.0-alpha","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"io.ballerina","version":"0.974.0","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"io.intino.plugin","version":"3.4.0","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"R4Intellij","version":"1.0.10","since":"145.258","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"com.github.ArtsiomCh.JDCleanRead","version":"0.1.0","since":"173.0","until":"191.0","originalSince":"173.0","originalUntil":null},{"id":"reasonml","version":"0.55.1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"cz.k2.eshop","version":"2.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"182.3208.4","since":"182.3208","until":"201","originalSince":"182.3208","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180613.175559","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180613.191334","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180613.204820","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.mario.WSAnything.plugin","version":"1.2","since":"1.0","until":"193.*","originalSince":"1.0","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"0.1.2","since":"172.0","until":"212.*","originalSince":"172.0","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.13408","since":"162.0","until":"202.*","originalSince":"141.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180614.150321","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180614.155907","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"JRebelPlugin","version":"2018.1.3.1","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.vladsch.MissingInActions","version":"1.5.0","since":"162.2147483647","until":"182.*","originalSince":"162.*","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180615.194123","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180615.204425","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180615.211129","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.445.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.445.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.446.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"za.co.sfy.angular.imports-sorter","version":"1.0","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180618.202215","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180618.205812","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180618.212513","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.0-alpha4","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180618.232102","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"itaka.intellij.plugin.json.navigator","version":"1.4","since":"181.0","until":"192.*","originalSince":"181.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.135","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.0.0","since":"163.0","until":"211.0","originalSince":"163.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.0.1","since":"163.0","until":"211.0","originalSince":"163.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.0.2","since":"163.0","until":"211.0","originalSince":"163.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.0.3","since":"163.0","until":"211.0","originalSince":"163.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.0.4","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180619.170118","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.0.5","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.0.6","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"3.0.4","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"cz.k2.eshop","version":"2.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.0.7","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.mario.WSAnything.plugin","version":"1.3","since":"1.0","until":"193.*","originalSince":"1.0","originalUntil":null},{"id":"reasonml","version":"0.56","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"XSLT-Debugger","version":"182.3341.1","since":"182.3341","until":"201","originalSince":"182.3341","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.5.7","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.plugin.adernov.powershell","version":"1.1.1","since":"172.4574","until":"182.*","originalSince":"172.4574","originalUntil":null},{"id":"com.visprogramming.armory","version":"1.42","since":"139.0","until":"211","originalSince":"139.0","originalUntil":null},{"id":"io.intino.plugin","version":"3.4.1","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2018.1.58245","since":"143.2200","until":"171.4249","originalSince":"143.2200","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.9.12-beta-1","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.9.12-beta-2","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"2.0.5","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"dev.mpp.android-data-tools","version":"1.0.2","since":"163","until":"183.*","originalSince":"1.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2018.1.58262","since":"143.2200","until":"171.4249","originalSince":"143.2200","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180622.210358","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"name.ekt.jetbrains.plugins.flatten","version":"0.13","since":"145.0","until":"200","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180624.040355","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.13411","since":"162.0","until":"202.*","originalSince":"141.0","originalUntil":null},{"id":"com.mario.WSAnything.plugin","version":"1.4","since":"1.0","until":"193.*","originalSince":"1.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180624.172908","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.476.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.476.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"xyz.ihac.derrick","version":"0.2.1-beta","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.0.8","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.0.9","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180625.145412","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.mario.WSAnything.plugin","version":"1.5","since":"1.0","until":"193.*","originalSince":"1.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180625.152327","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.jetbrains.colorful.toolwindow.icons","version":"1.0","since":"182.3341","until":"201","originalSince":"182.3341","originalUntil":null},{"id":"org.jetbrains.debugger.streams.kotlin","version":"0.0.2","since":"183.312","until":"191.0","originalSince":"183.312","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180625.173631","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180625.181640","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"io.ballerina","version":"0.975.0","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.61.2","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"ru.scarlett","version":"0.1.alpha","since":"173.0","until":"","originalSince":"217.3.4","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.13","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.williamlee.plugin.swagger.generate","version":"1.0","since":"173.0","until":"203","originalSince":"173.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.3.8.1","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.57","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.github.kassak.dg-exposer","version":"0.01","since":"182.0","until":"183.500","originalSince":"182.0","originalUntil":"192.0"},{"id":"fr.tolc.jahia.intellij.plugin","version":"2.0.0","since":"107.105","until":"212.*","originalSince":"107.105","originalUntil":null},{"id":"com.github.kassak.dg-exposer","version":"0.01.1","since":"182.0","until":"183.500","originalSince":"182.0","originalUntil":"192.0"},{"id":"de.endrullis.idea.postfixtemplates","version":"1.8.6","since":"181.0","until":"183.1","originalSince":"181.0","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.5.1","since":"163.0","until":"201","originalSince":"163.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.9.12-beta-3","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"kotless","version":"1.0","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180629.144615","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180629.152000","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.jetbrains.hackathon2015.S","version":"1.0.2","since":"181.0","until":"201","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180629.213500","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"Mongo Plugin","version":"0.11.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180702.164448","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.2.3 (201806260651)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180702.201730","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.8.3","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.2.6","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.3.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.14","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.1.0","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"gherkin","version":"181.5540.1","since":"181.5540","until":"183.*","originalSince":"181.5540","originalUntil":null},{"id":"cucumber-groovy","version":"181.5540.1","since":"181.5540","until":"201","originalSince":"181.5540","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"3.0.5","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.plugins.ruby-chef","version":"182.3458.5","since":"182.3458","until":"182.3458","originalSince":"182.3458","originalUntil":"182.*"},{"id":"cn.sourcespro","version":"1.4","since":"145.2070","until":"231.*","originalSince":"145.2070","originalUntil":null},{"id":"com.mario.WSAnything.plugin","version":"1.8","since":"1.0","until":"193.*","originalSince":"1.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.5.8","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"JRebelPlugin","version":"2018.1.4","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.softbank.robot.sdkplugin","version":"1.1.2","since":"162.0","until":"211.*","originalSince":"162.0","originalUntil":null},{"id":"org.spekframework","version":"2.0.0-alpha.1-Studio3.1","since":"173.1","until":"181.1","originalSince":"173.1","originalUntil":"181.*"},{"id":"EditorGroups","version":"0.20","since":"181.4892","until":"203","originalSince":"181.4892","originalUntil":null},{"id":"com.github.alexmojaki.birdseye.pycharm","version":"1.0","since":"173.0","until":"193.*","originalSince":"173.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"4.4.0","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"OdpsStudio","version":"2.9.5","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"org.scalafmt.ScalaFmt","version":"1.6.0-RC4","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180709.200536","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"name.kropp.intellij.makefile","version":"1.3","since":"181.0","until":"211.5538","originalSince":"181.0","originalUntil":null},{"id":"io.intino.plugin","version":"3.4.3","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.57.1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.9.12-beta-4","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.136","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.teamscale.ide.intellij","version":"4.3.3","since":"172.0","until":"","originalSince":"163.0","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"1.0.0","since":"172.0","until":"212.*","originalSince":"172.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.3.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"0.0.5","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"com.intellij.stats.completion","version":"0.1.3","since":"181.0","until":"182.0","originalSince":"181.0","originalUntil":null},{"id":"hu.rb.cs.generator","version":"1.3","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180712.031436","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180712.031719","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180712.032448","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"cn.robin.vectorIconPack","version":"1.1","since":"131.0","until":"221.*","originalSince":"131.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.15","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"cn.sourcespro","version":"1.5","since":"145.2070","until":"231.*","originalSince":"145.2070","originalUntil":null},{"id":"xyz.ihac.derrick","version":"0.2.2-beta","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"reasonml","version":"0.58","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180712.195546","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"net.masterthought.dlanguage","version":"1.17","since":"181.0","until":"182.*","originalSince":"181.0","originalUntil":"191.*"},{"id":"com.jetbrains.intellij.api.watcher","version":"6.20.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"codeReview4idea","version":"0.5.7","since":"172.767","until":"203.*","originalSince":"172.767","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.62.0","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"org.jspresso.plugin.i18n","version":"1.0.0","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"org.jspresso.plugin.i18n","version":"1.0.1","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.1.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"QAPlug","version":"1.3.18","since":"181.4445","until":"211","originalSince":"181.4445","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"2017.1.5","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.2.8","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.sjhy.plugin","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.1.2","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"io.ballerina","version":"0.980.0","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"cucumber-javascript","version":"182.3684.45","since":"182.3684","until":"201","originalSince":"182.3684","originalUntil":null},{"id":"reasonml","version":"0.58.1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.teamscale.ide.intellij","version":"4.3.4","since":"172.0","until":"","originalSince":"163.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180718.142112","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180719.025648","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"reasonml","version":"0.59","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.1.3","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.539.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.539.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.1.4","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"Git Scope","version":"2.1.1","since":"181.2784","until":"202.*","originalSince":"181.2784","originalUntil":null},{"id":"tv.twelvetone.gradle.plugin.navigation","version":"1.0.43","since":"145.0","until":"192.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180722.185701","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180722.185858","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.548.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.1.5","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.2.9","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.3.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"org.jetbrains.code-golf","version":"0.3","since":"172.1","until":"192.0","originalSince":"172.1","originalUntil":null},{"id":"org.jetbrains.code-golf","version":"0.3.1","since":"172.1","until":"192.0","originalSince":"172.1","originalUntil":null},{"id":"me.chaerim.yapf","version":"0.1","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"Mongo Plugin","version":"0.12.0","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.1.6","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.8.4","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.90","since":"134.1050","until":"200.0","originalSince":"134.1050","originalUntil":null},{"id":"reasonml","version":"0.59.1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"3.0.6","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.8.7","since":"181.0","until":"183.1","originalSince":"181.0","originalUntil":null},{"id":"cn.sourcespro","version":"1.6","since":"145.2070","until":"231.*","originalSince":"145.2070","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.5.9","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"gherkin","version":"182.3933","since":"182.3684","until":"183.*","originalSince":"182.3684","originalUntil":null},{"id":"cucumber-java","version":"182.3933","since":"182.3684","until":"182.*","originalSince":"182.3684","originalUntil":null},{"id":"cucumber-groovy","version":"182.3933","since":"182.3684","until":"201","originalSince":"182.3684","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.137","since":"182.3684.101","until":"213","originalSince":"182.3684.101","originalUntil":null},{"id":"JRebelPlugin","version":"2018.1.5","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"Jetbrains TeamCity Plugin","version":"2018.1.58418","since":"143.2200","until":"171.4249","originalSince":"143.2200","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.567.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"cucumber-java","version":"182.3934","since":"182.3684","until":"182.*","originalSince":"182.3684","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.132","since":"173.3727.127","until":"211","originalSince":"173.3727.127","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.1.7","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.1.0","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"reasonml","version":"0.60","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.567.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.1.7","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"reasonml","version":"0.60.1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"io.ballerina","version":"0.980.1","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.3.0","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.3.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"AureliaStorm","version":"0.7","since":"182.3684","until":"213.0","originalSince":"182.3684","originalUntil":null},{"id":"reasonml","version":"0.60.2","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.16","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.1.8.0","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.1.8","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.1.8.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.teamscale.ide.intellij","version":"4.3.6","since":"172.0","until":"","originalSince":"163.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.2.4 (201807311033)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"com.dubreuia","version":"1.0.0","since":"163.0","until":"223","originalSince":"163.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.8.5","since":"143.0","until":"193","originalSince":"143.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.1.8","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.138","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"io.intino.plugin","version":"3.4.5","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180802.144436","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.139","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.576.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"edu.cmu.cs.alabaster","version":"0.1.1","since":"173.0","until":"192.*","originalSince":"173.0","originalUntil":null},{"id":"com.ysnows.wxapp","version":"1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"1.8.8","since":"181.0","until":"183.1","originalSince":"181.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.4.4","since":"139.1803","until":"211","originalSince":"139.1803","originalUntil":null},{"id":"net.masterthought.dlanguage","version":"1.17.1","since":"181.0","until":"182.*","originalSince":"181.0","originalUntil":"191.*"},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180804.201711","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180804.201902","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"0.2.0","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.140","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.beust.kobalt.intellij","version":"1.133","since":"173.3727.127","until":"211","originalSince":"173.3727.127","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.1.9","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"CUBA","version":"3.4.2.163","since":"163.0","until":"211","originalSince":"163.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.584.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"com.teamscale.ide.intellij","version":"4.4.1","since":"172.0","until":"","originalSince":"163.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.584.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.141","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"AccuRev","version":"2018.2","since":"80.8000","until":"191","originalSince":"80.8000","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"3.1.0","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.2.0","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.3.1","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.2.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.9.12","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"org.elm.klazuka","version":"1.3.0","since":"162.0","until":"182.*","originalSince":"162.0","originalUntil":null},{"id":"com.likfe.ideaplugin.eventbus3","version":"1.2.3","since":"136.0","until":"223.*","originalSince":"136.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.3.2","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"io.ballerina","version":"0.981.0","since":"163.0","until":"172","originalSince":"163.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.23.0","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"CUBA","version":"3.4.3.163","since":"163.0","until":"211","originalSince":"163.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.10.12-beta-1","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.2.2","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.588.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"0.2.1","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"com.likfe.ideaplugin.eventbus3","version":"1.2.4","since":"136.0","until":"223.*","originalSince":"136.0","originalUntil":null},{"id":"Osmorc","version":"1.4.12","since":"182.0","until":"201","originalSince":"182.0","originalUntil":null},{"id":"com.yii2support","version":"0.10.56.13","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"com.yii2support","version":"0.10.56.15","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.142","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.143","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.idescout.sqlite","version":"4.4.1","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.alvincezy.TinyPic2","version":"1.1.0","since":"145.0","until":"183.1","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.2.3","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"org.jetbrains.settingsRepositoryPlus","version":"0.1.0","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.github.ArtsiomCh.JDCleanRead","version":"0.2.0","since":"173.0","until":"191.0","originalSince":"173.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.144","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.2.4","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"JRebelPlugin","version":"2018.1.6","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.squareup.sqldelight","version":"1.0.0-alpha5","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.2.5","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.588.6","since":"181.2218","until":"222","originalSince":"181.2218","originalUntil":null},{"id":"org.elixir_lang","version":"8.0.0","since":"173.4674.33","until":"211.*","originalSince":"173.4674.33","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.1.1","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.1.1","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.601.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"com.vladsch.git-file-case-fixer","version":"1.0.6","since":"163.15529","until":"202.*","originalSince":"163.15529","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.1.2","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.603.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.603.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.10.12","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.11.13-beta-1","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.3.4","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.3.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.weirddev.testme","version":"2.0.0","since":"163.0","until":"231.*","originalSince":"163.0","originalUntil":null},{"id":"cn.sourcespro","version":"1.7","since":"145.2070","until":"231.*","originalSince":"145.2070","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"8.11.13-beta-2","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"space.vistarsvo.embrowser","version":"2.0.0","since":"173.0","until":"181.0","originalSince":"173.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.145","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"cn.sourcespro","version":"1.8","since":"145.2070","until":"231.*","originalSince":"145.2070","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.605.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"ru.adelf.idea.dotenv","version":"0.7","since":"172.0","until":"192.*","originalSince":"172.0","originalUntil":null},{"id":"com.alvincezy.TinyPic2","version":"1.1.1","since":"145.0","until":"183.1","originalSince":"145.0","originalUntil":null},{"id":"com.github.ArtsiomCh.JDCleanRead","version":"0.2.1","since":"173.0","until":"191.0","originalSince":"173.0","originalUntil":null},{"id":"org.elm.klazuka","version":"1.3.1","since":"162.0","until":"182.*","originalSince":"162.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.605.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"Tolltech.Tollrech","version":"2018.1.3.6","since":"181.4952","until":"181.*","originalSince":"181.4952","originalUntil":"182.*"},{"id":"com.yii2support","version":"0.10.56.18","since":"162.0","until":"193.0","originalSince":"162.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.3.5","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.3.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"IdeaVIM","version":"0.49.5","since":"181.0","until":"201","originalSince":"181.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"3.1.1","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.6.0","since":"162.2147483647","until":"182.*","originalSince":"162.*","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.17","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.12","since":"143.2000","until":"192.*","originalSince":"143.2000","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.146","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.21.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"reasonml","version":"0.61","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"0.2.2","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.2.6","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.147","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"Error-prone plugin","version":"182.3911.36","since":"182.3911","until":"183.0","originalSince":"182.3911","originalUntil":null},{"id":"OdpsStudio","version":"3.0.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.alvincezy.TinyPic2","version":"1.1.2","since":"145.0","until":"183.1","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.616.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.13432","since":"162.0","until":"202.*","originalSince":"141.0","originalUntil":null},{"id":"org.elixir_lang","version":"8.1.0","since":"173.4674.33","until":"211.*","originalSince":"173.4674.33","originalUntil":null},{"id":"com.daveme.intellij.chocolateCakePHP","version":"0.3.0","since":"182.4129","until":"182.*","originalSince":"182.4129","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.23.1","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"com.xinv.release.json2go","version":"1.2","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.2.7","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.vladsch.git-file-case-fixer","version":"1.0.8","since":"163.15529","until":"202.*","originalSince":"163.15529","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180902.180425","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.6.4","since":"162.2147483647","until":"182.*","originalSince":"162.*","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"1.1.0","since":"172.0","until":"212.*","originalSince":"172.0","originalUntil":null},{"id":"cn.sourcespro","version":"1.9","since":"145.2070","until":"231.*","originalSince":"145.2070","originalUntil":null},{"id":"com.zhishui.skydragon.snippet","version":"1.0.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.dubreuia","version":"1.1.0","since":"163.0","until":"223","originalSince":"163.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.148","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"io.intino.plugin","version":"3.4.6","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.chronon","version":"182.3684.101","since":"182.3684","until":"182.*","originalSince":"182.3684","originalUntil":null},{"id":"ArchitectureReloaded","version":"0.2","since":"171.0","until":"201","originalSince":"171.0","originalUntil":null},{"id":"org.intellij.featureSuggester","version":"0.2.4","since":"182.3911","until":"193.0","originalSince":"182.3911","originalUntil":null},{"id":"cn.sourcespro","version":"2.0","since":"145.2070","until":"231.*","originalSince":"145.2070","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"1.1.1","since":"172.0","until":"212.*","originalSince":"172.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.1.9","since":"139.1603","until":"183.0","originalSince":"139.1603","originalUntil":null},{"id":"com.atomdu.plugin","version":"1.0.5","since":"171","until":"192.*","originalSince":"105.0","originalUntil":null},{"id":"org.intellij.scala","version":"2018.2.11","since":"182.0","until":"182.0","originalSince":"182.0","originalUntil":"183.0"},{"id":"org.intellij.scala","version":"2018.2.11","since":"182.0","until":"182.0","originalSince":"182.0","originalUntil":"183.0"},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.13433","since":"162.0","until":"202.*","originalSince":"141.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.0.2","since":"181.4203.550","until":"183.1","originalSince":"181.4203.550","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.3.6","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"me.chaerim.yapf","version":"0.2","since":"145.0","until":"201.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"183.2153.10","since":"183.2153","until":"183.*","originalSince":"183.2153","originalUntil":null},{"id":"cucumber-javascript","version":"183.2153.10","since":"183.2153","until":"201","originalSince":"183.2153","originalUntil":null},{"id":"TFS","version":"183.2153.10","since":"183.2153","until":"191.*","originalSince":"183.2153","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"183.2153.10","since":"183.2153","until":"201","originalSince":"183.2153","originalUntil":null},{"id":"XSLT-Debugger","version":"183.2153.10","since":"183.2153","until":"201","originalSince":"183.2153","originalUntil":null},{"id":"reasonml","version":"0.62","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"JRebelPlugin","version":"2018.1.7","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"vette.neos","version":"0.1.27-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.62.1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.alvincezy.TinyPic2","version":"1.1.3","since":"145.0","until":"183.1","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.616.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.622.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180908.025152","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.0.3","since":"181.4203.550","until":"183.1","originalSince":"181.4203.550","originalUntil":null},{"id":"wiki.crowd.cloudutils","version":"1.0.1","since":"141.0","until":"212.*","originalSince":"141.0","originalUntil":null},{"id":"org.elm.klazuka","version":"1.3.2","since":"162.0","until":"183.*","originalSince":"162.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.0.4","since":"181.4203.550","until":"183.1","originalSince":"181.4203.550","originalUntil":null},{"id":"de.dm.intellij.maven-archetypes-catalog-plugin","version":"1.3.0","since":"163.0","until":"213","originalSince":"163.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.7","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.8","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"IdeaVIM","version":"0.49.6","since":"181.0","until":"201","originalSince":"181.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.9","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.0.5","since":"181.4203.550","until":"183.1","originalSince":"181.4203.550","originalUntil":null},{"id":"net.javaru.idea.frc","version":"0.7.1","since":"173.0","until":"191.*","originalSince":"173.0","originalUntil":null},{"id":"intellij.buck.plugin","version":"3.5","since":"172.1294","until":"172.*","originalSince":"172.1294","originalUntil":null},{"id":"com.blueline.idea.plugin.packagejar","version":"1.0","since":"171.0","until":"213.*","originalSince":"171.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.10","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.622.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.11","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.12","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.13","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.github.ArtsiomCh.JDCleanRead","version":"0.2.2","since":"173.0","until":"191.0","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.14","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"wiki.crowd.cloudutils","version":"1.0.3","since":"141.0","until":"212.*","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.15","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.php.dql","version":"183.2407.8","since":"183.2407","until":"201","originalSince":"183.2407","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.16","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"3.1.2","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180912.131215","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.17","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.18","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.19","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.20","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.manzo.android.sluggard.plugin","version":"1.0.1","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.21","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.22","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.23","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.24","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.ntilde.androidinput","version":"1.2","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"cucumber-javascript","version":"183.2407.4","since":"183.2407","until":"201","originalSince":"183.2407","originalUntil":null},{"id":"XSLT-Debugger","version":"183.2407.4","since":"183.2407","until":"201","originalSince":"183.2407","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"183.2407.4","since":"183.2407","until":"201","originalSince":"183.2407","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"183.2407.4","since":"183.2407","until":"183.*","originalSince":"183.2407","originalUntil":null},{"id":"TFS","version":"183.2407.4","since":"183.2407","until":"191.*","originalSince":"183.2407","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.25","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.26","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.dubreuia","version":"1.2.0","since":"163.0","until":"223","originalSince":"163.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.629.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.27","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.deadlock.scsyntax","version":"1.0.6","since":"172.3317","until":"201","originalSince":"172.3317","originalUntil":null},{"id":"org.intellij.RegexpTester","version":"1.0.6","since":"90.1","until":"200.1","originalSince":"90.1","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.0.6","since":"181.4203.550","until":"182.0","originalSince":"181.4203.550","originalUntil":null},{"id":"com.github.alexmojaki.birdseye.pycharm","version":"1.0.1","since":"182.0","until":"193.*","originalSince":"182.0","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.5","since":"180.0","until":"181.0","originalSince":"180.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.0.7","since":"181.4203.550","until":"183.1","originalSince":"181.4203.550","originalUntil":null},{"id":"IdeaVIM","version":"0.49.7","since":"181.0","until":"201","originalSince":"181.0","originalUntil":null},{"id":"org.elixir_lang","version":"9.0.0","since":"173.4674.33","until":"211.*","originalSince":"173.4674.33","originalUntil":null},{"id":"com.manzo.android.sluggard.plugin","version":"1.0.2","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"com.manzo.android.sluggard.plugin","version":"1.0.3","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.3.7","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.4.2","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.28","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.29","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.teamscale.ide.intellij","version":"4.5.1","since":"172.0","until":"182.*","originalSince":"163.0","originalUntil":"182.*"},{"id":"intellij.buck.plugin","version":"3.5.2","since":"172.1294","until":"172.*","originalSince":"172.1294","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.149","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.6.10","since":"162.2147483647","until":"182.*","originalSince":"162.*","originalUntil":null},{"id":"cucumber-javascript","version":"183.2635.17","since":"183.2635","until":"201","originalSince":"183.2635","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"183.2635.17","since":"183.2635","until":"201","originalSince":"183.2635","originalUntil":null},{"id":"TFS","version":"183.2635.17","since":"183.2635","until":"191.*","originalSince":"183.2635","originalUntil":null},{"id":"XSLT-Debugger","version":"183.2635.17","since":"183.2635","until":"201","originalSince":"183.2635","originalUntil":null},{"id":"de.sgalinski.fluid.plugin.demo.id","version":"2.0.0","since":"143.0","until":"231","originalSince":"143.0","originalUntil":null},{"id":"swingexplorer-plugin-v2","version":"182.4505.22-1.6.0","since":"182.4505.22","until":"201.6668","originalSince":"182.4505.22","originalUntil":null},{"id":"reasonml","version":"0.63","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"0.2.3","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.2.8","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.23.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"com.jetbrains.gitalso","version":"0.1.0","since":"183.1182","until":"183.3506","originalSince":"183.1182","originalUntil":null},{"id":"org.elm.klazuka","version":"1.3.3","since":"162.0","until":"183.*","originalSince":"162.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.630.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.24.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.25.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.1.0","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.2.0","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.653.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"org.jetbrains.debugger.streams.kotlin","version":"0.0.3","since":"173.0","until":"191.0","originalSince":"173.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"18.2.181.000.0-Eclipse_4.9.0","since":"181.0","until":"202","originalSince":"181.0","originalUntil":null},{"id":"atg-toolkit","version":"0.6","since":"181.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.6","since":"180.0","until":"181.0","originalSince":"180.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.0.beta-1","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"net.afpro.idea.aophelper","version":"1.0","since":"173.0","until":"212.*","originalSince":"173.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.3.0","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.0","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"name.kropp.intellij.makefile","version":"1.5","since":"181.0","until":"211.5538","originalSince":"181.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.95","since":"134.1050","until":"200.0","originalSince":"134.1050","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.7","since":"180.0","until":"181.0","originalSince":"180.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.3.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"cn.sourcespro","version":"2.1","since":"145.2070","until":"231.*","originalSince":"145.2070","originalUntil":null},{"id":"com.nvinayshetty.DTOnator","version":"V0.997","since":"172.*","until":"","originalSince":"107.118","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20180927.194820","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.690.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.62.2","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.manzo.android.sluggard.plugin","version":"1.0.4","since":"145.0","until":"230","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.gitalso","version":"0.1.01","since":"183.1182","until":"183.3506","originalSince":"183.1182","originalUntil":null},{"id":"com.ludditelabs.autodocintellij.plugin","version":"0.2.0","since":"141.0","until":"145.*","originalSince":"141.0","originalUntil":null},{"id":"net.afpro.idea.aophelper","version":"1.1","since":"173.0","until":"212.*","originalSince":"173.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.951","since":"134.1050","until":"200.0","originalSince":"134.1050","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.3.0","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.3.1","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.4.0","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.5.0","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.8","since":"180.0","until":"181.0","originalSince":"180.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.26.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"0.3.0","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.701.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"io.ballerina","version":"0.982.0","since":"173.0","until":"182","originalSince":"163.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.0-rc-136-IJ2018.3-1","since":"183.1","until":"191.2000","originalSince":"183.1","originalUntil":"191.*"},{"id":"JRebelPlugin","version":"2018.2.0","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"org.jetbrains.plugins.stylus","version":"183.3283.3","since":"183.3283","until":"201","originalSince":"183.3283","originalUntil":null},{"id":"TFS","version":"183.3283.3","since":"183.3283","until":"191.*","originalSince":"183.3283","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"183.3283.3","since":"183.3283","until":"183.*","originalSince":"183.3283","originalUntil":null},{"id":"XSLT-Debugger","version":"183.3283.3","since":"183.3283","until":"201","originalSince":"183.3283","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.30","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.31","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.3.0 (201810020823)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"com.github.bjansen.intellij.pebble","version":"0.4","since":"143.0","until":"212.*","originalSince":"143.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.27.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.3.2","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.32","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.33","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.34","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.0-rc-146-IJ2018.3-1","since":"183.1","until":"191.2000","originalSince":"183.1","originalUntil":"191.*"},{"id":"com.intellij.testGuiFramework","version":"0.9.35","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"wiki.crowd.cloudutils","version":"1.0.4","since":"141.0","until":"212.*","originalSince":"141.0","originalUntil":null},{"id":"SerialPortMonitor","version":"0.5.3","since":"141.245","until":"201","originalSince":"141.245","originalUntil":null},{"id":"IdeaVIM","version":"0.49.8","since":"181.0","until":"201","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181004.185951","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.6.0.183","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.1.1.beta-1","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.727.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.14.3","since":"173.0","until":"221","originalSince":"173.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.15.1","since":"173.0","until":"221","originalSince":"173.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.1.1","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.1.730.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.3.8","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.axellience.vuegwt","version":"0.1.0","since":"162.0","until":"201.0","originalSince":"162.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181005.194457","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.6.1.183","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.9","since":"180.0","until":"181.0","originalSince":"180.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.6.2.183","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":null},{"id":"com.github.alexmojaki.birdseye.pycharm","version":"1.1.0","since":"182.0","until":"193.*","originalSince":"182.0","originalUntil":null},{"id":"lt.martynassateika.idea.codeigniter","version":"0.1.0","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.64","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.6.12","since":"162.2147483647","until":"183.*","originalSince":"162.*","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"5.2","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"git-extended-update-index","version":"0.0.1","since":"181.0","until":"193.2956.37","originalSince":"181.0","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"183.3647.1","since":"183.3647","until":"201","originalSince":"183.3647","originalUntil":null},{"id":"XSLT-Debugger","version":"183.3647.1","since":"183.3647","until":"201","originalSince":"183.3647","originalUntil":null},{"id":"TFS","version":"183.3647.1","since":"183.3647","until":"191.*","originalSince":"183.3647","originalUntil":null},{"id":"ru.fix.completable.reactor.plugin.idea","version":"1.4.4","since":"145.0","until":"202.5958.24","originalSince":"145.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181009.173956","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2018.1.58658","since":"143.2200","until":"171.4249","originalSince":"143.2200","originalUntil":null},{"id":"manifold.ij","version":"0.24-alpha","since":"163.0","until":"181.0","originalSince":"163.0","originalUntil":null},{"id":"lt.martynassateika.idea.codeigniter","version":"0.2.1","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"org.maxal.dialogResizer","version":"1.6","since":"181.0","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.0-rc1","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"0.3.1","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"3.1.3","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"nl.tudelft.watchdog","version":"3.1.0","since":"139.0","until":"200","originalSince":"139.0","originalUntil":null},{"id":"Error-prone plugin","version":"183.3647.12","since":"183.3647","until":"191.0","originalSince":"183.3647","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.3647.12","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.ludditelabs.autodocintellij.plugin","version":"0.2.1-alpha","since":"162.0","until":"222.*","originalSince":"162.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181011.210707","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.2.776.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.2.783.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"2.0.0","since":"181.0","until":"232","originalSince":"181.0","originalUntil":null},{"id":"tirke.cupPlugin","version":"1.2","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"reasonml","version":"0.65","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"color.scheme.GapStyle","version":"2.0","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.talkingdata.my.favorite.code","version":"1.0.2","since":"173.0","until":"193.*","originalSince":"173.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.0-rc2","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.3.3","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.3.9","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.3.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.18","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"183.3795.1","since":"183.3795","until":"201","originalSince":"183.3795","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"183.3795.1","since":"183.3795","until":"201","originalSince":"183.3795","originalUntil":null},{"id":"TFS","version":"183.3795.1","since":"183.3795","until":"191.*","originalSince":"183.3795","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"183.3795.1","since":"183.3795","until":"183.*","originalSince":"183.3795","originalUntil":null},{"id":"XSLT-Debugger","version":"183.3795.1","since":"183.3795","until":"201","originalSince":"183.3795","originalUntil":null},{"id":"gherkin","version":"183.3647.12","since":"183.3647","until":"183.*","originalSince":"183.3647","originalUntil":null},{"id":"cucumber-java","version":"183.3647.12","since":"183.3647","until":"183.*","originalSince":"183.3647","originalUntil":null},{"id":"cucumber-groovy","version":"183.3647.12","since":"183.3647","until":"201","originalSince":"183.3647","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.150","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"nl.tudelft.watchdog","version":"3.2.0","since":"139.0","until":"200","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.php.dql","version":"183.3795.24","since":"183.3795","until":"201","originalSince":"183.3795","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.13439","since":"162.0","until":"202.*","originalSince":"141.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.4.0","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.3795.13","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Error-prone plugin","version":"183.3795.13","since":"183.3795","until":"191.0","originalSince":"183.3795","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181017.183631","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181017.183633","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"manifold.ij","version":"0.25.2-alpha","since":"173.0","until":"181.0","originalSince":"173.0","originalUntil":null},{"id":"com.teamscale.ide.intellij","version":"4.5.9","since":"172.0","until":"182.*","originalSince":"163.0","originalUntil":"182.*"},{"id":"JRebelPlugin","version":"2018.2.1","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"IdeaVIM","version":"0.50","since":"181.0","until":"201","originalSince":"181.0","originalUntil":null},{"id":"IdeaVIM","version":"0.50","since":"181.0","until":"201","originalSince":"181.0","originalUntil":null},{"id":"reasonml","version":"0.65.1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"Code Review","version":"1.4.1","since":"183.3795","until":"222.*","originalSince":"183.3795","originalUntil":null},{"id":"wiki.crowd.cloudutils","version":"1.0.5","since":"141.0","until":"212.*","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.2.817.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"de.sgalinski.typoscript.plugin.id","version":"2.0.0","since":"143.0","until":"231","originalSince":"143.0","originalUntil":null},{"id":"com.github.novotnyr.jwt-intellij-plugin","version":"0.4","since":"143.0","until":"222.*","originalSince":"143.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.1.2","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.23.2","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.4.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.6.3.183","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":null},{"id":"reasonml","version":"0.66","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"reasonml","version":"0.66.1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.yii2support","version":"0.10.56.22","since":"163.0","until":"193.0","originalSince":"163.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"2017.1.6","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"com.jetbrains.gitalso","version":"0.2.0","since":"183.3506","until":"191.4738","originalSince":"183.1182","originalUntil":null},{"id":"Code Review","version":"1.4.2","since":"183.3795","until":"222.*","originalSince":"183.3795","originalUntil":null},{"id":"me.scana.okgradle","version":"0.1.0","since":"143.0","until":"143.*","originalSince":"143.0","originalUntil":null},{"id":"com.teamscale.ide.intellij","version":"4.6.0","since":"172.0","until":"182.*","originalSince":"163.0","originalUntil":"182.*"},{"id":"reasonml","version":"0.66.2","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"OdpsStudio","version":"3.0.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"pw.unbear.ijplug","version":"0.0.1","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.4.2","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.ntilde.androidinput","version":"1.3","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.1.3","since":"173.0","until":"211","originalSince":"173.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"3.1.4","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.3975.18","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.4.3","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.softbank.robot.sdkplugin","version":"1.1.6","since":"162.0","until":"211.*","originalSince":"162.0","originalUntil":null},{"id":"training","version":"0.8.64","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"training","version":"0.8.65","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"pw.unbear.ijplug","version":"0.0.2","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.elixir_lang","version":"10.0.0","since":"173.4674.33","until":"211.*","originalSince":"173.4674.33","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.1.3","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"0.3.3","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"pw.unbear.ijplug","version":"0.0.3","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"reasonml","version":"0.67","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"PojoToJson","version":"1.0.0","since":"145.0","until":"192.0","originalSince":"145.0","originalUntil":null},{"id":"pw.unbear.ijplug","version":"0.0.4","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"4.4.2","since":"181.0","until":"211","originalSince":"181.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.4.0","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"org.elixir_lang","version":"10.0.1","since":"173.4674.33","until":"211.*","originalSince":"173.4674.33","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"0.3.4","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.1.5.183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181030.173511","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181030.181032","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181030.183227","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.jetbrains.php.dql","version":"183.4139.15","since":"183.4139","until":"201","originalSince":"183.4139","originalUntil":null},{"id":"de.dieploegers.develop.idea.shellfilter","version":"2.0.0","since":"172.3317.76","until":"181.5684","originalSince":"172.3317.76","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.1.4","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"Error-prone plugin","version":"183.4139.22","since":"183.4139","until":"191.0","originalSince":"183.4139","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.4139.22","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"TFS","version":"183.4139.22","since":"183.4139","until":"191.*","originalSince":"183.4139","originalUntil":null},{"id":"cucumber-groovy","version":"183.4139.22","since":"183.4139","until":"201","originalSince":"183.4139","originalUntil":null},{"id":"cucumber-java","version":"183.4139.22","since":"183.4139","until":"183.*","originalSince":"183.4139","originalUntil":null},{"id":"gherkin","version":"183.4139.22","since":"183.4139","until":"183.*","originalSince":"183.4139","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.19","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.action-tracker","version":"0.3.1","since":"182.0","until":"201.0","originalSince":"182.0","originalUntil":null},{"id":"pw.unbear.ijplug","version":"0.0.5","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"pw.unbear.ijplug","version":"0.0.6","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"pw.unbear.ijplug","version":"0.0.7","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"pw.unbear.ijplug","version":"0.0.8","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.elm.klazuka","version":"2.0.0","since":"162.0","until":"183.*","originalSince":"162.0","originalUntil":null},{"id":"color.scheme.Defcula","version":"0.1.2","since":"142.0","until":"201.0","originalSince":"142.0","originalUntil":null},{"id":"TFS","version":"183.4139.35","since":"183.4139","until":"191.*","originalSince":"183.4139","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.2.871.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.2.6.183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181102.135155","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.62.5","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181102.205201","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181102.213236","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.2","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"org.elm.klazuka","version":"2.0.1","since":"162.0","until":"183.*","originalSince":"162.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.6.14","since":"162.2147483647","until":"183.*","originalSince":"162.*","originalUntil":null},{"id":"ImportPlugin","version":"0.1.3","since":"162.0","until":"182.1542","originalSince":"162.0","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.10","since":"180.0","until":"181.0","originalSince":"180.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.6.10","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.7.0.183","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.151","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"eu.gillissen.rider.usersecrets","version":"0.2.0","since":"145.0","until":"183.0","originalSince":"145.0","originalUntil":null},{"id":"JRebelPlugin","version":"2018.2.2","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.jetbrains.gitalso","version":"0.3.0","since":"183.3506","until":"191.4738","originalSince":"183.3506","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.4.1","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"xyz.ihac.derrick","version":"0.3.0-beta","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"PojoToJson","version":"1.0.1","since":"145.0","until":"192.0","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.152","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.153","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.2.7.183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.4.4","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"cn.sourcespro","version":"2.2","since":"145.2070","until":"231.*","originalSince":"145.2070","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181108.131500","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.vladsch.clionarduinoplugin","version":"1.3.4","since":"181.0","until":"191.*","originalSince":"181.0","originalUntil":null},{"id":"org.elm.klazuka","version":"2.0.2","since":"162.0","until":"183.*","originalSince":"162.0","originalUntil":null},{"id":"de.dieploegers.develop.idea.shellfilter","version":"2.1.0","since":"172.3317.76","until":"181.5684","originalSince":"172.3317.76","originalUntil":null},{"id":"org.elixir_lang","version":"10.1.0","since":"173.4674.33","until":"211.*","originalSince":"173.4674.33","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.11","since":"180.0","until":"181.0","originalSince":"180.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.2.871.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"synergix.plugin.intellj","version":"1.0","since":"173.0","until":"192.0","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.4284.36","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"cucumber-java","version":"183.4284.36","since":"183.4284","until":"183.*","originalSince":"183.4284","originalUntil":null},{"id":"com.jetbrains.php.dql","version":"183.4284.56","since":"183.4284","until":"201","originalSince":"183.4284","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.28.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"com.wuhao.code.check","version":"1.4.5","since":"145.0","until":"211","originalSince":"145.0","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.13447","since":"162.0","until":"202.*","originalSince":"141.0","originalUntil":null},{"id":"fr.alban.petiot","version":"1.1","since":"173.0","until":"181.*","originalSince":"173.0","originalUntil":null},{"id":"com.vladsch.clionarduinoplugin","version":"1.3.6","since":"181.0","until":"191.*","originalSince":"181.0","originalUntil":null},{"id":"fr.alban.petiot","version":"1.2","since":"182","until":"182.*","originalSince":"173.0","originalUntil":null},{"id":"reasonml","version":"0.67.1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.4.5","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.github.ArtsiomCh.JDCleanRead","version":"0.3.0","since":"183.0","until":"191.0","originalSince":"183.0","originalUntil":null},{"id":"io.ballerina","version":"0.983.0","since":"173.0","until":"182","originalSince":"163.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.154","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.4284.42","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.4.6","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.62.6","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"Osmorc","version":"183.4284.36","since":"183.4284","until":"201","originalSince":"183.4284","originalUntil":null},{"id":"TFS","version":"183.4284.36","since":"183.4284","until":"191.*","originalSince":"183.4284","originalUntil":null},{"id":"Osmorc","version":"183.4284.42","since":"183.4284","until":"201","originalSince":"183.4284","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181112.205724","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.4.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.4.7","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"1.980","since":"134.1050","until":"200.0","originalSince":"134.1050","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181114.114331","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.jetbrains.plugins.iasemenov.idea-git-extensions","version":"1.1","since":"191.1508","until":"191.7961","originalSince":"191.1508","originalUntil":"192.*"},{"id":"com.jetbrains.php.dql","version":"183.4284.100","since":"183.4284","until":"201","originalSince":"183.4284","originalUntil":null},{"id":"com.vladsch.clionarduinoplugin","version":"1.3.8","since":"181.0","until":"191.*","originalSince":"181.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.20","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.67.2","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.155","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"nl.rubensten.texifyidea","version":"0.6.2","since":"182.3684","until":"","originalSince":"141.*","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"183.4284.122","since":"183.4284","until":"201","originalSince":"183.4284","originalUntil":null},{"id":"PojoToJson","version":"1.0.2","since":"145.0","until":"192.0","originalSince":"145.0","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.14249","since":"162.0","until":"202.*","originalSince":"141.0","originalUntil":null},{"id":"net.lagerwey.cucumber-kotlin","version":"1.0.2","since":"162.0","until":"182.711","originalSince":"162.0","originalUntil":null},{"id":"com.vladsch.clionarduinoplugin","version":"1.3.12","since":"181.0","until":"191.*","originalSince":"181.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.0","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.ecarx.plugin.findview","version":"1.0","since":"135.1356","until":"","originalSince":"103.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.3.1 (201811191235)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"1.0.0","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"org.elm.klazuka","version":"2.0.3","since":"162.0","until":"183.*","originalSince":"162.0","originalUntil":null},{"id":"com.ecarx.plugin.findview","version":"1.1","since":"135.1356","until":"","originalSince":"103.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181120.140158","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181120.151500","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.teamscale.ide.intellij","version":"4.6.3","since":"172.0","until":"182.*","originalSince":"163.0","originalUntil":"182.*"},{"id":"com.github.ArtsiomCh.JDCleanRead","version":"0.3.1","since":"181.0","until":"191.0","originalSince":"181.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.4284.148","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.4284.148","since":"183.4284","until":"201","originalSince":"183.4284","originalUntil":null},{"id":"gherkin","version":"183.4284.148","since":"183.4284","until":"183.*","originalSince":"183.4284","originalUntil":null},{"id":"cucumber-java","version":"183.4284.148","since":"183.4284","until":"183.*","originalSince":"183.4284","originalUntil":null},{"id":"cucumber-groovy","version":"183.4284.148","since":"183.4284","until":"201","originalSince":"183.4284","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.4.2","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.4.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"synergix.plugin.intellj","version":"1.1","since":"120.0","until":"192.0","originalSince":"120.0","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.14256","since":"162.0","until":"202.*","originalSince":"141.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.21","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"eu.gillissen.rider.usersecrets","version":"0.2.1","since":"145.0","until":"183.0","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.largeFilesEditor","version":"1.0","since":"181.0","until":"181.0","originalSince":"181.0","originalUntil":null},{"id":"nl.rubensten.texifyidea","version":"0.6.3","since":"182.3684","until":"","originalSince":"141.*","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.4588.3","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.4588.3","since":"183.4588","until":"201","originalSince":"183.4588","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.2.984.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.3.8.183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.0-rc3","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"2.0.6","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"com.vladsch.clionarduinoplugin","version":"1.4.0","since":"181.0","until":"191.*","originalSince":"181.0","originalUntil":null},{"id":"OdpsStudio","version":"3.0.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"org.jf.fusionIdea","version":"0.5.2","since":"182.4892","until":"203","originalSince":"182.4892","originalUntil":null},{"id":"com.gradoservice.plugin.forge","version":"1.4","since":"141.177","until":"201.*","originalSince":"141.177","originalUntil":null},{"id":"com.longforus.mvpautocodeplus","version":"1.2","since":"171.0","until":"213","originalSince":"171.0","originalUntil":null},{"id":"reasonml","version":"0.68","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.teamscale.ide.intellij","version":"4.6.4","since":"172.0","until":"183.*","originalSince":"163.0","originalUntil":"183.*"},{"id":"com.codota.csp.intellij","version":"2.5.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.0-rc4","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"ca.rightsomegoodgames.mayacharm","version":"3.0.0","since":"183.0","until":"193.0","originalSince":"183.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.156","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"org.jf.fusionIdea","version":"0.5.3","since":"182.4892","until":"203","originalSince":"182.4892","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.4588.19","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.4588.19","since":"183.4588","until":"201","originalSince":"183.4588","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.5.2","since":"183.0","until":"201","originalSince":"183.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.4588.27","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.4588.27","since":"183.4588","until":"201","originalSince":"183.4588","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.29.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"4.0.0.final","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.158","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.2","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"JRebelPlugin","version":"2018.2.3","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.3.9.183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.4-20181130.021008","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.2.984.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"PerforceIC","version":"0.10.0","since":"171.0","until":"181.0","originalSince":"171.0","originalUntil":null},{"id":"org.elm.klazuka","version":"2.1.0","since":"162.0","until":"183.*","originalSince":"162.0","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.12","since":"183.0","until":"183.0","originalSince":"183.0","originalUntil":null},{"id":"com.arangodb.intellij.aql","version":"1.0.0","since":"172.0","until":"184.0","originalSince":"163.0","originalUntil":"184.0"},{"id":"com.vladsch.clionarduinoplugin","version":"1.4.2","since":"181.0","until":"191.*","originalSince":"181.0","originalUntil":null},{"id":"org.intellij.scala","version":"2018.3.522","since":"191.0","until":"191.0","originalSince":"191.0","originalUntil":"192.0"},{"id":"org.jf.fusionIdea","version":"0.5.4","since":"182.4892","until":"203","originalSince":"182.4892","originalUntil":null},{"id":"com.arangodb.intellij.aql","version":"1.0.1","since":"172.0","until":"184.0","originalSince":"163.0","originalUntil":"184.0"},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.14272","since":"162.0","until":"202.*","originalSince":"141.0","originalUntil":null},{"id":"com.aemtools","version":"0.9.0.1","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"com.viartemev.requestmapper","version":"0.15","since":"141.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.3","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.4.3","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.4.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.teamscale.ide.intellij","version":"4.6.5","since":"172.0","until":"183.*","originalSince":"163.0","originalUntil":"183.*"},{"id":"com.intellij.testGuiFramework","version":"183.4588.61","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.4588.61","since":"183.4588","until":"201","originalSince":"183.4588","originalUntil":null},{"id":"com.teamscale.ide.intellij","version":"4.7.0","since":"172.0","until":"183.*","originalSince":"163.0","originalUntil":"183.*"},{"id":"com.illuminatedcloud2.intellij","version":"2.0.4.4","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.4.3-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"2.0.7","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.0 (201812051159)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"com.github.alexandrelombard.org.eclipse.xtext.idea","version":"2.15.0","since":"145.0","until":"183.*","originalSince":"145.0","originalUntil":null},{"id":"com.github.alexandrelombard.org.eclipse.xtext.idea","version":"2.15.0","since":"145.0","until":"183.*","originalSince":"145.0","originalUntil":null},{"id":"com.github.alexandrelombard.org.eclipse.xtext.idea","version":"2.15.0-1","since":"145.0","until":"183.*","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.largeFilesEditor","version":"1.0.1","since":"181.0","until":"181.0","originalSince":"181.0","originalUntil":null},{"id":"com.github.alexandrelombard.org.eclipse.xtext.idea","version":"2.15.0-2","since":"145.0","until":"183.*","originalSince":"145.0","originalUntil":null},{"id":"com.github.alexandrelombard.org.eclipse.xtext.idea","version":"2.15.0-3","since":"145.0","until":"183.*","originalSince":"145.0","originalUntil":null},{"id":"com.github.alexandrelombard.org.eclipse.xtext.idea","version":"2.15.0-4","since":"145.0","until":"183.*","originalSince":"145.0","originalUntil":null},{"id":"com.github.alexandrelombard.org.eclipse.xtext.idea","version":"2.15.0-5","since":"145.0","until":"183.*","originalSince":"145.0","originalUntil":null},{"id":"com.mallowigi","version":"8.0","since":"182.0","until":"183.*","originalSince":"145.0","originalUntil":"183.*"},{"id":"com.github.alexandrelombard.org.eclipse.xtext.idea","version":"2.15.0-6","since":"145.0","until":"183.*","originalSince":"145.0","originalUntil":null},{"id":"com.github.alexandrelombard.org.eclipse.xtext.idea","version":"2.15.0-7","since":"145.0","until":"183.*","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.4886.3","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.4886.3","since":"183.4886","until":"201","originalSince":"183.4886","originalUntil":null},{"id":"com.intellij.plugin.adernov.powershell","version":"2.0.0","since":"183.0","until":"191.*","originalSince":"183.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"1.0.1","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.5.4","since":"183.0","until":"201","originalSince":"183.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.4","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.tp.xml","version":"9.0","since":"173.0","until":"191.*","originalSince":"173.0","originalUntil":null},{"id":"cn.bestwu.gdph","version":"0.1.4","since":"145.258","until":"191.5000","originalSince":"145.258","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.5.5","since":"183.0","until":"201","originalSince":"183.0","originalUntil":null},{"id":"io.ballerina","version":"0.990.0","since":"173.0","until":"182","originalSince":"163.0","originalUntil":null},{"id":"com.protobuf.free.gen.plugin.GenProtobuf","version":"1.0","since":"173.0","until":"222.2270.31","originalSince":"173.0","originalUntil":null},{"id":"com.protobuf.free.gen.plugin.GenProtobuf","version":"1.1","since":"173.0","until":"222.2270.31","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.4886.12","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.php.dql","version":"183.4886.12","since":"183.4886","until":"201","originalSince":"183.4886","originalUntil":null},{"id":"Osmorc","version":"183.4886.12","since":"183.4886","until":"201","originalSince":"183.4886","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.5","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.teamscale.ide.intellij","version":"4.6.6","since":"172.0","until":"183.*","originalSince":"163.0","originalUntil":"183.*"},{"id":"com.teamscale.ide.intellij","version":"4.7.1","since":"172.0","until":"183.*","originalSince":"163.0","originalUntil":"183.*"},{"id":"com.jetbrains.php.dql","version":"183.4886.22","since":"183.4886","until":"201","originalSince":"183.4886","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2018.2.60977","since":"143.2200","until":"171.4249","originalSince":"143.2200","originalUntil":null},{"id":"com.protobuf.free.gen.plugin.GenProtobuf","version":"1.2","since":"173.0","until":"222.2270.31","originalSince":"173.0","originalUntil":null},{"id":"com.compilerexplorer.compilerexplorer","version":"1.13","since":"183.0","until":"183.0","originalSince":"183.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"2.0","since":"134.1050","until":"200.0","originalSince":"134.1050","originalUntil":null},{"id":"com.protobuf.free.gen.plugin.GenProtobuf","version":"1.3","since":"173.0","until":"222.2270.31","originalSince":"173.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.63.1","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.6","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.contrastsecurity.contrast-intellij-plugin","version":"2.4.0-beta","since":"181.0","until":"181.0","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.4.5","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.4.6","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"6.0","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.24.0","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"3.0.3","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.30.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"6.1","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.69","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.4.7","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.7","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"color.scheme.GapStyle","version":"2.1","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.recognized.screencast.recorder","version":"0.9","since":"182.0","until":"201.*","originalSince":"182.0","originalUntil":null},{"id":"com.github.recognized.screencast.recorder","version":"0.91","since":"182.0","until":"201.*","originalSince":"182.0","originalUntil":null},{"id":"com.github.recognized.screencast.recorder","version":"0.92","since":"182.0","until":"201.*","originalSince":"182.0","originalUntil":null},{"id":"com.github.recognized.screencast.recorder","version":"0.93","since":"182.0","until":"201.*","originalSince":"182.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.4.8","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.github.recognized.screencast.recorder","version":"0.94","since":"182.0","until":"201.*","originalSince":"182.0","originalUntil":null},{"id":"com.github.recognized.screencast.editor","version":"1.0","since":"182.0","until":"211.*","originalSince":"182.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.159","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"reasonml","version":"0.69.1","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.31.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"2017.1.7","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"vette.neos","version":"0.1.28-SNAPSHOT","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"net.afpro.idea.aophelper","version":"1.2","since":"173.0","until":"212.*","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.4886.37","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.4886.37","since":"183.4886","until":"201","originalSince":"183.4886","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"2.0.8","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"ru.andrey.search-plugin","version":"1.0.1","since":"171.0","until":"","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.php.dql","version":"183.4886.46","since":"183.4886","until":"201","originalSince":"183.4886","originalUntil":null},{"id":"cucumber-javascript","version":"183.5153.1","since":"183.5153","until":"201","originalSince":"183.5153","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.5153.1","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.php.dql","version":"183.5153.1","since":"183.5153","until":"201","originalSince":"183.5153","originalUntil":null},{"id":"Osmorc","version":"183.5153.1","since":"183.5153","until":"201","originalSince":"183.5153","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.4.10","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"JRebelPlugin","version":"2018.2.4","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.github.recognized.screencast.recorder","version":"0.95","since":"182.0","until":"201.*","originalSince":"182.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"4.1.0","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"org.elm.klazuka","version":"2.1.1","since":"162.0","until":"183.*","originalSince":"162.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.5153.4","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.5153.4","since":"183.5153","until":"201","originalSince":"183.5153","originalUntil":null},{"id":"cn.sourcespro","version":"2.3","since":"145.2070","until":"231.*","originalSince":"145.2070","originalUntil":null},{"id":"ru.andrey.search-plugin","version":"1.1.0","since":"171.0","until":"","originalSince":"141.0","originalUntil":null},{"id":"com.vladsch.clionarduinoplugin","version":"1.4.4","since":"181.0","until":"191.*","originalSince":"181.0","originalUntil":null},{"id":"com.vladsch.git-file-case-fixer","version":"1.0.12","since":"163.15529","until":"202.*","originalSince":"163.15529","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.6.18","since":"162.2147483647","until":"183.*","originalSince":"162.*","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.5","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.elixir_lang","version":"10.2.0","since":"173.4674.33","until":"211.*","originalSince":"173.4674.33","originalUntil":null},{"id":"io.ballerina","version":"0.990.1","since":"173.0","until":"182","originalSince":"163.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"1.1.0","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"1.1.1","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.36","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.6-20181226.211027","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.37","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.5153.8","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.5153.8","since":"183.5153","until":"201","originalSince":"183.5153","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.8","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.1 (201812211023)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.9","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2018.12.27.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2018.12.27.002","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.2.1145.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"1.1","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"OdpsStudio","version":"3.0.4","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.9.2","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.0-rc5","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.10","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2018.12.31.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.10.3","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.10.4","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.10.5","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"IdeaVIM","version":"0.50.1","since":"181.0","until":"201","originalSince":"181.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.9","since":"172.0","until":"193","originalSince":"172.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.4.4-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.4.9","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"org.jetbrains.execsound","version":"1.0","since":"172.0","until":"","originalSince":"94.539","originalUntil":null},{"id":"org.jetbrains.execsound","version":"1.1","since":"172.0","until":"","originalSince":"94.539","originalUntil":null},{"id":"org.jetbrains.execsound","version":"1.2","since":"172.0","until":"","originalSince":"111.69","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.8.0.183","since":"183.0","until":"191.4000","originalSince":"183.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.9.1","since":"172.0","until":"193","originalSince":"172.0","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.14293","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"net.masterthought.dlanguage","version":"1.18","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":"191.*"},{"id":"com.squareup.sqldelight","version":"1.0.0-rc6","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.01.04.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.8.1.183","since":"183.0","until":"191.4000","originalSince":"183.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.5.0","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.4.5-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"name.kropp.intellij.makefile","version":"1.6","since":"183.0","until":"211.5538","originalSince":"183.0","originalUntil":null},{"id":"AureliaStorm","version":"0.8","since":"182.3684","until":"213.0","originalSince":"182.3684","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.22","since":"145.0","until":"201","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.execsound","version":"1.4","since":"172.0","until":"","originalSince":"111.69","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.6-20190107.022851","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.elm.klazuka","version":"2.2.0","since":"162.0","until":"190.*","originalSince":"162.0","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"1.2","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"com.synopsys.sig.desktop.idea","version":"2018.12.0-SNAPSHOT-ipj-release-2018.12.0-push-857.19","since":"172.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.0-rc7","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.5.10.6","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.6.0","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.0","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"lt.martynassateika.idea.codeigniter","version":"0.3.0","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.6.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.13","since":"143.2000","until":"192.*","originalSince":"143.2000","originalUntil":null},{"id":"com.jetbrains.php.dql","version":"183.5153.36","since":"183.5153","until":"201","originalSince":"183.5153","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.14321","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.5.1","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.4.6-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.luojilab.dedao.DDProjectWatcher","version":"1.0","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.01.10.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"6.2","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"3.0.5","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.5153.38","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.5153.38","since":"183.5153","until":"201","originalSince":"183.5153","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.160","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"intellij-scheme","version":"0.1.3","since":"103.72","until":"193.0","originalSince":"103.72","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.2.1145.7","since":"182.3684.101","until":"222","originalSince":"182.3684.101","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.5429.1","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.php.dql","version":"183.5429.1","since":"183.5429","until":"201","originalSince":"183.5429","originalUntil":null},{"id":"cucumber-javascript","version":"183.5429.1","since":"183.5429","until":"201","originalSince":"183.5429","originalUntil":null},{"id":"cucumber-java","version":"183.5429.1","since":"183.5429","until":"183.*","originalSince":"183.5429","originalUntil":null},{"id":"Osmorc","version":"183.5429.1","since":"183.5429","until":"201","originalSince":"183.5429","originalUntil":null},{"id":"gherkin","version":"183.5429.1","since":"183.5429","until":"183.*","originalSince":"183.5429","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.5.11","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"com.github.gtache.lsp","version":"1.5.0","since":"173.0","until":"203.*","originalSince":"173.0","originalUntil":null},{"id":"org.elm.klazuka","version":"2.2.1","since":"162.0","until":"190.*","originalSince":"162.0","originalUntil":null},{"id":"ca.rightsomegoodgames.mayacharm","version":"3.0.1","since":"183.0","until":"193.0","originalSince":"183.0","originalUntil":null},{"id":"synergix.plugin.intellj","version":"1.2","since":"182.0","until":"192.0","originalSince":"120.0","originalUntil":null},{"id":"XSLT-Debugger","version":"183.5429.2","since":"183.5429","until":"201","originalSince":"183.5429","originalUntil":null},{"id":"XSLT-Debugger","version":"183.5153.33","since":"183.5153","until":"201","originalSince":"183.5153","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.01.14.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.01.15.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"6.3","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"1.3","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"4.1.1","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"python-flake8","version":"0.1.0","since":"183.0","until":"193.*","originalSince":"183.0","originalUntil":null},{"id":"python-flake8","version":"0.1.1","since":"183.0","until":"193.*","originalSince":"183.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.01.17.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.magicbytes.blaze","version":"0.1","since":"163.0","until":"193.*","originalSince":"163.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.32.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"com.intellij.plugin.adernov.powershell","version":"2.0.1","since":"183.0","until":"191.*","originalSince":"183.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.01.18.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.01.18.002","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"ch.ricardo.plugins.intellij.mockery","version":"1.1.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"reasonml","version":"0.70","since":"143.0","until":"171.*","originalSince":"143.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.01.19.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.dubreuia","version":"1.3.0","since":"163.0","until":"223","originalSince":"163.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.01.21.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.2.1164.8","since":"183.4284.148","until":"222","originalSince":"183.4284.148","originalUntil":null},{"id":"com.sgaop.codegenerat.nutzfw","version":"1.0.3","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"com.sgaop.codegenerat.nutzfw","version":"1.0.5","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"com.magicbytes.blaze","version":"0.1.1","since":"163.0","until":"193.*","originalSince":"163.0","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"1.4","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.1","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"cn.sourcespro","version":"2.4","since":"145.2070","until":"231.*","originalSince":"145.2070","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"1.2.0","since":"172.0","until":"212.*","originalSince":"172.0","originalUntil":null},{"id":"com.github.nokia.pyvenv","version":"1.1","since":"145.0","until":"203","originalSince":"145.0","originalUntil":null},{"id":"cucumber-javascript","version":"183.5429.20","since":"183.5429","until":"201","originalSince":"183.5429","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.5429.20","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.5429.20","since":"183.5429","until":"201","originalSince":"183.5429","originalUntil":null},{"id":"com.idescout.sqlite","version":"5.0.0","since":"182.0","until":"211","originalSince":"182.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.5.2","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.5429.25","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.5429.25","since":"183.5429","until":"201","originalSince":"183.5429","originalUntil":null},{"id":"reasonml","version":"0.71","since":"172.0","until":"180.*","originalSince":"172.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.6.1.4","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.6.1.5","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.jetbrains.php.dql","version":"191.4212.35","since":"191.4212","until":"201","originalSince":"191.4212","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.6.2","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.jetbrains.chronon","version":"191.4212.41","since":"191.4212","until":"193.0","originalSince":"191.4212","originalUntil":null},{"id":"cucumber-javascript","version":"191.4212.41","since":"191.4212","until":"201","originalSince":"191.4212","originalUntil":null},{"id":"Error-prone plugin","version":"191.4212.41","since":"191.4212","until":"192.0","originalSince":"191.4212","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"191.4212.41","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.plugins.webcomponents","version":"191.4212.41","since":"191.4212","until":"191.*","originalSince":"191.4212","originalUntil":null},{"id":"cucumber-groovy","version":"191.4212.41","since":"191.4212","until":"201","originalSince":"191.4212","originalUntil":null},{"id":"cucumber-java","version":"191.4212.41","since":"191.4212","until":"191.*","originalSince":"191.4212","originalUntil":null},{"id":"Docker","version":"191.4212.41","since":"191.4212","until":"191.4212","originalSince":"191.4212","originalUntil":"191.*"},{"id":"gherkin","version":"191.4212.41","since":"191.4212","until":"191.*","originalSince":"191.4212","originalUntil":null},{"id":"Osmorc","version":"191.4212.41","since":"191.4212","until":"201","originalSince":"191.4212","originalUntil":null},{"id":"TFS","version":"191.4212.41","since":"191.4212","until":"191.*","originalSince":"191.4212","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.01.21.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"org.coffeescript","version":"191.4212.44","since":"80.9000","until":"201","originalSince":"80.9000","originalUntil":null},{"id":"XSLT-Debugger","version":"191.4212.27","since":"191.4212","until":"201","originalSince":"191.4212","originalUntil":null},{"id":"org.jetbrains.plugins.stylus","version":"191.4212.27","since":"191.4212","until":"201","originalSince":"191.4212","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.2 (201901240710)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"1.1.2","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"1.2.1","since":"172.0","until":"212.*","originalSince":"172.0","originalUntil":null},{"id":"net.berla.intellij.bookmarkactions","version":"1.0","since":"173.0","until":"213","originalSince":"173.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.3","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.7.3","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.2","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2018.2.1164.8","since":"183.4284.148","until":"222","originalSince":"183.4284.148","originalUntil":null},{"id":"com.luojilab.dedao.DDProjectWatcher","version":"1.1","since":"141.0","until":"201.0","originalSince":"141.0","originalUntil":null},{"id":"CUBA","version":"7.1-183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"com.magicbytes.blaze","version":"0.2.0","since":"163.0","until":"193.*","originalSince":"163.0","originalUntil":null},{"id":"JRebelPlugin","version":"2018.2.5","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"IdeaVIM","version":"0.50.2","since":"183.2940.10","until":"201","originalSince":"183.2940.10","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.6-20190129.024149","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.7","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.8-20190129.024356","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.suiyiwen.plugin.idea.apidoc","version":"1.3","since":"162.0","until":"191.*","originalSince":"162.0","originalUntil":null},{"id":"com.likfe.ideaplugin.eventbus3","version":"1.2.5","since":"136.0","until":"223.*","originalSince":"136.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.5429.30","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.5429.30","since":"183.5429","until":"201","originalSince":"183.5429","originalUntil":null},{"id":"com.dubreuia","version":"1.4.0","since":"163.0","until":"223","originalSince":"163.0","originalUntil":null},{"id":"io.ballerina","version":"0.990.3-RC1","since":"173.0","until":"182","originalSince":"163.0","originalUntil":null},{"id":"xyz.elmot.clion.armsupport.prj","version":"1.3.alpha1","since":"191.4212","until":"191.5700","originalSince":"191.4212","originalUntil":"191.*"},{"id":"com.shanbay.plugins.dsl.listener.builder","version":"1.0.0","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"1.2.5","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"JFormDesigner","version":"6.0.6","since":"123.72","until":"183.*","originalSince":"123.72","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.01.30.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"org.elm.klazuka","version":"2.2.2","since":"162.0","until":"190.*","originalSince":"162.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.01.30.002","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"PojoToJson","version":"1.0.3","since":"145.0","until":"192.0","originalSince":"145.0","originalUntil":null},{"id":"net.berla.intellij.bookmarkactions","version":"1.1","since":"173.0","until":"213.0","originalSince":"173.0","originalUntil":null},{"id":"Pythonid","version":"2019.1.191.4738.6","since":"191.4738","until":"191.4738","originalSince":"191.4738","originalUntil":"191.*"},{"id":"Docker","version":"191.4738.6","since":"191.4738","until":"191.4738","originalSince":"191.4738","originalUntil":"191.*"},{"id":"io.intino.plugin","version":"3.6.0","since":"182.0","until":"232.*","originalSince":"182.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.0.3","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.14354","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"4.2.0","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"com.danizz.TranslatorPlugin","version":"1.0.1","since":"171.0","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.6.3","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"io.intino.plugin","version":"3.6.1","since":"182.0","until":"232.*","originalSince":"182.0","originalUntil":null},{"id":"reasonml","version":"0.72","since":"172.0","until":"180.*","originalSince":"172.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.02.05.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.161","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.5.3","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.14364","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.02.05.002","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.02.05.003","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.5.4","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.02.05.004","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.helloyuyu.plugin.arouternavigatefunctiongenerator","version":"1.0.1","since":"173.0","until":"192.*","originalSince":"173.0","originalUntil":null},{"id":"org.elm.klazuka","version":"2.2.3","since":"162.0","until":"190.*","originalSince":"162.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.21-release-IJ2019.1-1","since":"191.2767","until":"191.2767","originalSince":"191.2767","originalUntil":"192.*"},{"id":"com.sencha.idea.IdeaPlugin","version":"6.0.12.563","since":"145.0","until":"213","originalSince":"145.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"2.10","since":"134.1050","until":"200.0","originalSince":"134.1050","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.02.07.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"1.5","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"com.dell.easydebug","version":"1.0","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"CUBA","version":"7.2-183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"com.danizz.TranslatorPlugin","version":"1.1.0","since":"171.0","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"1.6","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1182.8","since":"183.4284.148","until":"222","originalSince":"183.4284.148","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.33.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.34.0","since":"181.4203.1","until":"223.*","originalSince":"181.4203.1","originalUntil":null},{"id":"com.jetbrains.php.dql","version":"183.5429.47","since":"183.5429","until":"201","originalSince":"183.5429","originalUntil":null},{"id":"fortify.fod","version":"19.1.1040","since":"162.0","until":"213.*","originalSince":"162.0","originalUntil":null},{"id":"com.adacore.Ada-IntelliJ","version":"0.6-dev","since":"182.0","until":"193.*","originalSince":"182.0","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"1.7","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.26","since":"181.0","until":"193.*","originalSince":"181.0","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"1.8","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"com.dell.easydebug","version":"1.1","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.jfrog.conan.clion","version":"1.0.0","since":"180.0","until":"222","originalSince":"180.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.3.1","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"fistache.framework.id","version":"1.1.3","since":"183.4284.148","until":"202.5428.22","originalSince":"183.4284.148","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.5.5","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.4.7-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.6.4","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"IdeaVIM","version":"0.51","since":"183.2940.10","until":"201","originalSince":"183.2940.10","originalUntil":null},{"id":"IdeaVIM","version":"0.51","since":"183.2940.10","until":"201","originalSince":"183.2940.10","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"1.2.2","since":"172.0","until":"212.*","originalSince":"172.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.6.5","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.danizz.TranslatorPlugin","version":"1.1.1","since":"171.0","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"5.1.0","since":"182.0","until":"211","originalSince":"182.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.5912.2","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.5912.2","since":"183.5912","until":"201","originalSince":"183.5912","originalUntil":null},{"id":"Code Review","version":"1.4.3","since":"183.3795","until":"222.*","originalSince":"183.3795","originalUntil":null},{"id":"org.elm.klazuka","version":"2.2.4","since":"162.0","until":"190.*","originalSince":"162.0","originalUntil":null},{"id":"JRebelPlugin","version":"2018.2.6","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.yii2support","version":"0.10.57.23","since":"163.0","until":"193.0","originalSince":"163.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1182.8","since":"183.4284.148","until":"222","originalSince":"183.4284.148","originalUntil":null},{"id":"com.github.gtache.lsp","version":"1.5.1","since":"173.0","until":"203.*","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1194.8","since":"183.4284.148","until":"222","originalSince":"183.4284.148","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.5.6","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"io.ballerina","version":"0.990.3","since":"173.0","until":"182","originalSince":"163.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.6.6","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"de.achimonline.kickassembler-acbg","version":"1.0","since":"182.4892","until":"182.*","originalSince":"162.0","originalUntil":null},{"id":"de.achimonline.kickassembler-acbg","version":"1.0.1","since":"182.4892","until":"182.*","originalSince":"162.0","originalUntil":null},{"id":"com.softbank.robot.sdkplugin","version":"1.2.1","since":"162.0","until":"211.*","originalSince":"162.0","originalUntil":null},{"id":"org.jf.fusionIdea","version":"0.5.5","since":"182.4892","until":"203","originalSince":"182.4892","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.30-dev-1827-IJ2019.1-1","since":"191.5109.14","until":"191.5109.14","originalSince":"191.5109.14","originalUntil":"192.*"},{"id":"com.intellij.testGuiFramework","version":"183.5912.10","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.5912.10","since":"183.5912","until":"201","originalSince":"183.5912","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"4.2.1","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"com.github.gtache.lsp","version":"1.5.2","since":"173.0","until":"203.*","originalSince":"173.0","originalUntil":null},{"id":"intellij-scheme","version":"0.1.4","since":"103.72","until":"193.0","originalSince":"103.72","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.02.19.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.3.2","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.8-20190220.025349","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.6.7","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"OdpsStudio","version":"3.1.0","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.38","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.39","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.8-20190220.185338","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.ppolivka.gitlabprojects","version":"2.0.1","since":"181.0","until":"232","originalSince":"181.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"9.6.12","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"1.1.3","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"com.danizz.TranslatorPlugin","version":"2.0.0","since":"172.4574","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.14385","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.9","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.10-20190221.212449","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1194.8","since":"183.4284.148","until":"222","originalSince":"183.4284.148","originalUntil":null},{"id":"com.longforus.mvpautocodeplus","version":"1.3","since":"173.0","until":"213","originalSince":"173.0","originalUntil":null},{"id":"com.bettercloud.intellij.plugin.kafkatool","version":"1.0.0","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"CUBA","version":"7.4-183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"1.9","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.0.0-rc.1","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.6.8","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.02.25.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"1.2.6","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"com.suiyiwen.plugin.idea.apidoc","version":"1.4","since":"162.0","until":"191.*","originalSince":"162.0","originalUntil":null},{"id":"com.dell.easydebug","version":"1.2","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.largeFilesEditor","version":"1.1","since":"183.0","until":"183.0","originalSince":"183.0","originalUntil":null},{"id":"org.elm.klazuka","version":"3.0.0","since":"182.0","until":"190.*","originalSince":"162.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.5912.17","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.5912.17","since":"183.5912","until":"201","originalSince":"183.5912","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.6.9","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.0.0-rc.2","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.5912.21","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.5912.21","since":"183.5912","until":"201","originalSince":"183.5912","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.10-20190226.233033","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.1.0","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.162","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"CUBA","version":"8.1-183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.30-eap-11-IJ2019.1-1","since":"191.5109.14","until":"191.5109.14","originalSince":"191.5109.14","originalUntil":"192.*"},{"id":"com.atlassian.idea.bob","version":"1.0","since":"173.0","until":"","originalSince":"139.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.1.1","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.softbank.robot.sdkplugin","version":"1.2.2","since":"162.0","until":"211.*","originalSince":"162.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.7.0","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.4.5","since":"139.1803","until":"211","originalSince":"139.1803","originalUntil":null},{"id":"com.dell.easydebug","version":"1.3","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"jbehave-support-plugin","version":"1.53","since":"145.258","until":"213","originalSince":"145.258","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.0.0-rc.3","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.3 (201902280501)","since":"131.0","until":"202","originalSince":"131.0","originalUntil":null},{"id":"com.ntilde.androidinput","version":"1.3.2","since":"131.0","until":"181.*","originalSince":"131.0","originalUntil":null},{"id":"com.suiyiwen.plugin.idea.apidoc","version":"1.5","since":"162.0","until":"191.*","originalSince":"162.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.figlet","version":"1.2","since":"171.0","until":"212.*","originalSince":"171.0","originalUntil":null},{"id":"com.github.gtache.lsp","version":"1.5.3","since":"173.0","until":"203.*","originalSince":"173.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.21-release-IJ2019.1-2","since":"191.5532","until":"191.5532","originalSince":"191.5532","originalUntil":"192.*"},{"id":"org.scalafmt.ScalaFmt","version":"2.0.0-RC5","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.40","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.41","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.7.0.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"org.elm.klazuka","version":"3.0.1","since":"182.0","until":"191.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.10-20190306.211312","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.10-20190306.211927","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"name.kropp.intellij.makefile","version":"1.6.1","since":"183.0","until":"211.5538","originalSince":"183.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.7.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.7.1.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.11","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.12-20190307.151718","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.intellij.plugins.vscodekeymap","version":"1.0","since":"181.0","until":"201.*","originalSince":"181.0","originalUntil":null},{"id":"JRebelPlugin","version":"2018.2.7","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.12-20190307.172146","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.42","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"CheckStyle-IDEA-FLINT","version":"5.24.2","since":"145.258","until":"203","originalSince":"145.258","originalUntil":null},{"id":"org.elixir_lang","version":"10.3.0","since":"173.4674.33","until":"211.*","originalSince":"173.4674.33","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"2.0","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"CheckStyle-IDEA-FLINT","version":"5.24.3","since":"145.258","until":"203","originalSince":"145.258","originalUntil":null},{"id":"com.footprint.footprint-plugin","version":"1.0","since":"181.0","until":"193.*","originalSince":"181.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.1.0","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.6156.1","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.6156.1","since":"183.6156","until":"201","originalSince":"183.6156","originalUntil":null},{"id":"com.github.gtache.lsp","version":"1.5.4","since":"173.0","until":"203.*","originalSince":"173.0","originalUntil":null},{"id":"CheckStyle-IDEA-FLINT","version":"5.24.4","since":"145.258","until":"203","originalSince":"145.258","originalUntil":null},{"id":"reasonml","version":"0.73","since":"172.0","until":"180.*","originalSince":"172.0","originalUntil":null},{"id":"com.demisto.demisto-plugin","version":"0.9","since":"182.0","until":"191.5000","originalSince":"182.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.6156.4","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.6156.4","since":"183.6156","until":"201","originalSince":"183.6156","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.25","since":"183.0","until":"201","originalSince":"183.0","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"1.3.0","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.12-20190313.201234","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"de.endrullis.idea.postfixtemplates","version":"2.8.2.183","since":"183.0","until":"191.4000","originalSince":"183.0","originalUntil":null},{"id":"com.jetbrains.darkPurpleTheme","version":"1.0","since":"191.0","until":"201","originalSince":"191.0","originalUntil":null},{"id":"com.jetbrains.CyanTheme","version":"1.0","since":"191.0","until":"201","originalSince":"191.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.43","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.abeade.plugin.fcm.push","version":"0.5","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"com.magento.idea.magento2plugin","version":"0.3.0","since":"172.0","until":"223.*","originalSince":"172.0","originalUntil":null},{"id":"com.sgaop.codegenerat.nutzfw","version":"1.0.6.fix","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"1.3.1","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"dk.demus.idea.CodeNarc","version":"4.0","since":"163.0","until":"193.*","originalSince":"163.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.30-eap-45-IJ2019.1-1","since":"191.5532","until":"191.5532","originalSince":"191.5109.14","originalUntil":"192.*"},{"id":"OdpsStudio","version":"3.1.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1552647958.093","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"intellij.zeppelin.","version":"0.3","since":"172.*","until":"213.*","originalSince":"145.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.7.0","since":"162.2147483647","until":"192.*","originalSince":"162.*","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.163","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.7.2","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.6.11","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"color.scheme.Smooth_Minimal","version":"1.2","since":"142.0","until":"142.0","originalSince":"142.0","originalUntil":null},{"id":"org.elm.klazuka","version":"3.1.0","since":"182.0","until":"191.*","originalSince":"182.0","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"1.3.2","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"com.hiberbee.intellij.hiberbee-theme","version":"1.0","since":"191.6183","until":"191.*","originalSince":"191.0","originalUntil":null},{"id":"com.hiberbee.intellij.hiberbee-theme","version":"1.0.1","since":"191.6183","until":"191.*","originalSince":"191.0","originalUntil":"191.*"},{"id":"lsfusion.idea.plugin","version":"1.0.164","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"183.6156.8","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.6156.8","since":"183.6156","until":"201","originalSince":"183.6156","originalUntil":null},{"id":"CUBA","version":"8.2-183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1553021580.089","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1553027724.716","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.intellij.testGuiFramework","version":"0.9.44.1","since":"183.0","until":"201","originalSince":"183.0","originalUntil":null},{"id":"hu.aradipatrik.onedarknative","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"hu.aradipatrik.onedarknative","version":"1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"hu.aradipatrik.onedarknative","version":"1.2","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"hu.aradipatrik.onedarknative","version":"1.4","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.hd123.plugin.id","version":"2.9.7","since":"183.0","until":"","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1226.8","since":"183.4284.148","until":"222","originalSince":"183.4284.148","originalUntil":null},{"id":"com.softbank.robot.sdkplugin","version":"1.2.4","since":"162.0","until":"211.*","originalSince":"162.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.30-eap-96-IJ2019.1-1","since":"191.5109.14","until":"191.5109.14","originalSince":"191.5109.14","originalUntil":"192.*"},{"id":"com.jetbrains.darkPurpleTheme","version":"1.0.1","since":"191.0","until":"201","originalSince":"191.0","originalUntil":null},{"id":"com.jetbrains.CyanTheme","version":"1.0.1","since":"191.0","until":"201","originalSince":"191.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.7.2","since":"162.2147483647","until":"192.*","originalSince":"162.*","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"10.0","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"org.elixir_lang","version":"10.4.0","since":"173.4674.33","until":"211.*","originalSince":"173.4674.33","originalUntil":null},{"id":"com.abeade.plugin.fcm.push","version":"0.5.1","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"uk.co.reecedunn.intellij.plugin.xquery","version":"1.4","since":"191.0","until":"191.0","originalSince":"191.0","originalUntil":"191.*"},{"id":"reasonml","version":"0.74","since":"173.0","until":"180.*","originalSince":"173.0","originalUntil":null},{"id":"io.intino.plugin","version":"3.6.2","since":"182.0","until":"232.*","originalSince":"182.0","originalUntil":null},{"id":"color.scheme.GapStyle","version":"2.2","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"training","version":"191.6183.3","since":"191.6183","until":"191.*","originalSince":"191.6183","originalUntil":null},{"id":"Keymap exporter","version":"2.1","since":"130.1167","until":"201","originalSince":"130.1167","originalUntil":null},{"id":"JRebelPlugin","version":"2019.1.0","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.intellij.testGuiFramework","version":"183.6156.11","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"Osmorc","version":"183.6156.11","since":"183.6156","until":"201","originalSince":"183.6156","originalUntil":null},{"id":"training","version":"191.6183.4","since":"191.6183","until":"191.*","originalSince":"191.6183","originalUntil":null},{"id":"com.github.kisstkondoros.codemetrics","version":"0.1","since":"182.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"com.berzanmikaili.intellij.monokai_pro","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"io.intino.plugin","version":"3.6.3","since":"182.0","until":"232.*","originalSince":"182.0","originalUntil":null},{"id":"training","version":"191.6183.5","since":"191.6183","until":"191.*","originalSince":"191.6183","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.7.3","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"io.intino.plugin","version":"3.6.4","since":"182.0","until":"232.*","originalSince":"182.0","originalUntil":null},{"id":"com.berzanmikaili.intellij.monokai_pro","version":"1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"IdeaVIM","version":"0.51.1","since":"183.2940.10","until":"201","originalSince":"183.2940.10","originalUntil":null},{"id":"uk.co.reecedunn.intellij.plugin.xquery","version":"1.4.1","since":"191.0","until":"191.0","originalSince":"191.0","originalUntil":"191.*"},{"id":"com.hiberbee.intellij.hiberbee-theme","version":"1.0.3","since":"191.6183","until":"191.*","originalSince":"183.0","originalUntil":null},{"id":"org.aion4j.avm","version":"0.1.2","since":"183.0","until":"222.*","originalSince":"183.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.03.28.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"org.qupla.language","version":"0.1.14-alpha","since":"182.0","until":"193.*","originalSince":"182.0","originalUntil":null},{"id":"lt.martynassateika.idea.codeigniter","version":"0.4.0","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1226.8","since":"183.4284.148","until":"222","originalSince":"183.4284.148","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"6.4","since":"145.0","until":"145.*","originalSince":"145.0","originalUntil":null},{"id":"OdpsStudio","version":"3.1.2","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.30-eap-125-IJ2019.1-1","since":"191.5109.14","until":"191.5109.14","originalSince":"191.5109.14","originalUntil":"192.*"},{"id":"com.jetbrains.upsource","version":"2019.1.1238.8","since":"183.4284.148","until":"222","originalSince":"183.4284.148","originalUntil":null},{"id":"com.deadlock.scsyntax","version":"1.0.7","since":"181.0","until":"201","originalSince":"181.0","originalUntil":null},{"id":"org.bigtows.PinNote","version":"1.3.3.2","since":"69.7000","until":"183.*","originalSince":"69.7000","originalUntil":"191.*"},{"id":"com.jakecoffman.theme","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.jakecoffman.theme","version":"1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.bjansen.intellij.pebble","version":"0.5","since":"173.0","until":"212.*","originalSince":"143.0","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"2.1","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"ru.vsu.apakhomov.experimental.plugin.Experimental","version":"0.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.25.0","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"com.vladsch.idea.multimarkdown","version":"2.8.4","since":"163.15529","until":"212.0","originalSince":"163.15529","originalUntil":null},{"id":"com.haskforce","version":"0.3.42","since":"173.0","until":"203.*","originalSince":"173.0","originalUntil":null},{"id":"org.ziglang","version":"0.1.1","since":"162.0","until":"193","originalSince":"162.0","originalUntil":null},{"id":"com.ifengxue.plugin.jpa-support","version":"1.0.7","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.15.2","since":"173.0","until":"221","originalSince":"173.0","originalUntil":null},{"id":"net.fhtagn.pycharm.cellmode","version":"1.2.1","since":"182.0","until":"193","originalSince":"182.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.64.0","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"ca.rightsomegoodgames.mayacharm","version":"3.0.2","since":"183.0","until":"193.3519","originalSince":"183.0","originalUntil":null},{"id":"org.jf.fusionIdea","version":"0.5.6","since":"191.0","until":"203","originalSince":"191.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.21-release-IJ2019.1-3","since":"191.5532","until":"191.5532","originalSince":"191.5532","originalUntil":"192.*"},{"id":"com.zxy.idea.plugin.findViewById-support","version":"1.4","since":"171.0","until":"","originalSince":"AI-171.0","originalUntil":null},{"id":"org.limechain","version":"1.0","since":"183.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1554135945.464","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.khmelyuk.multirun","version":"1.10","since":"191.0","until":"222.4459.*","originalSince":"191.0","originalUntil":null},{"id":"com.berzanmikaili.intellij.monokai_pro","version":"1.2","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.intellij.datalore","version":"0.0.2","since":"191.1","until":"201","originalSince":"191.1","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"7.0","since":"183.2153.8","until":"183.*","originalSince":"183.2153.8","originalUntil":null},{"id":"CUBA","version":"9.0-183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"org.limechain","version":"1.1","since":"183.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.intellij.datalore","version":"0.0.3","since":"191.1","until":"201","originalSince":"191.1","originalUntil":null},{"id":"com.demisto.demisto-plugin","version":"0.9.1","since":"182.0","until":"201.0","originalSince":"182.0","originalUntil":null},{"id":"QAPlug","version":"1.3.19","since":"191.6183","until":"211","originalSince":"191.6183","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1554306597.42","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"1.7.4","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.weirddev.testme","version":"3.0.0","since":"191.0","until":"231.*","originalSince":"191.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.12-20190404.123012","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.13","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.14-20190404.155349","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"0.51.0+4","since":"183.0","until":"231.*","originalSince":"183.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"0.51.0+4","since":"183.0","until":"231.*","originalSince":"183.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1238.8","since":"183.4284.148","until":"222","originalSince":"183.4284.148","originalUntil":null},{"id":"AureliaStorm","version":"0.8.1","since":"182.3684","until":"213.*","originalSince":"182.3684","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"2.0.0","since":"182.711","until":"202.*","originalSince":"182.711","originalUntil":null},{"id":"org.elm.klazuka","version":"3.1.1","since":"182.3684.2","until":"191.*","originalSince":"182.3684.2","originalUntil":null},{"id":"com.zxy.idea.plugin.findViewById-support","version":"1.5","since":"171.0","until":"","originalSince":"AI-171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.8.0","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"OksiBlackCS","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.8.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.zxy.idea.plugin.findViewById-support","version":"1.6","since":"171.0","until":"","originalSince":"AI-171.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"5.2.0","since":"182.0","until":"211","originalSince":"182.0","originalUntil":null},{"id":"com.zhaow.restful.toolkit","version":"2.0.9","since":"145.0","until":"211.*","originalSince":"145.0","originalUntil":null},{"id":"DeepBugsJavaScript","version":"0.1","since":"183.0","until":"193.*","originalSince":"183.0","originalUntil":null},{"id":"OksiBlackCS","version":"1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.30-eap-164-IJ2019.1-1","since":"191.5109.14","until":"191.5109.14","originalSince":"191.5109.14","originalUntil":"192.*"},{"id":"lsfusion.idea.plugin","version":"1.0.165","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"io.ballerina","version":"0.991.0-RC1","since":"173.0","until":"182","originalSince":"163.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.166","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"R4Intellij","version":"1.0.11","since":"171.4694","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1554824311.575","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.herokuapp.vuesion","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.herokuapp.vuesion","version":"1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1554887719.557","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"org.jetbrains.idea.grammar","version":"2019.1","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"com.herokuapp.vuesion","version":"1.2","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"SequenceDiagram","version":"1.3.0","since":"141.1","until":"173.*","originalSince":"141.1","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.0.0-rc.4","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"au.com.clearboxsystems.plugin.jetbrains.darkerla","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"edu.umontreal.hatchery","version":"0.3","since":"143.379","until":"193","originalSince":"143.379","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"4.2.2","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"org.aion4j.avm","version":"0.2.0","since":"183.0","until":"222.*","originalSince":"183.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1554998911.924","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.30-release-IJ2019.1-1","since":"191.5109.14","until":"191.5109.14","originalSince":"191.5109.14","originalUntil":"192.*"},{"id":"org.jetbrains.kotlin","version":"1.3.30-release-IJ2019.1-1","since":"191.5109.14","until":"191.5109.14","originalSince":"191.5109.14","originalUntil":"192.*"},{"id":"reasonml","version":"0.75","since":"173.0","until":"180.*","originalSince":"173.0","originalUntil":null},{"id":"de.platon42.cajon","version":"0.4","since":"182.0","until":"","originalSince":"172.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"0.52.0+7","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.github.recognized.screencast.recorder","version":"1.0","since":"182.0","until":"201.*","originalSince":"182.0","originalUntil":null},{"id":"com.github.recognized.screencast.recorder","version":"1.0","since":"182.0","until":"201.*","originalSince":"182.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"0.52.0+9","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"edu.umontreal.hatchery","version":"0.3.1","since":"143.379","until":"193","originalSince":"143.379","originalUntil":null},{"id":"com.bloidonia.intellij-rest-linkomatic","version":"1.1","since":"183.0","until":"191.*","originalSince":"181.0","originalUntil":"191.*"},{"id":"com.alivanov.intellij.plugins.liquigen","version":"0.0.7","since":"191.6183","until":"203","originalSince":"191.6183","originalUntil":null},{"id":"edu.umontreal.hatchery","version":"0.3.2","since":"143.379","until":"193","originalSince":"143.379","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.27","since":"191.0","until":"193.*","originalSince":"191.0","originalUntil":null},{"id":"spring.web.initializr.plugin","version":"1.0.0","since":"181.5684","until":"191.*","originalSince":"172.3757.5","originalUntil":"191.*"},{"id":"com.ifengxue.plugin.jpa-support","version":"1.1.1","since":"171.0","until":"231.*","originalSince":"171.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.1.2","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.demisto.demisto-plugin","version":"0.9.2","since":"182.0","until":"201.0","originalSince":"182.0","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.1.3","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"2.1.0","since":"182.711","until":"202.*","originalSince":"182.711","originalUntil":null},{"id":"com.suming.react.PropTypes","version":"1.1.5","since":"143.0","until":"223.*","originalSince":"143.0","originalUntil":null},{"id":"JRebelPlugin","version":"2019.1.1","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.liferay.ide.intellij.plugin","version":"1.4.0","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"1.1.4","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"com.cybrosis.catdea","version":"1.0","since":"182.0","until":"202","originalSince":"182.0","originalUntil":null},{"id":"reasonml","version":"0.75.1","since":"173.0","until":"180.*","originalSince":"173.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.5.7","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.hand.ide.plugin.hap-support","version":"0.0.1","since":"171.4073","until":"","originalSince":"IU-171.4073.28","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1555426754.297","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.evolitist.ev3c","version":"0.8.1","since":"190.0","until":"192.0","originalSince":"CL-190.0","originalUntil":"CL-192.0"},{"id":"com.illuminatedcloud.intellij","version":"1.8.4.8-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.samdark.intellij-visual-studio-code-dark-plus","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.samdark.intellij-visual-studio-code-dark-plus","version":"1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.samdark.intellij-visual-studio-code-dark-plus","version":"1.2","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.magicbytes.blaze","version":"0.2.1","since":"163.0","until":"193.*","originalSince":"163.0","originalUntil":null},{"id":"com.dubreuia","version":"1.5.0+2018.3","since":"183.0","until":"223","originalSince":"183.0","originalUntil":null},{"id":"FastDebug","version":"1.1","since":"145.0","until":"193.*","originalSince":"145.0","originalUntil":null},{"id":"com.jensteichert.themes.nightowl","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.samdark.intellij-visual-studio-code-dark-plus","version":"1.3","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.35.0","since":"183.5912.21","until":"223.*","originalSince":"183.5912.21","originalUntil":null},{"id":"com.deadlock.scsyntax","version":"1.0.8","since":"181.0","until":"201","originalSince":"181.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"0.52.1+16","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"CUBA","version":"9.1-183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.5.8","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.15","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.16-20190419.112737","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"0.52.2+2","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"net.nazarsit","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"2.20","since":"134.1050","until":"200.0","originalSince":"134.1050","originalUntil":null},{"id":"YapiUpload","version":"1.3","since":"171.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.8.2","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.fernandojimenez.mattecarbon.theme","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.starxg.browserfx","version":"1.0.1","since":"173.0","until":"202.59","originalSince":"173.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"1.1.4.1","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.167","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"jp.ikeponias","version":"1.0-SNAPSHOT","since":"150.0","until":"203","originalSince":"150.0","originalUntil":null},{"id":"jp.ikeponias","version":"1.0","since":"150.0","until":"203","originalSince":"150.0","originalUntil":null},{"id":"jp.ikeponias","version":"1.0.0","since":"150.0","until":"203","originalSince":"150.0","originalUntil":null},{"id":"training","version":"SNAPSHOT.658","since":"191.6183","until":"201","originalSince":"191.6183","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.8.3","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.starxg.browserfx","version":"1.0.2","since":"173.0","until":"202.59","originalSince":"173.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.16-20190423.120128","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"5.2.1","since":"182.0","until":"211","originalSince":"182.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"18.3.181.000.0-Eclipse_2019-03","since":"181.0","until":"202","originalSince":"181.0","originalUntil":null},{"id":"de.timon.schelling.interesting.theme","version":"1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"de.timon.schelling.interesting.theme","version":"1.2","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.codemr.analyzer","version":"2019.1.1","since":"171.0","until":"181.0","originalSince":"171.0","originalUntil":null},{"id":"com.platform.gen","version":"1.2","since":"181.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"reasonml","version":"0.76","since":"173.0","until":"180.*","originalSince":"173.0","originalUntil":null},{"id":"reasonml","version":"0.76.1","since":"173.0","until":"180.*","originalSince":"173.0","originalUntil":null},{"id":"com.andreycizov.partialnav","version":"1.1","since":"171.1834","until":"","originalSince":"IC-171.1834.9","originalUntil":null},{"id":"OdpsStudio","version":"3.1.3","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.arcticicestudio.nord.jetbrains","version":"0.5.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"training","version":"SNAPSHOT.663","since":"191.6183","until":"201","originalSince":"191.6183","originalUntil":null},{"id":"reasonml","version":"0.76.2","since":"173.0","until":"180.*","originalSince":"173.0","originalUntil":null},{"id":"lt.martynassateika.idea.codeigniter","version":"0.4.1","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"cn.com.autohome.tuan.plugins","version":"1.0","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"cn.com.autohome.tuan.plugins","version":"1.01","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"io.ballerina","version":"0.991.0","since":"173.0","until":"182","originalSince":"163.0","originalUntil":null},{"id":"io.github.leeeory.theme.plaid","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"cn.com.autohome.tuan.plugins","version":"1.03","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"io.github.leeeory.theme.plaid","version":"0.0.2","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"io.github.leeeory.theme.plaid","version":"0.0.3","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"io.github.leeeory.theme.plaid","version":"0.0.4","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.31-release-IJ2019.1-1","since":"191.5109.14","until":"191.5109.14","originalSince":"191.5109.14","originalUntil":"192.*"},{"id":"name.kropp.intellij.qml","version":"0.3.3","since":"191.0","until":"223.*","originalSince":"191.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.31-release-IJ2019.1-1","since":"191.5109.14","until":"191.5109.14","originalSince":"191.5109.14","originalUntil":"192.*"},{"id":"training","version":"SNAPSHOT.664","since":"191.6183","until":"201","originalSince":"191.6183","originalUntil":null},{"id":"cn.com.autohome.tuan.plugins","version":"1.04","since":"182.0","until":"","originalSince":"172.0","originalUntil":null},{"id":"com.jetbrains.edu","version":"2.5-2019.1-1540","since":"191.5109","until":"191.*","originalSince":"191.5109","originalUntil":"192.*"},{"id":"com.intellij.plugins.vscodekeymap","version":"1.0.1","since":"181.0","until":"201.*","originalSince":"181.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.5.9","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"training","version":"SNAPSHOT.671","since":"191.6183","until":"201","originalSince":"191.6183","originalUntil":null},{"id":"training","version":"SNAPSHOT.672","since":"191.6183","until":"201","originalSince":"191.6183","originalUntil":null},{"id":"org.ziglang","version":"0.1.2","since":"173.0","until":"193","originalSince":"173.0","originalUntil":null},{"id":"jp.ikeponias","version":"1.0.1","since":"150.0","until":"203","originalSince":"150.0","originalUntil":null},{"id":"com.vladsch.MissingInActions","version":"1.7.4","since":"162.2147483647","until":"192.*","originalSince":"162.*","originalUntil":null},{"id":"com.github.novotnyr.jwt-intellij-plugin","version":"0.5","since":"143.0","until":"222.*","originalSince":"143.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.8.4","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.suiyiwen.plugin.idea.servicedoc","version":"1.4","since":"162.0","until":"191.*","originalSince":"162.0","originalUntil":null},{"id":"lt.martynassateika.idea.codeigniter","version":"0.5.0","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.8.5","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.martinagabrielli.themes","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.04.29.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"org.elixir_lang","version":"10.5.0","since":"173.4674.33","until":"211.*","originalSince":"173.4674.33","originalUntil":null},{"id":"rasarts.espresso.light.theme","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.alipay.antcloud.ide","version":"1.0.9","since":"183.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"J2ME","version":"192.0","since":"192.1","until":"201","originalSince":"192.1","originalUntil":null},{"id":"J2ME","version":"192.3","since":"192.1","until":"201","originalSince":"192.1","originalUntil":null},{"id":"com.idescout.sqlite","version":"6.0.0","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"reasonml","version":"0.76.3","since":"173.0","until":"180.*","originalSince":"173.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.1-2.alpha","since":"191.0","until":"191.*","originalSince":"191.0","originalUntil":null},{"id":"com.funk.sage.theme","version":"1.0.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.1-2.stable","since":"191.0","until":"191.*","originalSince":"191.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"0.52.3+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"UDC","version":"1.0.5","since":"139.0","until":"183.*","originalSince":"139.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.6.14","since":"181.0","until":"192.*","originalSince":"181.0","originalUntil":null},{"id":"dark_candy","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"silkworm","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"silkworm","version":"1.0.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"silkworm","version":"1.0.2","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"silkworm","version":"1.0.3","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.04.29.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"Lombook Plugin","version":"0.25-2019.1","since":"191.6183","until":"192.0","originalSince":"191.6183","originalUntil":null},{"id":"Lombook Plugin","version":"0.25-EAP","since":"191.7141","until":"192.0","originalSince":"191.7141","originalUntil":null},{"id":"lt.martynassateika.idea.codeigniter","version":"0.5.1","since":"145.0","until":"193.0","originalSince":"145.0","originalUntil":null},{"id":"silkworm","version":"1.0.4","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"Reykjavik","version":"0.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"Reykjavik","version":"0.1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.thvardhan.gradianto","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.thvardhan.gradianto","version":"1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"foggy-night","version":"0.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.26","since":"183.0","until":"201","originalSince":"183.0","originalUntil":null},{"id":"JFormDesigner","version":"6.0.6.4","since":"145.0","until":"191.*","originalSince":"145.0","originalUntil":null},{"id":"soft-charcoal","version":"0.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"white-sand-ui","version":"0.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"madrid","version":"0.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"MetalHeart","version":"0.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"warm-night","version":"0.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"Thursday","version":"0.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.2.6","since":"123.0","until":"211.*","originalSince":"123.0","originalUntil":null},{"id":"white-sand-ui","version":"0.2","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"2.2.7","since":"162.0","until":"211.*","originalSince":"162.0","originalUntil":null},{"id":"silkworm","version":"1.0.5","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"Struts Assistant","version":"192.5","since":"192.1","until":"193.1580","originalSince":"192.1","originalUntil":null},{"id":"Reykjavik","version":"0.1.2","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"MetalHeart","version":"0.1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"white-sand-ui","version":"0.2.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"training","version":"191.6183.6","since":"191.6183","until":"191.*","originalSince":"191.6183","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.16-20190502.204304","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"Struts Assistant","version":"192.6","since":"192.1","until":"193.1580","originalSince":"192.1","originalUntil":null},{"id":"com.suiyiwen.plugin.idea.servicedoc","version":"1.5","since":"162.0","until":"191.*","originalSince":"162.0","originalUntil":null},{"id":"com.suiyiwen.plugin.idea.apidoc","version":"1.6","since":"162.0","until":"191.*","originalSince":"162.0","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.0.0-rc.5","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.0.0-rc.6","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"0.53.0+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"color.scheme.Sunset Vibes Theme","version":"1.0","since":"142.0","until":"201.0","originalSince":"142.0","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.0.0-rc.7","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.android.aas","version":"1.0.0","since":"182.5107","until":"192.7142","originalSince":"AI-182.5107.16","originalUntil":null},{"id":"org.aion4j.avm","version":"0.3.0","since":"183.0","until":"222.*","originalSince":"183.0","originalUntil":null},{"id":"com.zeke.wong.neck-protect","version":"1.0","since":"171.0","until":"211.*","originalSince":"171.0","originalUntil":null},{"id":"dk.demus.idea.CodeNarc","version":"4.1.0","since":"183.0","until":"193.*","originalSince":"183.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.05.07.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.cybrosis.catdea","version":"1.0.1","since":"182.0","until":"202","originalSince":"182.0","originalUntil":null},{"id":"com.liuzhihang.toolkit.toolkit","version":"1.0.1","since":"181.0","until":"223","originalSince":"181.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.8.6","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.demisto.demisto-plugin","version":"0.9.3","since":"182.711","until":"201.0","originalSince":"182.711","originalUntil":null},{"id":"ir.intellij.idea.plugin","version":"0.0.1 release","since":"162.0","until":"191.7141","originalSince":"162.0","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"2.2","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1557328782.836","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"2.3","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.05.09.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.liuzhihang.toolkit.toolkit","version":"1.0.2","since":"181.0","until":"223","originalSince":"181.0","originalUntil":null},{"id":"UDC","version":"1.0.6","since":"139.0","until":"183.*","originalSince":"139.0","originalUntil":null},{"id":"io.github.donkirkby.livepycharm","version":"2.25.1","since":"145.0","until":"192","originalSince":"145.0","originalUntil":null},{"id":"org.zalando.intellij.swagger","version":"1.0.27","since":"183.0","until":"201","originalSince":"183.0","originalUntil":null},{"id":"com.ruiyu.ruiyu","version":"2.4","since":"173.0","until":"232.*","originalSince":"173.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.05.10.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.github.novotnyr.maven-version-idea-plugin","version":"1","since":"172.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"intellij-scheme","version":"0.1.5","since":"103.72","until":"193.0","originalSince":"103.72","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"10.1","since":"191.0","until":"211","originalSince":"191.0","originalUntil":null},{"id":"com.jfrog.conan.clion","version":"1.1.0","since":"180.0","until":"222","originalSince":"180.0","originalUntil":null},{"id":"com.bisguard.android.antidecompiler.idea","version":"0.9","since":"145.0","until":"223.*","originalSince":"145.0","originalUntil":null},{"id":"com.jfrog.conan.clion","version":"1.1.1","since":"180.0","until":"222","originalSince":"180.0","originalUntil":null},{"id":"com.apkfuns.swan.plugin","version":"1.0.2","since":"173.0","until":"193.0","originalSince":"173.0","originalUntil":null},{"id":"com.mario.WSAnything.plugin","version":"2.0","since":"183.5429.30","until":"193.*","originalSince":"183.5429.30","originalUntil":null},{"id":"com.mario.WSAnything.plugin","version":"2.1","since":"183.5429.30","until":"193.*","originalSince":"183.5429.30","originalUntil":null},{"id":"com.apkfuns.swan.plugin","version":"1.0.3","since":"173.0","until":"193.0","originalSince":"173.0","originalUntil":null},{"id":"com.apkfuns.swan.plugin","version":"1.0.4","since":"173.0","until":"193.0","originalSince":"173.0","originalUntil":null},{"id":"com.wishtack.pysynthetic.intellij","version":"0.7.0","since":"173.0","until":"192.*","originalSince":"173.0","originalUntil":null},{"id":"vette.neos","version":"1.0.0","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"10.2","since":"191.0","until":"211","originalSince":"191.0","originalUntil":null},{"id":"com.jetbrains.fast.mouse.scroll","version":"1.2","since":"191.4212.41","until":"201","originalSince":"191.4212.41","originalUntil":null},{"id":"com.apkfuns.swan.plugin","version":"1.0.5","since":"173.0","until":"193.0","originalSince":"173.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.4.9-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.6.0","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.28","since":"191.0","until":"193.*","originalSince":"191.0","originalUntil":null},{"id":"com.jetbrains.fast.mouse.scroll","version":"1.3","since":"191.4212.41","until":"201","originalSince":"191.4212.41","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"1.0.0+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.github.zouyq.cmdTools","version":"1.0","since":"173.0","until":"222.*","originalSince":"173.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"1.2.0","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"org.aion4j.avm","version":"0.3.4","since":"183.0","until":"222.*","originalSince":"183.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.4.201905141150-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.8.7","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.4.201905140501-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"dk.demus.idea.CodeNarc","version":"4.1.1","since":"183.0","until":"193.*","originalSince":"183.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"1.0.1+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.siberika.idea.pascal","version":"2.31","since":"134.1050","until":"200.0","originalSince":"134.1050","originalUntil":null},{"id":"com.apkfuns.swan.plugin","version":"1.0.6","since":"173.0","until":"193.0","originalSince":"173.0","originalUntil":null},{"id":"com.github.zouyq.cmdTools","version":"3.0","since":"173.0","until":"222.*","originalSince":"173.0","originalUntil":null},{"id":"net.objecthunter.idea.BuilderGenerator","version":"1.1","since":"172.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.35","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"com.wix.eslint","version":"1.0.36","since":"139.0","until":"181.0","originalSince":"139.0","originalUntil":null},{"id":"net.objecthunter.idea.BuilderGenerator","version":"1.2","since":"172.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.10","since":"172.0","until":"193","originalSince":"172.0","originalUntil":null},{"id":"EclipseCodeFormatter","version":"18.3.181.000.1-Eclipse_2019-03","since":"181.0","until":"202","originalSince":"181.0","originalUntil":null},{"id":"saros","version":"0.1.0","since":"182.5107.16","until":"193.6015.39","originalSince":"182.5107.16","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1362.9","since":"191.6183.87","until":"222","originalSince":"191.6183.87","originalUntil":null},{"id":"andrasferenczi.dart-data-plugin","version":"0.0.1","since":"183.0","until":"","originalSince":"172.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"7.1","since":"183.2153.8","until":"183.*","originalSince":"183.2153.8","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.8.8","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.10.1","since":"172.0","until":"193","originalSince":"172.0","originalUntil":null},{"id":"com.intellij.plugins.vscodekeymap","version":"1.0.2","since":"181.0","until":"201.*","originalSince":"181.0","originalUntil":null},{"id":"com.checkmarx.intellij","version":"8.90.0","since":"111.69","until":"200.0","originalSince":"111.69","originalUntil":null},{"id":"JRebelPlugin","version":"2019.1.2","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.suiyiwen.plugin.idea.apidoc","version":"1.7","since":"162.0","until":"191.*","originalSince":"162.0","originalUntil":null},{"id":"com.github.nokia.pyvenv","version":"1.2","since":"145.0","until":"203","originalSince":"145.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.40-eap-21-IJ2019.1-1","since":"191.5109.14","until":"191.5109.14","originalSince":"191.5109.14","originalUntil":"192.*"},{"id":"com.demisto.demisto-plugin","version":"0.9.4","since":"182.711","until":"201.0","originalSince":"182.711","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.15.3","since":"173.0","until":"221","originalSince":"173.0","originalUntil":null},{"id":"dk.demus.idea.CodeNarc","version":"4.1.2","since":"183.0","until":"193.*","originalSince":"183.0","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.14507","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.4.201905220224-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"org.elixir_lang","version":"10.5.1","since":"173.4674.33","until":"211.*","originalSince":"173.4674.33","originalUntil":null},{"id":"de.espend.idea.laravel","version":"0.15.4","since":"173.0","until":"222","originalSince":"173.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1558552891.973","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"1.0.2+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.8.9","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.intellij.plugin.adernov.powershell","version":"2.0.2","since":"192.0","until":"213.5744.182","originalSince":"192.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.40-eap-32-IJ2019.1-1","since":"191.5109.14","until":"191.5109.14","originalSince":"191.5109.14","originalUntil":"192.*"},{"id":"com.jetbrains.php","version":"192.4205.18","since":"192.4205","until":"192.4205","originalSince":"192.4205","originalUntil":"192.*"},{"id":"com.jetbrains.php.behat","version":"192.4205.18","since":"192.4205","until":"192.4300","originalSince":"192.4205","originalUntil":"192.*"},{"id":"com.jetbrains.php.blade","version":"192.4205.18","since":"192.4205","until":"192.4300","originalSince":"192.4205","originalUntil":"192.*"},{"id":"com.jetbrains.php.framework","version":"192.4205.18","since":"192.4205","until":"192.4300","originalSince":"192.4205","originalUntil":"192.*"},{"id":"com.jetbrains.php.drupal","version":"192.4205.18","since":"192.4205","until":"192.4300","originalSince":"192.4205","originalUntil":"192.*"},{"id":"CUBA","version":"10.0-183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.6.1","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"1.0.2+2","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"MavenRunHelper","version":"4.0.183.4139.0","since":"183.4139","until":"194","originalSince":"183.4139","originalUntil":null},{"id":"MavenRunHelper","version":"4.1.183.4139.0","since":"183.4139","until":"194","originalSince":"183.4139","originalUntil":null},{"id":"Jetbrains TeamCity Plugin","version":"2019.1.65998","since":"143.2200","until":"171.4249","originalSince":"143.2200","originalUntil":null},{"id":"org.jetbrains.plugins.phpstorm-remote-interpreter","version":"192.4205.18","since":"192.4205","until":"192.4300","originalSince":"192.4205","originalUntil":"192.*"},{"id":"com.jetbrains.php.wordPress","version":"192.4205.18","since":"192.4205","until":"192.4300","originalSince":"192.4205","originalUntil":"192.*"},{"id":"net.lagerwey.cucumber-kotlin","version":"1.1.0","since":"182.711","until":"182.711","originalSince":"182.711","originalUntil":null},{"id":"com.android.aas","version":"1.1.0","since":"182.5107","until":"192.7142","originalSince":"AI-182.5107.16","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"10.3","since":"191.0","until":"211","originalSince":"191.0","originalUntil":null},{"id":"nb-mind-map-idea","version":"1.4.6","since":"139.1803","until":"211","originalSince":"139.1803","originalUntil":null},{"id":"EditorGroups","version":"0.21","since":"182.0","until":"203","originalSince":"182.0","originalUntil":null},{"id":"MavenRunHelper","version":"4.2.183.4139.1","since":"183.4139","until":"194","originalSince":"183.4139","originalUntil":null},{"id":"com.dgtis.code.gen.plugin.code-gen-plugin","version":"1.0","since":"182.0","until":"","originalSince":"1.0","originalUntil":null},{"id":"com.smilingrob.gitpair","version":"1.5","since":"141.0","until":"203","originalSince":"141.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"10.3.1","since":"191.0","until":"211","originalSince":"191.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.9.0","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.dgtis.code.gen.plugin.code-gen-plugin","version":"2.0","since":"182.0","until":"","originalSince":"2.0","originalUntil":null},{"id":"J2ME","version":"192.4","since":"192.1","until":"201","originalSince":"192.1","originalUntil":null},{"id":"com.idescout.sqlite","version":"6.1.0","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"dk.demus.idea.CodeNarc","version":"4.2.0","since":"183.0","until":"193.*","originalSince":"183.0","originalUntil":null},{"id":"org.elixir_lang","version":"10.6.0","since":"173.4674.33","until":"211.*","originalSince":"173.4674.33","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1362.9","since":"191.6183.87","until":"222","originalSince":"191.6183.87","originalUntil":null},{"id":"com.mmyh.plugin.easyapp","version":"1.0","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"UDC","version":"1.0.7","since":"139.0","until":"183.*","originalSince":"139.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"10.3.2","since":"191.0","until":"211","originalSince":"191.0","originalUntil":null},{"id":"me.hiten.completion","version":"0.1","since":"171.0","until":"","originalSince":"161.0","originalUntil":null},{"id":"dk.demus.idea.CodeNarc","version":"4.2.1","since":"183.0","until":"193.*","originalSince":"183.0","originalUntil":null},{"id":"org.elm.klazuka","version":"3.1.2","since":"182.3684.2","until":"193.*","originalSince":"182.3684.2","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.70.6","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.9.0.7","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.9.0.8","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.9.0.9","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.9.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1559127677.707","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.dgtis.code.gen.plugin.code-gen-plugin","version":"3.0","since":"182.0","until":"","originalSince":"3.0","originalUntil":null},{"id":"spek-test-template-plugin","version":"0.1.1","since":"162.0","until":"192.*","originalSince":"162.0","originalUntil":null},{"id":"com.dgtis.code.gen.plugin.code-gen-plugin","version":"4.0","since":"182.0","until":"","originalSince":"4.0","originalUntil":null},{"id":"net.lagerwey.cucumber-kotlin","version":"1.1.1","since":"182.711","until":"193.6015","originalSince":"182.711","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1386.9","since":"191.6183.87","until":"222","originalSince":"191.6183.87","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.7.0","since":"191.5000","until":"192.*","originalSince":"191.5000","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.40-eap-67-IJ2019.2-1","since":"192.4205.45","until":"192.4205.45","originalSince":"192.4205.45","originalUntil":"193.*"},{"id":"io.github.QCute.CodeCase","version":"1.0.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.dgtis.code.gen.plugin.code-gen-plugin","version":"4.0.1","since":"172.0","until":"","originalSince":"4.0","originalUntil":null},{"id":"MavenRunHelper","version":"4.3.183.4139.0","since":"183.4139","until":"194","originalSince":"183.4139","originalUntil":null},{"id":"org.aion4j.avm","version":"0.3.5","since":"183.0","until":"222.*","originalSince":"183.0","originalUntil":null},{"id":"IdeaVIM","version":"0.51.2","since":"183.2940.10","until":"201","originalSince":"183.2940.10","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.6.2","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.petre-s.mock-gen-intellij","version":"0.3.1-beta","since":"162.0","until":"211","originalSince":"162.0","originalUntil":"300.*"},{"id":"org.intellij.plugins.hcl","version":"0.7.1","since":"191.5000","until":"192.*","originalSince":"191.5000","originalUntil":null},{"id":"com.khahn.angular-extract-component","version":"1.1","since":"191.0","until":"211","originalSince":"191.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.10.2","since":"172.0","until":"193","originalSince":"172.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"10.4","since":"191.0","until":"211","originalSince":"191.0","originalUntil":null},{"id":"com.idescout.sqlite","version":"6.1.1","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.7.2","since":"191.5000","until":"192.*","originalSince":"191.5000","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.6.3","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.dgtis.doclever.plugin.doclever-plugin","version":"1.0.0","since":"182.0","until":"","originalSince":"1.0","originalUntil":null},{"id":"MavenRunHelper","version":"4.4.183.4139.0","since":"183.4139","until":"194","originalSince":"183.4139","originalUntil":null},{"id":"Struts Assistant","version":"192.7","since":"192.1","until":"193.1580","originalSince":"192.1","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"10.4.1","since":"191.0","until":"211","originalSince":"191.0","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"1.5.0","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"1.1.0+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.chuntung.plugin.mybatisbuilder","version":"1.0.3","since":"191.6183","until":"192.4488","originalSince":"191.6183","originalUntil":"192.*"},{"id":"com.sgaop.codegenerat.nutzfw","version":"1.0.7","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"reasonml","version":"0.77","since":"173.0","until":"180.*","originalSince":"173.0","originalUntil":null},{"id":"com.github.shiraji.yaemoji","version":"1.0.0","since":"181.5087","until":"223","originalSince":"181.5087","originalUntil":null},{"id":"com.github.shiraji.yaemoji","version":"1.0.1","since":"181.5087","until":"223","originalSince":"181.5087","originalUntil":null},{"id":"com.sgaop.codegenerat.nutzfw","version":"1.0.8","since":"145.0","until":"231.*","originalSince":"145.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.9.2","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"MavenRunHelper","version":"4.5.183.4139.0","since":"183.4139","until":"194","originalSince":"183.4139","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"1.1.1+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1386.9","since":"191.6183.87","until":"222","originalSince":"191.6183.87","originalUntil":null},{"id":"CUBA","version":"10.1-183","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.10.3","since":"172.0","until":"193","originalSince":"172.0","originalUntil":null},{"id":"org.muzi.open.helper","version":"1.5","since":"181.*","until":"203.*","originalSince":"145.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.7.3","since":"191.5000","until":"192.*","originalSince":"191.5000","originalUntil":null},{"id":"com.github.shiraji.yaemoji","version":"1.0.2","since":"181.5087","until":"223","originalSince":"181.5087","originalUntil":null},{"id":"com.dgtis.doclever.plugin.doclever-plugin","version":"1.0.2","since":"163.0","until":"192.4787.16","originalSince":"111.0","originalUntil":"192.4787.16"},{"id":"co.nums.intellij.aem","version":"0.10.4","since":"172.0","until":"193","originalSince":"172.0","originalUntil":null},{"id":"JRebelPlugin","version":"2019.1.3","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.idescout.sqlite","version":"6.2.0","since":"183.0","until":"211","originalSince":"183.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.31-release-IJ2019.2-1","since":"192.1","until":"192.1","originalSince":"192.1","originalUntil":"193.*"},{"id":"lsfusion.idea.plugin","version":"1.0.168","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.169","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"aws.toolkit","version":"1.4","since":"183.2153.8","until":"191.*","originalSince":"183.2153.8","originalUntil":"192.*"},{"id":"OdpsStudio","version":"3.2.0.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.9.3","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"LivePlugin","version":"0.6.3 beta","since":"191.6183.87","until":"213.*","originalSince":"191.6183.87","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-2.stable","since":"192.0","until":"192.*","originalSince":"192.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"1.3.40-eap-105-IJ2019.2-1","since":"192.4205.45","until":"192.4205.45","originalSince":"192.4205.45","originalUntil":"193.*"},{"id":"io.ballerina","version":"0.991.1","since":"183.0","until":"193","originalSince":"183.0","originalUntil":null},{"id":"com.alibaba.p3c.smartfox","version":"2.0.0","since":"145.0","until":"231","originalSince":"145.0","originalUntil":null},{"id":"com.intellij.plugins.sublimetextkeymap","version":"1.0.0","since":"201.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1560346459.737","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"10.5","since":"191.0","until":"211","originalSince":"191.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"2.1.1","since":"182.711","until":"202.*","originalSince":"182.711","originalUntil":null},{"id":"com.github.igrmk","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.igrmk","version":"1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.pwc.accelerator.market","version":"1.0","since":"173.0","until":"191.*","originalSince":"173.0","originalUntil":null},{"id":"com.github.shiraji.yaemoji","version":"1.0.2","since":"181.5087","until":"223","originalSince":"181.5087","originalUntil":null},{"id":"com.intellij.plugins.netbeanskeymap","version":"1.0.0","since":"201.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.intellij.plugins.eclipsekeymap","version":"1.0.0","since":"201.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.github.igrmk","version":"1.2","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"10.5.1","since":"191.0","until":"211","originalSince":"191.0","originalUntil":null},{"id":"com.troyanovsky.idea.CodeHelper","version":"1.0","since":"191.0","until":"","originalSince":"IU-191.0","originalUntil":null},{"id":"com.ankit.mahadik.json.dart.class","version":"0.1","since":"171.0","until":"","originalSince":"1.0","originalUntil":null},{"id":"com.softbank.robot.sdkplugin","version":"1.3.5","since":"162.0","until":"211.*","originalSince":"162.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"1.2.0+3","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.android.tool.sizereduction.plugin","version":"0.3.0","since":"181.0","until":"192","originalSince":"181.0","originalUntil":null},{"id":"com.android.tool.sizereduction.plugin","version":"0.3.0","since":"181.0","until":"192","originalSince":"181.0","originalUntil":null},{"id":"io.github.likeanowl.topias","version":"1.0.3","since":"183.2940.10","until":"191.*","originalSince":"183.2940.10","originalUntil":null},{"id":"io.github.likeanowl.topias","version":"1.0.3b","since":"183.2940.10","until":"191.*","originalSince":"183.2940.10","originalUntil":null},{"id":"com.longforus.mvpautocodeplus","version":"1.4","since":"173.0","until":"213","originalSince":"173.0","originalUntil":null},{"id":"com.fabio","version":"1.1","since":"135.0","until":"","originalSince":"121.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"2.2.0","since":"182.711","until":"202.*","originalSince":"182.711","originalUntil":null},{"id":"io.github.likeanowl.topias","version":"1.0.4","since":"183.2940.10","until":"191.*","originalSince":"183.2940.10","originalUntil":null},{"id":"com.github.shiraji.yaemoji","version":"1.0.3","since":"181.5087","until":"223","originalSince":"181.5087","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.36.0","since":"183.5912.21","until":"223.*","originalSince":"183.5912.21","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.37.0","since":"183.5912.21","until":"223.*","originalSince":"183.5912.21","originalUntil":null},{"id":"com.sofy.ai.ideaplugin","version":"1.2","since":"181.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"org.psliwa.idea.composer","version":"1.0.29","since":"191.0","until":"193.*","originalSince":"191.0","originalUntil":null},{"id":"shay.daniel.plugin.pysystemrunner","version":"7.1","since":"182.0","until":"203","originalSince":"182.0","originalUntil":null},{"id":"com.sofy.ai.ideaplugin","version":"1.2.1","since":"181.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"com.cybrosis.catdea","version":"1.1","since":"182.0","until":"202","originalSince":"182.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.6.4","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.5.0-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"io.heidou.codesearch","version":"1.0.0","since":"171.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.sofy.ai.ideaplugin","version":"1.2.2","since":"181.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.4.201906190638-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.4.201906190729-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"1.2.2","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"com.github.novotnyr.maven-version-idea-plugin","version":"2","since":"172.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.9.4","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"idea-yapi","version":"1.0","since":"171.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.170","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.4.201906200518-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"NevaRiver","version":"1.01","since":"191.1","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.6.5","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.5.1-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1423.9","since":"191.6183.87","until":"222","originalSince":"191.6183.87","originalUntil":null},{"id":"R4Intellij","version":"1.1","since":"145.258","until":"193.0","originalSince":"145.258","originalUntil":null},{"id":"MyBatisLogPlugin","version":"2.0.8","since":"191.0","until":"193.*","originalSince":"141.0","originalUntil":null},{"id":"com.github.shiraji.yaemoji","version":"1.0.4.1","since":"181.5087","until":"223","originalSince":"181.5087","originalUntil":null},{"id":"com.github.shiraji.yaemoji","version":"1.0.4","since":"181.5087","until":"223","originalSince":"181.5087","originalUntil":null},{"id":"tanvd.grazi","version":"2019.1-3.dev","since":"191.0","until":"191.*","originalSince":"191.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-3.dev","since":"192.0","until":"192.*","originalSince":"192.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.1-3.1.dev","since":"191.0","until":"191.*","originalSince":"191.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-3.1.dev","since":"192.0","until":"192.*","originalSince":"192.0","originalUntil":null},{"id":"com.dongqing.plugin.findviews","version":"1.0","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.dgtis.code.gen.plugin.code-gen-plugin","version":"5.0","since":"172.0","until":"","originalSince":"5.0","originalUntil":null},{"id":"com.demisto.demisto-plugin","version":"0.9.5","since":"182.711","until":"201.0","originalSince":"182.711","originalUntil":null},{"id":"reasonml","version":"0.78.1","since":"173.0","until":"180.*","originalSince":"173.0","originalUntil":null},{"id":"com.structure101.intellij.developer.plugin","version":"5.0.14538","since":"162.0","until":"202.*","originalSince":"162.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.4.201906240955-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"com.bytedance.jedi.jdt","version":"1.0.0-alpha","since":"173.0","until":"202","originalSince":"173.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.7.4","since":"191.5000","until":"192.*","originalSince":"191.5000","originalUntil":null},{"id":"EclipseCodeFormatter","version":"19.0.181.000.0-Eclipse_2019-06-JavaOnly","since":"181.0","until":"202","originalSince":"181.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.4.201906250548-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.5.201906250806-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"com.github.kisstkondoros.codemetrics","version":"1.0.0","since":"191.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.vultix.intellij-ron","version":"2019.01.01","since":"183.0","until":"191.0","originalSince":"183.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.5.201906250954-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"com.seventh7.widget.iedis2","version":"2019.2","since":"191.7479.19","until":"191.*","originalSince":"191.7479.19","originalUntil":"193.*"},{"id":"tanvd.grazi","version":"2019.1-3.2.dev","since":"191.0","until":"191.*","originalSince":"191.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-3.2.dev","since":"192.0","until":"192.*","originalSince":"192.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.5.201906261114-RELEASE","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"2019.2","since":"192.0","until":"211","originalSince":"192.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1561552950.913","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.9.5","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.seventh7.widget.iedis2","version":"2019.2.1","since":"191.7479.19","until":"191.*","originalSince":"191.7479.19","originalUntil":"193.*"},{"id":"com.vultix.intellij-ron","version":"2019.01.02","since":"183.0","until":"191.0","originalSince":"183.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.5.201906260743-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.commerce.integration","version":"2019.1","since":"191.0","until":"193","originalSince":"191.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"1.3.0+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1561578945.36","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.intellij.patch","version":"1.3.1","since":"173.0","until":"181.*","originalSince":"173.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.6.201906271146-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.6.201906270215-SNAPSHOT","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.6.6","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.4.6.201906270300-RELEASE","since":"145.0","until":"202","originalSince":"145.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.commerce.integration","version":"2019.2","since":"191.0","until":"193.*","originalSince":"191.0","originalUntil":null},{"id":"com.liferay.ide.intellij.plugin","version":"1.5.1","since":"182.0","until":"212.*","originalSince":"182.0","originalUntil":null},{"id":"idea-yapi","version":"1.0.1","since":"171.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1432.9","since":"191.6183.87","until":"222","originalSince":"191.6183.87","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1432.9","since":"191.6183.87","until":"222","originalSince":"191.6183.87","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"2019.2.1","since":"192.0","until":"211","originalSince":"192.0","originalUntil":null},{"id":"io.intino.plugin","version":"3.7.2","since":"182.0","until":"232.*","originalSince":"182.0","originalUntil":null},{"id":"com.softbank.robot.sdkplugin","version":"1.3.7","since":"162.0","until":"211.*","originalSince":"162.0","originalUntil":null},{"id":"com.vultix.intellij-ron","version":"2019.01.03","since":"183.0","until":"191.0","originalSince":"183.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.1-3.3.dev","since":"191.0","until":"191.*","originalSince":"191.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-3.3.dev","since":"192.0","until":"192.*","originalSince":"192.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.171","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.172","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"reasonml","version":"0.78.2","since":"173.0","until":"180.*","originalSince":"173.0","originalUntil":null},{"id":"com.flipkart.dsp.dark.pheonix","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.9.6","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.seventh7.widget.iedis2","version":"2019.2.2","since":"191.7478.19","until":"191.*","originalSince":"191.7478.19","originalUntil":"193.*"},{"id":"IdeaVIM","version":"0.51.4","since":"183.2940.10","until":"201","originalSince":"183.2940.10","originalUntil":null},{"id":"io.intino.plugin","version":"3.7.3","since":"182.0","until":"232.*","originalSince":"182.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.3","since":"139.1603","until":"203.*","originalSince":"139.1603","originalUntil":null},{"id":"rest.bef","version":"1.0","since":"183.0","until":"183.*","originalSince":"160.*","originalUntil":"183.*"},{"id":"tanvd.grazi","version":"2019.2-3.4.dev","since":"192.0","until":"192.*","originalSince":"192.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.9.7","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"jebe.liao.JBLLoveShortCut","version":"1.0","since":"143.0","until":"","originalSince":"133.0","originalUntil":null},{"id":"csense-idea.kotlin-checked-exceptions","version":"1.0-SNAPSHOT","since":"183.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"csense-idea.kotlin-checked-exceptions","version":"0.7","since":"183.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.bytedance.jedi.jdt","version":"1.0.0-alpha-1","since":"173.0","until":"202","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1437.9","since":"191.6183.87","until":"222","originalSince":"191.6183.87","originalUntil":null},{"id":"com.jetbrains.CyanTheme","version":"1.1","since":"191.0","until":"201","originalSince":"191.0","originalUntil":null},{"id":"com.jetbrains.darkPurpleTheme","version":"1.1","since":"191.0","until":"201","originalSince":"191.0","originalUntil":null},{"id":"com.github.shiraji.yaemoji","version":"1.0.5","since":"181.5087","until":"223","originalSince":"181.5087","originalUntil":null},{"id":"net.aquadc.mike.plugin","version":"0.1-SNAPSHOT","since":"182.0","until":"221.*","originalSince":"182.0","originalUntil":null},{"id":"JRebelPlugin","version":"2019.1.4","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"net.aquadc.mike.plugin","version":"0.2","since":"182.0","until":"221.*","originalSince":"182.0","originalUntil":null},{"id":"com.vultix.intellij-ron","version":"2019.01.04","since":"183.0","until":"191.0","originalSince":"183.0","originalUntil":null},{"id":"com.jetbrains.CyanTheme","version":"1.1.1","since":"191.0","until":"201","originalSince":"191.0","originalUntil":null},{"id":"com.cybrosis.catdea","version":"1.1.1","since":"182.0","until":"202","originalSince":"182.0","originalUntil":null},{"id":"CUBA","version":"11.0-183","since":"183.4284.148","until":"211","originalSince":"183.4284.148","originalUntil":null},{"id":"com.jetbrains.edu","version":"2.7-2019.2-2140","since":"192.5281","until":"192.5281","originalSince":"192.5281","originalUntil":"193.*"},{"id":"CUBA","version":"11.0-183","since":"183.4284.148","until":"211","originalSince":"183.4284.148","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"7.2","since":"183.2153.8","until":"183.*","originalSince":"183.2153.8","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"4.3.0.final","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.3.3","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"com.deadlock.scsyntax","version":"1.0.9","since":"183.0","until":"201","originalSince":"183.0","originalUntil":null},{"id":"net.aquadc.mike.plugin","version":"0.3","since":"182.0","until":"221.*","originalSince":"182.0","originalUntil":null},{"id":"com.crashlytics.tools.androidstudio","version":"4.4.0","since":"130.677","until":"181.*","originalSince":"130.677","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.6.7","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"1.3.1+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"DafnyPlugin4Intellij.DafnyPlugin4Intellij","version":"1.0","since":"191.0","until":"","originalSince":"UI-191.0","originalUntil":null},{"id":"fortify.fod","version":"19.2.1063","since":"162.0","until":"213.*","originalSince":"162.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.6.8","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.173","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"org.nxt.plugin.kitfox","version":"1.0.0-RELEASE","since":"172.0","until":"201.*","originalSince":"172.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.174","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.squareup.sqldelight","version":"1.1.4","since":"145.0","until":"232.*","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.5.2-idea14","since":"139.0","until":"201","originalSince":"139.0","originalUntil":null},{"id":"Struts Assistant","version":"192.8","since":"192.1","until":"193.1580","originalSince":"192.1","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.07.11.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.darkyen.wemi.intellij","version":"0.9","since":"181.0","until":"211","originalSince":"171.0","originalUntil":null},{"id":"org.elm.klazuka","version":"3.2.0","since":"182.3684.2","until":"193.*","originalSince":"182.3684.2","originalUntil":null},{"id":"net.aquadc.mike.plugin","version":"0.4","since":"182.0","until":"221.*","originalSince":"182.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1437.9","since":"191.6183.87","until":"222","originalSince":"191.6183.87","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.3.4","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"com.sgaop.codegenerat.nutzfw","version":"1.0.8.fix","since":"183.0","until":"231.*","originalSince":"183.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"3.0","since":"162.0","until":"211.*","originalSince":"162.0","originalUntil":null},{"id":"training","version":"SNAPSHOT.713","since":"191.6183","until":"201","originalSince":"191.6183","originalUntil":null},{"id":"jp.ikeponias","version":"1.0.2","since":"150.0","until":"203","originalSince":"150.0","originalUntil":null},{"id":"intellij-scheme","version":"0.1.6","since":"103.72","until":"193","originalSince":"103.72","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.07.14.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"DafnyPlugin4Intellij.DafnyPlugin4Intellij","version":"1.0.1","since":"191.0","until":"","originalSince":"UI-191.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.3.5","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"com.zhenai.lib.ZhenaiLintPlugin","version":"1.0.0","since":"172.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"training","version":"SNAPSHOT.715","since":"191.6183","until":"201","originalSince":"191.6183","originalUntil":null},{"id":"com.zhenai.lib.ZhenaiLintPlugin","version":"1.0.1","since":"172.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.3.6","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"3.0.1","since":"162.0","until":"211.*","originalSince":"162.0","originalUntil":null},{"id":"com.android.aas","version":"2.0.0","since":"182.5107","until":"192.7142","originalSince":"AI-182.5107.16","originalUntil":null},{"id":"com.bytedance.jedi.jdt","version":"1.0.0","since":"173.0","until":"202","originalSince":"173.0","originalUntil":null},{"id":"com.bytedance.jedi.jdt","version":"1.0.1","since":"173.0","until":"202","originalSince":"173.0","originalUntil":null},{"id":"org.slayer.testLinkIntegration","version":"3.0.2","since":"162.0","until":"211.*","originalSince":"162.0","originalUntil":null},{"id":"com.bytedance.jedi.jdt","version":"1.0.2","since":"173.0","until":"202","originalSince":"173.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.6.9","since":"192.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"org.elm.klazuka","version":"3.2.1","since":"182.3684.2","until":"193.*","originalSince":"182.3684.2","originalUntil":null},{"id":"io.cacher.intellij","version":"1.0.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"1.3.2+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"4.3.1","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.7.0","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"DafnyPlugin4Intellij.DafnyPlugin4Intellij","version":"1.0.2","since":"191.0","until":"","originalSince":"UI-191.0","originalUntil":null},{"id":"com.bytedance.jedi.jdt","version":"1.0.3","since":"173.0","until":"202","originalSince":"173.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-3.5.dev","since":"192.3645","until":"192.*","originalSince":"192.3645","originalUntil":null},{"id":"IdeaVIM","version":"0.51.5","since":"183.2940.10","until":"201","originalSince":"183.2940.10","originalUntil":null},{"id":"OdpsStudio","version":"3.2.1","since":"141.0","until":"231.*","originalSince":"141.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.16-20190719.184131","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.github.bjansen.intellij.pebble","version":"0.6","since":"173.0","until":"212.*","originalSince":"173.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"1.3.3+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"io.github.QCute.CodeCase","version":"1.0.1","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-3.6.dev","since":"192.3645","until":"192.*","originalSince":"192.3645","originalUntil":null},{"id":"de.espend.idea.php.generics","version":"0.1.0","since":"191.0","until":"203","originalSince":"191.0","originalUntil":null},{"id":"org.liujing.plugin.json_serializable_format","version":"1.0","since":"135.0","until":"","originalSince":"107.121","originalUntil":null},{"id":"vette.neos","version":"1.1.0","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"org.liujing.plugin.json_serializable_format","version":"1.0.1","since":"135.0","until":"","originalSince":"107.121","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.07.21.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"cn.yiiguxing.plugin.translate","version":"2.3.7","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"io.intino.plugin","version":"4.0.0","since":"182.0","until":"232.*","originalSince":"182.0","originalUntil":null},{"id":"net.aquadc.mike.plugin","version":"0.5","since":"182.0","until":"221.*","originalSince":"182.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-3.7.dev","since":"192.3645","until":"192.*","originalSince":"192.3645","originalUntil":null},{"id":"NodeJS","version":"192.5728.87","since":"192.5728","until":"192.5728","originalSince":"192.5728","originalUntil":"192.*"},{"id":"DafnyPlugin4Intellij.DafnyPlugin4Intellij","version":"1.0.3","since":"191.0","until":"","originalSince":"UI-191.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-3.stable","since":"192.3645","until":"192.*","originalSince":"192.3645","originalUntil":null},{"id":"training","version":"SNAPSHOT.734","since":"192.5728","until":"201","originalSince":"192.5728","originalUntil":null},{"id":"training","version":"192.5728.1","since":"192.5728","until":"201","originalSince":"192.5728","originalUntil":null},{"id":"training","version":"192.5728.2","since":"192.5728","until":"201","originalSince":"192.5728","originalUntil":null},{"id":"training","version":"192.5728.3","since":"192.5728","until":"192.*","originalSince":"192.5728","originalUntil":null},{"id":"com.vultix.intellij-ron","version":"2019.01.05","since":"183.0","until":"191.0","originalSince":"183.0","originalUntil":null},{"id":"com.netease.newsreader.plugin","version":"1.0","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"me.xiongjinteng.plugin.xbatis","version":"1.r.4","since":"182.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.81.1","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"IdeaVIM","version":"0.52","since":"183.2940.10","until":"201","originalSince":"183.2940.10","originalUntil":null},{"id":"IdeaVIM","version":"0.52","since":"183.2940.10","until":"201","originalSince":"183.2940.10","originalUntil":null},{"id":"io.github.QCute.RecordCompletion","version":"1.0.0","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"io.github.QCute.CodeCase","version":"1.0.2","since":"173.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"design.verybeautiful.onedarkmonokai","version":"0.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"MyBatisLogPlugin","version":"2.0.9","since":"191.0","until":"193.*","originalSince":"141.0","originalUntil":null},{"id":"design.verybeautiful.onedarkmonokai","version":"0.1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"design.verybeautiful.onedarkmonokai","version":"0.1.2","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"design.verybeautiful.onedarkmonokai","version":"0.1.3","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.typ0520.jsontodart","version":"1.0.8","since":"171.3780","until":"192.*","originalSince":"171.3780","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.7.1","since":"171.0","until":"193.*","originalSince":"171.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.7.2","since":"183.3975.13","until":"193.*","originalSince":"183.3975.13","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.175","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.netease.newsreader.plugin","version":"1.1","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"com.netease.newsreader.plugin","version":"1.2","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.38.0","since":"183.5912.21","until":"223.*","originalSince":"183.5912.21","originalUntil":null},{"id":"org.avaje.ebean11.enhancer","version":"11.41.4","since":"171.0","until":"","originalSince":"161.0","originalUntil":null},{"id":"org.jspresso.plugin.ijds","version":"2.81.2","since":"141.0","until":"201.*","originalSince":"141.0","originalUntil":null},{"id":"ccom.intellij.idea.plugin.hybris.impex","version":"2019.2.3","since":"192.0","until":"211","originalSince":"192.0","originalUntil":null},{"id":"lsfusion.idea.plugin","version":"1.0.176","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.7.3","since":"183.3975.13","until":"193.*","originalSince":"183.3975.13","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"1.3.4+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"me.ely.kodegen","version":"0.1.1","since":"181.0","until":"231.*","originalSince":"181.0","originalUntil":null},{"id":"me.ely.codegen","version":"0.1.1","since":"181.0","until":"231.*","originalSince":"181.0","originalUntil":null},{"id":"com.atlassian.bitbucket.references","version":"7.3","since":"183.2153.8","until":"183.*","originalSince":"183.2153.8","originalUntil":null},{"id":"com.codota.csp.intellij","version":"2.9.8","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"org.moe.community","version":"1.4.5","since":"162.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"com.bytedance.jedi.jdt","version":"1.0.4","since":"173.0","until":"202","originalSince":"173.0","originalUntil":null},{"id":"com.suiyiwen.plugin.idea.apidoc","version":"2.0","since":"192.0","until":"193.*","originalSince":"192.0","originalUntil":null},{"id":"CUBA","version":"11.1-183","since":"183.4284.148","until":"211","originalSince":"183.4284.148","originalUntil":null},{"id":"CUBA","version":"11.1-183","since":"183.4284.148","until":"211","originalSince":"183.4284.148","originalUntil":null},{"id":"de.halirutan.mathematica","version":"2019.2","since":"192.0","until":"192.*","originalSince":"191.0","originalUntil":"192.*"},{"id":"cn.yiiguxing.plugin.translate","version":"2.3.8","since":"171.0","until":"223.*","originalSince":"171.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-4.1.dev","since":"192.3645","until":"192.*","originalSince":"192.3645","originalUntil":null},{"id":"com.deepexi.plugin.mapper-scan","version":"1.0.1","since":"172.0","until":"222.*","originalSince":"145.0","originalUntil":null},{"id":"net.jangaroo.idea.4","version":"4.0.18","since":"163.7743","until":"181.0","originalSince":"IU-163.7743.44","originalUntil":"IU-181.0"},{"id":"net.jangaroo.idea.4","version":"4.2018.18","since":"181.0","until":"","originalSince":"IU-181.0","originalUntil":null},{"id":"net.jangaroo.idea.4","version":"4.0.19","since":"163.7743","until":"181.0","originalSince":"IU-163.7743.44","originalUntil":"IU-181.0"},{"id":"net.jangaroo.idea.4","version":"4.2018.19","since":"181.0","until":"","originalSince":"IU-181.0","originalUntil":null},{"id":"tech.lnkd.LNKD-tech-Editor","version":"0.5-EARLY_ACCESS","since":"192.5728.12","until":"194.*","originalSince":"192.5728.12","originalUntil":null},{"id":"de.lukweb.discordbeam","version":"1.01","since":"183.4284.148","until":"192.*","originalSince":"183.4284.148","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.0.0-rc.8","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.7.5","since":"191.5000","until":"192.*","originalSince":"191.5000","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.16-20190731.172226","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"DafnyPlugin4Intellij.DafnyPlugin4Intellij","version":"1.0.4","since":"191.0","until":"","originalSince":"UI-191.0","originalUntil":null},{"id":"tk.cofedream.plugin.mybatis","version":"1.3.0","since":"183.0","until":"183.*","originalSince":"183.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"4.3.2","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"de.halirutan.mathematica","version":"2019.2.1","since":"192.0","until":"192.*","originalSince":"191.0","originalUntil":"192.*"},{"id":"com.codota.csp.intellij","version":"2.9.9","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"cn.ivhik.wyb.intellij.plugin","version":"1.4","since":"171.0","until":"211.*","originalSince":"171.0","originalUntil":null},{"id":"io.ktor.intellij.plugin","version":"1.2.3","since":"170.0","until":"201","originalSince":"170.0","originalUntil":null},{"id":"IdeaVIM","version":"0.52.1","since":"183.2940.10","until":"201","originalSince":"183.2940.10","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.0.0-rc.9","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.9.1-SNAPSHOT-1564684254.745","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.16-20190801.204518","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.16-20190801.211336","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"2.0.0+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.vladsch.idea.multimarkdown","version":"2.9.0","since":"173.2463","until":"183.*","originalSince":"173.2463","originalUntil":"191.*"},{"id":"com.illuminatedcloud2.intellij","version":"2.0.7.4","since":"183.3975.13","until":"193.*","originalSince":"183.3975.13","originalUntil":null},{"id":"rest.bef","version":"1.1","since":"172.0","until":"183.*","originalSince":"160.*","originalUntil":"183.*"},{"id":"org.jspresso.plugin.ijds","version":"2.82.0","since":"191.0","until":"201.*","originalSince":"191.0","originalUntil":null},{"id":"com.vladsch.idea.multimarkdown","version":"2.9.7","since":"192.0","until":"212.0","originalSince":"192.0","originalUntil":null},{"id":"com.adebesin.spacemacs","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-4.2.dev","since":"192.3645","until":"192.*","originalSince":"192.3645","originalUntil":null},{"id":"io.ballerina","version":"1.0.0-alpha","since":"183.0","until":"193","originalSince":"183.0","originalUntil":null},{"id":"com.demisto.demisto-plugin","version":"0.9.6","since":"182.711","until":"201.0","originalSince":"182.711","originalUntil":null},{"id":"com.antoshk.jsf-el-extension-plugin","version":"0.1","since":"181.0","until":"192.0","originalSince":"171.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.08.04.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-4.stable","since":"192.3645","until":"192.*","originalSince":"192.3645","originalUntil":null},{"id":"com.gentrio.runscriptplugin","version":"1.1","since":"171.0","until":"201.0","originalSince":"171.0","originalUntil":null},{"id":"com.netease.newsreader.plugin","version":"1.3","since":"141.0","until":"211","originalSince":"141.0","originalUntil":null},{"id":"io.github.lizhangqu.intellij.plugin.android.bundle","version":"1.0.6","since":"182.5107","until":"191.*","originalSince":"AI-182.5107","originalUntil":"AI-191.*"},{"id":"com.github.zxj5470.wxapp","version":"0.2.10","since":"172.0","until":"202.*","originalSince":"172.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.17","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.18-20190805.145722","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.0.0-rc.10","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"J2ME","version":"192.5","since":"192.1","until":"201","originalSince":"192.1","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.3.1-SNAPSHOT-1565093500.238","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.7.5","since":"183.3975.13","until":"193.*","originalSince":"183.3975.13","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"2.0.1+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"2.0.1+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.sunny.plugin.MockitoGenPlugin","version":"1.3","since":"163.0","until":"","originalSince":"131.0","originalUntil":null},{"id":"com.huawei.ide","version":"2.0.2019060","since":"181.0","until":"201.*","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.39.0","since":"183.5912.21","until":"223.*","originalSince":"183.5912.21","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.3.1","since":"139.1603","until":"203.*","originalSince":"139.1603","originalUntil":null},{"id":"org.avaje.ebean11.enhancer","version":"11.42.3","since":"171.0","until":"","originalSince":"161.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.40.0","since":"191.8026.42","until":"223.*","originalSince":"191.8026.42","originalUntil":null},{"id":"io.intino.plugin","version":"4.0.1","since":"192.0","until":"232.*","originalSince":"192.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.41.0","since":"191.8026.42","until":"223.*","originalSince":"191.8026.42","originalUntil":null},{"id":"IdeaVIM","version":"0.53","since":"183.2940.10","until":"201","originalSince":"183.2940.10","originalUntil":null},{"id":"IdeaVIM","version":"0.53","since":"183.2940.10","until":"201","originalSince":"183.2940.10","originalUntil":null},{"id":"training","version":"192.5728.4","since":"192.5728","until":"201","originalSince":"192.5728","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.18-20190807.140441","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"3.0.0","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.vladsch.git-file-case-fixer","version":"1.0.16","since":"163.15529","until":"202.*","originalSince":"163.15529","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.18-20190807.171316","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.18-20190807.175223","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.08.07.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"cn.sugarapp.plugins.yaml2props","version":"1.0.1","since":"173.0","until":"232","originalSince":"173.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.3.1-SNAPSHOT-1565269337.558","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.20-20190808.142432","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.19","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.0.0-rc.11","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"JRebelPlugin","version":"2019.1.5","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.heytea.plugin.ccg","version":"1.0.0","since":"172.0","until":"","originalSince":"123.72","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1467.9","since":"191.6183.87","until":"222","originalSince":"191.6183.87","originalUntil":null},{"id":"com.illuminatedcloud.intellij","version":"1.8.5.3-idea19","since":"192.0","until":"201","originalSince":"192.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.7.6","since":"183.3975.13","until":"193.*","originalSince":"183.3975.13","originalUntil":null},{"id":"fortify.fod","version":"19.3.2005","since":"162.0","until":"213.*","originalSince":"162.0","originalUntil":null},{"id":"me.ely.kodegen","version":"0.2","since":"181.0","until":"231.*","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.20-20190810.014531","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.20-20190810.022152","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.sunny.plugin.MockitoGenPlugin","version":"1.3.1","since":"163.0","until":"","originalSince":"131.0","originalUntil":null},{"id":"com.kenshoo.logzio-intellij-plugin","version":"1.0.8","since":"171.0","until":"192.*","originalSince":"163.15529","originalUntil":"192.*"},{"id":"com.bytedance.jedi.jdt","version":"1.0.5","since":"173.0","until":"202","originalSince":"173.0","originalUntil":null},{"id":"org.avaje.ebean11.enhancer","version":"11.42.4","since":"171.0","until":"","originalSince":"161.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.21","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.22-20190812.143216","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"tv.twelvetone.intellij.plugins.intellivue","version":"1.0.0-rc.12","since":"173.0","until":"201","originalSince":"173.0","originalUntil":null},{"id":"vette.neos","version":"1.1.1","since":"145.0","until":"203.3645.34","originalSince":"145.0","originalUntil":null},{"id":"com.koxudaxi.pydantic","version":"0.0.11","since":"192.0","until":"211.*","originalSince":"192.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.22-20190812.203548","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.fireline.plugin.id","version":"1.7.2","since":"141.0","until":"181","originalSince":"141.0","originalUntil":null},{"id":"synergix.plugin.intellj","version":"2.0","since":"191.0","until":"193.*","originalSince":"191.0","originalUntil":null},{"id":"com.sogou.adstream.code-sync","version":"0.0.1","since":"183.0","until":"201.*","originalSince":"183.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.3.1-SNAPSHOT-1565696143.44","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"detekt","version":"0.3.1","since":"171.0","until":"","originalSince":"131.0","originalUntil":null},{"id":"com.vaadin.designer2.intellij","version":"4.3.3","since":"145.0","until":"181.*","originalSince":"145.0","originalUntil":null},{"id":"org.broadinstitute.wdl.devtools","version":"0.0.59","since":"172.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"com.rickykurt.plugin.vant","version":"1.0.2","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"woainikk.kotlinizing-statistics","version":"1.2","since":"143.0","until":"","originalSince":"141.0","originalUntil":null},{"id":"com.jetbrains.fast.mouse.scroll","version":"1.4","since":"191.4212.41","until":"201","originalSince":"191.4212.41","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.22-20190814.121641","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"4.3.4","since":"192.6262","until":"192.*","originalSince":"192.5728.12","originalUntil":"192.*"},{"id":"com.koxudaxi.pydantic","version":"0.0.12","since":"192.0","until":"211.*","originalSince":"192.0","originalUntil":null},{"id":"org.broadinstitute.wdl.devtools","version":"0.0.60","since":"172.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"com.jetbrains.intellij.api.watcher","version":"6.42.0","since":"191.8026.42","until":"223.*","originalSince":"191.8026.42","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.3.1-SNAPSHOT-1565814992.142","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.phpinnacle.redoc","version":"0.3","since":"182.0","until":"201.*","originalSince":"182.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.3.1-SNAPSHOT-1565874031.176","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.7.7","since":"183.3975.13","until":"193.*","originalSince":"183.3975.13","originalUntil":null},{"id":"org.elixir_lang","version":"11.0.0","since":"192.4820","until":"211.*","originalSince":"192.4820","originalUntil":null},{"id":"org.broadinstitute.wdl.devtools","version":"0.0.64","since":"172.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1467.9","since":"191.6183.87","until":"222","originalSince":"191.6183.87","originalUntil":null},{"id":"com.jetbrains.upsource","version":"2019.1.1473.9","since":"191.6183.87","until":"222","originalSince":"191.6183.87","originalUntil":null},{"id":"org.semonte.intellij.swagger","version":"1.0.0","since":"183.0","until":"193.0","originalSince":"183.0","originalUntil":null},{"id":"org.elixir_lang","version":"11.0.1","since":"192.4820","until":"211.*","originalSince":"192.4820","originalUntil":null},{"id":"com.koxudaxi.pydantic","version":"0.0.13","since":"192.0","until":"211.*","originalSince":"192.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.22-20190816.192705","since":"181.0","until":"213","originalSince":"181.0","originalUntil":null},{"id":"org.broadinstitute.wdl.devtools","version":"0.0.65","since":"172.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"com.vultix.intellij-ron","version":"2019.02.01","since":"191.0","until":"193.0","originalSince":"191.0","originalUntil":null},{"id":"reasonml","version":"0.78.3","since":"173.0","until":"180.*","originalSince":"173.0","originalUntil":null},{"id":"reasonml","version":"0.78.4","since":"173.0","until":"180.*","originalSince":"173.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.08.17.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.werfad","version":"1.0.0","since":"171.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.andrey4623.rainbowcsv","version":"1.0","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.08.18.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"signal9.icon-java-plugin","version":"1.1-SNAPSHOT","since":"173.2147483647","until":"201.0","originalSince":"173.*","originalUntil":null},{"id":"com.neueda4j.intellij.plugin.cypher","version":"2.5.6","since":"192.0","until":"201","originalSince":"192.0","originalUntil":null},{"id":"com.yyh.filter","version":"0.0.1","since":"183.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.koxudaxi.pydantic","version":"0.0.14","since":"192.0","until":"211.*","originalSince":"192.0","originalUntil":null},{"id":"org.semonte.intellij.swagger","version":"1.0.1","since":"183.0","until":"193.0","originalSince":"183.0","originalUntil":null},{"id":"lv.midiana.misc.idea-plugins.deep-js-completion","version":"2019.08.19.001","since":"182.3569.36","until":"211","originalSince":"182.3569.36","originalUntil":null},{"id":"com.sunny.plugin.MockitoGenPlugin","version":"1.4.0","since":"163.0","until":"","originalSince":"131.0","originalUntil":null},{"id":"org.avaje.ebean11.enhancer","version":"11.43.2","since":"171.0","until":"","originalSince":"161.0","originalUntil":null},{"id":"com.yyh.filter","version":"0.0.2","since":"183.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.illuminatedcloud2.intellij","version":"2.0.7.8","since":"183.3975.13","until":"193.*","originalSince":"183.3975.13","originalUntil":null},{"id":"com.jfrog.conan.clion","version":"1.1.2","since":"180.0","until":"222","originalSince":"180.0","originalUntil":null},{"id":"com.github.mustfun.plugin.mybatis","version":"1.0.12","since":"182.3684","until":"192.0","originalSince":"182.3684","originalUntil":null},{"id":"com.codestream.jetbrains-codestream","version":"2.1.0+1","since":"182.2371.4","until":"231.*","originalSince":"182.2371.4","originalUntil":null},{"id":"com.evolitist.ev3c","version":"0.8.2","since":"190.0","until":"199.0","originalSince":"CL-190.0","originalUntil":"CL-199.0"},{"id":"lsfusion.idea.plugin","version":"1.0.177","since":"171.3780.107","until":"213","originalSince":"171.3780.107","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"1.4","since":"162.0","until":"203.*","originalSince":"139.1603","originalUntil":null},{"id":"tanvd.grazi","version":"2019.2-5.1.dev","since":"192.3645","until":"192.*","originalSince":"192.3645","originalUntil":null},{"id":"com.hpe.adm.octane.ideplugins.intellij","version":"2016.3-12.60.60.1","since":"191.0","until":"","originalSince":"163.0","originalUntil":null},{"id":"com.codota.csp.intellij","version":"3.0.1","since":"171.0","until":"211.0","originalSince":"171.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.3.1-SNAPSHOT-1566402950.961","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.3.1-SNAPSHOT-1566406991.599","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"org.dimdev.knit","version":"2.0","since":"190.0","until":"999.*","originalSince":"190.0","originalUntil":"1000.*"},{"id":"leetcode-editor","version":"5.0","since":"163.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"com.andrey4623.rainbowcsv","version":"1.1","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.kassak.dg-test-helper","version":"0.01","since":"193.0","until":"993.0","originalSince":"171.0","originalUntil":"993.0"},{"id":"color.scheme.GapStyle","version":"2.3","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"rest.bef","version":"1.2","since":"172.0","until":"183.*","originalSince":"160.*","originalUntil":"183.*"},{"id":"leetcode-editor","version":"5.1","since":"163.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"kaboyi.ideaplugins.wordcount","version":"1.0","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.alipay.antcloud.ide","version":"1.0.13","since":"183.0","until":"201","originalSince":"143.0","originalUntil":null},{"id":"dev.blachut.svelte.lang","version":"0.9.0","since":"192.0","until":"201.0","originalSince":"191.0","originalUntil":"201.0"},{"id":"com.airsaid.InspireWriting","version":"1.0.1","since":"172.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"myBitbucket","version":"0.3","since":"171.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"JRebelPlugin","version":"2019.1.6","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.microfocus.intellij.plugin.gitclient","version":"1.1.0","since":"182.0","until":"193.*","originalSince":"180.0","originalUntil":"193.9999"},{"id":"rest.bef","version":"1.3","since":"172.0","until":"191.*","originalSince":"160.*","originalUntil":"191.*"},{"id":"site.forgus.plugins.api-generator","version":"2.0","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"manifold.ij","version":"2019.1.14","since":"181.0","until":"192.0","originalSince":"173.0","originalUntil":"999.*"},{"id":"com.zephir","version":"0.3.3","since":"141.0","until":"","originalSince":"130.1","originalUntil":null},{"id":"org.teavm.idea","version":"0.6.0","since":"172.0","until":"","originalSince":"163.9166.7","originalUntil":null},{"id":"com.villains.intelij.plugin.trashpandatheme","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.kassak.dg-test-helper","version":"0.02","since":"193.0","until":"993.0","originalSince":"171.0","originalUntil":"993.0"},{"id":"io.paleocrafter.chronomorph","version":"2019.2-0.2.0","since":"183.0","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"4.5","since":"192.6603","until":"192.*","originalSince":"192.6262.7","originalUntil":"192.*"},{"id":"com.villains.intelij.plugin.trashpandatheme","version":"1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.airsaid.InspireWriting","version":"1.0.2","since":"172.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"com.intellij.plugins.visualstudiokeymap","version":"1.0.0","since":"201.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.11","since":"173.0","until":"193","originalSince":"172.0","originalUntil":null},{"id":"co.nums.intellij.aem","version":"0.11.1","since":"173.0","until":"193","originalSince":"172.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.3.1-SNAPSHOT-1568804120.493","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"com.badoo.ribs.intellij-plugin","version":"0.3.1-SNAPSHOT-1568815603.957","since":"182","until":"201","originalSince":"163.0","originalUntil":null},{"id":"io.github.xiaopihai7256","version":"0.1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"io.github.xiaopihai7256","version":"0.1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"kaboyi.ideaplugins.wordcount","version":"1.1","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.heytea.plugin.ccg","version":"1.1.0","since":"191.0","until":"","originalSince":"172.0","originalUntil":null},{"id":"io.github.xiaopihai7256","version":"0.2.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.zalesskyi.csv_translator","version":"1.0","since":"172.0","until":"","originalSince":"139.1603","originalUntil":null},{"id":"JRebelPlugin","version":"2019.2.0","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"MIFCMNotification.MIFCMNotification","version":"0.1","since":"182.0","until":"191.*","originalSince":"172.0","originalUntil":null},{"id":"com.intellij.plugins.netbeanskeymap","version":"2.0.0","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"com.zalesskyi.csv_translator","version":"1.0.1","since":"172.0","until":"","originalSince":"139.1603","originalUntil":null},{"id":"com.zalesskyi.csv_translator","version":"1.0.2","since":"172.0","until":"","originalSince":"IU-171.4694.73","originalUntil":null},{"id":"leetcode-editor","version":"5.2","since":"163.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"com.intellij.plugins.eclipsekeymap","version":"193.4089","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"com.intellij.plugins.netbeanskeymap","version":"193.4089","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"com.intellij.plugins.sublimetextkeymap","version":"193.4089","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"com.intellij.plugins.visualstudiokeymap","version":"193.4089","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"com.intellij.plugins.emacskeymap","version":"193.4106","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"com.intellij.plugins.gnomekeymap","version":"193.4106","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"com.intellij.plugins.kdekeymap","version":"193.4106","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"com.intellij.plugins.xwinkeymap","version":"193.4106","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"shirotelinintellij.yasukotelin.com.github","version":"1.2.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"net.antelle.intellij-xcode-dark-theme","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"WxbYapiUpload","version":"2.0.0","since":"162.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"shirotelinintellij.yasukotelin.com.github","version":"1.2.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.malbul.idea.theme.breath","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.android.aas","version":"3.0.0","since":"182.5107","until":"192.7142","originalSince":"AI-182.5107.16","originalUntil":null},{"id":"com.wrike.plugin.intellij","version":"0.14.7","since":"172.0","until":"211.*","originalSince":"131.0","originalUntil":null},{"id":"cn.vove7.ide.plugin.eventbus_navigator","version":"1.0","since":"191.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"site.forgus.plugins.api-generator","version":"3.0.0","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"cn.vove7.ide.plugin.eventbus_navigator","version":"1.1","since":"191.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"cn.vove7.ide.plugin.eventbus_navigator","version":"1.1.0","since":"191.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"site.forgus.plugins.api-generator","version":"3.1.0","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"site.forgus.plugins.api-generator","version":"3.1.1","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.pandora.plugins.kotlin_converter","version":"0.4.1","since":"172.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"site.forgus.plugins.api-generator","version":"3.2.1","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"pl.dominikw.Windchill-Intellij-Plugin","version":"0.3.0","since":"192.0","until":"192.*","originalSince":"191.0","originalUntil":"192.*"},{"id":"site.forgus.plugins.api-generator","version":"3.3.1","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"site.forgus.plugins.api-generator","version":"3.3.2","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"site.forgus.plugins.api-generator","version":"3.3.3","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"leetcode-editor","version":"5.4","since":"163.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"site.forgus.plugins.api-generator","version":"3.3.5","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"WxbYapiUpload","version":"2.0.1","since":"162.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"site.forgus.plugins.api-generator","version":"3.3.7","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"site.forgus.plugins.api-generator","version":"3.3.8","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"site.forgus.plugins.api-generator","version":"3.3.11","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"shirotelinintellij.yasukotelin.com.github","version":"1.3.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"cn.vove7.ide.plugin.eventbus_navigator","version":"1.2","since":"191.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"cn.vove7.ide.plugin.eventbus_navigator","version":"1.2.0","since":"191.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"manifold.ij","version":"2019.3.1","since":"193.0","until":"193.*","originalSince":"192.999","originalUntil":"193.*"},{"id":"cn.vove7.ide.plugin.eventbus_navigator","version":"1.2.2","since":"191.0","until":"211","originalSince":"172.0","originalUntil":null},{"id":"com.hrzntsudio.spatialos.intellij","version":"0.2","since":"182.0","until":"","originalSince":"141.0","originalUntil":null},{"id":"manifold.ij","version":"2019.3.2","since":"193.0","until":"193.*","originalSince":"192.999","originalUntil":"193.*"},{"id":"site.forgus.plugins.api-generator","version":"3.5.0","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"site.forgus.plugins.api-generator","version":"3.5.1","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"site.forgus.plugins.api-generator","version":"3.5.2","since":"181.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"palantir-java-format","version":"0.2.0","since":"193","until":"","originalSince":"173.0","originalUntil":null},{"id":"hebehan.easychangefontsize","version":"1.2","since":"171.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.jetbrains.hackathon.indices.viewer","version":"1.2","since":"192.0","until":"193.*","originalSince":"192.0","originalUntil":"201.*"},{"id":"palantir-java-format","version":"0.2.1","since":"193","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.reallyliri.plugins.interfacepairing","version":"1.1","since":"191.0","until":"","originalSince":"88.*","originalUntil":null},{"id":"com.intellij.plugins.watcher","version":"201.5","since":"201.5","until":"201.3802","originalSince":"201.5","originalUntil":"201.*"},{"id":"palantir-java-format","version":"0.2.2","since":"193","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.reallyliri.plugins.no-namespace-providers","version":"1.0","since":"182.0","until":"","originalSince":"88.*","originalUntil":null},{"id":"palantir-java-format","version":"0.2.3","since":"193","until":"","originalSince":"173.0","originalUntil":null},{"id":"palantir-java-format","version":"0.2.4","since":"193","until":"","originalSince":"173.0","originalUntil":null},{"id":"detekt","version":"0.3.2","since":"171.0","until":"","originalSince":"131.0","originalUntil":null},{"id":"palantir-java-format","version":"0.2.5","since":"193","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.drinchev.projectlabel","version":"1.0","since":"192.0","until":"232.*","originalSince":"141.0","originalUntil":null},{"id":"manifold.ij","version":"2019.3.3","since":"193.0","until":"193.*","originalSince":"192.999","originalUntil":"193.*"},{"id":"org.dandoh.favacts","version":"0.0.1","since":"192.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"com.reallyliri.plugins.no-namespace-providers","version":"1.2","since":"182.0","until":"","originalSince":"88.*","originalUntil":null},{"id":"se.fortnox.jbehavesinglescenario.jbehavesinglescenario","version":"2.0-SNAPSHOT","since":"183.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"palantir-java-format","version":"0.2.6","since":"193","until":"","originalSince":"173.0","originalUntil":null},{"id":"palantir-java-format","version":"0.2.7","since":"193","until":"","originalSince":"173.0","originalUntil":null},{"id":"palantir-java-format","version":"0.2.8","since":"193","until":"","originalSince":"173.0","originalUntil":null},{"id":"pl.dominikw.Windchill-Intellij-Plugin","version":"0.3.1","since":"192.0","until":"192.*","originalSince":"191.0","originalUntil":"192.*"},{"id":"se.fortnox.jbehavesinglescenario.jbehavesinglescenario","version":"2.1","since":"183.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.0","since":"193","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.intellij.plugins.eclipsekeymap","version":"193.4778.7","since":"201.0","until":"","originalSince":"193.4778","originalUntil":null},{"id":"com.intellij.plugins.emacskeymap","version":"193.4778.7","since":"201.0","until":"","originalSince":"193.4778","originalUntil":null},{"id":"com.intellij.plugins.gnomekeymap","version":"193.4778.7","since":"201.0","until":"","originalSince":"193.4778","originalUntil":null},{"id":"com.intellij.plugins.kdekeymap","version":"193.4778.7","since":"201.0","until":"","originalSince":"193.4778","originalUntil":null},{"id":"com.intellij.plugins.netbeanskeymap","version":"193.4778.7","since":"201.0","until":"","originalSince":"193.4778","originalUntil":null},{"id":"com.intellij.plugins.sublimetextkeymap","version":"193.4778.7","since":"201.0","until":"","originalSince":"193.4778","originalUntil":null},{"id":"com.intellij.plugins.visualstudiokeymap","version":"193.4778.7","since":"201.0","until":"","originalSince":"193.4778","originalUntil":null},{"id":"com.intellij.plugins.xwinkeymap","version":"193.4778.7","since":"201.0","until":"","originalSince":"193.4778","originalUntil":null},{"id":"shirotelinintellij.yasukotelin.com.github","version":"1.4.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"shirotelinintellij.yasukotelin.com.github","version":"1.4.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"id.mustofa.breeze-dark","version":"0.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.reallyliri.plugins.no-namespace-providers","version":"1.3","since":"182.0","until":"","originalSince":"88.*","originalUntil":null},{"id":"JRebelPlugin","version":"2019.2.1","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"manifold.ij","version":"2019.3.4","since":"193.0","until":"193.*","originalSince":"192.999","originalUntil":"193.*"},{"id":"com.intellij.plugins.netbeanskeymap","version":"193.4932.9","since":"201.0","until":"","originalSince":"193.4932","originalUntil":null},{"id":"com.intellij.plugins.macoskeymap","version":"193.4932.9","since":"201.0","until":"","originalSince":"193.4932","originalUntil":null},{"id":"io.github.lizhangqu.intellij.plugin.android.bundle","version":"1.0.7","since":"191.0","until":"195.*","originalSince":"AI-191.0","originalUntil":"AI-195.*"},{"id":"org.asciidoctor.intellij.asciidoc","version":"0.30.16","since":"182.5262","until":"","originalSince":"172.2465.6","originalUntil":null},{"id":"com.reallyliri.plugins.interfacepairing","version":"1.2","since":"191.0","until":"","originalSince":"88.*","originalUntil":null},{"id":"site.wangxing.plugin.format.field.pyramid","version":"1.0","since":"183.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.naixiaoxin.idea.hyperf","version":"1.0.0","since":"183.0","until":"","originalSince":"173.4127","originalUntil":null},{"id":"com.github.czy211.licensetemplate","version":"1.0.0","since":"192.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.asciidoctor.intellij.asciidoc","version":"0.30.18","since":"182.5262","until":"","originalSince":"172.2465.6","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"1.0.1","since":"172.0","until":"213.*","originalSince":"172.0","originalUntil":"300.0"},{"id":"artsiomch.cmake.plus","version":"193.1.1","since":"192.0","until":"193.5662","originalSince":"192.0","originalUntil":"194.0"},{"id":"palantir-java-format","version":"0.3.1","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.2","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"1.0.2","since":"182.0","until":"213.*","originalSince":"182.0","originalUntil":"300.0"},{"id":"kaboyi.ideaplugins.wordcount","version":"1.2","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"kaboyi.ideaplugins.wordcount","version":"1.2.1","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"kaboyi.ideaplugins.wordcount","version":"1.2.2","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"test-rail-plugin","version":"1.4.9","since":"192.0","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.dgtis.code.gen.plugin.code-gen-plugin","version":"6.0.1","since":"172.0","until":"","originalSince":"6.0","originalUntil":null},{"id":"test-rail-plugin","version":"1.5.0","since":"192.0","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.yiwowang.plugin.config","version":"1.0.0","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.bytedance.jedi.jdt","version":"1.0.8","since":"182.0","until":"202","originalSince":"173.0","originalUntil":null},{"id":"io.github.xiaopihai7256","version":"0.3.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"csense-idea.csense-kotlin-annotations","version":"0.1","since":"192.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.yiwowang.plugin.config","version":"1.1.0","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"JRebelPlugin","version":"2019.2.2","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"org.jetbrains.kotlin","version":"1.3.61-release-Studio3.6-1","since":"192.4787.16.36.5737808","until":"192.7142","originalSince":"192.4787.16.36.5737808","originalUntil":"192.*"},{"id":"com.jedide.apex","version":"2.1.8.193","since":"193.5233","until":"193.5662","originalSince":"193.5233","originalUntil":"193.*"},{"id":"com.zxy.ijplugin.wechat-miniprogram","version":"IU-LATEST-EAP-SNAPSHOT","since":"193.0","until":"232.*","originalSince":"192.4257","originalUntil":null},{"id":"palantir-java-format","version":"0.3.3","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"org.jetbrains.plugins.hocon","version":"2019.3.4","since":"193.0","until":"203.*","originalSince":"193.0","originalUntil":"220.0"},{"id":"com.intellij.marketplace","version":"193.5233.102","since":"193.5233","until":"193.*","originalSince":"193.0","originalUntil":"193.*"},{"id":"org.jetbrains.plugins.hocon","version":"2019.3.5","since":"193.0","until":"203.*","originalSince":"193.0","originalUntil":"220.0"},{"id":"color.scheme.GapStyle","version":"2.4","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.asciidoctor.intellij.asciidoc","version":"0.30.20","since":"182.5262","until":"","originalSince":"172.2465.6","originalUntil":null},{"id":"com.zxy.ijplugin.wechat-miniprogram","version":"1.0.0","since":"193.0","until":"232.*","originalSince":"192.4257","originalUntil":null},{"id":"com.heyangli.www.translation","version":"1.0","since":"182.0","until":"","originalSince":"180.*","originalUntil":null},{"id":"com.android.aas","version":"3.1.0","since":"182.5107","until":"192.7142","originalSince":"AI-182.5107.16","originalUntil":null},{"id":"com.zxy.ijplugin.wechat-miniprogram","version":"1.1","since":"193.0","until":"232.*","originalSince":"192.4257","originalUntil":null},{"id":"com.rookout.pycharm-plugin","version":"1.13.0-pycharm","since":"193.5233","until":"193.*","originalSince":"192.6603.28","originalUntil":"193.*"},{"id":"org.lso.logit","version":"v1.0","since":"191.0","until":"193.*","originalSince":"191.0","originalUntil":"194.*"},{"id":"com.viartemev.requestmapper","version":"0.17","since":"183.0","until":"211.*","originalSince":"141.0","originalUntil":null},{"id":"com.zxy.ijplugin.wechat-miniprogram","version":"1.2","since":"193.0","until":"232.*","originalSince":"192.4257","originalUntil":null},{"id":"palantir-java-format","version":"0.3.4","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.jetbrains.hackathon.indices.viewer","version":"1.3","since":"193.0","until":"193.*","originalSince":"193.0","originalUntil":"201.*"},{"id":"hu.aradipatrik.onedarknative","version":"1.5","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"hu.aradipatrik.nightowlnative","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"AutoYApi","version":"1.0.29","since":"182.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.joncpl.jDark","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"AutoYApi","version":"1.0.30","since":"182.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"csense-idea.kotlin-checked-exceptions","version":"0.9.7","since":"192.0","until":"","originalSince":"183.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.5","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.6","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.7","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"org.asciidoctor.intellij.asciidoc","version":"0.30.21","since":"182.5262","until":"","originalSince":"172.2465.6","originalUntil":null},{"id":"com.zxy.ijplugin.wechat-miniprogram","version":"1.3","since":"193.0","until":"232.*","originalSince":"192.4257","originalUntil":null},{"id":"com.zxy.ijplugin.wechat-miniprogram","version":"1.3.1","since":"193.0","until":"232.*","originalSince":"192.4257","originalUntil":null},{"id":"io.scriptcloud.plugin","version":"0.1.4","since":"183.0","until":"193.*","originalSince":"181.0","originalUntil":"193.*"},{"id":"indent-rainbow.indent-rainbow","version":"1.0.3","since":"182.0","until":"213.*","originalSince":"182.0","originalUntil":"300.0"},{"id":"com.joker.intellij.plugin","version":"0.5","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"cn.intellizhi.templatesupport","version":"1.2","since":"182.0","until":"193.*","originalSince":"173.0","originalUntil":"193.*"},{"id":"cn.mycommons.serializednamegen","version":"0.7","since":"192.0","until":"","originalSince":"141.0","originalUntil":null},{"id":"com.zxy.ijplugin.wechat-miniprogram","version":"1.4","since":"193.0","until":"232.*","originalSince":"192.4257","originalUntil":null},{"id":"palantir-java-format","version":"0.3.8","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.joncpl.jDark","version":"1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"idv.freddie.plugin.decompiler","version":"0.5.0","since":"192.0","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.layoutmanager","version":"1.2.0","since":"192.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.youngfeng.ideaplugin.generateserialversionuid","version":"0.1.0-beta","since":"183.0","until":"193.*","originalSince":"93.13","originalUntil":"193.*"},{"id":"uk.co.ben-gibson.remote.repository.mapper","version":"3.3.2","since":"162.94","until":"","originalSince":"IU-162.94","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"1.0.4","since":"182.0","until":"213.*","originalSince":"182.0","originalUntil":"300.0"},{"id":"com.wang.okhttpparamsget","version":"2.0.0","since":"182.0","until":"","originalSince":"174.0","originalUntil":null},{"id":"com.youngfeng.ideaplugin.generateserialversionuid","version":"0.1.0","since":"183.0","until":"193.*","originalSince":"93.13","originalUntil":"193.*"},{"id":"com.layoutmanager","version":"1.2.2","since":"192.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.yiwowang.plugin.config","version":"1.3.0","since":"182.0","until":"","originalSince":"170.0","originalUntil":null},{"id":"com.yiwowang.plugin.config","version":"1.3.1","since":"182.0","until":"","originalSince":"170.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.9","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.shuqi.tools.translate-properties","version":"1.2","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.yiwowang.plugin.config","version":"1.3.2","since":"182.0","until":"","originalSince":"170.0","originalUntil":null},{"id":"com.youngfeng.ideaplugin.generateserialversionuid","version":"0.2.0","since":"193.0","until":"193.*","originalSince":"93.13","originalUntil":"193.*"},{"id":"com.layoutmanager","version":"1.2.3","since":"192.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"io.scriptcloud.plugin","version":"0.1.5","since":"183.0","until":"193.*","originalSince":"181.0","originalUntil":"193.*"},{"id":"io.scriptcloud.plugin","version":"0.1.6","since":"183.0","until":"193.*","originalSince":"181.0","originalUntil":"193.*"},{"id":"com.youngfeng.ideaplugin.generateserialversionuid","version":"0.2.1","since":"193.0","until":"193.*","originalSince":"93.13","originalUntil":"193.*"},{"id":"com.wang.okhttpparamsget","version":"2.0.1","since":"182.0","until":"","originalSince":"174.0","originalUntil":null},{"id":"io.scriptcloud.plugin","version":"0.1.7","since":"183.0","until":"193.*","originalSince":"181.0","originalUntil":"193.*"},{"id":"com.layoutmanager","version":"1.3.0","since":"192.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.uber.motif","version":"0.0.1","since":"183.0","until":"","originalSince":"163.0","originalUntil":null},{"id":"com.uber.motif","version":"0.0.2","since":"183.0","until":"","originalSince":"163.0","originalUntil":null},{"id":"com.uber.motif","version":"0.0.3","since":"183.0","until":"","originalSince":"163.0","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"1.0.5","since":"182.0","until":"213.*","originalSince":"182.0","originalUntil":"300.0"},{"id":"com.zxy.ijplugin.wechat-miniprogram","version":"1.4.1","since":"193.0","until":"232.*","originalSince":"192.4257","originalUntil":null},{"id":"com.jedide.apex","version":"2.1.9.193","since":"193.5233","until":"193.5662","originalSince":"193.5233","originalUntil":"193.*"},{"id":"indent-rainbow.indent-rainbow","version":"1.1.0","since":"193.0","until":"213.*","originalSince":"193.0","originalUntil":"700.0"},{"id":"artsiomch.cmake.plus","version":"193.2.1","since":"192.0","until":"193.5662","originalSince":"192.0","originalUntil":"194.0"},{"id":"MyBatisLogPlugin","version":"2.1.0","since":"191.0","until":"193.*","originalSince":"141.0","originalUntil":null},{"id":"be.ugent.piedcler.dodona","version":"2.0.0","since":"183.6156","until":"192.*","originalSince":"171.0","originalUntil":"192.*"},{"id":"be.ugent.piedcler.dodona","version":"2.0.1","since":"183.6156","until":"","originalSince":"171.0","originalUntil":null},{"id":"leetcode-editor","version":"6.0","since":"182.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"com.xyz.caofancpu.D8gerAutoCode","version":"1.20","since":"182.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.xyz.caofancpu.D8gerAutoCode","version":"1.21","since":"182.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"leetcode-editor","version":"6.1","since":"182.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"com.xyz.caofancpu.D8gerAutoCode","version":"1.22","since":"182.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.dengzii.plugin.template","version":"1.0","since":"191.0","until":"","originalSince":"182.711","originalUntil":null},{"id":"com.shuqi.tools.cmp-helper","version":"0.9.3","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.reedelk.plugin","version":"0.6.0","since":"192.0","until":"194.0","originalSince":"191.0","originalUntil":"194.0"},{"id":"com.fwdekker.randomness","version":"2.4.0","since":"191.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.xyz.caofancpu.D8gerAutoCode","version":"1.23","since":"182.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"JRebelPlugin","version":"2020.1.0.1","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.github.gilday.darkmode","version":"1.1.0","since":"193.0","until":"193.*","originalSince":"192.0","originalUntil":"193.*"},{"id":"palantir-java-format","version":"0.3.10","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"artsiomch.cmake.plus","version":"193.3.1","since":"192.0","until":"193.5662","originalSince":"192.0","originalUntil":"194.0"},{"id":"dcevm-plugin","version":"1.0.2","since":"202","until":"223.*","originalSince":"192.0","originalUntil":null},{"id":"com.android.aas","version":"3.1.1","since":"182.5107","until":"192.7142","originalSince":"AI-182.5107.16","originalUntil":null},{"id":"leetcode-editor","version":"6.2","since":"163.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.11","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.12","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.tom.fonter","version":"1.0.2","since":"192.0","until":"232.*","originalSince":"192.0","originalUntil":"900.*"},{"id":"org.asciidoctor.intellij.asciidoc","version":"0.30.31","since":"182.5262","until":"","originalSince":"172.2465.6","originalUntil":null},{"id":"com.huawei.deveco.hms","version":"2.0.0.300","since":"182.5","until":"191.*","originalSince":"145.0","originalUntil":"191.*"},{"id":"palantir-java-format","version":"0.3.13","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"1.1.1","since":"183","until":"213.*","originalSince":"171.0","originalUntil":"700.0"},{"id":"palantir-java-format","version":"0.3.14","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.15","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.android.aas","version":"3.1.2","since":"182.5107","until":"192.7142","originalSince":"AI-182.5107.16","originalUntil":null},{"id":"palantir-java-format","version":"0.3.16","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.17","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.18","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"io.reactjava.reactjava-lang","version":"SNAPSHOT-1.200128.1","since":"193.0","until":"","originalSince":"IU-193.0","originalUntil":null},{"id":"io.reactjava.reactjava-lang","version":"SNAPSHOT-1.200128.2","since":"193.0","until":"","originalSince":"IU-193.0","originalUntil":null},{"id":"com.decentralized.internet.id","version":"1.0","since":"192.0","until":"201.0","originalSince":"173.0","originalUntil":null},{"id":"com.rookout.pycharm-plugin","version":"1.15.0-pycharm","since":"193.0","until":"193.*","originalSince":"192.6603.28","originalUntil":"193.*"},{"id":"io.reactjava.reactjava-lang","version":"SNAPSHOT-1.200129.1","since":"193.0","until":"","originalSince":"IU-193.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.19","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"1.2.0","since":"183.0","until":"213.*","originalSince":"182.0","originalUntil":"700.0"},{"id":"palantir-java-format","version":"0.3.20","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"training","version":"201.4515.39","since":"201.4515","until":"201.4515","originalSince":"201.4515","originalUntil":"201.*"},{"id":"palantir-java-format","version":"0.3.21","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.22","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.jedide.apex","version":"2.2.0.193.IC","since":"193.5233","until":"193.5662","originalSince":"193.5233","originalUntil":"193.*"},{"id":"ch.raffael.idea.plugins.runpopup","version":"1.1.0","since":"183.0","until":"199.0","originalSince":"181.0","originalUntil":null},{"id":"com.jedide.apex","version":"2.2.1.193","since":"193.5233","until":"193.5662","originalSince":"193.5233","originalUntil":"193.*"},{"id":"com.jedide.apex","version":"2.2.1.193.IC","since":"193.5233","until":"193.5662","originalSince":"193.5233","originalUntil":"193.*"},{"id":"com.badoo.liveprof.plugins","version":"0.1.1","since":"190.0","until":"300.0","originalSince":"174.0","originalUntil":null},{"id":"io.reactjava.reactjava-lang","version":"SNAPSHOT-1.200206.1","since":"193.0","until":"","originalSince":"IU-193.0","originalUntil":null},{"id":"net.jangaroo.idea.4","version":"4.2018.20","since":"181.0","until":"","originalSince":"IU-181.0","originalUntil":null},{"id":"io.reactjava.reactjava-lang","version":"SNAPSHOT-1.200207.1","since":"193.0","until":"","originalSince":"IU-193.0","originalUntil":null},{"id":"io.reactjava.reactjava-lang","version":"SNAPSHOT-1.200208.1","since":"193.0","until":"","originalSince":"IU-193.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.23","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.zxy.ijplugin.wechat-miniprogram","version":"1.8.1","since":"201.4515","until":"232.*","originalSince":"193.2723","originalUntil":null},{"id":"com.github.syuchan1005.emojiprefix","version":"2.1.3","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"org.asciidoctor.intellij.asciidoc","version":"0.30.34","since":"182.5262","until":"","originalSince":"172.2465.6","originalUntil":null},{"id":"dev.blachut.svelte.lang","version":"0.12.1","since":"192.0","until":"202.*","originalSince":"192.0","originalUntil":"211.0"},{"id":"be.ugent.piedcler.dodona","version":"2.0.2","since":"183.6156","until":"","originalSince":"171.0","originalUntil":null},{"id":"be.ugent.piedcler.dodona","version":"2.0.3","since":"192.7142","until":"","originalSince":"183.6156","originalUntil":null},{"id":"net.jangaroo.idea.4","version":"4.2018.21","since":"181.0","until":"","originalSince":"IU-181.0","originalUntil":null},{"id":"com.jedide.apex","version":"2.2.2.193","since":"193.5662","until":"193.*","originalSince":"193.5233","originalUntil":"193.*"},{"id":"JRebelPlugin","version":"2020.1.1","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"palantir-java-format","version":"0.3.24","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"R4Intellij","version":"193.5223.529","since":"193.5233","until":"193.*","originalSince":"193.5223","originalUntil":"193.*"},{"id":"palantir-java-format","version":"0.3.25","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"org.dudariev.converter.generator","version":"1.2.0","since":"193.0","until":"","originalSince":"IC-193.0","originalUntil":null},{"id":"com.github.gtache.lsp","version":"1.6.1","since":"193.0","until":"203.*","originalSince":"182.0","originalUntil":null},{"id":"com.yagaan.yagaan-intellij-plugin","version":"1.1.0","since":"193.0","until":"","originalSince":"192.0","originalUntil":null},{"id":"io.plugin.tsnode","version":"2020.2.18.0","since":"183.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.26","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"leetcode-editor","version":"6.3","since":"163.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"io.plugin.tsnode","version":"2020.2.19.0","since":"183.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.android.aas","version":"3.1.3","since":"192","until":"192.7142","originalSince":"AI-182.5107.16","originalUntil":"AI-192.7142.36"},{"id":"com.shizhuang.duapp.ideaplugin","version":"0.9.1-SNAPSHOT","since":"191.0","until":"192.7142","originalSince":"173.0","originalUntil":null},{"id":"org.asciidoctor.intellij.asciidoc","version":"0.30.38","since":"193.6494","until":"","originalSince":"172.2465.6","originalUntil":null},{"id":"com.teamnova.stickode.plugin","version":"0.2.5","since":"192.5728","until":"","originalSince":"191.6010548","originalUntil":null},{"id":"com.android.aas","version":"3.1.4","since":"192","until":"192.*","originalSince":"AI-182.5107.16","originalUntil":"AI-192.*"},{"id":"com.jetbrains.hackathon.indices.viewer","version":"1.5","since":"202.48","until":"202.2170","originalSince":"202.48","originalUntil":"202.*"},{"id":"org.jetbrains.plugins.hocon","version":"2020.1.0","since":"201.0","until":"203.*","originalSince":"201.0","originalUntil":"220.0"},{"id":"com.intellij.STAintellij.intellij_plugin","version":"20.1.146","since":"192.6817","until":"193.6494","originalSince":"173.3","originalUntil":"193.*"},{"id":"indent-rainbow.indent-rainbow","version":"1.3.0","since":"183.0","until":"213.*","originalSince":"182.0","originalUntil":"700.0"},{"id":"com.android.aas","version":"3.1.5","since":"193","until":"193.*","originalSince":"AI-182.5107.16","originalUntil":"AI-193.*"},{"id":"A move tab left and right using the keyboard plugin - by momomo.com","version":"12.550","since":"111","until":"","originalSince":"101.0","originalUntil":null},{"id":"com.intellij.STAintellij.intellij_plugin","version":"20.2.149","since":"192.6817","until":"201.5985","originalSince":"173.3","originalUntil":"201.*"},{"id":"org.jetbrains.kotlin","version":"1.3.70-release-IJ2019.3-1","since":"193.6494","until":"193.*","originalSince":"193.4099.13","originalUntil":"193.*"},{"id":"DeepBugsJavaScript","version":"0.4","since":"192.5728","until":"193.*","originalSince":"192.5728","originalUntil":"201.*"},{"id":"com.github.amibiz.ergokeys","version":"1.7","since":"183.3","until":"201.*","originalSince":"181.0","originalUntil":"201.*"},{"id":"IvyIDEA","version":"1.0.16","since":"193.6494","until":"","originalSince":"143.2370.31","originalUntil":null},{"id":"com.andreycizov.partialnav","version":"1.2","since":"171.1834","until":"","originalSince":"IC-171.1834.9","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"1.4.0","since":"183.0","until":"213.*","originalSince":"182.0","originalUntil":"700.0"},{"id":"com.andreycizov.partialnav","version":"1.3","since":"171.1834","until":"","originalSince":"IC-171.1834.9","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"1.4.1","since":"183.0","until":"213.*","originalSince":"182.0","originalUntil":"700.0"},{"id":"JRebelPlugin","version":"2020.2.0","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.intellij.STAintellij.intellij_plugin","version":"20.3.150","since":"192.6817","until":"201.5985","originalSince":"173.3","originalUntil":"201.*"},{"id":"palantir-java-format","version":"0.3.27","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.notime.intellijPlugin.backgroundImageByURL","version":"1.0.2","since":"182.0","until":"","originalSince":"162.0","originalUntil":null},{"id":"palantir-java-format","version":"0.3.28","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.uber.motif","version":"0.3.3","since":"182.0","until":"","originalSince":"163.0","originalUntil":null},{"id":"com.aladdin.debugger.idea.plugin","version":"0.0.3","since":"183.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"IDETalk","version":"201.6668.60","since":"201.6668","until":"201.7846","originalSince":"201.6668","originalUntil":"201.*"},{"id":"palantir-java-format","version":"1.0.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"me.mbolotov.cypress","version":"1.2.1","since":"193.0","until":"","originalSince":"192.0","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"1.4.2","since":"183.0","until":"222.*","originalSince":"182.0","originalUntil":"700.0"},{"id":"SmartJump","version":"2020.4.1","since":"171","until":"172","originalSince":"183.0","originalUntil":null},{"id":"leetcode-editor","version":"6.4","since":"163.0","until":"","originalSince":"143.0","originalUntil":null},{"id":"de.sist.gitlab","version":"1.18","since":"193.0","until":"","originalSince":"191.0","originalUntil":null},{"id":"com.android.aas","version":"3.2.0","since":"193","until":"193.*","originalSince":"AI-182.5107.16","originalUntil":"AI-193.*"},{"id":"com.github.gilday.darkmode","version":"1.2.1","since":"201.0","until":"201.*","originalSince":"192.0","originalUntil":"201.*"},{"id":"ca.ulaval.glo.sensei","version":"1.0.1","since":"193.6911","until":"","originalSince":"183.4284.148","originalUntil":null},{"id":"ca.ulaval.glo.sensei","version":"1.0.2","since":"193.6911","until":"","originalSince":"183.4284.148","originalUntil":null},{"id":"com.atlassian.idea.bob","version":"1.6","since":"183.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"IDETalk","version":"201.7223.18","since":"201.7223","until":"201.7846","originalSince":"201.7223","originalUntil":"201.*"},{"id":"SmartJump","version":"2020.4.2","since":"141","until":"142","originalSince":"183.0","originalUntil":null},{"id":"com.laravel_idea.plugin","version":"2.4.201","since":"201.0","until":"202","originalSince":"201.0","originalUntil":"202.*"},{"id":"IDETalk","version":"201.7223.36","since":"201.7223","until":"201.7846","originalSince":"201.7223","originalUntil":"201.*"},{"id":"com.laravel_idea.plugin","version":"2.4.1.201","since":"201.0","until":"202","originalSince":"201.0","originalUntil":"202.*"},{"id":"com.android.aas","version":"3.3.0","since":"193","until":"193.*","originalSince":"AI-182.5107.16","originalUntil":"AI-193.*"},{"id":"com.eny.i18n","version":"1.8.1","since":"193.0","until":"","originalSince":"191.0","originalUntil":null},{"id":"IDETalk","version":"201.7223.58","since":"201.7223","until":"201.7846","originalSince":"201.7223","originalUntil":"201.*"},{"id":"info.dong4j.idea.plugin.markdown.image.kit","version":"1.0.1","since":"191.0","until":"","originalSince":"183.0","originalUntil":null},{"id":"com.github.beansoftapp.reatnative.idea","version":"2020.1.0","since":"193.0","until":"203.*","originalSince":"191.0","originalUntil":null},{"id":"de.espend.idea.php.generics","version":"0.5.0","since":"201.6668","until":"203","originalSince":"193.1159","originalUntil":null},{"id":"JRebelPlugin","version":"2020.2.1","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"MyBatisLog","version":"2020.5.1","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"org.plugin.dot.id","version":"1.2","since":"193.0","until":"","originalSince":"141.0","originalUntil":null},{"id":"IDETalk","version":"201.7223.97","since":"201.7223","until":"201.7846","originalSince":"201.7223","originalUntil":"201.*"},{"id":"com.poratu.idea.plugins.tomcat","version":"3.6.2","since":"183.0","until":"","originalSince":"171.0","originalUntil":null},{"id":"IDETalk","version":"201.7223.99","since":"201.7223","until":"201.7846","originalSince":"201.7223","originalUntil":"201.*"},{"id":"com.intellij.STAintellij.intellij_plugin","version":"20.4.152","since":"192.6817","until":"201.5985","originalSince":"173.3","originalUntil":"201.*"},{"id":"info.kwarc.mmt.intellij.MMTPlugin","version":"19.0.1","since":"201.1","until":"201.*","originalSince":"192.6262.58","originalUntil":"201.*"},{"id":"com.touhidapps.column.align","version":"1.1.2","since":"183.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.touhidapps.column.align","version":"1.1.3","since":"183.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.touhidapps.column.align","version":"1.5.9","since":"183.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.pyfips.intellij.custominspections","version":"1.0","since":"183.0","until":"","originalSince":"131.0","originalUntil":null},{"id":"com.chuntung.plugin.mybatisbuilder","version":"1.1.3","since":"181.4203","until":"231.*","originalSince":"181.4203","originalUntil":"299.*"},{"id":"com.laravel_idea.plugin","version":"3.0.1.201","since":"201.0","until":"202","originalSince":"201.0","originalUntil":"202.*"},{"id":"com.laravel_idea.plugin","version":"3.0.3.201","since":"201.0","until":"202","originalSince":"201.0","originalUntil":"202.*"},{"id":"com.pqixing.modularization.idea","version":"2.0.7","since":"201","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.android.aas","version":"3.3.1","since":"193","until":"193.*","originalSince":"AI-182.5107.16","originalUntil":"AI-193.*"},{"id":"dk.lost_world.phpinsights","version":"1.1.0","since":"201.0","until":"203.0","originalSince":"183.0","originalUntil":null},{"id":"org.mule.tooling.intellij.dataweave.v2","version":"2.0.42","since":"193","until":"213","originalSince":"182.0","originalUntil":null},{"id":"com.laravel_idea.plugin","version":"3.0.4.201","since":"201.0","until":"202","originalSince":"201.0","originalUntil":"202.*"},{"id":"JRebelPlugin","version":"2020.2.2","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"net.javaru.idea.frc","version":"1.3.0-2020.2-eap","since":"202.4357","until":"202.6396","originalSince":"202.4357","originalUntil":"202.*"},{"id":"com.ccnode.codegenerator.MyBatisCodeHelperPro","version":"2.8.2.fix-183-202","since":"183.0","until":"202","originalSince":"183.0","originalUntil":"202.*"},{"id":"com.pqixing.modularization.idea","version":"2.0.8","since":"201","until":"","originalSince":"181.0","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"1.5.1","since":"193.0","until":"222.*","originalSince":"193.0","originalUntil":"700.0"},{"id":"org.whitesource.wss-intellij-plugin","version":"20.5.2","since":"173.0","until":"","originalSince":"172.0","originalUntil":null},{"id":"zdc.ideaPlugin.MavenManager","version":"1.0.1","since":"181.*","until":"","originalSince":"163.15529.8","originalUntil":null},{"id":"codeReview4idea","version":"0.5.8","since":"201.7846.76","until":"203.*","originalSince":"172.767","originalUntil":null},{"id":"com.jetbrains.hackathon.indices.viewer","version":"1.8","since":"202.4695","until":"202.*","originalSince":"202.4695","originalUntil":"203.*"},{"id":"com.sannsyn.opennlpmodelstrainer","version":"0.9.4.1","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"org.asciidoctor.intellij.asciidoc","version":"0.31.5","since":"202.5792.28","until":"","originalSince":"202.5103.13","originalUntil":null},{"id":"SmartJump","version":"2020.6.1","since":"193","until":"","originalSince":"183.0","originalUntil":null},{"id":"com.darkyen.wemi.intellij","version":"0.13","since":"201.7846.76","until":"211","originalSince":"193.5233.102","originalUntil":null},{"id":"JRebelPlugin","version":"2020.2.3","since":"139.1","until":"213.*","originalSince":"139.1","originalUntil":"999.*"},{"id":"com.android.aas","version":"3.3.2","since":"193","until":"201","originalSince":"182.5107.16","originalUntil":null},{"id":"artsiomch.cmake","version":"202.0.1","since":"202","until":"203.0","originalSince":"193.5662","originalUntil":"203.0"},{"id":"artsiomch.cmake.plus","version":"202.0.1","since":"202.0","until":"203.0","originalSince":"193.5662","originalUntil":"203.0"},{"id":"me.mbolotov.cypress.pro","version":"1.5.0","since":"201.0","until":"202.*","originalSince":"193.0","originalUntil":"202.*"},{"id":"me.mbolotov.cypress.pro","version":"1.5.0-2019.3","since":"193.0","until":"193.*","originalSince":"193.0","originalUntil":"202.*"},{"id":"palantir-java-format","version":"1.0.1","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.android.aas","version":"3.3.3","since":"193","until":"201","originalSince":"182.5107.16","originalUntil":null},{"id":"com.android.aas","version":"3.3.4","since":"193","until":"201","originalSince":"182.5107.16","originalUntil":null},{"id":"com.github.amibiz.ergokeys","version":"1.8","since":"183","until":"201.*","originalSince":"181.0","originalUntil":"201.*"},{"id":"artsiomch.cmake.plus","version":"202.0.2_EAP","since":"202","until":"203.0","originalSince":"193.5662","originalUntil":"203.0"},{"id":"com.codemr.professional","version":"Professional-2020.3.1-release-2019.3","since":"172","until":"172","originalSince":"193.5662.53","originalUntil":null},{"id":"fastify_decorators.plugin","version":"0.7","since":"193","until":"202.*","originalSince":"183.2940.10","originalUntil":"202.*"},{"id":"com.sonatype.nexus-iq","version":"2.9.0-01","since":"143.0","until":"201.3","originalSince":"143.0","originalUntil":"201.*"},{"id":"com.microfocus.intellij.plugin.gitclient","version":"1.3.1","since":"193.0","until":"202","originalSince":"193.0","originalUntil":"202.9999"},{"id":"com.cloudbees.idea.plugin","version":"1.0.9","since":"191.0","until":"200","originalSince":"191.0","originalUntil":"200.*"},{"id":"org.intellij.scala","version":"2020.2.652","since":"202.5792.0","until":"202.999999","originalSince":"202.5792.0","originalUntil":"203.*"},{"id":"org.intellij.scala","version":"2020.2.659","since":"202.5792.0","until":"202.99999999","originalSince":"202.5792.0","originalUntil":"203.*"},{"id":"com.itangcent.idea.plugin.easy-api","version":"1.9.9.183.0","since":"183.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"app.teamhub","version":"6.0.1","since":"193.6494","until":"211","originalSince":"193.6494","originalUntil":"211.*"},{"id":"fctorial.worldClock","version":"1.0","since":"201","until":"","originalSince":"193.0","originalUntil":null},{"id":"com.starxg.browserfx","version":"1.0.3","since":"202.60","until":"","originalSince":"173.0","originalUntil":null},{"id":"JRebelPlugin","version":"2020.2.4","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"dev.blachut.svelte.lang","version":"0.12.2","since":"192.0","until":"202.*","originalSince":"192.0","originalUntil":"211.0"},{"id":"com.github.kindermax.intellijlets","version":"0.0.4","since":"201","until":"202.*","originalSince":"193.0","originalUntil":"202.*"},{"id":"com.intellij.STAintellij.intellij_plugin","version":"20.7.161","since":"173.3","until":"201.*","originalSince":"173.3","originalUntil":"202.*"},{"id":"com.github.beansoftapp.flutter.storm","version":"2020.2.2","since":"201.6668.106","until":"202.*","originalSince":"201.3803.71","originalUntil":"202.*"},{"id":"com.stepsize.tech-debt-reporter","version":"0.7.7","since":"201.7223","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.stepsize.tech-debt-reporter","version":"0.7.8","since":"201.7223","until":"","originalSince":"171.3566.24","originalUntil":null},{"id":"JRebelPlugin","version":"2020.2.4.1","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"org.broadinstitute.winstanley","version":"0.5.0","since":"191.0","until":"","originalSince":"141.0","originalUntil":null},{"id":"com.github.beansoftapp.flutter.storm","version":"2020.2.3","since":"201.7846.79","until":"202.*","originalSince":"201.6668.106","originalUntil":"202.*"},{"id":"app.teamhub","version":"6.1.0","since":"193.6494","until":"211","originalSince":"193.6494","originalUntil":"211.*"},{"id":"com.github.odinggg.NewYapiUpload","version":"1.02","since":"182.0","until":"202.*","originalSince":"162.0","originalUntil":"202.*"},{"id":"dev.blachut.svelte.lang","version":"0.13.0","since":"201.7846","until":"202.*","originalSince":"201.7846","originalUntil":"203.*"},{"id":"cz.bios.idea","version":"1.1.3","since":"182","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.jetbrains.intellij.datalore","version":"0.1.7-202","since":"202.6948","until":"202.*","originalSince":"202.6397","originalUntil":"202.*"},{"id":"com.intellij.resharper.azure","version":"3.40.0.872-2020.2","since":"202.6397","until":"202.*","originalSince":"201.6668.60","originalUntil":"202.*"},{"id":"Git Scope","version":"3.0.3","since":"194.0","until":"202.*","originalSince":"194.0","originalUntil":"999.0"},{"id":"com.chuntung.plugin.mybatisbuilder","version":"1.1.4","since":"181.4203","until":"231.*","originalSince":"181.4203","originalUntil":"299.*"},{"id":"com.android.aas","version":"3.4.0","since":"193","until":"201","originalSince":"182.5107.16","originalUntil":null},{"id":"com.github.lonre.bucp","version":"20.08.21","since":"193.0","until":"231.*","originalSince":"193.0","originalUntil":"999.*"},{"id":"ir.msdehghan.plugins.ansible","version":"0.1","since":"182.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"JRebelPlugin","version":"2020.2.5","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"com.google.bamboo.id","version":"1.6","since":"183.0","until":"","originalSince":"163.0","originalUntil":null},{"id":"JRebelPlugin","version":"2020.2.5.1","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"com.synopsys.sig.desktop.idea","version":"2020.8.0.199619","since":"182.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.gmike.visual-studio-2019-dark","version":"1.0","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.gmike.visual-studio-2019-dark","version":"1.1","since":"191.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.xeonkryptos.eclipseprojectcreator","version":"0.0.3","since":"202.2","until":"202.*","originalSince":"202.0","originalUntil":"202.*"},{"id":"com.android.aas","version":"3.4.1","since":"193","until":"201","originalSince":"182.5107.16","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"1.6","since":"202.0","until":"222.*","originalSince":"202.0","originalUntil":"700.0"},{"id":"app.teamhub","version":"6.2.0","since":"193.6494","until":"211","originalSince":"193.6494","originalUntil":"211.*"},{"id":"leetcode-editor","version":"6.8","since":"202.0","until":"","originalSince":"163.0","originalUntil":null},{"id":"app.teamhub","version":"7.0.0","since":"193.6494","until":"211","originalSince":"193.6494","originalUntil":"211.*"},{"id":"com.github.beansoft.reatnative.idea.free","version":"2020.2","since":"193.0","until":"201.8743.12","originalSince":"191.0","originalUntil":null},{"id":"app.teamhub","version":"7.1.0","since":"193.6494","until":"211","originalSince":"193.6494","originalUntil":"211.*"},{"id":"JRebelPlugin","version":"2020.3.0","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"izhangzhihao.rainbow.fart","version":"1.3.2","since":"203","until":"","originalSince":"201.6668","originalUntil":null},{"id":"com.mallowigi","version":"28.0","since":"203.0","until":"203.5251.39","originalSince":"203.0","originalUntil":"203.*"},{"id":"com.github.turansky.yfiles","version":"0.27.0","since":"201.6487","until":"202.*","originalSince":"201.6487","originalUntil":"203.*"},{"id":"com.linkkou.plugin.intellij.assistant","version":"1.0.3","since":"201.0","until":"","originalSince":"172.0","originalUntil":null},{"id":"com.github.turansky.yfiles","version":"0.28.0","since":"201.6487","until":"202.*","originalSince":"201.6487","originalUntil":"203.*"},{"id":"com.android.aas","version":"3.4.2","since":"193.*","until":"201.*","originalSince":"182.5107.16","originalUntil":null},{"id":"FavoriteFolders","version":"1.3.2","since":"203.1","until":"","originalSince":"201.2935","originalUntil":null},{"id":"SmartJump","version":"2020.10.1","since":"193","until":"211.0","originalSince":"181.0","originalUntil":"211.0"},{"id":"app.teamhub","version":"8.0.0","since":"193.6494","until":"211","originalSince":"193.6494","originalUntil":"211.*"},{"id":"ru.taptima.phalyfusion","version":"1.0.2-SNAPSHOT","since":"201","until":"203","originalSince":"181.0","originalUntil":null},{"id":"ru.taptima.phalyfusion","version":"1.0.3-SNAPSHOT","since":"201","until":"203","originalSince":"181.0","originalUntil":null},{"id":"dev.simplix.tooling","version":"1.0.0","since":"202.0","until":"202.*","originalSince":"201.0","originalUntil":"202.*"},{"id":"org.jetbrains.completion.full.line","version":"0.2.1","since":"203.4203.26","until":"211.*","originalSince":"201.4163","originalUntil":"211.*"},{"id":"app.teamhub","version":"8.0.1","since":"193.6494","until":"211","originalSince":"193.6494","originalUntil":"211.*"},{"id":"org.jetbrains.completion.full.line","version":"0.2.2","since":"203.4203.26","until":"211.*","originalSince":"202.*","originalUntil":"211.*"},{"id":"com.zju3dv.python_alias_import","version":"1.3","since":"193.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.github.kindermax.intellijlets","version":"0.0.5","since":"201.0","until":"203.*","originalSince":"193.0","originalUntil":"203.*"},{"id":"org.jetbrains.completion.full.line","version":"0.2.4","since":"203.4203.26","until":"211.*","originalSince":"202.*","originalUntil":"211.*"},{"id":"org.jetbrains.completion.full.line","version":"0.2.5","since":"203.4203.26","until":"211.*","originalSince":"202.*","originalUntil":"211.*"},{"id":"JRebelPlugin","version":"2020.3.1","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"com.sonatype.nexus-iq","version":"2.9.1-02","since":"143.0","until":"201.3","originalSince":"143.0","originalUntil":"201.*"},{"id":"com.AvansTI.Boebot","version":"1.1","since":"182.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"indent-rainbow.indent-rainbow","version":"1.6.1","since":"202.0","until":"222.*","originalSince":"202.0","originalUntil":"700.0"},{"id":"palantir-java-format","version":"1.1.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"csdn.tools","version":"1.2.1","since":"182.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"csdn.tools","version":"1.3.0","since":"182.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"Go To Implementation Plugin","version":"1.1.3","since":"182.5107","until":"202.8194","originalSince":"182.0","originalUntil":"203.0"},{"id":"palantir-java-format","version":"2.0.0-rc1","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"csdn.tools","version":"1.3.1","since":"182.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.jetbrains.codeWithMe","version":"203.5981.37","since":"203.5981.37","until":"203.5981.37","originalSince":"203.5981","originalUntil":"203.*"},{"id":"com.android.aas","version":"3.5.0","since":"193.*","until":"201.*","originalSince":"182.5107.16","originalUntil":null},{"id":"net.mamoe.mirai-console","version":"1.0.0","since":"200.*","until":"205.*","originalSince":"193.*","originalUntil":"205.*"},{"id":"com.github.nthykier.debpkg","version":"0.0.6","since":"202.0","until":"202.*","originalSince":"201.0","originalUntil":"202.*"},{"id":"JRebelPlugin","version":"2020.3.2","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"palantir-java-format","version":"2.0.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"2.7.0","since":"192.7142","until":"202.*","originalSince":"192.7142","originalUntil":"203.*"},{"id":"org.intellij.scala","version":"2020.3.643","since":"203.5981.41","until":"203.*","originalSince":"203.5981.41","originalUntil":"211.*"},{"id":"com.intellij.grazie.completion","version":"0.1.11","since":"202.0","until":"202.*","originalSince":"202.0","originalUntil":"211.*"},{"id":"com.intellij.idea.plugin.sap.commerce","version":"2001.3","since":"203.5981.41","until":"203.*","originalSince":"203.5784.10","originalUntil":null},{"id":"artsiomch.cmake","version":"203.0.2","since":"193.5662","until":"203.0","originalSince":"193.5662","originalUntil":"204.0"},{"id":"com.tang","version":"1.3.5.185-IDEA203","since":"202.0","until":"203.*","originalSince":"201.0","originalUntil":"203.*"},{"id":"org.intellij.scala","version":"2020.3.18","since":"203.5981.41","until":"203.*","originalSince":"203.5981.41","originalUntil":"211.*"},{"id":"com.intellij.tide","version":"203.5981.213","since":"203.*","until":"203.*","originalSince":"203.5981","originalUntil":"203.*"},{"id":"org.dmfs.intellij.unclutter","version":"0.2.0","since":"203.*","until":"203.*","originalSince":"201.6668","originalUntil":"203.*"},{"id":"com.jetbrains.hackathon.indices.viewer","version":"1.12","since":"203.4203","until":"203.*","originalSince":"203.4203","originalUntil":"211.*"},{"id":"com.github.si9ma.codetimejetbrains","version":"0.0.4","since":"193.0","until":"203.*","originalSince":"162.0","originalUntil":"203.*"},{"id":"com.github.nuclearg.smartgs","version":"1.2","since":"202.5103.13","until":"","originalSince":"162.0","originalUntil":null},{"id":"org.intellij.scala","version":"2020.3.18","since":"203.5981.41","until":"203.*","originalSince":"203.5981.41","originalUntil":"211.*"},{"id":"com.sonatype.nexus-iq","version":"2.10.0-01","since":"143.0","until":"201.3","originalSince":"143.0","originalUntil":"201.*"},{"id":"app.teamhub","version":"9.0.0","since":"201.8743","until":"211","originalSince":"201.8743","originalUntil":"211.*"},{"id":"org.whitesource.wss-pycharm-plugin","version":"20.12.2.1","since":"183.0","until":"","originalSince":"172.0","originalUntil":null},{"id":"org.whitesource.wss-webstorm-plugin","version":"20.12.2.1","since":"182.0","until":"","originalSince":"172.0","originalUntil":null},{"id":"com.misset.OMT","version":"2.3.1","since":"203.0","until":"203.*","originalSince":"201.0","originalUntil":"203.*"},{"id":"palantir-java-format","version":"2.0.1","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.github.luomingxu.idea","version":"1.0","since":"203.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"Git Scope","version":"3.0.4","since":"203.0","until":"211.*","originalSince":"203.0","originalUntil":"999.0"},{"id":"net.mamoe.kotlin-jvm-blocking-bridge","version":"1.6.0","since":"201.*","until":"212.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"app.teamhub","version":"10.0.0","since":"201.8743","until":"211","originalSince":"201.8743","originalUntil":"211.*"},{"id":"com.isuwang.plugin","version":"2.2.0","since":"193.0","until":"201.*","originalSince":"193.0","originalUntil":"203.*"},{"id":"JRebelPlugin","version":"2021.1.0","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"app.teamhub","version":"10.0.1","since":"201.8743","until":"211","originalSince":"201.8743","originalUntil":"211.*"},{"id":"com.intellij.lang.jsgraphql","version":"2.7.1","since":"192.7142","until":"202.*","originalSince":"192.7142","originalUntil":"211.*"},{"id":"app.teamhub","version":"10.0.2","since":"201.8743","until":"211","originalSince":"201.8743","originalUntil":"211.*"},{"id":"app.teamhub","version":"10.0.3","since":"201.8743","until":"211","originalSince":"201.8743","originalUntil":"211.*"},{"id":"io.unthrottled.amii","version":"0.4.1","since":"202.7319.50","until":"203.*","originalSince":"201.4515.24","originalUntil":"203.*"},{"id":"org.elasticsearch4idea","version":"0.7.0","since":"202.6543","until":"203.*","originalSince":"201.0","originalUntil":"203.*"},{"id":"com.isuwang.plugin","version":"2.2.1","since":"193.0","until":"201.*","originalSince":"193.0","originalUntil":"203.*"},{"id":"net.mamoe.kotlin-jvm-blocking-bridge","version":"1.7.0","since":"201.*","until":"212.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"org.elasticsearch4idea","version":"0.7.1","since":"202.6543","until":"203.*","originalSince":"201.0","originalUntil":"203.*"},{"id":"app.teamhub","version":"10.0.4","since":"201.8743","until":"211","originalSince":"201.8743","originalUntil":"211.*"},{"id":"dev.niels.SQLServerBackupAndRestore","version":"0.8.0","since":"202.7319","until":"","originalSince":"201.7223","originalUntil":null},{"id":"net.mamoe.kotlin-jvm-blocking-bridge","version":"1.7.4","since":"201.*","until":"212.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"app.teamhub","version":"10.0.5","since":"201.8743","until":"211","originalSince":"201.8743","originalUntil":"211.*"},{"id":"pro.bashsupport","version":"1.5.14.211","since":"211.0.0","until":"211.5000.*","originalSince":"211.0.0","originalUntil":"211.*"},{"id":"com.jetbrains.idea.safepush","version":"211.5404","since":"211.4962","until":"212.0","originalSince":"211.0","originalUntil":"212.0"},{"id":"net.mamoe.kotlin-jvm-blocking-bridge","version":"1.8.0","since":"201.*","until":"212.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"com.hjf.redis.manager.redis-manager","version":"1.1.3","since":"190.*","until":"301.*","originalSince":"183.*","originalUntil":"301.*"},{"id":"intellij.ktor","version":"1.5.1-eap-1","since":"203.0","until":"203.*","originalSince":"203.0","originalUntil":"211.*"},{"id":"net.mamoe.kotlin-jvm-blocking-bridge","version":"1.9.0","since":"201.*","until":"212.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"studio.edaphic.sv","version":"2020.3.1.1","since":"201.*","until":"212.*","originalSince":"193.4386","originalUntil":"212.*"},{"id":"slinky.core.intellij","version":"0.6.7","since":"203.6682.168","until":"223.*","originalSince":"203.6682.168","originalUntil":"999.9999.999"},{"id":"JRebelPlugin","version":"2021.1.1","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"org.intellij.scala","version":"2021.1.7","since":"211.5538","until":"211.*","originalSince":"211.0","originalUntil":"211.*"},{"id":"org.intellij.scala","version":"2020.3.19","since":"203.5981.41","until":"203.*","originalSince":"203.5981.41","originalUntil":"211.*"},{"id":"net.mamoe.kotlin-jvm-blocking-bridge","version":"1.9.1","since":"201.*","until":"212.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"com.obroom.plugin.jpasql","version":"2021.2.1","since":"193.0","until":"193.3","originalSince":"193.0","originalUntil":"211.1"},{"id":"com.github.volkov.znavi","version":"0.0.6","since":"203.0","until":"203.*","originalSince":"203.0","originalUntil":"211.*"},{"id":"net.mamoe.kotlin-jvm-blocking-bridge","version":"1.10.0","since":"201.*","until":"212.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"com.musictime.intellij.plugin","version":"2.1.8","since":"172.0","until":"","originalSince":"162.0","originalUntil":null},{"id":"org.jetbrains.idea.project.template.variables","version":"0.4.4","since":"141.0","until":"","originalSince":"131.0","originalUntil":null},{"id":"vette.neos","version":"1.5.0","since":"193.0","until":"203.3645.34","originalSince":"193.0","originalUntil":"203.*"},{"id":"com.intellij.lang.jsgraphql","version":"2.8.0","since":"192.7142","until":"202.*","originalSince":"192.7142","originalUntil":"211.*"},{"id":"com.jetbrains.hackathon.indices.viewer","version":"1.14","since":"212","until":"212.*","originalSince":"211.5823","originalUntil":"212.*"},{"id":"com.jetbrains.hackathon.indices.viewer","version":"1.15","since":"212","until":"212.*","originalSince":"211.5823","originalUntil":"212.*"},{"id":"com.hjf.redis.manager.redis-manager","version":"1.1.4","since":"190.*","until":"301.*","originalSince":"183.*","originalUntil":"301.*"},{"id":"io.k6.ide.plugin","version":"0.0.1","since":"202.0","until":"211.*","originalSince":"201.0","originalUntil":"211.*"},{"id":"com.musictime.intellij.plugin","version":"2.1.9","since":"181","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.hjf.redis.manager.redis-manager","version":"1.1.5","since":"190.*","until":"301.*","originalSince":"183.*","originalUntil":"301.*"},{"id":"com.tabnine.TabNine","version":"0.3.4","since":"191","until":"","originalSince":"182.*","originalUntil":null},{"id":"org.bigtows.PinNote","version":"2.1","since":"202.*","until":"213.*","originalSince":"193.2252","originalUntil":"213.*"},{"id":"org.ice1000.julia","version":"0.4.2","since":"201.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.intellij.lang.jsgraphql","version":"2.9.0","since":"192.7142","until":"202.*","originalSince":"192.7142","originalUntil":"212.*"},{"id":"com.jetbrains.hackathon.indices.viewer","version":"1.16","since":"212","until":"212.*","originalSince":"211.5823","originalUntil":"212.*"},{"id":"com.hjf.redis.manager.redis-manager","version":"1.1.6","since":"190.*","until":"301.*","originalSince":"183.*","originalUntil":"301.*"},{"id":"JRebelPlugin","version":"2021.1.2","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"com.intellij.lang.jsgraphql","version":"2.9.1","since":"193.7288","until":"202.*","originalSince":"192.7142","originalUntil":"212.*"},{"id":"com.hjf.redis.manager.redis-manager","version":"1.1.7","since":"190.*","until":"301.*","originalSince":"183.*","originalUntil":"301.*"},{"id":"com.seventh7.widget.iedis2","version":"2021.1.1","since":"211.6222.4","until":"211.*","originalSince":"203.7148.57","originalUntil":"211.*"},{"id":"com.coasns.pax","version":"2021.1","since":"211.6222.4","until":"211.*","originalSince":"203.5981.41","originalUntil":"211.*"},{"id":"izhangzhihao.rainbow.brackets","version":"6.17","since":"201.*","until":"213","originalSince":"201.6668","originalUntil":null},{"id":"me.enaumov.plugins.salmon","version":"0.2","since":"191.*","until":"","originalSince":"191.0","originalUntil":null},{"id":"net.mamoe.kotlin-jvm-blocking-bridge","version":"1.10.1","since":"201.*","until":"212.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"com.chuntung.plugin.mybatisbuilder","version":"1.2.0","since":"181.4203","until":"231.*","originalSince":"181.4203","originalUntil":"299.*"},{"id":"sourcery.pycharm-plugin","version":"0.8.8","since":"183.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.github.taraktikos.cucumberclojure","version":"2020.3.2.1","since":"203.0","until":"203.*","originalSince":"202.0","originalUntil":"203.*"},{"id":"com.hjf.redis.manager.redis-manager","version":"1.1.8","since":"190.*","until":"301.*","originalSince":"183.*","originalUntil":"301.*"},{"id":"com.pqixing.aex","version":"1.0.9","since":"201","until":"","originalSince":"201.1.1","originalUntil":null},{"id":"me.enaumov.plugins.salmon","version":"0.7","since":"203.0","until":"","originalSince":"191.0","originalUntil":null},{"id":"net.mamoe.kotlin-jvm-blocking-bridge","version":"1.10.3","since":"201.*","until":"212.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"com.darshan.ezylogin","version":"1.0.3","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"io.k6.ide.plugin","version":"0.1.0","since":"202.0","until":"211.*","originalSince":"201.0","originalUntil":"211.*"},{"id":"com.github.chocovon.debug-variable-extractor","version":"1.2.1","since":"173","until":"202.*","originalSince":"162.0","originalUntil":"202.*"},{"id":"com.reallyliri.plugins.interfacepairing","version":"1.4","since":"211.5787","until":"","originalSince":"203.0","originalUntil":null},{"id":"net.sf.opk.avro-schema-support","version":"203.0.0","since":"211","until":"211.*","originalSince":"203.0","originalUntil":"211.*"},{"id":"com.synopsys.sig.desktop.idea","version":"2021.3.0.230770","since":"182.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"artsiomch.cmake","version":"211.0.1","since":"201.0","until":"203.0","originalSince":"201.0","originalUntil":"212.0"},{"id":"net.mamoe.mirai-console","version":"2.6-M1","since":"201.*","until":"203.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"com.agido.idea.settings","version":"0.1.5","since":"171.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"me.hehaiyang.codegen","version":"2.0.173","since":"173.0","until":"202","originalSince":"173.0","originalUntil":"203.*"},{"id":"org.intellij.scala","version":"2021.1.16","since":"211.6222","until":"211.*","originalSince":"211.6222","originalUntil":"212.*"},{"id":"org.intellij.scala","version":"2021.1.16","since":"211.6222","until":"211.*","originalSince":"211.6222","originalUntil":"212.*"},{"id":"net.mamoe.mirai-console","version":"2.6-M2","since":"201.*","until":"203.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"JRebelPlugin","version":"2021.2.0","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"intellij.ktor","version":"1.5.3","since":"211.0","until":"211.*","originalSince":"211.0","originalUntil":"212.*"},{"id":"com.github.zcg.love-your-eye-theme","version":"1.0.4","since":"191.*","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.avaje.ebean11.enhancer","version":"12.8.2","since":"171.0","until":"","originalSince":"161.0","originalUntil":null},{"id":"net.mamoe.kotlin-jvm-blocking-bridge","version":"1.10.4","since":"201.*","until":"212.*","originalSince":"201.*","originalUntil":"225.*"},{"id":"net.mamoe.mirai-console","version":"2.6-RC","since":"211.*","until":"215.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"sourcery.pycharm-plugin","version":"0.9.0","since":"183.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"one.util.ideaplugin.screenshoter","version":"1.6","since":"203.0","until":"","originalSince":"192.0","originalUntil":null},{"id":"xyz.zono.plugin.InputSequenceAction","version":"0.0.2","since":"145.0","until":"","originalSince":"131.0","originalUntil":null},{"id":"io.unthrottled.amii.rider","version":"0.2.1","since":"203.5981.141","until":"211.*","originalSince":"202.6397.94","originalUntil":"211.*"},{"id":"com.github.exidcuter.dockerregistryexplorer","version":"1.0.3-stable","since":"203.0","until":"211.*","originalSince":"201.0","originalUntil":"211.*"},{"id":"net.mamoe.mirai-console","version":"2.6.0","since":"211.*","until":"215.*","originalSince":"201.*","originalUntil":"215.*"},{"id":"com.taff.plugin.orchide","version":"2020.1.4.0-2019.3","since":"193.5562","until":"211.0","originalSince":"193.5562","originalUntil":"212.0"},{"id":"org.intellij.scala","version":"2021.1.17","since":"211.6222","until":"211.*","originalSince":"211.6222","originalUntil":"212.*"},{"id":"org.intellij.scala","version":"2021.1.18","since":"211.6222","until":"211.*","originalSince":"211.6222","originalUntil":"212.*"},{"id":"org.intellij.scala","version":"2021.1.17","since":"211.6222","until":"211.*","originalSince":"211.6222","originalUntil":"212.*"},{"id":"com.ytanikin.datasetnavigator","version":"0.4","since":"203.*","until":"","originalSince":"202.*","originalUntil":null},{"id":"org.intellij.scala","version":"2021.1.18","since":"211.6222","until":"211.*","originalSince":"211.6222","originalUntil":"212.*"},{"id":"org.intellij.scala","version":"2021.1.19","since":"211.6222","until":"211.*","originalSince":"211.6222","originalUntil":"212.*"},{"id":"org.apache.camel","version":"0.7.1","since":"211.6693","until":"211.*","originalSince":"203.0","originalUntil":"211.*"},{"id":"clueqva.Decorate.me","version":"1.3","since":"201.0","until":"","originalSince":"193.0","originalUntil":null},{"id":"com.intellij.STAintellij.intellij_plugin","version":"21.4.215","since":"201.*","until":"211.*","originalSince":"173.3","originalUntil":"211.*"},{"id":"JRebelPlugin","version":"2021.2.1","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"com.google.developers.certification.android","version":"1.0.10","since":"202.0","until":"202.*","originalSince":"201.0","originalUntil":"202.*"},{"id":"org.apache.camel","version":"0.7.5","since":"203.0","until":"203.*","originalSince":"203.0","originalUntil":"211.*"},{"id":"org.intellij.scala","version":"2021.1.20","since":"211.6222","until":"211.*","originalSince":"211.6222","originalUntil":"212.*"},{"id":"net.fhtagn.pycharm.cellmode","version":"1.3.0","since":"192.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.asherbernardi.jsgfplugin","version":"2.0","since":"203.*","until":"211.*","originalSince":"193.0","originalUntil":"211.*"},{"id":"com.sonatype.nexus-iq","version":"2.10.1-01","since":"143.0","until":"201.3","originalSince":"143.0","originalUntil":"201.*"},{"id":"me.mbolotov.cypress.pro","version":"2.1.0","since":"211.0","until":"211.*","originalSince":"203.0","originalUntil":"211.*"},{"id":"com.uriyyo.evaluate_async_code","version":"1.12","since":"193.0","until":"213","originalSince":"192.0","originalUntil":null},{"id":"org.rust.lang","version":"0.4.147.3871-211","since":"211.6693","until":"211.*","originalSince":"211.6693","originalUntil":"212.*"},{"id":"com.gem.gdis.disl-run","version":"1.1.0","since":"201.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.synopsys.sig.desktop.idea","version":"2021.5.0.23076936","since":"182","until":"","originalSince":"181.0","originalUntil":null},{"id":"org.turbanov.execution.cmd","version":"1.8","since":"201.0","until":"","originalSince":"191.0","originalUntil":null},{"id":"org.whitesource.wss-intellij-plugin","version":"21.5.1","since":"191.0","until":"","originalSince":"172.0","originalUntil":null},{"id":"org.whitesource.wss-webstorm-plugin","version":"21.5.1","since":"191.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"org.whitesource.wss-pycharm-plugin","version":"21.5.1","since":"191.0","until":"","originalSince":"183.0","originalUntil":null},{"id":"com.github.konevdmitry.VaDima","version":"1.0.0","since":"203.5981.165","until":"211.*","originalSince":"203.5981.165","originalUntil":"300.*"},{"id":"com.yanglx","version":"1.2.2","since":"183.0","until":"211.7142.45","originalSince":"183.0","originalUntil":"211.*"},{"id":"com.intellij.STAintellij.intellij_plugin","version":"21.5.216","since":"201.*","until":"211.*","originalSince":"173.3","originalUntil":"211.*"},{"id":"JRebelPlugin","version":"2021.2.2","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"org.jetbrains.plugins.tinygo","version":"0.1","since":"211.7442","until":"211.*","originalSince":"211.7442","originalUntil":"212.*"},{"id":"com.github.adamwojszczyk.sepiaTheme","version":"0.2.5","since":"203.5981","until":"999.*","originalSince":"203.5981","originalUntil":"1000.*"},{"id":"ru.adelf.idea.dotenv","version":"2021.2","since":"193.0","until":"211.*","originalSince":"193.0","originalUntil":"212.*"},{"id":"sourcery.pycharm-plugin","version":"0.9.1","since":"192.0","until":"","originalSince":"183.0","originalUntil":null},{"id":"com.pycrunch.intellijconnector","version":"1.2.2","since":"192.0","until":"203.5981.155","originalSince":"171.0","originalUntil":null},{"id":"net.sf.opk.avro-schema-support","version":"203.0.1","since":"211","until":"211.*","originalSince":"203.0","originalUntil":"211.*"},{"id":"cn.robin.mgs.v5.theme","version":"1.0.2","since":"191.*","until":"211.*","originalSince":"173.3.5","originalUntil":"211.*"},{"id":"com.checkmarx.intellij","version":"9.00.21","since":"172","until":"","originalSince":"111.69","originalUntil":null},{"id":"com.chuntung.plugin.mybatisbuilder","version":"1.2.1","since":"181.4203","until":"231.*","originalSince":"181.4203","originalUntil":"299.*"},{"id":"org.intellij.scala","version":"2021.2.10","since":"212.4321","until":"212.*","originalSince":"212.4321","originalUntil":"213.*"},{"id":"net.mamoe.kotlin-jvm-blocking-bridge","version":"1.10.6","since":"201.*","until":"212.*","originalSince":"201.*","originalUntil":"225.*"},{"id":"com.settler.rider.specflow","version":"1.9.0","since":"212.4037","until":"212.4037.*","originalSince":"212.4037","originalUntil":"212.*"},{"id":"de.cronn.validation-files-diff","version":"1.3","since":"193.0","until":"","originalSince":"192.0","originalUntil":null},{"id":"me.mbolotov.cypress.pro","version":"2.2.0","since":"211.0","until":"211.*","originalSince":"203.0","originalUntil":"212.*"},{"id":"Kunpeng Library","version":"2.3.1","since":"211.5538.20","until":"","originalSince":"203.5981.166","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"6.7.0","since":"211.5538","until":"211.*","originalSince":"211.5538","originalUntil":"212.*"},{"id":"org.intellij.scala","version":"2021.2.11","since":"212.4321","until":"212.*","originalSince":"212.4321","originalUntil":"213.*"},{"id":"palantir-java-format","version":"2.1.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.github.adamwojszczyk.sepiaTheme","version":"0.3.0","since":"203.5981","until":"999.*","originalSince":"203.5981","originalUntil":"1000.*"},{"id":"Scala-Macro-Tools Plugin","version":"0.1.1","since":"203.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"JRebelPlugin","version":"2021.3.0","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"palantir-java-format","version":"2.2.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.noorts.toggler","version":"1.2.0","since":"192.0","until":"212.*","originalSince":"191.0","originalUntil":"212.*"},{"id":"com.noorts.toggler","version":"1.2.1","since":"203.4341","until":"212.3116.29","originalSince":"203.4341","originalUntil":"213.*"},{"id":"org.intellij.scala","version":"2021.2.12","since":"212.4321","until":"212.*","originalSince":"212.4321","originalUntil":"213.*"},{"id":"com.checkmarx.intellij","version":"9.00.22","since":"172","until":"","originalSince":"111.69","originalUntil":null},{"id":"com.hd123.plugin.id","version":"2.29","since":"212","until":"","originalSince":"193.5233.102","originalUntil":null},{"id":"dev.blachut.svelte.lang","version":"0.20.0","since":"203.5784","until":"213.5281.15","originalSince":"203.5784","originalUntil":"213.*"},{"id":"com.shuzijun.markdown-editor","version":"1.1","since":"202.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.ankitkaneri.gomock.GoMock","version":"1.1.2","since":"201.0","until":"215.*","originalSince":"201.0","originalUntil":"221.*"},{"id":"artsiomch.cmake","version":"212.0.1","since":"201.0","until":"203.0","originalSince":"201.0","originalUntil":"213.0"},{"id":"com.github.ArtsiomCh.JDCleanRead","version":"212.0.1","since":"201.0","until":"232.*","originalSince":"201.0","originalUntil":"999.9"},{"id":"com.shuzijun.markdown-editor","version":"1.2","since":"202.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.shuzijun.markdown-editor","version":"1.3","since":"202.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.hd123.jetbrains.jira.workinghours","version":"1.0.193","since":"193","until":"193.*","originalSince":"183.0","originalUntil":"201.0"},{"id":"com.shuzijun.markdown-editor","version":"1.4","since":"202.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.sothis-baka.IDontHaveAPersonalPage.plugin.1","version":"1.0","since":"192","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.jetbrains.plugins.vue","version":"212.4746.57","since":"212.4746","until":"212.4746.*","originalSince":"212.4746","originalUntil":"212.*"},{"id":"org.intellij.scala","version":"2021.2.13","since":"212.4321","until":"212.*","originalSince":"212.4321","originalUntil":"213.*"},{"id":"com.intellij.resharper.azure","version":"3.50.0.1234-2021.2","since":"212.4746.33","until":"212.*","originalSince":"211.4961.4","originalUntil":"212.*"},{"id":"com.shuzijun.markdown-editor","version":"1.5","since":"202.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.jsonts.kotlin","version":"1.0.33","since":"202.0","until":"211.4","originalSince":"202.0","originalUntil":"211.*"},{"id":"dev.blachut.svelte.lang","version":"0.21.0","since":"212.0","until":"213.5281.15","originalSince":"212.0","originalUntil":"213.*"},{"id":"de.platon42.m68k","version":"0.2","since":"211.6693.0","until":"","originalSince":"193.7288.0","originalUntil":null},{"id":"org.intellij.scala","version":"2021.2.15","since":"212.4321","until":"212.*","originalSince":"212.4321","originalUntil":"213.*"},{"id":"org.intellij.scala","version":"2021.2.15","since":"212.4321","until":"212.*","originalSince":"212.4321","originalUntil":"213.*"},{"id":"net.sf.opk.avro-schema-support","version":"203.0.2","since":"211","until":"211.*","originalSince":"203.0","originalUntil":"211.*"},{"id":"me.mbolotov.cypress.pro","version":"2.3.0","since":"211.0","until":"211.*","originalSince":"211.0","originalUntil":"212.*"},{"id":"uk.org.oliveira.vg","version":"1.1.0","since":"211","until":"232.*","originalSince":"203.0","originalUntil":null},{"id":"com.itangcent.idea.plugin.easy-yapi","version":"2.2.4.183.0","since":"183.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.beansoft.reatnative.idea.free","version":"2021.2.0","since":"201.8743.12","until":"203.*","originalSince":"193.0","originalUntil":null},{"id":"com.lightrun.idea.plugin.saas.LightrunPlugin","version":"1.1.1-release.20.7c741dc","since":"193","until":"","originalSince":"183.2940.10","originalUntil":null},{"id":"com.noorts.toggler","version":"1.2.2","since":"203.4341","until":"212.3116.29","originalSince":"203.4341","originalUntil":"213.*"},{"id":"JRebelPlugin","version":"2021.3.1","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"com.github.zouyq.cmdTools","version":"0.3.1","since":"202.0","until":"223.*","originalSince":"202.0","originalUntil":"999.*"},{"id":"com.stepsize.tech-debt-reporter","version":"1.0.6-203+","since":"203.0","until":"","originalSince":"202.0","originalUntil":null},{"id":"com.sourcegraph.jetbrains","version":"1.2.1","since":"162.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.stepsize.tech-debt-reporter","version":"1.0.7-203+","since":"203.0","until":"","originalSince":"202.0","originalUntil":null},{"id":"com.saturn.intellijPlugin.backgroundImageFromBing","version":"2.2","since":"171.0","until":"","originalSince":"162.0","originalUntil":null},{"id":"com.github.beansoftapp.flutter.storm","version":"2021.2.0","since":"203.6682.141","until":"231.*","originalSince":"202.7660.26","originalUntil":null},{"id":"com.baomidou.plugin.idea.mybatisx","version":"1.5.0","since":"202.0","until":"","originalSince":"192.0","originalUntil":null},{"id":"com.asherbernardi.jsgfplugin","version":"2.0.1","since":"203.*","until":"212.*","originalSince":"193.0","originalUntil":"212.*"},{"id":"net.sf.opk.avro-schema-support","version":"203.0.3","since":"211","until":"212.*","originalSince":"203.0","originalUntil":"212.*"},{"id":"com.github.brandtjo.releasescripthelper","version":"1.2.5","since":"203.0","until":"212.*","originalSince":"202.0","originalUntil":"212.*"},{"id":"gileli121.glasside.windows","version":"1.2.4-SNAPSHOT","since":"200.0","until":"232.*","originalSince":"200.0","originalUntil":"300.*"},{"id":"com.joker.serial_number","version":"1.0.0-beta02","since":"212.4746.92","until":"212.4746.92","originalSince":"212.4746","originalUntil":"212.*"},{"id":"com.github.nicsilver.jumpertest","version":"0.1.2","since":"202.0","until":"212.*","originalSince":"202.0","originalUntil":"215.*"},{"id":"net.sf.opk.avro-schema-support","version":"203.1.0","since":"211","until":"212.*","originalSince":"203.0","originalUntil":"212.*"},{"id":"de.mariushoefler.flutter_enhancement_suite","version":"1.6.0","since":"203.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"io.github.danthe1st.ij2gdocs","version":"1.1.0","since":"203.0","until":"212.*","originalSince":"202.0","originalUntil":"212.*"},{"id":"com.github.affishaikh.kotlinbuildergenerator","version":"1.0.5.RC","since":"193.0","until":"212.*","originalSince":"193.0","originalUntil":"292.*"},{"id":"com.synopsys.sig.desktop.idea","version":"2021.8.0.248750","since":"193.0","until":"","originalSince":"181.0","originalUntil":null},{"id":"com.tang.ideaplugin","version":"v1.0.3","since":"191.8026.42","until":"","originalSince":"201.6668.113","originalUntil":null},{"id":"org.intellij.plugins.hcl","version":"0.7.11","since":"203.*","until":"213.*","originalSince":"192.5000","originalUntil":null},{"id":"MavenRunHelper","version":"4.16.212.000.0","since":"212.5284.31","until":"","originalSince":"212.0","originalUntil":null},{"id":"JRebelPlugin","version":"2021.3.2","since":"145.0","until":"213.*","originalSince":"145.0","originalUntil":"999.*"},{"id":"org.jboss.forge.plugin.idea","version":"3.1.5","since":"203.0","until":"212.*","originalSince":"193.0","originalUntil":"212.*"},{"id":"no.eirikb.avatest","version":"1.5.0","since":"202.0","until":"212.*","originalSince":"202.0","originalUntil":"999.*"},{"id":"org.toml.lang","version":"0.2.155.4114-212","since":"212.4746","until":"212.*","originalSince":"212.4746","originalUntil":"213.*"},{"id":"com.microfocus.intellij.plugin.gitclient","version":"1.4","since":"193.0","until":"212","originalSince":"193.0","originalUntil":"212.9999"},{"id":"com.ekino.oss.jcv-idea-plugin","version":"3.0.2","since":"211","until":"","originalSince":"201.0","originalUntil":null},{"id":"org.crev","version":"0.0.1","since":"212.0","until":"212.*","originalSince":"203.0","originalUntil":"212.*"},{"id":"activiti-bpmn-visualizer","version":"0.4.6.3","since":"192","until":"","originalSince":"182.0","originalUntil":null},{"id":"flowable-bpmn-visualizer","version":"0.4.6.3","since":"192","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.jetbrains.flora","version":"0.1.2","since":"211.0","until":"213.*","originalSince":"203.0","originalUntil":"213.*"},{"id":"com.intellij.resharper.azure","version":"3.50.0.1259-2021.3","since":"213.0","until":"213.3714.*","originalSince":"213.0","originalUntil":"213.*"},{"id":"JRebelPlugin","version":"2021.4.0","since":"163.0","until":"213.*","originalSince":"163.0","originalUntil":"999.*"},{"id":"jetbrains.mps.build","version":"2021.2","since":"212.1","until":"213.1","originalSince":"211.1","originalUntil":"213.1"},{"id":"jetbrains.mps.core","version":"2021.2","since":"212.1","until":"213.1","originalSince":"211.1","originalUntil":"213.1"},{"id":"jetbrains.mps.testing","version":"2021.2","since":"212.1","until":"213.1","originalSince":"211.1","originalUntil":"213.1"},{"id":"com.intellij.resharper.azure","version":"3.50.0.1269-2021.3","since":"213.0","until":"213.4293.*","originalSince":"213.0","originalUntil":"213.*"},{"id":"dev.nybroe.collector","version":"0.3.3","since":"212.0","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.github.leomillon.uuidgenerator","version":"4.5.0","since":"211","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.veracode.greenlight.intellij.plugin.id","version":"1.6.0.202110080335-RELEASE","since":"193.0","until":"211.7628.21","originalSince":"173.0","originalUntil":null},{"id":"net.sf.opk.avro-schema-support","version":"203.1.1","since":"211","until":"213.*","originalSince":"203.0","originalUntil":"213.*"},{"id":"activiti-bpmn-visualizer","version":"0.4.7.0","since":"192.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"flowable-bpmn-visualizer","version":"0.4.7.0","since":"192.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"Kunpeng Library","version":"2.3.2","since":"211.5538.20","until":"","originalSince":"203.5981.166","originalUntil":null},{"id":"palantir-java-format","version":"2.3.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"dev.blachut.svelte.lang","version":"0.21.1","since":"212.0","until":"221.4906","originalSince":"212.0","originalUntil":"221.*"},{"id":"pro.bashsupport","version":"2.0.6.213","since":"213.5281.0","until":"213.5744.202","originalSince":"213.5281.0","originalUntil":"213.*"},{"id":"simd","version":"3","since":"192.*","until":"","originalSince":"191.3","originalUntil":null},{"id":"MavenRunHelper","version":"4.18.212.000.0","since":"213.3565","until":"","originalSince":"212.0","originalUntil":null},{"id":"org.intellij.scala","version":"2021.3.8","since":"213.4631","until":"213.5744.202","originalSince":"213.4631","originalUntil":"221.*"},{"id":"MavenRunHelper","version":"4.18.212.000.1","since":"213.3565","until":"","originalSince":"212.0","originalUntil":null},{"id":"JRebelPlugin","version":"2021.4.1","since":"163.0","until":"213.*","originalSince":"163.0","originalUntil":"999.*"},{"id":"palantir-java-format","version":"2.4.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"2.5.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"2.6.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.sourcegraph.jetbrains","version":"1.2.2","since":"162.0","until":"","originalSince":"145.0","originalUntil":null},{"id":"com.chuntung.plugin.mybatisbuilder","version":"1.2.2","since":"181.4203","until":"231.*","originalSince":"181.4203","originalUntil":"299.*"},{"id":"org.intellij.scala","version":"2021.3.9","since":"213.4631","until":"213.5744.202","originalSince":"213.4631","originalUntil":"221.*"},{"id":"bobril-runner","version":"0.4.2","since":"201.0","until":"","originalSince":"191.0","originalUntil":null},{"id":"palantir-java-format","version":"2.7.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"org.jetbrains.kotlin","version":"212-1.6.0-release-799-IJ5457.46","since":"212.5457.46","until":"212.*","originalSince":"212.5080.55","originalUntil":"212.*"},{"id":"palantir-java-format","version":"2.8.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.intellij.plugin.adernov.powershell","version":"2.0.8","since":"213.3714.440","until":"213.5744.202","originalSince":"203.3645.34","originalUntil":null},{"id":"palantir-java-format","version":"2.9.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.intellij.kotlinNative.platformDeps","version":"213.5744.180","since":"213.5744","until":"213.5744.180","originalSince":"213.5744","originalUntil":"213.*"},{"id":"com.intellij.appcode.kmm","version":"213-1.5.10-release-949-AC5744.180","since":"213.5744","until":"213.5744.180","originalSince":"213.5744","originalUntil":"213.*"},{"id":"com.github.mbolotov.playwrightintellij","version":"1.0.1","since":"212.0","until":"213.*","originalSince":"211.0","originalUntil":"213.*"},{"id":"org.intellij.scala","version":"2021.3.13","since":"213.4631","until":"213.5744.202","originalSince":"213.4631","originalUntil":"221.*"},{"id":"org.intellij.scala","version":"2021.3.503","since":"213.4631","until":"213.5744.202","originalSince":"213.4631","originalUntil":"221.*"},{"id":"org.intellij.scala","version":"2021.3.14","since":"213.5744.223","until":"221.*","originalSince":"213.4631","originalUntil":"221.*"},{"id":"com.ibeetl.intellij.support","version":"1.0.8","since":"193.5233.102","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.github.mounthuaguo.monkeyking","version":"0.1.4","since":"202.0","until":"221.*","originalSince":"202.0","originalUntil":"256.*"},{"id":"li.barlog.oceanic-primal","version":"0.0.11","since":"193.0","until":"231.*","originalSince":"193.0","originalUntil":"512.0"},{"id":"LineShare-intellij-plugin","version":"1.0.1","since":"202.7319","until":"213.*","originalSince":"202.0","originalUntil":null},{"id":"JRebelPlugin","version":"2021.4.2","since":"163.0","until":"213.*","originalSince":"163.0","originalUntil":"999.*"},{"id":"Scala-Macro-Tools Plugin","version":"0.3.4","since":"211.0","until":"","originalSince":"213.0","originalUntil":null},{"id":"net.sf.opk.avro-schema-support","version":"203.1.2","since":"211","until":"213.*","originalSince":"203.0","originalUntil":"213.*"},{"id":"com.alibaba.compileflow.designer","version":"1.0.13","since":"182.*","until":"213.*","originalSince":"162.*","originalUntil":"213.*"},{"id":"yy-dev-tools","version":"2021.0.1","since":"211.0","until":"211.*","originalSince":"211.0","originalUntil":"213.*"},{"id":"leetcode-editor-pro","version":"2022.1.0","since":"203.0","until":"","originalSince":"202.0","originalUntil":null},{"id":"AceJump","version":"3.8.5","since":"213.5744.223","until":"","originalSince":"203.7717.56","originalUntil":null},{"id":"leetcode-editor-pro","version":"2022.1.1","since":"203.0","until":"","originalSince":"202.0","originalUntil":null},{"id":"org.intellij.scala","version":"2021.3.17","since":"213.5744.223","until":"213.*","originalSince":"213.5744.223","originalUntil":"221.*"},{"id":"org.intellij.scala","version":"2021.3.17","since":"213.5744.223","until":"213.*","originalSince":"213.5744.223","originalUntil":"221.*"},{"id":"me.him188.kotlin-dynamic-delegation","version":"213-0.1.0-160.1-1","since":"203.0","until":"213","originalSince":"201.0","originalUntil":null},{"id":"slinky.core.intellij","version":"0.7.0","since":"203.6682.168","until":"223.*","originalSince":"203.6682.168","originalUntil":"999.9999.999"},{"id":"intellij-crystal-lang","version":"0.2.0-2021.2","since":"212.0","until":"213.*","originalSince":"212.0","originalUntil":"999.*"},{"id":"dev.blachut.svelte.lang","version":"0.21.2","since":"213.6461","until":"221.4906","originalSince":"213.6461","originalUntil":"221.*"},{"id":"com.itangcent.idea.plugin.easy-yapi","version":"2.3.1.183.0","since":"183.0","until":"","originalSince":"173.0","originalUntil":null},{"id":"org.intellij.scala","version":"2021.3.18","since":"213.5744.223","until":"213.*","originalSince":"213.5744.223","originalUntil":"221.*"},{"id":"org.intellij.scala","version":"2021.3.514","since":"213.5744.223","until":"213.*","originalSince":"213.5744.223","originalUntil":"221.*"},{"id":"com.github.jrd77.codecheck.id","version":"1.2.2","since":"193.5233.102","until":"213.9999","originalSince":"193.5233.102","originalUntil":"213.*"},{"id":"org.intellij.scala","version":"2021.3.515","since":"213.5744.223","until":"213.*","originalSince":"213.5744.223","originalUntil":"221.*"},{"id":"org.intellij.scala","version":"2021.3.516","since":"213.5744.223","until":"213.*","originalSince":"213.5744.223","originalUntil":"221.*"},{"id":"co.bito.bito-intellij","version":"1.0.72","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"palantir-java-format","version":"2.10.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.0.73","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.mesour.intellij.neon","version":"1.0.0","since":"201.0","until":"221.*","originalSince":"193.0","originalUntil":null},{"id":"DartJsonGenerator","version":"3.1.2","since":"171.0","until":"171.*","originalSince":"171.0","originalUntil":"213.*"},{"id":"palantir-java-format","version":"2.11.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"YapiUploadPlus","version":"1.0.2","since":"173.0","until":"","originalSince":"94.539","originalUntil":null},{"id":"palantir-java-format","version":"2.12.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"2.13.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"2.14.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"ai.coderefactor","version":"2021.3.10","since":"212.*","until":"213.*","originalSince":"202.0","originalUntil":"213.*"},{"id":"org.intellij.scala","version":"2021.3.18","since":"213.5744.223","until":"213.*","originalSince":"213.5744.223","originalUntil":"221.*"},{"id":"fortify.securityAssistant.security-assistant-intellij","version":"22.1.0.0102","since":"203.0.0","until":"213.*","originalSince":"201.0.0","originalUntil":"213.*"},{"id":"com.github.beansoftapp.visualgc.plugin","version":"2021.3.3","since":"203.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"intellij-crystal-lang","version":"0.2.1-2021.2","since":"212.0","until":"213.*","originalSince":"212.0","originalUntil":"999.*"},{"id":"org.intellij.scala","version":"2021.3.522","since":"213.5744.223","until":"213.*","originalSince":"213.5744.223","originalUntil":"221.*"},{"id":"palantir-java-format","version":"2.15.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"org.intellij.scala","version":"2021.3.523","since":"213.5744.223","until":"213.*","originalSince":"213.5744.223","originalUntil":"221.*"},{"id":"palantir-java-format","version":"2.16.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"de.quantumrange.betterCollapse","version":"1.0.1-SNAPSHOT","since":"213.*","until":"213.*","originalSince":"213.6461","originalUntil":"213.*"},{"id":"com.unger1984.npmdependencychecker","version":"0.0.2","since":"203.0","until":"223.*","originalSince":"203.0","originalUntil":"300.0"},{"id":"co.bito.bito-intellij","version":"1.0.83","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"palantir-java-format","version":"2.17.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"marcglasberg.HibernateInspectionsPlugin","version":"1.6","since":"231.0","until":"","originalSince":"192.0","originalUntil":null},{"id":"com.sourcegraph.jetbrains","version":"1.2.3","since":"162","until":"213.*","originalSince":"145.0","originalUntil":"213.*"},{"id":"com.intellij.lang.jsgraphql","version":"3.1.3","since":"221.0","until":"221.*","originalSince":"211.0","originalUntil":"221.*"},{"id":"com.intellij.resharper.azure","version":"3.50.0.1350-2022.1","since":"221.0","until":"221.3427.104","originalSince":"221.0","originalUntil":"221.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"7.0.0","since":"221.0","until":"221.9999","originalSince":"221.0","originalUntil":"222.*"},{"id":"com.mallowigi.imageicon","version":"11.0.0","since":"221.0","until":"221.*","originalSince":"221.0","originalUntil":"231.*"},{"id":"com.mallowigi","version":"60.0.0","since":"221.0","until":"221.*","originalSince":"221.0","originalUntil":"231.*"},{"id":"com.checkmarx.intellij","version":"9.00.25","since":"172","until":"","originalSince":"111.69","originalUntil":null},{"id":"net.mamoe.mirai-console","version":"213-2.10.0-160-1","since":"212.*","until":"213.*","originalSince":"212.*","originalUntil":"225.*"},{"id":"com.icoder0.groom","version":"1.1.0","since":"201.8743.12","until":"232.*","originalSince":"182.5262.2","originalUntil":null},{"id":"net.mamoe.mirai-console","version":"213-2.10.0-162-1","since":"212.*","until":"213.9999","originalSince":"212.*","originalUntil":"225.*"},{"id":"com.unger1984.npmdependencychecker","version":"0.0.3","since":"203.0","until":"223.*","originalSince":"203.0","originalUntil":"300.0"},{"id":"co.bito.bito-intellij","version":"1.0.85","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.github.mbolotov.playwrightintellij","version":"1.1","since":"212.0","until":"213.*","originalSince":"212.0","originalUntil":"221.*"},{"id":"com.intellij.resharper.azure","version":"3.50.0.1355-2022.1","since":"221.3427.105","until":"221.*","originalSince":"221.0","originalUntil":"221.*"},{"id":"com.agenthun.intellij-astock-plugin","version":"2022.1.1","since":"202.0","until":"213.*","originalSince":"202.0","originalUntil":"221.*"},{"id":"com.github.voml.neo_theme","version":"0.2.1","since":"180.0","until":"220.*","originalSince":"170.0","originalUntil":"220.*"},{"id":"com.leinardi.pycharm.mypy","version":"0.14.0","since":"212.5712","until":"","originalSince":"201.8743","originalUntil":null},{"id":"com.leinardi.pycharm.pylint","version":"0.14.0","since":"212.5712","until":"","originalSince":"201.8743","originalUntil":null},{"id":"slinky.core.intellij","version":"0.7.1","since":"203.6682.168","until":"223.*","originalSince":"203.6682.168","originalUntil":"999.9999.999"},{"id":"org.reloadium","version":"0.7.0","since":"203.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"easy-code","version":"1.201.1","since":"201.7223","until":"212.*","originalSince":"201.7223","originalUntil":"213.*"},{"id":"com.chuntung.plugin.mybatisbuilder","version":"1.2.3","since":"181.4203","until":"231.*","originalSince":"181.4203","originalUntil":"299.*"},{"id":"com.cral.JSONKeyFinder","version":"2.0.6","since":"211.6693.65","until":"","originalSince":"202.5792.28","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"7.1.0","since":"221.0","until":"221.9999","originalSince":"221.0","originalUntil":"222.*"},{"id":"com.daveme.intellij.chocolateCakePHP","version":"0.8.0","since":"212.*","until":"213.*","originalSince":"212.0","originalUntil":"213.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"7.1.1","since":"221.0","until":"221.9999","originalSince":"221.0","originalUntil":"222.*"},{"id":"org.hg.VoidTheme","version":"1.0","since":"191","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"7.2.0","since":"221.0","until":"221.9999","originalSince":"221.0","originalUntil":"222.*"},{"id":"de.ax.powermode","version":"102.201","since":"211.7628.21","until":"","originalSince":"211.0","originalUntil":null},{"id":"palantir-java-format","version":"2.18.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"2.19.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"2.20.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.codelogic.itellicape","version":"22.6.2","since":"212.0","until":"","originalSince":"203.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"7.2.1","since":"221.0","until":"221.9999","originalSince":"221.0","originalUntil":"222.*"},{"id":"fr.adrienbrault.idea.symfony2plugin","version":"2022.1.213","since":"313","until":"313","originalSince":"211.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"7.2.2","since":"221.0","until":"221.9999","originalSince":"221.0","originalUntil":"222.*"},{"id":"org.reloadium","version":"0.7.6","since":"203.0","until":"","originalSince":"211.0","originalUntil":null},{"id":"org.intellij.qodana","version":"221.5080.126","since":"221.5080","until":"221.5080.*","originalSince":"221.5080","originalUntil":"221.*"},{"id":"com.previewjs.intellij.plugin","version":"1.6.0","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.github.goldsubmarine.restfulhelper","version":"0.2.4-stable","since":"213.0","until":"213.*","originalSince":"212.0","originalUntil":"213.*"},{"id":"fr.adrienbrault.idea.symfony2plugin","version":"2022.1.217","since":"221","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"7.2.3","since":"221.0","until":"221.9999","originalSince":"221.0","originalUntil":"222.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"7.3.0","since":"221.5080","until":"221.9999","originalSince":"221.5080","originalUntil":"222.*"},{"id":"net.sf.opk.avro-schema-support","version":"213.0.0","since":"211","until":"221.*","originalSince":"203.0","originalUntil":"221.*"},{"id":"fi.aalto.cs.intellij-plugin","version":"3.6","since":"213.*","until":"222.*","originalSince":"212.4746","originalUntil":null},{"id":"palantir-java-format","version":"2.21.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"palantir-java-format","version":"2.22.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"io.artage.sfcc.salesforce-commerce-cloud","version":"2021.1.2.4","since":"213","until":"221.*","originalSince":"203.3645.*","originalUntil":"221.*"},{"id":"com.murphysec.intellij.Plugin","version":"2.0.7","since":"202.1","until":"221.*","originalSince":"202.0","originalUntil":"999.0"},{"id":"com.previewjs.intellij.plugin","version":"1.6.1","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.mallowigi","version":"61.0.0","since":"221.5080","until":"221.*","originalSince":"221.5080","originalUntil":"231.*"},{"id":"com.previewjs.intellij.plugin","version":"1.6.2","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"net.sf.opk.avro-schema-support","version":"213.0.1","since":"211","until":"221.*","originalSince":"203.0","originalUntil":"221.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"7.3.2","since":"221.5080","until":"221.9999","originalSince":"221.5080","originalUntil":"222.*"},{"id":"com.previewjs.intellij.plugin","version":"1.6.3","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.mallowigi","version":"62.0.0","since":"221.5080","until":"221.*","originalSince":"221.5080","originalUntil":"231.*"},{"id":"com.github.turansky.yfiles","version":"1.20.0","since":"212.5712","until":"221.*","originalSince":"212.5712","originalUntil":"222.*"},{"id":"com.previewjs.intellij.plugin","version":"1.6.4","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.profoundinventions.houdini","version":"2022.1","since":"213.6461.21","until":"213.6461.21","originalSince":"212.0","originalUntil":"213.*"},{"id":"com.mesour.intellij.neon","version":"1.0.4","since":"201.0","until":"222.*","originalSince":"201.0","originalUntil":"291.*"},{"id":"com.wafer","version":"1.5","since":"181","until":"231.*","originalSince":"173.0","originalUntil":null},{"id":"com.mallowigi","version":"63.0.0","since":"221.5080","until":"221.*","originalSince":"221.5080","originalUntil":"231.*"},{"id":"com.sourcegraph.jetbrains","version":"1.2.4","since":"192.0","until":"221.*","originalSince":"162.0","originalUntil":"221.*"},{"id":"NEON support","version":"0.5.2","since":"212.0","until":"","originalSince":"139.0","originalUntil":null},{"id":"com.mallowigi","version":"64.0.0","since":"221.5080","until":"221.*","originalSince":"221.5080","originalUntil":"231.*"},{"id":"com.intuit.intellij.makefile","version":"2.0.1","since":"212","until":"213.*","originalSince":"213.5744.223","originalUntil":null},{"id":"com.mrliuxia.doraemon","version":"0.3.0","since":"172.4343","until":"221.*","originalSince":"172.4343","originalUntil":"311.0"},{"id":"com.intuit.intellij.makefile","version":"2.1.0","since":"213","until":"213.*","originalSince":"212.0","originalUntil":"213.*"},{"id":"com.jetbrains.edu","version":"2022.4-2022.1-218","since":"221.4165","until":"221.*","originalSince":"221.4165","originalUntil":"222.*"},{"id":"palantir-java-format","version":"2.23.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"me.mbolotov.cypress.pro","version":"3.1","since":"221.0","until":"221.*","originalSince":"213.0","originalUntil":"221.*"},{"id":"palantir-java-format","version":"2.24.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"com.previewjs.intellij.plugin","version":"1.7.0","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"dk.cego.gitlab_ci_local_plugin","version":"0.0.2","since":"211.0","until":"221.*","originalSince":"211.0","originalUntil":"231.*"},{"id":"org.intellij.scala","version":"2022.1.14","since":"221.4501","until":"221.*","originalSince":"221.4501","originalUntil":"222.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"7.4.0","since":"221.5080","until":"221.9999","originalSince":"221.5080","originalUntil":"222.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"7.4.1","since":"221.5080","until":"221.9999","originalSince":"221.5080","originalUntil":"222.*"},{"id":"ru.crazycoder.plugins.tabdir","version":"1.6.7","since":"122.519","until":"231.*","originalSince":"122.519","originalUntil":"400.*"},{"id":"me.foreverigor.streamtips","version":"1.0.1","since":"203.*","until":"212.5712.43","originalSince":"202.5800","originalUntil":null},{"id":"com.previewjs.intellij.plugin","version":"1.7.1","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.previewjs.intellij.plugin","version":"1.8.0","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.hotdog.plugin","version":"1.1.0","since":"203.*","until":"203.*","originalSince":"203.7717","originalUntil":"203.*"},{"id":"org.intellij.scala","version":"2022.1.15","since":"221.4501","until":"221.*","originalSince":"221.4501","originalUntil":"222.*"},{"id":"com.wada811.kotlinizepr.kotlinize-pr-plugin","version":"1.0.5","since":"203.*","until":"","originalSince":"192.*","originalUntil":null},{"id":"com.by122006.zircon.ijplugin","version":"2.2","since":"200.*","until":"222.*","originalSince":"200.*","originalUntil":"300.0"},{"id":"com.mybatis.smart.pro.plugin","version":"2022.2.2","since":"213.7172.25","until":"221.*","originalSince":"212.4746.92","originalUntil":"221.*"},{"id":"org.intellij.scala","version":"2022.1.623","since":"221.4501","until":"221.*","originalSince":"221.4501","originalUntil":"222.*"},{"id":"com.mybatis.smart.pro.plugin","version":"2022.2.3","since":"213.7172.25","until":"221.*","originalSince":"212.4746.92","originalUntil":"221.*"},{"id":"org.intellij.scala","version":"2022.1.15","since":"221.4501","until":"221.*","originalSince":"221.4501","originalUntil":"222.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"7.5.0.2","since":"221.5080","until":"221.9999","originalSince":"221.5080","originalUntil":"222.*"},{"id":"org.antlr.intellij.plugin","version":"1.19","since":"220","until":"","originalSince":"192.0","originalUntil":null},{"id":"ru.adelf.idea.dotenv","version":"2022.2","since":"222.0","until":"222.*","originalSince":"212.0","originalUntil":"222.*"},{"id":"top.xystudio.plugin.idea.LiteFlowX","version":"0.0.1","since":"183.*","until":"221.*","originalSince":"171.*","originalUntil":"221.*"},{"id":"com.jetbrains.edu","version":"2022.5-2022.1-343","since":"221.4165","until":"221.*","originalSince":"221.4165","originalUntil":"222.*"},{"id":"co.bito.bito-intellij","version":"1.0.99","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.0.100","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"org.jetbrains.IdeaVim-EasyMotion","version":"1.8","since":"213","until":"","originalSince":"203.7717.56","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.0.102","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.0.102-1","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.mybatis.smart.pro.plugin","version":"2022.2.6","since":"213.7172.25","until":"222.*","originalSince":"212.4746.92","originalUntil":"222.*"},{"id":"intellij-scheme","version":"0.1.8","since":"133.0","until":"","originalSince":"103.0","originalUntil":null},{"id":"com.jetbrains.gerryPurpleTheme","version":"3.10","since":"191.0","until":"211.*","originalSince":"191.0","originalUntil":"222.*"},{"id":"com.previewjs.intellij.plugin","version":"1.9.0","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.mintlify.document","version":"1.1.6","since":"203.0","until":"221.*","originalSince":"203.0","originalUntil":"222.*"},{"id":"com.github.turansky.yfiles","version":"1.21.0","since":"212.5712","until":"221.*","originalSince":"212.5712","originalUntil":"222.*"},{"id":"com.mybatis.smart.pro.plugin","version":"2022.2.7","since":"213.7172.25","until":"222.*","originalSince":"212.4746.92","originalUntil":"222.*"},{"id":"fi.tampere.catto.plugin","version":"1.1.7-SNAPSHOT","since":"221.*","until":"222.*","originalSince":"212.0","originalUntil":"222.*"},{"id":"com.junhai.oversea.sdk.plugin","version":"1.1.6","since":"200","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.github.brandtjo.releasescripthelper","version":"1.2.8","since":"221","until":"221.*","originalSince":"88.*","originalUntil":"221.*"},{"id":"com.by122006.zircon.ijplugin","version":"2.3","since":"200.*","until":"222.*","originalSince":"200.*","originalUntil":"300.0"},{"id":"slowgenius-tools","version":"2.0.0","since":"193.0","until":"222.*","originalSince":"191.0","originalUntil":"222.*"},{"id":"com.murphysec.intellij.Plugin","version":"3.0.0","since":"202.0","until":"223.*","originalSince":"202.0","originalUntil":"999.0"},{"id":"MyBatisLog","version":"2022.7.2","since":"221","until":"223.*","originalSince":"203.*","originalUntil":"223.*"},{"id":"com.github.passerr.idea.plugins","version":"3.0.0","since":"202","until":"","originalSince":"202.6397","originalUntil":null},{"id":"MyBatisLog","version":"2022.5.2","since":"193.1","until":"220.4","originalSince":"193.1","originalUntil":"222.2"},{"id":"co.bito.bito-intellij","version":"1.0.104","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.junhai.oversea.sdk.plugin","version":"1.1.7","since":"200","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.junhai.oversea.sdk.plugin","version":"1.1.8","since":"200","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.junhai.oversea.sdk.plugin","version":"1.1.9","since":"200","until":"","originalSince":"173.0","originalUntil":null},{"id":"com.previewjs.intellij.plugin","version":"1.9.1","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"palantir-java-format","version":"2.25.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.0.105","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"de.jensklingenberg.htmltocfw","version":"null","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"999.*"},{"id":"top.xystudio.plugin.idea.LiteFlowX","version":"1.0.0","since":"201.*","until":"221.*","originalSince":"183.*","originalUntil":"221.*"},{"id":"com.checkmarx.intellij","version":"9.00.29","since":"172","until":"","originalSince":"111.69","originalUntil":null},{"id":"com.murphysec.intellij.Plugin","version":"3.0.1","since":"202.0","until":"223.*","originalSince":"202.0","originalUntil":"999.0"},{"id":"co.anbora.labs.firebase-syntax-highlighting","version":"2022.3.1","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"co.bito.bito-intellij","version":"1.0.106","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"leetcode-editor","version":"8.2","since":"203.0","until":"","originalSince":"202.0","originalUntil":null},{"id":"org.moe","version":"1.5.2","since":"202.0","until":"223.*","originalSince":"201.0","originalUntil":null},{"id":"com.github.victorrentea.slf4jplugin","version":"1.0.20","since":"203.0","until":"233.*","originalSince":"203.0","originalUntil":"241.*"},{"id":"com.previewjs.intellij.plugin","version":"1.10.0","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"io.artage.sfcc.salesforce-commerce-cloud","version":"2021.1.2.5","since":"213","until":"222.*","originalSince":"211.*","originalUntil":"222.*"},{"id":"net.sf.opk.avro-schema-support","version":"213.1.0","since":"211","until":"223.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"com.mallowigi.colorHighlighter","version":"12.0.0","since":"222.0","until":"231.*","originalSince":"221.0","originalUntil":"231.*"},{"id":"com.murphysec.intellij.Plugin","version":"3.0.2","since":"202.0","until":"223.*","originalSince":"202.0","originalUntil":"999.0"},{"id":"com.tang","version":"1.3.7.2-IDEA222","since":"222.0","until":"222.*","originalSince":"212.0","originalUntil":"222.*"},{"id":"co.bito.bito-intellij","version":"1.0.107","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"net.sf.opk.avro-schema-support","version":"213.2.0","since":"211","until":"223.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"vedro","version":"0.1.3","since":"211","until":"","originalSince":"203.0","originalUntil":null},{"id":"palantir-java-format","version":"2.26.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"net.sf.opk.avro-schema-support","version":"213.2.1","since":"211","until":"223.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"com.github.turansky.yfiles","version":"1.22.0","since":"222.3345","until":"222.*","originalSince":"212.5712","originalUntil":"222.*"},{"id":"com.previewjs.intellij.plugin","version":"1.11.0","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.jetbrains.rider.plugins.ilruntimedebugger","version":"211.1.2","since":"211.*","until":"211.*","originalSince":"211.7628","originalUntil":"211.*"},{"id":"com.rrawat.gitlabmrview","version":"0.0.2-alpha","since":"220.0","until":"223.*","originalSince":"220.0","originalUntil":"233.*"},{"id":"com.egoshard.intellij.k8s-runtime-config-plugin","version":"1.2.10","since":"222.0","until":"223.*","originalSince":"213.0","originalUntil":"223.*"},{"id":"com.github.jensim.megamanipulator","version":"0.0.53","since":"221.0","until":"223.*","originalSince":"221.0","originalUntil":"229.*"},{"id":"detekt","version":"1.21.1","since":"221","until":"","originalSince":"203.5981.155","originalUntil":null},{"id":"com.mesour.intellij.latte","version":"1.0.1","since":"213.0","until":"222.*","originalSince":"213.0","originalUntil":"292.*"},{"id":"com.mesour.intellij.latte","version":"1.0.2","since":"213.0","until":"223.*","originalSince":"213.0","originalUntil":"292.*"},{"id":"dev.eltonsandre.intellij.spring.assistant.plugin","version":"2022.2.2","since":"221.*","until":"222.*","originalSince":"221.0","originalUntil":null},{"id":"com.github.enzdev.ideangxtranslateautocomplete","version":"0.1.3","since":"221.0","until":"222.*","originalSince":"211.0","originalUntil":"222.*"},{"id":"com.previewjs.intellij.plugin","version":"1.12.0","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.mesour.intellij.latte","version":"1.0.3","since":"213.0","until":"223.*","originalSince":"213.0","originalUntil":"292.*"},{"id":"com.alayouni.ansiHighlight","version":"22.2.3","since":"222.3345.118","until":"222.4345.14","originalSince":"222.3345.118","originalUntil":"222.*"},{"id":"SidePanelSwitcher","version":"1.0.2","since":"201","until":"300.*","originalSince":"191.0","originalUntil":"300.*"},{"id":"no.eirikb.avatest","version":"1.9.0","since":"203.0","until":"222.*","originalSince":"202.0","originalUntil":"222.*"},{"id":"detekt","version":"1.21.1-android","since":"212.4746.92","until":"221.*","originalSince":"203.5981.155","originalUntil":null},{"id":"com.mesour.intellij.latte","version":"1.0.4","since":"213.0","until":"223.*","originalSince":"213.0","originalUntil":"292.*"},{"id":"com.previewjs.intellij.plugin","version":"1.12.1","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.bugull.androidinitplugin","version":"1.0","since":"192","until":"223.*","originalSince":"160.0","originalUntil":"223.*"},{"id":"co.bito.bito-intellij","version":"1.0.108","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.previewjs.intellij.plugin","version":"1.12.2","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"org.example.tool","version":"1.2.1","since":"200.0","until":"222.*","originalSince":"200.0","originalUntil":"299.*"},{"id":"org.chromie.chromie","version":"1.0","since":"202.0","until":"222.*","originalSince":"201.0","originalUntil":"222.*"},{"id":"com.mesour.intellij.latte","version":"1.0.5","since":"213.0","until":"223.*","originalSince":"213.0","originalUntil":"292.*"},{"id":"org.chromie.chromie","version":"1.1","since":"202.0","until":"222.*","originalSince":"201.0","originalUntil":"222.*"},{"id":"com.lowgular.intellij","version":"0.5.2-SNAPSHOT","since":"221.0","until":"222.*","originalSince":"212.0","originalUntil":"222.*"},{"id":"co.bito.bito-intellij","version":"1.0.109","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.0.110","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.mesour.intellij.latte","version":"1.0.6","since":"213.0","until":"223.*","originalSince":"213.0","originalUntil":"292.*"},{"id":"com.rohdeschwarz.ic","version":"1.0.1","since":"222.0","until":"223.*","originalSince":"222.0","originalUntil":"250.0"},{"id":"io.thundra.merloc","version":"0.0.1","since":"203","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.previewjs.intellij.plugin","version":"1.13.0","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"co.anbora.labs.firebase-syntax-highlighting","version":"2022.4.1","since":"212.0","until":"222.*","originalSince":"212.0","originalUntil":"223.*"},{"id":"co.anbora.labs.kse","version":"1.2.2","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"co.anbora.labs.todo.export","version":"1.3.2","since":"222.0","until":"222.*","originalSince":"222.0","originalUntil":"223.*"},{"id":"co.anbora.labs.pdn-viewer","version":"1.3.2","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"leetcode-helper","version":"1.5","since":"203","until":"","originalSince":"202.0","originalUntil":null},{"id":"com.lowgular.intellij","version":"0.6.0-SNAPSHOT","since":"221.0","until":"222.*","originalSince":"212.0","originalUntil":"222.*"},{"id":"fortify.securityAssistant.security-assistant-intellij","version":"22.2.0.0110","since":"203.0","until":"223.*","originalSince":"201.0","originalUntil":"223.*"},{"id":"org.example.tool","version":"1.2.2","since":"200.0","until":"222.*","originalSince":"200.0","originalUntil":"299.*"},{"id":"co.bito.bito-intellij","version":"1.0.111","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.lowgular.intellij","version":"0.7.0-SNAPSHOT","since":"221.0","until":"222.*","originalSince":"212.0","originalUntil":"222.*"},{"id":"dev.buijs.klutter.jetbrains","version":"0.2.4","since":"221","until":"222.*","originalSince":"213.*","originalUntil":"222.*"},{"id":"com.rick.ormplugin.guide-idea-plugin-orm","version":"0.0.2-SNAPSHOT","since":"202.*","until":"222.*","originalSince":"222.*","originalUntil":null},{"id":"com.lowgular.intellij","version":"0.8.0-SNAPSHOT","since":"221.0","until":"222.*","originalSince":"212.0","originalUntil":"222.*"},{"id":"io.gitpod.jetbrains.gateway","version":"0.0.1-223-926.2","since":"223.6646","until":"223.*","originalSince":"223.926","originalUntil":"223.*"},{"id":"com.lowgular.intellij","version":"0.8.1-SNAPSHOT","since":"221.0","until":"222.*","originalSince":"212.0","originalUntil":"222.*"},{"id":"co.anbora.labs.firebase-syntax-highlighting","version":"2022.4.2","since":"212.0","until":"222.*","originalSince":"212.0","originalUntil":"223.*"},{"id":"com.lowgular.intellij","version":"0.9.0-SNAPSHOT","since":"221.0","until":"222.*","originalSince":"212.0","originalUntil":"222.*"},{"id":">com.ben.df","version":"1.6.8","since":"183","until":"","originalSince":"182.0","originalUntil":null},{"id":"co.anbora.labs.firebase-syntax-highlighting","version":"2022.5.1","since":"212.0","until":"222.*","originalSince":"212.0","originalUntil":"223.*"},{"id":"org.example.tool","version":"1.2.3","since":"200.0","until":"223","originalSince":"200.0","originalUntil":"299.*"},{"id":"palantir-java-format","version":"2.27.0","since":"193","until":"","originalSince":"182.0","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.0.112","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.0.113","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.mesour.intellij.latte","version":"1.0.7","since":"213.0","until":"223.*","originalSince":"213.0","originalUntil":"292.*"},{"id":"com.unger1984.npmdependencychecker","version":"0.1.1","since":"203.0","until":"223.*","originalSince":"203.0","originalUntil":"300.0"},{"id":"com.mesour.intellij.latte","version":"1.0.8","since":"213.0","until":"223.*","originalSince":"213.0","originalUntil":"292.*"},{"id":"com.previewjs.intellij.plugin","version":"1.14.0","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.taff.plugin.orchide","version":"2021.1.8.1-2020.1","since":"201.6668.113","until":"223","originalSince":"201.6668.113","originalUntil":"231.0"},{"id":"me.mbolotov.cypress.pro","version":"3.4","since":"221.0","until":"222.*","originalSince":"221.0","originalUntil":"223.*"},{"id":"io.codelink.plugins.jetbrains","version":"1.0.2","since":"212","until":"222.*","originalSince":"203.0","originalUntil":"222.*"},{"id":"org.intellij.scala","version":"2022.3.2","since":"223.6160","until":"231.*","originalSince":"223.5502","originalUntil":"231.*"},{"id":"io.codelink.plugins.jetbrains","version":"1.0.3","since":"212.0","until":"222.*","originalSince":"203.0","originalUntil":"222.*"},{"id":"org.example.tool","version":"1.3.0","since":"200.0","until":"223","originalSince":"200.0","originalUntil":"299.*"},{"id":"com.previewjs.intellij.plugin","version":"1.15.0","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"UDC","version":"2.0.1","since":"193.5662.53","until":"","originalSince":"191.*","originalUntil":null},{"id":"io.gitpod.jetbrains.gateway","version":"0.0.1-main.5095","since":"222.4345.14","until":"222.*","originalSince":"222.4167.26","originalUntil":"222.*"},{"id":"com.previewjs.intellij.plugin","version":"1.15.1","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.previewjs.intellij.plugin","version":"1.15.2","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"per.wbh.TimeAutoFormat","version":"1.0.7","since":"222.2680.4","until":"","originalSince":"222.0","originalUntil":null},{"id":"me.mbolotov.cypress.pro","version":"3.4.1","since":"222.0","until":"222.*","originalSince":"222.0","originalUntil":"223.*"},{"id":"com.meterian.heidi-plugin-intellij","version":"0.0.2","since":"222.0","until":"223.*","originalSince":"222.0","originalUntil":"232.*"},{"id":"io.gitpod.jetbrains.gateway","version":"0.0.1-main.5227-stable","since":"222.4345.14","until":"222.*","originalSince":"222.4167.26","originalUntil":"222.*"},{"id":"io.gitpod.jetbrains.gateway","version":"0.0.1-main.5237-stable","since":"222.4345.14","until":"222.*","originalSince":"222.4167.26","originalUntil":"222.*"},{"id":"co.bito.bito-intellij","version":"1.0.115-11","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.0.116","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.previewjs.intellij.plugin","version":"1.16.1","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"org.mvnsearch.jetbrains.plugins.dubbo-jetbrains-plugin","version":"0.7.0","since":"223.7126","until":"223.*","originalSince":"223.7126","originalUntil":"224.*"},{"id":"org.example.tool","version":"1.3.1","since":"200.0","until":"223","originalSince":"200.0","originalUntil":"299.*"},{"id":"com.sailorj.itools.action.MyPoJo2JsonAction","version":"1.2","since":"201","until":"213.*","originalSince":"191.*","originalUntil":"213.*"},{"id":"me.mbolotov.cypress.pro","version":"3.5","since":"222.0","until":"222.*","originalSince":"222.0","originalUntil":"223.*"},{"id":"com.taff.plugin.orchide","version":"2022.1.0.0-2020.1","since":"201.6668.113","until":"223","originalSince":"201.6668.113","originalUntil":"231.0"},{"id":"co.bito.bito-intellij","version":"1.0.117","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"co.anbora.labs.fantom-lang","version":"1.0.0","since":"213.0","until":"222.*","originalSince":"213.0","originalUntil":"223.*"},{"id":"com.murphysec.intellij.Plugin","version":"3.0.3","since":"202.0","until":"223.*","originalSince":"202.0","originalUntil":"999.0"},{"id":"izhangzhihao.rainbow.brackets","version":"2022.3.2-ij","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"IvyIDEA","version":"1.0.17","since":"193","until":"","originalSince":"143.2370.31","originalUntil":null},{"id":"izhangzhihao.rainbow.brackets","version":"2022.3.3.1-ij","since":"222.0","until":"222.*","originalSince":"203.0","originalUntil":"222.*"},{"id":"izhangzhihao.rainbow.brackets","version":"2022.3.3.2-ij","since":"203.0","until":"221.*","originalSince":"203.0","originalUntil":"222.*"},{"id":"palantir-java-format","version":"2.28.0","since":"193.0","until":"","originalSince":"182.0","originalUntil":null},{"id":"ski.chrzanow.foldableprojectview","version":"1.1.4","since":"221.0","until":"223.*","originalSince":"221.0","originalUntil":"231.*"},{"id":"com.intellij.mermaid","version":"0.0.3-nightly","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"231.*"},{"id":"bazelbuild-rider","version":"0.0.11","since":"223.0","until":"300.*","originalSince":"222.0","originalUntil":"300.*"},{"id":"net.kenro.ji.jin.intellij.purescript","version":"v0.58.0","since":"212","until":"222.*","originalSince":"203.0","originalUntil":"222.*"},{"id":"com.kiven.json2dart","version":"1.0.1","since":"213.7172.25","until":"223.*","originalSince":"213.7172.25","originalUntil":"999.0"},{"id":"top.xystudio.plugin.idea.LiteFlowX","version":"1.1.2","since":"203.*","until":"222.*","originalSince":"202.*","originalUntil":"222.*"},{"id":"com.intellij.mermaid","version":"0.0.4","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"231.*"},{"id":"com.github.linrenen.uniappsupport","version":"0.14.0","since":"220.0","until":"222.3500","originalSince":"220.0","originalUntil":"223.0"},{"id":"dev.magic.extension","version":"0.10.1","since":"211.0","until":"231.*","originalSince":"211.0","originalUntil":"999.*"},{"id":"aws.toolkit","version":"GW-1.55-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"aws.toolkit","version":"GW-1.55-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"aws.toolkit","version":"1.55-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"aws.toolkit","version":"1.55-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"aws.toolkit","version":"1.55-EAP.2022.12.02-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"dev.magic.extension","version":"0.10.2","since":"211.0","until":"231.*","originalSince":"211.0","originalUntil":"999.*"},{"id":"com.k.pmpstudy.RenameFilesRefactorBatch","version":"1.0.8","since":"223.0","until":"223.*","originalSince":"222.0","originalUntil":"223.*"},{"id":"co.bito.bito-intellij","version":"1.0.117-50","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"org.kdb.inside.brains.KdbInsideBrains","version":"3.0.0","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"me.mbolotov.cypress.pro","version":"3.5.1","since":"222.0","until":"222.*","originalSince":"222.0","originalUntil":"223.*"},{"id":"io.xmake","version":"1.1.9","since":"201.0","until":"232.*","originalSince":"201.0","originalUntil":"239.*"},{"id":"aws.toolkit","version":"1.55-EAP.2022.12.06-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"dev.magic.extension","version":"0.11.0","since":"211.0","until":"231.*","originalSince":"211.0","originalUntil":"999.*"},{"id":"aws.toolkit","version":"1.56-EAP.2022.12.07-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"ren.idea.thinkphp6helper","version":"0.14.8","since":"223.7500","until":"230.0","originalSince":"212.0","originalUntil":"230.0"},{"id":"org.intellij.scala","version":"2022.3.14","since":"223.7571","until":"223.*","originalSince":"223.7571","originalUntil":"231.*"},{"id":"aws.toolkit","version":"GW-1.56-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"aws.toolkit","version":"GW-1.56-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"aws.toolkit","version":"1.56-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"aws.toolkit","version":"1.56-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"com.lijiahaosummer.nccdev","version":"1.0.8","since":"223","until":"223.*","originalSince":"222.*","originalUntil":"223.*"},{"id":"co.bito.bito-intellij","version":"1.0.119","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"io.xmake","version":"1.2.0","since":"201.0","until":"232.*","originalSince":"201.0","originalUntil":"269.*"},{"id":"com.previewjs.intellij.plugin","version":"1.17.0","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.intellij.mermaid","version":"0.0.5","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"231.*"},{"id":"com.intellij.mermaid","version":"0.0.5","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"231.*"},{"id":"co.bito.bito-intellij","version":"1.0.120","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.0.121","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.wsy.smartndkstack","version":"1.3-SNAPSHOT","since":"203.0","until":"223.*","originalSince":"192.0","originalUntil":"223.*"},{"id":"com.jetbrains.edu","version":"2022.12-2022.3-161","since":"223.7255","until":"223.*","originalSince":"223.7255","originalUntil":"231.*"},{"id":"org.intellij.scala","version":"2022.3.15","since":"223.7571","until":"223.*","originalSince":"223.7571","originalUntil":"231.*"},{"id":"org.intellij.scala","version":"2022.3.14","since":"223.7571","until":"223.*","originalSince":"223.7571","originalUntil":"231.*"},{"id":"co.bito.bito-intellij","version":"1.0.123","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"aws.toolkit","version":"GW-1.57-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"aws.toolkit","version":"GW-1.57-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"aws.toolkit","version":"1.57-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"aws.toolkit","version":"1.57-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"aws.toolkit","version":"1.57-EAP.2022.12.16-223","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"224.*"},{"id":"dev.magic.extension","version":"0.12.0","since":"211.0","until":"231.*","originalSince":"211.0","originalUntil":"999.*"},{"id":"org.elixir_lang","version":"14.0.0","since":"223.7571.182","until":"223.*","originalSince":"221.5080","originalUntil":"223.*"},{"id":"co.bito.bito-intellij","version":"1.0.124","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"org.kdb.inside.brains.KdbInsideBrains","version":"3.2.1","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"org.jetbrains.IdeaVim-EasyMotion","version":"1.10","since":"223.7401.7","until":"","originalSince":"213.0","originalUntil":null},{"id":"net.sf.opk.avro-schema-support","version":"213.3.0","since":"211","until":"224.*","originalSince":"203.0","originalUntil":"224.*"},{"id":"org.intellij.scala","version":"2022.3.15","since":"223.7571","until":"223.*","originalSince":"223.7571","originalUntil":"231.*"},{"id":"org.jetbrains.idea.maven.maven2-support","version":"1.0","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"231.*"},{"id":"org.kdb.inside.brains.KdbInsideBrains","version":"3.3.0","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"co.bito.bito-intellij","version":"1.0.125","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.murphysec.intellij.Plugin","version":"3.0.4","since":"202.0","until":"231.*","originalSince":"202.0","originalUntil":"999.0"},{"id":"tanvd.paddle","version":"0.4.7","since":"221.5080","until":"222.4459","originalSince":"221.5080","originalUntil":"999.0"},{"id":"org.kdb.inside.brains.KdbInsideBrains","version":"3.4.0","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"org.intellij.scala","version":"2022.3.16","since":"223.7571","until":"223.*","originalSince":"223.7571","originalUntil":"231.*"},{"id":"pageqiu.conveniently.input.special.symbols","version":"1.0-SNAPSHOT","since":"172.4574.19","until":"","originalSince":"171.4694.73","originalUntil":null},{"id":"com.intellij.mermaid","version":"0.0.6-nightly","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"231.*"},{"id":"org.intellij.scala","version":"2022.3.946","since":"223.7571","until":"223.*","originalSince":"223.7571","originalUntil":"231.*"},{"id":"dev.magic.extension","version":"0.12.1","since":"211.0","until":"231.*","originalSince":"211.0","originalUntil":"999.*"},{"id":"net.sf.opk.avro-schema-support","version":"213.3.1","since":"211","until":"224.*","originalSince":"203.0","originalUntil":"224.*"},{"id":"org.kdb.inside.brains.KdbInsideBrains","version":"3.5.1","since":"203.0","until":"222.*","originalSince":"203.0","originalUntil":"223.*"},{"id":"com.mesour.intellij.latte","version":"1.0.9","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"292.*"},{"id":"com.mesour.intellij.neon","version":"1.0.5","since":"201.0","until":"231.*","originalSince":"201.0","originalUntil":"291.*"},{"id":"co.bito.bito-intellij","version":"1.0.126","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.0.127","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.intellij.mermaid","version":"0.0.6","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"231.*"},{"id":"com.previewjs.intellij.plugin","version":"1.17.1","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.previewjs.intellij.plugin","version":"1.17.2","since":"212.0","until":"223","originalSince":"212.0","originalUntil":"999.0"},{"id":"com.mesour.intellij.latte","version":"1.0.10","since":"223.0","until":"224.*","originalSince":"223.0","originalUntil":"292.*"},{"id":"co.bito.bito-intellij","version":"1.0.128","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.intellij.mermaid","version":"0.0.7","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"231.*"},{"id":"com.intellij.mermaid","version":"0.0.7","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"231.*"},{"id":"org.intellij.scala","version":"2022.3.16","since":"223.7571","until":"223.*","originalSince":"223.7571","originalUntil":"231.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.4.2-alpha1","since":"231.4840","until":"232.*","originalSince":"231.4840","originalUntil":"233.9999"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.4.2","since":"231.4840","until":"232.*","originalSince":"231.4840","originalUntil":"233.9999"},{"id":"com.dsoftware.ghtoolbar","version":"1.10.0","since":"223.4884.69","until":"223.*","originalSince":"223.4884.69","originalUntil":"231.*"},{"id":"com.jetbrains.kaggle","version":"1.2","since":"221.*","until":"231.*","originalSince":"193.*","originalUntil":"231.*"},{"id":"izhangzhihao.rainbow.brackets","version":"2023.1.2","since":"231.0","until":"231.*","originalSince":"223.0","originalUntil":"231.*"},{"id":"net.sf.opk.avro-schema-support","version":"213.4.0","since":"211","until":"231.*","originalSince":"203.0","originalUntil":"232.*"},{"id":"Valkyrie","version":"0.0.4","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"240.*"},{"id":"org.muchu.mybatis-support","version":"1.8.5","since":"223.0","until":"223.*","originalSince":"213.0","originalUntil":"223.*"},{"id":"com.github.davidenkoim.idnamessuggestingplugin","version":"0.2.1","since":"223.0","until":"234.0","originalSince":"222.0","originalUntil":"234.0"},{"id":"com.jetbrains.edu","version":"2023.1-2022.3-301","since":"223.7255","until":"223.*","originalSince":"223.7255","originalUntil":"231.*"},{"id":"Keep-Unit-Test-Running","version":"1.2","since":"211","until":"","originalSince":"201.6668.113","originalUntil":null},{"id":"com.peng.idea.plugin.builder-generator-plus-v2","version":"1.1.0","since":"222.0","until":"223.*","originalSince":"211.0","originalUntil":"223.*"},{"id":"me.bors.slack-share","version":"0.9.10","since":"203.0","until":"230.*","originalSince":"203.0","originalUntil":"231.*"},{"id":"co.bito.bito-intellij","version":"1.0.129","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"me.mbolotov.cypress.pro","version":"3.6.1","since":"231.0","until":"231.0","originalSince":"231.0","originalUntil":"231.*"},{"id":"com.hangox.myandroidtools","version":"1.0.57","since":"212.0","until":"231.*","originalSince":"212.0","originalUntil":"293.*"},{"id":"com.aiwan.gorm","version":"2023.1.4","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"fr.mary.olivier.aw-watcher","version":"2.0.0","since":"201.0","until":"","originalSince":"223.0","originalUntil":null},{"id":"fr.mary.olivier.aw-watcher","version":"2.0.1","since":"201.0","until":"","originalSince":"223.0","originalUntil":null},{"id":"com.denigma.intellij","version":"1.0.2.223","since":"222.*","until":"223.*","originalSince":"201.*","originalUntil":"223.*"},{"id":"com.aiwan.request-tool","version":"2023.1.5","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.aiwan.gorm","version":"2023.1.5","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"FavoriteFolders","version":"1.3.5","since":"231.1","until":"","originalSince":"223.1","originalUntil":null},{"id":"intellij-crystal-lang","version":"0.6-2023.1","since":"231.0","until":"231.6889","originalSince":"231.0","originalUntil":"231.*"},{"id":"me.mbolotov.cypress","version":"1.5.2","since":"231.0","until":"","originalSince":"223.0","originalUntil":null},{"id":"com.aiwan.request-tool","version":"2023.1.6","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.aiwan.gorm","version":"2023.1.6","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.intellij.mermaid","version":"0.0.8-nightly","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"231.*"},{"id":"com.aiwan.gorm","version":"2023.1.7","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.darkyen.darkyenustimetracker","version":"1.5.2","since":"221.0","until":"","originalSince":"203.0","originalUntil":null},{"id":"top.threep.plugin.txtic","version":"0.2.0","since":"212","until":"231.*","originalSince":"203.*","originalUntil":"231.*"},{"id":"com.aiwan.gorm","version":"2023.1.8","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"cn.sunist.project.bililive-danmaku","version":"1.1-SNAPSHOT","since":"213.0","until":"223.*","originalSince":"212.0","originalUntil":"312.*"},{"id":"com.jetbrains.edu","version":"2023.2-2023.1-10","since":"231.6471","until":"231.*","originalSince":"231.6471","originalUntil":"232.*"},{"id":"com.aiwan.gorm","version":"2023.1.9","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"intellij-crystal-lang","version":"0.6.1-2023.1","since":"231","until":"231.8770","originalSince":"231.0","originalUntil":"231.*"},{"id":"com.fuhrer.intellij.jump","version":"1.0","since":"222.0","until":"231.*","originalSince":"221.0","originalUntil":"231.*"},{"id":"com.aiwan.io-game","version":"2023.2.3","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.apifox.uploader","version":"1.1.14","since":"193.5662.53","until":"231.*","originalSince":"193.5662.53","originalUntil":"233.*"},{"id":"com.intellij.mermaid","version":"0.0.8","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.5.0","since":"231.6890","until":"232.*","originalSince":"231.6890","originalUntil":"233.9999"},{"id":"top.threep.plugin.txtic","version":"0.3.0","since":"212","until":"231.*","originalSince":"203.*","originalUntil":"231.*"},{"id":"com.broxus.t-sol","version":"1.1","since":"211","until":"","originalSince":"203.8084.24","originalUntil":null},{"id":"net.sf.opk.avro-schema-support","version":"213.4.1","since":"211","until":"231.*","originalSince":"203.0","originalUntil":"232.*"},{"id":"com.intellij.mermaid","version":"0.0.9-nightly.1","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"com.aiwan.request-tool","version":"2023.1.7","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.intellij.mermaid","version":"0.0.9","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"com.aiwan.gorm","version":"2023.1.10","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.metalbear.mirrord","version":"3.26.1","since":"223.0","until":"","originalSince":"213.0","originalUntil":null},{"id":"com.peng.idea.plugin.builder-generator-plus-v2","version":"1.1.1","since":"222.0","until":"223.*","originalSince":"211.0","originalUntil":"223.*"},{"id":"com.hangox.myandroidtools","version":"1.0.91","since":"213.0","until":"231.*","originalSince":"213.0","originalUntil":"293.*"},{"id":"top.threep.plugin.txtic","version":"0.4.0","since":"212","until":"231.*","originalSince":"203.*","originalUntil":"231.*"},{"id":"com.hangox.myandroidtools","version":"1.0.94","since":"213.0","until":"231.*","originalSince":"213.0","originalUntil":"293.*"},{"id":"dev.magic.extension","version":"0.13.1","since":"212.0","until":"231.*","originalSince":"212.0","originalUntil":"999.*"},{"id":"com.aiwan.request-tool","version":"2023.1.8","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.alibaba.p3c.xenoamess","version":"2.1.1.6x-SNAPSHOT","since":"231","until":"","originalSince":"202.8194.7","originalUntil":null},{"id":"com.aiwan.request-tool","version":"2023.1.9","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.aiwan.gorm","version":"2023.2.1","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.jetbrains.edu","version":"2023.2-2023.1-63","since":"231.6471","until":"231.*","originalSince":"231.6471","originalUntil":"232.*"},{"id":"dev.magic.extension","version":"0.13.2","since":"212.0","until":"231.*","originalSince":"212.0","originalUntil":"999.*"},{"id":"co.bito.bito-intellij","version":"1.0.130","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.aiwan.request-tool","version":"2023.2.1","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-116","since":"231.6471","until":"231.*","originalSince":"231.6471","originalUntil":"232.*"},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-132","since":"231.6471","until":"231.*","originalSince":"231.6471","originalUntil":"232.*"},{"id":"org.reloadium","version":"0.9.6","since":"223.0","until":"","originalSince":"222.0","originalUntil":null},{"id":"com.intellij.mermaid","version":"0.0.10-nightly.1","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"com.intellij.mermaid","version":"0.0.10-nightly.2","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"com.karsta26.recent-projects-with-branch","version":"1.1-SNAPSHOT","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"232.*"},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-144","since":"231.7665","until":"231.*","originalSince":"231.7665","originalUntil":"232.*"},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-148","since":"231.7665","until":"231.*","originalSince":"231.7665","originalUntil":"232.*"},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-153","since":"231.7665","until":"231.*","originalSince":"231.7665","originalUntil":"232.*"},{"id":"com.intellij.mermaid","version":"0.0.10-nightly.3","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"com.github.warningimhack3r.npmupdatedependencies","version":"1.0.1","since":"213.0","until":"","originalSince":"211.0","originalUntil":null},{"id":"org.lukasj.idea.torquescript","version":"1.14.0-legacy","since":"221.0","until":"222.*","originalSince":"221.0","originalUntil":"223.0"},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-155","since":"231.7665","until":"231.*","originalSince":"231.7665","originalUntil":"232.*"},{"id":"shop.itbug.FlutterCheckVersionX","version":"3.0.2.as","since":"221.1000.0","until":"221.6008.*","originalSince":"221.1000.0","originalUntil":"221.9000.0"},{"id":"com.intellij.mermaid","version":"0.0.10-nightly.4","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"org.example.tool","version":"1.3.2","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"299.*"},{"id":"shop.itbug.FlutterCheckVersionX","version":"3.0.4","since":"223.0.*","until":"223.8836.*","originalSince":"223.0.*","originalUntil":"223.9999.*"},{"id":"shop.itbug.FlutterCheckVersionX","version":"3.0.4.as","since":"221.1000.0","until":"221.6008.*","originalSince":"221.1000.0","originalUntil":"221.9999.0"},{"id":"com.intellij.mermaid","version":"0.0.10-nightly.5","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"com.aiwan.request-tool","version":"2023.2.2","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.aiwan.gorm","version":"2023.3.1","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-180","since":"231.8109","until":"231.*","originalSince":"231.8109","originalUntil":"232.*"},{"id":"dev.magic.extension","version":"0.13.3","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"shop.itbug.FlutterCheckVersionX","version":"3.0.5","since":"223.0.*","until":"223.8836.*","originalSince":"223.0.*","originalUntil":"223.9999.*"},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-195","since":"231.8109","until":"231.*","originalSince":"231.8109","originalUntil":"232.*"},{"id":"shop.itbug.FlutterCheckVersionX","version":"3.0.5.as","since":"221.1000.0","until":"221.6008.*","originalSince":"221.1000.0","originalUntil":"221.9999.0"},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-198","since":"231.8109","until":"231.*","originalSince":"231.8109","originalUntil":"232.*"},{"id":"co.nums.intellij.aem","version":"2023.1","since":"213.6461.79","until":"","originalSince":"213.0","originalUntil":null},{"id":"com.aiwan.request-tool","version":"2023.3.2","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.intellij.mermaid","version":"0.0.10-nightly.6","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"com.aiwan.request-tool","version":"2023.3.5","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.aiwan.gorm","version":"2023.3.2","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.gitlab.msciachero.intellij-gitlab-plugin","version":"6.5.0-AI","since":"221.6008","until":"222.*","originalSince":"221.6008","originalUntil":"223.*"},{"id":"com.intellij.mermaid","version":"0.0.10-nightly.7","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-221","since":"231.8109","until":"231.*","originalSince":"231.8109","originalUntil":"232.*"},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-230","since":"231.8109","until":"231.*","originalSince":"231.8109","originalUntil":"232.*"},{"id":"dev.magic.extension","version":"0.14.0","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"co.bito.bito-intellij","version":"1.0.131","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.luomacode.ChatMoss","version":"1.0.1","since":"203.0","until":"232.*","originalSince":"231.0","originalUntil":null},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-240","since":"231.8109","until":"231.*","originalSince":"231.8109","originalUntil":"232.*"},{"id":"dev.magic.extension","version":"0.14.1","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"co.bito.bito-intellij","version":"1.0.132","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.aiwan.gorm","version":"2023.3.3","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.jetbrains.edu","version":"2023.3-2023.1-252","since":"231.8109","until":"231.*","originalSince":"231.8109","originalUntil":"232.*"},{"id":"com.aiwan.jorm","version":"2023.3.3","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.huawei.deveco.hms","version":"6.9.0.300.CM","since":"212.0","until":"213.*","originalSince":"203.0","originalUntil":null},{"id":"com.intellij.mermaid","version":"0.0.10","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"com.intellij.mermaid","version":"0.0.10","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"com.github.grishberg.android.android-layout-inspector-plugin","version":"23.03.21.0","since":"211.0","until":"222.*","originalSince":"211.0","originalUntil":"223.*"},{"id":"dev.magic.extension","version":"0.14.2","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"net.sf.opk.avro-schema-support","version":"213.4.2","since":"211","until":"231.*","originalSince":"203.7717","originalUntil":"232.*"},{"id":"shop.itbug.FlutterCheckVersionX","version":"3.2.0.as","since":"221.1000.0","until":"221.6008.*","originalSince":"221.1000.0","originalUntil":"221.9999.0"},{"id":"shop.itbug.FlutterCheckVersionX","version":"3.2.0","since":"223.0.*","until":"223.8836.*","originalSince":"223.0.*","originalUntil":"223.9999.*"},{"id":"intellij-crystal-lang","version":"0.7-2023.1","since":"231.0","until":"231.8769","originalSince":"231.0","originalUntil":"231.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.6.0","since":"231.8109","until":"232.*","originalSince":"231.8109","originalUntil":"233.9999"},{"id":"com.intellij.mermaid","version":"0.0.11-nightly.1","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"com.utopia-rise.godotjvmideaplugin","version":"0.6.0-3.5.2-IJ2022.3","since":"222.3","until":"231.*","originalSince":"222.3","originalUntil":"999.*"},{"id":"com.intellij.mermaid","version":"0.0.11-nightly.2","since":"223.7025","until":"231.8109.175","originalSince":"223.7025","originalUntil":"232.*"},{"id":"dev.magic.extension","version":"0.15.0","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"com.utopia-rise.godotjvmideaplugin","version":"0.6.1-3.5.2-IJ2022.3","since":"223.1","until":"231.*","originalSince":"223.1","originalUntil":"999.*"},{"id":"com.aiwan.request-tool","version":"2023.3.6","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"com.millennialmedia.intellibot@lte2000","version":"0.16.191.8026","since":"192","until":"","originalSince":"143.381","originalUntil":null},{"id":"com.aiwan.gorm","version":"2023.3.4","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"dev.magic.extension","version":"0.15.1","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"co.bito.bito-intellij","version":"1.0.133","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.suusan2go.kotlin-fill-class","version":"1.0.19.1","since":"221.5080.210","until":"","originalSince":"191.8026.42","originalUntil":null},{"id":"org.mukatalab.jumpy","version":"0.0.6","since":"231.0","until":"231.*","originalSince":"222.0","originalUntil":"231.*"},{"id":"com.mukatalab.scopeActions","version":"0.0.7","since":"231.0","until":"231.*","originalSince":"222.0","originalUntil":"231.*"},{"id":"io.artage.sfcc.salesforce-commerce-cloud","version":"2023.1","since":"223.7255.*","until":"231.*","originalSince":"223.7255.*","originalUntil":"232.*"},{"id":"com.tw.plugin.clover","version":"0.2.4","since":"203.0","until":"231.*","originalSince":"203.0","originalUntil":"999.*"},{"id":"shop.itbug.FlutterCheckVersionX","version":"3.3.0","since":"231.0.*","until":"231.9011.*","originalSince":"231.0.*","originalUntil":"231.9999.*"},{"id":"net.mamoe.kotlin-jvm-blocking-bridge","version":"231-3.1.0-180.1","since":"231.0","until":"231.*","originalSince":"223.0","originalUntil":"231.*"},{"id":"com.aiwan.request-tool","version":"2023.3.7","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"nl.rubensten.texifyidea","version":"0.7.28","since":"231.0","until":"","originalSince":"223.0","originalUntil":null},{"id":"net.mamoe.mirai-console","version":"231-2.15.0-182-1","since":"231.0","until":"231.*","originalSince":"223.0","originalUntil":"231.*"},{"id":"com.furstenheim.more-actions","version":"1.6-SNAPSHOT","since":"190.0","until":"250.*","originalSince":"190.0","originalUntil":"500.0"},{"id":"com.aiwan.gorm","version":"2023.3.5","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"dev.magic.extension","version":"0.16.0","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"com.google.d2c.androidstudio.plugin","version":"0.3.05","since":"203.7717","until":"222.*","originalSince":"203.7717","originalUntil":"231.*"},{"id":"com.github.warfaj.paxintellijplugin","version":"0.0.5","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"251.*"},{"id":"com.jantvrdik.intellij.latte","version":"1.1.7","since":"221.0","until":"231.*","originalSince":"221.0","originalUntil":"291.*"},{"id":"com.mesour.intellij.neon","version":"1.0.6","since":"201.0","until":"232.*","originalSince":"201.0","originalUntil":"291.*"},{"id":"com.mesour.intellij.latte","version":"1.0.11","since":"223.0","until":"232.*","originalSince":"223.0","originalUntil":"292.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.6.1","since":"231.8109","until":"232.*","originalSince":"231.8109","originalUntil":"233.9999"},{"id":"net.sf.opk.avro-schema-support","version":"213.4.3","since":"211","until":"231.*","originalSince":"203.7717203.7717.56","originalUntil":"232.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.6.2","since":"231.8109","until":"232.*","originalSince":"231.8109","originalUntil":"233.9999"},{"id":"org.example.tool","version":"1.3.3","since":"223.0","until":"232.*","originalSince":"223.0","originalUntil":"299.*"},{"id":"net.sf.opk.avro-schema-support","version":"213.5.0","since":"211","until":"231.*","originalSince":"203.7717203.7717.56","originalUntil":"232.*"},{"id":"com.peng.idea.plugin.builder-generator-plus-v2","version":"1.1.2","since":"222.0","until":"231.*","originalSince":"211.0","originalUntil":"231.*"},{"id":"com.obroom.plugin.toolset","version":"2023.4.4","since":"222","until":"243.0","originalSince":"201.*","originalUntil":"243.0"},{"id":"com.jetbrains.writerside","version":"2023.03.3401","since":"231.0","until":"231.8769","originalSince":"231.0","originalUntil":"231.*"},{"id":"copApiDocx","version":"1.0.1","since":"192.7142.36","until":"231.9011.14","originalSince":"192.6262.58","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.0.134","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"shop.itbug.FlutterCheckVersionX","version":"3.3.1","since":"231.0.*","until":"231.9011.*","originalSince":"231.0.*","originalUntil":"231.9999.*"},{"id":"shop.itbug.FlutterCheckVersionX","version":"3.3.1.as","since":"222.0.*","until":"222.4554.*","originalSince":"222.0.*","originalUntil":"222.9999.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.6.3","since":"231.8109","until":"232.*","originalSince":"231.8109","originalUntil":"233.9999"},{"id":"com.github.linrenen.uniappsupport","version":"0.16.4","since":"223.7000","until":"232.*","originalSince":"223.7000","originalUntil":"999.0"},{"id":"dev.magic.extension","version":"0.17.0","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"com.aiwan.request-tool","version":"2023.4.1","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"li.barlog.oceanic-primal","version":"0.0.13","since":"211.0","until":"231.*","originalSince":"211.0","originalUntil":"993.*"},{"id":"org.intellij.sdk.MobTime","version":"3.4.1","since":"226.*","until":"231.*","originalSince":"226.*","originalUntil":"240.*"},{"id":"com.github.lonre.bucp","version":"23.04.20","since":"231.0","until":"231.*","originalSince":"231.0","originalUntil":"999.*"},{"id":"com.intellij.mermaid","version":"0.0.10-231.8109","since":"231.8109","until":"231.8770","originalSince":"231.8109","originalUntil":"231.*"},{"id":"ee.carlrobert.chatgpt","version":"1.10.4","since":"213.0","until":"231.*","originalSince":"211.0","originalUntil":"231.*"},{"id":"net.sf.opk.avro-schema-support","version":"213.5.1","since":"211","until":"232.*","originalSince":"203.7717203.7717.56","originalUntil":"232.*"},{"id":"com.timindustries.regexpluginv2","version":"0.0.5","since":"222.0","until":"231.*","originalSince":"221.0","originalUntil":"231.*"},{"id":"com.github.cetonek.tenebris","version":"0.0.13","since":"202.0","until":"231.*","originalSince":"202.0","originalUntil":"239.*"},{"id":"com.timindustries.regexpluginv2","version":"0.0.6","since":"222.*","until":"231.*","originalSince":"221.*","originalUntil":"231.*"},{"id":"com.google.d2c.androidstudio.plugin","version":"0.3.05-hotfix","since":"203.7717","until":"222.*","originalSince":"203.7717","originalUntil":"231.*"},{"id":"com.clutcher.comments_highlighter","version":"2023.4.0","since":"223.0","until":"232.*","originalSince":"222.0","originalUntil":null},{"id":"robocorp.lsp.intellij","version":"1.10.1","since":"203.0","until":"231.*","originalSince":"203.0","originalUntil":"290.*"},{"id":"dev.magic.extension","version":"0.18.0","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"co.bito.bito-intellij","version":"1.0.135","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.intellij.nativeDebug","version":"232.5087","since":"232.5087","until":"232.5087","originalSince":"232.5087","originalUntil":"232.*"},{"id":"org.openasr.idiolect","version":"1.4.8","since":"223","until":"231.*","originalSince":"222.*","originalUntil":null},{"id":"dev.magic.extension","version":"0.18.1","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"dev.magic.extension","version":"0.18.2","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"com.github.nikolaikopernik.codecomplexity","version":"0.0.2","since":"231.0","until":"231.*","originalSince":"221.0","originalUntil":"231.*"},{"id":"com.copperleaf.ballast.Ballast","version":"3.0.0","since":"221.0","until":"232.*","originalSince":"221.0","originalUntil":"999.*"},{"id":"dev.magic.extension","version":"0.18.3","since":"223.0","until":"231.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"dev.magic.extension","version":"0.18.4","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"fr.devcafeine.Typescript_Class_Tools","version":"0.1.0","since":"231","until":"231.*","originalSince":"224.0","originalUntil":"232.*"},{"id":"org.OverEngineer.InlineProblems","version":"0.4.2","since":"212.5712.*","until":"231.*","originalSince":"212.5","originalUntil":"231.*"},{"id":"dev.magic.extension","version":"0.18.5","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"com.copperleaf.ballast.Ballast","version":"3.0.1","since":"221.0","until":"232.*","originalSince":"221.0","originalUntil":"999.*"},{"id":"dev.magic.extension","version":"0.18.6","since":"223.0","until":"223.*","originalSince":"223.0","originalUntil":"999.*"},{"id":"com.k.pmpstudy.OpenedFilesDiffShortcut","version":"1.0.11","since":"231.0","until":"231.*","originalSince":"223.0","originalUntil":"231.*"},{"id":"intellij-crystal-lang","version":"0.8-2023.2","since":"232.0","until":"232.6094","originalSince":"232.0","originalUntil":"232.*"},{"id":"com.smallcloud.codify","version":"1.1.46","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"233.*"},{"id":"co.anbora.labs.pdn-viewer","version":"1.4.0","since":"223.0","until":"232.5150.116","originalSince":"223.0","originalUntil":"232.*"},{"id":"es.spockdatatable.idea","version":"1.2.0","since":"221.*","until":"232.*","originalSince":"201.0","originalUntil":"232.*"},{"id":"com.aiwan.gorm","version":"2023.5.1","since":"222.0","until":"231.*","originalSince":"222.0","originalUntil":"999.*"},{"id":"fortify.securityAssistant.security-assistant-intellij","version":"23.1.0.0116","since":"203","until":"233.*","originalSince":"201.0","originalUntil":"233.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.6.4","since":"231.8109","until":"232.*","originalSince":"231.8109","originalUntil":"233.9999"},{"id":"lermitage.intellij.extra.icons","version":"2023.2.4-221","since":"222","until":"224.*","originalSince":"221.6008.13","originalUntil":"224.*"},{"id":"co.bito.bito-intellij","version":"1.0.137","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"lermitage.intellij.extra.icons","version":"2023.2.5-221","since":"222","until":"224.*","originalSince":"221.6008.13","originalUntil":"224.*"},{"id":"intellij-crystal-lang","version":"0.8-2023.1","since":"231.0","until":"231.*","originalSince":"231.0","originalUntil":"233.*"},{"id":"org.jetbrains.idea.maven.maven2-support","version":"1.2","since":"232.0","until":"232.2","originalSince":"232.0","originalUntil":"232.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.7.0","since":"232.6095","until":"232.*","originalSince":"232.6095","originalUntil":"233.9999"},{"id":"pt.ist.fenixframework.plugin","version":"1.0.2","since":"212.0","until":"232.*","originalSince":"212.0","originalUntil":"255.*"},{"id":"co.bito.bito-intellij","version":"1.0.138","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"PlantUML integration","version":"6.2.2-IJ2022.2","since":"232.6734.9","until":"","originalSince":"222.4167.9","originalUntil":null},{"id":"org.vorpal.research.kex-plugin","version":"0.0.1","since":"223.0","until":"231.*","originalSince":"222.0","originalUntil":"231.*"},{"id":"com.github.tuchg.nonasciicodecompletionhelper","version":"1.0.1","since":"221","until":"","originalSince":"213.0","originalUntil":null},{"id":"io.snyk.snyk-intellij-plugin","version":"2.4.60","since":"202.0","until":"222.*","originalSince":"202.0","originalUntil":"231.*"},{"id":"com.wrike.plugin.intellij","version":"0.16.1","since":"212","until":"","originalSince":"203.0","originalUntil":null},{"id":"com.copperleaf.ballast.Ballast","version":"3.0.2","since":"221.0","until":"232.*","originalSince":"221.0","originalUntil":"999.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.7.1","since":"231.8109","until":"231.9161.*","originalSince":"231.8109","originalUntil":"231.9999"},{"id":"com.mallowigi","version":"91.0.0","since":"232.7295","until":"233.9999","originalSince":"231.8109","originalUntil":"233.9999"},{"id":"net.mamoe.mirai-console","version":"231-2.15.0-182-2","since":"231.0","until":"231.*","originalSince":"223.0","originalUntil":"231.*"},{"id":"com.huawei.deveco.hms","version":"6.10.0.300.CM","since":"212.0","until":"221.*","originalSince":"203.0","originalUntil":null},{"id":"com.github.bridgecrewio.prismacloud","version":"1.0.7","since":"203.0","until":"","originalSince":"201.0","originalUntil":null},{"id":"com.aeolid.GeneratorProofing","version":"1.3.2","since":"231","until":"232.*","originalSince":"231.0","originalUntil":"243.*"},{"id":"co.bito.bito-intellij","version":"1.1.0","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.videogameaholic.intellij.starcoder","version":"0.230620","since":"212.0","until":"232.*","originalSince":"212.0","originalUntil":"300.*"},{"id":"me.artspb.hackathon.git.bisect.run","version":"0.8.3","since":"232.7754","until":"233.*","originalSince":"231.8109","originalUntil":"233.*"},{"id":"com.ess.terminal-pro","version":"1.1.4","since":"211","until":"","originalSince":"203.1","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"1.4.0","since":"223.8214","until":"232.*","originalSince":"223.0","originalUntil":"232.*"},{"id":"com.videogameaholic.intellij.starcoder","version":"0.230627","since":"212.0","until":"232.*","originalSince":"212.0","originalUntil":"300.*"},{"id":"com.intellij.plugins.haxe","version":"1.4.1","since":"223.8214","until":"232.*","originalSince":"223.0","originalUntil":"232.*"},{"id":"com.intellij.plugins.haxe","version":"1.4.2","since":"223.8214","until":"232.*","originalSince":"223.0","originalUntil":"232.*"},{"id":"me.mbolotov.cypress.pro","version":"3.6.3","since":"232","until":"232.*","originalSince":"231.1","originalUntil":"232.*"},{"id":"ChatGPTGold","version":"2023.5.3-203.222.4","since":"203.0","until":"203.*","originalSince":"203.0","originalUntil":"222.4459.24"},{"id":"com.luomacode.ChatMoss","version":"1.0.8","since":"203.0","until":"232.*","originalSince":"203.0","originalUntil":"999.*"},{"id":"com.intellij.plugins.haxe","version":"1.4.3","since":"223.8214","until":"232.*","originalSince":"223.0","originalUntil":"232.*"},{"id":"com.videogameaholic.intellij.starcoder","version":"0.230703","since":"212.0","until":"232.*","originalSince":"212.0","originalUntil":"300.*"},{"id":"com.intellij.plugins.haxe","version":"1.4.4","since":"223.8214","until":"232.*","originalSince":"223.0","originalUntil":"232.*"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.8.0","since":"232.8296","until":"232.*","originalSince":"232.8296","originalUntil":"233.9999"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.8.1","since":"232.8296","until":"232.*","originalSince":"232.8296","originalUntil":"233.9999"},{"id":"com.intellij.plugins.haxe","version":"1.4.5","since":"223.8214","until":"232.*","originalSince":"223.0","originalUntil":"232.*"},{"id":"org.jetbrains.completion.full.line","version":"233.882","since":"231.0","until":"232.*","originalSince":"231.0","originalUntil":"233.*"},{"id":"com.clutcher.comments_highlighter","version":"2023.7.0","since":"231.0","until":"","originalSince":"223.0","originalUntil":null},{"id":"com.town.basket","version":"222.1.2","since":"222.*","until":"232.*","originalSince":"222.0","originalUntil":"232.*"},{"id":"com.intellij.plugins.haxe","version":"1.4.6","since":"223.8214","until":"232.*","originalSince":"223.0","originalUntil":"232.*"},{"id":"com.videogameaholic.intellij.starcoder","version":"0.230711","since":"212.0","until":"232.*","originalSince":"212.0","originalUntil":"300.*"},{"id":"com.microfocus.intellij.plugin.gitclient","version":"1.5","since":"193.0","until":"232.*","originalSince":"193.0","originalUntil":"239.9999"},{"id":"com.clutcher.comments_highlighter","version":"2023.7.1","since":"231.0","until":"","originalSince":"223.0","originalUntil":null},{"id":"com.clutcher.comments_highlighter","version":"2023.7.2","since":"231.0","until":"","originalSince":"223.0","originalUntil":null},{"id":"com.intellij.plugins.haxe","version":"1.4.7","since":"223.8214","until":"232.*","originalSince":"223.0","originalUntil":"232.*"},{"id":"com.mybatisflex.bigtian","version":"1.4.2-RELEASE","since":"223","until":"232.*","originalSince":"222.3345.*","originalUntil":"232.*"},{"id":"com.github.chocovon.debug-variable-sl","version":"2.1.1","since":"193.0","until":"232.*","originalSince":"193.0","originalUntil":"251.0"},{"id":"org.kotsuite.intellij","version":"1.0.5","since":"222","until":"231.*","originalSince":"211.0","originalUntil":"231.*"},{"id":"com.clutcher.comments_highlighter","version":"2023.7.3","since":"231","until":"","originalSince":"223.0","originalUntil":null},{"id":"com.gitlab.plugin","version":"0.1.1","since":"232.7754.73","until":"232.9559.62","originalSince":"232.7754.73","originalUntil":"232.*"},{"id":"com.github.lvlifeng.githelper","version":"231.1.5","since":"212.0","until":"232.*","originalSince":"203.0","originalUntil":"232.*"},{"id":"EditorGroups","version":"2.0.0","since":"232.0","until":"241.*","originalSince":"231.0","originalUntil":"241.*"},{"id":"SerialPortMonitor","version":"232.8660.153","since":"232.8660","until":"232.8660","originalSince":"232.8660","originalUntil":"232.*"},{"id":"com.github.linrenen.uniappsupport","version":"1.1.15-231.9","since":"230.0","until":"230.0","originalSince":"230.0","originalUntil":"232.*"},{"id":"SerialPortMonitor","version":"232.8660.158","since":"232.8660","until":"232.8660","originalSince":"232.8660","originalUntil":"232.*"},{"id":"com.gitlab.plugin","version":"0.1.1","since":"232.7754.73","until":"232.9559.*","originalSince":"232.7754.73","originalUntil":"232.*"},{"id":"com.clutcher.comments_highlighter","version":"2023.7.4","since":"231","until":"","originalSince":"223.0","originalUntil":null},{"id":"SerialPortMonitor","version":"232.8660.185","since":"232.8660","until":"232.8660","originalSince":"232.8660","originalUntil":"232.*"},{"id":"com.github.linrenen.uniappsupport","version":"1.1.16-232","since":"232.1","until":"232.*","originalSince":"232.1","originalUntil":"999.0"},{"id":"com.intellij.plugins.haxe","version":"1.4.8","since":"231.8109.175","until":"232.*","originalSince":"223.0","originalUntil":"232.*"},{"id":"com.github.hardcorequal.intellijgitquickview","version":"1.0.0","since":"232.0","until":"232.*","originalSince":"232.0","originalUntil":"250.*"},{"id":"com.github.linrenen.uniappsupport","version":"1.1.17-232","since":"232.1","until":"232.*","originalSince":"232.1","originalUntil":"999.0"},{"id":"com.clutcher.comments_highlighter","version":"2023.7.5","since":"231","until":"","originalSince":"223.0","originalUntil":null},{"id":"com.clutcher.comments_highlighter","version":"2023.7.7","since":"231.0","until":"","originalSince":"223.0","originalUntil":null},{"id":"com.h3110w0r1d.gitmoji","version":"0.1.2","since":"232.0","until":"233.*","originalSince":"222.0","originalUntil":"233.*"},{"id":"com.github.linrenen.uniappsupport","version":"1.1.18-232","since":"232.1","until":"232.*","originalSince":"232.1","originalUntil":"999.0"},{"id":"io.xmake","version":"1.2.1","since":"201.0","until":"232.*","originalSince":"201.0","originalUntil":"291.*"},{"id":"com.clutcher.comments_highlighter","version":"2023.7.8","since":"231","until":"","originalSince":"223.0","originalUntil":null},{"id":"org.jetbrains.completion.full.line","version":"233.2912","since":"231.0","until":"231.*","originalSince":"231.0","originalUntil":"232.*"},{"id":"com.github.linrenen.uniappsupport","version":"1.1.19-232","since":"232.1","until":"232.*","originalSince":"232.1","originalUntil":"999.0"},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.10.0","since":"232.8660","until":"232.*","originalSince":"232.8660","originalUntil":"233.9999"},{"id":"com.pvsstudio.dotnet","version":"7.26.73915","since":"193","until":"231.*","originalSince":"173.0","originalUntil":null},{"id":"FileSync","version":"1.15.0","since":"231.0","until":"","originalSince":"222.0","originalUntil":null},{"id":"com.github.linrenen.uniappsupport","version":"1.1.20-232","since":"232.1","until":"232.*","originalSince":"232.1","originalUntil":"999.0"},{"id":"com.github.ArtsiomCh.JDCleanRead","version":"232.1.0","since":"202.0","until":"232.*","originalSince":"202.0","originalUntil":"999.9"},{"id":"MyBatisLog","version":"2023.8.2","since":"203","until":"222.*","originalSince":"193.0","originalUntil":"222.*"},{"id":"com.clutcher.comments_highlighter","version":"2023.7.9","since":"231","until":"","originalSince":"223.0","originalUntil":null},{"id":"com.gitlab.plugin","version":"0.1.2","since":"232.7754.73","until":"232.9559.*","originalSince":"232.7754.73","originalUntil":"232.*"},{"id":"ArthasHotSwap","version":"3.0","since":"231.0","until":"233.*","originalSince":"231.0","originalUntil":"243.*"},{"id":"com.clutcher.comments_highlighter","version":"2023.7.10","since":"231","until":"","originalSince":"223.0","originalUntil":null},{"id":"net.mamoe.mirai-console","version":"232-2.15.0-182-1","since":"231.1","until":"232.*","originalSince":"223.0","originalUntil":"232.*"},{"id":"com.github.bigmouthcn.talkxideaplugin","version":"0.0.9","since":"212","until":"232.*","originalSince":"211.0","originalUntil":"232.*"},{"id":"io.github.godfather1103.custom.functions.for.live.templates","version":"1.1","since":"182.0","until":"","originalSince":"161.0","originalUntil":null},{"id":"com.github.thomasbagnolati.diamondthemeintellij","version":"2.0.1","since":"181","until":"","originalSince":"22.3","originalUntil":null},{"id":"co.bito.bito-intellij","version":"1.1.5","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"com.github.linrenen.uniappsupport","version":"1.1.21-232","since":"232.1","until":"232.*","originalSince":"232.1","originalUntil":"999.0"},{"id":"io.xmake","version":"1.2.2","since":"201.0","until":"232.*","originalSince":"201.0","originalUntil":"291.*"},{"id":"co.bito.bito-intellij","version":"1.1.6","since":"212.0","until":"","originalSince":"211.0","originalUntil":null},{"id":"io.unthrottled.amii","version":"1.1.8","since":"232.0","until":"232.*","originalSince":"231.0","originalUntil":"232.*"},{"id":"com.gitlab.plugin","version":"0.1.3","since":"232.7754.73","until":"232.9559.*","originalSince":"232.7754.73","originalUntil":"232.*"},{"id":"com.videogameaholic.intellij.starcoder","version":"0.230829","since":"212.0","until":"232.*","originalSince":"212.0","originalUntil":"300.*"},{"id":"com.github.bigmouthcn.talkxideaplugin","version":"0.0.10","since":"212","until":"232.*","originalSince":"211.0","originalUntil":"232.*"},{"id":"org.jetbrains.completion.full.line","version":"233.5199","since":"232.0","until":"232.*","originalSince":"231.0","originalUntil":"233.*"},{"id":"FitLang","version":"0.2.8-IDEA.221","since":"182.*","until":"232.*","originalSince":"182.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.2.9-IDEA.221","since":"182.*","until":"232.*","originalSince":"182.*","originalUntil":"253.*"},{"id":"io.ariga.atlas.hcl","version":"232.1.0","since":"232.0","until":"232.9559.*","originalSince":"232.0","originalUntil":"232.*"},{"id":"FitLang","version":"0.2.11","since":"182.*","until":"232.*","originalSince":"182.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.2.13","since":"182.*","until":"232.*","originalSince":"182.*","originalUntil":"253.*"},{"id":"com.github.linrenen.uniappsupport","version":"1.1.22-232","since":"232.1","until":"232.*","originalSince":"232.1","originalUntil":"999.0"},{"id":"org.rri.ijTextmate","version":"0.2","since":"222.*","until":"231.9392.1","originalSince":"222.3345.118","originalUntil":"231.9392.1"},{"id":"com.mallowigi","version":"93.1.0","since":"232.8660","until":"232.*","originalSince":"232.8660","originalUntil":"233.9999"},{"id":"com.github.bobi.aemgroovyconsoleplugin.aem-groovyconsole-plugin","version":"0.9.0","since":"231.0","until":"232.*","originalSince":"231.0","originalUntil":"241.*"},{"id":"FitLang","version":"0.3.6","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.3.7","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.3.8","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.4.0","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"org.example.tool","version":"1.3.4","since":"223.0","until":"299","originalSince":"223.0","originalUntil":"299.*"},{"id":"FitLang","version":"0.4.1","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"com.gitlab.plugin","version":"0.2.0","since":"232.7754.73","until":"232.9559.*","originalSince":"232.7754.73","originalUntil":"232.*"},{"id":"FitLang","version":"0.4.3","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"com.videogameaholic.intellij.starcoder","version":"0.230905","since":"212.0","until":"232.*","originalSince":"212.0","originalUntil":"300.*"},{"id":"FitLang","version":"0.4.4","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"com.yleanlink.template","version":"1.3.0","since":"203","until":"223.*","originalSince":"201.0","originalUntil":"223.*"},{"id":"com.baway.bw-plugin","version":"1.0.1-SNAPSHOT","since":"191.0","until":"232.*","originalSince":"191.0","originalUntil":"251.*"},{"id":"com.baway.bw-plugin","version":"1.0.2-SNAPSHOT","since":"191.0","until":"232.*","originalSince":"191.0","originalUntil":"251.*"},{"id":"FitLang","version":"0.4.5","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.4.6","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"co.bito.bito-intellij","version":"1.1.7","since":"212","until":"","originalSince":"211.0","originalUntil":null},{"id":"FitLang","version":"0.4.7","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.4.8","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.4.10","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.4.11","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"com.samuraism.plugins.tiger","version":"2023.2.1","since":"232.0","until":"232.*","originalSince":"232.0","originalUntil":"233.*"},{"id":"com.baway.bw-plugin","version":"1.0.2.1-SNAPSHOT","since":"191.0","until":"232.*","originalSince":"191.0","originalUntil":"251.*"},{"id":"FitLang","version":"0.4.12","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"lekanich.eye-health","version":"2023.2.1","since":"231.0","until":"232.*","originalSince":"231.0","originalUntil":"293.*"},{"id":"lekanich.Race","version":"2023.2.1","since":"232.0","until":"232.*","originalSince":"232.0","originalUntil":"294.*"},{"id":"NLSExchange","version":"1.4.1","since":"231.1","until":"232.*","originalSince":"223.0","originalUntil":"232.*"},{"id":"ai.codemaker.jetbrains","version":"1.16.0","since":"231.0","until":"232.*","originalSince":"231.0","originalUntil":"241.*"},{"id":"de.beyondco.tldr","version":"1.0.1","since":"213.0","until":"232.*","originalSince":"213.0","originalUntil":"235.*"},{"id":"io.mend.advisecode","version":"23.9.1","since":"231.*","until":"232.*","originalSince":"221.0","originalUntil":"232.*"},{"id":"FitLang","version":"0.4.15","since":"182","until":"253.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"liubsyyflymoon","version":"1.8.6","since":"221","until":"","originalSince":"203.0","originalUntil":null},{"id":"dev.huyaro.lang","version":"0.0.8","since":"223","until":"232.*","originalSince":"222.0","originalUntil":"232.*"},{"id":"dev.huyaro.lang","version":"0.0.9","since":"223","until":"232.*","originalSince":"222.0","originalUntil":"232.*"},{"id":"FitLang","version":"0.4.18","since":"182","until":"253.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"com.skcc.plugin.corus","version":"0.9.0","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"240.*"},{"id":"com.skcc.plugin.corus","version":"0.9.1","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"240.*"},{"id":"FitLang","version":"0.4.19","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.5.0","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.5.2","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.5.4","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"dev.huyaro.lang","version":"0.1.1","since":"223","until":"232.*","originalSince":"222.0","originalUntil":"232.*"},{"id":"FitLang","version":"0.5.6","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.5.7","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"com.skcc.plugin.corus","version":"0.9.2","since":"222.0","until":"232.*","originalSince":"222.0","originalUntil":"240.*"},{"id":"FitLang","version":"0.5.8","since":"182","until":"253.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"liubsyyflymoon","version":"1.8.7","since":"221","until":"","originalSince":"203.0","originalUntil":null},{"id":"Valkyrie","version":"0.0.6","since":"232.0","until":"232.*","originalSince":"232.0","originalUntil":"240.*"},{"id":"FitLang","version":"0.5.9","since":"182","until":"253.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"com.luomacode.ChatMoss","version":"1.1.0","since":"203.0","until":"232.*","originalSince":"203.0","originalUntil":"999.*"},{"id":"com.github.beansoft.iscratch","version":"2023.1.5","since":"232","until":"232.*","originalSince":"231.8770.17","originalUntil":null},{"id":"FitLang","version":"0.5.10","since":"182","until":"232.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"com.timindustries.regexpluginv2","version":"0.0.7","since":"222.*","until":"","originalSince":"231.*","originalUntil":null},{"id":"com.baway.bw-plugin","version":"1.0.3-SNAPSHOT","since":"191.0","until":"232.*","originalSince":"191.0","originalUntil":"251.*"},{"id":"me.panxin.plugin.idea.jumpcontroller","version":"1.3.0","since":"201","until":"","originalSince":"193.0","originalUntil":null},{"id":"IDS","version":"1.2","since":"211.0","until":"233.*","originalSince":"211.0","originalUntil":"250.*"},{"id":"PlantUML integration","version":"7.1.2-IJ2023.2","since":"233.6745.305","until":"","originalSince":"232.6734.9","originalUntil":null},{"id":"com.chrisrm.idea.MaterialThemeUI","version":"8.12.0","since":"232.8660","until":"232.9999","originalSince":"232.8660","originalUntil":"233.9999"},{"id":"FitLang","version":"0.5.11","since":"182","until":"253.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"FitLang","version":"0.5.12","since":"182","until":"253.*","originalSince":"161.*","originalUntil":"253.*"},{"id":"com.mesour.intellij.latte","version":"1.1.1","since":"232.0","until":"232.*","originalSince":"232.0","originalUntil":"292.*"}] diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix new file mode 100644 index 0000000000000..cba986c610393 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/source/build.nix @@ -0,0 +1,264 @@ +{ fetchFromGitHub +, fetchurl +, lib +, linkFarm +, makeWrapper +, runCommand +, stdenv +, stdenvNoCC + +, ant +, cmake +, glib +, jetbrains +, kotlin +, libdbusmenu +, maven +, p7zip +, pkg-config +, xorg + +, buildVer +, buildType +, ideaHash +, androidHash +, jpsHash +, mvnDeps +}: + +let + + jbr = jetbrains.jdk-no-jcef; + + ideaSrc = fetchFromGitHub { + owner = "jetbrains"; + repo = "intellij-community"; + rev = "${buildType}/${buildVer}"; + hash = ideaHash; + }; + + androidSrc = fetchFromGitHub { + owner = "jetbrains"; + repo = "android"; + rev = "${buildType}/${buildVer}"; + hash = androidHash; + }; + + src = runCommand "source" { } '' + cp -r ${ideaSrc} $out + chmod +w -R $out + cp -r ${androidSrc} $out/android + ''; + + libdbusmenu-jb = libdbusmenu.overrideAttrs (old: { + version = "jetbrains-fork"; + src = fetchFromGitHub { + owner = "jetbrains"; + repo = "libdbusmenu"; + rev = "d8a49303f908a272e6670b7cee65a2ba7c447875"; + hash = "sha256-u87ZgbfeCPJ0qG8gsom3gFaZxbS5NcHEodb0EVakk60="; + }; + configureFlags = old.configureFlags ++ [ + "--enable-static" + ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp libdbusmenu-glib/.libs/libdbusmenu-glib.a $out/lib + + runHook postInstall + ''; + }); + + libdbm = stdenv.mkDerivation { + pname = "libdbm"; + version = buildVer; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ glib xorg.libX11 libdbusmenu ]; + inherit src; + sourceRoot = "source/native/LinuxGlobalMenu"; + patches = [ ../patches/libdbm-headers.patch ]; + postPatch = "cp ${libdbusmenu-jb}/lib/libdbusmenu-glib.a libdbusmenu-glib.a"; + passthru.patched-libdbusmenu = libdbusmenu-jb; + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + mv libdbm.so $out/lib/libdbm.so + + runHook postInstall + ''; + }; + + fsnotifier = stdenv.mkDerivation { + pname = "fsnotifier"; + version = buildVer; + inherit src; + sourceRoot = "source/native/fsNotifier/linux"; + buildPhase = '' + runHook preBuild + cc -O2 -Wall -Wextra -Wpedantic -D "VERSION=\"${buildVer}\"" -std=c11 main.c inotify.c util.c -o fsnotifier + runHook postBuild + ''; + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mv fsnotifier $out/bin + runHook postInstall + ''; + }; + + jpsRepo = runCommand "jps-bootstrap-repository" + { + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = jpsHash; + nativeBuildInputs = [ ant jbr ]; + } '' + ant -Duser.home=$out -Dbuild.dir=/build/tmp -f ${src}/platform/jps-bootstrap/jps-bootstrap-classpath.xml + find $out -type f \( \ + -name \*.lastUpdated \ + -o -name resolver-status.properties \ + -o -name _remote.repositories \) \ + -delete + ''; + + jps-bootstrap = stdenvNoCC.mkDerivation { + pname = "jps-bootstrap"; + version = buildVer; + inherit src; + sourceRoot = "source/platform/jps-bootstrap"; + nativeBuildInputs = [ ant makeWrapper jbr ]; + patches = [ ../patches/kotlinc-path.patch ]; + postPatch = "sed -i 's|KOTLIN_PATH_HERE|${kotlin}|' src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt"; + buildPhase = '' + runHook preInstall + + ant -Duser.home=${jpsRepo} -Dbuild.dir=/build/out -f jps-bootstrap-classpath.xml + + runHook postInstall + ''; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java/ + cp /build/out/jps-bootstrap.classes.jar $out/share/java/jps-bootstrap.jar + cp -r /build/out/jps-bootstrap.out.lib $out/share/java/jps-bootstrap-classpath + makeWrapper ${jbr}/bin/java $out/bin/jps-bootstrap \ + --add-flags "-cp $out/share/java/jps-bootstrap-classpath/'*' org.jetbrains.jpsBootstrap.JpsBootstrapMain" + + runHook postInstall + ''; + }; + + artefactsJson = lib.importJSON mvnDeps; + mkRepoEntry = entry: { + name = ".m2/repository/" + entry.path; + path = fetchurl { + urls = [ + "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/${entry.url}" + "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/${entry.url}" + "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies/${entry.url}" + "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/${entry.url}" + "https://cache-redirector.jetbrains.com/dl.google.com/dl/android/maven2/${entry.url}" + "https://packages.jetbrains.team/maven/p/kpm/public/${entry.url}" + "https://packages.jetbrains.team/maven/p/dpgpv/maven/${entry.url}" + "https://cache-redirector.jetbrains.com/download.jetbrains.com/teamcity-repository/${entry.url}" + ]; + sha256 = entry.hash; + }; + }; + mvnRepo = linkFarm "intellij-deps" (map mkRepoEntry artefactsJson); + + kotlin-jps-plugin-classpath = + let + repoUrl = "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies"; + groupId = builtins.replaceStrings [ "." ] [ "/" ] "org.jetbrains.kotlin"; + artefactId = "kotlin-jps-plugin-classpath"; + version = "1.8.20"; + in + fetchurl { + url = repoUrl + "/" + groupId + "/" + artefactId + "/" + version + "/" + artefactId + "-" + version + ".jar"; + hash = "sha256-w+vmEBSXGcyvxHB3byIOFjTeCIC7tkWh9rvOoP0//9A="; + }; + + targetClass = if buildType == "pycharm" then "intellij.pycharm.community.build" else "intellij.idea.community.build"; + targetName = if buildType == "pycharm" then "PyCharmCommunityInstallersBuildTarget" else "OpenSourceCommunityInstallersBuildTarget"; + +in +stdenvNoCC.mkDerivation rec { + pname = "${buildType}-community"; + version = buildVer; + name = "${pname}-${version}.tar.gz"; + inherit src; + nativeBuildInputs = [ p7zip jbr jps-bootstrap ]; + repo = mvnRepo; + + patches = [ + ../patches/no-download.patch + ../patches/pycharm-build-fix.patch + ]; + + postPatch = '' + cp ${fsnotifier}/bin/fsnotifier bin/linux/amd64/fsnotifier + cp ${libdbm}/lib/libdbm.so bin/linux/amd64/libdbm.so + + sed \ + -e 's|JPS_PLUGIN_CLASSPATH_HERE|${kotlin-jps-plugin-classpath}|' \ + -e 's|KOTLIN_PATH_HERE|${kotlin}|' \ + -i platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt + sed \ + -e 's|JDK_PATH_HERE|${jbr}/lib/openjdk|' \ + -i platform/build-scripts/downloader/src/org/jetbrains/intellij/build/dependencies/JdkDownloader.kt + sed \ + -e 's|BROKEN_PLUGINS_HERE|${./brokenPlugins.json}|' \ + -i platform/build-scripts/src/org/jetbrains/intellij/build/impl/brokenPlugins.kt + sed \ + -e 's|MAVEN_REPO_HERE|${mvnRepo}/.m2/repository/|' \ + -e 's|MAVEN_PATH_HERE|${maven}/maven|' \ + -i build/deps/src/org/jetbrains/intellij/build/impl/BundledMavenDownloader.kt + echo '${buildVer}' > build.txt + ''; + + configurePhase = '' + runHook preConfigure + + # Will need removing after update + cp plugins/devkit/devkit-core/src/run/OpenedPackages.txt platform/platform-impl/resources/META-INF/OpenedPackages.txt + + ln -s "$repo"/.m2 /build/.m2 + export JPS_BOOTSTRAP_COMMUNITY_HOME=/build/source + jps-bootstrap \ + -Dbuild.number=${buildVer} \ + -Djps.kotlin.home=${kotlin} \ + -Dintellij.build.target.os=linux \ + -Dintellij.build.target.arch=x64 \ + -Dintellij.build.skip.build.steps=mac_artifacts,mac_dmg,mac_sit,windows_exe_installer,windows_sign,repair_utility_bundle_step \ + -Dintellij.build.unix.snaps=false \ + --java-argfile-target=java_argfile \ + /build/source \ + ${targetClass} \ + ${targetName} + + runHook postConfigure + ''; + buildPhase = '' + runHook preBuild + + java \ + -Djps.kotlin.home=${kotlin} \ + "@java_argfile" + + runHook postBuild + ''; + installPhase = '' + runHook preInstall + mv out/*/artifacts/*-no-jbr.tar.gz $out + runHook postInstall + ''; + + passthru = { + inherit libdbm fsnotifier jps-bootstrap; + }; +} diff --git a/pkgs/applications/editors/jetbrains/source/build_maven.py b/pkgs/applications/editors/jetbrains/source/build_maven.py new file mode 100755 index 0000000000000..37e051ad8578e --- /dev/null +++ b/pkgs/applications/editors/jetbrains/source/build_maven.py @@ -0,0 +1,94 @@ +#!/usr/bin/env nix-shell +# ! nix-shell -i python3 -p python3 python3.pkgs.xmltodict +import os +from argparse import ArgumentParser +from xmltodict import parse +from json import dump +from sys import stdout + +def get_args() -> (str, list[str]): + parser = ArgumentParser( + description="Given the path of a intellij source tree, make a list of urls and hashes of maven artefacts required to build" + ) + parser.add_argument("out", help="File to output json to") + parser.add_argument("path", help="Path to the intellij-community source dir") + args = parser.parse_args() + return args.path, args.out + + +def ensure_is_list(x): + if type(x) != list: + return [x] + return x + +def add_entries(sources, targets, hashes): + for num, artefact in enumerate(sources): + hashes.append({ + "url": artefact["@url"][26:], + "hash": artefact["sha256sum"], + "path": targets[num]["@url"][25:-2] + }) + + +def add_libraries(root_path: str, hashes: list[dict[str, str]], projects_to_process: list[str]): + library_paths = os.listdir(root_path + "/libraries/") + for path in library_paths: + file_contents = parse(open(root_path + "/libraries/" + path).read()) + if "properties" not in file_contents["component"]["library"]: + continue + sources = ensure_is_list(file_contents["component"]["library"]["properties"]["verification"]["artifact"]) + targets = ensure_is_list(file_contents["component"]["library"]["CLASSES"]["root"]) + add_entries(sources, targets, hashes) + + modules_xml = parse(open(root_path+"/modules.xml").read()) + for entry in modules_xml["project"]["component"]: + if entry["@name"] != "ProjectModuleManager": + continue + for module in entry["modules"]["module"]: + projects_to_process.append(module["@filepath"]) + + +def add_iml(path: str, hashes: list[dict[str, str]], projects_to_process: list[str]): + try: + contents = parse(open(path).read()) + except FileNotFoundError: + print(f"Warning: path {path} does not exist (did you forget the android directory?)") + return + for manager in ensure_is_list(contents["module"]["component"]): + if manager["@name"] != "NewModuleRootManager": + continue + + for entry in manager["orderEntry"]: + if type(entry) != dict or \ + entry["@type"] != "module-library" or \ + "properties" not in entry["library"]: + continue + + sources = ensure_is_list(entry["library"]["properties"]["verification"]["artifact"]) + targets = ensure_is_list(entry["library"]["CLASSES"]["root"]) + add_entries(sources, targets, hashes) + + +def main(): + root_path, out = get_args() + file_hashes = [] + projects_to_process: list[str] = [root_path+"/.idea"] + + while projects_to_process: + elem = projects_to_process.pop() + elem = elem.replace("$PROJECT_DIR$", root_path) + if elem.endswith(".iml"): + add_iml(elem, file_hashes, projects_to_process) + else: + add_libraries(elem, file_hashes, projects_to_process) + + if out == "stdout": + dump(file_hashes, stdout, indent=4) + else: + file = open(out, "w") + dump(file_hashes, file, indent=4) + file.write("\n") + + +if __name__ == '__main__': + main() diff --git a/pkgs/applications/editors/jetbrains/source/default.nix b/pkgs/applications/editors/jetbrains/source/default.nix new file mode 100644 index 0000000000000..d801af47578e0 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/source/default.nix @@ -0,0 +1,21 @@ +{ callPackage +}: + +{ + idea-community = callPackage ./build.nix { + buildVer = "232.9921.47"; + buildType = "idea"; + ideaHash = "sha256-sibp2Pa+NNHEeHMDRol45XOK0JzEhIZeI7TY04SkIx4="; + androidHash = "sha256-bc/UlR0DJQiQ3mdscucHkvzkSQxD0KnDFIM9UIb7Inw="; + jpsHash = "sha256-dBz64oATg45BMwd6etncQm84eHQSfSE9kDbuU9IVpmo="; + mvnDeps = ./idea_maven_artefacts.json; + }; + pycharm-community = callPackage ./build.nix { + buildVer = "232.10072.31"; + buildType = "pycharm"; + ideaHash = "sha256-NTQGz5HViQlJQaxcAnsliZS4NCKScVqx25FMILkBjpk="; + androidHash = "sha256-bc/UlR0DJQiQ3mdscucHkvzkSQxD0KnDFIM9UIb7Inw="; + jpsHash = "sha256-dBz64oATg45BMwd6etncQm84eHQSfSE9kDbuU9IVpmo="; + mvnDeps = ./idea_maven_artefacts.json; + }; +} diff --git a/pkgs/applications/editors/jetbrains/source/idea_maven_artefacts.json b/pkgs/applications/editors/jetbrains/source/idea_maven_artefacts.json new file mode 100644 index 0000000000000..ae68b7b354d69 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/source/idea_maven_artefacts.json @@ -0,0 +1,7107 @@ +[ + { + "url": "org/jetbrains/intellij/deps/asm-all/9.5/asm-all-9.5.jar", + "hash": "a1b68c71e5c72ff41fefea29f8d1c2499f2e31278acf8e312249df349b263fbe", + "path": "org/jetbrains/intellij/deps/asm-all/9.5/asm-all-9.5.jar" + }, + { + "url": "cglib/cglib-nodep/3.3.0/cglib-nodep-3.3.0.jar", + "hash": "3366d2c88fb576e486d830f521184e8f1839f8c15dcd2151a3f6e1f62b0b37a0", + "path": "cglib/cglib-nodep/3.3.0/cglib-nodep-3.3.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/gradle-api/8.2/gradle-api-8.2.jar", + "hash": "e5ca97fe9991ad7736b9c2c2d44cff72a6fb44e6815a736d9e372bc850c53950", + "path": "org/jetbrains/intellij/deps/gradle-api/8.2/gradle-api-8.2.jar" + }, + { + "url": "org/jetbrains/intellij/deps/gradle-api-impldep/8.2/gradle-api-impldep-8.2.jar", + "hash": "029d9d5b09ece9e5c345fbba0a8643505912ebde3e1d3933d00ea3313f817f6e", + "path": "org/jetbrains/intellij/deps/gradle-api-impldep/8.2/gradle-api-impldep-8.2.jar" + }, + { + "url": "org/jetbrains/intellij/deps/gradle-wrapper/8.2/gradle-wrapper-8.2.jar", + "hash": "a8451eeda314d0568b5340498b36edf147a8f0d692c5ff58082d477abe9146e4", + "path": "org/jetbrains/intellij/deps/gradle-wrapper/8.2/gradle-wrapper-8.2.jar" + }, + { + "url": "org/jetbrains/intellij/deps/gradle-launcher/8.2/gradle-launcher-8.2.jar", + "hash": "8ffd8aa02fd30adf36a6d5fa0b00a3c67e9e26577cb81ea3915853a5bf970ac7", + "path": "org/jetbrains/intellij/deps/gradle-launcher/8.2/gradle-launcher-8.2.jar" + }, + { + "url": "com/google/guava/guava/31.1-jre/guava-31.1-jre.jar", + "hash": "a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab", + "path": "com/google/guava/guava/31.1-jre/guava-31.1-jre.jar" + }, + { + "url": "com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar", + "hash": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26", + "path": "com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" + }, + { + "url": "com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar", + "hash": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b", + "path": "com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar" + }, + { + "url": "org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12.jar", + "hash": "9b47fbae444feaac4b7e04f0ea294569e4bc282bc69d8c2ce2ac3f23577281e2", + "path": "org/hdrhistogram/HdrHistogram/2.1.12/HdrHistogram-2.1.12.jar" + }, + { + "url": "junit/junit/3.8.1/junit-3.8.1.jar", + "hash": "b58e459509e190bed737f3592bc1950485322846cf10e78ded1d065153012d70", + "path": "junit/junit/3.8.1/junit-3.8.1.jar" + }, + { + "url": "junit/junit/4.13.2/junit-4.13.2.jar", + "hash": "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3", + "path": "junit/junit/4.13.2/junit-4.13.2.jar" + }, + { + "url": "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar", + "hash": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9", + "path": "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" + }, + { + "url": "org/junit/jupiter/junit-jupiter-api/5.9.1/junit-jupiter-api-5.9.1.jar", + "hash": "5d2fe4d719dffb25a95d77e9c7a34893cbbb1b4cc6c86f2726af7e0fb7035b2f", + "path": "org/junit/jupiter/junit-jupiter-api/5.9.1/junit-jupiter-api-5.9.1.jar" + }, + { + "url": "org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar", + "hash": "58812de60898d976fb81ef3b62da05c6604c18fd4a249f5044282479fc286af2", + "path": "org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar" + }, + { + "url": "org/junit/platform/junit-platform-commons/1.9.1/junit-platform-commons-1.9.1.jar", + "hash": "a8e82d510bbbce5fe1777b2ecf7bc68401e9ae8327009e029b2db5798403d25e", + "path": "org/junit/platform/junit-platform-commons/1.9.1/junit-platform-commons-1.9.1.jar" + }, + { + "url": "org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar", + "hash": "b509448ac506d607319f182537f0b35d71007582ec741832a1f111e5b5b70b38", + "path": "org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar" + }, + { + "url": "org/junit/jupiter/junit-jupiter-engine/5.9.1/junit-jupiter-engine-5.9.1.jar", + "hash": "8bbc506b4f603ede1f6bafd8eee69a9cc43de0c26a0ee8d40d583d3feeedc2e9", + "path": "org/junit/jupiter/junit-jupiter-engine/5.9.1/junit-jupiter-engine-5.9.1.jar" + }, + { + "url": "org/junit/platform/junit-platform-launcher/1.9.1/junit-platform-launcher-1.9.1.jar", + "hash": "5fb50ef56168358892e1bd0a080e2e5bb74dc882b2ecc2a9bad0eadb5a6a449e", + "path": "org/junit/platform/junit-platform-launcher/1.9.1/junit-platform-launcher-1.9.1.jar" + }, + { + "url": "org/junit/platform/junit-platform-engine/1.9.1/junit-platform-engine-1.9.1.jar", + "hash": "f59c3a67087f2b9bbb17a9c06dd416697989b2c53b38843874ebbbbcb0afc23f", + "path": "org/junit/platform/junit-platform-engine/1.9.1/junit-platform-engine-1.9.1.jar" + }, + { + "url": "org/junit/jupiter/junit-jupiter-params/5.9.1/junit-jupiter-params-5.9.1.jar", + "hash": "30157f26d857ba4f84c0d84d156f55f056e80dc09b4281affa8b1ed4d3205c08", + "path": "org/junit/jupiter/junit-jupiter-params/5.9.1/junit-jupiter-params-5.9.1.jar" + }, + { + "url": "org/junit/platform/junit-platform-suite/1.9.1/junit-platform-suite-1.9.1.jar", + "hash": "a21d4de7695ecabaff20b21a641d8f1e35bb2f3e57e752fd94f2209d87f06228", + "path": "org/junit/platform/junit-platform-suite/1.9.1/junit-platform-suite-1.9.1.jar" + }, + { + "url": "org/junit/platform/junit-platform-suite-api/1.9.1/junit-platform-suite-api-1.9.1.jar", + "hash": "f49e2a8983a52e2e5566a16828d634a02592ab8bf51d23c5c091214bc15e57b4", + "path": "org/junit/platform/junit-platform-suite-api/1.9.1/junit-platform-suite-api-1.9.1.jar" + }, + { + "url": "org/junit/platform/junit-platform-suite-engine/1.9.1/junit-platform-suite-engine-1.9.1.jar", + "hash": "e7b7ee49332764acaa64f88cfe4c624e4d69b15d04cacbf98103ed91d027e06c", + "path": "org/junit/platform/junit-platform-suite-engine/1.9.1/junit-platform-suite-engine-1.9.1.jar" + }, + { + "url": "org/junit/platform/junit-platform-suite-commons/1.9.1/junit-platform-suite-commons-1.9.1.jar", + "hash": "8279775f6a9b075e394a888b8ab1226307c86fb925b4414270be9518cf07377c", + "path": "org/junit/platform/junit-platform-suite-commons/1.9.1/junit-platform-suite-commons-1.9.1.jar" + }, + { + "url": "org/junit/vintage/junit-vintage-engine/5.9.1/junit-vintage-engine-5.9.1.jar", + "hash": "b97de493877c9ba5e4f03b44bd348a53e5fc9df2df5b1a048923e0204f7d7178", + "path": "org/junit/vintage/junit-vintage-engine/5.9.1/junit-vintage-engine-5.9.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/java-compatibility/1.0.1/java-compatibility-1.0.1.jar", + "hash": "1f799c9e7691a4dcddb1cb3e28e8517d5e6b27c2ac75093f39714afdc9216950", + "path": "org/jetbrains/intellij/deps/java-compatibility/1.0.1/java-compatibility-1.0.1.jar" + }, + { + "url": "jaxen/jaxen/1.2.0/jaxen-1.2.0.jar", + "hash": "70feef9dd75ad064def05a3ce8975aeba515ee7d1be146d12199c8828a64174c", + "path": "jaxen/jaxen/1.2.0/jaxen-1.2.0.jar" + }, + { + "url": "com/esotericsoftware/kryo/kryo5/5.5.0/kryo5-5.5.0.jar", + "hash": "5dab506f91ab06adad1acb5fe904e587c2781593a7930f003e84f6597622f3b2", + "path": "com/esotericsoftware/kryo/kryo5/5.5.0/kryo5-5.5.0.jar" + }, + { + "url": "org/slf4j/log4j-over-slf4j/1.7.36/log4j-over-slf4j-1.7.36.jar", + "hash": "0a7e032bf5bcdd5b2bf8bf2e5cf02c5646f2aa6fee66933b8150dbe84e651e8a", + "path": "org/slf4j/log4j-over-slf4j/1.7.36/log4j-over-slf4j-1.7.36.jar" + }, + { + "url": "be/cyberelf/nanoxml/nanoxml/2.2.3/nanoxml-2.2.3.jar", + "hash": "76f5f1fb2193f186d699f6cf396505d63e4dc8c14f8e7517f763845fa87a88bf", + "path": "be/cyberelf/nanoxml/nanoxml/2.2.3/nanoxml-2.2.3.jar" + }, + { + "url": "org/objenesis/objenesis/3.2/objenesis-3.2.jar", + "hash": "03d960bd5aef03c653eb000413ada15eb77cdd2b8e4448886edf5692805e35f3", + "path": "org/objenesis/objenesis/3.2/objenesis-3.2.jar" + }, + { + "url": "oro/oro/2.0.8/oro-2.0.8.jar", + "hash": "e00ccdad5df7eb43fdee44232ef64602bf63807c2d133a7be83ba09fd49af26e", + "path": "oro/oro/2.0.8/oro-2.0.8.jar" + }, + { + "url": "com/hierynomus/sshj/0.35.0/sshj-0.35.0.jar", + "hash": "d3b3d71f3e834c7e52d022036c2e96c2b21c8ec7baa20270965c4d59e2e4d86e", + "path": "com/hierynomus/sshj/0.35.0/sshj-0.35.0.jar" + }, + { + "url": "com/hierynomus/asn-one/0.6.0/asn-one-0.6.0.jar", + "hash": "e4f70fd92849b52240048b8ebace0c9a17d3bb7b9c882b3c7778cec3458495f5", + "path": "com/hierynomus/asn-one/0.6.0/asn-one-0.6.0.jar" + }, + { + "url": "net/i2p/crypto/eddsa/0.3.0/eddsa-0.3.0.jar", + "hash": "4dda1120db856640dbec04140ed23242215a075fe127bdefa0dcfa29fb31267d", + "path": "net/i2p/crypto/eddsa/0.3.0/eddsa-0.3.0.jar" + }, + { + "url": "org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar", + "hash": "d3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0", + "path": "org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" + }, + { + "url": "one/util/streamex/0.8.1/streamex-0.8.1.jar", + "hash": "84dbfa4730565134504d65cdd823341c8b2ee655e2d1c5f004cf95bff0180655", + "path": "one/util/streamex/0.8.1/streamex-0.8.1.jar" + }, + { + "url": "org/testng/testng/7.7.0/testng-7.7.0.jar", + "hash": "7c686ba8696f8206473b1b78e7e4947191b2aa4891c57b184b44ad4e052d2c08", + "path": "org/testng/testng/7.7.0/testng-7.7.0.jar" + }, + { + "url": "com/beust/jcommander/1.82/jcommander-1.82.jar", + "hash": "deeac157c8de6822878d85d0c7bc8467a19cc8484d37788f7804f039dde280b1", + "path": "com/beust/jcommander/1.82/jcommander-1.82.jar" + }, + { + "url": "org/webjars/jquery/3.6.1/jquery-3.6.1.jar", + "hash": "da2381fbee4799631ba44d1f4d6487b886b22450c7fc85842c5fdfa03429b817", + "path": "org/webjars/jquery/3.6.1/jquery-3.6.1.jar" + }, + { + "url": "org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3.jar", + "hash": "b086cee8fd8183e240b4afcf54fe38ec33dd8eb0da414636e5bf7aa4d9856629", + "path": "org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3.jar" + }, + { + "url": "com/thoughtworks/xstream/xstream/1.4.20/xstream-1.4.20.jar", + "hash": "87df0f0be57c92037d0110fbb225a30b651702dc275653d285afcfef31bc2e81", + "path": "com/thoughtworks/xstream/xstream/1.4.20/xstream-1.4.20.jar" + }, + { + "url": "io/github/x-stream/mxparser/1.2.2/mxparser-1.2.2.jar", + "hash": "aeeee23a3303d811bca8790ea7f25b534314861c03cff36dafdcc2180969eb97", + "path": "io/github/x-stream/mxparser/1.2.2/mxparser-1.2.2.jar" + }, + { + "url": "xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar", + "hash": "34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63", + "path": "xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar" + }, + { + "url": "xerces/xercesImpl/2.12.2/xercesImpl-2.12.2.jar", + "hash": "6fc991829af1708d15aea50c66f0beadcd2cfeb6968e0b2f55c1b0909883fe16", + "path": "xerces/xercesImpl/2.12.2/xercesImpl-2.12.2.jar" + }, + { + "url": "org/apache/ws/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1.jar", + "hash": "36efda6efee96e83602c9ba246db19bf4c5e733324390d2fa8213417d6b681e7", + "path": "org/apache/ws/xmlrpc/xmlrpc/2.0.1/xmlrpc-2.0.1.jar" + }, + { + "url": "com/fasterxml/aalto-xml/1.3.2/aalto-xml-1.3.2.jar", + "hash": "dcf2d5f453056c3ce848caff4179021bfb83b5efb3a3d779433c5bd70976068b", + "path": "com/fasterxml/aalto-xml/1.3.2/aalto-xml-1.3.2.jar" + }, + { + "url": "org/codehaus/woodstox/stax2-api/4.2/stax2-api-4.2.jar", + "hash": "badf6081a0bb526fd2c01951dfefad91b6846b6dd0eb0048587e30d1dd334e68", + "path": "org/codehaus/woodstox/stax2-api/4.2/stax2-api-4.2.jar" + }, + { + "url": "com/android/tools/build/aapt2-proto/0.3.1/aapt2-proto-0.3.1.jar", + "hash": "a503219b89b0aaf7b7c6c9b3b17d69e655a6c619072b684a1ea4fbf1d7dc49da", + "path": "com/android/tools/build/aapt2-proto/0.3.1/aapt2-proto-0.3.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/proto/223.0.1.0/proto-223.0.1.0.jar", + "hash": "fc56d0846f53f85b3cb443f3bbf13405b3361ff48cb74ec03d226a7b55e1f90c", + "path": "org/jetbrains/intellij/deps/android/tools/base/proto/223.0.1.0/proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libstudio.android-test-plugin-host-device-info-proto/223.0.1.0/libstudio.android-test-plugin-host-device-info-proto-223.0.1.0.jar", + "hash": "b6e1c5f2f773dad73e0b9f3f774db4100d275e818b1a53c1358ec94f881ca605", + "path": "org/jetbrains/intellij/deps/android/tools/base/libstudio.android-test-plugin-host-device-info-proto/223.0.1.0/libstudio.android-test-plugin-host-device-info-proto-223.0.1.0.jar" + }, + { + "url": "com/jetbrains/fus/reporting/ap-validation/76/ap-validation-76.jar", + "hash": "3d2123e0a17edd77776f083d04b2465fdb30d07484be658db0304587bd54ba07", + "path": "com/jetbrains/fus/reporting/ap-validation/76/ap-validation-76.jar" + }, + { + "url": "com/jetbrains/fus/reporting/model/76/model-76.jar", + "hash": "2d931e26e6632f608a6dab0fb60d27fae075260bf4532bb6ba8828d81bd167b3", + "path": "com/jetbrains/fus/reporting/model/76/model-76.jar" + }, + { + "url": "org/ow2/asm/asm-analysis/9.3/asm-analysis-9.3.jar", + "hash": "37fd5392bb2cf4c15f202ffefd46d0e92bb34ff848c549f30d426a60d6b29495", + "path": "org/ow2/asm/asm-analysis/9.3/asm-analysis-9.3.jar" + }, + { + "url": "org/ow2/asm/asm-tree/9.3/asm-tree-9.3.jar", + "hash": "ae629c2609f39681ef8d140a42a23800464a94f2d23e36d8f25cd10d5e4caff4", + "path": "org/ow2/asm/asm-tree/9.3/asm-tree-9.3.jar" + }, + { + "url": "org/ow2/asm/asm/9.3/asm-9.3.jar", + "hash": "1263369b59e29c943918de11d6d6152e2ec6085ce63e5710516f8c67d368e4bc", + "path": "org/ow2/asm/asm/9.3/asm-9.3.jar" + }, + { + "url": "org/assertj/assertj-core/3.24.2/assertj-core-3.24.2.jar", + "hash": "df3d0b348f1fe806bdddcb10fa4ae63c6679e9888d4bc7055f09848517976aa3", + "path": "org/assertj/assertj-core/3.24.2/assertj-core-3.24.2.jar" + }, + { + "url": "net/bytebuddy/byte-buddy/1.12.21/byte-buddy-1.12.21.jar", + "hash": "f6f45c2237a7f132c16745ad2a52c4cdde58028b11ee80b09f0d422f4930d685", + "path": "net/bytebuddy/byte-buddy/1.12.21/byte-buddy-1.12.21.jar" + }, + { + "url": "org/assertj/assertj-swing/3.17.1/assertj-swing-3.17.1.jar", + "hash": "e36445438d72d83cc48015dcb3f14d9a97eaa42c4663a9826db2bb50e4c7713b", + "path": "org/assertj/assertj-swing/3.17.1/assertj-swing-3.17.1.jar" + }, + { + "url": "dk/brics/automaton/1.12-1/automaton-1.12-1.jar", + "hash": "d75c864362cb9fdb741809c2317a4dcfa7433c9043d773269b4a7b1b1c2234f9", + "path": "dk/brics/automaton/1.12-1/automaton-1.12-1.jar" + }, + { + "url": "com/android/tools/smali/smali-baksmali/3.0.0/smali-baksmali-3.0.0.jar", + "hash": "d74a3c71bc2cd5786a960a546221ad44abd05506067f1aa7ae50f041ff859e1e", + "path": "com/android/tools/smali/smali-baksmali/3.0.0/smali-baksmali-3.0.0.jar" + }, + { + "url": "com/android/tools/smali/smali-util/3.0.0/smali-util-3.0.0.jar", + "hash": "7008f8d3fb63920d044e7d1f387a0ccff6a7e328ff252a90554d7a0e4c7f8014", + "path": "com/android/tools/smali/smali-util/3.0.0/smali-util-3.0.0.jar" + }, + { + "url": "org/jetbrains/intellij/blockmap/1.0.7/blockmap-1.0.7.jar", + "hash": "7e3f98d3370551fea909ceb952e4797108a3a5ef67a1d7b5fb03a036eab24df9", + "path": "org/jetbrains/intellij/blockmap/1.0.7/blockmap-1.0.7.jar" + }, + { + "url": "org/bouncycastle/bcpg-jdk18on/1.73/bcpg-jdk18on-1.73.jar", + "hash": "dd6efbd826f0d3aed3a1193acf1d81dd6044c585b90ddf88adca4e1fb41a0984", + "path": "org/bouncycastle/bcpg-jdk18on/1.73/bcpg-jdk18on-1.73.jar" + }, + { + "url": "org/bouncycastle/bcpkix-jdk18on/1.73/bcpkix-jdk18on-1.73.jar", + "hash": "9487164ba018f2211fcc0f989d6f4ea25b7d48fc6031501c3c7e3a17b164d860", + "path": "org/bouncycastle/bcpkix-jdk18on/1.73/bcpkix-jdk18on-1.73.jar" + }, + { + "url": "org/bouncycastle/bcprov-jdk18on/1.73/bcprov-jdk18on-1.73.jar", + "hash": "ad3ae628f4459a8fecb5c1a142b5525ce5118817414f97efd92f5448a69180ff", + "path": "org/bouncycastle/bcprov-jdk18on/1.73/bcprov-jdk18on-1.73.jar" + }, + { + "url": "org/bouncycastle/bcutil-jdk18on/1.73/bcutil-jdk18on-1.73.jar", + "hash": "0b70292c36cfe08ac00a71f5cc5af4c412ceedbc8c0f0a22995dbacfaf25dd42", + "path": "org/bouncycastle/bcutil-jdk18on/1.73/bcutil-jdk18on-1.73.jar" + }, + { + "url": "com/github/ben-manes/caffeine/caffeine/3.1.6/caffeine-3.1.6.jar", + "hash": "0311f9d5d9750aa2a1c11cbdba5a5cb7fec91c8870d6f179f324b3f5295b87dd", + "path": "com/github/ben-manes/caffeine/caffeine/3.1.6/caffeine-3.1.6.jar" + }, + { + "url": "io/github/classgraph/classgraph/4.8.158/classgraph-4.8.158.jar", + "hash": "fb99167dc45bf34f9e40141069f68583a53104c45ffca410642255d1ca81343f", + "path": "io/github/classgraph/classgraph/4.8.158/classgraph-4.8.158.jar" + }, + { + "url": "com/github/spullara/cli-parser/cli-parser/1.1.6/cli-parser-1.1.6.jar", + "hash": "436143bc3b925a1af4d0b8c9c7c53ac5c937f0f7aa32e4d97a24ce0a301ede27", + "path": "com/github/spullara/cli-parser/cli-parser/1.1.6/cli-parser-1.1.6.jar" + }, + { + "url": "com/jetbrains/cloudconfig/cloudconfig/2.2.0/cloudconfig-2.2.0.jar", + "hash": "f2246f96f74545e025787f281a8bef2920601d55f7251d9d7a449744083e3265", + "path": "com/jetbrains/cloudconfig/cloudconfig/2.2.0/cloudconfig-2.2.0.jar" + }, + { + "url": "commons-cli/commons-cli/1.5.0/commons-cli-1.5.0.jar", + "hash": "bc8bb01fc0fad250385706e20f927ddcff6173f6339b387dc879237752567ac6", + "path": "commons-cli/commons-cli/1.5.0/commons-cli-1.5.0.jar" + }, + { + "url": "commons-codec/commons-codec/1.15/commons-codec-1.15.jar", + "hash": "b3e9f6d63a790109bf0d056611fbed1cf69055826defeb9894a71369d246ed63", + "path": "commons-codec/commons-codec/1.15/commons-codec-1.15.jar" + }, + { + "url": "commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar", + "hash": "eeeae917917144a68a741d4c0dff66aa5c5c5fd85593ff217bced3fc8ca783b8", + "path": "commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar" + }, + { + "url": "org/apache/commons/commons-compress/1.23.0/commons-compress-1.23.0.jar", + "hash": "c267f17160e9ef662b4d78b7f29dca7c82b15c5cff2cb6a9865ef4ab3dd5b787", + "path": "org/apache/commons/commons-compress/1.23.0/commons-compress-1.23.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/commons-imaging/1.0-RC-1/commons-imaging-1.0-RC-1.jar", + "hash": "ba1cb46e5494286940b016da372ae94a60d2dbc411b6dac5db1e40128725d501", + "path": "org/jetbrains/intellij/deps/commons-imaging/1.0-RC-1/commons-imaging-1.0-RC-1.jar" + }, + { + "url": "commons-io/commons-io/2.11.0/commons-io-2.11.0.jar", + "hash": "961b2f6d87dbacc5d54abf45ab7a6e2495f89b75598962d8c723cea9bc210908", + "path": "commons-io/commons-io/2.11.0/commons-io-2.11.0.jar" + }, + { + "url": "commons-lang/commons-lang/2.6/commons-lang-2.6.jar", + "hash": "50f11b09f877c294d56f24463f47d28f929cf5044f648661c0f0cfbae9a2f49c", + "path": "commons-lang/commons-lang/2.6/commons-lang-2.6.jar" + }, + { + "url": "org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar", + "hash": "d919d904486c037f8d193412da0c92e22a9fa24230b9d67a57855c5c31c7e94e", + "path": "org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar" + }, + { + "url": "commons-logging/commons-logging/1.2/commons-logging-1.2.jar", + "hash": "daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636", + "path": "commons-logging/commons-logging/1.2/commons-logging-1.2.jar" + }, + { + "url": "com/google/testing/compile/compile-testing/0.16/compile-testing-0.16.jar", + "hash": "55746fa706fb051a53f61d205eb66ee31e33ed1936d92b323c7001df18ad3acb", + "path": "com/google/testing/compile/compile-testing/0.16/compile-testing-0.16.jar" + }, + { + "url": "info/cukes/cucumber-core/1.2.4/cucumber-core-1.2.4.jar", + "hash": "424f81cb5ce84386bd310d572f8edd91723cde58abd52f65db5888e0b38eb8f5", + "path": "info/cukes/cucumber-core/1.2.4/cucumber-core-1.2.4.jar" + }, + { + "url": "info/cukes/gherkin/2.12.2/gherkin-2.12.2.jar", + "hash": "0a5ebc0506ab1e4a08af1ca150f797304ff53b953c5b1f6fcf1f81551d964aad", + "path": "info/cukes/gherkin/2.12.2/gherkin-2.12.2.jar" + }, + { + "url": "io/cucumber/cucumber-core/2.4.0/cucumber-core-2.4.0.jar", + "hash": "ac0f343d6fc0dca4c93f8b6a6266b3bf4cb4d61913b8a4cd2b3abf50025268cf", + "path": "io/cucumber/cucumber-core/2.4.0/cucumber-core-2.4.0.jar" + }, + { + "url": "info/cukes/cucumber-html/0.2.6/cucumber-html-0.2.6.jar", + "hash": "e2167e99bdb018576cce9cc0aad154ad995fe67a4b0c36c63344f743865f96e7", + "path": "info/cukes/cucumber-html/0.2.6/cucumber-html-0.2.6.jar" + }, + { + "url": "io/cucumber/cucumber-jvm-deps/1.0.6/cucumber-jvm-deps-1.0.6.jar", + "hash": "d1c2cc901dd702eb77a2258c0d1446e4a302d28da0d4b49cd11ff3d5929281fa", + "path": "io/cucumber/cucumber-jvm-deps/1.0.6/cucumber-jvm-deps-1.0.6.jar" + }, + { + "url": "io/cucumber/gherkin/5.0.0/gherkin-5.0.0.jar", + "hash": "e35cfa4a16204bf59fa167bb6d45be0717d6b7cfba1c30f156d8f21cde2f4065", + "path": "io/cucumber/gherkin/5.0.0/gherkin-5.0.0.jar" + }, + { + "url": "io/cucumber/tag-expressions/1.1.1/tag-expressions-1.1.1.jar", + "hash": "e5a0a71fb846752900c0e5a99aa13e5a1bbc3ec97e7faf26803648fa45215584", + "path": "io/cucumber/tag-expressions/1.1.1/tag-expressions-1.1.1.jar" + }, + { + "url": "info/cukes/cucumber-jvm-deps/1.0.5/cucumber-jvm-deps-1.0.5.jar", + "hash": "2a4e84a51defe9108579b3c0a86bb41e54f04e9042e83adf4348a974dcf1dee6", + "path": "info/cukes/cucumber-jvm-deps/1.0.5/cucumber-jvm-deps-1.0.5.jar" + }, + { + "url": "de/pdark/decentxml/1.4/decentxml-1.4.jar", + "hash": "fe671ff552a8d724710e37fdb224b19c9aaf16ed3ce8dc8bbc694788f79edd41", + "path": "de/pdark/decentxml/1.4/decentxml-1.4.jar" + }, + { + "url": "com/jetbrains/infra/download-pgp-verifier/1.0.2/download-pgp-verifier-1.0.2.jar", + "hash": "81110da550181e2f8d90c7161f71fb8e9f8777632e75c37fbed5fbf3a0feacb4", + "path": "com/jetbrains/infra/download-pgp-verifier/1.0.2/download-pgp-verifier-1.0.2.jar" + }, + { + "url": "org/easymock/easymock/4.3/easymock-4.3.jar", + "hash": "c230864c8b11636aaa6bb49eee00a4342d3e016d860b4f80b89068fd056d1404", + "path": "org/easymock/easymock/4.3/easymock-4.3.jar" + }, + { + "url": "org/ec4j/core/ec4j-core/0.3.0/ec4j-core-0.3.0.jar", + "hash": "cadef0207077074b11a12be442f89ab6cf93fbc2f848702d9371a9611414d558", + "path": "org/ec4j/core/ec4j-core/0.3.0/ec4j-core-0.3.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/emulator_java_proto/223.0.1.0/emulator_java_proto-223.0.1.0.jar", + "hash": "3638a1709a24d0a09956257ea10487b12c90dbaba478b2a06b02f1eafab5d467", + "path": "org/jetbrains/intellij/deps/android/tools/base/emulator_java_proto/223.0.1.0/emulator_java_proto-223.0.1.0.jar" + }, + { + "url": "nl/jqno/equalsverifier/equalsverifier/3.8.3/equalsverifier-3.8.3.jar", + "hash": "23d9184d69c939cfee78981b53e84a257bfd5e9e902c1c0af2cced97f16a2e85", + "path": "nl/jqno/equalsverifier/equalsverifier/3.8.3/equalsverifier-3.8.3.jar" + }, + { + "url": "com/google/errorprone/error_prone_annotations/2.16/error_prone_annotations-2.16.jar", + "hash": "2668536a354cda63d19885fcabdecd8d6298aec4260cdfdf34b722e964d60396", + "path": "com/google/errorprone/error_prone_annotations/2.16/error_prone_annotations-2.16.jar" + }, + { + "url": "org/jetbrains/intellij/deps/fastutil/intellij-deps-fastutil/8.5.11-18/intellij-deps-fastutil-8.5.11-18.jar", + "hash": "1d36e528b8fa8e878ec4bf28e7c6acc374a89336b96e9bed7ebf735b1787febd", + "path": "org/jetbrains/intellij/deps/fastutil/intellij-deps-fastutil/8.5.11-18/intellij-deps-fastutil-8.5.11-18.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8.jar", + "hash": "37d53454b3c704bea04d7b8388b6e4c6789a57152f63cee0c414b3dd730d3464", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/javacpp/1.5.8/javacpp-1.5.8.jar", + "hash": "27d5eaf8f4433f6404aae0ad34cdbbfac75174e244c11d38222e0d075af33863", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/javacpp/1.5.8/javacpp-1.5.8.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg-platform/5.1.2-1.5.8/ffmpeg-platform-5.1.2-1.5.8.jar", + "hash": "83b925c8dade91b7ae1e6a44f142266bdcc31b30a727cac2d75744cca784efcf", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg-platform/5.1.2-1.5.8/ffmpeg-platform-5.1.2-1.5.8.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8.jar", + "hash": "37d53454b3c704bea04d7b8388b6e4c6789a57152f63cee0c414b3dd730d3464", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8-linux-x86_64.jar", + "hash": "5761863f13760b5609ff85ce7780dcdb71c8b8256c1c6b817ece4e5c86ea7f5b", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8-linux-x86_64.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8-macosx-arm64.jar", + "hash": "64b7c4ccebe0475d0121717fa76218392a77b3c39da77f681d58c48689edddf4", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8-macosx-arm64.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8-macosx-x86_64.jar", + "hash": "85f1cb19db3c9c642aed219fed2954390fc368c489f0701b6966207fb3e5dd7c", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8-macosx-x86_64.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8-windows-x86_64.jar", + "hash": "ce354e994754311bb590ed38da0289cad55c68948b44d6b313cf32690246c40e", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/ffmpeg/5.1.2-1.5.8/ffmpeg-5.1.2-1.5.8-windows-x86_64.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/javacpp/1.5.8/javacpp-1.5.8.jar", + "hash": "27d5eaf8f4433f6404aae0ad34cdbbfac75174e244c11d38222e0d075af33863", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/javacpp/1.5.8/javacpp-1.5.8.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/javacpp/1.5.8/javacpp-1.5.8-linux-x86_64.jar", + "hash": "36b78057cdcc5fa0dc950e29271a58c0a6efc5573bd9bd2845b99cccbb3116a7", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/javacpp/1.5.8/javacpp-1.5.8-linux-x86_64.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/javacpp/1.5.8/javacpp-1.5.8-macosx-arm64.jar", + "hash": "c605748036b7158edca0128c3febce6bae7c4b297406563ebae2a0dcbc591261", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/javacpp/1.5.8/javacpp-1.5.8-macosx-arm64.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/javacpp/1.5.8/javacpp-1.5.8-macosx-x86_64.jar", + "hash": "6c4f0bf404787c5a374c573b2445d5d6d8ce620f7c9ef41b2c601d1fe3836d6a", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/javacpp/1.5.8/javacpp-1.5.8-macosx-x86_64.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/javacpp/1.5.8/javacpp-1.5.8-windows-x86_64.jar", + "hash": "1bb08194d76780cd885fbfd27ed24dfb1ca088ee0b7a8aea25a836cb1506eedc", + "path": "org/jetbrains/intellij/deps/android/tools/ffmpeg-bundle/javacpp/1.5.8/javacpp-1.5.8-windows-x86_64.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-all/0.64.0/flexmark-all-0.64.0.jar", + "hash": "6211a32328f27888527c4bfe7809ae9a56cb56008a6173459cee9a91bbad3139", + "path": "com/vladsch/flexmark/flexmark-all/0.64.0/flexmark-all-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark/0.64.0/flexmark-0.64.0.jar", + "hash": "2eaaa51313ee2f5dce1e04ddbf793496b790a8e5ffb9841d7f52a8520eb6b753", + "path": "com/vladsch/flexmark/flexmark/0.64.0/flexmark-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-abbreviation/0.64.0/flexmark-ext-abbreviation-0.64.0.jar", + "hash": "00a3a6b59343f71c04b0771a596684f970ad4b6b264875e68d60128fccaebb71", + "path": "com/vladsch/flexmark/flexmark-ext-abbreviation/0.64.0/flexmark-ext-abbreviation-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-util/0.64.0/flexmark-util-0.64.0.jar", + "hash": "29cb23d79b9099f6714377db8c7a3f0ca99cb6c73ec51549692072b6cf0c310b", + "path": "com/vladsch/flexmark/flexmark-util/0.64.0/flexmark-util-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-admonition/0.64.0/flexmark-ext-admonition-0.64.0.jar", + "hash": "2faf1daeee5f083080861360ec713da200827ba4e8a3a75d4986e25742a74a34", + "path": "com/vladsch/flexmark/flexmark-ext-admonition/0.64.0/flexmark-ext-admonition-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-anchorlink/0.64.0/flexmark-ext-anchorlink-0.64.0.jar", + "hash": "e8f949d6328c4aa6cb2682f4f41c18cc6ae46d9b9c793e6db1b6db68e136dfdc", + "path": "com/vladsch/flexmark/flexmark-ext-anchorlink/0.64.0/flexmark-ext-anchorlink-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-aside/0.64.0/flexmark-ext-aside-0.64.0.jar", + "hash": "30196af44231431e129292f51ff1a2871149eef834cc5bdddd5886e0b4c838ad", + "path": "com/vladsch/flexmark/flexmark-ext-aside/0.64.0/flexmark-ext-aside-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-attributes/0.64.0/flexmark-ext-attributes-0.64.0.jar", + "hash": "768dd44a59df0823d61e2d824403c83ccb85625519ffaa0acb07371f3cbb18cd", + "path": "com/vladsch/flexmark/flexmark-ext-attributes/0.64.0/flexmark-ext-attributes-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-autolink/0.64.0/flexmark-ext-autolink-0.64.0.jar", + "hash": "9f6e086420030922367bebaeef109bc6814ccdfff032a123a385c882a74a061e", + "path": "com/vladsch/flexmark/flexmark-ext-autolink/0.64.0/flexmark-ext-autolink-0.64.0.jar" + }, + { + "url": "org/nibor/autolink/autolink/0.6.0/autolink-0.6.0.jar", + "hash": "a80be030f6386f18111cad9161c0b6983157352a1b59a59e6002172f0d321c04", + "path": "org/nibor/autolink/autolink/0.6.0/autolink-0.6.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-definition/0.64.0/flexmark-ext-definition-0.64.0.jar", + "hash": "977629f9065b9a6d84c4cb065f206740cb4be9c112aa9ce369ba5e9103d99391", + "path": "com/vladsch/flexmark/flexmark-ext-definition/0.64.0/flexmark-ext-definition-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-emoji/0.64.0/flexmark-ext-emoji-0.64.0.jar", + "hash": "40bb90895ce19ceef5b1d9d4402c252cf44a1707454d9e617060ac3d81316702", + "path": "com/vladsch/flexmark/flexmark-ext-emoji/0.64.0/flexmark-ext-emoji-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-enumerated-reference/0.64.0/flexmark-ext-enumerated-reference-0.64.0.jar", + "hash": "1c25bdccea3f3bcb5f263cdb97e5b471e54d2d5c8130bf3d5daee221b3b52861", + "path": "com/vladsch/flexmark/flexmark-ext-enumerated-reference/0.64.0/flexmark-ext-enumerated-reference-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-escaped-character/0.64.0/flexmark-ext-escaped-character-0.64.0.jar", + "hash": "3ebdc04e6af19c0a98a4347817fb55d25dd9cec77a280e1aea59efdbce29921d", + "path": "com/vladsch/flexmark/flexmark-ext-escaped-character/0.64.0/flexmark-ext-escaped-character-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-footnotes/0.64.0/flexmark-ext-footnotes-0.64.0.jar", + "hash": "5308e869da67621d8b2252c192498d545c9c17427ef45603606248fb77744c71", + "path": "com/vladsch/flexmark/flexmark-ext-footnotes/0.64.0/flexmark-ext-footnotes-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-gfm-issues/0.64.0/flexmark-ext-gfm-issues-0.64.0.jar", + "hash": "7b2a6a4570966b9b651565b57c309f690144d93cb48eb03f02aacd58700dd92b", + "path": "com/vladsch/flexmark/flexmark-ext-gfm-issues/0.64.0/flexmark-ext-gfm-issues-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-gfm-strikethrough/0.64.0/flexmark-ext-gfm-strikethrough-0.64.0.jar", + "hash": "503a073ab4b1dbd2576497a597eb51f1361902fb7b294c605e898485ab91db2c", + "path": "com/vladsch/flexmark/flexmark-ext-gfm-strikethrough/0.64.0/flexmark-ext-gfm-strikethrough-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-gfm-tasklist/0.64.0/flexmark-ext-gfm-tasklist-0.64.0.jar", + "hash": "eb469f3b48b4f1b4cbfa127410d9c55120ca761eaa675a03210c6052b9bdcb99", + "path": "com/vladsch/flexmark/flexmark-ext-gfm-tasklist/0.64.0/flexmark-ext-gfm-tasklist-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-gfm-users/0.64.0/flexmark-ext-gfm-users-0.64.0.jar", + "hash": "43c52ebaf42d1852ced4605c5e8d53e1cdf5bc4a03753816aaebea0b23346fdf", + "path": "com/vladsch/flexmark/flexmark-ext-gfm-users/0.64.0/flexmark-ext-gfm-users-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-gitlab/0.64.0/flexmark-ext-gitlab-0.64.0.jar", + "hash": "d608dffefafd1c4cdb9cc7cba07be462f72e22c9b0fedc96fd578a42f1fc4e90", + "path": "com/vladsch/flexmark/flexmark-ext-gitlab/0.64.0/flexmark-ext-gitlab-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-jekyll-front-matter/0.64.0/flexmark-ext-jekyll-front-matter-0.64.0.jar", + "hash": "9205baa5c0851e6a4784aa20ea29aa75c1942c0e1b2448c5925a3769e0c3ad93", + "path": "com/vladsch/flexmark/flexmark-ext-jekyll-front-matter/0.64.0/flexmark-ext-jekyll-front-matter-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-jekyll-tag/0.64.0/flexmark-ext-jekyll-tag-0.64.0.jar", + "hash": "79209b1ca5cf7b1a9b9940aec061046f957ee661d72b89e2480aaec253cf7e60", + "path": "com/vladsch/flexmark/flexmark-ext-jekyll-tag/0.64.0/flexmark-ext-jekyll-tag-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-media-tags/0.64.0/flexmark-ext-media-tags-0.64.0.jar", + "hash": "81d563c08d793b10fa72f3001d97a4d8c9d474b17441e496f65e15e969c6faa4", + "path": "com/vladsch/flexmark/flexmark-ext-media-tags/0.64.0/flexmark-ext-media-tags-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-resizable-image/0.64.0/flexmark-ext-resizable-image-0.64.0.jar", + "hash": "85f569f477b98fd1fbb0c0b5705c7bc4e2ca0434a0a92a7ccd6ec8b2617456af", + "path": "com/vladsch/flexmark/flexmark-ext-resizable-image/0.64.0/flexmark-ext-resizable-image-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-macros/0.64.0/flexmark-ext-macros-0.64.0.jar", + "hash": "89b482f01fe4c05237d510117c69228c43e8896d1dd4d2fbea148eae04fe6713", + "path": "com/vladsch/flexmark/flexmark-ext-macros/0.64.0/flexmark-ext-macros-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-ins/0.64.0/flexmark-ext-ins-0.64.0.jar", + "hash": "357eff83842e0a38f64c3c9b3d07d10f88539d7360cfaccd922d5a6a8cbb3e4b", + "path": "com/vladsch/flexmark/flexmark-ext-ins/0.64.0/flexmark-ext-ins-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-xwiki-macros/0.64.0/flexmark-ext-xwiki-macros-0.64.0.jar", + "hash": "f602762ea5e695b624020c76b97be077932a324ec88babf01fd19b966dd0a750", + "path": "com/vladsch/flexmark/flexmark-ext-xwiki-macros/0.64.0/flexmark-ext-xwiki-macros-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-superscript/0.64.0/flexmark-ext-superscript-0.64.0.jar", + "hash": "66422167fd4651d11f79aee9ec4e42da89822d817e4574cfd2d333b6fb32833e", + "path": "com/vladsch/flexmark/flexmark-ext-superscript/0.64.0/flexmark-ext-superscript-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-tables/0.64.0/flexmark-ext-tables-0.64.0.jar", + "hash": "44ebd9975b9a9f6ca3639385012bfd0a25a7e44e81db7d72ceb0023c658cb013", + "path": "com/vladsch/flexmark/flexmark-ext-tables/0.64.0/flexmark-ext-tables-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-toc/0.64.0/flexmark-ext-toc-0.64.0.jar", + "hash": "7510fb997d81002e953d70579129fd3f492acbd5ea36b6363a29d1a2e26c12eb", + "path": "com/vladsch/flexmark/flexmark-ext-toc/0.64.0/flexmark-ext-toc-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-typographic/0.64.0/flexmark-ext-typographic-0.64.0.jar", + "hash": "49cd84ea5e07944e895951053272dd67c69a6f10af4a2a77fffea85b0b9289ea", + "path": "com/vladsch/flexmark/flexmark-ext-typographic/0.64.0/flexmark-ext-typographic-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-wikilink/0.64.0/flexmark-ext-wikilink-0.64.0.jar", + "hash": "6bd7d9d9d6e47f8a1df4b805afb0d0204fa68ec776d349c8d7b5f062a617e6f0", + "path": "com/vladsch/flexmark/flexmark-ext-wikilink/0.64.0/flexmark-ext-wikilink-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-yaml-front-matter/0.64.0/flexmark-ext-yaml-front-matter-0.64.0.jar", + "hash": "c34a9c0b128c75af842c31f92ba1750f355f3319505f36c428515192d9bc7a74", + "path": "com/vladsch/flexmark/flexmark-ext-yaml-front-matter/0.64.0/flexmark-ext-yaml-front-matter-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-ext-youtube-embedded/0.64.0/flexmark-ext-youtube-embedded-0.64.0.jar", + "hash": "a66d48a36afd5679cf722445f318cac25bd1ae67d74f5604473f83210f89386e", + "path": "com/vladsch/flexmark/flexmark-ext-youtube-embedded/0.64.0/flexmark-ext-youtube-embedded-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-html2md-converter/0.64.0/flexmark-html2md-converter-0.64.0.jar", + "hash": "8daa944ae51847913a5ed0e9746fa3c8dfa11379039a91b3f6bbc35f31b36114", + "path": "com/vladsch/flexmark/flexmark-html2md-converter/0.64.0/flexmark-html2md-converter-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-jira-converter/0.64.0/flexmark-jira-converter-0.64.0.jar", + "hash": "324edeb333d711e3b82a0975164eb35c5ab1f1f8bf084c0c4ed68d51a70402bb", + "path": "com/vladsch/flexmark/flexmark-jira-converter/0.64.0/flexmark-jira-converter-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-pdf-converter/0.64.0/flexmark-pdf-converter-0.64.0.jar", + "hash": "6b486b6a78717e768b3df56e91df30a7f9257f74366fd870afb204f3bc0970ac", + "path": "com/vladsch/flexmark/flexmark-pdf-converter/0.64.0/flexmark-pdf-converter-0.64.0.jar" + }, + { + "url": "com/openhtmltopdf/openhtmltopdf-core/1.0.10/openhtmltopdf-core-1.0.10.jar", + "hash": "3e6fd2250d833d500b7cd48b7a896700d0c33bd9f77a219e820493b01566eda3", + "path": "com/openhtmltopdf/openhtmltopdf-core/1.0.10/openhtmltopdf-core-1.0.10.jar" + }, + { + "url": "com/openhtmltopdf/openhtmltopdf-pdfbox/1.0.10/openhtmltopdf-pdfbox-1.0.10.jar", + "hash": "7de90df1b3ecf84e6f0daf808d724c11142007a2f22bff1936479bf17251d31a", + "path": "com/openhtmltopdf/openhtmltopdf-pdfbox/1.0.10/openhtmltopdf-pdfbox-1.0.10.jar" + }, + { + "url": "org/apache/pdfbox/pdfbox/2.0.24/pdfbox-2.0.24.jar", + "hash": "3c2c0553ec0e7533c490b4c952e1af113621de5275af6e380e11d0d9a0a4f3d6", + "path": "org/apache/pdfbox/pdfbox/2.0.24/pdfbox-2.0.24.jar" + }, + { + "url": "org/apache/pdfbox/fontbox/2.0.24/fontbox-2.0.24.jar", + "hash": "2e8c0a569a90b04734fbc0c805d77f4ec03f98c11f5705055ccd7718c1953d68", + "path": "org/apache/pdfbox/fontbox/2.0.24/fontbox-2.0.24.jar" + }, + { + "url": "org/apache/pdfbox/xmpbox/2.0.24/xmpbox-2.0.24.jar", + "hash": "27383df2285b9e228c39f2c755adeebbef774793d33c4f20f0dc99e9ebaaf673", + "path": "org/apache/pdfbox/xmpbox/2.0.24/xmpbox-2.0.24.jar" + }, + { + "url": "de/rototor/pdfbox/graphics2d/0.32/graphics2d-0.32.jar", + "hash": "37f8f387395f96c214ac44f7475c7a2e1f832dfc1de289a3610e0ffbf728f679", + "path": "de/rototor/pdfbox/graphics2d/0.32/graphics2d-0.32.jar" + }, + { + "url": "com/openhtmltopdf/openhtmltopdf-rtl-support/1.0.10/openhtmltopdf-rtl-support-1.0.10.jar", + "hash": "5675c0b56d613b15446f9d0922d89781af48f05331326a87bdb3d1775c703215", + "path": "com/openhtmltopdf/openhtmltopdf-rtl-support/1.0.10/openhtmltopdf-rtl-support-1.0.10.jar" + }, + { + "url": "com/openhtmltopdf/openhtmltopdf-jsoup-dom-converter/1.0.0/openhtmltopdf-jsoup-dom-converter-1.0.0.jar", + "hash": "eb7ba2f2d6a59479ae3f04e3b844c9efe5c7a5fb55579602b70232fcd351287b", + "path": "com/openhtmltopdf/openhtmltopdf-jsoup-dom-converter/1.0.0/openhtmltopdf-jsoup-dom-converter-1.0.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-profile-pegdown/0.64.0/flexmark-profile-pegdown-0.64.0.jar", + "hash": "cbeca04fd93dec035ff4b85deffa976a0a1f25b5c374ad482750b2b8682f211b", + "path": "com/vladsch/flexmark/flexmark-profile-pegdown/0.64.0/flexmark-profile-pegdown-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-util-ast/0.64.0/flexmark-util-ast-0.64.0.jar", + "hash": "d7ca1d1f027457a5fecd0b4e0dd360d888f4b335bed809c1046fa75466ae96dc", + "path": "com/vladsch/flexmark/flexmark-util-ast/0.64.0/flexmark-util-ast-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-util-builder/0.64.0/flexmark-util-builder-0.64.0.jar", + "hash": "2218cd239254472e73e98fc3f4ee82880419409816bbb5857956da7cc8ea70fe", + "path": "com/vladsch/flexmark/flexmark-util-builder/0.64.0/flexmark-util-builder-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-util-collection/0.64.0/flexmark-util-collection-0.64.0.jar", + "hash": "5f68e6da2785071000c9be8e1ea6968f306d8e1457370cc060e9ff7974e5f89f", + "path": "com/vladsch/flexmark/flexmark-util-collection/0.64.0/flexmark-util-collection-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-util-data/0.64.0/flexmark-util-data-0.64.0.jar", + "hash": "40613e94469e43d91d3a853f4c63f97e3e1be891cd64bed6e2a7f6338e7f6024", + "path": "com/vladsch/flexmark/flexmark-util-data/0.64.0/flexmark-util-data-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-util-dependency/0.64.0/flexmark-util-dependency-0.64.0.jar", + "hash": "94abc1de6ae49473c9397ead4344f55daaed39b3081943451178b789e5eb5650", + "path": "com/vladsch/flexmark/flexmark-util-dependency/0.64.0/flexmark-util-dependency-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-util-format/0.64.0/flexmark-util-format-0.64.0.jar", + "hash": "a4cd2efe840a133fe408a2bfabc92a21d84402d9af9e829e052a745102e8f28c", + "path": "com/vladsch/flexmark/flexmark-util-format/0.64.0/flexmark-util-format-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-util-html/0.64.0/flexmark-util-html-0.64.0.jar", + "hash": "ae188a5588e18b37256bbaa1b314731ffc07d691704124458465193081da53d7", + "path": "com/vladsch/flexmark/flexmark-util-html/0.64.0/flexmark-util-html-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-util-misc/0.64.0/flexmark-util-misc-0.64.0.jar", + "hash": "166fffb18e34b4ae80a1893aad10e1f7bed37a17a93abcef3d2e4177cd666e38", + "path": "com/vladsch/flexmark/flexmark-util-misc/0.64.0/flexmark-util-misc-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-util-options/0.64.0/flexmark-util-options-0.64.0.jar", + "hash": "64966403e3b865c7936eb63e7815a19a726b854e45b8173a8a13f7d01bb81b1d", + "path": "com/vladsch/flexmark/flexmark-util-options/0.64.0/flexmark-util-options-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-util-sequence/0.64.0/flexmark-util-sequence-0.64.0.jar", + "hash": "55d942bf79d27c1d351c6f54872c734153ccc8952a5dd5256b7cc716c9af875c", + "path": "com/vladsch/flexmark/flexmark-util-sequence/0.64.0/flexmark-util-sequence-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-util-visitor/0.64.0/flexmark-util-visitor-0.64.0.jar", + "hash": "cb6256b9565a89ed08648547657b0c9b9f28bf37c25c545e431ede10fb5cda35", + "path": "com/vladsch/flexmark/flexmark-util-visitor/0.64.0/flexmark-util-visitor-0.64.0.jar" + }, + { + "url": "com/vladsch/flexmark/flexmark-youtrack-converter/0.64.0/flexmark-youtrack-converter-0.64.0.jar", + "hash": "30ef9467bc9f9dd30b1f5cd9da5989aaf25f32a7bb1ab4ae3d944d391a2a1f9b", + "path": "com/vladsch/flexmark/flexmark-youtrack-converter/0.64.0/flexmark-youtrack-converter-0.64.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/ift/git-learning-project/212.0.2/git-learning-project-212.0.2.jar", + "hash": "648eaffe833416e2accea4bf82b980f0e91ae51ef065f5bc74fa3481c373e9fd", + "path": "org/jetbrains/intellij/deps/ift/git-learning-project/212.0.2/git-learning-project-212.0.2.jar" + }, + { + "url": "com/android/tools/smali/smali-dexlib2/3.0.0/smali-dexlib2-3.0.0.jar", + "hash": "9a0812a700e617f0d3aeec68aa085ff81fcd18a45597d41f862468dd1b53ae02", + "path": "com/android/tools/smali/smali-dexlib2/3.0.0/smali-dexlib2-3.0.0.jar" + }, + { + "url": "io/grpc/grpc-core/1.53.0/grpc-core-1.53.0.jar", + "hash": "0077b9ff9a3b1a6ba3fad2e559c821e8f5176981068a6923647c7486b598aa03", + "path": "io/grpc/grpc-core/1.53.0/grpc-core-1.53.0.jar" + }, + { + "url": "io/grpc/grpc-api/1.53.0/grpc-api-1.53.0.jar", + "hash": "a86967728b17b4edf3c02dbd5011b2e7e323c0b7dd1de899925ca06543467625", + "path": "io/grpc/grpc-api/1.53.0/grpc-api-1.53.0.jar" + }, + { + "url": "io/grpc/grpc-context/1.53.0/grpc-context-1.53.0.jar", + "hash": "2a6431b5e7bca085b5abd844e30f1270e070c1a179d06b2ea3f83d5f60cc251a", + "path": "io/grpc/grpc-context/1.53.0/grpc-context-1.53.0.jar" + }, + { + "url": "com/google/android/annotations/4.1.1.4/annotations-4.1.1.4.jar", + "hash": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15", + "path": "com/google/android/annotations/4.1.1.4/annotations-4.1.1.4.jar" + }, + { + "url": "org/codehaus/mojo/animal-sniffer-annotations/1.21/animal-sniffer-annotations-1.21.jar", + "hash": "2f25841c937e24959a57b630e2c4b8525b3d0f536f2e511c9b2bed30b1651d54", + "path": "org/codehaus/mojo/animal-sniffer-annotations/1.21/animal-sniffer-annotations-1.21.jar" + }, + { + "url": "io/perfmark/perfmark-api/0.25.0/perfmark-api-0.25.0.jar", + "hash": "2044542933fcdf40ad18441bec37646d150c491871157f288847e29cb81de4cb", + "path": "io/perfmark/perfmark-api/0.25.0/perfmark-api-0.25.0.jar" + }, + { + "url": "io/grpc/grpc-kotlin-stub/1.3.0/grpc-kotlin-stub-1.3.0.jar", + "hash": "7183d216466b6147cc08f46c6d80ec5764a26cdb2dea2202089ad0912ea74222", + "path": "io/grpc/grpc-kotlin-stub/1.3.0/grpc-kotlin-stub-1.3.0.jar" + }, + { + "url": "io/grpc/grpc-netty-shaded/1.53.0/grpc-netty-shaded-1.53.0.jar", + "hash": "516f3879970d5526af4651d220d2b776f370ecdeb0bd9f6badbe4be88692fea2", + "path": "io/grpc/grpc-netty-shaded/1.53.0/grpc-netty-shaded-1.53.0.jar" + }, + { + "url": "com/google/errorprone/error_prone_annotations/2.14.0/error_prone_annotations-2.14.0.jar", + "hash": "1494e24e7bd5496e7d6f705169dddd46081cefb882ea4fc60b4a58ca50767f34", + "path": "com/google/errorprone/error_prone_annotations/2.14.0/error_prone_annotations-2.14.0.jar" + }, + { + "url": "io/grpc/grpc-protobuf/1.53.0/grpc-protobuf-1.53.0.jar", + "hash": "eb3c2107f6a6397d9c09179e814e2c6ebc5ff901d67bbf76588e8ef5bb51ca05", + "path": "io/grpc/grpc-protobuf/1.53.0/grpc-protobuf-1.53.0.jar" + }, + { + "url": "com/google/api/grpc/proto-google-common-protos/2.9.0/proto-google-common-protos-2.9.0.jar", + "hash": "0d830380ec66bd7e25eee63aa0a5a08578e46ad187fb72d99b44d9ba22827f91", + "path": "com/google/api/grpc/proto-google-common-protos/2.9.0/proto-google-common-protos-2.9.0.jar" + }, + { + "url": "io/grpc/grpc-protobuf-lite/1.53.0/grpc-protobuf-lite-1.53.0.jar", + "hash": "0e0b234188894ae282f770f85f717f3a2376b5afb5f80c00d664de22fa6cdaa8", + "path": "io/grpc/grpc-protobuf-lite/1.53.0/grpc-protobuf-lite-1.53.0.jar" + }, + { + "url": "io/grpc/grpc-stub/1.53.0/grpc-stub-1.53.0.jar", + "hash": "f69f8819dd26266e0d8ef62a0f1473894fbdbab9ea459f977037dbc3bc9cf6e4", + "path": "io/grpc/grpc-stub/1.53.0/grpc-stub-1.53.0.jar" + }, + { + "url": "com/google/code/gson/gson/2.10.1/gson-2.10.1.jar", + "hash": "4241c14a7727c34feea6507ec801318a3d4a90f070e4525681079fb94ee4c593", + "path": "com/google/code/gson/gson/2.10.1/gson-2.10.1.jar" + }, + { + "url": "com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.jar", + "hash": "aadc71b10d5c3ac474dd16be84cfb18d257e584d1e0a59f8cab64ef4376226ce", + "path": "com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.jar" + }, + { + "url": "org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar", + "hash": "711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c", + "path": "org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar" + }, + { + "url": "com/dynatrace/hash4j/hash4j/0.9.0/hash4j-0.9.0.jar", + "hash": "d6aa5066620ebf8451cc1f80ccbe30f7c7612bc0084049dd5012159fd93d6670", + "path": "com/dynatrace/hash4j/hash4j/0.9.0/hash4j-0.9.0.jar" + }, + { + "url": "org/apache/httpcomponents/httpmime/4.5.14/httpmime-4.5.14.jar", + "hash": "d401243d5c6eae928a37121b6e819158c8c32ea0584793e7285bb489ab2a3d17", + "path": "org/apache/httpcomponents/httpmime/4.5.14/httpmime-4.5.14.jar" + }, + { + "url": "org/apache/httpcomponents/httpclient/4.5.14/httpclient-4.5.14.jar", + "hash": "c8bc7e1c51a6d4ce72f40d2ebbabf1c4b68bfe76e732104b04381b493478e9d6", + "path": "org/apache/httpcomponents/httpclient/4.5.14/httpclient-4.5.14.jar" + }, + { + "url": "org/apache/httpcomponents/httpcore/4.4.16/httpcore-4.4.16.jar", + "hash": "6c9b3dd142a09dc468e23ad39aad6f75a0f2b85125104469f026e52a474e464f", + "path": "org/apache/httpcomponents/httpcore/4.4.16/httpcore-4.4.16.jar" + }, + { + "url": "com/ibm/icu/icu4j/73.1/icu4j-73.1.jar", + "hash": "e51fda26a50667aa6e5e7c752301203867dc36bbf82cb9f8f1008aded3798a5e", + "path": "com/ibm/icu/icu4j/73.1/icu4j-73.1.jar" + }, + { + "url": "org/imgscalr/imgscalr-lib/4.2/imgscalr-lib-4.2.jar", + "hash": "6f128a71c5e87a16f810513a73ad3c77d0ee0bb622ee0ce1ead115bccbc76d0a", + "path": "org/imgscalr/imgscalr-lib/4.2/imgscalr-lib-4.2.jar" + }, + { + "url": "org/jetbrains/intellij/deps/ini4j/0.5.5-2/ini4j-0.5.5-2.jar", + "hash": "6d342a8599aed6e2871c638c87e2533647d6a32aec1e0feaa871133ae21517a4", + "path": "org/jetbrains/intellij/deps/ini4j/0.5.5-2/ini4j-0.5.5-2.jar" + }, + { + "url": "org/jetbrains/intellij/deps/intellij-coverage-agent/1.0.723/intellij-coverage-agent-1.0.723.jar", + "hash": "1aed2e845e76dc04612ffd45aa68ff21ca1131a1ae6ebe0957ef0d22c449a300", + "path": "org/jetbrains/intellij/deps/intellij-coverage-agent/1.0.723/intellij-coverage-agent-1.0.723.jar" + }, + { + "url": "org/jetbrains/intellij/deps/intellij-test-discovery-agent/1.0.723/intellij-test-discovery-agent-1.0.723.jar", + "hash": "2e12686a4a5938bd5697141c7bf8abd44da0a33509babf372a4e9b66cab10fd0", + "path": "org/jetbrains/intellij/deps/intellij-test-discovery-agent/1.0.723/intellij-test-discovery-agent-1.0.723.jar" + }, + { + "url": "org/jetbrains/intellij/deps/ion-java/1.8.2-4/ion-java-1.8.2-4.jar", + "hash": "d7e6ae22a82bf0c99bb3cfbf5090f112d94acf6bc5353c90414428f4b9b854d9", + "path": "org/jetbrains/intellij/deps/ion-java/1.8.2-4/ion-java-1.8.2-4.jar" + }, + { + "url": "com/fasterxml/jackson/core/jackson-core/2.15.0/jackson-core-2.15.0.jar", + "hash": "5b483f68fa9dd6aa37da37d1f79dd5c4b9464238f4f0660a242cb6b5c724950c", + "path": "com/fasterxml/jackson/core/jackson-core/2.15.0/jackson-core-2.15.0.jar" + }, + { + "url": "com/fasterxml/jackson/core/jackson-databind/2.15.0/jackson-databind-2.15.0.jar", + "hash": "00c5a5d5ae71ac8e8d5b8da606841e2251c806355939cb5d51c4cdc6b644a0dc", + "path": "com/fasterxml/jackson/core/jackson-databind/2.15.0/jackson-databind-2.15.0.jar" + }, + { + "url": "com/fasterxml/jackson/core/jackson-annotations/2.15.0/jackson-annotations-2.15.0.jar", + "hash": "91adcd3dcf5fd9a16499934e7536a23d456692a0093e3d4fd52f138c3936348c", + "path": "com/fasterxml/jackson/core/jackson-annotations/2.15.0/jackson-annotations-2.15.0.jar" + }, + { + "url": "com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.15.0/jackson-dataformat-yaml-2.15.0.jar", + "hash": "691a0a605de15ea610180317331957fe6f7e91f45471ee45cbf9832d74291c31", + "path": "com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.15.0/jackson-dataformat-yaml-2.15.0.jar" + }, + { + "url": "com/fasterxml/jackson/datatype/jackson-datatype-joda/2.15.0/jackson-datatype-joda-2.15.0.jar", + "hash": "294155c0a30238c2d5dd39d6802b33506b349065e2f55985e64d5beeb706e20b", + "path": "com/fasterxml/jackson/datatype/jackson-datatype-joda/2.15.0/jackson-datatype-joda-2.15.0.jar" + }, + { + "url": "joda-time/joda-time/2.10.14/joda-time-2.10.14.jar", + "hash": "d65b4f127d36cf52b9b7b439552db22f3de92b892014512870cb3c98a3cf505e", + "path": "joda-time/joda-time/2.10.14/joda-time-2.10.14.jar" + }, + { + "url": "com/fasterxml/jackson/jr/jackson-jr-objects/2.15.0/jackson-jr-objects-2.15.0.jar", + "hash": "a296cc5cba5aa3dbd8c7ce482c2a1f55ef181671cf27ccdfba2c5c3fb47da74a", + "path": "com/fasterxml/jackson/jr/jackson-jr-objects/2.15.0/jackson-jr-objects-2.15.0.jar" + }, + { + "url": "com/fasterxml/jackson/module/jackson-module-kotlin/2.15.0/jackson-module-kotlin-2.15.0.jar", + "hash": "a8f728e2b8da5cd679ed940138a684891a165c7fdd95aede85e95aa0a004cb1e", + "path": "com/fasterxml/jackson/module/jackson-module-kotlin/2.15.0/jackson-module-kotlin-2.15.0.jar" + }, + { + "url": "io/javaslang/javaslang/2.0.6/javaslang-2.0.6.jar", + "hash": "b92286634df04984ce524e659fcfc270632ff2997190c48a0f7d671c3300568e", + "path": "io/javaslang/javaslang/2.0.6/javaslang-2.0.6.jar" + }, + { + "url": "io/javaslang/javaslang-match/2.0.6/javaslang-match-2.0.6.jar", + "hash": "15a73eba2858834ad08ca2cd1c39b35b02940fd22a7d5a22de998b8b318d400b", + "path": "io/javaslang/javaslang-match/2.0.6/javaslang-match-2.0.6.jar" + }, + { + "url": "com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar", + "hash": "993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce", + "path": "com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar" + }, + { + "url": "javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar", + "hash": "e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b", + "path": "javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar", + "hash": "88b955a0df57880a26a74708bc34f74dcaf8ebf4e78843a28b50eae945732b06", + "path": "javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar" + }, + { + "url": "org/glassfish/jaxb/jaxb-runtime/2.3.1/jaxb-runtime-2.3.1.jar", + "hash": "45fecfa5c8217ce1f3652ab95179790ec8cc0dec0384bca51cbeb94a293d9f2f", + "path": "org/glassfish/jaxb/jaxb-runtime/2.3.1/jaxb-runtime-2.3.1.jar" + }, + { + "url": "org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.jar", + "hash": "34975dde1c6920f1a39791142235689bc3cd357e24d05edd8ff93b885bd68d60", + "path": "org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.jar" + }, + { + "url": "com/sun/istack/istack-commons-runtime/3.0.7/istack-commons-runtime-3.0.7.jar", + "hash": "6443e10ba2e259fb821d9b6becf10db5316285fc30c53cec9d7b19a3877e7fdf", + "path": "com/sun/istack/istack-commons-runtime/3.0.7/istack-commons-runtime-3.0.7.jar" + }, + { + "url": "org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.jar", + "hash": "95b05d9590af4154c6513b9c5dc1fb2e55b539972ba0a9ef28e9a0c01d83ad77", + "path": "org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.jar" + }, + { + "url": "com/sun/xml/fastinfoset/FastInfoset/1.2.15/FastInfoset-1.2.15.jar", + "hash": "785861db11ca1bd0d1956682b974ad73eb19cd3e01a4b3fa82d62eca97210aec", + "path": "com/sun/xml/fastinfoset/FastInfoset/1.2.15/FastInfoset-1.2.15.jar" + }, + { + "url": "org/jetbrains/intellij/deps/jb-jdi/2.26/jb-jdi-2.26.jar", + "hash": "b924a7f4bae430ca1a07fdb33cd96660033833d99b55bc987080b3babe0a7f13", + "path": "org/jetbrains/intellij/deps/jb-jdi/2.26/jb-jdi-2.26.jar" + }, + { + "url": "com/jetbrains/jbr-api/17.1.9.0/jbr-api-17.1.9.0.jar", + "hash": "e10be02f30a530ec6599d9570912b54d0e426b3c1ebd4902441d9d0b31785251", + "path": "com/jetbrains/jbr-api/17.1.9.0/jbr-api-17.1.9.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/jcef/jcef/111.2.1-g870da30-chromium-111.0.5563.64-api-1.12/jcef-111.2.1-g870da30-chromium-111.0.5563.64-api-1.12.jar", + "hash": "505a0f8e8ebdb4a05490eb542832ced74eb498d26e47de8309790be7e52c0aa1", + "path": "org/jetbrains/intellij/deps/jcef/jcef/111.2.1-g870da30-chromium-111.0.5563.64-api-1.12/jcef-111.2.1-g870da30-chromium-111.0.5563.64-api-1.12.jar" + }, + { + "url": "net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar", + "hash": "be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0", + "path": "net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar" + }, + { + "url": "org/jetbrains/jediterm/jediterm-core/3.23/jediterm-core-3.23.jar", + "hash": "8fc55c69a4d54fe6a25f851c59e39cbd776e5c3aa5d38dc5a7614dbe4d01e268", + "path": "org/jetbrains/jediterm/jediterm-core/3.23/jediterm-core-3.23.jar" + }, + { + "url": "org/jetbrains/jediterm/jediterm-ui/3.23/jediterm-ui-3.23.jar", + "hash": "b09e336f5ef493185e5c9bc6a03cdf8aee36bfa58d19f80d3e4f6b9783a1553e", + "path": "org/jetbrains/jediterm/jediterm-ui/3.23/jediterm-ui-3.23.jar" + }, + { + "url": "org/jetbrains/jetCheck/0.2.2/jetCheck-0.2.2.jar", + "hash": "c5f95c97171311066a13eb750a6bb999fa7eeb43c1394705034926336c0b7b0f", + "path": "org/jetbrains/jetCheck/0.2.2/jetCheck-0.2.2.jar" + }, + { + "url": "org/jetbrains/annotations/24.0.0/annotations-24.0.0.jar", + "hash": "ff112f54ce874b8ae899cfd68f0315d96c9f406a338b8eca80c76d10e2e5a2f7", + "path": "org/jetbrains/annotations/24.0.0/annotations-24.0.0.jar" + }, + { + "url": "org/jetbrains/annotations-java5/24.0.0/annotations-java5-24.0.0.jar", + "hash": "2d033590350f9e936a787bfa407ecae221a80220762c9cf56c0066ff5e52fd10", + "path": "org/jetbrains/annotations-java5/24.0.0/annotations-java5-24.0.0.jar" + }, + { + "url": "org/jetbrains/markdown-jvm/0.4.0/markdown-jvm-0.4.0.jar", + "hash": "b2e2430c91c0815d45e52dfd4d1e392d00cde9270cbb3ba865e5ba1b99c9899e", + "path": "org/jetbrains/markdown-jvm/0.4.0/markdown-jvm-0.4.0.jar" + }, + { + "url": "com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0.jar", + "hash": "efd986ec851c3a5cd57907e72f27d1af9c1e5b1874b07a8b778588646d71d9fc", + "path": "com/jgoodies/jgoodies-common/1.4.0/jgoodies-common-1.4.0.jar" + }, + { + "url": "com/jgoodies/forms/1.1-preview/forms-1.1-preview.jar", + "hash": "26b0fc745ea051b57462be22a150c7600dbac6716b24cc60a5ecc0e8085c41a0", + "path": "com/jgoodies/forms/1.1-preview/forms-1.1-preview.jar" + }, + { + "url": "com/google/jimfs/jimfs/1.1/jimfs-1.1.jar", + "hash": "c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd", + "path": "com/google/jimfs/jimfs/1.1/jimfs-1.1.jar" + }, + { + "url": "org/openjdk/jmh/jmh-core/1.36/jmh-core-1.36.jar", + "hash": "f90974e37d0da8886b5c05e6e3e7e20556900d747c5a41c1023b47c3301ea73c", + "path": "org/openjdk/jmh/jmh-core/1.36/jmh-core-1.36.jar" + }, + { + "url": "net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar", + "hash": "df26cc58f235f477db07f753ba5a3ab243ebe5789d9f89ecf68dd62ea9a66c28", + "path": "net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar" + }, + { + "url": "org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar", + "hash": "6268a9a0ea3e769fc493a21446664c0ef668e48c93d126791f6f3f757978fee2", + "path": "org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar" + }, + { + "url": "org/openjdk/jmh/jmh-generator-annprocess/1.36/jmh-generator-annprocess-1.36.jar", + "hash": "c2a88cf8be1eb0870732a7b2e669972efc7f33a145998f568096137f16b20d79", + "path": "org/openjdk/jmh/jmh-generator-annprocess/1.36/jmh-generator-annprocess-1.36.jar" + }, + { + "url": "org/jmock/jmock/2.5.1/jmock-2.5.1.jar", + "hash": "d96425f4bab28798162e59fffbe7e16ea6c2aab303ee8dfb0a2ec38a5a4e2f36", + "path": "org/jmock/jmock/2.5.1/jmock-2.5.1.jar" + }, + { + "url": "org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1.jar", + "hash": "c53b16b999d3b2f1aa273bf5c560273d23e1fa21ce493ba7cbf5243118386b88", + "path": "org/jmock/jmock-junit4/2.5.1/jmock-junit4-2.5.1.jar" + }, + { + "url": "org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar", + "hash": "0c8d23755cd08d23c3ea194773a08b2c322d2b70cc8c86ac02b424d8a50c9118", + "path": "org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar" + }, + { + "url": "net/java/dev/jna/jna-platform/5.12.1/jna-platform-5.12.1.jar", + "hash": "8ce969116cac95bd61b07a8d5e07174b352e63301473caac72c395e3c08488d2", + "path": "net/java/dev/jna/jna-platform/5.12.1/jna-platform-5.12.1.jar" + }, + { + "url": "net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar", + "hash": "91a814ac4f40d60dee91d842e1a8ad874c62197984403d0e3c30d39e55cf53b3", + "path": "net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar" + }, + { + "url": "org/jruby/joni/joni/2.1.48/joni-2.1.48.jar", + "hash": "41cb16ce177877aae3d98aa2024486973702b66306024c683d89819ee978a529", + "path": "org/jruby/joni/joni/2.1.48/joni-2.1.48.jar" + }, + { + "url": "org/jruby/jcodings/jcodings/1.0.58/jcodings-1.0.58.jar", + "hash": "e2f85def67d6848a7a41c648248645689e3990d17ab8f253ab2fd7e69407df67", + "path": "org/jruby/jcodings/jcodings/1.0.58/jcodings-1.0.58.jar" + }, + { + "url": "org/jetbrains/jps/jps-javac-extension/7/jps-javac-extension-7.jar", + "hash": "742fc253d719293c2188adc7ec3dfc3fc6562dea06258ec8b345d23d0d6c24ad", + "path": "org/jetbrains/jps/jps-javac-extension/7/jps-javac-extension-7.jar" + }, + { + "url": "com/jcraft/jsch.agentproxy.connector-factory/0.0.9/jsch.agentproxy.connector-factory-0.0.9.jar", + "hash": "30fffe206fc598b464b255ae0300b1088fb9b47501e0266831c0167d36639884", + "path": "com/jcraft/jsch.agentproxy.connector-factory/0.0.9/jsch.agentproxy.connector-factory-0.0.9.jar" + }, + { + "url": "com/jcraft/jsch.agentproxy.core/0.0.9/jsch.agentproxy.core-0.0.9.jar", + "hash": "0ccda6cd8ec515bee1fef22d7737b52ac52d1c64c075d4d988136b60125a1eff", + "path": "com/jcraft/jsch.agentproxy.core/0.0.9/jsch.agentproxy.core-0.0.9.jar" + }, + { + "url": "com/jcraft/jsch.agentproxy.usocket-jna/0.0.9/jsch.agentproxy.usocket-jna-0.0.9.jar", + "hash": "a5a0f8d3c1c5fb2df2abc4cb68d79b38e71fb37fc2a84d898d2f775150f43a5f", + "path": "com/jcraft/jsch.agentproxy.usocket-jna/0.0.9/jsch.agentproxy.usocket-jna-0.0.9.jar" + }, + { + "url": "com/jcraft/jsch.agentproxy.usocket-nc/0.0.9/jsch.agentproxy.usocket-nc-0.0.9.jar", + "hash": "eab73aaf832a88c39c7e86559cacc6e7938948ce6f8e8c0e44811ef062ac9e63", + "path": "com/jcraft/jsch.agentproxy.usocket-nc/0.0.9/jsch.agentproxy.usocket-nc-0.0.9.jar" + }, + { + "url": "com/jcraft/jsch.agentproxy.sshagent/0.0.9/jsch.agentproxy.sshagent-0.0.9.jar", + "hash": "10a27a381f10b5efc33acd4f4200dda9fc9e70d304c8aad52e713064ee6f4655", + "path": "com/jcraft/jsch.agentproxy.sshagent/0.0.9/jsch.agentproxy.sshagent-0.0.9.jar" + }, + { + "url": "com/jcraft/jsch.agentproxy.pageant/0.0.9/jsch.agentproxy.pageant-0.0.9.jar", + "hash": "737ad86ce82b56152f4f463fc00fb5b4b1dab9dab095e356bcc488c49cfc32a8", + "path": "com/jcraft/jsch.agentproxy.pageant/0.0.9/jsch.agentproxy.pageant-0.0.9.jar" + }, + { + "url": "com/jcraft/jsch.agentproxy.sshj/0.0.9/jsch.agentproxy.sshj-0.0.9.jar", + "hash": "9a513fbf41d640df36a105e2e50e0ac6f99a9adf04ed4c72db55dfd93da8ef36", + "path": "com/jcraft/jsch.agentproxy.sshj/0.0.9/jsch.agentproxy.sshj-0.0.9.jar" + }, + { + "url": "com/networknt/json-schema-validator/1.0.72/json-schema-validator-1.0.72.jar", + "hash": "260647c459cc7de269b2a8f576e5693e434df888fd4801e92365fe18b9992cbc", + "path": "com/networknt/json-schema-validator/1.0.72/json-schema-validator-1.0.72.jar" + }, + { + "url": "com/jayway/jsonpath/json-path/2.8.0/json-path-2.8.0.jar", + "hash": "9601707e95cd79fb98570a01ea8cfb857b5cde948744d6e0edf733c11002c95b", + "path": "com/jayway/jsonpath/json-path/2.8.0/json-path-2.8.0.jar" + }, + { + "url": "net/minidev/json-smart/2.4.10/json-smart-2.4.10.jar", + "hash": "70cab5e9488630dc631b1fc6e7fa550d95cddd19ba14db39ceca7cabfbd4e5ae", + "path": "net/minidev/json-smart/2.4.10/json-smart-2.4.10.jar" + }, + { + "url": "net/minidev/accessors-smart/2.4.9/accessors-smart-2.4.9.jar", + "hash": "accdd5c7ac4c49b155890aaea1ffca2a9ccd5826b562dd95a99fc1887003e031", + "path": "net/minidev/accessors-smart/2.4.9/accessors-smart-2.4.9.jar" + }, + { + "url": "org/jsoup/jsoup/1.16.1/jsoup-1.16.1.jar", + "hash": "1f115726540ddf71958c14bc517ebfc49cf481e91cd917b0face84f01272e901", + "path": "org/jsoup/jsoup/1.16.1/jsoup-1.16.1.jar" + }, + { + "url": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar", + "hash": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + "path": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" + }, + { + "url": "com/github/weisj/jsvg/0.1.0-jb.18/jsvg-0.1.0-jb.18.jar", + "hash": "9e38c63bab0821e88030db0c9e0f56f90668651a1bd85f10984bf31cfd28b467", + "path": "com/github/weisj/jsvg/0.1.0-jb.18/jsvg-0.1.0-jb.18.jar" + }, + { + "url": "org/jetbrains/nativecerts/jvm-native-trusted-roots/1.0.21/jvm-native-trusted-roots-1.0.21.jar", + "hash": "9501d16ed256fa0db804e54e4d46732f1dceceae37f8590bec51032d3415496f", + "path": "org/jetbrains/nativecerts/jvm-native-trusted-roots/1.0.21/jvm-native-trusted-roots-1.0.21.jar" + }, + { + "url": "com/jcraft/jzlib/1.1.3/jzlib-1.1.3.jar", + "hash": "89b1360f407381bf61fde411019d8cbd009ebb10cff715f3669017a031027560", + "path": "com/jcraft/jzlib/1.1.3/jzlib-1.1.3.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.8.20-dev-5742/kotlin-gradle-plugin-idea-1.8.20-dev-5742.jar", + "hash": "49c2a0c474dea959fb797c06cbdb6f049d0ef592c8f8256e74b2d38b93bab5e0", + "path": "org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.8.20-dev-5742/kotlin-gradle-plugin-idea-1.8.20-dev-5742.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-gradle-plugin-idea-proto/1.8.20-dev-5742/kotlin-gradle-plugin-idea-proto-1.8.20-dev-5742.jar", + "hash": "911f4da2a752a559acf63d96ea2d1a3bdf5e5a175c4fecc69d79cca2d303c62d", + "path": "org/jetbrains/kotlin/kotlin-gradle-plugin-idea-proto/1.8.20-dev-5742/kotlin-gradle-plugin-idea-proto-1.8.20-dev-5742.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-project-model/1.6.0/kotlin-project-model-1.6.0.jar", + "hash": "38135d3f995fc505d604aed2e82ac5ba858b2a6a3e476899c3b8be47fd222b68", + "path": "org/jetbrains/kotlin/kotlin-project-model/1.6.0/kotlin-project-model-1.6.0.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-reflect/1.8.20/kotlin-reflect-1.8.20.jar", + "hash": "531e3c3f9b0c45f9a21f1642174453066a1066bec0190254a6331b331814ab8b", + "path": "org/jetbrains/kotlin/kotlin-reflect/1.8.20/kotlin-reflect-1.8.20.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-script-runtime/1.8.20/kotlin-script-runtime-1.8.20.jar", + "hash": "4bddc06cad20bb843fbd24094b1dc3c31f55508c6918885e8b548f2ebaa8a93e", + "path": "org/jetbrains/kotlin/kotlin-script-runtime/1.8.20/kotlin-script-runtime-1.8.20.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-stdlib/1.8.20/kotlin-stdlib-1.8.20.jar", + "hash": "4395647b1961d9fb730a34e8dbe56c293157bc0759004cca63d9b5ee6653e5c7", + "path": "org/jetbrains/kotlin/kotlin-stdlib/1.8.20/kotlin-stdlib-1.8.20.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-stdlib-common/1.8.20/kotlin-stdlib-common-1.8.20.jar", + "hash": "fa20188abaa8ecf1d0035e93a969b071f10e45a1c8378c314521eade73f75fd5", + "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.8.20/kotlin-stdlib-common-1.8.20.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-test/1.8.20/kotlin-test-1.8.20.jar", + "hash": "bf0f686171c7587c564478c504a58f9c03bac48c29824688328da9ae8fe5caa1", + "path": "org/jetbrains/kotlin/kotlin-test/1.8.20/kotlin-test-1.8.20.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-test-junit/1.8.20/kotlin-test-junit-1.8.20.jar", + "hash": "ff6b34d504322539d36bea362f7e542e25c5e0770e9f27125b129df430270f0e", + "path": "org/jetbrains/kotlin/kotlin-test-junit/1.8.20/kotlin-test-junit-1.8.20.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-tooling-core/1.8.20-dev-5742/kotlin-tooling-core-1.8.20-dev-5742.jar", + "hash": "7a412677e73a59588cdad4cb9c7f8e3bb70bae5db66933b4b3f3ece0071b4cad", + "path": "org/jetbrains/kotlin/kotlin-tooling-core/1.8.20-dev-5742/kotlin-tooling-core-1.8.20-dev-5742.jar" + }, + { + "url": "org/jetbrains/kotlin/allopen-compiler-plugin-for-ide/1.9.20-dev-5606/allopen-compiler-plugin-for-ide-1.9.20-dev-5606.jar", + "hash": "ddf72df178668a0deab4460fcfd64642f823b9834b8a88102a7bf4145eca0efe", + "path": "org/jetbrains/kotlin/allopen-compiler-plugin-for-ide/1.9.20-dev-5606/allopen-compiler-plugin-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/analysis-api-providers-for-ide/1.9.20-dev-5606/analysis-api-providers-for-ide-1.9.20-dev-5606.jar", + "hash": "fa57d9e567d17165c2c891cdf69e38f3714eb74049977d4a3d4acedf50b05f64", + "path": "org/jetbrains/kotlin/analysis-api-providers-for-ide/1.9.20-dev-5606/analysis-api-providers-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/analysis-project-structure-for-ide/1.9.20-dev-5606/analysis-project-structure-for-ide-1.9.20-dev-5606.jar", + "hash": "c495bead969c9e0826a25767cd727c58eae35614a695e9458f37916164c2a9ce", + "path": "org/jetbrains/kotlin/analysis-project-structure-for-ide/1.9.20-dev-5606/analysis-project-structure-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/android-extensions-compiler-plugin-for-ide/1.9.20-dev-5606/android-extensions-compiler-plugin-for-ide-1.9.20-dev-5606.jar", + "hash": "a6d474e5abff0109173ea02dc7a27e6ffe89d4d66976a6a5eff602e60df98b9f", + "path": "org/jetbrains/kotlin/android-extensions-compiler-plugin-for-ide/1.9.20-dev-5606/android-extensions-compiler-plugin-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/assignment-compiler-plugin-for-ide/1.9.20-dev-5606/assignment-compiler-plugin-for-ide-1.9.20-dev-5606.jar", + "hash": "8eda4da851b83c3ed0c2ffaa3c62195a32dc34af49668299d09dd395a976745b", + "path": "org/jetbrains/kotlin/assignment-compiler-plugin-for-ide/1.9.20-dev-5606/assignment-compiler-plugin-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/high-level-api-for-ide/1.9.20-dev-5606/high-level-api-for-ide-1.9.20-dev-5606.jar", + "hash": "952fbe203d43801734a47ef61c05e43f5677393f38df50c9974245aaf6ed3148", + "path": "org/jetbrains/kotlin/high-level-api-for-ide/1.9.20-dev-5606/high-level-api-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/high-level-api-fe10-for-ide/1.9.20-dev-5606/high-level-api-fe10-for-ide-1.9.20-dev-5606.jar", + "hash": "88f611387d55f8236e8a0e7e569de0e8ccb916d121bfa54741051b997e51d661", + "path": "org/jetbrains/kotlin/high-level-api-fe10-for-ide/1.9.20-dev-5606/high-level-api-fe10-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/high-level-api-fir-for-ide/1.9.20-dev-5606/high-level-api-fir-for-ide-1.9.20-dev-5606.jar", + "hash": "bcab142658d2fb514c7a5c3cbc25d84fc4cd91c81316b77fa34b51313ecf492b", + "path": "org/jetbrains/kotlin/high-level-api-fir-for-ide/1.9.20-dev-5606/high-level-api-fir-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/high-level-api-fir-tests-for-ide/1.9.20-dev-5606/high-level-api-fir-tests-for-ide-1.9.20-dev-5606.jar", + "hash": "fca3bcb84b84cdc1d9fff61e6fa0aac00657b52516b65d41cc0cc65a9f5c382e", + "path": "org/jetbrains/kotlin/high-level-api-fir-tests-for-ide/1.9.20-dev-5606/high-level-api-fir-tests-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/high-level-api-impl-base-for-ide/1.9.20-dev-5606/high-level-api-impl-base-for-ide-1.9.20-dev-5606.jar", + "hash": "126dccc25c976acb54d2d052cfda15de35db633431cee0ef8dbac2caa6f5fe1e", + "path": "org/jetbrains/kotlin/high-level-api-impl-base-for-ide/1.9.20-dev-5606/high-level-api-impl-base-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/high-level-api-impl-base-tests-for-ide/1.9.20-dev-5606/high-level-api-impl-base-tests-for-ide-1.9.20-dev-5606.jar", + "hash": "5f710036f929be799aff56152822b1aebb81a58143c1322e68a80a67066b98ff", + "path": "org/jetbrains/kotlin/high-level-api-impl-base-tests-for-ide/1.9.20-dev-5606/high-level-api-impl-base-tests-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/incremental-compilation-impl-tests-for-ide/1.9.20-dev-5606/incremental-compilation-impl-tests-for-ide-1.9.20-dev-5606.jar", + "hash": "d32d4db10d151501a9608c0fe577643ee5a0fddb212c11b9922355b9a81655d7", + "path": "org/jetbrains/kotlin/incremental-compilation-impl-tests-for-ide/1.9.20-dev-5606/incremental-compilation-impl-tests-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-build-common-tests-for-ide/1.9.20-dev-5606/kotlin-build-common-tests-for-ide-1.9.20-dev-5606.jar", + "hash": "8b3ed5f34fea8b6b2716c381f9b2294ad793b5796c98bc595a533067c96d2b24", + "path": "org/jetbrains/kotlin/kotlin-build-common-tests-for-ide/1.9.20-dev-5606/kotlin-build-common-tests-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-compiler-cli-for-ide/1.9.20-dev-5606/kotlin-compiler-cli-for-ide-1.9.20-dev-5606.jar", + "hash": "775c510a7d79e2237fa3798a5cccc3befc71355d7bdbf44e24965fb939f86e94", + "path": "org/jetbrains/kotlin/kotlin-compiler-cli-for-ide/1.9.20-dev-5606/kotlin-compiler-cli-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-compiler-common-for-ide/1.9.20-dev-5606/kotlin-compiler-common-for-ide-1.9.20-dev-5606.jar", + "hash": "d0e5e3f968385e15cf3ca507295cf9eabb4e409f4b3b847d496cc47db9963064", + "path": "org/jetbrains/kotlin/kotlin-compiler-common-for-ide/1.9.20-dev-5606/kotlin-compiler-common-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/1.9.20-dev-5606/kotlin-compiler-fe10-for-ide-1.9.20-dev-5606.jar", + "hash": "85b830c0a539edcb602690babcf979cefb89045293ef67de039f68ae0fc5bb47", + "path": "org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/1.9.20-dev-5606/kotlin-compiler-fe10-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-compiler-fir-for-ide/1.9.20-dev-5606/kotlin-compiler-fir-for-ide-1.9.20-dev-5606.jar", + "hash": "c8b836a1adfd29156b53610c160acff4be604ca5cc07f5c1eb0aca57395658f6", + "path": "org/jetbrains/kotlin/kotlin-compiler-fir-for-ide/1.9.20-dev-5606/kotlin-compiler-fir-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-compiler-ir-for-ide/1.9.20-dev-5606/kotlin-compiler-ir-for-ide-1.9.20-dev-5606.jar", + "hash": "c06444b222520bbbbab4daa06e60759054919368b6ebad89d5ce8a3ee65a8d3c", + "path": "org/jetbrains/kotlin/kotlin-compiler-ir-for-ide/1.9.20-dev-5606/kotlin-compiler-ir-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-compiler-tests-for-ide/1.9.20-dev-5606/kotlin-compiler-tests-for-ide-1.9.20-dev-5606.jar", + "hash": "abed2e2b61f2c147a4a4f20c0bade5e3c141154dd28aa79eced013d5b6d9da2b", + "path": "org/jetbrains/kotlin/kotlin-compiler-tests-for-ide/1.9.20-dev-5606/kotlin-compiler-tests-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-dist-for-ide/1.9.0-release-358/kotlin-dist-for-ide-1.9.0-release-358.jar", + "hash": "1b85efa55643f31e348f8388484af2cf3623023c020cb1b6416667f25111e6d2", + "path": "org/jetbrains/kotlin/kotlin-dist-for-ide/1.9.0-release-358/kotlin-dist-for-ide-1.9.0-release-358.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-gradle-statistics-for-ide/1.9.20-dev-5606/kotlin-gradle-statistics-for-ide-1.9.20-dev-5606.jar", + "hash": "ef0252705e16616de7416052b549a3751776a4afd612f2dfd2aa8b5013c9a75d", + "path": "org/jetbrains/kotlin/kotlin-gradle-statistics-for-ide/1.9.20-dev-5606/kotlin-gradle-statistics-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-jps-common-for-ide/1.9.20-dev-5606/kotlin-jps-common-for-ide-1.9.20-dev-5606.jar", + "hash": "195ffda17a5d7a4f732a9714dc09f65de8ef1fac6875774caa3cdc3f5d993b44", + "path": "org/jetbrains/kotlin/kotlin-jps-common-for-ide/1.9.20-dev-5606/kotlin-jps-common-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.9.0-release-358/kotlin-jps-plugin-classpath-1.9.0-release-358.jar", + "hash": "e3912443ef09b3f930685cf8e9322f28547f0ef3c63b97078c9766306d2dc438", + "path": "org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.9.0-release-358/kotlin-jps-plugin-classpath-1.9.0-release-358.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.9.0-release-358/kotlin-jps-plugin-tests-for-ide-1.9.0-release-358.jar", + "hash": "0e570634d9d6358b6a48dcb47ea626eda4c40245c0e6a1023c7e6ab0b2e0f8ca", + "path": "org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.9.0-release-358/kotlin-jps-plugin-tests-for-ide-1.9.0-release-358.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-script-runtime/1.9.20-dev-5606/kotlin-script-runtime-1.9.20-dev-5606.jar", + "hash": "98a629b8f67ae72e46e5356198ed1cd7c46ef51144e0f085fb911aa50e9338fe", + "path": "org/jetbrains/kotlin/kotlin-script-runtime/1.9.20-dev-5606/kotlin-script-runtime-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-scripting-common/1.9.20-dev-5606/kotlin-scripting-common-1.9.20-dev-5606.jar", + "hash": "dc660c8ecd858668c8b431fcef58578f0ee60d03dafcb540397ef1002f15809c", + "path": "org/jetbrains/kotlin/kotlin-scripting-common/1.9.20-dev-5606/kotlin-scripting-common-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.9.20-dev-5606/kotlin-scripting-compiler-impl-1.9.20-dev-5606.jar", + "hash": "444594ec2b8b21c9d2202930ae4be55d3ac5a99645e1994a315bf5ccaa67816d", + "path": "org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.9.20-dev-5606/kotlin-scripting-compiler-impl-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-scripting-jvm/1.9.20-dev-5606/kotlin-scripting-jvm-1.9.20-dev-5606.jar", + "hash": "62f3538d12ec908cdd6446de3ca47ea0e008d0a769f3776f4fd078bc15be0e20", + "path": "org/jetbrains/kotlin/kotlin-scripting-jvm/1.9.20-dev-5606/kotlin-scripting-jvm-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.20-dev-5606/kotlin-stdlib-jdk8-1.9.20-dev-5606.jar", + "hash": "4314b1f0d409a7b756c6ed569c1ce58ae58363fb63d3232c43a18b575e854340", + "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.20-dev-5606/kotlin-stdlib-jdk8-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-stdlib/1.9.20-dev-5606/kotlin-stdlib-1.9.20-dev-5606.jar", + "hash": "3788177db47c19025b42952d129f58938ad9a9171a369a55adce822c3f53b3ef", + "path": "org/jetbrains/kotlin/kotlin-stdlib/1.9.20-dev-5606/kotlin-stdlib-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-stdlib-common/1.9.20-dev-5606/kotlin-stdlib-common-1.9.20-dev-5606.jar", + "hash": "f84d3c2c1435ec7fdfb2ef97f4ed7f2e7e54498a9d46949caa85ef9b71c2a438", + "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.9.20-dev-5606/kotlin-stdlib-common-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.20-dev-5606/kotlin-stdlib-jdk7-1.9.20-dev-5606.jar", + "hash": "bef10bdb1b53d6a20e0b87a1b61a54984296021d13cd4405f68133ed7c175b34", + "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.20-dev-5606/kotlin-stdlib-jdk7-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-stdlib-minimal-for-test-for-ide/1.9.20-dev-5606/kotlin-stdlib-minimal-for-test-for-ide-1.9.20-dev-5606.jar", + "hash": "5bcc880fc12c04486727b1898ed609eff8aabafb2b243dfa8d437d72cd6a7629", + "path": "org/jetbrains/kotlin/kotlin-stdlib-minimal-for-test-for-ide/1.9.20-dev-5606/kotlin-stdlib-minimal-for-test-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlinx-serialization-compiler-plugin-for-ide/1.9.20-dev-5606/kotlinx-serialization-compiler-plugin-for-ide-1.9.20-dev-5606.jar", + "hash": "ee92e2d19740249f8d84a704634c350c60e3137a9ba4cfb789296aeb6d70e1b3", + "path": "org/jetbrains/kotlin/kotlinx-serialization-compiler-plugin-for-ide/1.9.20-dev-5606/kotlinx-serialization-compiler-plugin-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/lombok-compiler-plugin-for-ide/1.9.20-dev-5606/lombok-compiler-plugin-for-ide-1.9.20-dev-5606.jar", + "hash": "2a70f03e95819dff996ca48911bda9bcf2a46e9181b0a03382dc9856bac79e3d", + "path": "org/jetbrains/kotlin/lombok-compiler-plugin-for-ide/1.9.20-dev-5606/lombok-compiler-plugin-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/low-level-api-fir-for-ide/1.9.20-dev-5606/low-level-api-fir-for-ide-1.9.20-dev-5606.jar", + "hash": "787bbf883555e6497686b6d23285dfe9cac704080e997fc3aaf383f3cc46f97a", + "path": "org/jetbrains/kotlin/low-level-api-fir-for-ide/1.9.20-dev-5606/low-level-api-fir-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/noarg-compiler-plugin-for-ide/1.9.20-dev-5606/noarg-compiler-plugin-for-ide-1.9.20-dev-5606.jar", + "hash": "b1ad2c83a8504d0fe4b4827ed45c1f99c2eb2249d2ed05a7cde10a1d698ecdf4", + "path": "org/jetbrains/kotlin/noarg-compiler-plugin-for-ide/1.9.20-dev-5606/noarg-compiler-plugin-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/parcelize-compiler-plugin-for-ide/1.9.20-dev-5606/parcelize-compiler-plugin-for-ide-1.9.20-dev-5606.jar", + "hash": "8d3abb311735c481528dfc03d0350808e55f5a4a76c4d7bea5ea2ca344d377f1", + "path": "org/jetbrains/kotlin/parcelize-compiler-plugin-for-ide/1.9.20-dev-5606/parcelize-compiler-plugin-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/sam-with-receiver-compiler-plugin-for-ide/1.9.20-dev-5606/sam-with-receiver-compiler-plugin-for-ide-1.9.20-dev-5606.jar", + "hash": "59a4f1fae9b7a4d8c3ea3739f728c6ea6973612554aea0f210eb1543499227f1", + "path": "org/jetbrains/kotlin/sam-with-receiver-compiler-plugin-for-ide/1.9.20-dev-5606/sam-with-receiver-compiler-plugin-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/scripting-compiler-plugin-for-ide/1.9.20-dev-5606/scripting-compiler-plugin-for-ide-1.9.20-dev-5606.jar", + "hash": "ee9955a5467cb6617cb618a1e187d4e7154bdb5a088bd43a1d191307ac600966", + "path": "org/jetbrains/kotlin/scripting-compiler-plugin-for-ide/1.9.20-dev-5606/scripting-compiler-plugin-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlin/symbol-light-classes-for-ide/1.9.20-dev-5606/symbol-light-classes-for-ide-1.9.20-dev-5606.jar", + "hash": "e38206d069e9740aa969278761fc62791a653a7b30d3582b7b30b1f1711817fd", + "path": "org/jetbrains/kotlin/symbol-light-classes-for-ide/1.9.20-dev-5606/symbol-light-classes-for-ide-1.9.20-dev-5606.jar" + }, + { + "url": "org/jetbrains/kotlinx/kotlinx-collections-immutable-jvm/0.3.5/kotlinx-collections-immutable-jvm-0.3.5.jar", + "hash": "0cc458268187e86241854ae85bfa35accf9bd7a650fbe57015347287bf7e6b66", + "path": "org/jetbrains/kotlinx/kotlinx-collections-immutable-jvm/0.3.5/kotlinx-collections-immutable-jvm-0.3.5.jar" + }, + { + "url": "org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.7.1/kotlinx-coroutines-core-jvm-1.7.1.jar", + "hash": "7496cffdd3eb10109acdda1c3212f6ac7815789e09380dc9e2ccdec496dba3fc", + "path": "org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.7.1/kotlinx-coroutines-core-jvm-1.7.1.jar" + }, + { + "url": "org/jetbrains/kotlinx/kotlinx-coroutines-debug/1.7.1/kotlinx-coroutines-debug-1.7.1.jar", + "hash": "5333cbb9a17fd45642f3f05ff124006cd6743549413c2f53a35cf9acd1141e91", + "path": "org/jetbrains/kotlinx/kotlinx-coroutines-debug/1.7.1/kotlinx-coroutines-debug-1.7.1.jar" + }, + { + "url": "org/jetbrains/kotlinx/kotlinx-coroutines-guava/1.7.1/kotlinx-coroutines-guava-1.7.1.jar", + "hash": "be7ac4726a9d356d03be71c76ceb083e4f4653e2668c0be4af9198e424d7ffd6", + "path": "org/jetbrains/kotlinx/kotlinx-coroutines-guava/1.7.1/kotlinx-coroutines-guava-1.7.1.jar" + }, + { + "url": "org/jetbrains/kotlinx/kotlinx-coroutines-slf4j/1.7.1/kotlinx-coroutines-slf4j-1.7.1.jar", + "hash": "fbb40ca7e55a78017feac897180be64f562a2eb781c6a3f6c9bb2ff88d92223f", + "path": "org/jetbrains/kotlinx/kotlinx-coroutines-slf4j/1.7.1/kotlinx-coroutines-slf4j-1.7.1.jar" + }, + { + "url": "org/jetbrains/kotlinx/kotlinx-coroutines-test-jvm/1.7.1/kotlinx-coroutines-test-jvm-1.7.1.jar", + "hash": "bf88e8f0a8d88033d961d93435a132caf88fe35cee266bf71c48689eceddc72d", + "path": "org/jetbrains/kotlinx/kotlinx-coroutines-test-jvm/1.7.1/kotlinx-coroutines-test-jvm-1.7.1.jar" + }, + { + "url": "org/jetbrains/kotlinx/kotlinx-datetime-jvm/0.4.0/kotlinx-datetime-jvm-0.4.0.jar", + "hash": "075ca75a16e356484c07de3cc7bce79da9e4adbc670bbcf23c5e13f4e12ee6e7", + "path": "org/jetbrains/kotlinx/kotlinx-datetime-jvm/0.4.0/kotlinx-datetime-jvm-0.4.0.jar" + }, + { + "url": "org/jetbrains/kotlinx/kotlinx-html-jvm/0.8.1/kotlinx-html-jvm-0.8.1.jar", + "hash": "98bda1c78a5028a134ceb25b63f5c130c89349730d35fd47ef7490b6bf0b63b3", + "path": "org/jetbrains/kotlinx/kotlinx-html-jvm/0.8.1/kotlinx-html-jvm-0.8.1.jar" + }, + { + "url": "org/jetbrains/kotlinx/kotlinx-serialization-core-jvm/1.5.1/kotlinx-serialization-core-jvm-1.5.1.jar", + "hash": "a4053a35abeb59bf707d7948245556fe8dc379e9cfed088aec08134c899605d4", + "path": "org/jetbrains/kotlinx/kotlinx-serialization-core-jvm/1.5.1/kotlinx-serialization-core-jvm-1.5.1.jar" + }, + { + "url": "org/jetbrains/kotlinx/kotlinx-serialization-json-jvm/1.5.1/kotlinx-serialization-json-jvm-1.5.1.jar", + "hash": "6fc10b056e1006963abb2b9fc393dcd4e38425358b6f16285e8f63d3429ffd21", + "path": "org/jetbrains/kotlinx/kotlinx-serialization-json-jvm/1.5.1/kotlinx-serialization-json-jvm-1.5.1.jar" + }, + { + "url": "org/jetbrains/kotlinx/kotlinx-serialization-protobuf-jvm/1.5.1/kotlinx-serialization-protobuf-jvm-1.5.1.jar", + "hash": "3b8d778997709effc92f4d9e95204787b873279c6e145913bbd55065912be58c", + "path": "org/jetbrains/kotlinx/kotlinx-serialization-protobuf-jvm/1.5.1/kotlinx-serialization-protobuf-jvm-1.5.1.jar" + }, + { + "url": "io/ktor/ktor-client-core-jvm/2.3.0/ktor-client-core-jvm-2.3.0.jar", + "hash": "9c8707aac68e30900326933f9044fbedb4797ef18aa127dd2ec9cd74b5100153", + "path": "io/ktor/ktor-client-core-jvm/2.3.0/ktor-client-core-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-http-jvm/2.3.0/ktor-http-jvm-2.3.0.jar", + "hash": "a116d91b9de823384e157c9ddae8c7dd34592253cea03a812cb4c430f941914e", + "path": "io/ktor/ktor-http-jvm/2.3.0/ktor-http-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar", + "hash": "11f01ec6bc4a139852bec08e2346046a96ae636bb3d7643a14c109332692a447", + "path": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar", + "hash": "e4fc6eafdd18cdc95ee7e090b586b932a35d992660ae70fb18ba64b737427bcf", + "path": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-events-jvm/2.3.0/ktor-events-jvm-2.3.0.jar", + "hash": "c0fa2f2829e6ca47ce812a6fe35e65b634673aafcff2170b2cd07cf555981492", + "path": "io/ktor/ktor-events-jvm/2.3.0/ktor-events-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-websocket-serialization-jvm/2.3.0/ktor-websocket-serialization-jvm-2.3.0.jar", + "hash": "37f83ea9cab8a2e56c80d0bd0e461b6f4de0a7e4d97c3d26b38b091fbb0d2a49", + "path": "io/ktor/ktor-websocket-serialization-jvm/2.3.0/ktor-websocket-serialization-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-serialization-jvm/2.3.0/ktor-serialization-jvm-2.3.0.jar", + "hash": "dbb254d2f1eea8a9f97d77f1c6783b1aedb01563da0aba886bcfa89f973c3783", + "path": "io/ktor/ktor-serialization-jvm/2.3.0/ktor-serialization-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-websockets-jvm/2.3.0/ktor-websockets-jvm-2.3.0.jar", + "hash": "1412d2331f6951dc0b6c99e0a88fdb56ff50943e720191b25cdcdf715dab5c49", + "path": "io/ktor/ktor-websockets-jvm/2.3.0/ktor-websockets-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-client-auth-jvm/2.3.0/ktor-client-auth-jvm-2.3.0.jar", + "hash": "a33acc9111d4299d2d89ad7a43f5fbfaad1bc5bdade31e10989241c9f97df854", + "path": "io/ktor/ktor-client-auth-jvm/2.3.0/ktor-client-auth-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-client-cio-jvm/2.3.0/ktor-client-cio-jvm-2.3.0.jar", + "hash": "78b8897621c0993c0a2358dd79331e35f2d8cd11ef7d6a65e01b9db8d0d26348", + "path": "io/ktor/ktor-client-cio-jvm/2.3.0/ktor-client-cio-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-client-core-jvm/2.3.0/ktor-client-core-jvm-2.3.0.jar", + "hash": "9c8707aac68e30900326933f9044fbedb4797ef18aa127dd2ec9cd74b5100153", + "path": "io/ktor/ktor-client-core-jvm/2.3.0/ktor-client-core-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-http-jvm/2.3.0/ktor-http-jvm-2.3.0.jar", + "hash": "a116d91b9de823384e157c9ddae8c7dd34592253cea03a812cb4c430f941914e", + "path": "io/ktor/ktor-http-jvm/2.3.0/ktor-http-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-events-jvm/2.3.0/ktor-events-jvm-2.3.0.jar", + "hash": "c0fa2f2829e6ca47ce812a6fe35e65b634673aafcff2170b2cd07cf555981492", + "path": "io/ktor/ktor-events-jvm/2.3.0/ktor-events-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-http-cio-jvm/2.3.0/ktor-http-cio-jvm-2.3.0.jar", + "hash": "258b3fc2ffc4682e826f9604ac52e0e1ec85b07f050e3ce4e3cbe8cc35bea03a", + "path": "io/ktor/ktor-http-cio-jvm/2.3.0/ktor-http-cio-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-network-jvm/2.3.0/ktor-network-jvm-2.3.0.jar", + "hash": "17b85d910c882b8c33073f7888275b610739ac04faecb4f43f94bf757572c391", + "path": "io/ktor/ktor-network-jvm/2.3.0/ktor-network-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-websockets-jvm/2.3.0/ktor-websockets-jvm-2.3.0.jar", + "hash": "1412d2331f6951dc0b6c99e0a88fdb56ff50943e720191b25cdcdf715dab5c49", + "path": "io/ktor/ktor-websockets-jvm/2.3.0/ktor-websockets-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-network-tls-jvm/2.3.0/ktor-network-tls-jvm-2.3.0.jar", + "hash": "9720bb29ebd4b035e38082dbb11620bdcc8b57e4988d8f3206fb4bf307fdf9f5", + "path": "io/ktor/ktor-network-tls-jvm/2.3.0/ktor-network-tls-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar", + "hash": "11f01ec6bc4a139852bec08e2346046a96ae636bb3d7643a14c109332692a447", + "path": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar", + "hash": "e4fc6eafdd18cdc95ee7e090b586b932a35d992660ae70fb18ba64b737427bcf", + "path": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-client-content-negotiation-jvm/2.3.0/ktor-client-content-negotiation-jvm-2.3.0.jar", + "hash": "c821b07bbccb3a52ddef83959bd1ff6c0451b71ba9059d549f3e1984613baaf6", + "path": "io/ktor/ktor-client-content-negotiation-jvm/2.3.0/ktor-client-content-negotiation-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-client-core-jvm/2.3.0/ktor-client-core-jvm-2.3.0.jar", + "hash": "9c8707aac68e30900326933f9044fbedb4797ef18aa127dd2ec9cd74b5100153", + "path": "io/ktor/ktor-client-core-jvm/2.3.0/ktor-client-core-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-http-jvm/2.3.0/ktor-http-jvm-2.3.0.jar", + "hash": "a116d91b9de823384e157c9ddae8c7dd34592253cea03a812cb4c430f941914e", + "path": "io/ktor/ktor-http-jvm/2.3.0/ktor-http-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar", + "hash": "11f01ec6bc4a139852bec08e2346046a96ae636bb3d7643a14c109332692a447", + "path": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar", + "hash": "e4fc6eafdd18cdc95ee7e090b586b932a35d992660ae70fb18ba64b737427bcf", + "path": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-events-jvm/2.3.0/ktor-events-jvm-2.3.0.jar", + "hash": "c0fa2f2829e6ca47ce812a6fe35e65b634673aafcff2170b2cd07cf555981492", + "path": "io/ktor/ktor-events-jvm/2.3.0/ktor-events-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-websocket-serialization-jvm/2.3.0/ktor-websocket-serialization-jvm-2.3.0.jar", + "hash": "37f83ea9cab8a2e56c80d0bd0e461b6f4de0a7e4d97c3d26b38b091fbb0d2a49", + "path": "io/ktor/ktor-websocket-serialization-jvm/2.3.0/ktor-websocket-serialization-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-serialization-jvm/2.3.0/ktor-serialization-jvm-2.3.0.jar", + "hash": "dbb254d2f1eea8a9f97d77f1c6783b1aedb01563da0aba886bcfa89f973c3783", + "path": "io/ktor/ktor-serialization-jvm/2.3.0/ktor-serialization-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-websockets-jvm/2.3.0/ktor-websockets-jvm-2.3.0.jar", + "hash": "1412d2331f6951dc0b6c99e0a88fdb56ff50943e720191b25cdcdf715dab5c49", + "path": "io/ktor/ktor-websockets-jvm/2.3.0/ktor-websockets-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-client-encoding-jvm/2.3.0/ktor-client-encoding-jvm-2.3.0.jar", + "hash": "d1dce069a7cea7a2aee8c2f3a852aedb6f2b693784819e19b95ae41c2fa6c3cc", + "path": "io/ktor/ktor-client-encoding-jvm/2.3.0/ktor-client-encoding-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-client-logging-jvm/2.3.0/ktor-client-logging-jvm-2.3.0.jar", + "hash": "8431bdd42fd24b7f564cd37f44890bc9c2cabf5b20280044dfa4099b9ffd289d", + "path": "io/ktor/ktor-client-logging-jvm/2.3.0/ktor-client-logging-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-client-core-jvm/2.3.0/ktor-client-core-jvm-2.3.0.jar", + "hash": "9c8707aac68e30900326933f9044fbedb4797ef18aa127dd2ec9cd74b5100153", + "path": "io/ktor/ktor-client-core-jvm/2.3.0/ktor-client-core-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-http-jvm/2.3.0/ktor-http-jvm-2.3.0.jar", + "hash": "a116d91b9de823384e157c9ddae8c7dd34592253cea03a812cb4c430f941914e", + "path": "io/ktor/ktor-http-jvm/2.3.0/ktor-http-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar", + "hash": "11f01ec6bc4a139852bec08e2346046a96ae636bb3d7643a14c109332692a447", + "path": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar", + "hash": "e4fc6eafdd18cdc95ee7e090b586b932a35d992660ae70fb18ba64b737427bcf", + "path": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-events-jvm/2.3.0/ktor-events-jvm-2.3.0.jar", + "hash": "c0fa2f2829e6ca47ce812a6fe35e65b634673aafcff2170b2cd07cf555981492", + "path": "io/ktor/ktor-events-jvm/2.3.0/ktor-events-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-websocket-serialization-jvm/2.3.0/ktor-websocket-serialization-jvm-2.3.0.jar", + "hash": "37f83ea9cab8a2e56c80d0bd0e461b6f4de0a7e4d97c3d26b38b091fbb0d2a49", + "path": "io/ktor/ktor-websocket-serialization-jvm/2.3.0/ktor-websocket-serialization-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-serialization-jvm/2.3.0/ktor-serialization-jvm-2.3.0.jar", + "hash": "dbb254d2f1eea8a9f97d77f1c6783b1aedb01563da0aba886bcfa89f973c3783", + "path": "io/ktor/ktor-serialization-jvm/2.3.0/ktor-serialization-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-websockets-jvm/2.3.0/ktor-websockets-jvm-2.3.0.jar", + "hash": "1412d2331f6951dc0b6c99e0a88fdb56ff50943e720191b25cdcdf715dab5c49", + "path": "io/ktor/ktor-websockets-jvm/2.3.0/ktor-websockets-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-client-mock-jvm/2.3.0/ktor-client-mock-jvm-2.3.0.jar", + "hash": "a4717dd09bb5b13897c4d3b09406f66eed303d44c84a63d96b82a92c13d047b0", + "path": "io/ktor/ktor-client-mock-jvm/2.3.0/ktor-client-mock-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-http-jvm/2.3.0/ktor-http-jvm-2.3.0.jar", + "hash": "a116d91b9de823384e157c9ddae8c7dd34592253cea03a812cb4c430f941914e", + "path": "io/ktor/ktor-http-jvm/2.3.0/ktor-http-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar", + "hash": "11f01ec6bc4a139852bec08e2346046a96ae636bb3d7643a14c109332692a447", + "path": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar", + "hash": "e4fc6eafdd18cdc95ee7e090b586b932a35d992660ae70fb18ba64b737427bcf", + "path": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-client-core-jvm/2.3.0/ktor-client-core-jvm-2.3.0.jar", + "hash": "9c8707aac68e30900326933f9044fbedb4797ef18aa127dd2ec9cd74b5100153", + "path": "io/ktor/ktor-client-core-jvm/2.3.0/ktor-client-core-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-events-jvm/2.3.0/ktor-events-jvm-2.3.0.jar", + "hash": "c0fa2f2829e6ca47ce812a6fe35e65b634673aafcff2170b2cd07cf555981492", + "path": "io/ktor/ktor-events-jvm/2.3.0/ktor-events-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-websocket-serialization-jvm/2.3.0/ktor-websocket-serialization-jvm-2.3.0.jar", + "hash": "37f83ea9cab8a2e56c80d0bd0e461b6f4de0a7e4d97c3d26b38b091fbb0d2a49", + "path": "io/ktor/ktor-websocket-serialization-jvm/2.3.0/ktor-websocket-serialization-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-serialization-jvm/2.3.0/ktor-serialization-jvm-2.3.0.jar", + "hash": "dbb254d2f1eea8a9f97d77f1c6783b1aedb01563da0aba886bcfa89f973c3783", + "path": "io/ktor/ktor-serialization-jvm/2.3.0/ktor-serialization-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-websockets-jvm/2.3.0/ktor-websockets-jvm-2.3.0.jar", + "hash": "1412d2331f6951dc0b6c99e0a88fdb56ff50943e720191b25cdcdf715dab5c49", + "path": "io/ktor/ktor-websockets-jvm/2.3.0/ktor-websockets-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-network-tls-jvm/2.3.0/ktor-network-tls-jvm-2.3.0.jar", + "hash": "9720bb29ebd4b035e38082dbb11620bdcc8b57e4988d8f3206fb4bf307fdf9f5", + "path": "io/ktor/ktor-network-tls-jvm/2.3.0/ktor-network-tls-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-network-jvm/2.3.0/ktor-network-jvm-2.3.0.jar", + "hash": "17b85d910c882b8c33073f7888275b610739ac04faecb4f43f94bf757572c391", + "path": "io/ktor/ktor-network-jvm/2.3.0/ktor-network-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar", + "hash": "11f01ec6bc4a139852bec08e2346046a96ae636bb3d7643a14c109332692a447", + "path": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar", + "hash": "e4fc6eafdd18cdc95ee7e090b586b932a35d992660ae70fb18ba64b737427bcf", + "path": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-serialization-kotlinx-json-jvm/2.3.0/ktor-serialization-kotlinx-json-jvm-2.3.0.jar", + "hash": "34130cfb69365342f4c2a0a192edaf8cc3f0374206b42d97280f59a6a4a2978c", + "path": "io/ktor/ktor-serialization-kotlinx-json-jvm/2.3.0/ktor-serialization-kotlinx-json-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-http-jvm/2.3.0/ktor-http-jvm-2.3.0.jar", + "hash": "a116d91b9de823384e157c9ddae8c7dd34592253cea03a812cb4c430f941914e", + "path": "io/ktor/ktor-http-jvm/2.3.0/ktor-http-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar", + "hash": "11f01ec6bc4a139852bec08e2346046a96ae636bb3d7643a14c109332692a447", + "path": "io/ktor/ktor-utils-jvm/2.3.0/ktor-utils-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar", + "hash": "e4fc6eafdd18cdc95ee7e090b586b932a35d992660ae70fb18ba64b737427bcf", + "path": "io/ktor/ktor-io-jvm/2.3.0/ktor-io-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-serialization-kotlinx-jvm/2.3.0/ktor-serialization-kotlinx-jvm-2.3.0.jar", + "hash": "f0c870a7cbf616287b76991c7786f655fd7690073b112c0c427eea98e9c10a88", + "path": "io/ktor/ktor-serialization-kotlinx-jvm/2.3.0/ktor-serialization-kotlinx-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-serialization-jvm/2.3.0/ktor-serialization-jvm-2.3.0.jar", + "hash": "dbb254d2f1eea8a9f97d77f1c6783b1aedb01563da0aba886bcfa89f973c3783", + "path": "io/ktor/ktor-serialization-jvm/2.3.0/ktor-serialization-jvm-2.3.0.jar" + }, + { + "url": "io/ktor/ktor-websockets-jvm/2.3.0/ktor-websockets-jvm-2.3.0.jar", + "hash": "1412d2331f6951dc0b6c99e0a88fdb56ff50943e720191b25cdcdf715dab5c49", + "path": "io/ktor/ktor-websockets-jvm/2.3.0/ktor-websockets-jvm-2.3.0.jar" + }, + { + "url": "net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar", + "hash": "f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2", + "path": "net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/layout_inspector_skia_java_proto/223.0.1.0/layout_inspector_skia_java_proto-223.0.1.0.jar", + "hash": "57a5b14934f746e0910e7a69104ce918af769c6ea821a8c193e51661f45ab2a4", + "path": "org/jetbrains/intellij/deps/android/tools/base/layout_inspector_skia_java_proto/223.0.1.0/layout_inspector_skia_java_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/layoutinspector-view-proto/223.0.1.0/layoutinspector-view-proto-223.0.1.0.jar", + "hash": "646ec119025d94f8f154caaca82433dfdd67f411e1dbac64e791c8221454c9a1", + "path": "org/jetbrains/intellij/deps/android/tools/base/layoutinspector-view-proto/223.0.1.0/layoutinspector-view-proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/layout_inspector_compose_java_proto/223.0.1.0/layout_inspector_compose_java_proto-223.0.1.0.jar", + "hash": "e919843d85b1b7d8252fbefd8ef1bb2a838fe112136ae5d23dc56be17a65216b", + "path": "org/jetbrains/intellij/deps/android/tools/base/layout_inspector_compose_java_proto/223.0.1.0/layout_inspector_compose_java_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/layout_inspector_snapshot_java_proto/223.0.1.0/layout_inspector_snapshot_java_proto-223.0.1.0.jar", + "hash": "b5acbacd2efe23a13e523e982a4af48ea0e789da9cac4612192edaac80ce3aa7", + "path": "org/jetbrains/intellij/deps/android/tools/base/layout_inspector_snapshot_java_proto/223.0.1.0/layout_inspector_snapshot_java_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/layout_inspector_view_java_proto/223.0.1.0/layout_inspector_view_java_proto-223.0.1.0.jar", + "hash": "124d5d061c4f4e20b2f45e9315f3e2700a4849b25456c4a446ec4432c0be0251", + "path": "org/jetbrains/intellij/deps/android/tools/base/layout_inspector_view_java_proto/223.0.1.0/layout_inspector_view_java_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/jb-layoutlib-jdk11/223.0.1.0/jb-layoutlib-jdk11-223.0.1.0.jar", + "hash": "c119161aa752e5a03eca2b64ebf23116169750ad86872e014292d4b83d8c100c", + "path": "org/jetbrains/intellij/deps/android/tools/base/jb-layoutlib-jdk11/223.0.1.0/jb-layoutlib-jdk11-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libam-instrumentation-data-proto/223.0.1.0/libam-instrumentation-data-proto-223.0.1.0.jar", + "hash": "9e74dde675290902f77b42ebfae08d2f20b1e30e1449098e8f56b8e0d47afc05", + "path": "org/jetbrains/intellij/deps/android/tools/base/libam-instrumentation-data-proto/223.0.1.0/libam-instrumentation-data-proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libapp-processes-proto/223.0.1.0/libapp-processes-proto-223.0.1.0.jar", + "hash": "3faf2936c9d2f1da49ec915dc086b98981661084bf52e69b42bc8b0e94115f8e", + "path": "org/jetbrains/intellij/deps/android/tools/base/libapp-processes-proto/223.0.1.0/libapp-processes-proto-223.0.1.0.jar" + }, + { + "url": "org/apache/thrift/libthrift/0.13.0/libthrift-0.13.0.jar", + "hash": "f261ec1cfb7452e25c584cb4440389dffce59a6d38dfe91d12ec790594629b6e", + "path": "org/apache/thrift/libthrift/0.13.0/libthrift-0.13.0.jar" + }, + { + "url": "org/apache/lucene/lucene-analysis-common/9.6.0/lucene-analysis-common-9.6.0.jar", + "hash": "f2f0d724c99440f4ab9304c06e7966653d088e872a2bbd709605dff547e5a494", + "path": "org/apache/lucene/lucene-analysis-common/9.6.0/lucene-analysis-common-9.6.0.jar" + }, + { + "url": "org/apache/lucene/lucene-codecs/9.6.0/lucene-codecs-9.6.0.jar", + "hash": "371100cb3d39fb47a1f00846fe9114ec643bc41525102aec853b6ecfdf08571e", + "path": "org/apache/lucene/lucene-codecs/9.6.0/lucene-codecs-9.6.0.jar" + }, + { + "url": "org/apache/lucene/lucene-core/9.6.0/lucene-core-9.6.0.jar", + "hash": "43c3905ecc0c41b77694202b5249e538f3988d1c452bb75decdfb5fdb149dd51", + "path": "org/apache/lucene/lucene-core/9.6.0/lucene-core-9.6.0.jar" + }, + { + "url": "org/apache/lucene/lucene-highlighter/9.6.0/lucene-highlighter-9.6.0.jar", + "hash": "dd9ddcb93ba9e5c19d4de5b9b77530a0d4eceb5e2e8f31ac17e905e314a349ce", + "path": "org/apache/lucene/lucene-highlighter/9.6.0/lucene-highlighter-9.6.0.jar" + }, + { + "url": "org/apache/lucene/lucene-memory/9.6.0/lucene-memory-9.6.0.jar", + "hash": "99fd1e7c06867d2f21e2c86143f774df2009222f76e7379902e87577584e63a7", + "path": "org/apache/lucene/lucene-memory/9.6.0/lucene-memory-9.6.0.jar" + }, + { + "url": "org/apache/lucene/lucene-queries/9.6.0/lucene-queries-9.6.0.jar", + "hash": "7c3d67d2450fabde77e550e11b4ed75a27cf13b3fffe6ec51df4482742107b25", + "path": "org/apache/lucene/lucene-queries/9.6.0/lucene-queries-9.6.0.jar" + }, + { + "url": "org/apache/lucene/lucene-queryparser/9.6.0/lucene-queryparser-9.6.0.jar", + "hash": "83f4c46f9e5ac7ec3a9aad5fdb05d336c0c4f520528d28a676b65d57508b87f3", + "path": "org/apache/lucene/lucene-queryparser/9.6.0/lucene-queryparser-9.6.0.jar" + }, + { + "url": "org/apache/lucene/lucene-sandbox/9.6.0/lucene-sandbox-9.6.0.jar", + "hash": "aa240762a4639bf21c599e82c1c6ff16097d6aad619785772db159ed60169b43", + "path": "org/apache/lucene/lucene-sandbox/9.6.0/lucene-sandbox-9.6.0.jar" + }, + { + "url": "org/apache/lucene/lucene-suggest/9.6.0/lucene-suggest-9.6.0.jar", + "hash": "0ddf5f5b0cf06af1bc5f8ab9c8fc404b6d0006d369eadb15745ad78bb24b38c4", + "path": "org/apache/lucene/lucene-suggest/9.6.0/lucene-suggest-9.6.0.jar" + }, + { + "url": "org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar", + "hash": "d74a3334fb35195009b338a951f918203d6bbca3d1d359033dc33edd1cadc9ef", + "path": "org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar" + }, + { + "url": "org/apache/maven/maven-resolver-provider/3.8.5/maven-resolver-provider-3.8.5.jar", + "hash": "4b9f827efb393696431978dc0354651f1a95d4c52ba07c92d830efe5dc9b1012", + "path": "org/apache/maven/maven-resolver-provider/3.8.5/maven-resolver-provider-3.8.5.jar" + }, + { + "url": "org/apache/maven/maven-model/3.8.5/maven-model-3.8.5.jar", + "hash": "7c9eeb30ac1941ea9bdf76c08c162ed98c005913e5bff66de3f1027a304546dc", + "path": "org/apache/maven/maven-model/3.8.5/maven-model-3.8.5.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.8.5/maven-model-builder-3.8.5.jar", + "hash": "6bcd688b4700bc0d9046c531c316e75674f53b345d4432d6a7f62812b2424bef", + "path": "org/apache/maven/maven-model-builder/3.8.5/maven-model-builder-3.8.5.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar", + "hash": "b3b5412ce17889103ea564bcdfcf9fb3dfa540344ffeac6b538a73c9d7182662", + "path": "org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.8.5/maven-artifact-3.8.5.jar", + "hash": "91172bc294d6eab02fc9f45f4ea01fd0e418962d128cf489abea7b6957d988ee", + "path": "org/apache/maven/maven-artifact/3.8.5/maven-artifact-3.8.5.jar" + }, + { + "url": "org/apache/maven/maven-builder-support/3.8.5/maven-builder-support-3.8.5.jar", + "hash": "a205eaa76609ae0039bf38fe9a9c024c646eded05d176effbef524f04a2c2761", + "path": "org/apache/maven/maven-builder-support/3.8.5/maven-builder-support-3.8.5.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.jar", + "hash": "c5994010bcdce1d2bd603a4d50c47191ddbd7875d1157b23aaa26d33c82fda13", + "path": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.8.5/maven-repository-metadata-3.8.5.jar", + "hash": "24d89a1b23dc0427ac67895a741802fd23897bdf135d87fe586d718b38a3e924", + "path": "org/apache/maven/maven-repository-metadata/3.8.5/maven-repository-metadata-3.8.5.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-api/1.6.3/maven-resolver-api-1.6.3.jar", + "hash": "d0b28ed944058ba4f9be4b54c25d6d5269cc4f3f3c49aa450d4dc2f7e0d552f6", + "path": "org/apache/maven/resolver/maven-resolver-api/1.6.3/maven-resolver-api-1.6.3.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-spi/1.6.3/maven-resolver-spi-1.6.3.jar", + "hash": "17441a39045ac19bc4a8068fb7284facebf6337754bf2bf8f26a76b5f98ed108", + "path": "org/apache/maven/resolver/maven-resolver-spi/1.6.3/maven-resolver-spi-1.6.3.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-util/1.6.3/maven-resolver-util-1.6.3.jar", + "hash": "cdcad9355b625743f40e4cead9a96353404e010c39c808d23b044be331afa251", + "path": "org/apache/maven/resolver/maven-resolver-util/1.6.3/maven-resolver-util-1.6.3.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-impl/1.6.3/maven-resolver-impl-1.6.3.jar", + "hash": "17aaebe6e3e59df8cb5b4ec210196f7084637312b9bc4ff14cb77ad1ae3c381b", + "path": "org/apache/maven/resolver/maven-resolver-impl/1.6.3/maven-resolver-impl-1.6.3.jar" + }, + { + "url": "com/github/marschall/memoryfilesystem/2.4.0/memoryfilesystem-2.4.0.jar", + "hash": "1e9ed24c5eb43d068a0e5ce5ea19aa75a44ee927024cc7715245e8aca7cd87a5", + "path": "com/github/marschall/memoryfilesystem/2.4.0/memoryfilesystem-2.4.0.jar" + }, + { + "url": "com/michaelbaranov/microba/microba/0.4.5-jb.1/microba-0.4.5-jb.1.jar", + "hash": "dad321d5c6e522ef41f427665b4c5277c8ae72541c7b9df2ba63cb75f2831be1", + "path": "com/michaelbaranov/microba/microba/0.4.5-jb.1/microba-0.4.5-jb.1.jar" + }, + { + "url": "com/miglayout/miglayout-swing/11.0/miglayout-swing-11.0.jar", + "hash": "7aa9da079e0ed628a3672f8ddd1b6b05a5a3ec27639f82370956748943989ba6", + "path": "com/miglayout/miglayout-swing/11.0/miglayout-swing-11.0.jar" + }, + { + "url": "com/miglayout/miglayout-core/11.0/miglayout-core-11.0.jar", + "hash": "812b9c8a8f326098a43eb9550229dd31100c49f81680eecdf6649da423f0be9f", + "path": "com/miglayout/miglayout-core/11.0/miglayout-core-11.0.jar" + }, + { + "url": "org/mockito/mockito-core/5.3.1/mockito-core-5.3.1.jar", + "hash": "37f4dbaed25ffa6bdedaba78746c449e224b105d56fcedee8755936642d992a8", + "path": "org/mockito/mockito-core/5.3.1/mockito-core-5.3.1.jar" + }, + { + "url": "net/bytebuddy/byte-buddy/1.14.4/byte-buddy-1.14.4.jar", + "hash": "7ae2b39ac230be9e3e09ce020406c017ff8ceba06eaf078c62a88c218a0ff2b4", + "path": "net/bytebuddy/byte-buddy/1.14.4/byte-buddy-1.14.4.jar" + }, + { + "url": "net/bytebuddy/byte-buddy-agent/1.14.4/byte-buddy-agent-1.14.4.jar", + "hash": "fbd1ab3db43c6c78b8804908cb95b656517f5c82e7fde8d255d8bdceef412d70", + "path": "net/bytebuddy/byte-buddy-agent/1.14.4/byte-buddy-agent-1.14.4.jar" + }, + { + "url": "org/objenesis/objenesis/3.3/objenesis-3.3.jar", + "hash": "02dfd0b0439a5591e35b708ed2f5474eb0948f53abf74637e959b8e4ef69bfeb", + "path": "org/objenesis/objenesis/3.3/objenesis-3.3.jar" + }, + { + "url": "org/mockito/kotlin/mockito-kotlin/4.1.0/mockito-kotlin-4.1.0.jar", + "hash": "2d095d500993bf99400dc8ae5d1936f00cf7220dbeda96261c232a258a539f50", + "path": "org/mockito/kotlin/mockito-kotlin/4.1.0/mockito-kotlin-4.1.0.jar" + }, + { + "url": "io/netty/netty-buffer/4.1.91.Final/netty-buffer-4.1.91.Final.jar", + "hash": "cc88941780b833a5fce6f4f203224b4138b6e2260b93d81889c25066af33890f", + "path": "io/netty/netty-buffer/4.1.91.Final/netty-buffer-4.1.91.Final.jar" + }, + { + "url": "io/netty/netty-common/4.1.91.Final/netty-common-4.1.91.Final.jar", + "hash": "ae507ef1c97cb6293c05626777d501146369112fd6ce7ec6b8db6d169bf43390", + "path": "io/netty/netty-common/4.1.91.Final/netty-common-4.1.91.Final.jar" + }, + { + "url": "io/netty/netty-codec-http2/4.1.91.Final/netty-codec-http2-4.1.91.Final.jar", + "hash": "5f29d77c208427a382f3da16f7a98c6fd57e7f4158fa6b172d54abde647ff58f", + "path": "io/netty/netty-codec-http2/4.1.91.Final/netty-codec-http2-4.1.91.Final.jar" + }, + { + "url": "io/netty/netty-transport/4.1.91.Final/netty-transport-4.1.91.Final.jar", + "hash": "9cb5f94745be48c56bce3f3e3729188b62470a3f810ab215d59d567695b2fe10", + "path": "io/netty/netty-transport/4.1.91.Final/netty-transport-4.1.91.Final.jar" + }, + { + "url": "io/netty/netty-resolver/4.1.91.Final/netty-resolver-4.1.91.Final.jar", + "hash": "a6b8bacead85b88c0f423a017760eb0b796e0645ec37770f805158af357f6933", + "path": "io/netty/netty-resolver/4.1.91.Final/netty-resolver-4.1.91.Final.jar" + }, + { + "url": "io/netty/netty-codec/4.1.91.Final/netty-codec-4.1.91.Final.jar", + "hash": "df923f67bbafa986448506fa0c4f456397f6a18be86101c8d75128ff6bb43878", + "path": "io/netty/netty-codec/4.1.91.Final/netty-codec-4.1.91.Final.jar" + }, + { + "url": "io/netty/netty-handler/4.1.91.Final/netty-handler-4.1.91.Final.jar", + "hash": "4ef5e6c419736ec2e24c9d2d29679a53eb6299d56b48e2b28def16d66810dd50", + "path": "io/netty/netty-handler/4.1.91.Final/netty-handler-4.1.91.Final.jar" + }, + { + "url": "io/netty/netty-transport-native-unix-common/4.1.91.Final/netty-transport-native-unix-common-4.1.91.Final.jar", + "hash": "9a58ffe8807d25969cde351f2b8e6ea9f15c06c93ce263a9d75bff2d7866573c", + "path": "io/netty/netty-transport-native-unix-common/4.1.91.Final/netty-transport-native-unix-common-4.1.91.Final.jar" + }, + { + "url": "io/netty/netty-codec-http/4.1.91.Final/netty-codec-http-4.1.91.Final.jar", + "hash": "e1806a0df6e5cdda968ebe34496b8287e100d29e0e3b6c6b8b9c3d462b16162a", + "path": "io/netty/netty-codec-http/4.1.91.Final/netty-codec-http-4.1.91.Final.jar" + }, + { + "url": "io/netty/netty-handler-proxy/4.1.91.Final/netty-handler-proxy-4.1.91.Final.jar", + "hash": "60c736bec98087bc97fcd0097640966c57398d152f9aaa19e1a4618bbf74dbb9", + "path": "io/netty/netty-handler-proxy/4.1.91.Final/netty-handler-proxy-4.1.91.Final.jar" + }, + { + "url": "io/netty/netty-codec-socks/4.1.91.Final/netty-codec-socks-4.1.91.Final.jar", + "hash": "cdd0feff044cbf0f76b6925cb3e5a103f01e3577438538c8c640f069bf8c47e6", + "path": "io/netty/netty-codec-socks/4.1.91.Final/netty-codec-socks-4.1.91.Final.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/network_inspector_java_proto/223.0.1.0/network_inspector_java_proto-223.0.1.0.jar", + "hash": "a0211d0d4cef5ee99e407f7be1fe65ee708f4188b7e0a9ad42af178a24752fa9", + "path": "org/jetbrains/intellij/deps/android/tools/base/network_inspector_java_proto/223.0.1.0/network_inspector_java_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/ngram-slp/0.0.3/ngram-slp-0.0.3.jar", + "hash": "4ac10d8fb7e6326e09179fd83e664610a3362dc1d661fb32e5b2a19bcb9fc867", + "path": "org/jetbrains/intellij/deps/completion/ngram-slp/0.0.3/ngram-slp-0.0.3.jar" + }, + { + "url": "com/squareup/okhttp3/okhttp-jvm/5.0.0-alpha.11/okhttp-jvm-5.0.0-alpha.11.jar", + "hash": "506a1d3aba9f99b55570c7f8813cd79a44946531f29050d5b938474efdb4cf80", + "path": "com/squareup/okhttp3/okhttp-jvm/5.0.0-alpha.11/okhttp-jvm-5.0.0-alpha.11.jar" + }, + { + "url": "com/squareup/okio/okio-jvm/3.2.0/okio-jvm-3.2.0.jar", + "hash": "b642baef4c570055de4cb3d1667b2b16dced901ff8066345a063691aa06025a4", + "path": "com/squareup/okio/okio-jvm/3.2.0/okio-jvm-3.2.0.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-sdk/1.26.0/opentelemetry-sdk-1.26.0.jar", + "hash": "039640fdc6fd01fdd44312c1677b96366d465e2ca1424be08da0a7bf48e96a8d", + "path": "io/opentelemetry/opentelemetry-sdk/1.26.0/opentelemetry-sdk-1.26.0.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-api/1.26.0/opentelemetry-api-1.26.0.jar", + "hash": "000bd01ca7d67cb6542f0db8677f281d23ad87521b2afe7320484b54e1b7899b", + "path": "io/opentelemetry/opentelemetry-api/1.26.0/opentelemetry-api-1.26.0.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-context/1.26.0/opentelemetry-context-1.26.0.jar", + "hash": "9d9888fcfc405efd32aa28ed9eb156d6afbbe21772fff87b215b60ff37e30454", + "path": "io/opentelemetry/opentelemetry-context/1.26.0/opentelemetry-context-1.26.0.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-sdk-common/1.26.0/opentelemetry-sdk-common-1.26.0.jar", + "hash": "04207cb8d82e01a42386ebe967c53d789eb01ee17e9756c17fdc6460ce502efc", + "path": "io/opentelemetry/opentelemetry-sdk-common/1.26.0/opentelemetry-sdk-common-1.26.0.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-semconv/1.26.0-alpha/opentelemetry-semconv-1.26.0-alpha.jar", + "hash": "b57721963af36e72f10d7f882bb247b775f8d182777cfe8b1907b40282ff47eb", + "path": "io/opentelemetry/opentelemetry-semconv/1.26.0-alpha/opentelemetry-semconv-1.26.0-alpha.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-sdk-trace/1.26.0/opentelemetry-sdk-trace-1.26.0.jar", + "hash": "70a518c0f54e416964aaaa0a20f26ce038729fc7300c6e9aabba0a360c9f889d", + "path": "io/opentelemetry/opentelemetry-sdk-trace/1.26.0/opentelemetry-sdk-trace-1.26.0.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-sdk-metrics/1.26.0/opentelemetry-sdk-metrics-1.26.0.jar", + "hash": "95c0db72d3856553fddc1a313c326ac0b13e284d85660029fc7bc5ba39e5d362", + "path": "io/opentelemetry/opentelemetry-sdk-metrics/1.26.0/opentelemetry-sdk-metrics-1.26.0.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-extension-incubator/1.26.0-alpha/opentelemetry-extension-incubator-1.26.0-alpha.jar", + "hash": "59ddecd684fd8e009050dc29b5a6d115f49bbcb1270f3076dcf56f378617e91d", + "path": "io/opentelemetry/opentelemetry-extension-incubator/1.26.0-alpha/opentelemetry-extension-incubator-1.26.0-alpha.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-sdk-logs/1.26.0-alpha/opentelemetry-sdk-logs-1.26.0-alpha.jar", + "hash": "52e0e4d7c8bff90846dc16f77c1a6ab09615234e4291f1597e1da869f4b35dda", + "path": "io/opentelemetry/opentelemetry-sdk-logs/1.26.0-alpha/opentelemetry-sdk-logs-1.26.0-alpha.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-api-logs/1.26.0-alpha/opentelemetry-api-logs-1.26.0-alpha.jar", + "hash": "2561627dac2620e4ac6c3db01d1324d9db3aac1e089ba3186f4563cda2322f1d", + "path": "io/opentelemetry/opentelemetry-api-logs/1.26.0-alpha/opentelemetry-api-logs-1.26.0-alpha.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-api-events/1.26.0-alpha/opentelemetry-api-events-1.26.0-alpha.jar", + "hash": "f3e6a91a45fd872471a6f42441b924c196b83f475b759c14eea702da0911a79c", + "path": "io/opentelemetry/opentelemetry-api-events/1.26.0-alpha/opentelemetry-api-events-1.26.0-alpha.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-exporter-otlp-common/1.26.0/opentelemetry-exporter-otlp-common-1.26.0.jar", + "hash": "bf4cfd6c368ee3837a1431430a67e6a9657df99e74ab3a475cd257f5625f5b00", + "path": "io/opentelemetry/opentelemetry-exporter-otlp-common/1.26.0/opentelemetry-exporter-otlp-common-1.26.0.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-exporter-common/1.26.0/opentelemetry-exporter-common-1.26.0.jar", + "hash": "330fa4f1ff7a59506ae53b649a8085cca8f9d50f3279857545e871287e17f080", + "path": "io/opentelemetry/opentelemetry-exporter-common/1.26.0/opentelemetry-exporter-common-1.26.0.jar" + }, + { + "url": "io/opentelemetry/opentelemetry-extension-kotlin/1.26.0/opentelemetry-extension-kotlin-1.26.0.jar", + "hash": "9ffcb7ee71f360dca89f6be3acbd9fd4cf39a42283cd4ddee242f32288f53d30", + "path": "io/opentelemetry/opentelemetry-extension-kotlin/1.26.0/opentelemetry-extension-kotlin-1.26.0.jar" + }, + { + "url": "org/codehaus/groovy/groovy/3.0.13/groovy-3.0.13.jar", + "hash": "044569c20b1438263470585627da1b2c9722f1fb8d89f94e78c0ff219abd0146", + "path": "org/codehaus/groovy/groovy/3.0.13/groovy-3.0.13.jar" + }, + { + "url": "org/codehaus/groovy/groovy-ant/3.0.13/groovy-ant-3.0.13.jar", + "hash": "6b98dcf1309448d48b5a9762e94073fbee17cc45ff2b91b3d74a34b4945517c7", + "path": "org/codehaus/groovy/groovy-ant/3.0.13/groovy-ant-3.0.13.jar" + }, + { + "url": "org/codehaus/groovy/groovy-json/3.0.13/groovy-json-3.0.13.jar", + "hash": "921972defd8a89a5ab442f5ae57b1760755d7fe339dce46fe140e79a6e63e066", + "path": "org/codehaus/groovy/groovy-json/3.0.13/groovy-json-3.0.13.jar" + }, + { + "url": "org/codehaus/groovy/groovy-jsr223/3.0.13/groovy-jsr223-3.0.13.jar", + "hash": "d834f8d0e07fa73f5a59f700903180c1d834acde8ca03dd79641ef1460c82a4e", + "path": "org/codehaus/groovy/groovy-jsr223/3.0.13/groovy-jsr223-3.0.13.jar" + }, + { + "url": "org/codehaus/groovy/groovy-templates/3.0.13/groovy-templates-3.0.13.jar", + "hash": "abfb7190631a35fc96e023bfcd4658f3f7d4ae76c488ef1b972a54b29809ddc2", + "path": "org/codehaus/groovy/groovy-templates/3.0.13/groovy-templates-3.0.13.jar" + }, + { + "url": "org/codehaus/groovy/groovy-xml/3.0.13/groovy-xml-3.0.13.jar", + "hash": "8faea983f0d871bd2d2f28150747edf9047dd4d716700a0276eaa905a5cd0816", + "path": "org/codehaus/groovy/groovy-xml/3.0.13/groovy-xml-3.0.13.jar" + }, + { + "url": "org/jetbrains/packagesearch/pkgs-api-models/2.5.1/pkgs-api-models-2.5.1.jar", + "hash": "5cbd054ec28f66e9ababfc46ed3129cdcdbb0174dfc3d9c50ab8784b1b2dffcb", + "path": "org/jetbrains/packagesearch/pkgs-api-models/2.5.1/pkgs-api-models-2.5.1.jar" + }, + { + "url": "org/jetbrains/packagesearch/pkgs-version-utils/1.0.1/pkgs-version-utils-1.0.1.jar", + "hash": "08e4b76769ca0ab8bbc3f33498eb09df352e467e7cd55606ebc627a387d1c3b8", + "path": "org/jetbrains/packagesearch/pkgs-version-utils/1.0.1/pkgs-version-utils-1.0.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/perfetto-protos/223.0.1.0/perfetto-protos-223.0.1.0.jar", + "hash": "831d4b76986f36918dee489b1d8b8b9469d6856f2b3abfe70b5c6d374bf34c72", + "path": "org/jetbrains/intellij/deps/android/tools/base/perfetto-protos/223.0.1.0/perfetto-protos-223.0.1.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1.jar", + "hash": "86e0255d4c879c61b4833ed7f13124e8bb679df47debb127326e7db7dd49a07b", + "path": "org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1.jar" + }, + { + "url": "com/google/protobuf/protobuf-java/3.19.6/protobuf-java-3.19.6.jar", + "hash": "6a9a2dff91dcf71f85be71ae971f6164b5a631dcd34bff08f0618535ca44ad02", + "path": "com/google/protobuf/protobuf-java/3.19.6/protobuf-java-3.19.6.jar" + }, + { + "url": "org/bidib/com/github/markusbernhardt/proxy-vole/1.0.18/proxy-vole-1.0.18.jar", + "hash": "4a5cc62f3430f53cc79596fcd3b81561c3899ae5fbeda1fcd3a7af595aaa8b99", + "path": "org/bidib/com/github/markusbernhardt/proxy-vole/1.0.18/proxy-vole-1.0.18.jar" + }, + { + "url": "org/javadelight/delight-rhino-sandbox/0.0.15/delight-rhino-sandbox-0.0.15.jar", + "hash": "e287824b39907a21ee8dfc5a0c738be110fb256374d5dd87dbd8c0ad6d8ac44d", + "path": "org/javadelight/delight-rhino-sandbox/0.0.15/delight-rhino-sandbox-0.0.15.jar" + }, + { + "url": "org/jetbrains/pty4j/pty4j/0.12.13/pty4j-0.12.13.jar", + "hash": "8cae0b647c734dcd3ed5974bb596518f351d752e335a60084fcebab5da108c0d", + "path": "org/jetbrains/pty4j/pty4j/0.12.13/pty4j-0.12.13.jar" + }, + { + "url": "org/jetbrains/pty4j/purejavacomm/0.0.11.1/purejavacomm-0.0.11.1.jar", + "hash": "31c048a86057e07272429aa26e90713edbde96af9747362f27470d8e86a398a3", + "path": "org/jetbrains/pty4j/purejavacomm/0.0.11.1/purejavacomm-0.0.11.1.jar" + }, + { + "url": "com/jetbrains/rd/rd-core/2023.2.3/rd-core-2023.2.3.jar", + "hash": "b567e85d26b5e243df716bf53e0b837c1a4ec1b980f5142c943e9ecfeb16e5b6", + "path": "com/jetbrains/rd/rd-core/2023.2.3/rd-core-2023.2.3.jar" + }, + { + "url": "com/jetbrains/rd/rd-framework/2023.2.3/rd-framework-2023.2.3.jar", + "hash": "dde367783be76d224fd7532a1a52c1818b76879c9dd32fd35509de311ddcea8a", + "path": "com/jetbrains/rd/rd-framework/2023.2.3/rd-framework-2023.2.3.jar" + }, + { + "url": "com/jetbrains/rd/rd-gen/2023.2.3/rd-gen-2023.2.3.jar", + "hash": "e29a5697327a092fc647a95a9e73907dce089499ffec780428b0715f493ba58c", + "path": "com/jetbrains/rd/rd-gen/2023.2.3/rd-gen-2023.2.3.jar" + }, + { + "url": "com/jetbrains/rd/rd-swing/2023.2.3/rd-swing-2023.2.3.jar", + "hash": "52cc9c1137bd462355be85b450a120738d03b28a45da2d2181619d57a1dcb4bb", + "path": "com/jetbrains/rd/rd-swing/2023.2.3/rd-swing-2023.2.3.jar" + }, + { + "url": "com/jetbrains/rd/rd-text/2023.2.3/rd-text-2023.2.3.jar", + "hash": "1c51b2c8aeeb9c1aadcf0a78516ca045e35785e480dc83af111afcf8e79a467b", + "path": "com/jetbrains/rd/rd-text/2023.2.3/rd-text-2023.2.3.jar" + }, + { + "url": "org/mozilla/rhino-runtime/1.7.14/rhino-runtime-1.7.14.jar", + "hash": "8708d7502734391957d93773fff77914397b69f4302e6ef5a641164c6e9c971d", + "path": "org/mozilla/rhino-runtime/1.7.14/rhino-runtime-1.7.14.jar" + }, + { + "url": "org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar", + "hash": "5bf64690af4e59876b8902bb0db3dd39c686a40abfed97d3837eeeec7a2922ac", + "path": "org/slf4j/slf4j-jdk14/1.7.36/slf4j-jdk14-1.7.36.jar" + }, + { + "url": "org/yaml/snakeyaml/2.0/snakeyaml-2.0.jar", + "hash": "880c9d896e4b74a06c549c15ca496450165d6909fa15d7e662bee8f6a66d7afa", + "path": "org/yaml/snakeyaml/2.0/snakeyaml-2.0.jar" + }, + { + "url": "org/snakeyaml/snakeyaml-engine/2.6/snakeyaml-engine-2.6.jar", + "hash": "2652199af40c9aa2f1782400d2dfbbf4e5226208c4e05ddd4059c3d6d9cd1505", + "path": "org/snakeyaml/snakeyaml-engine/2.6/snakeyaml-engine-2.6.jar" + }, + { + "url": "org/xerial/sqlite-jdbc/3.41.2.2/sqlite-jdbc-3.41.2.2.jar", + "hash": "0cdab410947e04b6743df99cf1543267ddd107357d6f76948d145be590fd497d", + "path": "org/xerial/sqlite-jdbc/3.41.2.2/sqlite-jdbc-3.41.2.2.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/sqlite_inspector_proto/223.0.1.0/sqlite_inspector_proto-223.0.1.0.jar", + "hash": "1e52e915de03952a6bc72736125da70e0eb8a89583d31a4157bea609c3ebe8b9", + "path": "org/jetbrains/intellij/deps/android/tools/base/sqlite_inspector_proto/223.0.1.0/sqlite_inspector_proto-223.0.1.0.jar" + }, + { + "url": "org/sqlite/native/3.42.0-jb.1/native-3.42.0-jb.1.jar", + "hash": "491c4ae84a1bad34c85624682a80def4f3a3a0fb9d517121d05c2dfeb94966f8", + "path": "org/sqlite/native/3.42.0-jb.1/native-3.42.0-jb.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libstudio.proto/223.0.1.0/libstudio.proto-223.0.1.0.jar", + "hash": "9d65977b9f93c7dc44f5618eed39217edc40061756f72657f8b17f97010268ca", + "path": "org/jetbrains/intellij/deps/android/tools/base/libstudio.proto/223.0.1.0/libstudio.proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio-grpc/223.0.1.0/studio-grpc-223.0.1.0.jar", + "hash": "dafde19d7d30a439291282fa107faf1c74167179eac56cd10373a2d1b5a28cd3", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio-grpc/223.0.1.0/studio-grpc-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio-proto/223.0.1.0/studio-proto-223.0.1.0.jar", + "hash": "263170a91b4cddea11a586fbddc290c56a9c8ce19c1e6596430de455d671a032", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio-proto/223.0.1.0/studio-proto-223.0.1.0.jar" + }, + { + "url": "org/swinglabs/swingx-core/1.6.2-2/swingx-core-1.6.2-2.jar", + "hash": "0df80935d9bc3b3841bc621c6fef6615c93aaf80393ccaa196db11bf97784f18", + "path": "org/swinglabs/swingx-core/1.6.2-2/swingx-core-1.6.2-2.jar" + }, + { + "url": "org/jetbrains/teamcity/serviceMessages/2019.1.4/serviceMessages-2019.1.4.jar", + "hash": "8bfad3bc663424b7143fde7399e278e6c8202e021863937918314cf6e45a1251", + "path": "org/jetbrains/teamcity/serviceMessages/2019.1.4/serviceMessages-2019.1.4.jar" + }, + { + "url": "org/jetbrains/testDiscovery/test-discovery-plugin-base/0.1.191/test-discovery-plugin-base-0.1.191.jar", + "hash": "5ed74de192bd48546a6bc6e1c9f8f508663d8506ad9ef257aebbd6e829fdea36", + "path": "org/jetbrains/testDiscovery/test-discovery-plugin-base/0.1.191/test-discovery-plugin-base-0.1.191.jar" + }, + { + "url": "org/testcontainers/testcontainers/1.17.3/testcontainers-1.17.3.jar", + "hash": "b87e3bd3d005683ca5dcac70f431b633e407d8f63e3754a867112c631dcf683e", + "path": "org/testcontainers/testcontainers/1.17.3/testcontainers-1.17.3.jar" + }, + { + "url": "org/rnorth/duct-tape/duct-tape/1.0.8/duct-tape-1.0.8.jar", + "hash": "31cef12ddec979d1f86d7cf708c41a17da523d05c685fd6642e9d0b2addb7240", + "path": "org/rnorth/duct-tape/duct-tape/1.0.8/duct-tape-1.0.8.jar" + }, + { + "url": "com/github/docker-java/docker-java-api/3.2.13/docker-java-api-3.2.13.jar", + "hash": "f810d8c76637991990d17282be226feb7c8d74056147dc79f0d9d2a6e201aecc", + "path": "com/github/docker-java/docker-java-api/3.2.13/docker-java-api-3.2.13.jar" + }, + { + "url": "com/github/docker-java/docker-java-transport-zerodep/3.2.13/docker-java-transport-zerodep-3.2.13.jar", + "hash": "3f76f8eb0332607c145d69f27ad8aa6941b5448e745823641d3867ba3746f0f7", + "path": "com/github/docker-java/docker-java-transport-zerodep/3.2.13/docker-java-transport-zerodep-3.2.13.jar" + }, + { + "url": "com/github/docker-java/docker-java-transport/3.2.13/docker-java-transport-3.2.13.jar", + "hash": "778c35c0557cd3ba4f1c9f64fb942f77ca7e390c5daae4471854150f4ee8d87d", + "path": "com/github/docker-java/docker-java-transport/3.2.13/docker-java-transport-3.2.13.jar" + }, + { + "url": "com/jetbrains/intellij/documentation/tips-pycharm-community/232.101/tips-pycharm-community-232.101.jar", + "hash": "9d6ba2bb12f36e6f39ae685956140a542c547387bac26c655246485543902a58", + "path": "com/jetbrains/intellij/documentation/tips-pycharm-community/232.101/tips-pycharm-community-232.101.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/transport_java_proto/223.0.1.0/transport_java_proto-223.0.1.0.jar", + "hash": "a27d48e4ae35e6e22742c0871d180aa9eb5cbc52d6aa004a7d3905ac8cb3a49e", + "path": "org/jetbrains/intellij/deps/android/tools/base/transport_java_proto/223.0.1.0/transport_java_proto-223.0.1.0.jar" + }, + { + "url": "com/google/truth/truth/0.42/truth-0.42.jar", + "hash": "dd652bdf0c4427c59848ac0340fd6b6d20c2cbfaa3c569a8366604dbcda5214c", + "path": "com/google/truth/truth/0.42/truth-0.42.jar" + }, + { + "url": "com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0.jar", + "hash": "61ba4dc49adca95243beaa0569adc2a23aedb5292ae78aa01186fa782ebdc5c2", + "path": "com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/utp-core-proto-jarjar/223.0.1.0/utp-core-proto-jarjar-223.0.1.0.jar", + "hash": "17106e8b6a1333c0101f4d25d675fa23705c0298c2b5e64d7ebc2942f78445d2", + "path": "org/jetbrains/intellij/deps/android/tools/base/utp-core-proto-jarjar/223.0.1.0/utp-core-proto-jarjar-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/winp/winp/1.30.1/winp-1.30.1.jar", + "hash": "9e2d7a23a1d3921861939509108606ad1cf6b10c64d65ac91958a62043cfa253", + "path": "org/jetbrains/intellij/deps/winp/winp/1.30.1/winp-1.30.1.jar" + }, + { + "url": "com/jetbrains/intellij/platform/workspace-model-codegen/0.0.3/workspace-model-codegen-0.0.3.jar", + "hash": "46f3dc4e4ecba738122df9868a4d457e750efdb5ff59ee9e1cb4af9f5aa39fc9", + "path": "com/jetbrains/intellij/platform/workspace-model-codegen/0.0.3/workspace-model-codegen-0.0.3.jar" + }, + { + "url": "xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar", + "hash": "47dcde8986019314ef78ae7280a94973a21d2ed95075a40a000b42da956429e1", + "path": "xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar" + }, + { + "url": "org/tukaani/xz/1.9/xz-1.9.jar", + "hash": "211b306cfc44f8f96df3a0a3ddaf75ba8c5289eed77d60d72f889bb855f535e5", + "path": "org/tukaani/xz/1.9/xz-1.9.jar" + }, + { + "url": "org/jetbrains/marketplace-zip-signer/0.1.8/marketplace-zip-signer-0.1.8.jar", + "hash": "826d4d3e21b6584dd9a74f12ef35a2285fe9514fa0093618944666c0a3db194a", + "path": "org/jetbrains/marketplace-zip-signer/0.1.8/marketplace-zip-signer-0.1.8.jar" + }, + { + "url": "com/github/luben/zstd-jni/1.5.2-5/zstd-jni-1.5.2-5.jar", + "hash": "0f8e64feaa068b8a02de45e9343f9b2fc401235b81e7fe3f80b2aeba001691b2", + "path": "com/github/luben/zstd-jni/1.5.2-5/zstd-jni-1.5.2-5.jar" + }, + { + "url": "org/jetbrains/intellij/deps/zstd-jni-windows-aarch64/1.5.2-5-25/zstd-jni-windows-aarch64-1.5.2-5-25.jar", + "hash": "7d30221c057c04a1005990410677ace7920047e3e7111d036c3809c846c7aab5", + "path": "org/jetbrains/intellij/deps/zstd-jni-windows-aarch64/1.5.2-5-25/zstd-jni-windows-aarch64-1.5.2-5-25.jar" + }, + { + "url": "com/google/zxing/core/3.5.1/core-3.5.1.jar", + "hash": "1ba7c0fbb6c267e2fb74e1497d855adae633ccc98edc8c75163aa64bc08e3059", + "path": "com/google/zxing/core/3.5.1/core-3.5.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-kotlin/0.3.5/completion-ranking-kotlin-0.3.5.jar", + "hash": "d410d83df200f3b9df5992c2653bbe2bff528a9bc9463cc4cacc644b5274029a", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-kotlin/0.3.5/completion-ranking-kotlin-0.3.5.jar" + }, + { + "url": "org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar", + "hash": "58812de60898d976fb81ef3b62da05c6604c18fd4a249f5044282479fc286af2", + "path": "org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar" + }, + { + "url": "xalan/xalan/2.7.2/xalan-2.7.2.jar", + "hash": "a44bd80e82cb0f4cfac0dac8575746223802514e3cec9dc75235bc0de646af14", + "path": "xalan/xalan/2.7.2/xalan-2.7.2.jar" + }, + { + "url": "xalan/serializer/2.7.2/serializer-2.7.2.jar", + "hash": "e8f5b4340d3b12a0cfa44ac2db4be4e0639e479ae847df04c4ed8b521734bb4a", + "path": "xalan/serializer/2.7.2/serializer-2.7.2.jar" + }, + { + "url": "org/apache/xmlbeans/xmlbeans/5.1.1/xmlbeans-5.1.1.jar", + "hash": "5f484a78bed71cbffe3709678b6bdd3463781a7c61c6d9872330aecbf150762a", + "path": "org/apache/xmlbeans/xmlbeans/5.1.1/xmlbeans-5.1.1.jar" + }, + { + "url": "org/apache/logging/log4j/log4j-to-slf4j/2.20.0/log4j-to-slf4j-2.20.0.jar", + "hash": "88e731d7f455da59dfa08769527f87d6c496053a712637df7b999f6977933a2c", + "path": "org/apache/logging/log4j/log4j-to-slf4j/2.20.0/log4j-to-slf4j-2.20.0.jar" + }, + { + "url": "org/apache/logging/log4j/log4j-api/2.20.0/log4j-api-2.20.0.jar", + "hash": "2f43eea679ea66f14ca0f13fec2a8600ac124f5a5231dcb4df8393eddcb97550", + "path": "org/apache/logging/log4j/log4j-api/2.20.0/log4j-api-2.20.0.jar" + }, + { + "url": "org/jetbrains/research/refactorinsight/kotlin-impl/1.1/kotlin-impl-1.1.jar", + "hash": "4f82b5f024ce886685560b3a4f7467d164e707956da0d9a822b03b2df6f53e32", + "path": "org/jetbrains/research/refactorinsight/kotlin-impl/1.1/kotlin-impl-1.1.jar" + }, + { + "url": "org/jetbrains/research/refactorinsight/common/1.1/common-1.1.jar", + "hash": "97ea3971d83a4503799375bd7b33ec590081476f6e2999cf1cb9fec5c6f3411e", + "path": "org/jetbrains/research/refactorinsight/common/1.1/common-1.1.jar" + }, + { + "url": "org/jetbrains/research/kotlinrminer/kotlinRMiner-ide/1.2.1/kotlinRMiner-ide-1.2.1.jar", + "hash": "48c13df97048b3535fe1c044bafa31629f23f9c01259f215127edccc1467aa1b", + "path": "org/jetbrains/research/kotlinrminer/kotlinRMiner-ide/1.2.1/kotlinRMiner-ide-1.2.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/changeReminder/prediction/randomForestRegressor/0.0.11/randomForestRegressor-0.0.11.jar", + "hash": "a6908f14a17757a20a0d629c5d2f0986826021c679bfb224963ef6a06097aa21", + "path": "org/jetbrains/intellij/deps/changeReminder/prediction/randomForestRegressor/0.0.11/randomForestRegressor-0.0.11.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/performance-kotlin/0.0.6/performance-kotlin-0.0.6.jar", + "hash": "f8b9b802decae658447475325ae341efd07b2f6e3915312c9b51c5168e158012", + "path": "org/jetbrains/intellij/deps/completion/performance-kotlin/0.0.6/performance-kotlin-0.0.6.jar" + }, + { + "url": "commons-discovery/commons-discovery/0.4/commons-discovery-0.4.jar", + "hash": "97d264e2f98821c4cd39eacfd597b4dc7c19d4232cf1f335fc2eab389b2d92fd", + "path": "commons-discovery/commons-discovery/0.4/commons-discovery-0.4.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-log-events/0.0.3/completion-log-events-0.0.3.jar", + "hash": "f6f453ba3dc824d16ae0911e403dcde8e18e0ea7406c91e2832e8b6248a1f404", + "path": "org/jetbrains/intellij/deps/completion/completion-log-events/0.0.3/completion-log-events-0.0.3.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-log-events/0.0.3/completion-log-events-0.0.3.jar", + "hash": "f6f453ba3dc824d16ae0911e403dcde8e18e0ea7406c91e2832e8b6248a1f404", + "path": "org/jetbrains/intellij/deps/completion/completion-log-events/0.0.3/completion-log-events-0.0.3.jar" + }, + { + "url": "ai/grazie/spell/gec-spell-engine-local-jvm/0.2.181/gec-spell-engine-local-jvm-0.2.181.jar", + "hash": "b968dbbd0794e47c93d9f02a7849171b781cbec97e876703893156b8098d1d67", + "path": "ai/grazie/spell/gec-spell-engine-local-jvm/0.2.181/gec-spell-engine-local-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/utils/utils-common-jvm/0.2.181/utils-common-jvm-0.2.181.jar", + "hash": "2e7a050c3f089fe826d3ae60548134e13107a9bb7f255aac454eb5e2009d273d", + "path": "ai/grazie/utils/utils-common-jvm/0.2.181/utils-common-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/nlp/nlp-common-jvm/0.2.181/nlp-common-jvm-0.2.181.jar", + "hash": "04f7819509575671eff478c634cb5c82969e85e9bf1d0a6a99d99e76c661b8ab", + "path": "ai/grazie/nlp/nlp-common-jvm/0.2.181/nlp-common-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/nlp/nlp-tokenizer-jvm/0.2.181/nlp-tokenizer-jvm-0.2.181.jar", + "hash": "102375c6ecf3ca204f0b0fc27986355149a76f26ca8e3aded3be4cae61141b3a", + "path": "ai/grazie/nlp/nlp-tokenizer-jvm/0.2.181/nlp-tokenizer-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/nlp/nlp-langs-jvm/0.2.181/nlp-langs-jvm-0.2.181.jar", + "hash": "807fca2e2cdbbc87e3ef5e140f651898f795f660f952a83ad21efeb829311984", + "path": "ai/grazie/nlp/nlp-langs-jvm/0.2.181/nlp-langs-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/nlp/nlp-similarity-jvm/0.2.181/nlp-similarity-jvm-0.2.181.jar", + "hash": "7d21779a19dc3ccb037a1a5b85543162e358dbc656bea4926703315fdc125315", + "path": "ai/grazie/nlp/nlp-similarity-jvm/0.2.181/nlp-similarity-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/nlp/nlp-patterns-jvm/0.2.181/nlp-patterns-jvm-0.2.181.jar", + "hash": "f5890877d9a8a7ac801cf0cbdf4df239f44797978620fa943ea99380701e7f41", + "path": "ai/grazie/nlp/nlp-patterns-jvm/0.2.181/nlp-patterns-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/nlp/nlp-phonetics-jvm/0.2.181/nlp-phonetics-jvm-0.2.181.jar", + "hash": "4cbf17f5c7049077cc1b8f885cb332b8d2271c7d3cd71d1501cda3e9328936d6", + "path": "ai/grazie/nlp/nlp-phonetics-jvm/0.2.181/nlp-phonetics-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/nlp/nlp-detect-jvm/0.2.181/nlp-detect-jvm-0.2.181.jar", + "hash": "a111002943aa5df409448862b89c56a0517b19161ad08e17cbc7a58bb48ccb2e", + "path": "ai/grazie/nlp/nlp-detect-jvm/0.2.181/nlp-detect-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/spell/hunspell-en-jvm/0.2.16/hunspell-en-jvm-0.2.16.jar", + "hash": "04c678713b197343c44bd744f8a3eebb26ab40067612c5170c14dd0a0f6ed507", + "path": "ai/grazie/spell/hunspell-en-jvm/0.2.16/hunspell-en-jvm-0.2.16.jar" + }, + { + "url": "ai/grazie/nlp/nlp-stemmer-jvm/0.2.181/nlp-stemmer-jvm-0.2.181.jar", + "hash": "88ba4475ec92a7f1a40a44dc6f631e4426952f5f943174edcb7be10b9e773166", + "path": "ai/grazie/nlp/nlp-stemmer-jvm/0.2.181/nlp-stemmer-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/model/model-gec-jvm/0.2.181/model-gec-jvm-0.2.181.jar", + "hash": "f4a8f5f20627be8ed6ad6e96193f332f5054b6be983c446424b5852b118c7ddd", + "path": "ai/grazie/model/model-gec-jvm/0.2.181/model-gec-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/model/model-text-jvm/0.2.181/model-text-jvm-0.2.181.jar", + "hash": "62cc8ea821d734fef552da80b78c87c92f5e65322530b157c07aaefecf702b99", + "path": "ai/grazie/model/model-text-jvm/0.2.181/model-text-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/model/model-common-jvm/0.2.181/model-common-jvm-0.2.181.jar", + "hash": "4aff241f00efbe7c17960a3a3efb1ba046586a562b53a25a68d2964fafff48d7", + "path": "ai/grazie/model/model-common-jvm/0.2.181/model-common-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/utils/utils-lucene-lt-compatibility-jvm/0.2.181/utils-lucene-lt-compatibility-jvm-0.2.181.jar", + "hash": "cbc2a1339391d3ea1e059b192e7424dfff8593bcc5a1b674359714a817f4b705", + "path": "ai/grazie/utils/utils-lucene-lt-compatibility-jvm/0.2.181/utils-lucene-lt-compatibility-jvm-0.2.181.jar" + }, + { + "url": "info/debatty/java-string-similarity/2.0.0/java-string-similarity-2.0.0.jar", + "hash": "87675985e637d231b5783d1fea0bd947e71267bf557adc93ce3daec8a519bd22", + "path": "info/debatty/java-string-similarity/2.0.0/java-string-similarity-2.0.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/org.eclipse.jgit/6.5.0.202303070854-r-custom-4/org.eclipse.jgit-6.5.0.202303070854-r-custom-4.jar", + "hash": "d9b12a3323f6447a7ca8de3d781166224f11c3505fe43dc0a9dfb1f33eb3cf04", + "path": "org/jetbrains/intellij/deps/org.eclipse.jgit/6.5.0.202303070854-r-custom-4/org.eclipse.jgit-6.5.0.202303070854-r-custom-4.jar" + }, + { + "url": "com/googlecode/javaewah/JavaEWAH/1.1.13/JavaEWAH-1.1.13.jar", + "hash": "4c0fda2b1d317750d7ea324e36c70b2bc48310c0aaae67b98df0915d696d7111", + "path": "com/googlecode/javaewah/JavaEWAH/1.1.13/JavaEWAH-1.1.13.jar" + }, + { + "url": "org/jetbrains/intellij/deps/org.eclipse.jgit/6.5.0.202303070854-r-custom-4/org.eclipse.jgit-6.5.0.202303070854-r-custom-4.jar", + "hash": "d9b12a3323f6447a7ca8de3d781166224f11c3505fe43dc0a9dfb1f33eb3cf04", + "path": "org/jetbrains/intellij/deps/org.eclipse.jgit/6.5.0.202303070854-r-custom-4/org.eclipse.jgit-6.5.0.202303070854-r-custom-4.jar" + }, + { + "url": "com/googlecode/javaewah/JavaEWAH/1.1.13/JavaEWAH-1.1.13.jar", + "hash": "4c0fda2b1d317750d7ea324e36c70b2bc48310c0aaae67b98df0915d696d7111", + "path": "com/googlecode/javaewah/JavaEWAH/1.1.13/JavaEWAH-1.1.13.jar" + }, + { + "url": "org/eclipse/jgit/org.eclipse.jgit.ssh.jsch/6.5.0.202303070854-r/org.eclipse.jgit.ssh.jsch-6.5.0.202303070854-r.jar", + "hash": "8ab7b5fefc2a42c5156c678148f415ce35ae8d93a8e3127b5426241e965606f6", + "path": "org/eclipse/jgit/org.eclipse.jgit.ssh.jsch/6.5.0.202303070854-r/org.eclipse.jgit.ssh.jsch-6.5.0.202303070854-r.jar" + }, + { + "url": "com/jcraft/jsch/0.1.55/jsch-0.1.55.jar", + "hash": "d492b15a6d2ea3f1cc39c422c953c40c12289073dbe8360d98c0f6f9ec74fc44", + "path": "com/jcraft/jsch/0.1.55/jsch-0.1.55.jar" + }, + { + "url": "ai/grazie/spell/gec-spell-engine-local-jvm/0.2.181/gec-spell-engine-local-jvm-0.2.181.jar", + "hash": "b968dbbd0794e47c93d9f02a7849171b781cbec97e876703893156b8098d1d67", + "path": "ai/grazie/spell/gec-spell-engine-local-jvm/0.2.181/gec-spell-engine-local-jvm-0.2.181.jar" + }, + { + "url": "org/jetbrains/intellij/deps/searchEverywhere/model/find-action-model/231.0.0/find-action-model-231.0.0.jar", + "hash": "e0717acecdebc0c23e71a73a16c7a4287fd790a800cc6e2f2213e018a315bfcb", + "path": "org/jetbrains/intellij/deps/searchEverywhere/model/find-action-model/231.0.0/find-action-model-231.0.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/searchEverywhere/model/find-action-model/231.1.1/find-action-model-231.1.1.jar", + "hash": "7411cc9090801d3e8684ca170846de4aa60ce27da70d1b0af2c23e7d3efb1f05", + "path": "org/jetbrains/intellij/deps/searchEverywhere/model/find-action-model/231.1.1/find-action-model-231.1.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/searchEverywhere/model/find-file-model/223.1.0/find-file-model-223.1.0.jar", + "hash": "36728a93eed083d88318628ecc341a8d0928ec934d9b56e07f81610e7996c74b", + "path": "org/jetbrains/intellij/deps/searchEverywhere/model/find-file-model/223.1.0/find-file-model-223.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/searchEverywhere/model/find-file-model/232.0.1/find-file-model-232.0.1.jar", + "hash": "fc794f0ec27897a11c43075ec94e2fc2df4e5c5b6d50f1e22312efd1d343597b", + "path": "org/jetbrains/intellij/deps/searchEverywhere/model/find-file-model/232.0.1/find-file-model-232.0.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/searchEverywhere/model/find-classes-model/231.0.0/find-classes-model-231.0.0.jar", + "hash": "8269c5e164ad03387ef0df89197d9c3444f8a1c039e52ebfbfff37ca69a380f4", + "path": "org/jetbrains/intellij/deps/searchEverywhere/model/find-classes-model/231.0.0/find-classes-model-231.0.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/searchEverywhere/model/find-classes-model/231.4.1/find-classes-model-231.4.1.jar", + "hash": "a2ca8c6aeb54677fee7375083901ad157e35db98e81616ceef3049afc1775682", + "path": "org/jetbrains/intellij/deps/searchEverywhere/model/find-classes-model/231.4.1/find-classes-model-231.4.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/searchEverywhere/model/find-all-model/232.1.1/find-all-model-232.1.1.jar", + "hash": "b8de4c4b9d7baf979279f562b094cf85ed106bb00d04535d9dc4206c5625dd59", + "path": "org/jetbrains/intellij/deps/searchEverywhere/model/find-all-model/232.1.1/find-all-model-232.1.1.jar" + }, + { + "url": "isorelax/isorelax/20030108/isorelax-20030108.jar", + "hash": "3427152431cf7f967f92e69e5cac16147c5d8fb4b4e5a8a72f5291788efcff8c", + "path": "isorelax/isorelax/20030108/isorelax-20030108.jar" + }, + { + "url": "thaiopensource/jing/20030619/jing-20030619.jar", + "hash": "600acd9ebd37dd46e3a006bc6e748d68dfeb31cbf4881a84d06e6dc5cc5eed26", + "path": "thaiopensource/jing/20030619/jing-20030619.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-python/0.2.3/completion-ranking-python-0.2.3.jar", + "hash": "68dc28fcf866c5f7b16aadbc8d1cb6f64a360696b15513f363cf7ed0808402cd", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-python/0.2.3/completion-ranking-python-0.2.3.jar" + }, + { + "url": "completion/ml/python/features/ml-completion-prev-exprs-models/1.11/ml-completion-prev-exprs-models-1.11.jar", + "hash": "8924b199c8cc52530de2b250670806d8b046fa5ae9d32a9f27a9b224e934a1ad", + "path": "completion/ml/python/features/ml-completion-prev-exprs-models/1.11/ml-completion-prev-exprs-models-1.11.jar" + }, + { + "url": "org/apache/tuweni/tuweni-toml/2.0.0/tuweni-toml-2.0.0.jar", + "hash": "b7331e02e955b6b962a8fa89eb8d7db0960d0b232880bfc60e8602fb3fed36ad", + "path": "org/apache/tuweni/tuweni-toml/2.0.0/tuweni-toml-2.0.0.jar" + }, + { + "url": "org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar", + "hash": "43516d19beae35909e04d06af6c0c58c17bc94e0070c85e8dc9929ca640dc91d", + "path": "org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/trove4j/1.0.20221201/trove4j-1.0.20221201.jar", + "hash": "3d1ce86790d123de204215c4b2b8896afaed63abfdece24393e2183df5394c32", + "path": "org/jetbrains/intellij/deps/trove4j/1.0.20221201/trove4j-1.0.20221201.jar" + }, + { + "url": "com/intellij/remoterobot/remote-fixtures/0.11.16/remote-fixtures-0.11.16.jar", + "hash": "f7d51a8bda35e72bb4ef01301916b96a793c9f8ddd26474da54c38fa9e8ec2cc", + "path": "com/intellij/remoterobot/remote-fixtures/0.11.16/remote-fixtures-0.11.16.jar" + }, + { + "url": "com/intellij/remoterobot/robot-server-core/0.11.16/robot-server-core-0.11.16.jar", + "hash": "7a7b77c25d28059eecc73075198eab5d06b23774ab6e0aab10b1fc9e82f0abbd", + "path": "com/intellij/remoterobot/robot-server-core/0.11.16/robot-server-core-0.11.16.jar" + }, + { + "url": "com/intellij/remoterobot/remote-robot/0.11.16/remote-robot-0.11.16.jar", + "hash": "f20be85d7ec4ad921b9d14f116b8661ab9e6a1a1df20bf2101c9c532bdd0a513", + "path": "com/intellij/remoterobot/remote-robot/0.11.16/remote-robot-0.11.16.jar" + }, + { + "url": "org/slf4j/slf4j-api/2.0.0/slf4j-api-2.0.0.jar", + "hash": "a223e6df91b84f19d49c5ebc5f5f97c7f4438419f84a52fa05e1cfc6eed38aa9", + "path": "org/slf4j/slf4j-api/2.0.0/slf4j-api-2.0.0.jar" + }, + { + "url": "org/jetbrains/kotlin/kotlin-reflect/1.7.10/kotlin-reflect-1.7.10.jar", + "hash": "187c5e5a588a6ed18c3a41b54df138a5944121bdb396be1c3fa4abee67397955", + "path": "org/jetbrains/kotlin/kotlin-reflect/1.7.10/kotlin-reflect-1.7.10.jar" + }, + { + "url": "com/squareup/retrofit2/retrofit/2.9.0/retrofit-2.9.0.jar", + "hash": "e6ea1929c46852f5bec66ab3357da383476cef4e8d1deefdbf195b79cc4d6581", + "path": "com/squareup/retrofit2/retrofit/2.9.0/retrofit-2.9.0.jar" + }, + { + "url": "com/squareup/okhttp3/okhttp/3.14.9/okhttp-3.14.9.jar", + "hash": "2570fab55515cbf881d7a4ceef49fc515490bc027057e666776a2832465aeca0", + "path": "com/squareup/okhttp3/okhttp/3.14.9/okhttp-3.14.9.jar" + }, + { + "url": "com/squareup/okio/okio/1.17.2/okio-1.17.2.jar", + "hash": "f80ce42d2ffac47ad4c47e1d6f980d604d247ceb1a886705cf4581ab0c9fe2b8", + "path": "com/squareup/okio/okio/1.17.2/okio-1.17.2.jar" + }, + { + "url": "com/squareup/retrofit2/converter-gson/2.9.0/converter-gson-2.9.0.jar", + "hash": "32aa206b9a29c9df5eda93a092cfb3b0b9133e232c062baa882f0319f0e79f0e", + "path": "com/squareup/retrofit2/converter-gson/2.9.0/converter-gson-2.9.0.jar" + }, + { + "url": "org/mozilla/rhino/1.7.14/rhino-1.7.14.jar", + "hash": "c9290b0d801bf0dbbbc44338e0f769b7650a0c5d04e6bb1aeb85775c0211b003", + "path": "org/mozilla/rhino/1.7.14/rhino-1.7.14.jar" + }, + { + "url": "org/assertj/assertj-swing-junit/3.17.1/assertj-swing-junit-3.17.1.jar", + "hash": "e56fea51b7969240460d027a17f1c704b43e4eeca49a8c57206d573da3e30871", + "path": "org/assertj/assertj-swing-junit/3.17.1/assertj-swing-junit-3.17.1.jar" + }, + { + "url": "junit/junit/4.12/junit-4.12.jar", + "hash": "59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a", + "path": "junit/junit/4.12/junit-4.12.jar" + }, + { + "url": "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar", + "hash": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9", + "path": "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" + }, + { + "url": "org/assertj/assertj-swing/3.17.1/assertj-swing-3.17.1.jar", + "hash": "e36445438d72d83cc48015dcb3f14d9a97eaa42c4663a9826db2bb50e4c7713b", + "path": "org/assertj/assertj-swing/3.17.1/assertj-swing-3.17.1.jar" + }, + { + "url": "org/assertj/assertj-core/3.17.2/assertj-core-3.17.2.jar", + "hash": "d9a978d559d0b52a87f419b3d8f5bb137b97c661f7be2134e0498b454e4b980e", + "path": "org/assertj/assertj-core/3.17.2/assertj-core-3.17.2.jar" + }, + { + "url": "org/easytesting/fest-util/1.2.5/fest-util-1.2.5.jar", + "hash": "7b52f4d3ad41b7ed71f5b6b11833113b7e08326c8ef70d2dedf0b430c7ba5341", + "path": "org/easytesting/fest-util/1.2.5/fest-util-1.2.5.jar" + }, + { + "url": "org/easytesting/fest-reflect/1.4.1/fest-reflect-1.4.1.jar", + "hash": "c1ca19fcf0cd3555baf7c2af147c04ad22b4393ab75e5db0284e5170fb554c16", + "path": "org/easytesting/fest-reflect/1.4.1/fest-reflect-1.4.1.jar" + }, + { + "url": "com/squareup/okhttp3/mockwebserver/5.0.0-alpha.11/mockwebserver-5.0.0-alpha.11.jar", + "hash": "4a30234a911a73ae71f5aec5f98bee243c172665e841f8d532ef77e0b5e81010", + "path": "com/squareup/okhttp3/mockwebserver/5.0.0-alpha.11/mockwebserver-5.0.0-alpha.11.jar" + }, + { + "url": "com/squareup/okhttp3/mockwebserver3/5.0.0-alpha.11/mockwebserver3-5.0.0-alpha.11.jar", + "hash": "9c9e3ef454b514d4a1342faf99c7d4cb41eaae4cb7aefcc93cb7b202bdf4fdfd", + "path": "com/squareup/okhttp3/mockwebserver3/5.0.0-alpha.11/mockwebserver3-5.0.0-alpha.11.jar" + }, + { + "url": "com/thoughtworks/qdox/qdox/2.0.1/qdox-2.0.1.jar", + "hash": "c28db4602da9f3817a59de9be137c1f6083a9cb95fa1781f54eda75763a95c67", + "path": "com/thoughtworks/qdox/qdox/2.0.1/qdox-2.0.1.jar" + }, + { + "url": "com/pngencoder/pngencoder/0.14.0/pngencoder-0.14.0.jar", + "hash": "79bf02e8f49833dc3433ae1554999dd375075e5ab13447fc1e558857b51baecc", + "path": "com/pngencoder/pngencoder/0.14.0/pngencoder-0.14.0.jar" + }, + { + "url": "net/bytebuddy/byte-buddy-agent/1.14.0/byte-buddy-agent-1.14.0.jar", + "hash": "4b23cda64beade8b78ec80fd321e017a0cc2413e4d73f323d8e617222a0e5d2c", + "path": "net/bytebuddy/byte-buddy-agent/1.14.0/byte-buddy-agent-1.14.0.jar" + }, + { + "url": "com/willowtreeapps/assertk/assertk-jvm/0.23/assertk-jvm-0.23.jar", + "hash": "424e8f9f9452fa2029ed54f664917b848745e488faaad5eebdb51174683f1db8", + "path": "com/willowtreeapps/assertk/assertk-jvm/0.23/assertk-jvm-0.23.jar" + }, + { + "url": "com/willowtreeapps/opentest4k/opentest4k-jvm/1.2.1/opentest4k-jvm-1.2.1.jar", + "hash": "fab15bbc792057f3762867574b3bb7c993b1ee4f9e82b1c79471891c9b3a7055", + "path": "com/willowtreeapps/opentest4k/opentest4k-jvm/1.2.1/opentest4k-jvm-1.2.1.jar" + }, + { + "url": "org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar", + "hash": "58812de60898d976fb81ef3b62da05c6604c18fd4a249f5044282479fc286af2", + "path": "org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar" + }, + { + "url": "com/github/hypfvieh/dbus-java-transport-native-unixsocket/4.2.1/dbus-java-transport-native-unixsocket-4.2.1.jar", + "hash": "bb67de9bd08148123b918458efc78055146bd5ae1538487cf4a018dd0f644837", + "path": "com/github/hypfvieh/dbus-java-transport-native-unixsocket/4.2.1/dbus-java-transport-native-unixsocket-4.2.1.jar" + }, + { + "url": "com/github/hypfvieh/dbus-java-core/4.2.1/dbus-java-core-4.2.1.jar", + "hash": "3a7b9fd543a1be94de99009c36ac1803f08d6d12357706c8f5040855315469d1", + "path": "com/github/hypfvieh/dbus-java-core/4.2.1/dbus-java-core-4.2.1.jar" + }, + { + "url": "com/jetbrains/format-ripper/format-ripper/1.1.1/format-ripper-1.1.1.jar", + "hash": "c5edac7046453d487daf26bfce1ebb0ccb2d51e07167d01878a13ffdb9b66b8e", + "path": "com/jetbrains/format-ripper/format-ripper/1.1.1/format-ripper-1.1.1.jar" + }, + { + "url": "org/jetbrains/apple-notary-api-kotlin-client/1.0.2/apple-notary-api-kotlin-client-1.0.2.jar", + "hash": "25ac259e3506b4d80d038131445643d80bffc097488da73a9cbea05a2f14270b", + "path": "org/jetbrains/apple-notary-api-kotlin-client/1.0.2/apple-notary-api-kotlin-client-1.0.2.jar" + }, + { + "url": "com/amazonaws/aws-java-sdk-s3/1.12.431/aws-java-sdk-s3-1.12.431.jar", + "hash": "45b24b098dcaec230fde72b4e0568dab464cf7d8afd8b83fb9ac628778c67df9", + "path": "com/amazonaws/aws-java-sdk-s3/1.12.431/aws-java-sdk-s3-1.12.431.jar" + }, + { + "url": "com/amazonaws/aws-java-sdk-kms/1.12.431/aws-java-sdk-kms-1.12.431.jar", + "hash": "ffc62a11ad6a454d150a28c66c98e0300186faa53ec34d1c58c7dc5e2f7a3011", + "path": "com/amazonaws/aws-java-sdk-kms/1.12.431/aws-java-sdk-kms-1.12.431.jar" + }, + { + "url": "com/amazonaws/aws-java-sdk-core/1.12.431/aws-java-sdk-core-1.12.431.jar", + "hash": "e17a93342d623ecd58449b6142db53c5ec9d1fb7a6a40d6266e56ed796e06fdf", + "path": "com/amazonaws/aws-java-sdk-core/1.12.431/aws-java-sdk-core-1.12.431.jar" + }, + { + "url": "software/amazon/ion/ion-java/1.0.2/ion-java-1.0.2.jar", + "hash": "0d127b205a1fce0abc2a3757a041748651bc66c15cf4c059bac5833b27d471a5", + "path": "software/amazon/ion/ion-java/1.0.2/ion-java-1.0.2.jar" + }, + { + "url": "com/amazonaws/jmespath-java/1.12.431/jmespath-java-1.12.431.jar", + "hash": "238630e244b369b57238bb35e9a23382be65771b04a0f36d85df07b61b4ae2b9", + "path": "com/amazonaws/jmespath-java/1.12.431/jmespath-java-1.12.431.jar" + }, + { + "url": "com/auth0/java-jwt/4.3.0/java-jwt-4.3.0.jar", + "hash": "25a2353a1789870d960c0a9d8878a62eb1873116a2299d74f278451697676a67", + "path": "com/auth0/java-jwt/4.3.0/java-jwt-4.3.0.jar" + }, + { + "url": "org/jetbrains/intellij/plugins/structure-intellij/3.247/structure-intellij-3.247.jar", + "hash": "92bf25de8508be9d8dc84f65fd1b08c348a3f54a726fae389f0a92797e8816ce", + "path": "org/jetbrains/intellij/plugins/structure-intellij/3.247/structure-intellij-3.247.jar" + }, + { + "url": "org/jetbrains/intellij/plugins/structure-base/3.247/structure-base-3.247.jar", + "hash": "80f807bca6b0c01ec2d9c126f65906172698ba67897286574aff17d52cfae792", + "path": "org/jetbrains/intellij/plugins/structure-base/3.247/structure-base-3.247.jar" + }, + { + "url": "org/atteo/evo-inflector/1.3/evo-inflector-1.3.jar", + "hash": "ac0192fd110a0363732b17ea94fd1ce8cfd85790c8e1551e14f866908b5d80e1", + "path": "org/atteo/evo-inflector/1.3/evo-inflector-1.3.jar" + }, + { + "url": "org/jdom/jdom2/2.0.6.1/jdom2-2.0.6.1.jar", + "hash": "0b20f45e3a0fd8f0d12cdc5316b06776e902b1365db00118876f9175c60f302c", + "path": "org/jdom/jdom2/2.0.6.1/jdom2-2.0.6.1.jar" + }, + { + "url": "com/fasterxml/jackson/module/jackson-module-kotlin/2.14.1/jackson-module-kotlin-2.14.1.jar", + "hash": "8d83e6fe0ee319266dde031126da7c67024151b7c6a56410c3abb065fcd1ee7c", + "path": "com/fasterxml/jackson/module/jackson-module-kotlin/2.14.1/jackson-module-kotlin-2.14.1.jar" + }, + { + "url": "com/github/oshi/oshi-core/6.2.2/oshi-core-6.2.2.jar", + "hash": "efbca93df18f3eb16964a92d8342f0674dd5d90da575ef8e04ef2e4eabec6910", + "path": "com/github/oshi/oshi-core/6.2.2/oshi-core-6.2.2.jar" + }, + { + "url": "io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar", + "hash": "164e026e01338638e3433e4f6efbda52ed9a64a94ced649c3d0bbe02a7c61282", + "path": "io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar" + }, + { + "url": "org/apache/maven/maven-embedder/4.0.0-alpha-7/maven-embedder-4.0.0-alpha-7.jar", + "hash": "81a06d512e4a1b68e227464d6d96fe3356518bede58198ad1ef22d8721796ab2", + "path": "org/apache/maven/maven-embedder/4.0.0-alpha-7/maven-embedder-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-settings/4.0.0-alpha-7/maven-settings-4.0.0-alpha-7.jar", + "hash": "ed63449dad9170c63170f491dfc9fad249acbede944b35fca53f6311f12b8d7c", + "path": "org/apache/maven/maven-settings/4.0.0-alpha-7/maven-settings-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-api-settings/4.0.0-alpha-7/maven-api-settings-4.0.0-alpha-7.jar", + "hash": "b6a31e1ea51f06d78062ea4ded5a60618a3544d6b50fb737213532a005340a7b", + "path": "org/apache/maven/maven-api-settings/4.0.0-alpha-7/maven-api-settings-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-api-xml/4.0.0-alpha-7/maven-api-xml-4.0.0-alpha-7.jar", + "hash": "3388f4d0465f5a7e9a6264baf506da1b052c51f7cc10b7ce73f09723e6cf1d92", + "path": "org/apache/maven/maven-api-xml/4.0.0-alpha-7/maven-api-xml-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-xml-impl/4.0.0-alpha-7/maven-xml-impl-4.0.0-alpha-7.jar", + "hash": "c89323b70dd491a3ef21432dba4cad2b74e26caaafd77178b0f15313fe0bd5f0", + "path": "org/apache/maven/maven-xml-impl/4.0.0-alpha-7/maven-xml-impl-4.0.0-alpha-7.jar" + }, + { + "url": "org/codehaus/plexus/plexus-xml/4.0.1/plexus-xml-4.0.1.jar", + "hash": "a5b13d1a8efb8e9240d9a32b7a7da87b5dfff563e7737f7005d334af861f1f62", + "path": "org/codehaus/plexus/plexus-xml/4.0.1/plexus-xml-4.0.1.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/4.0.0-alpha-7/maven-settings-builder-4.0.0-alpha-7.jar", + "hash": "e1316fb941d660ec92885bcd407b23c2f6cafde2d65f2e20980d61313cce95cb", + "path": "org/apache/maven/maven-settings-builder/4.0.0-alpha-7/maven-settings-builder-4.0.0-alpha-7.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/4.0.0/plexus-utils-4.0.0.jar", + "hash": "270cd703b48c6e5c8c691f1875f22d62d22cfe072c73ae2f5814d83d68c1da0b", + "path": "org/codehaus/plexus/plexus-utils/4.0.0/plexus-utils-4.0.0.jar" + }, + { + "url": "org/apache/maven/maven-toolchain-builder/4.0.0-alpha-7/maven-toolchain-builder-4.0.0-alpha-7.jar", + "hash": "6f7bb4fc853fd6f6bf115d0536862f03c639d43cc379467b31a2910db26a92b4", + "path": "org/apache/maven/maven-toolchain-builder/4.0.0-alpha-7/maven-toolchain-builder-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-toolchain-model/4.0.0-alpha-7/maven-toolchain-model-4.0.0-alpha-7.jar", + "hash": "0636b12b3fb6924a5ecc9a0290387f00d9bb332b3531aebbd321a386dbbb0db1", + "path": "org/apache/maven/maven-toolchain-model/4.0.0-alpha-7/maven-toolchain-model-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-api-toolchain/4.0.0-alpha-7/maven-api-toolchain-4.0.0-alpha-7.jar", + "hash": "60386af2373f63337a778adfb3fee9429bf4c52f46b5f1caa132d5e67468c77f", + "path": "org/apache/maven/maven-api-toolchain/4.0.0-alpha-7/maven-api-toolchain-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-core/4.0.0-alpha-7/maven-core-4.0.0-alpha-7.jar", + "hash": "4f5355706da95d9d0eab3cacd8b1d5a653cd44845d80e1c73ef358cf502a5a62", + "path": "org/apache/maven/maven-core/4.0.0-alpha-7/maven-core-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/4.0.0-alpha-7/maven-repository-metadata-4.0.0-alpha-7.jar", + "hash": "7368f6af6b963d46423ffad099dc645ab4e7ca468999dad50ce5c7333dab43a6", + "path": "org/apache/maven/maven-repository-metadata/4.0.0-alpha-7/maven-repository-metadata-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-artifact/4.0.0-alpha-7/maven-artifact-4.0.0-alpha-7.jar", + "hash": "77277a532f540344c86ca85ef1b478e0ff4248099fb3374ca1d08aa7826ff172", + "path": "org/apache/maven/maven-artifact/4.0.0-alpha-7/maven-artifact-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-model-transform/4.0.0-alpha-7/maven-model-transform-4.0.0-alpha-7.jar", + "hash": "1be0bedfcc9fbdb260bb764cb15f9c926bdc7d5457d6994ff0a5bc9ce1dfc908", + "path": "org/apache/maven/maven-model-transform/4.0.0-alpha-7/maven-model-transform-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-resolver-provider/4.0.0-alpha-7/maven-resolver-provider-4.0.0-alpha-7.jar", + "hash": "56e0bbc15b10f7b0b8ee550b8b1f473bfe9d621f63fb0e714f8e2fc25649412b", + "path": "org/apache/maven/maven-resolver-provider/4.0.0-alpha-7/maven-resolver-provider-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-api-core/4.0.0-alpha-7/maven-api-core-4.0.0-alpha-7.jar", + "hash": "37a2fd46f515005f5410157f1e98e0fc42900ff8b3fc5b662d5095df1617ce5d", + "path": "org/apache/maven/maven-api-core/4.0.0-alpha-7/maven-api-core-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-api-meta/4.0.0-alpha-7/maven-api-meta-4.0.0-alpha-7.jar", + "hash": "c4f6f3868f5b280cc7e268f0f95e1bb1d2a824afe92a8029e861be7ec48b1272", + "path": "org/apache/maven/maven-api-meta/4.0.0-alpha-7/maven-api-meta-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-impl/1.9.13/maven-resolver-impl-1.9.13.jar", + "hash": "62a69d27a939ef29fe4a2b0da7d595418aa6057c783987a36b8c1c73e7ad9245", + "path": "org/apache/maven/resolver/maven-resolver-impl/1.9.13/maven-resolver-impl-1.9.13.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-named-locks/1.9.13/maven-resolver-named-locks-1.9.13.jar", + "hash": "d73b1c35e6f8d1af61e2bf2e4f4a3ab1866ab06d2e19eefd8556afec9968357c", + "path": "org/apache/maven/resolver/maven-resolver-named-locks/1.9.13/maven-resolver-named-locks-1.9.13.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-spi/1.9.13/maven-resolver-spi-1.9.13.jar", + "hash": "bb417eb74dc47fda54f0f94a78dcae0db1d4771fcdc88b0364d2d3e0826622a1", + "path": "org/apache/maven/resolver/maven-resolver-spi/1.9.13/maven-resolver-spi-1.9.13.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.inject/0.9.0.M2/org.eclipse.sisu.inject-0.9.0.M2.jar", + "hash": "9b62bcfc352a2ec87da8b01e37c952a54d358bbb1af3f212648aeafe7ab2dbb5", + "path": "org/eclipse/sisu/org.eclipse.sisu.inject/0.9.0.M2/org.eclipse.sisu.inject-0.9.0.M2.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/4.0.0-alpha-7/maven-plugin-api-4.0.0-alpha-7.jar", + "hash": "17fd8e65a16e61bb6dce6937c0cb69d772d7d5d08c30ed7565ea74a568c1222c", + "path": "org/apache/maven/maven-plugin-api/4.0.0-alpha-7/maven-plugin-api-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-model/4.0.0-alpha-7/maven-model-4.0.0-alpha-7.jar", + "hash": "37cde0eb7edaea329643ba5a6e95808cdf6678e17327042bfb6679b8f68ab72f", + "path": "org/apache/maven/maven-model/4.0.0-alpha-7/maven-model-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-api-model/4.0.0-alpha-7/maven-api-model-4.0.0-alpha-7.jar", + "hash": "01b5489914f198da93c66b0c1d159d0e0f948bfc80a2dd36d872b1bc1b6825d8", + "path": "org/apache/maven/maven-api-model/4.0.0-alpha-7/maven-api-model-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/4.0.0-alpha-7/maven-model-builder-4.0.0-alpha-7.jar", + "hash": "916bf00f01a10233cac87d2abb1b900279147af29e573f2cdde3e25cedd409dd", + "path": "org/apache/maven/maven-model-builder/4.0.0-alpha-7/maven-model-builder-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/maven-builder-support/4.0.0-alpha-7/maven-builder-support-4.0.0-alpha-7.jar", + "hash": "12461c417ed4302e03412fcc4f0941bc6d5c26dc1bb0fac4ba2bd4000226d42f", + "path": "org/apache/maven/maven-builder-support/4.0.0-alpha-7/maven-builder-support-4.0.0-alpha-7.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-api/1.9.13/maven-resolver-api-1.9.13.jar", + "hash": "a2c9970ce72afceece098433e5501c4dd332494389353a17d9e48072e32db80f", + "path": "org/apache/maven/resolver/maven-resolver-api/1.9.13/maven-resolver-api-1.9.13.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-util/1.9.13/maven-resolver-util-1.9.13.jar", + "hash": "5976b25b1400e35087d6eceb33d77e3f1cd50efd37725b290270f9f68aabbee0", + "path": "org/apache/maven/resolver/maven-resolver-util/1.9.13/maven-resolver-util-1.9.13.jar" + }, + { + "url": "org/apache/maven/maven-slf4j-wrapper/4.0.0-alpha-7/maven-slf4j-wrapper-4.0.0-alpha-7.jar", + "hash": "c90964538cfd79a02b77d61db9738c5e04d3844e5f2effb442b8be33622adcd2", + "path": "org/apache/maven/maven-slf4j-wrapper/4.0.0-alpha-7/maven-slf4j-wrapper-4.0.0-alpha-7.jar" + }, + { + "url": "com/google/inject/guice/5.1.0/guice-5.1.0.jar", + "hash": "4130e50bfac48099c860f0d903b91860c81a249c90f38245f8fed58fc817bc26", + "path": "com/google/inject/guice/5.1.0/guice-5.1.0.jar" + }, + { + "url": "aopalliance/aopalliance/1.0/aopalliance-1.0.jar", + "hash": "0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08", + "path": "aopalliance/aopalliance/1.0/aopalliance-1.0.jar" + }, + { + "url": "com/google/guava/guava/30.1-jre/guava-30.1-jre.jar", + "hash": "e6dd072f9d3fe02a4600688380bd422bdac184caf6fe2418cfdd0934f09432aa", + "path": "com/google/guava/guava/30.1-jre/guava-30.1-jre.jar" + }, + { + "url": "com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar", + "hash": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26", + "path": "com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar", + "hash": "e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b", + "path": "javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.jar", + "hash": "52f77c5ec49f787c9c417ebed5d6efd9922f44a202f217376e4f94c0d74f3549", + "path": "org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.9.0.M2/org.eclipse.sisu.plexus-0.9.0.M2.jar", + "hash": "9500d303ce467e26d129dda8559c3f3a91277d41ab49d2c4b4a5779536a62fc1", + "path": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.9.0.M2/org.eclipse.sisu.plexus-0.9.0.M2.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/2.1.0/plexus-component-annotations-2.1.0.jar", + "hash": "bde3617ce9b5bcf9584126046080043af6a4b3baea40a3b153f02e7bbc32acac", + "path": "org/codehaus/plexus/plexus-component-annotations/2.1.0/plexus-component-annotations-2.1.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-sec-dispatcher/2.0/plexus-sec-dispatcher-2.0.jar", + "hash": "873139960c4c780176dda580b003a2c4bf82188bdce5bb99234e224ef7acfceb", + "path": "org/codehaus/plexus/plexus-sec-dispatcher/2.0/plexus-sec-dispatcher-2.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-cipher/2.0/plexus-cipher-2.0.jar", + "hash": "9a7f1b5c5a9effd61eadfd8731452a2f76a8e79111fac391ef75ea801bea203a", + "path": "org/codehaus/plexus/plexus-cipher/2.0/plexus-cipher-2.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar", + "hash": "b3b5412ce17889103ea564bcdfcf9fb3dfa540344ffeac6b538a73c9d7182662", + "path": "org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar" + }, + { + "url": "org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar", + "hash": "d3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0", + "path": "org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" + }, + { + "url": "commons-cli/commons-cli/1.5.0/commons-cli-1.5.0.jar", + "hash": "bc8bb01fc0fad250385706e20f927ddcff6173f6339b387dc879237752567ac6", + "path": "commons-cli/commons-cli/1.5.0/commons-cli-1.5.0.jar" + }, + { + "url": "org/apache/maven/maven-compat/3.6.0/maven-compat-3.6.0.jar", + "hash": "8f1a5d4daff952dabeb3acaa0aa642903702a1aa8b442fcd7a07a8cf9e3db48b", + "path": "org/apache/maven/maven-compat/3.6.0/maven-compat-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-model/3.6.0/maven-model-3.6.0.jar", + "hash": "a1bf0c7856afd1f1b9c81c22818328fb7a796b4047010e08f2e859d1896080a9", + "path": "org/apache/maven/maven-model/3.6.0/maven-model-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.6.0/maven-model-builder-3.6.0.jar", + "hash": "a7295f062b54d0cbd513ffbb6d21c9bc9e21d9904547f299831236a988e50ab3", + "path": "org/apache/maven/maven-model-builder/3.6.0/maven-model-builder-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-builder-support/3.6.0/maven-builder-support-3.6.0.jar", + "hash": "56affafea9c76168bbc5b8ee9d26dd2dbe95b8185b70d6b2a46dd9fc39d0dd53", + "path": "org/apache/maven/maven-builder-support/3.6.0/maven-builder-support-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.6.0/maven-settings-3.6.0.jar", + "hash": "053655dc2890f119cb13ddb90b1888b9cfcf1cea3a374c0656d53595b4f37542", + "path": "org/apache/maven/maven-settings/3.6.0/maven-settings-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.6.0/maven-settings-builder-3.6.0.jar", + "hash": "271a82555c399d9b06c7751a802c3b919081a06b7c9b839bd70e93ea2df386e3", + "path": "org/apache/maven/maven-settings-builder/3.6.0/maven-settings-builder-3.6.0.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.4/plexus-sec-dispatcher-1.4.jar", + "hash": "da73e32b58132e64daf12269fd9d011c0b303f234840f179908725a632b6b57c", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.4/plexus-sec-dispatcher-1.4.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar", + "hash": "5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4", + "path": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.6.0/maven-artifact-3.6.0.jar", + "hash": "3d5a0e77cde76d386b18c7400db1eb16aacef02e031ecd0d954477aeccc92155", + "path": "org/apache/maven/maven-artifact/3.6.0/maven-artifact-3.6.0.jar" + }, + { + "url": "org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar", + "hash": "dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68", + "path": "org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar" + }, + { + "url": "org/apache/maven/maven-core/3.6.0/maven-core-3.6.0.jar", + "hash": "c7611780b8456e2b29284b8c0d37cdd5358facdc1091d64ab46a2feddd2cb6ae", + "path": "org/apache/maven/maven-core/3.6.0/maven-core-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.6.0/maven-plugin-api-3.6.0.jar", + "hash": "0062a08b463314a1b5f8eb1a56207efb830fbdf547c42a3191eb146c4db39b1a", + "path": "org/apache/maven/maven-plugin-api/3.6.0/maven-plugin-api-3.6.0.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-spi/1.3.1/maven-resolver-spi-1.3.1.jar", + "hash": "d4d15a6d473d78608412818c091b3c01d37bdf4f0e453156a19724af843a03ea", + "path": "org/apache/maven/resolver/maven-resolver-spi/1.3.1/maven-resolver-spi-1.3.1.jar" + }, + { + "url": "org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar", + "hash": "3ba9c619893c767db0f9c3e826d5118b57c35229301bcd16d865a89cec16a7e5", + "path": "org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar" + }, + { + "url": "commons-io/commons-io/2.5/commons-io-2.5.jar", + "hash": "a10418348d234968600ccb1d988efcbbd08716e1d96936ccc1880e7d22513474", + "path": "commons-io/commons-io/2.5/commons-io-2.5.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.3/org.eclipse.sisu.inject-0.3.3.jar", + "hash": "c6935e0b7d362ed4ca768c9b71d5d4d98788ff0a79c0d2bb954c221a078b166b", + "path": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.3/org.eclipse.sisu.inject-0.3.3.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar", + "hash": "b2931d41740490a8d931cbe0cfe9ac20deb66cca606e679f52522f7f534c9fd7", + "path": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" + }, + { + "url": "org/apache/maven/maven-resolver-provider/3.6.0/maven-resolver-provider-3.6.0.jar", + "hash": "3e7d265ef4e9ade0f5de998961c6cac634cbf3fbdb839bb50a3a50b2ffbba7f8", + "path": "org/apache/maven/maven-resolver-provider/3.6.0/maven-resolver-provider-3.6.0.jar" + }, + { + "url": "org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar", + "hash": "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79", + "path": "org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.6.0/maven-repository-metadata-3.6.0.jar", + "hash": "21702a5beccf3731ecdd6ed87f8fd0ae2bb7856b12fe91585b5513840722b0c3", + "path": "org/apache/maven/maven-repository-metadata/3.6.0/maven-repository-metadata-3.6.0.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-api/1.3.1/maven-resolver-api-1.3.1.jar", + "hash": "6be437d670dffa24bac4187bc1567c34fab04fc569836f8b45b9d79cbfd493ea", + "path": "org/apache/maven/resolver/maven-resolver-api/1.3.1/maven-resolver-api-1.3.1.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-util/1.3.1/maven-resolver-util-1.3.1.jar", + "hash": "a7c2d81cd7d6df38e2997bf09507e0bca6fa85dfb635de4bf28a7c501cb574f4", + "path": "org/apache/maven/resolver/maven-resolver-util/1.3.1/maven-resolver-util-1.3.1.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-impl/1.3.1/maven-resolver-impl-1.3.1.jar", + "hash": "aaa41b53ed4fcc13b3d719d85f45b0fba21ee026dd4b625dd82210a28ee8e2fe", + "path": "org/apache/maven/resolver/maven-resolver-impl/1.3.1/maven-resolver-impl-1.3.1.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/3.1.0/plexus-utils-3.1.0.jar", + "hash": "0ffa0ad084ebff5712540a7b7ea0abda487c53d3a18f78c98d1a3675dab9bf61", + "path": "org/codehaus/plexus/plexus-utils/3.1.0/plexus-utils-3.1.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.25/plexus-interpolation-1.25.jar", + "hash": "e003802501574637f7abdc4e83e6d509a31e9ff825d12da6d1e419acf9688705", + "path": "org/codehaus/plexus/plexus-interpolation/1.25/plexus-interpolation-1.25.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.3/org.eclipse.sisu.plexus-0.3.3.jar", + "hash": "98045f5ecd802d6a96ba00394f8cb61259f9ac781ec2cb51ca0cb7b2c94ac720", + "path": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.3/org.eclipse.sisu.plexus-0.3.3.jar" + }, + { + "url": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", + "hash": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", + "path": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" + }, + { + "url": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", + "hash": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", + "path": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.jar", + "hash": "a7fee9435db716bff593e9fb5622bcf9f25e527196485929b0cd4065c43e61df", + "path": "org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.jar" + }, + { + "url": "org/apache/maven/wagon/wagon-provider-api/3.2.0/wagon-provider-api-3.2.0.jar", + "hash": "21beff005c5b5754911b85f3a60480341b29a2faf1cf3b56260e6b646081a54f", + "path": "org/apache/maven/wagon/wagon-provider-api/3.2.0/wagon-provider-api-3.2.0.jar" + }, + { + "url": "com/google/inject/guice/4.2.1/guice-4.2.1.jar", + "hash": "cb4a9a054a20f5b9fcdd9734e97804779714fa5d62b30a0f5b5e99084f9954b0", + "path": "com/google/inject/guice/4.2.1/guice-4.2.1.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "com/google/guava/guava/25.1-android/guava-25.1-android.jar", + "hash": "f7b8f8fed176b9cf6831b98cb07320d7fbe91d99b29999f752c3821dfe45bdc8", + "path": "com/google/guava/guava/25.1-android/guava-25.1-android.jar" + }, + { + "url": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar", + "hash": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + "path": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" + }, + { + "url": "org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar", + "hash": "a40b2ce6d8551e5b90b1bf637064303f32944d61b52ab2014e38699df573941b", + "path": "org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar" + }, + { + "url": "com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar", + "hash": "03d0329547c13da9e17c634d1049ea2ead093925e290567e1a364fd6b1fc7ff8", + "path": "com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar" + }, + { + "url": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar", + "hash": "2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6", + "path": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" + }, + { + "url": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar", + "hash": "2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d", + "path": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" + }, + { + "url": "org/apache/maven/maven-core/3.6.0/maven-core-3.6.0.jar", + "hash": "c7611780b8456e2b29284b8c0d37cdd5358facdc1091d64ab46a2feddd2cb6ae", + "path": "org/apache/maven/maven-core/3.6.0/maven-core-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-model/3.6.0/maven-model-3.6.0.jar", + "hash": "a1bf0c7856afd1f1b9c81c22818328fb7a796b4047010e08f2e859d1896080a9", + "path": "org/apache/maven/maven-model/3.6.0/maven-model-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.6.0/maven-settings-3.6.0.jar", + "hash": "053655dc2890f119cb13ddb90b1888b9cfcf1cea3a374c0656d53595b4f37542", + "path": "org/apache/maven/maven-settings/3.6.0/maven-settings-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.6.0/maven-settings-builder-3.6.0.jar", + "hash": "271a82555c399d9b06c7751a802c3b919081a06b7c9b839bd70e93ea2df386e3", + "path": "org/apache/maven/maven-settings-builder/3.6.0/maven-settings-builder-3.6.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.25/plexus-interpolation-1.25.jar", + "hash": "e003802501574637f7abdc4e83e6d509a31e9ff825d12da6d1e419acf9688705", + "path": "org/codehaus/plexus/plexus-interpolation/1.25/plexus-interpolation-1.25.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.4/plexus-sec-dispatcher-1.4.jar", + "hash": "da73e32b58132e64daf12269fd9d011c0b303f234840f179908725a632b6b57c", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.4/plexus-sec-dispatcher-1.4.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar", + "hash": "5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4", + "path": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" + }, + { + "url": "org/apache/maven/maven-builder-support/3.6.0/maven-builder-support-3.6.0.jar", + "hash": "56affafea9c76168bbc5b8ee9d26dd2dbe95b8185b70d6b2a46dd9fc39d0dd53", + "path": "org/apache/maven/maven-builder-support/3.6.0/maven-builder-support-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.6.0/maven-repository-metadata-3.6.0.jar", + "hash": "21702a5beccf3731ecdd6ed87f8fd0ae2bb7856b12fe91585b5513840722b0c3", + "path": "org/apache/maven/maven-repository-metadata/3.6.0/maven-repository-metadata-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.6.0/maven-artifact-3.6.0.jar", + "hash": "3d5a0e77cde76d386b18c7400db1eb16aacef02e031ecd0d954477aeccc92155", + "path": "org/apache/maven/maven-artifact/3.6.0/maven-artifact-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.6.0/maven-plugin-api-3.6.0.jar", + "hash": "0062a08b463314a1b5f8eb1a56207efb830fbdf547c42a3191eb146c4db39b1a", + "path": "org/apache/maven/maven-plugin-api/3.6.0/maven-plugin-api-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.6.0/maven-model-builder-3.6.0.jar", + "hash": "a7295f062b54d0cbd513ffbb6d21c9bc9e21d9904547f299831236a988e50ab3", + "path": "org/apache/maven/maven-model-builder/3.6.0/maven-model-builder-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-resolver-provider/3.6.0/maven-resolver-provider-3.6.0.jar", + "hash": "3e7d265ef4e9ade0f5de998961c6cac634cbf3fbdb839bb50a3a50b2ffbba7f8", + "path": "org/apache/maven/maven-resolver-provider/3.6.0/maven-resolver-provider-3.6.0.jar" + }, + { + "url": "org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar", + "hash": "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79", + "path": "org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-impl/1.3.1/maven-resolver-impl-1.3.1.jar", + "hash": "aaa41b53ed4fcc13b3d719d85f45b0fba21ee026dd4b625dd82210a28ee8e2fe", + "path": "org/apache/maven/resolver/maven-resolver-impl/1.3.1/maven-resolver-impl-1.3.1.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-api/1.3.1/maven-resolver-api-1.3.1.jar", + "hash": "6be437d670dffa24bac4187bc1567c34fab04fc569836f8b45b9d79cbfd493ea", + "path": "org/apache/maven/resolver/maven-resolver-api/1.3.1/maven-resolver-api-1.3.1.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-spi/1.3.1/maven-resolver-spi-1.3.1.jar", + "hash": "d4d15a6d473d78608412818c091b3c01d37bdf4f0e453156a19724af843a03ea", + "path": "org/apache/maven/resolver/maven-resolver-spi/1.3.1/maven-resolver-spi-1.3.1.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-util/1.3.1/maven-resolver-util-1.3.1.jar", + "hash": "a7c2d81cd7d6df38e2997bf09507e0bca6fa85dfb635de4bf28a7c501cb574f4", + "path": "org/apache/maven/resolver/maven-resolver-util/1.3.1/maven-resolver-util-1.3.1.jar" + }, + { + "url": "org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar", + "hash": "3ba9c619893c767db0f9c3e826d5118b57c35229301bcd16d865a89cec16a7e5", + "path": "org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar" + }, + { + "url": "commons-io/commons-io/2.5/commons-io-2.5.jar", + "hash": "a10418348d234968600ccb1d988efcbbd08716e1d96936ccc1880e7d22513474", + "path": "commons-io/commons-io/2.5/commons-io-2.5.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.3/org.eclipse.sisu.plexus-0.3.3.jar", + "hash": "98045f5ecd802d6a96ba00394f8cb61259f9ac781ec2cb51ca0cb7b2c94ac720", + "path": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.3/org.eclipse.sisu.plexus-0.3.3.jar" + }, + { + "url": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", + "hash": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", + "path": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" + }, + { + "url": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", + "hash": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", + "path": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.3/org.eclipse.sisu.inject-0.3.3.jar", + "hash": "c6935e0b7d362ed4ca768c9b71d5d4d98788ff0a79c0d2bb954c221a078b166b", + "path": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.3/org.eclipse.sisu.inject-0.3.3.jar" + }, + { + "url": "com/google/inject/guice/4.2.1/guice-4.2.1-no_aop.jar", + "hash": "158fd8f52d2a4b4ce4293ac2b833bb2427f5ddfe30df4ae0fd4675a1038a3b79", + "path": "com/google/inject/guice/4.2.1/guice-4.2.1-no_aop.jar" + }, + { + "url": "aopalliance/aopalliance/1.0/aopalliance-1.0.jar", + "hash": "0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08", + "path": "aopalliance/aopalliance/1.0/aopalliance-1.0.jar" + }, + { + "url": "com/google/guava/guava/25.1-android/guava-25.1-android.jar", + "hash": "f7b8f8fed176b9cf6831b98cb07320d7fbe91d99b29999f752c3821dfe45bdc8", + "path": "com/google/guava/guava/25.1-android/guava-25.1-android.jar" + }, + { + "url": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar", + "hash": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + "path": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" + }, + { + "url": "org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar", + "hash": "a40b2ce6d8551e5b90b1bf637064303f32944d61b52ab2014e38699df573941b", + "path": "org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar" + }, + { + "url": "com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar", + "hash": "03d0329547c13da9e17c634d1049ea2ead093925e290567e1a364fd6b1fc7ff8", + "path": "com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar" + }, + { + "url": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar", + "hash": "2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6", + "path": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" + }, + { + "url": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar", + "hash": "2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d", + "path": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/3.1.0/plexus-utils-3.1.0.jar", + "hash": "0ffa0ad084ebff5712540a7b7ea0abda487c53d3a18f78c98d1a3675dab9bf61", + "path": "org/codehaus/plexus/plexus-utils/3.1.0/plexus-utils-3.1.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar", + "hash": "b2931d41740490a8d931cbe0cfe9ac20deb66cca606e679f52522f7f534c9fd7", + "path": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.jar", + "hash": "a7fee9435db716bff593e9fb5622bcf9f25e527196485929b0cd4065c43e61df", + "path": "org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.jar" + }, + { + "url": "org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar", + "hash": "dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68", + "path": "org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar" + }, + { + "url": "org/apache/maven/maven-embedder/3.6.0/maven-embedder-3.6.0.jar", + "hash": "e41b031c1e5bc23dc94b67f678644d549b15461361789d592c54cc3939829945", + "path": "org/apache/maven/maven-embedder/3.6.0/maven-embedder-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.6.0/maven-settings-3.6.0.jar", + "hash": "053655dc2890f119cb13ddb90b1888b9cfcf1cea3a374c0656d53595b4f37542", + "path": "org/apache/maven/maven-settings/3.6.0/maven-settings-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.6.0/maven-settings-builder-3.6.0.jar", + "hash": "271a82555c399d9b06c7751a802c3b919081a06b7c9b839bd70e93ea2df386e3", + "path": "org/apache/maven/maven-settings-builder/3.6.0/maven-settings-builder-3.6.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.25/plexus-interpolation-1.25.jar", + "hash": "e003802501574637f7abdc4e83e6d509a31e9ff825d12da6d1e419acf9688705", + "path": "org/codehaus/plexus/plexus-interpolation/1.25/plexus-interpolation-1.25.jar" + }, + { + "url": "org/apache/maven/maven-core/3.6.0/maven-core-3.6.0.jar", + "hash": "c7611780b8456e2b29284b8c0d37cdd5358facdc1091d64ab46a2feddd2cb6ae", + "path": "org/apache/maven/maven-core/3.6.0/maven-core-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.6.0/maven-repository-metadata-3.6.0.jar", + "hash": "21702a5beccf3731ecdd6ed87f8fd0ae2bb7856b12fe91585b5513840722b0c3", + "path": "org/apache/maven/maven-repository-metadata/3.6.0/maven-repository-metadata-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.6.0/maven-artifact-3.6.0.jar", + "hash": "3d5a0e77cde76d386b18c7400db1eb16aacef02e031ecd0d954477aeccc92155", + "path": "org/apache/maven/maven-artifact/3.6.0/maven-artifact-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-resolver-provider/3.6.0/maven-resolver-provider-3.6.0.jar", + "hash": "3e7d265ef4e9ade0f5de998961c6cac634cbf3fbdb839bb50a3a50b2ffbba7f8", + "path": "org/apache/maven/maven-resolver-provider/3.6.0/maven-resolver-provider-3.6.0.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-impl/1.3.1/maven-resolver-impl-1.3.1.jar", + "hash": "aaa41b53ed4fcc13b3d719d85f45b0fba21ee026dd4b625dd82210a28ee8e2fe", + "path": "org/apache/maven/resolver/maven-resolver-impl/1.3.1/maven-resolver-impl-1.3.1.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-spi/1.3.1/maven-resolver-spi-1.3.1.jar", + "hash": "d4d15a6d473d78608412818c091b3c01d37bdf4f0e453156a19724af843a03ea", + "path": "org/apache/maven/resolver/maven-resolver-spi/1.3.1/maven-resolver-spi-1.3.1.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.3/org.eclipse.sisu.inject-0.3.3.jar", + "hash": "c6935e0b7d362ed4ca768c9b71d5d4d98788ff0a79c0d2bb954c221a078b166b", + "path": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.3/org.eclipse.sisu.inject-0.3.3.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.6.0/maven-plugin-api-3.6.0.jar", + "hash": "0062a08b463314a1b5f8eb1a56207efb830fbdf547c42a3191eb146c4db39b1a", + "path": "org/apache/maven/maven-plugin-api/3.6.0/maven-plugin-api-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-model/3.6.0/maven-model-3.6.0.jar", + "hash": "a1bf0c7856afd1f1b9c81c22818328fb7a796b4047010e08f2e859d1896080a9", + "path": "org/apache/maven/maven-model/3.6.0/maven-model-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.6.0/maven-model-builder-3.6.0.jar", + "hash": "a7295f062b54d0cbd513ffbb6d21c9bc9e21d9904547f299831236a988e50ab3", + "path": "org/apache/maven/maven-model-builder/3.6.0/maven-model-builder-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-builder-support/3.6.0/maven-builder-support-3.6.0.jar", + "hash": "56affafea9c76168bbc5b8ee9d26dd2dbe95b8185b70d6b2a46dd9fc39d0dd53", + "path": "org/apache/maven/maven-builder-support/3.6.0/maven-builder-support-3.6.0.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-api/1.3.1/maven-resolver-api-1.3.1.jar", + "hash": "6be437d670dffa24bac4187bc1567c34fab04fc569836f8b45b9d79cbfd493ea", + "path": "org/apache/maven/resolver/maven-resolver-api/1.3.1/maven-resolver-api-1.3.1.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-util/1.3.1/maven-resolver-util-1.3.1.jar", + "hash": "a7c2d81cd7d6df38e2997bf09507e0bca6fa85dfb635de4bf28a7c501cb574f4", + "path": "org/apache/maven/resolver/maven-resolver-util/1.3.1/maven-resolver-util-1.3.1.jar" + }, + { + "url": "org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar", + "hash": "3ba9c619893c767db0f9c3e826d5118b57c35229301bcd16d865a89cec16a7e5", + "path": "org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar" + }, + { + "url": "commons-io/commons-io/2.5/commons-io-2.5.jar", + "hash": "a10418348d234968600ccb1d988efcbbd08716e1d96936ccc1880e7d22513474", + "path": "commons-io/commons-io/2.5/commons-io-2.5.jar" + }, + { + "url": "com/google/inject/guice/4.2.1/guice-4.2.1-no_aop.jar", + "hash": "158fd8f52d2a4b4ce4293ac2b833bb2427f5ddfe30df4ae0fd4675a1038a3b79", + "path": "com/google/inject/guice/4.2.1/guice-4.2.1-no_aop.jar" + }, + { + "url": "aopalliance/aopalliance/1.0/aopalliance-1.0.jar", + "hash": "0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08", + "path": "aopalliance/aopalliance/1.0/aopalliance-1.0.jar" + }, + { + "url": "com/google/guava/guava/25.1-android/guava-25.1-android.jar", + "hash": "f7b8f8fed176b9cf6831b98cb07320d7fbe91d99b29999f752c3821dfe45bdc8", + "path": "com/google/guava/guava/25.1-android/guava-25.1-android.jar" + }, + { + "url": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar", + "hash": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + "path": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" + }, + { + "url": "org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar", + "hash": "a40b2ce6d8551e5b90b1bf637064303f32944d61b52ab2014e38699df573941b", + "path": "org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar" + }, + { + "url": "com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar", + "hash": "03d0329547c13da9e17c634d1049ea2ead093925e290567e1a364fd6b1fc7ff8", + "path": "com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar" + }, + { + "url": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar", + "hash": "2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6", + "path": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" + }, + { + "url": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar", + "hash": "2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d", + "path": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", + "hash": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", + "path": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/3.1.0/plexus-utils-3.1.0.jar", + "hash": "0ffa0ad084ebff5712540a7b7ea0abda487c53d3a18f78c98d1a3675dab9bf61", + "path": "org/codehaus/plexus/plexus-utils/3.1.0/plexus-utils-3.1.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar", + "hash": "b2931d41740490a8d931cbe0cfe9ac20deb66cca606e679f52522f7f534c9fd7", + "path": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.3/org.eclipse.sisu.plexus-0.3.3.jar", + "hash": "98045f5ecd802d6a96ba00394f8cb61259f9ac781ec2cb51ca0cb7b2c94ac720", + "path": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.3/org.eclipse.sisu.plexus-0.3.3.jar" + }, + { + "url": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", + "hash": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", + "path": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.jar", + "hash": "a7fee9435db716bff593e9fb5622bcf9f25e527196485929b0cd4065c43e61df", + "path": "org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.4/plexus-sec-dispatcher-1.4.jar", + "hash": "da73e32b58132e64daf12269fd9d011c0b303f234840f179908725a632b6b57c", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.4/plexus-sec-dispatcher-1.4.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.7/plexus-cipher-1.7.jar", + "hash": "114859861ff10f987b880d6f34e3215274af3cc92b3a73831c84d596e37c6511", + "path": "org/sonatype/plexus/plexus-cipher/1.7/plexus-cipher-1.7.jar" + }, + { + "url": "org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar", + "hash": "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79", + "path": "org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar" + }, + { + "url": "commons-cli/commons-cli/1.4/commons-cli-1.4.jar", + "hash": "fd3c7c9545a9cdb2051d1f9155c4f76b1e4ac5a57304404a6eedb578ffba7328", + "path": "commons-cli/commons-cli/1.4/commons-cli-1.4.jar" + }, + { + "url": "org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar", + "hash": "dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68", + "path": "org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar" + }, + { + "url": "org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar", + "hash": "dbb8c53ccc0b16a9dd8370d6e7de63102468caedac1e5fa2eb418319a6875293", + "path": "org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar" + }, + { + "url": "org/apache/maven/maven-core/3.0.5/maven-core-3.0.5.jar", + "hash": "ac8e617f951ecde3c4f6bca4922fdd7861500fe7d58289f26ad5adac443075bc", + "path": "org/apache/maven/maven-core/3.0.5/maven-core-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-model/3.0.5/maven-model-3.0.5.jar", + "hash": "876a76b663db6c7326ad234afe430c473d3261a06b3284f31d5eb4889d1c3084", + "path": "org/apache/maven/maven-model/3.0.5/maven-model-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.0.5/maven-settings-3.0.5.jar", + "hash": "d8f9f237afc21d8202eedffa29cbf6e9d46c78b3c22b217d16267216988221b9", + "path": "org/apache/maven/maven-settings/3.0.5/maven-settings-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.0.5/maven-settings-builder-3.0.5.jar", + "hash": "ac0e62e26b7f690e265ba75667531973b8a2da12b3b0ff102a612f05b42b6faf", + "path": "org/apache/maven/maven-settings-builder/3.0.5/maven-settings-builder-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.0.5/maven-repository-metadata-3.0.5.jar", + "hash": "c867b4e075a4548bf27422542f96b159f94c4e7ffaaf6427b10433afd6a3a38c", + "path": "org/apache/maven/maven-repository-metadata/3.0.5/maven-repository-metadata-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar", + "hash": "c6d5e244dd2329971f91b8df666ffe9e0b00a7dd014d6ee073b6f6cb82877f5c", + "path": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.0.5/maven-plugin-api-3.0.5.jar", + "hash": "469505f75b8526a338cfd7e0ec841655ae52ddbcc1b36482e97d72f52ce7d890", + "path": "org/apache/maven/maven-plugin-api/3.0.5/maven-plugin-api-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.0.5/maven-model-builder-3.0.5.jar", + "hash": "45a2c6ff76e12678eaf576bd7a68d028c5a5ba85fdc216a381ea86e9187e1b51", + "path": "org/apache/maven/maven-model-builder/3.0.5/maven-model-builder-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-aether-provider/3.0.5/maven-aether-provider-3.0.5.jar", + "hash": "c74327cd5d7b137c8be3591c766271ac8ace1a617518f0410b8a95579f9839b0", + "path": "org/apache/maven/maven-aether-provider/3.0.5/maven-aether-provider-3.0.5.jar" + }, + { + "url": "org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar", + "hash": "d5de4e299be5a79feb1dbe8ff3814034c6e44314b4c00b92ffa8d97576ded5b3", + "path": "org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-impl/1.13.1/aether-impl-1.13.1.jar", + "hash": "865511994805827e88f327944a089142bb7f3d88cde271ba3dceb732cb137a93", + "path": "org/sonatype/aether/aether-impl/1.13.1/aether-impl-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar", + "hash": "ae8dc80232771f8913febfa410c5719e9ba8ded81fb99788e214fd676dbbe13f", + "path": "org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar", + "hash": "687799a0ce988bee9e8eb9ae0ba870300adc0114248ad4a4327bdb625d27e010", + "path": "org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar" + }, + { + "url": "org/sonatype/sisu/sisu-inject-plexus/2.3.0/sisu-inject-plexus-2.3.0.jar", + "hash": "bf9083fb846993689409b2bdbc735048e53bac6cc32707cde7ef84817b6e9365", + "path": "org/sonatype/sisu/sisu-inject-plexus/2.3.0/sisu-inject-plexus-2.3.0.jar" + }, + { + "url": "org/sonatype/sisu/sisu-inject-bean/2.3.0/sisu-inject-bean-2.3.0.jar", + "hash": "75819b29737c2bee1bfbda1011d455c7036738e0ef32ffbf85ba1d8fa157ceb2", + "path": "org/sonatype/sisu/sisu-inject-bean/2.3.0/sisu-inject-bean-2.3.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar", + "hash": "7fc63378d3e84663619b9bedace9f9fe78b276c2be3c62ca2245449294c84176", + "path": "org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar", + "hash": "8b909f4ca9788647942f883d4e559bcc642123f7c6bcd3846983a2e465469c33", + "path": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar", + "hash": "259d528a29722cab6349d7e7d432e3fd4877c087ffcb04985a6612e97023bba8", + "path": "org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar", + "hash": "4df7a6a7be64b35bbccf60b5c115697f9ea3421d22674ae67135dde375fcca1f", + "path": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar", + "hash": "3b0559bb8432f28937efe6ca193ef54a8506d0075d73fd7406b9b116c6a11063", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar", + "hash": "5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4", + "path": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar", + "hash": "b2931d41740490a8d931cbe0cfe9ac20deb66cca606e679f52522f7f534c9fd7", + "path": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" + }, + { + "url": "org/apache/maven/maven-compat/3.0.5/maven-compat-3.0.5.jar", + "hash": "1e821ef210f502d541741e950399bf7db385dfbb07d6b09ab9d65ff3ff0567fc", + "path": "org/apache/maven/maven-compat/3.0.5/maven-compat-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-model/3.0.5/maven-model-3.0.5.jar", + "hash": "876a76b663db6c7326ad234afe430c473d3261a06b3284f31d5eb4889d1c3084", + "path": "org/apache/maven/maven-model/3.0.5/maven-model-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.0.5/maven-model-builder-3.0.5.jar", + "hash": "45a2c6ff76e12678eaf576bd7a68d028c5a5ba85fdc216a381ea86e9187e1b51", + "path": "org/apache/maven/maven-model-builder/3.0.5/maven-model-builder-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.0.5/maven-settings-3.0.5.jar", + "hash": "d8f9f237afc21d8202eedffa29cbf6e9d46c78b3c22b217d16267216988221b9", + "path": "org/apache/maven/maven-settings/3.0.5/maven-settings-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar", + "hash": "c6d5e244dd2329971f91b8df666ffe9e0b00a7dd014d6ee073b6f6cb82877f5c", + "path": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-core/3.0.5/maven-core-3.0.5.jar", + "hash": "ac8e617f951ecde3c4f6bca4922fdd7861500fe7d58289f26ad5adac443075bc", + "path": "org/apache/maven/maven-core/3.0.5/maven-core-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.0.5/maven-settings-builder-3.0.5.jar", + "hash": "ac0e62e26b7f690e265ba75667531973b8a2da12b3b0ff102a612f05b42b6faf", + "path": "org/apache/maven/maven-settings-builder/3.0.5/maven-settings-builder-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.0.5/maven-repository-metadata-3.0.5.jar", + "hash": "c867b4e075a4548bf27422542f96b159f94c4e7ffaaf6427b10433afd6a3a38c", + "path": "org/apache/maven/maven-repository-metadata/3.0.5/maven-repository-metadata-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.0.5/maven-plugin-api-3.0.5.jar", + "hash": "469505f75b8526a338cfd7e0ec841655ae52ddbcc1b36482e97d72f52ce7d890", + "path": "org/apache/maven/maven-plugin-api/3.0.5/maven-plugin-api-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-aether-provider/3.0.5/maven-aether-provider-3.0.5.jar", + "hash": "c74327cd5d7b137c8be3591c766271ac8ace1a617518f0410b8a95579f9839b0", + "path": "org/apache/maven/maven-aether-provider/3.0.5/maven-aether-provider-3.0.5.jar" + }, + { + "url": "org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar", + "hash": "d5de4e299be5a79feb1dbe8ff3814034c6e44314b4c00b92ffa8d97576ded5b3", + "path": "org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-impl/1.13.1/aether-impl-1.13.1.jar", + "hash": "865511994805827e88f327944a089142bb7f3d88cde271ba3dceb732cb137a93", + "path": "org/sonatype/aether/aether-impl/1.13.1/aether-impl-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar", + "hash": "ae8dc80232771f8913febfa410c5719e9ba8ded81fb99788e214fd676dbbe13f", + "path": "org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar", + "hash": "687799a0ce988bee9e8eb9ae0ba870300adc0114248ad4a4327bdb625d27e010", + "path": "org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar", + "hash": "259d528a29722cab6349d7e7d432e3fd4877c087ffcb04985a6612e97023bba8", + "path": "org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar", + "hash": "3b0559bb8432f28937efe6ca193ef54a8506d0075d73fd7406b9b116c6a11063", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar", + "hash": "5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4", + "path": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar", + "hash": "8b909f4ca9788647942f883d4e559bcc642123f7c6bcd3846983a2e465469c33", + "path": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar", + "hash": "7fc63378d3e84663619b9bedace9f9fe78b276c2be3c62ca2245449294c84176", + "path": "org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar" + }, + { + "url": "org/sonatype/sisu/sisu-inject-plexus/2.3.0/sisu-inject-plexus-2.3.0.jar", + "hash": "bf9083fb846993689409b2bdbc735048e53bac6cc32707cde7ef84817b6e9365", + "path": "org/sonatype/sisu/sisu-inject-plexus/2.3.0/sisu-inject-plexus-2.3.0.jar" + }, + { + "url": "org/sonatype/sisu/sisu-inject-bean/2.3.0/sisu-inject-bean-2.3.0.jar", + "hash": "75819b29737c2bee1bfbda1011d455c7036738e0ef32ffbf85ba1d8fa157ceb2", + "path": "org/sonatype/sisu/sisu-inject-bean/2.3.0/sisu-inject-bean-2.3.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar", + "hash": "4df7a6a7be64b35bbccf60b5c115697f9ea3421d22674ae67135dde375fcca1f", + "path": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" + }, + { + "url": "org/apache/maven/wagon/wagon-provider-api/2.4/wagon-provider-api-2.4.jar", + "hash": "f65d8d59d71bca18ffa259b5a6de67697bc65b9ff1142c7bb4417ab4b1cacd92", + "path": "org/apache/maven/wagon/wagon-provider-api/2.4/wagon-provider-api-2.4.jar" + }, + { + "url": "org/apache/maven/maven-embedder/3.0.5/maven-embedder-3.0.5.jar", + "hash": "020cdfeff9bc0f1eaba30ce87ecbe51ab25ceda5aba77d0f5aa560e35f3d55ce", + "path": "org/apache/maven/maven-embedder/3.0.5/maven-embedder-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.0.5/maven-settings-3.0.5.jar", + "hash": "d8f9f237afc21d8202eedffa29cbf6e9d46c78b3c22b217d16267216988221b9", + "path": "org/apache/maven/maven-settings/3.0.5/maven-settings-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-core/3.0.5/maven-core-3.0.5.jar", + "hash": "ac8e617f951ecde3c4f6bca4922fdd7861500fe7d58289f26ad5adac443075bc", + "path": "org/apache/maven/maven-core/3.0.5/maven-core-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-model/3.0.5/maven-model-3.0.5.jar", + "hash": "876a76b663db6c7326ad234afe430c473d3261a06b3284f31d5eb4889d1c3084", + "path": "org/apache/maven/maven-model/3.0.5/maven-model-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.0.5/maven-settings-builder-3.0.5.jar", + "hash": "ac0e62e26b7f690e265ba75667531973b8a2da12b3b0ff102a612f05b42b6faf", + "path": "org/apache/maven/maven-settings-builder/3.0.5/maven-settings-builder-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.0.5/maven-repository-metadata-3.0.5.jar", + "hash": "c867b4e075a4548bf27422542f96b159f94c4e7ffaaf6427b10433afd6a3a38c", + "path": "org/apache/maven/maven-repository-metadata/3.0.5/maven-repository-metadata-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar", + "hash": "c6d5e244dd2329971f91b8df666ffe9e0b00a7dd014d6ee073b6f6cb82877f5c", + "path": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-aether-provider/3.0.5/maven-aether-provider-3.0.5.jar", + "hash": "c74327cd5d7b137c8be3591c766271ac8ace1a617518f0410b8a95579f9839b0", + "path": "org/apache/maven/maven-aether-provider/3.0.5/maven-aether-provider-3.0.5.jar" + }, + { + "url": "org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar", + "hash": "d5de4e299be5a79feb1dbe8ff3814034c6e44314b4c00b92ffa8d97576ded5b3", + "path": "org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-impl/1.13.1/aether-impl-1.13.1.jar", + "hash": "865511994805827e88f327944a089142bb7f3d88cde271ba3dceb732cb137a93", + "path": "org/sonatype/aether/aether-impl/1.13.1/aether-impl-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar", + "hash": "ae8dc80232771f8913febfa410c5719e9ba8ded81fb99788e214fd676dbbe13f", + "path": "org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar", + "hash": "687799a0ce988bee9e8eb9ae0ba870300adc0114248ad4a4327bdb625d27e010", + "path": "org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar", + "hash": "7fc63378d3e84663619b9bedace9f9fe78b276c2be3c62ca2245449294c84176", + "path": "org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.0.5/maven-plugin-api-3.0.5.jar", + "hash": "469505f75b8526a338cfd7e0ec841655ae52ddbcc1b36482e97d72f52ce7d890", + "path": "org/apache/maven/maven-plugin-api/3.0.5/maven-plugin-api-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.0.5/maven-model-builder-3.0.5.jar", + "hash": "45a2c6ff76e12678eaf576bd7a68d028c5a5ba85fdc216a381ea86e9187e1b51", + "path": "org/apache/maven/maven-model-builder/3.0.5/maven-model-builder-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-compat/3.0.5/maven-compat-3.0.5.jar", + "hash": "1e821ef210f502d541741e950399bf7db385dfbb07d6b09ab9d65ff3ff0567fc", + "path": "org/apache/maven/maven-compat/3.0.5/maven-compat-3.0.5.jar" + }, + { + "url": "org/apache/maven/wagon/wagon-provider-api/2.4/wagon-provider-api-2.4.jar", + "hash": "f65d8d59d71bca18ffa259b5a6de67697bc65b9ff1142c7bb4417ab4b1cacd92", + "path": "org/apache/maven/wagon/wagon-provider-api/2.4/wagon-provider-api-2.4.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar", + "hash": "8b909f4ca9788647942f883d4e559bcc642123f7c6bcd3846983a2e465469c33", + "path": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar", + "hash": "259d528a29722cab6349d7e7d432e3fd4877c087ffcb04985a6612e97023bba8", + "path": "org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar" + }, + { + "url": "org/sonatype/sisu/sisu-inject-plexus/2.3.0/sisu-inject-plexus-2.3.0.jar", + "hash": "bf9083fb846993689409b2bdbc735048e53bac6cc32707cde7ef84817b6e9365", + "path": "org/sonatype/sisu/sisu-inject-plexus/2.3.0/sisu-inject-plexus-2.3.0.jar" + }, + { + "url": "org/sonatype/sisu/sisu-inject-bean/2.3.0/sisu-inject-bean-2.3.0.jar", + "hash": "75819b29737c2bee1bfbda1011d455c7036738e0ef32ffbf85ba1d8fa157ceb2", + "path": "org/sonatype/sisu/sisu-inject-bean/2.3.0/sisu-inject-bean-2.3.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar", + "hash": "4df7a6a7be64b35bbccf60b5c115697f9ea3421d22674ae67135dde375fcca1f", + "path": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar", + "hash": "3b0559bb8432f28937efe6ca193ef54a8506d0075d73fd7406b9b116c6a11063", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.7/plexus-cipher-1.7.jar", + "hash": "114859861ff10f987b880d6f34e3215274af3cc92b3a73831c84d596e37c6511", + "path": "org/sonatype/plexus/plexus-cipher/1.7/plexus-cipher-1.7.jar" + }, + { + "url": "commons-cli/commons-cli/1.2/commons-cli-1.2.jar", + "hash": "e7cd8951956d349b568b7ccfd4f5b2529a8c113e67c32b028f52ffda371259d9", + "path": "commons-cli/commons-cli/1.2/commons-cli-1.2.jar" + }, + { + "url": "org/sonatype/sisu/sisu-guice/3.1.0/sisu-guice-3.1.0.jar", + "hash": "a263933f43e9c273161e0b99f553c33a80a0416ec0bd5dca17d54cf38ae5956f", + "path": "org/sonatype/sisu/sisu-guice/3.1.0/sisu-guice-3.1.0.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "org/sonatype/sisu/sisu-guava/0.9.9/sisu-guava-0.9.9.jar", + "hash": "9897e80ff6c08fc45b5b5ebd81d9e943a1087bdf0ad50cda457d616abbdaacd9", + "path": "org/sonatype/sisu/sisu-guava/0.9.9/sisu-guava-0.9.9.jar" + }, + { + "url": "org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar", + "hash": "dbb8c53ccc0b16a9dd8370d6e7de63102468caedac1e5fa2eb418319a6875293", + "path": "org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar" + }, + { + "url": "org/apache/maven/maven-compat/3.3.9/maven-compat-3.3.9.jar", + "hash": "2653f603b4aa7b521d8ad850c88a34dafd64aa79d7650399daa719de71cd1329", + "path": "org/apache/maven/maven-compat/3.3.9/maven-compat-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar", + "hash": "15abde67fa7ea1e573e1f68c34921e995f0971351aaf1fb96790688ff510efcd", + "path": "org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar" + }, + { + "url": "org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar", + "hash": "734c8356420cc8e30c795d64fd1fcd5d44ea9d90342a2cc3262c5158fbc6d98b", + "path": "org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar", + "hash": "6909cb229489e693df7960678528800a1759625835a1cb939c37b051c22193c3", + "path": "org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar", + "hash": "462a0d711a979c44791b97422ec4e91300ae555a598f684f116d725a2b9d297b", + "path": "org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar" + }, + { + "url": "com/google/guava/guava/18.0/guava-18.0.jar", + "hash": "d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99", + "path": "com/google/guava/guava/18.0/guava-18.0.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.3.9/maven-settings-3.3.9.jar", + "hash": "e4f569be53a076424e784222e7088f1827fcb2ef18d409132b3cda2fd92799e2", + "path": "org/apache/maven/maven-settings/3.3.9/maven-settings-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar", + "hash": "1f702928f2233c6ecdf308fbd8f2932ea287c7062183d3c8364b0db7e9c4445d", + "path": "org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-core/3.3.9/maven-core-3.3.9.jar", + "hash": "070d55ec5a6f3e4a785564283a9704bb39a93f1a2f89cdf60a3b899fde563bf9", + "path": "org/apache/maven/maven-core/3.3.9/maven-core-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.3.9/maven-settings-builder-3.3.9.jar", + "hash": "b4da54d52e2996a8a77c4db1ca8e98fc31792f07eeff695776f00ecffc3d5b60", + "path": "org/apache/maven/maven-settings-builder/3.3.9/maven-settings-builder-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar", + "hash": "6dbcc3d3d1dfb34df46c1ddb080fdd09fb899c80207016419cf13236c6b10399", + "path": "org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.3.9/maven-plugin-api-3.3.9.jar", + "hash": "14cae18fd7125901b12fc914e30ea26ad9bd43dbd399dd6e8fcbc6c754ef2c9c", + "path": "org/apache/maven/maven-plugin-api/3.3.9/maven-plugin-api-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar", + "hash": "f46962583d812cd4459a4cc963113b9c52f1f9b169172354693bc9efa0b3e3cb", + "path": "org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar" + }, + { + "url": "org/eclipse/aether/aether-spi/1.0.2.v20150114/aether-spi-1.0.2.v20150114.jar", + "hash": "2cafa2629da49edd54eb4df6d15f628c2d80eec293f37cd561f1fe78e7bcff9d", + "path": "org/eclipse/aether/aether-spi/1.0.2.v20150114/aether-spi-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/aether/aether-impl/1.0.2.v20150114/aether-impl-1.0.2.v20150114.jar", + "hash": "9a84f5863407acf2bf9cf280cd02f5a518952a386de61df3b8c5db8cfdec725d", + "path": "org/eclipse/aether/aether-impl/1.0.2.v20150114/aether-impl-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/aether/aether-api/1.0.2.v20150114/aether-api-1.0.2.v20150114.jar", + "hash": "3f74c7c7b9c924769cf3c5b4d52d21aa63e9a2ccbf16f5d26c30ebb31b99699d", + "path": "org/eclipse/aether/aether-api/1.0.2.v20150114/aether-api-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/aether/aether-util/1.0.2.v20150114/aether-util-1.0.2.v20150114.jar", + "hash": "9e9a57439a98034732e94d841bb7065b56e3a065654361ca9cc07135e9fbe17c", + "path": "org/eclipse/aether/aether-util/1.0.2.v20150114/aether-util-1.0.2.v20150114.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar", + "hash": "b2931d41740490a8d931cbe0cfe9ac20deb66cca606e679f52522f7f534c9fd7", + "path": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar", + "hash": "3b0559bb8432f28937efe6ca193ef54a8506d0075d73fd7406b9b116c6a11063", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar", + "hash": "5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4", + "path": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar", + "hash": "0f31c44b275f87e56d46a582ce96d03b9e2ab344cf87c4e268b34d3ad046beab", + "path": "org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar", + "hash": "aba7980581027ad5fc74a27ee4d64aad74932fdb32694967242d03fc50290d1f", + "path": "org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.2/org.eclipse.sisu.plexus-0.3.2.jar", + "hash": "f5cfe0d88e8276971db4ecff0e4186d5f2ec5fdb1b6bb8c2f359fdc4b43eb8b2", + "path": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.2/org.eclipse.sisu.plexus-0.3.2.jar" + }, + { + "url": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", + "hash": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", + "path": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" + }, + { + "url": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", + "hash": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", + "path": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.2/org.eclipse.sisu.inject-0.3.2.jar", + "hash": "66e87705a818da44eb080a7bb1fc431de987754b4f92aa85f69991bfc677d40d", + "path": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.2/org.eclipse.sisu.inject-0.3.2.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar", + "hash": "2b3a6ca5f19a9ad490bc233f45e68d3093c8c01b4acc3c1d14bad4ca7c7ff438", + "path": "org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar" + }, + { + "url": "org/apache/maven/wagon/wagon-provider-api/2.10/wagon-provider-api-2.10.jar", + "hash": "930b2e409513be03864d7a66e22dfdf5c086725e22ba3cf57ad45ed8af02996d", + "path": "org/apache/maven/wagon/wagon-provider-api/2.10/wagon-provider-api-2.10.jar" + }, + { + "url": "org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar", + "hash": "dbb8c53ccc0b16a9dd8370d6e7de63102468caedac1e5fa2eb418319a6875293", + "path": "org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar" + }, + { + "url": "org/apache/maven/maven-core/3.3.9/maven-core-3.3.9.jar", + "hash": "070d55ec5a6f3e4a785564283a9704bb39a93f1a2f89cdf60a3b899fde563bf9", + "path": "org/apache/maven/maven-core/3.3.9/maven-core-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar", + "hash": "15abde67fa7ea1e573e1f68c34921e995f0971351aaf1fb96790688ff510efcd", + "path": "org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.3.9/maven-settings-3.3.9.jar", + "hash": "e4f569be53a076424e784222e7088f1827fcb2ef18d409132b3cda2fd92799e2", + "path": "org/apache/maven/maven-settings/3.3.9/maven-settings-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.3.9/maven-settings-builder-3.3.9.jar", + "hash": "b4da54d52e2996a8a77c4db1ca8e98fc31792f07eeff695776f00ecffc3d5b60", + "path": "org/apache/maven/maven-settings-builder/3.3.9/maven-settings-builder-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar", + "hash": "462a0d711a979c44791b97422ec4e91300ae555a598f684f116d725a2b9d297b", + "path": "org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar", + "hash": "6dbcc3d3d1dfb34df46c1ddb080fdd09fb899c80207016419cf13236c6b10399", + "path": "org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar", + "hash": "1f702928f2233c6ecdf308fbd8f2932ea287c7062183d3c8364b0db7e9c4445d", + "path": "org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.3.9/maven-plugin-api-3.3.9.jar", + "hash": "14cae18fd7125901b12fc914e30ea26ad9bd43dbd399dd6e8fcbc6c754ef2c9c", + "path": "org/apache/maven/maven-plugin-api/3.3.9/maven-plugin-api-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar", + "hash": "6909cb229489e693df7960678528800a1759625835a1cb939c37b051c22193c3", + "path": "org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar" + }, + { + "url": "com/google/guava/guava/18.0/guava-18.0.jar", + "hash": "d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99", + "path": "com/google/guava/guava/18.0/guava-18.0.jar" + }, + { + "url": "org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar", + "hash": "f46962583d812cd4459a4cc963113b9c52f1f9b169172354693bc9efa0b3e3cb", + "path": "org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar" + }, + { + "url": "org/eclipse/aether/aether-spi/1.0.2.v20150114/aether-spi-1.0.2.v20150114.jar", + "hash": "2cafa2629da49edd54eb4df6d15f628c2d80eec293f37cd561f1fe78e7bcff9d", + "path": "org/eclipse/aether/aether-spi/1.0.2.v20150114/aether-spi-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/aether/aether-impl/1.0.2.v20150114/aether-impl-1.0.2.v20150114.jar", + "hash": "9a84f5863407acf2bf9cf280cd02f5a518952a386de61df3b8c5db8cfdec725d", + "path": "org/eclipse/aether/aether-impl/1.0.2.v20150114/aether-impl-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/aether/aether-api/1.0.2.v20150114/aether-api-1.0.2.v20150114.jar", + "hash": "3f74c7c7b9c924769cf3c5b4d52d21aa63e9a2ccbf16f5d26c30ebb31b99699d", + "path": "org/eclipse/aether/aether-api/1.0.2.v20150114/aether-api-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/aether/aether-util/1.0.2.v20150114/aether-util-1.0.2.v20150114.jar", + "hash": "9e9a57439a98034732e94d841bb7065b56e3a065654361ca9cc07135e9fbe17c", + "path": "org/eclipse/aether/aether-util/1.0.2.v20150114/aether-util-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.2/org.eclipse.sisu.plexus-0.3.2.jar", + "hash": "f5cfe0d88e8276971db4ecff0e4186d5f2ec5fdb1b6bb8c2f359fdc4b43eb8b2", + "path": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.2/org.eclipse.sisu.plexus-0.3.2.jar" + }, + { + "url": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", + "hash": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", + "path": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" + }, + { + "url": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", + "hash": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", + "path": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.2/org.eclipse.sisu.inject-0.3.2.jar", + "hash": "66e87705a818da44eb080a7bb1fc431de987754b4f92aa85f69991bfc677d40d", + "path": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.2/org.eclipse.sisu.inject-0.3.2.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar", + "hash": "aba7980581027ad5fc74a27ee4d64aad74932fdb32694967242d03fc50290d1f", + "path": "org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar", + "hash": "0f31c44b275f87e56d46a582ce96d03b9e2ab344cf87c4e268b34d3ad046beab", + "path": "org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar", + "hash": "b2931d41740490a8d931cbe0cfe9ac20deb66cca606e679f52522f7f534c9fd7", + "path": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar", + "hash": "2b3a6ca5f19a9ad490bc233f45e68d3093c8c01b4acc3c1d14bad4ca7c7ff438", + "path": "org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar", + "hash": "3b0559bb8432f28937efe6ca193ef54a8506d0075d73fd7406b9b116c6a11063", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar", + "hash": "5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4", + "path": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" + }, + { + "url": "org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar", + "hash": "734c8356420cc8e30c795d64fd1fcd5d44ea9d90342a2cc3262c5158fbc6d98b", + "path": "org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar" + }, + { + "url": "org/apache/maven/maven-embedder/3.3.9/maven-embedder-3.3.9.jar", + "hash": "6e1736c08f9798ed74efcdcdc435c640aca08af9b8c268dd7ea8ee8a3fef30a6", + "path": "org/apache/maven/maven-embedder/3.3.9/maven-embedder-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.3.9/maven-settings-3.3.9.jar", + "hash": "e4f569be53a076424e784222e7088f1827fcb2ef18d409132b3cda2fd92799e2", + "path": "org/apache/maven/maven-settings/3.3.9/maven-settings-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-core/3.3.9/maven-core-3.3.9.jar", + "hash": "070d55ec5a6f3e4a785564283a9704bb39a93f1a2f89cdf60a3b899fde563bf9", + "path": "org/apache/maven/maven-core/3.3.9/maven-core-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar", + "hash": "15abde67fa7ea1e573e1f68c34921e995f0971351aaf1fb96790688ff510efcd", + "path": "org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.3.9/maven-settings-builder-3.3.9.jar", + "hash": "b4da54d52e2996a8a77c4db1ca8e98fc31792f07eeff695776f00ecffc3d5b60", + "path": "org/apache/maven/maven-settings-builder/3.3.9/maven-settings-builder-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar", + "hash": "6dbcc3d3d1dfb34df46c1ddb080fdd09fb899c80207016419cf13236c6b10399", + "path": "org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar", + "hash": "1f702928f2233c6ecdf308fbd8f2932ea287c7062183d3c8364b0db7e9c4445d", + "path": "org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar", + "hash": "f46962583d812cd4459a4cc963113b9c52f1f9b169172354693bc9efa0b3e3cb", + "path": "org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar" + }, + { + "url": "org/eclipse/aether/aether-spi/1.0.2.v20150114/aether-spi-1.0.2.v20150114.jar", + "hash": "2cafa2629da49edd54eb4df6d15f628c2d80eec293f37cd561f1fe78e7bcff9d", + "path": "org/eclipse/aether/aether-spi/1.0.2.v20150114/aether-spi-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/aether/aether-impl/1.0.2.v20150114/aether-impl-1.0.2.v20150114.jar", + "hash": "9a84f5863407acf2bf9cf280cd02f5a518952a386de61df3b8c5db8cfdec725d", + "path": "org/eclipse/aether/aether-impl/1.0.2.v20150114/aether-impl-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/aether/aether-api/1.0.2.v20150114/aether-api-1.0.2.v20150114.jar", + "hash": "3f74c7c7b9c924769cf3c5b4d52d21aa63e9a2ccbf16f5d26c30ebb31b99699d", + "path": "org/eclipse/aether/aether-api/1.0.2.v20150114/aether-api-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/aether/aether-util/1.0.2.v20150114/aether-util-1.0.2.v20150114.jar", + "hash": "9e9a57439a98034732e94d841bb7065b56e3a065654361ca9cc07135e9fbe17c", + "path": "org/eclipse/aether/aether-util/1.0.2.v20150114/aether-util-1.0.2.v20150114.jar" + }, + { + "url": "com/google/inject/guice/4.0/guice-4.0-no_aop.jar", + "hash": "19393891be59b6feaf7e308bd8a3843b4e552c10cdb687ebffd7695634a250a8", + "path": "com/google/inject/guice/4.0/guice-4.0-no_aop.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "aopalliance/aopalliance/1.0/aopalliance-1.0.jar", + "hash": "0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08", + "path": "aopalliance/aopalliance/1.0/aopalliance-1.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar", + "hash": "aba7980581027ad5fc74a27ee4d64aad74932fdb32694967242d03fc50290d1f", + "path": "org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.3.9/maven-plugin-api-3.3.9.jar", + "hash": "14cae18fd7125901b12fc914e30ea26ad9bd43dbd399dd6e8fcbc6c754ef2c9c", + "path": "org/apache/maven/maven-plugin-api/3.3.9/maven-plugin-api-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar", + "hash": "6909cb229489e693df7960678528800a1759625835a1cb939c37b051c22193c3", + "path": "org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar", + "hash": "462a0d711a979c44791b97422ec4e91300ae555a598f684f116d725a2b9d297b", + "path": "org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar" + }, + { + "url": "com/google/guava/guava/18.0/guava-18.0.jar", + "hash": "d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99", + "path": "com/google/guava/guava/18.0/guava-18.0.jar" + }, + { + "url": "org/apache/maven/maven-compat/3.3.9/maven-compat-3.3.9.jar", + "hash": "2653f603b4aa7b521d8ad850c88a34dafd64aa79d7650399daa719de71cd1329", + "path": "org/apache/maven/maven-compat/3.3.9/maven-compat-3.3.9.jar" + }, + { + "url": "org/apache/maven/wagon/wagon-provider-api/2.10/wagon-provider-api-2.10.jar", + "hash": "930b2e409513be03864d7a66e22dfdf5c086725e22ba3cf57ad45ed8af02996d", + "path": "org/apache/maven/wagon/wagon-provider-api/2.10/wagon-provider-api-2.10.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar", + "hash": "0f31c44b275f87e56d46a582ce96d03b9e2ab344cf87c4e268b34d3ad046beab", + "path": "org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar", + "hash": "b2931d41740490a8d931cbe0cfe9ac20deb66cca606e679f52522f7f534c9fd7", + "path": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.2/org.eclipse.sisu.plexus-0.3.2.jar", + "hash": "f5cfe0d88e8276971db4ecff0e4186d5f2ec5fdb1b6bb8c2f359fdc4b43eb8b2", + "path": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.2/org.eclipse.sisu.plexus-0.3.2.jar" + }, + { + "url": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", + "hash": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", + "path": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" + }, + { + "url": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", + "hash": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", + "path": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.2/org.eclipse.sisu.inject-0.3.2.jar", + "hash": "66e87705a818da44eb080a7bb1fc431de987754b4f92aa85f69991bfc677d40d", + "path": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.2/org.eclipse.sisu.inject-0.3.2.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar", + "hash": "2b3a6ca5f19a9ad490bc233f45e68d3093c8c01b4acc3c1d14bad4ca7c7ff438", + "path": "org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar", + "hash": "3b0559bb8432f28937efe6ca193ef54a8506d0075d73fd7406b9b116c6a11063", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.7/plexus-cipher-1.7.jar", + "hash": "114859861ff10f987b880d6f34e3215274af3cc92b3a73831c84d596e37c6511", + "path": "org/sonatype/plexus/plexus-cipher/1.7/plexus-cipher-1.7.jar" + }, + { + "url": "org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar", + "hash": "fe30825245d2336c859dc38d60c0fc5f3668dbf29cd586828d2b5667ec355b91", + "path": "org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar" + }, + { + "url": "commons-cli/commons-cli/1.2/commons-cli-1.2.jar", + "hash": "e7cd8951956d349b568b7ccfd4f5b2529a8c113e67c32b028f52ffda371259d9", + "path": "commons-cli/commons-cli/1.2/commons-cli-1.2.jar" + }, + { + "url": "org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar", + "hash": "734c8356420cc8e30c795d64fd1fcd5d44ea9d90342a2cc3262c5158fbc6d98b", + "path": "org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar" + }, + { + "url": "com/google/inject/guice/4.0/guice-4.0.jar", + "hash": "b378ffc35e7f7125b3c5f3a461d4591ae1685e3c781392f0c854ed7b7581d6d2", + "path": "com/google/inject/guice/4.0/guice-4.0.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "org/apache/maven/archetype/archetype-catalog/2.2/archetype-catalog-2.2.jar", + "hash": "112e06e6acc1405ad3ba518442e835d1d42758ef31f0bbbdb32aa1e15a17d10f", + "path": "org/apache/maven/archetype/archetype-catalog/2.2/archetype-catalog-2.2.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar", + "hash": "b7554a41499282e3b2226a22aff3ebe984f7e159798c461d917c1b829b130cd1", + "path": "org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar" + }, + { + "url": "org/apache/maven/archetype/archetype-common/2.2/archetype-common-2.2.jar", + "hash": "3a00a78157a82fff778334764255642585127443e0b3da56bcdb6f8a0f910220", + "path": "org/apache/maven/archetype/archetype-common/2.2/archetype-common-2.2.jar" + }, + { + "url": "org/apache/maven/archetype/archetype-catalog/2.2/archetype-catalog-2.2.jar", + "hash": "112e06e6acc1405ad3ba518442e835d1d42758ef31f0bbbdb32aa1e15a17d10f", + "path": "org/apache/maven/archetype/archetype-catalog/2.2/archetype-catalog-2.2.jar" + }, + { + "url": "org/apache/maven/archetype/archetype-descriptor/2.2/archetype-descriptor-2.2.jar", + "hash": "162ff0cc80445307de05f5e0ce9c014e8cd22cfbd2ed610ae39806e4592c5255", + "path": "org/apache/maven/archetype/archetype-descriptor/2.2/archetype-descriptor-2.2.jar" + }, + { + "url": "org/apache/maven/archetype/archetype-registry/2.2/archetype-registry-2.2.jar", + "hash": "cf9bb9e523696557c20bd4c7f41b6adda6074c4da85a7070af2facbab28afaca", + "path": "org/apache/maven/archetype/archetype-registry/2.2/archetype-registry-2.2.jar" + }, + { + "url": "org/sonatype/nexus/nexus-indexer-artifact/1.0.1/nexus-indexer-artifact-1.0.1.jar", + "hash": "171035740322f96bd8c155cfb6050962dd61d7976a494c0aac6d46b3c83174c4", + "path": "org/sonatype/nexus/nexus-indexer-artifact/1.0.1/nexus-indexer-artifact-1.0.1.jar" + }, + { + "url": "org/sonatype/nexus/nexus-indexer/3.0.4/nexus-indexer-3.0.4.jar", + "hash": "9d43a28d0758914fdcea28a436601ac26d06a3b55d283bb6be0321ccd3631a58", + "path": "org/sonatype/nexus/nexus-indexer/3.0.4/nexus-indexer-3.0.4.jar" + }, + { + "url": "org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar", + "hash": "dbb8c53ccc0b16a9dd8370d6e7de63102468caedac1e5fa2eb418319a6875293", + "path": "org/apache/maven/shared/maven-dependency-tree/1.2/maven-dependency-tree-1.2.jar" + }, + { + "url": "org/apache/maven/archetype/archetype-common/2.2/archetype-common-2.2.jar", + "hash": "3a00a78157a82fff778334764255642585127443e0b3da56bcdb6f8a0f910220", + "path": "org/apache/maven/archetype/archetype-common/2.2/archetype-common-2.2.jar" + }, + { + "url": "org/apache/maven/archetype/archetype-catalog/2.2/archetype-catalog-2.2.jar", + "hash": "112e06e6acc1405ad3ba518442e835d1d42758ef31f0bbbdb32aa1e15a17d10f", + "path": "org/apache/maven/archetype/archetype-catalog/2.2/archetype-catalog-2.2.jar" + }, + { + "url": "org/apache/maven/archetype/archetype-descriptor/2.2/archetype-descriptor-2.2.jar", + "hash": "162ff0cc80445307de05f5e0ce9c014e8cd22cfbd2ed610ae39806e4592c5255", + "path": "org/apache/maven/archetype/archetype-descriptor/2.2/archetype-descriptor-2.2.jar" + }, + { + "url": "org/apache/maven/archetype/archetype-registry/2.2/archetype-registry-2.2.jar", + "hash": "cf9bb9e523696557c20bd4c7f41b6adda6074c4da85a7070af2facbab28afaca", + "path": "org/apache/maven/archetype/archetype-registry/2.2/archetype-registry-2.2.jar" + }, + { + "url": "org/apache/maven/maven-compat/3.6.0/maven-compat-3.6.0.jar", + "hash": "8f1a5d4daff952dabeb3acaa0aa642903702a1aa8b442fcd7a07a8cf9e3db48b", + "path": "org/apache/maven/maven-compat/3.6.0/maven-compat-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-model/3.6.0/maven-model-3.6.0.jar", + "hash": "a1bf0c7856afd1f1b9c81c22818328fb7a796b4047010e08f2e859d1896080a9", + "path": "org/apache/maven/maven-model/3.6.0/maven-model-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.6.0/maven-model-builder-3.6.0.jar", + "hash": "a7295f062b54d0cbd513ffbb6d21c9bc9e21d9904547f299831236a988e50ab3", + "path": "org/apache/maven/maven-model-builder/3.6.0/maven-model-builder-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-builder-support/3.6.0/maven-builder-support-3.6.0.jar", + "hash": "56affafea9c76168bbc5b8ee9d26dd2dbe95b8185b70d6b2a46dd9fc39d0dd53", + "path": "org/apache/maven/maven-builder-support/3.6.0/maven-builder-support-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.6.0/maven-settings-3.6.0.jar", + "hash": "053655dc2890f119cb13ddb90b1888b9cfcf1cea3a374c0656d53595b4f37542", + "path": "org/apache/maven/maven-settings/3.6.0/maven-settings-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.6.0/maven-settings-builder-3.6.0.jar", + "hash": "271a82555c399d9b06c7751a802c3b919081a06b7c9b839bd70e93ea2df386e3", + "path": "org/apache/maven/maven-settings-builder/3.6.0/maven-settings-builder-3.6.0.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.4/plexus-sec-dispatcher-1.4.jar", + "hash": "da73e32b58132e64daf12269fd9d011c0b303f234840f179908725a632b6b57c", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.4/plexus-sec-dispatcher-1.4.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar", + "hash": "5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4", + "path": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.6.0/maven-artifact-3.6.0.jar", + "hash": "3d5a0e77cde76d386b18c7400db1eb16aacef02e031ecd0d954477aeccc92155", + "path": "org/apache/maven/maven-artifact/3.6.0/maven-artifact-3.6.0.jar" + }, + { + "url": "org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar", + "hash": "dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68", + "path": "org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar" + }, + { + "url": "org/apache/maven/maven-core/3.6.0/maven-core-3.6.0.jar", + "hash": "c7611780b8456e2b29284b8c0d37cdd5358facdc1091d64ab46a2feddd2cb6ae", + "path": "org/apache/maven/maven-core/3.6.0/maven-core-3.6.0.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.6.0/maven-plugin-api-3.6.0.jar", + "hash": "0062a08b463314a1b5f8eb1a56207efb830fbdf547c42a3191eb146c4db39b1a", + "path": "org/apache/maven/maven-plugin-api/3.6.0/maven-plugin-api-3.6.0.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-spi/1.3.1/maven-resolver-spi-1.3.1.jar", + "hash": "d4d15a6d473d78608412818c091b3c01d37bdf4f0e453156a19724af843a03ea", + "path": "org/apache/maven/resolver/maven-resolver-spi/1.3.1/maven-resolver-spi-1.3.1.jar" + }, + { + "url": "org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar", + "hash": "3ba9c619893c767db0f9c3e826d5118b57c35229301bcd16d865a89cec16a7e5", + "path": "org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar" + }, + { + "url": "commons-io/commons-io/2.5/commons-io-2.5.jar", + "hash": "a10418348d234968600ccb1d988efcbbd08716e1d96936ccc1880e7d22513474", + "path": "commons-io/commons-io/2.5/commons-io-2.5.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.3/org.eclipse.sisu.inject-0.3.3.jar", + "hash": "c6935e0b7d362ed4ca768c9b71d5d4d98788ff0a79c0d2bb954c221a078b166b", + "path": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.3/org.eclipse.sisu.inject-0.3.3.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar", + "hash": "b2931d41740490a8d931cbe0cfe9ac20deb66cca606e679f52522f7f534c9fd7", + "path": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" + }, + { + "url": "org/apache/maven/maven-resolver-provider/3.6.0/maven-resolver-provider-3.6.0.jar", + "hash": "3e7d265ef4e9ade0f5de998961c6cac634cbf3fbdb839bb50a3a50b2ffbba7f8", + "path": "org/apache/maven/maven-resolver-provider/3.6.0/maven-resolver-provider-3.6.0.jar" + }, + { + "url": "org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar", + "hash": "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79", + "path": "org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.6.0/maven-repository-metadata-3.6.0.jar", + "hash": "21702a5beccf3731ecdd6ed87f8fd0ae2bb7856b12fe91585b5513840722b0c3", + "path": "org/apache/maven/maven-repository-metadata/3.6.0/maven-repository-metadata-3.6.0.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-api/1.3.1/maven-resolver-api-1.3.1.jar", + "hash": "6be437d670dffa24bac4187bc1567c34fab04fc569836f8b45b9d79cbfd493ea", + "path": "org/apache/maven/resolver/maven-resolver-api/1.3.1/maven-resolver-api-1.3.1.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-util/1.3.1/maven-resolver-util-1.3.1.jar", + "hash": "a7c2d81cd7d6df38e2997bf09507e0bca6fa85dfb635de4bf28a7c501cb574f4", + "path": "org/apache/maven/resolver/maven-resolver-util/1.3.1/maven-resolver-util-1.3.1.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-impl/1.3.1/maven-resolver-impl-1.3.1.jar", + "hash": "aaa41b53ed4fcc13b3d719d85f45b0fba21ee026dd4b625dd82210a28ee8e2fe", + "path": "org/apache/maven/resolver/maven-resolver-impl/1.3.1/maven-resolver-impl-1.3.1.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/3.1.0/plexus-utils-3.1.0.jar", + "hash": "0ffa0ad084ebff5712540a7b7ea0abda487c53d3a18f78c98d1a3675dab9bf61", + "path": "org/codehaus/plexus/plexus-utils/3.1.0/plexus-utils-3.1.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.25/plexus-interpolation-1.25.jar", + "hash": "e003802501574637f7abdc4e83e6d509a31e9ff825d12da6d1e419acf9688705", + "path": "org/codehaus/plexus/plexus-interpolation/1.25/plexus-interpolation-1.25.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.3/org.eclipse.sisu.plexus-0.3.3.jar", + "hash": "98045f5ecd802d6a96ba00394f8cb61259f9ac781ec2cb51ca0cb7b2c94ac720", + "path": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.3/org.eclipse.sisu.plexus-0.3.3.jar" + }, + { + "url": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", + "hash": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", + "path": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" + }, + { + "url": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", + "hash": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", + "path": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.jar", + "hash": "a7fee9435db716bff593e9fb5622bcf9f25e527196485929b0cd4065c43e61df", + "path": "org/codehaus/plexus/plexus-component-annotations/1.7.1/plexus-component-annotations-1.7.1.jar" + }, + { + "url": "org/apache/maven/wagon/wagon-provider-api/3.2.0/wagon-provider-api-3.2.0.jar", + "hash": "21beff005c5b5754911b85f3a60480341b29a2faf1cf3b56260e6b646081a54f", + "path": "org/apache/maven/wagon/wagon-provider-api/3.2.0/wagon-provider-api-3.2.0.jar" + }, + { + "url": "com/google/inject/guice/4.2.1/guice-4.2.1.jar", + "hash": "cb4a9a054a20f5b9fcdd9734e97804779714fa5d62b30a0f5b5e99084f9954b0", + "path": "com/google/inject/guice/4.2.1/guice-4.2.1.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "com/google/guava/guava/25.1-android/guava-25.1-android.jar", + "hash": "f7b8f8fed176b9cf6831b98cb07320d7fbe91d99b29999f752c3821dfe45bdc8", + "path": "com/google/guava/guava/25.1-android/guava-25.1-android.jar" + }, + { + "url": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar", + "hash": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + "path": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" + }, + { + "url": "org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar", + "hash": "a40b2ce6d8551e5b90b1bf637064303f32944d61b52ab2014e38699df573941b", + "path": "org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar" + }, + { + "url": "com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar", + "hash": "03d0329547c13da9e17c634d1049ea2ead093925e290567e1a364fd6b1fc7ff8", + "path": "com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar" + }, + { + "url": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar", + "hash": "2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6", + "path": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" + }, + { + "url": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar", + "hash": "2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d", + "path": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" + }, + { + "url": "org/apache/lucene/lucene-core/2.4.1/lucene-core-2.4.1.jar", + "hash": "b85d6c2a6b4c29e90fa7c5d94b21fe796f9c6857870268b56904765126bae718", + "path": "org/apache/lucene/lucene-core/2.4.1/lucene-core-2.4.1.jar" + }, + { + "url": "org/apache/maven/indexer/indexer-core/6.2.2/indexer-core-6.2.2.jar", + "hash": "7f69b1b75cc171ec37a9377cf590077c10b6153337236a7a766df70eb9ec7786", + "path": "org/apache/maven/indexer/indexer-core/6.2.2/indexer-core-6.2.2.jar" + }, + { + "url": "org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar", + "hash": "d3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0", + "path": "org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar" + }, + { + "url": "org/apache/lucene/lucene-core/8.11.1/lucene-core-8.11.1.jar", + "hash": "78a61d0b843c1cf1fe5be380a4d3a4c1602d3fbba4ca1185da8797c9bb115483", + "path": "org/apache/lucene/lucene-core/8.11.1/lucene-core-8.11.1.jar" + }, + { + "url": "org/apache/lucene/lucene-queryparser/8.11.1/lucene-queryparser-8.11.1.jar", + "hash": "23abf022a19e609fe3ca421ab6b6868a3250974d31c5b92f9879d97c127a77b8", + "path": "org/apache/lucene/lucene-queryparser/8.11.1/lucene-queryparser-8.11.1.jar" + }, + { + "url": "org/apache/lucene/lucene-queries/8.11.1/lucene-queries-8.11.1.jar", + "hash": "11fb2e90da5b4e6a6c26120bb80a2937a20a585d32236ed7c277048ba65f07ca", + "path": "org/apache/lucene/lucene-queries/8.11.1/lucene-queries-8.11.1.jar" + }, + { + "url": "org/apache/lucene/lucene-sandbox/8.11.1/lucene-sandbox-8.11.1.jar", + "hash": "28bee2711947cf3a9957f3f77132ce37457894c1fb468b0a20e9a95788b11c87", + "path": "org/apache/lucene/lucene-sandbox/8.11.1/lucene-sandbox-8.11.1.jar" + }, + { + "url": "org/apache/lucene/lucene-analyzers-common/8.11.1/lucene-analyzers-common-8.11.1.jar", + "hash": "1cdcc5a2d9cf4ffaf12fbf24bc2a18f2469cd295b60470ae8b97d1aa85dbad6f", + "path": "org/apache/lucene/lucene-analyzers-common/8.11.1/lucene-analyzers-common-8.11.1.jar" + }, + { + "url": "org/apache/lucene/lucene-backward-codecs/8.11.1/lucene-backward-codecs-8.11.1.jar", + "hash": "38e72688eef81efffb9c5ea68918f4d1adb2eb0de64ce6a8222abee036eb63cf", + "path": "org/apache/lucene/lucene-backward-codecs/8.11.1/lucene-backward-codecs-8.11.1.jar" + }, + { + "url": "org/apache/lucene/lucene-highlighter/8.11.1/lucene-highlighter-8.11.1.jar", + "hash": "c8e92e01b7443b2fd1698ac7b260b632197175143e13f0364b6f7258b9447307", + "path": "org/apache/lucene/lucene-highlighter/8.11.1/lucene-highlighter-8.11.1.jar" + }, + { + "url": "org/apache/lucene/lucene-memory/8.11.1/lucene-memory-8.11.1.jar", + "hash": "b948478fe2e8e7f94fa7f533a14a526720701fe98627214c93d924faa4be78de", + "path": "org/apache/lucene/lucene-memory/8.11.1/lucene-memory-8.11.1.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-api/1.8.0/maven-resolver-api-1.8.0.jar", + "hash": "5c9df7e7f6122172d5d27ce3efb2bc58fc7f423c2fb7468bf75315d742ebb181", + "path": "org/apache/maven/resolver/maven-resolver-api/1.8.0/maven-resolver-api-1.8.0.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-util/1.8.0/maven-resolver-util-1.8.0.jar", + "hash": "3468ec7ca9ee97878e61f26905546cdd709de778b8884777516a1af2d4a32e4e", + "path": "org/apache/maven/resolver/maven-resolver-util/1.8.0/maven-resolver-util-1.8.0.jar" + }, + { + "url": "org/apache/maven/maven-model/3.8.5/maven-model-3.8.5.jar", + "hash": "7c9eeb30ac1941ea9bdf76c08c162ed98c005913e5bff66de3f1027a304546dc", + "path": "org/apache/maven/maven-model/3.8.5/maven-model-3.8.5.jar" + }, + { + "url": "org/apache/maven/maven-core/3.8.3/maven-core-3.8.3.jar", + "hash": "4b518631aa5bda90a90ef122fba5288438bbf160fcd628246638092fe3050e10", + "path": "org/apache/maven/maven-core/3.8.3/maven-core-3.8.3.jar" + }, + { + "url": "org/apache/maven/maven-model/3.8.3/maven-model-3.8.3.jar", + "hash": "a5ce7648e89403e3b45a951648ee10d934b869001048ef05327be412860b50c5", + "path": "org/apache/maven/maven-model/3.8.3/maven-model-3.8.3.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.8.3/maven-settings-3.8.3.jar", + "hash": "5a80a24569a0eb383b4da05ea1d306b37753ae111e833bef3a2585c78555e0e0", + "path": "org/apache/maven/maven-settings/3.8.3/maven-settings-3.8.3.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.8.3/maven-settings-builder-3.8.3.jar", + "hash": "6c93c6336365e59841f4b879d08e027ba8f853f83889e2b374ced4de9c667749", + "path": "org/apache/maven/maven-settings-builder/3.8.3/maven-settings-builder-3.8.3.jar" + }, + { + "url": "org/codehaus/plexus/plexus-sec-dispatcher/2.0/plexus-sec-dispatcher-2.0.jar", + "hash": "873139960c4c780176dda580b003a2c4bf82188bdce5bb99234e224ef7acfceb", + "path": "org/codehaus/plexus/plexus-sec-dispatcher/2.0/plexus-sec-dispatcher-2.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-cipher/2.0/plexus-cipher-2.0.jar", + "hash": "9a7f1b5c5a9effd61eadfd8731452a2f76a8e79111fac391ef75ea801bea203a", + "path": "org/codehaus/plexus/plexus-cipher/2.0/plexus-cipher-2.0.jar" + }, + { + "url": "org/apache/maven/maven-builder-support/3.8.3/maven-builder-support-3.8.3.jar", + "hash": "b2e17c30158bcabad967c29ccc4f2c4e10065b03eedefdb1d8f901ddd3d12ca5", + "path": "org/apache/maven/maven-builder-support/3.8.3/maven-builder-support-3.8.3.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.8.3/maven-repository-metadata-3.8.3.jar", + "hash": "bb01f1d30929db0d8ab4bbce0e3ed3a924fa1c22dd0dc26b0ff7e39a067c2f8d", + "path": "org/apache/maven/maven-repository-metadata/3.8.3/maven-repository-metadata-3.8.3.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.8.3/maven-artifact-3.8.3.jar", + "hash": "be0e20f86b22835a49a355de8912260dff0a7cd47c4605506cd286ed25a34508", + "path": "org/apache/maven/maven-artifact/3.8.3/maven-artifact-3.8.3.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.8.3/maven-plugin-api-3.8.3.jar", + "hash": "be2e329e86e7547d66d18fb206a2f8e06363774647aaf7da776cc19f589a0d4d", + "path": "org/apache/maven/maven-plugin-api/3.8.3/maven-plugin-api-3.8.3.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.8.3/maven-model-builder-3.8.3.jar", + "hash": "bb2baf84e3d6c584681220947160e6d53c2bca34208c0295bdc74ab4233d396c", + "path": "org/apache/maven/maven-model-builder/3.8.3/maven-model-builder-3.8.3.jar" + }, + { + "url": "org/apache/maven/maven-resolver-provider/3.8.3/maven-resolver-provider-3.8.3.jar", + "hash": "9f7a733bc6a8c91265c669e8a268e7800578cd43e1435088e07d73a9b067d1be", + "path": "org/apache/maven/maven-resolver-provider/3.8.3/maven-resolver-provider-3.8.3.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-impl/1.6.3/maven-resolver-impl-1.6.3.jar", + "hash": "17aaebe6e3e59df8cb5b4ec210196f7084637312b9bc4ff14cb77ad1ae3c381b", + "path": "org/apache/maven/resolver/maven-resolver-impl/1.6.3/maven-resolver-impl-1.6.3.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-api/1.6.3/maven-resolver-api-1.6.3.jar", + "hash": "d0b28ed944058ba4f9be4b54c25d6d5269cc4f3f3c49aa450d4dc2f7e0d552f6", + "path": "org/apache/maven/resolver/maven-resolver-api/1.6.3/maven-resolver-api-1.6.3.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-spi/1.6.3/maven-resolver-spi-1.6.3.jar", + "hash": "17441a39045ac19bc4a8068fb7284facebf6337754bf2bf8f26a76b5f98ed108", + "path": "org/apache/maven/resolver/maven-resolver-spi/1.6.3/maven-resolver-spi-1.6.3.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-util/1.6.3/maven-resolver-util-1.6.3.jar", + "hash": "cdcad9355b625743f40e4cead9a96353404e010c39c808d23b044be331afa251", + "path": "org/apache/maven/resolver/maven-resolver-util/1.6.3/maven-resolver-util-1.6.3.jar" + }, + { + "url": "org/apache/maven/shared/maven-shared-utils/3.3.4/maven-shared-utils-3.3.4.jar", + "hash": "7925d9c5a0e2040d24b8fae3f612eb399cbffe5838b33ba368777dc7bddf6dda", + "path": "org/apache/maven/shared/maven-shared-utils/3.3.4/maven-shared-utils-3.3.4.jar" + }, + { + "url": "commons-io/commons-io/2.6/commons-io-2.6.jar", + "hash": "f877d304660ac2a142f3865badfc971dec7ed73c747c7f8d5d2f5139ca736513", + "path": "commons-io/commons-io/2.6/commons-io-2.6.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.5/org.eclipse.sisu.plexus-0.3.5.jar", + "hash": "7e4c61096d70826f20f7a7d55c59a5528e7aa5ad247ee2dfe544e4dd25f6a784", + "path": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.5/org.eclipse.sisu.plexus-0.3.5.jar" + }, + { + "url": "javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar", + "hash": "5909b396ca3a2be10d0eea32c74ef78d816e1b4ead21de1d78de1f890d033e04", + "path": "javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.jar", + "hash": "c5994010bcdce1d2bd603a4d50c47191ddbd7875d1157b23aaa26d33c82fda13", + "path": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.jar" + }, + { + "url": "com/google/inject/guice/4.2.2/guice-4.2.2-no_aop.jar", + "hash": "0f4f5fb28609a4d2b38b7f7128be7cf9b541f25283d71b4e56066d99683aafff", + "path": "com/google/inject/guice/4.2.2/guice-4.2.2-no_aop.jar" + }, + { + "url": "aopalliance/aopalliance/1.0/aopalliance-1.0.jar", + "hash": "0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08", + "path": "aopalliance/aopalliance/1.0/aopalliance-1.0.jar" + }, + { + "url": "com/google/guava/guava/25.1-android/guava-25.1-android.jar", + "hash": "f7b8f8fed176b9cf6831b98cb07320d7fbe91d99b29999f752c3821dfe45bdc8", + "path": "com/google/guava/guava/25.1-android/guava-25.1-android.jar" + }, + { + "url": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar", + "hash": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + "path": "com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" + }, + { + "url": "org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar", + "hash": "a40b2ce6d8551e5b90b1bf637064303f32944d61b52ab2014e38699df573941b", + "path": "org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar" + }, + { + "url": "com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar", + "hash": "03d0329547c13da9e17c634d1049ea2ead093925e290567e1a364fd6b1fc7ff8", + "path": "com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar" + }, + { + "url": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar", + "hash": "2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6", + "path": "com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" + }, + { + "url": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar", + "hash": "2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d", + "path": "org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/3.3.0/plexus-utils-3.3.0.jar", + "hash": "76d174792540e2775af94d03d10fb2d3c776e2cd0ac0ebf427d3e570072bb9ce", + "path": "org/codehaus/plexus/plexus-utils/3.3.0/plexus-utils-3.3.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.jar", + "hash": "52f77c5ec49f787c9c417ebed5d6efd9922f44a202f217376e4f94c0d74f3549", + "path": "org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar", + "hash": "b3b5412ce17889103ea564bcdfcf9fb3dfa540344ffeac6b538a73c9d7182662", + "path": "org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/2.1.0/plexus-component-annotations-2.1.0.jar", + "hash": "bde3617ce9b5bcf9584126046080043af6a4b3baea40a3b153f02e7bbc32acac", + "path": "org/codehaus/plexus/plexus-component-annotations/2.1.0/plexus-component-annotations-2.1.0.jar" + }, + { + "url": "org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar", + "hash": "dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68", + "path": "org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar" + }, + { + "url": "org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar", + "hash": "3624f8474c1af46d75f98bc097d7864a323c81b3808aa43689a6e1c601c027be", + "path": "org/slf4j/slf4j-api/1.7.32/slf4j-api-1.7.32.jar" + }, + { + "url": "org/apache/maven/wagon/wagon-provider-api/3.5.2/wagon-provider-api-3.5.2.jar", + "hash": "c7daff38f15c754f609854a01365ced5ad182b5e12d88a6f6ad534c030147cca", + "path": "org/apache/maven/wagon/wagon-provider-api/3.5.2/wagon-provider-api-3.5.2.jar" + }, + { + "url": "org/apache/maven/archetype/archetype-common/3.2.1/archetype-common-3.2.1.jar", + "hash": "7816a7d7c9a5c64b77a7fd1ebe203a1ce92b924638dd2216f81ea5bcebea6abc", + "path": "org/apache/maven/archetype/archetype-common/3.2.1/archetype-common-3.2.1.jar" + }, + { + "url": "org/apache/maven/archetype/archetype-catalog/3.2.1/archetype-catalog-3.2.1.jar", + "hash": "2aa061856e5e124facf7bf16831069015f98406969a7ba534e1ee557950d6680", + "path": "org/apache/maven/archetype/archetype-catalog/3.2.1/archetype-catalog-3.2.1.jar" + }, + { + "url": "org/apache/maven/archetype/archetype-descriptor/3.2.1/archetype-descriptor-3.2.1.jar", + "hash": "a20edcd3b38675827209068c544426f2ef03ed506d226f1d4c99a734948f8e36", + "path": "org/apache/maven/archetype/archetype-descriptor/3.2.1/archetype-descriptor-3.2.1.jar" + }, + { + "url": "org/codehaus/groovy/groovy-all/2.4.16/groovy-all-2.4.16.jar", + "hash": "42106c60e08eb147c294722b9c26bad26a148636ef244ab8d6092f5a09fa409e", + "path": "org/codehaus/groovy/groovy-all/2.4.16/groovy-all-2.4.16.jar" + }, + { + "url": "org/apache/ivy/ivy/2.5.0/ivy-2.5.0.jar", + "hash": "2f4c835b52311df922f8a8eb057843de5485088b234ccd03e478b9066b5e6bfc", + "path": "org/apache/ivy/ivy/2.5.0/ivy-2.5.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/2.0.0/plexus-component-annotations-2.0.0.jar", + "hash": "405eef6fc9188241ec88579c3e473f5c8997455c69bcd62e142492aca15106bc", + "path": "org/codehaus/plexus/plexus-component-annotations/2.0.0/plexus-component-annotations-2.0.0.jar" + }, + { + "url": "org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar", + "hash": "1345f11ba606d15603d6740551a8c21947c0215640770ec67271fe78bea97cf5", + "path": "org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar" + }, + { + "url": "org/apache/maven/shared/maven-invoker/3.0.1/maven-invoker-3.0.1.jar", + "hash": "d20e5d26c19c04199c73fd4f0b6caebf4bbdc6b872a4504c5e71a192751d9464", + "path": "org/apache/maven/shared/maven-invoker/3.0.1/maven-invoker-3.0.1.jar" + }, + { + "url": "org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar", + "hash": "3ba9c619893c767db0f9c3e826d5118b57c35229301bcd16d865a89cec16a7e5", + "path": "org/apache/maven/shared/maven-shared-utils/3.2.1/maven-shared-utils-3.2.1.jar" + }, + { + "url": "org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar", + "hash": "1205a1f229999170dcadcfb885a278ad0bc2295540a251f4c438f887ead7bbd9", + "path": "org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar", + "hash": "1c98a4ec9eb0cb86ecf01710aa75c0346ee3f96edc6edeabcb21ed984120e154", + "path": "org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar", + "hash": "7fc63378d3e84663619b9bedace9f9fe78b276c2be3c62ca2245449294c84176", + "path": "org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar" + }, + { + "url": "org/apache/maven/maven-model/3.0/maven-model-3.0.jar", + "hash": "27e426d73f8662b47f60df0e43439b3dec2909c42b89175a6e4431dfed3edafd", + "path": "org/apache/maven/maven-model/3.0/maven-model-3.0.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar", + "hash": "c938e4d8cdf0674496749a87e6d3b29aa41b1b35a39898a1ade2bc9eae214c17", + "path": "org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar" + }, + { + "url": "org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar", + "hash": "1c5c5ac5e8f29aefc8faa051ffa14eccd85b9e20f4bb35dc82fba7d5da50d326", + "path": "org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar" + }, + { + "url": "org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar", + "hash": "ff690ffc550b7ada3a4b79ef4ca89bf002b24f43a13a35d10195c3bba63d7654", + "path": "org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar" + }, + { + "url": "org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar", + "hash": "288149850d8d131763df4151f7e443fd2739e48510a6e4cfe49ca082c76130fa", + "path": "org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar" + }, + { + "url": "org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar", + "hash": "f54a0a28ce3d62af0e1cfe41dde616f645c28e452e77f77b78bc36e74d5e1a69", + "path": "org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar" + }, + { + "url": "org/apache/maven/shared/maven-artifact-transfer/0.13.1/maven-artifact-transfer-0.13.1.jar", + "hash": "1ac88accde99ed71e65253bd130868c0e654f940f01ade073b895eb2f817cf06", + "path": "org/apache/maven/shared/maven-artifact-transfer/0.13.1/maven-artifact-transfer-0.13.1.jar" + }, + { + "url": "org/apache/maven/maven-core/3.0/maven-core-3.0.jar", + "hash": "ba03294ee53e7ba31838e4950f280d033c7744c6c7b31253afc75aa351fbd989", + "path": "org/apache/maven/maven-core/3.0/maven-core-3.0.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar", + "hash": "3b1a46b4bc26a0176acaf99312ff2f3a631faf3224b0996af546aa48bd73c647", + "path": "org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar", + "hash": "e17e706c6f03c453f6000599cab607c2af5f1cc6e3a3b1e6fce27e5ef4999eab", + "path": "org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar", + "hash": "f5ecc6eaa4a32ee0c115d31525f588f491b2cc75fdeb4ed3c0c662c12ac0c32f", + "path": "org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar" + }, + { + "url": "org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar", + "hash": "a65e27aefbe74102d73cd7e3c5c7637021d294a9e7f33132f3c782a76714d0a3", + "path": "org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar" + }, + { + "url": "org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar", + "hash": "fb3160e1e3a7852b441016dbcc97a34e3cf4eeb8ceb9e82edf2729439858f080", + "path": "org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar" + }, + { + "url": "org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar", + "hash": "240113a2f22fd1f0b182b32baecf0e7876b3a8e41f3c4da3335eeb9ffb24b9f4", + "path": "org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar", + "hash": "7d95ad21733b060bfda2142b62439a196bde7644f9f127c299ae86d92179b518", + "path": "org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar", + "hash": "3b0559bb8432f28937efe6ca193ef54a8506d0075d73fd7406b9b116c6a11063", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar", + "hash": "5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4", + "path": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar", + "hash": "759079b9cf0cddae5ba06c96fd72347d82d0bc1d903c95d398c96522b139e470", + "path": "org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar" + }, + { + "url": "org/apache/maven/shared/maven-common-artifact-filters/3.1.0/maven-common-artifact-filters-3.1.0.jar", + "hash": "82a584c58bd6a1b13861e2d4cc194b5afc09ca0adad9fda741f16337dcda2e96", + "path": "org/apache/maven/shared/maven-common-artifact-filters/3.1.0/maven-common-artifact-filters-3.1.0.jar" + }, + { + "url": "org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar", + "hash": "fe30825245d2336c859dc38d60c0fc5f3668dbf29cd586828d2b5667ec355b91", + "path": "org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar" + }, + { + "url": "commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar", + "hash": "eeeae917917144a68a741d4c0dff66aa5c5c5fd85593ff217bced3fc8ca783b8", + "path": "commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar" + }, + { + "url": "org/codehaus/plexus/plexus-velocity/1.2/plexus-velocity-1.2.jar", + "hash": "b4c4a0dbeacad54306a1ae230eff5ab45d58e3ab88c86ab7245d3a0772be57ab", + "path": "org/codehaus/plexus/plexus-velocity/1.2/plexus-velocity-1.2.jar" + }, + { + "url": "org/apache/velocity/velocity/1.7/velocity-1.7.jar", + "hash": "ec92dae810034f4b46dbb16ef4364a4013b0efb24a8c5dd67435cae46a290d8e", + "path": "org/apache/velocity/velocity/1.7/velocity-1.7.jar" + }, + { + "url": "commons-lang/commons-lang/2.4/commons-lang-2.4.jar", + "hash": "2c73b940c91250bc98346926270f13a6a10bb6e29d2c9316a70d134e382c873e", + "path": "commons-lang/commons-lang/2.4/commons-lang-2.4.jar" + }, + { + "url": "com/ibm/icu/icu4j/70.1/icu4j-70.1.jar", + "hash": "2b4d8d4e098e86aa5f905ec81c46751d218b16afd3f7fc02b64f80dd20fffa20", + "path": "com/ibm/icu/icu4j/70.1/icu4j-70.1.jar" + }, + { + "url": "org/apache/maven/maven-core/3.3.9/maven-core-3.3.9.jar", + "hash": "070d55ec5a6f3e4a785564283a9704bb39a93f1a2f89cdf60a3b899fde563bf9", + "path": "org/apache/maven/maven-core/3.3.9/maven-core-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar", + "hash": "15abde67fa7ea1e573e1f68c34921e995f0971351aaf1fb96790688ff510efcd", + "path": "org/apache/maven/maven-model/3.3.9/maven-model-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.3.9/maven-settings-3.3.9.jar", + "hash": "e4f569be53a076424e784222e7088f1827fcb2ef18d409132b3cda2fd92799e2", + "path": "org/apache/maven/maven-settings/3.3.9/maven-settings-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.3.9/maven-settings-builder-3.3.9.jar", + "hash": "b4da54d52e2996a8a77c4db1ca8e98fc31792f07eeff695776f00ecffc3d5b60", + "path": "org/apache/maven/maven-settings-builder/3.3.9/maven-settings-builder-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar", + "hash": "462a0d711a979c44791b97422ec4e91300ae555a598f684f116d725a2b9d297b", + "path": "org/apache/maven/maven-builder-support/3.3.9/maven-builder-support-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar", + "hash": "6dbcc3d3d1dfb34df46c1ddb080fdd09fb899c80207016419cf13236c6b10399", + "path": "org/apache/maven/maven-repository-metadata/3.3.9/maven-repository-metadata-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar", + "hash": "1f702928f2233c6ecdf308fbd8f2932ea287c7062183d3c8364b0db7e9c4445d", + "path": "org/apache/maven/maven-artifact/3.3.9/maven-artifact-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.3.9/maven-plugin-api-3.3.9.jar", + "hash": "14cae18fd7125901b12fc914e30ea26ad9bd43dbd399dd6e8fcbc6c754ef2c9c", + "path": "org/apache/maven/maven-plugin-api/3.3.9/maven-plugin-api-3.3.9.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar", + "hash": "6909cb229489e693df7960678528800a1759625835a1cb939c37b051c22193c3", + "path": "org/apache/maven/maven-model-builder/3.3.9/maven-model-builder-3.3.9.jar" + }, + { + "url": "com/google/guava/guava/18.0/guava-18.0.jar", + "hash": "d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99", + "path": "com/google/guava/guava/18.0/guava-18.0.jar" + }, + { + "url": "org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar", + "hash": "f46962583d812cd4459a4cc963113b9c52f1f9b169172354693bc9efa0b3e3cb", + "path": "org/apache/maven/maven-aether-provider/3.3.9/maven-aether-provider-3.3.9.jar" + }, + { + "url": "org/eclipse/aether/aether-spi/1.0.2.v20150114/aether-spi-1.0.2.v20150114.jar", + "hash": "2cafa2629da49edd54eb4df6d15f628c2d80eec293f37cd561f1fe78e7bcff9d", + "path": "org/eclipse/aether/aether-spi/1.0.2.v20150114/aether-spi-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/aether/aether-impl/1.0.2.v20150114/aether-impl-1.0.2.v20150114.jar", + "hash": "9a84f5863407acf2bf9cf280cd02f5a518952a386de61df3b8c5db8cfdec725d", + "path": "org/eclipse/aether/aether-impl/1.0.2.v20150114/aether-impl-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/aether/aether-api/1.0.2.v20150114/aether-api-1.0.2.v20150114.jar", + "hash": "3f74c7c7b9c924769cf3c5b4d52d21aa63e9a2ccbf16f5d26c30ebb31b99699d", + "path": "org/eclipse/aether/aether-api/1.0.2.v20150114/aether-api-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/aether/aether-util/1.0.2.v20150114/aether-util-1.0.2.v20150114.jar", + "hash": "9e9a57439a98034732e94d841bb7065b56e3a065654361ca9cc07135e9fbe17c", + "path": "org/eclipse/aether/aether-util/1.0.2.v20150114/aether-util-1.0.2.v20150114.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.2/org.eclipse.sisu.plexus-0.3.2.jar", + "hash": "f5cfe0d88e8276971db4ecff0e4186d5f2ec5fdb1b6bb8c2f359fdc4b43eb8b2", + "path": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.2/org.eclipse.sisu.plexus-0.3.2.jar" + }, + { + "url": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar", + "hash": "1f10b2204cc77c919301f20ff90461c3df1b6e6cb148be1c2d22107f4851d423", + "path": "javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" + }, + { + "url": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar", + "hash": "a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f", + "path": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" + }, + { + "url": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.2/org.eclipse.sisu.inject-0.3.2.jar", + "hash": "66e87705a818da44eb080a7bb1fc431de987754b4f92aa85f69991bfc677d40d", + "path": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.2/org.eclipse.sisu.inject-0.3.2.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar", + "hash": "aba7980581027ad5fc74a27ee4d64aad74932fdb32694967242d03fc50290d1f", + "path": "org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar", + "hash": "0f31c44b275f87e56d46a582ce96d03b9e2ab344cf87c4e268b34d3ad046beab", + "path": "org/codehaus/plexus/plexus-utils/3.0.22/plexus-utils-3.0.22.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar", + "hash": "b2931d41740490a8d931cbe0cfe9ac20deb66cca606e679f52522f7f534c9fd7", + "path": "org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar", + "hash": "2b3a6ca5f19a9ad490bc233f45e68d3093c8c01b4acc3c1d14bad4ca7c7ff438", + "path": "org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar", + "hash": "3b0559bb8432f28937efe6ca193ef54a8506d0075d73fd7406b9b116c6a11063", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar", + "hash": "5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4", + "path": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" + }, + { + "url": "org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar", + "hash": "734c8356420cc8e30c795d64fd1fcd5d44ea9d90342a2cc3262c5158fbc6d98b", + "path": "org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar" + }, + { + "url": "com/google/inject/guice/4.0/guice-4.0.jar", + "hash": "b378ffc35e7f7125b3c5f3a461d4591ae1685e3c781392f0c854ed7b7581d6d2", + "path": "com/google/inject/guice/4.0/guice-4.0.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "org/apache/maven/maven-core/3.0.5/maven-core-3.0.5.jar", + "hash": "ac8e617f951ecde3c4f6bca4922fdd7861500fe7d58289f26ad5adac443075bc", + "path": "org/apache/maven/maven-core/3.0.5/maven-core-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-model/3.0.5/maven-model-3.0.5.jar", + "hash": "876a76b663db6c7326ad234afe430c473d3261a06b3284f31d5eb4889d1c3084", + "path": "org/apache/maven/maven-model/3.0.5/maven-model-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.0.5/maven-settings-3.0.5.jar", + "hash": "d8f9f237afc21d8202eedffa29cbf6e9d46c78b3c22b217d16267216988221b9", + "path": "org/apache/maven/maven-settings/3.0.5/maven-settings-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.0.5/maven-settings-builder-3.0.5.jar", + "hash": "ac0e62e26b7f690e265ba75667531973b8a2da12b3b0ff102a612f05b42b6faf", + "path": "org/apache/maven/maven-settings-builder/3.0.5/maven-settings-builder-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.0.5/maven-repository-metadata-3.0.5.jar", + "hash": "c867b4e075a4548bf27422542f96b159f94c4e7ffaaf6427b10433afd6a3a38c", + "path": "org/apache/maven/maven-repository-metadata/3.0.5/maven-repository-metadata-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar", + "hash": "c6d5e244dd2329971f91b8df666ffe9e0b00a7dd014d6ee073b6f6cb82877f5c", + "path": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.0.5/maven-plugin-api-3.0.5.jar", + "hash": "469505f75b8526a338cfd7e0ec841655ae52ddbcc1b36482e97d72f52ce7d890", + "path": "org/apache/maven/maven-plugin-api/3.0.5/maven-plugin-api-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.0.5/maven-model-builder-3.0.5.jar", + "hash": "45a2c6ff76e12678eaf576bd7a68d028c5a5ba85fdc216a381ea86e9187e1b51", + "path": "org/apache/maven/maven-model-builder/3.0.5/maven-model-builder-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-aether-provider/3.0.5/maven-aether-provider-3.0.5.jar", + "hash": "c74327cd5d7b137c8be3591c766271ac8ace1a617518f0410b8a95579f9839b0", + "path": "org/apache/maven/maven-aether-provider/3.0.5/maven-aether-provider-3.0.5.jar" + }, + { + "url": "org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar", + "hash": "d5de4e299be5a79feb1dbe8ff3814034c6e44314b4c00b92ffa8d97576ded5b3", + "path": "org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-impl/1.13.1/aether-impl-1.13.1.jar", + "hash": "865511994805827e88f327944a089142bb7f3d88cde271ba3dceb732cb137a93", + "path": "org/sonatype/aether/aether-impl/1.13.1/aether-impl-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar", + "hash": "ae8dc80232771f8913febfa410c5719e9ba8ded81fb99788e214fd676dbbe13f", + "path": "org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar", + "hash": "687799a0ce988bee9e8eb9ae0ba870300adc0114248ad4a4327bdb625d27e010", + "path": "org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar" + }, + { + "url": "org/sonatype/sisu/sisu-inject-plexus/2.3.0/sisu-inject-plexus-2.3.0.jar", + "hash": "bf9083fb846993689409b2bdbc735048e53bac6cc32707cde7ef84817b6e9365", + "path": "org/sonatype/sisu/sisu-inject-plexus/2.3.0/sisu-inject-plexus-2.3.0.jar" + }, + { + "url": "org/sonatype/sisu/sisu-inject-bean/2.3.0/sisu-inject-bean-2.3.0.jar", + "hash": "75819b29737c2bee1bfbda1011d455c7036738e0ef32ffbf85ba1d8fa157ceb2", + "path": "org/sonatype/sisu/sisu-inject-bean/2.3.0/sisu-inject-bean-2.3.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar", + "hash": "7fc63378d3e84663619b9bedace9f9fe78b276c2be3c62ca2245449294c84176", + "path": "org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar", + "hash": "8b909f4ca9788647942f883d4e559bcc642123f7c6bcd3846983a2e465469c33", + "path": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar", + "hash": "259d528a29722cab6349d7e7d432e3fd4877c087ffcb04985a6612e97023bba8", + "path": "org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar", + "hash": "4df7a6a7be64b35bbccf60b5c115697f9ea3421d22674ae67135dde375fcca1f", + "path": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar", + "hash": "3b0559bb8432f28937efe6ca193ef54a8506d0075d73fd7406b9b116c6a11063", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar", + "hash": "5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4", + "path": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" + }, + { + "url": "org/sonatype/sisu/sisu-guice/3.1.0/sisu-guice-3.1.0.jar", + "hash": "a263933f43e9c273161e0b99f553c33a80a0416ec0bd5dca17d54cf38ae5956f", + "path": "org/sonatype/sisu/sisu-guice/3.1.0/sisu-guice-3.1.0.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "org/sonatype/sisu/sisu-guava/0.9.9/sisu-guava-0.9.9.jar", + "hash": "9897e80ff6c08fc45b5b5ebd81d9e943a1087bdf0ad50cda457d616abbdaacd9", + "path": "org/sonatype/sisu/sisu-guava/0.9.9/sisu-guava-0.9.9.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar", + "hash": "4df7a6a7be64b35bbccf60b5c115697f9ea3421d22674ae67135dde375fcca1f", + "path": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" + }, + { + "url": "org/eclipse/aether/aether-api/0.9.0.M2/aether-api-0.9.0.M2.jar", + "hash": "e220097cffad96c2963ab12652ff8833ec6f40143d509f0a2ea59d22209b6ecd", + "path": "org/eclipse/aether/aether-api/0.9.0.M2/aether-api-0.9.0.M2.jar" + }, + { + "url": "org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar", + "hash": "ae8dc80232771f8913febfa410c5719e9ba8ded81fb99788e214fd676dbbe13f", + "path": "org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar" + }, + { + "url": "org/apache/maven/maven-core/3.0.5/maven-core-3.0.5.jar", + "hash": "ac8e617f951ecde3c4f6bca4922fdd7861500fe7d58289f26ad5adac443075bc", + "path": "org/apache/maven/maven-core/3.0.5/maven-core-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-model/3.0.5/maven-model-3.0.5.jar", + "hash": "876a76b663db6c7326ad234afe430c473d3261a06b3284f31d5eb4889d1c3084", + "path": "org/apache/maven/maven-model/3.0.5/maven-model-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-settings/3.0.5/maven-settings-3.0.5.jar", + "hash": "d8f9f237afc21d8202eedffa29cbf6e9d46c78b3c22b217d16267216988221b9", + "path": "org/apache/maven/maven-settings/3.0.5/maven-settings-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-settings-builder/3.0.5/maven-settings-builder-3.0.5.jar", + "hash": "ac0e62e26b7f690e265ba75667531973b8a2da12b3b0ff102a612f05b42b6faf", + "path": "org/apache/maven/maven-settings-builder/3.0.5/maven-settings-builder-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-repository-metadata/3.0.5/maven-repository-metadata-3.0.5.jar", + "hash": "c867b4e075a4548bf27422542f96b159f94c4e7ffaaf6427b10433afd6a3a38c", + "path": "org/apache/maven/maven-repository-metadata/3.0.5/maven-repository-metadata-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar", + "hash": "c6d5e244dd2329971f91b8df666ffe9e0b00a7dd014d6ee073b6f6cb82877f5c", + "path": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-plugin-api/3.0.5/maven-plugin-api-3.0.5.jar", + "hash": "469505f75b8526a338cfd7e0ec841655ae52ddbcc1b36482e97d72f52ce7d890", + "path": "org/apache/maven/maven-plugin-api/3.0.5/maven-plugin-api-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-model-builder/3.0.5/maven-model-builder-3.0.5.jar", + "hash": "45a2c6ff76e12678eaf576bd7a68d028c5a5ba85fdc216a381ea86e9187e1b51", + "path": "org/apache/maven/maven-model-builder/3.0.5/maven-model-builder-3.0.5.jar" + }, + { + "url": "org/apache/maven/maven-aether-provider/3.0.5/maven-aether-provider-3.0.5.jar", + "hash": "c74327cd5d7b137c8be3591c766271ac8ace1a617518f0410b8a95579f9839b0", + "path": "org/apache/maven/maven-aether-provider/3.0.5/maven-aether-provider-3.0.5.jar" + }, + { + "url": "org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar", + "hash": "d5de4e299be5a79feb1dbe8ff3814034c6e44314b4c00b92ffa8d97576ded5b3", + "path": "org/sonatype/aether/aether-spi/1.13.1/aether-spi-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-impl/1.13.1/aether-impl-1.13.1.jar", + "hash": "865511994805827e88f327944a089142bb7f3d88cde271ba3dceb732cb137a93", + "path": "org/sonatype/aether/aether-impl/1.13.1/aether-impl-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar", + "hash": "ae8dc80232771f8913febfa410c5719e9ba8ded81fb99788e214fd676dbbe13f", + "path": "org/sonatype/aether/aether-api/1.13.1/aether-api-1.13.1.jar" + }, + { + "url": "org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar", + "hash": "687799a0ce988bee9e8eb9ae0ba870300adc0114248ad4a4327bdb625d27e010", + "path": "org/sonatype/aether/aether-util/1.13.1/aether-util-1.13.1.jar" + }, + { + "url": "org/sonatype/sisu/sisu-inject-plexus/2.3.0/sisu-inject-plexus-2.3.0.jar", + "hash": "bf9083fb846993689409b2bdbc735048e53bac6cc32707cde7ef84817b6e9365", + "path": "org/sonatype/sisu/sisu-inject-plexus/2.3.0/sisu-inject-plexus-2.3.0.jar" + }, + { + "url": "org/sonatype/sisu/sisu-inject-bean/2.3.0/sisu-inject-bean-2.3.0.jar", + "hash": "75819b29737c2bee1bfbda1011d455c7036738e0ef32ffbf85ba1d8fa157ceb2", + "path": "org/sonatype/sisu/sisu-inject-bean/2.3.0/sisu-inject-bean-2.3.0.jar" + }, + { + "url": "org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar", + "hash": "7fc63378d3e84663619b9bedace9f9fe78b276c2be3c62ca2245449294c84176", + "path": "org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar", + "hash": "8b909f4ca9788647942f883d4e559bcc642123f7c6bcd3846983a2e465469c33", + "path": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar" + }, + { + "url": "org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar", + "hash": "259d528a29722cab6349d7e7d432e3fd4877c087ffcb04985a6612e97023bba8", + "path": "org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar", + "hash": "4df7a6a7be64b35bbccf60b5c115697f9ea3421d22674ae67135dde375fcca1f", + "path": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" + }, + { + "url": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar", + "hash": "3b0559bb8432f28937efe6ca193ef54a8506d0075d73fd7406b9b116c6a11063", + "path": "org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar" + }, + { + "url": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar", + "hash": "5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4", + "path": "org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar" + }, + { + "url": "org/sonatype/sisu/sisu-guice/3.1.0/sisu-guice-3.1.0.jar", + "hash": "a263933f43e9c273161e0b99f553c33a80a0416ec0bd5dca17d54cf38ae5956f", + "path": "org/sonatype/sisu/sisu-guice/3.1.0/sisu-guice-3.1.0.jar" + }, + { + "url": "javax/inject/javax.inject/1/javax.inject-1.jar", + "hash": "91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff", + "path": "javax/inject/javax.inject/1/javax.inject-1.jar" + }, + { + "url": "org/sonatype/sisu/sisu-guava/0.9.9/sisu-guava-0.9.9.jar", + "hash": "9897e80ff6c08fc45b5b5ebd81d9e943a1087bdf0ad50cda457d616abbdaacd9", + "path": "org/sonatype/sisu/sisu-guava/0.9.9/sisu-guava-0.9.9.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar", + "hash": "c6d5e244dd2329971f91b8df666ffe9e0b00a7dd014d6ee073b6f6cb82877f5c", + "path": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar", + "hash": "8b909f4ca9788647942f883d4e559bcc642123f7c6bcd3846983a2e465469c33", + "path": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar" + }, + { + "url": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar", + "hash": "4df7a6a7be64b35bbccf60b5c115697f9ea3421d22674ae67135dde375fcca1f", + "path": "org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" + }, + { + "url": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar", + "hash": "c6d5e244dd2329971f91b8df666ffe9e0b00a7dd014d6ee073b6f6cb82877f5c", + "path": "org/apache/maven/maven-artifact/3.0.5/maven-artifact-3.0.5.jar" + }, + { + "url": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar", + "hash": "8b909f4ca9788647942f883d4e559bcc642123f7c6bcd3846983a2e465469c33", + "path": "org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar" + }, + { + "url": "org/codehaus/plexus/plexus-archiver/3.0.3/plexus-archiver-3.0.3.jar", + "hash": "779d4a6878026fdaae6786683e33883d58f77df245fe38a7b444da12772190fc", + "path": "org/codehaus/plexus/plexus-archiver/3.0.3/plexus-archiver-3.0.3.jar" + }, + { + "url": "org/jetbrains/idea/maven/maven-indexer-api-rt/2023.2/maven-indexer-api-rt-2023.2.jar", + "hash": "b9e8bb167267aa21219d9319d568d3e48198dde3756368e6102879d638248931", + "path": "org/jetbrains/idea/maven/maven-indexer-api-rt/2023.2/maven-indexer-api-rt-2023.2.jar" + }, + { + "url": "com/google/apis/google-api-services-drive/v3-rev20230306-2.0.0/google-api-services-drive-v3-rev20230306-2.0.0.jar", + "hash": "a606dcd52e961402296c9774e92e998becccc5eee0fba79d5d9f9df6862c4718", + "path": "com/google/apis/google-api-services-drive/v3-rev20230306-2.0.0/google-api-services-drive-v3-rev20230306-2.0.0.jar" + }, + { + "url": "com/google/api-client/google-api-client/2.2.0/google-api-client-2.2.0.jar", + "hash": "58eca9fb0a869391689ffc828b3bd0b19ac76042ff9fab4881eddf7fde76903f", + "path": "com/google/api-client/google-api-client/2.2.0/google-api-client-2.2.0.jar" + }, + { + "url": "com/google/oauth-client/google-oauth-client/1.34.1/google-oauth-client-1.34.1.jar", + "hash": "193edf97aefa28b93c5892bdc598bac34fa4c396588030084f290b1440e8b98a", + "path": "com/google/oauth-client/google-oauth-client/1.34.1/google-oauth-client-1.34.1.jar" + }, + { + "url": "com/google/http-client/google-http-client-gson/1.42.3/google-http-client-gson-1.42.3.jar", + "hash": "8196efaa89c5f73b00b2b48edad02fcd78524259407c37ab1860737988545cee", + "path": "com/google/http-client/google-http-client-gson/1.42.3/google-http-client-gson-1.42.3.jar" + }, + { + "url": "com/google/http-client/google-http-client/1.42.3/google-http-client-1.42.3.jar", + "hash": "e395dd1765e3e6bceb0c610706bcf4128de84bd6e65cf1d4adbf998b4114161c", + "path": "com/google/http-client/google-http-client/1.42.3/google-http-client-1.42.3.jar" + }, + { + "url": "io/opencensus/opencensus-api/0.31.1/opencensus-api-0.31.1.jar", + "hash": "f1474d47f4b6b001558ad27b952e35eda5cc7146788877fc52938c6eba24b382", + "path": "io/opencensus/opencensus-api/0.31.1/opencensus-api-0.31.1.jar" + }, + { + "url": "io/opencensus/opencensus-contrib-http-util/0.31.1/opencensus-contrib-http-util-0.31.1.jar", + "hash": "3ea995b55a4068be22989b70cc29a4d788c2d328d1d50613a7a9afd13fdd2d0a", + "path": "io/opencensus/opencensus-contrib-http-util/0.31.1/opencensus-contrib-http-util-0.31.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/scenebuilderkit/11.0.5/scenebuilderkit-11.0.5.jar", + "hash": "36cd8f5bc933bcf726fadfc5276f0efcc7873d3a532e4e164674d2e8919f4781", + "path": "org/jetbrains/intellij/deps/scenebuilderkit/11.0.5/scenebuilderkit-11.0.5.jar" + }, + { + "url": "org/apache/ant/ant/1.7.1/ant-1.7.1.jar", + "hash": "ebe592c9af9fdb6c55f0e6c6fabc76f6e0eec8efdec535398e86c3a883687ebf", + "path": "org/apache/ant/ant/1.7.1/ant-1.7.1.jar" + }, + { + "url": "org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar", + "hash": "25eb5926c975ac6f4126feeb9d004f53f9ebf07dc117f5db9958a6bfb3110783", + "path": "org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-java/0.9.3/completion-ranking-java-0.9.3.jar", + "hash": "e3dcfee71eb13467139a1385152bd28554c79c677738cb617a91a772ea6e9f87", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-java/0.9.3/completion-ranking-java-0.9.3.jar" + }, + { + "url": "org/jetbrains/intellij/deps/debugger-memory-agent/1.0.43/debugger-memory-agent-1.0.43.jar", + "hash": "8915bdd1d6afc9df4eb1003069f40b7d24794b869c7dd1c849e45c1eb98269d8", + "path": "org/jetbrains/intellij/deps/debugger-memory-agent/1.0.43/debugger-memory-agent-1.0.43.jar" + }, + { + "url": "org/jetbrains/intellij/deps/sa-jdwp/1.22/sa-jdwp-1.22.jar", + "hash": "eaee1397eb553601c29954945e6dafbd7b9a17983704da4088db4da65a156b21", + "path": "org/jetbrains/intellij/deps/sa-jdwp/1.22/sa-jdwp-1.22.jar" + }, + { + "url": "org/jetbrains/intellij/deps/debugger-agent/1.2/debugger-agent-1.2.jar", + "hash": "b724610d5798f5dad9c86d7fd3771ce155a0601b6153741e75c4d86fab100d84", + "path": "org/jetbrains/intellij/deps/debugger-agent/1.2/debugger-agent-1.2.jar" + }, + { + "url": "org/jacoco/org.jacoco.ant/0.8.8/org.jacoco.ant-0.8.8.jar", + "hash": "02e33bd2c48dc0be67c2fea84d43beececfd400da6797c58153253d4c30aca15", + "path": "org/jacoco/org.jacoco.ant/0.8.8/org.jacoco.ant-0.8.8.jar" + }, + { + "url": "org/jacoco/org.jacoco.core/0.8.8/org.jacoco.core-0.8.8.jar", + "hash": "474c782f809d88924713dfdbf0acb79d330f904be576484803463d0465611643", + "path": "org/jacoco/org.jacoco.core/0.8.8/org.jacoco.core-0.8.8.jar" + }, + { + "url": "org/ow2/asm/asm/9.2/asm-9.2.jar", + "hash": "b9d4fe4d71938df38839f0eca42aaaa64cf8b313d678da036f0cb3ca199b47f5", + "path": "org/ow2/asm/asm/9.2/asm-9.2.jar" + }, + { + "url": "org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar", + "hash": "be4ce53138a238bb522cd781cf91f3ba5ce2f6ca93ec62d46a162a127225e0a6", + "path": "org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar" + }, + { + "url": "org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar", + "hash": "878fbe521731c072d14d2d65b983b1beae6ad06fda0007b6a8bae81f73f433c4", + "path": "org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar" + }, + { + "url": "org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar", + "hash": "aabf9bd23091a4ebfc109c1f3ee7cf3e4b89f6ba2d3f51c5243f16b3cffae011", + "path": "org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar" + }, + { + "url": "org/jacoco/org.jacoco.report/0.8.8/org.jacoco.report-0.8.8.jar", + "hash": "2c129110f3e3fcaa1f8179578ea3894586199cb0826be5c7790278084c9622a9", + "path": "org/jacoco/org.jacoco.report/0.8.8/org.jacoco.report-0.8.8.jar" + }, + { + "url": "org/jacoco/org.jacoco.agent/0.8.8/org.jacoco.agent-0.8.8.jar", + "hash": "072ecbd496896623899a696fff12c01c1615f737616d2792e6d0e10cdf8a610d", + "path": "org/jacoco/org.jacoco.agent/0.8.8/org.jacoco.agent-0.8.8.jar" + }, + { + "url": "org/jetbrains/intellij/deps/coverage-report/1.0.20/coverage-report-1.0.20.jar", + "hash": "5959f0aa7f33c74c8cde6babb2d9b92638f0e143461d2c37f6859f731c275c59", + "path": "org/jetbrains/intellij/deps/coverage-report/1.0.20/coverage-report-1.0.20.jar" + }, + { + "url": "org/freemarker/freemarker/2.3.32/freemarker-2.3.32.jar", + "hash": "04d65ec1bde6cea20e3495d5e78ef96ab774d9936434861d3254bd88e7e94f92", + "path": "org/freemarker/freemarker/2.3.32/freemarker-2.3.32.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-transport-file/1.3.3/maven-resolver-transport-file-1.3.3.jar", + "hash": "e6842c1a2c9080e60fed7747d2375fedf7e51277a995b7c053426f68537bc9c3", + "path": "org/apache/maven/resolver/maven-resolver-transport-file/1.3.3/maven-resolver-transport-file-1.3.3.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-transport-http/1.3.3/maven-resolver-transport-http-1.3.3.jar", + "hash": "efe8d834e7b55c30e1e17a1a9171ffcf67915eb00c3b0f8a9b8f2bc8aa4752f8", + "path": "org/apache/maven/resolver/maven-resolver-transport-http/1.3.3/maven-resolver-transport-http-1.3.3.jar" + }, + { + "url": "org/apache/maven/resolver/maven-resolver-connector-basic/1.3.3/maven-resolver-connector-basic-1.3.3.jar", + "hash": "273d2fe6bfe65986949d6e827794cf3ec43295af6dafe1d4186b6f3dd83c75a3", + "path": "org/apache/maven/resolver/maven-resolver-connector-basic/1.3.3/maven-resolver-connector-basic-1.3.3.jar" + }, + { + "url": "com/jetbrains/intellij/documentation/tips-intellij-idea-community/223.48/tips-intellij-idea-community-223.48.jar", + "hash": "7bb5d2980f547b6c868abcbbfc50b4076b6675e0b1be7a888139242aaecaa83b", + "path": "com/jetbrains/intellij/documentation/tips-intellij-idea-community/223.48/tips-intellij-idea-community-223.48.jar" + }, + { + "url": "org/spockframework/spock-core/2.1-groovy-3.0/spock-core-2.1-groovy-3.0.jar", + "hash": "fa8ff7446df04c51b3ccbc2a1bbc71f9c280878afe2d53be44d59d00b1b9828c", + "path": "org/spockframework/spock-core/2.1-groovy-3.0/spock-core-2.1-groovy-3.0.jar" + }, + { + "url": "org/junit/platform/junit-platform-engine/1.8.1/junit-platform-engine-1.8.1.jar", + "hash": "702868ed7e86b9b4672ede0f1e185e905baca9afab57746a7c650be3c7bca047", + "path": "org/junit/platform/junit-platform-engine/1.8.1/junit-platform-engine-1.8.1.jar" + }, + { + "url": "org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar", + "hash": "58812de60898d976fb81ef3b62da05c6604c18fd4a249f5044282479fc286af2", + "path": "org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar" + }, + { + "url": "org/languagetool/languagetool-core/6.1/languagetool-core-6.1.jar", + "hash": "0214cac9c32594e6754023069dbc9715ef1cf1662e0142cada300d1e8ff3eded", + "path": "org/languagetool/languagetool-core/6.1/languagetool-core-6.1.jar" + }, + { + "url": "org/languagetool/language-ru/6.1/language-ru-6.1.jar", + "hash": "79070a899b8d63acfde91f1f4f0772cc4f20a4c3f3d6d3dd5067821cb9215e70", + "path": "org/languagetool/language-ru/6.1/language-ru-6.1.jar" + }, + { + "url": "org/languagetool/language-de/6.1/language-de-6.1.jar", + "hash": "6ab71360ab27c94a0098cdd746e00a81605883c30c0d651b10fc17fe513f7215", + "path": "org/languagetool/language-de/6.1/language-de-6.1.jar" + }, + { + "url": "de/danielnaber/german-pos-dict/1.2.4/german-pos-dict-1.2.4.jar", + "hash": "56f0b00adb704cbc1e86776b45f6890efe90685ab370a34b5b299593cdcaae22", + "path": "de/danielnaber/german-pos-dict/1.2.4/german-pos-dict-1.2.4.jar" + }, + { + "url": "de/danielnaber/jwordsplitter/4.5/jwordsplitter-4.5.jar", + "hash": "5904e500073c3ed1dadcf56c9bf2712f7b222762d3072421b1c2d83e04795f43", + "path": "de/danielnaber/jwordsplitter/4.5/jwordsplitter-4.5.jar" + }, + { + "url": "edu/washington/cs/knowitall/openregex/1.1.1/openregex-1.1.1.jar", + "hash": "33021c9cca70c6292d53ff7dac5d1832d422e986aba52ec998532a5f47f921f8", + "path": "edu/washington/cs/knowitall/openregex/1.1.1/openregex-1.1.1.jar" + }, + { + "url": "org/languagetool/language-it/6.1/language-it-6.1.jar", + "hash": "f2489582ada5e325870aa0904a8ba53701854b05e85d9896d7ae3d09d00a5a2b", + "path": "org/languagetool/language-it/6.1/language-it-6.1.jar" + }, + { + "url": "org/apache/commons/commons-text/1.10.0/commons-text-1.10.0.jar", + "hash": "770cd903fa7b604d1f7ef7ba17f84108667294b2b478be8ed1af3bffb4ae0018", + "path": "org/apache/commons/commons-text/1.10.0/commons-text-1.10.0.jar" + }, + { + "url": "org/languagetool/languagetool-core/6.1/languagetool-core-6.1.jar", + "hash": "0214cac9c32594e6754023069dbc9715ef1cf1662e0142cada300d1e8ff3eded", + "path": "org/languagetool/languagetool-core/6.1/languagetool-core-6.1.jar" + }, + { + "url": "org/languagetool/language-en/6.1/language-en-6.1.jar", + "hash": "59a7c525cd3c4227c1e61bcf15912c792835c1616ff26c7aa7f583c47cbdd95e", + "path": "org/languagetool/language-en/6.1/language-en-6.1.jar" + }, + { + "url": "net/loomchild/segment/2.0.1/segment-2.0.1.jar", + "hash": "00ffa85bb3aaf252ecfab4f97f8b49a8894aced02229529ff5c2a7ad31f94070", + "path": "net/loomchild/segment/2.0.1/segment-2.0.1.jar" + }, + { + "url": "org/carrot2/morfologik-stemming/2.1.9/morfologik-stemming-2.1.9.jar", + "hash": "6170895b2315b697f4da5630caf57c6c441f1cb419d89d1cb5326b0673293e8a", + "path": "org/carrot2/morfologik-stemming/2.1.9/morfologik-stemming-2.1.9.jar" + }, + { + "url": "org/carrot2/morfologik-speller/2.1.9/morfologik-speller-2.1.9.jar", + "hash": "8d2566a216f401380878f25196f84bd351b807b11f18bc71acd1417e04a1ec29", + "path": "org/carrot2/morfologik-speller/2.1.9/morfologik-speller-2.1.9.jar" + }, + { + "url": "com/carrotsearch/hppc/0.9.1/hppc-0.9.1.jar", + "hash": "d58706a2be60c972452550cdba79870bf481447c50eb718308e33a6ba45c65ec", + "path": "com/carrotsearch/hppc/0.9.1/hppc-0.9.1.jar" + }, + { + "url": "org/carrot2/morfologik-fsa-builders/2.1.9/morfologik-fsa-builders-2.1.9.jar", + "hash": "f418c519b49470c2ec7024086bf210ba370ff158732368005d3b8cef964d3fff", + "path": "org/carrot2/morfologik-fsa-builders/2.1.9/morfologik-fsa-builders-2.1.9.jar" + }, + { + "url": "org/carrot2/morfologik-fsa/2.1.9/morfologik-fsa-2.1.9.jar", + "hash": "1bfefce937df14cc94d32a98ce59c33f4d5b6c0eddbb436b6bfe27ff2120a23d", + "path": "org/carrot2/morfologik-fsa/2.1.9/morfologik-fsa-2.1.9.jar" + }, + { + "url": "tech/uom/lib/uom-lib-common/1.1/uom-lib-common-1.1.jar", + "hash": "4add5fbcb7f548b79230ed7e01cb9fd4f9e2524bd1598dbcbfd8150563fe27f7", + "path": "tech/uom/lib/uom-lib-common/1.1/uom-lib-common-1.1.jar" + }, + { + "url": "tech/units/indriya/1.3/indriya-1.3.jar", + "hash": "7cbaa6f42e2c8412ef13cd0fb7f81936d64a1c3ea7c4f69cf75bb4e9410cb76b", + "path": "tech/units/indriya/1.3/indriya-1.3.jar" + }, + { + "url": "javax/measure/unit-api/1.0/unit-api-1.0.jar", + "hash": "35da65fdbd3f9c1fe79cfc8399db975fd97660d8a219febfda9fd1a5fc058f10", + "path": "javax/measure/unit-api/1.0/unit-api-1.0.jar" + }, + { + "url": "com/hankcs/aho-corasick-double-array-trie/1.2.3/aho-corasick-double-array-trie-1.2.3.jar", + "hash": "564f0fc690d50702a313510b9a72e9505ace6e81108e84f65de4feb0da244eb8", + "path": "com/hankcs/aho-corasick-double-array-trie/1.2.3/aho-corasick-double-array-trie-1.2.3.jar" + }, + { + "url": "com/vdurmont/emoji-java/5.1.1/emoji-java-5.1.1.jar", + "hash": "537fae02b7b09de5e47de8f21df20c81af3cd373f369f61e20e00d54827539fb", + "path": "com/vdurmont/emoji-java/5.1.1/emoji-java-5.1.1.jar" + }, + { + "url": "org/json/json/20170516/json-20170516.jar", + "hash": "813f37e4820f1854e8a4eb4f80df94bf1b1f2ec6c3b72692f23ab9a556256af6", + "path": "org/json/json/20170516/json-20170516.jar" + }, + { + "url": "ai/grazie/utils/utils-lucene-lt-compatibility-jvm/0.2.181/utils-lucene-lt-compatibility-jvm-0.2.181.jar", + "hash": "cbc2a1339391d3ea1e059b192e7424dfff8593bcc5a1b674359714a817f4b705", + "path": "ai/grazie/utils/utils-lucene-lt-compatibility-jvm/0.2.181/utils-lucene-lt-compatibility-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/spell/gec-spell-engine-local-jvm/0.2.181/gec-spell-engine-local-jvm-0.2.181.jar", + "hash": "b968dbbd0794e47c93d9f02a7849171b781cbec97e876703893156b8098d1d67", + "path": "ai/grazie/spell/gec-spell-engine-local-jvm/0.2.181/gec-spell-engine-local-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/utils/utils-common-jvm/0.2.181/utils-common-jvm-0.2.181.jar", + "hash": "2e7a050c3f089fe826d3ae60548134e13107a9bb7f255aac454eb5e2009d273d", + "path": "ai/grazie/utils/utils-common-jvm/0.2.181/utils-common-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/utils/utils-json-jvm/0.2.181/utils-json-jvm-0.2.181.jar", + "hash": "d309e93ded5d557273d3a6b0c19e30497f8e464d127d77077ba73d9420327bf7", + "path": "ai/grazie/utils/utils-json-jvm/0.2.181/utils-json-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/nlp/nlp-common-jvm/0.2.181/nlp-common-jvm-0.2.181.jar", + "hash": "04f7819509575671eff478c634cb5c82969e85e9bf1d0a6a99d99e76c661b8ab", + "path": "ai/grazie/nlp/nlp-common-jvm/0.2.181/nlp-common-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/nlp/nlp-tokenizer-jvm/0.2.181/nlp-tokenizer-jvm-0.2.181.jar", + "hash": "102375c6ecf3ca204f0b0fc27986355149a76f26ca8e3aded3be4cae61141b3a", + "path": "ai/grazie/nlp/nlp-tokenizer-jvm/0.2.181/nlp-tokenizer-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/nlp/nlp-langs-jvm/0.2.181/nlp-langs-jvm-0.2.181.jar", + "hash": "807fca2e2cdbbc87e3ef5e140f651898f795f660f952a83ad21efeb829311984", + "path": "ai/grazie/nlp/nlp-langs-jvm/0.2.181/nlp-langs-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/nlp/nlp-patterns-jvm/0.2.181/nlp-patterns-jvm-0.2.181.jar", + "hash": "f5890877d9a8a7ac801cf0cbdf4df239f44797978620fa943ea99380701e7f41", + "path": "ai/grazie/nlp/nlp-patterns-jvm/0.2.181/nlp-patterns-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/nlp/nlp-detect-jvm/0.2.181/nlp-detect-jvm-0.2.181.jar", + "hash": "a111002943aa5df409448862b89c56a0517b19161ad08e17cbc7a58bb48ccb2e", + "path": "ai/grazie/nlp/nlp-detect-jvm/0.2.181/nlp-detect-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/model/model-text-jvm/0.2.181/model-text-jvm-0.2.181.jar", + "hash": "62cc8ea821d734fef552da80b78c87c92f5e65322530b157c07aaefecf702b99", + "path": "ai/grazie/model/model-text-jvm/0.2.181/model-text-jvm-0.2.181.jar" + }, + { + "url": "ai/grazie/model/model-common-jvm/0.2.181/model-common-jvm-0.2.181.jar", + "hash": "4aff241f00efbe7c17960a3a3efb1ba046586a562b53a25a68d2964fafff48d7", + "path": "ai/grazie/model/model-common-jvm/0.2.181/model-common-jvm-0.2.181.jar" + }, + { + "url": "io/github/classgraph/classgraph/4.8.87/classgraph-4.8.87.jar", + "hash": "91d2a2b6048c5cfe19f3982ee84eb5c19cab1d741a45ae1b4360c068331f89e6", + "path": "io/github/classgraph/classgraph/4.8.87/classgraph-4.8.87.jar" + }, + { + "url": "org/jeasy/easy-random-core/4.2.0/easy-random-core-4.2.0.jar", + "hash": "e37f9fd2680da69e6e4e0fef6472b53240a935a18804e957ef60ef20f36281de", + "path": "org/jeasy/easy-random-core/4.2.0/easy-random-core-4.2.0.jar" + }, + { + "url": "org/objenesis/objenesis/3.1/objenesis-3.1.jar", + "hash": "cdb3d038c188de6f46ffd5cd930be2d5e5dba59c53b26437995d534e3db2fb80", + "path": "org/objenesis/objenesis/3.1/objenesis-3.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/filePrediction/model/file-prediction-model/0.3.0/file-prediction-model-0.3.0.jar", + "hash": "e506fd77462afcdb16f0ccfe7c96c1549443580a3be240c5dcff1ae2bfac0555", + "path": "org/jetbrains/intellij/deps/filePrediction/model/file-prediction-model/0.3.0/file-prediction-model-0.3.0.jar" + }, + { + "url": "com/github/ajalt/clikt/2.2.0/clikt-2.2.0.jar", + "hash": "beb3136d06764ec8ce0810a8fd6c8b7b49d04287d1deef3a07c016e43a458d33", + "path": "com/github/ajalt/clikt/2.2.0/clikt-2.2.0.jar" + }, + { + "url": "io/cucumber/cucumber-java/5.0.0-RC1/cucumber-java-5.0.0-RC1.jar", + "hash": "789e598804155bcca83a01071382af90d0e9e1f6c686c881800b07fc0c1ea3c4", + "path": "io/cucumber/cucumber-java/5.0.0-RC1/cucumber-java-5.0.0-RC1.jar" + }, + { + "url": "io/cucumber/cucumber-core/5.0.0-RC1/cucumber-core-5.0.0-RC1.jar", + "hash": "ada4315573c505d9dbb03cb0624f4a4e9fe9af92f4d278c4d7eb0422cdf299ff", + "path": "io/cucumber/cucumber-core/5.0.0-RC1/cucumber-core-5.0.0-RC1.jar" + }, + { + "url": "io/cucumber/gherkin/5.2.0/gherkin-5.2.0.jar", + "hash": "ab8af6e8e1f5bea8cf04aeb6e87a96121d554132615c35d1d0d0bb8aac6ebe05", + "path": "io/cucumber/gherkin/5.2.0/gherkin-5.2.0.jar" + }, + { + "url": "io/cucumber/gherkin-jvm-deps/1.0.6/gherkin-jvm-deps-1.0.6.jar", + "hash": "6ac4b12c6b694ac9ee4eecc8949cf7976d1bd892871cf816298de404bde44bb2", + "path": "io/cucumber/gherkin-jvm-deps/1.0.6/gherkin-jvm-deps-1.0.6.jar" + }, + { + "url": "io/cucumber/tag-expressions/2.0.2/tag-expressions-2.0.2.jar", + "hash": "2c0fd9f293b2ca0ce22531b8769dc2aef37eb704f1212030513a90f6eb975476", + "path": "io/cucumber/tag-expressions/2.0.2/tag-expressions-2.0.2.jar" + }, + { + "url": "io/cucumber/cucumber-expressions/8.0.0/cucumber-expressions-8.0.0.jar", + "hash": "81ad14ebf1a885ab4a201f0e48695eb60d8c55265c8323d49b98a0e34093e30b", + "path": "io/cucumber/cucumber-expressions/8.0.0/cucumber-expressions-8.0.0.jar" + }, + { + "url": "org/hamcrest/hamcrest-core/2.1/hamcrest-core-2.1.jar", + "hash": "e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9", + "path": "org/hamcrest/hamcrest-core/2.1/hamcrest-core-2.1.jar" + }, + { + "url": "org/hamcrest/hamcrest/2.1/hamcrest-2.1.jar", + "hash": "ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050", + "path": "org/hamcrest/hamcrest/2.1/hamcrest-2.1.jar" + }, + { + "url": "org/hamcrest/hamcrest-library/2.1/hamcrest-library-2.1.jar", + "hash": "b7e2b6895b3b679f0e47b6380fda391b225e9b78505db9d8bdde8d3cc8d52a21", + "path": "org/hamcrest/hamcrest-library/2.1/hamcrest-library-2.1.jar" + }, + { + "url": "io/cucumber/datatable/3.0.0/datatable-3.0.0.jar", + "hash": "c021f59d4d914edc42cb4c40dc440dca05f36902e0eb36c0307ed2d192ae0860", + "path": "io/cucumber/datatable/3.0.0/datatable-3.0.0.jar" + }, + { + "url": "io/cucumber/datatable-dependencies/3.0.0/datatable-dependencies-3.0.0.jar", + "hash": "0348ab1b354dbaa327ee3bead884cf6d7b4cb23c086d803012dbb7cc319277b0", + "path": "io/cucumber/datatable-dependencies/3.0.0/datatable-dependencies-3.0.0.jar" + }, + { + "url": "io/cucumber/cucumber-plugin/5.0.0-RC1/cucumber-plugin-5.0.0-RC1.jar", + "hash": "4d4cc28f9c73f5137db7b0ecd371d33696f5eac18db6c1ef65b65dd16275b3f3", + "path": "io/cucumber/cucumber-plugin/5.0.0-RC1/cucumber-plugin-5.0.0-RC1.jar" + }, + { + "url": "io/cucumber/docstring/5.0.0-RC1/docstring-5.0.0-RC1.jar", + "hash": "90049802a975fde907069eea511687871b53824027ba54d2b7d7f447502e5d59", + "path": "io/cucumber/docstring/5.0.0-RC1/docstring-5.0.0-RC1.jar" + }, + { + "url": "org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar", + "hash": "a9aae9ff8ae3e17a2a18f79175e82b16267c246fbbd3ca9dfbbb290b08dcfdd4", + "path": "org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar" + }, + { + "url": "io/cucumber/cucumber-core/4.0.1/cucumber-core-4.0.1.jar", + "hash": "25c52c0401f0786f66be90e384e765dbe0358b73fddd8874f7029da5f1b3c259", + "path": "io/cucumber/cucumber-core/4.0.1/cucumber-core-4.0.1.jar" + }, + { + "url": "io/cucumber/cucumber-html/0.2.7/cucumber-html-0.2.7.jar", + "hash": "c2413a16c107a137f7a9d73f24af17211ef9580eef5fc2fab589610166781099", + "path": "io/cucumber/cucumber-html/0.2.7/cucumber-html-0.2.7.jar" + }, + { + "url": "io/cucumber/gherkin/5.1.0/gherkin-5.1.0.jar", + "hash": "67f1cedeb8e85e6af84f89a8fe70bafaf6216dfad7a46b76fe10c5ee814e51e3", + "path": "io/cucumber/gherkin/5.1.0/gherkin-5.1.0.jar" + }, + { + "url": "io/cucumber/tag-expressions/1.1.1/tag-expressions-1.1.1.jar", + "hash": "e5a0a71fb846752900c0e5a99aa13e5a1bbc3ec97e7faf26803648fa45215584", + "path": "io/cucumber/tag-expressions/1.1.1/tag-expressions-1.1.1.jar" + }, + { + "url": "io/cucumber/cucumber-expressions/6.1.0/cucumber-expressions-6.1.0.jar", + "hash": "660ba952417b95cfb22dda2e8be6fba46f521188e4f8a47ae9614f675bdb9bb8", + "path": "io/cucumber/cucumber-expressions/6.1.0/cucumber-expressions-6.1.0.jar" + }, + { + "url": "io/cucumber/datatable/1.1.3/datatable-1.1.3.jar", + "hash": "487db14bc5471639a5b05e66f3b5f60ca3f73f9d984088ba88c64078709f38aa", + "path": "io/cucumber/datatable/1.1.3/datatable-1.1.3.jar" + }, + { + "url": "io/cucumber/datatable-dependencies/1.1.3/datatable-dependencies-1.1.3.jar", + "hash": "33b9c48799b681328ec865756a0eb9c8ade946052ef1409a4d882e438956692c", + "path": "io/cucumber/datatable-dependencies/1.1.3/datatable-dependencies-1.1.3.jar" + }, + { + "url": "io/cucumber/cucumber-core/3.0.2/cucumber-core-3.0.2.jar", + "hash": "d3fc5dce5cd26a8a71a94b932395b9588c1c6abbd40c49c2281da74e5e48f6a4", + "path": "io/cucumber/cucumber-core/3.0.2/cucumber-core-3.0.2.jar" + }, + { + "url": "io/cucumber/cucumber-html/0.2.7/cucumber-html-0.2.7.jar", + "hash": "c2413a16c107a137f7a9d73f24af17211ef9580eef5fc2fab589610166781099", + "path": "io/cucumber/cucumber-html/0.2.7/cucumber-html-0.2.7.jar" + }, + { + "url": "io/cucumber/gherkin/5.0.0/gherkin-5.0.0.jar", + "hash": "e35cfa4a16204bf59fa167bb6d45be0717d6b7cfba1c30f156d8f21cde2f4065", + "path": "io/cucumber/gherkin/5.0.0/gherkin-5.0.0.jar" + }, + { + "url": "io/cucumber/tag-expressions/1.1.1/tag-expressions-1.1.1.jar", + "hash": "e5a0a71fb846752900c0e5a99aa13e5a1bbc3ec97e7faf26803648fa45215584", + "path": "io/cucumber/tag-expressions/1.1.1/tag-expressions-1.1.1.jar" + }, + { + "url": "io/cucumber/cucumber-expressions/5.0.19/cucumber-expressions-5.0.19.jar", + "hash": "e7e296e57f911d4f3827df55753611446c427fc46f41ecb94d5e9f9dacda872a", + "path": "io/cucumber/cucumber-expressions/5.0.19/cucumber-expressions-5.0.19.jar" + }, + { + "url": "io/cucumber/datatable/1.0.3/datatable-1.0.3.jar", + "hash": "0d7fa64225d159ee9d29554ea6fa2bd0891319e5c06a3b0b58db2decf72fd6f2", + "path": "io/cucumber/datatable/1.0.3/datatable-1.0.3.jar" + }, + { + "url": "io/cucumber/datatable-dependencies/1.0.3/datatable-dependencies-1.0.3.jar", + "hash": "ec82d25da10509aab64430406fbcdc9a376f1c55a0081cf1326429ff691fc99d", + "path": "io/cucumber/datatable-dependencies/1.0.3/datatable-dependencies-1.0.3.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-java/0.8.2/completion-ranking-java-0.8.2.jar", + "hash": "c1686a3bfa4f29059b39ec51c6d6774fe11933d11aebd95bdb0d94e3ad9d3905", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-java/0.8.2/completion-ranking-java-0.8.2.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-java/0.9.2/completion-ranking-java-0.9.2.jar", + "hash": "2492dead3c2800e114634681b25b6e718df17005107ed4f1d30403e3aedffeb9", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-java/0.9.2/completion-ranking-java-0.9.2.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-kotlin/0.3.4/completion-ranking-kotlin-0.3.4.jar", + "hash": "c4aed95367eeff94afb97ccf969bc65adee1292e24b61170838cfd0b732384c9", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-kotlin/0.3.4/completion-ranking-kotlin-0.3.4.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-scala/0.4.1/completion-ranking-scala-0.4.1.jar", + "hash": "2bbdd2aeaa31dc35180490ba20ee3096097e8ca4bcecdd1b80a1c162487d3c15", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-scala/0.4.1/completion-ranking-scala-0.4.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-rust/0.4.0/completion-ranking-rust-0.4.0.jar", + "hash": "1a220f42926fc3ac2bfce50c521aced95821ef8e8e7478a00e884acbbdc98248", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-rust/0.4.0/completion-ranking-rust-0.4.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-python/0.3.2/completion-ranking-python-0.3.2.jar", + "hash": "f8f253b40454960df2f9b744b98ba5a08b490db4227fb2e97cfa1d18d103321a", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-python/0.3.2/completion-ranking-python-0.3.2.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-php/0.2.4/completion-ranking-php-0.2.4.jar", + "hash": "b73ea2290e95b8f8350a3bcf1c1ab260aed8a249049501f4b175c8dda0f04a78", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-php/0.2.4/completion-ranking-php-0.2.4.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-ruby/0.2.4/completion-ranking-ruby-0.2.4.jar", + "hash": "10392061789cf7c0101931dbfe851355b3fd33c9249947586d855a9180c439a7", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-ruby/0.2.4/completion-ranking-ruby-0.2.4.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-go/0.2.4/completion-ranking-go-0.2.4.jar", + "hash": "a5b09d91c7633fa4dede7c640f189dce258c69aa65874f4eaca0a799a5fc35f9", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-go/0.2.4/completion-ranking-go-0.2.4.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-js/0.3.0/completion-ranking-js-0.3.0.jar", + "hash": "e73816d0b63fa701e916b89f44559f6b8f104501f8b4f2feb300ac513e7a3850", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-js/0.3.0/completion-ranking-js-0.3.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-typescript/0.4.0/completion-ranking-typescript-0.4.0.jar", + "hash": "1ad40bce28263d3e4ff3e140949211d8812b05a6a0f121e92cb23980832838fc", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-typescript/0.4.0/completion-ranking-typescript-0.4.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-dart/0.0.2/completion-ranking-dart-0.0.2.jar", + "hash": "024322c6d09f72f9bddeb94d52e803d235a9afc284bc3efe7dfbc9de58d4fa6f", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-dart/0.0.2/completion-ranking-dart-0.0.2.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-swift/0.1.3/completion-ranking-swift-0.1.3.jar", + "hash": "c1d511070b2900ced87e03443091640ff7758f5064ff14d3503d6c8f50d28c1b", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-swift/0.1.3/completion-ranking-swift-0.1.3.jar" + }, + { + "url": "org/jetbrains/intellij/deps/completion/completion-ranking-cpp/0.1.5/completion-ranking-cpp-0.1.5.jar", + "hash": "2c09237e1e0e76d571b77c4f43371d8cd828903ffa442f0e3593894bce3021c3", + "path": "org/jetbrains/intellij/deps/completion/completion-ranking-cpp/0.1.5/completion-ranking-cpp-0.1.5.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libstudio.android-test-plugin-result-listener-gradle-proto/223.0.1.0/libstudio.android-test-plugin-result-listener-gradle-proto-223.0.1.0.jar", + "hash": "66ef739fbba469adaf5a156521ad31299f409e536fe45a19f6b4b48a015e9a43", + "path": "org/jetbrains/intellij/deps/android/tools/base/libstudio.android-test-plugin-result-listener-gradle-proto/223.0.1.0/libstudio.android-test-plugin-result-listener-gradle-proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libserver-flag-test-proto/223.0.1.0/libserver-flag-test-proto-223.0.1.0.jar", + "hash": "f2aff0fdc4b9eeb19459b71b2d0258cfac15000a2d22bf37b6d2502f71d0782e", + "path": "org/jetbrains/intellij/deps/android/tools/base/libserver-flag-test-proto/223.0.1.0/libserver-flag-test-proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/traceprocessor_protos/223.0.1.0/traceprocessor_protos-223.0.1.0.jar", + "hash": "5c2211d1d24ebc87df24fd0929c2b3f24e2ca54dadaeb347630be88036dbee97", + "path": "org/jetbrains/intellij/deps/android/tools/base/traceprocessor_protos/223.0.1.0/traceprocessor_protos-223.0.1.0.jar" + }, + { + "url": "androidx/tracing/tracing-perfetto-common/1.0.0-alpha01/tracing-perfetto-common-1.0.0-alpha01.jar", + "hash": "d2b985280c57c9f5d03cce09650ee60a450021865a6f5d42780cc898e99f0c91", + "path": "androidx/tracing/tracing-perfetto-common/1.0.0-alpha01/tracing-perfetto-common-1.0.0-alpha01.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/traceprocessor_protos/223.0.1.0/traceprocessor_protos-223.0.1.0.jar", + "hash": "5c2211d1d24ebc87df24fd0929c2b3f24e2ca54dadaeb347630be88036dbee97", + "path": "org/jetbrains/intellij/deps/android/tools/base/traceprocessor_protos/223.0.1.0/traceprocessor_protos-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/traceprocessor_protos/223.0.1.0/traceprocessor_protos-223.0.1.0.jar", + "hash": "5c2211d1d24ebc87df24fd0929c2b3f24e2ca54dadaeb347630be88036dbee97", + "path": "org/jetbrains/intellij/deps/android/tools/base/traceprocessor_protos/223.0.1.0/traceprocessor_protos-223.0.1.0.jar" + }, + { + "url": "org/eclipse/elk/org.eclipse.elk.alg.layered/0.3.0/org.eclipse.elk.alg.layered-0.3.0.jar", + "hash": "08267d824581f81af8a196d4551decae1256a454e618409a363e3e1574b06520", + "path": "org/eclipse/elk/org.eclipse.elk.alg.layered/0.3.0/org.eclipse.elk.alg.layered-0.3.0.jar" + }, + { + "url": "org/eclipse/elk/org.eclipse.elk.core/0.3.0/org.eclipse.elk.core-0.3.0.jar", + "hash": "7ec333e41fb3924fb85f50c54b6aff0587c3b19935447f1c35c95e10752a7bdc", + "path": "org/eclipse/elk/org.eclipse.elk.core/0.3.0/org.eclipse.elk.core-0.3.0.jar" + }, + { + "url": "org/eclipse/elk/org.eclipse.elk.graph/0.3.0/org.eclipse.elk.graph-0.3.0.jar", + "hash": "3d8d9bf2df6e72c8a2dfd42adf79e3b8b417cd76958b3912a7dd62dfef816ca3", + "path": "org/eclipse/elk/org.eclipse.elk.graph/0.3.0/org.eclipse.elk.graph-0.3.0.jar" + }, + { + "url": "org/eclipse/emf/org.eclipse.emf.common/2.12.0/org.eclipse.emf.common-2.12.0.jar", + "hash": "80b9ddd0174bbc5623767ed9f4c96b17ae98ffaefb8edbcc780d59b0d7efef83", + "path": "org/eclipse/emf/org.eclipse.emf.common/2.12.0/org.eclipse.emf.common-2.12.0.jar" + }, + { + "url": "org/eclipse/emf/org.eclipse.emf.ecore/2.12.0/org.eclipse.emf.ecore-2.12.0.jar", + "hash": "2ac691cc4fa09fdf18beef6bdd457b7bdfe4d301f9707a8c89c6cb209139f4f9", + "path": "org/eclipse/emf/org.eclipse.emf.ecore/2.12.0/org.eclipse.emf.ecore-2.12.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/jb-r8/223.0.1.0/jb-r8-223.0.1.0.jar", + "hash": "1c237d8045d2eff0c093363d8e22cd29014c8c4ec540185656cfb4eb3007b6f8", + "path": "org/jetbrains/intellij/deps/android/tools/base/jb-r8/223.0.1.0/jb-r8-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libjava_sites/223.0.1.0/libjava_sites-223.0.1.0.jar", + "hash": "13b71bbf5023496373c78235f720324a6f304c95605bdecbec672d73a8bfcd2e", + "path": "org/jetbrains/intellij/deps/android/tools/base/libjava_sites/223.0.1.0/libjava_sites-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libandroid-core-proto/223.0.1.0/libandroid-core-proto-223.0.1.0.jar", + "hash": "e2cf0b8d5402b75827be7b44c195041f543586a185c21dad1422500623b5391a", + "path": "org/jetbrains/intellij/deps/android/tools/base/libandroid-core-proto/223.0.1.0/libandroid-core-proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libandroid-core-proto-test/223.0.1.0/libandroid-core-proto-test-223.0.1.0.jar", + "hash": "0fcb7d4212ea7581921e640297fa17d0f3bfa25cd511c49e1246041ccfa12ad8", + "path": "org/jetbrains/intellij/deps/android/tools/base/libandroid-core-proto-test/223.0.1.0/libandroid-core-proto-test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libstudio.android-test-plugin-host-retention-proto/223.0.1.0/libstudio.android-test-plugin-host-retention-proto-223.0.1.0.jar", + "hash": "787fa80e8668b468e7372edf252333cd2d909383b1b43596339be4701f396e33", + "path": "org/jetbrains/intellij/deps/android/tools/base/libstudio.android-test-plugin-host-retention-proto/223.0.1.0/libstudio.android-test-plugin-host-retention-proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libandroid-core-proto/223.0.1.0/libandroid-core-proto-223.0.1.0.jar", + "hash": "e2cf0b8d5402b75827be7b44c195041f543586a185c21dad1422500623b5391a", + "path": "org/jetbrains/intellij/deps/android/tools/base/libandroid-core-proto/223.0.1.0/libandroid-core-proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libstudio.android-test-plugin-host-retention-proto/223.0.1.0/libstudio.android-test-plugin-host-retention-proto-223.0.1.0.jar", + "hash": "787fa80e8668b468e7372edf252333cd2d909383b1b43596339be4701f396e33", + "path": "org/jetbrains/intellij/deps/android/tools/base/libstudio.android-test-plugin-host-retention-proto/223.0.1.0/libstudio.android-test-plugin-host-retention-proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/jb-r8/223.0.1.0/jb-r8-223.0.1.0.jar", + "hash": "1c237d8045d2eff0c093363d8e22cd29014c8c4ec540185656cfb4eb3007b6f8", + "path": "org/jetbrains/intellij/deps/android/tools/base/jb-r8/223.0.1.0/jb-r8-223.0.1.0.jar" + }, + { + "url": "com/android/tools/build/apkzlib/7.3.1/apkzlib-7.3.1.jar", + "hash": "415c5d5adff68b0ebd700e27c04c150683e65d5731d47fdb018eae391f70768c", + "path": "com/android/tools/build/apkzlib/7.3.1/apkzlib-7.3.1.jar" + }, + { + "url": "com/android/tools/build/apksig/7.3.1/apksig-7.3.1.jar", + "hash": "6d6a13a51ac3806c11af5f0967092055e35a67df6a74bff1544d9f5518c5ad55", + "path": "com/android/tools/build/apksig/7.3.1/apksig-7.3.1.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/build-analysis-results-proto/223.0.1.0/build-analysis-results-proto-223.0.1.0.jar", + "hash": "99bb80fcc279a81838095ffe321d106316d1bf2f18086cfa8b31d0f55846f2e6", + "path": "org/jetbrains/intellij/deps/android/tools/base/build-analysis-results-proto/223.0.1.0/build-analysis-results-proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/build-analysis-results-proto/223.0.1.0/build-analysis-results-proto-223.0.1.0.jar", + "hash": "99bb80fcc279a81838095ffe321d106316d1bf2f18086cfa8b31d0f55846f2e6", + "path": "org/jetbrains/intellij/deps/android/tools/base/build-analysis-results-proto/223.0.1.0/build-analysis-results-proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/asdriver_proto/223.0.1.0/asdriver_proto-223.0.1.0.jar", + "hash": "cbd08c3bd4cac45e3a7aac804332f2b75ca46b5aeb64c1eba55f0f26b83f59f2", + "path": "org/jetbrains/intellij/deps/android/tools/base/asdriver_proto/223.0.1.0/asdriver_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/asdriver_proto/223.0.1.0/asdriver_proto-223.0.1.0.jar", + "hash": "cbd08c3bd4cac45e3a7aac804332f2b75ca46b5aeb64c1eba55f0f26b83f59f2", + "path": "org/jetbrains/intellij/deps/android/tools/base/asdriver_proto/223.0.1.0/asdriver_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/backgroundtask_inspector_java_proto/223.0.1.0/backgroundtask_inspector_java_proto-223.0.1.0.jar", + "hash": "93a35166e8da6e10456325dcf7fe10717db203c48688a3e42ce3f912d7a59a57", + "path": "org/jetbrains/intellij/deps/android/tools/base/backgroundtask_inspector_java_proto/223.0.1.0/backgroundtask_inspector_java_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/workmanager_inspector_proto/223.0.1.0/workmanager_inspector_proto-223.0.1.0.jar", + "hash": "270cf0afdecbc1eabbbd70008300bc108ce86141b50accd4ba80e70bf1cec506", + "path": "org/jetbrains/intellij/deps/android/tools/base/workmanager_inspector_proto/223.0.1.0/workmanager_inspector_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/backgroundtask_inspector_java_proto/223.0.1.0/backgroundtask_inspector_java_proto-223.0.1.0.jar", + "hash": "93a35166e8da6e10456325dcf7fe10717db203c48688a3e42ce3f912d7a59a57", + "path": "org/jetbrains/intellij/deps/android/tools/base/backgroundtask_inspector_java_proto/223.0.1.0/backgroundtask_inspector_java_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/workmanager_inspector_proto/223.0.1.0/workmanager_inspector_proto-223.0.1.0.jar", + "hash": "270cf0afdecbc1eabbbd70008300bc108ce86141b50accd4ba80e70bf1cec506", + "path": "org/jetbrains/intellij/deps/android/tools/base/workmanager_inspector_proto/223.0.1.0/workmanager_inspector_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/backgroundtask_inspector_java_proto/223.0.1.0/backgroundtask_inspector_java_proto-223.0.1.0.jar", + "hash": "93a35166e8da6e10456325dcf7fe10717db203c48688a3e42ce3f912d7a59a57", + "path": "org/jetbrains/intellij/deps/android/tools/base/backgroundtask_inspector_java_proto/223.0.1.0/backgroundtask_inspector_java_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/workmanager_inspector_proto/223.0.1.0/workmanager_inspector_proto-223.0.1.0.jar", + "hash": "270cf0afdecbc1eabbbd70008300bc108ce86141b50accd4ba80e70bf1cec506", + "path": "org/jetbrains/intellij/deps/android/tools/base/workmanager_inspector_proto/223.0.1.0/workmanager_inspector_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.android-annotations/223.0.1.0/studio.android.sdktools.android-annotations-223.0.1.0.jar", + "hash": "4013a7184f41205bb08169bd3080fe757aeffe684e886ffb6428eb24a220ce23", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.android-annotations/223.0.1.0/studio.android.sdktools.android-annotations-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.common/223.0.1.0/studio.android.sdktools.common-223.0.1.0.jar", + "hash": "732fcd5f6d3387ab5d137d575cb582b6ee4f76bcd3b1770bc1cf14780c98f471", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.common/223.0.1.0/studio.android.sdktools.common-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.zipflinger/223.0.1.0/studio.android.sdktools.zipflinger-223.0.1.0.jar", + "hash": "806b72297242c889e402bcefe01e39a3641dc3372c2d6e650fbbd5e4e88dc1b1", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.zipflinger/223.0.1.0/studio.android.sdktools.zipflinger-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.zipflinger_test/223.0.1.0/studio.android.sdktools.zipflinger_test-223.0.1.0.jar", + "hash": "db1e307f8d935b22e45650a49c863a9292c436bc0e1064b3a93679cd5a20268f", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.zipflinger_test/223.0.1.0/studio.android.sdktools.zipflinger_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.intellij.android.wizardTemplate.plugin/223.0.1.0/studio.intellij.android.wizardTemplate.plugin-223.0.1.0.jar", + "hash": "ff81f3d216cfcf6944352655608cb1b372f42513ba87bf907ffb4ad7754dad6a", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.intellij.android.wizardTemplate.plugin/223.0.1.0/studio.intellij.android.wizardTemplate.plugin-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.intellij.android.wizardTemplate.plugin_test/223.0.1.0/studio.intellij.android.wizardTemplate.plugin_test-223.0.1.0.jar", + "hash": "a7191af31a7dcec5ce17b87f45024fc692c515b2c149dded2777dc2c123a1edd", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.intellij.android.wizardTemplate.plugin_test/223.0.1.0/studio.intellij.android.wizardTemplate.plugin_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.intellij.android.wizardTemplate.impl/223.0.1.0/studio.intellij.android.wizardTemplate.impl-223.0.1.0.jar", + "hash": "367b77279f1ba4387d206972f772c732c2f1ca6e017a1ff86868e68bb9269a43", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.intellij.android.wizardTemplate.impl/223.0.1.0/studio.intellij.android.wizardTemplate.impl-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.intellij.android.wizardTemplate.impl_test/223.0.1.0/studio.intellij.android.wizardTemplate.impl_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.intellij.android.wizardTemplate.impl_test/223.0.1.0/studio.intellij.android.wizardTemplate.impl_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.usb-devices/223.0.1.0/studio.usb-devices-223.0.1.0.jar", + "hash": "6865cdb827ee09c51dbf19c0e7ae2b81504f64fa20250f77c48b181df8f5a5d1", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.usb-devices/223.0.1.0/studio.usb-devices-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.usb-devices_test/223.0.1.0/studio.usb-devices_test-223.0.1.0.jar", + "hash": "6d38e62192abe7b7a52c12f49ccf8afa4986d0d5097517094d9d9d9a9543a536", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.usb-devices_test/223.0.1.0/studio.usb-devices_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.tracer/223.0.1.0/studio.android.sdktools.tracer-223.0.1.0.jar", + "hash": "a599465ec7d5f0da9e736b65c47a746c41021194b08ef4047e402130b40eac97", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.tracer/223.0.1.0/studio.android.sdktools.tracer-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.tracer_test/223.0.1.0/studio.android.sdktools.tracer_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.tracer_test/223.0.1.0/studio.android.sdktools.tracer_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.threading-agent-callback/223.0.1.0/studio.android.sdktools.threading-agent-callback-223.0.1.0.jar", + "hash": "070323e55f9bc05d20cdf8e1281c4a9909a72404707ebc45395c1d96de4f9fb3", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.threading-agent-callback/223.0.1.0/studio.android.sdktools.threading-agent-callback-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.threading-agent-callback_test/223.0.1.0/studio.android.sdktools.threading-agent-callback_test-223.0.1.0.jar", + "hash": "a6b62dafc4b4d2febfd2e79761c4454bd6e76d7a11b5c3ec8994c56f79241790", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.threading-agent-callback_test/223.0.1.0/studio.android.sdktools.threading-agent-callback_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.testutils/223.0.1.0/studio.android.sdktools.testutils-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.testutils/223.0.1.0/studio.android.sdktools.testutils-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.testutils_test/223.0.1.0/studio.android.sdktools.testutils_test-223.0.1.0.jar", + "hash": "4eb627a9e819c9dfb860a96e3710292605e0510c3bc303d1abbde4f4bcba9552", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.testutils_test/223.0.1.0/studio.android.sdktools.testutils_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.sdklib/223.0.1.0/studio.android.sdktools.sdklib-223.0.1.0.jar", + "hash": "8a72f4169f7d18c04ef8e88511bdabcbe24f10c4b47029d5869884e5223e63c2", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.sdklib/223.0.1.0/studio.android.sdktools.sdklib-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.sdklib_test/223.0.1.0/studio.android.sdktools.sdklib_test-223.0.1.0.jar", + "hash": "e01efdfc45171529c356ea9c327bb2b15ee412d459a4f34a99b8855edf6b53b4", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.sdklib_test/223.0.1.0/studio.android.sdktools.sdklib_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.sdk-common/223.0.1.0/studio.android.sdktools.sdk-common-223.0.1.0.jar", + "hash": "fe8f08431c9edb25eaa528fe12aa876417beac2cdb6fdc60d5bf0e1b71edbffb", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.sdk-common/223.0.1.0/studio.android.sdktools.sdk-common-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.sdk-common_test/223.0.1.0/studio.android.sdktools.sdk-common_test-223.0.1.0.jar", + "hash": "61e76755f7a33f32510703fd3454489bb853fc9d1152057f159e08a4f92c8d1d", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.sdk-common_test/223.0.1.0/studio.android.sdktools.sdk-common_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.resource-repository/223.0.1.0/studio.android.sdktools.resource-repository-223.0.1.0.jar", + "hash": "33db8f323b286f737a5e44238ec2090cefe073a20c73c52560748406cbfe72e6", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.resource-repository/223.0.1.0/studio.android.sdktools.resource-repository-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.resource-repository_test/223.0.1.0/studio.android.sdktools.resource-repository_test-223.0.1.0.jar", + "hash": "41f55b51ed5c1bdd387000c3d15e30914605886ce6891f0dc98dbf744f2a5b74", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.resource-repository_test/223.0.1.0/studio.android.sdktools.resource-repository_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.repository/223.0.1.0/studio.android.sdktools.repository-223.0.1.0.jar", + "hash": "242d96ced9bdf7532d10d27f1be938b199d94c56392f8770ccde1442dae5250e", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.repository/223.0.1.0/studio.android.sdktools.repository-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.repository_test/223.0.1.0/studio.android.sdktools.repository_test-223.0.1.0.jar", + "hash": "9ed9dcd20a199f557d961d9eb7ae9f5ee43ff43c32886b89cf834edf3c76a894", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.repository_test/223.0.1.0/studio.android.sdktools.repository_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.profgen/223.0.1.0/studio.android.sdktools.profgen-223.0.1.0.jar", + "hash": "6d43a3448e3b9c383480cfc012d7441fb244aac95c7016fcd76cfab50c9b2c59", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.profgen/223.0.1.0/studio.android.sdktools.profgen-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.profgen_test/223.0.1.0/studio.android.sdktools.profgen_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.profgen_test/223.0.1.0/studio.android.sdktools.profgen_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.process-monitor/223.0.1.0/studio.android.sdktools.process-monitor-223.0.1.0.jar", + "hash": "03dd0355077f9d638586fa978630bcd716ca211211c739edc7147c5869cca3bf", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.process-monitor/223.0.1.0/studio.android.sdktools.process-monitor-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.process-monitor_test/223.0.1.0/studio.android.sdktools.process-monitor_test-223.0.1.0.jar", + "hash": "529bb00ddb144df6bd915f859d05b5b62046d88119a1d6fb2d9683a4621196e6", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.process-monitor_test/223.0.1.0/studio.android.sdktools.process-monitor_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.pixelprobe/223.0.1.0/studio.android.sdktools.pixelprobe-223.0.1.0.jar", + "hash": "aa879ff4482de9f41c25081598c1000bb551de587a611caec82cae2e5be89182", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.pixelprobe/223.0.1.0/studio.android.sdktools.pixelprobe-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.pixelprobe_test/223.0.1.0/studio.android.sdktools.pixelprobe_test-223.0.1.0.jar", + "hash": "6255807e8284beccd3dfb31d82f76f4092a449a9d7965b258fff2918e8473313", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.pixelprobe_test/223.0.1.0/studio.android.sdktools.pixelprobe_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.perflib/223.0.1.0/studio.android.sdktools.perflib-223.0.1.0.jar", + "hash": "012564a6d57589e4e0f0f08147fede6a041b504c3f69b7959a988dece55fa7a0", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.perflib/223.0.1.0/studio.android.sdktools.perflib-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.perflib_test/223.0.1.0/studio.android.sdktools.perflib_test-223.0.1.0.jar", + "hash": "1799fd58ded92ca4a08101d3f9ee9f23b5e2d8370f8bb76a5b22a83ebdb94bfb", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.perflib_test/223.0.1.0/studio.android.sdktools.perflib_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.perf-logger/223.0.1.0/studio.perf-logger-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.perf-logger/223.0.1.0/studio.perf-logger-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.perf-logger_test/223.0.1.0/studio.perf-logger_test-223.0.1.0.jar", + "hash": "5d6113bbd791886f0b37844db564faa7a891bed8903d67250332341e7f112058", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.perf-logger_test/223.0.1.0/studio.perf-logger_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.ninepatch/223.0.1.0/studio.android.sdktools.ninepatch-223.0.1.0.jar", + "hash": "17141301fd0ac926b8db4178bdc217ea910f046f1a11e60b4bc5e866233ef8a5", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.ninepatch/223.0.1.0/studio.android.sdktools.ninepatch-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.ninepatch_test/223.0.1.0/studio.android.sdktools.ninepatch_test-223.0.1.0.jar", + "hash": "3759b7498daa277a7d2f5fe9fb99827bc7f29c10d00f24374aa9e53e741c49b4", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.ninepatch_test/223.0.1.0/studio.android.sdktools.ninepatch_test-223.0.1.0.jar" + }, + { + "url": "com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.jar", + "hash": "3f8c088b4dd04a9858721f2e162508c94db0dd86f961e306ee63ef2eda871bf7", + "path": "com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.jar" + }, + { + "url": "org/tensorflow/tensorflow-lite-metadata/0.1.0-rc2/tensorflow-lite-metadata-0.1.0-rc2.jar", + "hash": "2c2a264f842498c36d34d2a7b91342490d9a962862c85baac1acd54ec2fca6d9", + "path": "org/tensorflow/tensorflow-lite-metadata/0.1.0-rc2/tensorflow-lite-metadata-0.1.0-rc2.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.mlkit-common/223.0.1.0/studio.android.sdktools.mlkit-common-223.0.1.0.jar", + "hash": "13037533713eb65cd8e61ca2ed0ead9935ae9343f95ac17ad83e2161410ab4ec", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.mlkit-common/223.0.1.0/studio.android.sdktools.mlkit-common-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.mlkit-common_test/223.0.1.0/studio.android.sdktools.mlkit-common_test-223.0.1.0.jar", + "hash": "3f01a7fd0293eca1c0d2aacaaee44763a9ba8f448bd9e623734b820fae0c2c0b", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.mlkit-common_test/223.0.1.0/studio.android.sdktools.mlkit-common_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.manifest-parser/223.0.1.0/studio.android.sdktools.manifest-parser-223.0.1.0.jar", + "hash": "e2c4f914385ea52727c47846d47a16f47ea573481366ecac51016f17bb2b5125", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.manifest-parser/223.0.1.0/studio.android.sdktools.manifest-parser-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.manifest-parser_test/223.0.1.0/studio.android.sdktools.manifest-parser_test-223.0.1.0.jar", + "hash": "2f3dd637969ab7d4fea77acadfce8a7aedf3b205e3ac90d07f1af4a543c24cd7", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.manifest-parser_test/223.0.1.0/studio.android.sdktools.manifest-parser_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.manifest-merger/223.0.1.0/studio.android.sdktools.manifest-merger-223.0.1.0.jar", + "hash": "a978b36f09d3194967eeab1aced19a0f7108f1084ebc8d7a6e83c9c2f55e22d5", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.manifest-merger/223.0.1.0/studio.android.sdktools.manifest-merger-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.manifest-merger_test/223.0.1.0/studio.android.sdktools.manifest-merger_test-223.0.1.0.jar", + "hash": "9b74aebd08e9b28024c93ec8327d14c3ea173f134fc2a960832ee828e50ca815", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.manifest-merger_test/223.0.1.0/studio.android.sdktools.manifest-merger_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint.testinfrastructure/223.0.1.0/studio.android.sdktools.lint.testinfrastructure-223.0.1.0.jar", + "hash": "c4e6ef2a35c98dd68a7e76e09a4e5ad696ea5055194fdbbb37e72396ef5e7885", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint.testinfrastructure/223.0.1.0/studio.android.sdktools.lint.testinfrastructure-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint.testinfrastructure_test/223.0.1.0/studio.android.sdktools.lint.testinfrastructure_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint.testinfrastructure_test/223.0.1.0/studio.android.sdktools.lint.testinfrastructure_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint.cli/223.0.1.0/studio.android.sdktools.lint.cli-223.0.1.0.jar", + "hash": "b8813101a1d883a647c0724095914f8612ea7496e2eb430407b019c92ad13c4b", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint.cli/223.0.1.0/studio.android.sdktools.lint.cli-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint.cli_test/223.0.1.0/studio.android.sdktools.lint.cli_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint.cli_test/223.0.1.0/studio.android.sdktools.lint.cli_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint-model/223.0.1.0/studio.android.sdktools.lint-model-223.0.1.0.jar", + "hash": "15cd889fae9693ce6b827085ee4dc56fc9007127e01c1e0aae6af38ae880973b", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint-model/223.0.1.0/studio.android.sdktools.lint-model-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint-model_test/223.0.1.0/studio.android.sdktools.lint-model_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint-model_test/223.0.1.0/studio.android.sdktools.lint-model_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/liblint-checks-proto.lib/223.0.1.0/liblint-checks-proto.lib-223.0.1.0.jar", + "hash": "45d2ea7affbb9b6628189f02186fbb06411e49407b4153b48566c27fc236f46b", + "path": "org/jetbrains/intellij/deps/android/tools/base/liblint-checks-proto.lib/223.0.1.0/liblint-checks-proto.lib-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint-checks/223.0.1.0/studio.android.sdktools.lint-checks-223.0.1.0.jar", + "hash": "ec845145016270a7bd44c28c82af221f03b75cfe3a2f7e6ef68a346a1e0cada6", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint-checks/223.0.1.0/studio.android.sdktools.lint-checks-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint-checks_test/223.0.1.0/studio.android.sdktools.lint-checks_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint-checks_test/223.0.1.0/studio.android.sdktools.lint-checks_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint-api/223.0.1.0/studio.android.sdktools.lint-api-223.0.1.0.jar", + "hash": "f11e2babeea224309d8bca187d941df4b7c9f7192eb10a2144fab96f5497e7ed", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint-api/223.0.1.0/studio.android.sdktools.lint-api-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint-api_test/223.0.1.0/studio.android.sdktools.lint-api_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.lint-api_test/223.0.1.0/studio.android.sdktools.lint-api_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.layoutlib-api/223.0.1.0/studio.android.sdktools.layoutlib-api-223.0.1.0.jar", + "hash": "b6397b5f9af4818d94fc7bb0131689addda212395b2a9cd38e9c4960bf3444df", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.layoutlib-api/223.0.1.0/studio.android.sdktools.layoutlib-api-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.layoutlib-api_test/223.0.1.0/studio.android.sdktools.layoutlib-api_test-223.0.1.0.jar", + "hash": "cd50c91bd68029783d8c8469694f001c223f6e0ddc7b172d2815426381a34b0b", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.layoutlib-api_test/223.0.1.0/studio.android.sdktools.layoutlib-api_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.jdwptracer/223.0.1.0/studio.android.sdktools.jdwptracer-223.0.1.0.jar", + "hash": "3f12f4f727082b90fb0d8e8a07d901e116433477db8f6bbf42ed92f4d0ca9fdc", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.jdwptracer/223.0.1.0/studio.android.sdktools.jdwptracer-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.jdwptracer_test/223.0.1.0/studio.android.sdktools.jdwptracer_test-223.0.1.0.jar", + "hash": "80543c09a0954de41172bfb44b102abde8c95ea24e996ac5564688f3a7d2af91", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.jdwptracer_test/223.0.1.0/studio.android.sdktools.jdwptracer_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.jdwppacket/223.0.1.0/studio.android.sdktools.jdwppacket-223.0.1.0.jar", + "hash": "c2005cf66d44e63a6d07879b726ebbb77018bd99d360111ad60772654a6e094c", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.jdwppacket/223.0.1.0/studio.android.sdktools.jdwppacket-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.jdwppacket_test/223.0.1.0/studio.android.sdktools.jdwppacket_test-223.0.1.0.jar", + "hash": "47f1a0dc9182cc656959e1677b36a289157ecc3221301423505e15cdcadb9cff", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.jdwppacket_test/223.0.1.0/studio.android.sdktools.jdwppacket_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.flags/223.0.1.0/studio.android.sdktools.flags-223.0.1.0.jar", + "hash": "76438a9516e06421bf345012533de4964d09d3af921f2486b10dc1c4edfb6f85", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.flags/223.0.1.0/studio.android.sdktools.flags-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.flags_test/223.0.1.0/studio.android.sdktools.flags_test-223.0.1.0.jar", + "hash": "be56761d7bb6d78bc973ed8b279242322eebe94b1edd74bc9d0ea40c0fa6da2c", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.flags_test/223.0.1.0/studio.android.sdktools.flags_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.fakeadbserver/223.0.1.0/studio.android.sdktools.fakeadbserver-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.fakeadbserver/223.0.1.0/studio.android.sdktools.fakeadbserver-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.fakeadbserver_test/223.0.1.0/studio.android.sdktools.fakeadbserver_test-223.0.1.0.jar", + "hash": "4e9e00041a5c05c76f1830103317a0d111a4f65ac37124dab140e49e8053fd0a", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.fakeadbserver_test/223.0.1.0/studio.android.sdktools.fakeadbserver_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.dynamic-layout-inspector.common/223.0.1.0/studio.dynamic-layout-inspector.common-223.0.1.0.jar", + "hash": "b1dba673549b98333fdc0896ea12710b11f811d142ef5532ed5de47fc4a5fc28", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.dynamic-layout-inspector.common/223.0.1.0/studio.dynamic-layout-inspector.common-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.dynamic-layout-inspector.common_test/223.0.1.0/studio.dynamic-layout-inspector.common_test-223.0.1.0.jar", + "hash": "f584be339b837510f6bcd17a0e04fa6707af5f7902a85150f4449b18af9d7a42", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.dynamic-layout-inspector.common_test/223.0.1.0/studio.dynamic-layout-inspector.common_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.dvlib/223.0.1.0/studio.android.sdktools.dvlib-223.0.1.0.jar", + "hash": "91424b5cbb9c329360a01964a5bf01570117731143f2e6f65c1992896982354a", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.dvlib/223.0.1.0/studio.android.sdktools.dvlib-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.dvlib_test/223.0.1.0/studio.android.sdktools.dvlib_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.dvlib_test/223.0.1.0/studio.android.sdktools.dvlib_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.draw9patch/223.0.1.0/studio.android.sdktools.draw9patch-223.0.1.0.jar", + "hash": "1a0d1d234d12583d9a9af4e58f30943ce3ae3934279deecc0536fec48734e186", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.draw9patch/223.0.1.0/studio.android.sdktools.draw9patch-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.draw9patch_test/223.0.1.0/studio.android.sdktools.draw9patch_test-223.0.1.0.jar", + "hash": "3d569804e4d8c8487688dd81e3b689bcf14335da73cba0fc3cfba771e6790b6f", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.draw9patch_test/223.0.1.0/studio.android.sdktools.draw9patch_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.device-provisioner/223.0.1.0/studio.android.sdktools.device-provisioner-223.0.1.0.jar", + "hash": "7fbcd1d7d7a9d2de6330a870fb226c94f4812c9dbb285e50229135323a676501", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.device-provisioner/223.0.1.0/studio.android.sdktools.device-provisioner-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.device-provisioner_test/223.0.1.0/studio.android.sdktools.device-provisioner_test-223.0.1.0.jar", + "hash": "02d3c416fa19eae26aff551cc63bed519c651876cb4600273520cf29d23ad47a", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.device-provisioner_test/223.0.1.0/studio.android.sdktools.device-provisioner_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/deploy_java_proto/223.0.1.0/deploy_java_proto-223.0.1.0.jar", + "hash": "200df958778ff640d7209c23576917695ad88535c8030c55af3d6038f34d860e", + "path": "org/jetbrains/intellij/deps/android/tools/base/deploy_java_proto/223.0.1.0/deploy_java_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/jb-r8/223.0.1.0/jb-r8-223.0.1.0.jar", + "hash": "1c237d8045d2eff0c093363d8e22cd29014c8c4ec540185656cfb4eb3007b6f8", + "path": "org/jetbrains/intellij/deps/android/tools/base/jb-r8/223.0.1.0/jb-r8-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libjava_version/223.0.1.0/libjava_version-223.0.1.0.jar", + "hash": "db56095dcf902e33d10d40727b0a47532e7f193104368d253c730beac518dc45", + "path": "org/jetbrains/intellij/deps/android/tools/base/libjava_version/223.0.1.0/libjava_version-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/fake_device_proto/223.0.1.0/fake_device_proto-223.0.1.0.jar", + "hash": "3550728814f22db276c018904d3e501921912edbeb45701d762217d4c6f26dbf", + "path": "org/jetbrains/intellij/deps/android/tools/base/fake_device_proto/223.0.1.0/fake_device_proto-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libjava_sites/223.0.1.0/libjava_sites-223.0.1.0.jar", + "hash": "13b71bbf5023496373c78235f720324a6f304c95605bdecbec672d73a8bfcd2e", + "path": "org/jetbrains/intellij/deps/android/tools/base/libjava_sites/223.0.1.0/libjava_sites-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.deployer/223.0.1.0/studio.android.sdktools.deployer-223.0.1.0.jar", + "hash": "b9b72a093ce2534b078689109e47d76053ce8e366c822b7565541336e3e3fea9", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.deployer/223.0.1.0/studio.android.sdktools.deployer-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.deployer_test/223.0.1.0/studio.android.sdktools.deployer_test-223.0.1.0.jar", + "hash": "d9e4eaf08140d2249be996c7689873bcb80fceb8c612169cac997571fb61a923", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.deployer_test/223.0.1.0/studio.android.sdktools.deployer_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.ddmlib/223.0.1.0/studio.android.sdktools.ddmlib-223.0.1.0.jar", + "hash": "98e57eff90dff3cd6df8244a54a8e30ea1837b358a1339d67cbbcd407b3ef4fe", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.ddmlib/223.0.1.0/studio.android.sdktools.ddmlib-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.ddmlib_test/223.0.1.0/studio.android.sdktools.ddmlib_test-223.0.1.0.jar", + "hash": "e9efde44df5bf99de00aa6ceb28f43bead3a6c809d9aa9521e868ef078cb283e", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.ddmlib_test/223.0.1.0/studio.android.sdktools.ddmlib_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/compilerCommon.antlr_runtime.shaded_jar/223.0.1.0/compilerCommon.antlr_runtime.shaded_jar-223.0.1.0.jar", + "hash": "f4d89fb56ed9582984e5323802ca4891795577542c8d0c03ec75bfea5378bc36", + "path": "org/jetbrains/intellij/deps/android/tools/base/compilerCommon.antlr_runtime.shaded_jar/223.0.1.0/compilerCommon.antlr_runtime.shaded_jar-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/compilerCommon.antlr.shaded_jar/223.0.1.0/compilerCommon.antlr.shaded_jar-223.0.1.0.jar", + "hash": "aef79cb486e1960725923d36409b3c19f71a842fd949e73cf420c8762a9c415a", + "path": "org/jetbrains/intellij/deps/android/tools/base/compilerCommon.antlr.shaded_jar/223.0.1.0/compilerCommon.antlr.shaded_jar-223.0.1.0.jar" + }, + { + "url": "com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar", + "hash": "757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76", + "path": "com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar" + }, + { + "url": "com/squareup/javapoet/1.10.0/javapoet-1.10.0.jar", + "hash": "20ef4b82e43ff7c652281a21313cf3b941092467add3fa73509c26f6969efdab", + "path": "com/squareup/javapoet/1.10.0/javapoet-1.10.0.jar" + }, + { + "url": "com/android/tools/build/jetifier/jetifier-core/1.0.0-beta10/jetifier-core-1.0.0-beta10.jar", + "hash": "26abb4a13927d9062169c504c9e94fe80e9ae3a4f7b5ab8875ab007536a91f5e", + "path": "com/android/tools/build/jetifier/jetifier-core/1.0.0-beta10/jetifier-core-1.0.0-beta10.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.compilerCommon/223.0.1.0/studio.compilerCommon-223.0.1.0.jar", + "hash": "ce6a63764e683fce12e029cd326e067f8602e8819308b9715848b994d1e368d3", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.compilerCommon/223.0.1.0/studio.compilerCommon-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.compilerCommon_test/223.0.1.0/studio.compilerCommon_test-223.0.1.0.jar", + "hash": "a9646496dbc6f00fca28bf65399e19e0c02a768fdc0b23356fa9c9b7c08e7021", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.compilerCommon_test/223.0.1.0/studio.compilerCommon_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/compilerCommon.antlr_runtime.shaded_jar/223.0.1.0/compilerCommon.antlr_runtime.shaded_jar-223.0.1.0.jar", + "hash": "f4d89fb56ed9582984e5323802ca4891795577542c8d0c03ec75bfea5378bc36", + "path": "org/jetbrains/intellij/deps/android/tools/base/compilerCommon.antlr_runtime.shaded_jar/223.0.1.0/compilerCommon.antlr_runtime.shaded_jar-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/compilerCommon.antlr.shaded_jar/223.0.1.0/compilerCommon.antlr.shaded_jar-223.0.1.0.jar", + "hash": "aef79cb486e1960725923d36409b3c19f71a842fd949e73cf420c8762a9c415a", + "path": "org/jetbrains/intellij/deps/android/tools/base/compilerCommon.antlr.shaded_jar/223.0.1.0/compilerCommon.antlr.shaded_jar-223.0.1.0.jar" + }, + { + "url": "com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar", + "hash": "757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76", + "path": "com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar" + }, + { + "url": "com/squareup/javapoet/1.10.0/javapoet-1.10.0.jar", + "hash": "20ef4b82e43ff7c652281a21313cf3b941092467add3fa73509c26f6969efdab", + "path": "com/squareup/javapoet/1.10.0/javapoet-1.10.0.jar" + }, + { + "url": "com/google/auto/auto-common/0.10/auto-common-0.10.jar", + "hash": "b876b5fddaceeba7d359667f6c4fb8c6f8658da1ab902ffb79ec9a415deede5f", + "path": "com/google/auto/auto-common/0.10/auto-common-0.10.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.compiler/223.0.1.0/studio.compiler-223.0.1.0.jar", + "hash": "d30efda307988f6a83199c349904ffcbad5f5f6433bd8f5726d5883e04abf8f2", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.compiler/223.0.1.0/studio.compiler-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.compiler_test/223.0.1.0/studio.compiler_test-223.0.1.0.jar", + "hash": "eeb3a37d14df27694438a639c950f78b041e327d3b921a6dd3ae811751124426", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.compiler_test/223.0.1.0/studio.compiler_test-223.0.1.0.jar" + }, + { + "url": "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar", + "hash": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9", + "path": "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.baseLibrarySupport/223.0.1.0/studio.baseLibrarySupport-223.0.1.0.jar", + "hash": "3fd6683938f24ff2532a2c742f3e74829745d20aef3950414a768e649ddf1d77", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.baseLibrarySupport/223.0.1.0/studio.baseLibrarySupport-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.baseLibrarySupport_test/223.0.1.0/studio.baseLibrarySupport_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.baseLibrarySupport_test/223.0.1.0/studio.baseLibrarySupport_test-223.0.1.0.jar" + }, + { + "url": "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar", + "hash": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9", + "path": "org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.baseLibrary/223.0.1.0/studio.baseLibrary-223.0.1.0.jar", + "hash": "4f07ede9cc3b42701328ec1c561c53f3afba5e846348b0a2baf8e63be2fc56ea", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.baseLibrary/223.0.1.0/studio.baseLibrary-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.baseLibrary_test/223.0.1.0/studio.baseLibrary_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.baseLibrary_test/223.0.1.0/studio.baseLibrary_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.common.testfixtures/223.0.1.0/studio.android.sdktools.common.testfixtures-223.0.1.0.jar", + "hash": "c26c81708f4c2b0077eba363fa6f5bccc883f28e3a010a374686b82b2117681f", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.common.testfixtures/223.0.1.0/studio.android.sdktools.common.testfixtures-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.common.testfixtures_test/223.0.1.0/studio.android.sdktools.common.testfixtures_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.common.testfixtures_test/223.0.1.0/studio.android.sdktools.common.testfixtures_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/libversion/223.0.1.3/libversion-223.0.1.3.jar", + "hash": "81dfd360c41f9e57ae0c53805d31e44ea79d914f8caba593f0c393f421d7bcc1", + "path": "org/jetbrains/intellij/deps/android/tools/base/libversion/223.0.1.3/libversion-223.0.1.3.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.common/223.0.1.0/studio.android.sdktools.common-223.0.1.0.jar", + "hash": "732fcd5f6d3387ab5d137d575cb582b6ee4f76bcd3b1770bc1cf14780c98f471", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.common/223.0.1.0/studio.android.sdktools.common-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.common_test/223.0.1.0/studio.android.sdktools.common_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.common_test/223.0.1.0/studio.android.sdktools.common_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.chunkio/223.0.1.0/studio.android.sdktools.chunkio-223.0.1.0.jar", + "hash": "26c169520e529ad6e125e743fc1aab1a8b6444612df68460a0ab48a1871a757a", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.chunkio/223.0.1.0/studio.android.sdktools.chunkio-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.chunkio_test/223.0.1.0/studio.android.sdktools.chunkio_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.chunkio_test/223.0.1.0/studio.android.sdktools.chunkio_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.builder-model/223.0.1.0/studio.android.sdktools.builder-model-223.0.1.0.jar", + "hash": "5ced709f1591de9f415a0978a96886ce4233e6e5957dbdaaab09f347df925928", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.builder-model/223.0.1.0/studio.android.sdktools.builder-model-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.builder-model_test/223.0.1.0/studio.android.sdktools.builder-model_test-223.0.1.0.jar", + "hash": "029bf48c044a462746249db1d30fa2ecc22e45b430fe00486c534cae79fbf16b", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.builder-model_test/223.0.1.0/studio.android.sdktools.builder-model_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.binary-resources/223.0.1.0/studio.android.sdktools.binary-resources-223.0.1.0.jar", + "hash": "92ddc3cc96b38ebf07d9b76f599e365eefcfae8573e9b70f7cefde8abf391a3a", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.binary-resources/223.0.1.0/studio.android.sdktools.binary-resources-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.binary-resources_test/223.0.1.0/studio.android.sdktools.binary-resources_test-223.0.1.0.jar", + "hash": "3a1a9b57fb4cec5a8af5563edfa9b908010a5dd83814e9f292cfae9ae6b83390", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.binary-resources_test/223.0.1.0/studio.android.sdktools.binary-resources_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.build-analyzer.common/223.0.1.0/studio.android.build-analyzer.common-223.0.1.0.jar", + "hash": "3340296a57c0a6ad663e83cce8228551f431abc3523a1ad9b74706f388dc4495", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.build-analyzer.common/223.0.1.0/studio.android.build-analyzer.common-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.build-analyzer.common_test/223.0.1.0/studio.android.build-analyzer.common_test-223.0.1.0.jar", + "hash": "4c5cd4e6cbde04e2f87389e21b0475e99ecb79a7a82c288db3d1f32a373d8951", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.build-analyzer.common_test/223.0.1.0/studio.android.build-analyzer.common_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.android-annotations/223.0.1.0/studio.android.sdktools.android-annotations-223.0.1.0.jar", + "hash": "4013a7184f41205bb08169bd3080fe757aeffe684e886ffb6428eb24a220ce23", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.android-annotations/223.0.1.0/studio.android.sdktools.android-annotations-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.android-annotations_test/223.0.1.0/studio.android.sdktools.android-annotations_test-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.android-annotations_test/223.0.1.0/studio.android.sdktools.android-annotations_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/explainer/223.0.1.0/explainer-223.0.1.0.jar", + "hash": "297bc50d4f61f8bc09caa91f8ee143cfdf18aa3f4208d716f5a53afd79a0f9bd", + "path": "org/jetbrains/intellij/deps/android/tools/base/explainer/223.0.1.0/explainer-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/generator/223.0.1.0/generator-223.0.1.0.jar", + "hash": "e6e14814df390b4d714db66bf84dafbaa1951d643e0ae91aa8c6ab368c3967c5", + "path": "org/jetbrains/intellij/deps/android/tools/base/generator/223.0.1.0/generator-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/shared/223.0.1.0/shared-223.0.1.0.jar", + "hash": "391caef69ac366ddc46c1c77ec7f41fcfda8ba27cdb0678ed17ca34abe949665", + "path": "org/jetbrains/intellij/deps/android/tools/base/shared/223.0.1.0/shared-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.analyzer/223.0.1.0/studio.android.sdktools.analyzer-223.0.1.0.jar", + "hash": "efec9d4d966f7167048a7405ce2fa8fc0c1ad32a686b9d1fdf477ec00b8d2eb0", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.analyzer/223.0.1.0/studio.android.sdktools.analyzer-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.analyzer_test/223.0.1.0/studio.android.sdktools.analyzer_test-223.0.1.0.jar", + "hash": "647f6f0f9e384d3fc7f087c813aabe8dc1096c97cf7e966809237a8b38a3dba1", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.analyzer_test/223.0.1.0/studio.android.sdktools.analyzer_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/analytics-tracker/223.0.1.0/analytics-tracker-223.0.1.0.jar", + "hash": "fcdc0ce7e941ecd867c7d25be0a9a25367440c551f1d61d8d81f297f7eef12b3", + "path": "org/jetbrains/intellij/deps/android/tools/base/analytics-tracker/223.0.1.0/analytics-tracker-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/analytics-tracker_test/223.0.1.0/analytics-tracker_test-223.0.1.0.jar", + "hash": "e9d765445baeb4abbc6cecabdbf99d3f9b2e8989bd9eafa4e045b6555753b9d8", + "path": "org/jetbrains/intellij/deps/android/tools/base/analytics-tracker_test/223.0.1.0/analytics-tracker_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/android.sdktools.analytics-testing/223.0.1.0/android.sdktools.analytics-testing-223.0.1.0.jar", + "hash": "c4ed2e61a0d749743fcd7c647714f0ec3f2c948e2c681bdfe663628e8db09638", + "path": "org/jetbrains/intellij/deps/android/tools/base/android.sdktools.analytics-testing/223.0.1.0/android.sdktools.analytics-testing-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/android.sdktools.analytics-testing_test/223.0.1.0/android.sdktools.analytics-testing_test-223.0.1.0.jar", + "hash": "30e9c4447977bd781d4d7fc452140bcc50eed0d3da2301d95977ee8054f4162d", + "path": "org/jetbrains/intellij/deps/android/tools/base/android.sdktools.analytics-testing_test/223.0.1.0/android.sdktools.analytics-testing_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/analytics-shared/223.0.1.0/analytics-shared-223.0.1.0.jar", + "hash": "d923fcb7eda661dc3aaa7c2c9a32a3d8816e076ef9a318fb6d8d1a90528192f5", + "path": "org/jetbrains/intellij/deps/android/tools/base/analytics-shared/223.0.1.0/analytics-shared-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/analytics-shared_test/223.0.1.0/analytics-shared_test-223.0.1.0.jar", + "hash": "72df3b7691589be37242564e92ace57d6ac88c13126978f5bdaa4e263949ec5c", + "path": "org/jetbrains/intellij/deps/android/tools/base/analytics-shared_test/223.0.1.0/analytics-shared_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/analytics-crash/223.0.1.0/analytics-crash-223.0.1.0.jar", + "hash": "7b96a4621926e4b0de5d157dbb2849795fb4121b83275ad5fce14957aab59278", + "path": "org/jetbrains/intellij/deps/android/tools/base/analytics-crash/223.0.1.0/analytics-crash-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/analytics-crash_test/223.0.1.0/analytics-crash_test-223.0.1.0.jar", + "hash": "7b4b25d989eacd204c17124a13142757a36b37789cf3c934597a866d1051884d", + "path": "org/jetbrains/intellij/deps/android/tools/base/analytics-crash_test/223.0.1.0/analytics-crash_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.adblib.tools/223.0.1.0/studio.android.sdktools.adblib.tools-223.0.1.0.jar", + "hash": "b2cc4d2cc59ecc73a0c6264b386bd715f3d86aa7b847a6de8d704ca84336383f", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.adblib.tools/223.0.1.0/studio.android.sdktools.adblib.tools-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.adblib.tools_test/223.0.1.0/studio.android.sdktools.adblib.tools_test-223.0.1.0.jar", + "hash": "9e67b90b17ccdaf127873854a0a95a15956d6efe2c81e08e8d6ceaf34ec51533", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.adblib.tools_test/223.0.1.0/studio.android.sdktools.adblib.tools_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.adblib.ddmlibcompatibility/223.0.1.0/studio.android.sdktools.adblib.ddmlibcompatibility-223.0.1.0.jar", + "hash": "dd74ada9d28b213300dc9af06790320ce36b6bd8e6e587b7640552af6a3d36bb", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.adblib.ddmlibcompatibility/223.0.1.0/studio.android.sdktools.adblib.ddmlibcompatibility-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.adblib.ddmlibcompatibility_test/223.0.1.0/studio.android.sdktools.adblib.ddmlibcompatibility_test-223.0.1.0.jar", + "hash": "b905728e199164f6f97bd7adbb3fc90926b28b4ca1aa6f89cc33251580610d43", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.adblib.ddmlibcompatibility_test/223.0.1.0/studio.android.sdktools.adblib.ddmlibcompatibility_test-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.adblib/223.0.1.0/studio.android.sdktools.adblib-223.0.1.0.jar", + "hash": "42ec90012dc0650774f8f50d4346d4a5cd47062ab4f8608a8a006a4ed3a60bf7", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.adblib/223.0.1.0/studio.android.sdktools.adblib-223.0.1.0.jar" + }, + { + "url": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.adblib_test/223.0.1.0/studio.android.sdktools.adblib_test-223.0.1.0.jar", + "hash": "da8b96b4aaf470dd2d980d9117e90df8078b38716b5d94b4e67c99f7f1b27980", + "path": "org/jetbrains/intellij/deps/android/tools/base/studio.android.sdktools.adblib_test/223.0.1.0/studio.android.sdktools.adblib_test-223.0.1.0.jar" + } +] diff --git a/pkgs/applications/editors/jupyter-kernels/coq/default.nix b/pkgs/applications/editors/jupyter-kernels/coq/default.nix index 545c4e8ec4e8f..9a2c12152d976 100644 --- a/pkgs/applications/editors/jupyter-kernels/coq/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/coq/default.nix @@ -18,7 +18,7 @@ # nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.coq = coq-kernel.definition; }' let - python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel (callPackage ./kernel.nix {}) ]); + python = python3.withPackages (ps: [ ps.traitlets ps.jupyter-core ps.ipykernel (callPackage ./kernel.nix {}) ]); logos = runCommand "coq-logos" { buildInputs = [ imagemagick ]; } '' mkdir -p $out diff --git a/pkgs/applications/editors/lapce/Cargo.lock b/pkgs/applications/editors/lapce/Cargo.lock index 11496a2d55bfd..206fef049c629 100644 --- a/pkgs/applications/editors/lapce/Cargo.lock +++ b/pkgs/applications/editors/lapce/Cargo.lock @@ -13,10 +13,26 @@ dependencies = [ ] [[package]] +name = "ab_glyph" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] name = "addr2line" -version = "0.17.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -39,6 +55,18 @@ dependencies = [ ] [[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", +] + +[[package]] name = "aho-corasick" version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -48,103 +76,132 @@ dependencies = [ ] [[package]] -name = "alacritty_config" -version = "0.1.0" +name = "aho-corasick" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c9edf2a6899fc12e9f8718485fa70f2c311bc86c25ff329783b16de7227dfd" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ - "log 0.4.17", + "memchr", +] + +[[package]] +name = "alacritty_config" +version = "0.1.2-dev" +source = "git+https://github.com/alacritty/alacritty?rev=6071a7bf35cfd99be8ba70f479f188b7370cda6f#6071a7bf35cfd99be8ba70f479f188b7370cda6f" +dependencies = [ + "log", "serde", - "serde_yaml", + "toml 0.8.2", ] [[package]] name = "alacritty_config_derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37164df1dc70b36db94e2df45b121c1f57b2946778d5f7e56f4b0d1c118e1b54" +version = "0.2.2-dev" +source = "git+https://github.com/alacritty/alacritty?rev=6071a7bf35cfd99be8ba70f479f188b7370cda6f#6071a7bf35cfd99be8ba70f479f188b7370cda6f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "alacritty_terminal" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043d0bc52432b59149ca25e45ea617cc4cfd2e34acc00d2f7ea976b9934be477" +version = "0.20.0-dev" +source = "git+https://github.com/alacritty/alacritty?rev=6071a7bf35cfd99be8ba70f479f188b7370cda6f#6071a7bf35cfd99be8ba70f479f188b7370cda6f" dependencies = [ "alacritty_config", "alacritty_config_derive", - "base64 0.13.0", - "bitflags", - "dirs", + "base64", + "bitflags 2.4.0", + "home", "libc", - "log 0.4.17", - "mio 0.6.23", - "mio-anonymous-pipes", - "mio-extras", - "miow 0.3.7", - "nix", + "log", + "miow", "parking_lot 0.12.1", - "regex-automata", + "piper", + "polling 3.2.0", + "regex-automata 0.3.9", + "rustix-openpty", "serde", "serde_yaml", "signal-hook", - "signal-hook-mio", + "toml 0.8.2", "unicode-width", "vte", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + +[[package]] name = "ambient-authority" -version = "0.0.1" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8ad6edb4840b78c5c3d88de606b22252d552b55f3a4699fbb10fc070ec3049" +checksum = "e9d4ee0d472d1cd2e28c97dfa124b3d8d992e10eb0a035f33f5d12e3a177ba3b" [[package]] -name = "android_system_properties" -version = "0.1.5" +name = "android-activity" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "052ad56e336bcc615a214bffbeca6c181ee9550acec193f0327e0b103b033a4d" dependencies = [ + "android-properties", + "bitflags 2.4.0", + "cc", + "cesu8", + "jni", + "jni-sys", "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "winapi 0.3.9", + "libc", ] [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] -name = "arc-swap" -version = "1.5.1" +name = "arbitrary" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" +checksum = "a2e1373abdaa212b704512ec2bd8b26bd0b7d5c3f70117411a5d9a451383c859" [[package]] -name = "arrayref" -version = "0.3.6" +name = "arc-swap" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] -name = "arrayvec" -version = "0.5.2" +name = "arrayref" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -153,62 +210,183 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] +name = "as-raw-xcb-connection" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5f312b0a56c5cdf967c0aeb67f6289603354951683bc97ddc595ab974ba9aa" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.3", +] + +[[package]] +name = "ashpd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31688b40eb5d739049f721d8405c33d3796b3f51f2bea84421a542dafe397e41" +dependencies = [ + "async-std", + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "url", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d26004fe83b2d1cd3a97609b21e39f9a31535822210fe83205d2ce48866ea61" +dependencies = [ + "event-listener", + "futures-core", + "parking_lot 0.12.1", +] + +[[package]] name = "async-channel" version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" dependencies = [ - "concurrent-queue", + "concurrent-queue 1.2.4", "event-listener", "futures-core", ] [[package]] -name = "async-task" -version = "4.3.0" +name = "async-executor" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue 2.2.0", + "fastrand 1.8.0", + "futures-lite", + "slab", +] [[package]] -name = "async-trait" -version = "0.1.57" +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[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 2.2.0", + "futures-lite", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.23", + "slab", + "socket2 0.4.7", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-recursion" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" +checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.101", ] [[package]] -name = "atk" -version = "0.14.0" +name = "async-std" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a83b21d2aa75e464db56225e1bda2dd5993311ba1095acaa8fa03d1ae67026ba" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ - "atk-sys", - "bitflags", - "glib", - "libc", + "async-channel", + "async-global-executor", + "async-io", + "async-lock", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", ] [[package]] -name = "atk-sys" -version = "0.14.0" +name = "async-task" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea" +checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] +name = "atomic" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + +[[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atty" @@ -218,7 +396,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi 0.1.19", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -229,34 +407,24 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.1", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.8.0" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c4a342b450b268e1be8036311e2c613d7f8a7ed31214dff1cc3b60852a3168d" -dependencies = [ - "byteorder", - "safemem", -] - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bincode" @@ -268,10 +436,25 @@ dependencies = [ ] [[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 = "bit_field" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" [[package]] name = "bitflags" @@ -280,6 +463,15 @@ 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" +dependencies = [ + "serde", +] + +[[package]] name = "bitmaps" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -296,20 +488,30 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] -name = "block-buffer" -version = "0.10.3" +name = "block-sys" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "2dd7cf50912cddc06dc5ea7c08c5e81c1b2c842a70d19def1848d54c586fed92" dependencies = [ - "generic-array", + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2", ] [[package]] @@ -321,7 +523,7 @@ dependencies = [ "async-channel", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.8.0", "futures-lite", "once_cell", ] @@ -334,7 +536,7 @@ checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "lazy_static", "memchr", - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -351,22 +553,22 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytemuck" -version = "1.12.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.2.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9e1f5fa78f69496407a27ae9ed989e3c3b072310286f5ef385525e4cbc24a9" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -377,9 +579,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cache-padded" @@ -388,64 +590,77 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] -name = "cairo-rs" -version = "0.14.9" +name = "calloop" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" dependencies = [ - "bitflags", - "cairo-sys-rs", - "glib", - "libc", + "bitflags 2.4.0", + "log", + "polling 3.2.0", + "rustix 0.38.20", + "slab", "thiserror", ] [[package]] -name = "cairo-sys-rs" -version = "0.14.9" +name = "calloop-wayland-source" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ - "glib-sys", - "libc", - "system-deps", + "calloop", + "rustix 0.38.20", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", ] [[package]] name = "cap-fs-ext" -version = "0.25.3" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b779b2d0a001c125b4584ad586268fb4b92d957bff8d26d7fe0dd78283faa814" +dependencies = [ + "cap-primitives", + "cap-std", + "io-lifetimes 2.0.2", + "windows-sys 0.48.0", +] + +[[package]] +name = "cap-net-ext" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "438ca7f5bb15c799ea146429e4f8b7bfd25ff1eb05319024549a7728de45800c" +checksum = "6ffc30dee200c20b4dcb80572226f42658e1d9c4b668656d7cc59c33d50e396e" dependencies = [ "cap-primitives", "cap-std", - "io-lifetimes", - "windows-sys", + "rustix 0.38.20", + "smallvec", ] [[package]] name = "cap-primitives" -version = "0.25.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba063daa90ed40882bb288ac4ecaa942d655d15cf74393d41d2267b5d7daf120" +checksum = "2bf30c373a3bee22c292b1b6a7a26736a38376840f1af3d2d806455edf8c3899" dependencies = [ "ambient-authority", "fs-set-times", "io-extras", - "io-lifetimes", + "io-lifetimes 2.0.2", "ipnet", "maybe-owned", - "rustix", - "winapi-util", - "windows-sys", + "rustix 0.38.20", + "windows-sys 0.48.0", "winx", ] [[package]] name = "cap-rand" -version = "0.25.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c720808e249f0ae846ec647fe48cef3cea67e4e5026cf869c041c278b7dcae45" +checksum = "577de6cff7c2a47d6b13efe5dd28bf116bd7f8f7db164ea95b7cc2640711f522" dependencies = [ "ambient-authority", "rand", @@ -453,52 +668,43 @@ dependencies = [ [[package]] name = "cap-std" -version = "0.25.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e3a603c9f3bd2181ed128ab3cd32fbde7cff76afc64a3576662701c4aee7e2b" +checksum = "84bade423fa6403efeebeafe568fdb230e8c590a275fba2ba978dd112efcf6e9" dependencies = [ "cap-primitives", "io-extras", - "io-lifetimes", - "ipnet", - "rustix", + "io-lifetimes 2.0.2", + "rustix 0.38.20", ] [[package]] name = "cap-time-ext" -version = "0.25.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da76e64f3e46f8c8479e392a7fe3faa2e76b8c1cea4618bae445276fdec12082" +checksum = "f8f52b3c8f4abfe3252fd0a071f3004aaa3b18936ec97bdbd8763ce03aff6247" dependencies = [ "cap-primitives", "once_cell", - "rustix", + "rustix 0.38.20", "winx", ] [[package]] name = "cc" -version = "1.0.73" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] -name = "cfg-expr" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" +name = "cesu8" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfg-if" @@ -507,13 +713,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "cgl" -version = "0.3.2" +name = "cfg_aliases" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" -dependencies = [ - "libc", -] +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" @@ -527,20 +730,20 @@ dependencies = [ "num-traits", "time 0.1.44", "wasm-bindgen", - "winapi 0.3.9", + "winapi", ] [[package]] name = "clap" -version = "3.2.22" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_derive", "clap_lex", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim", "termcolor", @@ -549,15 +752,15 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.18" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck 0.4.0", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.101", ] [[package]] @@ -570,26 +773,27 @@ dependencies = [ ] [[package]] -name = "cmake" -version = "0.1.48" +name = "clipboard-win" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +checksum = "9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342" dependencies = [ - "cc", + "lazy-bytes-cast", + "winapi", ] [[package]] name = "cocoa" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation", "core-graphics", - "foreign-types", + "foreign-types 0.5.0", "libc", "objc", ] @@ -600,22 +804,38 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "libc", "objc", ] [[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] name = "color_quant" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] name = "combine" version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -635,36 +855,43 @@ dependencies = [ ] [[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + +[[package]] name = "config" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f1667b8320afa80d69d8bbe40830df2c8a06003d86f73d8e003b2c48df416d" +checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7" dependencies = [ "async-trait", "lazy_static", "nom", "pathdiff", "serde", - "toml", + "toml 0.5.9", ] [[package]] -name = "console_error_panic_hook" -version = "0.1.7" +name = "copypasta" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +checksum = "6d35364349bf9e9e1c3a035ddcb00d188d23a3c40c50244c03c27a99fc6a65ae" dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen", + "clipboard-win", + "objc", + "objc-foundation", + "objc_id", + "smithay-clipboard", + "x11-clipboard", ] [[package]] -name = "const-cstr" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" - -[[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -682,14 +909,14 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "core-graphics" -version = "0.22.3" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.5.0", "libc", ] @@ -699,31 +926,49 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", - "foreign-types", + "foreign-types 0.3.2", "libc", ] [[package]] -name = "core-text" -version = "19.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" +name = "cosmic-text" +version = "0.7.0" +source = "git+https://github.com/lapce/cosmic-text?rev=f7a20704d6ebbe8fb82d0bb579c37c53e7ae9747#f7a20704d6ebbe8fb82d0bb579c37c53e7ae9747" dependencies = [ - "core-foundation", - "core-graphics", - "foreign-types", - "libc", + "fontdb 0.16.0", + "libm", + "log", + "once_cell", + "ouroboros", + "parking_lot 0.12.1", + "peniko", + "rangemap", + "rustybuzz 0.8.0", + "stretto", + "swash", + "sys-locale", + "ttf-parser 0.18.1", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", ] [[package]] +name = "cov-mark" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ffa3d3e0138386cd4361f63537765cac7ee40698028844635a54495a92f67f3" + +[[package]] name = "cpp_demangle" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -737,28 +982,29 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.88.2" +version = "0.101.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52056f6d0584484b57fa6c1a65c1fcb15f3780d8b6a758426d9e3084169b2ddd" +checksum = "f773437307980ac0f424bf9b9a5d0cd21a0f17248c6860c9a65bec8b5975f3fe" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.88.2" +version = "0.101.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fed94c8770dc25d01154c3ffa64ed0b3ba9d583736f305fed7beebe5d9cf74" +checksum = "443c2ac50e97fb7de1a0f862753fce3f27215558811a6fcee508eb0c3747fa79" dependencies = [ - "arrayvec 0.7.2", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", + "cranelift-control", "cranelift-entity", "cranelift-isle", "gimli", - "log 0.4.17", + "hashbrown 0.14.2", + "log", "regalloc2", "smallvec", "target-lexicon", @@ -766,51 +1012,61 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.88.2" +version = "0.101.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c451b81faf237d11c7e4f3165eeb6bac61112762c5cfe7b4c0fb7241474358f" +checksum = "c5b174c411480c79ce0793c55042fa51bec27e486381d103a53cab3b480cb2db" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.88.2" +version = "0.101.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73fa0151a528066a369de6debeea4d4b23a32aba68b5add8c46d3dc8091ff434" + +[[package]] +name = "cranelift-control" +version = "0.101.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c940133198426d26128f08be2b40b0bd117b84771fd36798969c4d712d81fc" +checksum = "b8adf1e6398493c9bea1190e37d28a0eb0eca5fddbc80e01e506cda34db92b1f" +dependencies = [ + "arbitrary", +] [[package]] name = "cranelift-entity" -version = "0.88.2" +version = "0.101.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" +checksum = "4917e2ed3bb5fe87d0ed88395ca6d644018d119a034faedd1f3e1f2c33cd52b2" dependencies = [ "serde", + "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.88.2" +version = "0.101.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34897538b36b216cc8dd324e73263596d51b8cf610da6498322838b2546baf8a" +checksum = "9aaadf1e7cf28886bbf046eaf7ef538997bc8a7e020e578ea4957b39da87d5a1" dependencies = [ "cranelift-codegen", - "log 0.4.17", + "log", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-isle" -version = "0.88.2" +version = "0.101.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2629a569fae540f16a76b70afcc87ad7decb38dc28fa6c648ac73b51e78470" +checksum = "a67fda31b9d69eaa1c49a2081939454c45857596a9d45af6744680541c628b4c" [[package]] name = "cranelift-native" -version = "0.88.2" +version = "0.101.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20937dab4e14d3e225c5adfc9c7106bafd4ac669bdb43027b911ff794c6fb318" +checksum = "76fb52ba71be98312f35e798d9e98e45ab2586f27584231bf7c644fa9501e8af" dependencies = [ "cranelift-codegen", "libc", @@ -819,15 +1075,15 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.88.2" +version = "0.101.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80fc2288957a94fd342a015811479de1837850924166d1f1856d8406e6f3609b" +checksum = "f1b2f48857ec7c051af938c72b5fdf370a5eec255c8a2be87633241af3c05772" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", "itertools", - "log 0.4.17", + "log", "smallvec", "wasmparser", "wasmtime-types", @@ -839,16 +1095,16 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -858,7 +1114,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -870,9 +1126,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.6.5", "once_cell", "scopeguard", ] @@ -883,11 +1139,17 @@ version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", ] [[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -898,6 +1160,43 @@ 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.101", +] + +[[package]] +name = "ctor" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" +dependencies = [ + "quote", + "syn 2.0.38", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +dependencies = [ + "bitflags 2.4.0", + "libloading 0.8.1", + "winapi", +] + +[[package]] name = "darling" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -918,7 +1217,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.101", ] [[package]] @@ -929,34 +1228,42 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.101", ] [[package]] name = "data-url" -version = "0.1.1" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + +[[package]] +name = "debugid" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "matches", + "uuid", ] [[package]] -name = "digest" -version = "0.9.0" +name = "derivative" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "generic-array", + "proc-macro2", + "quote", + "syn 1.0.101", ] [[package]] name = "digest" -version = "0.10.5" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.3", + "block-buffer", "crypto-common", ] @@ -975,7 +1282,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -989,16 +1296,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 1.0.0", - "dirs-sys-next", -] - -[[package]] name = "dirs-sys" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1006,7 +1303,7 @@ checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1017,109 +1314,76 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] name = "dlib" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading", + "libloading 0.8.1", ] [[package]] name = "dmg" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e565b39e64e4030c75320536cc18cd51f0636811c53d98a05f01ec5deb8dd8f" +checksum = "abc28c350337837f23b4750f774371f63db232338c9f89bdb9eb48523a7c4722" dependencies = [ - "log 0.3.9", + "log", "plist", ] [[package]] -name = "druid" -version = "0.7.0" -source = "git+https://github.com/lapce/druid?branch=shell_opengl#0b9c00fcda238e392e758382f25166cd748fd305" -dependencies = [ - "console_error_panic_hook", - "druid-derive", - "druid-shell", - "fluent-bundle", - "fluent-langneg", - "fluent-syntax", - "fnv", - "im", - "instant", - "tracing", - "tracing-subscriber", - "tracing-wasm", - "unic-langid", - "unicode-segmentation", - "usvg 0.14.1", - "xi-unicode", -] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] -name = "druid-derive" -version = "0.4.0" -source = "git+https://github.com/lapce/druid?branch=shell_opengl#0b9c00fcda238e392e758382f25166cd748fd305" +name = "drm" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edf9159ef4bcecd0c5e4cbeb573b8d0037493403d542780dba5d840bbf9df56f" dependencies = [ - "proc-macro2", - "quote", - "syn", + "bitflags 1.3.2", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "nix 0.26.4", ] [[package]] -name = "druid-shell" -version = "0.7.0" -source = "git+https://github.com/lapce/druid?branch=shell_opengl#0b9c00fcda238e392e758382f25166cd748fd305" +name = "drm-ffi" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1352481b7b90e27a8a1bf8ef6b33cf18b98dba7c410e75c24bb3eef2f0d8d525" dependencies = [ - "anyhow", - "bitflags", - "block", - "cairo-rs", - "cfg-if 1.0.0", - "cgl", - "cocoa", - "core-foundation", - "core-graphics", - "foreign-types", - "gdk-pixbuf", - "gdk-sys", - "gl_loader", - "glib-sys", - "glutin_wgl_sys", - "gtk", - "gtk-sys", - "instant", - "js-sys", - "keyboard-types", - "kurbo", - "lazy_static", - "objc", - "piet-wgpu", - "scopeguard", - "time 0.3.14", - "tracing", - "wasm-bindgen", - "web-sys", - "winapi 0.3.9", - "wio", + "drm-sys", + "nix 0.26.4", ] [[package]] -name = "dwrote" -version = "0.11.0" +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +checksum = "1369f1679d6b706d234c4c1e0613c415c2c74b598a09ad28080ba2474b72e42d" dependencies = [ - "lazy_static", "libc", - "winapi 0.3.9", - "wio", ] [[package]] @@ -1129,6 +1393,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" [[package]] +name = "educe" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae" +dependencies = [ + "enum-ordinalize", + "proc-macro2", + "quote", + "syn 1.0.101", +] + +[[package]] name = "either" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1140,7 +1416,7 @@ version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1153,27 +1429,54 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.9.1" +name = "enum-ordinalize" +version = "3.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" +checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" dependencies = [ - "atty", - "humantime", - "log 0.4.17", - "regex", - "termcolor", + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] +name = "enumflags2" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] name = "errno" -version = "0.2.8" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -1188,9 +1491,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.7" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" dependencies = [ "num-traits", ] @@ -1203,24 +1506,25 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "exr" -version = "1.5.1" +version = "1.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a7880199e74c6d3fe45579df2f436c5913a71405494cb89d59234d86b47dc5" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" dependencies = [ "bit_field", "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.1", + "rayon-core", "smallvec", - "threadpool", + "zune-inflate", ] [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastrand" @@ -1232,32 +1536,29 @@ dependencies = [ ] [[package]] -name = "fern" -version = "0.6.1" +name = "fastrand" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a" -dependencies = [ - "log 0.4.17", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] -name = "field-offset" -version = "0.3.4" +name = "fd-lock" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +checksum = "0b0377f1edc77dbd1118507bc7a66e4ab64d2b90c66f90726dc801e73a8c68f9" dependencies = [ - "memoffset", - "rustc_version", + "cfg-if", + "rustix 0.38.20", + "windows-sys 0.48.0", ] [[package]] -name = "file-per-thread-logger" -version = "0.1.5" +name = "fdeflate" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" dependencies = [ - "env_logger", - "log 0.4.17", + "simd-adler32", ] [[package]] @@ -1266,10 +1567,10 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall", - "windows-sys", + "redox_syscall 0.2.16", + "windows-sys 0.36.1", ] [[package]] @@ -1285,80 +1586,107 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.5.4", ] [[package]] name = "float-cmp" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75224bec9bfe1a65e2d34132933f2de7fe79900c96a0174307554244ece8150e" - -[[package]] -name = "float-cmp" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" [[package]] -name = "float-ord" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e" +name = "floem" +version = "0.1.0" +source = "git+https://github.com/lapce/floem?rev=0694f9672a10a49290af223cac3dc2ab53b1b1dd#0694f9672a10a49290af223cac3dc2ab53b1b1dd" +dependencies = [ + "bitflags 2.4.0", + "copypasta", + "crossbeam-channel", + "educe", + "floem_reactive", + "floem_renderer", + "floem_tiny_skia", + "floem_vger", + "im", + "image", + "indexmap 2.0.2", + "kurbo", + "once_cell", + "parking_lot 0.12.1", + "peniko", + "raw-window-handle 0.5.2", + "rfd", + "rustc-hash", + "sha2", + "smallvec", + "taffy", + "unicode-segmentation", + "winit", +] [[package]] -name = "float_next_after" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632" +name = "floem_reactive" +version = "0.1.0" +source = "git+https://github.com/lapce/floem?rev=0694f9672a10a49290af223cac3dc2ab53b1b1dd#0694f9672a10a49290af223cac3dc2ab53b1b1dd" dependencies = [ - "num-traits", + "smallvec", ] [[package]] -name = "fluent-bundle" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +name = "floem_renderer" +version = "0.1.0" +source = "git+https://github.com/lapce/floem?rev=0694f9672a10a49290af223cac3dc2ab53b1b1dd#0694f9672a10a49290af223cac3dc2ab53b1b1dd" dependencies = [ - "fluent-langneg", - "fluent-syntax", - "intl-memoizer", - "intl_pluralrules", - "rustc-hash", - "self_cell", - "smallvec", - "unic-langid", + "cosmic-text", + "image", + "peniko", + "resvg", ] [[package]] -name = "fluent-langneg" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +name = "floem_tiny_skia" +version = "0.1.0" +source = "git+https://github.com/lapce/floem?rev=0694f9672a10a49290af223cac3dc2ab53b1b1dd#0694f9672a10a49290af223cac3dc2ab53b1b1dd" dependencies = [ - "unic-langid", + "anyhow", + "bytemuck", + "floem_renderer", + "futures", + "image", + "peniko", + "raw-window-handle 0.5.2", + "resvg", + "softbuffer", + "swash", ] [[package]] -name = "fluent-syntax" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +name = "floem_vger" +version = "0.1.0" +source = "git+https://github.com/lapce/floem?rev=0694f9672a10a49290af223cac3dc2ab53b1b1dd#0694f9672a10a49290af223cac3dc2ab53b1b1dd" dependencies = [ - "thiserror", + "anyhow", + "floem_renderer", + "futures", + "image", + "peniko", + "raw-window-handle 0.5.2", + "resvg", + "swash", + "vger", + "wgpu", ] [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", "nanorand", - "pin-project", "spin", ] @@ -1369,58 +1697,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "font-kit" -version = "0.11.0" -source = "git+https://github.com/lapce/font-kit#23e28b06b40f31fc53b82645b09ce6421768be23" -dependencies = [ - "bitflags", - "byteorder", - "core-foundation", - "core-graphics", - "core-text", - "dirs-next", - "dwrote", - "float-ord", - "freetype", - "lazy_static", - "libc", - "log 0.4.17", - "pathfinder_geometry", - "pathfinder_simd", - "walkdir", - "winapi 0.3.9", - "yeslogic-fontconfig-sys", -] - -[[package]] name = "fontconfig-parser" -version = "0.5.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cea2adebf32a9b104b8ffb308b5fb3b456f04cc76c294c3c85025c8a5d75f4" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" dependencies = [ "roxmltree", ] [[package]] name = "fontdb" -version = "0.5.4" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58903f4f8d5b58c7d300908e4ebe5289c1bfdf5587964330f12023b8ff17fd1" +checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" dependencies = [ - "log 0.4.17", - "memmap2 0.2.3", - "ttf-parser 0.12.3", + "fontconfig-parser", + "log", + "memmap2 0.6.2", + "slotmap", + "tinyvec", + "ttf-parser 0.19.1", ] [[package]] name = "fontdb" -version = "0.9.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122fa73a5566372f9df09768a16e8e3dad7ad18abe07835f1f0b71f84078ba4c" +checksum = "98b88c54a38407f7352dd2c4238830115a6377741098ffd1f997c813d0e088a6" dependencies = [ "fontconfig-parser", - "log 0.4.17", - "memmap2 0.5.7", + "log", + "memmap2 0.9.0", + "slotmap", + "tinyvec", + "ttf-parser 0.20.0", +] + +[[package]] +name = "fontdue" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0793f5137567643cf65ea42043a538804ff0fbf288649e2141442b602d81f9bc" +dependencies = [ + "hashbrown 0.13.2", "ttf-parser 0.15.2", ] @@ -1430,64 +1749,60 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", ] [[package]] -name = "foreign-types-shared" -version = "0.1.1" +name = "foreign-types" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] [[package]] -name = "form_urlencoded" -version = "1.1.0" +name = "foreign-types-macros" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ - "percent-encoding", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] -name = "fount" -version = "0.1.0" -source = "git+https://github.com/lapce/fount#3bfdc689c0cfbeb498358c79c7be2cb3beb44efe" -dependencies = [ - "font-kit", - "memmap2 0.5.7", - "swash", -] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] -name = "freetype" -version = "0.7.0" +name = "foreign-types-shared" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6" -dependencies = [ - "freetype-sys", - "libc", -] +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] -name = "freetype-sys" -version = "0.13.1" +name = "form_urlencoded" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "cmake", - "libc", - "pkg-config", + "percent-encoding", ] [[package]] name = "fs-set-times" -version = "0.17.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a267b6a9304912e018610d53fe07115d8b530b160e85db4d2d3a59f3ddde1aec" +checksum = "dd738b84894214045e8414eaded76359b4a5773f0a0a56b16575110739cdcf39" dependencies = [ - "io-lifetimes", - "rustix", - "windows-sys", + "io-lifetimes 2.0.2", + "rustix 0.38.20", + "windows-sys 0.48.0", ] [[package]] @@ -1497,14 +1812,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] name = "fs_extra" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "fsevent-sys" @@ -1516,26 +1831,10 @@ dependencies = [ ] [[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] name = "futures" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1548,9 +1847,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.24" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1558,15 +1857,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.24" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1575,9 +1874,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" @@ -1585,7 +1884,7 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" dependencies = [ - "fastrand", + "fastrand 1.8.0", "futures-core", "futures-io", "memchr", @@ -1596,32 +1895,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "futures-sink" -version = "0.3.24" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.24" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1636,15 +1935,6 @@ dependencies = [ ] [[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[package]] name = "fxhash" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1654,71 +1944,36 @@ dependencies = [ ] [[package]] -name = "gdk" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d749dcfc00d8de0d7c3a289e04a04293eb5ba3d8a4e64d64911d481fa9933b" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.14.0" +name = "fxprof-processed-profile" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f" +checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", + "bitflags 2.4.0", + "debugid", + "fxhash", + "serde", + "serde_json", ] [[package]] -name = "gdk-pixbuf-sys" -version = "0.14.0" +name = "generic-array" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", + "typenum", + "version_check", ] [[package]] -name = "gdk-sys" -version = "0.14.0" +name = "gethostname" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e091b3d3d6696949ac3b3fb3c62090e5bfd7bd6850bef5c3c5ea701de1b1f1e" +checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", + "winapi", ] [[package]] @@ -1736,7 +1991,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -1745,9 +2000,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.11.4" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" dependencies = [ "color_quant", "weezl", @@ -1755,55 +2010,25 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" dependencies = [ "fallible-iterator", - "indexmap", + "indexmap 2.0.2", "stable_deref_trait", ] [[package]] -name = "gio" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711c3632b3ebd095578a9c091418d10fed492da9443f58ebc8f45efbeb215cb0" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-io", - "gio-sys", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi 0.3.9", -] - -[[package]] name = "git2" -version = "0.16.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" +checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags", + "bitflags 2.4.0", "libc", "libgit2-sys", - "log 0.4.17", + "log", "openssl-probe", "openssl-sys", "url", @@ -1816,129 +2041,120 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" dependencies = [ "khronos_api", - "log 0.4.17", - "xml-rs 0.8.4", + "log", + "xml-rs", ] [[package]] -name = "gl_loader" -version = "0.1.2" +name = "glob" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32d96dd5f881490e537041d5532320812ba096097f07fccb4626578da0b99d3" -dependencies = [ - "cc", - "libc", -] +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] -name = "glam" -version = "0.10.2" +name = "globset" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579160312273c954cc51bd440f059dde741029ac8daf8c84fece76cb77f62c15" +checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" dependencies = [ - "version_check", + "aho-corasick 0.7.19", + "bstr", + "fnv", + "log", + "regex", ] [[package]] -name = "glib" -version = "0.14.8" +name = "gloo-timers" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" dependencies = [ - "bitflags", "futures-channel", "futures-core", - "futures-executor", - "futures-task", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "once_cell", - "smallvec", + "js-sys", + "wasm-bindgen", ] [[package]] -name = "glib-macros" -version = "0.14.1" +name = "glow" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518" +checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4" dependencies = [ - "anyhow", - "heck 0.3.3", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", ] [[package]] -name = "glib-sys" -version = "0.14.0" +name = "glutin_wgl_sys" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" dependencies = [ - "libc", - "system-deps", + "gl_generator", ] [[package]] -name = "glob" -version = "0.3.0" +name = "gpu-alloc" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.4.0", + "gpu-alloc-types", +] [[package]] -name = "globset" -version = "0.4.9" +name = "gpu-alloc-types" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log 0.4.17", - "regex", + "bitflags 2.4.0", ] [[package]] -name = "glow" -version = "0.11.2" +name = "gpu-allocator" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" +checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", + "backtrace", + "log", + "presser", + "thiserror", + "winapi", + "windows 0.51.1", ] [[package]] -name = "glutin_wgl_sys" -version = "0.1.5" +name = "gpu-descriptor" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da5951a1569dbab865c6f2a863efafff193a93caf05538d193e9e3816d21696" +checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" dependencies = [ - "gl_generator", + "bitflags 1.3.2", + "gpu-descriptor-types", + "hashbrown 0.12.3", ] [[package]] -name = "gobject-sys" -version = "0.14.0" +name = "gpu-descriptor-types" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5" +checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" dependencies = [ - "glib-sys", - "libc", - "system-deps", + "bitflags 1.3.2", ] [[package]] name = "grep-matcher" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d27563c33062cd33003b166ade2bb4fd82db1fd6a86db764dfdad132d46c1cc" +checksum = "3902ca28f26945fe35cad349d776f163981d777fee382ccd6ef451126f51b319" dependencies = [ "memchr", ] @@ -1949,12 +2165,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1345f8d33c89f2d5b081f2f2a41175adef9fd0bed2fea6a26c96c2deb027e58e" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.19", "bstr", "grep-matcher", - "log 0.4.17", + "log", "regex", - "regex-syntax", + "regex-syntax 0.6.27", "thread_local", ] @@ -1969,71 +2185,21 @@ dependencies = [ "encoding_rs", "encoding_rs_io", "grep-matcher", - "log 0.4.17", - "memmap2 0.5.7", + "log", + "memmap2 0.5.10", ] [[package]] -name = "gtk" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb51122dd3317e9327ec1e4faa151d1fa0d95664cd8fb8dcfacf4d4d29ac70c" -dependencies = [ - "atk", - "bitflags", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c14c8d3da0545785a7c5a120345b3abb534010fb8ae0f2ef3f47c027fba303e" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk3-macros" -version = "0.14.0" +name = "grid" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21de1da96dc117443fb03c2e270b2d34b7de98d0a79a19bbb689476173745b79" -dependencies = [ - "anyhow", - "heck 0.3.3", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] +checksum = "eec1c01eb1de97451ee0d60de7d81cf1e72aabefb021616027f3d1c3ec1c723c" [[package]] name = "h2" -version = "0.3.14" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -2041,36 +2207,62 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", - "tracing", + "tracing 0.1.37", ] [[package]] name = "half" -version = "1.8.2" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", ] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash", - "serde", + "ahash 0.8.3", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.3", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.3", + "thiserror", + "widestring", + "winapi", ] [[package]] @@ -2099,11 +2291,29 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "home" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "libc", + "windows-sys 0.48.0", ] [[package]] @@ -2143,19 +2353,13 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "human-sort" version = "0.2.2" -source = "git+https://github.com/dragazo/human-sort#1e74db1e09e8194ba88ad983723cf6f8b0c365da" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +source = "git+https://github.com/dragazo/human-sort?rev=1e74db1e09e8194ba88ad983723cf6f8b0c365da#1e74db1e09e8194ba88ad983723cf6f8b0c365da" [[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", @@ -2168,10 +2372,10 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.7", "tokio", "tower-service", - "tracing", + "tracing 0.1.37", "want", ] @@ -2198,10 +2402,27 @@ dependencies = [ "core-foundation-sys", "js-sys", "wasm-bindgen", - "winapi 0.3.9", + "winapi", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2", + "dispatch", + "objc2", ] [[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + +[[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2226,7 +2447,7 @@ dependencies = [ "crossbeam-utils", "globset", "lazy_static", - "log 0.4.17", + "log", "memchr", "regex", "same-file", @@ -2252,9 +2473,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.4" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -2265,11 +2486,17 @@ dependencies = [ "num-rational", "num-traits", "png", - "scoped_threadpool", + "qoi", "tiff", ] [[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[package]] name = "include_dir" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2290,17 +2517,27 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 1.0.101", ] [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", "serde", ] @@ -2310,7 +2547,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -2330,47 +2567,27 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", + "cfg-if", ] [[package]] name = "interprocess" -version = "1.1.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c58ec7fbda1df9a93f587b780659db3c99f61f4be27f9c82c9b37684ffd0366" +checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" dependencies = [ "blocking", - "cfg-if 1.0.0", - "futures", + "cfg-if", + "futures-core", + "futures-io", "intmap", "libc", "once_cell", + "rustc_version", "spinning", "thiserror", - "winapi 0.3.9", -] - -[[package]] -name = "intl-memoizer" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" -dependencies = [ - "type-map", - "unic-langid", -] - -[[package]] -name = "intl_pluralrules" -version = "7.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18f988384267d7066cc2be425e6faf352900652c046b6971d2e228d3b1c5ecf" -dependencies = [ - "tinystr", - "unic-langid", + "to_method", + "winapi", ] [[package]] @@ -2381,32 +2598,30 @@ checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" [[package]] name = "io-extras" -version = "0.15.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5d8c2ab5becd8720e30fd25f8fa5500d8dc3fceadd8378f05859bd7b46fc49" +checksum = "9d3c230ee517ee76b1cc593b52939ff68deda3fae9e41eca426c6b4993df51c4" dependencies = [ - "io-lifetimes", - "windows-sys", + "io-lifetimes 2.0.2", + "windows-sys 0.48.0", ] [[package]] name = "io-lifetimes" -version = "0.7.3" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi 0.3.2", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] -name = "iovec" -version = "0.1.4" +name = "io-lifetimes" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] +checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c" [[package]] name = "ipnet" @@ -2415,15 +2630,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] -name = "is-terminal" -version = "0.3.0" +name = "is-docker" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d508111813f9af3afd2f92758f77e4ed2cc9371b642112c6a48d22eb73105c5" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" dependencies = [ - "hermit-abi 0.2.6", - "io-lifetimes", - "rustix", - "windows-sys", + "once_cell", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", ] [[package]] @@ -2443,25 +2665,47 @@ checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" [[package]] name = "ittapi" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c4f6ff06169ce7048dac5150b1501c7e3716a929721aeb06b87e51a43e42f4" +checksum = "25a5c0b993601cad796222ea076565c5d9f337d35592f8622c753724f06d7271" dependencies = [ "anyhow", "ittapi-sys", - "log 0.4.17", + "log", ] [[package]] name = "ittapi-sys" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e078cce01485f418bae3beb34dd604aaedf2065502853c7da17fbce8e64eda" +checksum = "cb7b5e473765060536a660eed127f758cf1a810c73e49063264959c60d1727d9" dependencies = [ "cc", ] [[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] name = "jobserver" version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2472,18 +2716,18 @@ dependencies = [ [[package]] name = "jpeg-decoder" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" dependencies = [ "rayon", ] [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -2500,22 +2744,14 @@ dependencies = [ ] [[package]] -name = "kernel32-sys" -version = "0.2.2" +name = "khronos-egl" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "keyboard-types" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68" -dependencies = [ - "bitflags", + "libc", + "libloading 0.8.1", + "pkg-config", ] [[package]] @@ -2540,107 +2776,45 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] [[package]] name = "kurbo" -version = "0.8.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", "serde", ] [[package]] -name = "lapce" -version = "0.2.8" +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" dependencies = [ - "lapce-proxy", - "lapce-ui", + "log", ] [[package]] -name = "lapce-core" -version = "0.2.8" +name = "lapce" +version = "0.3.1" dependencies = [ - "anyhow", - "arc-swap", - "bitflags", - "directories", - "itertools", - "lapce-rpc", - "lapce-xi-rope", - "log 0.4.17", - "lsp-types", - "once_cell", - "serde", - "slotmap", - "strum", - "strum_macros", - "thiserror", - "tree-sitter", - "tree-sitter-bash", - "tree-sitter-c", - "tree-sitter-c-sharp", - "tree-sitter-clojure", - "tree-sitter-cmake", - "tree-sitter-cpp", - "tree-sitter-css", - "tree-sitter-d", - "tree-sitter-dart", - "tree-sitter-dockerfile", - "tree-sitter-elixir", - "tree-sitter-elm", - "tree-sitter-erlang", - "tree-sitter-glimmer", - "tree-sitter-glsl", - "tree-sitter-go", - "tree-sitter-hare", - "tree-sitter-haskell", - "tree-sitter-haxe", - "tree-sitter-hcl", - "tree-sitter-html", - "tree-sitter-java", - "tree-sitter-javascript", - "tree-sitter-json", - "tree-sitter-julia", - "tree-sitter-kotlin", - "tree-sitter-latex", - "tree-sitter-lua", - "tree-sitter-md", - "tree-sitter-nix", - "tree-sitter-ocaml", - "tree-sitter-php", - "tree-sitter-prisma-io", - "tree-sitter-protobuf", - "tree-sitter-python", - "tree-sitter-ql", - "tree-sitter-r", - "tree-sitter-ruby", - "tree-sitter-rust", - "tree-sitter-scheme", - "tree-sitter-scss", - "tree-sitter-sql", - "tree-sitter-svelte", - "tree-sitter-swift", - "tree-sitter-toml", - "tree-sitter-typescript", - "tree-sitter-vue", - "tree-sitter-wgsl", - "tree-sitter-xml", - "tree-sitter-yaml", - "tree-sitter-zig", + "lapce-app", + "lapce-proxy", ] [[package]] -name = "lapce-data" -version = "0.2.8" +name = "lapce-app" +version = "0.3.1" dependencies = [ + "Inflector", "alacritty_terminal", "anyhow", + "base64", "bytemuck", "chrono", "clap", @@ -2648,24 +2822,24 @@ dependencies = [ "crossbeam-channel", "directories", "dmg", - "druid", "flate2", + "floem", "fs_extra", - "fuzzy-matcher", - "hashbrown 0.12.3", + "futures", "im", "include_dir", - "indexmap", + "indexmap 2.0.2", "interprocess", "itertools", "lapce-core", "lapce-proxy", "lapce-rpc", "lapce-xi-rope", - "log 0.4.17", "lsp-types", "notify", + "nucleo", "once_cell", + "open", "parking_lot 0.11.2", "pulldown-cmark", "rayon", @@ -2673,7 +2847,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "sha2 0.10.6", + "sha2", "sled", "smallvec", "structdesc", @@ -2681,15 +2855,54 @@ dependencies = [ "strum_macros", "tar", "thiserror", - "toml_edit", + "tokio", + "toml 0.5.9", + "toml_edit 0.19.14", + "tracing 0.2.0", + "tracing-appender", + "tracing-subscriber", + "unicode-width", "url", - "uuid", "zip", ] [[package]] +name = "lapce-core" +version = "0.3.1" +dependencies = [ + "anyhow", + "arc-swap", + "bitflags 1.3.2", + "directories", + "include_dir", + "itertools", + "lapce-rpc", + "lapce-xi-rope", + "libloading 0.7.3", + "lsp-types", + "once_cell", + "serde", + "slotmap", + "strum", + "strum_macros", + "thiserror", + "tracing 0.2.0", + "tree-sitter", + "tree-sitter-bash", + "tree-sitter-c", + "tree-sitter-cpp", + "tree-sitter-javascript", + "tree-sitter-json", + "tree-sitter-md", + "tree-sitter-python", + "tree-sitter-rust", + "tree-sitter-toml", + "tree-sitter-yaml", +] + +[[package]] name = "lapce-proxy" -version = "0.2.8" +version = "0.3.1" dependencies = [ "alacritty_terminal", "anyhow", @@ -2705,7 +2918,7 @@ dependencies = [ "grep-regex", "grep-searcher", "ignore", - "indexmap", + "indexmap 2.0.2", "interprocess", "jsonrpc-lite", "lapce-core", @@ -2713,13 +2926,12 @@ dependencies = [ "lapce-xi-rope", "libc", "locale_config", - "log 0.4.17", "lsp-types", - "mio 0.6.23", "notify", "objc", "once_cell", "parking_lot 0.11.2", + "polling 3.2.0", "psp-types", "regex", "reqwest", @@ -2728,7 +2940,9 @@ dependencies = [ "strum", "strum_macros", "tar", - "toml_edit", + "toml 0.5.9", + "toml_edit 0.19.14", + "tracing 0.2.0", "trash", "url", "walkdir", @@ -2736,68 +2950,31 @@ dependencies = [ "wasi-experimental-http-wasmtime", "wasmtime", "wasmtime-wasi", - "which", "zstd", ] [[package]] name = "lapce-rpc" -version = "0.2.8" +version = "0.3.1" dependencies = [ "anyhow", "crossbeam-channel", "human-sort", - "indexmap", + "indexmap 2.0.2", "lapce-xi-rope", - "log 0.4.17", "lsp-types", "parking_lot 0.11.2", "serde", "serde_json", -] - -[[package]] -name = "lapce-ui" -version = "0.2.8" -dependencies = [ - "Inflector", - "alacritty_terminal", - "anyhow", - "chrono", - "clap", - "druid", - "fern", - "hashbrown 0.12.3", - "im", - "image", - "include_dir", - "indexmap", - "itertools", - "lapce-core", - "lapce-data", - "lapce-proxy", - "lapce-rpc", - "lapce-xi-rope", - "log 0.4.17", - "log-panics", - "lsp-types", - "once_cell", - "open", - "rayon", - "regex", - "serde", - "serde_json", - "smallvec", - "toml_edit", - "unicode-width", - "winres", + "tracing 0.2.0", + "url", ] [[package]] name = "lapce-xi-rope" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ae23edb8cf91f01edd9a87c88623eae3977c8d647a31c57cb12f1a125ca10a" +checksum = "6516aaa99c5059dc1a1bc02ed782d5e524699c1b4330028a6bed8259f9d9ff0a" dependencies = [ "bytecount", "memchr", @@ -2807,16 +2984,16 @@ dependencies = [ ] [[package]] -name = "lazy_static" -version = "1.4.0" +name = "lazy-bytes-cast" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b" [[package]] -name = "lazycell" -version = "1.3.0" +name = "lazy_static" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "leb128" @@ -2832,15 +3009,15 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.133" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libgit2-sys" -version = "0.14.2+1.5.1" +version = "0.16.1+1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" dependencies = [ "cc", "libc", @@ -2856,15 +3033,31 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", + "cfg-if", + "winapi", ] [[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + +[[package]] name = "libssh2-sys" -version = "0.2.23" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" +checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" dependencies = [ "cc", "libc", @@ -2887,16 +3080,25 @@ dependencies = [ ] [[package]] -name = "linked-hash-map" -version = "0.5.6" +name = "line-wrap" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "locale_config" @@ -2908,7 +3110,7 @@ dependencies = [ "objc", "objc-foundation", "regex", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2923,31 +3125,13 @@ dependencies = [ [[package]] name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.17", -] - -[[package]] -name = "log" version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "serde", -] - -[[package]] -name = "log-panics" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" -dependencies = [ - "backtrace", - "log 0.4.17", + "value-bag", ] [[package]] @@ -2956,7 +3140,7 @@ version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3bcfee315dde785ba887edb540b08765fd7df75a7d948844be6bf5712246734" dependencies = [ - "bitflags", + "bitflags 1.3.2", "serde", "serde_json", "serde_repr", @@ -2964,125 +3148,120 @@ dependencies = [ ] [[package]] -name = "lyon" -version = "0.17.10" +name = "mach" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0510ed5e3e2fb80f3db2061ef5ca92d87bfda1a624bb1eacf3bd50226e4cbb" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" dependencies = [ - "lyon_algorithms", - "lyon_tessellation", + "libc", ] [[package]] -name = "lyon_algorithms" -version = "0.17.7" +name = "malloc_buf" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8037f716541ba0d84d3de05c0069f8068baf73990d55980558b84d944c8a244a" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" dependencies = [ - "lyon_path", - "sid", + "libc", ] [[package]] -name = "lyon_geom" -version = "0.17.7" +name = "maybe-owned" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d89ccbdafd83d259403e22061be27bccc3254bba65cdc5303250c4227c8c8e" -dependencies = [ - "arrayvec 0.5.2", - "euclid", - "num-traits", -] +checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] -name = "lyon_path" -version = "0.17.7" +name = "memchr" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0a59fdf767ca0d887aa61d1b48d4bbf6a124c1a45503593f7d38ab945bfbc0" -dependencies = [ - "lyon_geom", -] +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] -name = "lyon_tessellation" -version = "0.17.10" +name = "memfd" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7230e08dd0638048e46f387f255dbe7a7344a3e6705beab53242b5af25635760" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "float_next_after", - "lyon_path", + "rustix 0.38.20", ] [[package]] -name = "mach" -version = "0.3.2" +name = "memmap2" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] [[package]] -name = "malloc_buf" -version = "0.0.6" +name = "memmap2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" dependencies = [ "libc", ] [[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "maybe-owned" -version = "0.3.4" +name = "memmap2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] [[package]] -name = "memchr" -version = "2.5.0" +name = "memmap2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +dependencies = [ + "libc", +] [[package]] -name = "memfd" -version = "0.6.1" +name = "memoffset" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480b5a5de855d11ff13195950bdc8b98b5e942ef47afc447f6615cdcc4e15d80" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "rustix", + "autocfg", ] [[package]] -name = "memmap2" -version = "0.2.3" +name = "memoffset" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ - "libc", + "autocfg", ] [[package]] -name = "memmap2" -version = "0.5.7" +name = "memoffset" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ - "libc", + "autocfg", ] [[package]] -name = "memoffset" -version = "0.6.5" +name = "metal" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "autocfg", + "bitflags 2.4.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", ] [[package]] @@ -3107,91 +3286,54 @@ dependencies = [ ] [[package]] -name = "mio" -version = "0.6.23" +name = "miniz_oxide" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log 0.4.17", - "miow 0.2.2", - "net2", - "slab", - "winapi 0.2.8", + "adler", + "simd-adler32", ] [[package]] name = "mio" -version = "0.8.4" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", - "log 0.4.17", + "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", -] - -[[package]] -name = "mio-anonymous-pipes" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc513025fe5005a3aa561b50fdb2cda5a150b84800ae02acd8aa9ed62ca1a6b" -dependencies = [ - "mio 0.6.23", - "miow 0.3.7", - "parking_lot 0.11.2", - "spsc-buffer", - "winapi 0.3.9", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log 0.4.17", - "mio 0.6.23", - "slab", -] - -[[package]] -name = "mio-uds" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" -dependencies = [ - "iovec", - "libc", - "mio 0.6.23", + "windows-sys 0.48.0", ] [[package]] name = "miow" -version = "0.2.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "windows-sys 0.48.0", ] [[package]] -name = "miow" -version = "0.3.7" +name = "naga" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +checksum = "61d829abac9f5230a85d8cc83ec0879b4c09790208ae25b5ea031ef84562e071" dependencies = [ - "winapi 0.3.9", + "bit-set", + "bitflags 2.4.0", + "codespan-reporting", + "hexf-parse", + "indexmap 2.0.2", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", ] [[package]] @@ -3211,7 +3353,7 @@ checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" dependencies = [ "lazy_static", "libc", - "log 0.4.17", + "log", "openssl", "openssl-probe", "openssl-sys", @@ -3222,14 +3364,34 @@ dependencies = [ ] [[package]] -name = "net2" -version = "0.2.37" +name = "ndk" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", + "bitflags 2.4.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", ] [[package]] @@ -3238,10 +3400,23 @@ version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" dependencies = [ - "bitflags", - "cfg-if 1.0.0", + "bitflags 1.3.2", + "cfg-if", "libc", - "memoffset", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", ] [[package]] @@ -3260,17 +3435,60 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2c66da08abae1c024c01d635253e402341b4060a12e99b31c7594063bf490a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossbeam-channel", "filetime", "fsevent-sys", "inotify", "kqueue", "libc", - "mio 0.8.4", + "mio", "serde", "walkdir", - "winapi 0.3.9", + "winapi", +] + +[[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 = "nucleo" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ccab936f2c8ad271bb31430944d98d358f74153566ea323265497f5639b11b6" +dependencies = [ + "nucleo-matcher", + "parking_lot 0.12.1", + "rayon", +] + +[[package]] +name = "nucleo-matcher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b702b402fe286162d1f00b552a046ce74365d2ac473a2607ff36ba650f9bd57" +dependencies = [ + "cov-mark", + "memchr", + "unicode-segmentation", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", ] [[package]] @@ -3314,6 +3532,27 @@ 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", +] + +[[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", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] name = "num_threads" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3329,6 +3568,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", + "objc_exception", ] [[package]] @@ -3343,6 +3583,37 @@ dependencies = [ ] [[package]] +name = "objc-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] name = "objc_id" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3353,36 +3624,31 @@ dependencies = [ [[package]] name = "object" -version = "0.29.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "crc32fast", - "hashbrown 0.12.3", - "indexmap", + "hashbrown 0.14.2", + "indexmap 2.0.2", "memchr", ] [[package]] name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "opaque-debug" -version = "0.3.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "open" -version = "3.0.3" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a3100141f1733ea40b53381b0ae3117330735ef22309a190ac57b9576ea716" +checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" dependencies = [ + "is-wsl", + "libc", "pathdiff", - "windows-sys", ] [[package]] @@ -3391,9 +3657,9 @@ version = "0.10.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", + "bitflags 1.3.2", + "cfg-if", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -3408,7 +3674,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.101", ] [[package]] @@ -3441,34 +3707,66 @@ dependencies = [ ] [[package]] +name = "orbclient" +version = "0.3.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" +dependencies = [ + "redox_syscall 0.3.5", +] + +[[package]] +name = "ordered-stream" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] name = "os_str_bytes" version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" [[package]] -name = "pango" -version = "0.14.8" +name = "ouroboros" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "546fd59801e5ca735af82839007edd226fe7d3bb06433ec48072be4439c28581" +checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" dependencies = [ - "bitflags", - "glib", - "libc", - "once_cell", - "pango-sys", + "aliasable", + "ouroboros_macro", ] [[package]] -name = "pango-sys" -version = "0.14.0" +name = "ouroboros_macro" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe" +checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", + "Inflector", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.101", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" +dependencies = [ + "ttf-parser 0.19.1", ] [[package]] @@ -3505,14 +3803,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ "backtrace", - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "petgraph", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "thread-id", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3521,20 +3819,11 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", - "windows-sys", -] - -[[package]] -name = "parley" -version = "0.1.0" -source = "git+https://github.com/lapce/parley#c37477b889ff53b9a3033e2180becddf90b9bb17" -dependencies = [ - "fount", - "swash", + "windows-sys 0.36.1", ] [[package]] @@ -3550,22 +3839,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] -name = "pathfinder_geometry" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" -dependencies = [ - "log 0.4.17", - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_simd" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39fe46acc5503595e5949c17b818714d26fdf9b4920eacf3b2947f0199f4a6ff" +name = "peniko" +version = "0.1.0" +source = "git+https://github.com/linebender/peniko?rev=cafdac9a211a0fb2fec5656bd663d1ac770bcc81#cafdac9a211a0fb2fec5656bd663d1ac770bcc81" dependencies = [ - "rustc_version", + "kurbo", + "smallvec", ] [[package]] @@ -3575,99 +3854,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] -name = "pest" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb779fcf4bb850fbbb0edc96ff6cf34fd90c4b1a112ce042653280d9a7364048" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[package]] name = "petgraph" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.3", ] [[package]] name = "pico-args" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] -name = "piet" -version = "0.4.0" +name = "pin-project-lite" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31bf73f4f995c6ae50f709ff3635e466d1e42d814a84099ea0f90da9dd0f0b69" -dependencies = [ - "kurbo", - "unic-bidi", -] +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] -name = "piet-wgpu" +name = "pin-utils" version = "0.1.0" -source = "git+https://github.com/lapce/piet-wgpu?branch=shell_opengl#2024fe8f241dc95ad38f4024d39898bada8fe802" -dependencies = [ - "bytemuck", - "glam", - "glow", - "hashbrown 0.11.2", - "image", - "include_dir", - "linked-hash-map", - "log 0.4.17", - "lyon", - "parley", - "pathfinder_geometry", - "piet", - "resvg", - "sha2 0.9.9", - "swash", - "tiny-skia", - "unicode-width", - "usvg 0.22.0", -] - -[[package]] -name = "pin-project" -version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pin-project-internal" -version = "1.0.12" +name = "piper" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ - "proc-macro2", - "quote", - "syn", + "atomic-waker", + "fastrand 2.0.1", + "futures-io", ] [[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 = "pkg-config" version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3675,43 +3900,86 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "plist" -version = "0.2.4" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61ac2afed2856590ae79d6f358a24b85ece246d2aa134741a66d589519b7503" +checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" dependencies = [ - "base64 0.8.0", - "byteorder", - "chrono", - "xml-rs 0.7.0", + "base64", + "indexmap 1.9.3", + "line-wrap", + "quick-xml 0.28.2", + "time 0.3.14", ] [[package]] name = "png" -version = "0.17.6" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", + "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue 2.2.0", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62a79e457c9898100b4298d57d69ec53d06f9a6ed352431ce5f377e082d2e846" +dependencies = [ + "cfg-if", + "concurrent-queue 2.2.0", + "pin-project-lite", + "rustix 0.38.20", + "tracing 0.1.37", + "windows-sys 0.48.0", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[package]] name = "ppv-lite86" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "thiserror", - "toml", + "toml_edit 0.19.14", ] [[package]] @@ -3723,7 +3991,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.101", "version_check", ] @@ -3740,20 +4008,26 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.44" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] +name = "profiling" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45f10e75d83c7aec79a6aa46f897075890e156b105eebe51cfa0abce51af025f" + +[[package]] name = "psm" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3765,7 +4039,7 @@ dependencies = [ [[package]] name = "psp-types" version = "0.1.0" -source = "git+https://github.com/lapce/psp-types#b55d2c5c1f9aae89a4f369db5151fe1756d34c08" +source = "git+https://github.com/lapce/psp-types?rev=f7fea28f59e7b2d6faa1034a21679ad49b3524ad#f7fea28f59e7b2d6faa1034a21679ad49b3524ad" dependencies = [ "lsp-types", "serde", @@ -3774,21 +4048,48 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" dependencies = [ - "bitflags", + "bitflags 1.3.2", "getopts", "memchr", "unicase", ] [[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] name = "quote" -version = "1.0.21" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -3833,40 +4134,60 @@ dependencies = [ ] [[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9283c6b06096b47afc7109834fdedab891175bb5241ee5d4f7d2546549f263" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + +[[package]] name = "rayon" -version = "1.5.3" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "rctree" -version = "0.3.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9e29cb19c8fe84169fcb07f8f11e66bc9e6e0280efd4715c54818296f8a4a8" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] -name = "rctree" -version = "0.4.0" +name = "rect_packer" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae028b272a6e99d9f8260ceefa3caa09300a8d6c8d2b2001316474bc52122e9" +checksum = "d8ffb4dfda4b01cc420847665dc480760d596ce186f2772a66ed32fe9acb1c45" [[package]] name = "redox_syscall" @@ -3874,7 +4195,16 @@ 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]] @@ -3884,31 +4214,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regalloc2" -version = "0.3.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ - "fxhash", - "log 0.4.17", + "hashbrown 0.13.2", + "log", + "rustc-hash", "slice-group-by", "smallvec", ] [[package]] name = "regex" -version = "1.7.0" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ - "aho-corasick", + "aho-corasick 1.1.2", "memchr", - "regex-syntax", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -3916,8 +4248,27 @@ name = "regex-automata" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + +[[package]] +name = "regex-automata" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ - "regex-syntax", + "aho-corasick 1.1.2", + "memchr", + "regex-syntax 0.7.5", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick 1.1.2", + "memchr", + "regex-syntax 0.8.2", ] [[package]] @@ -3927,21 +4278,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] name = "remove_dir_all" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] name = "reqwest" -version = "0.11.12" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.13.0", + "base64", "bytes", "encoding_rs", "futures-core", @@ -3953,7 +4322,7 @@ dependencies = [ "hyper-tls", "ipnet", "js-sys", - "log 0.4.17", + "log", "mime", "native-tls", "once_cell", @@ -3962,6 +4331,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-socks", @@ -3975,36 +4345,74 @@ dependencies = [ [[package]] name = "resvg" -version = "0.22.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e702d1e8e00a3a0717b96244cba840f34f542d8f23097c8903266c4e2975658" +checksum = "1df5f3de3bb51d8a4766a1ef5d85851f2737716dea899516248d25e313a51b0d" dependencies = [ "gif", "jpeg-decoder", - "log 0.4.17", + "log", "pico-args", "png", "rgb", "svgfilters", - "svgtypes 0.8.1", - "tiny-skia", - "usvg 0.22.0", + "svgtypes", + "tiny-skia 0.9.1", + "usvg", +] + +[[package]] +name = "rfd" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fe664af397d2b6a13a8ba1d172a2b5c87c6c5149039edbf8fa122b98c9ed96f" +dependencies = [ + "ashpd", + "async-io", + "block", + "dispatch", + "futures-util", + "js-sys", + "log", + "objc", + "objc-foundation", + "objc_id", + "pollster", + "raw-window-handle 0.5.2", + "urlencoding", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.44.0", ] [[package]] name = "rgb" -version = "0.8.34" +version = "0.8.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3603b7d71ca82644f79b5a06d1220e9a58ede60bd32255f698cb1af8838b8db3" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" dependencies = [ "bytemuck", ] [[package]] +name = "rosvgtree" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad747e7384940e7bf33b15ba433b7bad9f44c0c6d5287a67c2cb22cd1743d497" +dependencies = [ + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", +] + +[[package]] name = "roxmltree" -version = "0.14.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b" +checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" dependencies = [ "xmlparser", ] @@ -4023,58 +4431,83 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.35.10" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes 1.0.11", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af895b90e5c071badc3136fc10ff0bcfc98747eadbaf43ed8f214e07ba8f8477" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "itoa", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.10", "once_cell", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix-openpty" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25c3aad9fc1424eb82c88087789a7d938e1829724f3e4043163baf0d13cfc12" +dependencies = [ + "errno", + "libc", + "rustix 0.38.20", ] [[package]] name = "rustybuzz" -version = "0.3.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab463a295d00f3692e0974a0bfd83c7a9bcd119e27e07c2beecdb1b44a09d10" +checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytemuck", "smallvec", - "ttf-parser 0.9.0", + "ttf-parser 0.18.1", "unicode-bidi-mirroring", "unicode-ccc", - "unicode-general-category 0.2.0", + "unicode-general-category", "unicode-script", ] [[package]] name = "rustybuzz" -version = "0.5.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a617c811f5c9a7060fe511d35d13bf5b9f0463ce36d63ce666d05779df2b4eba" +checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytemuck", + "libm", "smallvec", - "ttf-parser 0.15.2", + "ttf-parser 0.19.1", "unicode-bidi-mirroring", "unicode-ccc", - "unicode-general-category 0.4.0", + "unicode-general-category", "unicode-script", ] @@ -4085,19 +4518,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] -name = "safe_arch" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" -dependencies = [ - "bytemuck", -] - -[[package]] name = "safemem" -version = "0.2.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" [[package]] name = "same-file" @@ -4115,14 +4539,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] -name = "scoped_threadpool" -version = "0.1.9" +name = "scoped-tls" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" @@ -4131,12 +4555,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] +name = "sctk-adwaita" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1729a30a469de249c6effc17ec8d039b0aa29b3af79b819b7f51cb6ab8046a90" +dependencies = [ + "ab_glyph", + "log", + "memmap2 0.9.0", + "smithay-client-toolkit", + "tiny-skia 0.11.1", +] + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] name = "security-framework" version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -4154,54 +4597,36 @@ dependencies = [ ] [[package]] -name = "self_cell" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" - -[[package]] name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.145" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -4216,7 +4641,16 @@ checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.101", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", ] [[package]] @@ -4233,38 +4667,41 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap", + "indexmap 2.0.2", + "itoa", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", ] [[package]] -name = "sha2" -version = "0.9.9" +name = "sha1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "sha1_smol", ] [[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[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 1.0.0", + "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest", ] [[package]] @@ -4286,15 +4723,6 @@ dependencies = [ ] [[package]] -name = "sid" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5ac56c121948b4879bba9e519852c211bcdd8f014efff766441deff0b91bdb" -dependencies = [ - "num-traits", -] - -[[package]] name = "signal-hook" version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4305,18 +4733,6 @@ dependencies = [ ] [[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio 0.6.23", - "mio-uds", - "signal-hook", -] - -[[package]] name = "signal-hook-registry" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4326,25 +4742,25 @@ dependencies = [ ] [[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] name = "simplecss" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" dependencies = [ - "log 0.4.17", + "log", ] [[package]] name = "siphasher" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" - -[[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 = "sized-chunks" @@ -4358,9 +4774,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -4377,7 +4793,7 @@ dependencies = [ "fs2", "fxhash", "libc", - "log 0.4.17", + "log", "parking_lot 0.11.2", ] @@ -4398,9 +4814,54 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" +dependencies = [ + "bitflags 2.4.0", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.0", + "rustix 0.38.20", + "thiserror", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner 0.31.0", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb62b280ce5a5cba847669933a0948d00904cf83845c944eae96a4738cea1a6" +dependencies = [ + "libc", + "smithay-client-toolkit", + "wayland-backend 0.3.2", +] + +[[package]] +name = "smol_str" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" +dependencies = [ + "serde", +] [[package]] name = "socket2" @@ -4409,14 +4870,56 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "softbuffer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd56fe5e6c6f1881aad2bd37acaef4ac4a3689c970dfcbd87a36a6e60210ec8" +dependencies = [ + "as-raw-xcb-connection", + "bytemuck", + "cfg_aliases", + "cocoa", + "core-graphics", + "drm", + "drm-sys", + "fastrand 2.0.1", + "foreign-types 0.5.0", + "js-sys", + "log", + "memmap2 0.7.1", + "nix 0.26.4", + "objc", + "raw-window-handle 0.5.2", + "redox_syscall 0.3.5", + "tiny-xlib", + "wasm-bindgen", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-sys 0.30.1", + "web-sys", + "windows-sys 0.48.0", + "x11rb", ] [[package]] name = "spin" -version = "0.9.4" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -4431,10 +4934,20 @@ dependencies = [ ] [[package]] -name = "spsc-buffer" -version = "0.1.1" +name = "spirv" +version = "0.2.0+1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be6c3f39c37a4283ee4b43d1311c828f2e1fb0541e76ea0cb1a2abd9ef2f5b3b" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "sptr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" [[package]] name = "stable_deref_trait" @@ -4443,6 +4956,38 @@ 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 = "stretto" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63eada6d62b660f5c1d4862c180ae70193de86df12386eee74da694ae2177583" +dependencies = [ + "atomic", + "crossbeam-channel", + "parking_lot 0.12.1", + "rand", + "seahash", + "thiserror", + "tracing 0.1.37", + "wg", + "xxhash-rust", +] + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4456,7 +5001,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.101", ] [[package]] @@ -4474,7 +5019,7 @@ dependencies = [ "heck 0.3.3", "proc-macro2", "quote", - "syn", + "syn 1.0.101", ] [[package]] @@ -4483,33 +5028,25 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "639abcebc15fdc2df179f37d6f5463d660c1c79cd552c12343a4600827a04bce" dependencies = [ - "float-cmp 0.9.0", + "float-cmp", "rgb", ] [[package]] name = "svgtypes" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c536faaff1a10837cfe373142583f6e27d81e96beba339147e77b67c9f260ff" -dependencies = [ - "float-cmp 0.5.3", - "siphasher 0.2.3", -] - -[[package]] -name = "svgtypes" -version = "0.8.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc802f68b144cdf4d8ff21301f9a7863e837c627fde46537e29c05e8a18c85c1" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" dependencies = [ - "siphasher 0.3.10", + "kurbo", + "siphasher", ] [[package]] name = "swash" -version = "0.1.4" -source = "git+https://github.com/lapce/swash#1d9b8c700a415f0f4216dd30026b3a2149db8e1e" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" dependencies = [ "yazi", "zeno", @@ -4527,40 +5064,79 @@ dependencies = [ ] [[package]] -name = "system-deps" -version = "3.2.0" +name = "syn" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ - "anyhow", - "cfg-expr", - "heck 0.3.3", - "itertools", - "pkg-config", - "strum", - "strum_macros", - "thiserror", - "toml", - "version-compare", + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sys-locale" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" +dependencies = [ + "js-sys", + "libc", + "wasm-bindgen", + "web-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", ] [[package]] name = "system-interface" -version = "0.22.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa85f9e64bd72b222ced152d2694fd306c0ebe43670cb9d187701874b7b89008" +checksum = "27ce32341b2c0b70c144bbf35627fdc1ef18c76ced5e5e7b3ee8b5ba6b2ab6a0" dependencies = [ - "atty", - "bitflags", + "bitflags 2.4.0", "cap-fs-ext", "cap-std", - "io-lifetimes", - "rustix", - "windows-sys", + "fd-lock", + "io-lifetimes 2.0.2", + "rustix 0.38.20", + "windows-sys 0.48.0", "winx", ] [[package]] +name = "taffy" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2287b6d7f721ada4cddf61ade5e760b2c6207df041cac9bfaa192897362fd3" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] name = "tar" version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4573,9 +5149,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.4" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" @@ -4583,12 +5159,12 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if 1.0.0", - "fastrand", + "cfg-if", + "fastrand 1.8.0", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "remove_dir_all", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4602,28 +5178,28 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.36" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a99cb8c4b9a8ef0e7907cd3b617cc8dc04d571c4e73c8ae403d80ac160bb122" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.36" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a891860d3c8d66fec8e73ddb3765f90082374dbaaa833407b904a94f1a7eb43" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -4633,8 +5209,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f" dependencies = [ "libc", - "redox_syscall", - "winapi 0.3.9", + "redox_syscall 0.2.16", + "winapi", ] [[package]] @@ -4647,19 +5223,10 @@ dependencies = [ ] [[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] name = "tiff" -version = "0.7.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259662e32d1e219321eb309d5f9d898b779769d81b76e762c07c8e5d38fcb65" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ "flate2", "jpeg-decoder", @@ -4674,7 +5241,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4683,29 +5250,73 @@ version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" dependencies = [ + "itoa", "libc", "num_threads", ] [[package]] name = "tiny-skia" -version = "0.6.6" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d049bfef0eaa2521e75d9ffb5ce86ad54480932ae19b85f78bec6f52c4d30d78" +checksum = "ce2986c82f77818c7b9144c70818fdde98db15308e329ae2f7204d767808fd3c" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "bytemuck", - "cfg-if 1.0.0", + "cfg-if", + "log", "png", - "safe_arch", + "tiny-skia-path 0.9.0", ] [[package]] -name = "tinystr" -version = "0.3.4" +name = "tiny-skia" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4e37fdc219ee3d551882d24dc5e4df5f72fd9723cbca1ffaa57f7348bf7a47d" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "tiny-skia-path 0.11.1", +] + +[[package]] +name = "tiny-skia-path" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7acb0ccda1ac91084353a56d0b69b0e29c311fd809d2088b1ed2f9ae1841c47" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93a323d1de20dad9bc8b32daf57702c585ce76e80792d8151de1fc9dfc8d1ca7" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-xlib" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29738eedb4388d9ea620eeab9384884fc3f06f586a2eddb56bedc5885126c7c1" +checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" +dependencies = [ + "as-raw-xcb-connection", + "ctor 0.2.5", + "libloading 0.8.1", + "tracing 0.1.37", +] [[package]] name = "tinyvec" @@ -4723,35 +5334,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] +name = "to_method" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" + +[[package]] name = "tokio" -version = "1.21.1" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", - "mio 0.8.4", + "mio", "num_cpus", - "once_cell", "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.5", "tokio-macros", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -4787,7 +5402,7 @@ dependencies = [ "futures-sink", "pin-project-lite", "tokio", - "tracing", + "tracing 0.1.37", ] [[package]] @@ -4800,305 +5415,203 @@ dependencies = [ ] [[package]] -name = "toml_edit" -version = "0.14.4" +name = "toml" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ - "combine", - "indexmap", - "itertools", "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", ] [[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.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" -dependencies = [ - "cfg-if 1.0.0", - "log 0.4.17", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" -dependencies = [ - "ansi_term", - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "tracing-wasm" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07" -dependencies = [ - "tracing", - "tracing-subscriber", - "wasm-bindgen", -] - -[[package]] -name = "trash" -version = "2.1.5" +name = "toml_datetime" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe090367848cd40c4230ff3ce4e2ff6a2fd511c1e14ae047a4a4c37ef7965236" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ - "chrono", - "libc", - "log 0.4.17", - "objc", - "once_cell", - "scopeguard", - "url", - "windows", + "serde", ] [[package]] -name = "tree-sitter" -version = "0.20.9" +name = "toml_edit" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4423c784fe11398ca91e505cdc71356b07b1a924fc8735cfab5333afe3e18bc" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-bash" -version = "0.19.0" -source = "git+https://github.com/tree-sitter/tree-sitter-bash?rev=4488aa41406547e478636a4fcfd24f5bbc3f2f74#4488aa41406547e478636a4fcfd24f5bbc3f2f74" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "cc", - "tree-sitter", + "indexmap 2.0.2", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] -name = "tree-sitter-c" +name = "toml_edit" version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca211f4827d4b4dc79f388bf67b6fa3bc8a8cfa642161ef24f99f371ba34c7b" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-c-sharp" -version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-c-sharp?rev=5b60f99545fea00a33bbfae5be956f684c4c69e2#5b60f99545fea00a33bbfae5be956f684c4c69e2" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-clojure" -version = "0.1.0" -source = "git+https://github.com/abreumatheus/tree-sitter-clojure?rev=fdc969eb04fc711e38ad74afe441d74b3b5d3091#fdc969eb04fc711e38ad74afe441d74b3b5d3091" -dependencies = [ - "cc", - "tree-sitter", + "indexmap 2.0.2", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] -name = "tree-sitter-cmake" -version = "0.1.0" +name = "tower-service" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8253ba26ab0adc2ae7cc7802d47cda9bba3fa31d07436f829a4c7f2b2442f3" -dependencies = [ - "cc", - "tree-sitter", -] +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] -name = "tree-sitter-cpp" -version = "0.20.0" +name = "tracing" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a869e3c5cef4e5db4e9ab16a8dc84d73010e60ada14cdc60d2f6d8aed17779d" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-css" -version = "0.19.0" -source = "git+https://github.com/syntacti/tree-sitter-css?rev=397aa132b9982fcdd2d473ed69343762a557f10a#397aa132b9982fcdd2d473ed69343762a557f10a" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cc", - "tree-sitter", + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes 0.1.23", + "tracing-core 0.1.30", ] [[package]] -name = "tree-sitter-d" -version = "0.3.2" -source = "git+https://github.com/ghishadow/tree-sitter-d?rev=36603135ecb37ac6494c520efff91b875815d6f7#36603135ecb37ac6494c520efff91b875815d6f7" +name = "tracing" +version = "0.2.0" +source = "git+https://github.com/tokio-rs/tracing?rev=c14525e1610db88986f849d46bd3e9795878b012#c14525e1610db88986f849d46bd3e9795878b012" dependencies = [ - "cc", - "tree-sitter", + "pin-project-lite", + "tracing-attributes 0.2.0", + "tracing-core 0.2.0", ] [[package]] -name = "tree-sitter-dart" -version = "0.0.1" -source = "git+https://github.com/syntacti/tree-sitter-dart?rev=78cad4503571d72666f78d5ba8ed6c1417653063#78cad4503571d72666f78d5ba8ed6c1417653063" +name = "tracing-appender" +version = "0.2.0" +source = "git+https://github.com/tokio-rs/tracing?rev=c14525e1610db88986f849d46bd3e9795878b012#c14525e1610db88986f849d46bd3e9795878b012" dependencies = [ - "cc", - "tree-sitter", + "crossbeam-channel", + "thiserror", + "time 0.3.14", + "tracing-subscriber", ] [[package]] -name = "tree-sitter-dockerfile" -version = "0.1.0" -source = "git+https://github.com/panekj/tree-sitter-dockerfile?rev=c49d819e07685c90456270f1cc654d9cba640f53#c49d819e07685c90456270f1cc654d9cba640f53" +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "cc", - "tree-sitter", + "proc-macro2", + "quote", + "syn 1.0.101", ] [[package]] -name = "tree-sitter-elixir" -version = "0.19.0" -source = "git+https://github.com/elixir-lang/tree-sitter-elixir.git?rev=05e3631c6a0701c1fa518b0fee7be95a2ceef5e2#05e3631c6a0701c1fa518b0fee7be95a2ceef5e2" +name = "tracing-attributes" +version = "0.2.0" +source = "git+https://github.com/tokio-rs/tracing?rev=c14525e1610db88986f849d46bd3e9795878b012#c14525e1610db88986f849d46bd3e9795878b012" dependencies = [ - "cc", - "tree-sitter", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] -name = "tree-sitter-elm" -version = "5.6.3" +name = "tracing-core" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22b9408ad250aa27774132baf20c4f107faad16841aa45568c6900a27895093b" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ - "cc", - "tree-sitter", + "once_cell", ] [[package]] -name = "tree-sitter-erlang" -version = "0.0.1" -source = "git+https://github.com/WhatsApp/tree-sitter-erlang?rev=a8b8b0e16c4f5552f5e85af3dec976a5d16af8b9#a8b8b0e16c4f5552f5e85af3dec976a5d16af8b9" +name = "tracing-core" +version = "0.2.0" +source = "git+https://github.com/tokio-rs/tracing?rev=c14525e1610db88986f849d46bd3e9795878b012#c14525e1610db88986f849d46bd3e9795878b012" dependencies = [ - "cc", - "tree-sitter", + "once_cell", ] [[package]] -name = "tree-sitter-glimmer" -version = "0.0.1" -source = "git+https://github.com/VixieTSQ/tree-sitter-glimmer?rev=7281caca2ba114e1960c5d944a37860ef0841426#7281caca2ba114e1960c5d944a37860ef0841426" +name = "tracing-log" +version = "0.2.0" +source = "git+https://github.com/tokio-rs/tracing?rev=c14525e1610db88986f849d46bd3e9795878b012#c14525e1610db88986f849d46bd3e9795878b012" dependencies = [ - "cc", - "tree-sitter", + "log", + "once_cell", + "tracing-core 0.2.0", ] [[package]] -name = "tree-sitter-glsl" -version = "0.1.3" -source = "git+https://github.com/theHamsta/tree-sitter-glsl?rev=74329feb2605deccd32b1c644af507daa6fb82f1#74329feb2605deccd32b1c644af507daa6fb82f1" +name = "tracing-subscriber" +version = "0.3.0" +source = "git+https://github.com/tokio-rs/tracing?rev=c14525e1610db88986f849d46bd3e9795878b012#c14525e1610db88986f849d46bd3e9795878b012" dependencies = [ - "cc", - "tree-sitter", + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core 0.2.0", + "tracing-log", ] [[package]] -name = "tree-sitter-go" -version = "0.19.1" +name = "trash" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71967701c8214be4aa77e0260e98361e6fd71ceec1d9d03abb37a22c9f60d0ff" +checksum = "af3663fb8f476d674b9c61d1d2796acec725bef6bec4b41402a904252a25971e" dependencies = [ - "cc", - "tree-sitter", + "chrono", + "libc", + "log", + "objc", + "once_cell", + "scopeguard", + "url", + "windows 0.44.0", ] [[package]] -name = "tree-sitter-hare" -version = "0.20.7" +name = "tree-sitter" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbd59e015721be7de5449fad7b7d5302f0f8544b1589f818d9a38afd4ff198b" +checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" dependencies = [ "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-haskell" -version = "0.14.0" -source = "git+https://github.com/tree-sitter/tree-sitter-haskell?rev=e30bdfd53eb28c73f26a68b77d436fd2140af167#e30bdfd53eb28c73f26a68b77d436fd2140af167" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-haxe" -version = "0.2.2" -source = "git+https://github.com/vantreeseba/tree-sitter-haxe?rev=52e3d2b9c3955aca886bccc38b496ef99b603a09#52e3d2b9c3955aca886bccc38b496ef99b603a09" -dependencies = [ - "cc", - "tree-sitter", + "regex", ] [[package]] -name = "tree-sitter-hcl" -version = "0.0.1" -source = "git+https://github.com/VixieTSQ/tree-sitter-hcl?rev=f4aa4553344e03e149ec459549a7f686d6846626#f4aa4553344e03e149ec459549a7f686d6846626" +name = "tree-sitter-bash" +version = "0.19.0" +source = "git+https://github.com/tree-sitter/tree-sitter-bash?rev=4488aa41406547e478636a4fcfd24f5bbc3f2f74#4488aa41406547e478636a4fcfd24f5bbc3f2f74" dependencies = [ "cc", "tree-sitter", ] [[package]] -name = "tree-sitter-html" -version = "0.19.0" +name = "tree-sitter-c" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "184e6b77953a354303dc87bf5fe36558c83569ce92606e7b382a0dc1b7443443" +checksum = "30b03bdf218020057abee831581a74bff8c298323d6c6cd1a70556430ded9f4b" dependencies = [ "cc", "tree-sitter", ] [[package]] -name = "tree-sitter-java" +name = "tree-sitter-cpp" version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-java.git?rev=09d650def6cdf7f479f4b78f595e9ef5b58ce31e#09d650def6cdf7f479f4b78f595e9ef5b58ce31e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a869e3c5cef4e5db4e9ab16a8dc84d73010e60ada14cdc60d2f6d8aed17779d" dependencies = [ "cc", "tree-sitter", @@ -5106,9 +5619,9 @@ dependencies = [ [[package]] name = "tree-sitter-javascript" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2490fab08630b2c8943c320f7b63473cbf65511c8d83aec551beb9b4375906ed" +checksum = "edbc663376bdd294bd1f0a6daf859aedb9aa5bdb72217d7ad8ba2d5314102cf7" dependencies = [ "cc", "tree-sitter", @@ -5124,42 +5637,6 @@ dependencies = [ ] [[package]] -name = "tree-sitter-julia" -version = "0.19.0" -source = "git+https://github.com/varlad/tree-sitter-julia.git?rev=2ad4c9b79e0f213b61dbb3820754bfc6306e595a#2ad4c9b79e0f213b61dbb3820754bfc6306e595a" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-kotlin" -version = "0.2.11" -source = "git+https://github.com/fwcd/tree-sitter-kotlin?rev=a4f71eb9b8c9b19ded3e0e9470be4b1b77c2b569#a4f71eb9b8c9b19ded3e0e9470be4b1b77c2b569" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-latex" -version = "0.2.0" -source = "git+https://github.com/latex-lsp/tree-sitter-latex?rev=b3b2cf27f33e71438ebe46934900b1153901c6f2#b3b2cf27f33e71438ebe46934900b1153901c6f2" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-lua" -version = "0.0.12" -source = "git+https://github.com/syntacti/tree-sitter-lua?rev=a29f646c14ed800aaeef1ca58a9bacc6d92922e8#a29f646c14ed800aaeef1ca58a9bacc6d92922e8" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] name = "tree-sitter-md" version = "0.1.2" source = "git+https://github.com/MDeiml/tree-sitter-markdown.git?rev=272e080bca0efd19a06a7f4252d746417224959e#272e080bca0efd19a06a7f4252d746417224959e" @@ -5169,84 +5646,10 @@ dependencies = [ ] [[package]] -name = "tree-sitter-nix" -version = "0.0.1" -source = "git+https://github.com/panekj/tree-sitter-nix?rev=59fc47150ab437e8bb356c7ab21e9531e87f7cc8#59fc47150ab437e8bb356c7ab21e9531e87f7cc8" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-ocaml" -version = "0.20.0" -source = "git+https://github.com/tree-sitter/tree-sitter-ocaml?rev=cc26b1ef111100f26a137bcbcd39fd4e35be9a59#cc26b1ef111100f26a137bcbcd39fd4e35be9a59" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-php" -version = "0.19.1" -source = "git+https://github.com/tree-sitter/tree-sitter-php.git?rev=ab2e72179ceb8bb0b249c8ac9162a148e911b3dc#ab2e72179ceb8bb0b249c8ac9162a148e911b3dc" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-prisma-io" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15843349be7dd0281ffb24dd9659c6695d7a3d43a75e175c6a985f8dd6089174" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-protobuf" -version = "0.0.1" -source = "git+https://github.com/yusdacra/tree-sitter-protobuf?rev=5aef38d655f76a6b0d172340eed3766c93b3124c#5aef38d655f76a6b0d172340eed3766c93b3124c" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] name = "tree-sitter-python" -version = "0.20.2" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda114f58048f5059dcf158aff691dffb8e113e6d2b50d94263fd68711975287" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-ql" -version = "0.19.0" -source = "git+https://github.com/tree-sitter/tree-sitter-ql?rev=bd087020f0d8c183080ca615d38de0ec827aeeaf#bd087020f0d8c183080ca615d38de0ec827aeeaf" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-r" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "522c13f4cc46213148b19d4ad40a988ffabd51fd90eb7de759844fbde49bda0c" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-ruby" -version = "0.19.0" -source = "git+https://github.com/tree-sitter/tree-sitter-ruby.git?rev=656abef0645caea793e33c1c773570722463e1d8#656abef0645caea793e33c1c773570722463e1d8" +checksum = "e6c93b1b1fbd0d399db3445f51fd3058e43d0b4dcff62ddbdb46e66550978aa5" dependencies = [ "cc", "tree-sitter", @@ -5254,55 +5657,9 @@ dependencies = [ [[package]] name = "tree-sitter-rust" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13470fafb7327a3acf96f5bc1013b5539a899a182f01c59b5af53f6b93195717" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-scheme" -version = "0.2.0" -source = "git+https://github.com/6cdh/tree-sitter-scheme.git?rev=af0fd1fa452cb2562dc7b5c8a8c55551c39273b9#af0fd1fa452cb2562dc7b5c8a8c55551c39273b9" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-scss" -version = "0.0.1" -source = "git+https://github.com/VixieTSQ/tree-sitter-scss?rev=3aac3391ede5098edbf4cc8a9f6d0cfdfe28e5dc#3aac3391ede5098edbf4cc8a9f6d0cfdfe28e5dc" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-sql" -version = "0.0.2" -source = "git+https://github.com/oknozor/tree-sitter-sql?rev=15dad0f3cae8a094a7dac17d712ea8fb25228011#15dad0f3cae8a094a7dac17d712ea8fb25228011" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-svelte" -version = "0.10.2" -source = "git+https://github.com/Himujjal/tree-sitter-svelte?rev=52e122ae68b316d3aa960a0a422d3645ba717f42#52e122ae68b316d3aa960a0a422d3645ba717f42" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-swift" -version = "0.3.4" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe0df6a792c4cd3066239195b65a322066c9ebbff58686a9de3e9ad9f25b510" +checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594" dependencies = [ "cc", "tree-sitter", @@ -5319,44 +5676,6 @@ dependencies = [ ] [[package]] -name = "tree-sitter-typescript" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8ed0ecb931cdff13c6a13f45ccd615156e2779d9ffb0395864e05505e6e86d" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-vue" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc58c2aaf6d4a5da799f45751719a6ff4b7d38a97479c6b547b442a8cbf8730" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-wgsl" -version = "0.0.1" -source = "git+https://github.com/szebniok/tree-sitter-wgsl?rev=272e89ef2aeac74178edb9db4a83c1ffef80a463#272e89ef2aeac74178edb9db4a83c1ffef80a463" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-xml" -version = "0.0.1" -source = "git+https://github.com/RenjiSann/tree-sitter-xml?rev=422528a43630db6dcc1e222d1c5ee3babd559473#422528a43630db6dcc1e222d1c5ee3babd559473" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] name = "tree-sitter-yaml" version = "0.0.1" source = "git+https://github.com/panekj/tree-sitter-yaml?rev=80c8d76847f03e772c5c524cf29bafb56858a8d1#80c8d76847f03e772c5c524cf29bafb56858a8d1" @@ -5366,12 +5685,13 @@ dependencies = [ ] [[package]] -name = "tree-sitter-zig" -version = "0.0.1" -source = "git+https://github.com/maxxnino/tree-sitter-zig?rev=8d3224c3bd0890fe08358886ebf54fca2ed448a6#8d3224c3bd0890fe08358886ebf54fca2ed448a6" +name = "triomphe" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f" dependencies = [ - "cc", - "tree-sitter", + "serde", + "stable_deref_trait", ] [[package]] @@ -5382,30 +5702,27 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "ttf-parser" -version = "0.9.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ddb402ac6c2af6f7a2844243887631c4e94b51585b229fcfddb43958cd55ca" +checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] name = "ttf-parser" -version = "0.12.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" [[package]] name = "ttf-parser" -version = "0.15.2" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" +checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33" [[package]] -name = "type-map" -version = "0.4.0" +name = "ttf-parser" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" -dependencies = [ - "rustc-hash", -] +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[package]] name = "typenum" @@ -5414,85 +5731,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - -[[package]] -name = "unic-bidi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1356b759fb6a82050666f11dce4b6fe3571781f1449f3ef78074e408d468ec09" -dependencies = [ - "matches", - "unic-ucd-bidi", -] - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-langid" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73328fcd730a030bdb19ddf23e192187a6b01cd98be6d3140622a89129459ce5" -dependencies = [ - "unic-langid-impl", -] - -[[package]] -name = "unic-langid-impl" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a4a8eeaf0494862c1404c95ec2f4c33a2acff5076f64314b465e3ddae1b934d" -dependencies = [ - "tinystr", -] - -[[package]] -name = "unic-ucd-bidi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1d568b51222484e1f8209ce48caa6b430bf352962b877d592c29ab31fb53d8c" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" +name = "uds_windows" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" dependencies = [ - "unic-common", + "tempfile", + "winapi", ] [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -5517,15 +5769,9 @@ checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" [[package]] name = "unicode-general-category" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9af028e052a610d99e066b33304625dea9613170a2563314490a4e6ec5cf7f" - -[[package]] -name = "unicode-general-category" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07547e3ee45e28326cc23faac56d44f58f16ab23e413db526debce3b0bfd2742" +checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[package]] name = "unicode-ident" @@ -5534,6 +5780,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" [[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] name = "unicode-normalization" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5562,9 +5814,21 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[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" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "url" @@ -5579,57 +5843,69 @@ dependencies = [ ] [[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] name = "usvg" -version = "0.14.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8352f317d8f9a918ba5154797fb2a93e2730244041cf7d5be35148266adfa5" +checksum = "ae32eb823aab35fc343b19c4d354f70e713b442ce34cdfa8497bf6c39af8a342" dependencies = [ - "base64 0.13.0", - "data-url", - "flate2", - "fontdb 0.5.4", - "kurbo", - "log 0.4.17", - "memmap2 0.2.3", + "base64", + "log", "pico-args", - "rctree 0.3.3", - "roxmltree", - "rustybuzz 0.3.0", - "simplecss", - "siphasher 0.2.3", - "svgtypes 0.5.0", - "ttf-parser 0.12.3", - "unicode-bidi", - "unicode-script", - "unicode-vo", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", "xmlwriter", ] [[package]] -name = "usvg" -version = "0.22.0" +name = "usvg-parser" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a261d60a7215fa339482047cc3dafd4e22e2bf34396aaebef2b707355bbb39c0" +checksum = "c7529174e721c8078d62b08399258469b1d68b4e5f2983b347d6a9d39779366c" dependencies = [ - "base64 0.13.0", "data-url", "flate2", - "float-cmp 0.9.0", - "fontdb 0.9.1", + "imagesize", "kurbo", - "log 0.4.17", - "pico-args", - "rctree 0.4.0", - "roxmltree", - "rustybuzz 0.5.1", - "simplecss", - "siphasher 0.3.10", - "svgtypes 0.8.1", - "ttf-parser 0.15.2", + "log", + "rosvgtree", + "strict-num", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e672fbc19261c6553113cc04ff2ff38ae52fadbd90f2d814040857795fb5c50" +dependencies = [ + "fontdb 0.14.1", + "kurbo", + "log", + "rustybuzz 0.7.0", "unicode-bidi", "unicode-script", "unicode-vo", - "xmlwriter", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a56e9cd3be5eb6d6744477e95b82d52d393fc1dba4b5b090912c33af337c20b" +dependencies = [ + "kurbo", + "rctree", + "strict-num", + "svgtypes", ] [[package]] @@ -5640,11 +5916,18 @@ checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" [[package]] name = "uuid" -version = "1.2.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" + +[[package]] +name = "value-bag" +version = "1.0.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" dependencies = [ - "getrandom", + "ctor 0.1.26", + "version_check", ] [[package]] @@ -5654,23 +5937,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] -name = "version-compare" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" - -[[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] +name = "vger" +version = "0.2.7" +source = "git+https://github.com/lapce/vger-rs?rev=ed10537c72a732a03f782225a39da80e6f9acbbe#ed10537c72a732a03f782225a39da80e6f9acbbe" +dependencies = [ + "cosmic-text", + "euclid", + "fontdue", + "rect_packer", + "wgpu", +] + +[[package]] name = "vte" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" +checksum = "401dc1020e10f74d38616c1f1ab92ccd85dc902705a29d0730e0fbea8534f91a" dependencies = [ + "bitflags 2.4.0", + "cursor-icon", + "log", + "serde", "utf8parse", "vte_generate_state_changes", ] @@ -5698,7 +5991,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", - "winapi 0.3.9", + "winapi", "winapi-util", ] @@ -5708,7 +6001,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ - "log 0.4.17", + "log", "try-lock", ] @@ -5726,9 +6019,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi-cap-std-sync" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd3298c9cd5b619d74c3ef7130a370da0f677b30110a34ab15985b3b81475bc9" +checksum = "b5837041da0e6ec454a819bc20ab0f8a70b2c44bf4d33287aea9fdb16bc4d597" dependencies = [ "anyhow", "async-trait", @@ -5738,38 +6031,39 @@ dependencies = [ "cap-time-ext", "fs-set-times", "io-extras", - "io-lifetimes", - "is-terminal", + "io-lifetimes 2.0.2", "once_cell", - "rustix", + "rustix 0.38.20", "system-interface", - "tracing", + "tracing 0.1.37", "wasi-common", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "wasi-common" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eaf4ef6ce85c09254f2ff414e8319b023b60007f3d0eb6164b14a41c56231c" +checksum = "6efb2e9d72c6a070d62cf7b698acebab6faca9aacf26412bdecb9fabab79fd09" dependencies = [ "anyhow", - "bitflags", + "bitflags 2.4.0", "cap-rand", "cap-std", "io-extras", - "rustix", + "log", + "rustix 0.38.20", "thiserror", - "tracing", + "tracing 0.1.37", + "wasmtime", "wiggle", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "wasi-experimental-http-wasmtime" version = "0.10.0" -source = "git+https://github.com/lapce/wasi-experimental-http#5c6d970fe0750932f76979678384bf1c5ab5be2e" +source = "git+https://github.com/lapce/wasi-experimental-http#21419eb785cb583ead180f25a9685fa16de7f326" dependencies = [ "anyhow", "bytes", @@ -5778,7 +6072,7 @@ dependencies = [ "reqwest", "thiserror", "tokio", - "tracing", + "tracing 0.1.37", "url", "wasi-common", "wasmtime", @@ -5787,36 +6081,36 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", - "log 0.4.17", + "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -5824,9 +6118,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5834,243 +6128,395 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-encoder" -version = "0.17.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7ca71c70a6de5b10968ae4d298e548366d9cd9588176e6ff8866f3c49c96ee" +checksum = "9ca90ba1b5b0a70d3d49473c5579951f3bddc78d47b59256d2f9d4922b150aca" dependencies = [ "leb128", ] [[package]] name = "wasmparser" -version = "0.89.1" +version = "0.115.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef" +checksum = "e06c0641a4add879ba71ccb3a1e4278fd546f76f1eafb21d8f7b07733b547cd5" dependencies = [ - "indexmap", + "indexmap 2.0.2", + "semver", +] + +[[package]] +name = "wasmprinter" +version = "0.2.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e74458a9bc5cc9c7108abfa0fe4dc88d5abf1f3baf194df3264985f17d559b5e" +dependencies = [ + "anyhow", + "wasmparser", ] [[package]] name = "wasmtime" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" +checksum = "76e45ad44701a658aa3eb138a5bb63a10a35fa8874419b5e6047cfa54b2eb2cd" dependencies = [ "anyhow", "async-trait", "bincode", - "cfg-if 1.0.0", - "indexmap", + "bumpalo", + "cfg-if", + "encoding_rs", + "fxprof-processed-profile", + "indexmap 2.0.2", "libc", - "log 0.4.17", + "log", "object", "once_cell", "paste", "psm", "rayon", "serde", + "serde_derive", + "serde_json", "target-lexicon", + "wasm-encoder", "wasmparser", "wasmtime-cache", + "wasmtime-component-macro", + "wasmtime-component-util", "wasmtime-cranelift", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit", "wasmtime-runtime", + "wasmtime-winch", "wat", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-asm-macros" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" +checksum = "45a5944c8415853471b6ddff1f38b09d58fe5ac3c5dad27ee6bc03ca29e65cca" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882" +checksum = "6c16f85353656b301a4472ad649e9b17cc47400cee50a94bd9b24e7886a8130f" dependencies = [ "anyhow", - "base64 0.13.0", + "base64", "bincode", "directories-next", - "file-per-thread-logger", - "log 0.4.17", - "rustix", + "log", + "rustix 0.38.20", "serde", - "sha2 0.9.9", - "toml", - "windows-sys", + "serde_derive", + "sha2", + "toml 0.5.9", + "windows-sys 0.48.0", "zstd", ] [[package]] +name = "wasmtime-component-macro" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b174f64cd4b189396dde1bbe137f349d3c98525b8564b539f94ce978c571173d" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn 2.0.38", + "wasmtime-component-util", + "wasmtime-wit-bindgen", + "wit-parser", +] + +[[package]] +name = "wasmtime-component-util" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b18ff6d21a0ef69de7fd4db023646b386982e78b7e5c06e6455d98cf44774954" + +[[package]] name = "wasmtime-cranelift" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd91339b742ff20bfed4532a27b73c86b5bcbfedd6bea2dcdf2d64471e1b5c6" +checksum = "e7dbb50f43a7eb897f222fb427b3ba50620014eb43673b5bfa50cfd5b2681e37" dependencies = [ "anyhow", + "cfg-if", "cranelift-codegen", + "cranelift-control", "cranelift-entity", "cranelift-frontend", "cranelift-native", "cranelift-wasm", "gimli", - "log 0.4.17", + "log", "object", "target-lexicon", "thiserror", "wasmparser", + "wasmtime-cranelift-shared", + "wasmtime-environ", + "wasmtime-versioned-export-macros", +] + +[[package]] +name = "wasmtime-cranelift-shared" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc154520d9c910f02ce90735691186f90b220f532f9b0725543b054bf0d8381" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-control", + "cranelift-native", + "gimli", + "object", + "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" +checksum = "d72b405647d5378ed3ff7889586d26d79825641f477f288bc72ab416136ad4da" dependencies = [ "anyhow", "cranelift-entity", "gimli", - "indexmap", - "log 0.4.17", + "indexmap 2.0.2", + "log", "object", "serde", + "serde_derive", "target-lexicon", "thiserror", + "wasm-encoder", "wasmparser", + "wasmprinter", + "wasmtime-component-util", "wasmtime-types", ] [[package]] name = "wasmtime-fiber" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e867cf58e31bfa0ab137bd47e207d2e1e38c581d7838b2f258d47c8145db412" +checksum = "8702d1efdf73df040a586e239fffc6883d88edf60ac6f593b41392cc1f97c754" dependencies = [ "cc", - "cfg-if 1.0.0", - "rustix", + "cfg-if", + "rustix 0.38.20", "wasmtime-asm-macros", - "windows-sys", + "wasmtime-versioned-export-macros", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-jit" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" +checksum = "8c7462341d96d44b30776c7aec411c0cc11b15fde44b58efcbf269d21570bd7a" dependencies = [ "addr2line", "anyhow", "bincode", - "cfg-if 1.0.0", + "cfg-if", "cpp_demangle", "gimli", "ittapi", - "log 0.4.17", + "log", "object", "rustc-demangle", - "rustix", + "rustix 0.38.20", "serde", + "serde_derive", "target-lexicon", - "thiserror", "wasmtime-environ", "wasmtime-jit-debug", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-jit-debug" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" +checksum = "0fa128cdc680b5982087ea64eb73b63e96570b338fd6438b704b313eb854fd94" dependencies = [ "object", "once_cell", - "rustix", + "rustix 0.38.20", + "wasmtime-versioned-export-macros", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0980a96b16abbdaf829858d2389697b1d6cfc6a903873fd74b7e47a6b1045584" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-runtime" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" +checksum = "de31031471f04c0bad4f5e29b0e632db318488dd030cdb794ef15f91a52f2338" dependencies = [ "anyhow", "cc", - "cfg-if 1.0.0", - "indexmap", + "cfg-if", + "encoding_rs", + "indexmap 2.0.2", "libc", - "log 0.4.17", + "log", "mach", "memfd", - "memoffset", + "memoffset 0.9.0", "paste", "rand", - "rustix", - "thiserror", + "rustix 0.38.20", + "sptr", + "wasm-encoder", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", - "windows-sys", + "wasmtime-versioned-export-macros", + "wasmtime-wmemcheck", + "windows-sys 0.48.0", ] [[package]] name = "wasmtime-types" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" +checksum = "4e98a2c09807eee3207991bf05b6271aa3817c548224ded6b7bac61374ef9221" dependencies = [ "cranelift-entity", "serde", + "serde_derive", "thiserror", "wasmparser", ] [[package]] +name = "wasmtime-versioned-export-macros" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73190422af3b408daa3c791f97f50c62509746c09de934d69dae602c65809663" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] name = "wasmtime-wasi" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69271e6b52d59a9e1a5309fefb4c38969baff8eebc03c76293e7c7dc44e0ba1" +checksum = "1022616613f6279243392b00990ac81135f0c46018eba620538392342fc93df9" dependencies = [ "anyhow", + "async-trait", + "bitflags 2.4.0", + "bytes", + "cap-fs-ext", + "cap-net-ext", + "cap-rand", + "cap-std", + "cap-time-ext", + "fs-set-times", + "futures", + "io-extras", + "io-lifetimes 2.0.2", + "libc", + "log", + "once_cell", + "rustix 0.38.20", + "system-interface", + "thiserror", + "tokio", + "tracing 0.1.37", + "url", "wasi-cap-std-sync", "wasi-common", "wasmtime", "wiggle", + "windows-sys 0.48.0", ] [[package]] +name = "wasmtime-winch" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff589e9b8f701ea4d66472115d23145fe58b62d1289c51f4a2e36c5dccf6053" +dependencies = [ + "anyhow", + "cranelift-codegen", + "gimli", + "object", + "target-lexicon", + "wasmparser", + "wasmtime-cranelift-shared", + "wasmtime-environ", + "winch-codegen", +] + +[[package]] +name = "wasmtime-wit-bindgen" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f672060c021afd9a3ab72f4e319d1f7bb1f4e973d5e24130bb0bb11eba356f5e" +dependencies = [ + "anyhow", + "heck 0.4.0", + "indexmap 2.0.2", + "wit-parser", +] + +[[package]] +name = "wasmtime-wmemcheck" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d40e574507de689ee8ad428b5ddfc6bc81b5eff3c8d493e0b8ec1ebf7e4eadf" + +[[package]] name = "wast" version = "35.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6081,9 +6527,9 @@ dependencies = [ [[package]] name = "wast" -version = "47.0.0" +version = "66.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "117ccfc4262e62a28a13f0548a147f19ffe71e8a08be802af23ae4ea0bedad73" +checksum = "93cb43b0ac6dd156f2c375735ccfd72b012a7c0a6e6d09503499b8d3cb6e6072" dependencies = [ "leb128", "memchr", @@ -6093,90 +6539,362 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.49" +version = "1.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e367582095d2903caeeea9acbb140e1db9c7677001efa4347c3687fd34fe7072" +dependencies = [ + "wast 66.0.2", +] + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes 1.0.11", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.30.1", +] + +[[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.1", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags 1.3.2", + "nix 0.26.4", + "wayland-backend 0.1.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.0", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.0", + "cursor-icon", + "wayland-backend 0.3.2", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aab4e20c60429fbba9670a6cae0fff9520046ba0aa3e6d0b1cd2653bea14898" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" dependencies = [ - "wast 47.0.0", + "nix 0.26.4", + "wayland-client 0.31.1", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.0", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.4.0", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.0", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml 0.28.2", + "quote", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml 0.30.0", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "lazy_static", + "log", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", ] [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] +name = "web-time" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19353897b48e2c4d849a2d73cb0aeb16dc2be4e00c565abfc11eb65a806e47de" +dependencies = [ + "js-sys", + "once_cell", + "wasm-bindgen", +] + +[[package]] name = "weezl" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] -name = "which" -version = "4.3.0" +name = "wg" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "f390449c16e0679435fc97a6b49d24e67f09dd05fea1de54db1b60902896d273" dependencies = [ - "either", + "atomic-waker", + "parking_lot 0.12.1", + "triomphe", +] + +[[package]] +name = "wgpu" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24" +dependencies = [ + "arrayvec", + "cfg-if", + "flume", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle 0.5.2", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "837e02ddcdc6d4a9b56ba4598f7fd4202a7699ab03f6ef4dcdebfad2c966aea6" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.0", + "codespan-reporting", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle 0.5.2", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e30b9a8155c83868e82a8c5d3ce899de6c3961d2ef595de8fc168a1677fc2d8" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.0", + "block", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", "once_cell", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle 0.5.2", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", ] [[package]] -name = "wiggle" +name = "wgpu-types" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" +dependencies = [ + "bitflags 2.4.0", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3cd76a4d5e4052fb377eb7629a8971ce3e4668ba397e8e4c03d86ada0c7f4f1" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] +name = "wiggle" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "334709283558d9ebb0206cd1842c4fa619ff467d68c71eff982376d9c999d636" dependencies = [ "anyhow", "async-trait", - "bitflags", + "bitflags 2.4.0", "thiserror", - "tracing", + "tracing 0.1.37", "wasmtime", "wiggle-macro", ] [[package]] name = "wiggle-generate" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec1cc12e9d5af2d9488588be80b98f045a8872500bbb78c93b85a205e557f91" +checksum = "4143cb3a8c65efceba6fc3bf49769b7b5d60090f1226e708365044c1136584ee" dependencies = [ "anyhow", "heck 0.4.0", "proc-macro2", "quote", "shellexpand", - "syn", + "syn 2.0.38", "witx", ] [[package]] name = "wiggle-macro" -version = "1.0.2" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d2f18f246c48657537c507de7c1941970b09ef2d4c6351debc739a1827ebd3" +checksum = "56981968f26952a527f78cf3aeb5ac436db82d3be1682a217a1835754fa50f51" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wiggle-generate", ] [[package]] name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" @@ -6186,12 +6904,6 @@ dependencies = [ ] [[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6203,7 +6915,16 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +dependencies = [ + "winapi", ] [[package]] @@ -6213,16 +6934,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "winch-codegen" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2942fc0530ed88259df32f09f52a4222583e1ec7c3fa3f4a911905bbf70c3b0" +dependencies = [ + "anyhow", + "cranelift-codegen", + "gimli", + "regalloc2", + "smallvec", + "target-lexicon", + "wasmparser", + "wasmtime-environ", +] + +[[package]] +name = "windows" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] name = "windows" -version = "0.37.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows_aarch64_msvc 0.37.0", - "windows_i686_gnu 0.37.0", - "windows_i686_msvc 0.37.0", - "windows_x86_64_gnu 0.37.0", - "windows_x86_64_msvc 0.37.0", + "windows-core", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", ] [[package]] @@ -6239,6 +6991,66 @@ dependencies = [ ] [[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.5", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "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]] +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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] name = "windows_aarch64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6246,9 +7058,15 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.37.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -6258,9 +7076,15 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.37.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -6270,9 +7094,15 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.37.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -6282,9 +7112,27 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.37.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -6294,46 +7142,108 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.37.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] -name = "winreg" -version = "0.10.1" +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winit" +version = "0.29.4" +source = "git+https://github.com/lapce/winit?rev=e8c26d691a20a96c4e9d841d31fc315dabd5a5a1#e8c26d691a20a96c4e9d841d31fc315dabd5a5a1" +dependencies = [ + "ahash 0.8.3", + "android-activity", + "atomic-waker", + "bitflags 2.4.0", + "bytemuck", + "calloop", + "cfg_aliases", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2 0.9.0", + "ndk", + "ndk-sys", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle 0.5.2", + "raw-window-handle 0.6.0", + "redox_syscall 0.3.5", + "rustix 0.38.20", + "sctk-adwaita", + "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "5504cc7644f4b593cbc05c4a55bf9bd4e94b867c3c0bd440934174d50482427d" dependencies = [ - "winapi 0.3.9", + "memchr", ] [[package]] -name = "winres" -version = "0.1.12" +name = "winreg" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "toml", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] name = "winx" -version = "0.33.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b01e010390eb263a4518c8cebf86cb67469d1511c00b749a47b64c39e8054d" +checksum = "357bb8e2932df531f83b052264b050b81ba0df90ee5a59b2d1d3949f344f81e5" dependencies = [ - "bitflags", - "io-lifetimes", - "windows-sys", + "bitflags 2.4.0", + "windows-sys 0.48.0", ] [[package]] -name = "wio" -version = "0.2.2" +name = "wit-parser" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +checksum = "f6ace9943d89bbf3dbbc71b966da0e7302057b311f36a4ac3d65ddfef17b52cf" dependencies = [ - "winapi 0.3.9", + "anyhow", + "id-arena", + "indexmap 2.0.2", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", ] [[package]] @@ -6343,19 +7253,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b" dependencies = [ "anyhow", - "log 0.4.17", + "log", "thiserror", "wast 35.0.2", ] [[package]] -name = "ws2_32-sys" -version = "0.2.1" +name = "x11-clipboard" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +checksum = "b41aca1115b1f195f21c541c5efb423470848d48143127d0f07f8b90c27440df" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "x11rb", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading 0.7.3", + "nix 0.26.4", + "once_cell", + "winapi", + "winapi-wsapoll", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" +dependencies = [ + "nix 0.26.4", ] [[package]] @@ -6368,31 +7314,44 @@ dependencies = [ ] [[package]] -name = "xi-unicode" -version = "0.3.0" +name = "xcursor" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" +dependencies = [ + "nom", +] [[package]] -name = "xml-rs" -version = "0.7.0" +name = "xkbcommon-dl" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2" +checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" dependencies = [ - "bitflags", + "bitflags 2.4.0", + "dlib", + "log", + "once_cell", + "xkeysym", ] [[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + +[[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "xmlparser" -version = "0.13.3" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "114ba2b24d2167ef6d67d7d04c8cc86522b87f490025f39f0303b7db5bf5e3d8" +checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" [[package]] name = "xmlwriter" @@ -6401,30 +7360,78 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "xxhash-rust" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] +checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" [[package]] name = "yazi" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03b3e19c937b5b9bd8e52b1c88f30cce5c0d33d676cf174866175bb794ff658" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" [[package]] -name = "yeslogic-fontconfig-sys" -version = "3.2.0" +name = "zbus" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2bbd69036d397ebbff671b1b8e4d918610c181c5a16073b96f984a38d08c386" +checksum = "41ce2de393c874ba871292e881bf3c13a0d5eb38170ebab2e50b4c410eaa222b" dependencies = [ - "const-cstr", - "dlib", + "async-broadcast", + "async-channel", + "async-executor", + "async-io", + "async-lock", + "async-recursion", + "async-task", + "async-trait", + "byteorder", + "derivative", + "dirs", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.24.2", "once_cell", - "pkg-config", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing 0.1.37", + "uds_windows", + "winapi", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13d08f5dc6cf725b693cb6ceacd43cd430ec0664a879188f29e7d7dcd98f96d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.101", +] + +[[package]] +name = "zbus_names" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41a408fd8a352695690f53906dc7fd036be924ec51ea5e05666ff42685ed0af5" +dependencies = [ + "serde", + "static_assertions", + "zvariant", ] [[package]] @@ -6435,9 +7442,9 @@ checksum = "c110ba09c9b3a43edd4803d570df0da2414fed6e822e22b976a4e3ef50860701" [[package]] name = "zip" -version = "0.6.3" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "byteorder", "crc32fast", @@ -6473,3 +7480,39 @@ dependencies = [ "cc", "libc", ] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b794fb7f59af4105697b0449ba31731ee5dbb3e773a17dbdf3d36206ea1b1644" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd58d4b6c8e26d3dd2149c8c40c6613ef6451b9885ff1296d1ac86c388351a54" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.101", +] diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index 6b955bdb180b1..3efa3acaa939d 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -6,98 +6,95 @@ , cmake , pkg-config , perl +, python3 , fontconfig , glib , gtk3 , openssl +, libGL , libobjc +, libxkbcommon , Security , CoreServices , ApplicationServices , Carbon , AppKit , wrapGAppsHook +, wayland , gobject-introspection +, xorg }: - +let + rpathLibs = lib.optionals stdenv.isLinux [ + libGL + libxkbcommon + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libXxf86vm + xorg.libxcb + wayland + ]; +in rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "0.2.8"; + version = "0.3.1"; src = fetchFromGitHub { owner = "lapce"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cfQQ+PaInUB6B61sZ9iS/zt3L6Vc/vPOJTtEwR0BLco="; + sha256 = "sha256-R7z3E6Moyc6yMFGzfggiYgglLs/A+iOx8ZJKMPhbAz0="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "druid-0.7.0" = "sha256-PJH+Y5PScM6KnPeb5lBLKpqe9nbG3bXIJK2y4V1IM9o="; - "font-kit-0.11.0" = "sha256-MsUbFhWd3GdqchzwrRPuzpz3mNYde00HwA9EIRBc2SQ="; - "fount-0.1.0" = "sha256-ptPnisGuzip3tQUuwtPU+ETiIzxMvIgAvlIGyGw/4wI="; + "alacritty_config-0.1.2-dev" = "sha256-6FSi5RU7YOzNIB2kd/O1OKswn54ak6qrLvN/FbJD3g0="; + "cosmic-text-0.7.0" = "sha256-ATBeQeSlRCuBZIV4Fdam3p+eW5YH8uJadJearZuONrQ="; + "floem-0.1.0" = "sha256-UVmqF2vkX71o4JBrhIIhd2SkLNBaqibwl51FKLJUo4c="; "human-sort-0.2.2" = "sha256-tebgIJGXOY7pwWRukboKAzXY47l4Cn//0xMKQTaGu8w="; - "parley-0.1.0" = "sha256-9xT+bhcZSBxQp10cbxQlqiG4D4NxaTkAxfgaHX0cqX4="; - "piet-wgpu-0.1.0" = "sha256-SOycknxo6wMDy/2D3cxsngI0MZO78B5QkhdCkvCkFyU="; - "psp-types-0.1.0" = "sha256-7scU/eR6S2hVS6UKoFmZP901DMZEEho35nVEuQJERR0="; + "peniko-0.1.0" = "sha256-FZu56HLN5rwSWOwIC00FvKShSv4QPCR44l9MURgC+iI="; + "psp-types-0.1.0" = "sha256-/oFt/AXxCqBp21hTSYrokWsbFYTIDCrHMUBuA2Nj5UU="; "structdesc-0.1.0" = "sha256-4j6mJ1H5hxJXr7Sz0UsZxweyAm9sYuxjq8yg3ZlpksI="; - "swash-0.1.4" = "sha256-oPjQF/nKnoHyed+4SZcc4zlc/I+0J6/DuigbHglQPMA="; + "tracing-0.2.0" = "sha256-Tc44Mg2Ue4HyB1z+9UBqpjdecJa60ekGXs+npqv22uA="; "tree-sitter-bash-0.19.0" = "sha256-gTsA874qpCI/N5tmBI5eT8KDaM25gXM4VbcCbUU2EeI="; - "tree-sitter-c-sharp-0.20.0" = "sha256-4R6+15ZbtC/LtSHpk7DqcMiFYjht+062Av31spK07rc="; - "tree-sitter-clojure-0.1.0" = "sha256-qeTQgJ3DAlqhRlATB34aPNzAgKOyIaxfKiZP9Z3Mx2k="; - "tree-sitter-css-0.19.0" = "sha256-xXDTi9HL46qHoeyf2ZQJRCIYCY4vWBmTBkt55EewgmQ="; - "tree-sitter-d-0.3.2" = "sha256-oWbggHlWVxc5QsHDvOVcWvjykLPmFuuoxkqgen7He4A="; - "tree-sitter-dart-0.0.1" = "sha256-JW9Hdzm/Sb56od+K/Wf0IlcfpgiEVY5e3ovOtMEeqpQ="; - "tree-sitter-dockerfile-0.1.0" = "sha256-sSkAR6CZ9MnjeggaQ3F0aG4m0oKKSa866EXQDgm6k3Q="; - "tree-sitter-elixir-0.19.0" = "sha256-5nopPahI6VDxu9z2lKaXWMPZ+1EWYRM2S9k3cfRrxGM="; - "tree-sitter-erlang-0.0.1" = "sha256-6eiRiTTPdMBRsxVHIHYuw0sIfRDvP4pZIEyckoo304Q="; - "tree-sitter-glimmer-0.0.1" = "sha256-qQQ94F/CMx0cMhqqpY0xkMi10Yx+XG1YiT+if6laJvM="; - "tree-sitter-glsl-0.1.3" = "sha256-k37NkUjYPzZnE21EYPBX4CAFdmZzJzy5BOJU+VjpcA4="; - "tree-sitter-haskell-0.14.0" = "sha256-94zxdt3JjC3iki639taHYmRwQIzOlOM6H9C3sKnRj/o="; - "tree-sitter-haxe-0.2.2" = "sha256-yUzJDaAu2kTompR6W0UDRgld/mveaDoj9bdE9Bz9GwI="; - "tree-sitter-hcl-0.0.1" = "sha256-GWUOATMa6ANnhH5k+P9GcCNQQnhqpyfblUG90rQN0iw="; - "tree-sitter-java-0.20.0" = "sha256-tGBi6gJJIPpp6oOwmAQdqBD6eaJRBRcYbWtm1BHsgBA="; "tree-sitter-json-0.20.0" = "sha256-pXa6WFJ4wliXHBiuHuqtAFWz+OscTOxbna5iymS547w="; - "tree-sitter-julia-0.19.0" = "sha256-z+E3sYS9fMBWlSmy/3wiQRzhrYhhNK5xH6MK1FroMi8="; - "tree-sitter-kotlin-0.2.11" = "sha256-aRMqhmZKbKoggtBOgtFIq0xTP+PgeD3Qz6DPJsAFPRQ="; - "tree-sitter-latex-0.2.0" = "sha256-0n42ZrlQdo1IbrURVJkcKV2JeQ7jUI2eSW7dkC1aXH4="; - "tree-sitter-lua-0.0.12" = "sha256-0gViT7PjduQsTTi4e0VVUFiXJjmrjFBnWdGY0B4iS/0="; "tree-sitter-md-0.1.2" = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; - "tree-sitter-nix-0.0.1" = "sha256-BYAVY0BISrJSwIMvLa/4QrkWdzMs36ZEz96w/CxWVVo="; - "tree-sitter-ocaml-0.20.0" = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM="; - "tree-sitter-php-0.19.1" = "sha256-Lg4gEi6bCYosakr2McmgOwGHsmsVSjD+oyG6XNTd0j0="; - "tree-sitter-protobuf-0.0.1" = "sha256-h86NQAIRU+mUroa0LqokMtEVd7U5BXo/DADc2UUZQzI="; - "tree-sitter-ql-0.19.0" = "sha256-2QOtNguYAIhIhGuVqyx/33gFu3OqcxAPBZOk85Q226M="; - "tree-sitter-ruby-0.19.0" = "sha256-BjdgNxXoaZ+nYrszd8trL0Cu4hnQNZkSWejTThkAn0o="; - "tree-sitter-scheme-0.2.0" = "sha256-K3+zmykjq2DpCnk17Ko9LOyGQTBZb1/dgVXIVynCYd4="; - "tree-sitter-scss-0.0.1" = "sha256-zGnPZbdRfFvDmbfNMWxTpKCp0/Yl1WqlLjw05jtVofM="; - "tree-sitter-sql-0.0.2" = "sha256-PZSJ/8N/HNskFnkfqN11ZBOESXHGGGCPG/yET832hlE="; - "tree-sitter-svelte-0.10.2" = "sha256-ACRpn1/2d6/ambLvr0xr7kT9gTzFFHXtvbQRTxEoet0="; - "tree-sitter-wgsl-0.0.1" = "sha256-x42qHPwzv3uXVahHE9xYy3RkrYFctJGNEJmu6w1/2Qo="; - "tree-sitter-xml-0.0.1" = "sha256-3DwRrAkk0OU2bOxBYSPpUQm2dxg1AYosbV6HXfYax/Y="; "tree-sitter-yaml-0.0.1" = "sha256-bQ/APnFpes4hQLv37lpoADyjXDBY7J4Zg+rLyUtbra4="; - "tree-sitter-zig-0.0.1" = "sha256-E0q3nWsAMXBVM5LkOfrfBJyV9jQPJjiCSnD2ikXShFc="; - "wasi-experimental-http-wasmtime-0.10.0" = "sha256-vV2cwA+vxWcrozXparleZUqKxp2DDkaRJFOAT0m2uWo="; + "vger-0.2.7" = "sha256-evri/64mA0TQY7mFn+9bCl3c247V2QEYlwyMPpOcv5Y="; + "wasi-experimental-http-wasmtime-0.10.0" = "sha256-FuF3Ms1bT9bBasbLK+yQ2xggObm/lFDRyOvH21AZnQI="; + "winit-0.29.4" = "sha256-Y71QsRiHo0ldUAoAhid3yRDtHyIdd3HJ3AA6YJG04as="; }; }; + env = { + # Get openssl-sys to use pkg-config + OPENSSL_NO_VENDOR = 1; + + # This variable is read by build script, so that Lapce editor knows its version + RELEASE_TAG_NAME = "v${version}"; + + } // lib.optionalAttrs stdenv.cc.isClang { + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + postPatch = '' - substituteInPlace lapce-ui/Cargo.toml --replace ", \"lapce-data/updater\"" "" + substituteInPlace lapce-app/Cargo.toml --replace ", \"updater\"" "" ''; nativeBuildInputs = [ cmake pkg-config perl + python3 wrapGAppsHook # FIX: No GSettings schemas are installed on the system gobject-introspection ]; - # Get openssl-sys to use pkg-config - OPENSSL_NO_VENDOR = 1; - - buildInputs = [ + buildInputs = rpathLibs ++ [ glib gtk3 openssl @@ -112,11 +109,21 @@ rustPlatform.buildRustPackage rec { AppKit ]; - postInstall = '' + postInstall = if stdenv.isLinux then '' install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop + + $STRIP -S $out/bin/lapce + + patchelf --add-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/lapce + '' else '' + mkdir $out/Applications + cp -r extra/macos/Lapce.app $out/Applications + ln -s $out/bin $out/Applications/Lapce.app/Contents/MacOS ''; + dontPatchELF = true; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 94d554abd5912..49ac3fa018d27 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.7.5"; + version = "6.7.6"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-Y0g4mpEf4+hApHFHaqB8esVep2OyqWLo7YGLf/7eCYg="; + sha256 = "sha256-AWno/LccMMXZ7Aw4FYQCJSoB3dRRONoT/iex0jPFng0="; }; dontBuild = true; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index e183799d853ad..d2aa619fe5a3d 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -43,7 +43,6 @@ let luabitop mpack ] ++ lib.optionals doCheck [ - nvim-client luv coxpcall busted diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index ccd7d754e44c7..6840ac60919c1 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -25,16 +25,16 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; rev = version; - sha256 = "sha256-JCSFG7W4I1uXsVM7J059tHYq/DB16AZfGjsG0UvfctE="; + sha256 = "sha256-m3ZdzdmkW69j1sZ9h7M1m5fDNnJ7BM7nwYPx7QhsIso="; }; - cargoSha256 = "sha256-rH4jjbd0C1MKu3RE0bLvLo4iqyUXr0DvCudvFs1F+AA="; + cargoSha256 = "sha256-AAHMx4xxbC/JdmAPE2bub7qdF5sFNWjqXI1nuCUxsZA="; SKIA_SOURCE_DIR = let @@ -42,8 +42,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "m113-0.61.8"; - sha256 = "sha256-xGfkc1JLBGQW4WcblFyluZ2paEuisCVPNDU4Rfkv3BE="; + rev = "m119-0.67.3"; + sha256 = "sha256-U75NuJnQa5+SNlOrsBmdlvflGdjo3el63EeIsbnE7ms="; }; # The externals for skia are taken from skia/DEPS externals = linkFarm "skia-externals" (lib.mapAttrsToList @@ -116,5 +116,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { changelog = "https://github.com/neovide/neovide/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d multisn8 ]; + platforms = platforms.all; + badPlatforms = platforms.darwin; }; } diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/applications/editors/neovim/neovide/skia-externals.json index 82730f5458a3c..e57814e2a2d87 100644 --- a/pkgs/applications/editors/neovim/neovide/skia-externals.json +++ b/pkgs/applications/editors/neovim/neovide/skia-externals.json @@ -6,8 +6,8 @@ }, "libjpeg-turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "22f1a22c99e9dde8cd3c72ead333f425c5a7aa77", - "sha256": "sha256-5MaYvyrhADFGKBxcS3kbKcn9tj0FNXAN/rAXXYW6ljs=" + "rev": "ed683925e4897a84b3bffc5c1414c85b97a129a3", + "sha256": "sha256-DYJP3phe4OzCtRN2pMc07ITTWR8MuIlOWWg9PBsQAVw=" }, "icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", @@ -21,13 +21,13 @@ }, "harfbuzz": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "09a266236147497bd8149240062c31c16fbc81e3", - "sha256": "sha256-NLydUJI15zRBFFDc7VRDXjgc0AwS3l6GMt2usMWOSG4=" + "rev": "4cfc6d8e173e800df086d7be078da2e8c5cfca19", + "sha256": "sha256-rrstyAz7Eb8ZgFJZKUASY8nU4YFZAptd5VS9B2cs2Yg=" }, "wuffs": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", - "rev": "a0041ac0310b3156b963e2f2bea09245f25ec073", - "sha256": "sha256-obRMrrKY3rPdFwQNa5IplpuKqiodHvRC8jbIOjp7R2w=" + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "sha256": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=" }, "libpng": { "url": "https://skia.googlesource.com/third_party/libpng.git", diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/applications/editors/neovim/neovim-qt.nix index a8483f0db348e..75067585653bf 100644 --- a/pkgs/applications/editors/neovim/neovim-qt.nix +++ b/pkgs/applications/editors/neovim/neovim-qt.nix @@ -37,6 +37,7 @@ mkDerivation rec { description = "Neovim client library and GUI, in Qt5"; homepage = "https://github.com/equalsraf/neovim-qt"; license = licenses.isc; + mainProgram = "nvim-qt"; maintainers = with maintainers; [ peterhoeg ]; inherit (neovim.meta) platforms; }; diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index a7e0e4c770577..cbe811c33b683 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -74,9 +74,12 @@ let }) ('' source ${nmt}/bash-lib/assertions.sh vimrc="${writeText "init.vim" neovim-drv.initRc}" + luarc="${writeText "init.lua" neovim-drv.luaRcContent}" + luarcGeneric="$out/patched.lua" vimrcGeneric="$out/patched.vim" mkdir $out ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric" + ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$luarc" > "$luarcGeneric" '' + buildCommand); in @@ -89,6 +92,9 @@ rec { nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix; singlelinesconfig = runTest (wrapNeovim2 "-single-lines" nvimConfSingleLines) '' + assertFileContains \ + "$luarcGeneric" \ + "vim.cmd.source \"/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-init.vim" assertFileContent \ "$vimrcGeneric" \ "${./init-single-lines.vim}" diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index d61a2fe5e5a81..29146a769843a 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -32,16 +32,28 @@ let # set to false if you want to control where to save the generated config # (e.g., in ~/.config/init.vim or project/.nvimrc) , wrapRc ? true - , neovimRcContent ? "" + # vimL code that should be sourced as part of the generated init.lua file + , neovimRcContent ? null + # lua code to put into the generated init.lua file + , luaRcContent ? "" # entry to load in packpath , packpathDirs , ... }: + assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; + + stdenv.mkDerivation (finalAttrs: let + rcContent = '' + ${luaRcContent} + '' + lib.optionalString (!isNull neovimRcContent) '' + vim.cmd.source "${writeText "init.vim" neovimRcContent}" + ''; + wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; - commonWrapperArgs = + generatedWrapperArgs = # vim accepts a limited number of commands so we join them all [ "--add-flags" ''--cmd "lua ${providerLuaRc}"'' @@ -66,15 +78,12 @@ let finalMakeWrapperArgs = [ "${neovim-unwrapped}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] - ++ lib.optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] - ++ commonWrapperArgs + ++ lib.optionals finalAttrs.wrapRc [ "--add-flags" "-u ${writeText "init.lua" rcContent}" ] + ++ finalAttrs.generatedWrapperArgs ; perlEnv = perl.withPackages (p: [ p.NeovimExt p.Appcpanminus ]); - in - assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; - - stdenv.mkDerivation (finalAttrs: { + in { name = "neovim-${lib.getVersion neovim-unwrapped}${extraName}"; __structuredAttrs = true; @@ -83,8 +92,8 @@ let inherit wrapRc providerLuaRc packpathDirs; inherit python3Env rubyEnv; withRuby = rubyEnv != null; - inherit wrapperArgs; - + inherit wrapperArgs generatedWrapperArgs; + luaRcContent = rcContent; # Remove the symlinks created by symlinkJoin which we need to perform # extra actions upon postBuild = lib.optionalString stdenv.isLinux '' @@ -112,7 +121,7 @@ let '' + lib.optionalString (manifestRc != null) (let manifestWrapperArgs = - [ "${neovim-unwrapped}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ] ++ commonWrapperArgs; + [ "${neovim-unwrapped}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ] ++ finalAttrs.generatedWrapperArgs; in '' echo "Generating remote plugin manifest" export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 72ff8ae5d6057..3b20e5c815d5a 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.13"; + version = "0.26.14"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0wlpv0rk4ys4rbcpf8lqpkm0yr5dxkaz60qk2lvm27w1s489ir8l"; + sha256 = "sha256-2bvspG3lecKlcN/+YPRmFKQCu/jhckafeSo272iE+9k="; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 1b3e96a45113a..266e6cf3b3aa9 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.65.6"; + version = "2.65.8"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-HJ1smXLycxcII6FjvXCvxipm7G+2SVweOMPwJ3aJxMg="; + hash = "sha256-1g2D79yUHeFz9jpmz1N5qDmpe1DA8xV82t78ZUVOhBE="; }; vendorHash = null; diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index bd69a865be0ec..e2e7638550f9f 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 = "62"; + version = "65"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-CynYWzFnsr5FoNwBlK4k8c+EE22NP0OrpEFrSiEtxUU="; + hash = "sha256-5Hpj/RkD11bNcr9/gQG0Y7BNMsh1BGZQiN4IMbI4osc="; }; format = "other"; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix deleted file mode 100644 index 6888cebec2d0b..0000000000000 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkg-config, makeWrapper, gnome2, gtk2 }: -stdenv.mkDerivation { - version = "unstable-2014-08-20"; - pname = "supertux-editor"; - - src = fetchFromGitHub { - owner = "SuperTux"; - repo = "supertux-editor"; - rev = "0c666e8ccc7daf9e9720fe79abd63f8fa979c5e5"; - sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx"; - }; - - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ mono gtk-sharp-2_0 gnome2.libglade gtk2 ]; - - installPhase = '' - mkdir -p $out/bin $out/lib/supertux-editor - cp *.{dll,dll.config,exe} $out/lib/supertux-editor - makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor \ - --add-flags "$out/lib/supertux-editor/supertux-editor.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ - --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') - - makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor-debug \ - --add-flags "--debug $out/lib/supertux-editor/supertux-editor.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ - --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') - ''; - - # Always needed on Mono, otherwise nothing runs - dontStrip = true; - - meta = with lib; { - description = "Level editor for SuperTux"; - homepage = "https://github.com/SuperTux/supertux-editor"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 5d6c3687a0be1..cf19ea5a8cca1 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation { pkg-config wrapQtAppsHook xdg-utils - ] ++ lib.optionals (!stdenv.isDarwin) [ cmake ]; @@ -63,8 +62,19 @@ stdenv.mkDerivation { qtmacextras ]; + cmakeFlags = lib.optionals stdenv.isDarwin [ + (lib.cmakeFeature "TEXMACS_GUI" "Qt") + (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "./TeXmacs.app/Contents/Resources") + ]; + env.NIX_LDFLAGS = "-lz"; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + mv TeXmacs.app $out/Applications/ + makeWrapper $out/Applications/TeXmacs.app/Contents/MacOS/TeXmacs $out/bin/texmacs + ''; + qtWrapperArgs = [ "--suffix" "PATH" ":" (lib.makeBinPath [ xmodmap @@ -77,7 +87,7 @@ stdenv.mkDerivation { ]) ]; - postFixup = '' + postFixup = lib.optionalString (!stdenv.isDarwin) '' wrapQtApp $out/bin/texmacs ''; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 0451c067c16cf..4c514f3396dc0 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.6.3"; + version = "4.7.2"; src = fetchFromGitHub { owner = "texstudio-org"; repo = "texstudio"; rev = finalAttrs.version; - hash = "sha256-L8N7T7FFfjT801HxbQiiC0ewW7vde4S0RVmNT2CWiWY="; + hash = "sha256-Q4/aoLIxFssti3Dto1JwRRAQ+D3DHlH9JgDrHBVKg4M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 83d61b37bfc67..b392cc0aa565e 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.2048"; + version = "9.0.2116"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-zR2iPiD4/gf5BnxYoe3cx2ebGWE1P2bY4Cg15gveFgg="; + hash = "sha256-ZKcNg/RrjvEsxpIcTjzQYi1xig3zLeTV+PXaBb4gUuM="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index 6915198f09614..174d7416a736e 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -93,6 +93,8 @@ mapAliases (with prev; { neoinclude = neoinclude-vim; neomru = neomru-vim; neosnippet = neosnippet-vim; + nvim-ts-rainbow = throw "nvim-ts-rainbow has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30 + nvim-ts-rainbow2 = throw "nvim-ts-rainbow2 has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30 The_NERD_Commenter = nerdcommenter; The_NERD_tree = nerdtree; open-browser = open-browser-vim; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index fc08f823148ba..1c8f6ad4ee4d0 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2023-11-14"; + version = "2023-12-15"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "b50fdaf7836c18e0de2f1def0c1f39d56ef8bced"; - sha256 = "1xmnzr1hccgdaadjc8i207bz44272ng5aaaypdacaag2pciapq3s"; + rev = "48c59167beeb6ee0caa501c46cecc97b9be8571d"; + sha256 = "013jns9jz630zc79npadrh5a75spgmglq76d4m56wx89qkbchfxm"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-12-02"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "c4f2d408542f07592a34c3a68171d36c612741b9"; - sha256 = "0j1qng5sp5h9b478ajjx9fcx88k8sfj26s19lxi76g7a00yzm0b6"; + rev = "771c9517bf36f431361cbaac1ddc8499c7e5c5d3"; + sha256 = "1cbdfhyly5wr1h7i04l1pr85a34w853vnm6iayigky9y7rvv4ihk"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2023-10-06"; + version = "2023-12-21"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "cc9a3ae3efdcc7d038aab0620ea28882533c236c"; - sha256 = "1q5mcqyim7gjc6hr792a7q8xbng7yvr6ynwicz6wn14q05s6lwpq"; + rev = "302d41ed8de2633b4e6b2bf49f061e19f868a4e1"; + sha256 = "089r4szjc90pnasm5vrg2kh4akgjp5524d6mli8cqds9nspdhb0m"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -498,36 +498,36 @@ final: prev: actions-preview-nvim = buildVimPlugin { pname = "actions-preview.nvim"; - version = "2023-11-20"; + version = "2023-12-05"; src = fetchFromGitHub { owner = "aznhe21"; repo = "actions-preview.nvim"; - rev = "b2c89c2937d527c22deb194d574d2a93246cd869"; - sha256 = "0ib70ks303vy8yjjm8xrn6nyins6766w3fv223a3lbw5qrd1arc0"; + rev = "8f79029a36ab6807478f157538a91ccd4af5858f"; + sha256 = "0hrrrkfr2qv6fgmvc4nv3spp0d8lqq9skc3gbgnzg8m7pfai2mfx"; }; meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; }; adwaita-nvim = buildVimPlugin { pname = "adwaita.nvim"; - version = "2023-06-22"; + version = "2023-12-15"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "adwaita.nvim"; - rev = "bb421a3439a515862ecb57970f10722cdcc4d089"; - sha256 = "1fw7kbgzqif40vks3h3n5jgachnimcbv7gpv85z7mw07hc0g7h33"; + rev = "981bce791959d79cd1316e59e23906e3c05efb44"; + sha256 = "1lrxns172mad4936x1njagn5j30nyxwrw82dmhzf4yfkz8pra251"; }; meta.homepage = "https://github.com/Mofiqul/adwaita.nvim/"; }; aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-11-24"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "88764566f96bf900a64b3dcd6d178cfb69b1c8ce"; - sha256 = "1mr3p7lwhh9dgjmk6lrnibixj1lwssn9kbkva3hwlmh0zw4n5mdd"; + rev = "e2e3bc2df4490690ea005395eecdc8eeb30c4def"; + sha256 = "1fxjdhsyxsflfzsvsp1rds5cdqw4bipqr5i04sccn2qzip5dfsm7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -583,12 +583,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2023-11-19"; + version = "2023-12-10"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "1ccd99e113324602b4eca41fd24ba6f991e8f05d"; - sha256 = "09cmg0w967f9x04g686w9s31yz9jx1qg7rb0jibdjv7khyl1cvqs"; + rev = "9a23ec1f60ec85f6afb70870a1978141b321fb3c"; + sha256 = "07gl4a5y4g2ywlj5a9zhwnfb2d4ma8b3hdkf3brls7smwknvlkn0"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -787,12 +787,12 @@ final: prev: asynctasks-vim = buildVimPlugin { pname = "asynctasks.vim"; - version = "2023-09-21"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "7b77b195a4297d3e4c9dde01c20aa6be17e3fcf3"; - sha256 = "0bvchmk1pdfjmyidf393chmc17y0v6zq92p3ac7dpwyiz01c360l"; + rev = "851da4282ffb2ce3d5e4c2f70d2d09da7839d48f"; + sha256 = "12xm92dz599w0imd7flpvay4d73hfvj0hrnz90aq6xvfrry8mzpq"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -871,12 +871,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2023-08-29"; + version = "2023-12-05"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "3eb26b949e1b90798e84926848551046e2eb0721"; - sha256 = "06lyapgg0fdz6p6bas9cjrsi6qx2b8rjn8ivc3yxhp2940bqqrlf"; + rev = "51196ca66b38fc1660fdf50031cb0b31a199b7c9"; + sha256 = "1k0vgnn7anx6s6avbx17gyy749960ap1nds23qnsmp0pfz9x5scw"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -955,12 +955,12 @@ final: prev: barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2023-09-14"; + version = "2023-12-18"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "283bceab39f549c5e5228212661750704fcfcd9e"; - sha256 = "0l6gbszklfab0kgs90x2lld6mqvkyx4i439249qikx1dilyalx91"; + rev = "4ba9ac54f0c5d82131905160afff94172e3325e6"; + sha256 = "0cfhcwb8w4h63dj3r1zi7ikqjs78isgvy2lgqw35k8camw4jlqkr"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -1135,12 +1135,12 @@ final: prev: bufdelete-nvim = buildVimPlugin { pname = "bufdelete.nvim"; - version = "2023-06-29"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4"; - sha256 = "10whb4jd96h41qkmwvdsnn6cvj005x9l0dz7b0yrypa0yi2xirjj"; + rev = "0b9c0f182b09c51170bb9f252f15de7695e4d507"; + sha256 = "07442wjgf5nx99qaqzi1gyhxlcp8pxlc15vg9jckf9wl3s3m2hiv"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -1171,12 +1171,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2023-11-29"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "1a3397556d194bb1f2cc530b07124ccc512c5501"; - sha256 = "0da8kyg229n658dcybnxr2ckcaz8lmwphdmr83ajvqh3dj92rmx6"; + rev = "e48ce1805697e4bb97bc171c081e849a65859244"; + sha256 = "06af2lvydw7c2yswin968vdh2f06s5xmwx6pip45c4am8q68a2y6"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1243,24 +1243,24 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2023-11-11"; + version = "2023-12-16"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "f77b477d9f0b9a28612212b3fc43145f2a5591cc"; - sha256 = "0xp4h8yhlm9kfr4m5446g95mvqr4imhrzwhg726hrdkfs04b1hzq"; + rev = "ec6e23fd2c0bf4ffcf71c1271acdcee6e2c6f49c"; + sha256 = "1y3ns91ysx684ryxv1zjaw8ghrm2ry4rswhm87im4rwghnwvnrwx"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; chadtree = buildVimPlugin { pname = "chadtree"; - version = "2023-10-07"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "f205444ad5666c5fe47f5d6248351a9fe7af574b"; - sha256 = "1rc68r9nx4nycnbl4pqr7lh31wv5xzrx34swsk191qkxl0fvzx2b"; + rev = "8f65d9b84e590efc440e47e204104a6a3d40c0cd"; + sha256 = "0s7k5wa4gc99wfvvndb1ckgqymilq9qx3gkjh9jb5k2anl4z70cm"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1519,12 +1519,12 @@ final: prev: cmp-dap = buildVimPlugin { pname = "cmp-dap"; - version = "2022-11-13"; + version = "2023-12-10"; src = fetchFromGitHub { owner = "rcarriga"; repo = "cmp-dap"; - rev = "d16f14a210cd28988b97ca8339d504533b7e09a4"; - sha256 = "1rqn5jbvca0yfsa7nhm6j0xss0hidvvqa5yks60vv3apkilhds63"; + rev = "ea92773e84c0ad3288c3bc5e452ac91559669087"; + sha256 = "0xa3qh1bnr5s5fzxjziq30rjp9sdsb5vpf209qrna9972zhlnby2"; }; meta.homepage = "https://github.com/rcarriga/cmp-dap/"; }; @@ -1639,12 +1639,12 @@ final: prev: cmp-look = buildVimPlugin { pname = "cmp-look"; - version = "2022-06-26"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "octaltree"; repo = "cmp-look"; - rev = "b39c50bcdf6199dddda56adc466c2bd9c951a960"; - sha256 = "10526mczd6l68zikd78qs2hlxbhaz7x3v9z1y83palx3aby0ihvq"; + rev = "971e65a6be0e75c3438fe7b176d4fc020cb89d7b"; + sha256 = "05ixyq1wf06wjzxsm9qn7anvqm988q7cb7gvdwc6xwvdyaf5vgrn"; }; meta.homepage = "https://github.com/octaltree/cmp-look/"; }; @@ -1675,12 +1675,12 @@ final: prev: cmp-nvim-lsp = buildVimPlugin { pname = "cmp-nvim-lsp"; - version = "2023-06-23"; + version = "2023-12-10"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "44b16d11215dce86f253ce0c30949813c0a90765"; - sha256 = "1ny64ls3z9pcflsg3sd7xnd795mcfbqhyan3bk4ymxgv5jh2qkcr"; + rev = "5af77f54de1b16c34b23cba810150689a3a90312"; + sha256 = "03q0v6wgi1lphcfjjdsc26zhnmj3ab9xxsiyp1adl3s1ybv22jzz"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -1855,12 +1855,12 @@ final: prev: cmp-treesitter = buildVimPlugin { pname = "cmp-treesitter"; - version = "2023-10-06"; + version = "2023-12-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "b8bc760dfcc624edd5454f0982b63786a822eed9"; - sha256 = "01fz8hj7qadg2h8q0d3xv7x9q0qsykbbvv6bdnw71j74rid4xw7k"; + rev = "13e4ef8f4dd5639fca2eb9150e68f47639a9b37d"; + sha256 = "10375kviak1wxklha79g8gbk8pph8finsb3wga6p7mw1m657vc9b"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; @@ -1975,12 +1975,12 @@ final: prev: coc-lua = buildVimPlugin { pname = "coc-lua"; - version = "2023-02-22"; + version = "2023-12-08"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "995a70cde230fd5ae0b670ff75b8b00b45312126"; - sha256 = "1yfrbrwl1iq3h25xlgcnxwnz31d0bxcpcxjw76fjfhxwa2l7iy5g"; + rev = "ceedce75a82b3a6d33f33df7c079b5f7bd7ed952"; + sha256 = "1jzwywq5pys40iykfsdfczd34yjy7m4an812w2y44brzydglmxmm"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -2045,14 +2045,26 @@ final: prev: meta.homepage = "https://github.com/manicmaniac/coconut.vim/"; }; + codeium-nvim = buildVimPlugin { + pname = "codeium.nvim"; + version = "2023-12-17"; + src = fetchFromGitHub { + owner = "Exafunction"; + repo = "codeium.nvim"; + rev = "445dca5efbbfa4c5fad7e5ffda46b1cb21028d2c"; + sha256 = "0xird4nhh1126qhd4x5xaix332ia35dfd8kndxf4124b1gg6ss19"; + }; + meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; + }; + codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2023-11-27"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "2a0c0b7fecee38a52fe750563ff70cff45f768b0"; - sha256 = "0a8j82lf4vhjwlghggm724m5lnd74ajjv6p77vdpyhg2b0xd756n"; + rev = "949f625902855a436dd08ed220a147976aab4e58"; + sha256 = "1g4akdzmr481jb6c63jfximgdi9pyq7gja9mcyfwbl05isk5zzxi"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2287,12 +2299,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-12-01"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "e8ac7f1a9a3973ecce6942b2f26d16e65902aa70"; - sha256 = "127shx9vzq9rkjk44xpr24w76b51fywwrni6nvrdq29swqdpk9yw"; + rev = "41852493b5abd7b5a0fd61ff007994c777a08ec9"; + sha256 = "1vi45d5qcw7h0h7fxwl941063p2rd8csh82ca4fw43i3cajwh2zl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2300,12 +2312,12 @@ final: prev: conjure = buildVimPlugin { pname = "conjure"; - version = "2023-08-27"; + version = "2023-12-07"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "58c46d1f4999679659a5918284b574c266a7ac83"; - sha256 = "1pjjp2g9h98ghraky57iss5ls37k47iw8ii3q558nym4mknhx06d"; + rev = "4880144f13a7693cded529b302de491bfbaedbd6"; + sha256 = "13rixqrw1hdpfxzz8qkwcvf1a2plcrv5mz6aaaa8vdksa3vica8i"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2348,36 +2360,36 @@ final: prev: copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2023-12-01"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "38a41d0d78f8823cc144c99784528b9a68bdd608"; - sha256 = "05v2cxa10s98pk7w0g3g8p440bz6n2r2k4ygxz9vkbcjf39kgjaj"; + rev = "858bbfa6fa81c88fb1f64107d7981f1658619e0a"; + sha256 = "15l1y1zqzsrvz437vyzaxwjcxrqagfwc3v9bplhv77kvaj0sbb67"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2023-11-23"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "2c31989063b145830d5f0bea8ab529d2aef2427b"; - sha256 = "0icjjxgmi1v8jsidvh3lhnn04nkqpgfgr83mg2qa9603f1a34fqw"; + rev = "5b19fb001d7f31c4c7c5556d7a97b243bd29f45f"; + sha256 = "0m6s01in8bkfviq7p0xq9x5ldgj826ixbnz4586bgg9pzkr0lz4q"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPlugin { pname = "coq.artifacts"; - version = "2023-09-07"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "469c27eb84a91fe2721b6c0af57703ffa1e785e9"; - sha256 = "0v902lf7l0590nif3g45c5ad0s1wr9v7bz0g733aji9hh3fcxl8i"; + rev = "e7202d1a1b5cfa91446d5b7a035f915934e4d713"; + sha256 = "11dkb6h7lshnhn8l04hjykwv7lsaxl58jqrxi2hv1byr6406j6xl"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; @@ -2408,12 +2420,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2023-10-07"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "d4a58fa7ab20c928f88e416b3fcf6ada965bf314"; - sha256 = "0jk3gz1rbq1zwzly66gcxhkxqn2im45lr5q5vjg2idpvbn6y8zpf"; + rev = "72df7bf4528ae8130e29b496aaecb4bfd8ab7c6b"; + sha256 = "123bl1866w0438kczgdbk85482y8wakj32lpy7z3j1qa45xi2lg2"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2444,12 +2456,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2023-11-29"; + version = "2023-12-20"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "a8b8f60c33b16c8ef22f8064166daa29a47fca4a"; - sha256 = "0r86h7lpcicbh4453vigryi238kmsx149ffs6n53n898wlkla6pi"; + rev = "81c6325b7f8875857ec09e5d24f3b6d7986f29e2"; + sha256 = "1dlri6p8v8bs3mkssvxixpg8knavr2axwydy5qhywzzjzz236yd5"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2576,12 +2588,12 @@ final: prev: debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2023-11-28"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "8a6d66bd6162e9c49804e9286a7d4ceba60355d5"; - sha256 = "0ykxdjsffx1fz82ayl5mb0j1syqk3b6cjw7a6qcfcgh2w4dmijvm"; + rev = "7eec2b7ddf98b462de02f8ad521327a7736aaf28"; + sha256 = "13mi4a4gdnbxbdf0z5l7bz6p0danlwl7xf0m9knzlkagqwdd10cn"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -2672,24 +2684,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2023-11-26"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "6c7ebef6f71b948a152c09bd844fba00f8fee3d6"; - sha256 = "1qsfxw6yq6rpgmfmisqj4n30p5llb469zfg7iy4ri1r046pjv8yb"; + rev = "886bfa038d75d415677f8a7a62e8940c74554707"; + sha256 = "1rj760wlsk93i7w1ynk4wsq6qrz2lr0yqw2bfzwrbp17kdp4h02k"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2023-08-21"; + version = "2023-12-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "51d2367d3373457327e583819c00381387b8c51e"; - sha256 = "1pns3j5f4ls2hdcwydka3r9qp43rr4p392pkcxz807jyrzjzrbdi"; + rev = "0fcdadc7636ef82636e972c4c651fb77e3cf1954"; + sha256 = "14nhfxaxd771rh784acs1s21cvlx8877wsb9qmyk821sljb4hcwn"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3034,12 +3046,12 @@ final: prev: dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; - version = "2023-10-26"; + version = "2023-12-15"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "7200e64c589f899d29f8963aad7543856d1c2545"; - sha256 = "095jnw5wmphr7fp4n63sdjh787hlvhpz4baqcvcy7n90aiq3r3sq"; + rev = "cadf9a1d873d67a92a76b258715cad91f0c1dbb9"; + sha256 = "1a12kkfszgb94zi4wi3ksrpcyd2vkl2wcm314z738p7p5vjrvkwl"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -3058,12 +3070,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2023-12-03"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "2b7c2d53363cb3d93376904dac3ea6d52dd900c5"; - sha256 = "0kwsdil034a1cqy0ccyhy7hpzn4pnxcb0b4g0p3y09wk935mwdrk"; + rev = "ee3a356254ab494c0e280b809969a7a3a7e38fb7"; + sha256 = "1d1pxwvz4n5hlr5qa6ql3hx06350xyqycxzk5fs15ggnq6c8drd8"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3143,12 +3155,12 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2023-11-29"; + version = "2023-12-21"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "ff84e0402907f9557778bd6cb32f9d5b1552ffaf"; - sha256 = "01f3al8hncjj043q6490gzxz38sjv7if49148116yfdbipj1lf60"; + rev = "ddc7c542aaad21da594edba233c15ae3fad01ea0"; + sha256 = "0qhs1dzn0wy6jrqkyn4bz5cmd9xzxp3prka72446b3sj4521bbs7"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -3336,12 +3348,12 @@ final: prev: fern-vim = buildVimPlugin { pname = "fern.vim"; - version = "2023-08-26"; + version = "2023-12-04"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "e295f0df5735a042f63b05218118646809ba9d27"; - sha256 = "1qldf9k9h5jjn5gyadpln6mc8qsw9f18qqmfrdbl88rr99kx9c32"; + rev = "56f8e4c79da01eecb0f7f3803c051cd23c803b35"; + sha256 = "13bfp6qgvxx4xbngnpssxv8z1w2f63jalhj69haazaca8yhr4599"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -3360,12 +3372,12 @@ final: prev: fidget-nvim = buildVimPlugin { pname = "fidget.nvim"; - version = "2023-11-28"; + version = "2023-12-21"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "785efc604f6ffe3c3fdd2ea86262804d48863ee1"; - sha256 = "01c0pcfvr2acpc70ljmr2dcmg6mvfyvsr9inxgwxv347pdi8phll"; + rev = "1ba4ed7e4ee114df803ccda7ffedaf7ad2c26239"; + sha256 = "1qy4wdxpggyihrniahxchzp3jnl45h82imlfzcnhs7h39849hgic"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3382,6 +3394,18 @@ final: prev: meta.homepage = "https://github.com/bogado/file-line/"; }; + fileline-nvim = buildVimPlugin { + pname = "fileline.nvim"; + version = "2023-08-30"; + src = fetchFromGitHub { + owner = "lewis6991"; + repo = "fileline.nvim"; + rev = "64fc4b24f559467ff7fdbf4b3d9eaf4724f331e4"; + sha256 = "0q68mz6kd3zbf2blwz84q39wn2kq9svl8516p5vyn9jpn70rnmgv"; + }; + meta.homepage = "https://github.com/lewis6991/fileline.nvim/"; + }; + firenvim = buildVimPlugin { pname = "firenvim"; version = "2023-08-18"; @@ -3421,24 +3445,24 @@ final: prev: flatten-nvim = buildVimPlugin { pname = "flatten.nvim"; - version = "2023-11-28"; + version = "2023-12-09"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "51dd9a0a83138aee3bd9fc402ce79f9db50af7fa"; - sha256 = "17mg19d7n1bcmkv6q4fx60v1pmq7ll2qxqycybfrd82458wcbc6z"; + rev = "c78c5200899d2afd171d9d2bf09e139e3710eeb6"; + sha256 = "19r1nndapqg7d3a5h4sfbknh4331vg5lncdz39zknb9bv8721mby"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; flit-nvim = buildVimPlugin { pname = "flit.nvim"; - version = "2023-10-22"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "f4e9af572a62c808c8de214da672f2a115a98c35"; - sha256 = "10sd56dlgg9zisxp49lh9di3ag6w69rlzy067sp2rcbr84gz8spy"; + rev = "fc57989ab4414c83c8bd153d813cd542e80808db"; + sha256 = "1954cwp2vlg5h0k2lbm89gfq4g3wrkvaxvhq480c5sra81g8x2gp"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3493,12 +3517,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2023-10-04"; + version = "2023-12-19"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "7350750d46fbeb4d2bb4878157b658d435935299"; - sha256 = "031l98vwm5099q9xizldk8djn3yrckpp3nlbbd16b2iw7v7rgwm7"; + rev = "7cb01c52ac9ece55118be71e0f7457783d5522a4"; + sha256 = "1cfgnz7zmap7i163w3yb44lwiws4k2dvajvl4a92pyykj91mnq2p"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3649,12 +3673,12 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-12-01"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "a1a2d0f42eaec400cc6918a8e898fc1f9c4dbc5f"; - sha256 = "14pdspy8932fh5w247vqs0fyywb6mwg1af9sk5irgxfsv7c0xlg2"; + rev = "6991c1f86eb9fa449a186ab047e88063d3a14484"; + sha256 = "1nr9wqx5xh323c09dqvz3yha4vfiws57sj9bvxdc3ckyk3x1mmyk"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3817,12 +3841,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-11-29"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2"; - sha256 = "086jmhzgpavwjvp7ssd8ga0wxgnz480zzjiv84h4ivva2nv3lnvi"; + rev = "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9"; + sha256 = "0n1pdil0di93sfmlxnw80xvwxgz36m3hllhzg16bmlcjwgagwclp"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3865,24 +3889,24 @@ final: prev: glow-nvim = buildVimPlugin { pname = "glow.nvim"; - version = "2023-08-28"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5"; - sha256 = "0fa2g6r3kf103jh5vx493bkkbxssizm8i4lri1pl24mnha871ndx"; + rev = "238070a686c1da3bccccf1079700eb4b5e19aea4"; + sha256 = "1j63y3hb03n5m4jig8576sxnb3jixxlr66m9xcs8vgfm5h0mrhqs"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-12-01"; + version = "2023-12-21"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "7b7c20029a817ef51f6b498388488e9850fe45ac"; - sha256 = "0qbgmg9kvhxz4akmxd56lwr2zjxrayccgiynkcfnqakvya271jji"; + rev = "e352271f8268e6559e92801a33258f73697b2be9"; + sha256 = "1lymi374ss3wbayv4dpxp7pblrsgx6nna0qy196afz37bcbgidka"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4009,16 +4033,40 @@ final: prev: gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2023-11-29"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "0940564208a490c173216c3b7d2188b0a5ad3491"; - sha256 = "15vlr7wh9grfn2s4vhmi5a2pap00366irvyglc1g0wvj3w7n520z"; + rev = "f0e029a3989691eb38cfa9272b75251c62a00821"; + sha256 = "0103xd3h3flgw8ra1qwsqkxmnvf66zvvqfdygr2r1xfs0q1zy24p"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; + guard-collection = buildVimPlugin { + pname = "guard-collection"; + version = "2023-11-13"; + src = fetchFromGitHub { + owner = "nvimdev"; + repo = "guard-collection"; + rev = "13e00d19f418d68977c6bc803f0d23d09dce580d"; + sha256 = "1zhq99hf722m5m842ghadj9akmb0y1sqkpmbhhk15jynnvv16ab6"; + }; + meta.homepage = "https://github.com/nvimdev/guard-collection/"; + }; + + guard-nvim = buildVimPlugin { + pname = "guard.nvim"; + version = "2023-11-27"; + src = fetchFromGitHub { + owner = "nvimdev"; + repo = "guard.nvim"; + rev = "394317c25a6b0f0e064aebcfcf902e46fb0a04ba"; + sha256 = "sha256-Yva/mSn5RdvHLK5cVGHUCEHRauYrwy7wR2uDzyBM9sw="; + }; + meta.homepage = "https://github.com/nvimdev/guard.nvim/"; + }; + guess-indent-nvim = buildVimPlugin { pname = "guess-indent.nvim"; version = "2023-04-03"; @@ -4045,59 +4093,59 @@ final: prev: gv-vim = buildVimPlugin { pname = "gv.vim"; - version = "2023-10-28"; + version = "2023-12-10"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "c67a016566e03d8936c7386e626f88956e87761e"; - sha256 = "0r2qgv22y3d2gb9l0wvgz3y9f3svn2ppydwr4rs42nyh56z702fd"; + rev = "b6bb6664e2c95aa584059f195eb3a9f3cb133994"; + sha256 = "06wr0krg23xy9j36chypxcnd88cvds85jk0ajbl3pvg53x0qigad"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2023-11-19"; + version = "2023-12-15"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "ddf9c8d1028ce318e8c6a0acece6bad31b6f49c5"; - sha256 = "0qyr7az1nmcmsv4dchaa52fkziqvx2k3yx0ifwlhj4v6ipi9vbm4"; + rev = "9a79ec3d7a6112dd997ac4b2130c97fcdb9ee98f"; + sha256 = "11dbsbs5vxw3vvvyiapa4dlv21vg7sssji0fxi19sfl6xj5ihbmi"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; hare-vim = buildVimPlugin { pname = "hare.vim"; - version = "2023-10-24"; + version = "2023-12-09"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "92c63717c27584b53e6c9c9594e47a1840a8e107"; - sha256 = "0z4gm1p06li8fx9h0zjwbimhz8jfl9akh98a5l4q0qv211bpn0ya"; + rev = "9cbc973fa49a771ca21e85cc34da5c2ff3fb365d"; + sha256 = "17fv3chxmd4dh4sl1i20sq7qkbv36j0c0f0ivlxgr8q9m5j8mnz7"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; harpoon = buildVimPlugin { pname = "harpoon"; - version = "2023-12-02"; + version = "2023-12-01"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "581da797f9d66485f841525af596255270c2bcf5"; - sha256 = "1fnxjwsrsm0qdf9a20nfxy58dy1dv8l70w4ipqn4lh0hd36ziacr"; + rev = "867e212ac153e793f95b316d1731f3ca1894625e"; + sha256 = "0ilawmxl31fm0iw7ql0nnxwnh1k8yyykdc8030w3fjz9yr9vm39n"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-12-03"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "b345179204a3c4fd38b8d7699989d51d7d6febfe"; - sha256 = "1yzcap9drf9nl2ygmwl8b8napfx8fkx4wmrrhazb1p25921srs0m"; + rev = "d24c1fa062a1245d0c1f714e099081b7989b1bc0"; + sha256 = "1mv2ld4f00h36mifzbjgbps2rgq3s0vaja1fzdnp6ixc46dc88hf"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4271,12 +4319,12 @@ final: prev: hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2023-12-01"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "05d9325e14ee1af9114b5c4586d1b200e75ccac9"; - sha256 = "1ffhx1i9p7a13k6qmpry507ypk45sff6api5nnnc709bd7360743"; + rev = "b723d0d3f392013617d11cb54d12ef77f0155d67"; + sha256 = "1vibpd56f4alnppfdpq6sb1q2xim2xlp2bz8fjhkgcww5pghaqg3"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4367,12 +4415,12 @@ final: prev: image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-11-25"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "41f0f2643a09631bc0d8e2837b514667d423e440"; - sha256 = "02fzgynv02fgj8ayyjdhkh290pzii0nllxpzmraa5z5w0rrs3s9y"; + rev = "4d1dd5ddc63b37e5af303af0a3a8ed752d43a95c"; + sha256 = "1zgv5041bqxmvgfd9dbdmwcqhl6m4fc5j2s907rk6dfzv75a6qrb"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4391,12 +4439,12 @@ final: prev: inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2023-12-03"; + version = "2023-12-17"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "a48c7cec5c4f00d7438dce5fadb55f4d715ef9f2"; - sha256 = "08qwjv7dwgs03dvv7dxgm4hqrcsvvbn1r3f4xkj1g3ppr9pzqhva"; + rev = "e346532860e1896b1085815e854ed14e2f066a2c"; + sha256 = "1nvriggnpzqqjwvxvivqr66g1rir586mfxcs5dy7mnkfnvjpd15l"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; @@ -4439,12 +4487,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2023-12-02"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "dbd90bb689ff10d21fee6792eb8928f0584b5860"; - sha256 = "1fbx8l5m09qyis4d767gmmwa9rgify6vwjvj3b1jqfzhlz1fmd24"; + rev = "0dca9284bce128e60da18693d92999968d6cb523"; + sha256 = "1pniy5ppzmcivzfcsjkqrmqqcj1z354v8g0mmgcbrypcyk2rqz5r"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4608,12 +4656,12 @@ final: prev: jellybeans-nvim = buildVimPlugin { pname = "jellybeans-nvim"; - version = "2022-03-21"; + version = "2023-12-07"; src = fetchFromGitHub { owner = "metalelf0"; repo = "jellybeans-nvim"; - rev = "f77b75443adf6461ded30de0243f49771f933d06"; - sha256 = "187xvsfg9ac04006bzcwdi03l5cnzg3rg7ak1s9n8wb66s25vrpx"; + rev = "12a8687daf82bb4f69c5cb1dcc672bd9c5e6a094"; + sha256 = "1rplnwvakz18f9r585p36xy3g2iskk53qp54a0hjyjagpqc3by5n"; }; meta.homepage = "https://github.com/metalelf0/jellybeans-nvim/"; }; @@ -4668,12 +4716,12 @@ final: prev: julia-vim = buildVimPlugin { pname = "julia-vim"; - version = "2023-07-05"; + version = "2023-12-15"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "69dd4b076b9b4f863647b424f856bbe6d5ba0cd4"; - sha256 = "1rvrm39xcm30mxxd6zbhxfqqz677d4vn55qcm0rxr08zcy431p89"; + rev = "20542b50610e075e5f4199187800ede2425f6cb8"; + sha256 = "02yy03w15s4f779qphg2smcsa6dka8vspsyixqajc4w9g7y1si7k"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -4812,24 +4860,24 @@ final: prev: lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; - version = "2023-09-26"; + version = "2023-12-15"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "de35012036d43bca03628d40d083f7c02a4cda3f"; - sha256 = "1wgcl487gijm0ydp8n79jc8pmh947vphhh67vk6p79fxaihc56bl"; + rev = "1e08e3f5ac1152339690140e61a4a32b3bdc7de5"; + sha256 = "1rs3sva578j28hy6881w2wjxixl7g7rirard0fljxz460wfnr0vx"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-11-26"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "73e9844702f7b80344e89e3fb465fc1550dd3658"; - sha256 = "0xq48hdv3hh52rs561m359ccvr7qpv867agxql9qh4yf9v3kw764"; + rev = "a5daac8ebccb93af25ace2a2041b503f18ff3dcb"; + sha256 = "1a2qgmpg2j49v5pz8j4bfa5n8q8kiyixfz3jxhh41jkw7myxcqwh"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4860,12 +4908,12 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2023-12-01"; + version = "2023-12-21"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "d55acc28ecc1f3ab3c396afd1f8b11a239285d9b"; - sha256 = "0g4savdihdh15lddh5yj8vq5py9flzl59dqc93w6yx2kvj1r9ad2"; + rev = "b20691cc8824826571e5298d1402730bb9c721d2"; + sha256 = "03l8q22j5gc2xhpfzdyiskj082kriijwf5rw3ngcyb43i6v23n23"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4908,12 +4956,12 @@ final: prev: lexima-vim = buildVimPlugin { pname = "lexima.vim"; - version = "2023-09-04"; + version = "2023-12-20"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "b1e1b1bde07c1efc97288c98c5912eaa644ee6e1"; - sha256 = "1dk32rjahn6grwq1gdxnxs6pavjzhkml7zb3pg1ky75pivs1rlgr"; + rev = "5513d686801993b40c55baa65602f79cd3cf3c77"; + sha256 = "08gmpxxfjsjqvhcicr3rwm97xddsn93afxnqipyz4vjclzmpxgwg"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -5148,12 +5196,12 @@ final: prev: lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; - version = "2023-09-13"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "e8782a5468a4849ae440a1531be559d85aebe142"; - sha256 = "04rpqhp66icj4l21wj6pk15mj2v78yhphccylgkjky8934rqpn6r"; + rev = "31fc250a412ab24555b389f61fac0330f6bb7660"; + sha256 = "18kr0avk2vcv6fp9nw2y53ssl5lbv4vh8g9sav123anlqpvd756x"; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; }; @@ -5208,12 +5256,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2023-11-28"; + version = "2023-12-10"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "98fe58a00c69f709b6b65e53aed56d86da92a4b7"; - sha256 = "1sacv394xy4i5y63r7pyv5xgkmlwjjwxvml0rsasgiwnsrmgagw7"; + rev = "b9044716e675354357ab8269ccf7bd0fcdc0991e"; + sha256 = "0fmnpk6ahj5idg7dbpv68ww0bdnl8gpja1m0s3xcyn60gykkksk6"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5255,36 +5303,36 @@ final: prev: lspcontainers-nvim = buildVimPlugin { pname = "lspcontainers.nvim"; - version = "2023-06-03"; + version = "2023-12-17"; src = fetchFromGitHub { owner = "lspcontainers"; repo = "lspcontainers.nvim"; - rev = "593b6655edc3ff7caaa89cac1ba9b27695b7fa09"; - sha256 = "0pvpphwkklcydjlzp2577n8rc3l5q3q7q5lmnp2iz79aizq0qhx9"; + rev = "ac31157d72d6267fc892a3f021d37f5d24dbc344"; + sha256 = "08r2lywir50w00g2wr7kvq194w42a663klfwkhvznvdm1bv44rwn"; }; meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/"; }; lspkind-nvim = buildVimPlugin { pname = "lspkind-nvim"; - version = "2023-05-05"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind.nvim"; - rev = "57610d5ab560c073c465d6faf0c19f200cb67e6e"; - sha256 = "18lpp3ng52ylp8s79qc84b4dhmy7ymgis7rjp88zghv1kndrksjb"; + rev = "d11d58c3fc3edbd8c0112b5850ef4ed553d98752"; + sha256 = "0gjn22b07vv223si5g50421vz42s0vn9l4vs1g0zsg8skkzlmls4"; }; meta.homepage = "https://github.com/onsails/lspkind.nvim/"; }; lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-12-01"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "e9f08958e5f8410cadaa6388844788aedec5f78a"; - sha256 = "1rhrjh36nlwrms9ikd3vfmvf1lh5m8wqx79n82g68lkaxch6g8v1"; + rev = "335805d4f591f5bb71cabb6aa4dc58ccef8e8617"; + sha256 = "0b4z2br4w8gh7yxgdnr6700pp7wm479d83bgglgbfvz7v97xjj25"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5327,12 +5375,12 @@ final: prev: luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2023-12-02"; + version = "2023-12-17"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "f03089854a8e15594a01562fa7192d0009a6fbe7"; - sha256 = "1ghr6h14004gydf5gjxny4szb0v9brydv1j8rd3x1z87m0jp7hk6"; + rev = "57c9f5c31b3d712376c704673eac8e948c82e9c1"; + sha256 = "0dqv6yxwhlxx080qgxwg1ljm5w7l45f1k2qz499jjx8rpbyxykml"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5352,12 +5400,12 @@ final: prev: lush-nvim = buildNeovimPlugin { pname = "lush.nvim"; - version = "2023-09-23"; + version = "2023-12-05"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "966aad1accd47fa11fbe2539234f81f678fef2de"; - sha256 = "0g1xib2k42py9qqccjz11qk52ri0drgdk5rb0ls7wzx4v636k15h"; + rev = "f76741886b356586f9dfe8e312fbd1ab0fd1084f"; + sha256 = "1jvfycqg5s72gmib8038kzyy8fyanl06mkz74rjy878zv8r6nf59"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -5436,12 +5484,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-12-01"; + version = "2023-12-21"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "4eb8e15e3c0757303d4c6dea64d2981fc679e990"; - sha256 = "0ng3zhxcxdkpwd4zy17yl51h7bhknd3qv8j6rkbq1js237zv027p"; + rev = "56e435e09f8729af2d41973e81a0db440f8fe9c9"; + sha256 = "1n0r3vg2wyz8i4yvybxd15x7yn53ynkngbk9qvacm8j0m73lgq0v"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5484,12 +5532,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2023-11-24"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "d61da5decc7768769314c121a3232b6eadc73f2d"; - sha256 = "1jsjshi8hwiyazpchhc5smsp2p9n7g54i7px4crc0gdnm3sxk5q0"; + rev = "60416124a07a3358f3b93915092db50fcb712b41"; + sha256 = "160ycm9dh95r240jgz6wgfqgmi2i6wxwf32jq7348jabxbl3n7si"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5556,12 +5604,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-12-01"; + version = "2023-12-17"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "6d1cbcaec421b3768088b4047e78ce22e5503b99"; - sha256 = "1924d432sym9qbp2q9h9gj5ky81vnxq1y4zzfrg5ay76clplaa95"; + rev = "ea1af8c7d5e72148cae8a04e9887322a53fe66cf"; + sha256 = "0m0x9fq56napz4kkbhh7bxm9aw0hjk2m8fd126pb1bjhsl6zr99g"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5592,12 +5640,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2023-11-28"; + version = "2023-12-14"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "f23b219b11bf2ac242db80809186241f944410cf"; - sha256 = "1yclcdmw6r7fr7zx7rzjnf6h20n7y1nlfnz932yjnc233dq9kdsy"; + rev = "d10908058836afe3ec2867cf3f603c1fd78dd8fb"; + sha256 = "0404dbdpkd8s2gkm8nv2wymj14bmvzpk3r377cnlbxydrbiqfshx"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -5626,6 +5674,18 @@ final: prev: meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; + modus-themes-nvim = buildVimPlugin { + pname = "modus-themes.nvim"; + version = "2023-12-21"; + src = fetchFromGitHub { + owner = "miikanissi"; + repo = "modus-themes.nvim"; + rev = "3b2c421ee10885e78f0f3330aa73dbb22f8664f5"; + sha256 = "0ymhk80rq6dkrjlmszcn0hwy7zwn7rn7yvyc1vz7zfmjg9dy95c4"; + }; + meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; + }; + molokai = buildVimPlugin { pname = "molokai"; version = "2015-11-11"; @@ -5640,24 +5700,24 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2023-11-30"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "93f2f168e77cbd82a881e07030cdbd45a48ed070"; - sha256 = "0rvzxd2y3lrmwc0q2vrz5fr42qy682jkrqr3iwydxbwipp6ky7s2"; + rev = "b626f8d848ed01d648357f5b3d223fddcc732dcf"; + sha256 = "0bnvz2ysvdlhxdkhxcw4360nniqg9fd5b2xaxl2sv81q1isf99af"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2023-10-30"; + version = "2023-12-08"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "70c384c43b9e19b59df3d6489b544ad4df155100"; - sha256 = "0ddsfh39f6s1z2a42qgk8w0fl02j6xvsqqjcf4zqw32mgyfhwf6i"; + rev = "6e7ce88ab4ddfcdeac65161d233a43e906940a0c"; + sha256 = "1ifvas0zfyw69a4n0hkp1m0866fh42vmmli0hnbjlls347bj3s98"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -5700,12 +5760,12 @@ final: prev: nabla-nvim = buildVimPlugin { pname = "nabla.nvim"; - version = "2023-11-17"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "jbyuki"; repo = "nabla.nvim"; - rev = "f5aff14fa3d60f4be568c444be84400812823648"; - sha256 = "0ynqz7hmbxswxlnw411ah6n1bsd6saq8l5s8lrmbfas91zm5hy0x"; + rev = "27a6ea9ed7452bb9e0b19eb0942b5bcf7d051b2f"; + sha256 = "1dnd6s6abwxihliqqyl1vrds14w502m0x7aadlxrrfh970bqikg0"; }; meta.homepage = "https://github.com/jbyuki/nabla.nvim/"; }; @@ -5952,12 +6012,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2023-11-18"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "230ff118613fa07138ba579b89d13ec2201530b9"; - sha256 = "13ma0zh6jbh8dbinczbanwf1jy20sac9qxx7v9h174gbyzpc079m"; + rev = "134c46625abdb18b1b3bb844b3cbb946d95c5557"; + sha256 = "1sizdylsmlw7w5dlx2n23dkcqbgnl1xx32gk15c5qyp1109ki4yz"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -6000,24 +6060,24 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-11-30"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "1676d2c24186fc30005317e0306d20c639b2351b"; - sha256 = "1iv3nkzn2p7dbyzdzir0iw3yzvczj6mskz01yiwv9jgq0dpl9rzc"; + rev = "269051a7093fa481128904a33a6c4e1ca8de4340"; + sha256 = "0cvpk2an23dx7ds0grjxigl9pglmdwpgjwnlc11nb5mzcdalzqpj"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPlugin { pname = "neoformat"; - version = "2023-11-22"; + version = "2023-12-15"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "afbc055587e88554b1fd11408cfab859d0cd40d3"; - sha256 = "0p7vvl7nc5caijgksshwibdq704kq3r6rq7w5ih3vnk1i7s5sw1h"; + rev = "cd45ca8309d5261e8e76557c11a22b2f1ffc710b"; + sha256 = "1jfn7s9k8zylnx4xsvlgi0akv96ysxyx8wh8y765v7cjxjq7cnhq"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -6036,12 +6096,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2023-12-01"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "d0e87541130b2cf62d7f8a54487ef99560232fb6"; - sha256 = "16mmrhn83k8jrjavxbzq5ql32q2c9jqdgfx3a6hd2iv810y664qi"; + rev = "7b4a2c7466498168ab3d2e9f43c67af8ee8f5fe9"; + sha256 = "135gw4s8i7lrwg6809blf1nzfzda29fxlg0vjhffm03w20z0h8g1"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6108,12 +6168,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2023-12-01"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "bf3daa2229c60f92f48ac6d7db3049b65fd01371"; - sha256 = "0si90zng5x0p6qcrzzib8gifbxxw3m3sqbh22jiwwdjxwr3vhy9d"; + rev = "0ccc3bba3f67f6f8740b86a50aa5e1428327a741"; + sha256 = "0zbfspd5l38dr6lg4k5r49yy0sf20mg79l3g20276ra2c9vclr3y"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6132,12 +6192,12 @@ final: prev: neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2023-11-10"; + version = "2023-12-08"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "e85740d1a54ab0f10127b08c67a291053bc3acfa"; - sha256 = "0klmrkmhc3b52v7f03dvhysywixkh2zqqllq7sbrs278gnlxm2yl"; + rev = "be4ebf855a52f71ca4338694a5696675d807eff9"; + sha256 = "1yqh9ig3w8kyzksv8sv7xsc2rk2l637q54g4wv8zqwz226cw56ws"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6180,12 +6240,12 @@ final: prev: neotest = buildVimPlugin { pname = "neotest"; - version = "2023-11-13"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "d424d262d01bccc1e0b038c9a7220a755afd2a1f"; - sha256 = "1sg8m77hik1gffrqy4038sivhr8yhg536dp6yr5gbnbrjvc35dgm"; + rev = "6aa6e4529a4a125b49c48541b97ba146ceee2441"; + sha256 = "1rljzxqklwijc9bhb02s5rzn655nv7fm0lzb532wf559wvd2q3kq"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6216,12 +6276,12 @@ final: prev: neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2023-10-25"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "f7bdb60c3d7716f75fb04582f64dae8efb7716f1"; - sha256 = "1sibrd1nqhmp75jhv15fmfxk796bw419zmj9bz4y2kn9w4rdwv1z"; + rev = "1532f6123207dcfe36263e7f3182609f68588da8"; + sha256 = "06jvpsw21gryy4vzv6ag2zradm71v7lrzvkhhhpljyvc482yvflg"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; @@ -6253,24 +6313,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-12-03"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "51729f549b048890bb9d76b502c63a0a2ba29556"; - sha256 = "0myx63bpb23wai2fc8zcjx9dsq8l1jysgp1al2wxgqmn8k3b26vl"; + rev = "3286c40342e0def09466373a3b3227e123749f2d"; + sha256 = "0xb62xx3fz1wn9i8axf3rjv47s3spv40b80l8p6im9x275kdiyn4"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-jest = buildVimPlugin { pname = "neotest-jest"; - version = "2023-11-13"; + version = "2023-12-17"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-jest"; - rev = "d8b00a91e440474da20a8e9acdb0d72051078b8b"; - sha256 = "1z400jfjy3nqxn8024kbampnbnawzxacqz7k3mv2l72brgyp62bn"; + rev = "a394106cf053eef86d65ae04c4b93a1a7bd60aef"; + sha256 = "0vgb4lvi1cvdjqwljdrzgvpm772jj9cj44s1hms58iwl35rg17wq"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; }; @@ -6313,12 +6373,12 @@ final: prev: neotest-python = buildVimPlugin { pname = "neotest-python"; - version = "2023-11-12"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-python"; - rev = "c969a5b0073f2b5c8eaf017d1652f9251d761a15"; - sha256 = "0vjbc6sj9d4l8553g10wqxqpjr8z064g143i4ig4d42vsxh24ccc"; + rev = "86ac2bbc8a4da3f203e56d9303d6ed1d7e50c1f6"; + sha256 = "00gh7lv1syjry7zfjd74p3jn63qsn0slqss1wj9hb07swcdfr600"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; }; @@ -6433,24 +6493,24 @@ final: prev: nerdcommenter = buildVimPlugin { pname = "nerdcommenter"; - version = "2023-11-02"; + version = "2023-12-18"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "da948e160d9f54c2967c7927b9c74c5a68c8dc49"; - sha256 = "0ww8l7lfwqnkskil0dfl71brnb5v03dgyf7i0nfmrcnyc2c0xrcm"; + rev = "e361a44230860d616f799a337bc58f5218ab6e9c"; + sha256 = "0cpmg8wa67kd3qhrqd4hbq2symcvkyfn4fwbs2l7mx5hvmabj36d"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPlugin { pname = "nerdtree"; - version = "2023-12-02"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "9ec27d45a863aeb82fea56cebcb8a75a4e369fc9"; - sha256 = "17j2q0vdplxz4qjkx140mgxjcj1dghzkz1ijb3vc3i2hl5qfmba1"; + rev = "fefea5d3824ce98ff3fc76c2e78c4bc85c7fb516"; + sha256 = "0j335a5rngc0dv48k0j2m58fz29s66xm02r9vx7xgdcvd3xlq0xj"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -6503,6 +6563,18 @@ final: prev: meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; + nfnl = buildVimPlugin { + pname = "nfnl"; + version = "2023-12-07"; + src = fetchFromGitHub { + owner = "Olical"; + repo = "nfnl"; + rev = "eaeef3337d7377cf16d8592ad2d345b1a192e4f2"; + sha256 = "1smdmihg26jrhcdg086h682mi9038gv8cha63xd63szz67pfd7w8"; + }; + meta.homepage = "https://github.com/Olical/nfnl/"; + }; + nginx-vim = buildVimPlugin { pname = "nginx.vim"; version = "2023-11-26"; @@ -6517,12 +6589,12 @@ final: prev: nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2023-11-22"; + version = "2023-12-21"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "eb82712f86319272f4b7b9dbb4ec6df650e6987f"; - sha256 = "1ab734sg19g9q448qkv183rcj72r2gchwpmr0snnlkbmz9x547js"; + rev = "fcf699bef2b2731c840a5746113c3dd31a9cb813"; + sha256 = "1dvl2ykg2a6dw7wjlmd610bf0d71y0zcrwni283z8mwq88aazqr4"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -6563,18 +6635,6 @@ final: prev: meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; - nlua-nvim = buildVimPlugin { - pname = "nlua.nvim"; - version = "2022-12-20"; - src = fetchFromGitHub { - owner = "tjdevries"; - repo = "nlua.nvim"; - rev = "01aa428ff00605d52d0c0ece560f6a6d7971726b"; - sha256 = "1v80qmhhqc1frpvnz42wa84qaz6xkasyrz59aisifp1vqcn01lgk"; - }; - meta.homepage = "https://github.com/tjdevries/nlua.nvim/"; - }; - nnn-vim = buildVimPlugin { pname = "nnn.vim"; version = "2023-05-23"; @@ -6589,12 +6649,12 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2023-12-01"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "968ad52ee472e950d104303c4c0bfcd3de664fe1"; - sha256 = "0lqhi74fjvsflx642g04k2zf8i8dxfycmgd7hh0nkc6012b1ma3x"; + rev = "baf3efd1a1785a96a0568e1fdd6aefa4a59e5edc"; + sha256 = "127m8cjqbkrip7s83xwq0bvv2qcvjdw01056fkjsfmhh1s6gkigb"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -6613,24 +6673,24 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2023-12-01"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "7bf88cd3b37a411fdacfdca1745408a77a420493"; - sha256 = "0ynlhj5vskv6laixs79lh334fxxkm0yx1vcgc9vyk9cr19v5109n"; + rev = "e7382de51b4cf629e56f1fa18192e716e5ba8145"; + sha256 = "1mkllpak5s68rhn9kxikbry8150c63kmsl6a845clzbzhc5qpwsy"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; nord-nvim = buildVimPlugin { pname = "nord.nvim"; - version = "2023-10-04"; + version = "2023-12-20"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "0a22a387c92bb3b46e3d245522712ae7497bec38"; - sha256 = "1bmmyf3d4ihiaa0h9q77scif22kykkidks72vmamzh7v34x3c7d8"; + rev = "80c1e5321505aeb22b7a9f23eb82f1e193c12470"; + sha256 = "0bv733mf2c7cclqcgr64ngrxzk38pwimvcl0g63c6pj1la8xpqzj"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -6673,12 +6733,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2023-12-03"; + version = "2023-12-06"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "1d044afde83e73c56de8e176615a4a6e7c8cf0e3"; - sha256 = "08s5anr34vkc8zcac3v7f6rgyankcr0k34y8hkrmc554ak4f1cqq"; + rev = "c9b4de623d19a85b353ff70d2ae9c77143abe69c"; + sha256 = "1km9qyl54kysyiq2kz8f52gyqcri545k4rb68kfm45kfcn7l7wrc"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -6709,12 +6769,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2023-11-13"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "9d37797e6f9856ef25cfa266cff43f764e828827"; - sha256 = "0a57bswr6w0nmxj1fmvn24w60ibgh1gyqx586qhz1fq5i4jfjva8"; + rev = "b9963e29b21a672325af5b51f1d32a9191abcdaa"; + sha256 = "00lp8glikynxnxx7xnkfyzpr4r0dizlrfcqw2hw5i8q23s8cm5b3"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6757,12 +6817,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2023-10-21"; + version = "2023-12-20"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "0f04d78619cce9a5af4f355968040f7d675854a1"; - sha256 = "0k2pibxx42qsdvxgbrdj7g44y5q6dnaw0g07gq025dpn27jk9ark"; + rev = "9fd41181693dd4106b3e414a822bb6569924de81"; + sha256 = "1xwvw5j81rx7q5jmv14fnphxsjk9anzglf10j8ai8217gc9h530z"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -6793,12 +6853,12 @@ final: prev: nvim-bqf = buildVimPlugin { pname = "nvim-bqf"; - version = "2023-09-19"; + version = "2023-12-06"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "8784eebf34371049b641646d00232c2603215297"; - sha256 = "1vrp72kc1f1rkfdb9xnmd792l4h1j7vrnhf99l54pi700dnbjzcg"; + rev = "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748"; + sha256 = "1kla734nj2q6bin9d1gzm4kml0bl89q2hfr0l9ly2lw3s506nynb"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -6829,48 +6889,48 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2023-11-06"; + version = "2023-12-14"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "0b751f6beef40fd47375eaf53d3057e0bfa317e4"; - sha256 = "1qp7s2iam9zzdlw5sgkk6c623z7vjgga0rcg63ja0f836l90grba"; + rev = "538e37ba87284942c1d76ed38dd497e54e65b891"; + sha256 = "1mxigpm4h8ad8hjd8zy6ajkk2c03vgcrigqarhybz6zsi52iil06"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPlugin { pname = "nvim-code-action-menu"; - version = "2022-12-20"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "e4399dbaf6eabff998d3d5f1cbcd8d9933710027"; - sha256 = "01pbr8z8fn16vsdlsxrhd83rbx41pah477xr6p01lnmsqzwg3k7f"; + rev = "8c7672a4b04d3cc4edd2c484d05b660a9cb34a1b"; + sha256 = "13rjzsw44151gk9zwl7gmmmdysb6hz1i5mcw1mprif41v0zrm3x5"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2023-10-18"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "2e71292a37535fdbcf0f9500aeb141021d90af8b"; - sha256 = "140qc5gzss0nb00gp1qr3rz22swzcvkwg7c5772ki8yvj3yc9ini"; + rev = "07069496c3a25c3d9956292d05008ca17036afe0"; + sha256 = "0w8zc1pajncq172hvw69mx5ix7id5fsp5159r050sfncb1m9b86w"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; - version = "2023-02-27"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "dde3084106a70b9a79d48f426f6d6fec6fd203f7"; - sha256 = "1nk72p1lqs5gl5lr8fp1nd6qpif90xlp38pc7znaflgyp9lm0a45"; + rev = "85855b38011114929f4058efc97af1059ab3e41d"; + sha256 = "1z88vp8a56blhm7s0p1s19i2pwa7dldaxxh86x7jj0dyc8vwbax0"; }; meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; @@ -6949,12 +7009,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2023-12-02"; + version = "2023-12-20"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "d7749eb3d9933a75d2244820308ce442f646c7ae"; - sha256 = "0plpvvzbhvs9yhjb7413zcypzdmr9437vkn3mybnd93k8rfwsly9"; + rev = "f0dca670fa059eb89dda8869a6310c804241345c"; + sha256 = "0zdsr98abzyiw7887dgvjh3i3bf95vw3lg4d384rr6zrxwh03kjh"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -6973,12 +7033,12 @@ final: prev: nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2023-11-15"; + version = "2023-12-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "e0be843877e7ae756ef1ee7a441ca0b9e1677da9"; - sha256 = "0xib2xayrnf96r07rd7xdahpza41155npkdjxmr48h52gjj15nbl"; + rev = "091e4ae00a12085f9ed4200a3cd04af7179b8a23"; + sha256 = "02ialmgk6i2svjqglj7hmrakfsk5spcxb9idb13vmzlng8s3rzsp"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; @@ -7081,24 +7141,24 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2023-10-16"; + version = "2023-12-18"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "5dfa7701c586b7ddba4152e512563c377e031b49"; - sha256 = "1yxcd6xl5zjbsz6x34fnslhpaqs1liyvwqwkk0sdsiyzb6iv7wvw"; + rev = "e9f927026657fd231f13603dd247b3a5d215acc7"; + sha256 = "02j4kqgqw48s2q9cqx1d4qvidxmd0rzvj7jqby38hvcsz3zql8qr"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; - version = "2023-11-30"; + version = "2023-12-17"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "9bd8d6b155fafc59da18291858c39f115464287c"; - sha256 = "0d3dxc0v347z6dz7zmnf845kzv6j2yca94pgakaac4x6m3lcy5xl"; + rev = "8ffc64bb6b624612cf762982b92633f283f7a715"; + sha256 = "093da3q6lalp48wph4688hjkd0lf0bnzsa8y2bms1j8js0mmr0p3"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -7188,36 +7248,36 @@ final: prev: nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2023-11-24"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "463b8190db2455d3bc764d234076b8b42e405c28"; - sha256 = "1v024pi0xanax2q3blmq7cz8cl1vnb7shpzk4agda823qxm9kc3i"; + rev = "899097c248d5e6101735905ecf7d78eb4a48941a"; + sha256 = "1npn61bc4nhf49li4pg0h5a6r9i03519v7v9kjb9hr3f1yjgzhlb"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-12-03"; + version = "2023-12-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "f20f35756e74b91c0b4340d01fee22422bdffefa"; - sha256 = "1whq19qifw8w6bkm8sl80h0krjyrpsd9zyyq0skfl3bbsn31vlsv"; + rev = "32f98300881f38f4e022391f240188fec42f74db"; + sha256 = "0xq253xxzq870wnkpciwvk8wxva0znygcdcknq8f3gg40jqlqc48"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-notify = buildVimPlugin { pname = "nvim-lsp-notify"; - version = "2023-03-19"; + version = "2023-12-07"; src = fetchFromGitHub { owner = "mrded"; repo = "nvim-lsp-notify"; - rev = "9986955e0423f2f5cdb3bd4f824bc980697646a0"; - sha256 = "06zaydcsmmdblqvrkiv827lv3z9smf90v57f62fqgbxn5rhx38r7"; + rev = "9541bdde0b84b7a33a24dbc2eccc3df33d4a0cdb"; + sha256 = "1i4mg82x7x676xf63l1lzxmzd9h8hs3c8yra4l7aq6yw2vywdpdp"; }; meta.homepage = "https://github.com/mrded/nvim-lsp-notify/"; }; @@ -7236,12 +7296,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-12-01"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "694aaec65733e2d54d393abf80e526f86726c988"; - sha256 = "16nrq7gxnk33qgpmcnjd8yq738vd7qpr2x77v7xf84qp2443nbkx"; + rev = "9099871a7c7e1c16122e00d70208a2cd02078d80"; + sha256 = "0w9f87zniyzz3hk3jqavj02d4lafp8aamfgv5j7nb5aa0c1hjd61"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7296,12 +7356,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2023-11-24"; + version = "2023-12-17"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "826b7542b8bccf9a120d1c613481fb0496f93724"; - sha256 = "03hifwc01nc3s4hlbfhfpcw7as0l6sfgsrh0flmqpxhdix52gljm"; + rev = "1e269f1f01e6b970603d51e9e044824d9d8114e7"; + sha256 = "10qhb6jnbz0nzajzfk244783avy2pinw1ddrnfml1cfaaw6n9r9c"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -7344,12 +7404,12 @@ final: prev: nvim-neoclip-lua = buildVimPlugin { pname = "nvim-neoclip.lua"; - version = "2023-05-16"; + version = "2023-12-04"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "4e406ae0f759262518731538f2585abb9d269bac"; - sha256 = "0iz5jhzgmajg30cf49n9r0mryxag0dybbfgl231z9v421hr3187p"; + rev = "798cd0592a81c185465db3a091a0ff8a21af60fd"; + sha256 = "16dyzbqpc6427sgcrbd5fb3z0bnhdydhsdsa90i346y3v8lqpnj2"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -7368,12 +7428,12 @@ final: prev: nvim-notify = buildVimPlugin { pname = "nvim-notify"; - version = "2023-09-28"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3"; - sha256 = "1a7s4y8xd1plcidnzs29rhqw7mfbj1q01bqffqjmimii9v6azmfn"; + rev = "27a6649ba6b22828ccc67c913f95a5407a2d8bec"; + sha256 = "1xsvwrl52hngs34m3lscfi3ipjfw1l8mlgpdxpwkglin0j0pz0vb"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -7428,12 +7488,12 @@ final: prev: nvim-remote-containers = buildVimPlugin { pname = "nvim-remote-containers"; - version = "2023-08-01"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "jamestthompson3"; repo = "nvim-remote-containers"; - rev = "ac76b4b193962dfc0be872feeaf10756aea459e2"; - sha256 = "0ww40yw1fdlanl5wxisqn2c7qlagcn3nkxjafg3nbzd4spi5vg91"; + rev = "73c2cbc59b69b4026682aea6bab225831fb8eaa4"; + sha256 = "0dw49mhx1svcpqx4y6lfp6gpns6r7irk4y3q615ffag0hvx11r63"; }; meta.homepage = "https://github.com/jamestthompson3/nvim-remote-containers/"; }; @@ -7464,12 +7524,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2023-12-01"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "7eb9030662fad8bfbc1df2c6cfc165aa4a8904b2"; - sha256 = "1245qk1s00svnh57ijamziam8lm3d419a5vf3wry9fdf2lm01j1g"; + rev = "6715dba4f0972beb47ad7f8915e2e89023f1c6a2"; + sha256 = "0lfwp4fzq9hqpw1zxj4jv78f9na3wxf87078yqdiry7fdllndh6z"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7512,36 +7572,36 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2023-11-15"; + version = "2023-12-20"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "a18a58015b46f02b4fe537ebfffd82e46110ff24"; - sha256 = "0ry2scnw8hzd3snjhbp71zc6mnna2bwn6icr3frsgdj1p5rfissn"; + rev = "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc"; + sha256 = "1kmw61gli562d4r4vsf2fpxa09pi6a0brcdzly02n7xcan4l7bc4"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2023-11-07"; + version = "2023-12-21"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "e0eeac5480704cc3fdd5bdadd4901ca5409d7838"; - sha256 = "09nl8id8adhk8qz8jz7ygwx5dmh96237gkp6fw2qdhvv4x7w843j"; + rev = "f54cacbbf3b66cee83da6a75f17deaa53a8fbb8f"; + sha256 = "1y5cqbbr18vy8xyxqp5pkw3ff678ima5v41kis5frzgwnjcd7vaa"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2023-11-13"; + version = "2023-12-04"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "0855a89e00a5822c3a482a82e5223fcf2e9ede13"; - sha256 = "09riinjjh96nrs357ay886j8gs6cgkhj3zwngm44pf8p04w2w81n"; + rev = "633a0ab03159569a66b65671b0ffb1a6aed6cf18"; + sha256 = "0svcw6rjrnjxh6i54a4nq8af5n3634gf30cycv3f95xywmn2h7m6"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -7584,36 +7644,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-11-28"; + version = "2023-12-19"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "05f55c1fd6470b31627655c528245794e3cd4b2c"; - sha256 = "1kjagblw41981h4lzx8mpaksb2c5jdz2icq4ccf5sxd8f6fprhbw"; + rev = "50f30bcd8c62ac4a83d133d738f268279f2c2ce2"; + sha256 = "0av2zr0bnc7m1f36iyvs54x9xl52hfj7n04y8c993brh8ibn70mv"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-12-03"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "0791b5ebb590a2d44e20640c52679df1fc42e8ab"; - sha256 = "1a6sy62hwb1kclm6czbi1m9vv2xcp7pswgsafrxff96ahkqnbrrm"; + rev = "27f68c0b6a87cbad900b3d016425450af8268026"; + sha256 = "07l6hkhvzk9kbsj0c88mirswinxzy4dva0gznrxi0a5nx6kfqzdy"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-11-21"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "bf4d15ee4e96ff5201f16a4ed14443670662eb90"; - sha256 = "0a7mmyrwi2x34fbjxwnzw9qm2imaffx4bmkn0rpa0l4sm6qs9way"; + rev = "652ec514d6ba8bc4a3c2de76c855fe668e2c7196"; + sha256 = "1y69c6hhmmzp8acx1ljhn8f7gicmxyxfqqyv02893czngvhkmqc3"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7656,12 +7716,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2023-12-01"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a"; - sha256 = "1kdfwihk8ci827aq4w6xv7vn2740qpmh6dk892cd6yi0ab4zxvxn"; + rev = "4795812635c7b90cec41637314862b0a229d2b24"; + sha256 = "14096da56shii724690wi0fca1zzvm6g1dyv4wq05rkn355lqgaf"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7680,12 +7740,12 @@ final: prev: nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; - version = "2023-06-16"; + version = "2023-12-10"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "6be1192965df35f94b8ea6d323354f7dc7a557e4"; - sha256 = "1j47gcybag2qk87qc4karwdvzhvi485x7m80n2sj27rrh1fyv972"; + rev = "8515e48a277a2f4947d91004d9aa92c29fdc5e18"; + sha256 = "0bmxkq919dlhblxc7bjsvy6206qq1szi022i8g9kjsvq13726p9v"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -7702,37 +7762,14 @@ final: prev: meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; - nvim-ts-rainbow = buildVimPlugin { - pname = "nvim-ts-rainbow"; - version = "2023-06-07"; - src = fetchFromGitHub { - owner = "mrjones2014"; - repo = "nvim-ts-rainbow"; - rev = "8312b513ce930e7669a1721befbe56f2e1853301"; - sha256 = "16s8kppsn9m831ymcz5w3kpnq40sxg98nykd0gz3hfj27hinqag5"; - }; - meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/"; - }; - - nvim-ts-rainbow2 = buildVimPlugin { - pname = "nvim-ts-rainbow2"; - version = "2023-07-12"; - src = fetchgit { - url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "b3120cd5ae9ca524af9cb602f41e12e301fa985f"; - sha256 = "0mjg0pkd8wv8cfar30lkyywdrd3g5lz36bbsfb7lrqi7kbksyzxv"; - }; - meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - }; - nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2023-12-02"; + version = "2023-12-17"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "9fa77fb7e4365a053a5303b773aaf5eaf806d1f4"; - sha256 = "07idni9j2yzv5wxc1amg8w3sbrmn07kqsdm4wza5pz6j444fjksm"; + rev = "a15944ff8e3d570f504f743d55209275ed1169c4"; + sha256 = "05afg6g2csb95xfpgspm5d8avmpfb1cy4mb65lql72hx93bw0z80"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -7751,12 +7788,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-11-27"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "5efb8bd06841f91f97c90e16de85e96d57e9c862"; - sha256 = "1vxc1b51h6ss6h7fcihl6v01v8a8df1i6hz11hq2m46dyqw2n5p9"; + rev = "43aa2ddf476012a2155f5f969ee55ab17174da7a"; + sha256 = "1qx2vk3liiwdzwqclxg5hrgk0qsb9qzdgmkxz52nqfb1180xi28n"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7775,12 +7812,12 @@ final: prev: nvim-window-picker = buildVimPlugin { pname = "nvim-window-picker"; - version = "2023-09-24"; + version = "2023-12-17"; src = fetchFromGitHub { owner = "s1n7ax"; repo = "nvim-window-picker"; - rev = "e7b6699fbd007bbe61dc444734b9bade445b2984"; - sha256 = "01l5d0bylgv1kg4wlq3n2rk656fzh0scy68l88nkbra7qqj9d5i2"; + rev = "41cfaa428577c53552200a404ae9b3a0b5719706"; + sha256 = "1bcjsx5qgvj1gi6zdi3fwc44x7afh35xbyrjik0dzl3hj6ds960g"; }; meta.homepage = "https://github.com/s1n7ax/nvim-window-picker/"; }; @@ -7859,29 +7896,41 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2023-11-24"; + version = "2023-12-16"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "1ce62d9a29b5eca2c63fb955359f5212e4d1bc7b"; - sha256 = "12yykcj8g1xrl7xlyvfb6jkqyxd17ixnfsrqym0y3lva01gs44zl"; + rev = "4a60f50bb886572a59fde095b990fa28e2b50dba"; + sha256 = "0dzh4h1zqv94f3zmrn31cs54pbwkz1ws3dppd9rsyl1fyi4hs28y"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-12-01"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "58340545c6a01e5e9f7966df448714a156db137a"; - sha256 = "0s3yd9336yqk8s8f07lf0195pn5q0ij1qphp0yaisrpxbfarl63p"; + rev = "71b1ef5edfcee7c58fe611fdd79bfafcb9fb0531"; + sha256 = "0aj95b35yn2mz9rgs67wm2irykjv85i1bd2jkfa0wmkl0i6k2gg5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; }; + ollama-nvim = buildVimPlugin { + pname = "ollama.nvim"; + version = "2023-12-22"; + src = fetchFromGitHub { + owner = "nomnivore"; + repo = "ollama.nvim"; + rev = "d99e2462be8875602d173c117d5301862669d985"; + sha256 = "1qjx6xrxrvsbn52njinlvrrqnl2j2j07g86yi031mnbx2zmbkric"; + }; + meta.homepage = "https://github.com/nomnivore/ollama.nvim/"; + }; + omnisharp-extended-lsp-nvim = buildVimPlugin { pname = "omnisharp-extended-lsp.nvim"; version = "2023-04-14"; @@ -7908,12 +7957,12 @@ final: prev: onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2023-11-23"; + version = "2023-12-06"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "e7c656ac6b6460aaab817cbd0c9d5c043eda4b43"; - sha256 = "1f25ipxzigmq24a6krhs4akgp9hmhyby150kxzy3zn8n3yn0p8c9"; + rev = "c5476a091b0f1b4e853db91c91ff941f848a1cdd"; + sha256 = "1zg75v3cgm0f2yhy2pasvdd42jw33f0w1p140cj1dnrskhwbrl2j"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -7932,12 +7981,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2023-11-15"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "c9d7e5f9a40e9a3aa578b40361577315cbbfdeea"; - sha256 = "0p285mjng1graa1lciama8qh163csi38cqxzf8kwdbd2dxxma91g"; + rev = "ac22f137ad88e6f210a2c8564b94d7d072e16268"; + sha256 = "0qybyv2zqk3x07w0prx6nar3rjil2jxhk413m0j4sx9n7byci6g9"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7956,12 +8005,12 @@ final: prev: onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2023-10-25"; + version = "2023-12-04"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "3679fb93aaf473c1dd63222ac88577a909f6b41c"; - sha256 = "0xlfhmjqsx6cf12jkidp7bxpl9rdbrv1nrcszh0f2rvgir7r843k"; + rev = "879bc64ea4678bf32d2bfda47c4e3a04af52a448"; + sha256 = "1w45z9jy9ckplz1g0smyrbcdll27sqpc059a5r53y8nfb5abllnc"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -8016,48 +8065,48 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2023-11-22"; + version = "2023-12-04"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "cbb10d4c7514680e90f791d62f1168cb87aad0ce"; - sha256 = "1l6h7yx7sq5g6wv1ggns98scdyqxs317laj543pd1ji9pfqpmnpr"; + rev = "92bfc3fb7ee845d9e58326b0b69f3ed89e84253f"; + sha256 = "0cdfspvmk3yk67vi4s65y2mky1xxiaxrz5zwi0ljvlcmfbzpyz4j"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; other-nvim = buildVimPlugin { pname = "other.nvim"; - version = "2023-08-02"; + version = "2023-12-04"; src = fetchFromGitHub { owner = "rgroli"; repo = "other.nvim"; - rev = "cba4e5feb0c0a703acc9b78bc64422ac1469c468"; - sha256 = "1n6hgz4f2h9l1qnvq9083xndb8msk4krznyfgqc27xhp6jrd4y70"; + rev = "d4d926dec6d0e037c1a5f092793b474947ed357e"; + sha256 = "1pqs0sv35p74jgb3p01dqgpvzcdsxg1fmwkrq65nz9lw8zff7q11"; }; meta.homepage = "https://github.com/rgroli/other.nvim/"; }; otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2023-12-02"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "9a3db06bf3abadafb93279648317984ca789b888"; - sha256 = "16pgvzb2xyak2zxmi0r65w979jzim4m595ag0lcsgr4wvm0vz8j2"; + rev = "e4cfb3444e65750023d9db1947d1d12463d06eb5"; + sha256 = "1g50s4yi57ygdyfamwx80dx3n04wq5g7skm3kvpib17j70kzixys"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2023-10-28"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "6f462a61ce9a5f47743cbf78454bed14a855eb03"; - sha256 = "1zxqd6mjhxw1mcr6n4jgd0jxpz6j0qpcmzlzsgih8xkjn65vdxa3"; + rev = "93cf38a3e9914a18a7cf6032c6a19f87a22db3c9"; + sha256 = "1lyj5h1jw3rmpwfklgnq0hv7ya3viqs4a4mwnwli3bg24zqzcsr2"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -8523,11 +8572,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-11-26"; + version = "2023-12-24"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "47404636a34580db1636dc0cf35027bdf77abba5"; - sha256 = "0li17i97h8iyk4pa79n1jgzi3firnjmz88vxx0aadd3x33p45d2r"; + rev = "35413f67fb918207a4acc4948ca9ccb75b6cf8d5"; + sha256 = "18c5r5pzmnfkslr5y7zc7dfmmwk1w9zar75c8sl5snzwd5gyfvpp"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8774,12 +8823,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2023-12-03"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "7c1089ad1e35198911992c09cfd24dc15a225985"; - sha256 = "1lillfkjq0jhq7d5w12brj4x8l88vj168ypihjigngm4gabwrr8f"; + rev = "ec97afa277059fc6d9b39942a316d55f8bb444cc"; + sha256 = "07wxlmjikljbcrcn4xkijkgqsyqqxxwlj0d0pxcl2g4gc42blsdv"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -8942,12 +8991,12 @@ final: prev: sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2023-11-15"; + version = "2023-12-14"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "41378567217097a3d78b624c9f11d29436381e99"; - sha256 = "0dwh7zb8l83d8l63ps6qc5am7r95bnyavz5r8qpxnzgzdic2r5nv"; + rev = "817f1f36e4c43f82e8e1cdfa4cf978dffa037255"; + sha256 = "12zlrlqmny9f6y781pnlfn7qzac41mwx8a3qdmarrgns08hfp6l5"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -9015,24 +9064,24 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2023-12-02"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "c970c7a3cc7ba635fd73d43c81b40f04c00f5058"; - sha256 = "0ri4b6q4qqy1cwyhknysnldbrg2yx4cfi2ddgvnn6snq8jhkmjbw"; + rev = "f0003bf9c3f11b8b9209264f865b8864453ca926"; + sha256 = "08wfsxz6a6lzd2brnr2z8zanfnkik494ggq6my6nn9npbalkgdr0"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; smartcolumn-nvim = buildVimPlugin { pname = "smartcolumn.nvim"; - version = "2023-09-12"; + version = "2023-12-20"; src = fetchFromGitHub { owner = "m4xshen"; repo = "smartcolumn.nvim"; - rev = "c6abf3917fcec487c7475e208ae37f5788af5b04"; - sha256 = "1imdzqq997n8jwcxf8dyh0647hx58z9imm95nky23dlmhp3lzn9v"; + rev = "8cbf75c26e9f9248704a662564f30cc2d7de7f34"; + sha256 = "1hyfl7g11fx9xbkyaljcwdih1fc4cp777j0rxii5jrr50rvriyik"; }; meta.homepage = "https://github.com/m4xshen/smartcolumn.nvim/"; }; @@ -9051,12 +9100,12 @@ final: prev: smartyank-nvim = buildVimPlugin { pname = "smartyank.nvim"; - version = "2023-02-25"; + version = "2023-12-06"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "smartyank.nvim"; - rev = "7e3905578f646503525b2f7018b8afd17861018c"; - sha256 = "19lp8cpnp3ynr6vc5si3gsfpdw78xs8krmaqlbjsx478ig316y7z"; + rev = "b048fec8c6b7d122adab6f78606057d59975ece7"; + sha256 = "1i9lyl7yy96rvjpl676pgs1irvrrqx8xsrbz9b8ri37md8h3zjym"; }; meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/"; }; @@ -9256,12 +9305,12 @@ final: prev: srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2023-12-02"; + version = "2023-12-06"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "e605292319d9c964281d840ac87d3deddfc06559"; - sha256 = "0b5zj2ilvhkv01n480gd6zylnhc3yhq9p7gcj0f12fn9yfihqdnf"; + rev = "d6037f87842753a85e4cd855a2ca4206ac04db7e"; + sha256 = "0kjcqv2pkk7dplxzvxhly3argza7bj4kiaabngn1pkdpq2h9acy8"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -9304,12 +9353,12 @@ final: prev: stan-vim = buildVimPlugin { pname = "stan-vim"; - version = "2021-05-28"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "eigenfoo"; repo = "stan-vim"; - rev = "2adaa984e531e1876f053cacb07d8d181d70fbd1"; - sha256 = "1a826cfmwyn4kfyrj6164425gf2wbjs85cdkhzkqsrj0i924hjqz"; + rev = "d14f7f5f96e802c48bd2b6e087cf7956054d9f38"; + sha256 = "0dvszn4d9xia3qxr3f8l43m1iqfjwl12s4k6igzj2mq4kdq132f0"; }; meta.homepage = "https://github.com/eigenfoo/stan-vim/"; }; @@ -9338,14 +9387,26 @@ final: prev: meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; + startup-nvim = buildVimPlugin { + pname = "startup.nvim"; + version = "2023-12-20"; + src = fetchFromGitHub { + owner = "startup-nvim"; + repo = "startup.nvim"; + rev = "c6ba324f9eba0c23b675b53af431346aab893268"; + sha256 = "0vp4vfrlb39z4s4617v1xkzjkx6l5sxfravfj2wkkwzpjrqfs2bl"; + }; + meta.homepage = "https://github.com/startup-nvim/startup.nvim/"; + }; + statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2023-10-09"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "98d02fc90ebd7c4674ec935074d1d09443d49318"; - sha256 = "0ml58i3xfn0nnqci2wh4nqi4y8ydfxbk7px4abkjlym24apbga6y"; + rev = "3b629754420919575a9e5758027d6e1831dbf2aa"; + sha256 = "1qbvcrqih5w2dxf0gd9rnw1vmx0mzsi52i38i0zp44kflgp432h3"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; @@ -9497,12 +9558,12 @@ final: prev: tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2023-09-21"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "9e537762cbb7647357eab22c61c7c5dda00138dd"; - sha256 = "0wznkhpd3wax8jqw6wa2802x649jv8ph89plz1qwc08ia47lwcfb"; + rev = "f283ca1e8c1827b657d87865e97bfe2199432c90"; + sha256 = "1mns6mxwp9s4bzr5p1c9ck89azj4b3ilcmgr23ba8d8nmw2s71k2"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -9606,12 +9667,12 @@ final: prev: tagbar = buildVimPlugin { pname = "tagbar"; - version = "2023-09-25"; + version = "2023-12-21"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "5d6990e4fc5b3e3b88a3af90146f2561c4f6d828"; - sha256 = "08i5gx57hsj4840m1b85064077l3gbdiyxq04g6s1m1zpj0xq7zj"; + rev = "fcd31ec145bbc628b90371be381717a1498b7c12"; + sha256 = "04hv2fm8f2s4bczn3mdgm6wl690lnchxmv1k2iyjwsa79gkhcn5h"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -9666,12 +9727,12 @@ final: prev: telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2023-10-12"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "renerocksai"; repo = "telekasten.nvim"; - rev = "3fd50c62c1ed2f973ce8639c1218445e4e91a962"; - sha256 = "0r7fcl8w93amzi4i30mp2amqnv3xahi62djzalfj11w6p3fbrg4l"; + rev = "8c2b3889eb31009ae510a43384d1957b37654176"; + sha256 = "1isbz68lbdm50x9mid0l1jid8q11msfsaayw8ravac0z5ybdb8k3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; @@ -9727,12 +9788,12 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2023-12-03"; + version = "2023-12-07"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "98101b22402cd6d1c7e9a7e0c4718bfc98cb1625"; - sha256 = "13bnzdsmahk8phcxzm8d343mzmbxahrr34fkn8ylxy1shxbw6mw6"; + rev = "8e0543365fe5781c9babea7db89ef06bcff3716d"; + sha256 = "1rpgn2050sjxw4555m32a9bmapx8i0xkmy4p200712nnh6xg9z11"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -9800,12 +9861,12 @@ final: prev: telescope-live-grep-args-nvim = buildVimPlugin { pname = "telescope-live-grep-args.nvim"; - version = "2023-08-28"; + version = "2023-12-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-live-grep-args.nvim"; - rev = "851c0997d55601f2afd7290db0f90dc364e29f58"; - sha256 = "0c3hrbrxkcf1qz8djlkmf10fzn34i637sy3ijkdc0ywx1cqr6r1g"; + rev = "731a046da7dd3adff9de871a42f9b7fb85f60f47"; + sha256 = "0sczw6b6vk01cdncyfq6svasrfrisbxd3valsxy0qrv768h2sqwl"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-live-grep-args.nvim/"; }; @@ -9824,12 +9885,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2023-11-14"; + version = "2023-12-04"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "d946dba3dbf71005434aeae5a4aa5589b09649bc"; - sha256 = "1sha737v9ixzf2d336ykvh5kszb5bi2vb4i5ms4ffayf10lhk30g"; + rev = "f9657fd3f8e26c8035eacd63d95dc487ae6439b5"; + sha256 = "11i2y3vvhdxspl6xy2922n0l6wm0gmkv89vma4jqw7la80chhn29"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -9860,12 +9921,12 @@ final: prev: telescope-sg = buildVimPlugin { pname = "telescope-sg"; - version = "2023-08-09"; + version = "2023-12-16"; src = fetchFromGitHub { owner = "Marskey"; repo = "telescope-sg"; - rev = "2e770cda77cb893035a5db5e67ea3ff45e6fc458"; - sha256 = "1pgc3va2j7wp49aq0kxnsqlybl0xa668y9xwqfznpxdpr09vlvln"; + rev = "68289496f5612a756953756f8d1e8cc0ecee9e5d"; + sha256 = "07fnrqrf59krvql35zayggl42icgjv23k5sqwyv5vz1wmsp4j1pg"; }; meta.homepage = "https://github.com/Marskey/telescope-sg/"; }; @@ -9884,12 +9945,12 @@ final: prev: telescope-ui-select-nvim = buildVimPlugin { pname = "telescope-ui-select.nvim"; - version = "2023-11-24"; + version = "2023-12-04"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-ui-select.nvim"; - rev = "c261d903a78c2cda47a5e44488621f10f9dd7fcf"; - sha256 = "13clvq5zhhf6msawjsf42bja0avhngzzq0c0v5jfv2qzpdgbl5k2"; + rev = "6e51d7da30bd139a6950adf2a47fda6df9fa06d2"; + sha256 = "1cgi4kmq99ssx97nnriff5674cjfvc3qsw62nx3iz0xqc6d4s631"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/"; }; @@ -9969,12 +10030,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-12-03"; + version = "2023-12-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "3f5f165447d797576206e3b9bd555ea8db85b6f2"; - sha256 = "0y9b69cah627dd3298gyizim8qfgq3wp9ajlz1pah0m43xcylkfm"; + rev = "f336f8cfab38a82f9f00df380d28f0c2a572f862"; + sha256 = "14v1v45p5jpvn9lgbjcfgx8p4b60w0bqk3vv7sdb5nbikkjhy10z"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10077,12 +10138,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2023-12-02"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "ebe3650101a3505044559f71ec4ea4c789292164"; - sha256 = "01lqj5x0976lpik80i7riy5r8q498ki1nkkmc716xgnbl7021b0g"; + rev = "590d89b424e5355aa5a15845db2a520725fe043b"; + sha256 = "0xcz949diqx21ncrxv2mkljrkkd209r386cda3ivjhw04zgr0q2b"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -10210,12 +10271,12 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2023-11-27"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "6b334b9d1266b0f58ab1b6965c1e5b7eb5c34523"; - sha256 = "1fcgvgr2aaprmkw5jxd79c75i1azj8al4cmnswxkiqj0024q4bpb"; + rev = "91be5f327e42aa016da13b277540de8dba0b14e3"; + sha256 = "08pvns6275c1vjgnppcvz8jl0irqgwwf9135ck07fxxl1x2h3yw5"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -10354,12 +10415,12 @@ final: prev: typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2023-11-29"; + version = "2023-12-19"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "7911a0aa27e472bff986f1d3ce38ebad3b635b28"; - sha256 = "1sfsi7fxilws81svc8c0y2a1r6ky99xw9pfpnn5hfhvh9q16ar8i"; + rev = "829b5dc4f6704b249624e5157ad094dcb20cdc6b"; + sha256 = "0y1m35b5i7s856xk50kwczi08s5r313qkpjny0f7acg5hz60kz1v"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -10390,12 +10451,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2023-11-27"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "8b1d2962875b8701c830199f042b74663b6a3a7f"; - sha256 = "0yws4pfzzbz49shk99r4hblxqqxfjbqj2sh52ssjff2hk6is804c"; + rev = "308e7737d09de8c1100320ddc6bc270615ae791a"; + sha256 = "076ylgny48bl5iajw0hh3bqwlchj9pygq2bf3y0qlwckrzq05nbn"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -10438,12 +10499,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2023-12-01"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "ebf9874e64a8c96041af727d2aa17033a8718f03"; - sha256 = "1ndm54q3qg2hhcnh1bncjpmknczmngy9n6jgbr2wrxsvrsq8mb06"; + rev = "966d8e4c3c165988c3dd32457c72c82320d7f9f8"; + sha256 = "1nk4ziqz13w82k8l0wxmvjrbx01bnd96zmqwwwvxbsph59ym35ny"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10534,12 +10595,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2023-11-21"; + version = "2023-12-17"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "61c56c7865ac9708cb4615ff0281e94297f82c1f"; - sha256 = "1rq47x48dgsvs0z5hqmb87kba8rkz1w178cbshxjwxzb92v701qc"; + rev = "8cea10925699a8f77f6d9ebb5df87a5995fbd3f2"; + sha256 = "13wlrsri5m6yvfrcjkfsr70r5rxbzga90ba03m6n397xfmybx506"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -12154,12 +12215,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2023-10-29"; + version = "2023-12-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "46eaf8918b347906789df296143117774e827616"; - sha256 = "1xqznxw6f0arrvb4i5m2y3pkxy0lg5dimkzgm8rwci47w2r7rb3g"; + rev = "59659093581aad2afacedc81f009ed6a4bfad275"; + sha256 = "1h5l6257vqk41h93nv5ipvccglqnz1bjqh6dsds1q4x2l80xn61v"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -12262,12 +12323,12 @@ final: prev: vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2023-11-11"; + version = "2023-12-07"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "fe0e8a2630eef548e4122096e4e2241f42208fe3"; - sha256 = "1lzhkqr74z430zm61jy4hmrxv3nq89rhrpzlp8fj9vwfkbqpzrgm"; + rev = "4b49965897b8264cd6f90fa47ddb917f4296c469"; + sha256 = "08fdid8s17l42k7ykw3c7jfjj10rgmdgnd5p5gxbi76zx0x9aylv"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -12310,12 +12371,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2023-11-19"; + version = "2023-12-24"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "97327927551d519f8f035f6f12f7bca041fed665"; - sha256 = "1kby6q5qi94i1jbb9vnl8llv55yvafap0w02hfm373rid00yi6fz"; + rev = "67332cefc9d69a2ff40ea3c4d9a05691aee9f0f0"; + sha256 = "0hx9607lf2q7nn6a64nralyizhcl1m0q9mg882rmbf9jp560b56k"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -12334,11 +12395,11 @@ final: prev: vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2023-09-11"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "6089a44e89e76f9eba138fb68bfd132420404ff7"; + rev = "c1d6af3b93ec135e7e2fc182d4cae6cd0d9e20b1"; sha256 = "1fm5rvvp7kh1lqfz6g9s8vjgbrbjqrdwysr573ymxacavbx8iri2"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; @@ -12888,24 +12949,24 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2023-12-03"; + version = "2023-12-22"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "4e3c322be764cde80eab73c8e03c7ac410eb0e19"; - sha256 = "0ypbbk72h5l9j89i2hsjkcr95is1jd9gsnhchqw6zy8ip7qqa6sb"; + rev = "61effac68ca42dbe515d488c4fef73035ce4f281"; + sha256 = "1sy6paz63g7hnh1rf8m9vhcpqkyrm7lh2q41ri9x24jyfcip60jd"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; vim-kitty-navigator = buildVimPlugin { pname = "vim-kitty-navigator"; - version = "2023-11-30"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "2aafc20a0a4eb3efa757db51868a2ab181e88690"; - sha256 = "0f298z3mcisja1h6z1f1smj9b3kq232bkvjwj9xyavhr0fpq6h9f"; + rev = "20abf8613aa228a5def1ae02cd9da0f2d210352a"; + sha256 = "04b37lm1bb7420l18l4rjglls5jg4n5aswmk0nxgwgh1wf4xkkw2"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -13116,12 +13177,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2023-11-25"; + version = "2023-12-21"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "3af8f3b38effc4a631a15bb283a4b701c251275d"; - sha256 = "1qca60s39q0w7l4zhj63jarh26dkqik8pw8ncwlbkinvfv5h3dbi"; + rev = "d36f381dc8f39a9b86d66ef84c2ebbb7516d91d6"; + sha256 = "0bdkxvm6sypciadlznh1s4xa7in1n2larlr6843k9f63ray4pr9a"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -13152,12 +13213,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2023-11-15"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "3d99f09affd1ea6b9289949d5b282c43fe21eab8"; - sha256 = "08983vwgcaz2ydl4pf5nlzjli7aa88bmdp3m56519ihfhj2s1s22"; + rev = "f6850d1bfb2ca5585bf4de05a18c9d2c3d1c968e"; + sha256 = "0m6y4syvp2g69igkc9n1ia83m7lyz2rqz7bkfsa9h0dhfwlwd8vg"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -13261,24 +13322,24 @@ final: prev: vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; - version = "2022-08-29"; + version = "2023-12-13"; src = fetchFromGitHub { owner = "mzlogin"; repo = "vim-markdown-toc"; - rev = "7ec05df27b4922830ace2246de36ac7e53bea1db"; - sha256 = "1806c3g07gbggj5xv30v78c6czarl5v11aa2rxb7igizfsn13vwv"; + rev = "0e2c7cdc3ac1d067eb309a10220d001bb7be39cd"; + sha256 = "0ggdbvv4mca4z0xhkdybimc4yy3bah1v21660wjs8n2v4f5rvslx"; }; meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2023-11-24"; + version = "2023-12-19"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "269f9bea87e20a01438085eb13df539929a12727"; - sha256 = "0ca3fhdr6pp77z72lxlhlkzi1ng713nfzvyywmq8a31z8j2vkh87"; + rev = "2550178c43464134ce65328da458905f70dbe041"; + sha256 = "0y3kgj7jaa6g4ydfp1cjbishzsvb9qrd5k2lswm7hag0fisxhig7"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -13429,12 +13490,12 @@ final: prev: vim-mundo = buildVimPlugin { pname = "vim-mundo"; - version = "2022-11-05"; + version = "2023-12-15"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "b53d35fb5ca9923302b9ef29e618ab2db4cc675e"; - sha256 = "1dwrarcxrh8in78igm036lpvyww60c93vmmlk8h054i3v2p8vv59"; + rev = "2ceda8c65f7b3f9066820729fc02003a09df91f9"; + sha256 = "0mrwkjq5a2krh6dim2sj5816dwj9lx2zmd1vpmhc88y5lwkhsy4m"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -13717,12 +13778,12 @@ final: prev: vim-oscyank = buildVimPlugin { pname = "vim-oscyank"; - version = "2023-10-10"; + version = "2023-12-07"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "7250d51bda669ce1d7f334f2f5e6be012daddcde"; - sha256 = "1ci3z82d20w24vipcpq1z20i6icy7nv7mkdxsk2ly7llr7xwa72w"; + rev = "53c08f17d73e25d1498f9fe2611240878f1fef0b"; + sha256 = "03i2dvc8dlyxq521glyln0k4g5l6jxx23fhi88l50lblsnqn54y5"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -13765,12 +13826,12 @@ final: prev: vim-pandoc = buildVimPlugin { pname = "vim-pandoc"; - version = "2023-11-10"; + version = "2023-12-18"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "84ff781925a28346df99d3764ec697c3088862a7"; - sha256 = "09lswvc5s97brx6iimkbqslmsmbb19nz0s6w0hpss8vf0fy38a8l"; + rev = "fae27ec62606b6b914de5270985a69d1b5da1287"; + sha256 = "139lg369mrh0zkk3bh1fgp2iz54m8fjp7rgyy3j25ivylna5lzn8"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -14041,12 +14102,12 @@ final: prev: vim-ps1 = buildVimPlugin { pname = "vim-ps1"; - version = "2023-11-28"; + version = "2023-12-09"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "308aac5449ccce54d09a669afc41326ae848d731"; - sha256 = "0akpwjpm66zyjx9vzlzy98dsxv556maz4pbk1grv14bxzz84m4vi"; + rev = "be5dce9cd15176c6b1ecd056a8ced93fc2f6efac"; + sha256 = "1k8a1ilsshjvahf9az1x8nalb5wkin8jxzi3zqc658liww2qm98z"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -14569,12 +14630,12 @@ final: prev: vim-snippets = buildVimPlugin { pname = "vim-snippets"; - version = "2023-11-29"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "ec4ff7e9c9b274e93295924e59c82b4f51e2ae42"; - sha256 = "04gsma772cf6rxig2b3d37pvmv3y7sg7qjczkr5fjahsxafr4rpg"; + rev = "a8dc763b3f534ec1a0c0ae5082689c10dcaf9d5f"; + sha256 = "1qavvd6hx4r898dpn70h805crgx8s2n9ldrd17z7ir6zp6c6gp0m"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -14846,12 +14907,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2023-11-20"; + version = "2023-12-15"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "d11dc6f9c3e2f062646e3e265f878dcdfbb6a8ca"; - sha256 = "1kr1shaa6kcwhsv1g6cv2m6n6dvbg0w5rk5nn12804g5i5g2svbd"; + rev = "b7ca2a825c8308286c21a563802290b3ca6e20c1"; + sha256 = "0p9ks8nq517bzk543k6am6d2njbl9fz43aiq2zlsmpl5n06p6zsb"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -14990,12 +15051,12 @@ final: prev: vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2023-09-16"; + version = "2023-12-23"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "7db70e08ea03b3e4d91f63713d76134512e28d7e"; - sha256 = "05mz1lpc0akanxf7pcrlwp08v84x69ah6042cc2pzqsjj5l24a64"; + rev = "38b1d0402c4600543281dc85b3f51884205674b6"; + sha256 = "0wj7627bvzw2rjb97b3ddkqx966f4xjlw80lmna6kxi0vvx5hsp1"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -15266,12 +15327,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2023-11-17"; + version = "2023-12-05"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "87c6861ea81700ec4a6a27c81413cf07cb2c883c"; - sha256 = "0j2rnrz2cx0zsvqbx4glpdij89nbxwq6iyb385jvv7lhm4fyary8"; + rev = "8c8856327815a077cbebeba8c7456312a3d2c39c"; + sha256 = "1k3zklr93im6w2767yajzgbfh270yh00898fccghdcjq66gd6hxy"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -15302,12 +15363,12 @@ final: prev: vim-which-key = buildVimPlugin { pname = "vim-which-key"; - version = "2023-09-14"; + version = "2023-12-16"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "08cf520fc4785e656dfdb319ecf6fe9e75bfc4fa"; - sha256 = "033flr2sqlhmn7qilx5nz1z14kmy8dwzdh86rg8xh21r2894adx9"; + rev = "a03cb503b0de6f5071a7263f5fb8d63493e901e5"; + sha256 = "095rg29ydsazjqa0ks34b5d6gvq37rin4q2qwqxq2994yb8a530m"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -15410,12 +15471,12 @@ final: prev: vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2023-10-31"; + version = "2023-12-17"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "5c23544a89ef5a820d3744e4bccbcfbeed3cc9be"; - sha256 = "0bpwgrml3yaszh39nkf3zxk4q4djjjlhyb8xjyikn1a4yvl0fs0y"; + rev = "e4995b97a4f6f822144ad61b68929ea5fa4e524e"; + sha256 = "05k7jyclx2351zff26i17aypskhcxav1zv2n7k87s03c04kl3x00"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; @@ -15470,12 +15531,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2022-01-31"; + version = "2023-12-12"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "b0ce0820240e72a330bd388caa48baf434f1a0e3"; - sha256 = "1yknp4fjdwkc5sfw8f6rkhffa1k7lz3pa9q62v9ifj27a0gykwsd"; + rev = "31dd31c96fc03fb158e1f40f72f3661ef5a9152d"; + sha256 = "0wph29fkp5hcziy3ym9854dds9lrm0g7w4b98bx1ks05lgx6wxzq"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -15578,12 +15639,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2023-11-26"; + version = "2023-12-21"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "c03345e5adb171e4bfa9fca530dc01216e2819aa"; - sha256 = "1z6xy63fhdvaiwv4ay3njrwfarg8a2rxingnl9knwrni7q26gw4p"; + rev = "4b07a565efd199777f5a327f6039b8dfdcff35d3"; + sha256 = "0pv9hkwcip7a4z35vx0v50p7iafxy3a3wfhr5n2s7d2l5r156nx1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -15591,12 +15652,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2023-12-03"; + version = "2023-12-20"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "911987d8d65ade51311d512ac98cf39f89a309ea"; - sha256 = "025qbjs685s0yf9vddwyxz0vc2h1j33mj5s7w2xm8f10a8j5skfz"; + rev = "6179414f2eb3db977a513b7b19c23e7e62a0f388"; + sha256 = "1fynvg4695h990lh1w9mknd7n0mdk2br1j0xdh3sh94w204xyyrh"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15879,12 +15940,12 @@ final: prev: wtf-nvim = buildVimPlugin { pname = "wtf.nvim"; - version = "2023-11-11"; + version = "2023-12-11"; src = fetchFromGitHub { owner = "piersolenski"; repo = "wtf.nvim"; - rev = "03775272c9ba88cbaae1d1802078a3f751969350"; - sha256 = "04xknhrmjvywdxfmng35i8cibxkcdjmz4wz1nmsr3gc09rddfrr3"; + rev = "07f79bdffaa9dd2785fe2543da6d850e76d2709c"; + sha256 = "0gnrb8rqfd8filv74wj62cq5gfa8n36f2bv7m607rnggy0rzx58n"; }; meta.homepage = "https://github.com/piersolenski/wtf.nvim/"; }; @@ -15913,6 +15974,18 @@ final: prev: meta.homepage = "https://github.com/guns/xterm-color-table.vim/"; }; + yanky-nvim = buildVimPlugin { + pname = "yanky.nvim"; + version = "2023-11-27"; + src = fetchFromGitHub { + owner = "gbprod"; + repo = "yanky.nvim"; + rev = "6bb9ffd3cad4c9876bda54e19d0659de28a4f84f"; + sha256 = "01pd9xgw9wh9xa4sk80g0n61ra4l9xvssqak6vv03kgrpyb1qizw"; + }; + meta.homepage = "https://github.com/gbprod/yanky.nvim/"; + }; + yats-vim = buildVimPlugin { pname = "yats.vim"; version = "2023-08-24"; @@ -16036,12 +16109,12 @@ final: prev: zoomwintab-vim = buildVimPlugin { pname = "zoomwintab.vim"; - version = "2021-10-10"; + version = "2023-12-05"; src = fetchFromGitHub { owner = "troydm"; repo = "zoomwintab.vim"; - rev = "7a354f3f0aa7807d822c03c8c24dc6c1cced9d3c"; - sha256 = "18b9c90nrbia3bdx9liznkm05pr7qlya7fdllqnnmpb4v047c06f"; + rev = "3b76f740534ecc4114bc8a207ecb0db77b2fb002"; + sha256 = "0iljm70cbmgpzraki4ccw7fhyzp467f8fr4wimzg4yam5354x1hh"; }; meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; @@ -16060,12 +16133,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-11-29"; + version = "2023-12-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "919d1f786338ebeced798afbf28cd085cd54542a"; - sha256 = "1lwd4kvz52zkrn6wyh9k58pvcg4aas99c5ddzhsi76g31fg2ix8n"; + rev = "4fbab1f01488718c3d54034a473d0346346b90e3"; + sha256 = "1p65clzvfr0d3lyjhj1k8wbkfddvndxadpdf9n63cqah5ac8znhh"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -16096,28 +16169,40 @@ final: prev: embark-vim = buildVimPlugin { pname = "embark-vim"; - version = "2023-11-27"; + version = "2023-12-20"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "7efd788d2e7b2d0a923cb6dabad7e2c11ab7aa95"; - sha256 = "0pnqx6jli9pwqs6h2dsvh7q05gchama7zcpr91zp2jabacbanycf"; + rev = "95f92adee0e5ad36f74fe04266554ac9c03e3fc3"; + sha256 = "15v8wgbcckdll8j27d2v30rcbgc38hddmnfbk24p3jxx2pxdl529"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; gruvbox-community = buildVimPlugin { pname = "gruvbox-community"; - version = "2023-09-19"; + version = "2023-12-10"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "86c767ff91e2518da44ba8c78b3bc6c979cf5403"; - sha256 = "1map59hiin7qwwyliqxqwq3v64hskn4xpxisnfpj7ci56c9viby8"; + rev = "e1f033164931797a67b68089995c8078415f9d7d"; + sha256 = "1ffr4h7vwgnxvvx57jibj5yvyag6mn6n1v29r5haf3md1981s97g"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; + harpoon2 = buildVimPlugin { + pname = "harpoon2"; + version = "2023-12-21"; + src = fetchFromGitHub { + owner = "ThePrimeagen"; + repo = "harpoon"; + rev = "31701337377991c66eebb57ebd23ef01eb587352"; + sha256 = "0iv0mxh9iagv4r3n60y1ljkwsjlr96kvqnqbd05c6fgs1v1dm43l"; + }; + meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; + }; + mattn-calendar-vim = buildVimPlugin { pname = "mattn-calendar-vim"; version = "2022-02-10"; @@ -16156,12 +16241,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2023-11-24"; + version = "2023-12-08"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "f50f9834e522b62ea89a84775091c1cf89af57a4"; - sha256 = "0fcc0h2xk8gjb7jy0xbql2vjv8ik7rfzbakxbcz860xjbcblpsqq"; + rev = "1e5539ad0a2ece2dd72771d582d0dac58f47844d"; + sha256 = "01lwskz1dwi8s7xby5pyibpxcfmzyfdps37ryp7fb6wcvvdz2mlb"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index f2122db806eb1..f5f6245b05d9d 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -39,12 +39,12 @@ }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=82ee140"; + version = "0.0.0+rev=ca70b23"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"; - hash = "sha256-fNKLvE9uXQlsCqO2F8ahxWigTmYu6f2TgRBgGbXvszk="; + rev = "ca70b2347a79615cd749517f6c6c2352e50a7ce9"; + hash = "sha256-7gVA5aFGw2DSFmmlv6HMLcfSki4aDPB05llfHFSaYME="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -117,12 +117,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=484f508"; + version = "0.0.0+rev=cd08aef"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "484f50849bcce887c86451f532bf778689ca8523"; - hash = "sha256-5k5sHW9xabbCFJXHJfs8oBlCjIBa6L3OtDdKEVXLgOc="; + rev = "cd08aefa20dc0f3d5984b08b5d468f75bf4fd096"; + hash = "sha256-39TnAM/urE0slFtqGykkmBlZPg0OFdkDU+p1WAAjl5c="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -495,23 +495,23 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=a2861e8"; + version = "0.0.0+rev=11426c5"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "a2861e88a730287a60c11ea9299c033c7d076e30"; - hash = "sha256-hBHqQ3eBjknRPJjP+lQJU6NPFhUMtiv4FbKsTw28Bog="; + rev = "11426c5fd20eef360d5ecaf10729191f6bc5d715"; + hash = "sha256-/tfxskct2GByqFmmWJ4IZNREpNGvDqz2kbIyLRveGrs="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=0ae8d47"; + version = "0.0.0+rev=c26afd7"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "0ae8d475281a25e9d7ab1068a952ff9a1615c0df"; - hash = "sha256-MCvzk5sJiA/JgQqI6fyVnjy5mA7bwmZvzWwdKS0PDQc="; + rev = "c26afd7f2316f689410a1622f1780eff054994b1"; + hash = "sha256-vYN1E49IpsvTUmxuzRyydCmhYZYGndcZPMBYgSMudrE="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -550,12 +550,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=5694277"; + version = "0.0.0+rev=57e6951"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "56942778b5791d07949e6c7b6093e01aba5b7ab4"; - hash = "sha256-0a36KKjacSbVb8zXaq2SHPw8njkZLb5rRWoaEUdsYyA="; + rev = "57e69513efd831f9cc8207d65d96bad917ca4aa4"; + hash = "sha256-7Me0zj/+uNXgBOAyiFgljyA3hLkdGeyBKn+CaBhODMA="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -715,12 +715,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=6856a5f"; + version = "0.0.0+rev=7e3ad5f"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "6856a5fd0ffeff17d83325a8ce4e57811010eff1"; - hash = "sha256-OD+lGLsMRFRPHwnXoM78t95QvjO0OQN4ae3z3wy5DO4="; + rev = "7e3ad5fdc61cd701e146ef78e4fc6dcdf6dbca0e"; + hash = "sha256-Ct7zLvcJVqIaVy/wOGOPvghjwRcsHblPaTuifUcackI="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -737,12 +737,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=b2afa4f"; + version = "0.0.0+rev=2b49c49"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "b2afa4fd6bb41a7bf912b034c653c90af7ae5122"; - hash = "sha256-Z1wutK2NyI5EMwTezeZp/g8JFD0p7kqBGCuh9Amyjgo="; + rev = "2b49c49ef632928b5c52bb0a7269ff797d5d1414"; + hash = "sha256-zFdyUqbJn7ighjXH+9EO+0Cf2Oj8ON8IYUZCIQUQ5dA="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -803,12 +803,12 @@ }; gomod = buildGrammar { language = "gomod"; - version = "0.0.0+rev=f41a273"; + version = "0.0.0+rev=9b86399"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; - rev = "f41a27386f1cfa1271122db5f0ff59b910520007"; - hash = "sha256-U/kpBEgUqJzJ3qQ40TMBuM1UKI9+HxnFEmmN8FfvS5w="; + rev = "9b86399ab733fbd548ba0e817e732cb3351082d2"; + hash = "sha256-STi1lqsfmaiMKrk7C6fjkmJ0ehhTf+AF6hly34/3BIg="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; @@ -902,12 +902,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=ca10c43"; + version = "0.0.0+rev=dd924b8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "ca10c43a4c9bfe588c480d2941726c2fadcae699"; - hash = "sha256-HyS9Q6+WSUgyQ9mL5sZvQ4CHW+3MypT2U9b1X5NnMHc="; + rev = "dd924b8df1eb76261f009e149fc6f3291c5081c2"; + hash = "sha256-rm9EeoZ5mO4bHAB0+E+6teKCicghQ46W7VvLfv3Za7I="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -979,12 +979,12 @@ }; hoon = buildGrammar { language = "hoon"; - version = "0.0.0+rev=1d5df35"; + version = "0.0.0+rev=0135187"; src = fetchFromGitHub { owner = "urbit-pilled"; repo = "tree-sitter-hoon"; - rev = "1d5df35af3e0afe592832a67b9fb3feeeba1f7b6"; - hash = "sha256-2xrpyA5JCibGxaJkRmcgNreFHcCvJaYkHThSc6KAV1U="; + rev = "0135187126370cbf112d759a50eab4a5c913a827"; + hash = "sha256-9FHCBaHQ/iXL3asJ3OZD9Gc02kPtWPNlPyRXiaEhkMU="; }; meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon"; }; @@ -1243,12 +1243,12 @@ }; leo = buildGrammar { language = "leo"; - version = "0.0.0+rev=23a9534"; + version = "0.0.0+rev=304611b"; src = fetchFromGitHub { owner = "r001"; repo = "tree-sitter-leo"; - rev = "23a9534d09d523d0dcee7dbf89e7c819e6835f6f"; - hash = "sha256-21Vqvc3HjmKi1FRKyswMcf8rPjkyAbjTayDYMsTUsBg="; + rev = "304611b5eaf53aca07459a0a03803b83b6dfd3b3"; + hash = "sha256-D3jtNBYLgN2/0TnbOMJrsuZrP+PMr835aDYlCwIPPrk="; }; meta.homepage = "https://github.com/r001/tree-sitter-leo"; }; @@ -1265,12 +1265,12 @@ }; liquidsoap = buildGrammar { language = "liquidsoap"; - version = "0.0.0+rev=91d2708"; + version = "0.0.0+rev=691484a"; src = fetchFromGitHub { owner = "savonet"; repo = "tree-sitter-liquidsoap"; - rev = "91d2708e12a5869154a85190b13ac89cb1414189"; - hash = "sha256-2wnGHQXx5QHkXSBsxjULIRlbXj7CBxWxFjef3n9lmew="; + rev = "691484ae766c4eee2ac59ec09e621b27b9ed9add"; + hash = "sha256-fuvT4k/NdtMNsU0rD5z9IpJ8Hc7dHTJiMWDvpShzUMY="; }; meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; }; @@ -1444,23 +1444,23 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=b759233"; + version = "0.0.0+rev=502a874"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "b759233581fd8bae239e905c67a9ba453205da78"; - hash = "sha256-4OrdtlpSsHTY/BmxRr0cKwTFfUSv+KN9IYDjfpdGIfg="; + rev = "502a8746c82c616ed441e0ab2b8c09772ee7d114"; + hash = "sha256-ahUyqjVe0haOOXXzL7t+rC4yfN+ZsPQR551v9564P/A="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; nim = buildGrammar { language = "nim"; - version = "0.0.0+rev=1f9308c"; + version = "0.0.0+rev=482e2f4"; src = fetchFromGitHub { owner = "alaviss"; repo = "tree-sitter-nim"; - rev = "1f9308c9e440ddbc67c0aaeb9396c992d266b281"; - hash = "sha256-VgyZk6P2hMCySE8ZrYip7bVtP5OKdfRIgXESDmMgFBc="; + rev = "482e2f4e1c2520db711c57f1899e926c3e81d4eb"; + hash = "sha256-OGZUNoVpsIMQuvYa23b6O15ekTWXbVYAqaYokYs0ugY="; }; meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; }; @@ -1700,12 +1700,12 @@ }; poe_filter = buildGrammar { language = "poe_filter"; - version = "0.0.0+rev=374f618"; + version = "0.0.0+rev=fa83292"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-poe-filter"; - rev = "374f618de179498c2a821136bb86c3edbe221e10"; - hash = "sha256-X6PQQqY7fLB9AvCMfLlZ2cU8dKoCsw1KGjzYup8BoJ8="; + rev = "fa83292e04d27976ab5c354e0c980f2c67628a02"; + hash = "sha256-Ij3anynA3ZYi4/Cxp+Anvgc2Te1Qxi0mnWDc0XTHaN0="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; }; @@ -1866,12 +1866,12 @@ }; qmljs = buildGrammar { language = "qmljs"; - version = "0.0.0+rev=35ead5b"; + version = "0.0.0+rev=2591330"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "35ead5b9955cdb29bcf709d622fa960ff33992b6"; - hash = "sha256-jT47lEGuk6YUjcHB0ZMyL3i5PqyUaCQmt0j78cUpy8Q="; + rev = "259133077f2fd854bcaa6f0149d3fc281fc8070b"; + hash = "sha256-xg3fXYfAYHVAkByQekOd4EFLv0TbINcQPasFQYUkF0A="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; @@ -1921,12 +1921,12 @@ }; rbs = buildGrammar { language = "rbs"; - version = "0.0.0+rev=23c69a4"; + version = "0.0.0+rev=b28e181"; src = fetchFromGitHub { owner = "joker1007"; repo = "tree-sitter-rbs"; - rev = "23c69a4fa9803abc9d87b235ca88d52418250041"; - hash = "sha256-tdxx+feI0UIHkk1eS5VrIuYvOZWpuWF3NEioqrnZ+30="; + rev = "b28e1819d434e95916d11fe48ee6e8959b69197b"; + hash = "sha256-HWWvettxkzziIWH6448RDxmVkaUNfSOgv3CtrlsgW3U="; }; meta.homepage = "https://github.com/joker1007/tree-sitter-rbs"; }; @@ -2042,12 +2042,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=1b4c2fa"; + version = "0.0.0+rev=866f945"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "1b4c2fa5c55c5fd83cbb0d2f818f916aba221a42"; - hash = "sha256-93uWT5KMqCUwntdL5U2Vc71ci+uP3OdP9y6kVZ3bYLo="; + rev = "866f94551cd03f9055d04dba20465b84e7e693f3"; + hash = "sha256-BvZdA972p6ks988z1Che9EN97ukjCC9AVUbhaxUx0Qc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2087,12 +2087,12 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=11526ab"; + version = "0.0.0+rev=ac07aa2"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "11526ab1a2514c7302f3c4af60b0ebc992cee086"; - hash = "sha256-iDj2H1ScR478eE/ppxIDiLOx1Bb8e2KsWcWrKhlHACM="; + rev = "ac07aa2c875ef6ada2ec468d8a4d0c7c5efd96d7"; + hash = "sha256-wWCXk7HnORmD1M761rv31yvPGLGynUyNYzrhZDNwzFs="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; @@ -2153,24 +2153,24 @@ }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=82ee140"; + version = "0.0.0+rev=ca70b23"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"; - hash = "sha256-fNKLvE9uXQlsCqO2F8ahxWigTmYu6f2TgRBgGbXvszk="; + rev = "ca70b2347a79615cd749517f6c6c2352e50a7ce9"; + hash = "sha256-7gVA5aFGw2DSFmmlv6HMLcfSki4aDPB05llfHFSaYME="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=82ee140"; + version = "0.0.0+rev=ca70b23"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"; - hash = "sha256-fNKLvE9uXQlsCqO2F8ahxWigTmYu6f2TgRBgGbXvszk="; + rev = "ca70b2347a79615cd749517f6c6c2352e50a7ce9"; + hash = "sha256-7gVA5aFGw2DSFmmlv6HMLcfSki4aDPB05llfHFSaYME="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2188,12 +2188,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=a3ea0e4"; + version = "0.0.0+rev=b599f6a"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "a3ea0e4143a617fc2c4ccf29c41e0ba7a1ff6ab9"; - hash = "sha256-VwkehcELs+t+1GjiOiPs1UQT+0E7OZaXaWTyjFWlMto="; + rev = "b599f6a1ca37cb5bae827a424cd98371a0d91bdc"; + hash = "sha256-GwDkAgWcMyASzfd8layZjjEigXelJbtQTgWe7VBLgwM="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2241,6 +2241,17 @@ }; meta.homepage = "https://github.com/sigmaSd/tree-sitter-strace"; }; + styled = buildGrammar { + language = "styled"; + version = "0.0.0+rev=5e52758"; + src = fetchFromGitHub { + owner = "mskelton"; + repo = "tree-sitter-styled"; + rev = "5e52758b32e02adca16bb93f95b3f9c050c72b56"; + hash = "sha256-3x/ZKVYyWuLGkgdm9HutI16m8xpJKSMOZHY48WqH9b0="; + }; + meta.homepage = "https://github.com/mskelton/tree-sitter-styled"; + }; supercollider = buildGrammar { language = "supercollider"; version = "0.0.0+rev=3b35bd0"; @@ -2344,12 +2355,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=6b9dff6"; + version = "0.0.0+rev=8793137"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "6b9dff614d5bab902cb6989bfcaa180636218159"; - hash = "sha256-89CJkVuNWm3V3Iz8iCx1pLIJwhyPcEfDB3ZqqiwZEdU="; + rev = "8793137e669949e72ac1d877ba9cadfbb5062fc0"; + hash = "sha256-SLj4IrqLgNhkeErsWcAfPeUzpAcub00yqhBeeHi18wY="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -2400,12 +2411,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=c5fae9e"; + version = "0.0.0+rev=aeb2e8f"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "c5fae9e4ad9f483fb6232a8688a2c940be6b496b"; - hash = "sha256-k2NN7vRIDsq/J4J6T9KEAwSht7JBtU9Ul7tUL/TrU58="; + rev = "aeb2e8fdc417c32ae7d1149cfa2a8ddc3b293600"; + hash = "sha256-fETWuo/mZA6tCux0Hsdbg/vTxo/cdtIES9VIp75twMw="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -2558,12 +2569,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=165ed9f"; + version = "0.0.0+rev=f0336bb"; src = fetchFromGitHub { owner = "v-analyzer"; repo = "v-analyzer"; - rev = "165ed9fda0be82ff26639dd8cf5d93fe7f7432a0"; - hash = "sha256-iH4k/begatiLc0BoAezWkhbdIjG5BHlduPMRUx/dNaI="; + rev = "f0336bb8847393ba4d5905a94642acf0dc3d5ebd"; + hash = "sha256-0hC9xb1rOtUb47gzCdzvCxAz54d9RZ4UMfb2PFOM6ZE="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/v-analyzer/v-analyzer"; @@ -2592,12 +2603,12 @@ }; vhs = buildGrammar { language = "vhs"; - version = "0.0.0+rev=375b42e"; + version = "0.0.0+rev=9534865"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; - rev = "375b42e9845f704dd491c17c7e37f7c972e0faf3"; - hash = "sha256-A9m0MNAINMbrNr3BYBU/WMtC5edXWCaxvcfCwDFe8p4="; + rev = "9534865e614c95eb9418e5e73f061c32fa4d9540"; + hash = "sha256-Qf4Y1I/X5xGVZ4u2ud+XdC2dL+0sjR+0pJRJ8SUraiQ="; }; meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; @@ -2614,12 +2625,12 @@ }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=60045f7"; + version = "0.0.0+rev=4f8ba9e"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "60045f7d717eba85fa8abd996e0bb50eed5a3d8e"; - hash = "sha256-FW+sPrzFQxKkWkyX2q+s+RBIMCOUWOt38vj2DzAaJ4I="; + rev = "4f8ba9e39c8b3fbaf0bb5f70ac255474a9099359"; + hash = "sha256-WSDz3vP/qNW1VGmXd5aGjO9PrJpjBNN4wdBohSbh9co="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -2658,12 +2669,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=9573195"; + version = "0.0.0+rev=785c54e"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "9573195e753fa0d303e65d8237d3902159708457"; - hash = "sha256-DS0PJU9OlER+izTZTyiSGRIs0tGgEKImrEyFbj2b1wM="; + rev = "785c54e35a6a45826ff7228aa9662c19ca92ad57"; + hash = "sha256-oNmbm8utc9wPqvhvVyfg5fbvku1QFpmcfxdk8vqSTf4="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 0b1832494c2df..f12855e77d41f 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1,23 +1,20 @@ { lib , stdenv - - # nixpkgs functions -, buildGoModule +, # nixpkgs functions + buildGoModule , buildVimPlugin , fetchFromGitHub , fetchFromSourcehut , fetchpatch , fetchurl , substituteAll - - # Language dependencies -, fetchYarnDeps +, # Language dependencies + fetchYarnDeps , mkYarnModules , python3 , rustPlatform - - # Misc dependencies -, Cocoa +, # Misc dependencies + Cocoa , code-minimap , dasht , deno @@ -34,7 +31,7 @@ , languagetool , llvmPackages , meson -, nim +, nim1 , nodePackages , openscad , pandoc @@ -60,50 +57,42 @@ , xxd , zathura , zsh - - # command-t dependencies -, getconf +, # codeium-nvim dependencies + codeium +, # command-t dependencies + getconf , ruby - - # cpsm dependencies -, boost +, # cpsm dependencies + boost , cmake , icu , ncurses - - # LanguageClient-neovim dependencies -, CoreFoundation +, # LanguageClient-neovim dependencies + CoreFoundation , CoreServices - - # nvim-treesitter dependencies -, callPackage - - # sg.nvim dependencies -, darwin - - # sved dependencies -, glib +, # nvim-treesitter dependencies + callPackage +, # sg.nvim dependencies + darwin +, # sved dependencies + glib , gobject-introspection , wrapGAppsHook - - # sniprun dependencies -, bashInteractive +, # sniprun dependencies + bashInteractive , coreutils , curl , gnugrep , gnused , makeWrapper , procps - - # sg-nvim dependencies -, openssl +, # sg-nvim dependencies + openssl , pkg-config - - # vim-agda dependencies -, agda - - # vim-go dependencies -, asmfmt +, # vim-agda dependencies + agda +, # vim-go dependencies + asmfmt , delve , errcheck , go-motion @@ -121,16 +110,14 @@ , iferr , impl , reftools - -# hurl dependencies -, hurl - - # must be lua51Packages -, luaPackages +, # hurl dependencies + hurl +, # must be lua51Packages + luaPackages , luajitPackages -}: - -self: super: { +, +}: self: super: +{ alpha-nvim = super.alpha-nvim.overrideAttrs { dependencies = [ self.nvim-web-devicons # required by the startify theme @@ -179,11 +166,12 @@ self: super: { }; chadtree = super.chadtree.overrideAttrs { - passthru.python3Dependencies = ps: with ps; [ - pynvim-pp - pyyaml - std2 - ]; + passthru.python3Dependencies = ps: + with ps; [ + pynvim-pp + pyyaml + std2 + ]; # We need some patches so it stops complaining about not being in a venv patches = [ ./patches/chadtree/emulate-venv.patch ]; @@ -199,13 +187,16 @@ self: super: { # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). # The linked ruby code shows generates the required '.clang_complete' for cmake based projects # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 - preFixup = '' - substituteInPlace "$out"/plugin/clang_complete.vim \ - --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'" + preFixup = + '' + substituteInPlace "$out"/plugin/clang_complete.vim \ + --replace "let g:clang_library_path = '' + + "''" + + '' " "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'" - substituteInPlace "$out"/plugin/libclang.py \ - --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang" - ''; + substituteInPlace "$out"/plugin/libclang.py \ + --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang" + ''; }; clighter8 = super.clighter8.overrideAttrs { @@ -324,6 +315,19 @@ self: super: { src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx"; }; + codeium-nvim = super.codeium-nvim.overrideAttrs { + dependencies = with self; [ nvim-cmp plenary-nvim ]; + buildPhase = '' + cat << EOF > lua/codeium/installation_defaults.lua + return { + tools = { + language_server = "${codeium}/bin/codeium_language_server" + }; + }; + EOF + ''; + }; + command-t = super.command-t.overrideAttrs { nativeBuildInputs = [ getconf ruby ]; buildPhase = '' @@ -374,11 +378,12 @@ self: super: { }; coq_nvim = super.coq_nvim.overrideAttrs { - passthru.python3Dependencies = ps: with ps; [ - pynvim-pp - pyyaml - std2 - ]; + passthru.python3Dependencies = ps: + with ps; [ + pynvim-pp + pyyaml + std2 + ]; # We need some patches so it stops complaining about not being in a venv patches = [ ./patches/coq_nvim/emulate-venv.patch ]; @@ -469,11 +474,14 @@ self: super: { }; direnv-vim = super.direnv-vim.overrideAttrs (old: { - preFixup = old.preFixup or "" + '' - substituteInPlace $out/autoload/direnv.vim \ - --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ - "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" - ''; + preFixup = + old.preFixup + or "" + + '' + substituteInPlace $out/autoload/direnv.vim \ + --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ + "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" + ''; }); executor-nvim = super.executor-nvim.overrideAttrs { @@ -513,7 +521,7 @@ self: super: { }; in super.fruzzy.overrideAttrs (old: { - buildInputs = [ nim ]; + buildInputs = [ nim1 ]; patches = [ (substituteAll { src = ./patches/fruzzy/get_version.patch; @@ -544,7 +552,6 @@ self: super: { }; fzf-hoogle-vim = super.fzf-hoogle-vim.overrideAttrs { - # add this to your lua config to prevent the plugin from trying to write in the # nix store: # vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json' @@ -586,10 +593,18 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }; + guard-nvim = super.guard-nvim.overrideAttrs { + dependencies = with self; [ guard-collection ]; + }; + harpoon = super.harpoon.overrideAttrs { dependencies = with self; [ plenary-nvim ]; }; + harpoon2 = super.harpoon2.overrideAttrs { + dependencies = with self; [ plenary-nvim ]; + }; + hex-nvim = super.hex-nvim.overrideAttrs { postPatch = '' substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd @@ -613,7 +628,6 @@ self: super: { # dontUnpack = true; src = "${hurl.src}/contrib/vim"; - }; image-nvim = super.image-nvim.overrideAttrs { @@ -729,48 +743,51 @@ self: super: { rev = "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f"; sha256 = "10d6dh0czdpgfpzqs5vzxfffkm0460qjzi2mfkacgghqf3iwkbja"; }; - passthru.python3Dependencies = ps: with ps; [ - pynvim - jupyter-client - ueberzug - pillow - cairosvg - plotly - ipykernel - pyperclip - pnglatex - ]; + passthru.python3Dependencies = ps: + with ps; [ + pynvim + jupyter-client + ueberzug + pillow + cairosvg + plotly + ipykernel + pyperclip + pnglatex + ]; meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/"; }; - markdown-preview-nvim = let - # We only need its dependencies `node-modules`. - nodeDep = mkYarnModules rec { - inherit (super.markdown-preview-nvim) pname version; - packageJSON = ./markdown-preview-nvim/package.json; - yarnLock = "${super.markdown-preview-nvim.src}/yarn.lock"; - offlineCache = fetchYarnDeps { - inherit yarnLock; - hash = "sha256-kzc9jm6d9PJ07yiWfIOwqxOTAAydTpaLXVK6sEWM8gg="; + markdown-preview-nvim = + let + # We only need its dependencies `node-modules`. + nodeDep = mkYarnModules rec { + inherit (super.markdown-preview-nvim) pname version; + packageJSON = ./markdown-preview-nvim/package.json; + yarnLock = "${super.markdown-preview-nvim.src}/yarn.lock"; + offlineCache = fetchYarnDeps { + inherit yarnLock; + hash = "sha256-kzc9jm6d9PJ07yiWfIOwqxOTAAydTpaLXVK6sEWM8gg="; + }; }; - }; - in super.markdown-preview-nvim.overrideAttrs { - patches = [ - (substituteAll { - src = ./markdown-preview-nvim/fix-node-paths.patch; - node = "${nodejs}/bin/node"; - }) - ]; - postInstall = '' - ln -s ${nodeDep}/node_modules $out/app - ''; + in + super.markdown-preview-nvim.overrideAttrs { + patches = [ + (substituteAll { + src = ./markdown-preview-nvim/fix-node-paths.patch; + node = "${nodejs}/bin/node"; + }) + ]; + postInstall = '' + ln -s ${nodeDep}/node_modules $out/app + ''; - nativeBuildInputs = [ nodejs ]; - doInstallCheck = true; - installCheckPhase = '' - node $out/app/index.js --version - ''; - }; + nativeBuildInputs = [ nodejs ]; + doInstallCheck = true; + installCheckPhase = '' + node $out/app/index.js --version + ''; + }; mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs { dependencies = with self; [ mason-nvim nvim-lspconfig ]; @@ -916,6 +933,10 @@ self: super: { dependencies = with self; [ telescope-nvim plenary-nvim ]; }; + ollama-nvim = super.ollama-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + onehalf = super.onehalf.overrideAttrs { configurePhase = "cd vim"; }; @@ -1003,14 +1024,16 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-ITrjY15Haz8hEztWym4q8YW2h0R8/kOYPaIYJu87sN4="; + cargoHash = "sha256-U+EGS0GMWzE2yFyMH04gXpR9lR7HRMgWBecqICfTUbE="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; prePatch = '' rm .cargo/config.toml @@ -1044,12 +1067,12 @@ self: super: { sniprun = let - version = "1.3.8"; + version = "1.3.9"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "refs/tags/v${version}"; - hash = "sha256-xQb/VZOuwB1J4m6iOs1JMfH1f1rOzJzpvq3D4HHOHAI="; + hash = "sha256-g2zPGAJIjMDWn8FCsuRPZyYHDk+ZHCd04lGlYHvb4OI="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; @@ -1059,13 +1082,13 @@ self: super: { darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-6h0P0UVks6dQz2PZ1A/CLa1T8okD3CIUnfrH3vHe4L8="; + cargoHash = "sha256-h/NhDFp+Yiyx37Tlfu0W9rMnd+ZmQp5gt+qhY3PB7DE="; nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/sniprun \ - --prefix PATH ${lib.makeBinPath [ bashInteractive coreutils curl gnugrep gnused procps ]} + --prefix PATH ${lib.makeBinPath [bashInteractive coreutils curl gnugrep gnused procps]} ''; doCheck = false; @@ -1097,18 +1120,24 @@ self: super: { }; sqlite-lua = super.sqlite-lua.overrideAttrs { - postPatch = let - libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"; - in '' - substituteInPlace lua/sqlite/defs.lua \ - --replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}" - ''; + postPatch = + let + libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"; + in + '' + substituteInPlace lua/sqlite/defs.lua \ + --replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}" + ''; }; ssr = super.ssr-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter ]; }; + startup-nvim = super.startup-nvim.overrideAttrs { + dependencies = with super; [ plenary-nvim ]; + }; + statix = buildVimPlugin rec { inherit (statix) pname src meta; version = "0.1.0"; @@ -1187,17 +1216,16 @@ self: super: { preFixup = let fzy-lua-native-path = "deps/fzy-lua-native"; - fzy-lua-native = - stdenv.mkDerivation { - name = "fzy-lua-native"; - src = "${old.src}/${fzy-lua-native-path}"; - # remove pre-compiled binaries - preBuild = "rm -rf static/*"; - installPhase = '' - install -Dm 444 -t $out/static static/* - install -Dm 444 -t $out/lua lua/* - ''; - }; + fzy-lua-native = stdenv.mkDerivation { + name = "fzy-lua-native"; + src = "${old.src}/${fzy-lua-native-path}"; + # remove pre-compiled binaries + preBuild = "rm -rf static/*"; + installPhase = '' + install -Dm 444 -t $out/static static/* + install -Dm 444 -t $out/lua lua/* + ''; + }; in '' rm -rf $target/${fzy-lua-native-path}/* @@ -1253,7 +1281,7 @@ self: super: { cp "${ftdetect}" vim-plugin/ftdetect/tup.vim cd vim-plugin ''; - meta.maintainers = with lib.maintainers; [enderger]; + meta.maintainers = with lib.maintainers; [ enderger ]; }; typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs { @@ -1268,7 +1296,6 @@ self: super: { }; in super.unicode-vim.overrideAttrs { - # redirect to /dev/null else changes terminal color buildPhase = '' cp "${unicode-data}" autoload/unicode/UnicodeData.txt @@ -1371,9 +1398,11 @@ self: super: { # https://github.com/NixOS/nixpkgs/issues/157609 vim-colorschemes = super.vim-colorschemes.overrideAttrs (old: { src = old.src.overrideAttrs (srcOld: { - postFetch = (srcOld.postFetch or "") + lib.optionalString (!stdenv.isDarwin) '' - rm $out/colors/darkBlue.vim - ''; + postFetch = + (srcOld.postFetch or "") + + lib.optionalString (!stdenv.isDarwin) '' + rm $out/colors/darkBlue.vim + ''; }); }); @@ -1523,11 +1552,14 @@ self: super: { }; vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { - postPatch = old.postPatch or "" + '' - substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \ - 'g:stylish_haskell_command = "stylish-haskell"' \ - 'g:stylish_haskell_command = "${stylish-haskell}/bin/stylish-haskell"' - ''; + postPatch = + old.postPatch + or "" + + '' + substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \ + 'g:stylish_haskell_command = "stylish-haskell"' \ + 'g:stylish_haskell_command = "${stylish-haskell}/bin/stylish-haskell"' + ''; }); vim-surround = super.vim-surround.overrideAttrs { @@ -1683,8 +1715,8 @@ self: super: { ''; stripDebugList = [ "autoload/leaderf/python" ]; }; - -} // ( +} + // ( let nodePackageNames = [ "coc-clangd" @@ -1737,11 +1769,12 @@ self: super: { "coc-yaml" "coc-yank" ]; - nodePackage2VimPackage = name: buildVimPlugin { - pname = name; - inherit (nodePackages.${name}) version meta; - src = "${nodePackages.${name}}/lib/node_modules/${name}"; - }; + nodePackage2VimPackage = name: + buildVimPlugin { + pname = name; + inherit (nodePackages.${name}) version meta; + src = "${nodePackages.${name}}/lib/node_modules/${name}"; + }; in lib.genAttrs nodePackageNames nodePackage2VimPackage ) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index cc57f5408dbf4..ead5cf15b28f2 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -170,6 +170,7 @@ https://github.com/coc-extensions/coc-svelte/,, https://github.com/iamcco/coc-tailwindcss/,, https://github.com/neoclide/coc.nvim/,release, https://github.com/manicmaniac/coconut.vim/,HEAD, +https://github.com/Exafunction/codeium.nvim/,HEAD, https://github.com/Exafunction/codeium.vim/,HEAD, https://github.com/gorbit99/codewindow.nvim/,HEAD, https://github.com/metakirby5/codi.vim/,, @@ -281,6 +282,7 @@ https://github.com/lambdalisue/fern.vim/,, https://github.com/wincent/ferret/,, https://github.com/j-hui/fidget.nvim/,, https://github.com/bogado/file-line/,, +https://github.com/lewis6991/fileline.nvim/,, https://github.com/glacambre/firenvim/,HEAD, https://github.com/andviro/flake8-vim/,, https://github.com/folke/flash.nvim/,HEAD, @@ -335,12 +337,15 @@ https://github.com/morhetz/gruvbox/,, https://github.com/eddyekofo94/gruvbox-flat.nvim/,, https://github.com/sainnhe/gruvbox-material/,, https://github.com/ellisonleao/gruvbox.nvim/,, +https://github.com/nvimdev/guard-collection/,HEAD, +https://github.com/nvimdev/guard.nvim/,HEAD, https://github.com/nmac427/guess-indent.nvim/,HEAD, https://github.com/sjl/gundo.vim/,, https://github.com/junegunn/gv.vim/,, https://github.com/m4xshen/hardtime.nvim/,HEAD, https://git.sr.ht/~sircmpwn/hare.vim,HEAD, -https://github.com/ThePrimeagen/harpoon/,, +https://github.com/ThePrimeagen/harpoon/,master, +https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2 https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, @@ -470,6 +475,7 @@ https://github.com/jghauser/mkdir.nvim/,main, https://github.com/jakewvincent/mkdnflow.nvim/,HEAD, https://github.com/SidOfc/mkdx/,, https://github.com/mawkler/modicator.nvim/,HEAD, +https://github.com/miikanissi/modus-themes.nvim/,HEAD, https://github.com/tomasr/molokai/,, https://github.com/benlubas/molten-nvim/,HEAD, https://github.com/loctvl842/monokai-pro.nvim/,HEAD, @@ -545,12 +551,12 @@ https://github.com/Xuyuanp/nerdtree-git-plugin/,, https://github.com/miversen33/netman.nvim/,HEAD, https://github.com/oberblastmeister/neuron.nvim/,, https://github.com/fiatjaf/neuron.vim/,, +https://github.com/Olical/nfnl/,main, https://github.com/chr4/nginx.vim/,, https://github.com/EdenEast/nightfox.nvim/,, https://github.com/zah/nim.vim/,, https://github.com/figsoda/nix-develop.nvim/,HEAD, https://github.com/tamago324/nlsp-settings.nvim/,main, -https://github.com/tjdevries/nlua.nvim/,, https://github.com/mcchrish/nnn.vim/,, https://github.com/shortcuts/no-neck-pain.nvim/,HEAD, https://github.com/folke/noice.nvim/,HEAD, @@ -646,8 +652,6 @@ https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,, https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD, https://github.com/windwp/nvim-ts-autotag/,, https://github.com/joosepalviste/nvim-ts-context-commentstring/,, -https://github.com/mrjones2014/nvim-ts-rainbow/,, -https://gitlab.com/HiPhish/nvim-ts-rainbow2,HEAD, https://github.com/kevinhwang91/nvim-ufo/,HEAD, https://github.com/samjwill/nvim-unception/,HEAD, https://github.com/kyazdani42/nvim-web-devicons/,, @@ -661,6 +665,7 @@ https://github.com/glepnir/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, https://github.com/stevearc/oil.nvim/,HEAD, +https://github.com/nomnivore/ollama.nvim/,HEAD, https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD, https://github.com/Th3Whit3Wolf/one-nvim/,, https://github.com/navarasu/onedark.nvim/,, @@ -783,6 +788,7 @@ https://github.com/luukvbaal/stabilize.nvim/,, https://github.com/eigenfoo/stan-vim/,, https://github.com/josegamez82/starrynight/,HEAD, https://github.com/darfink/starsearch.vim/,, +https://github.com/startup-nvim/startup.nvim/,HEAD, https://github.com/luukvbaal/statuscol.nvim/,, https://github.com/teto/stylish.nvim/,HEAD, https://github.com/gbprod/substitute.nvim/,HEAD, @@ -1339,6 +1345,7 @@ https://github.com/tweekmonster/wstrip.vim/,, https://github.com/piersolenski/wtf.nvim/,HEAD, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, +https://github.com/gbprod/yanky.nvim/,HEAD, https://github.com/HerringtonDarkholme/yats.vim/,, https://github.com/lucasew/yescapsquit.vim/,HEAD, https://github.com/elkowar/yuck.vim/,HEAD, diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index f4d25b8547f4c..479a475e07416 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -30,10 +30,6 @@ stdenv.mkDerivation rec { libselinux ]; - postPatch = '' - patchShebangs ./configure - ''; - postInstall = '' wrapProgram $out/bin/vis \ --prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a1eb75f8de820..d7df2dac1b5a3 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -344,8 +344,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.0.1"; - sha256 = "1yf065syb5hskds47glnv18nk0fg7d84w1j72hg1pqb082gn1sdv"; + version = "1.5.0"; + sha256 = "1glad9xmzq58jc7js8afjmqrxgd3rqm80fk528wv5kqcmn90bgk3"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -710,8 +710,8 @@ let mktplcRef = { name = "ruff"; publisher = "charliermarsh"; - version = "2023.40.0"; - sha256 = "sha256-Ym76WtKvz18NgxH9o8O/Ozn+/AtqLvjJs8ffLhPOWkQ="; + version = "2023.60.0"; + sha256 = "sha256-zxE4QcWt8M6djTbdIf0YNSpeF1w7vMK4/BW5ArCOYbE="; }; meta = { license = lib.licenses.mit; @@ -1580,8 +1580,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.135.544"; - sha256 = "sha256-OeG1nkQbQAfu8NuDEA+iaWy0ioFyXPe7Qm/CZIKPiX8="; + version = "1.143.601"; + sha256 = "sha256-Ge/q1fAfhI5EuJFLHZqZyuPahHSgES7G0ns9FbS9vzA="; }; meta = { @@ -2123,19 +2123,19 @@ let kddejong.vscode-cfn-lint = let - inherit (python3Packages) cfn-lint; + inherit (python3Packages) cfn-lint pydot; in buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-cfn-lint"; publisher = "kddejong"; - version = "0.21.0"; + version = "0.25.1"; sha256 = "sha256-IueXiN+077tiecAsVCzgYksWYTs00mZv6XJVMtRJ/PQ="; }; nativeBuildInputs = [ jq moreutils ]; - buildInputs = [ cfn-lint ]; + buildInputs = [ cfn-lint pydot ]; postInstall = '' cd "$out/$installPrefix" @@ -2749,8 +2749,8 @@ let publisher = "nvarner"; # Please update the corresponding binary (typst-lsp) when updating # this extension. - version = "0.11.0"; - sha256 = "sha256-fs+CBg3FwzTn608dm9EvfF2UrI2Sa5hsm0OK/WQyy6o="; + version = "0.12.0"; + sha256 = "sha256-9v6zJyeUBj0TOpK2otLqZ0ksjmzExKTJYRF+9akvuuo="; }; nativeBuildInputs = [ jq moreutils ]; @@ -3136,15 +3136,17 @@ let mktplcRef = { publisher = "shd101wyy"; name = "markdown-preview-enhanced"; - version = "0.6.10"; - sha256 = "sha256-nCsl7ZYwuTvNZSTUMR6jEywClmcPm8xW6ABu9220wJI="; + version = "0.8.10"; + sha256 = "sha256-BjTV2uH9QqCS1VJ94XXgzNMJb4FB4Ee+t/5uAQfJCuM="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; longDescription = '' - Markdown Preview Enhanced provides you with many useful functionalities - such as automatic scroll sync, math typesetting, mermaid, PlantUML, - pandoc, PDF export, code chunk, presentation writer, etc. + Markdown Preview Enhanced is an extension that provides you with + many useful functionalities such as automatic scroll sync, math + typesetting, mermaid, PlantUML, pandoc, PDF export, code chunk, + presentation writer, etc. A lot of its ideas are inspired by + Markdown Preview Plus and RStudio Markdown. ''; homepage = "https://github.com/shd101wyy/vscode-markdown-preview-enhanced"; license = lib.licenses.ncsa; @@ -3555,8 +3557,8 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.25"; - sha256 = "sha256-qM+CLV8jWYkJWXZyELnR1H9pSWFifAOGqH+LgHr7nNA="; + version = "0.0.27"; + sha256 = "sha256-wEY1FZjgiQJ7VrJGZX0SgZqz/14v//jxgrqdafLjIfM="; }; meta = { description = "VSCode language extension for Uiua"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix index ef1a5a4d49ec8..9d157bb7b2e0f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix @@ -28,6 +28,9 @@ vscode-utils.buildVscodeMarketplaceExtension { EOF } jq "$(print_jq_query)" ./package.json | sponge ./package.json + # Add a link from temp to /tmp so that the extension gets a writable + # directory to write to. + ln -s /tmp temp ''; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 3b2ab09d1b534..c6ad1dc42bf5f 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -38,6 +38,19 @@ let "--bin=codelldb" ]; + postFixup = '' + mkdir -p $out/share + # codelldb expects libcodelldb.so to be in the same + # directory as the executable, and can't find it in $out/lib. + # To make codelldb executable as a standalone, + # we put all files in $out/share, and then wrap the binary in $out/bin. + mv $out/bin/* $out/share + cp $out/lib/* $out/share + ln -s ${lldb.lib} $out/lldb + makeWrapper $out/share/codelldb $out/bin/codelldb \ + --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server" + ''; + patches = [ ./adapter-output-shared_object.patch ]; # Tests are linked to liblldb but it is not available here. @@ -112,7 +125,7 @@ in stdenv.mkDerivation { mkdir -p $ext/{adapter,formatters} mv -t $ext vsix-extracted/extension/* - cp -t $ext/adapter ${adapter}/{bin,lib}/* + cp -t $ext/adapter ${adapter}/share/* cp -r ../adapter/scripts $ext/adapter wrapProgram $ext/adapter/codelldb \ --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server" diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 693ffb4e94412..5000393913c14 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -247,7 +247,11 @@ in ); postFixup = lib.optionalString stdenv.isLinux '' - patchelf --add-needed ${libglvnd}/lib/libGLESv2.so.2 $out/lib/vscode/${executableName} + patchelf \ + --add-needed ${libglvnd}/lib/libGLESv2.so.2 \ + --add-needed ${libglvnd}/lib/libGL.so.1 \ + --add-needed ${libglvnd}/lib/libEGL.so.1 \ + $out/lib/vscode/${executableName} ''; inherit meta; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index a784455f70e5a..9d094c9eaf296 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1vdgc4mnysij2sf87d5dfh0yw9j2a58lvmnwzzsj1icaydhkhfjy"; - x86_64-darwin = "0zxky35ifgjwb6p41mi3z34fvn49fpl09r1n9kp46ip8mqsm7gm7"; - aarch64-linux = "0qv0gbkfx78a393x44g6zmi5gs57d2cnjqlwfv0yrhkgi5s8v1ma"; - aarch64-darwin = "1rl4256h8i52akzy8g2bkydsi5llp05qqj0jr2di896x4niw57iz"; - armv7l-linux = "18mcf5x3h3mwlvhkl86b2wcl0adj7pr4aqr12va07mwlh2fp83h4"; + x86_64-linux = "1z692zp413vgla0ln04rf2fnx0giy2rgglmi6q1jk9b7wmlrsrh1"; + x86_64-darwin = "00d143mgrx5s7qdsxp93j04wz2xcgm8rkb5gj1a2czjcjvpsyjmv"; + aarch64-linux = "1b5fjxfgjr7rak23kmnapqbbimd6f7q5fjiwbcclxwyl0cqa0d3j"; + aarch64-darwin = "0zv81nj767741i9p2i5ac5ql9pm9snz6lg1zqvvw3rps3d5vwysz"; + armv7l-linux = "11zms120dagscnxrr5xpivcxipbmahf2sy68a4bmcjk1nqnvcsgh"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.84.2"; + version = "1.85.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "1a5daa3a0231a0fbba4f14db7ec463cf99d7768e"; + rev = "0ee08df0cf4527e40edc9aa28f4b5bd38bbff2b2"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "18kx7szx1v7dk0qqsw6cf40zd8mrc7a8snvm6i1n8q039d9mx2jz"; + sha256 = "06672ynsr7bxzkgdi1ghmrb6ki0y1ypmakk7w51r599vi1bjfnr0"; }; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index ec47f8c1b8de0..b4c0a4480ccc7 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 = "1h2s90h1a4b4r9rqafd5fj95mx21xqlp3msv8fxfjd2kkfl8bdcl"; - x86_64-darwin = "1cprq4cy01cmyqrvv5p9f09k7h5p4nj9jbk4lrlnyj1z2xvhcls1"; - aarch64-linux = "0g9j14vnan10r014309s6mdkizjfpbd83bf1kxx2kk625n87xszc"; - aarch64-darwin = "10rw2dy3khpxa292zygxi67amxd6s351ha8nxvav5m9xfxlgd2qn"; - armv7l-linux = "0bw0hfhvwv7wbh2daxgxaxm34v5z5ak4nmmk45ksxc4xsmjc5v23"; + x86_64-linux = "1fhvzwhkcqn3bxh92nidhg2bagxbxyg7c8b582wz1msp1l7c27mq"; + x86_64-darwin = "1fspzw4zz8z9f91xhaw5h9r82q8anlk9ck3n3sms3vrb2g992xdr"; + aarch64-linux = "1hynvczhz946xz9ygrsax1ap3kyw5wm19mn6s9vcdw7wg8imvcyr"; + aarch64-darwin = "0kfr8i7z8x4ys2qsabfg78yvk42f0lnaax0l0wdiv94pp0iixijy"; + armv7l-linux = "0vcywp0cqd1rxvb2zf4h3l5sc9rbi88w1v087q12q265c56izzw8"; }.${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.84.2.23317"; + version = "1.85.1.23348"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 6013f8a699fe5..08d4eeb469d07 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , libxml2 , libpeas , glib @@ -19,15 +20,24 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-nc8YS1PcmtM37TJpGl691SlxJliyI2gSGJtNzkWbk9A="; + sha256 = "sha256-IpUBB7Viwc/nRfwzFllRiWoOmUxRZzS2BcxyM7W3oHI="; }; + patches = [ + # Fix missing include for libxml2 2.12 + # https://github.com/linuxmint/xed/pull/611 + (fetchpatch { + url = "https://github.com/linuxmint/xed/commit/28cb2e8136c1bfe90faf5f2341bde66156990778.patch"; + hash = "sha256-AqIb7Jj19SF3tIriPwn1JeB7niCmPbBsLE4ch2AX7fk="; + }) + ]; + nativeBuildInputs = [ meson pkg-config diff --git a/pkgs/applications/emulators/blink/default.nix b/pkgs/applications/emulators/blink/default.nix index bdaf36bf6615d..d939b99add88c 100644 --- a/pkgs/applications/emulators/blink/default.nix +++ b/pkgs/applications/emulators/blink/default.nix @@ -19,6 +19,15 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # Do not include --enable-static and --disable-shared flags during static compilation + dontAddStaticConfigureFlags = true; + + # Don't add --build and --host flags as they are not supported + configurePlatforms = lib.optionals stdenv.hostPlatform.isStatic [ ]; + + # ./configure script expects --static not standard --enable-static + configureFlags = lib.optional stdenv.hostPlatform.isStatic "--static"; + # 'make check' requires internet connection doCheck = true; checkTarget = "test"; diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 0688947f6ba19..6a17905ccb290 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.260"; + version = "0.261"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-spWnaf7xXK2xzgdUagsgN5doVrpJk7EA6fzYd9FlFm0="; + hash = "sha256-Tbsu4dYOBGwsPW94W0xN2+t4vqb1cWI7J1C2l6WU3qI="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index 9a18bf968582a..36bcae4196549 100644 --- a/pkgs/applications/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix @@ -1,12 +1,11 @@ { cmake , fetchFromGitHub , lib -, llvmPackages_16 +, llvmPackages_17 , cubeb , curl , extra-cmake-modules , ffmpeg -, fmt_8 , gettext , harfbuzz , libaio @@ -15,12 +14,12 @@ , libsamplerate , libXrandr , libzip +, makeWrapper , pkg-config , qtbase , qtsvg , qttools , qtwayland -, rapidyaml , SDL2 , soundtouch , strip-nondeterminism @@ -37,27 +36,26 @@ let pcsx2_patches = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2_patches"; - rev = "04d727b3bf451da11b6594602036e4f7f5580610"; - sha256 = "sha256-zrulsSMRNLPFvrC/jeYzl53i4ZvFQ4Yl2nB0bA6Y8KU="; + rev = "42d7ee72b66955e3bbd2caaeaa855f605b463722"; + sha256 = "sha256-Zd+Aeps2IWVX2fS1Vyczv/wAX8Z89XnCH1eqSPdYEw8="; }; in -llvmPackages_16.stdenv.mkDerivation rec { +llvmPackages_17.stdenv.mkDerivation rec { pname = "pcsx2"; - version = "1.7.5004"; + version = "1.7.5318"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-o+9VSuoZgTkS75rZ6qYM8ITD+0OcwXp+xh/hdUGpVK4="; + sha256 = "sha256-5SUlq3HQAzROG1yncA4u4XGVv+1I+s9FQ6LgJkiLSD0="; }; cmakeFlags = [ - "-DDISABLE_ADVANCE_SIMD=TRUE" - "-DUSE_SYSTEM_LIBS=ON" + "-DDISABLE_ADVANCE_SIMD=ON" "-DUSE_LINKED_FFMPEG=ON" - "-DDISABLE_BUILD_DATE=TRUE" + "-DDISABLE_BUILD_DATE=ON" ]; nativeBuildInputs = [ @@ -72,7 +70,6 @@ llvmPackages_16.stdenv.mkDerivation rec { buildInputs = [ curl ffmpeg - fmt_8 gettext harfbuzz libaio @@ -85,7 +82,6 @@ llvmPackages_16.stdenv.mkDerivation rec { qtsvg qttools qtwayland - rapidyaml SDL2 soundtouch vulkan-headers @@ -106,11 +102,22 @@ llvmPackages_16.stdenv.mkDerivation rec { strip-nondeterminism $out/bin/resources/patches.zip ''; - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ - vulkan-loader - ] ++ cubeb.passthru.backendLibs)}" - ]; + qtWrapperArgs = + let + libs = lib.makeLibraryPath ([ + vulkan-loader + ] ++ cubeb.passthru.backendLibs); + in [ + "--prefix LD_LIBRARY_PATH : ${libs}" + ]; + + # https://github.com/PCSX2/pcsx2/pull/10200 + # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run + postFixup = '' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/pcsx2-qt \ + --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi' + ''; meta = with lib; { description = "Playstation 2 emulator"; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index f4fe6f467abf8..18f28b03d9e04 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -28,17 +28,17 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.1053"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1100"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "28dd7d80af56701887dbb538b56aa58edaf39d91"; - sha256 = "09h4423z18q8r8fqcd5kv34iwmy9gkmpgw8an8myrhhvkmxi3zwg"; + rev = "06bff0159c9eddc5111859d1ca315708152ac61b"; + sha256 = "1fxslad3i6cbd4kcjal1pzbr472az834ahyg7k8yf34b7syljswq"; }; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; nugetDeps = ./deps.nix; diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 8a7c89f4dbd19..a8f5e5a132d1a 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -2,42 +2,47 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.5"; sha256 = "1l8vpw7dmkgll197i42r98ikkl0g08469wkl1kxkcv8f0allgah6"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.5"; sha256 = "0w1909yjg1s1h6zzxbfw1dazvlknpgk9v7d03ik7ihd14lxzr1i2"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.5"; sha256 = "14nr767zhxcqwis901sn5s9qala0wf2ip4pic3ncdvkhyhq6w9fs"; }) (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.0-rc2.1"; sha256 = "0pmc0fi2abn9qaqwx9lvqnd1a5a8lzp8zin72d3k3xjsh1w1g0n8"; }) (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.4"; sha256 = "1p7mz33a6dn6ghvwajxdghq15mn5f6isvvqzxcjbnhh3m5c1zhrz"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.0.4"; sha256 = "1yxand1h0ybwbykn12ixdanbp74rd5spcz8xifmzjmvisjzglvsi"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.5"; sha256 = "1zqp8whkvm95zxhjpwska7rhkbxjfkv2fz3821pn782931pn59ah"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.5"; sha256 = "1plr03dgq24gjlcx39qlbcg2ywh7in58yfkkq9snvnagh8yk3ifi"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.5"; sha256 = "0sn6c3mqvc62vhy8ssmz515wbcaq418qfrck67zysp2qzw5iyv9v"; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.0.5"; sha256 = "1z68j7xvjngdqfswnxnpqlv8qcgk41z9lfdfvknlckkb3g1kzhr6"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.5"; sha256 = "1n41g1z36sgvhfl7bdavc3j7ccr3qkbqjc4znimqazzyfifh0m99"; }) (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.5"; sha256 = "0a6a8lbpna3z5bcall7a953r3xjibcl90ic21gimwhipyp29sfn1"; }) (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; sha256 = "1ra1kd0kkblppr5zy7rzdbwllggrzvp9lkxblf9mg3y8rnp6fk83"; }) (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; }) - (fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0.2"; sha256 = "0b07rszfp87lj08bsni6vjynqcpfdwr8cqxpwy68620qki8w953l"; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0.2"; sha256 = "12bqmm0sdc5a1xxz1hffvpgpjc5m64cn7w45bd67wnapz2w943rv"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.5"; sha256 = "008pqpim91i6mya0nfn3g9gclh0dw5mqmhi2fdalbh62sa8a18xc"; }) + (fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0.3"; sha256 = "1v91g3wv4s3la09syrzk30q7vwyv5vh71zczddsanmp2gj2v90c4"; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0.3"; sha256 = "0iz0gr8zsxyky0gbb7yc57qp7qcyjpjl29ncpjzg897wxcnmsjg1"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.5"; sha256 = "1i6xpihpw32i9mywzzhw0nyc2gkifmri6ylila21y8xb0jdazdyv"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.5"; sha256 = "03rbx4msnl8jvw1017wi88rxvgg8iz7idy7wajp3nzk9m0c4pilx"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.5"; sha256 = "1bixdr5yzd9spyjc4n2kf1bwg52q3p5akj9xsr25xp310j3kgyxf"; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; }) (fetchNuGet { pname = "DynamicData"; version = "7.14.2"; sha256 = "07k79w4702masq71rk865mi3h1kaxamyp7dgl08ny4n22gg8482k"; }) - (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) - (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) + (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; sha256 = "1likxhccg4l4g4i65z4dfzp9059hij6h1q7prx2sgakvk8zzmw9k"; }) (fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.0.4"; sha256 = "1xizjlk34xi4z837j6lbv4mc5vfb8gimkxicxcz0012wkzlmmzb1"; }) (fetchNuGet { pname = "FSharp.Core"; version = "7.0.200"; sha256 = "1ji816r8idwjmxk8bzyq1z32ybz7xdg3nb0a7pnvqr8vys11bkgb"; }) (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; sha256 = "1rqcmdyzxz9kc0k8594hbpksjc23mkakmjybi4b8702qycxx0lrf"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; sha256 = "1b5ng37bwk75cifw7p1hzn8z6sswi8h7h510qgwlbvgmlrs5r0ga"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; sha256 = "1hyvmz7rfbrxbcpnwyvb64gdk1hifcpz3rln58yyb7g1pnbpnw2s"; }) (fetchNuGet { pname = "jp2masa.Avalonia.Flexbox"; version = "0.3.0-beta.4"; sha256 = "17847ssn15l755zmspvb69wsfbj9ayvy9xl8zgjx6wvvwp6x89cp"; }) - (fetchNuGet { pname = "LibHac"; version = "0.18.0"; sha256 = "19d5fqdcws0730580jlda6pdddprxcrhw7b3ybiiglabsr7bmgdv"; }) + (fetchNuGet { pname = "LibHac"; version = "0.19.0"; sha256 = "06fyfqxi92mz55adzkk2y56spvf0217icnri2s1gcpyvc5w2cc8l"; }) (fetchNuGet { pname = "MicroCom.CodeGenerator.MSBuild"; version = "0.11.0"; sha256 = "0ynvaq3faqh4pirl0l8l6xq2ikk3f27xw05i8vm3vwamgy4p7k2f"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) @@ -48,29 +53,30 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.7.0"; sha256 = "1lz3ha3pp58hd4y031z64slcf9rh7g1cgkrlrbhi4vpa67xhynnh"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.7.2"; sha256 = "09mf5kpxn1a1m8ciwklhh6ascx0yqpcs5r2hvmfj80j44n3qrwhm"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.0"; sha256 = "0sc96z969qfybq5njsqm8hwhqv8jj6gysyjq7n9r9km1nqnhazmi"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.0"; sha256 = "12xa4yx19j5q7nbisl57jla8x6pby964cr9xkv0qm4834x4zdd3h"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.0"; sha256 = "0hv1qb51v6frvhybwcn6m3haq768jgdx59p17jn217fbjiprq14s"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.0"; sha256 = "0cjdbi3ximvfz2nyp2vlxqskmscxw8drjighvy7dna3mi749isrh"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.3"; sha256 = "0njmg2lygnirnfjv9gck2f5lq4ly5rgws9cpf8qj3kwcwxfp0b9s"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.3"; sha256 = "1ayh85xqdq8rqjk2iqcn7iaczcl7d8qg6bxk0b4rgx59fmsmbqj7"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.3"; sha256 = "13cjqmf59k895q6gkd5ycl89mnpalckda7rhsdl11jdyr32hsfnv"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.3"; sha256 = "1pmhd0imh9wlhvbvvwjrpjsqvzagi2ly22nddwr4r0pi234khyz1"; }) (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "2.3.2"; sha256 = "115bm7dljchr7c02hiv1r3l21r22wpml1j26fyn2amaflaihpq4l"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.2"; sha256 = "08g9dpp766racnh90s1sy3ncl291majgq6v2604hfw1f6zkmbjqh"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.2"; sha256 = "0xdjkdnrvnaxqgg38y5w1l3jbppigg68cc8q9jn0p21vn48bgrxq"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.7.2"; sha256 = "1szsg1iy77f0caxzkk0ihpp4ifbfnbdbn8k0wbbhbdprxj8pr356"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; sha256 = "05392f41ijgn17y8pbjcx535l1k09krnq3xdp60kyq568sn6xk2i"; }) (fetchNuGet { pname = "MsgPack.Cli"; version = "1.0.1"; sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; }) + (fetchNuGet { pname = "NetCoreServer"; version = "7.0.0"; sha256 = "0rhc03cm9rq5d0dl5m3m2ia68b4q5bf4vycv5f475dh1as7sh37w"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) @@ -78,12 +84,12 @@ (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.1.0"; sha256 = "1z5g15npmsjszhfmkrdmp4ds7jpxzhxblss2rjl5mfn5sihy4cww"; }) - (fetchNuGet { pname = "OpenTK.Core"; version = "4.7.7"; sha256 = "1jyambm9lp0cnzy2mirv5psm0gvk2xi92k3r5jf0mi2jqmd2aphn"; }) - (fetchNuGet { pname = "OpenTK.Graphics"; version = "4.7.7"; sha256 = "1hrz76qlyw29cl5y917r65dnxwhcaswbq9ljzgc6fsnix4lngbvv"; }) - (fetchNuGet { pname = "OpenTK.Mathematics"; version = "4.7.7"; sha256 = "1xdagkfbs8nbs9lpqbr062pjmb5my1gj5yg2vbfw9xz238619lz2"; }) - (fetchNuGet { pname = "OpenTK.OpenAL"; version = "4.7.7"; sha256 = "1zqdk1iplqmchvm42k71z6y8fdz0lg2cd1xw9h0asf760qa9aq5z"; }) - (fetchNuGet { pname = "OpenTK.redist.glfw"; version = "3.3.8.30"; sha256 = "1zm1ngzg6p64x0abz2x9mnl9x7acc1hmk4d1svk1mab95pqbrgwz"; }) - (fetchNuGet { pname = "OpenTK.Windowing.GraphicsLibraryFramework"; version = "4.7.7"; sha256 = "1f33yqf5lr8qkza56xm1kqhs59v706yan2i3bkdlc56609gf8qy9"; }) + (fetchNuGet { pname = "OpenTK.Audio.OpenAL"; version = "4.8.1"; sha256 = "0rhjdl24f8682bfdcbkslxlsiga9yii81fkc1cmjy8a73wf27wvj"; }) + (fetchNuGet { pname = "OpenTK.Core"; version = "4.8.1"; sha256 = "1wmyyh4kpxsl9hg3zhjg9iafwv9d78fdn5prb7yz7hz2cmbsashx"; }) + (fetchNuGet { pname = "OpenTK.Graphics"; version = "4.8.1"; sha256 = "0kapiban123fl2054kf0ilsh1ria8dc05z20ig4xglw3rbvm386p"; }) + (fetchNuGet { pname = "OpenTK.Mathematics"; version = "4.8.1"; sha256 = "0gpzhc2l33ibc6dq8kncza9hyiv97yiby95vcxlcmwbqfwf68gln"; }) + (fetchNuGet { pname = "OpenTK.redist.glfw"; version = "3.3.8.39"; sha256 = "05z0hcignvzk8ffg6mn8m10sv5wppicibjz7zncsj3h3z8cin3vf"; }) + (fetchNuGet { pname = "OpenTK.Windowing.GraphicsLibraryFramework"; version = "4.8.1"; sha256 = "03s9lki64vm5w4xd4vj6qri3cxxwmwcgi4i8l1a1vy96np2a2vnq"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -136,9 +142,11 @@ (fetchNuGet { pname = "Ryujinx.GtkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0dri508x5kca2wk0mpgwg6fxj4n5n3kplapwdmlcpfcbwbmrrnyr"; }) (fetchNuGet { pname = "Ryujinx.PangoSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1bdxm5k54zs0h6n2dh20j5jlyn0yml9r8qr828ql0k8zl7yhlq40"; }) (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.28.1-build28"; sha256 = "0kn7f6cgvb2rsybiif6g7xkw1srmfr306zpv029lvi264dv6aj6l"; }) + (fetchNuGet { pname = "securifybv.PropertyStore"; version = "0.1.0"; sha256 = "1s7bga6989jdpz4mk4kf1ysgq13pwjmk21xf4rh4kj4b9psd6cwd"; }) + (fetchNuGet { pname = "securifybv.ShellLink"; version = "0.1.0"; sha256 = "1v52d01590m8y06bybis6hlg296wk3y7ilqyh01ram62v5wrjvq2"; }) (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.2"; sha256 = "0l28whcj3r8gmdg7vyb4sxbjdr12w5q9lqibclfrwrwhlx3rxhb0"; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.3"; sha256 = "03q6m6c323asqd8lji2ndm8wdqbi69vwq3ji0fgsscdmyzwb3wpq"; }) (fetchNuGet { pname = "Silk.NET.Core"; version = "2.16.0"; sha256 = "1mkqc2aicvknmpyfry2v7jjxh3apaxa6dmk1vfbwxnkysl417x0k"; }) (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; sha256 = "0sg5mxv7ga5pq6wc0lz52j07fxrcfmb0an30r4cxsxk66298z2wy"; }) (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; sha256 = "05918f6fl8byla2m7qjp7dvxww2rbpj2sqd4xq26rl885fmddfvf"; }) @@ -147,21 +155,26 @@ (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "1.0.4"; sha256 = "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"; }) (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; sha256 = "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.6"; sha256 = "1h61vk9ibavwwrxqgclzsxmchighvfaqlcqrj0dpi2fzw57f54c2"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.6"; sha256 = "0cg38xgddww1y93xrnbfn40sin63yl39j5zm7gm5pdgp5si0cf2n"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; sha256 = "1fp9h8c8k6sbsh48b69dc6461isd4dajq7yw5i7j6fhkas78q4zf"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.6"; sha256 = "02wpxwqwknhdhkl00in766samqfzi7r6jmhxs4d047v0fmygv1h8"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; sha256 = "1w2mwcwkqvrg4x4ybc4674xnkqwh1n2ihg520gqgpnqfc11ghc4n"; }) (fetchNuGet { pname = "SPB"; version = "0.0.4-build28"; sha256 = "1ran6qwzlkv6xpvnp7n0nkva0zfrzwlcxj7zfzz9v8mpicqs297x"; }) - (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.2"; sha256 = "0xkv2h80s4nz2yypiax30s1ws0yd6zdijf5rq1lqjcxaiggf6a7q"; }) - (fetchNuGet { pname = "Svg.Model"; version = "1.0.0.2"; sha256 = "0zdj69w5dxzwj4fqcsjfjjbc67x931f7qb32i1jsn2k91v904gsd"; }) - (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.2"; sha256 = "1877z97c8qbsr1adbc0hvfls03icgmzh4j3pjp8cfnxflxrxql6a"; }) + (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.3"; sha256 = "1m9jpz87hl074k111bi208az05a50f8ka44pn442pgf2741sih61"; }) + (fetchNuGet { pname = "Svg.Model"; version = "1.0.0.3"; sha256 = "1iwcyqynscjijaandl87agqncc3x3kbpwka63yzqljjph2d0wg2h"; }) + (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.3"; sha256 = "06jcw0qp74i5h1m7n6lssm2c4r7hnccwdbzvxix035pz78knv2mf"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "7.0.0"; sha256 = "08a2k2v7kdx8wmzl4xcpfj749yy476ggqsy4cps4iyqqszgyv0zc"; }) + (fetchNuGet { pname = "System.CodeDom"; version = "8.0.0"; sha256 = "0zyzd15v0nf8gla7nz243m1kff8ia6vqp471i3g7xgawgj5n21dv"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) @@ -174,26 +187,26 @@ (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.0"; sha256 = "1j4rsm36bnwqmh5br9mzmj0ikjnc39k26q6l9skjlrnw8hlngwy4"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.0"; sha256 = "15c717z4kspqxiwnia7dk1mj5gv7hg584q4x1xc7z1g0rnz28pwd"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.3"; sha256 = "1fls88ffq34j1gr6zay1crm27v3sjs5fa4mvj9akqjq05bxanlhk"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.Hashing"; version = "7.0.0"; sha256 = "0vilmb817wnw8w13kkps831p05zzc41dldigpbr3wqi0hsrf8ad9"; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; sha256 = "1hg5i9hiihj9x4d0mlvhfddmivzrhzz83dyh26fqw1nd8jvqccxk"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Management"; version = "7.0.2"; sha256 = "0mjdkzl459hnz0qg4m0xp2kwizsqgdc9vc3xk7y7cv0znhhbb7bc"; }) + (fetchNuGet { pname = "System.Management"; version = "8.0.0"; sha256 = "1zbwj6ii8axa4w8ymjzi9d9pj28nhswygahyqppvzaxypw6my2hz"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) @@ -268,7 +281,6 @@ (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix index 0353518855684..9d0eb1570287f 100644 --- a/pkgs/applications/emulators/sameboy/default.nix +++ b/pkgs/applications/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.15.8"; + version = "0.16"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "sha256-SBK+aYekEJreD0XBvYaU12eIKmm9JNYIpPt1XhUtH4c="; + sha256 = "sha256-sQVTCHOSc2N+Qs/rl0DfsUzg7P5Egws2UuNBQ9fpkoQ="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index b090864d0d00a..6eae243ce3b40 100644 --- a/pkgs/applications/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { pname = "visualboyadvance-m"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "sha256-XMb4+YPH1xgbiRC4vmooxALmjX2QURLWOGOwepdWI7o="; + sha256 = "sha256-r/LF9mYwKPwkIidMAb4k4B6Q2UYjW0TucKI5LJ2gjl0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 1bd1d6a8214d8..d8a154a167f01 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "8.20"; - url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; - hash = "sha256-SNa3a9ZDBaICBX+8GdkiwfSWJfbRqYJZJ8ChhXJzmYI="; + version = "9.0-rc1"; + url = "https://dl.winehq.org/wine/source/9.0/wine-${version}.tar.xz"; + hash = "sha256-GDd3V74ffxeGzopWqET2ZXKIH/z3RcC0yjTwmmDi8zA="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -116,8 +116,8 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases - version = "8.20"; - hash = "sha256-CiWTXjUR1+GY+MO7djHfVUH71zSo3lpH9IaqS5zCeJ8="; + inherit (unstable) version; + hash = "sha256-jjy4r9VEJsU7FJ7RmE8+cgHTAkZVGruNUD5hzmGSB8c="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index e0e022ebb4023..3fc8adde9b675 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/pkgs/applications/emulators/xemu/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.7.117"; + version = "0.7.118"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-R6BPDBMrVhxUkjMWK8Jz9vqEz5P3v62PIyulHp6Q+KM="; + hash = "sha256-IGzPxwNxuqMsZhQ63VUyDzPSBpAgc0U0oUjM/blEd7g="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/yuzu/sources.nix b/pkgs/applications/emulators/yuzu/sources.nix index 640bbcd50acd1..4952c74ac4b48 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-12-02 +# Last updated: 2023-12-14 { compatList = { - rev = "3447075b5b565adcef1de0b47dd32c33f3c52e75"; + rev = "fc974b6e78105774dae5f68e712a6beb51b9db1e"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; }; mainline = { - version = "1639"; - hash = "sha256:10wj8yrk4q3sq0fqj6qqd45sjsv0ch3ldbxayirzv002lqb62jcy"; + version = "1651"; + hash = "sha256:00cxyh3d18k17g982yqcbaq4b6bgs4kji0yz6i15h066aj15dimy"; }; ea = { - version = "4003"; - distHash = "sha256:1sr79h3v2nlkr114d14bry5bkgniw1kqq2bxjlzr5x9hlvavz710"; - fullHash = "sha256:0kx8f8h6l86prxm0v3fxmff43d6swmcrvzy5vg54b55zvqm1byr1"; + version = "4019"; + distHash = "sha256:1qd953bl216yxmaa6y0iil6pn2pn53k87qwagbmcd4l5h4aaqi7h"; + fullHash = "sha256:0na96hqfdd40q6drrlgak4qdsxs3wfizxhb8kf8qrbai3qfpx00v"; }; } diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index b6166f2586d44..6cbc47901562c 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.10.2"; + version = "2.11.1"; src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; rev = "v${version}"; - hash = "sha256-vDQHOv6ejp2aOQY0s80mC7x5sG6wB1/98/taw7aYEnE="; + hash = "sha256-Q+D5A4KVhVuas7sGy0CqN95cvTLAw5LWet/BECjJUPg="; }; - cargoHash = "sha256-xy/h2O7aTURt4t8sNRASLhMYtceQrZnOynwhfhaecDA="; + cargoHash = "sha256-RfBRm/YiTPxkAN8A+uAoN047DBHEVSL0isQfJgO1Bo0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/file-managers/yazi/default.nix b/pkgs/applications/file-managers/yazi/default.nix index cd0476c1e00d6..9f446b38d12aa 100644 --- a/pkgs/applications/file-managers/yazi/default.nix +++ b/pkgs/applications/file-managers/yazi/default.nix @@ -74,5 +74,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sxyazi/yazi"; license = licenses.mit; maintainers = with maintainers; [ xyenon matthiasbeyer ]; + mainProgram = "yazi"; }; } diff --git a/pkgs/applications/file-managers/ytree/default.nix b/pkgs/applications/file-managers/ytree/default.nix deleted file mode 100644 index 4ba320919ef35..0000000000000 --- a/pkgs/applications/file-managers/ytree/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv -, fetchurl -, ncurses -, readline -}: - -stdenv.mkDerivation rec { - pname = "ytree"; - version = "2.05"; - - src = fetchurl { - url = "https://han.de/~werner/${pname}-${version}.tar.gz"; - sha256 = "sha256-jPixUeSRO1t/epHf/VxzBhBqQkd+xE5x1ix19mq2Glc="; - }; - - buildInputs = [ - ncurses - readline - ]; - - # don't save timestamp, in order to improve reproducibility - postPatch = '' - substituteInPlace Makefile --replace 'gzip' 'gzip -n' - ''; - - installFlags = [ "DESTDIR=${placeholder "out"}" ]; - - preInstall = '' - mkdir -p $out/bin $out/share/man/man1 - ''; - - meta = with lib; { - description = "A curses-based file manager similar to DOS Xtree(TM)"; - homepage = "https://www.han.de/~werner/ytree.html"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - }; -} -# TODO: X11 support diff --git a/pkgs/applications/finance/cryptowatch/default.nix b/pkgs/applications/finance/cryptowatch/default.nix deleted file mode 100644 index 08c260c8b8678..0000000000000 --- a/pkgs/applications/finance/cryptowatch/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, wrapGAppsHook -, dbus -, libGL -, libX11 -, libXcursor -, libXi -, libXrandr -, udev -, unzip -, alsa-lib -}: - -stdenv.mkDerivation rec { - pname = "cryptowatch-desktop"; - version = "0.7.1"; - - src = fetchurl { - url = "https://cryptowat.ch/desktop/download/linux/${version}"; - hash = "sha256-ccyHfjp00CgQH+3SiDWx9yE1skOj0RWxnBomHWY/IaU="; - }; - - unpackPhase = "unzip $src"; - - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook - unzip - ]; - - buildInputs = [ - dbus - udev - alsa-lib - ]; - - sourceRoot = "."; - - installPhase = '' - install -m755 -D cryptowatch_desktop $out/bin/cryptowatch_desktop - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libX11 libXcursor libXrandr libXi ]}" - ) - ''; - - meta = with lib; { - homepage = "https://cryptowat.ch"; - description = "Application for visualising real-time cryptocurrency market data"; - platforms = platforms.linux; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ livnev kashw2 ]; - }; -} diff --git a/pkgs/applications/finance/denaro/default.nix b/pkgs/applications/finance/denaro/default.nix index 4da73b2a4e17b..f322d7d89a14a 100644 --- a/pkgs/applications/finance/denaro/default.nix +++ b/pkgs/applications/finance/denaro/default.nix @@ -14,17 +14,17 @@ buildDotnetModule rec { pname = "denaro"; - version = "2023.9.2"; + version = "2023.11.0"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "Denaro"; rev = version; - hash = "sha256-3Atdi0R7OHpP1HUBWGu2Y4L8hr9jLPMIFYCEWeoEq6A="; + hash = "sha256-buMoB6ZTmzGjjSCOfdUvKbJ7xJmK/zHH8sz5iO3SJXo="; }; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; projectFile = "NickvisionMoney.GNOME/NickvisionMoney.GNOME.csproj"; nugetDeps = ./deps.nix; @@ -44,10 +44,10 @@ buildDotnetModule rec { # Denaro switches installation tool frequently (bash -> just -> cake) # For maintainability, let's do it ourselves postInstall = '' - substituteInPlace NickvisionMoney.Shared/org.nickvision.money.desktop.in --replace '@EXEC@' "NickvisionMoney.GNOME" + substituteInPlace NickvisionMoney.Shared/Linux/org.nickvision.money.desktop.in --replace '@EXEC@' "NickvisionMoney.GNOME" install -Dm444 NickvisionMoney.Shared/Resources/org.nickvision.money.svg -t $out/share/icons/hicolor/scalable/apps/ install -Dm444 NickvisionMoney.Shared/Resources/org.nickvision.money-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/ - install -Dm444 NickvisionMoney.Shared/org.nickvision.money.desktop.in -T $out/share/applications/org.nickvision.money.desktop + install -Dm444 NickvisionMoney.Shared/Linux/org.nickvision.money.desktop.in -T $out/share/applications/org.nickvision.money.desktop ''; runtimeDeps = [ diff --git a/pkgs/applications/finance/denaro/deps.nix b/pkgs/applications/finance/denaro/deps.nix index be415c6d57b3a..612c3114ab915 100644 --- a/pkgs/applications/finance/denaro/deps.nix +++ b/pkgs/applications/finance/denaro/deps.nix @@ -2,48 +2,45 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Ace4896.DBus.Services.Secrets"; version = "1.1.0"; sha256 = "03rs3f71vgzk3pp0mx83rx6aqg2aq7xwk0p42mj5701m3592x49d"; }) - (fetchNuGet { pname = "Cake.Tool"; version = "3.1.0"; sha256 = "1kv9zz0qsx40wiygydw5z6vkj8hfayvgy9bsii2lamdas9z0vmbc"; }) - (fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; }) + (fetchNuGet { pname = "Ace4896.DBus.Services.Secrets"; version = "1.2.0"; sha256 = "1i1rwv8z2dx0mjib7vair2w7ylngmrcpbd012sdlpvdjpx0af0bn"; }) + (fetchNuGet { pname = "Cake.Tool"; version = "3.2.0"; sha256 = "0jvf3r0rr15q650182c3y6a4c21k84rzl2f0nida878j6fhmk6v7"; }) + (fetchNuGet { pname = "Docnet.Core"; version = "2.6.0"; sha256 = "1b1nj984ly4zgj28fri1a6ych9sdiacxkms8pvzsclvyxkf0ri8m"; }) (fetchNuGet { pname = "FuzzySharp"; version = "2.0.2"; sha256 = "1xq3q4s9d5p1yn4j91a90hawk9wcrz1bl6zj9866y01yx9aamr8s"; }) - (fetchNuGet { pname = "GetText.NET"; version = "1.8.7"; sha256 = "0djn5sc7p33ayjmxmxs4hqagh51bg70wqs6mwbhlhsrc67bvgj9a"; }) - (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.4.0"; sha256 = "1wy780mwvl7n1kr85r2icwsz9p3vsw749603x0wm3ka5ywbzv91k"; }) - (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.4.0"; sha256 = "11rg8hgran23b4m1116sfvfss0fgz874imafrv3h9w7c76f6hhci"; }) - (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.4.0"; sha256 = "101qr6kijslzqd6dcmpjzrbdp8nr6ibi8958frvkpxifqa4xyp4c"; }) - (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.4.0"; sha256 = "1bws3zry4awy73lwzllbdljl8wybmxfm870m175wl38c7pa18sav"; }) - (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.4.0"; sha256 = "05maiqg2qxsg56zb8zamv241gqkskli8laa7i0dxl3f93ddc78f6"; }) - (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.4.0"; sha256 = "1gy8gx7vy070nc2afj1zsn3d004y9d3gwn7zdj9g2fbhavbc4snk"; }) - (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.4.0"; sha256 = "05q00p06kn97143az2xi5zhfpi30qqcds1n1zfj87gi5w0jla4ib"; }) - (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.4.0"; sha256 = "06vrkjyzj4rjvlni3ixj12zpky2mah8v1q8nbbkfwca08k5hdz7p"; }) - (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.4.0"; sha256 = "06b2c35ynmkknk5zbhs75081dki0zm165xa659mg8i88cyxsgrh4"; }) - (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.4.0"; sha256 = "1hwmd3j4gllzjwkqq3m4wbl3v7hh2nsa7i1d2ziw3fvgbnbnb1vi"; }) - (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.4.0"; sha256 = "1r8hkr7vm32cjmw092l67kaysqa5jzyn7v518502nljlm9ivil6f"; }) - (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.4.0"; sha256 = "1wyq9s18gfs73z01gaqm87i7h71ir2n0jz1dyi26hj6b3qp0p34a"; }) - (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.4.0"; sha256 = "0qifms5nlljzccgzvnyx5vcdgvfdyp2q7s0zdglay5x5g4zrl8fv"; }) - (fetchNuGet { pname = "GirCore.PangoCairo-1.0"; version = "0.4.0"; sha256 = "1vn8bgi9ijnw25id5vis15gv9h0d4y03scr4jv03scisv411jrl8"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.4-preview.84"; sha256 = "1kk2ja6lsfmx00sliniyky9fimrk9pcq2ql7j72310kx3qaad45v"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.4-preview.84"; sha256 = "0q5nmqhvdyg112c6q5h2h407d11g7sickbrn3fc5036n7svij13z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.4-preview.84"; sha256 = "1jkkjj2p8wiabc6m5m88kf1ykq5wdjihyn27279mvw8vyrp4zp5d"; }) + (fetchNuGet { pname = "GetText.NET"; version = "1.9.14"; sha256 = "18z4cf0dldcf41z8xgj3gdlvj9w5a9ikgj72623r0i740ndnl094"; }) + (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.5.0-preview.3"; sha256 = "090kg5v99myd7hi49cz933cl36hk5n586ywy78gf5djn5im3v19l"; }) + (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.5.0-preview.3"; sha256 = "0bh1h2hr6givrq6096bvzcsg4lab1hlm7r7h4bqifbw0zmmcfb7k"; }) + (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.5.0-preview.3"; sha256 = "194p44gd7r69x70j3qynv5v8awlyxmdazmzpwzgj5ayy2xpdk3hy"; }) + (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.5.0-preview.3"; sha256 = "09p097nvs7vi7l14l024m39qyhg1gyqihanq7zv66xqys4hzim1g"; }) + (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.5.0-preview.3"; sha256 = "0lspyra1g1rd8hj3f3daxspin5dhgplzgjh4jwhlgzzn648942j0"; }) + (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.5.0-preview.3"; sha256 = "090svrddgpliks5r29yncih3572w7gdc552nl16qbviqbmhr0lbs"; }) + (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.5.0-preview.3"; sha256 = "1wxwf24gabd69yxpnhv30rn7pcv49w885jdw3nqbrakl7pvv9fza"; }) + (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.5.0-preview.3"; sha256 = "0iajydyx79f3khx0fhv8izbxlzxwn6gpps2xzmi9c4v98ly221j3"; }) + (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.5.0-preview.3"; sha256 = "114fbgxils50jdy891nwj70yr43lnwgbq9fzxqzywd1kk70k7mww"; }) + (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.5.0-preview.3"; sha256 = "0f5s6f6pwc9vc3nm7xfaa06z2klgpg4rv5cdf0cwis3vlncd7dnj"; }) + (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.5.0-preview.3"; sha256 = "1fn0b8lwlrmjm9phjq4amqnq3q70fl214115652cap5rz4rjmpgg"; }) + (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.5.0-preview.3"; sha256 = "0xska2l44l0j38mlgmrwly1qal9wzbv2w2jjj8gn90sxbygb8zky"; }) + (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.5.0-preview.3"; sha256 = "0ccw3bd3kl24mnxbjzhya11i0ln6g1g7q876pyy54cwh48x4mdia"; }) + (fetchNuGet { pname = "GirCore.PangoCairo-1.0"; version = "0.5.0-preview.3"; sha256 = "0lds340p5cci7sjp58nh94jxkjvzfky9cbs2h4q98hglxndjm7r9"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; sha256 = "1rqcmdyzxz9kc0k8594hbpksjc23mkakmjybi4b8702qycxx0lrf"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; sha256 = "0i9gaiyjgmcpnfn1fixbxq8shqlh4ahng7j4dxlf38zlln1f6h80"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; sha256 = "1b5ng37bwk75cifw7p1hzn8z6sswi8h7h510qgwlbvgmlrs5r0ga"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; sha256 = "1hyvmz7rfbrxbcpnwyvb64gdk1hifcpz3rln58yyb7g1pnbpnw2s"; }) (fetchNuGet { pname = "Hazzik.Qif"; version = "1.0.3"; sha256 = "16v6cfy3pa0qy699v843pss3418rvq5agz6n43sikzh69vzl2azy"; }) - (fetchNuGet { pname = "LiveChartsCore"; version = "2.0.0-beta.910"; sha256 = "0yw54yd1kp4j8js1g405m4lvv84zx4zkx4m64iiqsc765a4alvvy"; }) - (fetchNuGet { pname = "LiveChartsCore.SkiaSharpView"; version = "2.0.0-beta.910"; sha256 = "1ifhvcsa0319mip98xbmlib3k7fkn24igfxxyfi2d31rajqv970r"; }) - (fetchNuGet { pname = "Markdig"; version = "0.31.0"; sha256 = "0iic44i47wp18jbbpl44iifhj2mfnil9gakkw3bzp7zif3rhl19m"; }) - (fetchNuGet { pname = "Meziantou.Framework.Win32.CredentialManager"; version = "1.4.2"; sha256 = "0x7xlym8jsm0zgbb75ip74gnw3fssb30phc48xf35yx6i0sfb2dh"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.5"; sha256 = "11gkdlf2apnzvwfd7bxdhjvb4qd0p2ridp4rrz44f7h76x1sb0gk"; }) + (fetchNuGet { pname = "LiveChartsCore"; version = "2.0.0-rc2"; sha256 = "02ywlv67525qnnx7x2xaz52gs8195zvvjlmcz7ql1gff05pkcb15"; }) + (fetchNuGet { pname = "LiveChartsCore.SkiaSharpView"; version = "2.0.0-rc2"; sha256 = "1p35mli6wxq5jn7h27564a8dgv4qyj95isihs9lbmvs1pr7m785l"; }) + (fetchNuGet { pname = "Markdig"; version = "0.33.0"; sha256 = "1dj06wgdqmjji4nfr1dysz7hwp5bjgsrk9qjkdq82d7gk6nmhs9r"; }) + (fetchNuGet { pname = "Meziantou.Framework.Win32.CredentialManager"; version = "1.4.5"; sha256 = "1ikjxj6wir2jcjwlmd4q7zz0b4g40808gx59alvad31sb2aqp738"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.0"; sha256 = "05qjnzk1fxybks92y93487l3mj5nghjcwiy360xjgk3jykz3rv39"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; sha256 = "05392f41ijgn17y8pbjcx535l1k09krnq3xdp60kyq568sn6xk2i"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Nickvision.Aura"; version = "2023.9.3"; sha256 = "0j3fqjl8nskqqwmkc41h3pgnvl63nq9w443b571j154xibly5iw7"; }) - (fetchNuGet { pname = "Nickvision.GirExt"; version = "2023.7.3"; sha256 = "1ahf4mld9khk2gaja30zfcjmhclz2l2nims0q4l7jk2nm9p7rzi9"; }) + (fetchNuGet { pname = "Nickvision.Aura"; version = "2023.11.3"; sha256 = "06g63k1p8maskg8hicjbi00fyyxh95fkykvv205p9vr0803bjqrd"; }) + (fetchNuGet { pname = "Octokit"; version = "9.0.0"; sha256 = "0kw49w1hxk4d2x9598012z9q1yr3ml5rm06fy1jnmhy44s3d3jp5"; }) (fetchNuGet { pname = "OfxSharp.NetStandard"; version = "1.0.0"; sha256 = "1v7yw2glyywb4s0y5fw306bzh2vw175bswrhi5crvd92wf93makj"; }) - (fetchNuGet { pname = "PdfSharpCore"; version = "1.3.56"; sha256 = "0a01b2a14gygh25rq3509rky85331l8808q052br2fzidhb2vc10"; }) - (fetchNuGet { pname = "QuestPDF"; version = "2023.5.1"; sha256 = "1yfjwb7aj975aars7mcp1dxvarxl8aq122bndpw808b4cx3058gl"; }) + (fetchNuGet { pname = "PdfSharpCore"; version = "1.3.62"; sha256 = "1wxm642fx0pgiidd5x35iifayq7nicykycpwpvs0814xfjm0zw63"; }) + (fetchNuGet { pname = "QuestPDF"; version = "2023.10.2"; sha256 = "08jy42k8nxbkbdc2z013vk28r5ckmg7lpzvnah0shrjmwfq34v4j"; }) (fetchNuGet { pname = "ReadSharp.Ports.SgmlReader.Core"; version = "1.0.0"; sha256 = "0pcvlh0gq513vw6y12lfn90a0br56a6f26lvppcj4qb839zmh3id"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) @@ -63,21 +60,16 @@ (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; }) (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta17"; sha256 = "1qm8q82wzj54nbv63kx3ybln51k47sl18hia3jnzk1zrb6wdsw9a"; }) - (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.3"; sha256 = "12qb0r7v2v91vw8q8ygr67y527gwhbas6d6zdvrv4ksxwjx9dzp9"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.4-preview.84"; sha256 = "1isyjmmfqzbvqiypsvvnqrwf6ifr2ypngzvzj41m5nbk1jr8nn6m"; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.4-preview.84"; sha256 = "132n0sq2fjk53mc89yx6qn20w194145sv9367s623di7ysz467br"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.4-preview.84"; sha256 = "0vqwc2wh8brzn99cc61qgcyf3gd8vqlbdkjcmc3bcb07bc8k16v7"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.4-preview.84"; sha256 = "0m48d87cp2kvrhxvykxnhbzgm7xrw8jkdagvma80bag5gzdiicy2"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.5"; sha256 = "0xnzpkhm9z09yay76wxgn4j8js260pansx8r10lrksxv2b4b0n4x"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.5"; sha256 = "03181hahmxv8jlaikx0nkzfc2q1l1cdp3chgx5q6780nhqyjkhhx"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.5"; sha256 = "1chij7jlpi2mdm55chrkn8bmlda5qb3q6idkljgc3rz26n6c2l5b"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.5"; sha256 = "11xah1nfzryh52zfwhlvfm2ra7d3an5ygff2brylp75wa685gm7g"; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.0.2"; sha256 = "1r654m3ga9al9q4qjr1104rp6lk7j9blmf4j0104zq8893hhq727"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; sha256 = "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.6"; sha256 = "1h61vk9ibavwwrxqgclzsxmchighvfaqlcqrj0dpi2fzw57f54c2"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.6"; sha256 = "0cg38xgddww1y93xrnbfn40sin63yl39j5zm7gm5pdgp5si0cf2n"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; sha256 = "1fp9h8c8k6sbsh48b69dc6461isd4dajq7yw5i7j6fhkas78q4zf"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; sha256 = "1w2mwcwkqvrg4x4ybc4674xnkqwh1n2ihg520gqgpnqfc11ghc4n"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.6"; sha256 = "15v2x7y4k7cl47a9jccbvgbwngwi5dz6qhv0cxpcasx4v5i9aila"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; sha256 = "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.6"; sha256 = "0dl5an15whs4yl5hm2wibzbfigzck0flah8a07k99y1bhbmv080z"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.6"; sha256 = "1jx8d4dq5w2951b7w722gnxbfgdklwazc48kcbdzylkglwkrqgrq"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) @@ -87,6 +79,7 @@ (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.0"; sha256 = "1j4rsm36bnwqmh5br9mzmj0ikjnc39k26q6l9skjlrnw8hlngwy4"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) @@ -99,6 +92,7 @@ (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { pname = "System.Net.Requests"; version = "4.3.0"; sha256 = "0pcznmwqqk0qzp0gf4g4xw7arhb0q8v9cbzh3v8h8qp6rjcr339a"; }) @@ -114,7 +108,6 @@ (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) @@ -128,7 +121,6 @@ (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index ba587bb763652..ca599d34a4686 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -76,14 +76,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.28.13"; + version = "3.28.14"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-5UHyRxWFqhTq97VNb8AU8QYGaY0lmGB8bo8yXp1vnFQ="; + hash = "sha256-BiBrnma6HlaRF2kC/AwbdhRaZOYrJ7lzDLdJfjkDmfk="; }; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 8bc888bca9183..5322b1fb3441c 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -77,14 +77,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.1"; + version = "3.34.2"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-y+MATjhGUh0Qu4mNRALmP04Zd2/ozvaJnJDdM38Cy+w="; + hash = "sha256-RKxIJpp0lmRqyMYJuX2U4/GJh0FTnklFOcUft6LsuHc="; }; passthru = { diff --git a/pkgs/applications/gis/qmapshack/default.nix b/pkgs/applications/gis/qmapshack/default.nix index 3460f60d2b63d..4fca64f0dde5d 100644 --- a/pkgs/applications/gis/qmapshack/default.nix +++ b/pkgs/applications/gis/qmapshack/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qmapshack"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "Maproom"; repo = "qmapshack"; rev = "V_${version}"; - hash = "sha256-qG/fiR2J5wQZaR+xvBGjdp3L7viqki2ktkzBUf6fZi8="; + hash = "sha256-wqztKmaUxY3qd7IgPM7kV7x0BsrTMTX3DbcdM+lsarI="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index f396ded7e13b8..7639838a10a52 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "saga"; - version = "9.2.0"; + version = "9.3.0"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; - sha256 = "sha256-jHZi1c1M5WQfqBmtIvI7S9mWNXmzGUsvgJICvXbSjVc="; + sha256 = "sha256-zBdp4Eyzpc21zhA2+UD6LrXNH+sSfb0avOscxCbGxjE="; }; sourceRoot = "saga-${version}/saga-gis"; diff --git a/pkgs/applications/gis/spatialite-gui/default.nix b/pkgs/applications/gis/spatialite-gui/default.nix index 76014887d2b8a..b33818e354867 100644 --- a/pkgs/applications/gis/spatialite-gui/default.nix +++ b/pkgs/applications/gis/spatialite-gui/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gaia-gis.it/fossil/spatialite_gui"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; + maintainers = teams.geospatial.members; mainProgram = "spatialite_gui"; }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index d248b845ddf00..8d6bcce59254a 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -49,13 +49,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-21"; + version = "7.1.1-24"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-DqVonNh6bFNK91Pd6MwIO1yMrshfGAWNWPpHHQUA2sQ="; + hash = "sha256-oQ/g2/OhZWKvh//QevYsyi8uNwgo1yuihT5728eVKF8="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 6a8e973c1bebd..7f8d9be53b858 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , cmake , boost -, cgal_5 +, cgal , eigen , flann , gdal @@ -41,7 +41,7 @@ mkDerivation rec { buildInputs = [ boost - cgal_5 + cgal flann gdal gmp @@ -95,6 +95,15 @@ mkDerivation rec { dontWrapGApps = true; + postInstall = '' + install -Dm444 $src/snap/gui/{ccViewer,cloudcompare}.png -t $out/share/icons/hicolor/256x256/apps + install -Dm444 $src/snap/gui/{ccViewer,cloudcompare}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/{ccViewer,cloudcompare}.desktop \ + --replace 'Exec=cloudcompare.' 'Exec=' \ + --replace 'Icon=''${SNAP}/meta/gui/' 'Icon=' \ + --replace '.png' "" + ''; + # fix file dialogs crashing on non-NixOS (and avoid double wrapping) preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") diff --git a/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch b/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch deleted file mode 100644 index c461d8a642912..0000000000000 --- a/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp -index 189737908..a2a479693 100644 ---- a/plug-ins/pdf/pdf-import.cpp -+++ b/plug-ins/pdf/pdf-import.cpp -@@ -152,12 +152,12 @@ public : - void - updateLineDash (GfxState *state) - { -- double *dashPattern; -- int dashLength; -- double dashStart; -- -- state->getLineDash (&dashPattern, &dashLength, &dashStart); -- this->dash_length = dashLength ? dashPattern[0] * scale : 1.0; -+ const double *dashPattern=NULL; -+ int dashLength=0; -+ double dashStart=0; -+ const std::vector<double> &dash = state->getLineDash(&dashStart); // > Poppler 22.09 ... -+ dashPattern = dash.data(); -+ dashLength = dash.size(); - - if (dashLength == 0) - this->line_style = DIA_LINE_STYLE_SOLID; -@@ -318,10 +318,11 @@ public : - //FIXME: Dia is really unhappy about zero size fonts - if (!(state->getFontSize() > 0.0)) - return; -- GfxFont *f = state->getFont(); -+ const std::shared_ptr<GfxFont> f = state->getFont(); // poppler 22.05 ... header changed -+ gconstpointer f1 = &f; // GLib typedef const void * gconstpointer; - - // instead of building the same font over and over again -- if (g_hash_table_lookup (this->font_map, f)) { -+ if (g_hash_table_lookup (this->font_map, f1)) { - ++font_map_hits; - return; - } -@@ -333,8 +334,9 @@ public : - gchar *family = g_strdup (f->getFamily() ? f->getFamily()->c_str() : "sans"); - - // we are (not anymore) building the same font over and over again -+ f1 = &f; - g_print ("Font 0x%x: '%s' size=%g (* %g)\n", -- GPOINTER_TO_INT (f), family, state->getTransformedFontSize(), scale); -+ GPOINTER_TO_INT (f1), family, state->getTransformedFontSize(), scale); - - // now try to make a fontname Dia/Pango can cope with - // strip style postfix - we already have extracted the style bits above -@@ -354,7 +356,9 @@ public : - fsize *= fabs(fm[3] / fm[0]); - font = dia_font_new (family, style, fsize * scale / 0.8); - -- g_hash_table_insert (this->font_map, f, font); -+ f1 = &f; -+ gpointer f2 = (gpointer)f1; // GLib typedef void* gpointer; -+ g_hash_table_insert (this->font_map, f2, font); - g_free (family); - } - void updateTextShift(GfxState *state, double shift) -@@ -721,11 +725,12 @@ DiaOutputDev::drawString(GfxState *state, GooString *s) - return; - if (!(state->getFontSize() > 0.0)) - return; -- font = (DiaFont *)g_hash_table_lookup (this->font_map, state->getFont()); -+ gconstpointer f_1 = &state->getFont(); -+ font = (DiaFont *)g_hash_table_lookup (this->font_map, f_1); - - // we have to decode the string data first - { -- GfxFont *f = state->getFont(); -+ const std::shared_ptr<GfxFont> f = state->getFont(); - const char *p = s->c_str(); - CharCode code; - int j = 0, m, n; -@@ -870,8 +875,8 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_ - std::unique_ptr<PDFDoc> doc; - GooString *fileName = new GooString(filename); - // no passwords yet -- GooString *ownerPW = NULL; -- GooString *userPW = NULL; -+ const std::optional<GooString> ownerPW; -+ const std::optional<GooString> userPW; - gboolean ret = FALSE; - - // without this we will get strange crashes (at least with /O2 build) -@@ -899,6 +904,7 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_ - delete diaOut; - ret = TRUE; - } -+ doc.reset(); - delete fileName; - - return ret; diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index fd767e356f12c..c27cbf94476b5 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -41,6 +41,12 @@ rustPlatform.buildRustPackage rec { AppKit ]; + postInstall = '' + install -Dm444 assets/epick.desktop -t $out/share/applications + install -Dm444 assets/icon.svg $out/share/icons/hicolor/scalable/apps/epick.svg + install -Dm444 assets/icon.png $out/share/icons/hicolor/48x48/apps/epick.png + ''; + postFixup = lib.optionalString stdenv.isLinux '' patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]} ''; diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 1ac1666f8f40c..5491305fad2c8 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -1,17 +1,14 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitLab , alsa-lib -, bzip2 , fftw , freeglut , freetype , glew , libjack2 -, libGL -, libGLU , libjpeg , liblo -, libpng , libsndfile , libtiff , ode @@ -19,12 +16,11 @@ , openssl , racket_7_9 , scons -, zlib }: let racket = racket_7_9; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fluxus"; version = "0.19"; src = fetchFromGitLab { @@ -53,6 +49,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons ]; patches = [ ./fix-build.patch ]; + postPatch = '' + substituteInPlace src/Unicode.cpp \ + --replace "(byte)" "(unsigned char)" + ''; sconsFlags = [ "RacketPrefix=${racket}" "RacketInclude=${racket}/include/racket" @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = "http://www.pawfal.org/fluxus/"; maintainers = [ maintainers.brainrape ]; - broken = true; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/gimp/plugins/patches/focusblur-glib.patch b/pkgs/applications/graphics/gimp/plugins/patches/focusblur-glib.patch deleted file mode 100644 index b1079ab366043..0000000000000 --- a/pkgs/applications/graphics/gimp/plugins/patches/focusblur-glib.patch +++ /dev/null @@ -1,200 +0,0 @@ -ls diff --git focusblur-3.2.6/src/aaa.h focusblur-3.2.6/src/aaa.h -index 4a6d90b..c74cab2 100644 ---- focusblur-3.2.6/src/aaa.h -+++ focusblur-3.2.6/src/aaa.h -@@ -19,8 +19,7 @@ - #ifndef __AAA_H__ - #define __AAA_H__ - --#include <glib/gmacros.h> --#include <glib/gtypes.h> -+#include <glib.h> - - - G_BEGIN_DECLS -diff --git focusblur-3.2.6/src/brush.h focusblur-3.2.6/src/brush.h -index 685b253..8778fec 100644 ---- focusblur-3.2.6/src/brush.h -+++ focusblur-3.2.6/src/brush.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_BRUSH_H__ - #define __FOCUSBLUR_BRUSH_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - #include "focusblurtypes.h" - - G_BEGIN_DECLS -diff --git focusblur-3.2.6/src/depthmap.h focusblur-3.2.6/src/depthmap.h -index 78f5e99..baee540 100644 ---- focusblur-3.2.6/src/depthmap.h -+++ focusblur-3.2.6/src/depthmap.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_DEPTHMAP_H__ - #define __FOCUSBLUR_DEPTHMAP_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - - #include "focusblurtypes.h" - #include "focusblurenums.h" -diff --git focusblur-3.2.6/src/diffusion.h focusblur-3.2.6/src/diffusion.h -index 07ffe4b..3c1e4b9 100644 ---- focusblur-3.2.6/src/diffusion.h -+++ focusblur-3.2.6/src/diffusion.h -@@ -23,7 +23,7 @@ - #define __FOCUSBLUR_DIFFUSION_H__ - - --#include <glib/gtypes.h> -+#include <glib.h> - - #include "focusblur.h" - #include "focusblurtypes.h" -diff --git focusblur-3.2.6/src/fftblur.h focusblur-3.2.6/src/fftblur.h -index 124bcba..cd809fa 100644 ---- focusblur-3.2.6/src/fftblur.h -+++ focusblur-3.2.6/src/fftblur.h -@@ -23,8 +23,7 @@ - #define __FOCUSBLUR_FFTBLUR_H__ - - --#include <glib/gmacros.h> --#include <glib/gtypes.h> -+#include <glib.h> - #include <libgimpwidgets/gimpwidgetstypes.h> - - #include "focusblurparam.h" -diff --git focusblur-3.2.6/src/fftblurbuffer.h focusblur-3.2.6/src/fftblurbuffer.h -index b34d682..42e6380 100644 ---- focusblur-3.2.6/src/fftblurbuffer.h -+++ focusblur-3.2.6/src/fftblurbuffer.h -@@ -28,8 +28,7 @@ - #endif - #include <fftw3.h> - --#include <glib/gmacros.h> --#include <glib/gtypes.h> -+#include <glib.h> - #include <gtk/gtkstyle.h> - #include <libgimp/gimptypes.h> - #include <libgimpwidgets/gimpwidgetstypes.h> -diff --git focusblur-3.2.6/src/fftblurproc.h focusblur-3.2.6/src/fftblurproc.h -index 495572d..10a34f4 100644 ---- focusblur-3.2.6/src/fftblurproc.h -+++ focusblur-3.2.6/src/fftblurproc.h -@@ -23,8 +23,7 @@ - #define __FOCUSBLUR_FFTBLUR_PROC_H__ - - --#include <glib/gmacros.h> --#include <glib/gtypes.h> -+#include <glib.h> - - #include "focusblurtypes.h" - -diff --git focusblur-3.2.6/src/focusblur.h focusblur-3.2.6/src/focusblur.h -index 54ca40a..d7e13a6 100644 ---- focusblur-3.2.6/src/focusblur.h -+++ focusblur-3.2.6/src/focusblur.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_H__ - #define __FOCUSBLUR_H__ - --#include <glib/gmacros.h> -+#include <glib.h> - - G_BEGIN_DECLS - -diff --git focusblur-3.2.6/src/focusblurparam.h focusblur-3.2.6/src/focusblurparam.h -index 64c887b..32865b4 100644 ---- focusblur-3.2.6/src/focusblurparam.h -+++ focusblur-3.2.6/src/focusblurparam.h -@@ -22,8 +22,7 @@ - #ifndef __FOCUSBLUR_PARAM_H__ - #define __FOCUSBLUR_PARAM_H__ - --#include <glib/gmacros.h> --#include <glib/gtypes.h> -+#include <glib.h> - #include <gtk/gtkstyle.h> - #include <libgimp/gimptypes.h> - -diff --git focusblur-3.2.6/src/focusblurstock.h focusblur-3.2.6/src/focusblurstock.h -index 15f3603..cfc0567 100644 ---- focusblur-3.2.6/src/focusblurstock.h -+++ focusblur-3.2.6/src/focusblurstock.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_STOCK_H__ - #define __FOCUSBLUR_STOCK_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - - G_BEGIN_DECLS - -diff --git focusblur-3.2.6/src/focusblurtypes.h focusblur-3.2.6/src/focusblurtypes.h -index 0954c60..1531c84 100644 ---- focusblur-3.2.6/src/focusblurtypes.h -+++ focusblur-3.2.6/src/focusblurtypes.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_TYPES_H__ - #define __FOCUSBLUR_TYPES_H__ - --#include <glib/gmacros.h> -+#include <glib.h> - - - G_BEGIN_DECLS -diff --git focusblur-3.2.6/src/interface.h focusblur-3.2.6/src/interface.h -index 6defd27..e819c60 100644 ---- focusblur-3.2.6/src/interface.h -+++ focusblur-3.2.6/src/interface.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_INTERFACE_H__ - #define __FOCUSBLUR_INTERFACE_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - - #include "focusblurtypes.h" - -diff --git focusblur-3.2.6/src/render.h focusblur-3.2.6/src/render.h -index febbd24..a501f1e 100644 ---- focusblur-3.2.6/src/render.h -+++ focusblur-3.2.6/src/render.h -@@ -24,7 +24,7 @@ - - #include "config.h" - --#include <glib/gtypes.h> -+#include <glib.h> - //#include <libgimp/gimp.h> - #include <libgimp/gimpui.h> - -diff --git focusblur-3.2.6/src/shine.h focusblur-3.2.6/src/shine.h -index c5a3621..86b4c09 100644 ---- focusblur-3.2.6/src/shine.h -+++ focusblur-3.2.6/src/shine.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_SHINE_H__ - #define __FOCUSBLUR_SHINE_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - #include <libgimp/gimptypes.h> - - #include "focusblurtypes.h" -diff --git focusblur-3.2.6/src/source.h focusblur-3.2.6/src/source.h -index 50d34ca..8eec35c 100644 ---- focusblur-3.2.6/src/source.h -+++ focusblur-3.2.6/src/source.h -@@ -24,7 +24,7 @@ - - #include "config.h" - --#include <glib/gtypes.h> -+#include <glib.h> - #include <libgimp/gimptypes.h> - - #include "focusblurtypes.h" diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 16b3a8c5037b1..cf3a31a1d4bf1 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { installPhase = '' install -D ./goxel $out/bin/goxel + + for res in $(ls data/icons | sed -e 's/icon//g' -e 's/.png//g'); do + install -Dm444 data/icons/icon$res.png $out/share/icons/hicolor/''${res}x''${res}/apps/goxel.png + done + + install -Dm444 snap/gui/goxel.desktop -t $out/share/applications + substituteInPlace $out/share/applications/goxel.desktop \ + --replace 'Icon=''${SNAP}/icon.png' 'Icon=goxel' ''; meta = with lib; { diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 26454897ddabd..cd2d89d0e99c2 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -4,6 +4,7 @@ , SDL , SDL_image , SDL_ttf +, installShellFiles , fontconfig , libpng , libtiff @@ -12,17 +13,28 @@ , zlib }: -stdenv.mkDerivation rec { - version = "2.8.3091"; +stdenv.mkDerivation (finalAttrs: { pname = "grafx2"; + version = "2.8.3091"; + + outputs = [ "out" "man" ]; src = fetchurl { + name = "grafx2-${finalAttrs.version}.tar.gz"; url = "https://pulkomandy.tk/projects/GrafX2/downloads/65"; - name = "${pname}-${version}.tar.gz"; hash = "sha256-KdY7GUhQp/Q7t/ktLPGxI66ZHy2gDAffn2yB5pmcJCM="; }; - nativeBuildInputs = [ pkg-config ]; + postPatch = '' + substituteInPlace misc/unix/grafx2.desktop \ + --replace "Exec=grafx2" "Exec=grafx2-sdl" + ''; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + buildInputs = [ SDL SDL_image @@ -34,15 +46,31 @@ stdenv.mkDerivation rec { zlib ]; + strictDeps = false; # Why?? + makeFlags = [ "-C src" ]; installFlags = [ "-C src" "PREFIX=$(out)" ]; + postInstall = '' + installManPage misc/unix/grafx2.1 + ''; + meta = { - description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance"; - homepage = "http://pulkomandy.tk/projects/GrafX2"; - license = lib.licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = []; + homepage = "http://grafx2.eu/"; + description = "The ultimate 256-color painting program"; + longDescription = '' + GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe + Paint and Brilliance. Specialized in 256-color drawing, it includes a very + large number of tools and effects that make it particularly suitable for + pixel art, game graphics, and generally any detailed graphics painted with + a mouse. + + The program is mostly developed on Haiku, Linux and Windows, but is also + portable on many other platforms. + ''; + license = with lib.licenses; [ gpl2Plus ]; mainProgram = "grafx2-sdl"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 0acc934a7fd9b..bbf52e105a284 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -153,5 +153,6 @@ perlPackages.buildPerlPackage rec { homepage = "https://gscan2pdf.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ pacien ]; + mainProgram = "gscan2pdf"; }; } diff --git a/pkgs/applications/graphics/halftone/default.nix b/pkgs/applications/graphics/halftone/default.nix index 2d90583142407..16859b94a7b61 100644 --- a/pkgs/applications/graphics/halftone/default.nix +++ b/pkgs/applications/graphics/halftone/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "halftone"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "tfuxu"; repo = pname; rev = version; - hash = "sha256-hUaI5omYUa5Fq95N0FqJJe+WVoRWkANy0/mmaURWIzg="; + hash = "sha256-Yh3LxeO90N45LSefV1RZoO+8C0TUmFELzXaaQ1rCo2o="; }; format = "other"; diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index fc2437c1c4c51..bbce1b15a19a3 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.29.0"; + version = "1.33.0"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-efKYmsDbdDxgOHkv05zwlq88NzW7pYOQOYcJqPeKXkY="; + hash = "sha256-59RkynW02gxVPz48diC1Th+vtru+oHMeuArfdA2a1IU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 67d9774a35a9b..20ff949a35402 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... }: callPackage ./generic.nix { - version = "5.1.5"; + version = "5.2.2"; kde-channel = "stable"; - sha256 = "1lx4x4affkbh47b7w5qvahkkr4db0vcw6h24nykak6gpy2z5wxqw"; + hash = "sha256-wdLko219iqKW0CHlK+STzGedP+Xoqk/BPENNM+gVTOI="; } diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 8bf6e26ab9d2d..df78c3108fb88 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -2,13 +2,14 @@ , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons -, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib, libjxl -, openjpeg, opencolorio, xsimd, poppler, curl, ilmbase, libmypaint, libwebp -, qtmultimedia, qtx11extras, quazip +, boost, libraw, fftw, eigen, exiv2, fribidi, libaom, libheif, libkdcraw, lcms2, gsl, openexr, giflib +, libjxl, mlt , openjpeg, opencolorio, xsimd, poppler, curl, ilmbase, immer, kseexpr, lager +, libmypaint , libunibreak, libwebp +, qtmultimedia, qtx11extras, quazip, SDL2, zug, pkg-config , python3Packages , version , kde-channel -, sha256 +, hash }: mkDerivation rec { @@ -17,33 +18,18 @@ mkDerivation rec { src = fetchurl { url = "mirror://kde/${kde-channel}/krita/${version}/krita-${version}.tar.gz"; - inherit sha256; + inherit hash; }; - 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="; - }) - (fetchpatch { - name = "krita-opencolorio-2.3-compat.patch"; - url = "https://invent.kde.org/graphics/krita/-/commit/520c633c2c868f2236d8e56eefecdcb6e3ebd840.patch"; - hash = "sha256-eXsgBN8OnKjZOQsOxViPypts6CVh3L+IYKMB/mDUcfQ="; - includes = [ "plugins/dockers/lut/ocio_display_filter_vfx2021.cpp" ]; - }) - ]; - - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config python3Packages.sip makeWrapper ]; buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons - boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib libjxl - openjpeg opencolorio poppler curl ilmbase libmypaint libwebp - qtmultimedia qtx11extras quazip + boost libraw fftw eigen exiv2 fribidi lcms2 gsl openexr lager libaom libheif libkdcraw giflib + libjxl mlt openjpeg opencolorio xsimd poppler curl ilmbase immer kseexpr libmypaint + libunibreak libwebp qtmultimedia qtx11extras quazip SDL2 zug python3Packages.pyqt5 - xsimd ]; env.NIX_CFLAGS_COMPILE = toString ([ "-I${ilmbase.dev}/include/OpenEXR" ] @@ -58,6 +44,9 @@ mkDerivation rec { --replace 'PYTHONPATH=''${_sip_python_path}' 'PYTHONPATH=${pythonPath}' substituteInPlace cmake/modules/SIPMacros.cmake \ --replace 'PYTHONPATH=''${_krita_python_path}' 'PYTHONPATH=${pythonPath}' + + substituteInPlace plugins/impex/jp2/jp2_converter.cc \ + --replace '<openjpeg.h>' '<${openjpeg.incDir}/openjpeg.h>' ''; cmakeBuildType = "RelWithDebInfo"; @@ -65,6 +54,7 @@ mkDerivation rec { cmakeFlags = [ "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" + "-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON" ]; preInstall = '' diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 3da49cf80109f..656713fb25e4e 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -14,7 +14,7 @@ , levmar , qhull , cmake -, cgal_5 +, cgal , boost179 , mpfr , xercesc @@ -45,7 +45,7 @@ mkDerivation rec { gmp levmar qhull - cgal_5 + cgal boost179 mpfr xercesc diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index 676cb3452afaa..1351f711f56d0 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -66,6 +66,11 @@ rustPlatform.buildRustPackage rec { "--skip=bench" ]; + postInstall = '' + install -Dm444 $src/res/oculante.png -t $out/share/icons/hicolor/128x128/apps/ + install -Dm444 $src/res/oculante.desktop -t $out/share/applications + ''; + postFixup = lib.optionalString stdenv.isLinux '' patchelf $out/bin/oculante --add-rpath ${lib.makeLibraryPath [ libxkbcommon libX11 ]} ''; diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 3178c50c933de..e32e668573132 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, copyDesktopItems, makeDesktopItem, qmake +{ stdenv, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake , qtbase, qtxmlpatterns, qttools, qtwebengine, libGL, fontconfig, openssl, poppler, wrapQtAppsHook , ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: let - importer = stdenv.mkDerivation rec { + importer = stdenv.mkDerivation { pname = "openboard-importer"; version = "unstable-2016-10-08"; @@ -23,15 +23,15 @@ let install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter ''; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation (finalAttrs: { pname = "openboard"; - version = "unstable-2022-11-28"; + version = "1.7.0"; src = fetchFromGitHub { owner = "OpenBoard-org"; repo = "OpenBoard"; - rev = "9de37af2df1a7c0d88f71c94ab2db1815d082862"; - sha256 = "sha256-TiKrSyxtF1g1bepCoFxoxGOdREXhsMrS3g8uZKSiugg="; + rev = "v${finalAttrs.version}"; + hash = "sha256-OSAogtZoMisyRziv63ag9w8HQaaRdz0J28jQZR7cTMM="; }; postPatch = '' @@ -115,4 +115,4 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ fufexan ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index fc048d4acae8d..24d1fdc06ae8b 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -11,7 +11,7 @@ , libGLU, libGL , glew , opencsg -, cgal +, cgal_4 , mpfr , gmp , glib @@ -60,7 +60,7 @@ mkDerivation rec { nativeBuildInputs = [ bison flex pkg-config gettext qmake ]; buildInputs = [ - eigen boost glew opencsg cgal mpfr gmp glib + eigen boost glew opencsg cgal_4 mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig qtbase qtmultimedia qscintilla cairo ] ++ lib.optionals stdenv.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ] diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index eb1d89a0083f9..9fdc77ac745f2 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,49 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dEAlOKjNXL7zqlll6lqGmbopjdplDR3ewMMNu9TMsmw="; + hash = "sha256-New0+pWtKdEx/k69pNisNKYj6p998HoEjAhQEDugP/g="; + # Apparently upstream requires that the compiled executable will know the + # commit hash and the date of the commit. This information is also presented + # in the output of `pdfcpu version` which we use as a sanity check in the + # installCheckPhase. This was discussed upstream in: + # + # - https://github.com/pdfcpu/pdfcpu/issues/751 + # - https://github.com/pdfcpu/pdfcpu/pull/752 + # + # The trick used here is to write that information into files in `src`'s + # `$out`, and then read them into the `ldflags`. We also delete the `.git` + # directories in `src`'s $out afterwards, imitating what's done if + # `leaveDotGit = false;` See also: + # https://github.com/NixOS/nixpkgs/issues/8567 + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/COMMIT + git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; - vendorHash = "sha256-WZsm2wiKedMP0miwnzhnSrF7Qw+jqd8dnpcehlsdMCA="; + vendorHash = "sha256-jVX/CFf9dd9qD3gyGVDjbfINtPLCsgdjWFix4BCpDZ0="; + + ldflags = [ + "-s" + "-w" + "-X main.version=v${version}" + ]; + + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X main.commit=$(cat COMMIT)" + ldflags+=" -X main.date=$(cat SOURCE_DATE)" + ''; + # No tests doCheck = false; @@ -20,6 +53,8 @@ buildGoModule rec { export HOME=$(mktemp -d) echo checking the version print of pdfcpu $out/bin/pdfcpu version | grep ${version} + $out/bin/pdfcpu version | grep $(cat COMMIT | cut -c1-8) + $out/bin/pdfcpu version | grep $(cat SOURCE_DATE) ''; subPackages = [ "cmd/pdfcpu" ]; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 9513b92f60ac5..21febdc02b7e9 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -7,40 +7,31 @@ , wrapQtAppsHook , exiv2 , graphicsmagick -, kimageformats , libarchive , libraw , mpv , poppler , pugixml , qtbase +, qtcharts , qtdeclarative -, qtgraphicaleffects +, qtimageformats +, qtlocation , qtmultimedia -, qtquickcontrols -, qtquickcontrols2 +, qtpositioning +, qtsvg +, qtwayland }: stdenv.mkDerivation rec { pname = "photoqt"; - version = "3.4"; + version = "4.1"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-kVf9+zI9rtEMmS0N4qrN673T/1fnqfcV3hQPnMXMLas="; + hash = "sha256-vxQZFlS4C+Dg9I6BKeMUFOYHz74d28gbhJlIpxSKTvs="; }; - postPatch = '' - # exiv2 0.28.1 - substituteInPlace CMakeLists.txt \ - --replace "exiv2lib" "exiv2" - '' - # error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'? - + lib.optionalString stdenv.isDarwin '' - substituteInPlace cplusplus/main.cpp \ - --replace "std::setlocale" "setlocale" - ''; - nativeBuildInputs = [ cmake extra-cmake-modules @@ -51,18 +42,21 @@ stdenv.mkDerivation rec { buildInputs = [ exiv2 graphicsmagick - kimageformats libarchive libraw mpv poppler pugixml qtbase + qtcharts qtdeclarative - qtgraphicaleffects + qtimageformats + qtlocation qtmultimedia - qtquickcontrols - qtquickcontrols2 + qtpositioning + qtsvg + ] ++ lib.optionals stdenv.isLinux [ + qtwayland ]; cmakeFlags = [ @@ -76,6 +70,12 @@ stdenv.mkDerivation rec { export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" ''; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/photoqt.app $out/Applications + makeWrapper $out/{Applications/photoqt.app/Contents/MacOS,bin}/photoqt + ''; + meta = { description = "Simple, yet powerful and good looking image viewer"; homepage = "https://photoqt.org/"; diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/applications/graphics/pizarra/default.nix index ccf21d630e649..f9d7fc650647d 100644 --- a/pkgs/applications/graphics/pizarra/default.nix +++ b/pkgs/applications/graphics/pizarra/default.nix @@ -30,6 +30,15 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3-x11 atk glib librsvg ]; + postInstall = '' + install -Dm444 res/icons/tk.categulario.pizarra.svg $out/share/icons/hicolor/scalable/apps/pizarra.svg + install -Dm444 res/pizarra.desktop -t $out/share/applications + substituteInPlace $out/share/applications/pizarra.desktop \ + --replace "TryExec=/usr/bin/" "TryExec=" \ + --replace "Exec=/usr/bin/" "Exec=" \ + --replace "Icon=/usr/share/icons/hicolor/scalable/apps/pizarra.svg" "Icon=pizarra" + ''; + meta = with lib; { description = "A simple blackboard written in GTK"; longDescription = '' diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 560cf666d2621..2cb5f8ddde247 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -29,6 +29,10 @@ mkDerivation rec { pkg-config ]; + cmakeFlags = [ + "-DVIDEO_SUPPORT=ON" + ]; + buildInputs = [ exiv2 mpv diff --git a/pkgs/applications/graphics/rnote/Cargo.lock b/pkgs/applications/graphics/rnote/Cargo.lock index 96130db9b3100..af715c5955f20 100644 --- a/pkgs/applications/graphics/rnote/Cargo.lock +++ b/pkgs/applications/graphics/rnote/Cargo.lock @@ -103,30 +103,30 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -185,12 +185,12 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 3.1.0", + "event-listener 4.0.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -198,15 +198,15 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 2.8.0", + "async-lock 3.2.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 1.13.0", + "futures-lite 2.1.0", "slab", ] @@ -244,22 +244,21 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" +checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" dependencies = [ - "async-lock 3.1.0", + "async-lock 3.2.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.0.1", + "futures-lite 2.1.0", "parking", - "polling 3.3.0", - "rustix 0.38.24", + "polling 3.3.1", + "rustix 0.38.26", "slab", "tracing", - "waker-fn", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -273,11 +272,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb2ab2aa8a746e221ab826c73f48bc6ba41be6763f0855cb249eb6d154cf1d7" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" dependencies = [ - "event-listener 3.1.0", + "event-listener 4.0.0", "event-listener-strategy", "pin-project-lite", ] @@ -306,7 +305,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.24", + "rustix 0.38.26", "windows-sys 0.48.0", ] @@ -316,13 +315,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.0", + "async-io 2.2.1", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.24", + "rustix 0.38.26", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -336,9 +335,9 @@ checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "atomic-polyfill" -version = "0.1.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" dependencies = [ "critical-section", ] @@ -555,12 +554,12 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 2.1.0", - "async-lock 3.1.0", + "async-channel 2.1.1", + "async-lock 3.2.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.0.1", + "futures-lite 2.1.0", "piper", "tracing", ] @@ -688,9 +687,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.8" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive", @@ -698,9 +697,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", @@ -769,9 +768,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -791,9 +790,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "coreaudio-rs" @@ -1011,15 +1010,9 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] name = "data-url" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" - -[[package]] -name = "data-url" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "derive_builder" @@ -1065,13 +1058,14 @@ 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", "shell-words", "tempfile", + "thiserror", "zeroize", ] @@ -1161,12 +1155,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1196,12 +1190,23 @@ dependencies = [ ] [[package]] +name = "event-listener" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] name = "event-listener-strategy" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 3.1.0", + "event-listener 4.0.0", "pin-project-lite", ] @@ -1307,28 +1312,28 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" dependencies = [ - "roxmltree", + "roxmltree 0.18.1", ] [[package]] name = "fontdb" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" dependencies = [ "fontconfig-parser", "log", "memmap2", "slotmap", "tinyvec", - "ttf-parser 0.19.2", + "ttf-parser", ] [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1414,11 +1419,14 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" dependencies = [ + "fastrand 2.0.1", "futures-core", + "futures-io", + "parking", "pin-project-lite", ] @@ -1532,9 +1540,9 @@ dependencies = [ [[package]] name = "geo" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" +checksum = "4841b40fdbccd4b7042bd6195e4de91da54af34c50632e371bcbfcdfb558b873" dependencies = [ "earcutr", "float_next_after", @@ -1544,6 +1552,7 @@ dependencies = [ "num-traits", "robust", "rstar", + "spade", ] [[package]] @@ -1610,9 +1619,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" @@ -1670,13 +1679,19 @@ dependencies = [ ] [[package]] +name = "glib-build-tools" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431c56f463443cba9bc3600248bc6d680cb614c2ee1cdd39dab5415bd12ac5c" + +[[package]] name = "glib-macros" version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" dependencies = [ "heck", - "proc-macro-crate 2.0.0", + "proc-macro-crate 2.0.1", "proc-macro-error", "proc-macro2", "quote", @@ -1844,9 +1859,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -1854,9 +1869,9 @@ dependencies = [ [[package]] name = "heapless" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" dependencies = [ "atomic-polyfill", "hash32", @@ -1932,9 +1947,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1995,7 +2010,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -2067,7 +2082,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.3", - "rustix 0.38.24", + "rustix 0.38.26", "windows-sys 0.48.0", ] @@ -2115,6 +2130,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2174,9 +2198,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -2277,7 +2301,7 @@ dependencies = [ "cairo-rs", "cast", "cssparser", - "data-url 0.3.0", + "data-url", "encoding_rs", "float-cmp", "gdk-pixbuf", @@ -2322,9 +2346,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "locale_config" @@ -2417,9 +2441,9 @@ checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" -version = "0.6.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" dependencies = [ "libc", ] @@ -2752,15 +2776,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" +checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" dependencies = [ "is-wsl", "libc", @@ -2924,9 +2948,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" @@ -3106,16 +3130,16 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.24", + "rustix 0.38.26", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3147,9 +3171,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "ppv-lite86" @@ -3195,11 +3219,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" dependencies = [ - "toml_edit 0.20.7", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -3228,9 +3253,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -3389,7 +3414,7 @@ dependencies = [ [[package]] name = "rnote" -version = "0.9.2" +version = "0.9.4" dependencies = [ "anyhow", "base64", @@ -3397,10 +3422,11 @@ dependencies = [ "fs_extra", "futures", "gettext-rs", + "glib-build-tools", "gtk4", "ijson", "image", - "itertools 0.11.0", + "itertools 0.12.0", "kurbo", "libadwaita", "log", @@ -3436,7 +3462,7 @@ dependencies = [ [[package]] name = "rnote-cli" -version = "0.9.2" +version = "0.9.4" dependencies = [ "anyhow", "atty", @@ -3454,9 +3480,10 @@ dependencies = [ [[package]] name = "rnote-compose" -version = "0.9.2" +version = "0.9.4" dependencies = [ "anyhow", + "approx", "base64", "clap", "ink-stroke-modeler-rs", @@ -3482,7 +3509,7 @@ dependencies = [ [[package]] name = "rnote-engine" -version = "0.9.2" +version = "0.9.4" dependencies = [ "anyhow", "approx", @@ -3498,7 +3525,7 @@ dependencies = [ "gtk4", "ijson", "image", - "itertools 0.11.0", + "itertools 0.12.0", "kurbo", "librsvg", "log", @@ -3519,7 +3546,7 @@ dependencies = [ "rodio", "rough_piet", "roughr", - "roxmltree", + "roxmltree 0.19.0", "rstar", "semver", "serde", @@ -3587,6 +3614,12 @@ dependencies = [ ] [[package]] +name = "roxmltree" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" + +[[package]] name = "rstar" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3634,15 +3667,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.24" +version = "0.38.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" +checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.11", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", ] [[package]] @@ -3653,17 +3686,17 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +checksum = "71cd15fef9112a1f94ac64b58d1e4628192631ad6af4dc69997f995459c874e7" dependencies = [ "bitflags 1.3.2", "bytemuck", "smallvec", - "ttf-parser 0.18.1", + "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", - "unicode-general-category", + "unicode-properties", "unicode-script", ] @@ -3727,18 +3760,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", @@ -3840,9 +3873,9 @@ dependencies = [ [[package]] name = "slotmap" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ "serde", "version_check", @@ -3889,11 +3922,11 @@ dependencies = [ [[package]] name = "spade" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "544b7011aca0c409a39df31cccdbf9962ea2f78597711ef2a58750d3cafd5b44" +checksum = "87a3ef2efbc408c9051c1a27ce7edff430d74531d31a480b7ca4f618072c2670" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", "num-traits", "robust", "smallvec", @@ -3998,9 +4031,9 @@ dependencies = [ [[package]] name = "svg" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d815ad337e8449d2374d4248448645edfe74e699343dd5719139d93fa87112" +checksum = "0d703a3635418d4e4d0e410009ddbfb65047ef9468b1d29afd3b057a5bc4c217" [[package]] name = "svg_path_ops" @@ -4022,9 +4055,9 @@ dependencies = [ [[package]] name = "svgtypes" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +checksum = "d71499ff2d42f59d26edb21369a308ede691421f79ebc0f001e2b1fd3a7c9e52" dependencies = [ "kurbo", "siphasher", @@ -4131,7 +4164,7 @@ dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.8.8", + "toml 0.8.2", "version-compare", ] @@ -4156,7 +4189,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall", - "rustix 0.38.24", + "rustix 0.38.26", "windows-sys 0.48.0", ] @@ -4234,9 +4267,9 @@ dependencies = [ [[package]] name = "tiny-skia-path" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +checksum = "5de35e8a90052baaaf61f171680ac2f8e925a1e43ea9d2e3a00514772250e541" dependencies = [ "arrayref", "bytemuck", @@ -4272,21 +4305,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.20.2", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] @@ -4306,20 +4339,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.1.0", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap 2.1.0", "serde", @@ -4346,12 +4368,6 @@ checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" [[package]] name = "ttf-parser" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" - -[[package]] -name = "ttf-parser" version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" @@ -4415,9 +4431,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-bidi-mirroring" @@ -4432,12 +4448,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" [[package]] -name = "unicode-general-category" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" - -[[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4459,6 +4469,12 @@ dependencies = [ ] [[package]] +name = "unicode-properties" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0" + +[[package]] name = "unicode-script" version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4484,9 +4500,9 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -4495,9 +4511,9 @@ dependencies = [ [[package]] name = "usvg" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +checksum = "c51daa774fe9ee5efcf7b4fec13019b8119cda764d9a8b5b06df02bb1445c656" dependencies = [ "base64", "log", @@ -4510,27 +4526,27 @@ dependencies = [ [[package]] name = "usvg-parser" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +checksum = "45c88a5ffaa338f0e978ecf3d4e00d8f9f493e29bed0752e1a808a1db16afc40" dependencies = [ - "data-url 0.2.0", + "data-url", "flate2", "imagesize", "kurbo", "log", - "roxmltree", + "roxmltree 0.18.1", "simplecss", "siphasher", - "svgtypes 0.11.0", + "svgtypes 0.12.0", "usvg-tree", ] [[package]] name = "usvg-text-layout" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593" dependencies = [ "fontdb", "kurbo", @@ -4544,13 +4560,13 @@ dependencies = [ [[package]] name = "usvg-tree" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +checksum = "6cacb0c5edeaf3e80e5afcf5b0d4004cc1d36318befc9a7c6606507e5d0f4062" dependencies = [ "rctree", "strict-num", - "svgtypes 0.11.0", + "svgtypes 0.12.0", "tiny-skia-path", ] @@ -4602,9 +4618,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4612,9 +4628,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", @@ -4627,9 +4643,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -4639,9 +4655,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4649,9 +4665,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", @@ -4662,15 +4678,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -4691,7 +4707,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.24", + "rustix 0.38.26", ] [[package]] @@ -4772,6 +4788,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4802,6 +4827,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4814,6 +4854,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4826,6 +4872,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4838,6 +4890,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4850,6 +4908,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4862,6 +4926,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4874,6 +4944,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4886,10 +4962,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" -version = "0.5.19" +version = "0.5.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" dependencies = [ "memchr", ] @@ -4935,18 +5017,18 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "zerocopy" -version = "0.7.26" +version = "0.7.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +checksum = "5d075cf85bbb114e933343e087b92f2146bac0d55b534cbb8188becf0039948e" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.26" +version = "0.7.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +checksum = "86cd5ca076997b97ef09d3ad65efe811fa68c9e874cb636ccb211223a813b0c2" dependencies = [ "proc-macro2", "quote", @@ -4955,9 +5037,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12a3946ecfc929b583800f4629b6c25b88ac6e92a40ea5670f77112a85d40a8b" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zune-inflate" diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 78e5be57ef685..7940e574dc507 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-LLJurn5KJBlTtFrQXcc7HZqtIATOLgiwJqUsZe4cRIo="; + hash = "sha256-twysPSuCu++dVqoRKTNSvxwrO1ljUu4k2vPZEBkaj10="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 6f624747d688c..d93423e075218 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -38,13 +38,13 @@ # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.3"; + version = "0.32.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-4AD+5bPzYseRFPDs/44is0yaKGW1nkGi2j5NxdLKLDw="; + url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-3iqUUIRtHOwUxqEDA3X9SeGvJNySCtZIA0QST5zLhW8="; }; nativeBuildInputs = [ @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "shotwell"; versionPolicy = "odd-unstable"; }; }; @@ -103,4 +103,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; []; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/graphics/snapshot/default.nix b/pkgs/applications/graphics/snapshot/default.nix index a47016e379daf..4b0c5f5f2cc2f 100644 --- a/pkgs/applications/graphics/snapshot/default.nix +++ b/pkgs/applications/graphics/snapshot/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , cargo , desktop-file-utils , meson @@ -17,24 +16,15 @@ , gnome }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "45.0"; + version = "45.1"; src = fetchurl { - url = "mirror://gnome/sources/snapshot/${lib.versions.major version}/snapshot-${version}.tar.xz"; - hash = "sha256-7keO4JBzGgsIJLZrsXRr2ADcv+h6yDWEmUSa85z822c="; + url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; + hash = "sha256-/kRifa7zrZbBaaLlRhDmZxj4k9cN/SXUDTBskYQ7zjk="; }; - patches = [ - # Fix portal requests - # https://gitlab.gnome.org/GNOME/snapshot/-/merge_requests/168 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/snapshot/-/commit/6aec0f56d6bb994731c1309ac6e2cb822b82067e.patch"; - hash = "sha256-6tnOhhTQ3Rfl3nCw/rliLKkvZknvZKCQyeMKaTxYmok="; - }) - ]; - nativeBuildInputs = [ cargo desktop-file-utils @@ -75,4 +65,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "snapshot"; }; -} +}) diff --git a/pkgs/applications/graphics/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix index de01630587578..ca3b17a3ed371 100644 --- a/pkgs/applications/graphics/structorizer/default.nix +++ b/pkgs/applications/graphics/structorizer/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "structorizer"; - version = "3.32-14"; + version = "3.32-15"; desktopItems = [ (makeDesktopItem { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "fesch"; repo = "Structorizer.Desktop"; rev = version; - hash = "sha256-pnzvfXH4KC067aqqH9h1+T3K+6IzIYw8IJCMdmGrN6c="; + hash = "sha256-ZCVvMvbXMQIcZRk1F7QiRtNeuLicHe/aEvwp4FvhwoM="; }; patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index 1b6ea48577913..5981a30374938 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.9.4"; + version = "2.9.5"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-H9/z0NIqGGJPipioWvv67vIFQ46RZr5+ycm3NQrO9ZE="; + hash = "sha256-zEqdHWfMbxdOoZ3NfvOPZL0osrFVMxFN32gXfEjbKLs="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix index ef7cba998dd7d..e7776062de44f 100644 --- a/pkgs/applications/graphics/vkdt/default.nix +++ b/pkgs/applications/graphics/vkdt/default.nix @@ -19,15 +19,17 @@ , ffmpeg , libvorbis , libmad +, testers +, vkdt }: stdenv.mkDerivation rec { pname = "vkdt"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Au0S+9Y+H0FuoHZacnN4azQFQB0tarT2bHNsLxujfLw="; + hash = "sha256-Sk/K+EWvJBkwwD5R1gH9ZQHetojrJTTJrKW9Dvr+lHA="; }; strictDeps = true; @@ -61,6 +63,10 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; + passthru.tests.version = testers.testVersion { + package = vkdt; + }; + meta = with lib; { description = "A vulkan-powered raw image processor"; homepage = "https://github.com/hanatos/vkdt"; diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix index 7ad0d1ab66418..6983d3eb14a5c 100644 --- a/pkgs/applications/kde/angelfish.nix +++ b/pkgs/applications/kde/angelfish.nix @@ -24,7 +24,7 @@ , srcs # provided as callPackage input to enable easier overrides through overlays -, cargoSha256 ? "sha256-YR7d8F1LWDHY+h2ZQe52u3KWIeEMTnrbU4DO+hpIOec=" +, cargoSha256 ? "sha256-EXsAvI8dKgCGmLbGr9fdk/F9UwtSfd/aIyqAy5tvFSI=" }: mkDerivation rec { diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 32d1e71facf0a..ab2c10d15779b 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -101,6 +101,7 @@ let kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; + kalgebra = callPackage ./kalgebra.nix {}; merkuro = callPackage ./merkuro.nix {}; kalzium = callPackage ./kalzium.nix {}; kamoso = callPackage ./kamoso.nix {}; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index f074bbeee63a2..2d6455fad777e 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.3/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.4/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kalgebra.nix b/pkgs/applications/kde/kalgebra.nix new file mode 100644 index 0000000000000..ed1b0b567e0be --- /dev/null +++ b/pkgs/applications/kde/kalgebra.nix @@ -0,0 +1,46 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, analitza +, ki18n +, kinit +, kirigami2 +, kconfigwidgets +, kwidgetsaddons +, kio +, kxmlgui +, qtwebengine +, plasma-framework +}: + +mkDerivation { + pname = "kalgebra"; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + + buildInputs = [ + ki18n + analitza + kinit + kirigami2 + kconfigwidgets + kwidgetsaddons + kio + kxmlgui + qtwebengine + plasma-framework + ]; + + meta = { + homepage = "https://apps.kde.org/kalgebra/"; + description = "A 2D and 3D Graph Calculator"; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ ninjafb ]; + }; +} diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix index bcd8ba360a82e..00330b76b3a00 100644 --- a/pkgs/applications/kde/kdenlive/default.nix +++ b/pkgs/applications/kde/kdenlive/default.nix @@ -36,6 +36,11 @@ , wrapGAppsHook }: +let + mlt-full = mlt.override { + ffmpeg = ffmpeg-full; + }; +in mkDerivation { pname = "kdenlive"; nativeBuildInputs = [ @@ -60,7 +65,7 @@ mkDerivation { kplotting ktextwidgets mediainfo - mlt + mlt-full phonon-backend-gstreamer qtdeclarative qtmultimedia @@ -81,8 +86,9 @@ mkDerivation { # https://github.com/NixOS/nixpkgs/issues/83885 patches = [ ./dependency-paths.patch ]; - inherit mlt mediainfo; + inherit mediainfo; ffmpeg = ffmpeg-full; + mlt = mlt-full; postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index b8df9043eb1f6..c88723d9c9091 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1955 +4,1955 @@ { akonadi = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/akonadi-23.08.3.tar.xz"; - sha256 = "0h9yzd33psycpcdqb4c54s0dysifmjjrwygjk7rbhfph8099y864"; - name = "akonadi-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/akonadi-23.08.4.tar.xz"; + sha256 = "0dj9xn0bpcq409kfd61zh5wdhbh4yrlviwhlmxawrm1mx5r07yv3"; + name = "akonadi-23.08.4.tar.xz"; }; }; akonadi-calendar = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/akonadi-calendar-23.08.3.tar.xz"; - sha256 = "1r9h40m0jha2qzj63l8xwsxn8avmak2h7k3vxi91wdnd288cdnib"; - name = "akonadi-calendar-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/akonadi-calendar-23.08.4.tar.xz"; + sha256 = "0xayrqrragk1vp0rsghdpx482c3f23iri0rd70v86393qdhb59mq"; + name = "akonadi-calendar-23.08.4.tar.xz"; }; }; akonadi-calendar-tools = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/akonadi-calendar-tools-23.08.3.tar.xz"; - sha256 = "0vwfq3nls3c9qxm4kd9cb42p1x2na0mfjcg4cnlffas8bhg1sll5"; - name = "akonadi-calendar-tools-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/akonadi-calendar-tools-23.08.4.tar.xz"; + sha256 = "17s24ijhk68dw7ailk992a7xkdjl6dj5nwr06zlvdhskxx9z3xrc"; + name = "akonadi-calendar-tools-23.08.4.tar.xz"; }; }; akonadi-contacts = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/akonadi-contacts-23.08.3.tar.xz"; - sha256 = "0kf99fhykxb957f8iipw98nn16j3nqp730nsahwd3nhknb517v0r"; - name = "akonadi-contacts-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/akonadi-contacts-23.08.4.tar.xz"; + sha256 = "1nxm1lwk6jazfv684gb4w1y9r8xaj0y14xvsslljf018l20wqr4q"; + name = "akonadi-contacts-23.08.4.tar.xz"; }; }; akonadi-import-wizard = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/akonadi-import-wizard-23.08.3.tar.xz"; - sha256 = "1hvpb29mym0psibzn7vdyd466bnf03z3bwmwbk406w7zkc1ahh35"; - name = "akonadi-import-wizard-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/akonadi-import-wizard-23.08.4.tar.xz"; + sha256 = "08pk36hw9v9bs8scgxzbwlhlcyikbcliybp1p6ga2j7p8mjm6fg2"; + name = "akonadi-import-wizard-23.08.4.tar.xz"; }; }; akonadi-mime = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/akonadi-mime-23.08.3.tar.xz"; - sha256 = "07qwkkbjdcpi0b18fndal2nxbxz0nawihway93dzj8w7zzcf5pg8"; - name = "akonadi-mime-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/akonadi-mime-23.08.4.tar.xz"; + sha256 = "1bzsddyr784a4dw1fqp57xp8az6dysqy7xmfygm5r5bbbdnlxdpb"; + name = "akonadi-mime-23.08.4.tar.xz"; }; }; akonadi-notes = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/akonadi-notes-23.08.3.tar.xz"; - sha256 = "1z9i7wd72kqy07wrh31zrl15swny38azhn2l3c6w9gc5zhl6sf9g"; - name = "akonadi-notes-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/akonadi-notes-23.08.4.tar.xz"; + sha256 = "0vlcbb783jj3zx8nsrd0r7si28463rsd2xcxb3z5m4il8xmr0smh"; + name = "akonadi-notes-23.08.4.tar.xz"; }; }; akonadi-search = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/akonadi-search-23.08.3.tar.xz"; - sha256 = "066v60c358znm2s32m98jpmqj53zhh887mmylqrd1rak3p8xbwfc"; - name = "akonadi-search-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/akonadi-search-23.08.4.tar.xz"; + sha256 = "0ipwxa0xv8bwvx9ngpq2i3ivq0s97m0x2kj4n4dw4sil31x2yzq5"; + name = "akonadi-search-23.08.4.tar.xz"; }; }; akonadiconsole = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/akonadiconsole-23.08.3.tar.xz"; - sha256 = "1jg47kjabfbmvxdg972p5wm97jngxsqswmql2j32fpiq5vcwjjg3"; - name = "akonadiconsole-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/akonadiconsole-23.08.4.tar.xz"; + sha256 = "1xnvrpd7xy2cz6m8x41lki3gnvfq74gvi9vlyfpf9v85z4ri6jhv"; + name = "akonadiconsole-23.08.4.tar.xz"; }; }; akregator = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/akregator-23.08.3.tar.xz"; - sha256 = "0brq2m91ahsyvvn30hlpc18igbpij0dgxixis147m8i1aidyi7hh"; - name = "akregator-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/akregator-23.08.4.tar.xz"; + sha256 = "1psgzcw84xnh7xgi1s1yxk41sndshy8j1mvvz42gasrpqdfzrpjv"; + name = "akregator-23.08.4.tar.xz"; }; }; alligator = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/alligator-23.08.3.tar.xz"; - sha256 = "1w54frf5rm0x40451kffs0qh1jsagx9jihwpigvjmhl0i7dknvpp"; - name = "alligator-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/alligator-23.08.4.tar.xz"; + sha256 = "0g8ps4vkrc1wdprand6y8h99zh4flhg4mcqn1552nk5p3kcyvzh1"; + name = "alligator-23.08.4.tar.xz"; }; }; analitza = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/analitza-23.08.3.tar.xz"; - sha256 = "14lg9w5x4rcy4sn9yxj9a035k9c5c7ijcfmxr1hcs45dgcapd5si"; - name = "analitza-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/analitza-23.08.4.tar.xz"; + sha256 = "0d0qaz08xaiy1whg9vgd4316fvzfhm1wnmy17b83p8ihd80p8agk"; + name = "analitza-23.08.4.tar.xz"; }; }; angelfish = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/angelfish-23.08.3.tar.xz"; - sha256 = "1f8q9h8aac2mdfrd4rxq1kyzvzradb3azrasdzfc4m941ka3lrgb"; - name = "angelfish-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/angelfish-23.08.4.tar.xz"; + sha256 = "1nggkgwkvgczpn3aq8isphzhykjihdd8a6nfrghfnsbfjmnz1y7s"; + name = "angelfish-23.08.4.tar.xz"; }; }; arianna = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/arianna-23.08.3.tar.xz"; - sha256 = "1drfaswzmlw8jws6l07550qa92fp00pp6860lyw92kapw8wh25zf"; - name = "arianna-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/arianna-23.08.4.tar.xz"; + sha256 = "04rj2p1s75na1yac4swlanqh6ijsn4d4wy5vn0f0lkgbbd9pgc0z"; + name = "arianna-23.08.4.tar.xz"; }; }; ark = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ark-23.08.3.tar.xz"; - sha256 = "0vrjs94ncwbixr4q10rs3cjxbgxgwyrh96wbk78q2lv620xb8byk"; - name = "ark-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ark-23.08.4.tar.xz"; + sha256 = "17makvdjycjxxykmxm0kw3amdwp55296zvhrqs3a4fwbg352c912"; + name = "ark-23.08.4.tar.xz"; }; }; artikulate = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/artikulate-23.08.3.tar.xz"; - sha256 = "0kx1ma6vf04ylr34skfwbprxq2x9wzr7x8nxv10jqhrr73g0vgv1"; - name = "artikulate-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/artikulate-23.08.4.tar.xz"; + sha256 = "1vxd0k30qviz1qp2308dp3d4627dfvl86114d9x2xlwgyf78mmfw"; + name = "artikulate-23.08.4.tar.xz"; }; }; audiocd-kio = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/audiocd-kio-23.08.3.tar.xz"; - sha256 = "1dvqkmh9ndv6iqlk0qv09s0yhrxpc1n2p5zw4ll6hinw9gagbkvv"; - name = "audiocd-kio-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/audiocd-kio-23.08.4.tar.xz"; + sha256 = "011g4g5c5mbhdiqsc9rl8wsjvcbyxn4ikmiz0jcn7v7rjg91z7zc"; + name = "audiocd-kio-23.08.4.tar.xz"; }; }; audiotube = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/audiotube-23.08.3.tar.xz"; - sha256 = "0j57zw0jmagpd9924c2drz4g52i5i8kw81yvka6qamj0n1db6awg"; - name = "audiotube-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/audiotube-23.08.4.tar.xz"; + sha256 = "1jbnwk16awsqg08xarx1gpxix0fjy1jfifhpvd6gww70p6m6d1kr"; + name = "audiotube-23.08.4.tar.xz"; }; }; baloo-widgets = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/baloo-widgets-23.08.3.tar.xz"; - sha256 = "1p4cpcdxbab0nqgs8933dh73pkjr9j8vd8b3wz0s295bpws560mz"; - name = "baloo-widgets-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/baloo-widgets-23.08.4.tar.xz"; + sha256 = "0mqnfavcickq07kz2xiq1j1mn4prv7jhhfbl635zg4s95anz6f7y"; + name = "baloo-widgets-23.08.4.tar.xz"; }; }; blinken = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/blinken-23.08.3.tar.xz"; - sha256 = "06sqp8ghbapkfwbf4m74rp28lcv2ql3djfz5ngavgby4mh0fy06j"; - name = "blinken-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/blinken-23.08.4.tar.xz"; + sha256 = "0g85bzm4nx4jialscjxva6438s6q24pr4cbqs52q1c3hkh90qn26"; + name = "blinken-23.08.4.tar.xz"; }; }; bomber = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/bomber-23.08.3.tar.xz"; - sha256 = "0fcxp7jcimqpij250rcwr5xkwk3wghjsf0x0b8gxs5s7a2x3ywkf"; - name = "bomber-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/bomber-23.08.4.tar.xz"; + sha256 = "0zj31z3zkgv34x42378v5l7gcq5k530x2adpi476zxmx0nwmwsmk"; + name = "bomber-23.08.4.tar.xz"; }; }; bovo = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/bovo-23.08.3.tar.xz"; - sha256 = "19ab8z30g19k7vs27cyfgmv8kaadr6a7i50rndsbhbjdwkmi7n9g"; - name = "bovo-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/bovo-23.08.4.tar.xz"; + sha256 = "1kk0vkd6vrlnrhxrkdacxvm60rqm5j0rkwm1vnssg6j90405wq22"; + name = "bovo-23.08.4.tar.xz"; }; }; calendarsupport = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/calendarsupport-23.08.3.tar.xz"; - sha256 = "180gkqh3xpm93r8jh381d6ihjg68gzkjqn9pmak32whg8012q4bd"; - name = "calendarsupport-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/calendarsupport-23.08.4.tar.xz"; + sha256 = "1r018kcxk90ykwvf7bw6lammx2kkzz6jnqp8fl2cfj36pfc84w3w"; + name = "calendarsupport-23.08.4.tar.xz"; }; }; calindori = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/calindori-23.08.3.tar.xz"; - sha256 = "0800khsn96lsgv5iwmkdrxgsdvyddvjgpfrv7rp3bd3jj21qb8br"; - name = "calindori-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/calindori-23.08.4.tar.xz"; + sha256 = "1sjxjmpc69l26635wg28cmbif2z3jszanmzgpc93s39fgi47mw97"; + name = "calindori-23.08.4.tar.xz"; }; }; cantor = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/cantor-23.08.3.tar.xz"; - sha256 = "009azpj5frkpc4yc3cc6jqhd5prwmkab1m5j6khmyg78vdrfibcw"; - name = "cantor-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/cantor-23.08.4.tar.xz"; + sha256 = "01nihsmjfmiipzh7371a7msb3gc0fiw6wh4a2g800c380nvd4ix9"; + name = "cantor-23.08.4.tar.xz"; }; }; cervisia = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/cervisia-23.08.3.tar.xz"; - sha256 = "0nncgcn67ksv0xw3fsf90pqi6mjqca4v6wr52pf0knpy7a22hpig"; - name = "cervisia-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/cervisia-23.08.4.tar.xz"; + sha256 = "1mlydja8652rk9jg2gz3xzsj09kmgwb6miq9fyifv8p024ml9gj1"; + name = "cervisia-23.08.4.tar.xz"; }; }; colord-kde = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/colord-kde-23.08.3.tar.xz"; - sha256 = "14baqrdwwssd305qhvxils0sbbdw6hdz4ggg3qkp30xc18vdp270"; - name = "colord-kde-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/colord-kde-23.08.4.tar.xz"; + sha256 = "1a3lx7ahjcl05jkbril7lx6x12qfmh7w7kxm2gplfhfnii9hvmxv"; + name = "colord-kde-23.08.4.tar.xz"; }; }; dolphin = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/dolphin-23.08.3.tar.xz"; - sha256 = "17msggyxykq3gvzl6h9fxrmc06s7h74279rdfmckvprxi5yqfknm"; - name = "dolphin-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/dolphin-23.08.4.tar.xz"; + sha256 = "11c5i2bm33cm84kww4p5jmi64pmfxafjrzri06vl8cwg05w0nqva"; + name = "dolphin-23.08.4.tar.xz"; }; }; dolphin-plugins = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/dolphin-plugins-23.08.3.tar.xz"; - sha256 = "0s57n5bg0sq9xj38rq8sy6fv6biiwrxg85a4xq0hqsjfcy7gwk89"; - name = "dolphin-plugins-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/dolphin-plugins-23.08.4.tar.xz"; + sha256 = "1m1kmdgx6isyff4i9nj6mv16lsg08rzivd0p42avj1pm17giyhcw"; + name = "dolphin-plugins-23.08.4.tar.xz"; }; }; dragon = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/dragon-23.08.3.tar.xz"; - sha256 = "0hf4agxqs8y7ivrd2ikr1ld1liam5kncswsxi25al1hv5c49qirf"; - name = "dragon-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/dragon-23.08.4.tar.xz"; + sha256 = "1h5c29fkarqcbbhirj9q88v5spsp1l4hkjs0akp21j212b309dd5"; + name = "dragon-23.08.4.tar.xz"; }; }; elisa = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/elisa-23.08.3.tar.xz"; - sha256 = "1nb6scjq9aj8cd5paqyyhx4l9lp6a4rq8f0dkkmq55nb4ixq1nz5"; - name = "elisa-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/elisa-23.08.4.tar.xz"; + sha256 = "0hsikp4ya26gq0v1f259mbwahl5rv1lfjj3cwh579rwabk8vpj5a"; + name = "elisa-23.08.4.tar.xz"; }; }; eventviews = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/eventviews-23.08.3.tar.xz"; - sha256 = "0hazaxgil90pa9y2ja4f76h78yppiykqh2c216qrsqaw22lisgiw"; - name = "eventviews-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/eventviews-23.08.4.tar.xz"; + sha256 = "0zl527fzz9brhk0gqvgfnzmqhqc3phxg97nafadvasrj8fz8nv9h"; + name = "eventviews-23.08.4.tar.xz"; }; }; falkon = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/falkon-23.08.3.tar.xz"; - sha256 = "00py03fbj105knqmrj370ca8lyipiknwjvhswli3hv8ksk5wsxxi"; - name = "falkon-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/falkon-23.08.4.tar.xz"; + sha256 = "0qvd53klxfmfm4b3apwvywwzi1k9qv6c2wyljz0cziycd2vq917h"; + name = "falkon-23.08.4.tar.xz"; }; }; ffmpegthumbs = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ffmpegthumbs-23.08.3.tar.xz"; - sha256 = "109766pkhqwq8vk14av79c18lpw73q553b9l9asrkh5s0gzignmh"; - name = "ffmpegthumbs-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ffmpegthumbs-23.08.4.tar.xz"; + sha256 = "0jv8fy68fwikn3vlf4hxvnyqv1a1hs18zdj2ds112ymlmw846bsh"; + name = "ffmpegthumbs-23.08.4.tar.xz"; }; }; filelight = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/filelight-23.08.3.tar.xz"; - sha256 = "12hq3q0my6lfa0ql1smgyxqbq9dcv8i70rc1s7w69b7k9y45nnp2"; - name = "filelight-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/filelight-23.08.4.tar.xz"; + sha256 = "1irn8kbbka1p9dzh9yl87fc7gz9486bq3wxbiw4gh11pkrm246dg"; + name = "filelight-23.08.4.tar.xz"; }; }; ghostwriter = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ghostwriter-23.08.3.tar.xz"; - sha256 = "0pfr9s6csk2w3qzr48sg6y4fpvh7xflja12pva9sp8whzplg7wda"; - name = "ghostwriter-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ghostwriter-23.08.4.tar.xz"; + sha256 = "0w8cjrvsibhp7q4b2wqhi5pmbvir6p1z283k3pq6qhl72fg9cpd8"; + name = "ghostwriter-23.08.4.tar.xz"; }; }; granatier = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/granatier-23.08.3.tar.xz"; - sha256 = "1wjwj4lwn992wgsmqdvs50jy60vcpim5y56a6xrwxcdbhcvj65px"; - name = "granatier-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/granatier-23.08.4.tar.xz"; + sha256 = "1n6x7nlrxdlj54rwbdv440sf6g5a56mnhlsf5x54z97il3jrvxxm"; + name = "granatier-23.08.4.tar.xz"; }; }; grantlee-editor = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/grantlee-editor-23.08.3.tar.xz"; - sha256 = "1wdss8narjdr5fvqqysh0mnj47d86lhdj2zk8a5vz6cijvyd9076"; - name = "grantlee-editor-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/grantlee-editor-23.08.4.tar.xz"; + sha256 = "0aczzf4bgg9gsh83nzifia2vrmk5xr3y0nxsw0dk061s1g1d04yc"; + name = "grantlee-editor-23.08.4.tar.xz"; }; }; grantleetheme = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/grantleetheme-23.08.3.tar.xz"; - sha256 = "127wxfa1n9akb1i746h9fbg3xsc7127lmgl8qa0y09bjj217dd2r"; - name = "grantleetheme-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/grantleetheme-23.08.4.tar.xz"; + sha256 = "0bf3llh7y9n7wlgmpb9ydpm4grfhcwgf7nsjz0c84mkgv1a9876q"; + name = "grantleetheme-23.08.4.tar.xz"; }; }; gwenview = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/gwenview-23.08.3.tar.xz"; - sha256 = "0g6qm3nzcsgm5l8h8fkd9hc26zgf3k6vy510m27y3jra7p7rn2hs"; - name = "gwenview-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/gwenview-23.08.4.tar.xz"; + sha256 = "01ddradjrcamkpjzskyiwm53i1iisk9y5v2vjffhgmvldjkrnm28"; + name = "gwenview-23.08.4.tar.xz"; }; }; incidenceeditor = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/incidenceeditor-23.08.3.tar.xz"; - sha256 = "07zljj30n6f80fw4p53hxz1frjs6camc1zyvx876rl8bxssd7c06"; - name = "incidenceeditor-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/incidenceeditor-23.08.4.tar.xz"; + sha256 = "0d8y9fvmr1mbi6virz9vsiaz4vhy5v74ngilmy3s488s99mhbm4f"; + name = "incidenceeditor-23.08.4.tar.xz"; }; }; itinerary = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/itinerary-23.08.3.tar.xz"; - sha256 = "1bgrj6i24lg9xv7kz7z1dk0xqgvbc15w1hz0r4mrwm4w151r9w77"; - name = "itinerary-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/itinerary-23.08.4.tar.xz"; + sha256 = "0jdb2m35r20bc8w2iq5xdjzfmdvaw0di4sp6wxl8vhcj0py1ryhw"; + name = "itinerary-23.08.4.tar.xz"; }; }; juk = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/juk-23.08.3.tar.xz"; - sha256 = "1y4wfilvpd3zbjw33lzk7amjb20c8gb2lmcl85mqyksmmsv7kl1j"; - name = "juk-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/juk-23.08.4.tar.xz"; + sha256 = "1ar9418j11sy213nis0i0l4nabqcrbxck7rzkn961cvaflw22par"; + name = "juk-23.08.4.tar.xz"; }; }; k3b = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/k3b-23.08.3.tar.xz"; - sha256 = "12jvb72vr3g1z9qbjjxxlpcvrpvmm8n0d02fs4fpvnmqzbxlkiw3"; - name = "k3b-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/k3b-23.08.4.tar.xz"; + sha256 = "096bv6jphlq3ch32q30d6h9qg5q8iphhkdpgb4hgmgz8pp2qgsrh"; + name = "k3b-23.08.4.tar.xz"; }; }; kaccounts-integration = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kaccounts-integration-23.08.3.tar.xz"; - sha256 = "0na3sy9dcn6qndivyr5yi2az0fvl6a8ywi4x775dxi2nncbjb730"; - name = "kaccounts-integration-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kaccounts-integration-23.08.4.tar.xz"; + sha256 = "0ln9f46kbhy7xpbvbbiv3i0kav0w5siqdbhj3s951a6c0mj1dv3v"; + name = "kaccounts-integration-23.08.4.tar.xz"; }; }; kaccounts-providers = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kaccounts-providers-23.08.3.tar.xz"; - sha256 = "1fz5k81xci4xwvgg79jhjpldblfbc5yagqggc28dkqvrzfzij6nb"; - name = "kaccounts-providers-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kaccounts-providers-23.08.4.tar.xz"; + sha256 = "11cg52vh6bapim4g2s1h7ds59kffrsidq5xg0w3cn9aqhh8hpi89"; + name = "kaccounts-providers-23.08.4.tar.xz"; }; }; kaddressbook = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kaddressbook-23.08.3.tar.xz"; - sha256 = "10n1d0p24fvcalwdl54cgg1n12yj476w343sqjrijzqp8j4a82pr"; - name = "kaddressbook-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kaddressbook-23.08.4.tar.xz"; + sha256 = "11j2a10xc0hmdmsqc6zqv2bjqj5msf3lqk5qq3dkkcgnwipr4v0d"; + name = "kaddressbook-23.08.4.tar.xz"; }; }; kajongg = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kajongg-23.08.3.tar.xz"; - sha256 = "1xdw8j4qxgqaxrj7dwazmzdrj88gzvgzcd45g7s4kimyf05pjpk5"; - name = "kajongg-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kajongg-23.08.4.tar.xz"; + sha256 = "0nlhh99nsndjd3gzc95dfmn1gzxnq8gg2l9m1mm90hnp4d655jbm"; + name = "kajongg-23.08.4.tar.xz"; }; }; kalarm = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kalarm-23.08.3.tar.xz"; - sha256 = "072m43s3dr7xdvplvvfvb1s5rgy6rbq540cjx239hwpd3qkg1ri8"; - name = "kalarm-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kalarm-23.08.4.tar.xz"; + sha256 = "0vhjx29i5ikk427md3i8kcf9s6q150hi01gsb64y5lx8jk2hpci1"; + name = "kalarm-23.08.4.tar.xz"; }; }; kalgebra = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kalgebra-23.08.3.tar.xz"; - sha256 = "104niva0c2ghqzydb433allm4g7yh2kfrglm5h2gw9p8rr792m9k"; - name = "kalgebra-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kalgebra-23.08.4.tar.xz"; + sha256 = "04wx0ai2xsq8br7hpvm2hcdf5fg0c982bshqsrbxvj1dhrb4mmwd"; + name = "kalgebra-23.08.4.tar.xz"; }; }; kalk = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kalk-23.08.3.tar.xz"; - sha256 = "0b3ifhiyl89syf2jawcddwk8zp1j1zgvg26lcqmi2plw67mvc7lj"; - name = "kalk-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kalk-23.08.4.tar.xz"; + sha256 = "1ngckrp6lsgb6cnp2d6fca0ywqddwacmr9ac4w6zfzyfjpiyxmic"; + name = "kalk-23.08.4.tar.xz"; }; }; kalzium = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kalzium-23.08.3.tar.xz"; - sha256 = "0pybhz6p2i92iv1zgn9prqqqaim0173n1pvbfrk00kbb1cfcpkbw"; - name = "kalzium-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kalzium-23.08.4.tar.xz"; + sha256 = "0gkvschn9la909907xa52hkp55rnbjm3rhrb6gjj07xxf1qrq358"; + name = "kalzium-23.08.4.tar.xz"; }; }; kamera = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kamera-23.08.3.tar.xz"; - sha256 = "1y1f4salx1svhar3bpvg5a5j1bwmi6n3drqzd3zvkfvfhdzzvsrp"; - name = "kamera-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kamera-23.08.4.tar.xz"; + sha256 = "148pa22gmcb87hp9mxwchc32zjrc7j0n60np5g46h4czjmcppsca"; + name = "kamera-23.08.4.tar.xz"; }; }; kamoso = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kamoso-23.08.3.tar.xz"; - sha256 = "1f31c5kbaf7dbksrnb3fmgcwk8b3qp4q94c99h6napm3q3p4bkbi"; - name = "kamoso-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kamoso-23.08.4.tar.xz"; + sha256 = "0ravp92i6q5cn4n6w89991yckjgjp6asm4bsnhnl434gv3q8dj6f"; + name = "kamoso-23.08.4.tar.xz"; }; }; kanagram = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kanagram-23.08.3.tar.xz"; - sha256 = "12x1pgd4hfha16jb3bf7ywm4p98zh0c7m98bx4slxryhxc8glmmp"; - name = "kanagram-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kanagram-23.08.4.tar.xz"; + sha256 = "0whnpy0yib7gdy8fj9gk21vs7q3lgr0il6ghzzykjq8s65xav4mm"; + name = "kanagram-23.08.4.tar.xz"; }; }; kapman = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kapman-23.08.3.tar.xz"; - sha256 = "1jhifmif3dwflc8j4mg8h7sd29kxz8fd3mw7d8rb60j1z1xarjx9"; - name = "kapman-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kapman-23.08.4.tar.xz"; + sha256 = "0cyp29nw0cgri2yw0rsc7y5bg37df331s8m1xajsaq2i2f15yk0y"; + name = "kapman-23.08.4.tar.xz"; }; }; kapptemplate = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kapptemplate-23.08.3.tar.xz"; - sha256 = "0hzbhfkch9l7yaiv3j1pr4ankjzjr7cfv5s87a19nif31jwy05gd"; - name = "kapptemplate-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kapptemplate-23.08.4.tar.xz"; + sha256 = "1g7r8fj2jyisk1f1fv7q9bfmmhz08xmbs9wx3xk67ijkmzbpszyx"; + name = "kapptemplate-23.08.4.tar.xz"; }; }; kasts = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kasts-23.08.3.tar.xz"; - sha256 = "136gsrxgbzdd1jsm23cyzzj02yhgjcbmywn7qnzg69hcd9rxpfkn"; - name = "kasts-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kasts-23.08.4.tar.xz"; + sha256 = "18vj02zdzi01r004jv8hpkmgjm0m74kypdsk8xcvw54vqzb5krmi"; + name = "kasts-23.08.4.tar.xz"; }; }; kate = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kate-23.08.3.tar.xz"; - sha256 = "16m2v46msl065841z62h2dpnndif3j1gafd2vspy77n41aqhikqp"; - name = "kate-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kate-23.08.4.tar.xz"; + sha256 = "18pvnfzd09ffxrz5g0whd7m342x14zpm0xmic4n7zxh5namaqzr9"; + name = "kate-23.08.4.tar.xz"; }; }; katomic = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/katomic-23.08.3.tar.xz"; - sha256 = "16xi82qg0wdfs4y8qkl34q46231qx3jh351y3wwzpnsrcpq9vxxp"; - name = "katomic-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/katomic-23.08.4.tar.xz"; + sha256 = "1vksy7qpc12r1y6ss42lqbxqigzbvlvlkggcs2jx399bafs6kf0l"; + name = "katomic-23.08.4.tar.xz"; }; }; kbackup = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kbackup-23.08.3.tar.xz"; - sha256 = "1d1bsbm4zkxlxjbk9p2ndix1ly4k7vjm94v0pfy057j21djiqb0b"; - name = "kbackup-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kbackup-23.08.4.tar.xz"; + sha256 = "12sdg1c3bzyd25vf7z4d9a4z13hjhv7hhdzy9nq2w6v4qmkp28z9"; + name = "kbackup-23.08.4.tar.xz"; }; }; kblackbox = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kblackbox-23.08.3.tar.xz"; - sha256 = "047g9h5nz9awdpg9ha3qi7l0ybs77qwjgw0628ac33klxlz0y60p"; - name = "kblackbox-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kblackbox-23.08.4.tar.xz"; + sha256 = "0c7bzkib99xx3gqah4j463rdvl39aq7nxh4wda0glik28s9w21kg"; + name = "kblackbox-23.08.4.tar.xz"; }; }; kblocks = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kblocks-23.08.3.tar.xz"; - sha256 = "13yw8pdvnn3944x6cqxbiwllphyjynan57f215000f4gpvj8ncmc"; - name = "kblocks-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kblocks-23.08.4.tar.xz"; + sha256 = "0slpkdkwcffq71l4r5vsd0fh73y90zwxfyp0lm69n99p9ni8gjzq"; + name = "kblocks-23.08.4.tar.xz"; }; }; kbounce = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kbounce-23.08.3.tar.xz"; - sha256 = "129724ks0cd5689wihyhds3rb6rai8bp4wajqihn3qidpq7h3dqp"; - name = "kbounce-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kbounce-23.08.4.tar.xz"; + sha256 = "0lp4cgjrm80355w4xa15ji91z5dsd55m43fhg8zw5yn6kp2hi2mg"; + name = "kbounce-23.08.4.tar.xz"; }; }; kbreakout = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kbreakout-23.08.3.tar.xz"; - sha256 = "1pnkwgxmy02ggxxzx1cxhvvghvz37kwvkw70gd2d98ma143b97xq"; - name = "kbreakout-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kbreakout-23.08.4.tar.xz"; + sha256 = "0czgfk93xhy9yhc84x2rdbf54dgyqjlhm71vfi5cs8858nacbwk5"; + name = "kbreakout-23.08.4.tar.xz"; }; }; kbruch = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kbruch-23.08.3.tar.xz"; - sha256 = "0pg4q9si6s43dja3nl8fr73cfy568xxbq3d9j4am1bl0jpwlsyjb"; - name = "kbruch-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kbruch-23.08.4.tar.xz"; + sha256 = "1rnk6k1rs0nf8470mykas7srwyfpkw71sckgwz1mw9vd4v4mkb2w"; + name = "kbruch-23.08.4.tar.xz"; }; }; kcachegrind = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kcachegrind-23.08.3.tar.xz"; - sha256 = "0zy2fp31bq0688njpk54dd51vd7fm4ph5x0jdygbr8w9pg7r5vlz"; - name = "kcachegrind-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kcachegrind-23.08.4.tar.xz"; + sha256 = "011bsb9yxrjmazqs1s6fvzvga4mlhjpdvkifbxblqavwp3ipmwbw"; + name = "kcachegrind-23.08.4.tar.xz"; }; }; kcalc = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kcalc-23.08.3.tar.xz"; - sha256 = "0f3nq88ifzcw7yjcalcn4xbg12rn11fsddgd8gbaxhqilxf7ggkr"; - name = "kcalc-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kcalc-23.08.4.tar.xz"; + sha256 = "107q804sn2pvvw0l2wjqwaqiyqnn0cgfxxi5i4nbjvbcm28iwjbr"; + name = "kcalc-23.08.4.tar.xz"; }; }; kcalutils = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kcalutils-23.08.3.tar.xz"; - sha256 = "1c1ifc11y0a25k2aiczl0mwpnc87y9m2vawwjcshzp04k9yfl88p"; - name = "kcalutils-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kcalutils-23.08.4.tar.xz"; + sha256 = "17an9cnlcwgi1yqgy7qzw83y4a7jwkzlf0gd976hk90i6yz4krd4"; + name = "kcalutils-23.08.4.tar.xz"; }; }; kcharselect = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kcharselect-23.08.3.tar.xz"; - sha256 = "02zaq8w4a1sq67jn5swfrsnwh2rjlizkcr4xv1j1jy6cmvl7s9k6"; - name = "kcharselect-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kcharselect-23.08.4.tar.xz"; + sha256 = "15cdm98cx74smkfdwwg5y1pi8wwaavp2088x5r99p8vhdccr782k"; + name = "kcharselect-23.08.4.tar.xz"; }; }; kclock = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kclock-23.08.3.tar.xz"; - sha256 = "0h932w0lfd9aq7n3p2ny375qbnqsa9hk1sq0mz1sgj7csb5y924i"; - name = "kclock-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kclock-23.08.4.tar.xz"; + sha256 = "0ifd04hsjr2rsn7vb94p3yvf5znqij3i6w30w2nvykyrds0yrnsl"; + name = "kclock-23.08.4.tar.xz"; }; }; kcolorchooser = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kcolorchooser-23.08.3.tar.xz"; - sha256 = "07zv0vvwdgf68ay07adp0hcgw1y5xasfm5kf82rr0khiqwmm2qal"; - name = "kcolorchooser-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kcolorchooser-23.08.4.tar.xz"; + sha256 = "135289j58pw2gh0vf3sjq4fz38jw9l4n4h7dqn7jm5ibc36f3iqg"; + name = "kcolorchooser-23.08.4.tar.xz"; }; }; kcron = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kcron-23.08.3.tar.xz"; - sha256 = "1vbyp2g6p5bgzwbp72aa9zsdwnhr2r4jvpa626j31hh58hxdj0c3"; - name = "kcron-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kcron-23.08.4.tar.xz"; + sha256 = "06w518p82sclwychrzk9y0xmx1ir87yf9irqvvqq62bm479dq92k"; + name = "kcron-23.08.4.tar.xz"; }; }; kde-dev-scripts = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kde-dev-scripts-23.08.3.tar.xz"; - sha256 = "0m3f5wyp01128yhni6g5idihhli3zbn0mw60c1wkbr81k0drb71x"; - name = "kde-dev-scripts-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kde-dev-scripts-23.08.4.tar.xz"; + sha256 = "056xymrzb6x7ixj75dcplhr198b0mw78kdfygf9ry0h8ma84gdmb"; + name = "kde-dev-scripts-23.08.4.tar.xz"; }; }; kde-dev-utils = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kde-dev-utils-23.08.3.tar.xz"; - sha256 = "04sfqlf1b7lkpd0d5wifiq253fcl3ba38gnvwyw6jmlgsajaapm4"; - name = "kde-dev-utils-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kde-dev-utils-23.08.4.tar.xz"; + sha256 = "06fzj033lm3jmidkkpywdl2sqymarvy97mhlb5kslsl7g9vkkili"; + name = "kde-dev-utils-23.08.4.tar.xz"; }; }; kde-inotify-survey = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kde-inotify-survey-23.08.3.tar.xz"; - sha256 = "1b2hplri9s6h26csf2hyp25gffk1mzz4kaxwq7ssjhwswg251qqc"; - name = "kde-inotify-survey-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kde-inotify-survey-23.08.4.tar.xz"; + sha256 = "0ym04p4647y9amjypqv24mvgf6n0xmjm3zix8v0ywzmlxyd2fkjw"; + name = "kde-inotify-survey-23.08.4.tar.xz"; }; }; kdebugsettings = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdebugsettings-23.08.3.tar.xz"; - sha256 = "1fm4bzgrg501v99hx0plkfvkw13ynlc9k1xsq1mi0dx4kx53rkbi"; - name = "kdebugsettings-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdebugsettings-23.08.4.tar.xz"; + sha256 = "1nhi0cq195bmg6hj4x4c59crjnpfkwsazz5wf52gdh2dmn4dxsk0"; + name = "kdebugsettings-23.08.4.tar.xz"; }; }; kdeconnect-kde = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdeconnect-kde-23.08.3.tar.xz"; - sha256 = "01i9palhzsa0f2cypwi0ik6lc37p7hx1h1zlz5ly1q70n8amx3xr"; - name = "kdeconnect-kde-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdeconnect-kde-23.08.4.tar.xz"; + sha256 = "0wgqg3di4s8n43q6znr7lzphidi3mnghac4rjgjx08fs65da9m8b"; + name = "kdeconnect-kde-23.08.4.tar.xz"; }; }; kdeedu-data = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdeedu-data-23.08.3.tar.xz"; - sha256 = "0x32hqb6fixk53fv5g29jjq1bk0svv4i9yb51amgscbqf0aircf9"; - name = "kdeedu-data-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdeedu-data-23.08.4.tar.xz"; + sha256 = "002b6yvq0f2anr6avpawg8byx78mds0pw550ga5x0dikyp0xwzaj"; + name = "kdeedu-data-23.08.4.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdegraphics-mobipocket-23.08.3.tar.xz"; - sha256 = "11vlmkaqypnjsvgvrma22qy5vq5mjcyz71y2glbbdjvmld61s91s"; - name = "kdegraphics-mobipocket-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdegraphics-mobipocket-23.08.4.tar.xz"; + sha256 = "1rqx2y9xfqn32xv4vb7j2pp6i0nc9a64llmbp6jzvazbv7yzlw7q"; + name = "kdegraphics-mobipocket-23.08.4.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdegraphics-thumbnailers-23.08.3.tar.xz"; - sha256 = "1h02p2l2z28g2nnfhf57d4xjy185biwp0ym4cwpavx8xxa4sb87m"; - name = "kdegraphics-thumbnailers-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdegraphics-thumbnailers-23.08.4.tar.xz"; + sha256 = "0i8h3whf4hh8ff0rivbkkr8v58y1jzwh4jpwb47vb1d0hlskzvw6"; + name = "kdegraphics-thumbnailers-23.08.4.tar.xz"; }; }; kdenetwork-filesharing = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdenetwork-filesharing-23.08.3.tar.xz"; - sha256 = "1v35g9g3h1j8l012di3fdqk0s4qcbwnlglvcbymbbrph6bsjz9m2"; - name = "kdenetwork-filesharing-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdenetwork-filesharing-23.08.4.tar.xz"; + sha256 = "1v2zvn228jc3s6rf362zbbrxilxqkjvvnjw1y5yhdnk9c3l5nglj"; + name = "kdenetwork-filesharing-23.08.4.tar.xz"; }; }; kdenlive = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdenlive-23.08.3.tar.xz"; - sha256 = "13rfbj01xdiskwld1liys5y0har2wnxqxfb2wglm0bafcsjciv47"; - name = "kdenlive-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdenlive-23.08.4.tar.xz"; + sha256 = "04yk092z6hwblfn8y61ny72pxb7czd20lw2jmvrs05lf1l4i3ik5"; + name = "kdenlive-23.08.4.tar.xz"; }; }; kdepim-addons = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdepim-addons-23.08.3.tar.xz"; - sha256 = "1pa091c978ram37p7a5kzmcv5b6mw9il7kz12hzad10sj6vkx106"; - name = "kdepim-addons-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdepim-addons-23.08.4.tar.xz"; + sha256 = "1qxbz97gpn6gwqq40bxx6w75bd0slaah0wvf8mrir3x1b1h5kvrv"; + name = "kdepim-addons-23.08.4.tar.xz"; }; }; kdepim-runtime = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdepim-runtime-23.08.3.tar.xz"; - sha256 = "06vbachvqa92idzxpcxj3z943089iqq6db5w90nwfda5bg1v734r"; - name = "kdepim-runtime-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdepim-runtime-23.08.4.tar.xz"; + sha256 = "188xgj7g5i76h6d6n8zw3qn965rm64aa8wiza92bq2hxihgj3hn2"; + name = "kdepim-runtime-23.08.4.tar.xz"; }; }; kdesdk-kio = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdesdk-kio-23.08.3.tar.xz"; - sha256 = "1895jc0kbgiysbbkjjwqx94h7xy30basybl362b72nmx1irydhw0"; - name = "kdesdk-kio-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdesdk-kio-23.08.4.tar.xz"; + sha256 = "1vz44a7261a538qhpn7ria56wa3zabbxgb33dqpzxapmsgnm0q01"; + name = "kdesdk-kio-23.08.4.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdesdk-thumbnailers-23.08.3.tar.xz"; - sha256 = "09hd7xi2sw7mhc41k845igvpncfkq7rabbr92gh33fx3fi2bq0k5"; - name = "kdesdk-thumbnailers-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdesdk-thumbnailers-23.08.4.tar.xz"; + sha256 = "0ibbfy5l1d5iv8m6sjwbw2f9s0kvzrvbi6k2j3gcf2a41y5hay3a"; + name = "kdesdk-thumbnailers-23.08.4.tar.xz"; }; }; kdev-php = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdev-php-23.08.3.tar.xz"; - sha256 = "1vxafw6i3yp9dcccv447b1yjhm3wssyysbx99c4564j6q43bizvr"; - name = "kdev-php-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdev-php-23.08.4.tar.xz"; + sha256 = "1l0g6jx3iz6k8vmjziazm4h21myi3qb80nflaydddcrd6bzrgh10"; + name = "kdev-php-23.08.4.tar.xz"; }; }; kdev-python = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdev-python-23.08.3.tar.xz"; - sha256 = "1n2vcw01mfmvjxswp9j9qj5w9sxlmshpmjp28dscnksqlmgvyk8c"; - name = "kdev-python-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdev-python-23.08.4.tar.xz"; + sha256 = "14xj96yv24qdsyz9cdiy1b14wp8w72iayyvqyp0w050p4i6cjvm3"; + name = "kdev-python-23.08.4.tar.xz"; }; }; kdevelop = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdevelop-23.08.3.tar.xz"; - sha256 = "1zimkfvpipkc6py6zxrxvdnznjm29s9qwkskk2x6nckrj0zikk0r"; - name = "kdevelop-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdevelop-23.08.4.tar.xz"; + sha256 = "1w3s6ncrbldsfm0ca6cryxf0d53d87k4iifcahq12acgrqmjpl4i"; + name = "kdevelop-23.08.4.tar.xz"; }; }; kdf = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdf-23.08.3.tar.xz"; - sha256 = "118fcs26qdjm08r2qz86gx5kwgqfgn07f3j6b30hrfvfrxsyi63b"; - name = "kdf-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdf-23.08.4.tar.xz"; + sha256 = "038ckjiikiy23gihxnznxlaf8wmni83hi9q2i4dms4956776rlfi"; + name = "kdf-23.08.4.tar.xz"; }; }; kdialog = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdialog-23.08.3.tar.xz"; - sha256 = "0nm8zx44y0g6hc101lfbybdilhvblpx8v9hz8qb1mixac9mg69fz"; - name = "kdialog-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdialog-23.08.4.tar.xz"; + sha256 = "0y6dchl3nv183hlkmwkmj654mhm3dvad3mkq8d2622jl73w9byld"; + name = "kdialog-23.08.4.tar.xz"; }; }; kdiamond = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kdiamond-23.08.3.tar.xz"; - sha256 = "13z4p5qasqvj9fbif40lxva8nl1z9ccy4wgrk9z429h4gz14gms0"; - name = "kdiamond-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kdiamond-23.08.4.tar.xz"; + sha256 = "02ws8wr7adwcm3rl70zchl3kgc5jgr6j5wz07hswdwwl2nl2pd69"; + name = "kdiamond-23.08.4.tar.xz"; }; }; keditbookmarks = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/keditbookmarks-23.08.3.tar.xz"; - sha256 = "16ff8sh9dbrwpnciny75n5a9zy4mzb7k0r6q1di0qyc7fsbsx5xh"; - name = "keditbookmarks-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/keditbookmarks-23.08.4.tar.xz"; + sha256 = "14xzjlyaqvg6qkjmw4d6540f5xawkd7sjxrvfa5bas623c1888ks"; + name = "keditbookmarks-23.08.4.tar.xz"; }; }; keysmith = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/keysmith-23.08.3.tar.xz"; - sha256 = "0bc9ywphfcg526izx9g39wwfs9kqp78xw7asngdmnb9mlpyiqc6d"; - name = "keysmith-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/keysmith-23.08.4.tar.xz"; + sha256 = "11fm64h7pzsm63hw3cji033m9xk2hcnc0d74rzyvpn1ql3whn43n"; + name = "keysmith-23.08.4.tar.xz"; }; }; kfind = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kfind-23.08.3.tar.xz"; - sha256 = "1rs50199j1xgzd6nr48hn4f254avv2jajkg6yldcpigjb6y62bpa"; - name = "kfind-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kfind-23.08.4.tar.xz"; + sha256 = "1psf1lwbnpnqp8snm4880awnxapv27b42nax6b8nxzf7mb5lqlkh"; + name = "kfind-23.08.4.tar.xz"; }; }; kfourinline = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kfourinline-23.08.3.tar.xz"; - sha256 = "1n9svckg4x463rliby8amyrhrihl55p1h4kk5lkn7hfa58irs59n"; - name = "kfourinline-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kfourinline-23.08.4.tar.xz"; + sha256 = "0g5hml3jzz7p1jacxqqb2llvhv5p2g4j9wdvrplxf8cycwwd941n"; + name = "kfourinline-23.08.4.tar.xz"; }; }; kgeography = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kgeography-23.08.3.tar.xz"; - sha256 = "18q7jc76g279hcdqy0bsiwq0wpssr545m31spnji3v3cfyg21w2g"; - name = "kgeography-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kgeography-23.08.4.tar.xz"; + sha256 = "06nvqn9mrpk1i14xwh9qv6g22hs2s64ip7lxjms4j3js304606wg"; + name = "kgeography-23.08.4.tar.xz"; }; }; kget = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kget-23.08.3.tar.xz"; - sha256 = "1cdb3w6941c6agasjzmk58lgviks2phk9w321p1yw2g6v4prb81g"; - name = "kget-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kget-23.08.4.tar.xz"; + sha256 = "0gmkizhgi2fwvvkycpcvj46ws3w5hgsz5ajy58857y1nam23293r"; + name = "kget-23.08.4.tar.xz"; }; }; kgoldrunner = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kgoldrunner-23.08.3.tar.xz"; - sha256 = "1ivx443a807rbbl179pid04am1s3qcmdrkf90pgpf1y85mf52gw4"; - name = "kgoldrunner-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kgoldrunner-23.08.4.tar.xz"; + sha256 = "02nslz7fz4d6d8gg4qb2flsciirqq0yxfgc0rp8r677gv2nfarmk"; + name = "kgoldrunner-23.08.4.tar.xz"; }; }; kgpg = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kgpg-23.08.3.tar.xz"; - sha256 = "0fn44ikpj1f1cniivq3k32248pmcf7ir54dpwzlfa0xn9cgr5b6r"; - name = "kgpg-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kgpg-23.08.4.tar.xz"; + sha256 = "12x2vyn63agqryjzk9dm9jdgxiaw685nv86ysbmmnf621qcvl13m"; + name = "kgpg-23.08.4.tar.xz"; }; }; khangman = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/khangman-23.08.3.tar.xz"; - sha256 = "0cj46h6px8i1s1qianc7ypa0xzchv9dbv88c85igl7jaw3l8vyiz"; - name = "khangman-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/khangman-23.08.4.tar.xz"; + sha256 = "1jj2ahaw9i5xv8jkqd8s9vrxnaz5aamq86ryq43jssrppm11r88x"; + name = "khangman-23.08.4.tar.xz"; }; }; khelpcenter = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/khelpcenter-23.08.3.tar.xz"; - sha256 = "0ppsif19kchz8k2ww2nc1wqqri6zq93cg36j6iydg61qiilf4grv"; - name = "khelpcenter-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/khelpcenter-23.08.4.tar.xz"; + sha256 = "0j7dlnc5yn0bjvcc5811chy74rdkj1431lrl1czmyb1xl66bp52i"; + name = "khelpcenter-23.08.4.tar.xz"; }; }; kidentitymanagement = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kidentitymanagement-23.08.3.tar.xz"; - sha256 = "1pfvmbij90v626spb123hdgxzdpvx1r64pkx540g40fp5nw86d3z"; - name = "kidentitymanagement-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kidentitymanagement-23.08.4.tar.xz"; + sha256 = "16z86wi9n7l4ly4l3l0yzirqyrsqz1fngmad0cjcfhjkd29ncwwj"; + name = "kidentitymanagement-23.08.4.tar.xz"; }; }; kig = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kig-23.08.3.tar.xz"; - sha256 = "09lfcxs4qnj36vcm7flvf8ay7cgmbs5nwq1ranzk7n82gs6f96n9"; - name = "kig-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kig-23.08.4.tar.xz"; + sha256 = "1bykhflf9xr408c9z7g76q5kczi4ara7wbv4hy6abwmn4qsaw52k"; + name = "kig-23.08.4.tar.xz"; }; }; kigo = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kigo-23.08.3.tar.xz"; - sha256 = "1asplm2rdppqkl6l1j9d97k081c2j7zlckbk0j4wkkyqgh2pgf00"; - name = "kigo-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kigo-23.08.4.tar.xz"; + sha256 = "1clb12pjlsqb2l4n7zp292gv7nd8bh543x75cz41d2l6zv59jlnd"; + name = "kigo-23.08.4.tar.xz"; }; }; killbots = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/killbots-23.08.3.tar.xz"; - sha256 = "0v2zblvcv1r1by33icp4lakzjx4f87d2pcaxh99nvv3frq6y7ic9"; - name = "killbots-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/killbots-23.08.4.tar.xz"; + sha256 = "1crcv5pr2avadrzv4vh9gls0gwflqvz8w2cjan7hb2xfnszphhp4"; + name = "killbots-23.08.4.tar.xz"; }; }; kimagemapeditor = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kimagemapeditor-23.08.3.tar.xz"; - sha256 = "138dd5h1664akiwd0svsayyymjsg3brchwhvdyrfig9xx878s43p"; - name = "kimagemapeditor-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kimagemapeditor-23.08.4.tar.xz"; + sha256 = "1c3yclj7rrvkc3pis06h00i9cwll9grqvadrdfixmzfcdg7glf1w"; + name = "kimagemapeditor-23.08.4.tar.xz"; }; }; kimap = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kimap-23.08.3.tar.xz"; - sha256 = "1wym8sppd89sncm2f40zaxrzhmipq49g4vm5zw97cixkln0xlw0l"; - name = "kimap-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kimap-23.08.4.tar.xz"; + sha256 = "036liwpz7yzl192lbkhmasi5irw5884vrhj7qnnp6ihmh400b8as"; + name = "kimap-23.08.4.tar.xz"; }; }; kio-admin = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kio-admin-23.08.3.tar.xz"; - sha256 = "1a3r00sx1hvgbapd0m4v122cc24bkh2yxmnshdl73fm6sqdk1c6i"; - name = "kio-admin-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kio-admin-23.08.4.tar.xz"; + sha256 = "1xlr94p6yh65v8spdp80hrjbw74iazzpwvxz94sizfv7vl64i3q5"; + name = "kio-admin-23.08.4.tar.xz"; }; }; kio-extras = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kio-extras-23.08.3.tar.xz"; - sha256 = "1nnnv14105rvgqa5ad8b4nnafhy7cq7bpk5jqbf63jb87074sih6"; - name = "kio-extras-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kio-extras-23.08.4.tar.xz"; + sha256 = "0qfd92di1z59i8258640vsgrikkij73bjdxkfpp495cyrlhvr37n"; + name = "kio-extras-23.08.4.tar.xz"; }; }; kio-gdrive = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kio-gdrive-23.08.3.tar.xz"; - sha256 = "1pwd6lpa5vvbar2mz94xhwhwlds4hm0l6f8lx4y79h6d3wv50mhm"; - name = "kio-gdrive-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kio-gdrive-23.08.4.tar.xz"; + sha256 = "17ihwp04ips0gyvvwyhkwilad47c2qxkik5bsi6gxafh8f0jb0d8"; + name = "kio-gdrive-23.08.4.tar.xz"; }; }; kio-zeroconf = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kio-zeroconf-23.08.3.tar.xz"; - sha256 = "0f87k0v04p7pjv325qw425vs9vwfm1mmjljbcjq67afh666p8zdm"; - name = "kio-zeroconf-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kio-zeroconf-23.08.4.tar.xz"; + sha256 = "1p2h6v9ymcdc0szb0cy35c6jwp71arr4h8b8mr5hdwgyrg0zrfa9"; + name = "kio-zeroconf-23.08.4.tar.xz"; }; }; kipi-plugins = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kipi-plugins-23.08.3.tar.xz"; - sha256 = "1d5kh2iqvms8kfls0hjpp55pyll5qvzn3bxggy4ihjba12kwrq1c"; - name = "kipi-plugins-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kipi-plugins-23.08.4.tar.xz"; + sha256 = "12mzclfmi4vj5rl39dmj6qqp1g3008kpn1vr8f0qsyphjpr82syv"; + name = "kipi-plugins-23.08.4.tar.xz"; }; }; kirigami-gallery = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kirigami-gallery-23.08.3.tar.xz"; - sha256 = "0br35c5v4mz8nbqrqd0pagdr2gv88p0qh11ansadgkalwmgs283f"; - name = "kirigami-gallery-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kirigami-gallery-23.08.4.tar.xz"; + sha256 = "0fxw9c0543qxqsaibkxjmhsgvyhny6yy5krbfk73fs6a7klvbqma"; + name = "kirigami-gallery-23.08.4.tar.xz"; }; }; kiriki = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kiriki-23.08.3.tar.xz"; - sha256 = "1af6a6cghdak9wwx518q8wqyi8bylisy3gdlqfg2n5k1vq9ma1nr"; - name = "kiriki-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kiriki-23.08.4.tar.xz"; + sha256 = "1rh4ypql69rgwj7cn166qgr5irp8mdm7757r08gi065kz0lxhfgw"; + name = "kiriki-23.08.4.tar.xz"; }; }; kiten = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kiten-23.08.3.tar.xz"; - sha256 = "0ysrh6437sd5zqj76j6a1nz3q8cwqx4nqqijwnc75jdqd5w3aii7"; - name = "kiten-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kiten-23.08.4.tar.xz"; + sha256 = "142rmapzybmzqmnx6j4j8vgxmzs8y00rp18ax7s8kfs7gn03ad39"; + name = "kiten-23.08.4.tar.xz"; }; }; kitinerary = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kitinerary-23.08.3.tar.xz"; - sha256 = "164xixh9lxp9kyx08pf2p2qbdl28800x7hvvnvkmy79bvsqvpr7l"; - name = "kitinerary-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kitinerary-23.08.4.tar.xz"; + sha256 = "090q9mlf7i8ydi458gvbgvmxm77ys97az7lknl16pz4gfmf0ld71"; + name = "kitinerary-23.08.4.tar.xz"; }; }; kjournald = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kjournald-23.08.3.tar.xz"; - sha256 = "0xz903wfi85g338advs46sn7fpdrcmy731gqp4dhpcrly8amvbzi"; - name = "kjournald-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kjournald-23.08.4.tar.xz"; + sha256 = "0b1gv5yypkk3vhgvw2g4clk8mipz3bv5pdnqidzjwhl5z2lisgzl"; + name = "kjournald-23.08.4.tar.xz"; }; }; kjumpingcube = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kjumpingcube-23.08.3.tar.xz"; - sha256 = "19k3wah2x4y3z950y70i9vkqwnlrnsdj71rrz8yxv29i0c4kdywd"; - name = "kjumpingcube-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kjumpingcube-23.08.4.tar.xz"; + sha256 = "17km7y89b637f7r9g90a684fsc4lsdnwqm7m3w6qy89h3r74kd2x"; + name = "kjumpingcube-23.08.4.tar.xz"; }; }; kldap = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kldap-23.08.3.tar.xz"; - sha256 = "1xz1fjvlal6y1ciakzsgqkivsi092rj6xvbmgp3pp4h7f2pwhnz5"; - name = "kldap-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kldap-23.08.4.tar.xz"; + sha256 = "0gh5sg11qcg40wns7i3g7bwwdkmqzb1kqrfrgdg08j7vqjwhwj30"; + name = "kldap-23.08.4.tar.xz"; }; }; kleopatra = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kleopatra-23.08.3.tar.xz"; - sha256 = "0ga3hs89g5dd6kf6xdfnr9srswf1dzis2dfm8jkah7czfmcfns28"; - name = "kleopatra-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kleopatra-23.08.4.tar.xz"; + sha256 = "0mwicqry4h3q2bq138flxag5x5l8qpwlbg97jifjc32yqlxpg3jm"; + name = "kleopatra-23.08.4.tar.xz"; }; }; klettres = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/klettres-23.08.3.tar.xz"; - sha256 = "1vvs8a0npf9dy5778jjyvbg0jpbgjz1ysf3ckg9v8n5qr211v1cp"; - name = "klettres-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/klettres-23.08.4.tar.xz"; + sha256 = "16304hdzz78nyqqpcq3sf4f6wlk26imffag17cap3fs9l0qpq5pn"; + name = "klettres-23.08.4.tar.xz"; }; }; klickety = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/klickety-23.08.3.tar.xz"; - sha256 = "0kwaiab8cm1azc34l50gw0kjm2zx8j4pjqyi58829xrvvh3rf8lq"; - name = "klickety-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/klickety-23.08.4.tar.xz"; + sha256 = "0vhf069mlv6xkdzyj4dp251k0rinslaai6kkm7kjim0dal7ykk37"; + name = "klickety-23.08.4.tar.xz"; }; }; klines = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/klines-23.08.3.tar.xz"; - sha256 = "1qaw6rrd1az91sk3siij9a6fhcgl1y42m5v39497468y5iabc92j"; - name = "klines-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/klines-23.08.4.tar.xz"; + sha256 = "0f2a8vgnpg2mf9hc4gbz4ld5lw5jwbw1vyais6c9djykp552rjx9"; + name = "klines-23.08.4.tar.xz"; }; }; kmag = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kmag-23.08.3.tar.xz"; - sha256 = "0s978ixr19cd9jkd2j47c8ppb6j22w3wjyyvn5h5n09shr2sw2fx"; - name = "kmag-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kmag-23.08.4.tar.xz"; + sha256 = "12djnbl0l9z2vilndchx4z4mznrkwqvjdlgdj2gynj2wa08flprd"; + name = "kmag-23.08.4.tar.xz"; }; }; kmahjongg = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kmahjongg-23.08.3.tar.xz"; - sha256 = "1di8nib9k7f2d3afbbp12qmk377fah4b0vqwmj8i0ahhw7a1ydgs"; - name = "kmahjongg-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kmahjongg-23.08.4.tar.xz"; + sha256 = "17gnl34x5dq8lqws19m2cqf7k3sc8hs3290pnjmnxcgb29fy0mv0"; + name = "kmahjongg-23.08.4.tar.xz"; }; }; kmail = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kmail-23.08.3.tar.xz"; - sha256 = "01vjh1icad7ymcm2nqwss4b61a09mw7f6gzwqyzyc1x6f38908hv"; - name = "kmail-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kmail-23.08.4.tar.xz"; + sha256 = "10p5diprnhmgji4k9vm4bfhvjllah75j728cljvacdbmcqw879jv"; + name = "kmail-23.08.4.tar.xz"; }; }; kmail-account-wizard = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kmail-account-wizard-23.08.3.tar.xz"; - sha256 = "193f700lk0j5ci5x8y10d5lnd30lk4p4idyspznskqfs6sranshq"; - name = "kmail-account-wizard-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kmail-account-wizard-23.08.4.tar.xz"; + sha256 = "05n1c0piblrr3032hpy4zcqw3kkp4shy08qbq3rw1kdzaibmc86a"; + name = "kmail-account-wizard-23.08.4.tar.xz"; }; }; kmailtransport = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kmailtransport-23.08.3.tar.xz"; - sha256 = "18a8i2cffqdwgb7bvyayzrfp8l9zhhl3z0728bn51drw53c2pprp"; - name = "kmailtransport-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kmailtransport-23.08.4.tar.xz"; + sha256 = "18kkm56q336hh0j0lfnk871bzjsjfii0r69v9b6gsh1nni2lygks"; + name = "kmailtransport-23.08.4.tar.xz"; }; }; kmbox = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kmbox-23.08.3.tar.xz"; - sha256 = "1884av5dxz6d59z9abdbji9w7yyl02r51lrarna85iwy2pxpiq4j"; - name = "kmbox-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kmbox-23.08.4.tar.xz"; + sha256 = "1n9243aw9wvg1zr89djk98k14pik1h0z182jksb8mw8vv7xqqafm"; + name = "kmbox-23.08.4.tar.xz"; }; }; kmime = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kmime-23.08.3.tar.xz"; - sha256 = "1c9kkw1cmzlkmzg93pj0v3h4wd9gkna4xhi24774pwsxi06chl8s"; - name = "kmime-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kmime-23.08.4.tar.xz"; + sha256 = "04qgr8lws48m56lffbdqxkas7p97jm9scq2ccdksrq05dh6jl5hd"; + name = "kmime-23.08.4.tar.xz"; }; }; kmines = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kmines-23.08.3.tar.xz"; - sha256 = "0g1r2cx50fy0p5p7v7yydq9sn1kj4ahidqv3dfwwcy5lssgs6q6j"; - name = "kmines-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kmines-23.08.4.tar.xz"; + sha256 = "0wym7v9cmd4y2z3i7rqwvvpcm1hdkwi8rqwzhqcmh5i3xk3j5pmv"; + name = "kmines-23.08.4.tar.xz"; }; }; kmix = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kmix-23.08.3.tar.xz"; - sha256 = "0ddcb0gmjsw3k5by8i3b23c4gb8933blpqx74vx4b9crbv364x3m"; - name = "kmix-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kmix-23.08.4.tar.xz"; + sha256 = "0i2ywcipcprxmi23f501jjzic00nri0ss20dfcicgf0bpc8ybh71"; + name = "kmix-23.08.4.tar.xz"; }; }; kmousetool = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kmousetool-23.08.3.tar.xz"; - sha256 = "05xq14sc3n07kyq4nys0270pc1nxjvd7v2jxrfna621kdr8mvv7n"; - name = "kmousetool-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kmousetool-23.08.4.tar.xz"; + sha256 = "12i73smzx3kjj75hza424cr5nnq80xvgfv2kwmf32a3k9436jx15"; + name = "kmousetool-23.08.4.tar.xz"; }; }; kmouth = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kmouth-23.08.3.tar.xz"; - sha256 = "0fqmrccd0pfn8pjfnaq5pk1xzns4v6y2vkfvv07lkpdnzj0mx7s1"; - name = "kmouth-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kmouth-23.08.4.tar.xz"; + sha256 = "08f1yb7m3c3pyp6glwwg9lya3a6j30wvxga2j2ik9hwfs9jx5x9j"; + name = "kmouth-23.08.4.tar.xz"; }; }; kmplot = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kmplot-23.08.3.tar.xz"; - sha256 = "1sjw598jncfbmpscq71fh4l8w932d1p77jkqp70d32az36xrnns5"; - name = "kmplot-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kmplot-23.08.4.tar.xz"; + sha256 = "1zmxaahpj6k5fk5fzrxqzrkki080mkxgz2a73ajsfjs387qvxg92"; + name = "kmplot-23.08.4.tar.xz"; }; }; knavalbattle = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/knavalbattle-23.08.3.tar.xz"; - sha256 = "1mjk27k9h9i2sb2li97hnzjirgji1z7kv7al5c7m5r4j8jz6jzyy"; - name = "knavalbattle-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/knavalbattle-23.08.4.tar.xz"; + sha256 = "106hjf4ji4c9gvly916dbslvpxgc04qwp403srknqgrbx8ixsacg"; + name = "knavalbattle-23.08.4.tar.xz"; }; }; knetwalk = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/knetwalk-23.08.3.tar.xz"; - sha256 = "1mg9hjvrqj8ksp79hkw3rpx16swmr8l2xxkmsx3vczdk2hi46gbr"; - name = "knetwalk-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/knetwalk-23.08.4.tar.xz"; + sha256 = "1vk1z9jk77qn8abckdj3mv3a4xyaz9r44b5hxzsf79870p4ss2ix"; + name = "knetwalk-23.08.4.tar.xz"; }; }; knights = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/knights-23.08.3.tar.xz"; - sha256 = "0yjigwqyzj3ph56zvlddfjmiwzssrq9lar6ipzga5k2anwdfgv6j"; - name = "knights-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/knights-23.08.4.tar.xz"; + sha256 = "08flarcc72hrv59ahiwh6c9cfyrjr1lhk42xv0arnvf87w0a6dr9"; + name = "knights-23.08.4.tar.xz"; }; }; knotes = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/knotes-23.08.3.tar.xz"; - sha256 = "1d24j7qyizvppzmrz25w08gghx37cdrsmb4gzy3vsvamx9r8cjda"; - name = "knotes-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/knotes-23.08.4.tar.xz"; + sha256 = "1xm9sjm0kqsyj8ah3mhb66hb80icfs45byz0lvbw7idridv22bpd"; + name = "knotes-23.08.4.tar.xz"; }; }; koko = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/koko-23.08.3.tar.xz"; - sha256 = "0lk1ik63rbdh7dj4g3y6m6ck44gc1rx526zn94cjm6ii7g7xlvfy"; - name = "koko-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/koko-23.08.4.tar.xz"; + sha256 = "12inpjdbf4xa569wb4rc0qckkm6g2wy3ggls2wdf2pr3k36yhx9m"; + name = "koko-23.08.4.tar.xz"; }; }; kolf = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kolf-23.08.3.tar.xz"; - sha256 = "16sig7wi0pg421fpbqygjacsaslvailxd4fvmwph2356lz8w059j"; - name = "kolf-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kolf-23.08.4.tar.xz"; + sha256 = "0mxs7vif7zwgbmrm3h20km9pf2cl129zbc4fvxzkwvksa982b92w"; + name = "kolf-23.08.4.tar.xz"; }; }; kollision = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kollision-23.08.3.tar.xz"; - sha256 = "00cm9x81l9qwb0nq7c3mpyxc3pgn3hgrbcrwg38na1plm1ykbrfx"; - name = "kollision-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kollision-23.08.4.tar.xz"; + sha256 = "1ywl689cr0673xs5aflg689k5n9rnmgp0ggwmv56czrm8fkp015a"; + name = "kollision-23.08.4.tar.xz"; }; }; kolourpaint = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kolourpaint-23.08.3.tar.xz"; - sha256 = "0mhj64r2hz7pqnii9gs5psmq0drjgqkj4v49kzapx7za54c5lgzg"; - name = "kolourpaint-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kolourpaint-23.08.4.tar.xz"; + sha256 = "1rpq355q2ghhxx3hvqqygr92vwlrm5vcpgvl422xr456ljn7jarc"; + name = "kolourpaint-23.08.4.tar.xz"; }; }; kompare = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kompare-23.08.3.tar.xz"; - sha256 = "1gcwm0c5yd20k1hxds0qjvmz27f380g42ia85b291w05q28ryip8"; - name = "kompare-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kompare-23.08.4.tar.xz"; + sha256 = "14rwav520s95zf83jaa1xqbskaj74pqx7di8i5f36fw0ap5llgvr"; + name = "kompare-23.08.4.tar.xz"; }; }; kongress = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kongress-23.08.3.tar.xz"; - sha256 = "1956nirp276qmwnc60q7z482as3dhmzifw38shys651fpwl3k1yg"; - name = "kongress-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kongress-23.08.4.tar.xz"; + sha256 = "03qn8cqnsm6267p5yk86z22k6j2mwdnf31v93v6x496yfmhg89xa"; + name = "kongress-23.08.4.tar.xz"; }; }; konqueror = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/konqueror-23.08.3.tar.xz"; - sha256 = "0ay4nsx3xybjmvl3r5ivmyxhx97krjz09a9pih4wdf822x79044j"; - name = "konqueror-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/konqueror-23.08.4.tar.xz"; + sha256 = "1bz6v320kwv9sz86zv1icqi6la4pml79mq0hya43x0i709nqdrli"; + name = "konqueror-23.08.4.tar.xz"; }; }; konquest = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/konquest-23.08.3.tar.xz"; - sha256 = "0pndf3qrvrifd0qf3viy01vw94dniwrrggw5h397dhy3hq47ibny"; - name = "konquest-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/konquest-23.08.4.tar.xz"; + sha256 = "08wal5q84nbdlnb7f850bkfypk09dbw467416038p340fnjyvxzq"; + name = "konquest-23.08.4.tar.xz"; }; }; konsole = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/konsole-23.08.3.tar.xz"; - sha256 = "08skv0c1390v792s0zw2w6xl3jpm3qyzjd3g1mcnim0zmlq38372"; - name = "konsole-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/konsole-23.08.4.tar.xz"; + sha256 = "1dwg4x8xmzy5kh4szzl814hgjpvn4vi6pwfz1abmnqa9qz85n2vc"; + name = "konsole-23.08.4.tar.xz"; }; }; kontact = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kontact-23.08.3.tar.xz"; - sha256 = "16h9z3bss4k9pg178ar34vpakcqxz9w3zclgajd55wf13jk3xk92"; - name = "kontact-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kontact-23.08.4.tar.xz"; + sha256 = "12bk6rr1lj3b036l341lh5na2cw6r6khd4dq220pyrf1i75fnizp"; + name = "kontact-23.08.4.tar.xz"; }; }; kontactinterface = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kontactinterface-23.08.3.tar.xz"; - sha256 = "0yqpjn7fdg2hcjffff6j9nnilm9phfnral3kwqwfp5y565qiq8gl"; - name = "kontactinterface-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kontactinterface-23.08.4.tar.xz"; + sha256 = "0ar57i4cdmpqsqsgnpavs3rs4hfj39wnddacvxpcj33ifzq40dln"; + name = "kontactinterface-23.08.4.tar.xz"; }; }; kontrast = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kontrast-23.08.3.tar.xz"; - sha256 = "1n6shhfbdxz77m2s0bml2br94g98fb71rwm8znj5dcrcq021w06q"; - name = "kontrast-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kontrast-23.08.4.tar.xz"; + sha256 = "1c4z9kh38njvb06i47gfyz85hai7kcvfrrz1ab6ipnx73ci2j7fp"; + name = "kontrast-23.08.4.tar.xz"; }; }; konversation = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/konversation-23.08.3.tar.xz"; - sha256 = "1w48wcl395bg9hmpl2i4yx4r3y4jhcxwi7pzh0hrs15rblmqjsgx"; - name = "konversation-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/konversation-23.08.4.tar.xz"; + sha256 = "1wl7rnipv7spnlkcz5fcc272m5h8q9q0s56ln04wdybvqnwmvk2g"; + name = "konversation-23.08.4.tar.xz"; }; }; kopeninghours = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kopeninghours-23.08.3.tar.xz"; - sha256 = "0qz57nfb84y49fbcjx9m57qcbg02pdxzskvldim2dv2rc9ppl2kf"; - name = "kopeninghours-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kopeninghours-23.08.4.tar.xz"; + sha256 = "0w6nflzhhasdm2sbgx8nlqp95y1yklwrpvm5q6njivxwfi68abwg"; + name = "kopeninghours-23.08.4.tar.xz"; }; }; kopete = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kopete-23.08.3.tar.xz"; - sha256 = "10dx8if755y9chrsqf257854aq35rs4hcxb9zfmzm0cazfxj03jc"; - name = "kopete-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kopete-23.08.4.tar.xz"; + sha256 = "0lp58zribmp6iaia97m6a2p8bizxy1wan7f9k968gpg8ykpv7vhx"; + name = "kopete-23.08.4.tar.xz"; }; }; korganizer = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/korganizer-23.08.3.tar.xz"; - sha256 = "0v16q90lj1kc8xdc9dg6cmp510zvxr64n0r67qllqdiim0vja6fj"; - name = "korganizer-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/korganizer-23.08.4.tar.xz"; + sha256 = "10rbrdv55cjac5hv94k0dp82dnd0176ykw1df4lnzccmk047kxsk"; + name = "korganizer-23.08.4.tar.xz"; }; }; kosmindoormap = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kosmindoormap-23.08.3.tar.xz"; - sha256 = "1s281a1i0fjknd52ip3q1s96hfvawmzkxvkca1s8vhgv42za18bq"; - name = "kosmindoormap-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kosmindoormap-23.08.4.tar.xz"; + sha256 = "1w7wa0ma8gnyawiaidcwa5hm5zx9pd8vfh18srwb2f1dffx0hzic"; + name = "kosmindoormap-23.08.4.tar.xz"; }; }; kpat = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kpat-23.08.3.tar.xz"; - sha256 = "1i6fcpqza9pdpfnalq4ijn8raz43fm8sg9881wnp8684yy7qszq5"; - name = "kpat-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kpat-23.08.4.tar.xz"; + sha256 = "0r7krvl4cm1vzaprm5vzyw8wx04idqssv6p606avsvp39jcv4g24"; + name = "kpat-23.08.4.tar.xz"; }; }; kpimtextedit = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kpimtextedit-23.08.3.tar.xz"; - sha256 = "1yq4cahv72n7rzgmza59w78k1fcfhcr1364ag9gr33qbrm7p45iw"; - name = "kpimtextedit-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kpimtextedit-23.08.4.tar.xz"; + sha256 = "1r8df5qyhq8r30i2p55q8wsm1znnvmzif06axzazxhl2x0n94mfs"; + name = "kpimtextedit-23.08.4.tar.xz"; }; }; kpkpass = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kpkpass-23.08.3.tar.xz"; - sha256 = "1sppnafk9hyqrk5cgdybwprcnvhv29hvajiisrmggc3gai1sb87x"; - name = "kpkpass-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kpkpass-23.08.4.tar.xz"; + sha256 = "17wsgmanim8ab8hya3vihwwry4s6zl6s24mqplhax79jng9lcp52"; + name = "kpkpass-23.08.4.tar.xz"; }; }; kpmcore = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kpmcore-23.08.3.tar.xz"; - sha256 = "14v3dbgmrprygmjbdc62bvqc6hnki9nn29jwbxzqfb5jlfwq9ar8"; - name = "kpmcore-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kpmcore-23.08.4.tar.xz"; + sha256 = "0kmnvwilvc3nysi9dywkfkdxxh5fynxm29knxahw1a9xgr4dha6i"; + name = "kpmcore-23.08.4.tar.xz"; }; }; kpublictransport = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kpublictransport-23.08.3.tar.xz"; - sha256 = "1ywk9fz5vzq93mq68jzjkn7khmdyydr1qdi67yn7lrm1wp43n0z7"; - name = "kpublictransport-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kpublictransport-23.08.4.tar.xz"; + sha256 = "178l4skgx44zilpggrlcmn3v8a8bqs9f0j6qmkx4mrif52lvy8w1"; + name = "kpublictransport-23.08.4.tar.xz"; }; }; kqtquickcharts = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kqtquickcharts-23.08.3.tar.xz"; - sha256 = "1b7g83h2dw716384cqz4njah7grpx0h33rrxn2zmhk426qy4sks3"; - name = "kqtquickcharts-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kqtquickcharts-23.08.4.tar.xz"; + sha256 = "1qfsjc414nxzl3rvzizxxg7kbi16v0mxpabj1sy6scz24x8ff68v"; + name = "kqtquickcharts-23.08.4.tar.xz"; }; }; krdc = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/krdc-23.08.3.tar.xz"; - sha256 = "1wkaq0w2r2v6llz25imb7qa760dif3xbbzjmj25c0x9pw2qq7v7x"; - name = "krdc-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/krdc-23.08.4.tar.xz"; + sha256 = "0ka8m8yz6485vi1sqbr7n5pg67i1csk9yqjvv5fni9g2z5m6ynlq"; + name = "krdc-23.08.4.tar.xz"; }; }; krecorder = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/krecorder-23.08.3.tar.xz"; - sha256 = "12xdq8s1996alhbb82y9qwl72cgj8xq7fgfqfg1hrl9ny36ffig0"; - name = "krecorder-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/krecorder-23.08.4.tar.xz"; + sha256 = "0wsn7kjk73619w24233s0and2q0li8yy7zlpfx4v8h9c926431di"; + name = "krecorder-23.08.4.tar.xz"; }; }; kreversi = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kreversi-23.08.3.tar.xz"; - sha256 = "0h4nmf6gsw8x195f45rfnjpmkhh1qj238y6hwz6ifvw4d52wf6w2"; - name = "kreversi-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kreversi-23.08.4.tar.xz"; + sha256 = "13lf6hbg0a4ni119j3c21x72n7wpjb9g1f6dbdazrjmjvz5bfql5"; + name = "kreversi-23.08.4.tar.xz"; }; }; krfb = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/krfb-23.08.3.tar.xz"; - sha256 = "1qz7s3kv4ss44qsx5vbpx6lk7xaqs4p533v3gh12r6ivr783cp9j"; - name = "krfb-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/krfb-23.08.4.tar.xz"; + sha256 = "1139rgd77k53i0gglbjb5lwcnrs3fik19a953lrzhicc881a65dv"; + name = "krfb-23.08.4.tar.xz"; }; }; kross-interpreters = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kross-interpreters-23.08.3.tar.xz"; - sha256 = "1l4sgxhz8j6hmxyd5l6waqavg1gkcsa25wnc3mhf2fipl2ic3xbs"; - name = "kross-interpreters-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kross-interpreters-23.08.4.tar.xz"; + sha256 = "1f0vqj1yl5knw55cy2ldxz090n7gxw3m7lwb5z7mr6mazaf06l4z"; + name = "kross-interpreters-23.08.4.tar.xz"; }; }; kruler = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kruler-23.08.3.tar.xz"; - sha256 = "0j19garqdxcag2cqyz18cmzbqzg1a8w0b5lf4g5y3r7ymnwx4vjc"; - name = "kruler-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kruler-23.08.4.tar.xz"; + sha256 = "08q5pnwiprnj4rwl9brw2r28gaxl9acfd61dkl9kigcasijwz75m"; + name = "kruler-23.08.4.tar.xz"; }; }; ksanecore = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ksanecore-23.08.3.tar.xz"; - sha256 = "00yp2gb826cpldrzijc6pz96l6smbjjn9s3jrcaxlp2f80v5lrrb"; - name = "ksanecore-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ksanecore-23.08.4.tar.xz"; + sha256 = "1r00sl09cn4vryv11cc080f6r9qrh0q6va66d2a9sdkqfa8idlap"; + name = "ksanecore-23.08.4.tar.xz"; }; }; kshisen = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kshisen-23.08.3.tar.xz"; - sha256 = "06cwa578s8ip5h9zl6gdbndk4qxyca8kwb40v8pvk1ai6iz1lmk9"; - name = "kshisen-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kshisen-23.08.4.tar.xz"; + sha256 = "1pdjy5zx7q4ajk00y5mgm6kxq17qmf0rwnakwfi938lzlvv06cir"; + name = "kshisen-23.08.4.tar.xz"; }; }; ksirk = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ksirk-23.08.3.tar.xz"; - sha256 = "1mnnj768xf43wa82dzrr1pv85l6xmvqrfxy5af3079jwdpd8frkj"; - name = "ksirk-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ksirk-23.08.4.tar.xz"; + sha256 = "05cy7iv80zfqa44gi0w29i5njbp7idjli5699b15as2nadmzbfxv"; + name = "ksirk-23.08.4.tar.xz"; }; }; ksmtp = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ksmtp-23.08.3.tar.xz"; - sha256 = "0jbzydrpbyw00zwnx02qfziiz61vsp3qri3yym1qn9xds83a962b"; - name = "ksmtp-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ksmtp-23.08.4.tar.xz"; + sha256 = "1hwyf1idk0a9a77gk7l2d7k3l6jy34pz6j7vcw1a7wfniz3ri8wz"; + name = "ksmtp-23.08.4.tar.xz"; }; }; ksnakeduel = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ksnakeduel-23.08.3.tar.xz"; - sha256 = "1x1nvl3bgbc7wdbjrdp513y5rjfh4h1dd8wjl21zp57z0w14qha7"; - name = "ksnakeduel-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ksnakeduel-23.08.4.tar.xz"; + sha256 = "0ydsplqw4sijq2rfdyhzdzf95bnp3mpflwk8p4r3iahay3kcihk3"; + name = "ksnakeduel-23.08.4.tar.xz"; }; }; kspaceduel = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kspaceduel-23.08.3.tar.xz"; - sha256 = "186mnhf18gacpzpdw50iqwzqm66xlfqcasfznlry8xwa7cj7vpki"; - name = "kspaceduel-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kspaceduel-23.08.4.tar.xz"; + sha256 = "01fqs6izbm34ypjrlbsqwvac7kqrc4vjkx6i04kq5zsaybawzy1i"; + name = "kspaceduel-23.08.4.tar.xz"; }; }; ksquares = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ksquares-23.08.3.tar.xz"; - sha256 = "06i7h685wzjrl6gm40g8n49p9nhv0m9rxz0w8jjp728db9p8dk0k"; - name = "ksquares-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ksquares-23.08.4.tar.xz"; + sha256 = "0j3vivk6ci1k7pfv441rq915zdpzrf9a6fsh06igci34v1vm9yni"; + name = "ksquares-23.08.4.tar.xz"; }; }; ksudoku = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ksudoku-23.08.3.tar.xz"; - sha256 = "0r0s8zgzj0wqi6g1kia6pwv4jbf09kr2w4d2kz2s5pihwgqzygc9"; - name = "ksudoku-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ksudoku-23.08.4.tar.xz"; + sha256 = "05zklr7mm81xz3m5lriyll1vkphwq5hz8ry423733ryaqqyjsdzs"; + name = "ksudoku-23.08.4.tar.xz"; }; }; ksystemlog = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ksystemlog-23.08.3.tar.xz"; - sha256 = "09yna6kl4c4h2zlzqqx02ndnri2rqyi3kq4zjcg0rdx77rz7j60w"; - name = "ksystemlog-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ksystemlog-23.08.4.tar.xz"; + sha256 = "1fgnyi8aqr8b6zw91k049ljvs6jgl5frjw6zrz0jnc75lijc9zzc"; + name = "ksystemlog-23.08.4.tar.xz"; }; }; kteatime = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kteatime-23.08.3.tar.xz"; - sha256 = "02ydm87488dkxh02svm2fr25v1y5ir07s454nfiza3ykvsiv919d"; - name = "kteatime-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kteatime-23.08.4.tar.xz"; + sha256 = "194c4q5pc9h5v1v6k80xchd3ysj42khwaq912dinvy43py1rw8sw"; + name = "kteatime-23.08.4.tar.xz"; }; }; ktimer = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ktimer-23.08.3.tar.xz"; - sha256 = "1b3gd0hmd3yry5kbrr0z0v94m43g0hb0bry821w8vfx0hnqdxfvr"; - name = "ktimer-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ktimer-23.08.4.tar.xz"; + sha256 = "08bcs3xh1yr2p2nnklb72jkfdxlrqp47pva4f886micanqfxhhjb"; + name = "ktimer-23.08.4.tar.xz"; }; }; ktnef = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ktnef-23.08.3.tar.xz"; - sha256 = "1avnpm8zmqv65l68s64b87vhs2zb8h2c9p5is6aafqpiiqjpx0rd"; - name = "ktnef-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ktnef-23.08.4.tar.xz"; + sha256 = "0ffg2qc5nlnhmdhnq9ry2b34kis0z0bsk0iqp1mk5fs8ksasli75"; + name = "ktnef-23.08.4.tar.xz"; }; }; ktorrent = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ktorrent-23.08.3.tar.xz"; - sha256 = "1dasy90ijjwrkxfrrgqc3c9r2nnsjfnsmlpz8871yvfr4cmx7n68"; - name = "ktorrent-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ktorrent-23.08.4.tar.xz"; + sha256 = "0q8a3xsxk1sxaa90vj4fpq35xlmjwj86kki46w572dsx7bmcpwym"; + name = "ktorrent-23.08.4.tar.xz"; }; }; ktouch = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ktouch-23.08.3.tar.xz"; - sha256 = "0zsswlflvbwkgv6makzvmpafnv59q2w5dp62hzawzysg80nlqnm9"; - name = "ktouch-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ktouch-23.08.4.tar.xz"; + sha256 = "18zfmmanz1f8jqhckb23pspsmprl1ran6vbxdqcfl4pb928b63fr"; + name = "ktouch-23.08.4.tar.xz"; }; }; ktrip = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ktrip-23.08.3.tar.xz"; - sha256 = "11dccp2mwaw29yp2fa52xm1j8hjwgbgxhgkywm5w2x9ddd2mrdwa"; - name = "ktrip-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ktrip-23.08.4.tar.xz"; + sha256 = "1c9j0hqhq6hpsacm05qmkbiyr3bq57llqsvq1a9qy6yd1fldn4xg"; + name = "ktrip-23.08.4.tar.xz"; }; }; ktuberling = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/ktuberling-23.08.3.tar.xz"; - sha256 = "0krhznbjnaqnknldynbvi2lm0if7b2badzmfyk0zcm6zsca56dva"; - name = "ktuberling-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/ktuberling-23.08.4.tar.xz"; + sha256 = "12q07w5s3bv3rx1irypzw83l4y47j1zqk67akkrhcgf9f69jz71w"; + name = "ktuberling-23.08.4.tar.xz"; }; }; kturtle = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kturtle-23.08.3.tar.xz"; - sha256 = "1an929zydwb2nfcysk5jpijvihwprmgy8491z6jx60hzwdsm6pqa"; - name = "kturtle-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kturtle-23.08.4.tar.xz"; + sha256 = "1782pnybvjqpzdppsz5284dibasz7rk03pbz6il7dz86l701phlz"; + name = "kturtle-23.08.4.tar.xz"; }; }; kubrick = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kubrick-23.08.3.tar.xz"; - sha256 = "0kzh0q3k5d6cv1g3479bz4q67b2p2skakjvs1jjr2imz8gw75c42"; - name = "kubrick-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kubrick-23.08.4.tar.xz"; + sha256 = "12p6k800chp7qhj6shj1xp2pvfxm0cw50598s95c8jxhv44d4fg2"; + name = "kubrick-23.08.4.tar.xz"; }; }; kwalletmanager = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kwalletmanager-23.08.3.tar.xz"; - sha256 = "0wml6z5m2qcbqw37d1mvpnbc0rnrdsp7azyzh4p1qrvz7xvjd33p"; - name = "kwalletmanager-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kwalletmanager-23.08.4.tar.xz"; + sha256 = "0p62nl2y1fdlgzinzafhd1xgndn93c4qcl0gn6gicjfi9a37qjd1"; + name = "kwalletmanager-23.08.4.tar.xz"; }; }; kwave = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kwave-23.08.3.tar.xz"; - sha256 = "0vcvcjx4jvbrxvy6ys8jy0p85inia66lhnj5c6zf7hjyb4kyd9wd"; - name = "kwave-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kwave-23.08.4.tar.xz"; + sha256 = "0wicp8zpk1q45aqx1zhwq8v9yh173zvmz5ncv4nr3dm1jgvh4l4q"; + name = "kwave-23.08.4.tar.xz"; }; }; kweather = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kweather-23.08.3.tar.xz"; - sha256 = "1zk4qf1r9c45zgqpnx5y2prm6d64vxhhycnbn07yk46zqnk6gifj"; - name = "kweather-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kweather-23.08.4.tar.xz"; + sha256 = "1fr19q59577pml6wj1di72yvdk0q6brd637vqn7xwbdvjhhk6vvn"; + name = "kweather-23.08.4.tar.xz"; }; }; kwordquiz = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/kwordquiz-23.08.3.tar.xz"; - sha256 = "0nqdax13syqwi5i3q4gf3cjnywricvdd2798v31naza39m06m6z1"; - name = "kwordquiz-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/kwordquiz-23.08.4.tar.xz"; + sha256 = "1gnwmba6b08a1wgw40c71h7qgqk7sknj495hh66rxgm03injnpj0"; + name = "kwordquiz-23.08.4.tar.xz"; }; }; libgravatar = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libgravatar-23.08.3.tar.xz"; - sha256 = "12k2fb6wnnba81d8amizf2npa5ydpj6s95sbn0s4qy329lgxmfp3"; - name = "libgravatar-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libgravatar-23.08.4.tar.xz"; + sha256 = "1w9z0d85gdkghx7k9506rg0fzgzvah9wfvyq16hhjgfb4cv0292w"; + name = "libgravatar-23.08.4.tar.xz"; }; }; libkcddb = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libkcddb-23.08.3.tar.xz"; - sha256 = "0b68vypfvkq5c7s5zqdwdr9r84x2gsvqavjz1dk6ybq4j5lm3ldz"; - name = "libkcddb-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libkcddb-23.08.4.tar.xz"; + sha256 = "130ajnb4k1i48r015xfw5yp8ys72hgz5gqgvpa4vfqy71hbhndr9"; + name = "libkcddb-23.08.4.tar.xz"; }; }; libkcompactdisc = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libkcompactdisc-23.08.3.tar.xz"; - sha256 = "0a46yy0jzsddqgklvi8hgjg4h4f7six2d3higzrh7v2ychlqxqkp"; - name = "libkcompactdisc-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libkcompactdisc-23.08.4.tar.xz"; + sha256 = "166nj97pars5anx1k8dc7f92cfnbb0mvwgi9cpsz138bxpqvn3zi"; + name = "libkcompactdisc-23.08.4.tar.xz"; }; }; libkdcraw = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libkdcraw-23.08.3.tar.xz"; - sha256 = "0bzkdlhfkql38qm22qpiinl8p7pxhl5xpnw12l0ghjpdmnxzn1jl"; - name = "libkdcraw-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libkdcraw-23.08.4.tar.xz"; + sha256 = "1mm3gsp7lfqxb9irk59hrzaxdqjv28iwaa1xmpazw4q62nmlj7mi"; + name = "libkdcraw-23.08.4.tar.xz"; }; }; libkdegames = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libkdegames-23.08.3.tar.xz"; - sha256 = "14zavbir7rf5lgxyppngpbbxmpq9kyx45c170jpilma6a3dqm787"; - name = "libkdegames-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libkdegames-23.08.4.tar.xz"; + sha256 = "1v4xskpclyr7qv94xrmw33zvcff1ymb2y6b658rdxari1gjpamja"; + name = "libkdegames-23.08.4.tar.xz"; }; }; libkdepim = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libkdepim-23.08.3.tar.xz"; - sha256 = "043ddlssg3a0q48y3mvn9smmarmswmff0gz3gpw1m6waagymqrff"; - name = "libkdepim-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libkdepim-23.08.4.tar.xz"; + sha256 = "0rga1s5y3lsq8awgdpd3yaqjczgjakhf12v553hg0nz8b1cl4s7z"; + name = "libkdepim-23.08.4.tar.xz"; }; }; libkeduvocdocument = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libkeduvocdocument-23.08.3.tar.xz"; - sha256 = "19m1dzvgf34awbyabbwn03jyznv430jd4qxwj2lgp1684p2dqyab"; - name = "libkeduvocdocument-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libkeduvocdocument-23.08.4.tar.xz"; + sha256 = "1jvbkyb2gnh8a47724m95nb30g58jnzlwja5p9gx1rwjha28jkcp"; + name = "libkeduvocdocument-23.08.4.tar.xz"; }; }; libkexiv2 = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libkexiv2-23.08.3.tar.xz"; - sha256 = "1p9qyqyl7348yfbnpw01s81agknllx77i07cvv9bmdcwm103vw07"; - name = "libkexiv2-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libkexiv2-23.08.4.tar.xz"; + sha256 = "1xpki1b3007wm17pnjvfrqb2qlx7wkps5bzhn1m4k30i6vxa2q50"; + name = "libkexiv2-23.08.4.tar.xz"; }; }; libkgapi = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libkgapi-23.08.3.tar.xz"; - sha256 = "01c7933w8qspasd4l51mj21dnm9amdppwzn81naqhzj2ggh3f1ks"; - name = "libkgapi-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libkgapi-23.08.4.tar.xz"; + sha256 = "1dvfj1pgfw2sysr2x06fzfxbr2xb949kgy0b52aq0akq5534qrfc"; + name = "libkgapi-23.08.4.tar.xz"; }; }; libkipi = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libkipi-23.08.3.tar.xz"; - sha256 = "1jwhs7clznh4izbdxyhni7ks8hqb1m425kw847jjmhrzf7gj5bzv"; - name = "libkipi-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libkipi-23.08.4.tar.xz"; + sha256 = "0z3xlsyms58l84fvgjxf6y83a82p81s6gk8757y9aiidjihzih88"; + name = "libkipi-23.08.4.tar.xz"; }; }; libkleo = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libkleo-23.08.3.tar.xz"; - sha256 = "1s0k7vc1iasahqy2sk98j1lybvv1ppwhrl1jpzlk6pca28pg6dqc"; - name = "libkleo-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libkleo-23.08.4.tar.xz"; + sha256 = "01sspgd1sf3dzds05jbvylif4vza3zb0fz2hfrrvmjvflswgbazi"; + name = "libkleo-23.08.4.tar.xz"; }; }; libkmahjongg = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libkmahjongg-23.08.3.tar.xz"; - sha256 = "0x8nym9hfjg9823gxl00jhn182d6p9jjff8h8fvblh88h267rxr4"; - name = "libkmahjongg-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libkmahjongg-23.08.4.tar.xz"; + sha256 = "0cp2zpk0444jf1rr6jnn0v62sbx1baf646ki8g2hpmsmvqwvslih"; + name = "libkmahjongg-23.08.4.tar.xz"; }; }; libkomparediff2 = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libkomparediff2-23.08.3.tar.xz"; - sha256 = "1cbhd214shiphha8pmqrlxliq0szmr6qqksrjl70pq9k58myfq76"; - name = "libkomparediff2-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libkomparediff2-23.08.4.tar.xz"; + sha256 = "07kfsnijj7xm4mvz95dzn3xmmczxl6bqzdr7d5jcv33kvp46mdbn"; + name = "libkomparediff2-23.08.4.tar.xz"; }; }; libksane = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libksane-23.08.3.tar.xz"; - sha256 = "0dynrv65q78r7zyl1is6jpi7ln6s7jciil27sjjlz1cwlhalq16f"; - name = "libksane-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libksane-23.08.4.tar.xz"; + sha256 = "1gsd5wlvh9c8xaprp0sjxknjc8yzz2f04kla5012a0a2761ym7d0"; + name = "libksane-23.08.4.tar.xz"; }; }; libksieve = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libksieve-23.08.3.tar.xz"; - sha256 = "09iw7jv93pwfj0i6y4iyhi7f1z3sw2lx8y608bcpbsw6ki2hwiky"; - name = "libksieve-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libksieve-23.08.4.tar.xz"; + sha256 = "0ixriyls3ynwkyfjyvax4r851nh5xb1hvvcyphjd6apzy9zci08f"; + name = "libksieve-23.08.4.tar.xz"; }; }; libktorrent = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/libktorrent-23.08.3.tar.xz"; - sha256 = "1jl27xmk82yjfpwc7cj4hxllzksvc1mn0qlcc92r637zyw9haxfa"; - name = "libktorrent-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/libktorrent-23.08.4.tar.xz"; + sha256 = "0vyv8m2s37zmhs145n8lk1p8npxcrd2xvw1aciyjc0nrxrx46z1v"; + name = "libktorrent-23.08.4.tar.xz"; }; }; lokalize = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/lokalize-23.08.3.tar.xz"; - sha256 = "1hbqwld7fiwjbzz0nas1wks0j7ganqb61nr78g4qrygyfz0fkk22"; - name = "lokalize-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/lokalize-23.08.4.tar.xz"; + sha256 = "0ca52y67sqcjmzmxz3s6vpdlycr9k8sm8v07xmkxw6m77l97f5rq"; + name = "lokalize-23.08.4.tar.xz"; }; }; lskat = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/lskat-23.08.3.tar.xz"; - sha256 = "0j8qy8aih5jflndfw53fbfmg2v2dpah99pk0g7qisr21d0xdsnq4"; - name = "lskat-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/lskat-23.08.4.tar.xz"; + sha256 = "1qcp2mxwddqxv8pzzaqq6sq8qyvxfy55k3pz8x7zml0iswspbv3r"; + name = "lskat-23.08.4.tar.xz"; }; }; mailcommon = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/mailcommon-23.08.3.tar.xz"; - sha256 = "0jami0ml0q414nz3lcwk5pvl21zfmfkpz751j8kqc3rvv7579y5r"; - name = "mailcommon-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/mailcommon-23.08.4.tar.xz"; + sha256 = "11z9zvwlqiylrkmw1hfsvqjwgiil7g2gzfh3avrrf3p4d8mc3y3g"; + name = "mailcommon-23.08.4.tar.xz"; }; }; mailimporter = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/mailimporter-23.08.3.tar.xz"; - sha256 = "02ii6vqpxwm4cvkkh7nfq3q9sdb9wlx09k3d1yzampv36rh015xm"; - name = "mailimporter-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/mailimporter-23.08.4.tar.xz"; + sha256 = "14w82drnf5vzjcqwhs34i82ismmbbkmp6ryw64xvv70idi64gyid"; + name = "mailimporter-23.08.4.tar.xz"; }; }; marble = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/marble-23.08.3.tar.xz"; - sha256 = "166264afbxjimgvz062918fgqc7ck8sz5qiz63m1w858irgifpl0"; - name = "marble-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/marble-23.08.4.tar.xz"; + sha256 = "13vsrfzcff64wxgi0rfsmlca62kbbny4c8rn7j90jbzdrjw5aafg"; + name = "marble-23.08.4.tar.xz"; }; }; markdownpart = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/markdownpart-23.08.3.tar.xz"; - sha256 = "1nw8r7m3h2j3aylmq5lg0c2rz9cmpsdlixh0ba3cpxcy1ddk4xmp"; - name = "markdownpart-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/markdownpart-23.08.4.tar.xz"; + sha256 = "0gr2hd7jnx6s3fsssasf7c2hl6mk3j2ccb6552k6bpdvl1ianmfc"; + name = "markdownpart-23.08.4.tar.xz"; }; }; mbox-importer = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/mbox-importer-23.08.3.tar.xz"; - sha256 = "0306gpa7ybcyx4p1fc1pgr8yh5q7rq7v025494ylwj3va9c6j5h5"; - name = "mbox-importer-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/mbox-importer-23.08.4.tar.xz"; + sha256 = "1pninrlpwpakpc3a50aqfjvm1y828xsqm51vbblx41yrs9sfkbmz"; + name = "mbox-importer-23.08.4.tar.xz"; }; }; merkuro = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/merkuro-23.08.3.tar.xz"; - sha256 = "1vqg3bl6qmnb0vk0l408i4liwq8ydnmr69a3ch8z54l1p2za3xlx"; - name = "merkuro-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/merkuro-23.08.4.tar.xz"; + sha256 = "1rdfbvir3aadgkpqnh5j3b2snwkfgay130qnr2w0lhfs3dx3q4pj"; + name = "merkuro-23.08.4.tar.xz"; }; }; messagelib = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/messagelib-23.08.3.tar.xz"; - sha256 = "1ss69pffs81aa6zi6hnnhxzmjfyigyahq6ranvc4q90gb49l95jv"; - name = "messagelib-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/messagelib-23.08.4.tar.xz"; + sha256 = "1nahb2zhwi6scx5pc2abgjxz13m5rnsaknvcmiarih4zald5vncs"; + name = "messagelib-23.08.4.tar.xz"; }; }; minuet = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/minuet-23.08.3.tar.xz"; - sha256 = "0j0p8kcd4m4fzc9cffhp70s6nl7xcd0wq6smzjq2v83x4fwpnqfl"; - name = "minuet-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/minuet-23.08.4.tar.xz"; + sha256 = "1wrqwgcibqifgwzz0q40rmasykxilknx9rv60yzqjlc1bh1611xg"; + name = "minuet-23.08.4.tar.xz"; }; }; neochat = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/neochat-23.08.3.tar.xz"; - sha256 = "1gzkwwhrgrap100a1191r66g2kqclnq6jp73k5zgsacxcvf5bwcy"; - name = "neochat-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/neochat-23.08.4.tar.xz"; + sha256 = "1sdcg24s0gvim8s6mzqn6s5cjf8sag52w0wnicm2y15w0210763d"; + name = "neochat-23.08.4.tar.xz"; }; }; okular = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/okular-23.08.3.tar.xz"; - sha256 = "16qippfwkbxgznlg6f3csmhlk6rbpjqf0nmw11bmrsfng1smam22"; - name = "okular-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/okular-23.08.4.tar.xz"; + sha256 = "04dga15sj8gm2l1j6qpqcm3scc5awap63g5jqbfdr1z2i8bp7z9p"; + name = "okular-23.08.4.tar.xz"; }; }; palapeli = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/palapeli-23.08.3.tar.xz"; - sha256 = "0jvb72ndq7c9q21x6gis8i9a8xxb61rjl62xs1adavy9x5za4j4q"; - name = "palapeli-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/palapeli-23.08.4.tar.xz"; + sha256 = "0cb63gazax3ii78n5bir061aw20s4vkm6pgahz75kvwhfsyky4qa"; + name = "palapeli-23.08.4.tar.xz"; }; }; parley = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/parley-23.08.3.tar.xz"; - sha256 = "00dx3455b0wfpx1y1svgdvmfd1wcv2cyk61867nk34wn91mkk2jl"; - name = "parley-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/parley-23.08.4.tar.xz"; + sha256 = "1y6mb5k3nhra4p35dml9x5nw40b21cnz7nkirxf3wjrg7jjx0iac"; + name = "parley-23.08.4.tar.xz"; }; }; partitionmanager = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/partitionmanager-23.08.3.tar.xz"; - sha256 = "0b4klirhyqp4vgpy1gp1prdyknrdmsfbl2nz3kmkm47q97b3jsc3"; - name = "partitionmanager-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/partitionmanager-23.08.4.tar.xz"; + sha256 = "1mj6pbrv9lj7jg3rfj4jncaclm70nzxw6dqbd52m48fa8vz0xpy5"; + name = "partitionmanager-23.08.4.tar.xz"; }; }; picmi = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/picmi-23.08.3.tar.xz"; - sha256 = "1nfwzv0lngxv6s57v4j8acq4kp94iq8swpiah4gf57ikwvfmwcbv"; - name = "picmi-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/picmi-23.08.4.tar.xz"; + sha256 = "1dbygyydawp6982asn015l20c4g479nl63a4yvs1hlv0vs261ry6"; + name = "picmi-23.08.4.tar.xz"; }; }; pim-data-exporter = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/pim-data-exporter-23.08.3.tar.xz"; - sha256 = "0b2vcv7mkbwf2jvrwahnmh28h4gx6ng6hpxin4mr9ams2iv55s4i"; - name = "pim-data-exporter-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/pim-data-exporter-23.08.4.tar.xz"; + sha256 = "0nhwvg2wp25nkwgizc9zp4b5zww4ap8clfbm4s6n9c851dslh3s3"; + name = "pim-data-exporter-23.08.4.tar.xz"; }; }; pim-sieve-editor = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/pim-sieve-editor-23.08.3.tar.xz"; - sha256 = "03h40pdknqdclw312n4293h2hg30wvhkbwwim411w1nlryi028vz"; - name = "pim-sieve-editor-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/pim-sieve-editor-23.08.4.tar.xz"; + sha256 = "1bkll224v8pqcph33qnvi0sk5zymdz6jy5s4rqdd13nqzzv6cyhb"; + name = "pim-sieve-editor-23.08.4.tar.xz"; }; }; pimcommon = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/pimcommon-23.08.3.tar.xz"; - sha256 = "1j75s4b10kvy1mp9dli2z09jh57kwd018dd1br2yirqgrj3q2mk4"; - name = "pimcommon-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/pimcommon-23.08.4.tar.xz"; + sha256 = "0lfxd76rg4gx98xiwhzvv6bi97rqpxppc0qs1zgzd94hnar7kafl"; + name = "pimcommon-23.08.4.tar.xz"; }; }; plasmatube = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/plasmatube-23.08.3.tar.xz"; - sha256 = "13szmsk7x1bril3hp7dzw844pfzk9w9is4l8h4a4y1xzm80y3y95"; - name = "plasmatube-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/plasmatube-23.08.4.tar.xz"; + sha256 = "0mdljamssq8609mxfm1whdpf0jd3lvyrd5cf7rhnq35hvrncm4b1"; + name = "plasmatube-23.08.4.tar.xz"; }; }; poxml = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/poxml-23.08.3.tar.xz"; - sha256 = "135klpiigvibfk3vcjmkcl203zrmqbjrhj6wydnl0x8xa2sskv2j"; - name = "poxml-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/poxml-23.08.4.tar.xz"; + sha256 = "0irp4ns0p25navasgdpgi35xxa1n5jf9aly32604dddx2mrh1w0r"; + name = "poxml-23.08.4.tar.xz"; }; }; print-manager = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/print-manager-23.08.3.tar.xz"; - sha256 = "0h6w04w08pia84lxjmincxf5l88w2p6bqsz60caa6w743k6qcanv"; - name = "print-manager-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/print-manager-23.08.4.tar.xz"; + sha256 = "0hsxawswgpaidm2wg5s8mzzh46cascr1pfjiqplqndzixff77grd"; + name = "print-manager-23.08.4.tar.xz"; }; }; qmlkonsole = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/qmlkonsole-23.08.3.tar.xz"; - sha256 = "0shjzdn6drjq0ngvvh4mzzl4csqlj3bc3j25wr459srxv7m8f40h"; - name = "qmlkonsole-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/qmlkonsole-23.08.4.tar.xz"; + sha256 = "1qjszxh9wxpl1is2k065s9w18frvpnz2x6sk36r3c87xaxn7pzxi"; + name = "qmlkonsole-23.08.4.tar.xz"; }; }; rocs = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/rocs-23.08.3.tar.xz"; - sha256 = "03dksz8s47hgmwqqgn6n216nn3fs2iahw6nf90nnk57gkgl0f80i"; - name = "rocs-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/rocs-23.08.4.tar.xz"; + sha256 = "0182szpicdg353gapjsghg35sw638kcddwaycn3jkc50mwfy9jg1"; + name = "rocs-23.08.4.tar.xz"; }; }; signon-kwallet-extension = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/signon-kwallet-extension-23.08.3.tar.xz"; - sha256 = "1lkh40nqz26f8v8gfgs3f74jvwylvpmix6pgklpnjz5q724630zw"; - name = "signon-kwallet-extension-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/signon-kwallet-extension-23.08.4.tar.xz"; + sha256 = "1fpqjzpj7dhcp1km5fg65jpa1v78hsgpgrriyvpqpvaxfn0ylifi"; + name = "signon-kwallet-extension-23.08.4.tar.xz"; }; }; skanlite = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/skanlite-23.08.3.tar.xz"; - sha256 = "0y877svxcnijbyj3g95m5w65fncl9pbkl4y6slvci8mysmx4cxpj"; - name = "skanlite-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/skanlite-23.08.4.tar.xz"; + sha256 = "0wh5c3w8sbggpcln6arqagfxffyjns4v2v1d8drawfn66q5pqzvk"; + name = "skanlite-23.08.4.tar.xz"; }; }; skanpage = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/skanpage-23.08.3.tar.xz"; - sha256 = "03lir17v5fmcvkgrwxlpd2cghnha275f3b2ks4dgdcqhpxfyx1zg"; - name = "skanpage-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/skanpage-23.08.4.tar.xz"; + sha256 = "1mdvh7qknlfrcq8v7hbjdbns7327czch95dh5w6w86r1a5by2mxn"; + name = "skanpage-23.08.4.tar.xz"; }; }; spectacle = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/spectacle-23.08.3.tar.xz"; - sha256 = "1nr4vawvr3n0mrvbasrbjppdri177fsxnyljihxkcldlbqdx8idx"; - name = "spectacle-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/spectacle-23.08.4.tar.xz"; + sha256 = "04yd00p0rkpswrcj13ckp38ii185g1dab82vm58inm8i8cyyarbq"; + name = "spectacle-23.08.4.tar.xz"; }; }; step = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/step-23.08.3.tar.xz"; - sha256 = "19ipq26hbr38p9zbgn45ykhib7lm4cm880r1s8a6grdx8ziw6jx9"; - name = "step-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/step-23.08.4.tar.xz"; + sha256 = "0dmnc9kvg2hxi2mf4d55k4sm82lfb4xs6apq4m8fxqd3zh0jxr9n"; + name = "step-23.08.4.tar.xz"; }; }; svgpart = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/svgpart-23.08.3.tar.xz"; - sha256 = "1lybl6pybawybds0w8l0fcx37i7axjkw9b0rhk5vn3sw397yvkra"; - name = "svgpart-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/svgpart-23.08.4.tar.xz"; + sha256 = "111zdzp5knm1x13d1mhhn48l72lfa28jwn69023skgav35fa50wh"; + name = "svgpart-23.08.4.tar.xz"; }; }; sweeper = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/sweeper-23.08.3.tar.xz"; - sha256 = "1a7qh1rvzs5xk5aw19x29091psp0khjqmgs06avilfsfbpschkn0"; - name = "sweeper-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/sweeper-23.08.4.tar.xz"; + sha256 = "0csqrkbx86ppfddqc5qvzp0svw0ngf9129p3xz5birhcdvq3bpic"; + name = "sweeper-23.08.4.tar.xz"; }; }; telly-skout = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/telly-skout-23.08.3.tar.xz"; - sha256 = "1cxkzxq1nx62100a42m534wvgmv3m00im16j7lnjqknr4nidxzrb"; - name = "telly-skout-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/telly-skout-23.08.4.tar.xz"; + sha256 = "1ipy5vl9vj800cy7axag4y1gnnszgbyvw22ns1j2x1z7m3rhp5vi"; + name = "telly-skout-23.08.4.tar.xz"; }; }; tokodon = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/tokodon-23.08.3.tar.xz"; - sha256 = "0nc56jgl114zd95szq7jcjw6vqpklm0jk17l2s8nikwra06y2smx"; - name = "tokodon-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/tokodon-23.08.4.tar.xz"; + sha256 = "1hsdwmnrsqm5mi1c7lsa6p7r29w8iz27129yf6j1491yw3cv9lqw"; + name = "tokodon-23.08.4.tar.xz"; }; }; umbrello = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/umbrello-23.08.3.tar.xz"; - sha256 = "0l3mxnyhyhm5h7gyhw5q28yzcsxkgsjqpcbnyhy74pdjw1xs969v"; - name = "umbrello-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/umbrello-23.08.4.tar.xz"; + sha256 = "0vms6wflbybpaxwng29hsw5mcjrxw24kp8b6i1chavqryhci7s0k"; + name = "umbrello-23.08.4.tar.xz"; }; }; yakuake = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/yakuake-23.08.3.tar.xz"; - sha256 = "16h3zanzxjqdl9rvyxplvr35bjkzz2qfxqmm1fkjsq1vbb9lxf6r"; - name = "yakuake-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/yakuake-23.08.4.tar.xz"; + sha256 = "1igzc110fvzwa9817hclv7whwmfvp4hvcn636a6l4s5vsajm940y"; + name = "yakuake-23.08.4.tar.xz"; }; }; zanshin = { - version = "23.08.3"; + version = "23.08.4"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.3/src/zanshin-23.08.3.tar.xz"; - sha256 = "0dcakpv36zmiad2686bcw7ll9mpw3dj4sxd7dqlhvl0n7hhm2gxf"; - name = "zanshin-23.08.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.4/src/zanshin-23.08.4.tar.xz"; + sha256 = "0axrh9g6drxp5sjmcbv7vqbi0n7q6qpnlgs546186z25kwq80xm0"; + name = "zanshin-23.08.4.tar.xz"; }; }; } diff --git a/pkgs/applications/maui/srcs.nix b/pkgs/applications/maui/srcs.nix index 6473b9607bfd6..7de3325e4d967 100644 --- a/pkgs/applications/maui/srcs.nix +++ b/pkgs/applications/maui/srcs.nix @@ -4,59 +4,59 @@ { agenda = { - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "${mirror}/stable/maui/agenda/0.5.1/agenda-0.5.1.tar.xz"; - sha256 = "1c45fnlg15pjd3ljmm3w2jcrq94jirrykpq1xrvgfbv5d50796x7"; - name = "agenda-0.5.1.tar.xz"; + url = "${mirror}/stable/maui/agenda/0.5.2/agenda-0.5.2.tar.xz"; + sha256 = "160y0pq3mj72wxyfnnl45488j4kpl26xpf83vlnfshiwvc6c0m3y"; + name = "agenda-0.5.2.tar.xz"; }; }; arca = { - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "${mirror}/stable/maui/arca/0.5.1/arca-0.5.1.tar.xz"; - sha256 = "0irbc1ysnia5wp398ddijad77qg7gd076fkm972wgk4pmqnm0rcz"; - name = "arca-0.5.1.tar.xz"; + url = "${mirror}/stable/maui/arca/0.5.2/arca-0.5.2.tar.xz"; + sha256 = "0l0x24m55hc20yc40yjj0zx910yzh31qn911swdli39iy4c6mxk2"; + name = "arca-0.5.2.tar.xz"; }; }; bonsai = { - version = "2.2.0"; + version = "1.1.2"; src = fetchurl { - url = "${mirror}/stable/maui/bonsai/1.0.0/bonsai-2.2.0.tar.xz"; - sha256 = "0gpqdj30brqv9nsiis93w9lad4xn7d301gxncj04pcpybmbksg4r"; - name = "bonsai-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/bonsai/1.1.2/bonsai-1.1.2.tar.xz"; + sha256 = "0nzp0ixxap3q1llv42l71rygxv98hvcmqwqdw7690w650hja7zvj"; + name = "bonsai-1.1.2.tar.xz"; }; }; booth = { - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "${mirror}/stable/maui/booth/1.1.1/booth-1.1.1.tar.xz"; - sha256 = "1s3h083qbjjj5dmm27vc66vx0mzgpl4klhi9cc07z3apjldf1si0"; - name = "booth-1.1.1.tar.xz"; + url = "${mirror}/stable/maui/booth/1.1.2/booth-1.1.2.tar.xz"; + sha256 = "06gg4zgpn8arnzmi54x7xbdg5wyc3a86v9z5x6y101imh6cwbhyw"; + name = "booth-1.1.2.tar.xz"; }; }; buho = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/buho/3.0.1/buho-3.0.1.tar.xz"; - sha256 = "0favgdwnb8gvmpisq58bmjvnajzgdk886z5m07vz4mfj7ipjjzbv"; - name = "buho-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/buho/3.0.2/buho-3.0.2.tar.xz"; + sha256 = "0sllffddngzxc2wi2wszjxzb75rca0a42bdylm7pxmr5p8mafn1l"; + name = "buho-3.0.2.tar.xz"; }; }; clip = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/clip/3.0.1/clip-3.0.1.tar.xz"; - sha256 = "1acjnam8ljc6mw7xbphh99li9437kqlmdb258j7w3vgnqh2psipx"; - name = "clip-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/clip/3.0.2/clip-3.0.2.tar.xz"; + sha256 = "0pjqk1l1cwkvwrlv1lb113cl8kggppxqhdsild83wrzbfqx9nrva"; + name = "clip-3.0.2.tar.xz"; }; }; communicator = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/communicator/3.0.1/communicator-3.0.1.tar.xz"; - sha256 = "1j4yaw8w1hyvndra881r70ayz4ph00w41hhysqhgccxr36abcncl"; - name = "communicator-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/communicator/3.0.2/communicator-3.0.2.tar.xz"; + sha256 = "0hmapwsgrlaiwvprpmllfy943w0sclnk4vg7sb6rys1i96f3yz6r"; + name = "communicator-3.0.2.tar.xz"; }; }; era = { @@ -68,139 +68,139 @@ }; }; fiery = { - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "${mirror}/stable/maui/fiery/1.1.1/fiery-1.1.1.tar.xz"; - sha256 = "03aszdvksx5bsrh479wl6vq28l026ddfv8p9privigjpcdbbaslk"; - name = "fiery-1.1.1.tar.xz"; + url = "${mirror}/stable/maui/fiery/1.1.2/fiery-1.1.2.tar.xz"; + sha256 = "0ba3bxhvfzkpwrrnfyhbvprlhdv2vmgmi41lpq2pian0d3nkc05s"; + name = "fiery-1.1.2.tar.xz"; }; }; index-fm = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/maui/index/3.0.2/index-fm-3.0.2.tar.xz"; + sha256 = "08ncjliqzx71scmfxl3h24w9s8dgrp6gd7nf6pczyn5arqf96d81"; + name = "index-fm-3.0.2.tar.xz"; }; }; mauikit = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit/3.0.1/mauikit-3.0.1.tar.xz"; - sha256 = "0vlxs13k3wk2kk3jcxrdmpa3d9gblvzp22sqqd7nys6kilq8kzdb"; - name = "mauikit-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit/3.0.2/mauikit-3.0.2.tar.xz"; + sha256 = "19317xfbyy3cg9nm1dqknvypsj9kq8phz36srwvwfyxd26kaqs2s"; + name = "mauikit-3.0.2.tar.xz"; }; }; mauikit-accounts = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/maui/mauikit-accounts/3.0.2/mauikit-accounts-3.0.2.tar.xz"; + sha256 = "1h876vz9vfyl44pryhf5s4lkzik00zwhjvyrv7f4b1zwjz3xbqai"; + name = "mauikit-accounts-3.0.2.tar.xz"; }; }; mauikit-calendar = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/maui/mauikit-calendar/3.0.2/mauikit-calendar-3.0.2.tar.xz"; + sha256 = "098d2alw1dnhpqwkdy0wrl6cvanyb6vg8qy5aqmgmsk0hil1s8x1"; + name = "mauikit-calendar-3.0.2.tar.xz"; }; }; mauikit-documents = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/maui/mauikit-documents/3.0.2/mauikit-documents-3.0.2.tar.xz"; + sha256 = "1ln8nk6n2wcqdjd4l5pzam9291rx52mal7rdxs06f6fwszwifhyr"; + name = "mauikit-documents-3.0.2.tar.xz"; }; }; mauikit-filebrowsing = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.2/mauikit-filebrowsing-3.0.2.tar.xz"; + sha256 = "03dcmpw8l19mziswhhsvyiiid07qx0c4ddh8986llsz6xngdnlib"; + name = "mauikit-filebrowsing-3.0.2.tar.xz"; }; }; mauikit-imagetools = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/maui/mauikit-imagetools/3.0.2/mauikit-imagetools-3.0.2.tar.xz"; + sha256 = "1xryms7mc3lq8p67m2h3cxffyd9dk8m738ap30aq9ym62qq76psl"; + name = "mauikit-imagetools-3.0.2.tar.xz"; }; }; mauikit-terminal = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/maui/mauikit-terminal/3.0.2/mauikit-terminal-3.0.2.tar.xz"; + sha256 = "0abywv56ljxbmsi5y3x9agbgbhvscnkznja9adwjj073pavvaf1g"; + name = "mauikit-terminal-3.0.2.tar.xz"; }; }; mauikit-texteditor = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - 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"; + url = "${mirror}/stable/maui/mauikit-texteditor/3.0.2/mauikit-texteditor-3.0.2.tar.xz"; + sha256 = "09wdvjy8c0b5lka0fj28kl99w5y3w0nvz2mnr3ic5kn825ay1wmy"; + name = "mauikit-texteditor-3.0.2.tar.xz"; }; }; mauiman = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauiman/3.0.1/mauiman-3.0.1.tar.xz"; - sha256 = "0nygvb0nixcidla94xhwa4rrdwi3r2kcq62m9a3sabpl0z22mppq"; - name = "mauiman-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauiman/3.0.2/mauiman-3.0.2.tar.xz"; + sha256 = "0aqzgdkcs6cdlsbsyiyhadambcwwa0xj2q2yj5hv5d42q25ibfs1"; + name = "mauiman-3.0.2.tar.xz"; }; }; nota = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/nota/3.0.1/nota-3.0.1.tar.xz"; - sha256 = "1ynnpkwjmj9xx5xzlz32y0k6mcrz2y50z1s4lq5kshiwa3vbjn61"; - name = "nota-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/nota/3.0.2/nota-3.0.2.tar.xz"; + sha256 = "11lqdxwsdvf1vz9y1d9r38vxfsz4jfnin3c1ipsvjl0f0zn1glr6"; + name = "nota-3.0.2.tar.xz"; }; }; pix = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/pix/3.0.1/pix-3.0.1.tar.xz"; - sha256 = "1c1fz21x324r606ab7qsnbqpz3xvc4b6794xbf7vm6p7cfsgkdq7"; - name = "pix-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/pix/3.0.2/pix-3.0.2.tar.xz"; + sha256 = "0wlpqqbf4j7dlylxhfixrcjz0yz9csni4vnbqv9l5vkxxwf0mq4k"; + name = "pix-3.0.2.tar.xz"; }; }; shelf = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/shelf/3.0.1/shelf-3.0.1.tar.xz"; - sha256 = "02qg37qpfccan3n87pbq3i7zyl22g32ipr8smbdcpwdyhxz1v00q"; - name = "shelf-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/shelf/3.0.2/shelf-3.0.2.tar.xz"; + sha256 = "1x27grdn9qa7ysxh4fb35h5376crpbl39vpd6hn0a7c3fk74w95q"; + name = "shelf-3.0.2.tar.xz"; }; }; station = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/station/3.0.1/station-3.0.1.tar.xz"; - sha256 = "11nbhax5xxrypy6ly5i609yvg7n754fhwjdpbf8c5c8j7285lnbz"; - name = "station-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/station/3.0.2/station-3.0.2.tar.xz"; + sha256 = "14i4z5lkj2rg7p5nkglqpzvrrxmf7b07kf49hh1jdk08753abc76"; + name = "station-3.0.2.tar.xz"; }; }; strike = { - version = "2.2.0"; + version = "1.1.2"; src = fetchurl { - url = "${mirror}/stable/maui/strike/1.0.0/strike-2.2.0.tar.xz"; - sha256 = "159l1i0mi3q5avcg45aq5ixz8wjfryhip61h9gynxr1m77qdpfnc"; - name = "strike-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/strike/1.1.2/strike-1.1.2.tar.xz"; + sha256 = "01ak3h6n0z3l346nbzfabkgbzwbx1fm3l9g7myiip4518cb2n559"; + name = "strike-1.1.2.tar.xz"; }; }; vvave = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/vvave/3.0.1/vvave-3.0.1.tar.xz"; - sha256 = "0z7y27sdwcpxh0jr8k0h17rk0smljvky28ck741ysxqdv992bbk9"; - name = "vvave-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/vvave/3.0.2/vvave-3.0.2.tar.xz"; + sha256 = "1py46ryi57757wyqfvxc2h02x33n11g1v04f0hac0zkjilp5l21k"; + name = "vvave-3.0.2.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 2a46cfd50035d..27d07e9d57f28 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,7 +9,7 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.20" else "8.10.20-1.BETA"; + version = if channel == "stable" then "8.10.20" else "8.10.22-21.BETA"; sources = { stable = { @@ -33,19 +33,19 @@ let beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-+wHxtlE0zeVEObzdpcIP75LKbbjsG8LMqdIPFkY0BoU="; + hash = "sha256-R4jj5U2a8AoAs1qVIjMQx6odK0Ks4WeqRURf3pOOduo="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-BRsp/hhBwgQFU+5Tt1M9V5Lx8oRLN3uaqLrzrPo/xpo="; + hash = "sha256-1opo/RZ0aTZn3Jo9XIw/g8WYK2xgRiaRKgd7RstGJ5g="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-WVP5a007cU1GR/lnL7C6QiJpTTsjzaiS69H2LJzYm70="; + hash = "sha256-jlQgXlLLUF78g2B7KYgTSQZAEe57TRw4vN7MPn3IwwI="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-BBSUSSnot1ktC0ik7yMhqsgLdkeQBrJUpHBvwu0w9m0="; + hash = "sha256-nzKESK3QKsi0Xzm3ytXWIH08LV2F6jLKvCLDHzVR9xQ="; }; }; }; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 9030421dbee48..70ac99f20a497 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.23.0"; + version = "2.24.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-WBUHS1qoKHGJb6ktw8BD3V0H0419BO3EyTh675UnZRA=" "zip"; - i686-linux = fetch "linux_386" "sha256-pulMvdE8COwRBk3IBBXqYPk2+A1XuCN9TxtGqm1HFeM=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-w0ieg9MxjmkABc4LRZIGyfDjbOter0pKRigLZBhosz4=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-fRkvkLnhr0oZCcCGhQd53Oj8uTxsgaSUkxD7p7CPOwI=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-wISQ4528+rYxaIvxAa9jrF6E6A3SvMGbLyqB4JO3Mbw=" "zip"; + i686-linux = fetch "linux_386" "sha256-A+sQY6Q0JfHuusdP96M7BqjMCn2YobAekieN3HdRJac=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-hgMZ3gSqpb04ixTwMnEg0EpYgzuTF1CMEGGl6LbYKjY=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-R0gGUgN+f5DQF57AyAI6P4X3ySktxQ60DCPJPknwxPY=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index fdb5ec771fb8b..4fe234f8e2e9c 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,17 +11,17 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "5.4.13.4"; + version = "5.5.0.11"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-RQx+E/lxdSgB2ddNIeWOd/S2OMMiznXCbYUXdYKRvCM="; + hash = "sha256-VlJiTCdoH6hlVtQgECIlbsQvg3S58B5IIy1zRxh1eOg="; }; - dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; - dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; nugetDeps = ./deps.nix; @@ -32,7 +32,7 @@ buildDotnetModule rec { "-p:PublishTrimmed=true" ]; dotnetInstallFlags = [ - "--framework=net7.0" + "--framework=net8.0" ]; selfContainedBuild = true; @@ -57,8 +57,7 @@ buildDotnetModule rec { echo "Publishing plugin $1" dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \ - -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore \ - --framework=net7.0 + -p:TargetLatestRuntimePatch=false -p:UseAppHost=false } buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 359090389d9af..65bfa46113ef8 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -57,24 +57,25 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.33.0"; sha256 = "0816lmn0varxwhdklhh5hdqp0xnfz3nlrvaf2wpkk5v1mq86216h"; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.34.0"; sha256 = "1jrs5fc8k99mh1kipvvlgwm0qlacrsh82bbpdclb84xz0h6nwwrh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.3"; sha256 = "0njmg2lygnirnfjv9gck2f5lq4ly5rgws9cpf8qj3kwcwxfp0b9s"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.3"; sha256 = "1ayh85xqdq8rqjk2iqcn7iaczcl7d8qg6bxk0b4rgx59fmsmbqj7"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.3"; sha256 = "13cjqmf59k895q6gkd5ycl89mnpalckda7rhsdl11jdyr32hsfnv"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.3"; sha256 = "1pmhd0imh9wlhvbvvwjrpjsqvzagi2ly22nddwr4r0pi234khyz1"; }) + (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.0"; sha256 = "13y3bilk9rrrgsk9abks7xvpwp12zw150xcyi0diig2hqswys1h4"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) @@ -90,9 +91,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.2.5"; sha256 = "02fybqi9d7czz3jmhmgb8wia2hpjj5hmcnij6zsgs69rkv6hf9j0"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.5"; sha256 = "0jzfqa12l5vvxd2j684cnm29w19v386cpm11pw8h6prpf57affaj"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.5"; sha256 = "0li0sw04w0a4zms5jjv1ga45wxiqlcvaw8gi0wbhiifrdzz5yckb"; }) + (fetchNuGet { pname = "NLog"; version = "5.2.7"; sha256 = "1gq5l9qv3vnl0rvxa110bbqsq6m43h8h912xijqab1hsjdpb46q3"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.7"; sha256 = "1hv2v4hqqq86vjvxa0cbk4klaii8n8h1wjrlsfzbp9nnxnzg9pzi"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.7"; sha256 = "1jifwnvkfi3jankan7543q985gzrywddvajlqrf573aa2dbp5n1f"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.26"; sha256 = "1mcg46xnhgqwjacy6j8kvp3rylpi26wjnmhwv8mh5cwjya9nynqb"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.26"; sha256 = "1wrr38ygdanf121bkl8b1d4kz1pawm064z69bqf3qbr46h4j575w"; }) @@ -105,19 +106,17 @@ (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) - (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; sha256 = "1cxrp0sk5b2gihhkn503iz8fa99k860js2qyzjpsw9rn547pdkny"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; sha256 = "1nbyn42xys0kv247jf45r748av6fp8kp27f1582lfhnj2n8290rp"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; sha256 = "0wqbjxgggskfn45ilvg86grqci3zx9xj34r5sradca4mqqc90n7f"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; sha256 = "1p9xpqzx42s8cdizv6nh15hcjvl2km0rwby66nfkj4cb472l339s"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; sha256 = "0syz7y6wgnxxgjvfqgymn9mnaa5fjy1qp06qnsvh3agr9mvcv779"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) + (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; sha256 = "0y7rp5qwwvh430nr0r15zljw01gny8yvr0gg6w5cmsk3q7q7a3dc"; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; sha256 = "16j61piz1jf8hbh14i1i4m2r9vw79gdqhjr4f4i588h52249fxlz"; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "8.0.0"; sha256 = "10fwp7692a6yyw1p8b923k061zh95a6xs3vzfdmdv5pmf41cxlb7"; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; sha256 = "1gbfimhxx6v6073pblv4rl5shz3kgx8lvfif5db26ak8pl5qj4kb"; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; sha256 = "0snljpgfmg0wlkwilkvn9qjjghq1pjdfgdpnwhvl2qw6vzdij703"; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; sha256 = "0skwla26d8clfz3alr8m42qbzsrbi7dhg74z6ha832b6730mm4pr"; }) (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.3"; sha256 = "1fls88ffq34j1gr6zay1crm27v3sjs5fa4mvj9akqjq05bxanlhk"; }) (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.1"; sha256 = "1nq9ngkqha70rv41692c79zq09cx6m85wkp3xj9yc31s62afyl5i"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index a048f0a3e4fb2..e4e2c652fefec 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "c582499d60f0726b6ec7f0fd27bd533c1f67b937"; + version = "f84a296f0ab029e56baba3cca45e5cf21129fd76"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -10,10 +10,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-dTSYlswMWWRafieWqNDIi3qCBvNAkcmZWKhQgJiv2Ts="; + hash = "sha256-NISUhxClFAzLQp4o9AzMzasPV9+aBAyDd1tuNT7HJw4="; }; - npmDepsHash = "sha256-0zzP1z3VO9Y4gBWJ+T7oHhKE/H2dzMUMg71BKupVcH4="; + npmDepsHash = "sha256-kI7kgSw0xs8Hsa/5lhLteDo8TgwyxIxKE1QK92D1Qio="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/activate-linux/default.nix b/pkgs/applications/misc/activate-linux/default.nix index 1a6da925d0575..3515f190fe770 100644 --- a/pkgs/applications/misc/activate-linux/default.nix +++ b/pkgs/applications/misc/activate-linux/default.nix @@ -52,6 +52,11 @@ stdenv.mkDerivation (finalAttrs: { cp activate-linux $out/bin cp activate-linux.1 $out/share/man/man1 + install -Dm444 res/icon.png $out/share/icons/hicolor/128x128/apps/activate-linux.png + install -Dm444 res/activate-linux.desktop -t $out/share/applications + substituteInPlace $out/share/applications/activate-linux.desktop \ + --replace 'Icon=icon' 'Icon=activate-linux' + runHook postInstall ''; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 60e8a3fe029c0..1b8e0541346a5 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autoconf-archive - ] ++ lib.optionals enableOpusfile [ - # configure.ac uses pkg-config only to locate libopusfile pkg-config ]; diff --git a/pkgs/applications/misc/bambu-studio/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch b/pkgs/applications/misc/bambu-studio/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch new file mode 100644 index 0000000000000..15f1bf8f0b59e --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch @@ -0,0 +1,34 @@ +From 7eed499898226222a949a792e0400ec10db4a1c9 Mon Sep 17 00:00:00 2001 +From: Zhaofeng Li <hello@zhaofeng.li> +Date: Tue, 22 Nov 2022 13:00:39 -0700 +Subject: [PATCH] [not for upstream] CMakeLists: Link against webkit2gtk in + libslic3r_gui + +WebView.cpp uses symbols from webkitgtk directly. Upstream setup +links wxGTK statically so webkitgtk is already pulled in. + +> /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: slic3r/liblibslic3r_gui.a(WebView.cpp.o): undefined reference to symbol 'webkit_web_view_run_javascript_finish' +> /nix/store/039g378vc3pc3dvi9dzdlrd0i4q93qwf-binutils-2.39/bin/ld: /nix/store/8yvy428jy2nwq4dhmrcs7gj5r27a2pv6-webkitgtk-2.38.2+abi=4.0/lib/libwebkit2gtk-4.0.so.37: error adding symbols: DSO missing from command line +--- + src/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9c5cb96..e92a0e3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -175,6 +175,11 @@ if (WIN32) + target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly) + endif () + ++# We link against webkit2gtk symbols in src/slic3r/GUI/Widgets/WebView.cpp ++if (CMAKE_SYSTEM_NAME STREQUAL "Linux") ++ target_link_libraries(libslic3r_gui "-lwebkit2gtk-4.0") ++endif () ++ + # Link the resources dir to where Slic3r GUI expects it + set(output_dlls_Release "") + set(output_dlls_Debug "") +-- +2.38.1 + diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix new file mode 100644 index 0000000000000..69a27c06d6716 --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -0,0 +1,173 @@ +{ stdenv +, lib +, openexr +, jemalloc +, c-blosc +, binutils +, fetchFromGitHub +, cmake +, pkg-config +, wrapGAppsHook +, boost179 +, cereal +, cgal_5 +, curl +, dbus +, eigen +, expat +, gcc-unwrapped +, glew +, glfw +, glib +, glib-networking +, gmp +, gstreamer +, gst-plugins-base +, gst-plugins-bad +, gtest +, gtk3 +, hicolor-icon-theme +, ilmbase +, libpng +, mesa +, mpfr +, nlopt +, opencascade-occt +, openvdb +, pcre +, qhull +, systemd +, tbb_2021_8 +, webkitgtk +, wxGTK31 +, xorg +, fetchpatch +, withSystemd ? stdenv.isLinux +}: +let + wxGTK31' = wxGTK31.overrideAttrs (old: { + configureFlags = old.configureFlags ++ [ + # Disable noisy debug dialogs + "--enable-debug=no" + ]; + }); + openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { + buildInputs = [ openexr boost179 tbb_2021_8 jemalloc c-blosc ilmbase ]; + }); +in +stdenv.mkDerivation rec { + pname = "bambu-studio"; + version = "01.08.01.57"; + + src = fetchFromGitHub { + owner = "bambulab"; + repo = "BambuStudio"; + rev = "v${version}"; + hash = "sha256-15Eq+ylQK+xlxG7cg6xoCPb+zJ66qqwQIKd1zA13I5o="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + binutils + boost179 + cereal + cgal_5 + curl + dbus + eigen + expat + gcc-unwrapped + glew + glfw + glib + glib-networking + gmp + gstreamer + gst-plugins-base + gst-plugins-bad + gtk3 + hicolor-icon-theme + ilmbase + libpng + mesa.osmesa + mpfr + nlopt + opencascade-occt + openvdb_tbb_2021_8 + pcre + tbb_2021_8 + webkitgtk + wxGTK31' + xorg.libX11 + ] ++ lib.optionals withSystemd [ + systemd + ] ++ checkInputs; + + patches = [ + # Fix for webkitgtk linking + ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch + ]; + + doCheck = true; + checkInputs = [ gtest ]; + + separateDebugInfo = true; + + # The build system uses custom logic - defined in + # cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt + # library, which doesn't pick up the package in the nix store. We + # additionally need to set the path via the NLOPT environment variable. + NLOPT = nlopt; + + # Disable compiler warnings that clutter the build log. + # It seems to be a known issue for Eigen: + # http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221 + NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; + + # prusa-slicer uses dlopen on `libudev.so` at runtime + NIX_LDFLAGS = lib.optionalString withSystemd "-ludev"; + + # TODO: macOS + prePatch = '' + # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx + # now seems to be integrated into the main lib. + sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake + ''; + + cmakeFlags = [ + "-DSLIC3R_STATIC=0" + "-DSLIC3R_FHS=1" + "-DSLIC3R_GTK=3" + + # BambuStudio-specific + "-DBBL_RELEASE_TO_PUBLIC=1" + "-DBBL_INTERNAL_TESTING=0" + "-DDEP_WX_GTK3=ON" + "-DSLIC3R_BUILD_TESTS=0" + "-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK" + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "$out/lib" + + # Fixes intermittent crash + # The upstream setup links in glew statically + --prefix LD_PRELOAD : "${glew.out}/lib/libGLEW.so" + ) + ''; + + meta = with lib; { + description = "PC Software for BambuLab's 3D printers"; + homepage = "https://github.com/bambulab/BambuStudio"; + license = licenses.agpl3; + maintainers = with maintainers; [ zhaofengli ]; + mainProgram = "bambu-studio"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix new file mode 100644 index 0000000000000..17896cf5fa202 --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: +let + orca-slicer = bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { + version = "1.8.1"; + pname = "orca-slicer"; + + src = fetchFromGitHub { + owner = "SoftFever"; + repo = "OrcaSlicer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-3aIVi7Wsit4vpFrGdqe7DUEC6HieWAXCdAADVtB5HKc="; + }; + + meta = with lib; { + description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; + homepage = "https://github.com/SoftFever/OrcaSlicer"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ zhaofengli ovlach pinpox ]; + mainProgram = "orca-slicer"; + platforms = platforms.linux; + }; + }); +in +orca-slicer diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 24ea7287160b7..e803c7eae840b 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -38,11 +38,11 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "blender"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-/jLU0noX5RxhQ+26G16nGFylm65Lzfm9s11oCWCC43Q="; + hash = "sha256-qqDnKdp1kc+/RXcq92NFl32qp7EaCvNdmPkxPiRgd6M="; }; patches = [ @@ -52,7 +52,10 @@ stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ] - ++ lib.optionals cudaSupport [ addOpenGLRunpath ] + ++ lib.optionals cudaSupport [ + addOpenGLRunpath + cudaPackages.cuda_nvcc + ] ++ lib.optionals waylandSupport [ pkg-config ]; buildInputs = [ boost ffmpeg gettext glew ilmbase @@ -87,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: rec { llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL ]) ++ lib.optional jackaudioSupport libjack2 - ++ lib.optional cudaSupport cudaPackages.cudatoolkit + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] ++ lib.optional colladaSupport opencollada ++ lib.optional spaceNavSupport libspnav; pythonPath = with python310Packages; [ numpy requests zstandard ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 7779480fa08a1..e1c0b5045ab01 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-cKUV+tBZ5ZdXkoLdJPdURKnWP5B5gzCUQQehVQIRgko="; + hash = "sha256-1OZPSXF5cQlmwbD2bHVWtYHLUgCo8LaR1WPpuSUWoR8="; }; patches = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "0007-Hardening-Qt-code.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; - hash = "sha256-eTzwo8aAIJnZTIZ/8DqCQi3ZbKxycEdiv+UxRuxo12g="; + hash = "sha256-a6yyG0RUsQJBBNxeJsTtQSBV2lxdzz1hnTob88O+SKg="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index c9caa508f171f..10bdf17813c5a 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.17.0"; + version = "5.18.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-yxph3Aor5nZOhu2PY4MGcfScaz9w24JXqXbhT+QKlNI="; + hash = "sha256-f7XYcFleEe1f6Uh6mOqfakzfWzOiQtBPhowTJUZU1MU="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 1b85a1ec65fe2..da39da86ef7b8 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.4.0"; + version = "4.4.2"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-lEMwPGXvgI8wtXska9ngAy9R2tr41Jq5yO6xQk9V5n4="; + sha256 = "sha256-GUU6VWfTmNS6ny12HnMr3uQmS7HI86Oupcmqx0MVAvE="; }; subPackages = [ "cmd/cheat" ]; diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index bb445422d0303..0852e886c54b5 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -44,6 +44,6 @@ in appimageTools.wrapType2 rec { license = licenses.gpl3Only; maintainers = with maintainers; [ aw ]; platforms = [ "x86_64-linux" ]; - mainProgram = pname; + mainProgram = "chrysalis"; }; } diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix index c7f5c265127f1..64a3c4f3f8939 100644 --- a/pkgs/applications/misc/clipcat/default.nix +++ b/pkgs/applications/misc/clipcat/default.nix @@ -2,42 +2,33 @@ , fetchFromGitHub , rustPlatform , protobuf -, xvfb-run , installShellFiles }: rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.11.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - hash = "sha256-6L6u8inHkiEz7lp3T0a237z3JQwGDWKXtTBVNIKct64="; + hash = "sha256-NuljH6cqgdtTJDkNv4w44s1UM4/R1gmpVyWpCzCJ3DU="; }; - cargoHash = "sha256-uzIqIGjCZEmChM3uVAnAp7eTIznTLXW/4t+NVoryjtk="; + cargoHash = "sha256-5+qa9/QGZyZBaO2kbvpP7Ybs1EXIO1MlPFm0PDTNqCQ="; nativeBuildInputs = [ protobuf installShellFiles ]; - nativeCheckInputs = [ - xvfb-run + checkFlags = [ + # Some test cases interact with X11, skip them + "--skip=test_x11_clipboard" + "--skip=test_x11_primary" ]; - useNextest = true; - - # cargo-nextest help us retry the failed test cases - NEXTEST_RETRIES = 5; - - # Some test cases interact with X11, we use xvfb-run here - checkPhase = '' - xvfb-run --auto-servernum cargo nextest run --release --workspace --no-fail-fast --no-capture - ''; - postInstall = '' for cmd in clipcatd clipcatctl clipcat-menu clipcat-notify; do installShellCompletion --cmd $cmd \ diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 0771737eb266e..99c2ce866db39 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.3.6"; + version = "1.3.8"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-a8cLtmv9nLtvN9o/aIwveTAT36XmTN1j85ZxVGIXO6E="; + sha256 = "sha256-lc6yWzJiSzGKMzJIpgOtirJONsh49vXWDWrhLV/erwQ="; }; patches = [ ./polkit-dir.patch diff --git a/pkgs/applications/misc/corectrl/polkit-dir.patch b/pkgs/applications/misc/corectrl/polkit-dir.patch index 85b0f765bebe6..beaef3b5097eb 100644 --- a/pkgs/applications/misc/corectrl/polkit-dir.patch +++ b/pkgs/applications/misc/corectrl/polkit-dir.patch @@ -1,5 +1,5 @@ diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt -index 1b7ed7c..757748c 100644 +index 3fe2ace..2542ea1 100644 --- a/src/helper/CMakeLists.txt +++ b/src/helper/CMakeLists.txt @@ -22,15 +22,7 @@ message("D-Bus files will be installed into ${DBUS_DATADIR_PREFIX_DIR}/dbus-1") @@ -7,15 +7,15 @@ index 1b7ed7c..757748c 100644 # Find polkit pkg_check_modules(POLKIT REQUIRED polkit-gobject-1) -execute_process( -- COMMAND pkg-config --variable=policydir polkit-gobject-1 -- RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT -- OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR -- OUTPUT_STRIP_TRAILING_WHITESPACE +- COMMAND pkg-config --variable=policydir polkit-gobject-1 +- RESULT_VARIABLE POLKIT_POLICY_INSTALL_DIR_RESULT +- OUTPUT_VARIABLE POLKIT_POLICY_INSTALL_DIR +- OUTPUT_STRIP_TRAILING_WHITESPACE -) -if(NOT POLKIT_POLICY_INSTALL_DIR_RESULT EQUAL "0") - message(FATAL_ERROR "Failed to retrieve Polkit `policydir` variable using pkg-config") -endif() +option(POLKIT_POLICY_INSTALL_DIR "Polkit policy directory") - list(APPEND PROCESS_MONITOR_SRC - pmon/processmonitor.cpp + list(APPEND HELPER_COMPILE_DEFINITIONS + ELPP_THREAD_SAFE diff --git a/pkgs/applications/misc/cura/numpy-cast.patch b/pkgs/applications/misc/cura/numpy-cast.patch deleted file mode 100644 index efb14182b3e65..0000000000000 --- a/pkgs/applications/misc/cura/numpy-cast.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN Cura-15.04.old/Cura/util/sliceEngine.py Cura-15.04/Cura/util/sliceEngine.py ---- Cura-15.04.old/Cura/util/sliceEngine.py 2016-05-07 20:34:17.305020334 +0200 -+++ Cura-15.04/Cura/util/sliceEngine.py 2016-05-07 20:40:02.993286467 +0200 -@@ -343,7 +343,7 @@ - objMax[1] = max(oMax[1], objMax[1]) - if objMin is None: - return -- pos += (objMin + objMax) / 2.0 * 1000 -+ pos = numpy.add( pos, (objMin + objMax) / 2.0 * 1000, out=pos, casting='unsafe') - commandList += ['-s', 'posx=%d' % int(pos[0]), '-s', 'posy=%d' % int(pos[1])] - - vertexTotal = [0] * 4 diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index a9e87e7240598..0e7800b9bbb32 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "2.1"; + version = "2.2"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "sha256-D5FUhv1moQKzcLj/3VWJNs24jTXJir1dMpv59orPTtc="; + sha256 = "sha256-88cCQm3eViy0OwSyCTlnW7uuiFwz2/6Wz45QzxCgXxg="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/applications/misc/eos-installer/default.nix index 67e6b2bc97ade..5d4ea2e8c60c9 100644 --- a/pkgs/applications/misc/eos-installer/default.nix +++ b/pkgs/applications/misc/eos-installer/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "eos-installer"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "endlessm"; repo = "eos-installer"; rev = "Release_${version}"; - sha256 = "utTTux8o8TN51bvnGldrtMEatiLA1AiHf/9XJZ7k7KM="; + sha256 = "BqvZglzFJabGXkI8hnLiw1r+CvM7kSKQPj8IKYBB6S4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/ericw-tools/default.nix b/pkgs/applications/misc/ericw-tools/default.nix index dadd235319b33..9e833eafa7705 100644 --- a/pkgs/applications/misc/ericw-tools/default.nix +++ b/pkgs/applications/misc/ericw-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , gtest, fmt , cmake, ninja, installShellFiles }: @@ -20,6 +20,13 @@ stdenv.mkDerivation rec { popd ''; + patches = [ + (fetchpatch { + url = "https://github.com/ericwa/ericw-tools/commit/c9570260fa895dde5a21272d76f9a3b05d59efdd.patch"; + hash = "sha256-dZr2LWuJBAIT//XHXYEz2vhaK2mxtxkSJ4IQla8OXKI="; + }) + ]; + nativeBuildInputs = [ cmake ninja installShellFiles ]; outputs = [ "out" "doc" "man" ]; @@ -44,5 +51,6 @@ stdenv.mkDerivation rec { description = "Map compile tools for Quake and Hexen 2"; license = licenses.gpl3Plus; maintainers = with maintainers; [ astro ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/faircamp/Cargo.lock b/pkgs/applications/misc/faircamp/Cargo.lock index b8dba83ebfbe9..0eb6211e4287b 100644 --- a/pkgs/applications/misc/faircamp/Cargo.lock +++ b/pkgs/applications/misc/faircamp/Cargo.lock @@ -54,7 +54,7 @@ dependencies = [ "actix-utils", "ahash", "base64", - "bitflags 2.2.1", + "bitflags 2.4.1", "brotli", "bytes", "bytestring", @@ -78,17 +78,17 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "zstd 0.12.3+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] name = "actix-macros" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" +checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" +checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" dependencies = [ "futures-core", "tokio", @@ -116,9 +116,9 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e8613a75dd50cc45f473cee3c34d59ed677c0f7b44480ce3b8247d7dc519327" +checksum = "3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4" dependencies = [ "actix-rt", "actix-service", @@ -126,8 +126,7 @@ dependencies = [ "futures-core", "futures-util", "mio", - "num_cpus", - "socket2 0.4.9", + "socket2", "tokio", "tracing", ] @@ -188,21 +187,21 @@ dependencies = [ "serde_json", "serde_urlencoded", "smallvec", - "socket2 0.5.3", - "time 0.3.21", + "socket2", + "time", "url", ] [[package]] name = "actix-web-codegen" -version = "4.2.0" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9" +checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -233,21 +232,22 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -284,9 +284,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -298,15 +298,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -322,9 +322,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -332,15 +332,15 @@ 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 = "arbitrary-int" -version = "1.2.5" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a49f791c7c8885e8221d31bc3a34455b0fd869810d8ddff608dbe08a598f9d9" +checksum = "fe8e2a586ecd6eb29477a0c25b19742acca4fa5e39c92e127656616810c20579" [[package]] name = "askama_escape" @@ -390,16 +390,16 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide 0.7.1", + "miniz_oxide", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.21.3" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -430,9 +430,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block-buffer" @@ -445,9 +445,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -456,9 +456,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -466,33 +466,33 @@ dependencies = [ [[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 = "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" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[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 = "bytestring" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae" +checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" dependencies = [ "bytes", ] @@ -520,11 +520,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]] @@ -541,18 +542,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.29" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87d9d13be47a5b7c3907137f1290b0459a7f80efb26be8c52afb11963bccb02" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -567,9 +567,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.2" +version = "4.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" dependencies = [ "clap_builder", "clap_derive", @@ -577,9 +577,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" dependencies = [ "anstream", "anstyle", @@ -589,21 +589,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.39", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "claxon" @@ -661,15 +661,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.21", + "time", "version_check", ] [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -677,15 +677,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -701,19 +701,9 @@ dependencies = [ [[package]] name = "critical-section" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - -[[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", -] +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "crossbeam-deque" @@ -728,9 +718,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", @@ -741,9 +731,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", ] @@ -765,6 +755,15 @@ dependencies = [ ] [[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] + +[[package]] name = "derive_more" version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -779,15 +778,15 @@ dependencies = [ [[package]] name = "deunicode" -version = "0.4.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" +checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" [[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", "crypto-common", @@ -796,35 +795,41 @@ dependencies = [ [[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 = "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", ] [[package]] name = "enolib" -version = "0.2.1" -source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.2.1#16f94efb92203f5b8f92a67de6abb7fa0ef5869d" +version = "0.3.0" +source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.3.0#e5739943579f23d43300f83a06988c47e9719f1a" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "exr" -version = "1.6.3" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" dependencies = [ "bit_field", "flume", "half", "lebe", - "miniz_oxide 0.6.2", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -832,7 +837,7 @@ dependencies = [ [[package]] name = "faircamp" -version = "0.8.0" +version = "0.11.0" dependencies = [ "actix-files", "actix-web", @@ -863,24 +868,25 @@ dependencies = [ "slug", "tokio", "url", + "urlencoding", "webbrowser", "zip", ] [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] [[package]] name = "fixed" -version = "1.23.1" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79386fdcec5e0fde91b1a6a5bcd89677d1f9304f7f986b154a1b9109038854d9" +checksum = "02c69ce7e7c0f17aa18fdd9d0de39727adb9c6281f2ad12f57cbe54ae6e76e7d" dependencies = [ "az", "bytemuck", @@ -890,12 +896,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -919,36 +925,36 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-core", "futures-task", @@ -968,14 +974,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -991,15 +997,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "h2" -version = "0.3.19" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -1016,10 +1022,11 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" dependencies = [ + "cfg-if", "crunchy", ] @@ -1034,9 +1041,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heapless" @@ -1059,12 +1066,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -1092,15 +1096,15 @@ dependencies = [ [[package]] name = "hound" -version = "3.5.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" +checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f" [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1121,22 +1125,22 @@ 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 = "iana-time-zone" -version = "0.1.56" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1150,20 +1154,20 @@ dependencies = [ [[package]] name = "id3" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9389dd9c8c4671b1e4b2878a6329bccb573f9c24a75bc91c641c451ce5436501" +checksum = "bf8550abe8a02c044e8f4162c8ddb4020fc65b5e7771ad9b80c25e13ed4536b6" dependencies = [ - "bitflags 2.2.1", + "bitflags 2.4.1", "byteorder", "flate2", ] [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1190,19 +1194,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] [[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 = "inout" @@ -1233,9 +1237,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jni" @@ -1261,9 +1265,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -1279,9 +1283,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.62" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -1317,9 +1321,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libvips" @@ -1333,27 +1337,26 @@ dependencies = [ [[package]] name = "local-channel" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c" +checksum = "b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8" dependencies = [ "futures-core", "futures-sink", - "futures-util", "local-waker", ] [[package]] name = "local-waker" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1" +checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1361,12 +1364,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 = "malloc_buf" @@ -1379,15 +1379,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[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", ] @@ -1427,15 +1427,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" @@ -1446,14 +1437,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "wasi", + "windows-sys 0.48.0", ] [[package]] @@ -1524,18 +1515,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" 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", "libc", @@ -1579,9 +1570,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 = "opus" @@ -1624,15 +1615,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", ] [[package]] @@ -1648,9 +1639,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" @@ -1666,28 +1657,28 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.39", ] [[package]] @@ -1710,18 +1701,24 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.8" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1729,9 +1726,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -1803,9 +1800,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[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", @@ -1813,30 +1810,28 @@ 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 = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.4" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -1846,9 +1841,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -1857,9 +1852,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rmp3" @@ -1888,9 +1883,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" @@ -1913,41 +1908,41 @@ 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 = "semver" -version = "1.0.17" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -1968,9 +1963,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -1979,9 +1974,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -1999,49 +1994,40 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "slug" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" +checksum = "3bd94acec9c8da640005f8e135a39fc0372e74535e6b368b7a04b875f784c8c4" dependencies = [ "deunicode", + "wasm-bindgen", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.2" 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 = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -2070,9 +2056,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -2087,9 +2073,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -2098,22 +2084,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.39", ] [[package]] @@ -2129,22 +2115,13 @@ 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.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ + "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -2152,15 +2129,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -2182,9 +2159,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes", @@ -2194,27 +2171,27 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.39", ] [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -2226,11 +2203,10 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-core", @@ -2238,24 +2214,24 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[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 = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -2268,9 +2244,9 @@ 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 = "unicode-normalization" @@ -2283,9 +2259,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -2293,6 +2269,12 @@ dependencies = [ ] [[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] name = "utf8parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2306,9 +2288,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", @@ -2316,21 +2298,15 @@ dependencies = [ [[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" [[package]] name = "wasm-bindgen" -version = "0.2.85" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2338,24 +2314,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.85" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.85" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2363,28 +2339,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.85" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.85" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-sys" -version = "0.3.62" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -2392,9 +2368,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" +checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" dependencies = [ "core-foundation", "home", @@ -2431,9 +2407,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", ] @@ -2445,12 +2421,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -2468,7 +2444,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]] @@ -2488,17 +2464,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]] @@ -2509,9 +2485,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" @@ -2521,9 +2497,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" @@ -2533,9 +2509,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" @@ -2545,9 +2521,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" @@ -2557,9 +2533,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" @@ -2569,9 +2545,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" @@ -2581,9 +2557,29 @@ 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 = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "zerocopy" +version = "0.7.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "f43de342578a3a14a9314a2dab1942cbfcbe5686e1f91acdc513058063eafe18" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1012d89e3acb79fad7a799ce96866cfb8098b74638465ea1b1533d35900ca90" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] [[package]] name = "zip" @@ -2601,7 +2597,7 @@ dependencies = [ "hmac", "pbkdf2", "sha1", - "time 0.3.21", + "time", "zstd 0.11.2+zstd.1.5.2", ] @@ -2616,11 +2612,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]] @@ -2635,9 +2631,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", @@ -2645,12 +2641,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index bbceb6833b9c1..a617494c1be18 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -16,20 +16,20 @@ rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "0.8.0"; + version = "0.11.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-Rz/wMlVNjaGhk26QMnS4+W3oA/RSdB6FuigC84L8eDg="; + hash = "sha256-CD5wCvONlgNTXpFcCHCLdJ/lJsC2VTleKt9+ZX5znZo="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "enolib-0.2.1" = "sha256-ryB5Tk90BvsstdXgYw7F0BJymWWetAIijhVpLeVBOa8="; + "enolib-0.3.0" = "sha256-nw1nnIh2r4JFcUb3D21BcjeieDTYRIza8Lrq1yD+ZYQ="; }; }; diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/applications/misc/flashprint/default.nix index 893ae8aed0055..affc8c5ad2be5 100644 --- a/pkgs/applications/misc/flashprint/default.nix +++ b/pkgs/applications/misc/flashprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "flashprint"; - version = "5.8.1"; + version = "5.8.3"; src = fetchurl { url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; - hash = "sha256-X5CsJmJa3qGQxdZ1xg3xoVnIaChzxZ/GaLZFqBE2dIk="; + hash = "sha256-6vBEthQD0HM2D+l+2dwWmdU+XPJpcvZQM+2GMuaf5Pw="; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/flowtime/default.nix b/pkgs/applications/misc/flowtime/default.nix index 6ede1b080f25c..6637cb8781910 100644 --- a/pkgs/applications/misc/flowtime/default.nix +++ b/pkgs/applications/misc/flowtime/default.nix @@ -5,16 +5,14 @@ , meson , ninja , wrapGAppsHook4 +, gst_all_1 , libadwaita , libxml2 -, libgee -, gst_all_1 -, gobject-introspection , desktop-file-utils -, glib , pkg-config , libportal-gtk4 , blueprint-compiler +, appstream-glib }: stdenv.mkDerivation rec { @@ -31,24 +29,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ blueprint-compiler desktop-file-utils - glib - gobject-introspection meson ninja pkg-config vala wrapGAppsHook4 + appstream-glib ]; buildInputs = [ libadwaita libxml2 - libgee libportal-gtk4 ] ++ (with gst_all_1; [ gstreamer gst-plugins-base - gst-plugins-bad ]); meta = with lib; { @@ -56,5 +51,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Diego-Ivan/Flowtime"; license = licenses.gpl3Plus; maintainers = with maintainers; [ foo-dogsquared pokon548 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/applications/misc/fluxboxlauncher/default.nix index 4794e14b4698e..719f08db6bcdf 100644 --- a/pkgs/applications/misc/fluxboxlauncher/default.nix +++ b/pkgs/applications/misc/fluxboxlauncher/default.nix @@ -46,6 +46,11 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ]; + postInstall = '' + install -Dm444 fluxboxlauncher.desktop -t $out/share/applications + install -Dm444 fluxboxlauncher.svg -t $out/share/icons/hicolor/scalable/apps + ''; + meta = with lib; { description = "A Gui editor (gtk) to configure applications launching on a fluxbox session"; homepage = "https://github.com/mothsART/fluxboxlauncher"; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index dc247264775d2..5bf2f15c2fc92 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.26.3"; + version = "1.26.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-M8EP0YbyJhOUPrghYA2jDQ/CpyD98d27l94uEj4YEpM="; + sha256 = "sha256-XlHfCPwTgy66CiIvEu/NU8gNXfLg+8i98anngyeRfGU="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gcfflasher/default.nix b/pkgs/applications/misc/gcfflasher/default.nix index 14bc6ad012e06..917a665760174 100644 --- a/pkgs/applications/misc/gcfflasher/default.nix +++ b/pkgs/applications/misc/gcfflasher/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gcfflasher"; - version = "4.0.3-beta"; + version = "4.3.0-beta"; src = fetchFromGitHub { owner = "dresden-elektronik"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-m+iDBfsHo+PLYd3K8JaKwhIXcnj+Q8w7gIgmHp+0plk="; + hash = "sha256-H1CZ7rAM1QpdmSnUpvg6ytln/0MQKju/C4aIk3xl0PA="; }; nativeBuildInputs = [ @@ -22,11 +22,6 @@ stdenv.mkDerivation rec { cmake ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'main_windows.c' 'main_posix.c' - ''; - buildInputs = lib.optionals stdenv.isLinux [ libgpiod ]; @@ -42,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; homepage = "https://github.com/dresden-elektronik/gcfflasher"; maintainers = with maintainers; [ fleaz ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index 061fce572631a..c508b3400e24d 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "genact"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MB/i1jCxoGE8cPF+NE8aS7kF7ZsGb4+OyLcPcGp1hwI="; + sha256 = "sha256-iPDIbfbRNhgmTQHw9gNczXTcUaJ0dQpBDHg5ZOQQJ4M="; }; - cargoSha256 = "sha256-OBGJIR3REeMxHQu3ovEKSZZ8QNlhl/5jvWbR5OdsRTQ="; + cargoHash = "sha256-Hg8Xlcx0j70Z8IwlJPCwm+qhurXjtKGLI3ZUCeHL1KY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index c05f00ae3a509..538c25d6dc985 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Automatic GeoIP database updater"; homepage = "https://github.com/maxmind/geoipupdate"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ das_j ]; + maintainers = teams.helsinki-systems.members; }; } diff --git a/pkgs/applications/misc/gimoji/default.nix b/pkgs/applications/misc/gimoji/default.nix index 63223755e01b7..7787e71691d3d 100644 --- a/pkgs/applications/misc/gimoji/default.nix +++ b/pkgs/applications/misc/gimoji/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "gimoji"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "zeenix"; repo = "gimoji"; rev = version; - hash = "sha256-7UzdZsidLHLZBj7mpRJQhvr3VP7HtkKPfAc7dnxS7kE="; + hash = "sha256-rXGnSXqKxxmC2V2qapWZb+TB89a854ZGq1kG/3JjlUg="; }; - cargoHash = "sha256-oWImiIUFgy/pKHlZPPd1IWDG5l5LYCWTYJjgEqiXzLA="; + cargoHash = "sha256-WYMqKwe78D00ZZ+uwV61keRBNiJQKNqlpQtteVR0bVA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 389359e0cd079..1ca75f28ea5f1 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "girara"; - version = "0.4.0"; + version = "0.4.1"; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "pwmt"; repo = "girara"; rev = version; - sha256 = "sha256-dzWdiFGJ45JcH+wNwq2P3NZeWwHXAvXR1eJC85mYy7M="; + sha256 = "sha256-47ff7NBunVvYlCEQN/LwTRG33aButisVvdwxlh28LUM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gnome-extension-manager/default.nix b/pkgs/applications/misc/gnome-extension-manager/default.nix index 1dfa17981e895..5a0a1c3cf6828 100644 --- a/pkgs/applications/misc/gnome-extension-manager/default.nix +++ b/pkgs/applications/misc/gnome-extension-manager/default.nix @@ -60,7 +60,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ foo-dogsquared ]; - # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; }; } diff --git a/pkgs/applications/misc/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix index ad11b734762ef..4d6abb585c304 100644 --- a/pkgs/applications/misc/gpu-burn/default.nix +++ b/pkgs/applications/misc/gpu-burn/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cudatoolkit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpu-burn"; - version = "unstable-2021-04-29"; + version = "unstable-2023-11-10"; src = fetchFromGitHub { owner = "wilicc"; repo = "gpu-burn"; - rev = "1e9a84f4bec3b0835c00daace45d79ed6c488edb"; - sha256 = "sha256-x+kta81Z08PsBgbf+fzRTXhNXUPBd5w8bST/T5nNiQA="; + rev = "b99aedce3e020d2ca419832ee27b7f29dfa6373e"; + sha256 = "sha256-cLO0GXvujZ+g64j+OY31n43MsVER3ljo8Qrt+EzSKjc="; }; postPatch = '' substituteInPlace gpu_burn-drv.cpp \ - --replace "const char *kernelFile = \"compare.ptx\";" \ - "const char *kernelFile = \"$out/share/compare.ptx\";" + --replace "#define COMPARE_KERNEL \"compare.ptx\"" \ + "#define COMPARE_KERNEL \"$out/share/compare.ptx\"" ''; buildInputs = [ cudatoolkit ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index d4b89db84ef55..9f4b744474897 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.11"; + version = "13.13"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-EJpyWuOyUVb34F5Pg8KPF9R3f3VpvZVeg8WBZ1oGbbE="; + hash = "sha256-EUBExf2fpa4Y3T6pKnDoaZYhwE4XOJDMEn+LT1XxIYc="; }; buildInputs = [ diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index d5dc1c84f7611..b85e00d095ed0 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-hJuFfdUeUUIjTBRtUo2x24BDuMPPkkReGLFDZSHR9pA="; + hash = "sha256-NgMEgSfHVLCEKZ3MmNV571ySMUD8wj+kq5EccGrxtZc="; }; - vendorHash = "sha256-tEeP8i2I9/Q4tuswkeV1S3jpc7saLxtzzLQxcPUh1sM="; + vendorHash = "sha256-fmc6nbS/Xmn/YRwToRH7EhP4SFRMf8hjZ/rLtaP/USo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 131cd28764ecc..5c28cd2443e40 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -71,6 +71,8 @@ buildFHSEnv rec { "bin/hotl" # hda/otl manipulation tool "bin/hython" # hython "bin/hkey" # license administration + "bin/husk" # hydra rendereing tool + "bin/mantra" # mantra renderer "houdini/sbin/sesinetd" ]; in '' @@ -80,7 +82,7 @@ buildFHSEnv rec { mkdir -p $out/$(dirname $executable) echo "#!${stdenv.shell}" >> $out/$executable - echo "$WRAPPER ${unwrapped}/$executable \$@" >> $out/$executable + echo "$WRAPPER ${unwrapped}/$executable \"\$@\"" >> $out/$executable done cd $out @@ -93,6 +95,6 @@ buildFHSEnv rec { ]; runScript = writeScript "${name}-wrapper" '' - exec $@ + exec "$@" ''; } diff --git a/pkgs/applications/misc/houdini/runtime-build.nix b/pkgs/applications/misc/houdini/runtime-build.nix new file mode 100644 index 0000000000000..60f27c1949642 --- /dev/null +++ b/pkgs/applications/misc/houdini/runtime-build.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, requireFile, bc, version, src, eulaDate }: + +let + license_dir = "~/.config/houdini"; +in +stdenv.mkDerivation rec { + inherit version src; + pname = "houdini-runtime"; + + buildInputs = [ bc ]; + installPhase = '' + patchShebangs houdini.install + mkdir -p $out + ./houdini.install --install-houdini \ + --install-license \ + --no-install-menus \ + --no-install-bin-symlink \ + --auto-install \ + --no-root-check \ + --accept-EULA ${eulaDate} \ + $out + echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt # does not seem to do anything any more. not sure, official docs do not say anything about it + ''; + + dontFixup = true; + + meta = with lib; { + description = "3D animation application software"; + homepage = "https://www.sidefx.com"; + license = licenses.unfree; + platforms = platforms.linux; + hydraPlatforms = [ ]; # requireFile src's should be excluded + maintainers = with maintainers; [ canndrew kwohlfahrt ]; + }; +} diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 2f218781abb6e..e437dd51c8850 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,40 +1,14 @@ -{ lib, stdenv, requireFile, bc }: +{ lib, stdenv, requireFile, callPackage}: let license_dir = "~/.config/houdini"; in -stdenv.mkDerivation rec { +callPackage ./runtime-build.nix rec { version = "19.5.569"; - pname = "houdini-runtime"; + eulaDate = "2021-10-13"; src = requireFile rec { name = "houdini-${version}-linux_x86_64_gcc9.3.tar.gz"; sha256 = "0c2d6a31c24f5e7229498af6c3a7cdf81242501d7a0792e4c33b53a898d4999e"; - url = meta.homepage; - }; - - buildInputs = [ bc ]; - installPhase = '' - patchShebangs houdini.install - mkdir -p $out - ./houdini.install --install-houdini \ - --install-license \ - --no-install-menus \ - --no-install-bin-symlink \ - --auto-install \ - --no-root-check \ - --accept-EULA 2021-10-13 \ - $out - echo "licensingMode = localValidator" >> $out/houdini/Licensing.opt # does not seem to do anything any more. not sure, official docs do not say anything about it - ''; - - dontFixup = true; - - meta = with lib; { - description = "3D animation application software"; - homepage = "https://www.sidefx.com"; - license = licenses.unfree; - platforms = platforms.linux; - hydraPlatforms = [ ]; # requireFile src's should be excluded - maintainers = with maintainers; [ canndrew kwohlfahrt ]; + url = "https://www.sidefx.com/download/daily-builds/?production=true"; }; } diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix deleted file mode 100644 index 9e07193cdb7f2..0000000000000 --- a/pkgs/applications/misc/jigdo/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, db, gtk2, bzip2 }: - -stdenv.mkDerivation rec { - pname = "jigdo"; - version = "0.7.3"; - - src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_${version}.orig.tar.gz"; - sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv"; - }; - - patches = [ - (fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-4.diff.gz"; - sha256 = "03zsh57fijciiv23lf55k6fbfhhzm866xjhx83x54v5s1g2h6m8y"; - }) - ./sizewidth.patch - ]; - - buildInputs = [ db gtk2 bzip2 ]; - - configureFlags = [ "--without-libdb" ]; - - meta = with lib; { - description = "Download utility that can fetch files from several sources simultaneously"; - homepage = "http://atterer.org/jigdo/"; - license = licenses.gpl2Only; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/misc/jigdo/sizewidth.patch b/pkgs/applications/misc/jigdo/sizewidth.patch deleted file mode 100644 index 17b1749fcf777..0000000000000 --- a/pkgs/applications/misc/jigdo/sizewidth.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git i/src/mkimage.cc w/src/mkimage.cc -index 02e65b1..b263796 100755 ---- i/src/mkimage.cc -+++ w/src/mkimage.cc -@@ -285,27 +285,27 @@ bostream& JigdoDescVec::put(bostream& file, MD5Sum* md) const { - //______________________________________________________________________ - - namespace { -- const int SIZE_WIDTH = 12; -+ const int MKIMAGE_SIZE_WIDTH = 12; - } - - ostream& JigdoDesc::ImageInfo::put(ostream& s) const { -- s << "image-info " << setw(SIZE_WIDTH) << size() << " " -+ s << "image-info " << setw(MKIMAGE_SIZE_WIDTH) << size() << " " - << md5() << ' ' << blockLength() << '\n'; - return s; - } - ostream& JigdoDesc::UnmatchedData::put(ostream& s) const { -- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' ' -- << setw(SIZE_WIDTH) << size() << '\n'; -+ s << "in-template " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' ' -+ << setw(MKIMAGE_SIZE_WIDTH) << size() << '\n'; - return s; - } - ostream& JigdoDesc::MatchedFile::put(ostream& s) const { -- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' ' -- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; -+ s << "need-file " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' ' -+ << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; - return s; - } - ostream& JigdoDesc::WrittenFile::put(ostream& s) const { -- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' ' -- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; -+ s << "have-file " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' ' -+ << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; - return s; - } - diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index e993b085aec3d..c00b2aecd740c 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.12.18"; + version = "2.13.11"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; sha256 = { - x86_64-linux = "1fwcqgqni7d9x0prdy3p8ccc5lzgn57rhph4498vs1q40kyq8823"; - x86_64-darwin = "sha256-atd7nkefLvilTq39nTLbXQhm1zzBCHOLL7MRJwlTSMk="; - aarch64-darwin = "sha256-xiWXD+ULSVJ80uruYz0uRFkDRT1QOUd6FSWDKK9yLMc="; + x86_64-linux = "sha256-YkNtvgPAYD7Rw72QoMHqRN24K1RB1GR8W9ka8wCUA8w="; + x86_64-darwin = "sha256-/T8OkTIIQ6ApnL0y5+xRdkQlByzXSwrpw5wXqbhoSoE="; + aarch64-darwin = "sha256-OM+Le2c1esvE8+QwAMpXc03yLUwxibKRRc37WaTGnTs="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 3eff3c3d79f32..d8a6ff79ad4cd 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18822"; + version = "18907"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-pzB12lkcWGJ7sVdcfJZC2MnUowfWdElxny0pSQ5vjlw="; + hash = "sha256-EASSuZn18oruUmPFNZ1Bwv0krTJa0tw4ddTJzkGEjW8="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-MFiWbEU8C6Jvq9wkIKANQeqJh2/yC3y40ANnGEl4IF0="; + hash = "sha256-tEJKBst+n669JENURd9ipFzV7yS/JZWEYkflq8d4g2Q="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-/zdOaiyuvSwdVZcnw0ghDj2I+YKpFLc12fjZUMtRtVg="; + sha256 = "sha256-RFZGRTDdWP/goH/Ev16nhq1SjxYkfFr3djwSrotK7Fo="; }; }; in diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index 972c4b94ada74..23da5323e21f2 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.15.93226"; + version = "0.15.98319"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-RMN/OQHnHCx/xbi/J9LiK6m0TkPvd34GtmR6lr66pKs="; + sha256 = "sha256-0gc3uXBByBR2shKhtUElEiz2saCwmH9vxWFf/WZm6hw="; stripRoot = false; }; diff --git a/pkgs/applications/misc/kaufkauflist/default.nix b/pkgs/applications/misc/kaufkauflist/default.nix index 8950a3017c189..d214db2c5e785 100644 --- a/pkgs/applications/misc/kaufkauflist/default.nix +++ b/pkgs/applications/misc/kaufkauflist/default.nix @@ -21,14 +21,14 @@ let }; in buildNpmPackage rec { pname = "kaufkauflist"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "annaaurora"; repo = "kaufkauflist"; rev = "v${version}"; - hash = "sha256-W/FlHLZYYG/s9NdAqm0OJHlpTZtEG4iaegc4iOnAwWk="; + hash = "sha256-gIwJtfausORMfmZONhSOZ1DRW5CSH+cLDCNy3j+u6d0="; }; npmDepsHash = "sha256-d1mvC72ugmKLNStoemUr8ISCUYjyo9EDWdWUCD1FMiM="; diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix index e90299baa567a..9d70e59202e8a 100644 --- a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix +++ b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { longDescription = '' Requires having: * Elgato's Keylight paired to local wifi network. - * Service avahi with nssmdns enabled. + * Service avahi with nssmdns4 enabled. ''; license = licenses.mit; homepage = "https://github.com/mschneider82/keylight-control"; diff --git a/pkgs/applications/misc/kickoff/default.nix b/pkgs/applications/misc/kickoff/default.nix index 89e0356309eac..21018f509b1cb 100644 --- a/pkgs/applications/misc/kickoff/default.nix +++ b/pkgs/applications/misc/kickoff/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "kickoff"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "j0ru"; repo = pname; rev = "v${version}"; - hash = "sha256-9QupKpB3T/6gdGSeLjRknjPdgOzbfzEeJreIamWwpSw="; + hash = "sha256-WUDbb/GLABhqE93O6bm19Y+r0kSMEJrvduw68Igub44="; }; - cargoHash = "sha256-a7FZpMtgTdqpLV/OfgN4W4GpTJlkfEtPO7F//FmVA/s="; + cargoHash = "sha256-nhUC9PSKAbNEK5e4WRx3dgYI0rJP5XSWcW6M5E0Ihv4="; libPath = lib.makeLibraryPath [ wayland diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 0901e82f3d0bf..a119dc6633f20 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -43,6 +43,9 @@ mkDerivation rec { postBuild = '' mkdir $out/bin mv $out/lib/klayout $out/bin/ + + install -Dm444 etc/klayout.desktop -t $out/share/applications + install -Dm444 etc/logo.png $out/share/icons/hicolor/256x256/apps/klayout.png ''; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-parentheses" ]; diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix index 7c1f52f81eec0..c210c257cc537 100644 --- a/pkgs/applications/misc/kondo/default.nix +++ b/pkgs/applications/misc/kondo/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kondo"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "tbillington"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m00zRNnryty96+pmZ2/ZFk61vy7b0yiWpomWzAHUAMk="; + hash = "sha256-OqOmOujnyLTqwzNvLWudQi+xa5v37JTtyUXaItnpnfs="; }; - cargoHash = "sha256-hG4bvcGYNwdNX9Wsdw30i3a3Ttxud+quNZpolgVKXQE="; + cargoHash = "sha256-WF4GHj/5VYrTUh1E3t29zbpSLjJ6g7RWVpLYqg9msZg="; meta = with lib; { description = "Save disk space by cleaning unneeded files from software projects"; diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix index 4ea55b39c5315..0784ff3ddc941 100644 --- a/pkgs/applications/misc/leetcode-cli/default.nix +++ b/pkgs/applications/misc/leetcode-cli/default.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec { pname = "leetcode-cli"; - version = "0.4.2"; + version = "0.4.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Yr8Jsy8863O6saaFRAxssni+PtK7XYe+Iifgxu8Rx6Q="; + sha256 = "sha256-y5zh93WPWSMDXqYangqrxav+sC0b0zpFIp6ZIew6KMo="; }; - cargoHash = "sha256-rab/oLr27UOlnwUUB1RXC/egLoYyzmVtzN1L+AGed8o="; + cargoHash = "sha256-VktDiLsU+GOsa6ba9JJZGEPTavSKp+aSZm2dfhPEqMs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 03c1702b20736..95c98d9665a62 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { install -d $out/bin install build/llpp $out/bin install misc/llpp.inotify $out/bin/llpp.inotify + install -Dm444 misc/llpp.desktop -t $out/share/applications '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/llpp \ --prefix PATH ":" "${xclip}/bin" diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index a40064bb5ff80..9c9e83655419c 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.20"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-iT0Gc/ePx1tUNTPoE2Ol+dHUmbS4CkneZbyraRBx5Ak="; + hash = "sha256-jDIfOHGki4InGuLvsnxdd2/FMPbT3VyuHtPxA4r3s5c="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/lttoolbox/default.nix b/pkgs/applications/misc/lttoolbox/default.nix new file mode 100644 index 0000000000000..25dbeba7d953b --- /dev/null +++ b/pkgs/applications/misc/lttoolbox/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoconf +, automake +, pkg-config +, utf8cpp +, libtool +, libxml2 +, icu +, python3 +}: + +stdenv.mkDerivation rec { + pname = "lttoolbox"; + version = "3.7.1"; + + src = fetchFromGitHub { + owner = "apertium"; + repo = "lttoolbox"; + rev = "refs/tags/v${version}"; + hash = "sha256-3lHXKtwQSrMGQEGOGr27e3kB2qKkTFZcEzeAnIm89Rg="; + }; + + patches = [ + # can be removed once the version goes past this commit + # https://github.com/apertium/lttoolbox/commit/e682fe18a96d5a865cfbd3e5661dbc7b3ace1821 + (fetchpatch { + url = "https://github.com/apertium/lttoolbox/commit/e682fe18a96d5a865cfbd3e5661dbc7b3ace1821.patch"; + hash = "sha256-VeP8Mv2KYxX+eVjIRw/jHbURaWN665+fiFaoT3VxAno="; + }) + ]; + + nativeBuildInputs = [ + autoconf + automake + pkg-config + utf8cpp + libtool + ]; + buildInputs = [ + libxml2 + icu + ]; + buildFlags = [ + "CPPFLAGS=-I${utf8cpp}/include/utf8cpp" + ]; + configurePhase = '' + ./autogen.sh --prefix $out + ''; + doCheck = true; + checkPhase = '' + ${python3}/bin/python3 tests/run_tests.py + ''; + + meta = with lib; { + description = "Finite state compiler, processor and helper tools used by apertium"; + homepage = "https://github.com/apertium/lttoolbox"; + maintainers = with maintainers; [ onthestairs ]; + changelog = "https://github.com/apertium/lttoolbox/releases/tag/v${version}"; + license = licenses.gpl2; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/applications/misc/mainsail/default.nix index 20315e7acc36a..f372e0a5b0b19 100644 --- a/pkgs/applications/misc/mainsail/default.nix +++ b/pkgs/applications/misc/mainsail/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "mainsail"; - version = "2.8.0"; + version = "2.9.0"; src = fetchzip { url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; - hash = "sha256-YNI4WkWLnB1w8I0ETflDsWNkB6QGO5QrASajKpcmGcU="; + hash = "sha256-7GnPdnBoK0lErUgnG3dw644ASb0/1pwGqqvxfn/81T0="; stripRoot = false; }; diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 2745dca8a02cc..bc85e674c575e 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "mediaelch"; - version = "2.10.4"; + version = "2.10.6"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - hash = "sha256-gNpnmyUKDXf40+1JmJzNyEPIv/DO8b3CdJAphheEvTU="; + hash = "sha256-qc7HaCMAmALY9MoIKmaCWF0cnwBBFDAXwqiBzwzu2bU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index d2e8c7aa59e98..e4b734b89aac7 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "mediainfo-gui"; - version = "23.10"; + version = "23.11"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-t0OuJSHZ2Oi5pYUNfCop3jC6d321JzjQ37oXzARnduc="; + hash = "sha256-gByxsNG//MEibeymISoe41Mi6LsSYwozu7B6kqioycM="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 094f8c17903d7..b6a5166bd213d 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "23.10"; + version = "23.11"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-t0OuJSHZ2Oi5pYUNfCop3jC6d321JzjQ37oXzARnduc="; + hash = "sha256-gByxsNG//MEibeymISoe41Mi6LsSYwozu7B6kqioycM="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/misc/mission-center/Cargo.lock b/pkgs/applications/misc/mission-center/Cargo.lock index 7481dab903a98..93df955ddf1d4 100644 --- a/pkgs/applications/misc/mission-center/Cargo.lock +++ b/pkgs/applications/misc/mission-center/Cargo.lock @@ -16,35 +16,36 @@ checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if 1.0.0", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[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 = "arrayvec" @@ -71,24 +72,24 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -104,9 +105,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block" @@ -125,24 +126,25 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", "async-lock", "async-task", - "atomic-waker", "fastrand", + "futures-io", "futures-lite", - "log", + "piper", + "tracing", ] [[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 = "byte-slice-cast" @@ -152,23 +154,23 @@ checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" [[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" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cairo-rs" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" +checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "cairo-sys-rs", "glib", "libc", @@ -178,9 +180,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ "glib-sys", "libc", @@ -189,15 +191,18 @@ 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-expr" -version = "0.15.3" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -223,32 +228,30 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils 0.8.16", ] [[package]] name = "const-random" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" dependencies = [ "const-random-macro", - "proc-macro-hack", ] [[package]] name = "const-random-macro" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ "getrandom", "once_cell", - "proc-macro-hack", "tiny-keccak", ] @@ -260,9 +263,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -287,16 +290,6 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.16", -] - -[[package]] name = "crossbeam-deque" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -357,6 +350,17 @@ dependencies = [ ] [[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] name = "deflate" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -378,30 +382,30 @@ dependencies = [ [[package]] name = "dlv-list" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" dependencies = [ "const-random", ] [[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 = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno-sys" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0007216af1525058024bc6dc15bbd2ffe8af877f0fbf754fbdb78c59d634e8" +checksum = "a8f7083207e75d4435df450dc6413612d97fe5a441477aba02484f9f7f77057e" dependencies = [ "cc", "libc", @@ -415,9 +419,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fallible-streaming-iterator" @@ -427,12 +431,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[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 = "field-offset" @@ -441,29 +442,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ "memoffset", - "rustc_version 0.4.0", + "rustc_version", ] [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -472,9 +473,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -482,37 +483,32 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", "futures-core", - "futures-io", - "memchr", - "parking", "pin-project-lite", - "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-core", "futures-macro", @@ -533,9 +529,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" +checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -559,9 +555,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" +checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -601,9 +597,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if 1.0.0", "libc", @@ -632,9 +628,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.18.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" +checksum = "47d809baf02bdf1b5ef4ad3bf60dd9d4977149db4612b7bbb58e56aef168193b" dependencies = [ "futures-channel", "futures-core", @@ -683,12 +679,22 @@ dependencies = [ ] [[package]] +name = "gl_loader" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32d96dd5f881490e537041d5532320812ba096097f07fccb4626578da0b99d3" +dependencies = [ + "cc", + "libc", +] + +[[package]] name = "glib" -version = "0.18.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" +checksum = "58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "futures-channel", "futures-core", "futures-executor", @@ -707,16 +713,16 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" +checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" dependencies = [ "heck", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -765,9 +771,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" +checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" dependencies = [ "cairo-rs", "gdk4", @@ -780,9 +786,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" +checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -796,9 +802,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" +checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" dependencies = [ "cairo-rs", "field-offset", @@ -822,7 +828,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -831,9 +837,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" +checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -867,27 +873,21 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "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", + "hashbrown 0.14.2", ] [[package]] @@ -897,12 +897,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] name = "image" version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -919,12 +913,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -952,7 +946,7 @@ dependencies = [ "intmap", "libc", "once_cell", - "rustc_version 0.4.0", + "rustc_version", "spinning", "thiserror", "to_method", @@ -967,15 +961,15 @@ checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -994,9 +988,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libadwaita" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" +checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" dependencies = [ "gdk-pixbuf", "gdk4", @@ -1010,9 +1004,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" +checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" dependencies = [ "gdk4-sys", "gio-sys", @@ -1026,15 +1020,24 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "pkg-config", @@ -1066,9 +1069,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1076,9 +1079,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 = "malloc_buf" @@ -1097,9 +1100,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -1111,12 +1114,6 @@ dependencies = [ ] [[package]] -name = "minidl" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87d3d8666e5ed22230c0096edcccf7097905b1e2975869e1b9fe5df40d26d801" - -[[package]] name = "miniz_oxide" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1127,20 +1124,20 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.3.3" +version = "0.4.3" dependencies = [ "arrayvec 0.7.4", + "dbus", "errno-sys", "gettext-rs", "gl", + "gl_loader", "gtk4", "interprocess", "lazy_static", "libadwaita", "libc", "libudev-sys", - "minidl", - "num_cpus", "pathfinder_canvas", "pathfinder_color", "pathfinder_content", @@ -1164,14 +1161,13 @@ 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 1.0.0", "libc", - "static_assertions", ] [[package]] @@ -1217,24 +1213,14 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[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 = "objc" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1271,19 +1257,19 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "ordered-multimap" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" dependencies = [ "dlv-list", - "hashbrown 0.13.2", + "hashbrown 0.14.2", ] [[package]] name = "pango" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" dependencies = [ "gio", "glib", @@ -1305,15 +1291,9 @@ dependencies = [ ] [[package]] -name = "parking" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - -[[package]] name = "pathfinder_canvas" version = "0.5.0" -source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" +source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" dependencies = [ "pathfinder_color", "pathfinder_content", @@ -1324,7 +1304,7 @@ dependencies = [ [[package]] name = "pathfinder_color" version = "0.5.0" -source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" +source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" dependencies = [ "pathfinder_simd", ] @@ -1332,7 +1312,7 @@ dependencies = [ [[package]] name = "pathfinder_content" version = "0.5.0" -source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" +source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" dependencies = [ "arrayvec 0.5.2", "bitflags 1.3.2", @@ -1347,7 +1327,7 @@ dependencies = [ [[package]] name = "pathfinder_geometry" version = "0.5.1" -source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" +source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" dependencies = [ "log", "pathfinder_simd", @@ -1356,7 +1336,7 @@ dependencies = [ [[package]] name = "pathfinder_gl" version = "0.5.0" -source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" +source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" dependencies = [ "gl", "half", @@ -1370,7 +1350,7 @@ dependencies = [ [[package]] name = "pathfinder_gpu" version = "0.5.0" -source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" +source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" dependencies = [ "bitflags 1.3.2", "fxhash", @@ -1387,12 +1367,12 @@ dependencies = [ [[package]] name = "pathfinder_renderer" version = "0.5.0" -source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" +source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" dependencies = [ "bitflags 1.3.2", "byte-slice-cast", "byteorder", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "fxhash", "half", "hashbrown 0.7.2", @@ -1415,20 +1395,20 @@ dependencies = [ [[package]] name = "pathfinder_resources" version = "0.5.0" -source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" +source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" [[package]] name = "pathfinder_simd" -version = "0.5.1" -source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" +version = "0.5.2" +source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" dependencies = [ - "rustc_version 0.3.3", + "rustc_version", ] [[package]] name = "pathfinder_ui" version = "0.5.0" -source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" +source = "git+https://github.com/kicsyromy/pathfinder?rev=ec56924f660e6faa83c81c6b62b3c69b9a9fa00e#ec56924f660e6faa83c81c6b62b3c69b9a9fa00e" dependencies = [ "hashbrown 0.7.2", "pathfinder_color", @@ -1442,20 +1422,10 @@ dependencies = [ ] [[package]] -name = "pest" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73935e4d55e2abf7f130186537b19e7a4abc886a0252380b59248af473a3fc9" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[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" @@ -1464,6 +1434,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1494,7 +1475,16 @@ 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-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", ] [[package]] @@ -1522,25 +1512,19 @@ 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.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" 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", ] @@ -1581,14 +1565,14 @@ version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", ] [[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", @@ -1596,21 +1580,19 @@ 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 0.5.8", "crossbeam-deque", "crossbeam-utils 0.8.16", - "num_cpus", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -1620,9 +1602,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -1631,17 +1613,17 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rusqlite" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -1651,9 +1633,9 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" dependencies = [ "cfg-if 1.0.0", "ordered-multimap", @@ -1661,83 +1643,56 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.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.17", + "semver", ] [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "semver" -version = "0.11.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.167" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.167" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -1746,18 +1701,18 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -1779,18 +1734,18 @@ 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", ] [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "spinning" @@ -1802,12 +1757,6 @@ dependencies = [ ] [[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1820,9 +1769,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -1831,9 +1780,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.4" +version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751e810399bba86e9326f5762b7f32ac5a085542df78da6a78d94e07d14d7c11" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -1845,9 +1794,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.1" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ "cfg-expr", "heck", @@ -1858,9 +1807,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.8" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "temp-dir" @@ -1876,22 +1825,22 @@ checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -1911,30 +1860,52 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[package]] name = "toml" -version = "0.7.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.21.0", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.12" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap", "serde", @@ -1944,22 +1915,32 @@ dependencies = [ ] [[package]] -name = "typenum" -version = "1.16.0" +name = "tracing" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-core", +] [[package]] -name = "ucd-trie" -version = "0.1.6" +name = "tracing-core" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "vcpkg" @@ -1986,12 +1967,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1999,9 +1974,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2009,24 +1984,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2034,28 +2009,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -2137,15 +2112,35 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "winnow" -version = "0.4.9" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] [[package]] name = "xml-rs" -version = "0.8.15" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "zerocopy" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix index acbf4c053c4a1..cc8cae4811294 100644 --- a/pkgs/applications/misc/mission-center/default.nix +++ b/pkgs/applications/misc/mission-center/default.nix @@ -16,8 +16,8 @@ , blueprint-compiler , cairo , cmake +, dbus , desktop-file-utils -, dmidecode , gdk-pixbuf , gettext , glib @@ -31,25 +31,27 @@ , sqlite , udev , wayland +, dmidecode +, vulkan-loader }: let nvtop = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; - rev = "be47f8c560487efc6e6a419d59c69bfbdb819324"; - hash = "sha256-MdaZYLxCuVX4LvbwBYNfHHoJWqZAy4J8NBK7Guh2whc="; + rev = "45a1796375cd617d16167869bb88e5e69c809468"; + hash = "sha256-1P9pWXhgTHogO0DztxOsFKNwvTRRfDL3nzGmMANMC9w="; }; in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.3.3"; + version = "0.4.3"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-xLyCLKUk21MvswtPUKm41Hr34vTzCMVQNTaAkuhSGLc="; + hash = "sha256-Yc3oiiD0ernuewq32hk3pDn1vQJNZFgMPPb4lArKP9w="; }; cargoDeps = symlinkJoin { @@ -58,7 +60,7 @@ stdenv.mkDerivation rec { (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "pathfinder_canvas-0.5.0" = "sha256-k2Sj69hWA0UzRfv91aG1TAygVIuOX3gmipcDbuZxxc8="; + "pathfinder_canvas-0.5.0" = "sha256-qEp16TVggPtvFvDuUyWsS6rH6MeO6FW0K6BnACghaCg="; }; }) (rustPlatform.importCargoLock { @@ -86,8 +88,8 @@ stdenv.mkDerivation rec { blueprint-compiler cairo cmake + dbus desktop-file-utils - dmidecode gdk-pixbuf gettext glib @@ -104,14 +106,23 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace src/main.rs \ + substituteInPlace src/sys_info_v2/gatherer.rs \ + --replace '"missioncenter-gatherer"' '"${placeholder "out"}/bin/missioncenter-gatherer"' + + substituteInPlace src/sys_info_v2/mem_info.rs \ + --replace '"dmidecode"' '"${dmidecode}/bin/dmidecode"' + + substituteInPlace $cargoDepsCopy/gl_loader-*/src/glad.c \ --replace "libGL.so.1" "${libGL}/lib/libGL.so.1" + substituteInPlace $cargoDepsCopy/ash-*/src/entry.rs \ + --replace '"libvulkan.so.1"' '"${vulkan-loader}/lib/libvulkan.so.1"' + SRC_GATHERER=$NIX_BUILD_TOP/source/src/sys_info_v2/gatherer SRC_GATHERER_NVTOP=$SRC_GATHERER/3rdparty/nvtop substituteInPlace $SRC_GATHERER_NVTOP/nvtop.json \ - --replace "nvtop-be47f8c560487efc6e6a419d59c69bfbdb819324" "nvtop-src" + --replace "nvtop-45a1796375cd617d16167869bb88e5e69c809468" "nvtop-src" GATHERER_BUILD_DEST=$NIX_BUILD_TOP/source/build/src/sys_info_v2/gatherer/src/debug/build/native mkdir -p $GATHERER_BUILD_DEST @@ -128,10 +139,6 @@ stdenv.mkDerivation rec { patchShebangs data/hwdb/generate_hwdb.py ''; - postInstall = '' - wrapProgram $out/bin/missioncenter --prefix PATH : $out/bin:${dmidecode}/bin - ''; - meta = with lib; { description = "Monitor your CPU, Memory, Disk, Network and GPU usage"; homepage = "https://gitlab.com/mission-center-devs/mission-center"; diff --git a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock index 7a714c49ccc63..99951e03a3374 100644 --- a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[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 = "arrayvec" @@ -21,48 +21,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] -name = "async-channel" -version = "1.9.0" +name = "ash" +version = "0.37.3+1.3.251" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", + "libloading", ] [[package]] -name = "async-lock" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-task" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "atomic-waker" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bitflags" @@ -72,9 +43,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block-buffer" @@ -86,27 +57,6 @@ dependencies = [ ] [[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 = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] name = "bytemuck" version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -123,29 +73,29 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn", ] [[package]] name = "cargo-util" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd54c8b94a0c851d687924460637361c355afafa72d973fe8644499fbdee8fae" +checksum = "77042b5b585f701f1cfb4b6b12ebc02b9b0cefbc8dcce235906b6bf376d4245d" dependencies = [ "anyhow", "core-foundation", "filetime", "hex", "jobserver", - "libc 0.2.147", - "log", + "libc 0.2.150", "miow", "same-file", "sha2", "shell-escape", "tempfile", + "tracing", "walkdir", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -154,7 +104,7 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "libc 0.2.147", + "libc 0.2.150", ] [[package]] @@ -164,33 +114,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "concurrent-queue" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -dependencies = [ - "crossbeam-utils", -] - -[[package]] name = "const-random" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" dependencies = [ "const-random-macro", - "proc-macro-hack", ] [[package]] name = "const-random-macro" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ "getrandom", "once_cell", - "proc-macro-hack", "tiny-keccak", ] @@ -201,7 +140,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", - "libc 0.2.147", + "libc 0.2.150", ] [[package]] @@ -212,11 +151,11 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ - "libc 0.2.147", + "libc 0.2.150", ] [[package]] @@ -229,15 +168,6 @@ dependencies = [ ] [[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] name = "crunchy" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -254,6 +184,26 @@ dependencies = [ ] [[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc 0.2.150", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "dbus-crossroads" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a4c83437187544ba5142427746835061b330446ca8902eabd70e4afb8f76de0" +dependencies = [ + "dbus", +] + +[[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -265,34 +215,34 @@ dependencies = [ [[package]] name = "dlv-list" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" dependencies = [ "const-random", ] [[package]] name = "drm" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf9159ef4bcecd0c5e4cbeb573b8d0037493403d542780dba5d840bbf9df56f" +checksum = "e58eefd79f5173683872c0c82d0f05c2dc3c583d631259f60bb7a323756b7ff2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "bytemuck", "drm-ffi", "drm-fourcc", - "nix", + "rustix", ] [[package]] name = "drm-ffi" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1352481b7b90e27a8a1bf8ef6b33cf18b98dba7c410e75c24bb3eef2f0d8d525" +checksum = "220dd8c12ebf2b0cbaffa19e00de02f5f090d363fb900f16ea012c077eea1174" dependencies = [ "drm-sys", - "nix", + "rustix", ] [[package]] @@ -303,11 +253,12 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" [[package]] name = "drm-sys" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1369f1679d6b706d234c4c1e0613c415c2c74b598a09ad28080ba2474b72e42d" +checksum = "5115283ec60c99da8a9e5dc3c55f27680211e974c948cb6f3b51f0373190503b" dependencies = [ - "libc 0.2.147", + "libc 0.2.150", + "linux-raw-sys 0.6.1", ] [[package]] @@ -317,50 +268,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a373bc9844200b1ff15bd1b245931d1c20d09d06e4ec09f361171f29a4b0752d" dependencies = [ "khronos", - "libc 0.2.147", + "libc 0.2.150", ] [[package]] name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc 0.2.147", - "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 0.2.147", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "fastrand" -version = "1.9.0" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" dependencies = [ - "instant", + "libc 0.2.150", + "windows-sys", ] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" @@ -369,16 +294,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", - "libc 0.2.147", - "redox_syscall", - "windows-sys 0.48.0", + "libc 0.2.150", + "redox_syscall 0.3.5", + "windows-sys", ] [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -394,82 +319,50 @@ dependencies = [ ] [[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-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] name = "gatherer" -version = "0.3.3" +version = "0.4.3" dependencies = [ - "anyhow", "arrayvec", + "ash", "cargo-util", "cc", + "dbus", + "dbus-crossroads", "drm", "egl", "flate2", "gbm", - "interprocess", "lazy_static", - "libc 0.2.147", - "minidl", - "num_cpus", + "libc 0.2.150", "pkg-config", - "raw-cpuid", "rust-ini", - "rustbus", "serde", "serde_json", "sha2", - "shared_memory_extended", "tar", - "thiserror", "ureq", ] [[package]] name = "gbm" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ec389cda876966cf824111bf6e533fb934c711d473498279964a990853b3c6" +checksum = "65dffaf38d96aa22cb748ccd9b1ffe624931e899f54c0225815ef7ac757a409f" dependencies = [ "bitflags 1.3.2", "drm", "drm-fourcc", "gbm-sys", - "libc 0.2.147", + "libc 0.2.150", ] [[package]] name = "gbm-sys" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63eba9b9b7a231514482deb08759301c9f9f049ac6869403f381834ebfeaf67" +checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58" dependencies = [ - "libc 0.2.147", + "libc 0.2.150", ] [[package]] @@ -484,26 +377,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", - "libc 0.2.147", + "libc 0.2.150", "wasi", ] [[package]] name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" - -[[package]] -name = "hermit-abi" -version = "0.3.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hex" @@ -522,41 +409,6 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "interprocess" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" -dependencies = [ - "blocking", - "cfg-if", - "futures-core", - "futures-io", - "intmap", - "libc 0.2.147", - "once_cell", - "rustc_version", - "spinning", - "thiserror", - "to_method", - "winapi", -] - -[[package]] -name = "intmap" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" - -[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -564,20 +416,11 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc 0.2.147", -] - -[[package]] -name = "js-sys" -version = "0.3.64" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ - "wasm-bindgen", + "libc 0.2.150", ] [[package]] @@ -603,52 +446,46 @@ checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" [[package]] name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "linux-raw-sys" -version = "0.4.7" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] -name = "lock_api" -version = "0.4.10" +name = "libdbus-sys" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" dependencies = [ - "autocfg", - "scopeguard", + "pkg-config", ] [[package]] -name = "log" -version = "0.4.19" +name = "libloading" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] [[package]] -name = "memchr" -version = "2.5.0" +name = "linux-raw-sys" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] -name = "memoffset" -version = "0.7.1" +name = "linux-raw-sys" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] +checksum = "da4a7ec558fa3b65e4c69b6af8df01fb9ad51ac69262335e1505276bc091935d" [[package]] -name = "minidl" -version = "0.1.5" +name = "log" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87d3d8666e5ed22230c0096edcccf7097905b1e2975869e1b9fe5df40d26d801" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "miniz_oxide" @@ -661,35 +498,11 @@ dependencies = [ [[package]] name = "miow" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" -dependencies = [ - "windows-sys 0.42.0", -] - -[[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", - "libc 0.2.147", - "memoffset", - "pin-utils", - "static_assertions", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" dependencies = [ - "hermit-abi", - "libc 0.2.147", + "windows-sys", ] [[package]] @@ -700,21 +513,15 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "ordered-multimap" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" dependencies = [ "dlv-list", "hashbrown", ] [[package]] -name = "parking" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - -[[package]] name = "percent-encoding" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -727,191 +534,101 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[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" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[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", ] [[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc 0.2.147", - "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 = "raw-cpuid" -version = "11.0.1" +name = "redox_syscall" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags 2.4.0", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "ring" -version = "0.16.20" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "libc 0.2.147", - "once_cell", + "getrandom", + "libc 0.2.150", "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys", ] [[package]] name = "rust-ini" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" dependencies = [ "cfg-if", "ordered-multimap", ] [[package]] -name = "rustbus" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208e43f29ba67bb31fc726854383be3c358e48df918a0d2d2a7efb710ea3575b" -dependencies = [ - "nix", - "rustbus_derive", - "thiserror", -] - -[[package]] -name = "rustbus_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dcb6a55a8a297bb62066b114624aac082ac1a330d90a0d5b336645208e29ae2" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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.38.13" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", - "libc 0.2.147", - "linux-raw-sys", - "windows-sys 0.48.0", + "libc 0.2.150", + "linux-raw-sys 0.4.11", + "windows-sys", ] [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ "log", "ring", - "rustls-webpki 0.101.5", + "rustls-webpki", "sct", ] [[package]] name = "rustls-webpki" -version = "0.100.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.5" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", @@ -933,52 +650,40 @@ dependencies = [ ] [[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", ] [[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" - -[[package]] name = "serde" -version = "1.0.179" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5bf42b8d227d4abf38a1ddb08602e229108a517cd4e5bb28f9c7eaafdce5c0" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.179" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "741e124f5485c7e60c03b043f79f320bff3527f4bbf12cf3831750dc46a0ec2c" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn", ] [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -987,9 +692,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -997,19 +702,6 @@ dependencies = [ ] [[package]] -name = "shared_memory_extended" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004d7ece9a3be64f85471d50967710b0a146144225bed5f0abd0514a3bed086f" -dependencies = [ - "cfg-if", - "libc 0.2.147", - "nix", - "rand", - "win-sys", -] - -[[package]] name = "shell-escape" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1017,41 +709,15 @@ checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" [[package]] name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spinning" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b" -dependencies = [ - "lock_api", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "syn" -version = "1.0.109" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "syn" -version = "2.0.27" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -1065,41 +731,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", - "libc 0.2.147", + "libc 0.2.150", "xattr", ] [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall", + "fastrand", + "redox_syscall 0.4.1", "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "thiserror" -version = "1.0.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.27", + "windows-sys", ] [[package]] @@ -1127,16 +773,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "to_method" -version = "1.1.0" +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] [[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 = "unicode-bidi" @@ -1146,9 +817,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" @@ -1161,22 +832,22 @@ dependencies = [ [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[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.3", + "rustls-webpki", "url", "webpki-roots", ] @@ -1199,12 +870,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] name = "walkdir" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1221,86 +886,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.27", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.27", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[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.3", -] - -[[package]] -name = "win-sys" -version = "0.3.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" -dependencies = [ - "windows", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "winapi" @@ -1320,9 +909,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", ] @@ -1334,34 +923,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" -dependencies = [ - "windows_aarch64_msvc 0.34.0", - "windows_i686_gnu 0.34.0", - "windows_i686_msvc 0.34.0", - "windows_x86_64_gnu 0.34.0", - "windows_x86_64_msvc 0.34.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.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1376,125 +937,53 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "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", + "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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" - -[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" - -[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" - -[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" - -[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" - -[[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.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" @@ -1505,5 +994,5 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ - "libc 0.2.147", + "libc 0.2.150", ] diff --git a/pkgs/applications/misc/mobilecoin-wallet/default.nix b/pkgs/applications/misc/mobilecoin-wallet/default.nix index 3d0cbdcefa170..1bde970c1e155 100644 --- a/pkgs/applications/misc/mobilecoin-wallet/default.nix +++ b/pkgs/applications/misc/mobilecoin-wallet/default.nix @@ -2,11 +2,11 @@ let pname = "mobilecoin-wallet"; - version = "1.5.0"; + version = "1.8.0"; name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin-Wallet-${version}.AppImage"; - sha256 = "sha256-zSTtnKvgcDSiicEDuVK2LN2d8WHiGReYI3XLBmm3Fbo="; + url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage"; + hash = "sha256-XGU/xxsMhOBAh+MeMtL2S707yH8HnoO9w5l7zqjO6rs="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; @@ -34,6 +34,7 @@ in appimageTools.wrapType2 { homepage = "https://github.com/mobilecoinofficial/desktop-wallet"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "mobilecoin-wallet"; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index db08bd5c14ce7..e4bf829191e30 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -60,12 +60,12 @@ let in stdenv.mkDerivation rec { - version = "1.23.5"; + version = "1.23.6"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "sha256-blZ5zfqu+cfoniljlSIM4sEz7T3K1RpHhmczbG6uxwY="; + sha256 = "sha256-rBHrhZ3UBEiOUVPNyWUbtDQeW6r007Pyfir8gvmq3Ck="; }; patches = [ ./0001-Use-command-v-in-favor-of-which.patch diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 4049f95b1949d..3ea19ebd0209a 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.22.1"; + version = "2.23.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "sha256-dlK7R9T1AezNr3+5Or8XYAMRlnnXejIs9jXAjwTuvd8="; + sha256 = "sha256-pqBTrHBvsuosyQqCnSiI3+pOe2J6XeIQ8dai+kTVFjc="; }; - cargoHash = "sha256-nastb6dsBGM8zIQ/WCfQy3Y50kH3J1dM/vnkOe/q95A="; + cargoHash = "sha256-dx13p+kEyqhyaF8ejJLWsgW3IpEvS9nlIHhjxOpp4d8="; nativeBuildInputs = [ makeWrapper ]; @@ -33,6 +33,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/denisidoro/navi"; license = licenses.asl20; platforms = platforms.unix; + mainProgram = "navi"; maintainers = with maintainers; [ cust0dian ]; }; } diff --git a/pkgs/applications/misc/nerd-font-patcher/default.nix b/pkgs/applications/misc/nerd-font-patcher/default.nix index 10c42949a3ff1..76bd2a44824e1 100644 --- a/pkgs/applications/misc/nerd-font-patcher/default.nix +++ b/pkgs/applications/misc/nerd-font-patcher/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "nerd-font-patcher"; - version = "3.0.2"; + version = "3.1.1"; src = fetchzip { url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/FontPatcher.zip"; - sha256 = "sha256-ZJpF/Q5lfcW3srb2NbJk+/QEuwaFjdzboa+rl9L7GGE="; + sha256 = "sha256-H2dPUs6HVKJcjxy5xtz9nL3SSPXKQF3w30/0l7A0PeY="; stripRoot = false; }; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 798c15fffde93..a2882e16f93ef 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -12,6 +12,7 @@ , pkg-config , vala , wrapGAppsHook4 +, fetchpatch }: stdenv.mkDerivation rec { @@ -41,6 +42,15 @@ stdenv.mkDerivation rec { libgee ]; + + patches = [ + # Fixes the compilation error with new Vala compiler. Remove in the next version. + (fetchpatch { + url = "https://github.com/musicinmybrain/notejot/commit/c6a7cfcb792de63fb51eb174f9f3d4e02f6a2ce1.patch"; + hash = "sha256-dexPKIpUaAu/p0K2WQpElhPNt86CS+jD0dPL5+CTl4I="; + }) + ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/applications/misc/ns-usbloader/default.nix b/pkgs/applications/misc/ns-usbloader/default.nix index b86ae37363ee7..f50f14d5e2b88 100644 --- a/pkgs/applications/misc/ns-usbloader/default.nix +++ b/pkgs/applications/misc/ns-usbloader/default.nix @@ -4,6 +4,8 @@ , copyDesktopItems , makeDesktopItem , makeWrapper +, wrapGAppsHook +, gvfs , maven , jre }: @@ -40,18 +42,25 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ copyDesktopItems makeWrapper + wrapGAppsHook + gvfs ]; + # Don't wrap binaries twice. + dontWrapGApps = true; + + ### Issues: + # * Set us to only use software rendering with `-Dprism.order=sw`, had a hard time + # getting `prism_es2` happy with NixOS's GL/GLES. + # * Currently, there's also a lot of `Failed to build parent project for org.openjfx:javafx-*` + # at build, but jar runs fine when using `jreWithJavaFX`. + installPhase = '' runHook preInstall mkdir -p $out/share/java install -Dm644 target/ns-usbloader-${version}.jar $out/share/java/ns-usbloader.jar - mkdir -p $out/bin - makeWrapper ${jreWithJavaFX}/bin/java $out/bin/ns-usbloader \ - --append-flags "-jar $out/share/java/ns-usbloader.jar" - mkdir -p $out/lib/udev/rules.d install -Dm644 ${./99-ns-usbloader.rules} $out/lib/udev/rules.d/99-ns-usbloader.rules @@ -64,6 +73,13 @@ maven.buildMavenPackage rec { runHook postInstall ''; + preFixup = '' + mkdir -p $out/bin + makeWrapper ${jreWithJavaFX}/bin/java $out/bin/ns-usbloader \ + --append-flags "-Dprism.order=sw -jar $out/share/java/ns-usbloader.jar" \ + "''${gappsWrapperArgs[@]}" + ''; + desktopItems = [ (makeDesktopItem { type = "Application"; diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 5596fc6010ecc..2f3be342a7a8f 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -18,6 +18,7 @@ , substituteAll , systemd , udev +, gnused }: stdenv.mkDerivation rec { @@ -30,6 +31,13 @@ stdenv.mkDerivation rec { }; patches = [ + # This patch injects a default value for NUT_CONFPATH into the nutshutdown script + # since the way we build the package results in the binaries being hardcoded to check + # $out/etc/ups.conf instead of /etc/nut/ups.conf (where the module places the file). + # We also cannot use `--sysconfdir=/etc/nut` since that results in the install phase + # trying to install directly into /etc/nut which predictably fails + ./nutshutdown-conf-default.patch + (substituteAll { src = ./hardcode-paths.patch; avahi = "${avahi}/lib"; @@ -63,16 +71,23 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/lib/systemd/system-shutdown/nutshutdown \ + --replace /bin/sed "${gnused}/bin/sed" \ --replace /bin/sleep "${coreutils}/bin/sleep" \ --replace /bin/systemctl "${systemd}/bin/systemctl" for file in system/{nut-monitor.service,nut-driver-enumerator.service,nut-server.service,nut-driver@.service} system-shutdown/nutshutdown; do - substituteInPlace $out/lib/systemd/$file \ - --replace "$out/etc/nut.conf" "/etc/nut.conf" + substituteInPlace $out/lib/systemd/$file \ + --replace "$out/etc/nut.conf" "/etc/nut/nut.conf" done + substituteInPlace $out/lib/systemd/system/nut-driver-enumerator.path \ + --replace "$out/etc/ups.conf" "/etc/nut/ups.conf" + # we don't need init.d scripts rm -r $out/share/solaris-init + + # Suspicious/overly broad rule, remove it until we know better + rm $out/etc/udev/rules.d/52-nut-ipmipsu.rules ''; meta = with lib; { diff --git a/pkgs/applications/misc/nut/nutshutdown-conf-default.patch b/pkgs/applications/misc/nut/nutshutdown-conf-default.patch new file mode 100644 index 0000000000000..28e5a286126dd --- /dev/null +++ b/pkgs/applications/misc/nut/nutshutdown-conf-default.patch @@ -0,0 +1,10 @@ +diff --git a/scripts/systemd/nutshutdown.in b/scripts/systemd/nutshutdown.in +index ace2485b3..9dee869bb 100755 +--- a/scripts/systemd/nutshutdown.in ++++ b/scripts/systemd/nutshutdown.in +@@ -1,4 +1,5 @@ + #!/bin/sh ++export NUT_CONFPATH="${NUT_CONFPATH-/etc/nut}" + + # This script requires both nut-server (drivers) + # and nut-client (upsmon) to be present locally diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/applications/misc/nwg-bar/default.nix index 41d32418b0873..7e9aecd387cd1 100644 --- a/pkgs/applications/misc/nwg-bar/default.nix +++ b/pkgs/applications/misc/nwg-bar/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "nwg-bar"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kqLQwqZ2RPSKNdw1yzKUfqSe8hQcJe/6/8UzTT/Gz/8="; + sha256 = "sha256-e64qCthZfGeFIe/g4Bu342d/C46qzJRBdxzzP6rM408="; }; patches = [ ./fix-paths.patch ]; @@ -24,7 +24,7 @@ buildGoModule rec { substituteInPlace tools.go --subst-var out ''; - vendorHash = "sha256-vdDlPsjfHl7w1ufosLYquHAKOvkolNBr04bt+OQBlFE="; + vendorHash = "sha256-YMpq9pgA3KjQMcw7JDwEDbHZ5h3N7ziFVIGvQ+xA3Ds="; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index 18ba079088af7..ade4b4214ff4d 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -46,6 +46,11 @@ python310Packages.buildPythonApplication rec { dontWrapGApps = true; + postInstall = '' + install -Dm444 nwg-displays.svg -t $out/share/icons/hicolor/scalable/apps + install -Dm444 nwg-displays.desktop -t $out/share/applications + ''; + preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}"); ''; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 43ea198d62c9b..5ef2cbd99f45c 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.16"; + version = "1.5.3"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ 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}"; - hash = if stdenv.isDarwin then "sha256-ydLWr+Snkza9G+R7HbPuUdoZsL25Uj+KDos67Mq/urY=" else "sha256-PBKLGs3MZyarSMiWnjqY7d9bQrKu2uLAvLUufpHLxcw="; + hash = if stdenv.isDarwin then "sha256-AXjzQwZxyRaI8mMU2EsNK0fRcXS7UNNBWPXeJzgomlY=" else "sha256-F7nqWOeBGGSmSVNTpcx3lHRejSjNeM2BBqS9tsasTvg="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index b70e34e73d3b0..3d18c951c671c 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -29,13 +29,13 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2023.11.17-17"; + version = "2023.12.20-4"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-3oGcupO49+ZXyW+ii4T+wov4qweDnLO+VkXSAIh7qJ4="; + hash = "sha256-9yQMBP5Jta6P/FmYL6Ek3MzU1DKtVEwlwYAkNxC5pn4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 04794635cdfbd..c01d141e7894f 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3ypEP5HQYXOyB2euvDDpKjpbCD67oE19wkmzQbyKxiI="; + hash = "sha256-R4vxggZ9bUSPar/QLRc172RGgPXuf9jUwK19kBKpT2w="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index a52729d52c772..602c366c12a4f 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -16,19 +16,22 @@ , libXfixes , libpulseaudio , libva -, ffmpeg +, ffmpeg_5 , libpng , libjpeg8 , curl +, vulkan-loader +, gnome +, zenity ? gnome.zenity }: stdenvNoCC.mkDerivation { pname = "parsec-bin"; - version = "150_90c"; + version = "150_91a"; src = fetchurl { - url = "https://web.archive.org/web/20231028212419/https://builds.parsec.app/package/parsec-linux.deb"; - sha256 = "sha256-rFSdl7BgnuJAj6w5in0/yszO8b5qcr9b+wjF1WkAU70="; + url = "https://web.archive.org/web/20231209190803if_/https://builds.parsec.app/package/parsec-linux.deb"; + sha256 = "sha256-/qugI7k0NYpq7p9l9auD2Pp+SFoFZ9jAZswpreVfgO4="; }; unpackPhase = '' @@ -55,7 +58,7 @@ stdenvNoCC.mkDerivation { alsa-lib libpulseaudio libva - ffmpeg + ffmpeg_5 libpng libjpeg8 curl @@ -64,6 +67,11 @@ stdenvNoCC.mkDerivation { libXi libXrandr libXfixes + vulkan-loader + ]; + + binPath = lib.makeBinPath [ + zenity ]; prepareParsec = '' @@ -80,6 +88,7 @@ stdenvNoCC.mkDerivation { mv usr/* $out wrapProgram $out/bin/parsecd \ + --prefix PATH : "$binPath" \ --prefix LD_LIBRARY_PATH : "$runtimeDependenciesPath" \ --run "$prepareParsec" @@ -108,7 +117,7 @@ stdenvNoCC.mkDerivation { changelog = "https://parsec.app/changelog"; description = "Remote streaming service client"; license = licenses.unfree; - maintainers = with maintainers; [ arcnmx ]; + maintainers = with maintainers; [ arcnmx pabloaul ]; platforms = platforms.linux; mainProgram = "parsecd"; }; diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix index a50b53378e7dc..1275f8f0db56f 100644 --- a/pkgs/applications/misc/pe-bear/default.nix +++ b/pkgs/applications/misc/pe-bear/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pe-bear"; - version = "0.6.5.2"; + version = "0.6.6"; src = fetchFromGitHub { owner = "hasherezade"; repo = "pe-bear"; rev = "v${version}"; - sha256 = "sha256-00OebZZUUwQ1yruTKEUj+bNEKY/CuzdLEbejnnagPnY="; + sha256 = "sha256-WuuhQxjmV/AlmM1z85paUbpIaBht4fgqY8yvtZ0hPKQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 25ff9aed3b743..bd60eb62379df 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.69.0"; + version = "0.77.6"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-YVNcr8oYEOsy0KLOsPdWTZcXYTqyz4RYG9MCEngLn7c="; + hash = "sha256-sTRKk74R60TPuYtAvmc1o0YA934SZx39DrjyGkc0smc="; # 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; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-lU21nRfIi4/eobnHhX/fCWnWtoiQBiWvTUOjBL0I4X4="; + vendorHash = "sha256-0On/Rg8c9g45qbLuwhP/ZIGosu0X1uzXfAoddgTCDkg="; doCheck = false; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 8114f2ecb416c..dc5b2c68c6325 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -10,7 +10,7 @@ , wrapGAppsHook , boost , cereal -, cgal_5 +, cgal , curl , dbus , eigen @@ -35,7 +35,6 @@ , libbgcode , heatshrink , catch2 -, fetchpatch , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , wxGTK-override ? null }: @@ -71,12 +70,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - hash = "sha256-S0z2v6knkQ+xlABB1zedEGtlxA/65X/vxLh304StfbE="; + hash = "sha256-hSHeh3qJroCFnzeoVz6LKtCK8r0ealWSFz9cW4xvSb8="; rev = "version_${finalAttrs.version}"; }; @@ -90,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { binutils boost cereal - cgal_5 + cgal curl dbus eigen diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index 8ac8ae5f4f55e..436c1fc70377a 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -3,27 +3,35 @@ , fetchFromGitHub , libX11 , libXtst -, qmake +, cmake , qtbase , qttools +, qtwayland , openssl , libscrypt , wrapQtAppsHook +, testers +, qMasterPassword +, x11Support ? true +, waylandSupport ? false }: stdenv.mkDerivation rec { pname = "qMasterPassword"; - version = "1.2.4"; + version = "2.0"; src = fetchFromGitHub { owner = "bkueng"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VQ1ZkXaZ5sUbtWa/GreTr5uXvnZ2Go6owJ2ZBK25zns="; + hash = "sha256-4qxPjrf6r2S0l/hcs6bqfJm56jdDz+0a0xEkqGBYGBs="; }; - buildInputs = [ qtbase libX11 libXtst openssl libscrypt ]; - nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; + buildInputs = [ qtbase qtwayland openssl libscrypt ] ++ lib.optionals x11Support [ libX11 libXtst ]; + nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; + cmakeFlags = lib.optionals waylandSupport [ + "-DDISABLE_FILL_FORM_SHORTCUTS=1" + ]; # Upstream install is mostly defunct. It hardcodes target.path and doesn't # install anything but the binary. @@ -34,17 +42,22 @@ stdenv.mkDerivation rec { '' else '' mkdir -p $out/bin mkdir -p $out/share/{applications,doc/qMasterPassword,icons/qmasterpassword,icons/hicolor/512x512/apps,qMasterPassword/translations} - mv qMasterPassword $out/bin - mv data/qMasterPassword.desktop $out/share/applications - mv LICENSE README.md $out/share/doc/qMasterPassword - mv data/icons/app_icon.png $out/share/icons/hicolor/512x512/apps/qmasterpassword.png - mv data/icons/* $out/share/icons/qmasterpassword - lrelease ./data/translations/translation_de.ts - lrelease ./data/translations/translation_pl.ts - mv ./data/translations/translation_de.qm $out/share/qMasterPassword/translations/translation_de.qm - mv ./data/translations/translation_pl.qm $out/share/qMasterPassword/translations/translation_pl.qm + cp qMasterPassword $out/bin + cp $src/data/qMasterPassword.desktop $out/share/applications + cp $src/LICENSE $src/README.md $out/share/doc/qMasterPassword + cp $src/data/icons/app_icon.png $out/share/icons/hicolor/512x512/apps/qmasterpassword.png + cp $src/data/icons/* $out/share/icons/qmasterpassword + cp ./translations/translation_de.qm $out/share/qMasterPassword/translations/translation_de.qm + cp ./translations/translation_pl.qm $out/share/qMasterPassword/translations/translation_pl.qm ''; + passthru = { + tests.version = testers.testVersion { + package = qMasterPassword; + version = "v${version}"; + }; + }; + meta = with lib; { description = "Stateless Master Password Manager"; longDescription = '' diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index b09e0fe047247..585a18bb34329 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { changelog = "https://github.com/juruen/rmapi/blob/v${version}/CHANGELOG.md"; license = licenses.agpl3Only; maintainers = [ maintainers.nickhu ]; + mainProgram = "rmapi"; }; } diff --git a/pkgs/applications/misc/revanced-cli/default.nix b/pkgs/applications/misc/revanced-cli/default.nix new file mode 100644 index 0000000000000..c63e5e2ec6003 --- /dev/null +++ b/pkgs/applications/misc/revanced-cli/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + pname = "revanced-cli"; + version = "4.3.0"; + + src = fetchurl { + url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar"; + hash = "sha256-D/4zR5PvcZqv8yyNIzbnYnGoHDrPQAeHyrN/G4QsTB0="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$prefix/bin" + + makeWrapper ${jre}/bin/java $out/bin/revanced-cli \ + --add-flags "-jar $src" \ + --prefix PATH : "$PATH" + + runHook postInstall + ''; + + meta = with lib; { + description = "Command line application as an alternative to the ReVanced Manager"; + homepage = "https://github.com/revanced/revanced-cli"; + license = licenses.gpl3Only; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + maintainers = with maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/applications/misc/rtfm/default.nix b/pkgs/applications/misc/rtfm/default.nix index 99f9a465e13de..9eb97113c37b5 100644 --- a/pkgs/applications/misc/rtfm/default.nix +++ b/pkgs/applications/misc/rtfm/default.nix @@ -18,14 +18,14 @@ let in crystal.buildCrystalPackage rec { pname = "rtfm"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitHub { owner = "hugopl"; repo = "rtfm"; rev = "v${version}"; name = "rtfm"; - hash = "sha256-SmQq3hG94oV346dHtqTHC0xE4cWB3rspD3XXu+mSI8Q="; + hash = "sha256-IfI7jYM1bsrCq2NiANv/SWkCjPyT/HYUofJMUYy0Sbk="; }; patches = [ @@ -54,7 +54,7 @@ crystal.buildCrystalPackage rec { wrapGAppsHook4 gobject-introspection gi-crystal - ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ webkitgtk_6_0 diff --git a/pkgs/applications/misc/rtfm/patches/make.patch b/pkgs/applications/misc/rtfm/patches/make.patch index 503faf5245beb..51b95575cd0d6 100644 --- a/pkgs/applications/misc/rtfm/patches/make.patch +++ b/pkgs/applications/misc/rtfm/patches/make.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2023-07-17 17:18:28.000000000 +0300 -+++ b/Makefile 2023-07-19 12:13:44.627168135 +0300 +--- a/Makefile 2023-12-07 23:37:38.984501858 +0300 ++++ b/Makefile 2023-12-07 23:47:52.884456064 +0300 @@ -4,8 +4,7 @@ all: configure .WAIT rtfm docsets @@ -10,16 +10,7 @@ rtfm: shards build --release -s rtfm -@@ -29,13 +28,15 @@ - install -D -m644 data/io.github.hugopl.rtfm.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/io.github.hugopl.rtfm.gschema.xml - # docsets - mkdir -p $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ -- cp -rv data/Crystal.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ -- cp -rv data/Gtk4.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ -+ cp -r data/Crystal.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ -+ cp -r data/Gtk4.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ - # License - install -D -m0644 LICENSE $(DESTDIR)$(PREFIX)/share/licenses/rtfm/LICENSE +@@ -36,6 +35,8 @@ # Changelog install -D -m0644 CHANGELOG.md $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md gzip -9fn $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md @@ -27,4 +18,4 @@ + glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/rtfm \ No newline at end of file + rm -f $(DESTDIR)$(PREFIX)/bin/rtfm diff --git a/pkgs/applications/misc/rtfm/shards.nix b/pkgs/applications/misc/rtfm/shards.nix index f6882397d83f1..0a7ce34cda62e 100644 --- a/pkgs/applications/misc/rtfm/shards.nix +++ b/pkgs/applications/misc/rtfm/shards.nix @@ -11,13 +11,13 @@ }; gio = { url = "https://github.com/hugopl/gio.cr.git"; - rev = "v0.1.0"; - sha256 = "0vj35bi64d4hni18nrl8fmms306a0gl4zlxpf3aq08lh0sbwzhd8"; + rev = "v0.2.1"; + sha256 = "0vl5lpvhhdi9pvyl12smag0i3dwj1jjz1zzilc8ai0wjrnbnwlxs"; }; gtk4 = { url = "https://github.com/hugopl/gtk4.cr.git"; - rev = "v0.15.0"; - sha256 = "100j5k4sfc2dpj3nplzjcaxw1bwy3hsy5cw93asg00kda9h8dbb1"; + rev = "v0.16.0"; + sha256 = "1bnnfy07246vwbjfwhziv2yw1g52pzhhrr25660fp3qcnw8q513w"; }; harfbuzz = { url = "https://github.com/hugopl/harfbuzz.cr.git"; @@ -26,13 +26,13 @@ }; libadwaita = { url = "https://github.com/geopjr/libadwaita.cr.git"; - rev = "23ce21d6400af7563ede0b53deea6d1f77436985"; - sha256 = "09jz6r0yp4qsm47qcknzgkjxavr5j3dkxf2yjbw0jkaz1an58pfw"; + rev = "cffabb56e911d2a90c53c2fd14d6bd08bf5ac446"; + sha256 = "0gcq04vgxg0vff9fcalgzq9phq0y76diihkzhlfn91bdxwkx7rl3"; }; pango = { url = "https://github.com/hugopl/pango.cr.git"; - rev = "v0.2.0"; - sha256 = "0dl3qrhi2ybylmvzx1x5gsznp2pcdkc50waxrljxwnf5avn8ixsf"; + rev = "v0.3.0"; + sha256 = "1dg5bcbq11zww4xh68dq4ivnsz89yqsnxz81ggp4j9c9d6dhx0m4"; }; sqlite3 = { url = "https://github.com/crystal-lang/crystal-sqlite3.git"; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 6c839f65d942e..39bb82aaaef6d 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -25,6 +25,10 @@ buildPythonApplication rec { hash = "sha256-tvsBTf6+zKBzB5aL+LUcEvE4jmVHnnoY0L4xoKMJ0vM="; }; + postPatch = '' + substituteInPlace setup.py --replace "root_dir = sys.prefix" "root_dir = '/'" + ''; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection @@ -49,9 +53,7 @@ buildPythonApplication rec { dontWrapGApps = true; postInstall = '' - mkdir -p $out/share/applications - cp -r safeeyes/platform/icons $out/share/icons/ - cp safeeyes/platform/io.github.slgobinath.SafeEyes.desktop $out/share/applications/io.github.slgobinath.SafeEyes.desktop + mv $out/lib/python*/site-packages/share $out/share ''; preFixup = '' diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 69a71c6563cbb..506ff5f10c8af 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -11,6 +11,7 @@ , libxml2 , libzip , ncurses +, xlsSupport ? false }: stdenv.mkDerivation rec { @@ -35,11 +36,12 @@ stdenv.mkDerivation rec { buildInputs = [ gnuplot - libxls - libxlsxwriter libxml2 libzip ncurses + ] ++ lib.optionals xlsSupport [ + libxls + libxlsxwriter ]; makeFlags = [ "prefix=${placeholder "out"}" ]; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 9ef5acb28fe12..8553f1a1d6528 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -57,6 +57,11 @@ python3Packages.buildPythonApplication rec { doCheck = false; # there are no tests + postInstall = '' + install -Dm444 org.skytemple.SkyTemple.desktop -t $out/share/applications + install -Dm444 installer/skytemple.ico $out/share/icons/hicolor/256x256/apps/org.skytemple.SkyTemple.ico + ''; + meta = with lib; { homepage = "https://github.com/SkyTemple/skytemple"; description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky"; diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/misc/sway-contrib/default.nix index df5ad07b1c5ab..df5ad07b1c5ab 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/misc/sway-contrib/default.nix diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 53eb0fca5ae26..f3c69be653f4e 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -19,6 +19,7 @@ , iconv , cppunit , syncthing +, xdg-utils , webviewSupport ? true , jsSupport ? true , kioPluginSupport ? stdenv.isLinux @@ -33,14 +34,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.4.9"; + version = "1.4.11"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-I9+q9GQ1QMbo7BdVG159iRYbDvRyfXmwBIW5AeJ3sC4="; + sha256 = "sha256-wzIIiVo6EmfQAyaIVsVsT4lfm0ThhGBgETV0036Pgvo="; }; buildInputs = [ @@ -95,6 +96,10 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (!webviewSupport) ["-DWEBVIEW_PROVIDER:STRING=none"] ; + qtWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ xdg-utils ]}" + ]; + meta = with lib; { homepage = "https://github.com/Martchus/syncthingtray"; description = "Tray application and Dolphin/Plasma integration for Syncthing"; diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 21cec72c5f808..737c713fb79c8 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -30,6 +30,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-S4+cS4m69nqDN2h0vwyO35fFFBEa0Rcxx0XDBfSNLp0="; + postInstall = '' + install -Dm444 linux/com.system76.keyboardconfigurator.desktop -t $out/share/applications + cp -r data/icons $out/share + ''; + meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; homepage = "https://github.com/pop-os/keyboard-configurator"; diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix index fe52c50a1f8e0..40882205420a8 100644 --- a/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "1.5.6"; + version = "1.5.10"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; rev = version; - hash = "sha256-3sitrTaIRKmjx+5vWOQXE0/Gu0jJ8VCpOq2cZZVLrbk="; + hash = "sha256-CkqNPG57e76TT/vF9lscS6m2FbXOvOfqiT/9aM2Il9E="; }; - yarnHash = "sha256-mZ8beCF+3mnpgKED0fP96RBbGbKNNXqEJkGSjgrEGBc="; + yarnHash = "sha256-atl2XrY9LmWh2USp6K2W50/khEsnY6OqKBUS26Ln9ZM="; meta = with lib; { homepage = "https://tandoor.dev/"; diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index f5ce961e401ac..cdd143cc766da 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -7,23 +7,15 @@ let python = python3.override { packageOverrides = self: super: { - django = super.django_4; - - django-crispy-forms = super.django-crispy-forms.overridePythonAttrs (_: rec { - version = "1.14.0"; - format = "setuptools"; - + validators = super.validators.overridePythonAttrs (_: rec { + version = "0.20.0"; src = fetchFromGitHub { - owner = "django-crispy-forms"; - repo = "django-crispy-forms"; - rev = "refs/tags/${version}"; - hash = "sha256-NZ2lWxsQHc7Qc4HDoWgjJTZ/bJHmjpBf3q1LVLtzA+8="; + owner = "python-validators"; + repo = "validators"; + rev = version; + hash = "sha256-ZnLyTHlsrXthGnaPzlV2ga/UTm5SSEHLTwC/tobiPak="; }; - }); - - # Tests are incompatible with Django 4 - django-js-reverse = super.django-js-reverse.overridePythonAttrs (_: { - doCheck = false; + propagatedBuildInputs = [ super.decorator super.six ]; }); }; }; @@ -44,8 +36,8 @@ python.pkgs.pythonPackages.buildPythonPackage rec { ./media-root.patch # https://github.com/TandoorRecipes/recipes/pull/2706 (fetchpatch { - url = "https://github.com/TandoorRecipes/recipes/commit/8f66f5c3ca61751a80cc133ff4c59019d6fca406.patch"; - hash = "sha256-oF5YlPg1LEdLvKpxiSqjTmYPbrGquPlRIz6A05031gs="; + url = "https://github.com/TandoorRecipes/recipes/commit/702c1d67d3b2d13cf471bf9daa1d2ef0f1837dec.patch"; + hash = "sha256-6vmtYs6b0d38Ojxxc2I7oxqpkIlyRVlhzURBOTO2VlQ="; }) ]; @@ -63,6 +55,7 @@ python.pkgs.pythonPackages.buildPythonPackage rec { django-cleanup django-cors-headers django-crispy-forms + django-crispy-bootstrap4 django-hcaptcha django-js-reverse django-oauth-toolkit @@ -145,6 +138,11 @@ python.pkgs.pythonPackages.buildPythonPackage rec { pytest-factoryboy ]; + # flaky + disabledTests = [ + "test_search_count" + ]; + passthru = { inherit frontend python; diff --git a/pkgs/applications/misc/tellico/hex.patch b/pkgs/applications/misc/tellico/hex.patch deleted file mode 100644 index 999c502287e99..0000000000000 --- a/pkgs/applications/misc/tellico/hex.patch +++ /dev/null @@ -1,15 +0,0 @@ -index 7ea81c7..0c19767 100644 ---- a/src/utils/iso5426converter.cpp -+++ b/src/utils/iso5426converter.cpp -@@ -1211,7 +1211,11 @@ QChar Iso5426Converter::getCombiningChar(uint c) { - return 0x1EF1; // SMALL LETTER U WITH HORN AND DOT BELOW - - default: -+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) -+ myDebug() << "no match for" << hex << c; -+#else - myDebug() << "no match for" << Qt::hex << c; -+#endif - return QChar(); - } - } diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 5d704acb23513..faf32c96a19e3 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation rec { mv usr $out mv opt $out + # binary is not used and probably vulnerable to CVE(s) + rm $out/opt/TheDesk/thedesk + substituteInPlace $out/share/applications/thedesk.desktop \ --replace '/opt/TheDesk' $out/bin diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 640a367b8bb20..75730e461c394 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.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - sha256 = "sha256-0obIMnPBvMO30o+qXqwtINNRobBR6cFO65B/xjVt+2w="; + sha256 = "sha256-6s/fifjGCkk8JiADPbeiqsKMgY0fkIJBqRPco+rmP1A="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index 3d32c43bd2b6f..ab96762553019 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.35.0"; + version = "2.39.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-l19p/Ql1gaNJpmDH46jwLgUUmJ5YTYRQi6DdayAd84Q="; + hash = "sha256-uKp/lFOOsoLiOSzydroGe4VtBv+YqnfXiV1PdSe0Qj0="; }; buildInputs = [ sqlite zlib ]; diff --git a/pkgs/applications/misc/translatelocally/default.nix b/pkgs/applications/misc/translatelocally/default.nix index 81aa9ec91bcff..1ce54adedc84c 100644 --- a/pkgs/applications/misc/translatelocally/default.nix +++ b/pkgs/applications/misc/translatelocally/default.nix @@ -1,19 +1,20 @@ { lib, stdenv, fetchFromGitHub , cmake, qt6, libarchive, pcre2, protobuf, gperftools, blas +, runCommand, translatelocally, translatelocally-models }: let - rev = "f8a2dba0a63989c6b3a7be36f736ed478cad1dd2"; + rev = "a210037760ca3ca9016ca1831c97531318df70fe"; in stdenv.mkDerivation (finalAttrs: { pname = "translatelocally"; - version = "unstable-2023-08-25"; + version = "unstable-2023-09-20"; src = fetchFromGitHub { owner = "XapaJIaMnu"; repo = "translateLocally"; inherit rev; - hash = "sha256-uUdDi0CwCR/FQjw5D2s088d/Tp7NQOI0ia30oOhlGoc="; + hash = "sha256-T7cZdR09yDrPTwYxvDIaKTdV4mrB+gTHYVfch5BQ+PE="; fetchSubmodules = true; }; @@ -26,6 +27,11 @@ in stdenv.mkDerivation (finalAttrs: { 3rd_party/bergamot-translator/3rd_party/marian-dev/src/common/git_revision.h ''; + # https://github.com/XapaJIaMnu/translateLocally/blob/81ed8b9/.github/workflows/build.yml#L330 + postConfigure = lib.optionalString stdenv.isAarch64 '' + bash ../cmake/fix_ruy_build.sh .. . + ''; + nativeBuildInputs = [ cmake protobuf @@ -48,6 +54,19 @@ in stdenv.mkDerivation (finalAttrs: { "-DCBLAS_LIBRARIES=-lcblas" ]; + passthru.tests = { + cli-translate = runCommand "${finalAttrs.pname}-test-cli-translate" { + nativeBuildInputs = [ + translatelocally + translatelocally-models.fr-en-tiny + ]; + } '' + export LC_ALL="C.UTF-8" + echo "Bonjour" | translateLocally -m fr-en-tiny > $out + diff "$out" <(echo "Hello") + ''; + }; + meta = with lib; { mainProgram = "translateLocally"; homepage = "https://translatelocally.com/"; @@ -55,8 +74,5 @@ in stdenv.mkDerivation (finalAttrs: { license = licenses.mit; maintainers = with maintainers; [ pacien ]; platforms = platforms.linux; - - # https://github.com/XapaJIaMnu/translateLocally/issues/150 - broken = stdenv.isAarch64; }; }) diff --git a/pkgs/applications/misc/tsukae/default.nix b/pkgs/applications/misc/tsukae/default.nix index 0a01758b2c47d..fcd211769677c 100644 --- a/pkgs/applications/misc/tsukae/default.nix +++ b/pkgs/applications/misc/tsukae/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { description = "Show off your most used shell commands."; homepage = "https://github.com/irevenko/tsukae"; license = licenses.mit; - mainProgram = pname; + mainProgram = "tsukae"; maintainers = with maintainers; [ l3af ]; }; } diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix index b8948f7d809c6..6ce4ed4be7b56 100644 --- a/pkgs/applications/misc/tuba/default.nix +++ b/pkgs/applications/misc/tuba/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "tuba"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-m38ur7IxQsI46iMpveEXW3OZONbTI7xNq96XSocxxbs="; + hash = "sha256-Tt2g7xwXf/o/ip5RgUCXclL9omWa/pRglkDMoEGn1AM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/tuxclocker/default.nix b/pkgs/applications/misc/tuxclocker/default.nix new file mode 100644 index 0000000000000..5592c8e2cdec5 --- /dev/null +++ b/pkgs/applications/misc/tuxclocker/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, boost +, fetchFromGitHub +, git +, makeWrapper +, meson +, ninja +, pkg-config +, python3 +, qtbase +, qtcharts +, tuxclocker-plugins +, wrapQtAppsHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tuxclocker"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "Lurkki14"; + repo = "tuxclocker"; + fetchSubmodules = true; + rev = "${finalAttrs.version}"; + hash = "sha256-8dtuZXBWftXNQpqYgNQOayPGfvEIu9QfbqDShfkt1qA="; + }; + + # Meson doesn't find boost without these + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + + nativeBuildInputs = [ + git + makeWrapper + meson + ninja + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + boost + qtbase + qtcharts + ]; + + postInstall = '' + wrapProgram "$out/bin/tuxclockerd" \ + --prefix "TEXTDOMAINDIR" : "${tuxclocker-plugins}/share/locale" \ + --prefix "TUXCLOCKER_PLUGIN_PATH" : "${tuxclocker-plugins}/lib/tuxclocker/plugins" \ + --prefix "PYTHONPATH" : "${python3.pkgs.hwdata}/${python3.sitePackages}" + ''; + + mesonFlags = [ + "-Dplugins=false" + ]; + + meta = with lib; { + description = "Qt overclocking tool for GNU/Linux"; + homepage = "https://github.com/Lurkki14/tuxclocker"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ lurkki ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/applications/misc/typioca/default.nix b/pkgs/applications/misc/typioca/default.nix index f18e572c67054..acf8b3a341fee 100644 --- a/pkgs/applications/misc/typioca/default.nix +++ b/pkgs/applications/misc/typioca/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "typioca"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; rev = version; - hash = "sha256-cm6z7MVAbFxfkSTaCfh8wZhtgXdfVQopqEk+w+hPZpI="; + hash = "sha256-N7+etRqHxLX0eVvdOofXQ1fqEUTsck7UAL5mX6NUsOU="; }; - vendorHash = "sha256-XiKn18WCbhVvsrIvTN/Yquj4mhq4n1X1jqdGUaMacV4="; + vendorHash = "sha256-FKLAbrZVtF8gj90NU7m47pG+BBKYkPjJKax5nZmpehY="; ldflags = [ "-s" diff --git a/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch b/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch deleted file mode 100644 index f14d7f7180271..0000000000000 --- a/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 86cc27022015697a61d1ec1b13e52f9dbe7f6c57 Mon Sep 17 00:00:00 2001 -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Mon, 23 Mar 2020 18:34:00 -0400 -Subject: [PATCH] Adjust get_data_path for NixOS - -We construct the ulauncher data path from xdg_data_dirs -and prevent it from being a nix store path or being xdg_data_home. -We do this to prevent /nix/store paths being hardcoded to shortcuts.json. -On NixOS this path will either be /run/current-system/sw/share/ulauncher -or $HOME/.nix-profile/share/ulauncher if the user used nix-env. ---- - ulauncher/config.py | 27 ++++++++++++++++++--------- - 1 file changed, 18 insertions(+), 9 deletions(-) - -diff --git a/ulauncher/config.py b/ulauncher/config.py -index f21014e..cc636e1 100644 ---- a/ulauncher/config.py -+++ b/ulauncher/config.py -@@ -50,15 +50,24 @@ def get_data_path(): - is specified at installation time. - """ - -- # Get pathname absolute or relative. -- path = os.path.join( -- os.path.dirname(__file__), __ulauncher_data_directory__) -- -- abs_data_path = os.path.abspath(path) -- if not os.path.exists(abs_data_path): -- raise ProjectPathNotFoundError(abs_data_path) -- -- return abs_data_path -+ paths = list( -+ filter( -+ os.path.exists, -+ [ -+ os.path.join(dir, "ulauncher") -+ for dir in xdg_data_dirs -+ # Get path that isn't in the /nix/store so they don't get hardcoded into configs -+ if not dir.startswith("/nix/store/") -+ # Exclude .local/share/ulauncher which isn't what we want -+ if not dir.startswith(xdg_data_home) -+ ], -+ ) -+ ) -+ -+ try: -+ return paths[0] -+ except: -+ raise ProjectPathNotFoundError() - - - def is_wayland(): --- -2.25.1 - diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index e69b6330fef8a..cd69643251063 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -39,5 +39,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/firecat53/urlscan/releases/tag/${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dpaetzel ]; + mainProgram = "urlscan"; }; } diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix deleted file mode 100644 index 2eca4cfccb31f..0000000000000 --- a/pkgs/applications/misc/urlview/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "urlview"; - _version = "0.9"; - patchLevel = "19"; - version = "${_version}-${patchLevel}"; - - urlBase = "mirror://debian/pool/main/u/urlview/"; - - src = fetchurl { - url = urlBase + "urlview_${_version}.orig.tar.gz"; - sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ncurses ]; - - preAutoreconf = '' - touch NEWS - ''; - - preConfigure = '' - mkdir -p $out/share/man/man1 - ''; - - debianPatches = fetchurl { - url = urlBase + "urlview_${_version}-${patchLevel}.diff.gz"; - sha256 = "056883c17756f849fb9235596d274fbc5bc0d944fcc072bdbb13d1e828301585"; - }; - - patches = debianPatches; - - postPatch = '' - substituteInPlace urlview.c \ - --replace '/etc/urlview/url_handler.sh' "$out/etc/urlview/url_handler.sh" - ''; - - postInstall = '' - install -Dm755 url_handler.sh $out/etc/urlview/url_handler.sh - patchShebangs $out/etc/urlview - ''; - - meta = with lib; { - description = "Extract URLs from text"; - homepage = "https://packages.qa.debian.org/u/urlview.html"; - license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ ma27 ]; - }; -} diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index c8991cf2ac6f7..ae0466c1faaab 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vhs"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-JKhijruaRjdMEbsIrcu2swSCb/nTxwIG/F9c2eGncnQ="; + hash = "sha256-4VQcIynkENScxpeM09IXrpMszqojlMuyjtXX2lbS9dg="; }; - vendorHash = "sha256-IpybcyW4up9QVV7fJCh+2Lrpi571tfravN17vh/G1bQ="; + vendorHash = "sha256-/XW5Gq9Yz+M7Al1hy6pow34e3Cn3q8aA0ByRdhWXUIQ="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/applications/misc/wallust/default.nix b/pkgs/applications/misc/wallust/default.nix index 4155c912c6385..1cd1184a23450 100644 --- a/pkgs/applications/misc/wallust/default.nix +++ b/pkgs/applications/misc/wallust/default.nix @@ -4,7 +4,7 @@ , nix-update-script }: let - version = "2.7.1"; + version = "2.9.0"; in rustPlatform.buildRustPackage { pname = "wallust"; @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage { owner = "explosion-mental"; repo = "wallust"; rev = version; - hash = "sha256-WhL2HWM1onRrCqWJPLnAVMd/f/xfLrK3mU8jFSLFjAM="; + hash = "sha256-AuZRt02bFr7GzI7qe4giGgjlXK/WX+gmF4+QwD0ChXk="; }; - cargoSha256 = "sha256-pR2vdqMGJZ6zvXwwKUIPjb/lWzVgYqQ7C7/sk/+usc4="; + cargoHash = "sha256-O9w18ae83mgF3zjk0WUMeu16Ap7CF2ubuPnOqeCt4Nw="; passthru.updateScript = nix-update-script { }; @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage { license = lib.licenses.mit; maintainers = with lib.maintainers; [ onemoresuza iynaix ]; downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${version}"; - platforms = lib.platforms.unix; mainProgram = "wallust"; }; } diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index e82e7a266fb7d..7514c80e602b5 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -39,7 +39,6 @@ , upower , wayland , wireplumber -, wlroots , wrapGAppsHook , cavaSupport ? true @@ -115,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon spdlog wayland - wlroots ] ++ lib.optionals cavaSupport [ SDL2 @@ -180,13 +178,12 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "waybar"; maintainers = with lib.maintainers; [ FlorianFranzen - jtbx lovesegfault minijackson rodrgz synthetica khaneliman ]; - inherit (wlroots.meta) platforms; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix index 7e2f72e31ded0..0de4ca92d37ca 100644 --- a/pkgs/applications/misc/wttrbar/default.nix +++ b/pkgs/applications/misc/wttrbar/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wttrbar"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; rev = version; - hash = "sha256-Qe1Is13RXUIT5JkfuLK3Lj5gxKxVbfA4FCNgkqSTMNE="; + hash = "sha256-AGIUMw4lvYiUJol4VYS+ozNMsCDNGPCsg+fwMlpWEJY="; }; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); - cargoHash = "sha256-IK6ciz+XtNsC4QsAop7Pf5qjiTCUQa30xnHWW4PobnA="; + cargoHash = "sha256-3FDY0SUl1lb9jUjUj14j/5gF5NoSpS1PMj1AtXr/4Hk="; meta = { description = "A simple but detailed weather indicator for Waybar using wttr.in"; diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index f3a0f25552d9e..f7b3f6837f7c6 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { wrapQtApp $out/XyGrib/XyGrib mkdir -p $out/bin ln -s $out/XyGrib/XyGrib $out/bin/xygrib + install -Dm444 $src/debian/xygrib.png -t $out/share/icons/hicolor/32x32/apps + install -Dm444 $src/debian/xygrib.desktop -t $out/share/applications + substituteInPlace $out/share/applications/xygrib.desktop \ + --replace 'Exec=XyGrib' 'Exec=xygrib' ''; meta = with lib; { diff --git a/pkgs/applications/networking/asn/default.nix b/pkgs/applications/networking/asn/default.nix index e81931c619b35..694976f543c35 100644 --- a/pkgs/applications/networking/asn/default.nix +++ b/pkgs/applications/networking/asn/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "asn"; - version = "0.75"; + version = "0.75.2"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; rev = "refs/tags/v${version}"; - hash = "sha256-XqP0Nx5pfYtM1xXxEDGooONj7nQ9UngJ9/AOZefnPV8="; + hash = "sha256-G8TDl9R5nbUzmjcr1m+eNNybSDqb64c7ZOO/viL5/Q4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 7ac034568c82e..b748acfa12e56 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.15"; + version = "1.10.17"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-vx9Vfbdxd3Y0fdjpKC6LFAUEej1RHszyM5GUUGKy0zU="; + hash = "sha256-KttDsSOrnaFsGHoKnYkj94U6WbHXJP2RJNtqSMs3PTo="; }; - vendorHash = "sha256-br/z6k1D1r9JEECKNy7BOZzfHaaveCMUA1bKos0+p0Q="; + vendorHash = "sha256-B4UuVmUf1aFu+7gFAdTLcm+iZoTwVFmBcckOXQxRuI0="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 9f192ec4f16d6..d2f96600d7872 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -92,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.60.125"; + version = "1.61.109"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-ZctJBLEpaOzRK8BppMK7aT0kx00e7zXO+y8U38CCxKo="; + hash = "sha256-vIi205FqgoQEZCV4iWCFxjH2hJNWH9HjRU94jt7Ee8A="; }; dontConfigure = true; @@ -205,7 +205,8 @@ stdenv.mkDerivation rec { ''; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; - maintainers = with maintainers; [ uskudnik rht jefflabonte nasirhm ]; + maintainers = with maintainers; [ uskudnik rht jefflabonte nasirhm buckley310 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "brave"; }; } diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 249c8b45f3f5c..c55b14a5e7756 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -176,7 +176,7 @@ let base = rec { - pname = "${packageName}-unwrapped"; + pname = "${lib.optionalString ungoogled "ungoogled-"}${packageName}-unwrapped"; inherit (upstream-info) version; inherit packageName buildType buildPath; @@ -195,7 +195,7 @@ let buildPlatformLlvmStdenv.cc pkg-config libuuid - libpng # needed for "host/generate_colors_info" + (libpng.override { apngSupport = false; }) # needed for "host/generate_colors_info" ] # When cross-compiling, chromium builds a huge proportion of its # components for both the `buildPlatform` (which it calls @@ -237,7 +237,7 @@ let ++ lib.optional pulseSupport libpulseaudio; patches = [ - ./cross-compile.patch + ./patches/cross-compile.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: @@ -246,6 +246,7 @@ let # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21): # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1 ./patches/angle-wayland-include-protocol.patch + ] ++ lib.optionals (!chromiumVersionAtLeast "120") [ # We need to revert this patch to build M114+ with LLVM 16: (githubPatch { # Reland [clang] Disable autoupgrading debug info in ThinLTO builds @@ -253,6 +254,9 @@ let hash = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M="; revert = true; }) + ] ++ lib.optionals (chromiumVersionAtLeast "120") [ + # We need to revert this patch to build M120+ with LLVM 16: + ./patches/chromium-120-llvm-16.patch ] ++ lib.optionals (!chromiumVersionAtLeast "119.0.6024.0") [ # Fix build with at-spi2-core ≥ 2.49 # This version is still needed for electron. @@ -383,9 +387,13 @@ let # depending on which part of the codebase you are in; see: # https://github.com/chromium/chromium/blob/d36462cc9279464395aea5e65d0893d76444a296/build/config/BUILDCONFIG.gn#L17-L44 custom_toolchain = "//build/toolchain/linux/unbundle:default"; + host_toolchain = "//build/toolchain/linux/unbundle:default"; + # We only build those specific toolchains when we cross-compile, as native non-cross-compilations would otherwise + # end up building much more things than they need to (roughtly double the build steps and time/compute): + } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { host_toolchain = "//build/toolchain/linux/unbundle:host"; v8_snapshot_toolchain = "//build/toolchain/linux/unbundle:host"; - + } // { host_pkg_config = "${pkgsBuildBuild.pkg-config}/bin/pkg-config"; pkg_config = "${pkgsBuildHost.pkg-config}/bin/${stdenv.cc.targetPrefix}pkg-config"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 7c2c75e749741..c1ac2dee602cb 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,6 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper , buildPackages -, llvmPackages_16 , ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-16.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-16.patch new file mode 100644 index 0000000000000..99a8c521a08af --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-16.patch @@ -0,0 +1,43 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index de1cd6e..bb5700b 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -616,24 +616,6 @@ config("compiler") { + } + } + +- # TODO(crbug.com/1488374): This causes binary size growth and potentially +- # other problems. +- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version. +- if (default_toolchain != "//build/toolchain/cros:target" && +- !llvm_android_mainline) { +- cflags += [ +- "-mllvm", +- "-split-threshold-for-reg-with-hint=0", +- ] +- if (use_thin_lto && is_a_target_toolchain) { +- if (is_win) { +- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ] +- } else { +- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ] +- } +- } +- } +- + # TODO(crbug.com/1235145): Investigate why/if this should be needed. + if (is_win) { + cflags += [ "/clang:-ffp-contract=off" ] +@@ -800,13 +782,6 @@ config("compiler") { + if (is_apple) { + ldflags += [ "-Wcrl,object_path_lto" ] + } +- if (!is_chromeos) { +- # TODO(https://crbug.com/972449): turn on for ChromeOS when that +- # toolchain has this flag. +- # We only use one version of LLVM within a build so there's no need to +- # upgrade debug info, which can be expensive since it runs the verifier. +- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ] +- } + } + + # TODO(https://crbug.com/1211155): investigate why this isn't effective on diff --git a/pkgs/applications/networking/browsers/chromium/cross-compile.patch b/pkgs/applications/networking/browsers/chromium/patches/cross-compile.patch index 7df73299bc43a..7df73299bc43a 100644 --- a/pkgs/applications/networking/browsers/chromium/cross-compile.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/cross-compile.patch diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 33831a5f9b1f0..eadcefe71bdc1 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,39 +1,39 @@ { stable = { chromedriver = { - hash_darwin = "sha256-sRAU9RJANz+Sov6oaoZasMoaqM+mIZSDbag92wXsVCI="; + hash_darwin = "sha256-20OgLWrtw2QwyfoehoU7WjmH3IoOG4k3dAya5U5c7Qc="; hash_darwin_aarch64 = - "sha256-U+PBsfpc7PNZYedHIdPnWXA9xKpRnon5vxgKKJr69ow="; - hash_linux = "sha256-2o6LAo2pEsCi1exPv1nEMk2Tklhh49UyWaYoyQ7Df/Y="; - version = "119.0.6045.105"; + "sha256-7aI141Ndtun3HglNKiW4+TTVgOVASnz98Rn1trgUgpo="; + hash_linux = "sha256-gJ6xXhW87URDvpFP88KgLKmwoFDlqMN1Vj6L+bDdbSc="; + version = "120.0.6099.109"; }; deps = { gn = { - hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4="; - rev = "991530ce394efb58fcd848195469022fa17ae126"; + hash = "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k="; + rev = "e4702d7409069c4f12d45ea7b7f0890717ca3f4b"; url = "https://gn.googlesource.com/gn"; - version = "2023-09-12"; + version = "2023-10-23"; }; }; - hash = "sha256-LqAORwZRyS9ASo0U+iVi9srEKYoSBG5upjqi5F65ITg="; - hash_deb_amd64 = "sha256-9nZjyJnXvOO1iZea3mdsj5FYkylrWnhColZ+q+X/xcU="; - version = "119.0.6045.199"; + hash = "sha256-+T2TOLwIwFxVDae7MFDZrjREGF+3Zx2xt/Dlu7uZggc="; + hash_deb_amd64 = "sha256-0FB1gTbsjqFRy0ocE0w5ACtD9kSJ5AMnxg+qBxqCulc="; + version = "120.0.6099.129"; }; ungoogled-chromium = { deps = { gn = { - hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4="; - rev = "991530ce394efb58fcd848195469022fa17ae126"; + hash = "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k="; + rev = "e4702d7409069c4f12d45ea7b7f0890717ca3f4b"; url = "https://gn.googlesource.com/gn"; - version = "2023-09-12"; + version = "2023-10-23"; }; ungoogled-patches = { - hash = "sha256-ZcE5rmreXt4X+PuMalNRE7FakMIMOCyZQfhIhKDSxMg="; - rev = "119.0.6045.199-1"; + hash = "sha256-kVhAa/+RnYEGy7McysqHsb3ysPIILnxGXe6BTLbioQk="; + rev = "120.0.6099.129-1"; }; }; - hash = "sha256-LqAORwZRyS9ASo0U+iVi9srEKYoSBG5upjqi5F65ITg="; - hash_deb_amd64 = "sha256-9nZjyJnXvOO1iZea3mdsj5FYkylrWnhColZ+q+X/xcU="; - version = "119.0.6045.199"; + hash = "sha256-+T2TOLwIwFxVDae7MFDZrjREGF+3Zx2xt/Dlu7uZggc="; + hash_deb_amd64 = "sha256-0FB1gTbsjqFRy0ocE0w5ACtD9kSJ5AMnxg+qBxqCulc="; + version = "120.0.6099.129"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 164851bc2756f..56d21187ebb2e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -20,7 +20,6 @@ , runtimeShell , systemLocale ? config.i18n.defaultLocale or "en_US" , patchelfUnstable # have to use patchelfUnstable to support --no-clobber-old-sections -, makeWrapper }: let @@ -58,20 +57,6 @@ let source = lib.findFirst (sourceMatches mozLocale) defaultSource sources; 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 { @@ -79,7 +64,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (source) url sha256; }; - nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook wrappedPatchelf ]; + nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook patchelfUnstable ]; buildInputs = [ gtk3 adwaita-icon-theme @@ -95,6 +80,8 @@ stdenv.mkDerivation { appendRunpaths = [ "${pipewire}/lib" ]; + # Firefox uses "relrhack" to manually process relocations from a fixed offset + patchelfFlags = [ "--no-clobber-old-sections" ]; installPhase = '' diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index ef638e30a1655..17e5cccd02076 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1025 +1,1025 @@ { - version = "120.0"; + version = "121.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ach/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ach/firefox-121.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "7261b9784146704182f2d9b180c868d61aa7cbebb7ca917cd42fa6980d1585a1"; + sha256 = "ef3acc06adbfbfea448f174ee9e7572c92d4f41b0a25d492880311d3ce59d25d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/af/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/af/firefox-121.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "420b971bacf5453f2c38d31e8f7d65c951401e3fccbb92173b2c82bfb22699a6"; + sha256 = "948209f8fde1f41fc1602ce37a2183f34dda8605021a3f1c2db7f93b790b8919"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/an/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/an/firefox-121.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "37b49f961dd97d96bf4fd3920acd6d85f9afbd2c76a621753ebab8e3e03797bd"; + sha256 = "779894e500e83eb4914af04dab209f1bf4da7e2c94b793ddae91ea4d5bd4bac6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ar/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ar/firefox-121.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9bb02a6112a0a10316996d0b008f45ce4c27210705b54495c6ca63436742dc4d"; + sha256 = "69b55140214377d9f3f8dc730c846f1f4ffd634c2dfeea06b968b6b62f17edd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ast/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ast/firefox-121.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "dceb8bf7b0224e4bcba9b027d453fd60f83c6a24ce2e8e694a63bbae564d0007"; + sha256 = "0c554f77afbf4cb24641a26c912801d14edf40cbb62989c63b0ad11bfb5bfd42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/az/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/az/firefox-121.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "8889b60439e52610ba0de48489163d6a8068ade2d4dfb992c8e010493abf76a1"; + sha256 = "b5ee9c6713bade0d4ff402784e0c5dcb6f3d868f9b4e45796ca349981673312b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/be/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/be/firefox-121.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "0bfa1ece62b38df07cd8eee7690ab1fc897a964afaf1d235dd3f5c7cdf478a76"; + sha256 = "6fbed06adeda99ffddac291ff971fd05f89d860356035f8c3b0de0d649dfb531"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/bg/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/bg/firefox-121.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e4c3abdcaea8f27f0e161e4efd0400d98d7b6752e485bd3f0614c058a42a2c1b"; + sha256 = "d053ebaafc0758341dde58e7e6d632dea87dcb7f6d3afc65f93d4b775bc67eaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/bn/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/bn/firefox-121.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c23ea3a77292bb6394a44f9caaa11dbfa6b42082d0357b33b4b4322c73c8f505"; + sha256 = "3b09592af340f9bb58ee2267a6c1465102a9a0b2094d31309c6f912096e9edba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/br/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/br/firefox-121.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "02768d93d88e5af6513a19882c21d6d038814e371de50083dea0501d3834c8ee"; + sha256 = "22bb3f28936a9ccbf84b3ea6bf030c9ae4364539f1327d0666020399c1dae0d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/bs/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/bs/firefox-121.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "50f12f026b663e245abd4c94de3a2c9c7e4e12e8a4f7f1b2c841907d9b62b92a"; + sha256 = "3f3e8dc33ad5c74a81ce6344e9a04cc7048967d5319d6027e8f22734fa5ea260"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ca-valencia/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ca-valencia/firefox-121.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "2df72d66cabf029691fa6a42fc72e29543201bc21fb67879d043b27e7beaff65"; + sha256 = "97a419a909e87475a5f2703d6f78c9efd22c48faa4f43819535af39a35d242f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ca/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ca/firefox-121.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "dce9f552cea74c4a71416af8d279fae86327c44c645431b54fb281bd465181de"; + sha256 = "beef08c0ca636034c844227d500fc1827d9ebc495465d602e3c2e020f292c36e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/cak/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/cak/firefox-121.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "69193eb592264a0bdb10e851a4a09b81388a40c5754693aec6eb1ceef572b3b5"; + sha256 = "428c8227543097de1f380d7fa8aae3430db8ac7c2958bb7ebd327a9d6016de79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/cs/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/cs/firefox-121.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "56ca1034d81ec2c7a6915f9b42da639f13b7c386b536df3c616c9bde4792756e"; + sha256 = "53131c9a655b8fce9a4bab43cfb4497794594d0bcb32700e12b480011b24c4fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/cy/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/cy/firefox-121.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3ca612e2eaf1c53cdda54006b3161203198ddd2d9957675535ff157bf7704590"; + sha256 = "4b107aee59e72c954037e60a49cbc182ed4c58a8f2ada71e23d54d6a0eca272c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/da/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/da/firefox-121.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "bc7b4d42e874233c557e2cd533b6008cfcb58c17aa2d74a03840fff9a5cb3069"; + sha256 = "7df23761b1370594fb0f2e4db64a1b37f927dd399c4ab0d9e2f5fc0d68518ad3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/de/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/de/firefox-121.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b1c14c7f90bec2ab5a9d7dbbc90c66914a3dfe4b7404d23d6d2e133a375d9ac2"; + sha256 = "2ad8bf7ae7b01b9493e1490225230e146a0aa3e442a5f969f293946385882f02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/dsb/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/dsb/firefox-121.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7867c83ff736a2ce677777691343f901500b2471b01ff53062b7c5b73a886c0f"; + sha256 = "3ce4f431262b2ef2715a9708438ded794613daf585e9aa040c476724cced94bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/el/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/el/firefox-121.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "437adb01c9193b965c4612f71625c3b486f9b82716c31cc3a4e215c10178084b"; + sha256 = "d60541d1a382b9789daab611c25b0a8bdd6b3cfb7b3122bd5839d875290819b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/en-CA/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/en-CA/firefox-121.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "058dd94236a1b9fb6e7692b9875416ecf7fadf98fbe1c29004f7ffa06955782e"; + sha256 = "f70e4d37314c395da64e441df445d43cae8647744d4bd5826b368802d2b76ba0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/en-GB/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/en-GB/firefox-121.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "88eba42df3c4c240e35792cfc571ec2b3a2b53cdf015c1b12797c80b76c17fdb"; + sha256 = "b12b6dac28538d4425dc3c953480fcb54d23c3688edacdd72990df65ef8ffdd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/en-US/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/en-US/firefox-121.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "340a7ea9a7b230ef3a8e81c8053d5a2f944760ca9b32987a4a2ce52e8f62294b"; + sha256 = "f1c779b04e81a72860b9be0185d3f957c746dfc2128d62f5413b720a279b17e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/eo/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/eo/firefox-121.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "bc1621f82df6a090bd485b5bb2a1d97210686740729a5076e45bdb6b41e330cb"; + sha256 = "4454448aa79f2c4f8ad7f3fe28b2ee918901b3dd989514d1cb269dbcf447b1f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/es-AR/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/es-AR/firefox-121.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "d87be470cdd767428209e138396a929851da35f2733bca93709184392751c0af"; + sha256 = "3757f45aa86e8052d9c963d04736428df6206bbbdeb48e5ace2ae4b490846295"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/es-CL/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/es-CL/firefox-121.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "a389f0c702eb1182086070bf6b0e28be107f0cdbec5a24f9a3e15e4cd46f0bd0"; + sha256 = "4820ee8162ca6e51b98397ff49652e34108afa4fa24521da57efb0cf0e09b034"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/es-ES/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/es-ES/firefox-121.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "dc680f687574379ddc8e08235a24742c641fb3f0c8a2dab16a3a998ece9e2994"; + sha256 = "f40e232caf2a5e2a238eeae189bcce6270875ac4b57945167592a24220a90181"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/es-MX/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/es-MX/firefox-121.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "6960e3ce9ad995181a4471e8030d3b0333b7d1573a2bb323609ffecd1febce72"; + sha256 = "58c20d883e1c1f7a37e997cb03f9e240a5c86fd004814a066a155e891a4bc629"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/et/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/et/firefox-121.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a6b39af56d45adaec536e6604fe03ef09efea984c87039b968102b2e07c45d53"; + sha256 = "dd7b7815612603b44a9bd91568356d0292e205e6a7bd3551fef9bf1dfeef8ca6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/eu/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/eu/firefox-121.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4ed6e0a02af8ef08f2c24c7dfdaec91f9b7081ec405a99af35c4c527914b95b8"; + sha256 = "20fef639f4c9f668013817ca75ad9144cb243f5086d2f32ef34e10f4a4164c29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fa/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/fa/firefox-121.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "6961f23a46e30f2d1c210a039f88c7e0435a712fdae0b0dc232c9efde9ddcd6c"; + sha256 = "2898af2c401b048a7c32b1f9312b9576121f664da8d95be075c1fd60a05e70bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ff/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ff/firefox-121.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "c43ee72ede3ee0ab6b07566422e2a774135ef8d183294965a05406ee8ab2ad95"; + sha256 = "d6efcdafd8337ff67f53b761d3d2b95f9bd24d59441e93f6ce7b46e16e8a42b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fi/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/fi/firefox-121.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3e95a9abf7b409e81d63849789f65a28331f639afed9e4c681d0321084bff04f"; + sha256 = "a987d796e049963563a69b8213ea7d460181dd348df3b0ea00e61d0ca016eecd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fr/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/fr/firefox-121.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c286d422edd48d15481e6a188590a39e9424d996558eaf3f039da7e78403085e"; + sha256 = "acd056a2d719dc3ba2c5d96e3a28fc89e3c00188c08144e91e420652ddd561eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fur/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/fur/firefox-121.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "8de3ffb4861c4729d7b90d91c906d09f9ababa5e6ae9f714585b35cfb44547e9"; + sha256 = "65511fef8341eebcf3027cb5982bb1565a0902e1f091f573bc48ef4be6fdcfee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fy-NL/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/fy-NL/firefox-121.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "6e2745f3ce0df7bb880a31e9bb9b0824abbfeae0171e07fbfa5e30b10912d370"; + sha256 = "e5af90c421271865b6b1454267c0724ff1da35fe135a37b74cd941d37a9746ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ga-IE/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ga-IE/firefox-121.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "95a5a80bc9ebfd4395e10c34ff3d5d6f2a30106c2e6941b7b07addf14edb9e7f"; + sha256 = "45d9c8f93e99f203ef033e8e4cf0db7c7a5b90ec70e07e92dc6992d30c0df625"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/gd/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/gd/firefox-121.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "db8dfb7783b12a3e9729cc9352da8c8299d8cd0b009778805749b090f86c12bb"; + sha256 = "46599ac0cbcc5725b3f4f556e99bc8977a8ffd22ac19074274cde732ddf52573"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/gl/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/gl/firefox-121.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f8101f9b9512dac67c468ca865e1bbbb5769395b1120684ee993556d43144027"; + sha256 = "f88acfc4242fe28917d4a46324d3e5b13d5c8429e14331b77e814779b8bd284c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/gn/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/gn/firefox-121.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "a84726437ce8d980565943b6998c1635a7b7bf766feab9317b1a369d2b878592"; + sha256 = "8728938933b9065e59653d7b77679321669dc301893b99c636302b4f4a7db64d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/gu-IN/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/gu-IN/firefox-121.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "5b8b2e6e444a2a5ce15f92447345f18421739449db835fcc06f9e0e26e02b14f"; + sha256 = "a5b73e0d53421217dce2d68dc1c7a605ddb317e3ad22fadabcf550e4042b8b50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/he/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/he/firefox-121.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "894727d171dea3784a671f473c0a4b67496ac7f54f0130360401c1fc6637ee78"; + sha256 = "82530562791c5e4f6fbc52cecc003eb63c23c7f9312dfb1c494fccf01a0e9b35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hi-IN/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/hi-IN/firefox-121.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "1d9e40b7eff8a2b1a377ebe2a03d310bbaed58d8b5d32b780a3c44f29676dfc0"; + sha256 = "b7ec2ce57c8c7b2e742f93aa0a9ad35a36e1d59e6b945a5d85e4ccd74b218d8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hr/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/hr/firefox-121.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "4714572bbeba00141d3a9b683a69a9cf5b44c51e9b7f262cba8765ed4ecb9998"; + sha256 = "ea6f54926ea763367826398eba1d61dcd7dbf39cb43c6961aebce867ef54c069"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hsb/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/hsb/firefox-121.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "eadd9c74297985a8a33f30d9597fe5f808cf224f7e66f7045f12ed1ded3261fa"; + sha256 = "31f48263620d530c107eb88a2dcece4e20f59de1f4af8ab403e6fa8d1f8a04d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hu/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/hu/firefox-121.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "a1a0609ca55bc551fdd045faf65aedb130a0fbbfbe82b4c86f0b02044d1f2e2a"; + sha256 = "fdcfd89185a9a33e33db78442c7c74a56f5a9c9270c2924140c37d2dc5ae6e20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hy-AM/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/hy-AM/firefox-121.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "10fbe2959447353e302c5a1e2e676f88fda07a213b0f48c9f64a710a9b6b1e8c"; + sha256 = "f731daf591cc2124b9f3fea17eb44df778b2f6b58249d3c3cc811742901d5e70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ia/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ia/firefox-121.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "64129e1ebc5797f0f88e90880452bfa8cb823cc28a5fa833073324b769bc74f2"; + sha256 = "8cfa3b50c0f1ab4b159516d7867d4bb38494af760f3606083045e17e369750e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/id/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/id/firefox-121.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "468af01d74eaf91ec9ca862886db3eb5d5260bb4a02db324d28f87c314080d47"; + sha256 = "90ee84250491e6fed4999998db0599c33b25e0ead02a0410a663fdcbeea66399"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/is/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/is/firefox-121.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "467f19393aa187d57f526b066f24404368b8a3aa3d46843edc1e0d8f9034f753"; + sha256 = "584e910bae339a0aab099a4ba73bd8b90543432a87c5f863a1289a724d106db8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/it/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/it/firefox-121.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e4dc3d17bd70c2cd08d5ee0bd1f933de50f1e702a9bdc2da90f4f94f430db2e9"; + sha256 = "c5737976489b0568628ac626235df7e06aa6a33ff7c4929a694290a147956219"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ja/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ja/firefox-121.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "abbaf1073e3ec9f29774aa6df2abb972cf18029851b066ab735cf7ba999946e6"; + sha256 = "56e65e7963979c08b802225de32cef747aa94f23ce0ea86861d6a84833417395"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ka/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ka/firefox-121.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b0da46ff1e053d42f7ca16963ea8d44b4cd8d3a89f8201c2b4ed3918a84a0490"; + sha256 = "d43868e9095863c5e05c747175e33a2e99b5dff36f98909dfd312d36aa04f073"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/kab/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/kab/firefox-121.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8fc834b0e09827a727b6aabd557bc12b4c7e95f6a17e231a341b6ac5b031a049"; + sha256 = "b0e74a6da62c6175b68ec0ad270e7799618f7d5e57c41ab33c8daee201c5c101"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/kk/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/kk/firefox-121.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "613268846c3cf6574d50e55d5c474634fd7573ea3cd68fc16b1fd6c5ff08e23d"; + sha256 = "0ecfc3db9f30291a20db3aad76d1404a6e4bff6573042a3af00900342376993b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/km/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/km/firefox-121.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "9365ae8f344a3532ac1ac4eff63811791e32af12d498563c995c0e160f96c8b1"; + sha256 = "355447e849684932129cdb3a20310827e0fc71a6439b24a16bb1bc5868187e0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/kn/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/kn/firefox-121.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c5e074479079042fdb955e11f4c4a193cd4e894bb5afb1cb2c92f5308198f006"; + sha256 = "f997d63f1343c5e6fb595db1e0ffd1804aa4576a20ce1a82ba7880a2dc21e2c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ko/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ko/firefox-121.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4319d5bd2d5a41c87e212ca2ea7666292e2f2f08f22768699bd86904bfe65bc2"; + sha256 = "395edaabf9806305e52e65b6d801311898d966a47bb776ed23dfd09c3e6b2495"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/lij/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/lij/firefox-121.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b26f2a7079cf633da7808f0a6c40d556ee3a52c72d77433cf289ae9fac2e8c86"; + sha256 = "3d4a1d6352fc4beb9fb184cac6237a263d421baef58710a3bdea53a37c57ddb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/lt/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/lt/firefox-121.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "86a35c164d7998b6be554ef2b7807adb5b108491e558a414b09b37ee2c619245"; + sha256 = "e7eafc5a8e0349d037984d74361bd63c75176e9a51fc9e84a15359116823e8c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/lv/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/lv/firefox-121.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "199831283f7e6a3573993a03f9ea40ee05b238dd1d6201915c36a9d0669e0f16"; + sha256 = "f1806c16570e94eef8728f011dc43e7580d1f390beee642f1dd05c701a572b35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/mk/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/mk/firefox-121.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "cd8bf243dd94eed0a5904c80a6f331c7af0fa13731822d1ca44471450dade265"; + sha256 = "25f80e5105036239f8f8020e0e4815285427c42a4a127bff553d1b79c333df61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/mr/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/mr/firefox-121.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "6b8b7f5df3182d63a5174ea79002bd698075341ba9335a770b49c506f8f14e23"; + sha256 = "236bfa9e78ac47247b98c61581a8f5aa1129c7027c97c6aa04c7a68e2c944e37"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ms/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ms/firefox-121.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "205f17e0bfc655d3842444a44b27163b2a9e92f430132946d51de7cad5f46520"; + sha256 = "1d2210fa0e9a7496d6f1ab10f04b5039061d911574fac3b1dc17340c82fb1866"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/my/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/my/firefox-121.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "9142c797c3d0318b71f23310c716ce703e9dfbf4682f2f9bc4f0994b0054b7af"; + sha256 = "660203f5198c926ae6f1f86c8677e405f2c13aed8d1e65169a5701e4a586d514"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/nb-NO/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/nb-NO/firefox-121.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e8f0458d543dc0df5be81a53ee7b66ede0b988899d914a9fd0b9f51debb1ab3a"; + sha256 = "f9c90cd8f3ba7dc143bac4fe778462dba7ea34c350de84dea09ea079cb0c6c88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ne-NP/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ne-NP/firefox-121.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "2718dfa28173373563d120684ae9ffe85634cbf0cad332018f7acf08a958d0b4"; + sha256 = "b4750911a594eb8f2b34a8af7a664860dca4fcdcbfd0d063c8e718033508443f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/nl/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/nl/firefox-121.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "191012d84fc1349b46c8c9a60739aa16e10925595334ba5ebe71b8183af27aab"; + sha256 = "ac52d8331aa94fb5185c8770e7e276c1dd37116f01abf3ebea496789adbb5e2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/nn-NO/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/nn-NO/firefox-121.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "ec5d00408f471bf873a574f6611cee60e6ce09119f5ead39e28b9f8e782ab95d"; + sha256 = "2ee98acdf01fe0726a736732308e524699c55696001ccb6009f58b1bbc5713a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/oc/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/oc/firefox-121.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "06710541a83e0ad27aab4d976eb6b2e44512276b4a0e0f32dca1a418b82a7b52"; + sha256 = "75f9f45d77428b92be5bb9cdc6052fe6a045151b61224bc09f0eb567ddd2f11c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/pa-IN/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/pa-IN/firefox-121.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "86f23f3a40fb434197d0349dfcc30c1aa7acbcedaf8562b1f9cb107f11da675f"; + sha256 = "e034fc67a4e7b90c016217690c6ea39eaa84131582d9576e41d257566acce9c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/pl/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/pl/firefox-121.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "bedb7b5dffde7903a2f392a0b591091e3b6df02bbd65ae6509c100602f686b42"; + sha256 = "6111a0800e83da94ad2913161a003bc0b5ecd372f83987444c0eeebe399917df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/pt-BR/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/pt-BR/firefox-121.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "032ce640b47c9fe6ea34f8b4446db9b8c7d5983902027fa4c31337db90c5c170"; + sha256 = "abd7ae8b27d2e8210d9938edf0eddb72956bc137cedd06a7b34e5e4a52074373"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/pt-PT/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/pt-PT/firefox-121.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "a7cacc08ce0ae3d9c62271294d4e8b5ebd4e9128d5898cf6c2d891f1912e3763"; + sha256 = "01ec4c8a9a411c904e7708fc352526b72a7a4f545a4a4e642683c061f42826d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/rm/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/rm/firefox-121.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "9a9d34ad86d7b9a06bec9346feccfbdd7eae7b9fed6700c753cd40870f63ff19"; + sha256 = "4b96bbb04f1759a072c70dba2201e113e60dd8a8b9f0335ebc5992616c0a6495"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ro/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ro/firefox-121.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "134b4c16ca280a565a5a21bd278856e0353b4ce505513c3df5d26984c23a4009"; + sha256 = "43a7d5d47e32a35a56ab5172e659121c42009f54e66eccae6eb308405067ec2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ru/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ru/firefox-121.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "648e085e3937565065ce8da32dafdf6119957c8994b47dcc153adff668e87ac4"; + sha256 = "af27dedf6da50ab4e4a107005faf4842e7293097c3682fdeb0894941d958a5de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sat/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/sat/firefox-121.0.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "eecd8a88202986c44a17b8f2035ad2bb1c335b4d852a330d6b5de4043206a19e"; + sha256 = "3de63d35a7a78cfa874013ec73e74de45a1f07860620301488b3e925c1b4108a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sc/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/sc/firefox-121.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "937231d9548496bdbd097a4e249b3b433b76dba5c30edb040b61d6c9e1fc1135"; + sha256 = "80e32c4a536071c209c747425af2ecc9333ff2f0f6c509fb2a1064be4601c7ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sco/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/sco/firefox-121.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "dc0e840fb5e660e83851649d0b86fd9aadac51525b5c96a0bc05e36a1f833824"; + sha256 = "87b40fc859041840aa7cdf7dc9e89769bdf2155dc485af629cb480e87aa6243c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/si/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/si/firefox-121.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "52344c7e38ad40306b4e064205a06e6a36d92ae3826422744a2bf66aa369df5d"; + sha256 = "3ddd4de2de556c910eb7da073657060dd8054b8c1438a7e09aeb68492482637c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sk/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/sk/firefox-121.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "62ba51e311f5dc9bd53223c2ceae72751a645982d145aa4c4583322a5ab96ea4"; + sha256 = "cf7422e46ddbf5cd00770ddff4c5f5c82ab364bde0fdc4782c88882be8fb3b23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sl/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/sl/firefox-121.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "0eccf03cee663928dc92bef83cadb2728596fe00d32ad5d8056e48ab19e0535c"; + sha256 = "f0470965c2aaf90f1ca95851400c0b8485304a778cf997cab21e40598d3d1e68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/son/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/son/firefox-121.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "07f5bc3b8788b13e67095b47ba544de4dee364cb39e0c435e51de0234cd78af3"; + sha256 = "f4b1cfdd70699d2f10178bd5fa332cc28258cd73ead2608db3e4cd8a69ab6a85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sq/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/sq/firefox-121.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2ea37bb1012aed2c32f94b43fc6b0e6c21e6c01d37e6821508abb5b9537ab53d"; + sha256 = "1748d6c6a3bf84dd8015f7c8c4050dcea6929774efa5467f5f62572b67f291e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sr/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/sr/firefox-121.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f90e1272fc47144d586c41cfe45091d3263a76c74b45763a4acd428efb4a0f2e"; + sha256 = "663d92f57d3ec4634765ade2e44d3460b459abb873cc0a6a5b203fee87fb218b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sv-SE/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/sv-SE/firefox-121.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "f4b7158fd318fa72a0b1a13e75bf6781580df051ef636b7a6128d78cb4cdacb9"; + sha256 = "0a6a9e02420518d96a45b04feab9301697dd72b7255ee19b39d1dd33960b66ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/szl/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/szl/firefox-121.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "dbd9f407fc4d5e6c33efca730f1524c682424c46dd4d82f039c72526b8117f1f"; + sha256 = "3003a6c3c8b657b0212579f7d0eec691cc9b81cdce86f8ffef66958f69954d7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ta/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ta/firefox-121.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "e843b0ceff3c7b706dea4029bfc32ed1e05354d90277c7bf595c7ba024c3501d"; + sha256 = "45370a57cfec070cd57496649ce635e976c710d3adc74b08fc73f7cb58e87e2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/te/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/te/firefox-121.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "03de55ee242a343a5ce3b3346dfceb97a13120c8aa7ae44b01001cc7eda2b3ab"; + sha256 = "c10dc1bc43c1b0090831dddf66ea66a6b3ee930446e0540c0bdb6ae41e8152e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/tg/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/tg/firefox-121.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "d9dc9158a5c064cdee76ae605e1096c516a5079e875cbfe215c765ec9018e926"; + sha256 = "f9921241c30e47e2a2d98aa354aaff68a0b2db169ba2eb1e7a327d5cc059f143"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/th/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/th/firefox-121.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9b7f996dfdfeaeea549e5dfceb8c6b7ee4261cc3879b40d9149c5faba5b73e5e"; + sha256 = "cc156d5af07d8d63128af44f7c5cb0e566f40062cbad02d2a80efc1245c82b8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/tl/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/tl/firefox-121.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "3f7cf5e67f1f591c57b61624272bb23d3f89e62fca555bbfdd71e6d5fb3ab1f4"; + sha256 = "cd3d2fce357553ffa19e8a3ac4887106e29c5ee991bf845c5852fe02361ad975"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/tr/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/tr/firefox-121.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "6fd28a1992d2de1ce631281b1721185a878f1a3ac16cb149e98c1690ad60b06a"; + sha256 = "a37d55a78feb048fe3da87bebaa819e0ca869c6630a784ee77a45c0d10b3d744"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/trs/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/trs/firefox-121.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "de8efb4e8d9edb8f19824b6456fcbeb1688001f41e3e9c4c9ead6825ac4aaa72"; + sha256 = "27fe308a6e2cec8b97515411020decec375af0fb5d1aa506caffc1e8e9fa7400"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/uk/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/uk/firefox-121.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "543a7a0f919e8497a69e97605333a9cf51c5c88f95140f4ace579366055906d4"; + sha256 = "2052940b332b93d5aea8a6c4b412a7a5875809fddfec96eb6329e469162c9887"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ur/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/ur/firefox-121.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a913fb999041219345483c6c32f4d3b68b8cc97d46e33ba20814195d0945555c"; + sha256 = "e4d162b47cbdb9da7133543aa037b4e972a84370d3f7ecb349a7757cc5d38437"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/uz/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/uz/firefox-121.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "c7908e88c71332a71e70caa390f08efd3444cdc1f8f0e55ac997524ded8e7f8b"; + sha256 = "b4be97acd2fc09590ce21971f955f03e121e1ca39569b798853f77843b16710a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/vi/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/vi/firefox-121.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4abaaf12f0ece14115da876e79e0dfebdee9ad8f9f4c540b391502cc71d8e092"; + sha256 = "90cdaeaad614567f0c6fbf0f0b1e6aa74d1ffca5a8c53b10dee52ffb153f3c85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/xh/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/xh/firefox-121.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "16409657ed62fa92f0f0b3ae2981fdc9a9ad45659592622c9ffe81a01e5b818a"; + sha256 = "6434a5afcd8d4aea393afc6713ff2a4a1c40e8e528faf418065399bdbb3fa436"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/zh-CN/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/zh-CN/firefox-121.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a14938714c864310ad4c0d7f2d7aaeb8a7d658ae674d7dd277570280cdba5364"; + sha256 = "0e836a1c781dde800377df7ad927b8a6b1410ec0cd0e74e6314bc3e7f86c7efa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/zh-TW/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-x86_64/zh-TW/firefox-121.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "35db6f291f8efcf493fd1fe3313a500fc11891f29dec2f24c53a8fa5b59bf4b2"; + sha256 = "adf4d91655b60e2f3b48745b41cccde5a3a34efbb86c2de13b4cce9f77cf8d5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ach/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ach/firefox-121.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "6d6b3c203ecd57b8325b44df60f1c73b96e209f2fe97b41fa345057554b79f75"; + sha256 = "57a8ad9e88167bb8cdb0b502784f715a50deddf0e2f0736f039a5d09f631bfc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/af/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/af/firefox-121.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "3d64f3a8ba54e46c0db30bd2a581ad0047fbddbed038cfedeca7829039957e26"; + sha256 = "fc7913067d14abe7997c8f9777d44cb73696f623bdf2ccbcc8eab1227c1cb945"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/an/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/an/firefox-121.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "7e82cea049c85b4604c1ee549499d78f9bbafb27160f1a406d2422d071353098"; + sha256 = "ef86d1e7b870ca78078e3dc26962fbce1ecc5f1951af6b2d0e1567504895fbdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ar/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ar/firefox-121.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c00d163008419f17f429e77577d94017cba391e29a15cb8c8539b1d191c4e069"; + sha256 = "0add44758a453250e67fbeaa62a88ee69dd133b137988b72fc930159966e319e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ast/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ast/firefox-121.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "fc2e1f5d2f80beff9171c5ecd3fe63c23bbadae8b18627617720d2f018177d72"; + sha256 = "e28fbd987e329ad091ea58a58bc78eac408dc5672a226a28e322a10aa2a22cab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/az/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/az/firefox-121.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "997f1a81ec8d1306dc14764c098ae13f1f041862247f672d891d17cd1369dfcf"; + sha256 = "4034fd3be479eb3a5f6fa58c42e6c754a5d4a3f2d7a3c5f6606f7853487d1c2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/be/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/be/firefox-121.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "7e6f9ee14b6c5d08c22a7ff5bf9ecd6622992fd5f1d644da9c0b2accd4b415a1"; + sha256 = "7a95cf4eeb05a3b5f911eb08dcf4aea0b6150de2bd21d26b9b736989b155749f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/bg/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/bg/firefox-121.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "d8dc55be45f40430d126f7d365859aeb1f6c1be8d615eaa368e93f740c6a8e70"; + sha256 = "8fd66e5c423af9228f1dcb96beb626c643ef5f69c73744b50d55de599d99ba46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/bn/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/bn/firefox-121.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "a8b955eb49bdc369e69007b53bfd6ccdce62856b695979a957ed97ffed1412b4"; + sha256 = "d859dbca5c39cdbc93462ed3bcedc13566067116e5f7ab4e6a89944b81b5a81b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/br/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/br/firefox-121.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "11ad446f9d3893bba9ff2aca01ae9a5779e56b3f0c48fd3c7cc588f8d4649a3a"; + sha256 = "11a9c336c767b03ab50f008fa03e07a1de329e94c57bae103d38fb33c274c130"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/bs/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/bs/firefox-121.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "4e49e589fa66e2f19dbdaf71be3763660be024d0824041852f239c484eaae843"; + sha256 = "1b0eccf7457252195e30deeaf1cbdcce23d0ecce857df71f01246597975191ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ca-valencia/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ca-valencia/firefox-121.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ecfd1243d5b8b1b7be8e9c1d50894e5ce6341eb15cbb1fee4e68b92514e2cfd7"; + sha256 = "3f5e1ea20e9a6caacc0f2f3f958b1578aaa0d5c8c6d27e6c295294c18c8069dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ca/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ca/firefox-121.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ce2277c0592a4ae3b60630dac7084048b3c9f79a03ff9c1d6c60f5346f57b163"; + sha256 = "ece0ab9a6779a3bad27e632041b38ef9b4c1b20c6b2a43af292c811c63b1a191"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/cak/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/cak/firefox-121.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "459c72e9a0ae2b4c278bbada6b4545083101d0cf324cdda6c68a50006818b3e8"; + sha256 = "df8936cd8236928d458c7e02f24cefa8b76d42fc6aad3e1bf9b3a063692bd8a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/cs/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/cs/firefox-121.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "340bb19b1593684055f2660b2acc5e34f773673e8035b897d41363c69772371b"; + sha256 = "057ca6befa22e37fe704a588065f4a369144e1084d2218369128e114bd6db69f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/cy/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/cy/firefox-121.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f403fd18b0a94b303eb9aa68492173bc5b69e3fbde4173314cc4eaad7c1060b8"; + sha256 = "3a7ed9936c1a4208ee8347c5f51ef96c864ffac83804fc992f01e0fc90c87d56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/da/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/da/firefox-121.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "c0f4dc9cd1b6935a4fb66502bdd13f8c8186a84211f49e5e61d9bb827b9f4f07"; + sha256 = "0700547406cbca013ff4b499d29c9495d99b648d9cd08972c0314e719aedfc1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/de/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/de/firefox-121.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "0ae96c328e4d632124dbdb1b31978874bde3e88c7030cf1ab6af54f73a94368d"; + sha256 = "b638879aa131f0a8e66af21a8b4187041e942894a7fea2eda1d00c270600bc01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/dsb/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/dsb/firefox-121.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "65845b1dd223a05fd23be7b81cbc18e02020b8e30c955f09d40eb6320f9d2615"; + sha256 = "942c035780179f8b47103259266306b07af99de044ebdff755ca5c823bdbf5b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/el/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/el/firefox-121.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f0a6ebe0307fdc5cffd63953d5b5ba23f792eee74e7a79e65be155a62d149caf"; + sha256 = "b78ef29b54fa6cfbe660eac9f56a2ee5f99b46511f0d6944e5ff5227de9f0643"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/en-CA/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/en-CA/firefox-121.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c3de315a373ed9a9f15729036394ee0a394785a787d3ee9946077b0a93085809"; + sha256 = "b633a9d40ee8b1aa3a287feee9438b94cd6b919a473c57c4f3526bf0ee3e07e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/en-GB/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/en-GB/firefox-121.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "cba09755f156e3e117d00dcd77f4bc3c080b7deee31fcac72410bc76bc4b0efd"; + sha256 = "730a94730cc710c5709f9a22c84515b9dca368fd98ae0c9610f0f47646975db6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/en-US/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/en-US/firefox-121.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "924f0032446b4c2fa6cbe7fc98ad8bc6d89808c4fc35f948fbb1dfead2ef7b95"; + sha256 = "d237a5a3cf69d0815eec3d00826aa004da64b8ab41837bec5a0e8de906b0f5e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/eo/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/eo/firefox-121.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3932293c3c010f0ee71998941936822ff5985d3d8c19f8ece40a695314d54193"; + sha256 = "b950a19fa0a6cf3f90cb2e7e5078164d92152add365f6f7f3f139b253aefc91b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/es-AR/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/es-AR/firefox-121.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b1de43001cc06d90bcdcf9229664000d315bdb3af66a5fc667891c5b1e09adac"; + sha256 = "7397f6d1ad267ed25993d14d65a05dbbc35a145f7de8baaa91a065b393ed342f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/es-CL/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/es-CL/firefox-121.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "b13b50b85bd569a3cca6abaa3488a96422f44c631314982ec68343efd585f427"; + sha256 = "317296559da73eb9f44b1814d4d46ea33831135b7ccb29a4204489fa223315c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/es-ES/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/es-ES/firefox-121.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "22347e7e26642a67c9354d90863c0659803ad0d3ee04cd6177ac59d770ef2e79"; + sha256 = "2d12b6f90481b7a0d3baea96120a6ae4be6fad0a3d78d3b1b25c9c4fabf8f583"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/es-MX/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/es-MX/firefox-121.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "14b17c0bde5b7f110b1c270e6dce7e603247c20feb60f034b4c38cb58eb28fca"; + sha256 = "1031eaf77fb729955a2f764cd5afe6992dc2aab847b7905c941e80eec9dabd85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/et/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/et/firefox-121.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "ee94bb80d52b854375676fc37d2224bd1760b04c41952fcea76c3ae9c1c2eff0"; + sha256 = "54bce31eb3f0a5f421cbb101eb512a16a5aa572d05b8fd7ef1d86c41fc7c4fe2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/eu/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/eu/firefox-121.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "e6cf36e85d4562e733bf3a7bb09230156892fb11f112b838286da5f2f142a9c5"; + sha256 = "2665099e30b3b0ba2c2b3e5cca89185be171a17da1458e64eacc97f3d2334aac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fa/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/fa/firefox-121.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "7a9fa8d7c9e340c0e7e668fce6085480eb0b02e67472a20f2732e0369ed15141"; + sha256 = "61c096bc3e281dbc8d5d73975698a0016fbe138294b4b72e30a31c059e9a4f38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ff/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ff/firefox-121.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "35ea0636918e7d263b4f1bba48f78a3328fe1d16dd5536a8a4fb24fde7f92ccf"; + sha256 = "0b0c74629f98ee4a0d03931e35a88fc5eecdef3df2cd9a315c474f5bb380d2c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fi/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/fi/firefox-121.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "cb9e897b4466601c1bdaf6f99eb778f7970e16de87d67a3dcd30d26ec78be11e"; + sha256 = "becd35f86e9231f7f4d5d103f99d7f766f1b150f7fc87aaf85c0677dc94defa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fr/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/fr/firefox-121.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e753c4f9b9403e1c2028dddfb41c4c11265e0533058f5e30731f7e4eb165c962"; + sha256 = "0098172a97a87a054f7b103b3eb2f6c37bbc2ce9161869c299ad5757bbb3f565"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fur/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/fur/firefox-121.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "02a0ffd7a52e49914826eebf599c0ebbfc2600b515c54e0c76fa724ff2eddedd"; + sha256 = "e052e014e60fa632988aa230694197edcd5988e4a784b3c1130f36d5b232629f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fy-NL/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/fy-NL/firefox-121.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "450fd214944fbce6895694384549f0d0c748af365f2e469a0d212b895e4d8dc7"; + sha256 = "93fcc885f55aa31dde07565fa5760a20a269e667f15ae8b2bd91b0a5b2b86a11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ga-IE/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ga-IE/firefox-121.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "6b7f8d6204409cfea9ac8eefb9e0653195e9f7d8e59cbc3632b52818733363ba"; + sha256 = "50388572a793456cfb4ad99ea7d2d31ca6e59e8e6ff3e95eff0ec03b79051c33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/gd/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/gd/firefox-121.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "f7023ea44357a24878cab6cf644c4f5a64035e731b511d7029dec48cbb13b0ed"; + sha256 = "1876a3919e4fe0d943dedaec6f936756711a4267e643fdff15d68310a9c4421b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/gl/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/gl/firefox-121.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "2ea045e690e216289990f3b3bc2bb0fc7080ca885184ff637ae9732768ad842a"; + sha256 = "ce700ae62957204efdb89ce45e49f3fd0eaff54355e1a258cb7cae09bbecd00d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/gn/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/gn/firefox-121.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "5ad75c39f17e4c341d51f50ff128d80efbf1bc4f9b3eff58e3063e5d8378e783"; + sha256 = "cc470351cae294762d170f1fd06c45d8e5fca1cf6363e8721318a29e77134488"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/gu-IN/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/gu-IN/firefox-121.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "293dc4e2a01dd93e5d84632257481adf278ef3f2c2860410ed4ffc0e8b19f513"; + sha256 = "1ce12bbadcfcacf62d72289b7676b8f3737a78de39faa8760b42e34c1d5fab84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/he/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/he/firefox-121.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "846d946394df370fefb5cfa08644789254290795e26c1ca5d851efe8ec61c314"; + sha256 = "a2d302839136f7e09874e73c2094edd75cfa33cb13004410ac2862a96421db32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hi-IN/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/hi-IN/firefox-121.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "f86b0a54cde49cec714775b21ca733c3c550b9b18f64d37562a4cb64cedeabc7"; + sha256 = "1f442324a9263576b8a16c0253fd8975f94540708192082622ed892d37c55350"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hr/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/hr/firefox-121.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b971171c618d7a7793fb7afffb4f6fd0b6f764c0ed839a214911186376460eec"; + sha256 = "339de4338e2a971ee27952d018118a72531a800ef7b16d740c70cece52866c9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hsb/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/hsb/firefox-121.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "2afd51995e4a49e5731ed5bbbbee08aec5f23e11d72ab973eaebfb42704c34d9"; + sha256 = "fc79988f7096bbf1128401be4dcd9fd9f47599c5019c98390d11dfb7f9b67329"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hu/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/hu/firefox-121.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "255487be8c811cd539ff74fe3ed42722f2f55531b581888a98e41785bf9d6481"; + sha256 = "13540683f5cf052c142a3f5f305cfc9c876fe2821e30cb081c1826acb6ad9d34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hy-AM/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/hy-AM/firefox-121.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "38cc75876757aee876f4b7a459793f349f5c8aadeda626cb7a64bd596d50f9c0"; + sha256 = "211c23d439e5426171842cae165cc644a69d43b48b82a18a71cd2f169cf6cd11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ia/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ia/firefox-121.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "7c99f7cc607bff519fc251f792f46c8c171f04febcf5b72a4a2c36df6c212e0e"; + sha256 = "1e5f85f09529466f9c96c449dc111ca2d2f22cdc71e3ea603fccf0eeb2abff21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/id/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/id/firefox-121.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "fd0120401c964cbe4505c6f56433da264c885319545f3ba12a18c79393c5eb0a"; + sha256 = "805cf50848d2648a23bb94a5acb2cdca5b3355f1c7274edc8f38a3064dd67ea3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/is/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/is/firefox-121.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "51c7c492ba3b38692e087c069d06f611e7e4286986c81dd759f6dd6ef98d2033"; + sha256 = "6bf03f07217bf649621e94a62b1e19d31b2254b5123caeb38333ec072c0097b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/it/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/it/firefox-121.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "eb5a21f3b6100fed5324bb39b2e4a2f4733744c19c17d050f805f9626b7a8535"; + sha256 = "7360a2d33da0cc2db29e42737eb30183d674cc4ce61b1b023c98f21953dc27db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ja/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ja/firefox-121.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "44c9d827f5389a4953838ce988d0ac2ac94e28c7b856bcdbb061727741626679"; + sha256 = "02c1c188acf8703cc2ccc1c3a6eb52ee96b6a34689262d41f84e7ad529e080f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ka/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ka/firefox-121.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "8684241c4b9bebb733c6ff0f0753ab39946a077e53eb266b00c52469f63a6e69"; + sha256 = "79c5780e0cb0308e7e4404579a8528cd4e92c2872e0e866f8eb3edb6ba15b149"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/kab/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/kab/firefox-121.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "00e607abd9c18db021cf6579ebfde99e69c2074e6c3c37fd8e1babb11cd8da72"; + sha256 = "95c16ab969b2a774853224abddc0f97ab3896508d4be08adece694311bb809ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/kk/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/kk/firefox-121.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a95590b17f81572d61d9f4953c912cf6d01d2bc269ab69ca76c2718361679810"; + sha256 = "67be9749d7b9b7326825b46fb4bfaa11db2b6912cd145309a4f62534f36abc7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/km/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/km/firefox-121.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "8cb890b9f00dcc3b5941a637bfd7e9870bc8315880559e305c28a890b180ab09"; + sha256 = "6b9d2ed7d7fa1067c0efd5aaecba0013155e1dc8bca3884fdb018ea9b44e5637"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/kn/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/kn/firefox-121.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "2c2f1b23b96d92af24167bb1b15208c83830d6bc8e1445834cea18909885ce85"; + sha256 = "18907950babb49166cf58b8d14fdff7aa9454da27f9b8ed5e8c4987327ec2107"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ko/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ko/firefox-121.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f0c91c806c72764d8c3a0a8d4a53c2f2d8887159c67915c705a67c55d5051d76"; + sha256 = "8ed9fc182742c09de4cbb084d1e651e6882701d7ee9c9867c0152538e1841247"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/lij/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/lij/firefox-121.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "9ade5925615bbbbf67a5a7c4c9981237b3326379aa796e4f624775482bbd0b57"; + sha256 = "203bd75f29b813bab13f32611433859046ffaea9607ecea48b22c278257443ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/lt/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/lt/firefox-121.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6d3e072044a71a8c468728d01a6124cadc31b3b751b21a56d09781dfabc7d464"; + sha256 = "8dc41e56185e1de86602d4ce3943b3b3fbea36d3f7f1d03c50eca419f037e721"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/lv/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/lv/firefox-121.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "088066e9f092405346b21c5b29bf250a667c9118a69d4715dd31eacbe8289c1d"; + sha256 = "c0838180c17bd7bef6e59e2237a1d29934147cf3177ca8a13884c6adf4131ec5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/mk/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/mk/firefox-121.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "073dbc445a4bd79c750d8088524aaabc428ea3f87cf4237d6c26459d558b9a2d"; + sha256 = "bc9f537d1f6ff409d2517000a50e944d668399a085c77e2df183ed5118b20d51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/mr/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/mr/firefox-121.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "84f9a9f15c9d4baea7ac5e7978a9515ae695aca736af063840ac17c840e8419a"; + sha256 = "1522f56cec5621cff7b8ed17bbb39b959205df43f7850f55d93cafdc0d64497b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ms/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ms/firefox-121.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "657baafe8d91ef103977a7aeafe62e072b2c385025689195fc4f11d2318375ea"; + sha256 = "0fcd94a9927d48b19dab829b452574d62809309a7ff438595633981a0d54584f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/my/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/my/firefox-121.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "a1e74c3e264e00cf9fc65527766be4e59bfb9c647d3148e538395f3f44f13cea"; + sha256 = "2af6d2a265949d42f4e3e12219a8d51d0df5d6b745009e88b8806a271e978ef0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/nb-NO/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/nb-NO/firefox-121.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "676ca8c99a8d8c81579a914773b4b4370a09e713056bcf67107743f040bbecad"; + sha256 = "13926023af0438bb2411082b12f9cfe6c8f915de82333d91bfb5590c89db5cb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ne-NP/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ne-NP/firefox-121.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "e3cfbb9b969e0483525bca8f5d92e9cfb4cf7468e92e97a89d6ccbab14659475"; + sha256 = "aba6beda26f42d2f153637d9651233b66f715df15d867da69d36c1707f542786"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/nl/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/nl/firefox-121.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "b8cba7e4eea5b521f01d3eeea05ffc73b8cd5fb5000a8d82882c85998ca28a0e"; + sha256 = "656ec31332aab8d580b58693f2dd918e58b0cfb6515f1b9cddaab405e771f086"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/nn-NO/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/nn-NO/firefox-121.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d25dddf1966ba1e109647d52aa6ffd4ae34bed4fc8d95ed1e1f2ceb8ca115faa"; + sha256 = "36c0191e2399b2787100eed0ce05102fff75246b1aaefb6867494898d484ad0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/oc/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/oc/firefox-121.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "413813ac356cbac6defed52fc2eaa6549bf6a374d3c5bdf7c23705ebf67db594"; + sha256 = "8d22d9c7d301f919dc07581fabbb4ab84bcd9a570c698e209f20a0790120eb4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/pa-IN/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/pa-IN/firefox-121.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "af1e7bc5fa2c0ee798d1897c9de9102ec80f825df942152d8f3ecaf96b30e915"; + sha256 = "119f7b5c1730b396644e0c32d2539e20366b5e915964ec11287b0e012794bdfd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/pl/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/pl/firefox-121.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a6a88455cc8044c204e7797bfbce7c6287a8b95aff3e0476a40a887530d657d6"; + sha256 = "b9c67e208458ffe236bc551d6d7da1ea18093fbcc633c612c15bf19bd37b2a95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/pt-BR/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/pt-BR/firefox-121.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "28b71c9d3a8b71addbb5e25a24339277cea7a377b2fb0c84dec7fcfc099f80bc"; + sha256 = "912207883c316874cc40765d52b5f229addb367c453918f6ddbe1e2ca7f2b38f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/pt-PT/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/pt-PT/firefox-121.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e9f222a3e0f060c9f0fc2f3f4b7ea41f72f281f9021dfce5256dd74a0844f408"; + sha256 = "86a6e19eefa91375a51d8f897f61179aeda1486e365e4eabe68b78a6dd77eead"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/rm/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/rm/firefox-121.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "eb689283673b655a6960d0b38c86d0bcaba991031e7bd3cc81e1ffaf62321082"; + sha256 = "edb883a3206d1e7a1f22840e4180cafd312c7c1aea4c1ecddde47fd6d71cc574"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ro/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ro/firefox-121.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "b7be6d7ff81f3d4f9bc63aadc5f6724e900811a2fb83c1649c73b4b11f06cdb5"; + sha256 = "5fe901c5392095e023acba59b8da3caef7c89ada5874b58c0cb9dfd76c3e8991"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ru/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ru/firefox-121.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "42c5a27358521a2ad1f90d76291c177e059c0bc78a7cf584f0001c171e3af773"; + sha256 = "2c1179bc792f3a598d76f4ed6b082185e79131188b96dc6878b956151dd9f5f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sat/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/sat/firefox-121.0.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "3d8f23c32bf09d082bff8a8e07154efa0f0210463718a1bf17d498a7f2b4f879"; + sha256 = "403656a5c18fc5324c99a11ccb8b7a76067709429bee3e987dcec15a9231cd3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sc/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/sc/firefox-121.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "4cc1ec00e153f85182eac844bf6c502172fd649e5cd19e8d618839bba9e7246d"; + sha256 = "7e1ab0434bdf2f3512d5e438322a7c963130f3876dc3efda09ac072df3c92701"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sco/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/sco/firefox-121.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "b71fc4af5b153ec3e4da3db6ebcd385abe8b6a955f96f2793c480cc43078b417"; + sha256 = "457d7a4fd1a1d47d8a6c3c4f221e04cfdd75c2625f97a0c0c012f356d5a3fc0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/si/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/si/firefox-121.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "1b7d26cb1ee71c05a8a113df8c6ef9918aae9955a05ae0d906f3ab9076de6eff"; + sha256 = "3bfc54906ce1b748c5749d66058670e028e4e71156ef0c3e6b902a9f5ceb56c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sk/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/sk/firefox-121.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "2bdf7ec91a936b81537930c3bc930bf8834460d0cff36db0f18449ce68786e7b"; + sha256 = "e07ee130f5061c5ef7d865fdafa0925cf1988f1d059dd705d1dc6d1f557fe243"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sl/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/sl/firefox-121.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "a90210e59f2afda7b59518d774de6c2fb9f138a01091cad03492ed02db2c0a22"; + sha256 = "1a749df70aada6e5a927c7b43ba91536c046e6d2f887a2a84b9e391929a77694"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/son/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/son/firefox-121.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "fc8c11313be82e4de14de176e2610c10b7aa7ec2f193f5a879a731ba54839957"; + sha256 = "177817eff1e25128cfa027396ae99948577212bb7068e52275286b11abc6257f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sq/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/sq/firefox-121.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "344f7ebd334d4abdfdcf259f770309f5d8dd748cdf865efdc4d871a328c4dd39"; + sha256 = "ab824b17f55dacf6e568300af4e81856ef71e654cee481df30962c51198ff0b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sr/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/sr/firefox-121.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "84e7a59e98afcfe6e14948c937c446f060cebe87b70a852baa0cb40bba55e5fe"; + sha256 = "95c12ffb4e8ac50b3bfa823dc062ee0ed598900900c19e2f561389245a054681"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sv-SE/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/sv-SE/firefox-121.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f0678a5c33b960912457fa6619228659cdbb8a35a98a7b783c03b8c52fcf6e6d"; + sha256 = "e9affb84a718a326c3ffe33435fb75d0ebe669d713128e6592bd117ff97b5d18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/szl/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/szl/firefox-121.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "794046dd28fa390ff8ec62576d37dbbd53ef561f24084ccd385b6ff2f1324fd9"; + sha256 = "ea79f2cb5c4a6fa99f85314f52d2ead9e247e443853750e6779d912da5d2a33a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ta/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ta/firefox-121.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "f78369a5bed86718908c927d3ac91b94096e0932b89903fca3ca353089ce6102"; + sha256 = "2b50e20c6a1ae24651a1b9363fba339fd50bff0aef47005a19ad9b7b15d1a5b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/te/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/te/firefox-121.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "664ed5133a28e8715019a0f890086f6627ce6887f23b0e1997b7fd3e5b3a1665"; + sha256 = "ef4d6478854c8d643ea33c77e702a4bfdefead93965891d962f65ce7d2889b5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/tg/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/tg/firefox-121.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "81e960ef12b82ae057f21bac6695fcb8609afba040542e0792de9692fe543524"; + sha256 = "cb83d6a083d66f1a57477ccd8e3e94e7ac899ede10a7acae4a83f32da3ca172f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/th/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/th/firefox-121.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b07d2c4d795a7d5829b375573a562ed23a503d31ff914d2a05edfff381de3674"; + sha256 = "32b28399d0fe0678f89ecc65a0fa3c892d681e4ed39acb82cd672166edb29670"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/tl/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/tl/firefox-121.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "14cc86f160b201ff66dab3f54fe0604b099fe4ed4cacfb3c8c5420fb75aea05c"; + sha256 = "1c828ad1418d650c5006ab2bd7d133d77b807266512fda81dc93d2342f362153"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/tr/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/tr/firefox-121.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "a3c6e8ca647ff56f8447f148f28c9afacba8446cb17165be7a1d8ad38381c1c7"; + sha256 = "649615224be67242c5f3bccae51717080cfdd3b1200f5e6568727b735c70e0aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/trs/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/trs/firefox-121.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "2d517436bb9b417882a362037ab0a096a1e25e7c3f7a40e68e564c19e9eca947"; + sha256 = "01a38f360175f49dceb29aa22631d9003a0a20910b4d386dcfeb45dbba6adebf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/uk/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/uk/firefox-121.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "144da484cd8cde4f50dee471b8299de445932fd1f0cc4585a00533ac0fe3114e"; + sha256 = "437d15bbd1c7b8e5b8653057960c27aa6939da79227b8235e51668499a37fa3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ur/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/ur/firefox-121.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "3417edecd2eb4735a48a0e71429cc866a9b15e37d7fec99ecea793e83072028f"; + sha256 = "8811ed01323278ee2c1ee9517509d5c977ef95cd87dd956a9664d6d399350d85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/uz/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/uz/firefox-121.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "cf1a58caf9c3e03435923e4bc368d4d95496793187db7cd2f1d0da81be962a57"; + sha256 = "121703f75f8ac5e0c0d62001bce1c6e2a45e91d2da379153f722d03d3eef3616"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/vi/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/vi/firefox-121.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d8a1eee3e1fc31d70c86a4879e1977c88ea92abf58e7117936e6f9b9ca73e34d"; + sha256 = "d2b3f04d9cdfd262b2f27b4ef13275eea9bcaa8bc7ecb66005ebb0af67f72629"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/xh/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/xh/firefox-121.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "626cdc3529f9304d6e37c9885f57d77d11db4c633462e746975158d465933a33"; + sha256 = "54409f2bc668e2808b65fba77b68e9a703c32053dac64a738cedf381d2069c79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/zh-CN/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/zh-CN/firefox-121.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4a8c35174fc46de73257d4c75dc3f43f85cf56961b9e80464cbbe5da2b13f8a4"; + sha256 = "65717053ac51b68d0bd25ada7f6d63030cdf56ab10363faac69c3674a6e09092"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/zh-TW/firefox-120.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/121.0/linux-i686/zh-TW/firefox-121.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "2fabc12704373d685862155e8869e078dd819c99f286eeef6f8de20de740fd59"; + sha256 = "d98f30218f9384925301bc36249602ef38111a5a94f5a18378196a8e18b01273"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f43eaab9fa00a..81aaf519453a0 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 = "120.0.1"; + version = "121.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "dd0e3eb234d58c39431d1f100834ef4bcc8cfb89ff471a37b948eda4dd3874b63b1979cda39a0db0dd3b4a579b5f09a7d2d1f39d26fd9f2b8d5635e4b8738b6c"; + sha512 = "52e9e21ce825c4e58f09fd2c7347f1ac4efbca47e119136a712f0d4ee80c769ef80a43bad74a4c88cd377f804f5780b07f7af5b779f3fb5d244fa095e6b3b18a"; }; extraPatches = [ @@ -33,11 +33,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "121.0b5"; + version = "121.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1c9d2e8fe32687e95af5cf335ef219e70847977568ca636a322c2804f6408d054236df4196e03fc666ac3245ca4a3a9785caf56e1d928a1850f4b34ab5237f8c"; + sha512 = "a107ba7127f40763325335136c5aeaf6d873dd9ca1c8ca95d93e96b377b41a0974056c84e8323c51ed57e01a2e4ef9996ef2ee2d804053aa2226bd837026523a"; }; meta = { @@ -62,13 +62,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "121.0b5"; + version = "121.0b9"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "cf23b18abece88f4cee418892791a8a4076ccc14cfe0f1d58f9284ec72f109e44a5397a88b4350f963a3e02e53dd91d7b777c36debd9a3621081499519659f6e"; + sha512 = "732c2b3f1e47512bee9af696e8763ce13b39497a6ec9af0de9904ce4f55b03bc799e628e17e84ce7062ebd5a7dc50290fbbfa17b0f41622ce5088f1d548897b5"; }; meta = { @@ -94,11 +94,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.5.0esr"; + version = "115.6.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "5ee722884cd545cf5146f414526b4547286625f4f5996a409d7f64f115633fb7eb74d202e82f175fd5b2d24cce88deee70020fcb284055fcdea3d39da182074e"; + sha512 = "9fe23b5f715e35b788d9c8fefe6b7be8785789b4ae6f5649b05a54221934101c6e1b9580319145f9bcaebfbd00fcc33e97afb63f7d57ba102a6b02c874d324af"; }; meta = { diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 9b90f94dbcacf..9e2bba5b4807f 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,19 +7,19 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.6.0"; + packageVersion = "11.7.1"; applicationName = "Floorp"; binaryName = "floorp"; # Must match the contents of `browser/config/version.txt` in the source tree - version = "155.5.0"; + version = "115.6.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-5OQZckST6l9OZ7jnj52nuALCWiH1hVdDoDHSpqwUUfA="; + hash = "sha256-1GxWqibUR10gz0TjQuCtFntlxoNkq4CY5Yt/4FcIDDQ="; }; extraConfigureFlags = [ diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 6375e074a34aa..e4c3442c47489 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.17.4"; + version = "1.17.5"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-vzdlcyA+RCr8RH0KbTiUah8lS++Xq6gLCHbgHHBFEig="; + hash = "sha256-q50r0jH7opIh3r08jAwYmFWl1e/x9qVL+mUEf8JVfuc="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 65ce8374f3578..89856df00ed4f 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "120.0.1-1", + "packageVersion": "121.0-1", "source": { - "rev": "120.0.1-1", - "sha256": "0kvfa97m7dq1b030d62zblpb445fkbgb2w19bckxwxv7mx36awy7" + "rev": "121.0-1", + "sha256": "1vd4vz4i27p1lwx5ibaxqf7r1ll5zlvf54n6mqmaya3q0lrawb14" }, "settings": { - "rev": "9dac02778ebed3e2614da52c36b7cede45f4f602", - "sha256": "0flk6v50cyiaajzcz9gm1hig00vkw9xdbjd5rdxidrmhcqxy24vy" + "rev": "41623492f2b6970972014f6ce196015d3d7f1b59", + "sha256": "0ayyyw44q0gh668bzlv6cfl7baa0818bnz83g53l5j2f10xd52by" }, "firefox": { - "version": "120.0.1", - "sha512": "dd0e3eb234d58c39431d1f100834ef4bcc8cfb89ff471a37b948eda4dd3874b63b1979cda39a0db0dd3b4a579b5f09a7d2d1f39d26fd9f2b8d5635e4b8738b6c" + "version": "121.0", + "sha512": "52e9e21ce825c4e58f09fd2c7347f1ac4efbca47e119136a712f0d4ee80c769ef80a43bad74a4c88cd377f804f5780b07f7af5b779f3fb5d244fa095e6b3b18a" } } diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 5794a04489daa..3ab9e53b209c7 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.4"; + version = "13.0.7"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-qK67rf9zkMA53WFIcMCsPUH4m6YkMVqAUsHiGsy/xN4="; + hash = "sha256-8x0Qa+NasMq1JdrVnCWlCyPb+5UpJXK1VLFoY9lx+8Q="; }; }; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c8b315893a52a..62465e5efd2fb 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -18,15 +18,15 @@ let isQt6 = lib.versions.major qtbase.version == "6"; pdfjs = let - version = "3.9.179"; + version = "4.0.269"; in fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; - hash = "sha256-QoJFb7MlZN6lDe2Yalsd10sseukL6+tNRi6JzLPVBYw="; + hash = "sha256-8gwJUxygcdvERDni/k6WIx3tzk7yb+qHZ4NsfkP0VDo="; stripRoot = false; }; - version = "3.0.2"; + version = "3.1.0"; in python3.pkgs.buildPythonApplication { @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication { inherit version; src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-pRiT3koSNRmvuDcjuc7SstmPTKUoUnjIHpvdqR7VvFE="; + hash = "sha256-UA3MHMoI1rC4FPowbiII4lM1rL4OLPmZ+1GRbg9LLl8="; }; # Needs tox @@ -117,6 +117,7 @@ python3.pkgs.buildPythonApplication { --set-default QSG_RHI_BACKEND vulkan ''} ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''} + --set QTWEBENGINE_RESOURCES_PATH "${qtwebengine}/resources" ) ''; diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index ce72abe79e7bf..9cc75e58d0285 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -1,8 +1,12 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , makeDesktopItem +, copyDesktopItems +, makeWrapper , writeText , autoPatchelfHook +, wrapGAppsHook , callPackage , atk @@ -33,6 +37,9 @@ , libdrm , libGL +, mediaSupport ? true +, ffmpeg + , audioSupport ? mediaSupport , pipewireSupport ? audioSupport @@ -46,18 +53,6 @@ , libvaSupport ? mediaSupport , libva -# Media support (implies audio support) -, mediaSupport ? true -, ffmpeg - -# Wrapper runtime -, coreutils -, glibcLocales -, gnome -, runtimeShell -, shared-mime-info -, gsettings-desktop-schemas - # Hardening , graphene-hardened-malloc # Whether to use graphene-hardened-malloc @@ -106,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.5"; + version = "13.0.8"; sources = { x86_64-linux = fetchurl { @@ -116,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-WZq8ig62Mu3q6OrVSaPbe6MLQ6pvFNo3yQMXC7PCGJY="; + hash = "sha256-eD+c4ACgWajmfMiqqk5HC30uJiqfNqvASepVoO7ox2w="; }; i686-linux = fetchurl { @@ -126,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-/enIdKLMRmJIjwXEo0i3hgHZKEtWaBgFzE1rtZMsqeY="; + hash = "sha256-ZQ0tSPyfzBWy27lX5+zI3Nuqqz5ZUv1T6lzapvYHc7A="; }; }; @@ -149,7 +144,7 @@ stdenv.mkDerivation rec { src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook copyDesktopItems makeWrapper wrapGAppsHook ]; buildInputs = [ gtk3 alsa-lib @@ -160,15 +155,15 @@ stdenv.mkDerivation rec { preferLocalBuild = true; allowSubstitutes = false; - desktopItem = makeDesktopItem { + desktopItems = [(makeDesktopItem { name = "torbrowser"; - exec = "tor-browser"; - icon = "torbrowser"; + exec = "tor-browser %U"; + icon = "tor-browser"; desktopName = "Tor Browser"; genericName = "Web Browser"; comment = meta.description; categories = [ "Network" "WebBrowser" "Security" ]; - }; + })]; buildPhase = '' runHook preBuild @@ -191,6 +186,9 @@ stdenv.mkDerivation rec { # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path mv firefox.real firefox + # store state at `~/.tor browser` instead of relative to executable + touch "$TBB_IN_STORE/system-install" + # The final libPath. Note, we could split this into firefoxLibPath # and torLibPath for accuracy, but this is more convenient ... libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor @@ -214,7 +212,6 @@ stdenv.mkDerivation rec { sed -i TorBrowser/Data/Tor/torrc-defaults \ -e "s|\(ClientTransportPlugin snowflake\) exec|\1 exec $interp|" - # Prepare for autoconfig. # # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment @@ -228,12 +225,11 @@ stdenv.mkDerivation rec { cat >mozilla.cfg <<EOF // First line must be a comment - // Always update via Nixpkgs - lockPref("app.update.auto", false); - lockPref("app.update.enabled", false); - lockPref("extensions.update.autoUpdateDefault", false); - lockPref("extensions.update.enabled", false); - lockPref("extensions.torbutton.versioncheck_enabled", false); + // Reset pref that captures store paths. + clearPref("extensions.xpiState"); + + // Stop obnoxious first-run redirection. + lockPref("noscript.firstRunRedirection", false); // User should never change these. Locking prevents these // values from being written to prefs.js, avoiding Store @@ -241,12 +237,6 @@ stdenv.mkDerivation rec { lockPref("extensions.torlauncher.torrc-defaults_path", "$TBB_IN_STORE/TorBrowser/Data/Tor/torrc-defaults"); lockPref("extensions.torlauncher.tor_path", "$TBB_IN_STORE/TorBrowser/Tor/tor"); - // Reset pref that captures store paths. - clearPref("extensions.xpiState"); - - // Stop obnoxious first-run redirection. - lockPref("noscript.firstRunRedirection", false); - // Insist on using IPC for communicating with Tor // // Defaults to creating \$XDG_RUNTIME_DIR/Tor/{socks,control}.socket @@ -269,18 +259,12 @@ stdenv.mkDerivation rec { ''} EOF - # Hard-code path to TBB fonts; see also FONTCONFIG_FILE in - # the wrapper below. + # FONTCONFIG_FILE is required to make fontconfig read the TBB + # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 + # indicates the system fonts.conf being used instead. FONTCONFIG_FILE=$TBB_IN_STORE/fontconfig/fonts.conf sed -i "$FONTCONFIG_FILE" \ - -e "s,<dir>fonts</dir>,<dir>$TBB_IN_STORE/fonts</dir>," - - # Preload extensions by moving into the runtime instead of storing under the - # user's profile directory. - # See https://support.mozilla.org/en-US/kb/deploying-firefox-with-extensions - mkdir -p "$TBB_IN_STORE/distribution/extensions" - mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \ - "$TBB_IN_STORE/distribution/extensions" + -e "s,<dir>fonts</dir>,<dir>$TBB_IN_STORE/fonts</dir>," # Hard-code paths to geoip data files. TBB resolves the geoip files # relative to torrc-defaults_path but if we do not hard-code them @@ -291,156 +275,20 @@ stdenv.mkDerivation rec { GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6 EOF - WRAPPER_LD_PRELOAD=${lib.optionalString (useHardenedMalloc == true) - "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} - - WRAPPER_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ - gnome.adwaita-icon-theme - shared-mime-info - ]} - WRAPPER_XDG_DATA_DIRS+=":"${lib.concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ - glib - gsettings-desktop-schemas - gtk3 - ]}; - - # Generate wrapper mkdir -p $out/bin - cat > "$out/bin/tor-browser" << EOF - #! ${runtimeShell} - set -o errexit -o nounset - - PATH=${lib.makeBinPath [ coreutils ]} - export LC_ALL=C - export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive - - # Enter local state directory. - REAL_HOME=\''${HOME%/} - TBB_HOME=\''${TBB_HOME:-''${XDG_DATA_HOME:-\$REAL_HOME/.local/share}/tor-browser} - HOME=\$TBB_HOME - - mkdir -p "\$HOME" - cd "\$HOME" - - # Initialize empty TBB local state directory hierarchy. We - # intentionally mirror the layout that TBB would see if executed from - # the unpacked bundle dir. - mkdir -p "\$HOME/TorBrowser" "\$HOME/TorBrowser/Data" - - # Initialize the Tor data directory. - mkdir -p "\$HOME/TorBrowser/Data/Tor" - - # TBB will fail if ownership is too permissive - chmod 0700 "\$HOME/TorBrowser/Data/Tor" - - # Initialize the browser profile state. - # All files under user's profile dir are generated by TBB. - mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default" - - # Clear some files if the last known store path is different from the new one - : "\''${KNOWN_STORE_PATH:=\$HOME/known-store-path}" - if ! [ "\$KNOWN_STORE_PATH" -ef $out ]; then - echo "Cleanup files with outdated store references" - ln -Tsf $out "\$KNOWN_STORE_PATH" - - # Clear out some files that tend to capture store references but are - # easily generated by firefox at startup. - rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{addonStartup.json.lz4,compatibility.ini,extensions.ini,extensions.json} - rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/startupCache/* - fi - - # XDG - : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" - : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}" - - ${lib.optionalString pulseaudioSupport '' - # Figure out some envvars for pulseaudio - : "\''${PULSE_SERVER:=\$XDG_RUNTIME_DIR/pulse/native}" - : "\''${PULSE_COOKIE:=\$XDG_CONFIG_HOME/pulse/cookie}" - ''} - - # Font cache files capture store paths; clear them out on the off - # chance that TBB would continue using old font files. - rm -rf "\$HOME/.cache/fontconfig" - # Manually specify data paths (by default TB attempts to create these in the store) - { - echo "user_pref(\"extensions.torlauncher.toronionauthdir_path\", \"\$HOME/TorBrowser/Data/Tor/onion-auth\");" - echo "user_pref(\"extensions.torlauncher.torrc_path\", \"\$HOME/TorBrowser/Data/Tor/torrc\");" - echo "user_pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/TorBrowser/Data/Tor\");" - } >> "\$HOME/TorBrowser/Data/Browser/profile.default/prefs.js" - - # Lift-off - # - # XAUTHORITY and DISPLAY are required for TBB to work at all. - # - # DBUS_SESSION_BUS_ADDRESS is inherited to avoid auto-launch; to - # prevent that, set it to an empty/invalid value prior to running - # tor-browser. - # - # PULSE_SERVER is necessary for audio playback. - # - # Setting FONTCONFIG_FILE is required to make fontconfig read the TBB - # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 - # indicates the system fonts.conf being used instead. - # - # XDG_DATA_DIRS is set to prevent searching system dirs (looking for .desktop & icons) - exec env -i \ - LD_PRELOAD=$WRAPPER_LD_PRELOAD \ - \ - TZ=":" \ - TZDIR="\''${TZDIR:-}" \ - LOCALE_ARCHIVE="\$LOCALE_ARCHIVE" \ - \ - TMPDIR="\''${TMPDIR:-/tmp}" \ - HOME="\$HOME" \ - XAUTHORITY="\''${XAUTHORITY:-\$HOME/.Xauthority}" \ - DISPLAY="\''${DISPLAY:-}" \ - DBUS_SESSION_BUS_ADDRESS="\''${DBUS_SESSION_BUS_ADDRESS:-unix:path=\$XDG_RUNTIME_DIR/bus}" \\ - \ - XDG_DATA_HOME="\$HOME/.local/share" \ - XDG_DATA_DIRS="$WRAPPER_XDG_DATA_DIRS" \ - \ - PULSE_SERVER="\''${PULSE_SERVER:-}" \ - PULSE_COOKIE="\''${PULSE_COOKIE:-}" \ - \ - MOZ_ENABLE_WAYLAND="\''${MOZ_ENABLE_WAYLAND:-}" \ - WAYLAND_DISPLAY="\''${WAYLAND_DISPLAY:-}" \ - XDG_RUNTIME_DIR="\''${XDG_RUNTIME_DIR:-}" \ - XCURSOR_PATH="\''${XCURSOR_PATH:-}" \ - \ - APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \ - \ - TOR_SKIP_LAUNCH="\''${TOR_SKIP_LAUNCH:-}" \ - TOR_CONTROL_HOST="\''${TOR_CONTROL_HOST:-}" \ - TOR_CONTROL_PORT="\''${TOR_CONTROL_PORT:-}" \ - TOR_CONTROL_COOKIE_AUTH_FILE="\''${TOR_CONTROL_COOKIE_AUTH_FILE:-}" \ - TOR_CONTROL_PASSWD="\''${TOR_CONTROL_PASSWD:-}" \ - TOR_SOCKS_HOST="\''${TOR_SOCKS_HOST:-}" \ - TOR_SOCKS_PORT="\''${TOR_SOCKS_PORT:-}" \ - \ - FONTCONFIG_FILE="$FONTCONFIG_FILE" \ - \ - LD_LIBRARY_PATH="$libPath" \ - \ - "$TBB_IN_STORE/firefox" \ - --class "Tor Browser" \ - -no-remote \ - -profile "\$HOME/TorBrowser/Data/Browser/profile.default" \ - "\''${@}" - EOF - chmod +x $out/bin/tor-browser + makeWrapper "$TBB_IN_STORE/firefox" "$out/bin/tor-browser" \ + --prefix LD_PRELOAD : "${lib.optionalString (useHardenedMalloc == true) + "${graphene-hardened-malloc}/lib/libhardened_malloc.so"}" \ + --prefix LD_LIBRARY_PATH : "$libPath" \ + --set FONTCONFIG_FILE "$FONTCONFIG_FILE" \ + --set-default MOZ_ENABLE_WAYLAND 1 # Easier access to docs mkdir -p $out/share/doc ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser - # Install .desktop item - mkdir -p $out/share/applications - cp $desktopItem/share/applications"/"* $out/share/applications - sed -i $out/share/applications/torbrowser.desktop \ - -e "s,Exec=.*,Exec=$out/bin/tor-browser," \ - -e "s,Icon=.*,Icon=tor-browser," + # Install icons for i in 16 32 48 64 128; do mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps/ ln -s $out/share/tor-browser/browser/chrome/icons/default/default$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/tor-browser.png @@ -451,8 +299,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null echo "Checking tor-browser wrapper ..." - TBB_HOME=$(mktemp -d) \ - $out/bin/tor-browser --version >/dev/null + $out/bin/tor-browser --version >/dev/null runHook postBuild ''; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index e870ab51c8791..a734a4a3b56eb 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.4.3160.42"; + version = "6.5.3206.39"; suffix = { aarch64-linux = "arm64"; @@ -34,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-DQXlINbgZmYdmrp/VeWloWFk2REPMyWUaJkMVl0wDho="; - x86_64-linux = "sha256-udzdWNG0B9SidaOPsAOzkoviB3kwjaNCPZkSSIpLXNI="; + aarch64-linux = "sha256-7f3JRkkBGF+7EFGbzosUcKUUFswmKhpacbcd0AaY8fw="; + x86_64-linux = "sha256-louqE7Icf8qEiegzoVd/1jzA+wLFTrQyN3V8g64uQT8="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/cluster/acorn/default.nix b/pkgs/applications/networking/cluster/acorn/default.nix index 4b6e44ab020f4..decafe8602e68 100644 --- a/pkgs/applications/networking/cluster/acorn/default.nix +++ b/pkgs/applications/networking/cluster/acorn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "acorn"; - version = "0.8.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "acorn-io"; repo = pname; rev = "v${version}"; - hash = "sha256-ZS3YxXgMSu8+eRnpqrtaBTQIlSY3cscudcTbztiRsbM="; + hash = "sha256-l9V6URc5wY30z6W76n3xrGMHC43kDWfx0+1eznmcVi4="; }; - vendorHash = "sha256-jkkzlMc2y8HvPZjpmRIQz64JK5yjhdoJevE0dclBHvA="; + vendorHash = "sha256-EJ66rX0Pv6KG9wiEZq1POf6CODbENP/LbS6qZkn3XWs="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/applications/networking/cluster/aiac/default.nix index 92f04fa888152..8b9b3fcc8b7af 100644 --- a/pkgs/applications/networking/cluster/aiac/default.nix +++ b/pkgs/applications/networking/cluster/aiac/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "aiac"; - version = "2.5.0"; + version = "4.0.0"; excludedPackages = [".ci"]; src = fetchFromGitHub { owner = "gofireflyio"; repo = pname; rev = "v${version}"; - hash = "sha256-BCcoMftnvfAqmabnSz/oRAlJg95KJ236mduxV2DfRG4="; + hash = "sha256-OXqHZlVo1rFt/hJbc14faXTbckLx9CvsL131qj6G1dw="; }; - vendorHash = "sha256-Uqr9wH7hCLdZEu6DXddgB7NuLtqcjUbOPJ2YX+9ehKM="; - ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v3/libaiac.Version=v${version}" ]; + vendorHash = "sha256-JWQQUB4/yIDGzWeshtcWnkXQS7jYcDHwG/tef6sBizQ="; + ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v4/libaiac.Version=v${version}" ]; meta = with lib; { description = ''Artificial Intelligence Infrastructure-as-Code Generator.''; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 6417ebca951ab..27b466f2f2619 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildGoModule -, buildGoPackage , fetchFromGitHub , installShellFiles , pkgsBuildBuild diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 1764bf610eb53..b6722b9c49af5 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.9.1"; + version = "2.9.3"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-5oSuExdkP+69AJD5U74yLD4e+5pvbFOY6T9mcKnJ5Jw="; + hash = "sha256-GaY4Cw/LlSwy35umbB4epXt6ev8ya19UjHRwhDwilqU="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-/MmcWusqgEe8KEJcEBOqOkv1lJb06R3TKYFk4wvdWHk="; + vendorHash = "sha256-2TNBbxNX4HGdRqbOEDrLBkWgw+0lyIrdxnVcbip3N6c="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 9c5225eb1b4bf..39f5f70988c51 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.15"; + version = "0.10.20"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-1r/f3CoTaOA2ZfM9UBGftZDZdCL9JIrs6SvaSO8BI6w="; + hash = "sha256-aOJ07Ks+J7cDvF3InKGYx4dJAql9ltJQqa8P+4cKhNk="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index 41dd4cbb08b97..cc826faf11f18 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.5.0"; + version = "7.5.1"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LWfS722V0ubh4QaUNuGwrvFsVAzA9Hd5xLlDfTG0PBs="; + sha256 = "sha256-rgqs7L0V4OFOfHZw6poS/DxcCgxmcKZAc3TAal7B8FA="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 0a7f5178ef19e..80f67b3a1bde8 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.15.12"; + version = "0.15.19"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-Js//4dB8b3w9AOvMhXt91G87FzQ8jHq3W3pJHzLbluA="; + hash = "sha256-52i3Ek/rXFF9rMMiXNMnRjT2HYsknGKvVtCRrVDmo9U="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index aaf76d727c62b..e21685747b9bd 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.69"; + version = "1.0.70"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-gecvS7Vwg1TQTjbDsKrwnf5/eA7XOnIvb6xw8MZDUkU="; + sha256 = "sha256-QhCyGeK/j3oKjJM1XhCcXXAKK+jnTksmpoDox8vjF8Y="; }; - vendorHash = "sha256-cJIdF+zujftCIBzzzUpXLUWXCP4+n+gSaPJsatEQuOs="; + vendorHash = "sha256-BE5CxzpY82VBn7/YlHr8FQy7UOzcVQe23naUU/9SxZ4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 84f0e51884666..cc7286dbd301e 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.5"; + version = "8.7.7"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-saGtll+feAZ3eQGMHN4XcI+eSkfniTfsEHNN+tABmR4="; + sha256 = "sha256-WPZLINtjH+VuWlXX1XNeSuasxn+UI89Klrehg806kvI="; }; - vendorHash = "sha256-OjgZHN/57CmWmpOXqRFVf+duVCy26hg4lbSkDHgsV44="; + vendorHash = "sha256-ZQSbupcY+Uc8tYWZY/hYBaeaNxYuSOOIo0v9e5Ax0m0="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 30710a814652d..9249b324202d8 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-yACUJY//y1nqu0PfmCuREC8k/koJEB6yPV5IXLnweB0="; + hash = "sha256-EzJl4BfjRFzj7Qq3bc7rQlD7D1xnb6zIr2wgeaZ9Dhk="; }; - vendorHash = "sha256-wOf9OWbqjxYJio57lMBdp77RG5hhRrVU75iJiI8g0EM="; + vendorHash = "sha256-wSjd40rvrtpsE+wF3u3b+IRehksJOuRLThLuYOOHaAY="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 5d2804251146c..14afe56caf4f3 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "cmctl"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - hash = "sha256-TfFdHKXbbi0yqvyQjZArY9GbkwjUq1Z00UuNAldyDuc="; + hash = "sha256-bmlM5WyJd5EtL3e4mPHwCqoIyDAgN7Ce7/vS6bhVuP0="; }; sourceRoot = "${src.name}/cmd/ctl"; - vendorHash = "sha256-63XxGvVsIRDpQ0ri6VkjciyD+k7eEMBcg0w8NU8ypYs="; + vendorHash = "sha256-PQKPZXgp6ggWymVBOErmLps0cilOsE54t108ApZoiDQ="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 8421c3157e5e7..1db39c3cf007f 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - hash = "sha256-cbmG9wK3yd79jCiNAKcSSx0COyh6CxR1bgIiCO3i++g="; + hash = "sha256-goXpNpb5tVOHeskRLw3CivYett3RxYBREAI+S74CMFQ="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 821921d418bfe..707fbbbd6372a 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -7,9 +7,9 @@ }: let - version = "2.1.2"; - sha256 = "1k47wjfyhkfn4v5cpfwfgb8ypcsiaml2cxwbwasis926wda37gzk"; - manifestsSha256 = "1imwvm85p5m9s05vmjvqql2hbkrj4m5cy87212ghybaricklcx6a"; + version = "2.2.2"; + sha256 = "0d4sf1b0dddcarngr4dllhbbyjajpf1byv9cf7nx9040i80vk56p"; + manifestsSha256 = "1ixdzgaw3mrkwbazfbx0vc04z4rsyyyj5dsck15dv5kkvhi304lg"; manifests = fetchzip { url = @@ -29,7 +29,7 @@ in buildGoModule rec { inherit sha256; }; - vendorHash = "sha256-4srEYBI/Qay9F0JxEIT0HyOtF29V9dzdB1ei4tZYJbs="; + vendorHash = "sha256-jbhxSeLjgNmj2wCZao4DkQ57GvpYKlUyy7xdNKN1nWc="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index ce52fdb6a3557..d3b7a9e1a003c 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.15.16"; + version = "1.15.18"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-GsT9ffQdLDxckKyf9U0sWZBf388o6ee9clrUuLJT/bA="; + hash = "sha256-oHwo0I3OFfilLg2tlL0EycTo6BC7LYbzg7dxgfz/XeI="; }; - vendorHash = "sha256-/JliAQtUd8fbKThqkwC4u4XNawXhoZaV1XdJRciJxmw="; + vendorHash = "sha256-MrTiZCvYUmdX4sK85jeeQpUupvitH6PfbQ+RfwELaV4="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 928acfa935a2b..cb6ddb0015202 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.13.2"; + version = "3.13.3"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-WXtEXgKco50D1TR775lIm/VuD+MJMbOMQpPC0W4MAYo="; + sha256 = "sha256-tU6RdVdcOvNYgnVmeDVKVuKY5GLeqVzpleq6qNwD2yI="; }; - vendorHash = "sha256-kvler6o4On4SbFF7AvPSCF5fRYtPNI5fsOcUbrTGYcQ="; + vendorHash = "sha256-ve2T2O9cISshAe5uAyXYZ6Mbb1TPhOqhV8vkF5uMrhY="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 8967550b4d0ed..f623ed21e31ba 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.159.0"; + version = "0.160.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-7RFDa8Yw2tPjVvJLVPb7VbDNhrHNxzqmE0uogm7X/HY="; + sha256 = "sha256-sPHEYhKiKzB5MYylWeHKpVjjXbDsWbg99TKqT/d3uJ0="; }; - vendorHash = "sha256-kVr6h5u71RimRER6tNxZUewSqqjaAPptriD5bfsE85U="; + vendorHash = "sha256-LkmPytmXrense/M0erBkxeQ7XXGlHDLY1yedsOxk4+E="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index 54211aa5421ab..7160da0f63e80 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hubble"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nnW0dLFPHex4fYJeBPFy8SP7Uc6cs5eN+dv0kIfCUYs="; + sha256 = "sha256-GVfPrKPX/y/trtZjIftUW1bH5Z/O/oIUoIjjEET38Mk="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index a442142383095..8aa3656007efc 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,25 +2,25 @@ buildGoModule rec { pname = "istioctl"; - version = "1.18.2"; + version = "1.20.1"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-eSftWXwV8W/mpxZNvUUDS27z3vU36vJj/z0/Wo5qEts="; + hash = "sha256-baY9O2F5qte6v8HM905VYdvqQZxkTSeu3ydB4Y4UM4E="; }; - vendorHash = "sha256-tuiQ11pcfoTOu+OVey+YmU4tTOj5C7p5bKP2ylEkUug="; + vendorHash = "sha256-QEP7qG3RLVhEGsNJU0r/grVrcepouAC8usL9nLeaJFs="; nativeBuildInputs = [ installShellFiles ]; # Bundle release metadata ldflags = let attrs = [ - "istio.io/pkg/version.buildVersion=${version}" - "istio.io/pkg/version.buildStatus=Nix" - "istio.io/pkg/version.buildTag=${version}" - "istio.io/pkg/version.buildHub=docker.io/istio" + "istio.io/istio/pkg/version.buildVersion=${version}" + "istio.io/istio/pkg/version.buildStatus=Nix" + "istio.io/istio/pkg/version.buildTag=${version}" + "istio.io/istio/pkg/version.buildHub=docker.io/istio" ]; in ["-s" "-w" "${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 2d0854ba365ed..05294c0d437bd 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -41,7 +41,7 @@ buildGo121Module rec { description = "A bootstrapping and management tool for k0s clusters."; homepage = "https://k0sproject.io/"; license = licenses.asl20; - mainProgram = pname; + mainProgram = "k0sctl"; maintainers = with maintainers; [ nickcao qjoly ]; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix index abe8e933d11e9..a6e40bbcead67 100644 --- a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.27.7+k3s2"; - k3sCommit = "575bce7689f4be112bd0099362fb8d5f2e39398e"; - k3sRepoSha256 = "1k8hmxdc45pxwkpkq3y1jpx1ybv1h9y4sk7zb09y0487jqqgd15f"; - k3sVendorHash = "sha256-IqnBau4uBIN8ccnoX1P3ud8ZoMR3BjhchLU32tq0YWQ="; + k3sVersion = "1.27.8+k3s2"; + k3sCommit = "02fcbd1f57f0bc0ca1dc68f98cfa0e7d3b008225"; + k3sRepoSha256 = "02g741b43s2ss1mdjnrs7fx4bhv9k55k4n350h9qp5jgqg8ldbdi"; + k3sVendorHash = "sha256-mCPr+Y8wiWyW5T/iYH7Y4tz+nrqGyD2IQnIFd0EgdjI="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/pkgs/applications/networking/cluster/k8sgpt/default.nix b/pkgs/applications/networking/cluster/k8sgpt/default.nix index 69e8427be0279..87afcd7bdf797 100644 --- a/pkgs/applications/networking/cluster/k8sgpt/default.nix +++ b/pkgs/applications/networking/cluster/k8sgpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "k8sgpt"; - version = "0.3.19"; + version = "0.3.24"; src = fetchFromGitHub { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${version}"; - hash = "sha256-yXlcTU0efgjcWy4nlhEIjd9dzErKyAW9gFhacOXv6pA="; + hash = "sha256-GxZDbG2G+TFd2lPpEqP1hIDXFJDOLh4Y7yZsHodok/c="; }; - vendorHash = "sha256-/yibMktAzoUCGED8oJWmNZJxOY0UM0zMl4Qww6olOZY="; + vendorHash = "sha256-N/Qd51EmvTWy48Pj+UywBCRDG+k2zd6NTzGGm4jNyjQ="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index b58ef4fa08b52..124431b8dfc48 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,17 +2,18 @@ buildGoModule rec { pname = "k9s"; - version = "0.28.2"; + version = "0.30.4"; src = fetchFromGitHub { - owner = "derailed"; - repo = "k9s"; - rev = "v${version}"; - sha256 = "sha256-3ij77aBNufSEP3wf8wtQ/aBehE45fwrgofCmyXxuyPM="; + owner = "derailed"; + repo = "k9s"; + rev = "v${version}"; + hash = "sha256-P06hKqVu/aUttjwdFVCvzC80WWbQn94bXk3LVl/97yw="; }; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/derailed/k9s/cmd.version=${version}" "-X github.com/derailed/k9s/cmd.commit=${src.rev}" "-X github.com/derailed/k9s/cmd.date=1970-01-01T00:00:00Z" @@ -20,7 +21,9 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorHash = "sha256-kgi5ZfbjkSiJ/uZkfpeMhonSt/4sO3RKARpoww1FsTo="; + proxyVendor = true; + + vendorHash = "sha256-Exn4NYegZWrItBoGVb97GUDRhhfeSJUEdr7xJnxcRMI="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); @@ -48,7 +51,9 @@ buildGoModule rec { meta = with lib; { description = "Kubernetes CLI To Manage Your Clusters In Style"; homepage = "https://github.com/derailed/k9s"; + changelog = "https://github.com/derailed/k9s/releases/tag/v${version}"; license = licenses.asl20; + mainProgram = "k9s"; maintainers = with maintainers; [ Gonzih markus1189 bryanasdev000 qjoly ]; }; } diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 02799677d9ec0..2127ae5b3135a 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.18.0"; + version = "1.19.2"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-EMBCJc9x4oduFSHMYajc/Pf8nHwRP7qMsvJUbnDkjdk="; + hash = "sha256-YxOuZb1R9Orm3RTnZyzi54VzQbbmE+lO+4osvG97pwE="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index 2dee8f6fb148c..998cabdb10889 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.14.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-D0BsjAZ7yhbZ8dJ3U/K2tdKhLTZBmK/HorApSYVb3ww="; + hash = "sha256-TL/K1r76DV9CdKfVpE3Fn7N38lHqEF9Sxtthfew2l3w="; }; - vendorHash = "sha256-vCcdQt8/jkUQVz0SpjWUhiJd7d3ePIF6qLD8NKCc618="; + vendorHash = "sha256-72gFtM+Z65VreeIamoBHXx2EsGCv8aDHmRz2aSQCU7Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index f753c739eb7e4..d153b8816b038 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -61,8 +61,8 @@ rec { }; kops_1_28 = mkKops rec { - version = "1.28.1"; - sha256 = "sha256-jVaSqBdxg70XODwmFIpufJGXqB4r0UfNc/J+ZnjkhDU="; + version = "1.28.2"; + sha256 = "sha256-l8budNU+sXZY/hA6jluM+s5pA43j0stQM5vmkwDPuio="; rev = "v${version}"; }; } diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 5a930bf2c99ed..4a131603e178f 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,30 +1,42 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.7.2) + activesupport (7.1.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) + base64 (0.2.0) + bigdecimal (3.1.5) colorize (0.8.1) concurrent-ruby (1.2.2) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + connection_pool (2.4.1) + domain_name (0.6.20231109) + drb (2.2.0) + ruby2_keywords ejson (1.4.1) - faraday (2.7.10) + faraday (2.7.12) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - ffi (1.15.5) + ffi (1.16.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - googleauth (1.7.0) - faraday (>= 0.17.3, < 3.a) + google-cloud-env (2.1.0) + faraday (>= 1.0, < 3.a) + googleauth (1.9.1) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) @@ -39,10 +51,10 @@ GEM http-form_data (2.3.0) i18n (1.14.1) concurrent-ruby (~> 1.0) - jsonpath (1.1.3) + jsonpath (1.1.5) multi_json jwt (2.7.1) - krane (3.3.0) + krane (3.4.0) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -61,16 +73,16 @@ GEM llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) - memoist (0.16.2) mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0808) - minitest (5.19.0) + mime-types-data (3.2023.1205) + minitest (5.20.0) multi_json (1.15.0) + mutex_m (0.2.0) netrc (0.11.0) os (1.1.4) - public_suffix (5.0.3) - rake (13.0.6) + public_suffix (5.0.4) + rake (13.1.0) recursive-open-struct (1.1.3) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) @@ -78,18 +90,15 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) ruby2_keywords (0.0.5) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - statsd-instrument (3.5.11) - thor (1.2.2) + statsd-instrument (3.6.1) + thor (1.3.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) PLATFORMS ruby @@ -98,4 +107,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.4.18 + 2.4.22 diff --git a/pkgs/applications/networking/cluster/krane/default.nix b/pkgs/applications/networking/cluster/krane/default.nix index cc9d19fd8152b..0bb04197a7ee9 100644 --- a/pkgs/applications/networking/cluster/krane/default.nix +++ b/pkgs/applications/networking/cluster/krane/default.nix @@ -13,6 +13,7 @@ bundlerApp { meta = with lib; { description = "A command-line tool that helps you ship changes to a Kubernetes namespace and understand the result"; homepage = "https://github.com/Shopify/krane"; + changelog = "https://github.com/Shopify/krane/blob/main/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau ]; }; diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index 50c859eb72231..0326b6d1146d6 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vlzcnyqlbchaq85phmdv73ydlc18xpvxy1cbsk191cwd29i7q32"; + sha256 = "1l6hmf99zgckpn812qfxfz60rbh0zixv1hxnxhjlg8942pvixn2v"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.1.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.6"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b1gqa90amazwnll9590m5ighywh9sacsmpyd5ihljivmvjswksk"; + type = "gem"; + }; + version = "3.1.5"; }; colorize = { groups = ["default"]; @@ -41,16 +61,36 @@ }; version = "1.2.2"; }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + type = "gem"; + }; + version = "2.4.1"; + }; domain_name = { - dependencies = ["unf"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si"; type = "gem"; }; - version = "0.5.20190701"; + version = "0.6.20231109"; + }; + drb = { + dependencies = ["ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79"; + type = "gem"; + }; + version = "2.2.0"; }; ejson = { groups = ["default"]; @@ -63,15 +103,15 @@ version = "1.4.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 = "19w1lzipnxs6vy3y0pw1mf956f768ppzgfrnlpwgrpnjjv9xqf7d"; type = "gem"; }; - version = "2.7.10"; + version = "2.7.12"; }; faraday-net_http = { groups = ["default"]; @@ -88,10 +128,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -104,16 +144,27 @@ }; version = "1.0.1"; }; + google-cloud-env = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "056r1p8vhjswnx2cy3mzhwc5gj03whmpz8m4p2ph37gag5bpnxmf"; + type = "gem"; + }; + version = "2.1.0"; + }; googleauth = { - dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; + dependencies = ["faraday" "google-cloud-env" "jwt" "multi_json" "os" "signet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h1k47vjaq37l0w9q49g3f50j1b0c1svhk07rmd1h49w38v2hxag"; + sha256 = "0spv89di017rg25psiv4w3pn6f67y2w6vv8w910i83b5yii84rl1"; type = "gem"; }; - version = "1.7.0"; + version = "1.9.1"; }; http = { dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"]; @@ -174,10 +225,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i1idcl0rpfkzkxngadw33a33v3gqf93a3kj52y2ha2zs26bdzjp"; + sha256 = "1ghxjcs9rss0fd43yqnc3ab6fhnm4qrkvv34p0xcjb9s35kh9xr9"; type = "gem"; }; - version = "1.1.3"; + version = "1.1.5"; }; jwt = { groups = ["default"]; @@ -195,10 +246,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qf5la1w4zrbda5n3s01pb9gij5hyknwglsnqsrc0vcm6bslfygj"; + sha256 = "1phcappqkj30i99cqggj4sqzhcb3gim9my5xqzybq3byqfrcprqg"; type = "gem"; }; - version = "3.3.0"; + version = "3.4.0"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -222,16 +273,6 @@ }; version = "0.4.0"; }; - memoist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; - type = "gem"; - }; - version = "0.16.2"; - }; mime-types = { dependencies = ["mime-types-data"]; groups = ["default"]; @@ -248,20 +289,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; + sha256 = "08ja4k3yjczzz7n6rp1f3qvz4v45bc6fy04clnvdxbq3kfr7jk4c"; type = "gem"; }; - version = "3.2023.0808"; + version = "3.2023.1205"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.19.0"; + version = "5.20.0"; }; multi_json = { groups = ["default"]; @@ -273,6 +314,16 @@ }; version = "1.15.0"; }; + mutex_m = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + type = "gem"; + }; + version = "0.2.0"; + }; netrc = { groups = ["default"]; platforms = []; @@ -298,20 +349,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "5.0.3"; + version = "5.0.4"; }; rake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; type = "gem"; }; - version = "13.0.6"; + version = "13.1.0"; }; recursive-open-struct = { groups = ["default"]; @@ -350,30 +401,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0100rclkhagf032rg3r0gf3f4znrvvvqrimy6hpa73f21n9k2a0x"; + sha256 = "0fzakk5y7zzii76zlkynpp1c764mzkkfg4mpj18f5pf2xp1aikb6"; type = "gem"; }; - version = "0.17.0"; + version = "0.18.0"; }; statsd-instrument = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zpr5ms18ynygpwx73v0a8nkf41kpjylc9m3fyhvchq3ms17hcb0"; + sha256 = "1psmiygzad3j4l0vzh2x48cmk4v6q87yg8ndvnp9jkcsbik77bzx"; type = "gem"; }; - version = "3.5.11"; + version = "3.6.1"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; + sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.0"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -386,25 +437,4 @@ }; version = "2.0.6"; }; - unf = { - dependencies = ["unf_ext"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; - type = "gem"; - }; - version = "0.0.8.2"; - }; } diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix index bdb9ce1a5c851..6283b8387ddb8 100644 --- a/pkgs/applications/networking/cluster/kubecm/default.nix +++ b/pkgs/applications/networking/cluster/kubecm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecm"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-8Y8JChZxjbN/nOw2tzDfJvYSMAtAadf6QMsDFK4IIOg="; + hash = "sha256-53diz+TNGRmNbSZJAIKPFi0x/BdL02Tjb847I/XdhW0="; }; - vendorHash = "sha256-HjMgXEDX9pDpK+1Hm0xI0wYRfpj7K6xkZJXCUBqbE3Y="; + vendorHash = "sha256-QPd7gUEY6qNdl96slKvY7+Av6fCU9q+XdjKNKUXz2Wo="; ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix index 131a653b0ed29..dc536bdce9376 100644 --- a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-FRSypaZex55ABE+e23kvNZFTTn6Z8AEy8ag3atwMdEk="; + hash = "sha256-qaIpx8iZhkGEW8MZNgI6rMopNuz+FPpoVBDs9z+BJa0="; }; - vendorHash = "sha256-mirnieBrrVwRccJDgelZvSfQaAVlTsttOh3nJBN6ev0="; + vendorHash = "sha256-SCeKoxI1zFzSwLAdAa1YI3DiyfK/uOk7CmWwQWVeF7g="; subPackages = [ "cmd/kubectl-cnpg" ]; diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix index 4eb0a43687d1c..36238ae746ffb 100644 --- a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "kubectl-node-shell"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "kvaps"; repo = "kubectl-node-shell"; rev = "v${version}"; - sha256 = "sha256-+JRHSigjsxuZFQg73wTMWWKtCVXd2mMFqivYGcwYznE="; + sha256 = "sha256-ZVLL++QTc4fvOTsFfaWVad/jj4EqPiZUpL7HsMb2AdE="; }; strictDeps = true; diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/applications/networking/cluster/kubedog/default.nix index dc67ccc36e634..92a785a468b73 100644 --- a/pkgs/applications/networking/cluster/kubedog/default.nix +++ b/pkgs/applications/networking/cluster/kubedog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubedog"; - version = "0.9.12"; + version = "0.11.0"; src = fetchFromGitHub { owner = "werf"; repo = "kubedog"; rev = "v${version}"; - hash = "sha256-B667EnlOD0kXqkW73XXcyQwROWh5SmsM8565sjcGinI="; + hash = "sha256-+mkzPOJPadHWyNq53AHX6kT5rr0vNjomWNfiAzeLeE4="; }; - vendorHash = "sha256-OgfgCsysNtY7mZQXdmHFyJ0FqmBD3SeQdTLd5Lw3F7k="; + vendorHash = "sha256-rHpP974zhx8kaw8sLGVGDe2CkodBK3mC8ssKIW0VG48="; subPackages = [ "cmd/kubedog" ]; diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index ab2eb86164aa4..c7c2b795179c3 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.3.5"; + version = "2.3.7"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-RqysUaHLgTNuTeLt5xsD06Qxv5qsGTPE0H7r4RqPf30="; + hash = "sha256-oJWQ5u85uQrHnf3VxY0vJwgGePxB4pg+LD0gofYIB1g="; }; - vendorHash = "sha256-IH43F809dr6LGb87pqW2G9xrJLsQcHfjOm5PUj8r4Qo="; + vendorHash = "sha256-blMKBgSBRCVlXu8n3wcd2iMkBTALe2gPxy0Z4uwxUWI="; ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; diff --git a/pkgs/applications/networking/cluster/kubent/default.nix b/pkgs/applications/networking/cluster/kubent/default.nix index f54b6875a92ba..f650394ef0e4f 100644 --- a/pkgs/applications/networking/cluster/kubent/default.nix +++ b/pkgs/applications/networking/cluster/kubent/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, kubent }: buildGoModule rec { pname = "kubent"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "doitintl"; repo = "kube-no-trouble"; rev = version; - sha256 = "sha256-QIvMhKAo30gInqJBpHvhcyjgVkdRqgBKwLQ80ng/75U="; + sha256 = "sha256-fJRaahK/tDns+edi1GIdYRk4+h2vbY2LltZN2hxvKGI="; }; - vendorHash = "sha256-XXf6CPPHVvCTZA4Ve5/wmlgXQ/gZZUW0W/jXA0bJgLA="; + vendorHash = "sha256-nEc0fngop+0ju8hDu7nowBsioqCye15Jo1mRlM0TtlQ="; ldflags = [ "-w" "-s" @@ -20,6 +20,12 @@ buildGoModule rec { subPackages = [ "cmd/kubent" ]; + passthru.tests.version = testers.testVersion { + package = kubent; + command = "kubent --version"; + version = "v${version}"; + }; + meta = with lib; { homepage = "https://github.com/doitintl/kube-no-trouble"; description = "Easily check your cluster for use of deprecated APIs"; diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix index c69ec96df6a28..a416b309fdfd3 100644 --- a/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-ZUuMQ0y6qXM9g/snJchqGPf7z+5skE/OPqC3rvRenXo="; + sha256 = "sha256-lXGDt9UWIk3T+Zp5sdAftStEnd3RmdevTjkvfuZtNf0="; }; vendorHash = "sha256-AUw1wJNWjpNVsjw/Hr1ZCePYWQkf1SqRVnQgi8tOFG0="; diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 5bae083a06f73..f4f04f6ce685f 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 = "51.0.27"; + version = "52.0.0"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-DGyvP2Z3fZNXqKuE42OPdaWfYpIGu9TIBBxbYzRPZ6M="; + hash = "sha256-CBiRQ3i3kPVMuhws30Pl/7deuEiUHnRiDKhad6/c7zU="; }; - vendorHash = "sha256-Vcn1Ky/J/3QiV6M5fLedDcpkLp5WsVcXRkOEgkKPYEQ="; + vendorHash = "sha256-LBvQ9Z6bEBzAzdaEBRJbixBjy1u7MlVTAn6vD/ZvCNM="; ldflags = let t = "github.com/kubeshark/kubeshark"; in [ "-s" "-w" diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index 507430e231c7d..36c377b75c545 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.0.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - sha256 = "sha256-vlUR/fr/PFUBzvxebssrcUgfgnDpFuLuJOl5SBEMKR8="; + sha256 = "sha256-n65z7L82qQE4Xao5W99zIkXGEx2BFM4n/6C1cuTJXsk="; }; - vendorHash = "sha256-EcHHSOAr93M2kPhEaZSpvpZCq4pi1NCedo9hw1Mn0a4="; + vendorHash = null; # TODO investigate why some config tests are failing doCheck = false; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 79d5649e2b972..49697b777141c 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.14.5"; - sha256 = "1xdqqv62sr0hmjd64lvfvnrxhgdjsvb9xxxp2vvx0iz6rpp00n1x"; - vendorHash = "sha256-yEwz9CopCbK8mOUxzjDG3nsbWzhJlA3JTO4nYN8G68E="; + version = "2.14.7"; + sha256 = "0mrnyb98h4614aa3i3ki3gz3rsp60qy038phgmp3x9s0gq11bd23"; + vendorHash = "sha256-bGl8IZppwLDS6cRO4HmflwIOhH3rOhE/9slJATe+onI="; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 5df669ed94a55..e4cad2ae422fe 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.11.4"; - sha256 = "0j6yzjd2rnm6vzn2fky83pw3v943n3chhnr7a302rnafprlbmmp4"; - vendorHash = "sha256-1s2vj9GSNe4j9TtIo69uakrg8PnBHNchlApryBeHmKs="; + version = "23.12.2"; + sha256 = "1icra5x0mj02yiy8d7byhs4pzbxnixffwj6gdqxkh9g65d8mpc16"; + vendorHash = "sha256-8QyI8jxAdBTo75hqD3rtZtO71QaIs3VjlXI5xjGXS5w="; } diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 96e6d9eec7d20..ee9defe2eeca5 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.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-jjYSvY7NT9G/tcsM+9qHnsL81QKItyVMZZWuD2mpln0="; + hash = "sha256-6YMDGvNl1uNMWR1xTPRjYGwaKXC5c4oUy88VRY2Bedw="; }; - vendorHash = "sha256-O48QzyQLkt7T9j+CKQG8TcHlmtS+ykoMoCamsEswPjk="; + vendorHash = "sha256-tXLuOZUoMhVfhhYxnxNw+nYofhEFMKI1b94lVPySd3E="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix index 49ffc319a05e2..0dddf771bd517 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix @@ -40,6 +40,6 @@ buildPythonPackage { description = "EncryptedLinksTo from Nixops 1 module port"; homepage = "https://github.com/nix-community/nixops-encrypted-links"; license = licenses.mit; - maintainers = with maintainers; [ adisbladis ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/cluster/nixops/unwrapped.nix b/pkgs/applications/networking/cluster/nixops/unwrapped.nix index c70da93046956..d7c9924289238 100644 --- a/pkgs/applications/networking/cluster/nixops/unwrapped.nix +++ b/pkgs/applications/networking/cluster/nixops/unwrapped.nix @@ -58,7 +58,7 @@ buildPythonApplication rec { description = "A tool for deploying to NixOS machines in a network or cloud"; homepage = "https://github.com/NixOS/nixops"; license = licenses.lgpl3Only; - maintainers = with lib.maintainers; [ adisbladis aminechikhaoui roberth ]; + maintainers = with lib.maintainers; [ aminechikhaoui roberth ]; platforms = lib.platforms.unix; mainProgram = "nixops"; }; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index f5f3961ade48d..942a4d3ce013d 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -9,8 +9,8 @@ let generic = - { buildGoModule, version, sha256, vendorHash, ... }@attrs: - let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorHash" ]; + { buildGoModule, version, sha256, vendorHash, license, ... }@attrs: + let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorHash" "license" ]; in buildGoModule (rec { pname = "nomad"; @@ -40,8 +40,8 @@ let meta = with lib; { homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; - license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes amaxine techknowlogick ]; + inherit license; + maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes amaxine techknowlogick cottand ]; }; } // attrs'); in @@ -52,21 +52,23 @@ rec { # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad = nomad_1_5; + nomad = nomad_1_6; nomad_1_4 = generic { buildGoModule = buildGo120Module; version = "1.4.12"; sha256 = "sha256-dO98FOaO5MB5pWzeF705s/aBDTaF0OyWnVxWGB91suI="; vendorHash = "sha256-D5TcTZa64Jr47u4mrTXK4lUIC5gfBQNVgL6QKh1CaQM="; + license = lib.licenses.mpl20; passthru.tests.nomad = nixosTests.nomad; }; nomad_1_5 = generic { - buildGoModule = buildGo120Module; - version = "1.5.8"; - sha256 = "sha256-5VAUNunQz4s1Icd+s5i8Kx6u1P0By+ikl4C5wXM1oho="; - vendorHash = "sha256-y3WiQuoQn6SdwTgtPWuB6EBtsJC+YleQPzownZQNkno="; + buildGoModule = buildGo121Module; + version = "1.5.12"; + sha256 = "sha256-BhKetWtwysWTYI0ruEp/Ixh4eoGxDX0Geup2PCXfsZY="; + vendorHash = "sha256-X4pBxKWr5QFRxh9tw5QDpytyuVNXQvV1LHm5IbPELY0="; + license = lib.licenses.mpl20; passthru.tests.nomad = nixosTests.nomad; preCheck = '' export PATH="$PATH:$NIX_BUILD_TOP/go/bin" @@ -75,9 +77,22 @@ rec { nomad_1_6 = generic { buildGoModule = buildGo121Module; - version = "1.6.3"; - sha256 = "sha256-5UWGriDy15PX3+9UppcUsEwih/e9COLVBis3fn+24L0="; - vendorHash = "sha256-gXoheW6Ww9Iu4utKNHweP2blzhWid+Q9Tp0ZgCmBAVg="; + version = "1.6.5"; + sha256 = "sha256-10s/yRWGoYTRbMytWShuTgYc1b388IID5doAvWXpyCU="; + vendorHash = "sha256-gd6a/CBJ+OOTNHEaRLoDky2f2cDCyW9wSZzD6K22voQ="; + license = lib.licenses.mpl20; + passthru.tests.nomad = nixosTests.nomad; + preCheck = '' + export PATH="$PATH:$NIX_BUILD_TOP/go/bin" + ''; + }; + + nomad_1_7 = generic { + buildGoModule = buildGo121Module; + version = "1.7.2"; + sha256 = "sha256-tFmsX9C++nuUBqLjjpMMyVCwQHn4nlB3OywIPMYE32Q="; + vendorHash = "sha256-iMEEBDxK7ALa19GMIabofzq557aXcYpt0H3/jAKnBBM="; + license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' export PATH="$PATH:$NIX_BUILD_TOP/go/bin" diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 8dbe03f3ba2e0..39020d87d9991 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -9,14 +9,14 @@ }: buildGoModule rec { pname = "openshift"; - version = "4.13.0"; - gitCommit = "e561d37"; + version = "4.14.0"; + gitCommit = "0c63f9d"; src = fetchFromGitHub { owner = "openshift"; repo = "oc"; - rev = "e561d37285c8bde273ce00d086bea599a9cdd3be"; - hash = "sha256-/ar96N+MSy0DPdza3UWiyolg1EZPBR6LCku4GV+HppM="; + rev = "0c63f9da2694c080257111616c60005f32a5bf47"; + hash = "sha256-viNSRwGNB0TGgw501cQuj4ajmAgvqk4vj2RmW8/DCB8="; }; vendorHash = null; @@ -62,6 +62,5 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ offline bachp moretea stehessel ]; mainProgram = "oc"; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index ab960b7526ee4..735c37084efa9 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,16 +14,17 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.6.0-beta1"; + version = "1.6.0-rc1"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-bOZzMraJ1Bc5CauYkJLH4riCOhAbZlXh9TdBjJsp4Ds="; + hash = "sha256-3aNK0i0LrFmDT6JEvlYggIPC+DsilUtkrcp8E0w8FO8="; }; - vendorHash = "sha256-T67VFtAsw6Dn+Ma0znwaa53GvzmrNLFoU17rCeJehKw="; - ldflags = [ "-s" "-w" ]; + + vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk="; + ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ]; postConfigure = '' # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 @@ -35,7 +36,7 @@ let patches = [ ./provider-path-0_15.patch ]; passthru = { - inherit plugins withPlugins; + inherit full plugins withPlugins; tests = { inherit opentofu_plugins_test; }; }; @@ -59,11 +60,14 @@ let maintainers = with maintainers; [ gmemstr nickcao + zowoq ]; mainProgram = "tofu"; }; }; + full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders)); + opentofu_plugins_test = let mainTf = writeText "main.tf" '' terraform { @@ -107,7 +111,6 @@ let 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. diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 71fd37a3cefd6..52cef9db4105a 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.7.6"; + version = "2.8.1"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-h0xr94DNmqjpRcas0F+UxQEnCHt5VGU2CRtv+GzJl00="; + hash = "sha256-ULZAmv3U6nMlhXuR6ZbZgAkWubs7t4qJBn05s0CF8uo="; }; - vendorHash = "sha256-UBuCAIwx1UOh9bsk3eNlTOozB55RIvuKQ0P1WRkJNaI="; + vendorHash = "sha256-dYQicGlk+G3l03yb+PlIaMzwRcWqC1TPqQ4Akm8xJF8="; subPackages = [ "src/server/cmd/pachctl" ]; @@ -24,7 +24,7 @@ buildGoModule rec { meta = with lib; { description = "Containerized Data Analytics"; homepage = "https://www.pachyderm.com/"; - license = licenses.unfree; + license = licenses.asl20; maintainers = with maintainers; [ offline ]; mainProgram = "pachctl"; }; diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index b496d5a801522..4223c0854f55b 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pluto"; - version = "5.18.6"; + version = "5.19.1"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-PQf1gEFlZ6Y9KMQjKeXAZy/OfxCbiKfST3pr9xp0/vg="; + hash = "sha256-6TOHDjR5sFaIeR6Zuf4azQAIgUyev7vdlAKB7YNk8R0="; }; vendorHash = "sha256-8ZOYp/vM16PugmE+3QK7ZRDwIwRCMEwD0NRyiOBlh14="; diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index c65c795a173bc..8e5a7e68ef560 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "popeye"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-A1jUlEgjBoiN+NYwpyW/1eYzkCK3UuPID++fu+zGvzk="; + sha256 = "sha256-2mLbBvdUWGspTNeU3QJzR5NDI24njvRO2nss/Bo93W8="; }; ldflags = [ @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/derailed/popeye/cmd.commit=${version}" ]; - vendorHash = "sha256-MEsChBBn0mixgJ7pzRoqAqup75b/mVv6k3OMmzgyLC4="; + vendorHash = "sha256-Vt5QwggdasVk4j2huSIneBMemi3Q0R4MgZn2yNlOH5E="; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix index 68da1404bd822..99b0998582f4e 100644 --- a/pkgs/applications/networking/cluster/rke2/default.nix +++ b/pkgs/applications/networking/cluster/rke2/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rke2"; - version = "1.28.2+rke2r1"; + version = "1.29.0+rke2r1"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-PkBnM6mKE90e8VZ3QHYp2mM4RgD9u1gNjFea3RaPGy0="; + hash = "sha256-E59GUcbnbvsGZYn87RGNrGTVUsydKsjL+C5h15q74p0="; }; - vendorHash = "sha256-aW8en8KJsPITKT4fIyhhtLiYdk+98iL14wQXG4HsM3U="; + vendorHash = "sha256-Og0CqxNnhRN6PdggneGK05uprZ2D7lux/snXcArIm8Q="; postPatch = '' # Patch the build scripts so they work in the Nix build environment. diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index a699acb486e03..952439cfd6fca 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.2.1"; + version = "4.3.1"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-6dj6thIjxoYdX4h7btK8bQcqfqbZ86E/rQOHkgIeaN4="; + sha256 = "sha256-Rr/ETsJJvch9qdqZnin6CiD7WWJXQAcc7TR+YCINk0Q="; }; - vendorHash = "sha256-SGhflDzTRix+kWgh9/0Rc5laQwGdEu+RawEDyHVI+3E="; + vendorHash = "sha256-Jzv4ozR8RJiwkgVGGq6dlV/7rbBLq8hFe/Pm4SJZCkU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index f4d50d3dbbcd8..6900dc5607ec7 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "bd5465d6b2b2b92b517f4c6074008d22338ff509"; +let rev = "6f9e27f1795f10475c9f6f5decdff692e1e228da"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.56.14"; # Do not forget to update `rev` above + version = "0.57.1"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -20,10 +20,10 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - sha256 = "sha256-YiVCdAdwdK9PcQ6VQQNAjLQq2X54vJmZfbHRjV2d8VQ="; + hash = "sha256-e9C5ZwKqT3Fiko2HqrIpONVvjhT8KBBO7rQc3BJhl+A="; }; - vendorHash = "sha256-Fqxkyl9AKZ7H4QSp2V/yztpeXHt57+LjpzzGtOPndX0="; + vendorHash = "sha256-HE53eIEyhOI9ksEx1EKmv/txaTa7KDrNUMEVRMi4Wuo="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 80142048c6fe4..19c4b280a60cb 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -3,63 +3,55 @@ , fetchzip , makeWrapper , jdk8 -, python3Packages -, extraPythonPackages ? [ ] +, python3 +, python310 , coreutils -, hadoopSupport ? true , hadoop , RSupport ? true , R +, nixosTests }: let - spark = { pname, version, hash, extraMeta ? {} }: - stdenv.mkDerivation rec { - inherit pname version; - jdk = if hadoopSupport then hadoop.jdk else jdk8; + spark = { pname, version, hash, extraMeta ? {}, pysparkPython ? python3 }: + stdenv.mkDerivation (finalAttrs: { + inherit pname version hash hadoop R pysparkPython; + inherit (finalAttrs.hadoop) jdk; src = fetchzip { - url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; - inherit hash; + url = with finalAttrs; "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; + inherit (finalAttrs) hash; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk python3Packages.python ] - ++ extraPythonPackages - ++ lib.optional RSupport R; + buildInputs = with finalAttrs; [ jdk pysparkPython ] + ++ lib.optional RSupport finalAttrs.R; - untarDir = "${pname}-${version}"; installPhase = '' - mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java} - mv * $out/lib/${untarDir} - - cp $out/lib/${untarDir}/conf/log4j.properties{.template,} || \ - cp $out/lib/${untarDir}/conf/log4j2.properties{.template,} - - cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF - export JAVA_HOME="${jdk}" - export SPARK_HOME="$out/lib/${untarDir}" - '' + lib.optionalString hadoopSupport '' - export SPARK_DIST_CLASSPATH=$(${hadoop}/bin/hadoop classpath) - '' + '' - export PYSPARK_PYTHON="${python3Packages.python}/bin/${python3Packages.python.executable}" - export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" - ${lib.optionalString RSupport '' - export SPARKR_R_SHELL="${R}/bin/R" - export PATH="\$PATH:${R}/bin"''} - EOF - - for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do - makeWrapper "$n" "$out/bin/$(basename $n)" - substituteInPlace "$n" --replace dirname ${coreutils.out}/bin/dirname + mkdir -p "$out/opt" + mv * $out/ + for n in $(find $out/bin -type f -executable ! -name "find-spark-home"); do + wrapProgram "$n" --set JAVA_HOME "${finalAttrs.jdk}" \ + --run "[ -z $SPARK_DIST_CLASSPATH ] && export SPARK_DIST_CLASSPATH=$(${finalAttrs.hadoop}/bin/hadoop classpath)" \ + ${lib.optionalString RSupport ''--set SPARKR_R_SHELL "${finalAttrs.R}/bin/R"''} \ + --prefix PATH : "${ + lib.makeBinPath ( + [ finalAttrs.pysparkPython ] ++ + (lib.optionals RSupport [ finalAttrs.R ]) + )}" done - for n in $(find $out/lib/${untarDir}/sbin -type f); do - # Spark deprecated scripts with "slave" in the name. - # This line adds forward compatibility with the nixos spark module for - # older versions of spark that don't have the new "worker" scripts. - ln -s "$n" $(echo "$n" | sed -r 's/slave(s?).sh$/worker\1.sh/g') || true - done - ln -s $out/lib/${untarDir}/lib/spark-assembly-*.jar $out/share/java + ln -s ${finalAttrs.hadoop} "$out/opt/hadoop" + ${lib.optionalString RSupport ''ln -s ${finalAttrs.R} "$out/opt/R"''} ''; + passthru = { + tests = nixosTests.spark.default.passthru.override { + sparkPackage = finalAttrs.finalPackage; + }; + # Add python packages to PYSPARK_PYTHON + withPythonPackages = f: finalAttrs.finalPackage.overrideAttrs (old: { + pysparkPython = old.pysparkPython.withPackages f; + }); + }; + meta = { description = "Apache Spark is a fast and general engine for large-scale data processing"; homepage = "https://spark.apache.org/"; @@ -68,24 +60,23 @@ let platforms = lib.platforms.all; maintainers = with lib.maintainers; [ thoughtpolice offline kamilchm illustris ]; } // extraMeta; - }; + }); in { - spark_3_4 = spark rec { + spark_3_5 = spark rec { pname = "spark"; - version = "3.4.0"; - hash = "sha256-0y80dRYzb6Ceu6MlGQHtpMdzOob/TBg6kf8dtF6KyCk="; + version = "3.5.0"; + hash = "sha256-f+a4a23aOM0GCDoZlZ7WNXs0Olzyh3yMtO8ZmEoYvZ4="; }; - spark_3_3 = spark rec { + spark_3_4 = spark rec { pname = "spark"; - version = "3.3.2"; - hash = "sha256-AeKe2QN+mhUJgZRSIgbi/DttAWlDgwC1kl9p7syEvbo="; - extraMeta.knownVulnerabilities = [ "CVE-2023-22946" ]; + version = "3.4.2"; + hash = "sha256-qr0tRuzzEcarJznrQYkaQzGqI7tugp/XJpoZxL7tJwk="; }; - spark_3_2 = spark rec { + spark_3_3 = spark rec { pname = "spark"; - version = "3.2.4"; - hash = "sha256-xL4W+dTWbvmmncq3/8iXmhp24rp5SftvoRfkTyxCI8E="; - extraMeta.knownVulnerabilities = [ "CVE-2023-22946" ]; + version = "3.3.3"; + hash = "sha256-YtHxRYTwrwSle3UpFjRSwKcnLFj2m9/zLBENH/HVzuM="; + pysparkPython = python310; }; } diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index d21cc921976f5..6a3a73bd446aa 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.17"; + version = "0.15.18"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RzwLc29f+u/m1x5R199M8XQQ5nn33ofYi3AyMCimMtA="; + sha256 = "sha256-tQRnqc8VL3QmFzWlf4YHhtLxVAQDkb+U+2ynqmpGffQ="; # 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-dUqcg9/kJfKWIygem0rmtgOiYOHpfWOdH4YV0mYhxeQ="; + vendorHash = "sha256-VOnftPcsgpmvmfjEc+vdbUOyn6t9QlVRkuxs/Ahy548="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index f0414dba54d38..f93cea7f25101 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "talosctl"; - version = "1.5.5"; + version = "1.6.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-15sNXiJ/s3MlrXFXPxA7mQ+/36HRSZF6XKos6XEHi1Y="; + hash = "sha256-Mcc9lfnhSbVA5tNHUtBgfQEGVyen4KZ/V9OeV8PxAYQ="; }; - vendorHash = "sha256-fGl16Wsb1tW9+wZBg5yY73t7n+EJ1dVx5IlzY2B8PJA="; + vendorHash = "sha256-VeUDyiJ0R27Xrf+79f0soELKvR2xaK5ocbvhCzP9eFk="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 9bda0fedf0b1d..7c7f9d8992abf 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.32.2"; + version = "0.33.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-CNjZpiIKkky4BVmz6pN5tdADIt6hlnWY8ig9Rdt6qmI="; + sha256 = "sha256-PjtZrN0AmD2Ll0Jgvw/7ZNb5/TqYdsngrdLjLfprPa0="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index ea6166475065a..4ea119877941d 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -17,16 +17,16 @@ let tctl-next = buildGoModule rec { pname = "tctl-next"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-4kNuudnYBD6rgIkysP7dEjsRu/dFvTm3hkbBYZ6+Zh4="; + hash = "sha256-pFVCy6xB7Fhj4OatyNQdjkDpDGtod2nJsg2vdl5ED9s="; }; - vendorHash = "sha256-ZECwF/avHKE4L9GHa2w5Lx71wD6UIAaPpRkUtpEVafI="; + vendorHash = "sha256-mauaavG3oeUzMrBEiK85Tws++6V1WViczRFhyovUpB4="; inherit overrideModAttrs; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 6c0715939fe56..63b00032f7252 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.22.0"; + version = "1.22.3"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-7AdbGsgdDsSUtj8TkZl4CcvF2Xk1l9W9Vdos+fEsIVI="; + hash = "sha256-iqJzvnueUnIyu3Z6a5Ht90arHaHgM4COCDdZo7Qvzuk="; }; - vendorHash = "sha256-gDiVB34fICaS6IyQCAa4ePff/vsT7/7HnJM9ZjiOh4k="; + vendorHash = "sha256-Aum5OsdJ69MkP8tXXGWa6IdouX6F4xKjD/ndAqShMhw="; excludedPackages = [ "./build" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 62ca803c8b63c..d2eea88e1f210 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,22 +1,22 @@ { "aci": { - "hash": "sha256-RcMT8KD2V9JsAoQCznHpWIe+DHcTfKuW6gJlnxw9Kxo=", + "hash": "sha256-8oQSliSbuSXCXFkwVca33E8g+qUP1Yf9I4n1/c6O8BA=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.11.1", + "rev": "v2.12.0", "spdx": "MPL-2.0", "vendorHash": null }, "acme": { - "hash": "sha256-Yw+mkmRmetNKQhS5jpJ946ISj6Ga+G6hFArT0iVWNJ0=", + "hash": "sha256-hDZY+AY+MRHNbceVdAzLso9isUo/6/qTCk9hSZLBd2g=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "proxyVendor": true, "repo": "terraform-provider-acme", - "rev": "v2.18.0", + "rev": "v2.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xpcloyR34rkarjJM2PWiLzFaJCpXWqPCP49Pmnk29nY=" + "vendorHash": "sha256-1OfGAuzd+rLAgLmzzkm3Biru0vb/xd3C5DJQcXwdlME=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -28,29 +28,29 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-RxqrgekgPkLUTJsrEVfQPTOodv/hNWXFV7c/1Mg6mt0=", + "hash": "sha256-7rwkwOrE9nznB6G96ZF/nnRVlxS+7XnOyziPLGpM61w=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.9.3", + "rev": "v4.9.4", "spdx": "MIT", "vendorHash": "sha256-gRcWzrI8qNpP/xxGV6MOYm79h4mH4hH+NW8W2BbGdYw=" }, "akamai": { - "hash": "sha256-Du0ANsAHzV6zKobpiJzdy26JgIW1NRO6fbAHNMCDbaI=", + "hash": "sha256-CBBrX0mm6hyobOdhbDaud4HKupIMnDTJp7+kWSej+NI=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v5.4.0", + "rev": "v5.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-4w3zYSO0GIL636FFuv1X4covAyFHVQ2Ah9N4RUQd7wM=" + "vendorHash": "sha256-Y30DSv7gAW7JzaTYt0XGwLhTArFILPPnxYmP2mKe9Sc=" }, "alicloud": { - "hash": "sha256-GdoesVK4awNjMMBE6YuLIMh23WyMLKxABWLQ/y5H4kw=", + "hash": "sha256-jTTpnuU/3VuPi1LKglQhuBVKM2m9ddJdRnbTnyBK16I=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.212.0", + "rev": "v1.214.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -64,13 +64,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { - "hash": "sha256-fhKN7aqQlurzKB568LC7wt0yikUrsEjS8vngMedqQY8=", + "hash": "sha256-uoHuh4LTbF27ns4oBRfmR7f/NvFd7j0NNmFWywl5x7U=", "homepage": "https://registry.terraform.io/providers/hashicorp/archive", "owner": "hashicorp", "repo": "terraform-provider-archive", - "rev": "v2.4.0", + "rev": "v2.4.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-LSAxibOYXxyIAsprMzbW+mnUXX7gHtYjMZYaUrGLtD4=" + "vendorHash": "sha256-F3bCFX57QTw5h/pnPB6pIrszXYqbwe0kzStOpmPgzHM=" }, "argocd": { "hash": "sha256-nJrXbeI/07LlKngEkAnqPG6CiOLFTFugmZMVl2FEvIo=", @@ -82,22 +82,22 @@ "vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo=" }, "artifactory": { - "hash": "sha256-F491M8AS+nh4fCPUA/6R9c6MQ6CB29QJsWjk1L5LOwI=", + "hash": "sha256-6WtnjsXzGZAIilm3N52G07o7eU9UQ6LXWqd7sDcV2Bg=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v9.8.0", + "rev": "v10.0.2", "spdx": "Apache-2.0", - "vendorHash": "sha256-Ne0ed+H6lPEH5uTYS98pLIf+7B1w+HSM77tGGG9E5RQ=" + "vendorHash": "sha256-iYm8xaHDWqjq8ui5bsSMMKNRE0/KBkOkzmImOQwMA7w=" }, "auth0": { - "hash": "sha256-ShwoPwEQLNX1+LB84iWrS5VopKt8kao35/iVVGLDZck=", + "hash": "sha256-z40zGGgKtru83KbmhK5kQhbHdXjCQ7q5G0eAfvqfa4A=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.1.0", + "rev": "v1.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-fD3epndk6L+zjtUNalis9VJCxWKOBScYGHkUFRnLNLQ=" + "vendorHash": "sha256-/rT/dVpla6r3pIouZZ7tmluKDyjdYuzdMGoPCNn+Ptk=" }, "avi": { "hash": "sha256-EGpHajrTTOx7LrFHzsrrkGMqsuUEJLJAN6AJ48QdJis=", @@ -118,29 +118,29 @@ "vendorHash": null }, "aws": { - "hash": "sha256-4ecgttYOAQ/I+ma1eSPomiJ4rdT9F1gtQUu4OS4stlQ=", + "hash": "sha256-wEbpTOlIZjewEepvqTjQRZAY4BtpetMF+HzvmdFEHGw=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.25.0", + "rev": "v5.31.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-twXEX5emBPQUMQcf11S9ZKfuaGv74LtXUE2LxqmN2xo=" + "vendorHash": "sha256-SVrPxBzcykecphwpHvcAhUbmf77eXC9VDdabGzg2bn8=" }, "azuread": { - "hash": "sha256-PwHnyw0sZurUMLWKUmC3ULB8bc9adIU5C9WzVqBsLBA=", + "hash": "sha256-lumXl3orK5Jq5+qnRfiIA94NjK2bCjd3LhRzHmW1h8I=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.45.0", + "rev": "v2.47.0", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-sGZvfjq2F1BjvqgYel0P/ofGmHXv8c7OhfXGGoXB2+Q=", + "hash": "sha256-YXVSApUnJlwxIldDoijl72rA9idKV/vGRf0tAiaH8cc=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.80.0", + "rev": "v3.85.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -154,29 +154,29 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-N2WfSCro4jVZSXTe41hs4uQsmnhbsfl/J2o51YEOsB4=", + "hash": "sha256-LAUkF8QUA5I1QfNfEtpZl0LT8ifFa/oYJsLRJYp7TGk=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.20", + "rev": "v1.19.23", "spdx": "MPL-2.0", "vendorHash": null }, "bigip": { - "hash": "sha256-eiwnIsGVGrOxSwrZj+UAq5sl2w2eT6tDCVQSnMBc/lk=", + "hash": "sha256-IfUMVksaXCzQD05khAY6s0qbAPd79omIzq6FCcMMjpg=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.20.0", + "rev": "v1.20.1", "spdx": "MPL-2.0", "vendorHash": null }, "bitbucket": { - "hash": "sha256-dO+2sg+4Xg+9fxKe/hGF0EBS4yGZAzhIBgcBhT/VDWk=", + "hash": "sha256-jrxCUTqR6knktDIX3sFDtIP6OD9cJGdV+JgwSgoDfMo=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.37.2", + "rev": "v2.38.0", "spdx": "MPL-2.0", "vendorHash": "sha256-2s8ATVlSVa6n/OSay0oTdJXGdfnCwX6da3Pcu/xYcPY=" }, @@ -190,22 +190,22 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-+H2ivPSrNBybUSYX2sLL4V8uqLTsJZp7AN1AYQQ/f90=", + "hash": "sha256-eemTDSXZGLboPGoyMxj3w+klf386HTc/6NeI1G1KHXI=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.0.6", + "rev": "v1.2.0", "spdx": "MIT", - "vendorHash": "sha256-GzHqmSS0yWH+pNGA7ZbfpRkjUsc2F9vlJ9XEOjKxFS4=" + "vendorHash": "sha256-L/lUBQW5SbIMfqTiJhSyft2eEx+Psd6BK00kM6Z2QpA=" }, "checkly": { - "hash": "sha256-HfmEh+7RmCIjBvacBW6sX3PL295oHOo8Z+5YsFyl0/4=", + "hash": "sha256-PaQDHK/T3H2W+Ah4cYdP0VOOMSiK/9UgJDmmHHiYEsI=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.7.2", + "rev": "v1.7.3", "spdx": null, - "vendorHash": "sha256-iAAsTiBX1/EOCFgLv7bmTVW5ga5ef4GIEJSHo4w76Tg=" + "vendorHash": "sha256-bP2qfEOP3CPTkr6Dq/o4PCCVnAm+ujsp+pogmuUX4ZM=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -217,22 +217,22 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-YZUlGvhanK/xH6Qbqlw6YebBxg03lZIcQeiUc5GP51o=", + "hash": "sha256-ways6qj4rwoBo0XS69aMIMlBssv4R8CFZ4l5Lsnlih0=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.28.0", + "rev": "v1.29.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-dR/7rtDNj9bIRh6JMwXhWvLiAhXfrGnqS9QvfDH9eGw=" + "vendorHash": "sha256-+HZzsAsEJuzEZ61ARaNYC1WxI3M6UwFEf+8q3Bd/JWA=" }, "cloudflare": { - "hash": "sha256-FdKz6EmpxhqM+wcCAuwTCOCxhV0LI4+7d12fNxOSd7Q=", + "hash": "sha256-KaFn0r5p7bE9kAK6g/SMyqfoF6vMWyP6bRqihW+a5a8=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.19.0", + "rev": "v4.20.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-PwIFz2T+iXR6+A/yrF4+kxWr2SxLDUY8XDO5aTeg89M=" + "vendorHash": "sha256-sEy+G+IXwfLBCp1Rfw48mBH7WilsfoCQF5XbtF8fOCI=" }, "cloudfoundry": { "hash": "sha256-yEqsdgTSlwppt6ILRZQ6Epyh5WVN6Il3xsBOa/NfIdo=", @@ -244,13 +244,13 @@ "vendorHash": "sha256-0hq4dR1KqnE2IXMwif2/NVKQKRO/QplW/A6sB4pJ+FM=" }, "cloudinit": { - "hash": "sha256-fdtUKD8XC1Y72IzrsCfTZYVYZwLqY3gV2sajiw4Krzw=", + "hash": "sha256-etZeCGtYhO0szRGxnj1c3/WOelxScWiHEA9w1Jb7bEE=", "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", "repo": "terraform-provider-cloudinit", - "rev": "v2.3.2", + "rev": "v2.3.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-h4CO3sC41RPSmkTlWUCiRvQ1NRZkT2v1uHFOemvBN8s=" + "vendorHash": "sha256-MFhKJEuylDnyj9ltugxGXgfIxBT3/mYaxB0JmTJxK3M=" }, "cloudscale": { "hash": "sha256-SDivLkP1y/qBVNSiyCjV6zPTbLUplxzD3gNxzkjC51M=", @@ -272,13 +272,13 @@ "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { - "hash": "sha256-mGLI/TAovyBvowI6AwRPcmYqwnPEe4ibDhFj1t7I+oM=", + "hash": "sha256-Glgig56QdXZ9VNZx25/60YPChg9MtLq/S95nuAco3m0=", "homepage": "https://registry.terraform.io/providers/hashicorp/consul", "owner": "hashicorp", "repo": "terraform-provider-consul", - "rev": "v2.19.0", + "rev": "v2.20.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sOnEgGTboK+vbNQYUOP0TxLe2JsqBUFo6/k55paIsmM=" + "vendorHash": "sha256-OKKcyx5JAQGMoUMRxIbe3lg825vhwCcWcPNZqo+/gl4=" }, "ct": { "hash": "sha256-c1cqTfMlZ5fXDNMYLsk4447X0p/qIQYvRTqVY8cSs+E=", @@ -290,38 +290,39 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-IU9eBWYqI/a9EsYhI6kPom1PK/H403Dxr7eSXYFL5Do=", + "hash": "sha256-NEXA4oRPC+A8aDuecp45mQm3NbAQKIHR0GSfxDVkeUw=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.32.0", + "rev": "v3.34.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-C+N+LQ6qjpRrUNzCaiauIor+noD+0igTfR7RnrZdNwU=" + "vendorHash": "sha256-57cwm7RqCqDR9PmnBFMnrM2vTogCOlpXwvVwnBkkA0Y=" }, "dexidp": { - "hash": "sha256-Sy/xkhuNTocCoD7Nlq+pbvYiat4du4vZtOOZD2Ig3OA=", + "hash": "sha256-3UgiOeAGpGG2mkImPDvb24WjV2mavhY0E12j7W+SJs8=", "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp", "owner": "marcofranssen", "repo": "terraform-provider-dexidp", - "rev": "v0.3.2", + "rev": "v0.3.4", "spdx": "MIT", - "vendorHash": "sha256-8gz6tsmHHH9B3Z5H0TZRdlpCI6LhthIn7fYn8PjYPeg=" + "vendorHash": "sha256-ejM1RmVBW3v0OStYzJTCym2ByWHJ1zzz/yWVbUiQWN0=" }, "dhall": { - "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", + "hash": "sha256-QjY5ZazQn4HiLQtdmw9X7o5tFw+27B2IISzmzMMHjHE=", "homepage": "https://registry.terraform.io/providers/awakesecurity/dhall", "owner": "awakesecurity", + "proxyVendor": true, "repo": "terraform-provider-dhall", - "rev": "v0.0.3", + "rev": "v0.0.7", "spdx": "BSD-3-Clause", - "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" + "vendorHash": "sha256-e/+czUeOACwRC7xY90pZp2EWDzDpLU6Ud9RPzuNKaOY=" }, "digitalocean": { - "hash": "sha256-8T2xWKKoPU54ukMClva/fgZXGDMh92Oi0IacjnbgCCI=", + "hash": "sha256-pu6QTKT5ikm3B12zDpWFsMbSjv8zl1oMvWtA4qtjluk=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.32.0", + "rev": "v2.34.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -335,13 +336,13 @@ "vendorHash": null }, "dns": { - "hash": "sha256-feMN0Fpq8ct3l0u1Y8Zjgee4iC+e90CwAZmk5VQj2So=", + "hash": "sha256-7PRRdL1LhcHKHqqdB7KvBsrrPjaYEKfoSPpc31/Ki/c=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.3.2", + "rev": "v3.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-SvyeMKuAJ4vu++7Fx0hutx3vQvgf1sh1PFSLPRqJPjw=" + "vendorHash": "sha256-z2p2tjTK7eL0gRU8XnXw9SY9qokqiqJOVhkiBQlHRnA=" }, "dnsimple": { "hash": "sha256-6QubFsPp3sOmCSgIpRH+x+Q9YDDnOnfX5UzV+iy3uh4=", @@ -380,31 +381,31 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-7RnThTuYTO1W0nBZAilUB5WOp8Rng14aNBiax6M9FwQ=", + "hash": "sha256-zjYMJfG+FJpgDWdDxlwp02lhs5yn15EIJqrAGIbrgDs=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.19.0", + "rev": "v1.22.0", "spdx": "MIT", - "vendorHash": "sha256-nq380VsSog+nsL+U1KXkVUJqq3t4dJkrfbBH8tHm48E=" + "vendorHash": "sha256-c40HqNBU0dXsidddgXuke8cSo/frAUKlxWMbsimiYMc=" }, "exoscale": { - "hash": "sha256-Fc2/IT8L1jn0Oh8zT0C/Am4eoumQe0VRYqBDc/enEuY=", + "hash": "sha256-HVNGzcX0l7E4jB6TiWSPG9XRmpKL6HIt2gaYiDLFOb4=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.53.1", + "rev": "v0.54.1", "spdx": "MPL-2.0", "vendorHash": null }, "external": { - "hash": "sha256-+0AqlVGKSEeXlcKfNiYDqh0B9rRqyt9FDNWstdOFACI=", + "hash": "sha256-rmCdTtyYv3jZDXWWqRLV8AgnnZ0Hqp8Ofq8BoLBkDhs=", "homepage": "https://registry.terraform.io/providers/hashicorp/external", "owner": "hashicorp", "repo": "terraform-provider-external", - "rev": "v2.3.1", + "rev": "v2.3.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" + "vendorHash": "sha256-mkopDoGhGZSJyxWYtR8OU9BU1GYwhLe3xwNkUKwlBNI=" }, "fastly": { "hash": "sha256-T3iQ0QIB3lfzcTx1K7WkgUdKsl/hls2+eorPa0O19g8=", @@ -416,21 +417,21 @@ "vendorHash": null }, "flexibleengine": { - "hash": "sha256-+RAuFh88idG49nV4HVPgaGxADw/k/sUSTqrzWjf15tw=", + "hash": "sha256-YWVJhBkhc62VabppH6TMO51PfaBwsLdakHOpmWXAprQ=", "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", "repo": "terraform-provider-flexibleengine", - "rev": "v1.43.0", + "rev": "v1.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-yin+UVMkqIxMSoVB4TD6Nv8F24FnEGZP5PFVpmuO2Fg=" + "vendorHash": "sha256-bvMetztfnT7gSkTfhpnkvlnZeAAzuehuNqYN/Gx+DmY=" }, "fortios": { - "hash": "sha256-RpcKMndbO3wbkHmrINkbsQ+UeFsZrQ7x02dv8ZpFMec=", + "hash": "sha256-3fcbUH3/LjsdNbomN2tl2WN/P0rpf0ZsILVkAOLUbt0=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", "proxyVendor": true, "repo": "terraform-provider-fortios", - "rev": "1.18.0", + "rev": "1.18.1", "spdx": "MPL-2.0", "vendorHash": "sha256-DwRfbD4AqB+4KLuYtqY5fUdzRrEpTIvL4VAM7nieJJA=" }, @@ -453,33 +454,33 @@ "vendorHash": null }, "gitlab": { - "hash": "sha256-eONOqinRXs9lPz4d8WDb9lA0XcJuNqzgsZrmJAZ42t8=", + "hash": "sha256-IzZN7W1nfByUco4LG0AutSAVRHpeAnaHNmu6tpvHyQk=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v16.5.0", + "rev": "v16.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2t50Gsyf8gxG/byjgNyw5GEturU0MgBvZuJyc49s4t0=" + "vendorHash": "sha256-TMLLsOquMpkeAqS8hLI963hQ6t9n2fyx4XjtB+7oR2E=" }, "google": { - "hash": "sha256-o4tyG0Q4sqBktreYEKJ+1QlNXx/BEPmAGOTTzTcFnP8=", + "hash": "sha256-ISZC6jMxQ3f/TKsjMkG7uL260XXLdZEQauoEQUNY5eY=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v5.6.0", + "rev": "v5.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9nz3VLTi4RfGBDAE7JBUWXrJRajwAyxoeEH+VSP0wyQ=" + "vendorHash": "sha256-Bk4NxA/je67lre74KkKz4eT9fgmut3Crho8z/l1xEBY=" }, "google-beta": { - "hash": "sha256-+5Fm/aT90bD6RpQrUGjmpmahPTjOfsRJAaZuZsrPQn4=", + "hash": "sha256-roAdaihEy3OHaAG0qP6Puliqj97jvphwNr0lmKYY1Tg=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v5.6.0", + "rev": "v5.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9nz3VLTi4RfGBDAE7JBUWXrJRajwAyxoeEH+VSP0wyQ=" + "vendorHash": "sha256-Bk4NxA/je67lre74KkKz4eT9fgmut3Crho8z/l1xEBY=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -491,20 +492,20 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-8GBhJvv0JYHh98l1IRMsodYlFAkW5Lt1dJ03mPzTcts=", + "hash": "sha256-3Sq+08URFntRO4uF3VFo49vrdvD1Vb+nG7V4a0IHlu0=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v2.6.1", + "rev": "v2.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-DOkDVQPTwB0l1VlfbvwJYiKRi/GE85cPzaY4JKnewaA=" + "vendorHash": "sha256-uhvk1TcnT8PNV2oHJy+rM+Z+WuKgl0rGoNypEWn7ddA=" }, "gridscale": { - "hash": "sha256-gyUDWG7h3fRU0l0uyfmxd0Oi1TtQHnJutqahDoPZWgM=", + "hash": "sha256-nOuckOEiHTMUOSjRwTHaitLOosraEl2mbU4gafi3gi4=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.22.0", + "rev": "v1.23.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -518,13 +519,13 @@ "vendorHash": "sha256-oGABaZRnwZdS5qPmksT4x7Tin2WpU2Jk9pejeHbghm8=" }, "helm": { - "hash": "sha256-pgV1xXhg8WIyF4RhJwAenTI6eAmtINveO8zqrKzLajQ=", + "hash": "sha256-Zj0mZfQhZimk3QozKHNU7quO/SqV3278Y+l9bFa8w/k=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.11.0", + "rev": "v2.12.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE=" + "vendorHash": "sha256-qoXWnAbjRsvFDtlDCfeaIjc5hZIbCgosyH0pXhHkWiA=" }, "heroku": { "hash": "sha256-M1HdcKHOVf/rxjECvHqnU6FRXE6T8TpI24Fo0gkZ6FU=", @@ -555,20 +556,20 @@ "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=" }, "http": { - "hash": "sha256-zffR6NS3i+aWF89c5NzKvuqWe6q8OPbRONY5gjsrUWE=", + "hash": "sha256-cD38F0IzYRQB43lLrlm8m6XeH0GL9nNFgqImtH5wjU8=", "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", "repo": "terraform-provider-http", - "rev": "v3.4.0", + "rev": "v3.4.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-hxT9mpKifb63wlCUeUzgVo4UB2TnYZy9lXF4fmGYpc4=" + "vendorHash": "sha256-1gWC+HAwb9kzyhxlgQG7bky2VjGzCzFUFQGQzbrmmPg=" }, "huaweicloud": { - "hash": "sha256-V6Ar0MXK7i927eDq8uvHZc3ivVonK9KBKqSZCCESgq0=", + "hash": "sha256-ZY3HhTn53rO+vzBWdrNflafuBOSEIM6AvskqbLXHjfs=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.57.0", + "rev": "v1.59.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -591,13 +592,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-Od+aunGMjcQ4AF60dxWNAUVMQiAkFMSAquOhUp3icug=", + "hash": "sha256-LHj3oua4EnaWKs5kendY4zZvGeLI/dd0PyTcCsOytWo=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.59.0", + "rev": "v1.60.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-qp1TZmDr7X+2MCdlGTBLubJ7hF5Y9jqoFaj5mxgNLHE=" + "vendorHash": "sha256-crz1eLJnXpqe5iAy3s7Cgo72o3pwjpeWPx29GKw0qAg=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -608,6 +609,15 @@ "spdx": "MPL-2.0", "vendorHash": null }, + "incus": { + "hash": "sha256-FWQaU2C1cRo+3SqnesJl5EXfEYR/ssSHHZ9/09zRSTQ=", + "homepage": "https://registry.terraform.io/providers/lxc/incus", + "owner": "lxc", + "repo": "terraform-provider-incus", + "rev": "v0.0.2", + "spdx": "MPL-2.0", + "vendorHash": "sha256-KdyhF1RUZoycsNqRnkME9Q7bTkV2xuNERx24+/p+j1w=" + }, "infoblox": { "hash": "sha256-rjqtqfmQQoJIhMtP6sFOu/XfJ691E77P0Bf9gjml2yg=", "homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox", @@ -618,13 +628,13 @@ "vendorHash": null }, "jetstream": { - "hash": "sha256-CFjgF02JZJ072mAMvRnObaq3t+SPeT2uXqkRvlRrG5c=", + "hash": "sha256-RlYl8DNx+XjLjMQ8CbVJH0p2ZwBrDNp2OCvzHxQ7zLA=", "homepage": "https://registry.terraform.io/providers/nats-io/jetstream", "owner": "nats-io", "repo": "terraform-provider-jetstream", - "rev": "v0.0.35", + "rev": "v0.1.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-OMDMpL9ox6tI9tkoSU0oVuFzRObmUGgGQy6RtsNbyIg=" + "vendorHash": "sha256-NEGjgtrn6ZowqSF6NAK1NnSjYVUvfWuH/4R5ZPdTZSs=" }, "kafka": { "hash": "sha256-cWFPuKU7CQU8TYy125N88saBGPkrGa+7mKLi3TlnM2I=", @@ -663,40 +673,40 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-aPplKT6L9Lmp4St6DLtHywiunqLaABEB9urbtSfK8Ec=", + "hash": "sha256-AAvGYVD+MTF8Ds992lrEgzc9naVbv/qz4+jZRLbieG0=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.23.0", + "rev": "v2.24.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA=" + "vendorHash": "sha256-kyQDioVlZFufhXRInXUPTW343LZFmB3SeTlLLRPwzRA=" }, "launchdarkly": { - "hash": "sha256-4vluO+efNhlYhnzNjvZD6ol0eIx3DWzQBTevMmRAfxM=", + "hash": "sha256-AxnMBygXEkgnGfVRqpIFcGdjED3S+OryzIutFzWM+fY=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.16.0", + "rev": "v2.17.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-f/OJ+DoH/pc+A7bl1OOgsSU1PQC2ZEBuK7sSmcpA3tk=" + "vendorHash": "sha256-hGlgqLXpVUoATd7GihX+RMoUvGkqXr5F/uwAY3n+57Y=" }, "libvirt": { - "hash": "sha256-64wCem/eTCCyZvz96szsWoKrxKezsHQYoYZGKHBF8OY=", + "hash": "sha256-yGlNBbixrQxjh7zgZoK3YXpUmr1vrLiLZhKpXvQULYg=", "homepage": "https://registry.terraform.io/providers/dmacvicar/libvirt", "owner": "dmacvicar", "repo": "terraform-provider-libvirt", - "rev": "v0.7.4", + "rev": "v0.7.6", "spdx": "Apache-2.0", - "vendorHash": "sha256-dHzyNvzxNltCAmwYWQHOEKkhgfylUUhOtBPiBqIS1Qg=" + "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" }, "linode": { - "hash": "sha256-ScuHyfnco5Xz6HrZ9YPQLdWKo1Hqu7LRteLHH2JxHXQ=", + "hash": "sha256-fQc6iJi32B+LPHW1c26/PsI6HGMBOBZpIhALEGBTKK0=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.9.7", + "rev": "v2.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-5ALsYOuWLFGbIR3yVKmPeb0tQnx63p4WC98WdcxXeZ4=" + "vendorHash": "sha256-hbGilQWhlme1URDz2idjYMq1oAYiI4JIvs/n/+W1lEU=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -708,13 +718,13 @@ "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" }, "local": { - "hash": "sha256-LN9mYtFNPPlG3Wdz0ggS57zYMO2chf6JipRmn+OKCnw=", + "hash": "sha256-FeraMYTrcGQ7JwlCOMyOJdwhtdRHS1b5PA0lpSIwAVY=", "homepage": "https://registry.terraform.io/providers/hashicorp/local", "owner": "hashicorp", "repo": "terraform-provider-local", - "rev": "v2.4.0", + "rev": "v2.4.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ=" + "vendorHash": "sha256-T/YQsNpPISDSVi00KrLRX/+jFNQVl2ze/3D2ZRxmUjI=" }, "lxd": { "hash": "sha256-2th4/2uLFnmSFKI94bSSt4OSX9wiML/OkThR6SbUCPE=", @@ -762,20 +772,20 @@ "vendorHash": "sha256-aIIkj0KpkIR+CsgPk4NCfhG7BMKaAQZy/49unQx4nWQ=" }, "mongodbatlas": { - "hash": "sha256-SMIc78haJiH0XdTr9OBGWOcvXfYQW9thcNkCOxmNxDw=", + "hash": "sha256-49DqsvrRw0Md9fJS3GVvSKJOQAMcL494fjuuOPf/u7k=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.12.3", + "rev": "v1.14.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-B1trhV2/H5gP7EnUU7G45gIh95S2wYbANHsRM76CDWE=" + "vendorHash": "sha256-ySk+zivqynxdOIVtwzRJ31U2u8rxMJLXRxZw2rmtoaM=" }, "namecheap": { - "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", + "hash": "sha256-NqY3dELdpYahbdK7wpTJ9BMTIesUpwOvISbArDOPj/4=", "homepage": "https://registry.terraform.io/providers/namecheap/namecheap", "owner": "namecheap", "repo": "terraform-provider-namecheap", - "rev": "v2.1.0", + "rev": "v2.1.1", "spdx": "Apache-2.0", "vendorHash": null }, @@ -789,22 +799,22 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-6SwAieZc7Qe8r+olZUUV46myax/M57t4VfWDrXMK8Hk=", + "hash": "sha256-dRO12NFsZnRxbKBo7B0wK2C5HHBVA0iIdCU+sYzuSqA=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.27.7", + "rev": "v3.28.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-9+AcCcAX/oEnljMCuJQ9B/aRkAB/074r4G/XWnLv/KU=" + "vendorHash": "sha256-mcw5BfZLmSidhkJz/NonraE77HonthI6WUwRfammM/g=" }, "nomad": { - "hash": "sha256-urxTfyBv/vuX3Xowca625aNEsU4sxkmd24tis2YjR3Y=", + "hash": "sha256-MEQK/HF9SNEKehLIUMBm2P0WdR5yISJ8DCpI0fVP/DA=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v2.0.0", + "rev": "v2.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-L8BpkzTs5qcr31Nho66xzlNMVg2SqfZbj9pPAZrNuqA=" + "vendorHash": "sha256-vK+xErFvVj59lcSGUcMK0qdEFjC2cg77BI8EQ6Na83Y=" }, "ns1": { "hash": "sha256-UHoOVITbfwZ7tviDuZ1Tp9aVgRpB9ZnCzk5EOZeH/Eo=", @@ -816,13 +826,13 @@ "vendorHash": "sha256-nkpKq8cAusokeuOk32n8QA9He9zQlaTFzUwLMHKzpqM=" }, "null": { - "hash": "sha256-ExXDbAXMVCTZBlYmi4kD/7JFB1fCFAoPL637+1N6rEI=", + "hash": "sha256-KOwJXGvMc9Xgq4Kbr72aW6RDwzldUrU1C3aDxpKO3qE=", "homepage": "https://registry.terraform.io/providers/hashicorp/null", "owner": "hashicorp", "repo": "terraform-provider-null", - "rev": "v3.2.1", + "rev": "v3.2.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-vXyE0/tXzFHJPNq8MZ+NZItDWS3K7ZhtY23hGjtqRh8=" + "vendorHash": "sha256-9MeLKrKV3OESkJ4kTB9A9c9IYY1QsME0CODIoGU+anU=" }, "nutanix": { "deleteVendor": true, @@ -835,22 +845,22 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-gk5KegQozeDg6ZqYsy+DxMczBOKxH0v3mHFRau/alFY=", + "hash": "sha256-s+yyvYJCEcG3BxcPbnHR88WzZfuwk2c4QNGkdqSwLn4=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.20.0", + "rev": "v5.23.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-LCOuRsAX0ftacS0ecNQpYXKKumfCZ9a10bSuRJtD20E=", + "hash": "sha256-+lwR0/Q2lbBCDwQ0Hurhw8VhXOQzHqfMtD/dnedHIvU=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.6.1", + "rev": "v4.6.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-ZhF1c4cez43cCumU+PYufpEcprRDxY7hVCNQHdIEDtI=" + "vendorHash": "sha256-sF/jKuP7d5nafda9UfwtvdSsoJAxyI10o+70vadwAHs=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -880,20 +890,20 @@ "vendorHash": "sha256-hVsqlWTZoYAMWMeismKhiqFxSFbkTBSIEMSLZx5stnQ=" }, "opentelekomcloud": { - "hash": "sha256-3p5R8thq5iWaeAsvqoA03UK6hzVGi4DlEe3PHJBP3xA=", + "hash": "sha256-V18yZ3wMxQaqGqqIMvN5ukZ4J9hci2cOhx8s+NdlNXg=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.35.11", + "rev": "v1.35.14", "spdx": "MPL-2.0", - "vendorHash": "sha256-MD3tywosRUbkzeXQA2yTHr3p8RJlzNZVbrlTesDHpMI=" + "vendorHash": "sha256-wiMHvONS1VKtLf245pVCgqmlvyx8nlBJda0vOuepPak=" }, "opsgenie": { - "hash": "sha256-IIQtbRKfLbJz5J/T/YzVWSivMeuyKO6iKlXmbrslpQo=", + "hash": "sha256-ZssKhfwFrzCjvlebEmKAHWBInN5daVqxbmVFoA92dv8=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.34", + "rev": "v0.6.35", "spdx": "MPL-2.0", "vendorHash": null }, @@ -907,11 +917,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-4TplBhRU4k7ucDCsgWcqEok9tOADuZAwqOonAY+eLdY=", + "hash": "sha256-XP7Y8qCnsCDMfMV1ip09y5HZHZUmpvYzBZA3xodedTw=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.1.1", + "rev": "v3.4.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -979,13 +989,13 @@ "vendorHash": "sha256-2uNawlNPmByjoIjufl3yMfo2MdV+MsXqSRVEWursHKc=" }, "random": { - "hash": "sha256-IsXKdS3B5kWY5LlNKM0fYjp2uM96ngi6vZ9F46MmfcA=", + "hash": "sha256-8RRfoxDXa9pScyZ8CXBuWODlahd3lH0IzPaV0yb7GpI=", "homepage": "https://registry.terraform.io/providers/hashicorp/random", "owner": "hashicorp", "repo": "terraform-provider-random", - "rev": "v3.5.1", + "rev": "v3.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ScY/hAb14SzEGhKLpnJ8HrWOccwc2l0XW6t+f62LyWM=" + "vendorHash": "sha256-f89G4Ln6JX1uJNeH7Vv69Fkibh1K3jOiULVvcn4ILao=" }, "remote": { "hash": "sha256-x0mTouv+hRGznyn2XxohWzPb0vjJvJf6kDlWrLJ/JvA=", @@ -1006,13 +1016,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-lOoxgWps6r4/7JhK0Z0Iz5EA2mHYNrdIgOntRqXFrH8=", + "hash": "sha256-KSkVKPRBSdajQrf9XbcVDu+migRWqCKAYxVuywILzEo=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.33.0", + "rev": "v2.35.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-tly9+vClV/IGivNBY114lNXxnYjJVvhVAi1tEyCtIoo=" + "vendorHash": "sha256-vG5wLysF76t4eGIaV8eyrH7TNeZKci2gJ/AfZEUlhdA=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1024,22 +1034,22 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-o1Lf4CEdq7WeJ4TAY7Hq/rjadcB6Ifi5ylEs7ctXw4I=", + "hash": "sha256-p9XH9/sIVyY2f957/8KI91y5GCn1/MEGY+QBsArvYJA=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v4.0.1", + "rev": "v4.0.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-5+cFBQHK1ypac5Ug2YNokfH/XoVInAytoIklN3bHt2g=" + "vendorHash": "sha256-FjJosTjFRJnBW22IB9UHfZe9KWrT1h12InyUl0q7a28=" }, "sentry": { - "hash": "sha256-L/aZ4/xCVZk3C6AGglzCj5T9XnoI/uiLbRASNAHwcro=", + "hash": "sha256-VTgD19eWeRtDFOuUjnSANkNz8pN/UutJeFgS5qkMpH8=", "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", "repo": "terraform-provider-sentry", - "rev": "v0.11.2", + "rev": "v0.12.1", "spdx": "MIT", - "vendorHash": "sha256-5XAetSjMtRffP/xExRUXfclDutEFV0VL3drusaB4rnM=" + "vendorHash": "sha256-lwTsKX3rQObMvysvcPYxJxd09LRlWTH2s+APiOhnalo=" }, "shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", @@ -1069,13 +1079,13 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-O5Nt+CcVppo5w4gD+NQ/XrRbkJicIzQrh5gffjPNvvw=", + "hash": "sha256-G/LHNXkK/pOwNqpoCudM3eGQgv1U2r5l4N/gJfJ5JzU=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.75.0", + "rev": "v0.82.0", "spdx": "MIT", - "vendorHash": "sha256-VD3zXfaa2fmq85a/k7LPbDVS1gA5xHC2F3Ojqpmt8MI=" + "vendorHash": "sha256-nT/zEQgHWnCrlm6TL/DnXIvwDxEs147OfXn/qnlvIH0=" }, "sops": { "hash": "sha256-ZastswL5AVurQY3xn6yx3M1BMvQ9RjfcZdXX0S/oZqw=", @@ -1087,22 +1097,22 @@ "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" }, "spotinst": { - "hash": "sha256-mYLIOnWI1yzfmuKikDib4PIDLJulGBqvo2OkGmUt7fw=", + "hash": "sha256-0J0doJcCG1rqyq9hHrB0dWknVcepafQn6obbn2+MuWg=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.149.0", + "rev": "v1.156.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6UUXMcfyIiZWc7HSy3P8gc7i1L9cVjifwREfmw05Qco=" + "vendorHash": "sha256-rM+JSRhrhHT8RjinP0Wz8/zphiRBnuPmGgS/gGJ/Cik=" }, "stackpath": { - "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", + "hash": "sha256-aCaoRxlV/UxYobHC5OqFO8nt9oQgyug1AuJffhnwauc=", "homepage": "https://registry.terraform.io/providers/stackpath/stackpath", "owner": "stackpath", "repo": "terraform-provider-stackpath", - "rev": "v1.5.0", + "rev": "v2.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OGYiynCwbJU2KisS7Y6xmLuBKOtQvh3MWPrvBk/x95U=" + "vendorHash": "sha256-G+5vSXhxmt0Qsqt7vnecPZfIxAonNF3l7ygQZ0nemnU=" }, "statuscake": { "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=", @@ -1114,49 +1124,49 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-5/PaEGKG8M/XifRelqV1aL6ARXRVvOYY/uka+grijzg=", + "hash": "sha256-HMjghu/2Q7rPkVKO5qtKAqEZFexbK3lfiylwB8Q2sYw=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.27.0", + "rev": "v2.28.0", "spdx": "MPL-2.0", "vendorHash": "sha256-iNBM4Y24vDGPKyb5cppSogk145F0/pAFmOzEeiWgfLI=" }, "tailscale": { - "hash": "sha256-GOeuTjF+nwasO2Fel8FbDvZeTLaz+/HlcZnySxxS2d8=", + "hash": "sha256-1OSGJham+oJLQUcSm+Iea9SDM5VhOcE7Bz+ZgxM4Lww=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.13.11", + "rev": "v0.13.13", "spdx": "MIT", - "vendorHash": "sha256-wbSQkw2k/LtbWOcMd8ZnHzzI01H45J18sevQU9Xur2Q=" + "vendorHash": "sha256-w0S9ACnDNZsEvYEkS2Q/8I2doM3AmgpzmgRXgA7CaTw=" }, "talos": { - "hash": "sha256-aP5hiR+b31+QjVWvNPxYkzijTUnFGpgR3f5XuN1Pzx8=", + "hash": "sha256-DoO2aGoBkuafPJGNz0opmkFw4wwUgsczA2D0bSXQAlg=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.3.2", + "rev": "v0.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0HRhwUGDE4y7UFlXyD0w8zl4NV5436L4SRhrb8vQGyc=" + "vendorHash": "sha256-FWwHAaUKUw7DyNs4sAlkLkGNj48wMJgpFvfQgbp8lFs=" }, "tencentcloud": { - "hash": "sha256-o9PY7kZAsF/bOkmIa0QKW2SabK0u56FtjMxmlKNROBg=", + "hash": "sha256-Ixusjq3HmPhT9uBoaDnrfVHFxD420Z5P/+JxBd0SIRY=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.45", + "rev": "v1.81.60", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-HsoqWDwze/INB3KfQzwKKGbyKiU7xfsI4Bg/4/xFGr4=", + "hash": "sha256-dbraY0A8z2YI09FWFqIsOcWshGn1/ZlPLeWdjWWbgmc=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.50.0", + "rev": "v0.51.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-D8ouBW20jzFi365gDgL2sRk2IERSgJN3PFb7e1Akl50=" + "vendorHash": "sha256-lxXTiJeZ/8psry2dxrecB+o0xElSQrCjwZ9zXijI9Bs=" }, "thunder": { "hash": "sha256-wS50I4iTnHq0rDUoz7tQXpqW84wugQQiw42xhzxFiRw=", @@ -1168,22 +1178,22 @@ "vendorHash": null }, "time": { - "hash": "sha256-FehWmIkL0o2pleafN/mlBa46cdFqCFUS+coOwFPdb9M=", + "hash": "sha256-5AOp6y/Nmu59uB9QXqwkcgakyzAyiAclZ9EJa7+MvpY=", "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", "repo": "terraform-provider-time", - "rev": "v0.9.1", + "rev": "v0.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-MLh/we8KNrDBy2BAMZ6B/gBe0p3xJ7l/imNzTHciJjs=" + "vendorHash": "sha256-TrkmjqUJi28sN9POzEuKzKyPQiS1RtVpj9NbsM3jW0I=" }, "tls": { - "hash": "sha256-DBOkfvT0+mlgaWiBHggZUKvHL8jLZjQjRi0xFZKgcoM=", + "hash": "sha256-2K18jY2+oPvelMtZ2o4WJcAPhc93nCvJdHq+VNfmWZI=", "homepage": "https://registry.terraform.io/providers/hashicorp/tls", "owner": "hashicorp", "repo": "terraform-provider-tls", - "rev": "v4.0.4", + "rev": "v4.0.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-k7aW5ZD6pAtdT6tTXy8YaJlFS5WR5FzPd9eINgPBYJM=" + "vendorHash": "sha256-6uzqx9Tz9JcHYHhG/tWYJaUP8yWe533gB0h1+YF+tgQ=" }, "triton": { "deleteVendor": true, @@ -1205,11 +1215,11 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-eCJXqCtNWPsJzlEPdGHK1NMxASTqQBIFAWSVGbyiKn0=", + "hash": "sha256-D6nrIjw4m2loeZRKNvrmgNQ4oaHKEc2xjxrWcgE8LNw=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.38.2", + "rev": "v1.38.3", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1223,22 +1233,22 @@ "vendorHash": "sha256-vFfwa8DfmiHpbBbXPNovPC7SFoXRjyHRwOVqBcWCEtI=" }, "vault": { - "hash": "sha256-9SOHw46KChe7bGInsIIyy0pyNG3K7CXNEomHkmpt8d4=", + "hash": "sha256-Db56SNnIHUuiIUKFKC5NwWaIbfsT85GZ95UBR+PUSMY=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v3.22.0", + "rev": "v3.23.0", "spdx": "MPL-2.0", "vendorHash": "sha256-5rRWlInDRj7hw4GZqTxfH7Y8tyTvzJgBWA1I5j0EyaI=" }, "vcd": { - "hash": "sha256-ltdkB9PqmuCs5daRjcThVhy1wIoDW21yBiwtRo/pMss=", + "hash": "sha256-TP9COMofx4c2GZ0dQkfopn4iq8ddfV3WwuNjTu6yQnU=", "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", "repo": "terraform-provider-vcd", - "rev": "v3.10.0", + "rev": "v3.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-p/wTnEr/+qe8S83x6EtfsnIMVUF1VWZVHOq0vLDbh60=" + "vendorHash": "sha256-IqmmlLr+bwfSRJtKbK/fiBdbf2vX61+6h6rZizD1vw8=" }, "venafi": { "hash": "sha256-OQNeDmsXC1Fr9bTZ07HELZznU9n4ttSkFbNOC6ooxnk=", @@ -1259,29 +1269,29 @@ "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { - "hash": "sha256-03qXrYDpmPc7gHELzjS5miLm5NPTrF0AV1sUSCM0/4o=", + "hash": "sha256-dvdsfUKhl1z/iHsh+/2HDb6mEX86P9FgynkzVQgtM5w=", "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", "repo": "terraform-provider-vra7", - "rev": "v3.0.11", + "rev": "v3.0.12", "spdx": "MPL-2.0", "vendorHash": null }, "vsphere": { - "hash": "sha256-3kBxS8JeYYjILfpeq58fYt6j2vQXEHRXoxZBfOhCptA=", + "hash": "sha256-VWPKSR6xIph5dnMBSmLB/laY+DmNdshn6+94amCFQ5g=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.5.1", + "rev": "v2.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-4ulRYzb4bzk0TztT04CwqlnMGw8tp7YnoCm2/NqGN7Y=" + "vendorHash": "sha256-d9CdK5AHFZRC89Xko4vyx8jR10fkG1VYGVILlXM7zgw=" }, "vultr": { - "hash": "sha256-9HEuJXV6spLoLEVwdNid+MfVrBvrdUKjHWkDvQLSG+s=", + "hash": "sha256-CW4wZ4wPdf66z68oov1d5q3ayITEzImIs/WA+mMKmpg=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.17.1", + "rev": "v2.18.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1295,12 +1305,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-QirLhOAvOcsMFR0ZWHCCI2wbfcD5hfHSlZ0bguvAHiI=", + "hash": "sha256-piN10vAmUjI/jHTGVWvSGFNR7T01/51E8rJ+UZZt5Vk=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.102.0", + "rev": "v0.104.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-y8M50X2F4olM1I0i32uUd/FASY9wUnMOF5k4AEP6b9I=" + "vendorHash": "sha256-W/i1r+SdYPTU4kha5Pr4i8+Xr8KqTEKFZDA3+vMP8pk=" } } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 9937359dd497a..df62730e0bb97 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -167,9 +167,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.6.5"; - hash = "sha256-TJKs7pWoLFIeov/ERgPqZxPtbjSAHrHI2wrSEXUAS1A="; - vendorHash = "sha256-QHfCGlgOv4v3MzUs4JxIHytcyymUYmnk4Z0smgak1Mg="; + version = "1.6.6"; + hash = "sha256-fYFmHypzSbSgut9Wij6Sz8xR97DVOwPLQap6pan7IRA="; + vendorHash = "sha256-fQsxTX1v8HsMDIkofeCVfNitJAaTWHwppC7DniXlvT4="; 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 e0bfdd444efdb..a48e16a9ef718 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.53.8"; + version = "0.54.10"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qjtyzwcpkZ1+jfwbpYGEXPLeh5+7iNNRRmn8VvZBIEo="; + hash = "sha256-0cciBPMK2ceRSyV0zt5o/SgHDUzbtMj/BmLzqsMf/7g="; }; - vendorHash = "sha256-Eu4BOi9ClzNps20OT4L/AXxKZ5zL9ipSmfDunO6CxNs="; + vendorHash = "sha256-nz/mIMLgYF2HjN0jalCqUni143VKjFUMBc/0GaEG20U="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index 8256d04d6b97b..ab44da15a8d0f 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -1,14 +1,14 @@ -{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles, testers, vcluster }: buildGoModule rec { pname = "vcluster"; - version = "0.17.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-xmSp3cNqNv48gBWpt0Pnvl3l5gIyV1oPNGrB58X+OVU="; + hash = "sha256-TJjMB7x8MOlr3GexsnOZBFPJovVkf4ByRn1aGprvZFQ="; }; vendorHash = null; @@ -36,9 +36,15 @@ buildGoModule rec { postInstall = '' installShellCompletion --cmd vcluster \ --bash <($out/bin/vcluster completion bash) \ + --fish <($out/bin/vcluster completion fish) \ --zsh <($out/bin/vcluster completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = vcluster; + command = "vcluster --version"; + }; + meta = with lib; { description = "Create fully functional virtual Kubernetes clusters"; downloadPage = "https://github.com/loft-sh/vcluster"; diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix index d71e9fb7fb7d4..45fc40384763a 100644 --- a/pkgs/applications/networking/cluster/waagent/default.nix +++ b/pkgs/applications/networking/cluster/waagent/default.nix @@ -1,25 +1,18 @@ -{ fetchFromGitHub, - findutils, - gnugrep, - gnused, - iproute2, - iptables, - lib, - nettools, # for hostname - openssh, - openssl, - parted, - procps, # for pidof, - python39, # the latest python version that waagent test against according to https://github.com/Azure/WALinuxAgent/blob/28345a55f9b21dae89472111635fd6e41809d958/.github/workflows/ci_pr.yml#L75 - shadow, # for useradd, usermod - util-linux, # for (u)mount, fdisk, sfdisk, mkswap +{ bash +, coreutils +, fetchFromGitHub +, lib +, python39 +, substituteAll }: let inherit (lib) makeBinPath; + # the latest python version that waagent test against according to https://github.com/Azure/WALinuxAgent/blob/28345a55f9b21dae89472111635fd6e41809d958/.github/workflows/ci_pr.yml#L75 + python = python39; in -python39.pkgs.buildPythonPackage rec { +python.pkgs.buildPythonApplication rec { pname = "waagent"; version = "2.8.0.11"; src = fetchFromGitHub { @@ -29,44 +22,54 @@ python39.pkgs.buildPythonPackage rec { sha256 = "0fvjanvsz1zyzhbjr2alq5fnld43mdd776r2qid5jy5glzv0xbhf"; }; patches = [ - # Suppress the following error when waagent try to configure sshd: + # Suppress the following error when waagent tries to configure sshd: # Read-only file system: '/etc/ssh/sshd_config' ./dont-configure-sshd.patch ]; doCheck = false; - buildInputs = with python39.pkgs; [ distro ]; - runtimeDeps = [ - findutils - gnugrep - gnused - iproute2 - iptables - nettools # for hostname - openssh - openssl - parted - procps # for pidof - shadow # for useradd, usermod - util-linux # for (u)mount, fdisk, sfdisk, mkswap - ]; + # azure-product-uuid chmod rule invokes chmod to change the mode of + # product_uuid (which is not a device itself). + # Replace this with an absolute path. + postPatch = '' + substituteInPlace config/99-azure-product-uuid.rules \ + --replace "/bin/chmod" "${coreutils}/bin/chmod" + ''; + + propagatedBuildInputs = [ python.pkgs.distro ]; + + # The udev rules are placed to the wrong place. + # Move them to their default location. + # Keep $out/${python.sitePackages}/usr/sbin/waagent where it is. + # waagent re-executes itself in UpdateHandler.run_latest, even if autoupdate + # is disabled, manually spawning a python interprever with argv0. + # We can't use the default python program wrapping mechanism, as it uses + # wrapProgram which doesn't support --argv0. + # So instead we make our own wrapper in $out/bin/waagent, setting PATH and + # PYTHONPATH. + # PATH contains our PYTHON, and PYTHONPATH stays set, so this should somewhat + # still work. + preFixup = '' + mv $out/${python.sitePackages}/etc $out/ - fixupPhase = '' - mkdir -p $out/bin/ - WAAGENT=$(find $out -name waagent | grep sbin) - cp $WAAGENT $out/bin/waagent - wrapProgram "$out/bin/waagent" \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : "${makeBinPath runtimeDeps}" - patchShebangs --build "$out/bin/" + buildPythonPath + + mkdir -p $out/bin + makeWrapper $out/${python.sitePackages}/usr/sbin/waagent $out/bin/waagent \ + --set PYTHONPATH $PYTHONPATH \ + --prefix PATH : $program_PATH \ + --argv0 $out/${python.sitePackages}/usr/sbin/waagent ''; + dontWrapPythonPrograms = false; + meta = { - description = "The Microsoft Azure Linux Agent (waagent) - manages Linux provisioning and VM interaction with the Azure - Fabric Controller"; + description = "The Microsoft Azure Linux Agent (waagent)"; + longDescription = '' + The Microsoft Azure Linux Agent (waagent) + manages Linux provisioning and VM interaction with the Azure + Fabric Controller''; homepage = "https://github.com/Azure/WALinuxAgent"; license = with lib.licenses; [ asl20 ]; }; - } diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 9895729c29eb9..c10bd88f4d767 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.269"; + version = "1.2.275"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-LUHENANM+3wGftTVXaQsGykKayzEAIQ3TQ5qM77TJVA="; + hash = "sha256-8WMkarh/5ylCz1IqyLefivjvCBAl15TvT6TLqBmG7Hs="; }; - vendorHash = "sha256-20bPsBRya7Gg7p/hSSnnYLoSHf/fRwk1UrA/KlMT3Jk="; + vendorHash = "sha256-LXjGqI9cowou5ZHVRldwCD1vOzwCyU269TkTflIkdAc="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/yor/default.nix b/pkgs/applications/networking/cluster/yor/default.nix index 9177ed8110dae..ea89d83f6bf76 100644 --- a/pkgs/applications/networking/cluster/yor/default.nix +++ b/pkgs/applications/networking/cluster/yor/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "yor"; - version = "0.1.185"; + version = "0.1.187"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-5CBOLbqsEVzYyU67c7QTGTe471XQlEC/826wYCPHzEo="; + hash = "sha256-w82kJhMnupVv4eq3SUDFaWSvkVrxOSPsN+OXl8aIKog="; }; vendorHash = "sha256-ZeTjGmlu8LndD2DKNncPzlpECdvkOjfwaVvV6S3sL9E="; diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 92319f173493c..9825bd480f716 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.12.6"; + version = "0.12.7"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-AmlDOtV6uQtrscvIgK5kz6PldA7a1XrVuwO4DCFZeno="; + hash = "sha256-voNUnQ0CWM0aGiVkIucn6eRJCp0ajz7hYKBFkYsKPu0="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-v1DoRZuv6k6UIgPirXMbvunttn1aBLbTc+GdtdKquDk="; + vendorHash = "sha256-adxPB3JPnAf6AxUZjgciK7nJguQWyeYy2/qfePVUouE="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 8b46e31b7b5cf..ab818c7267986 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "unstable-2023-11-14"; + version = "unstable-2023-12-12"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "002e382c0de1d87e2ce7fd579346da4f339880ca"; - hash = "sha256-eOlPc2WDjc73UlFH9d6Kw4/nEbjhBv4xLopxdTnFTYk="; + rev = "320ec7753d552974d4d5ede3fcf6fb3c0d52b6e4"; + hash = "sha256-LVWOXw8+GbCE6N6kVSXDjjNqOcq7PS4KU7LXoowhBdQ="; }; - vendorHash = "sha256-1evMzQECqZvKJzNUk9GjrQej9vmnHs9Fm4kXJ0i5gMw="; + vendorHash = "sha256-8qr1erKGyJvR4LDKHkZf7nR0tQOcvUHQyJt7OlqNS44="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix index 3d78aa42a2404..c7a5e8e9e2b93 100644 --- a/pkgs/applications/networking/diswall/default.nix +++ b/pkgs/applications/networking/diswall/default.nix @@ -5,20 +5,20 @@ let in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-uWGpSpT8TyEkF5OI2enZwbcsyoHIemC0Dm1LExi+AC8="; + sha256 = "sha256-RchpdIS5RKe6Ck2kYQHeq5Dl+ZBWdO/+ZHuFyfYmyMc="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-Te2mqrBKHDKbFaO0ZNV2C6AHz07v1jWCMm05YiXg+w0="; + cargoHash = "sha256-AUDTPFRntxk84o9f4wfai04tBMFM2ItNGc3W9lcZ1as="; doCheck = false; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 1bf5980acb4aa..e233d02a4c89d 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.6.2"; + version = "4.7.3"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-FcEpUNFPwottpuIsO53voucKULTkWOdbDgEXKYLb9LQ="; + hash = "sha256-xxcoh7x6OvziVNCaCLnjqTfJCn2JOR0n23lfNUbZ2cg="; }; - vendorHash = "sha256-cW6urAJ3H30HY4Q7JLWFsQebg6YhdGSBgICWMl85v9U="; + vendorHash = "sha256-fRK2ZFoqugZ9lb6VxZZHBQjTa2ZQs5NFBx6Z6NX3eWw="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix index 0c97ad68b824a..652768eab9913 100644 --- a/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "goeland"; - version = "0.16.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "slurdge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bjPmhNJFkN0N0Mx3Q4RJuNfeqFy9v8KphiAU1WyKCo4="; + sha256 = "sha256-3LO0p3klnwamhTuOw5S0dN5qsI8u1l5UWN5FkGnY5Lo="; }; - vendorHash = "sha256-jYrPsVagGgvpQ9Zj3o2kB82xgw/yaJS9BXxuqMkNjEA="; + vendorHash = "sha256-zwUX6EBz34lg7vg7R52xcslrhyRTiueP3RNLRxsupn4="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix deleted file mode 100644 index 22bd33b87717f..0000000000000 --- a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, lib, fetchurl, unzip, makeDesktopItem, copyDesktopItems -, makeWrapper, electron }: - -stdenv.mkDerivation rec { - pname = "indigenous-desktop"; - version = "1.3.0"; - - src = fetchurl { - url = "https://github.com/marksuth/indigenous-desktop/releases/download/v${version}/indigenous-linux-x64-${version}.zip"; - sha256 = "sha256-1nqj9N5RQE0PogJSULu75CTVLHeQsHIimtFXSCP6SPA="; - }; - - nativeBuildInputs = [ - copyDesktopItems - makeWrapper - unzip - ]; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = "indigenous-desktop"; - icon = "indigenous-desktop"; - comment = meta.description; - desktopName = "Indigenous"; - genericName = "Feed Reader"; - }) - ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/opt/indigenous $out/share/indigenous $out/share/pixmaps - cp -r ./ $out/opt/indigenous - mv $out/opt/indigenous/{locales,resources} $out/share/indigenous - mv $out/share/indigenous/resources/app/images/icon.png $out/share/pixmaps/indigenous-desktop.png - - makeWrapper ${electron}/bin/electron $out/bin/indigenous-desktop \ - --add-flags $out/share/indigenous/resources/app - - runHook postInstall - ''; - - meta = with lib; { - description = "IndieWeb app with extensions for sharing to/reading from micropub endpoints"; - homepage = "https://indigenous.realize.be/indigenous-desktop"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.gpl3Only; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 723e2bef1b827..c522210bb6e70 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.33"; + version = "2.34"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-p9cyH5jANkB+PuvAq6KjaelgPwj1f7XNxuKMpT7jjpg="; + hash = "sha256-knF+N/HHL/E6C973t+ww5XTLV2thwy7lMAeqTyXspHY="; }; - cargoHash = "sha256-95xM4kZZ70xhfx+EvqFecYbVdisq9hpgp0t+s5Cp8QQ="; + cargoHash = "sha256-IsDym+tqF040SxCJF575OPm45IROYMFsCrxJcM1SAJ4="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 2653af6f51ae6..b9e903c236a54 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -43,6 +43,7 @@ buildPythonApplication rec { homepage = "https://pypi.python.org/pypi/rss2email"; license = licenses.gpl2; maintainers = with maintainers; [ ekleog ]; + mainProgram = "r2e"; }; passthru.tests = { smoke-test = nixosTests.rss2email; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index ae0ba30d559bc..8563b71a9faaa 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,15 +24,15 @@ let in python.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.10.1"; - format = "pyproject"; + version = "3.11.2"; + pyproject = true; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-4r+PADMUpyvWNvA7MSgjx1VcCJKrYJLyvEn9esZKCRw="; + hash = "sha256-IM3qVn+XAv0EvRYc7ujMU4NPly5IaxF0efHAgI/lyms="; }; postPatch = '' @@ -60,6 +60,7 @@ python.pkgs.buildPythonApplication rec { loguru more-itertools packaging + pendulum psutil pynzb pyrsistent diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 9253412aac033..ae792037e453a 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -8,6 +8,7 @@ , fetchFromGitHub , pkgsStatic , stdenv +, nixosTests , testers , gns3-server }: @@ -75,9 +76,12 @@ python3.pkgs.buildPythonApplication { "--reruns 3" ]; - passthru.tests.version = testers.testVersion { - package = gns3-server; - command = "${lib.getExe gns3-server} --version"; + passthru.tests = { + inherit (nixosTests) gns3-server; + version = testers.testVersion { + package = gns3-server; + command = "${lib.getExe gns3-server} --version"; + }; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/pkgs/applications/networking/instant-messengers/abaddon/default.nix index 7e47b6fe698b5..3dbab9211dfa8 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.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "uowuo"; repo = "abaddon"; rev = "v${version}"; - hash = "sha256-2iozeRuY/+JDnaHfAYiXNS1VgSrHAxXPuI8BevEEKTc="; + hash = "sha256-Amp6PkQWd4PnwUL29fzGETLuQXVEaARr+jIRlfrxTKc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 69515f82ddf73..f969a3c5163c4 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "9.5.0"; + version = "9.7.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-UQg7yGKdjZWrJpPAaHpPz9aQuxLvuRDXeQaOg7WorwE="; + hash = "sha256-nqIMnMz2FysBOyKpoHXQw9Gl0lmQg5oXmnZDqlPNZ+A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index fd9bdf89234d5..5f234ab523004 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -27,13 +27,13 @@ , dbusSupport ? true }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.7.0"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - hash = "sha256-cp9aaOtvFl9RUHPQRMkSjPvf0fJ29Bclh4SKnAHo7fE="; + hash = "sha256-A1S8pen0aPd3CmeRpttwivhwHnAv7Rk2lao8I/CWvo0="; }; prePatch = lib.optionalString (!dbusSupport) '' substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' "" diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 2bb15a79b941e..f7ac823caaad7 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,11 +11,11 @@ }: let pname = "beeper"; - version = "3.85.17"; + version = "3.90.11"; name = "${pname}-${version}"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.85.17-build-231109zg8yl8v6s.AppImage"; - hash = "sha256-sYdfN535Fg3Bm26XKQNyuTItV+1dT3W/2HGH51ncEM0="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.90.11-build-2312112f0wxx20y.AppImage"; + hash = "sha256-ZYv0PUvZiw8pcszCVCd7mHE/+VHb+I25OPu5R7vI1j4="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 09ba8c4d13548..81c1f6656eaaf 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -7,18 +7,17 @@ , meson , ninja , pkg-config -, python3 -, wrapGAppsHook +, wrapGAppsHook4 , evolution-data-server , feedbackd , glibmm , libsecret , gnome-desktop , gspell -, gtk3 +, gtk4 , json-glib , libgcrypt -, libhandy +, libadwaita , libphonenumber , modemmanager , olm @@ -30,21 +29,17 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitLab { - domain = "source.puri.sm"; - owner = "Librem5"; - repo = "chatty"; + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-zsZDpncnoj+0klJ2/220gY93c7mD0wIvQaP3QF8F3zQ="; + hash = "sha256-jyG6kubXTyHUw2F+MfjJiQ0us4PrbavF5PJS5Pg46Mw="; }; - postPatch = '' - patchShebangs build-aux/meson - ''; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -52,8 +47,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -63,10 +57,10 @@ stdenv.mkDerivation rec { libsecret gnome-desktop gspell - gtk3 + gtk4 json-glib libgcrypt - libhandy + libadwaita libphonenumber modemmanager olm @@ -84,8 +78,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "XMPP and SMS messaging via libpurple and ModemManager"; - homepage = "https://source.puri.sm/Librem5/chatty"; - changelog = "https://source.puri.sm/Librem5/chatty/-/blob/${src.rev}/NEWS"; + homepage = "https://gitlab.gnome.org/World/Chatty"; + changelog = "https://gitlab.gnome.org/World/Chatty/-/blob/${src.rev}/NEWS"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda tomfitzhenry ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index a946ab60e4db5..ab6b0ff5abc45 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -23,12 +23,12 @@ let esbuild' = esbuild.override { buildGoModule = args: buildGoModule (args // rec { - version = "0.14.54"; + version = "0.19.8"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-qCtpy69ROCspRgPKmCV0YY/EOSWiNU/xwDblU0bQp4w="; + hash = "sha256-f13YbgHFQk71g7twwQ2nSOGA0RG0YYM01opv6txRMuw="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); @@ -36,16 +36,16 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.42.1"; + version = "1.42.2"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-Ua4HN02203l2FgeMotqLjcRSEHFP/4OTrl8sPS/0C+k="; + hash = "sha256-c8eK6YpxCP+Ga/VcqbbOUYuL1h4xspjglCZ1wiEAags="; }; - npmDepsHash = "sha256-c9ZwShmHIoFJ2mAabKyYkYsCMXqxUf+tAS1a1/7s0qo="; + npmDepsHash = "sha256-7xMSsKESK9BqQrMvxceEhsETwDFue0/viCNULtzzwGo="; postPatch = '' test \ diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 83bf99b828d19..879314a97f0e0 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub +, buildPackages , vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext , gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking , libadwaita @@ -86,6 +87,10 @@ stdenv.mkDerivation rec { "-DVERSION_FOUND=true" "-DVERSION_IS_RELEASE=true" "-DVERSION_FULL=${version}" + "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext" + "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt" + "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" + "-DSOUP_VERSION=${lib.versions.major libsoup.version}" ]; # Undefined symbols for architecture arm64: "_gpg_strerror" diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 6a5cdfd152de0..7d5b8aaa4e9d6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,52 +1,53 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let - versions = if stdenv.isLinux then { - stable = "0.0.35"; - ptb = "0.0.56"; - canary = "0.0.184"; - development = "0.0.0"; - } else { - stable = "0.0.284"; - ptb = "0.0.87"; - canary = "0.0.340"; - development = "0.0.2"; - }; + versions = + if stdenv.isLinux then { + stable = "0.0.39"; + ptb = "0.0.61"; + canary = "0.0.224"; + development = "0.0.1"; + } else { + stable = "0.0.289"; + ptb = "0.0.91"; + canary = "0.0.374"; + development = "0.0.15"; + }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-VcSRV9LDiUXduRt20kVeAnwinl6FmACQgn//W6eFyys="; + hash = "sha256-KZLKBzd9hdOQkp7mN0rUZ8TbMvH2G0/AfwHPLAlDpug="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-RDXApmhlu2aQTjWVXMyRp0CL29btsQufIPuxjjtJGIU="; + hash = "sha256-wyP1a1bMpMx3m61EA6vtak1K4HOtCl6eMjh1DlHz5J8="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-Pu0kei/ls9yrDEpRQcgDAaEkRbYkFmp/jTwOkljoy18="; + hash = "sha256-SDF4woekFmy6VUqYTfSZi4aqtZ5ARgaex6+8qOMSHMQ="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-/+9NyreRkXu2++uhwCh3/C1Cos39hfzB0Yjf0Otg9pk="; + hash = "sha256-unzPakomF2hmiikrNfnOueBdcuZCz2z3oCA7Djn6OmY="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-TTzhc6P0hFG9BFMviNx8CCg1cVEKDiB3gtb8oR/slNA="; + hash = "sha256-3XaiaWdP7GSnMeR6yU5lfeumrVm6WpUmitVuSs+xAvE="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-cl6+kTth/7j+HJHPU4Oy1N5EnmMbpdvltKzrU1by+Ik="; + hash = "sha256-8pAoi8rAaHC17GxlDGEJxGX726qRe1LVMTQK6SngniM="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-LfixXyCoTnifw2GVAnCDnBla757JyGzbvUJwY4UhgGI="; + hash = "sha256-CiE33dAcX/aAjOncpX62KX+XfrRd5FgH8qQ2picwe6Q="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-iMw61dXtThXvz2GnZiM4+tURMRfXhrN/ze1RTBL6zy8="; + hash = "sha256-Fxxrjkj3W1MagT4rCxVEtip1W9MImsdQOuHXKPKsEtM="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index a730d8611b788..12920bf9aa387 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.50"; + "version" = "1.11.52"; "hashes" = { - "desktopSrcHash" = "sha256-ZSzH0QWUSmoSk57TF7EH3DbUFO4VX8jCrH55oruMP+s="; - "desktopYarnHash" = "044sjxpd86zhmd0wcqmsnjvrh1krspp2qd9xzlxii4zwm9jz1hxn"; - "webSrcHash" = "sha256-6BzqETzQL4Xi4YqSyjFmIgajPPpagTS4tYhOZrEfEpo="; - "webYarnHash" = "1aw40r44dvl43bfgl2cr52hdj833maq2xyg3xa49837m7lf6pr8c"; + "desktopSrcHash" = "sha256-kAnEx9wfcpjRLWz3z5md/f0vJkToYW9s888U8SAaQJ4="; + "desktopYarnHash" = "0w9hqiq1dwv6asl0bf5kvqjvm4nfpqvd0k4s0rd84fki5ysl3ijv"; + "webSrcHash" = "sha256-+jDymyX66oCSgklTiPqMi9uBFZWd5bga0SVqOc7HW8I="; + "webYarnHash" = "1sj0d4m1dxcix3mzw3g3y2zj6g0pcxl87qmz7ppicxpjbkd77g1i"; }; } diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/applications/networking/instant-messengers/element/update.sh index c68a347e68aed..0a1cc0595f879 100755 --- a/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github +#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the element packages." diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock index 085eec078c76e..877c80cc6a65f 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock @@ -30,7 +30,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array", - "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", ] [[package]] @@ -60,38 +69,38 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.9.4" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" +checksum = "bc3be92e19a7ef47457b8e6f90707e12b6ac5d20c6f3866584fa3be0787d839f" dependencies = [ - "aead", + "aead 0.4.3", "aes 0.7.5", "cipher 0.3.0", - "ctr 0.8.0", - "ghash", + "ctr 0.7.0", + "ghash 0.4.4", "subtle", ] [[package]] name = "aes-gcm-siv" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfde8146762f3c5f3c5cd41aa17a71f3188df09d5857192b658510d850e16068" +checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ - "aead", - "aes 0.7.5", - "cipher 0.3.0", - "ctr 0.7.0", - "polyval", + "aead 0.5.2", + "aes 0.8.3", + "cipher 0.4.4", + "ctr 0.9.2", + "polyval 0.6.1", "subtle", "zeroize", ] [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -113,9 +122,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" [[package]] name = "arrayref" @@ -131,11 +140,10 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ashpd" -version = "0.5.0" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" +checksum = "2c018490e423efb6f032ef575f873ea57b61d44bec763cfe027b8e8852a027cf" dependencies = [ - "async-std", "enumflags2", "futures-channel", "futures-util", @@ -143,9 +151,10 @@ dependencies = [ "gdk4-x11", "gtk4", "once_cell", - "rand 0.8.5", + "rand", "serde", "serde_repr", + "tokio", "url", "zbus", ] @@ -156,80 +165,60 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-channel" -version = "1.9.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 4.0.1", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] -name = "async-executor" -version = "1.5.1" +name = "async-io" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", - "async-task", + "async-lock 2.8.0", + "autocfg", + "cfg-if", "concurrent-queue", - "fastrand 1.9.0", - "futures-lite", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock", - "autocfg", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-global-executor" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", + "socket2 0.4.10", + "waker-fn", ] [[package]] name = "async-io" -version = "1.13.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" dependencies = [ - "async-lock", - "autocfg", + "async-lock 3.2.0", "cfg-if", "concurrent-queue", - "futures-lite", - "log", + "futures-io", + "futures-lite 2.1.0", "parking", - "polling", - "rustix 0.37.23", + "polling 3.3.1", + "rustix 0.38.28", "slab", - "socket2 0.4.9", - "waker-fn", + "tracing", + "windows-sys 0.52.0", ] [[package]] @@ -238,86 +227,88 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.1", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", - "autocfg", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", "blocking", "cfg-if", - "event-listener", - "futures-lite", - "rustix 0.37.23", - "signal-hook", - "windows-sys", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.28", + "windows-sys 0.48.0", ] [[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.42", ] [[package]] -name = "async-std" -version = "1.12.0" +name = "async-signal" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "crossbeam-utils", - "futures-channel", + "async-io 2.2.2", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", "futures-core", "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", + "rustix 0.38.28", + "signal-hook-registry", "slab", - "wasm-bindgen-futures", + "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "async-tungstenite" -version = "0.17.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b71b31561643aa8e7df3effe284fa83ab1a840e52294c5f4bd7bfd8b2becbb" +checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" dependencies = [ "futures-io", "futures-util", @@ -331,9 +322,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -370,15 +361,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bincode" @@ -390,6 +375,12 @@ dependencies = [ ] [[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -397,22 +388,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.7", ] [[package]] @@ -423,15 +413,6 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[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.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" @@ -466,23 +447,25 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock", + "async-lock 3.2.0", "async-task", - "atomic-waker", - "fastrand 1.9.0", - "futures-lite", - "log", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.1.0", + "piper", + "tracing", ] [[package]] name = "blurhash" -version = "0.1.1" -source = "git+https://github.com/marc0x1/blurhash-rs?branch=pixbuf-patch#c07c0cbcd29b2277e8c1d0f6ae07b2e0fad1ed52" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa5ddff25bcae3e2ac5a93506cc050c730163fd92d319556861375b225164dde" dependencies = [ "gdk-pixbuf", "image 0.23.14", @@ -490,35 +473,35 @@ 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" -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" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[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 = "cairo-rs" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" +checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cairo-sys-rs", "glib", "libc", @@ -528,9 +511,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ "glib-sys", "libc", @@ -558,9 +541,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -574,40 +557,39 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher 0.4.4", "cpufeatures", - "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead", + "aead 0.5.2", "chacha20", - "cipher 0.3.0", + "cipher 0.4.4", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -647,9 +629,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -662,9 +644,9 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -672,15 +654,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -695,20 +677,10 @@ 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" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -717,48 +689,42 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] [[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "typenum", ] [[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] name = "ctr" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -777,19 +743,48 @@ dependencies = [ ] [[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher 0.4.4", +] + +[[package]] name = "curve25519-dalek" -version = "3.2.1" -source = "git+https://github.com/Schmiddiii/curve25519-dalek?rev=1b9f81352bb659999a46af961f069d635ca432d3#1b9f81352bb659999a46af961f069d635ca432d3" +version = "4.0.0" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.0.0#463e5c7cba32561ffee8a281c4455ff3c25660d4" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "platforms", + "rustc_version", "serde", "subtle", "zeroize", ] [[package]] +name = "curve25519-dalek-derive" +version = "0.1.0" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.0.0#463e5c7cba32561ffee8a281c4455ff3c25660d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] name = "deflate" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -812,20 +807,11 @@ dependencies = [ [[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.4", + "block-buffer", "crypto-common", "subtle", ] @@ -838,7 +824,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] @@ -855,9 +841,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[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", @@ -865,20 +851,20 @@ 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.42", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -909,30 +895,67 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" dependencies = [ - "cc", - "libc", + "concurrent-queue", + "parking", + "pin-project-lite", ] [[package]] name = "event-listener" -version = "2.5.3" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.1", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.71.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide 0.7.1", + "rayon-core", + "smallvec", + "zune-inflate", +] [[package]] name = "fastrand" @@ -945,20 +968,26 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] [[package]] +name = "fiat-crypto" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" + +[[package]] name = "field-offset" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -976,7 +1005,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flare" -version = "0.10.0" +version = "0.11.0" dependencies = [ "ashpd", "async-trait", @@ -988,7 +1017,7 @@ dependencies = [ "gettext-rs", "gtk4", "hex", - "image 0.23.14", + "image 0.24.7", "lazy_static", "libadwaita", "libsignal-service", @@ -999,7 +1028,7 @@ dependencies = [ "presage", "presage-store-sled", "qrcode-generator", - "rand 0.8.5", + "rand", "regex", "serde", "serde_json", @@ -1009,20 +1038,28 @@ dependencies = [ "tracing", "url", "zbus", - "zeroize", ] [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide 0.7.1", ] [[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin 0.9.8", +] + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1030,9 +1067,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1055,9 +1092,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1070,9 +1107,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1080,15 +1117,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1097,9 +1134,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -1117,33 +1154,43 @@ dependencies = [ ] [[package]] +name = "futures-lite" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1168,9 +1215,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" +checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1194,9 +1241,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" +checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1285,24 +1332,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "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" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1332,7 +1368,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug", - "polyval", + "polyval 0.5.3", +] + +[[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug", + "polyval 0.6.1", + "zeroize", ] [[package]] @@ -1346,16 +1393,26 @@ dependencies = [ ] [[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.18.1" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" dependencies = [ "futures-channel", "futures-core", @@ -1385,11 +1442,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.18.1" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" +checksum = "951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "futures-channel", "futures-core", "futures-executor", @@ -1408,16 +1465,16 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" +checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" dependencies = [ "heck 0.4.1", - "proc-macro-crate", + "proc-macro-crate 2.0.1", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] @@ -1437,18 +1494,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] name = "gobject-sys" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1484,9 +1529,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" +checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" dependencies = [ "cairo-rs", "gdk4", @@ -1499,9 +1544,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" +checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1515,9 +1560,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" +checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" dependencies = [ "cairo-rs", "field-offset", @@ -1541,7 +1586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -1550,9 +1595,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" +checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1568,19 +1613,27 @@ dependencies = [ ] [[package]] +name = "half" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] + +[[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[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.5", "bytes", "headers-core", "http", @@ -1615,9 +1668,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 = "hex" @@ -1627,40 +1680,29 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.11.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "digest 0.9.0", - "hmac 0.11.0", -] - -[[package]] -name = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac 0.12.1", + "hmac", ] [[package]] name = "hmac" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "crypto-mac", - "digest 0.9.0", + "digest", ] [[package]] -name = "hmac" -version = "0.12.1" +name = "home" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "digest 0.10.7", + "windows-sys 0.52.0", ] [[package]] @@ -1674,9 +1716,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1685,9 +1727,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1714,9 +1756,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -1728,7 +1770,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -1737,10 +1779,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", "log", @@ -1764,16 +1807,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1787,9 +1830,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1804,14 +1847,14 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "gif", - "jpeg-decoder", + "gif 0.11.4", + "jpeg-decoder 0.1.22", "num-iter", "num-rational 0.3.2", "num-traits", "png 0.16.8", "scoped_threadpool", - "tiff", + "tiff 0.6.1", ] [[package]] @@ -1823,16 +1866,21 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", + "exr", + "gif 0.12.0", + "jpeg-decoder 0.3.0", "num-rational 0.4.1", "num-traits", "png 0.17.10", + "qoi", + "tiff 0.9.0", ] [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown", @@ -1865,7 +1913,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1875,8 +1923,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.9", - "windows-sys", + "rustix 0.38.28", + "windows-sys 0.48.0", ] [[package]] @@ -1889,16 +1937,25 @@ 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" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -1913,21 +1970,21 @@ dependencies = [ ] [[package]] -name = "js-sys" -version = "0.3.64" +name = "jpeg-decoder" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" dependencies = [ - "wasm-bindgen", + "rayon", ] [[package]] -name = "kv-log-macro" -version = "1.0.7" +name = "js-sys" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ - "log", + "wasm-bindgen", ] [[package]] @@ -1936,14 +1993,20 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin", + "spin 0.5.2", ] [[package]] -name = "libadwaita" +name = "lebe" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libadwaita" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" dependencies = [ "gdk-pixbuf", "gdk4", @@ -1957,9 +2020,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" +checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" dependencies = [ "gdk4-sys", "gio-sys", @@ -1973,45 +2036,44 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libsignal-protocol" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.28.1#86b2fcc427bf32530866f4e30b18707c1f3682f7" +source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" dependencies = [ - "aes 0.7.5", + "aes 0.8.3", "aes-gcm-siv", "arrayref", "async-trait", - "block-modes", + "ctr 0.9.2", "curve25519-dalek", "displaydoc", - "generic-array", "hex", - "hkdf 0.11.0", - "hmac 0.11.0", - "itertools", + "hkdf", + "hmac", + "itertools 0.10.5", "log", "num_enum", "pqcrypto-kyber", "pqcrypto-traits", "prost 0.9.0", "prost-build 0.9.0", - "rand 0.7.3", - "sha2 0.9.9", + "rand", + "sha2", "signal-crypto", + "static_assertions", "subtle", "thiserror", - "typenum", "uuid", "x25519-dalek", ] @@ -2019,7 +2081,7 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=8789920#87899201123b8095cd0f30317620a6d5b7fd652b" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=0a7987e#0a7987e59bbb9fb110e899ac09e8efb6e28bc46d" dependencies = [ "aes 0.7.5", "aes-gcm", @@ -2032,17 +2094,17 @@ dependencies = [ "derivative", "futures", "hex", - "hkdf 0.12.3", - "hmac 0.12.1", + "hkdf", + "hmac", "libsignal-protocol", "log", "phonenumber", "prost 0.10.4", "prost-build 0.10.4", - "rand 0.7.3", + "rand", "serde", "serde_json", - "sha2 0.10.7", + "sha2", "thiserror", "url", "uuid", @@ -2052,11 +2114,10 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=8789920#87899201123b8095cd0f30317620a6d5b7fd652b" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=0a7987e#0a7987e59bbb9fb110e899ac09e8efb6e28bc46d" dependencies = [ "async-trait", "async-tungstenite", - "base64 0.13.1", "bytes", "futures", "headers", @@ -2118,9 +2179,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "locale_config" @@ -2137,9 +2198,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2150,9 +2211,6 @@ name = "log" version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -dependencies = [ - "value-bag", -] [[package]] name = "lru-cache" @@ -2173,29 +2231,10 @@ dependencies = [ ] [[package]] -name = "matrix-sdk-store-encryption" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ddee75c3cca58f3a323283dc4e849d19d52988903f907ed0fb53dcad5d6fd25" -dependencies = [ - "blake3", - "chacha20poly1305", - "displaydoc", - "hmac 0.12.1", - "pbkdf2 0.11.0", - "rand 0.8.5", - "serde", - "serde_json", - "sha2 0.10.7", - "thiserror", - "zeroize", -] - -[[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -2268,13 +2307,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "wasi", + "windows-sys 0.48.0", ] [[package]] @@ -2293,7 +2332,7 @@ dependencies = [ "mime_guess", "percent-encoding", "pin-project-lite", - "rand 0.8.5", + "rand", "thiserror", "tokio", "tokio-util", @@ -2307,15 +2346,14 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[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 0.7.1", - "static_assertions", ] [[package]] @@ -2365,7 +2403,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.8.5", + "rand", "serde", "smallvec", "zeroize", @@ -2426,9 +2464,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -2445,23 +2483,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.42", ] [[package]] @@ -2495,18 +2533,18 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oncemutex" @@ -2521,22 +2559,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "220729ba847d98e1a9902c05e41dae79ce4a0b913dad68bc540dd3120a8c2b6b" dependencies = [ "aes 0.8.3", - "async-global-executor", - "async-std", "byteorder", "cbc", "cipher 0.4.4", - "digest 0.10.7", + "digest", "futures-util", - "hkdf 0.12.3", - "hmac 0.12.1", + "hkdf", + "hmac", "num", "num-bigint-dig", "once_cell", - "pbkdf2 0.12.2", - "rand 0.8.5", + "pbkdf2", + "rand", "serde", - "sha2 0.10.7", + "sha2", + "tokio", "zbus", "zeroize", ] @@ -2565,9 +2602,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" dependencies = [ "gio", "glib", @@ -2590,9 +2627,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -2620,43 +2657,20 @@ dependencies = [ ] [[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", - "hmac 0.12.1", - "password-hash", - "sha2 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", - "hmac 0.12.1", + "digest", + "hmac", ] [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -2670,14 +2684,14 @@ dependencies = [ [[package]] name = "phonenumber" -version = "0.3.2+8.13.9" +version = "0.3.3+8.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34749f64ea9d76f10cdc8a859588b57775f59177c7dd91f744d620bd62982d6f" +checksum = "635f3e6288e4f01c049d89332a031bd74f25d64b6fb94703ca966e819488cd06" dependencies = [ "bincode", "either", "fnv", - "itertools", + "itertools 0.11.0", "lazy_static", "nom", "quick-xml", @@ -2685,6 +2699,7 @@ dependencies = [ "regex-cache", "serde", "serde_derive", + "strum", "thiserror", ] @@ -2701,10 +2716,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[package]] +name = "platforms" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" [[package]] name = "png" @@ -2734,11 +2766,12 @@ dependencies = [ [[package]] name = "poksho" version = "0.7.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.28.1#86b2fcc427bf32530866f4e30b18707c1f3682f7" +source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" dependencies = [ "curve25519-dalek", - "hmac 0.11.0", - "sha2 0.9.9", + "hmac", + "sha2", + "subtle", ] [[package]] @@ -2754,18 +2787,32 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.28", + "tracing", + "windows-sys 0.52.0", ] [[package]] name = "poly1305" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug", - "universal-hash", + "universal-hash 0.5.1", ] [[package]] @@ -2777,7 +2824,19 @@ dependencies = [ "cfg-if", "cpufeatures", "opaque-debug", - "universal-hash", + "universal-hash 0.4.0", +] + +[[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", + "universal-hash 0.5.1", ] [[package]] @@ -2794,15 +2853,15 @@ checksum = "d9d34bec6abe2283e6de7748b68b292d1ffa2203397e3e71380ff8418a49fb46" dependencies = [ "cc", "dunce", - "getrandom 0.2.10", + "getrandom", "libc", ] [[package]] name = "pqcrypto-kyber" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9d9695c19e525d5366c913562a331fbeef9a2ad801d9a9ded61a0e4c2fe0fb" +checksum = "e205df07793e278e4a77c44db68b7d0e81064984cfcf508f24ae68cde63b6609" dependencies = [ "cc", "glob", @@ -2813,45 +2872,64 @@ dependencies = [ [[package]] name = "pqcrypto-traits" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e91cb6af081c6daad5fa705f8adb0634c027662052cb3174bdf2957bf07e25" +checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb" [[package]] name = "presage" version = "0.6.0-dev" -source = "git+https://github.com/MarcusGrass/presage?rev=d6d8fff#d6d8fff5f5e6429e6fe9d3c6d388323d094fdab6" +source = "git+https://github.com/Schmiddiii/presage?rev=1166349dbe47be3b23a2b698ace5b51c760a6e9d#1166349dbe47be3b23a2b698ace5b51c760a6e9d" dependencies = [ - "base64 0.12.3", + "base64 0.21.5", "futures", "libsignal-service", "libsignal-service-hyper", "log", "parking_lot", - "rand 0.7.3", + "rand", "serde", "serde_json", + "sha2", "thiserror", "tokio", "url", ] [[package]] +name = "presage-store-cipher" +version = "0.1.0" +source = "git+https://github.com/Schmiddiii/presage?rev=1166349dbe47be3b23a2b698ace5b51c760a6e9d#1166349dbe47be3b23a2b698ace5b51c760a6e9d" +dependencies = [ + "blake3", + "chacha20poly1305", + "hmac", + "pbkdf2", + "rand", + "serde", + "serde_json", + "sha2", + "thiserror", + "zeroize", +] + +[[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/MarcusGrass/presage?rev=d6d8fff#d6d8fff5f5e6429e6fe9d3c6d388323d094fdab6" +source = "git+https://github.com/Schmiddiii/presage?rev=1166349dbe47be3b23a2b698ace5b51c760a6e9d#1166349dbe47be3b23a2b698ace5b51c760a6e9d" dependencies = [ "async-trait", "base64 0.12.3", "fs_extra", "log", - "matrix-sdk-store-encryption", "presage", + "presage-store-cipher", "prost 0.10.4", "prost-build 0.10.4", + "quickcheck_macros", "serde", "serde_json", - "sha2 0.10.7", + "sha2", "sled", "thiserror", ] @@ -2863,7 +2941,17 @@ 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-macro-crate" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +dependencies = [ + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -2892,9 +2980,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" dependencies = [ "unicode-ident", ] @@ -2927,7 +3015,7 @@ checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", "heck 0.3.3", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -2949,7 +3037,7 @@ dependencies = [ "cfg-if", "cmake", "heck 0.4.1", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -2968,7 +3056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -2981,7 +3069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -3008,10 +3096,19 @@ dependencies = [ ] [[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] name = "qrcode-generator" -version = "4.1.8" +version = "4.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc713c23eb7e1a5f18b84e72be88b82a617ee25783a524a38f0caa4c986b2d76" +checksum = "1d06cb9646c7a14096231a2474d7f21e5e8c13de090c68d13bde6157cfe7f159" dependencies = [ "html-escape", "image 0.24.7", @@ -3034,25 +3131,23 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.33" +name = "quickcheck_macros" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "rand" -version = "0.7.3" +name = "quote" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", + "proc-macro2", ] [[package]] @@ -3062,18 +3157,8 @@ 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]] @@ -3083,16 +3168,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]] @@ -3101,23 +3177,14 @@ 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]] 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", @@ -3125,14 +3192,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]] @@ -3146,34 +3211,34 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.4", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.8.2", ] [[package]] @@ -3196,23 +3261,22 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "ring" -version = "0.16.20" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", + "getrandom", "libc", - "once_cell", - "spin", + "spin 0.9.8", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -3232,41 +3296,41 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", "linux-raw-sys 0.3.8", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "rustix" -version = "0.38.9" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.5", - "windows-sys", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -3276,7 +3340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.3", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -3292,11 +3356,21 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.5", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "base64 0.21.2", + "ring", + "untrusted", ] [[package]] @@ -3307,9 +3381,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "schannel" @@ -3317,7 +3391,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3334,9 +3408,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", @@ -3367,35 +3441,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.187" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7fe14252655bd1e578af19f5fa00fe02fd0013b100ca6b49fde31c41bae4c" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.187" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46b2a6ca578b3f1d4501b12f78ed4692006d79d82a1a7c561c12dbc3d625eb8" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -3404,111 +3478,64 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] [[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", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] name = "sha2" -version = "0.9.9" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] name = "signal-crypto" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.28.1#86b2fcc427bf32530866f4e30b18707c1f3682f7" +source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" dependencies = [ - "aes 0.7.5", - "block-modes", + "aes 0.8.3", + "cbc", + "ctr 0.9.2", "displaydoc", - "generic-array", - "ghash", - "hmac 0.11.0", - "sha-1 0.9.8", - "sha2 0.9.9", + "ghash 0.5.0", + "hmac", + "sha1", + "sha2", "subtle", "thiserror", ] [[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] name = "signal-hook-registry" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3550,15 +3577,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -3566,12 +3593,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3616,16 +3643,47 @@ 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" +dependencies = [ + "lock_api", +] + +[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -3640,9 +3698,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "5b7d0a2c048d661a1a59fcd7355baa232f7ed34e0ee4df2eef3c1c1c0d3852d8" dependencies = [ "proc-macro2", "quote", @@ -3663,9 +3721,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.1" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ "cfg-expr", "heck 0.4.1", @@ -3676,56 +3734,56 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "temp-dir" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall 0.3.5", - "rustix 0.38.9", - "windows-sys", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.28", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] @@ -3734,12 +3792,23 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" dependencies = [ - "jpeg-decoder", + "jpeg-decoder 0.1.22", "miniz_oxide 0.4.4", "weezl", ] [[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder 0.3.0", + "weezl", +] + +[[package]] name = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3756,18 +3825,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", + "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.3", + "signal-hook-registry", + "socket2 0.5.5", "tokio-macros", - "windows-sys", + "tracing", + "windows-sys 0.48.0", ] [[package]] @@ -3782,24 +3854,23 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", - "webpki", ] [[package]] @@ -3818,14 +3889,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.20.2", ] [[package]] @@ -3839,9 +3910,20 @@ 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", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap", "serde", @@ -3858,11 +3940,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -3871,63 +3952,63 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.17.3" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ - "base64 0.13.1", "byteorder", "bytes", + "data-encoding", "http", "httparse", "log", - "rand 0.8.5", + "rand", "rustls", - "sha-1 0.10.1", + "sha1", "thiserror", "url", "utf-8", - "webpki", ] [[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" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.0", "tempfile", "winapi", ] @@ -3943,15 +4024,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[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" @@ -3976,25 +4057,35 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "universal-hash" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" dependencies = [ "generic-array", "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", +] + +[[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -4010,26 +4101,20 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8-width" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "uuid" -version = "1.4.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ "serde", ] [[package]] -name = "value-bag" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" - -[[package]] name = "version-compare" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4043,9 +4128,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "want" @@ -4058,21 +4143,15 @@ 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.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4080,36 +4159,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", "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.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4117,42 +4184,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "weezl" @@ -4162,13 +4209,14 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[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.28", ] [[package]] @@ -4189,9 +4237,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", ] @@ -4203,12 +4251,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -4217,7 +4265,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -4226,13 +4283,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "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]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -4242,58 +4314,101 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" -version = "0.5.15" +version = "0.5.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" dependencies = [ "memchr", ] [[package]] name = "x25519-dalek" -version = "1.1.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ "curve25519-dalek", - "rand_core 0.5.1", + "rand_core", + "serde", "zeroize", ] @@ -4314,19 +4429,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" dependencies = [ "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", "async-process", "async-recursion", - "async-task", "async-trait", - "blocking", "byteorder", "derivative", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", @@ -4334,11 +4443,12 @@ dependencies = [ "nix", "once_cell", "ordered-stream", - "rand 0.8.5", + "rand", "serde", "serde_repr", "sha1", "static_assertions", + "tokio", "tracing", "uds_windows", "winapi", @@ -4354,7 +4464,7 @@ version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", @@ -4375,9 +4485,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -4390,13 +4500,13 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.42", ] [[package]] name = "zkcredential" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.28.1#86b2fcc427bf32530866f4e30b18707c1f3682f7" +source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" dependencies = [ "curve25519-dalek", "displaydoc", @@ -4408,24 +4518,34 @@ dependencies = [ [[package]] name = "zkgroup" version = "0.9.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.28.1#86b2fcc427bf32530866f4e30b18707c1f3682f7" +source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" dependencies = [ - "aead", "aes-gcm-siv", "bincode", "curve25519-dalek", "displaydoc", "hex", "lazy_static", + "libsignal-protocol", "poksho", "serde", - "sha2 0.9.9", + "sha2", "signal-crypto", "subtle", + "uuid", "zkcredential", ] [[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] name = "zvariant" version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4446,7 +4566,7 @@ version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix index 7770eb6af50ca..361408314ee5d 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix +++ b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -21,24 +21,23 @@ stdenv.mkDerivation rec { pname = "flare"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = pname; rev = version; - hash = "sha256-+9zpYW9xjLe78c2GRL6raFDR5g+R/JWxQzU/ZS+5JtY="; + hash = "sha256-mOy16w6K/xUc28c2tRxifWxsBf9VxLuDPB+GXE2iYtE="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "blurhash-0.1.1" = "sha256-SLpszTL2CupMAfUQK5KlnsHTIBDB8hbJs1d6DQXaUiA="; - "curve25519-dalek-3.2.1" = "sha256-0hFRhn920tLBpo6ZNCl6DYtTMHMXY/EiDvuhOPVjvC0="; - "libsignal-protocol-0.1.0" = "sha256-VQwrGTNZnlDK5p8ZleAZYtbzDiVTHxc93/CRlCUjWtE="; - "libsignal-service-0.1.0" = "sha256-1ub0IPSvGhZ2tsC6IolusJ1NSWy+5SXSx8qlIdPngTE="; - "presage-0.6.0-dev" = "sha256-4isKBn/4yHoAYsYbBTULK/veZmaecU7t+PvE4Y0oNgk="; + "curve25519-dalek-4.0.0" = "sha256-KUXvYXeVvJEQ/+dydKzXWCZmA2bFa2IosDzaBL6/Si0="; + "libsignal-protocol-0.1.0" = "sha256-FCrJO7porlY5FrwZ2c67UPd4tgN7cH2/3DTwfPjihwM="; + "libsignal-service-0.1.0" = "sha256-OWLtaxldKgYPP/aJuWezNkNN0990l3RtDWK38R1fL90="; + "presage-0.6.0-dev" = "sha256-sd/kvdbrlJnKPSC/0SDXo6Z6Zc5Am0op/t6gprJf91w="; }; }; diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index b48acec1d32be..39c892b335123 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -23,6 +23,7 @@ , libnotify , xdg-utils , mesa +, libglvnd , libappindicator-gtk3 }: @@ -68,7 +69,7 @@ in stdenv.mkDerivation (rec { expat stdenv.cc.cc ]; - runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify libappindicator-gtk3 ]; + runtimeDependencies = [ libglvnd stdenv.cc.cc.lib (lib.getLib udev) libnotify libappindicator-gtk3 ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix deleted file mode 100644 index df75f7192bf71..0000000000000 --- a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, gtk4 -, glib -, gobject-introspection -, pkg-config -}: - -buildGoModule rec { - pname = "gotktrix"; - version = "unstable-2023-04-05"; - - src = fetchFromGitHub { - owner = "diamondburned"; - repo = pname; - rev = "a8f876a383cc34dac18edddbe22be2dd494b8d0c"; # compound - hash = "sha256-BuiA9UajdMhSrEfaXdu5DZlVhC4GVUdUpQDLMvKGrEk="; - }; - - vendorHash = "sha256-oo/j6i7slXILqyvj/EHojsyCZzJMGd10PTZaLvI1xoc="; - - buildInputs = [ - gtk4 - glib - ]; - - nativeBuildInputs = [ pkg-config gobject-introspection ]; - - # Checking requires a working display - doCheck = false; - - postPatch = '' - sed -i '/DBusActivatable/d' .nix/com.github.diamondburned.gotktrix.desktop - echo 'X-Purism-FormFactor=Workstation;Mobile;' >> .nix/com.github.diamondburned.gotktrix.desktop - ''; - - postInstall = '' - install -Dm444 .nix/com.github.diamondburned.gotktrix.desktop -t $out/share/applications/ - install -Dm444 .github/logo-256.png -T $out/share/icons/hicolor/256x256/apps/gotktrix.png - ''; - - meta = with lib; { - description = "Matrix client written in Go using GTK4"; - homepage = "https://github.com/diamondburned/gotktrix"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ chuangzhu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix deleted file mode 100644 index 8debefa0c11c4..0000000000000 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat -, alsa-lib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd -, libGL, xcbutilkeysyms, xdg-utils, libtool }: - -let - version = "4.30.5.1682"; - - rpath = lib.makeLibraryPath [ - xdg-utils - xorg.libXext - xorg.libSM - xorg.libICE - xorg.libX11 - xorg.libXrandr - xorg.libXdamage - xorg.libXrender - xorg.libXfixes - xorg.libXcomposite - xorg.libXcursor - xorg.libxcb - xorg.libXi - xorg.libXScrnSaver - xorg.libXtst - freetype - fontconfig - openssl - glib - nss - nspr - dbus - alsa-lib - zlib - libtool - libxml2 - libxslt - expat - xcbutilkeysyms - systemd - libGL - ] + ":${stdenv.cc.cc.lib}/lib64"; -in stdenv.mkDerivation { - pname = "hipchat"; - inherit version; - - src = fetchurl { - url = "https://atlassian.artifactoryonline.com/artifactory/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - ar x $src - tar xfvz data.tar.gz - - mkdir -p $out/libexec/hipchat - d=$out/libexec/hipchat/lib - mv opt/HipChat4/* $out/libexec/hipchat/ - mv usr/share $out - - for file in $(find $d -type f); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file || true - patchelf --set-rpath ${rpath}:$out/libexec/hipchat/lib:\$ORIGIN $file || true - done - - patchShebangs $d/linuxbrowserlaunch.sh - - substituteInPlace $out/share/applications/hipchat4.desktop \ - --replace /opt/HipChat4/bin/HipChat4 $out/bin/hipchat - - makeWrapper $d/HipChat.bin $out/bin/hipchat \ - --run 'export HIPCHAT_LD_LIBRARY_PATH=$LD_LIBRARY_PATH' \ - --run 'export HIPCHAT_QT_PLUGIN_PATH=$QT_PLUGIN_PATH' \ - --set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \ - --set QTWEBENGINEPROCESS_PATH $d/QtWebEngineProcess - - makeWrapper $d/QtWebEngineProcess.bin $d/QtWebEngineProcess \ - --set QT_PLUGIN_PATH "$d/plugins" - ''; - - meta = with lib; { - description = "Desktop client for HipChat services"; - homepage = "http://www.hipchat.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ puffnfresh ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 87f65e6d05aad..5dac8dfe703a1 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -2,7 +2,6 @@ , lib , pkg-config , fetchFromGitLab -, fetchpatch , gitUpdater , ffmpeg_6 @@ -66,14 +65,14 @@ let in stdenv.mkDerivation rec { pname = "jami"; - version = "20230619.1"; + version = "20231201.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-gOl4GtGmEvhM8xtlyFvTwXrUsbocUKULnVy9cnCNAM0="; + hash = "sha256-A38JwjqdQVy03d738p2tpTFA6EWRSPNiesS5wZfti7Y="; fetchSubmodules = true; }; @@ -82,24 +81,16 @@ stdenv.mkDerivation rec { patch-src = src + "/daemon/contrib/src/pjproject/"; in rec { - version = "e4b83585a0bdf1523e808a4fc1946ec82ac733d0"; + version = "311bd018fc07aaf62d4c2d2494e08b5ee97e6846"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "pjproject"; rev = version; - hash = "sha256-QeD2o6uz9r5vc3Scs1oRKYZ+aNH+01TSxLBj71ssfj4="; + hash = "sha256-pZiOSOUxAXzMY4c1/AyKcwa7nyIJC/ZVOqDg9/QO/Nk="; }; - patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [ - (fetchpatch { - name = "CVE-2023-27585.patch"; - url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch"; - hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg="; - }) - ]; - - patchFlags = [ "-p1" "-l" ]; + patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)); configureFlags = (readLinesToList ./config/pjsip_args_common) ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); @@ -110,6 +101,52 @@ stdenv.mkDerivation rec { enablePushNotifications = true; }; + dhtnet = stdenv.mkDerivation { + pname = "dhtnet"; + version = "unstable-2023-11-23"; + + src = fetchFromGitLab { + domain = "git.jami.net"; + owner = "savoirfairelinux"; + repo = "dhtnet"; + rev = "b1bcdecbac2a41de3941ef5a34faa6fbe4472535"; + hash = "sha256-EucSsUuHXbVqr7drrTLK0f+WZT2k9Tx/LV+IBldTQO8="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + asio + fmt + gnutls + http-parser + jsoncpp + libupnp + msgpack + opendht-jami + openssl + pjsip-jami + restinio + ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=Off" + "-DBUILD_BENCHMARKS=Off" + "-DBUILD_TOOLS=Off" + "-DBUILD_TESTING=Off" + ]; + + meta = with lib; { + description = "Lightweight Peer-to-Peer Communication Library"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = [ maintainers.linsui ]; + }; + }; + daemon = stdenv.mkDerivation { pname = "jami-daemon"; inherit src version meta; @@ -125,6 +162,7 @@ stdenv.mkDerivation rec { alsa-lib asio dbus + dhtnet sdbus-cpp fmt ffmpeg_6 @@ -154,13 +192,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; }; - postPatch = '' - substituteInPlace src/app/commoncomponents/ModalTextEdit.qml \ - --replace 'required property string placeholderText' 'property string placeholderText: ""' - ''; - preConfigure = '' echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h + # Currently the daemon is still built seperately but jami expects it in CMAKE_INSTALL_PREFIX + # This can be removed in future versions when JAMICORE_AS_SUBDIR is on + mkdir -p $out + ln -s ${daemon} $out/daemon ''; nativeBuildInputs = [ @@ -172,7 +209,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - daemon ffmpeg_6 libnotify networkmanager @@ -189,10 +225,7 @@ stdenv.mkDerivation rec { qtwebengine ]; - cmakeFlags = [ - "-DLIBJAMI_INCLUDE_DIR=${daemon}/include/jami" - "-DLIBJAMI_XML_INTERFACES_DIR=${daemon}/share/dbus-1/interfaces" - ] ++ lib.optionals (!withWebengine) [ + cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ]; @@ -201,11 +234,6 @@ stdenv.mkDerivation rec { "--set-default QT_QPA_PLATFORM xcb" ]; - postInstall = '' - # Make the jamid d-bus services available - ln -s ${daemon}/share/dbus-1 $out/share - ''; - passthru.updateScript = gitUpdater { rev-prefix = "stable/"; }; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index ebf3341e309a9..1d930612e9f9f 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -11,6 +11,7 @@ , minizip-ng , mkDerivation , qtgraphicaleffects +, qtmultimedia , qtquickcontrols2 , qttools }: @@ -33,7 +34,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "5.0.16"; + version = "5.1.2"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,13 +42,14 @@ mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-zS0JyK+HGiHY7tPdl3RK6fJJOUS+fKM1u3npNxDAAYE="; + hash = "sha256-Pu2tGKe3C1uR4lzXkC5sJFu8iJBqF76UfWJXYjPwBkc="; }; patches = [ ./do-not-build-linphone-sdk.patch ./remove-bc_compute_full_version-usage.patch ./no-store-path-in-autostart.patch + ./reset-output-dirs.patch ]; # See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21 @@ -55,6 +57,8 @@ mkDerivation rec { echo "project(linphoneqt VERSION ${version})" >linphone-app/linphoneqt_version.cmake substituteInPlace linphone-app/src/app/AppController.cpp \ --replace "APPLICATION_SEMVER" "\"${version}\"" + substituteInPlace CMakeLists.txt \ + --subst-var out ''; # TODO: After linphone-desktop and liblinphone split into separate packages, @@ -72,6 +76,7 @@ mkDerivation rec { minizip-ng qtgraphicaleffects + qtmultimedia qtquickcontrols2 ]; @@ -86,23 +91,20 @@ mkDerivation rec { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" + + # Requires EQt5Keychain + "-DENABLE_QT_KEYCHAIN=OFF" + + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; - # The default install phase fails because the paths are somehow messed up in - # the makefiles. The errors were like: - # - # CMake Error at cmake_builder/linphone_package/cmake_install.cmake:49 (file): - # file INSTALL cannot find - # "/build/linphone-desktop-.../build/linphone-sdk/desktop//nix/store/.../bin": - # No such file or directory. - # - # If someone is able to figure out how to fix that, great. For now, just - # trying to pick all the relevant files to the output. - # - # Also, the exec path in linphone.desktop file remains invalid, pointing to - # the build directory, after the whole nix build process. So, let's use sed to - # manually fix that path. - # + preInstall = '' + mkdir -p $out/share/linphone + mkdir -p $out/share/sounds/linphone + ''; + # In order to find mediastreamer plugins, mediastreamer package was patched to # support an environment variable pointing to the plugin directory. Set that # environment variable by wrapping the Linphone executable. @@ -116,26 +118,17 @@ mkDerivation rec { # It is quite likely that there are some other files still missing and # Linphone will randomly crash when it tries to access those files. Then, # those just need to be copied manually below. - installPhase = '' - mkdir -p $out/bin $out/lib - cp linphone-app/linphone $out/bin/ - cp linphone-app/libapp-plugin.so $out/lib/ + postInstall = '' mkdir -p $out/lib/mediastreamer/plugins ln -s ${mediastreamer-openh264}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ ln -s ${mediastreamer}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/ - wrapProgram $out/bin/linphone \ - --set MEDIASTREAMER_PLUGINS_DIR \ - $out/lib/mediastreamer/plugins - mkdir -p $out/share/applications - cp linphone-app/linphone.desktop $out/share/applications/ - mkdir -p $out/share/icons/hicolor/scalable/apps - cp ../linphone-app/assets/images/linphone_logo.svg $out/share/icons/hicolor/scalable/apps/linphone.svg + mkdir -p $out/share/belr/grammars ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ ln -s ${belle-sip}/share/belr/grammars/* $out/share/belr/grammars/ - mkdir -p $out/share/linphone - ln -s ${liblinphone}/share/linphone/* $out/share/linphone/ - ln -s ${liblinphone}/share/sounds $out/share/sounds + + wrapProgram $out/bin/linphone \ + --set MEDIASTREAMER_PLUGINS_DIR $out/lib/mediastreamer/plugins ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch b/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch index dc635b32a0312..f93f031bf6906 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch +++ b/pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch @@ -4,58 +4,72 @@ Date: Fri, 28 Jan 2022 02:36:01 +0100 Subject: [PATCH] Remove Linphone SDK build --- - CMakeLists.txt | 86 ++----------------- - .../cmake_builder/additional_steps.cmake | 9 -- - 2 files changed, 5 insertions(+), 90 deletions(-) + CMakeLists.txt | 100 +----------------- + .../cmake_builder/additional_steps.cmake | 9 -- + 2 files changed, 5 insertions(+), 104 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2002b925..6d92a8e5 100644 +index b5a4ab5..3afcd88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -152,7 +152,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") - list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") +@@ -194,7 +194,6 @@ list(APPEND APP_OPTIONS "-DQTKEYCHAIN_TARGET_NAME=${QTKEYCHAIN_TARGET_NAME}") + list(APPEND APP_OPTIONS "-DENABLE_QT_GL=${ENABLE_VIDEO}")#Activate on video -include(ExternalProject) set(PROJECT_BUILD_COMMAND "") if(CMAKE_BUILD_PARALLEL_LEVEL) list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") -@@ -190,30 +189,8 @@ if(ENABLE_BUILD_APP_PLUGINS) +@@ -237,41 +236,8 @@ if(ENABLE_BUILD_APP_PLUGINS) endif() endif() -- -if(NOT LINPHONE_QT_ONLY) --ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" -- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" -- STAMP_DIR "${SDK_BUILD_DIR}/stamp" -- BINARY_DIR "${SDK_BUILD_DIR}" -- STEP_TARGETS build -- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -- BUILD_ALWAYS NO #${DO_BUILD} --) --ExternalProject_Add_Step(sdk force_build -- COMMENT "Forcing build for 'desktop'" -- DEPENDEES configure -- DEPENDERS build -- ALWAYS 1 --) +-#add_subdirectory(external/qtkeychain) +- if(ENABLE_QT_KEYCHAIN) +- ExternalProject_Add(app-qtkeychain PREFIX "${CMAKE_BINARY_DIR}/qtkeychain" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/qtkeychain" +- INSTALL_DIR "${QTKEYCHAIN_OUTPUT_DIR}" +- BINARY_DIR "${SDK_BUILD_DIR}/qtkeychain" +- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${QTKEYCHAIN_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} +- BUILD_ALWAYS NO #${DO_BUILD} +- ) +- endif() +- ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" +- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" +- STAMP_DIR "${SDK_BUILD_DIR}/stamp" +- BINARY_DIR "${SDK_BUILD_DIR}" +- STEP_TARGETS build +- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} +- BUILD_ALWAYS NO #${DO_BUILD} +- ) +- ExternalProject_Add_Step(sdk force_build +- COMMENT "Forcing build for 'sdk'" +- DEPENDEES configure +- DEPENDERS build +- ALWAYS 1 +- ) -endif() include(FindPkgConfig) --set(APP_DEPENDS sdk) - find_package(Qt5 5.10 COMPONENTS Core REQUIRED) - - if ( NOT Qt5_FOUND ) -@@ -227,62 +204,9 @@ find_package(belcard CONFIG QUIET) - find_package(Mediastreamer2 CONFIG QUIET) +-set(APP_DEPENDS sdk)# Used if NOT LINPHONE_QT_ONLY + if(ENABLE_QT_KEYCHAIN) + list(APPEND APP_DEPENDS app-qtkeychain) + endif() +@@ -289,65 +255,9 @@ find_package(Mediastreamer2 CONFIG QUIET) find_package(ortp CONFIG QUIET) + find_package(${QTKEYCHAIN_TARGET_NAME} CONFIG QUIET) --if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS) +-if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) +- OR ( ENABLE_QT_KEYCHAIN AND NOT(${QTKEYCHAIN_TARGET_NAME}_FOUND) ) +- OR FORCE_APP_EXTERNAL_PROJECTS +-) - message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install") - ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app" - SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" @@ -65,7 +79,7 @@ index 2002b925..6d92a8e5 100644 - BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} - INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} - # ${APP_OPTIONS} - BUILD_ALWAYS ON - ) @@ -78,10 +92,10 @@ index 2002b925..6d92a8e5 100644 - BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} - INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} - ) - endif() -- install(CODE "message(STATUS Running install)") +- install(CODE "message(STATUS \"Running install\")") - set(AUTO_REGENERATION auto_regeneration) - if( ENABLE_BUILD_APP_PLUGINS) - add_custom_target(${AUTO_REGENERATION} ALL @@ -115,12 +129,12 @@ index 2002b925..6d92a8e5 100644 - BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} -# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." - LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -DCMAKE_OSX_ARCHITECTURES=${LINPHONESDK_MACOS_ARCHS} - EXCLUDE_FROM_ALL ON - #BUILD_ALWAYS ON -) diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake -index 7f7fd573..a69a04e8 100644 +index 7f7fd57..a69a04e 100644 --- a/linphone-app/cmake_builder/additional_steps.cmake +++ b/linphone-app/cmake_builder/additional_steps.cmake @@ -54,14 +54,5 @@ if (ENABLE_PACKAGING) @@ -139,5 +153,5 @@ index 7f7fd573..a69a04e8 100644 endif () endif () -- -2.25.1 +2.39.3 (Apple Git-145) diff --git a/pkgs/applications/networking/instant-messengers/linphone/reset-output-dirs.patch b/pkgs/applications/networking/instant-messengers/linphone/reset-output-dirs.patch new file mode 100644 index 0000000000000..2ad43fb17e280 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/reset-output-dirs.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5a4ab5..b6b89c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,10 +59,10 @@ set(CMAKE_CXX_STANDARD 11) + + # Prepare gobal CMAKE configuration specific to the current project + set(SDK_BUILD_DIR "${CMAKE_BINARY_DIR}/WORK") # SDK build in WORK. Keep all in it. +-set(LINPHONE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/linphone-sdk/desktop") +-set(QTKEYCHAIN_OUTPUT_DIR "${CMAKE_BINARY_DIR}/qtkeychain") ++set(LINPHONE_OUTPUT_DIR "@out@") ++set(QTKEYCHAIN_OUTPUT_DIR "@out@") + set(QTKEYCHAIN_TARGET_NAME "EQt5Keychain") +-set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT") ++set(APPLICATION_OUTPUT_DIR "@out@") + + set(CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}/include${PREFIX_PATH}") + if(WIN32) diff --git a/pkgs/applications/networking/instant-messengers/neosay/default.nix b/pkgs/applications/networking/instant-messengers/neosay/default.nix index 4d9b70dd1e2e7..3f76bdade3a8c 100644 --- a/pkgs/applications/networking/instant-messengers/neosay/default.nix +++ b/pkgs/applications/networking/instant-messengers/neosay/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "neosay"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "donuts-are-good"; repo = "neosay"; rev = "v${version}"; - hash = "sha256-Uwz6Y26AtzWXLFgJY0WVD0HBb+vbMeeMKt8gCk6viec="; + hash = "sha256-2tFjvAobDpBh1h0ejdtqxDsC+AqyneN+xNssOJNfEbk="; }; vendorHash = "sha256-w0aZnel5Obq73UXcG9wmO9t/7qQTE8ru656u349cvzQ="; diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index af5cf167a62c9..e90526c0a6aa7 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -2,7 +2,6 @@ , cups , dpkg , fetchurl -, gjs , glib , gtk3 , lib @@ -11,6 +10,7 @@ , libgcrypt , libkrb5 , mesa # for libgbm +, libGL , nss , xorg , systemd @@ -19,7 +19,6 @@ , at-spi2-core , autoPatchelfHook , wrapGAppsHook -, makeWrapper }: let @@ -43,8 +42,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - # makeBinaryWrapper not support shell wrapper specifically for `NIXOS_OZONE_WL`. - (wrapGAppsHook.override { inherit makeWrapper; }) + wrapGAppsHook dpkg ]; @@ -76,7 +74,9 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/qq.desktop \ --replace "/opt/QQ/qq" "$out/bin/qq" \ --replace "/usr/share" "$out/share" - ln -s $out/opt/QQ/qq $out/bin/qq + makeWrapper $out/opt/QQ/qq $out/bin/qq \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" # Remove bundled libraries rm -r $out/opt/QQ/resources/app/sharp-lib @@ -91,13 +91,6 @@ stdenv.mkDerivation { runHook postInstall ''; - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ gjs ]}" - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - ) - ''; - passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/qq/sources.nix b/pkgs/applications/networking/instant-messengers/qq/sources.nix index b3ea2b3fe820b..93bb928c28f3a 100644 --- a/pkgs/applications/networking/instant-messengers/qq/sources.nix +++ b/pkgs/applications/networking/instant-messengers/qq/sources.nix @@ -1,8 +1,8 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-11-14 +# Last updated: 2023-12-05 { - version = "3.2.2-18394"; - urlhash = "fd2e886e"; - arm64_hash = "sha256-6E3h7Z4936YKZb+G0FoMb90T3EzH8z07mmGMnL4SDFk="; - amd64_hash = "sha256-L1M8O0FzVKLXNNYGGMPf1Nbh/DFxLHBlbzapr7uz5Sk="; + version = "3.2.3-19189"; + urlhash = "06d558c3"; + arm64_hash = "sha256-qNcw6P985F/JAB9roxaBR5hz2KcLiffUDKu/14nvvgE="; + amd64_hash = "sha256-37d7F1VB2puEFJC12x57aRj4NIYcCYyPCK06Z/OwNiM="; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index dccdf634b599e..6565f89e93f14 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - sha256 = "sha256-P6ia7IU6OQJQXANy1snIZEqarKUcRmgbkP6L+UMwi+8="; + sha256 = "sha256-V1Sxfgn3fcqW7t7oa1pfnrPYAqHdCLrWUbplE/I789A="; }; desktopItem = (makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 63d8b250b96a7..a05df511ab0af 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.10"; + version = "3.9.11"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-VLHkFiIwfjCHr08wTsD8rMWSvHEswZCKl2XJr61cQYE="; + hash = "sha256-jyBHXzzFkCHGy8tdnE/daNbADYYAINBlC5td+wHOl4k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json deleted file mode 100644 index fbae80954e8be..0000000000000 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "version": "1.11.30-sc.2", - "rev": "v1.11.30-sc.2", - "srcHash": "1qb1fcr52gyzxndz3j77vn3ddwjpxwvicnh16c72zpzpfbbky7a5", - "webYarnHash": "0bg5vc7q8afqfpsaqqkczf9whbzici5d2bxj5cadhrlmlb27f8nx", - "jsSdkYarnHash": "0p1whh3pmqz170l542fiq3zgljl5daa9b96i59p3wvggnx7kny7j", - "reactSdkYarnHash": "02ysshiyjj3w00b628is9bd7i8qc3vc8kr1zam2dpj26lb9k5pdd", - "desktopYarnHash": "16pzmlwzf3z8mky3wb4azaiggigyfnpxmbq3irjp30ic6yhl50yw" -} diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix deleted file mode 100644 index 86bc2d671eb09..0000000000000 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ /dev/null @@ -1,131 +0,0 @@ -{ lib -, element-desktop # for seshat and keytar -, schildichat-web -, stdenv -, fetchFromGitHub -, makeWrapper -, makeDesktopItem -, copyDesktopItems -, fetchYarnDeps -, yarn -, nodejs -, prefetch-yarn-deps -, electron -, Security -, AppKit -, CoreServices -, sqlcipher -}: - -let - pinData = lib.importJSON ./pin.json; - executableName = "schildichat-desktop"; -in -stdenv.mkDerivation rec { - pname = "schildichat-desktop"; - inherit (pinData) version; - - src = fetchFromGitHub { - owner = "SchildiChat"; - repo = "schildichat-desktop"; - inherit (pinData) rev; - sha256 = pinData.srcHash; - fetchSubmodules = true; - }; - - offlineCache = fetchYarnDeps { - yarnLock = src + "/element-desktop/yarn.lock"; - sha256 = pinData.desktopYarnHash; - }; - - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs makeWrapper copyDesktopItems ]; - inherit (element-desktop) seshat keytar; - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - pushd element-desktop - yarn config --offline set yarn-offline-mirror $offlineCache - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - rm -rf node_modules/matrix-seshat node_modules/keytar - ln -s $keytar node_modules/keytar - ln -s $seshat node_modules/matrix-seshat - patchShebangs node_modules/ - popd - - runHook postConfigure - ''; - - # Only affects unused scripts in $out/share/element/electron/scripts. Also - # breaks because there are some `node`-scripts with a `npx`-shebang and - # this shouldn't be in the closure just for unused scripts. - dontPatchShebangs = true; - - buildPhase = '' - runHook preBuild - - pushd element-desktop - yarn --offline run build:ts - yarn --offline run i18n - yarn --offline run build:res - popd - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - # resources - mkdir -p "$out/share/element" - ln -s '${schildichat-web}' "$out/share/element/webapp" - mv element-desktop "$out/share/element/electron" - cp -r "$out/share/element/electron/res/img" "$out/share/element" - cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json - ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json - - # icons - for icon in $out/share/element/electron/build/icons/*.png; do - mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" - ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/schildichat.png" - done - - # executable wrapper - # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102 - makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ - --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ - --add-flags "$out/share/element/electron" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - - runHook postInstall - ''; - - # The desktop item properties should be kept in sync with data from upstream: - # https://github.com/schildichat/element-desktop/blob/sc/package.json - desktopItems = [ - (makeDesktopItem { - name = "schildichat-desktop"; - exec = "${executableName} %u"; - icon = "schildichat"; - desktopName = "SchildiChat"; - genericName = "Matrix Client"; - comment = meta.description; - categories = [ "Network" "InstantMessaging" "Chat" ]; - startupWMClass = "schildichat"; - mimeTypes = [ "x-scheme-handler/element" ]; - }) - ]; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - description = "Matrix client / Element Desktop fork"; - homepage = "https://schildi.chat/"; - changelog = "https://github.com/SchildiChat/schildichat-desktop/releases"; - maintainers = teams.matrix.members ++ (with maintainers; [ kloenk yuka ]); - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix deleted file mode 100644 index 0803bcc377917..0000000000000 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ stdenv, lib -, fetchFromGitHub -, fetchYarnDeps -, nodejs -, yarn -, prefetch-yarn-deps -, writeText, jq, conf ? {} -}: - -let - pinData = lib.importJSON ./pin.json; - noPhoningHome = { - disable_guests = true; # disable automatic guest account registration at matrix.org - }; - configOverrides = writeText "element-config-overrides.json" (builtins.toJSON (noPhoningHome // conf)); - -in stdenv.mkDerivation rec { - pname = "schildichat-web"; - inherit (pinData) version; - - src = fetchFromGitHub { - owner = "SchildiChat"; - repo = "schildichat-desktop"; - inherit (pinData) rev; - sha256 = pinData.srcHash; - fetchSubmodules = true; - }; - - webOfflineCache = fetchYarnDeps { - yarnLock = src + "/element-web/yarn.lock"; - sha256 = pinData.webYarnHash; - }; - jsSdkOfflineCache = fetchYarnDeps { - yarnLock = src + "/matrix-js-sdk/yarn.lock"; - sha256 = pinData.jsSdkYarnHash; - }; - reactSdkOfflineCache = fetchYarnDeps { - yarnLock = src + "/matrix-react-sdk/yarn.lock"; - sha256 = pinData.reactSdkYarnHash; - }; - - nativeBuildInputs = [ yarn prefetch-yarn-deps jq nodejs ]; - - configurePhase = '' - runHook preConfigure - - export HOME=$PWD/tmp - # with the update of openssl3, some key ciphers are not supported anymore - # this flag will allow those codecs again as a workaround - # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 - # and https://github.com/vector-im/element-web/issues/21043 - export NODE_OPTIONS=--openssl-legacy-provider - mkdir -p $HOME - - pushd element-web - fixup-yarn-lock yarn.lock - yarn config --offline set yarn-offline-mirror $webOfflineCache - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules - rm -rf node_modules/matrix-react-sdk - ln -s $PWD/../matrix-react-sdk node_modules/ - rm -rf node_modules/matrix-js-sdk - ln -s $PWD/../matrix-js-sdk node_modules/ - popd - - pushd matrix-js-sdk - fixup-yarn-lock yarn.lock - yarn config --offline set yarn-offline-mirror $jsSdkOfflineCache - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules - popd - - pushd matrix-react-sdk - fixup-yarn-lock yarn.lock - yarn config --offline set yarn-offline-mirror $reactSdkOfflineCache - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules scripts - popd - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - pushd element-web - export VERSION=${version} - yarn build:res --offline - yarn build:module_system --offline - yarn build:bundle --offline - popd - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mv element-web/webapp $out - jq -s '.[0] * .[1]' "configs/sc/config.json" "${configOverrides}" > "$out/config.json" - - runHook postInstall - ''; - - meta = with lib; { - description = "Matrix client / Element Web fork"; - homepage = "https://schildi.chat/"; - changelog = "https://github.com/SchildiChat/schildichat-desktop/releases"; - maintainers = teams.matrix.members ++ (with maintainers; [ kloenk yuka ]); - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/schildichat/update.sh b/pkgs/applications/networking/instant-messengers/schildichat/update.sh deleted file mode 100755 index 6ddc99902c3be..0000000000000 --- a/pkgs/applications/networking/instant-messengers/schildichat/update.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-git jq - -if [[ "$#" -gt 2 || "$1" == -* ]]; then - echo "Regenerates packaging data for the SchildiChat packages." - echo "Usage: $0 [git revision or tag] [version string override]" - exit 1 -fi - -rev="$1" -version="$2" - -set -euo pipefail - -if [ -z "$rev" ]; then - rev="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" -fi - -if [ -z "$version" ]; then - # strip leading "v" - version="${rev#v}" -fi - -src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev $rev) -src=$(echo $src_data | jq -r .path) -src_hash=$(echo $src_data | jq -r .sha256) - -web_yarn_hash=$(prefetch-yarn-deps $src/element-web/yarn.lock) -desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock) -js_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-js-sdk/yarn.lock) -react_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-react-sdk/yarn.lock) - -cat > pin.json << EOF -{ - "version": "$version", - "rev": "$rev", - "srcHash": "$src_hash", - "webYarnHash": "$web_yarn_hash", - "jsSdkYarnHash": "$js_sdk_yarn_hash", - "reactSdkYarnHash": "$react_sdk_yarn_hash", - "desktopYarnHash": "$desktop_yarn_hash" -} -EOF diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c545ac79a242b..364843e7bfa82 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,6 @@ -{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { - signal-desktop = { - dir = "Signal"; - version = "6.40.0"; - hash = "sha256-vyXHlycPSyEyv938IKzGM6pdERHHerx2CLY/U+WMrH4="; - }; - signal-desktop-beta = { - dir = "Signal Beta"; - version = "6.40.0-beta.2"; - hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg="; - }; +{ hostPlatform, callPackage }: { + signal-desktop = if hostPlatform.system == "aarch64-linux" + then callPackage ./signal-desktop-aarch64.nix { } + else callPackage ./signal-desktop.nix { }; + signal-desktop-beta = callPackage ./signal-desktop-beta.nix{ }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 1d75bd542d6c0..15db7d09ac422 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -1,8 +1,4 @@ -{ pname -, dir -, version -, hash -, stdenv +{ stdenv , lib , fetchurl , autoPatchelfHook @@ -51,8 +47,20 @@ , wayland }: -stdenv.mkDerivation rec { - inherit pname version; # Please backport all updates to the stable channel. +{ pname +, dir +, version +, hash +, url +}: + +let + inherit (stdenv) targetPlatform; + ARCH = if targetPlatform.isAarch64 then "arm64" else "x64"; +in stdenv.mkDerivation rec { + inherit pname version; + + # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -61,8 +69,7 @@ stdenv.mkDerivation rec { # few additional steps and might not be the best idea.) src = fetchurl { - url = "https://updates.signal.org/desktop/apt/pool/s/${pname}/${pname}_${version}_amd64.deb"; - inherit hash; + inherit url hash; }; nativeBuildInputs = [ @@ -152,8 +159,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc pipewire ] }" - # Currently crashes see https://github.com/NixOS/nixpkgs/issues/222043 - #--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) @@ -163,11 +169,14 @@ stdenv.mkDerivation rec { ${if pname == "signal-desktop" then "--replace \"bin/signal-desktop\" \"bin/signal-desktop --use-tray-icon\"" else ""} 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" + patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-${ARCH}.node" ''; - # Tests if the application launches and waits for "Link your phone to Signal Desktop": - passthru.tests.application-launch = nixosTests.signal-desktop; + passthru = { + # Tests if the application launches and waits for "Link your phone to Signal Desktop": + tests.application-launch = nixosTests.signal-desktop; + updateScript.command = [ ./update.sh ]; + }; meta = { description = "Private, simple, and secure messenger"; @@ -178,9 +187,9 @@ stdenv.mkDerivation rec { homepage = "https://signal.org/"; changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ mic92 equirosa urandom ]; + maintainers = with lib.maintainers; [ mic92 equirosa urandom bkchr ]; mainProgram = pname; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix new file mode 100644 index 0000000000000..c331c56eb7cd3 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix { } rec { + pname = "signal-desktop"; + dir = "Signal"; + version = "6.42.0"; + url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; + hash = "sha256-kr8FM+EAtL/7TrgJlI33oDd4CPGMJ+F2PpQCR4OL6j4="; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix new file mode 100644 index 0000000000000..02b54fd1de94c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix {} rec { + pname = "signal-desktop-beta"; + dir = "Signal Beta"; + version = "6.43.0-beta.1"; + url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; + hash = "sha256-7UlfpOWAalJjZjAJLa2CL3HdR2LFlE1/5sdec5Sj/tg="; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix new file mode 100644 index 0000000000000..58b119605d586 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix {} rec { + pname = "signal-desktop"; + dir = "Signal"; + version = "6.42.0"; + url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; + hash = "sha256-uGsVv/J8eMjPOdUs+8GcYopy9D2g3SUhS09banrA6hY="; +} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh b/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh new file mode 100755 index 0000000000000..37c0f33d12f75 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix-update curl coreutils jq + +set -ex + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" + +curl_github() { + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@" +} + +case "$UPDATE_NIX_ATTR_PATH" in +signal-desktop) + latestTag=$(curl_github https://api.github.com/repos/signalapp/Signal-Desktop/releases/latest | jq -r ".tag_name") + latestVersion="$(expr "$latestTag" : 'v\(.*\)')" + latestVersionAarch64=$(curl_github "https://api.github.com/repos/0mniteck/Signal-Desktop-Mobian/releases/latest" | jq -r ".tag_name") + + echo "Updating signal-desktop for x86_64-linux" + nix-update --version "$latestVersion" \ + --system x86_64-linux \ + --override-filename "$SCRIPT_DIR/signal-desktop.nix" \ + signal-desktop + + echo "Updating signal-desktop for aarch64-linux" + nix-update --version "$latestVersionAarch64" \ + --system aarch64-linux \ + --override-filename "$SCRIPT_DIR/signal-desktop-aarch64.nix" \ + signal-desktop + ;; +signal-desktop-beta) + latestTagBeta=$(curl_github https://api.github.com/repos/signalapp/Signal-Desktop/releases | jq -r ".[0].tag_name") + latestVersionBeta="$(expr "$latestTagBeta" : 'v\(.*\)')" + echo "Updating signal-desktop-beta for x86_64-linux" + nix-update --version "$latestVersionBeta" --system x86_64-linux --override-filename "$SCRIPT_DIR/signal-desktop-beta.nix" signal-desktop-beta + ;; +*) + echo "Unknown attr path $UPDATE_NIX_ATTR_PATH" + ;; +esac diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 91be487a264f2..b57392051d01b 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, darwin, fetchFromGitHub, openssl, sqlite }: +{ lib, stdenv, fetchFromGitHub, openssl, sqlite }: -(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { +stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20231114"; + version = "20231211"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-5ZDHAv8le1MLS394fto4Rg19J/b2QkZZ70Sn0Yap/hs="; + hash = "sha256-L8yfuaM/gyRknIM/ER0DfAZj6X9G0rAVVvAE9MtYF0g="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index b15dbbb92bdb2..7b3a2ec371776 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle, git, perl -, makeWrapper, fetchpatch, substituteAll, jre_minimal +{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused, +gradle, git, perl, makeWrapper, fetchpatch, substituteAll, jre_minimal }: # NOTE: when updating the package, please check if some of the hacks in `deps.installPhase` @@ -16,6 +16,8 @@ let sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; }; + gradleWithJdk = gradle.override { java = jdk17_headless; }; + jre' = jre_minimal.override { jdk = jdk17_headless; # from https://gitlab.com/signald/signald/-/blob/0.23.0/build.gradle#L173 @@ -39,7 +41,7 @@ let deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit src version; - nativeBuildInputs = [ gradle perl ]; + nativeBuildInputs = [ gradleWithJdk perl ]; patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -112,13 +114,13 @@ in stdenv.mkDerivation { mkdir -p $out tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/ wrapProgram $out/bin/signald \ - --prefix PATH : ${lib.makeBinPath [ coreutils ]} \ + --prefix PATH : ${lib.makeBinPath [ coreutils findutils gnused ]} \ --set JAVA_HOME "${jre'}" runHook postInstall ''; - nativeBuildInputs = [ git gradle makeWrapper ]; + nativeBuildInputs = [ git gradleWithJdk makeWrapper ]; doCheck = true; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 2e1cae4fb2a37..05417bd8d6c5c 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.35.126"; - x86_64-darwin-sha256 = "1fmcvj4ryf9k82hbrkb4fl7iki6v80msgrwsc7l996wzkg5j771n"; + x86_64-darwin-version = "4.36.134"; + x86_64-darwin-sha256 = "13s7vcbi180y221qh5dpvp9s94511lqwih3k52k61p98xjarrcwv"; - x86_64-linux-version = "4.35.126"; - x86_64-linux-sha256 = "0axwmhr8r8q3ih91zxwj3z64fnjy7w4mzmlyxcp2iws5gd541lcm"; + x86_64-linux-version = "4.35.131"; + x86_64-linux-sha256 = "0mb33vvb36aavn52yvk5fiyc8f7z56cqm1siknaap707iqqfpwpb"; - aarch64-darwin-version = "4.35.126"; - aarch64-darwin-sha256 = "0g477a31sdyxmg66aklpw359k1kk7vrd96vgcy5lxsvwvihiinkz"; + aarch64-darwin-version = "4.36.134"; + aarch64-darwin-sha256 = "0yyqmyicf4rkpvp6al2kb7g188xhg3m8hyi24a23yhnil8hk2r3v"; version = { x86_64-darwin = x86_64-darwin-version; 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 ed8ed30327816..a859efd3fae70 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , makeWrapper , makeDesktopItem , copyDesktopItems @@ -19,20 +20,30 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.3.22"; + version = "1.4.1"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-nyhAq06k0nNrGSbD0N1RNwcplYf5vO1BvnvEfNYGG0A="; + hash = "sha256-1URS9VPqV58p8RUA47j8sdqYqps1Ruo0aqdZXedvPX8="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-ydhJXAvz3k6GwpnSL6brl9xFpb+ooi8Am89TkcE00hc="; + hash = "sha256-ef+JW5ud9LlRxaCJC2iOT5N7FgZO7IkAABJcMQPvIBA="; }; + patches = [ + # remove when IsmaelMartinez/teams-for-linux#1058 is merged + (fetchpatch { + name = "teams-for-linux-fix-version.patch"; + url = "https://github.com/IsmaelMartinez/teams-for-linux/commit/1d14947eef35c6a2e0cbdfcce405820f8dd36c68.diff"; + hash = "sha256-kj2jEAqgZ0frUw85hY23mFYFcXz95z/WQSDymsheDfg="; + }) + ]; + + nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ]; configurePhase = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index d7cf9a2d2c1e3..7ec8d5686c3c0 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -80,14 +80,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.12.2"; + version = "4.13.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-jIOJ7iFF2SMZOBTVzc0ECEZrkXPY060jk3fxt7kIWSg="; + hash = "sha256-WhctvEmOGOxkVQUC84BcC4Td5GUEpY7dOG5La6lTv8E="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 1964925924cda..b9059e17bc264 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-11-17"; + version = "unstable-2023-12-21"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "76a3513d7f25d6623d92463fbe6470d9001b66a8"; - sha256 = "sha256-nubFELIHxn9yQiFGDqcYtVN9rjXizzkiV07ypWY9v48="; + rev = "afd9d5d31798d3eacf9ed6c30601e91d0f1e4d60"; + sha256 = "sha256-/1cghoxmm+6uFEUgCjh1Xhb0CTnd1XAq1M21FruDRek="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix index 2a8a8bb93e72c..6549c533c26fd 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -6,23 +6,23 @@ , pipewire , libpulseaudio , xdg-utils -, electron_27 +, electron_28 , makeDesktopItem , nix-update-script }: buildNpmPackage rec { pname = "webcord"; - version = "4.5.2"; + version = "4.6.1"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; rev = "v${version}"; - hash = "sha256-0bSUfIqEkkjnwp+6zTg/KUpcQvOwUo5q7KnF8MLyIoo="; + hash = "sha256-4ePjRs9CEnDHq9iVcQNEkefl0YP/tc1ePLhW/w9NPDs="; }; - npmDepsHash = "sha256-uO83IsNo/Efd+j5nVvwaao0u9hZUv0jDE8/x61QmYA4="; + npmDepsHash = "sha256-UzwLORlUeTMq3RyOHpvBrbxbwgpMBsbmfyXBhpB6pOQ="; nativeBuildInputs = [ copyDesktopItems @@ -59,7 +59,7 @@ buildNpmPackage rec { install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png # Add xdg-utils to path via suffix, per PR #181171 - makeWrapper '${lib.getExe electron_27}' $out/bin/webcord \ + makeWrapper '${lib.getExe electron_28}' $out/bin/webcord \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \ --suffix PATH : "${binPath}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/applications/networking/instant-messengers/webex/default.nix index fcb59900ff00b..c55178060fc85 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "43.8.0.26955"; + version = "43.11.0.27795"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230814223338/Webex_ubuntu.7z"; - sha256 = "6c754d65fffbcbbb2ca303e1f8c1e5688da190eea3d3b67c77361abc6e2bb85b"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20231108131957/Webex_ubuntu.7z"; + sha256 = "e7a30481840a4a56c7ac38fa9efb487c722758ad9ac875432e86232d6a8e6466"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 10af3d3ea4d3b..8eae0b8a0d258 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.16.6.24664"; - versions.x86_64-darwin = "5.16.6.24664"; - versions.x86_64-linux = "5.16.6.382"; + versions.aarch64-darwin = "5.16.10.25689"; + versions.x86_64-darwin = "5.16.10.25689"; + versions.x86_64-linux = "5.16.10.668"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-5xccYYisVRZw7tJ6uri52BuaeURadaHypse4vjwPQIY="; + hash = "sha256-FIvUDbK1dwOdF8Y70Y3PHTxM/Kl5BMkmvNwcqbV+pog="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-N3jzvxoRY3W5fw1Fs0qevgHC+7cLLYvoGA/ZYiE71JA="; + hash = "sha256-z8nDNaJtSUtb/KeoxiSgU3HU/VY7JxGp9Ug5roD0y3U="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-2O8jGQHGyF5XLQUxHUWA3h9K792lRQmOC2mS0rTukSw="; + hash = "sha256-dZQHbpvU8uNafmHtGoPhj6WsDhO20Dma/XwY6oa3Xes="; }; }; diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index 2e2ef6ee6ccc3..ac525fd2fa11a 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.5.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; - rev = "${pname}-v${version}"; - hash = "sha256-p1OvXso5szo8ZCnCTKgDzCEMJgiePXQMhVYOkWVZrbE="; + rev = "v${version}"; + hash = "sha256-b3XpKAV/K+69tQmjM1CGzoOTcaQHB6q3gpoSa/YFwak="; }; - cargoHash = "sha256-QqMBEYaIQ6PqO7w7Yd1jVr0zHARsVaJtZzWytmDksZQ="; + cargoHash = "sha256-dnEEque40qi7vuUxY/UDZ5Kz8LTuz0GvYVjTxl8eMvI="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/applications/networking/localproxy/default.nix index 9144b67c9abb3..06968035f04a0 100644 --- a/pkgs/applications/networking/localproxy/default.nix +++ b/pkgs/applications/networking/localproxy/default.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "localproxy"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "aws-samples"; repo = "aws-iot-securetunneling-localproxy"; rev = "v${finalAttrs.version}"; - hash = "sha256-ec72bvBkRBj4qlTNfzNPeQt02OfOPA8y2PoejHpP9cY="; + hash = "sha256-voUKfXa43mOltePQEXgmJ2EBaN06E6R/2Zz6O09ogyY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index b7948a9df97d5..792a785317f8d 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.50.1"; + version = "3.50.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "577S3Z/AhFf3W6ufiWJV8w/TTHu8nIqV74fi4pEqCa0="; + sha256 = "gYgjez2TGnOrire1c5/0Pqoky8mtjnK4I5KZ9pizHmY="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch index aa1b1bcb89db9..55fcb25f1551b 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch @@ -1,8 +1,8 @@ diff --git a/src/EWS/calendar/e-cal-backend-ews-utils.c b/src/EWS/calendar/e-cal-backend-ews-utils.c -index 653a8fb..ad80283 100644 +index b7c65ae..b334198 100644 --- a/src/EWS/calendar/e-cal-backend-ews-utils.c +++ b/src/EWS/calendar/e-cal-backend-ews-utils.c -@@ -2406,7 +2406,19 @@ e_cal_backend_ews_get_configured_evolution_icaltimezone (void) +@@ -2425,7 +2425,19 @@ e_cal_backend_ews_get_configured_evolution_icaltimezone (void) if (schema) { GSettings *settings; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 702e92c04c325..96f3f3aea2251 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -20,13 +20,13 @@ , libappindicator }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mailspring"; - version = "1.12.0"; + version = "1.13.2"; src = fetchurl { - url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - hash = "sha256-6dTAPetJgYrvIEtu+2QxcBOeYFZfN/dFhM0CZFzcC/E="; + url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/mailspring-${finalAttrs.version}-amd64.deb"; + hash = "sha256-KEoKUg5CRYP0kNT4jr7pjUp6gK4cQ/qQEiOBNCrhbFM="; }; nativeBuildInputs = [ @@ -88,18 +88,18 @@ stdenv.mkDerivation rec { --replace Exec=mailspring Exec=$out/bin/mailspring ''; - meta = with lib; { + meta = { description = "A beautiful, fast and maintained fork of Nylas Mail by one of the original authors"; + downloadPage = "https://github.com/Foundry376/Mailspring"; + homepage = "https://getmailspring.com"; + license = lib.licenses.gpl3Plus; longDescription = '' Mailspring is an open-source mail client forked from Nylas Mail and built with Electron. Mailspring's sync engine runs locally, but its source is not open. ''; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ toschmidt ]; - homepage = "https://getmailspring.com"; - downloadPage = "https://github.com/Foundry376/Mailspring"; + mainProgram = "mailspring"; + maintainers = with lib.maintainers; [ toschmidt ]; platforms = [ "x86_64-linux" ]; - knownVulnerabilities = [ "CVE-2023-4863" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -} +}) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index fccca24f9d288..2e30ae70d23bf 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -6,25 +6,24 @@ }: stdenv.mkDerivation rec { - version = "20230517"; + version = "20231103"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-1i0STaJulJP0LWdNfLLIEKVapfkcguYRnbc+psWlVE4="; + sha256 = "sha256-9/XYgQjOdIwDpoJz5kNmiRBdoSod9l7Yl0u4e20KDPw="; }; patches = [ # https://github.com/neomutt/neomutt/issues/3773#issuecomment-1493295144 ./fix-open-very-large-mailbox.patch + # https://github.com/neomutt/neomutt/issues/4128 (fetchpatch { - # https://github.com/neomutt/neomutt/pull/3933 - name = "disable-incorrect-tests.patch"; - url = "https://github.com/neomutt/neomutt/compare/f624551b86cdb53224b5b48304a808ca2815111e...a9a1d99e6c0fdf367188125451300fa89d3e801a.patch"; - hash = "sha256-Plei063T8XyXF4/7/nAb6/4OyXz72vBAXHwls9WL1vM="; - excludes = [".github/workflows/macos.yml"]; + name = "fix-attr-color-copy.patch"; + url = "https://github.com/neomutt/neomutt/commit/24f8644c28e602206a63fae53c4eb3d32426ce0c.patch"; + hash = "sha256-8qcW9hb6yxEZICRYgl6ZhPQDrI6nZN9NH+40GhTgR0o="; }) ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 3ba78c7439281..8fc12d5fd1707 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ mog ]; platforms = platforms.unix; license = licenses.mit; + mainProgram = "notmuch-addrlookup"; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 7046c701914d6..37c90f1b2f0f7 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.38.1"; + version = "0.38.2"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - hash = "sha256-wUGHYNDlPvrR81Jn65mlD4t/ooVcFHPgpMmCuG+OzdQ="; + hash = "sha256-UoLr5HQrA+4A/Dq4NZaflNIpJ523IyESvcUAnYYelH4="; }; nativeBuildInputs = [ @@ -146,5 +146,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ flokli puckipedia ]; platforms = platforms.unix; + mainProgram = "notmuch"; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 715ede00bda66..ebef5257a99d7 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.4.2"; + version = "115.6.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/af/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/af/thunderbird-115.6.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f6cb9c8a8069e430f2a11961880f0484ef0582ee98cd6cefc4136fe62882526b"; + sha256 = "da001289185e3eb531e4eb10b43aec013e969ce4954024b5796f18ffd0f8a9fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ar/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ar/thunderbird-115.6.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a3bf45d4268bb2af5ae843e54e32c7bf879666113a76d6091b2b1b8f4a3afd05"; + sha256 = "bcb77b4bb7393f77e2210028425083b6b7aa65a59e412f4df2a33d2c2d0e9992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ast/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ast/thunderbird-115.6.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e14679065a5ef9825473749929086715d21c899ec03760d66420098af78bd364"; + sha256 = "0acc512da93eb40baa100e49c7b49a6a8075c710f1293eaf3cb0ad418cf9258f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/be/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/be/thunderbird-115.6.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "cad53df572751af17c38ff18aed28ec65d376a02050e8341d76a96cc5e21e3c3"; + sha256 = "b2ab2849364cafb7cdad18615196b15c81cf348c2ec8b89adb58976ad1a9c0ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/bg/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/bg/thunderbird-115.6.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "ae6eb58bc7b7036a4a5283f9968cb734a9e3f5caf680cd9565a71a3a4b5fbb81"; + sha256 = "79d61375c3cb3ffb2fa1681b4713ca735debc63eee4bac4891a355089f1791e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/br/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/br/thunderbird-115.6.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "763d2ca13ffe77f5cd7d8e65a1b99d13de48e44ca6e4069dd263354eac1b5ec5"; + sha256 = "4fcbef93f3222f1fcc822d1c8b915741ea9a117dc9113ae9cd80a7d513a47a22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ca/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ca/thunderbird-115.6.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "48eecfd0f6156bf8e1e065a1a26c78486876f32f08cee4ff864316a351518ebf"; + sha256 = "52741c1815a031eae8bf44fbe7b2ab4ed102f20e74d3c5fbaf59b13ea86b71b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/cak/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/cak/thunderbird-115.6.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "412ca26696c0f75b265c4f14d8edf1274427b641062ec30e1b3f81bb4816bdc1"; + sha256 = "a835a155e52909edfc3457e51eea3528eb87e0c965aee37e118993181141b173"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/cs/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/cs/thunderbird-115.6.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "52348c625287a7ab209e714b3bb05f5bacd51d8ffe9d4adf978b6970ff0c605c"; + sha256 = "859151674b39809b1b2da6e541434b618e738f60de19a4b9fcd94dae5b332a4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/cy/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/cy/thunderbird-115.6.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3249849916c27cc1cea3e8414c89fbb96a95654aa9d9d13c513e8ae3ecac2241"; + sha256 = "cb08c0ac49c3cfe58e14bd9fa96c3310e0e6e4fbd715398a4607ad97cc417479"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/da/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/da/thunderbird-115.6.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8e0531a525128b4b02547b11b48a7938c18356bc2cc8bfe7f86841bfc188656f"; + sha256 = "c27fc8ea397bcb7115ca07ef69feeb12a92eb6406f2a74ed6ada6cae6e2d8156"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/de/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/de/thunderbird-115.6.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "f60fc1958d29faf1047ea7eaeb900a02351e569685dd4c3594db45edb97905b1"; + sha256 = "34af72c8f962588a08d41169c3abb94b1562860f4ecf9848ab0e89e07529d8a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/dsb/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/dsb/thunderbird-115.6.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5953e818188ec5c4780a45dfe8ca576a3a3b9f8cd196ff81a380e161a6ae10d5"; + sha256 = "429e7f4440cb65ca4996617b9a07264d73ee1c8e20a94a1966fbb68070ef7e41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/el/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/el/thunderbird-115.6.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "e6f5021f37bb842aa9baef26dd4895a028d7c81345acaa13b2be027392a5818b"; + sha256 = "9bf897dc0f73664506b1ce7bc1306cadf2ce3fb2ca73b893f0784967a4ee45ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/en-CA/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/en-CA/thunderbird-115.6.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "991533bc7344cba739e95e0e979e724070bda14df8de43dacc1dec4cfa1cdc89"; + sha256 = "ff48e5422448f1af914e5b8e95f59f159ca734f26ab702483fa07ee02221e218"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/en-GB/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/en-GB/thunderbird-115.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ccb93e3d905481c45756edc8926ff9999a1d697a428a3a31b9ed3c366aa9e325"; + sha256 = "3e11fbe6c4a951dbfc2d9b784adb4b1357360ff9fc88466b1b3d7bd8def230e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/en-US/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/en-US/thunderbird-115.6.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "3f7571801f390131dcf98bf97565391b35ea883a1a835229c5ed6c790f1bdfca"; + sha256 = "cc0c4e1739b80d1b44e73b8c197cb1d3e00068f857c6de862cef546b39078f9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/es-AR/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/es-AR/thunderbird-115.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "39562a107559766857a369b4a2d48273c852548564a1b5a145c75ed5073d6362"; + sha256 = "423d90a4055d6a803924be4736f01aa979ab8536fc0a9cd00ffd79c8e748e572"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/es-ES/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/es-ES/thunderbird-115.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b246ca331d7626477203a720318394d4750da96eb0e66336ffd4e34f345bc9f5"; + sha256 = "475ad1b68213ce8a2ad98cd41e2c790afee5f5130ff2f7fcc0a5703bc61da22b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/es-MX/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/es-MX/thunderbird-115.6.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "9860008e2344e7e42e7856ee83f384c4f13fa8bcdb06c9dce7a5536449c3955f"; + sha256 = "96ed320d46cafdcbbbceb1c49668b1c056609eace810e0a617f9bfa994ddd76a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/et/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/et/thunderbird-115.6.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a4b3beed7208991ddecf91f2c92586f5267daf862feb228688192c3d2ce3695d"; + sha256 = "c020d639caf49e623a0d45cab53b0133cac623ca27618897ae5ec36b8a34592d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/eu/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/eu/thunderbird-115.6.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "f75f7557ca1b920a68f52c39c97952741cebe7bb4fa1222f0db8e11cad9ee00f"; + sha256 = "86252f65293288719ed4567acd92e6dc9f2a8fac0e6b88e98be8d7d669f810cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/fi/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/fi/thunderbird-115.6.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c064953b062e8c29b880cd07b504d36d26fc909bc0a7a6728af964bc845ebe0b"; + sha256 = "e09139970bf66503174f39a4939bfbaa85b8da898163a131a9d960d6a17a8de5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/fr/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/fr/thunderbird-115.6.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "e49b72d8258d4140494d7f4ac44bae0fec2bfaf19adb4e186b65cc1acd9d912d"; + sha256 = "f4481a21721f84d2efa4a899e2ea391804b38626fc8f5ff452b294cf9bc4faea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/fy-NL/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/fy-NL/thunderbird-115.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "4485958ba2c9f2f23b9bc7e698a85e16299c359111cbb99221d0edacfc263360"; + sha256 = "a4efd5e4cd5a15602b6782f2e85c9f141d00f6594df5d08cddbef23edfb97d29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ga-IE/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ga-IE/thunderbird-115.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "8153c43633a6b0cd66aaedd3d71b91f3eb7697f1985909f295d70b87ed5a1c87"; + sha256 = "9874315770d2ba7ffb9cff453d3f3e2678ddc80ec7a1852764f618dfadfedc91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/gd/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/gd/thunderbird-115.6.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ac847943ca5da90e8dd2c3041cf960b6f5a84d648a17f3441fa6bb2ccc0829e6"; + sha256 = "6a4f13edb5e31b39c673c662a2b83c4e14fdaca787c2941dad4dd2789e502fe3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/gl/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/gl/thunderbird-115.6.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5dbbe07d7ec93d852c46a45aa919b05956f1630352547efd86ba90ba37ce8969"; + sha256 = "46cde24d08a2682d1bfcc7854aa837f51f71c41e35e21f0cb020f89edf516909"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/he/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/he/thunderbird-115.6.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8628fce18ee60217944cc21312ba4df777bc90091bc77424ca2012e8aecbb9e3"; + sha256 = "44ede6bbdb3fc9b4a69a027411556e32eed1f6cc566b1485eb1c5f7ce6ba7016"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/hr/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/hr/thunderbird-115.6.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "8829ad3546b7e12a9cefbd993083733d876752aa03a41236668eb84565c235e2"; + sha256 = "09d43fdfc6d48103679fea209b352d5e8bc6482576cb6dd0d847511f9a13df81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/hsb/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/hsb/thunderbird-115.6.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e55e7006c6e80c1bc2d59e41a4475be97abfd385c4433bdd3d3b9d633a7c4a45"; + sha256 = "ad302adb04144d99ac41664782fe75d585f237f4d49448c343938d5f4f123a5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/hu/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/hu/thunderbird-115.6.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "77d5dc64238ec7914b7fce05fa94d2a5d8e11928380ee1d0322c414d69aa5a2e"; + sha256 = "e0ca4d0509c0d955e29e95e1eed698afcb957ef286a371e36869aef6f29509d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/hy-AM/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/hy-AM/thunderbird-115.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "2bb6da6af7201d25e7c11895dc969e5f17dd3a5bed963ec930eab091e706bcbb"; + sha256 = "58de958a95f25abcc3741c12c4b685cb2a09988f562a7d19612e961bcac68e02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/id/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/id/thunderbird-115.6.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "8db39f0b0aeebd47c6db4dee6057053b578b3d6c09668a0d64c3141c80421821"; + sha256 = "420c848b532601e1c792205c6b7cc23df64daee47537ec420aa57e69df9a0490"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/is/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/is/thunderbird-115.6.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a23ed8b9e000eb5579b710706e656d66667b384af0d3ddb7530ce85733c75233"; + sha256 = "68a567d9fe636c04d762bde1430cb9c1dd60924a3b24c5e1c5ac9b36d7ed66ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/it/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/it/thunderbird-115.6.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7f7f89bcf11366e7b1485b8e26aef44fd565c8d4d67839473171517a8a9f074f"; + sha256 = "8a1270d03d0263e6be0a4118f5e8d5e18f5f458a0050926a0f7f576856b79ea1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ja/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ja/thunderbird-115.6.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "2da90acef62b2d1f4b5c70a857a58bceaaa59eea06cd5c55476c2d555bda66d5"; + sha256 = "34deb785f2b1f122c067363780faf0734de79e0ec408e4ced086817f82085b30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ka/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ka/thunderbird-115.6.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e7722b2a7118d2ac5991ba535a277acf2ffd1f6e56f36f7a2f35b465eed1657a"; + sha256 = "9ee1b702a34ac9e5dd2f1b5d1a2f49e4a70413b2f0f964fba9b9a778391a85fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/kab/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/kab/thunderbird-115.6.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "e5d30697c976c25ff3845b3b83f98097cdb4aa0350c8362ddd0b9aaf68c63fde"; + sha256 = "22eb4d3ca7c0a4864cfc85629b5213b273bc71b99d5b1f81f93fd1751d6e6968"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/kk/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/kk/thunderbird-115.6.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f952cee1fa3a054683ebfeb256293a0172ab63806af2481980ca527a07f5b383"; + sha256 = "01d58f41fcf51e2af5a36ae14afcbca06245f7d9397469a8955a587a07e60e90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ko/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ko/thunderbird-115.6.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d0589966a1853541260b11f0848dc2621ef52f83426a2bd6115f0b28038289d6"; + sha256 = "3483d1f236ae0c01e82905e3cbb2cbaaea4309d3f2d20a6314193c29e69a8f11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/lt/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/lt/thunderbird-115.6.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4d1680aa863f93db1f800f0dcf35496fc4bf777ffc7eb7c853f84629054f53af"; + sha256 = "7a4ad439ed1a7569711e2f1e4a0a707b40901df2422d5284b6a7f95468f7fa2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/lv/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/lv/thunderbird-115.6.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "24571d6977a3bf99a636598a527875f5037e290807ea1884583739df7cc3d0b6"; + sha256 = "8292b0ae96ac9ec242499502b4aa6dbe116900574d3fdd9389e2e4021db8eed0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ms/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ms/thunderbird-115.6.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "937936b0e31500ff3c2e34090f79e158d23869faf829eed5d855c83c49946b38"; + sha256 = "279906b0465c22131768a29ad016cc2bb8685bbc97efd9e11c9014ceb609d90e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/nb-NO/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/nb-NO/thunderbird-115.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "3084fed2561faf59c1ec4f75e6001181db689086daf8014a370c13f0709b1916"; + sha256 = "54e648299959a5749fec47fd469fe90e6f8ba5a1cf9dfce540440ffae7e95a10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/nl/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/nl/thunderbird-115.6.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "54f1294805f3899917cdfe3cd6e5dcc5ed054312d7a88fe89bab4d96a2bee1d4"; + sha256 = "e8737763c2bb1ff8775dc110a8c462bf6ab406cc59d2730b56449ea05a663fca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/nn-NO/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/nn-NO/thunderbird-115.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "fa43ea181404914a61e790aab79538848f4a4c889f331795c7128360cd06f070"; + sha256 = "aa635abbca9691b05f4e9d803019c5d0b7389906a35f95ecfd8c24cdf213ecd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/pa-IN/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/pa-IN/thunderbird-115.6.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "95276577202c4214712f8b53270cc67c46004842d3d508003e0de9568128b44f"; + sha256 = "3bc693ca9187daaf951403529db420d6e671c086b4a7e78916d4d147e659a076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/pl/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/pl/thunderbird-115.6.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d9f440c272f9a7ece1e0d93beb29c42eb7cc9058a46c9876e9643485ef203eeb"; + sha256 = "d60fbbc04b8518f61ca4c985b5e1865663e362918b770f27928de7ba915d25bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/pt-BR/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/pt-BR/thunderbird-115.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "65ab26c8db2e47bd33cdbd054b053116abec1229fb852ff9a2a6e08989d17214"; + sha256 = "7320320ccf2ff08c391bd86a10c4c99d5cb77cad0c6fe415e5c5431a8064a76e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/pt-PT/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/pt-PT/thunderbird-115.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "d2313d541e70bb5884a32d3ba47f2c08f605a7eedab03043070c9ff4e1e70238"; + sha256 = "16422f49a5fb7913366d0e322e30b9bebca5300d3769c5182575b82a7395a02b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/rm/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/rm/thunderbird-115.6.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "099c226a5cb0b0f33c55132f93422d7a831a0db701c2d35fe9b15187fb661e17"; + sha256 = "0a54e9e865b9898fbd33d07ae667fe60812bc064e5b4a88b5f767da91ca28e9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ro/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ro/thunderbird-115.6.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "495819d350ee091fd70134e7614fc53a77898563cc001e16b90befeddd6097c8"; + sha256 = "6d5f82b1eb6fe3d1866fc76b84c88d3ae28034b46654452fc0dabcd9fa2c428b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ru/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ru/thunderbird-115.6.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "b230727076e96b9343b16ebdeaa81d4bafe9aa7cf7b505e0ff80a69eb5524f77"; + sha256 = "fb776a1f5c868511bf8637685f22e76705344fd9d2067459a8dd1107277c339a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sk/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/sk/thunderbird-115.6.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "38957f7a5d76b613b5d0e72282556f04d9c5ddc145ce2082a047a2ef57cec1af"; + sha256 = "bf33c801e6dcab70044718038dc54d50d9e7b057068de1995ba512465e2801b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sl/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/sl/thunderbird-115.6.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8ea2a350f4eb609cb5ec9cffabfc3af342ddf34612368acd272c8658ff382fab"; + sha256 = "e5afce769cb574d5dd02edfd7ca312548c2fab18cc62e38a10e6775d16637698"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sq/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/sq/thunderbird-115.6.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "cc33784f9b3b255ef63007ac348d0c995a41716c6cec9a1b93a21c6881908837"; + sha256 = "ad02884d14abd534489edc8ff4d015e6921ca15016c08541a97f7ea6d5bd6178"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sr/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/sr/thunderbird-115.6.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "2e1013b838117e10bcc66f320df8095ccdf0338c76dc8cd8737357b2bbcf77b3"; + sha256 = "370ff6430560a6714b91ffd8d62b4ada6148ec323464256fa44e19d71028faaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sv-SE/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/sv-SE/thunderbird-115.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "23942d8165eb78889890269b82e0404984f89e636ed050b7d14a5625dc889aec"; + sha256 = "5e2576e14dd06abe73c00dacdb303d5d0066f87c229794e3bca8a84de53b4bc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/th/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/th/thunderbird-115.6.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c6d83bda21db67bcecb4923f68c5a311edf14749a04726457f251bdc14d18d71"; + sha256 = "9485d3cd7f25d020591c24b4c73b00b05bff50ea9b4cc0dc7a3f09458efc2e08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/tr/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/tr/thunderbird-115.6.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "72429c1ce1a44bc0a55973b31ace62f1dd408e8aab2e84483414bd5d09b0533d"; + sha256 = "b971537c4eb887aa30ad98cb93914fc899f06c8fb7ae58c20eed6e72dcbb4034"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/uk/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/uk/thunderbird-115.6.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "2dc323d8b0a5f3636d938e08245bd66624b4c1388078fa06acda9da12a250585"; + sha256 = "bad0b8865e6f2f1c4774ff37527eb88ce61d141a7c50d54015e87c12dcfe7f31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/uz/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/uz/thunderbird-115.6.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b79e94e508ed7b4344683a8e56d4417519058a111ac3afcee5242b787e8da403"; + sha256 = "c9f13e53d4493370c094309ff1e1901cd87ee7596c65e89282024b1d6d2a07c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/vi/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/vi/thunderbird-115.6.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "08d243efb6fb4c7bebd9ccd7720c4b583d30e2cce6142d6769745778aa847f1c"; + sha256 = "70c65de801a4cf090ef8870f97a8cf824629474354f8706ba1f0bbb7a6f156ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/zh-CN/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/zh-CN/thunderbird-115.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b3fced53a9ffd152a9d7301da4b3119d70e09d38352d997cb1938656d53f4e40"; + sha256 = "5351d9fe1a2cca6515e0ffbfd34fe74d260b930558bc168d1b8656f419604332"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/zh-TW/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/zh-TW/thunderbird-115.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "328bf581c63dfcfe8702e718a1112a62cd3fa544023618282c14111e6586375c"; + sha256 = "7949d2eca09e5474a05d8994324d48425c72277f1e96aa950f5c65c2da8fd442"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/af/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/af/thunderbird-115.6.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "08383e3f87665461568adcbd7cc12e0811d9e3b52ab51ea32573c851eb59c4cc"; + sha256 = "07b291ebf3f7867cb3aa0fe82a19a74e9cf83c86bc4f92c213824660a6f4bf28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ar/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ar/thunderbird-115.6.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "90fe66398616435addf7cd9871c42fe0419089729bf8fc0f9473cd557e32a3d4"; + sha256 = "45d528cc36d44960aad6cd64d6a5d1a75900135751d9a1eb1461f10e8e681c54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ast/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ast/thunderbird-115.6.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "940299f1d667e1b4cce44b1b4d7b26021ee1313fadca391cc18e8551b56ff1fd"; + sha256 = "1c7d2ddbea9f05d2b40acd8a05611ff797085d8e99a6b06b1fee17492df56d73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/be/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/be/thunderbird-115.6.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "7c5fb060a3e269cdc929d190fe96d2e1caf4ec6298e3372314e8fedc1cf64c22"; + sha256 = "25a0accbce2e1989ec71db07b5e5831e52a686b240ebed156416f5b9ff3b4d9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/bg/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/bg/thunderbird-115.6.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1814d1b9e840261693a2c48124f610c2a3f2da53711799d9b12f1904064b20ca"; + sha256 = "a99f0e59db770fdf62d853e506f853e38f65e92d04d6b28a90f8062e4192ee7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/br/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/br/thunderbird-115.6.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7a85ca429f007cccaf44e923084a1eafffd2148303cfd54a991768417dd4a945"; + sha256 = "8b1444de4034807486f2614e04b3da6d2cadb96f86d2cd36aa46925dad5eeec0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ca/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ca/thunderbird-115.6.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "3d90952a9becc9da367a16c8606b74debc6eeba66650d8456aba959b5c8af54e"; + sha256 = "b2dd4d74b9c482c7426078cbe08a3f745ddef0a9fe16a6a5691bb7651be4f577"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/cak/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/cak/thunderbird-115.6.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "9b27c4bbebb87d079d12c83c2d4aba6eeb778d97afdd28f8df52093cea82a206"; + sha256 = "c8bb93aaa0731caf672e41af38b7fe5d34170e50c3e868dd363ef679102a944e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/cs/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/cs/thunderbird-115.6.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "0a50cbaa130b23276ce5b0e58d72f6e7dae1c15c6089cb3aed7148d676244b6d"; + sha256 = "1d579af4752467d7cac2f772d2d7b8cae65cd9371e3a3771e21ec538858528a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/cy/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/cy/thunderbird-115.6.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "97ec55678e2b4e821b6b33667fa8eb4ab9b66ad39a263eccb13ff4ae4050bb17"; + sha256 = "4e9c8480087c8fd4a40e85035473ae5c5e8d1ff9b26ac6efc31162af25234e80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/da/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/da/thunderbird-115.6.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "281b4050241ac64eccf5c0c1d077c986b8d9f9dbe7ca39ef25ca5a967d2dba9e"; + sha256 = "53c595e918ad887d3b2aa2048b9874a83a40dd511bcca678ba1ae4a66c401895"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/de/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/de/thunderbird-115.6.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "9ccfa1201294f2d9c9d65643f95eeb90dae1cfacff7cb8d81b6760285c382d33"; + sha256 = "1f0c3eca7d299c7c790b87586cfcca0398e124537156a555838b03b77c270eea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/dsb/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/dsb/thunderbird-115.6.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "f71f6b889deeca16de9ccd1c38afa9c9e0cc18a7fcef16cb42c2c5349988a8b9"; + sha256 = "7f941eda6eced0fadc81155eb2c51102b5e6186fb5855f7b65e7ae2422e635a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/el/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/el/thunderbird-115.6.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f6bb942f8ac7a9fd2a73869639646ce7c80f71cf51ec4a35d448ae79a65e0d3c"; + sha256 = "29a0af6776493e1e9a4afa170170ff9979817b907b163e934d9f2caa8bfe20bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/en-CA/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/en-CA/thunderbird-115.6.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "52e4f617f06d21b60ae3a41bd053d73a56c05115fcad963b2b4c4eef1e85756f"; + sha256 = "a0cb55277af0920026bd4785162c39f10ba5b2d35dcb435965130a922f6cc128"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/en-GB/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/en-GB/thunderbird-115.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "dba2923a47c12dd14542a27cca051df17c6e00f54eacb2ffe0fbd08730d35701"; + sha256 = "a2e64df8fd7b0f5e3ffbfbd3df46cdfc21fea228f3aaf6a0caee5c684449b39b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/en-US/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/en-US/thunderbird-115.6.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d42af97a227a9622f246025d522e86ee0274de090c7a007a88e1eed9861be382"; + sha256 = "d5d79f81b57a35d49f7d6dcc1df6b09db68d258ae603695d8ca332e8ffd6402a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/es-AR/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/es-AR/thunderbird-115.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "94d7fe7f3c857086361212ed098087e3bb592fbdfb11845f08f1c531434ad477"; + sha256 = "2122cececa06db9facb24c13404a47889e2800226b4ecb273c041e185b9a3ade"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/es-ES/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/es-ES/thunderbird-115.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d014c178c9bb16838fb1b14df01e6b6d5df4c87c4421c4a4fdff4cf17d019285"; + sha256 = "fcf3ad6437237515917fa413826b0b607eb959422755d5871f572c5a82d05ba7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/es-MX/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/es-MX/thunderbird-115.6.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "ae785957277ff303e6df28589c1cbb536e98143daefae7d55b95abb327ce97d9"; + sha256 = "8fc061bad54d290f8b912014ec3bb7651fb2ba1e102d6053cfc298fb333c5cac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/et/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/et/thunderbird-115.6.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "8138692b55a357f7c00969ced73dcdb03d536806df02905414a589b89026c67f"; + sha256 = "f47aa257578ce3d7879c28d4262d7738383c07d4abe35a24e3b8b468523444c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/eu/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/eu/thunderbird-115.6.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "14c61bf1db21cf5f3b07e3cde8945135957d8a30aa7fdb0e47e54b10255cf1ae"; + sha256 = "51b9bc06f9426f2876503d7bbaa6e8c5814f60e6bd24905d0f20cafbaeb7b53a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/fi/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/fi/thunderbird-115.6.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8d3815fca050082244ce006020463588f115bede9a85ab92fd7b5e129e610a7a"; + sha256 = "9c4cc3c76fe99e7f6444e074cb8ce141380db9c838471ea38477695366ece9a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/fr/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/fr/thunderbird-115.6.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "3b75ca8cc061aa81fea54c974a796435a20344f43f7aaacdc7fd3e69982f8b0f"; + sha256 = "ee526f7532b1b81900cc1368fcd791cdd4eafcb9166d2a4aa49d9bdfd0476c5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/fy-NL/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/fy-NL/thunderbird-115.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "4fdc9e70b935cc39853a045eef3f5f992dd46327e07ace300307a9a12a188cc7"; + sha256 = "ebc8eef40b181c51bfe78b199030092d15038ebee265dd2e3ab89c131f7e4e46"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ga-IE/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ga-IE/thunderbird-115.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "01c8c390636fd567ef3f72099f349f7273b0cede1aab69251916f90ea6640817"; + sha256 = "9bb4ca3b5172854fb1d71a1f928db8a525327c712174b6ac5eddca82494a5629"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/gd/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/gd/thunderbird-115.6.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "e92d9c51e1093814d39564c99558d3324c7774f72b7b3baa6f2f09056180b817"; + sha256 = "e7e8252a3d114208e345b1261f9266ac641ab1760214910dfe0b3f5270bb2a4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/gl/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/gl/thunderbird-115.6.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0ef59efe918b0a11cf7acbf3cf5faac4fb4fd11dd42c6c2eb74ded8921ce8070"; + sha256 = "e00f131ffb5aec831566e4fd8045ca316cc4c01459d2fcd57f59136f9a7a37fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/he/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/he/thunderbird-115.6.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "2f4085a6d052147eafceed86dbef1060c9bc6e46483a8dfc4ed6e64ec6906593"; + sha256 = "940cee2f7bef2852cf3091ca8abe0cc9c5a9fbef90a19869179798480dbcd323"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/hr/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/hr/thunderbird-115.6.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "1bd34790200a497a85c0c9df008159189183f35752b3a0ee30b7136b0b7bc533"; + sha256 = "ff9ba02327db837af53c0e97d444d5235048e2db3cf2c9e6121c6ec7739bdbeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/hsb/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/hsb/thunderbird-115.6.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "826501b1ef15b0e29f199d20e306c0da884d147a744dc21600e42c0c5a4552f3"; + sha256 = "6086a73ef05c195391f299f42cf15d9576e184885c61c967e924faa6a5b3464d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/hu/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/hu/thunderbird-115.6.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c96b3cc9d3cf1ac7426d4368d23efb8ce8421212ea412cee3c35f1fb1b334736"; + sha256 = "2c70ed224b2ea9487c0939828b02d2ef37d71119ff856ea53d2004926881dfa6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/hy-AM/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/hy-AM/thunderbird-115.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "aea19658cc49e236e2e5b9365a89e70e3430f084f4f578c1632dad4158ed386f"; + sha256 = "acb94ddfa982536817cb9579d6c6f0d6e78081c005d94e10b4e2a684dd010fa1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/id/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/id/thunderbird-115.6.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "671a7938c700e305575d5afa1cddee2efc272eb42bf25eefa556c9f734593daa"; + sha256 = "fc141b8199a3e5b1c8793a7ed49357f92bf6abdbf878a02d7e5d5710e165f18c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/is/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/is/thunderbird-115.6.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "a7b0d1de39daa5349bc8fb18e7c873cdaf361b6ab37407ccb0ea727d263bb966"; + sha256 = "0aa15d63f08e8d1e04757bf20855ae5e21759d9c51ee50597db98fee648cbb35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/it/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/it/thunderbird-115.6.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "764a66760083bfd09f073cc88f0cac67cd2712482a833ded3130c4f584d30dca"; + sha256 = "5a103f2bbed408abfebe04221d44114dc885620c8003c9f79108f0e27180a045"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ja/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ja/thunderbird-115.6.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "edbf7f3d41e3828b0092e5dcf0a3338526809b0e8810f9819e33f41b9afbc62f"; + sha256 = "a02a44ca0442aa593b15831bd0aeedc155852f906dd58801102c382b06623497"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ka/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ka/thunderbird-115.6.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "dd74e35eaf32c8c5e5acfa43f4bcf0c9c123eb416ee9602bfa6cfd5476daf267"; + sha256 = "b77707369d2baac5e181d957e39585d470ad4b4602b56d574184d29477fd047b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/kab/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/kab/thunderbird-115.6.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "3eca6970ce51a50420a8af1f497e025095e62a591663ee13a50e19344a34f6fc"; + sha256 = "5e3283b39f8b59d677aa60aa1766d647e0feb2deaad25f159066b5c420932be2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/kk/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/kk/thunderbird-115.6.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "194f9573ed80d89ebb227cad02c2aadbd2fff7a924efe95836b25b869a776052"; + sha256 = "6451c736c8cf44f08855c1b5a5d18a823d864732f03b2f7c611590271c99cf04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ko/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ko/thunderbird-115.6.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "76de2ae5ccd6ae6e0e0e751b142f3151899d046e27be7244519535ebc2c0e514"; + sha256 = "a56d3f4536fecb6090d2ac939fcf03c43b277a078cea0648850ee1dc40ad5f8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/lt/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/lt/thunderbird-115.6.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "1e4031535b0306b9f876ce01dda4913cf7bb2f3506bf3e0a8b095f14f7e75d6d"; + sha256 = "15862bf349b8325bd58e3efb588de9d07c0be47f40c3550398e5297aa43bac26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/lv/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/lv/thunderbird-115.6.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "2e92b529ddee80cabf2d9ddaf831c04350a0839ba04945c0bbe944005852971b"; + sha256 = "429c366482550f0ac705a5abe34a43aeb28004129ffe9f3869c831135c3f0ca0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ms/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ms/thunderbird-115.6.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ae21aa767a9e0e30a306e87041900e6563654a128b496c26061ae83665ad1048"; + sha256 = "f6a9353b2abca86f7f45260b1673a32df8581da6f72cb3dc16d7112adf49b610"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/nb-NO/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/nb-NO/thunderbird-115.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6af7284b487fd40f2785677b411a2d9a40a17ec40a6d3473709de7e87d069303"; + sha256 = "13b7a2b10bce00585f10d6172d2fb8468d457e8d589e4f924b5de118008d750d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/nl/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/nl/thunderbird-115.6.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0703e2a855aa259e1133390b27c376d6c98fafede9a9629ef970b31a1cf5bf80"; + sha256 = "19e3c05e1f46bd34bfb91e0e42b923f4011ba7a67b90542b8b50229ab43f78a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/nn-NO/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/nn-NO/thunderbird-115.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b40f8ffba3ab3ed6ae27c395d9d9e9106d026c5ca6bec6801560ad75d33b755a"; + sha256 = "50218d6fd52cabdb1e4fb1aefb4b53bbd444fc8d5fafeeb59268123e9cbc327a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/pa-IN/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/pa-IN/thunderbird-115.6.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "fca4d6fe2e4af82920065ec759f44f2032f8a4f237408352ba481552079bb65f"; + sha256 = "2ac0194a1b51396244216cf44d7cee1dc19e80a1069b9da035229569ef07c8b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/pl/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/pl/thunderbird-115.6.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "2fd14fee330663d551d513c2fc02c8d325180c99bab5199cf03df9d9a0c42297"; + sha256 = "71c3cf6acd6c28462430da90ff5de20820370a79c2e8062dec0dc64c7558c841"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/pt-BR/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/pt-BR/thunderbird-115.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "90ec7cf1df0e88e40ae1a372d4db118dd4d7395b055e7cf0b137a5a968f0690e"; + sha256 = "ff0b5ede7048dc9b59cbe0fd0a5b67b4139ffc8573ca708828598dab7881ef8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/pt-PT/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/pt-PT/thunderbird-115.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "33ed9c0c2e357694ba2f942f8322bf72b9da7a4ea699c9371f24f4282702c80a"; + sha256 = "2a1da87542faa02b14fe24e0fe5087a91154e34da44cd85d99c2f0ecd4d90609"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/rm/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/rm/thunderbird-115.6.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "6f42ae9d7c342d4f0c49cb6a40250abc94e3688015d7c2d18b60ea9749482a91"; + sha256 = "0039a65b5cb2f4e65cd80d74b25a39f3d2865848fa657d4025185c4d02493fb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ro/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ro/thunderbird-115.6.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "21c5a6025a9134beec3647691d0e843e31d28649c2179fdca8b6209cb86ff55f"; + sha256 = "d6fb761490e0281bb5a2e03afa6abb8fed34233ba1308d84c4f37d0a0f799126"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ru/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ru/thunderbird-115.6.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e848ff4e0867d346096fe417239ad9ab1c1680f1df5d68622a65340c0579e579"; + sha256 = "971a40cf457113c40a51297972acb085dbfa95eead3050254f8b591a192cabe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sk/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/sk/thunderbird-115.6.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e02d48cb66318cebeb764014e47b4d5f8623d7cbf66f665ff4018dac9656ee4e"; + sha256 = "3463d64670355ed590097997e1a4a138ac5f5993ea153a59eac26410aa2a8544"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sl/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/sl/thunderbird-115.6.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "c64947d2efb20bd3a9d0371114bc58cfbd6cc903a8ac9233565d38aeea474c79"; + sha256 = "143190c87d22e14da14a26e9e8f6aef73b34bdd198d13bd1e4e01160614a198f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sq/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/sq/thunderbird-115.6.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "65291c7a93eaa973410ecc642111030ddd3083a76419c35632bf6d5b11ed9659"; + sha256 = "5d886885ba9265cc67b8ce99a5adf847936882ead50b3720c441b20b0175b3e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sr/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/sr/thunderbird-115.6.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "33df374a558e147840773676e8a849d792224a77e3da4dc2366e56d2863962b8"; + sha256 = "c1eb74299fb983fef8267d60fffa62901c47de795ee6bb9baadfdbd56331da61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sv-SE/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/sv-SE/thunderbird-115.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "2d2a7af5330149a14ff550bf0572226e77cb92529269666ffd05f00b0061f2f1"; + sha256 = "a4d9cb7e3c9a2b4bd82044cf1d78d9500c5f861acebf6392a5ff7e68e35fb0e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/th/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/th/thunderbird-115.6.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4593a11c4ba6ab479734c52ee818ff6b304a74ac94199b77d6f2008f3dabe5ec"; + sha256 = "1f7eec0902cc77f3d945b6e654256a605a5fe98938e6219a52eb4af12e01f055"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/tr/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/tr/thunderbird-115.6.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c363acf14f55c307e9d0a1d9d23dd33f40e72da9c9c22f5ef0c9b9eca13a639f"; + sha256 = "1f67cbac18b7815664e1c9192ded480f9aee3a62ed3ec0491bd0abf724e54430"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/uk/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/uk/thunderbird-115.6.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "b4f356f80d2d8d8167b404553fa3bc55b392157b0ccf70ae471bd91433d58a3f"; + sha256 = "9d92994ed190b15c31e81eb1768b86805e7fd2507b3a6f3a2923fd7a965592d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/uz/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/uz/thunderbird-115.6.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9a875b9bdf2de6ea3ca5a86381e4f0e02b16940f456bbc86387e1b19aac51efb"; + sha256 = "5f47edfa7c15c7b8c35b594f3c05ba69df037b4d22f0e6575ceb1683b1616cac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/vi/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/vi/thunderbird-115.6.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "3370cbd9253379c7cc1096a85b8b37d6102e4af9343a303024dc1811b82e2293"; + sha256 = "492d522445a75a96c6a30bd247bc23ec3d7caf9f3f79a0217a762d2066007c00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/zh-CN/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/zh-CN/thunderbird-115.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b85d1962f95954ea8ad8b4306fe6f6bea352c2fc47db039477952bdb69f07457"; + sha256 = "34ae2af74f6d6fe6ace208a5a69ddb13c26de3b99295d34c61de071f2eba112f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/zh-TW/thunderbird-115.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/zh-TW/thunderbird-115.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "286e8f3d72f2510919e30989d9c4eca3a3e2e0ef4162400942d5b2fa0777dac5"; + sha256 = "dfc2c8affdb13b18ca77d04d6aa44d14bdbe9dc359babb09afbe652727419393"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 523a1f3a3904d..e46714801bd7b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -44,13 +44,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.4.2"; + version = "115.6.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "44cedd5931edbac2ab0babfaf0e71a0262317c01fd7d71e8740bb8f54766c9b49b9e325f1d2796c3a233d4298457d8769b675213a21bef759c46086080bcc8bc"; + sha512 = "2484a99a62fc960b7926b1daa6055e14b1f9e1006ea45522d16131071b33003d4f7ef95911fd2ceb3e941f9d251c66d917013d6a5ecd717d2b1c6d33944f2e01"; }; 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 0d0be882f4307..7f83f9dc7d9d2 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.27"; + version = "3.119.3"; 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-z2Ir8O7IDiE7cYuLshpMQMnOJanaECUvKlUEyPayIPo="; + hash = "sha256-TdjvU12nh1sTfGTdBn+7dbEunaF38YjDvceEns4iRbA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/misc/zammad/0001-nulldb.patch b/pkgs/applications/networking/misc/zammad/0001-nulldb.patch index 61971525b99d0..cf024c998b6c8 100644 --- a/pkgs/applications/networking/misc/zammad/0001-nulldb.patch +++ b/pkgs/applications/networking/misc/zammad/0001-nulldb.patch @@ -7,7 +7,7 @@ index d85a17491..90ea5e387 100644 require 'rails/all' +require 'nulldb' - require_relative 'issue_2656_workaround_for_rails_issue_33600' + require_relative '../lib/zammad/safe_mode' # DO NOT REMOVE THIS LINE - see issue #2037 diff --git a/db/schema.rb b/db/schema.rb diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index b69f90d321a48..369b16282c41b 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -19,11 +19,12 @@ , yarn2nix-moretea , v8 , cacert +, redis }: let pname = "zammad"; - version = "5.4.1"; + version = "6.2.0"; src = applyPatches { @@ -100,7 +101,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-HI4RR4/ll/zNBNtDCb8OvEsG/BMVYacM0CcYqbkNHEY="; + hash = "sha256-u72ZTpcUvFa1gaWi4lzTQa+JsI85jU4n8r1JhqFnCj4="; }; yarnPreBuild = '' @@ -124,13 +125,26 @@ stdenv.mkDerivation { cacert ]; + nativeBuildInputs = [ + redis + ]; + RAILS_ENV = "production"; buildPhase = '' node_modules=${yarnEnv}/libexec/Zammad/node_modules ${yarn2nix-moretea.linkNodeModulesHook} + mkdir redis-work + pushd redis-work + redis-server & + REDIS_PID=$! + popd + rake DATABASE_URL="nulldb://user:pass@127.0.0.1/dbname" assets:precompile + + kill $REDIS_PID + rm -r redis-work ''; installPhase = '' @@ -151,6 +165,6 @@ stdenv.mkDerivation { homepage = "https://zammad.org"; license = licenses.agpl3Plus; platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ n0emis garbas taeer ]; + maintainers = with maintainers; [ n0emis taeer netali ]; }; } diff --git a/pkgs/applications/networking/misc/zammad/gemset.nix b/pkgs/applications/networking/misc/zammad/gemset.nix index bf33453ca6f8c..31b956182173f 100644 --- a/pkgs/applications/networking/misc/zammad/gemset.nix +++ b/pkgs/applications/networking/misc/zammad/gemset.nix @@ -16,32 +16,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bndmmby5qxq8rs42fbb2ax3hhbjj2ds8wja08s0iadkbrn7shvf"; + sha256 = "117vxic67jnw6q637kmsb3ryj0x485295pz9a9y4z8xn9bdlsl0z"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; actionmailbox = { - dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; + dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx00kf0syq5gdhlrmw0q9v92ki55drbsk4gzy86ls2q8xkd792s"; + sha256 = "1r8ldj2giaz8cn49qkdqn5zc29gbsr5ky4fg6r7ali0yh1xh684l"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vbif021cyndq3v3m61dkmgdbbirqk9zcsszb9nisq24m3gx1aai"; + sha256 = "0w6gvj7ybniq89834hqww9rj2xypz9l91f8niwaws2yq1qklymr2"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -49,21 +49,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k6hc7klvn8m88b88vykl83jrpqhn4zz67l2zx9v266xga6fhala"; + sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; actiontext = { - dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; + dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16ldxyxlxl9scggpmkww2fxzim7sl2b4js610pvddcsr74z9fjs7"; + sha256 = "0i47r3n2m8qm002gx7c0lx1pv15pr2zy57dm8j38x960rsb655pp"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck02cfc17s6g05qn0k7khwvvazwbf2rxbjcma8px2nw2j1ngvcn"; + sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05bkw9qgjgj2nxzjj2fh6jp1fcvgff0aa4r77k0gcfmnzc1g8wdl"; + sha256 = "1cn1ic7ml75jm0c10s7cm5mvcgfnafj0kjvvjavpjcxgz6lxcqyb"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03hy5bwghdklcxbdylmsq70y0qzslck5slb2zkvp7g6mmvk86kwd"; + sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alshkgbcxp9s4vqb2b0yrrnyg15kxhlp1slsb03a61w7h42pspw"; + sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; activerecord-import = { dependencies = ["activerecord"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cwm95795c6j5hk76csdkfg7ad228cmp086shkcmhnad4mycbh4m"; + sha256 = "0n1zmpdwxic878zbc0hphbdk18619ifh6ikbxc24mv1sx7l2srq4"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.1"; }; activerecord-nulldb-adapter = { dependencies = ["activerecord"]; @@ -126,21 +126,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c0f7fn06fzc7pn0dydchnq6xgcaga9rbzhmin5z5xvg5nkv783c"; + sha256 = "1552py7zlamd5gy2dbkzjixanl9k07y6jqqrr4ic6n52apwd0ijy"; type = "gem"; }; - version = "0.8.0"; + version = "1.0.1"; }; activerecord-session_store = { - dependencies = ["actionpack" "activerecord" "multi_json" "rack" "railties"]; + dependencies = ["actionpack" "activerecord" "cgi" "multi_json" "rack" "railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06ddhz1b2yg72iv09n48gcd3ix5da7hxlzi7vvj13nrps2qwlffg"; + sha256 = "0x13crb9f6yxk5i320c3a29rl760lkyhh21zd128f34dc4fknigq"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -148,21 +148,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06w4wlabqqr9bwdig44r5vdwkcbbivwgwn2fl775w7h05vrccgp8"; + sha256 = "0d6vm6alsp0g6f3548b615zxbz8l2wrmaikwgsf8kv11wf6swb4c"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["assets" "default" "development" "nulldb" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06mihpy83a5xmavvn7l8vbix472dsi0vh30xj6g594k0679m0ir6"; + sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; acts_as_list = { dependencies = ["activerecord"]; @@ -181,10 +181,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.5"; + }; + android_key_attestation = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02spc1sh7zsljl02v9d5rdb717b628vw2k7jkkplifyjk4db0zj6"; + type = "gem"; + }; + version = "0.3.0"; }; argon2 = { dependencies = ["ffi" "ffi-compiler"]; @@ -192,10 +202,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdllcqlr81nzyf485ldv1p660xsi476p79ghbj7zsf3n9n86gwd"; + sha256 = "0mwmrqfpwljp0pkv8zbamg66s2zlxrhhvfvcgg9jlldzf98zc3lq"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; ast = { groups = ["default" "development" "test"]; @@ -226,14 +236,108 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "020v30xd1v2yvyfshbii497c83n4kafc6967pwmgl54sxkx04xwq"; + sha256 = "0x8ian7m977840aydnv2h62qmsnmnc4bf1d3jm8sn271d0xdv5jk"; + type = "gem"; + }; + version = "10.4.15.0"; + }; + awrence = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gj8f8c54r9cabkm41s59sa1ca5wpbipw7gq3sfl87x9296227fx"; + type = "gem"; + }; + version = "1.2.1"; + }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r0n8p7yv8y2cl8gh1s2wcgjrd0p8b0d1diw652v4g0fy683adzk"; + type = "gem"; + }; + version = "1.853.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11rfshwp9nflhv7rqc9nb0fg70d3lw11qldfiw02pk3zpvc7ddxh"; type = "gem"; }; - version = "10.4.7.0"; + version = "3.187.0"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01z32ryrl18al0hazyimww808ij144pgs5m8wmp0k49i7k33hnlw"; + type = "gem"; + }; + version = "1.72.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1azbbd73q3nhiggdhr320ywxj2ph7s9icfa7c96i7gq2a8li202q"; + type = "gem"; + }; + version = "1.137.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wzi7mkyfcr23y8r3dx64zqil115rjy8d9nmkd2q5a6ssxs8y58w"; + type = "gem"; + }; + version = "1.6.1"; + }; + base64 = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cydk9p2cv25qysm0sn2pb97fcpz1isa7n3c8xm1gd99li8x6x8c"; + type = "gem"; + }; + version = "0.1.1"; + }; + bindata = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5"; + type = "gem"; + }; + version = "2.4.15"; }; binding_of_caller = { dependencies = ["debug_inspector"]; - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -259,20 +363,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q"; + sha256 = "0iqkzby0fdgi786m873nm0ckmc847wy9a4ydinb29m7hd3fs83kb"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; brakeman = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds"; + sha256 = "1gliwnyma9f1mpr928c79i36q51yl68dwjd3jgwvsyr4piiiqr1r"; type = "gem"; }; - version = "5.4.0"; + version = "6.0.1"; }; browser = { groups = ["default"]; @@ -305,7 +409,7 @@ version = "3.2.4"; }; byebug = { - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -330,10 +434,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "123198zk2ak8mziwa5jc3ckgpmsg08zn064n3aywnqm9s1bwjv3v"; + sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; type = "gem"; }; - version = "3.38.0"; + version = "3.39.2"; + }; + cbor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0511idr8xps9625nh3kxr68sdy6l3xy2kcz7r57g47fxb1v18jj3"; + type = "gem"; + }; + version = "0.5.9.6"; + }; + cgi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18zc1z8va9j1gcv131p605wmkvn1p5958mmvvy7v45ki8c0w7qn5"; + type = "gem"; + }; + version = "0.3.6"; }; childprocess = { groups = ["default" "development" "test"]; @@ -377,7 +501,7 @@ version = "0.3.3"; }; coderay = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -424,20 +548,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1izh9vf2rjjxphidgf00wdmvmvlrbsy4n2a99fds59qkbd5cy0i9"; + sha256 = "0pjbnlzb459wqd8lv6d2xfnjbc71viffhkzxg3cd0i2q9jq0fvgk"; type = "gem"; }; - version = "13.0.7"; + version = "14.0.7"; }; concurrent-ruby = { groups = ["assets" "default" "development" "nulldb" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.2"; + }; + cose = { + dependencies = ["cbor" "openssl-signature_algorithm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; + type = "gem"; + }; + version = "1.3.0"; }; crack = { dependencies = ["rexml"]; @@ -465,10 +600,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l5f5cq8ki3h4djh7pb8yqdkywqd08vjy3vd64yqh7qd6pdwky6w"; + sha256 = "1zmrgngggg4yvdbggdx9p3z4wcav4vxfigramxxvjh3hi7l12pig"; type = "gem"; }; - version = "3.2.6"; + version = "3.2.8"; }; daemons = { groups = ["default"]; @@ -485,23 +620,23 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xyza6gjci6qp83srcvsg3i225x17n27bwci4wqzpmn9bykjac2n"; + sha256 = "137xw0nl7ixxqyam6fjgmzl24i3rdml37whgnks8y35w92i95447"; type = "gem"; }; - version = "3.2.3"; + version = "3.2.6"; }; date = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; type = "gem"; }; - version = "3.3.3"; + version = "3.3.4"; }; debug_inspector = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -527,10 +662,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wh1146hg0b85zv336dn00jx9mzw5ma0maj67is7bvz5l35hd6yk"; + sha256 = "1b80s5b6dihazdd8kcfrd7z3qv8kijxpxq5027prazdha3pgzadf"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; deprecation_toolkit = { dependencies = ["activesupport"]; @@ -580,30 +715,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fxrvqv3l5w9p20s129rg41zc6agf1n4yrmganancnvykbkygki2"; + sha256 = "1q2pywgyn6cbnm0fh3dln5z1qgd1g8hvb4x8rppjc1bpfxnfhi13"; type = "gem"; }; - version = "5.6.4"; - }; - dotenv = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; - type = "gem"; - }; - version = "2.8.1"; + version = "5.6.6"; }; dry-cli = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ffdpd18n1h1fxsl4yz7wpjlxb0nw8s0wxzwypi9vcyzij0d993s"; + sha256 = "1w39jms4bsggxvl23cxanhccv1ngb6nqxsqhi784v5bjz1lx3si8"; type = "gem"; }; - version = "0.7.0"; + version = "1.0.0"; }; dry-core = { dependencies = ["concurrent-ruby" "zeitwerk"]; @@ -611,10 +736,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01gks2hrp7nl3pzb487azvd25dlbrc40d5cpk4n0szwnf2c0k4ks"; + sha256 = "03a5qn74c4lk2rpy6wlhv66synjlyzc4wn086xzphkpmw12l4bzk"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; dry-inflector = { groups = ["default"]; @@ -654,10 +779,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s5cqx3i7bigfhy8pniswdhinc9k2xxvkk05ikqy0kmwiy4bc991"; + sha256 = "1f6dz0hm67rhybh6xq2s3vvr700cp43kf50z2lids62s2i0mh5hj"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.1"; }; eco = { dependencies = ["coffee-script" "eco-source" "execjs"]; @@ -717,10 +842,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; eventmachine = { groups = ["default"]; @@ -737,10 +862,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; + sha256 = "1yywajqlpjhrj1m43s3lfg3i4lkb6pxwccmwps7qw37ndmphdzg8"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.1"; }; factory_bot = { dependencies = ["activesupport"]; @@ -770,21 +895,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b8772jybi0vxzbcs5zw17k40z661c8adn2rd6vqqr7ay71bzl09"; + sha256 = "1ic47k6f0q6xl9g2yxa3x60gfbwx98wnx75qnbhhgk0zc7a5ijhy"; type = "gem"; }; - version = "3.1.1"; + version = "3.2.2"; }; faraday = { - dependencies = ["faraday-net_http" "ruby2_keywords"]; + dependencies = ["base64" "faraday-net_http" "ruby2_keywords"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; + sha256 = "0vn7jwss2v6jhnxvjsiwbs3irjwhbx9zxn4l6fhd4rkcfyxzdnw5"; type = "gem"; }; - version = "2.7.4"; + version = "2.7.11"; }; faraday-mashify = { dependencies = ["faraday" "hashie"]; @@ -844,10 +969,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rv8dlq9nqpias29jh40qb6xzznlk6ra41nan6s5hy56402f0k29"; + sha256 = "1l38x0i0z8pjwr54lmnk8q1lxd7cqyl5m0qqqwb2iw28kncvmb3i"; type = "gem"; }; - version = "2.21.0"; + version = "2.21.1"; }; globalid = { dependencies = ["activesupport"]; @@ -855,10 +980,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "040bxzfd7mz1p6z4bc9vk5yrf762hdllvf98hmk848fq28xc5dsk"; + sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh"; type = "gem"; }; - version = "1.0.1"; + version = "1.2.1"; }; gmail_xoauth = { dependencies = ["oauth"]; @@ -872,14 +997,15 @@ version = "0.4.2"; }; graphql = { + dependencies = ["racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14knjmj2csrl9s890ikvipsbxn01xn6vdb64iwlbv6xnc20scwxf"; + sha256 = "0zcm3bcw8zqqyns43cir276yfs5bafcan90rg22ihxi0b01c395p"; type = "gem"; }; - version = "2.0.17"; + version = "2.1.6"; }; graphql-batch = { dependencies = ["graphql" "promise.rb"]; @@ -887,10 +1013,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nsjfi47h9ma8gkqi7v6ky3jqp1zb05l4y2xdsa13f0s8vmq04jv"; + sha256 = "0y8lclq94jjqg4sbn6lkbfa8cm64nnicgzkrmaihl8ml7p6mslal"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.3"; }; hashdiff = { groups = ["default" "development" "test"]; @@ -985,6 +1111,17 @@ }; version = "0.6.0"; }; + httparty = { + dependencies = ["mini_mime" "multi_xml"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "050jzsa6fbfvy2rldhk7mf1sigildaqvbplfz2zs6c0zlzwppvq0"; + type = "gem"; + }; + version = "0.21.0"; + }; httpclient = { groups = ["default"]; platforms = []; @@ -1001,10 +1138,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.1"; }; icalendar = { dependencies = ["ice_cube"]; @@ -1012,21 +1149,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11zfs0l8y2a6gpf0krm91d0ap2mnf04qky89dyzxwaspqxqgj174"; + sha256 = "15xpiqb2884ip8js4vwm85vd22y919w2dga36yqdfam2gcwi8vvw"; type = "gem"; }; - version = "2.8.0"; + version = "2.10.0"; }; icalendar-recurrence = { - dependencies = ["icalendar" "ice_cube"]; + dependencies = ["icalendar" "ice_cube" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06li3cdbwkd9y2sadjlbwj54blqdaa056yx338s4ddfxywrngigh"; + sha256 = "01226l14p9wys5vla2l36a51cjffp96i4dk01frffd042qjgmf2x"; type = "gem"; }; - version = "1.1.3"; + version = "1.2.0"; }; ice_cube = { groups = ["default"]; @@ -1069,7 +1206,7 @@ version = "1.5.0"; }; interception = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1078,6 +1215,16 @@ }; version = "0.5"; }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; + type = "gem"; + }; + version = "1.6.2"; + }; json = { groups = ["default" "development" "test"]; platforms = []; @@ -1098,15 +1245,18 @@ }; version = "2.3.0"; }; - kgio = { - groups = ["default" "unicorn"]; + keycloak-admin = { + dependencies = ["httparty"]; + groups = ["development" "test"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ipzvw7n0kz1w8rkqybyxvf3hb601a770khm0xdqm68mc4aa59xx"; - type = "gem"; + fetchSubmodules = false; + rev = "037ac274541d513f3edc3df74bc684ff23ecc473"; + sha256 = "068gd98ii6jflnwk9nky71m0vl9jqmxb5fx1nmdphp917drn98c1"; + type = "git"; + url = "https://github.com/tschaefer/ruby-keycloak-admin/"; }; - version = "2.11.4"; + version = "22.0.4"; }; koala = { dependencies = ["addressable" "faraday" "faraday-multipart" "json" "rexml"]; @@ -1114,10 +1264,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14jq1q8314x5qncmfgs53iv1ycz1fm887gnp7w04h963gbwr3yhc"; + sha256 = "0qrs0yra1d0kxrn28fh1hvm099rh26dp4hpkw36vgfm286qjslww"; + type = "gem"; + }; + version = "3.5.0"; + }; + language_server-protocol = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; type = "gem"; }; - version = "3.4.0"; + version = "3.17.0.3"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -1140,6 +1300,16 @@ }; version = "1.1.4"; }; + localhost = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12p4sy88qnw5c8ga6fdlxy2w2i0xw9mmnzckzj71k4rvbwpdzlg1"; + type = "gem"; + }; + version = "1.1.10"; + }; logging = { dependencies = ["little-plugger" "multi_json"]; groups = ["default"]; @@ -1157,10 +1327,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; + sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; type = "gem"; }; - version = "2.19.1"; + version = "2.21.3"; }; mail = { dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; @@ -1231,50 +1401,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9"; + sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; type = "gem"; }; - version = "3.2023.0218.1"; + version = "3.2023.0808"; }; mini_mime = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.5"; }; mini_portile2 = { groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.5"; }; minitest = { groups = ["assets" "default" "development" "nulldb" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.17.0"; + version = "5.20.0"; }; minitest-profile = { groups = ["development" "test"]; @@ -1291,10 +1461,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3"; + sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.2"; }; multi_json = { groups = ["default"]; @@ -1307,7 +1477,7 @@ version = "1.15.0"; }; multi_xml = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1331,10 +1501,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsy70mg4p854jska7ff7cy8fyn9nhlkrmfdvkkfmk8qxairbfq1"; + sha256 = "1gjvj215qdhwk3292sc7xsn6fmwnnaq2xs35hh5hc8d8j22izlbn"; type = "gem"; }; - version = "0.5.4"; + version = "0.5.5"; }; naught = { groups = ["default"]; @@ -1373,10 +1543,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y55ib1v2b8prqfi9ij7hca60b1j94s2bzr6vskwi3i5735472wq"; + sha256 = "0mzifz1c5clhncp0baaqlmybijafbw6j2kknr25h0r1wrrin2ynq"; type = "gem"; }; - version = "0.3.2"; + version = "0.4.0"; }; net-imap = { dependencies = ["date" "net-protocol"]; @@ -1384,20 +1554,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.7"; }; net-ldap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; + sha256 = "0xqcffn3c1564c4fizp10dzw2v5g2pabdzrcn25hq05bqhsckbar"; type = "gem"; }; - version = "0.17.1"; + version = "0.18.0"; }; net-pop = { dependencies = ["net-protocol"]; @@ -1437,10 +1607,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; type = "gem"; }; - version = "2.5.8"; + version = "2.5.9"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -1448,10 +1618,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; + sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12"; type = "gem"; }; - version = "1.13.10"; + version = "1.15.5"; }; nori = { groups = ["default"]; @@ -1497,15 +1667,15 @@ version = "2.0.9"; }; omniauth = { - dependencies = ["hashie" "rack"]; + dependencies = ["hashie" "rack" "rack-protection"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jn9j54l5h7xcba2vjq74l1dk0xrwvsjxam4qhylpi52nw0h5502"; + sha256 = "15xjsxis357np7dy1lak39x1n8g8wxljb08wplw5i4gxi743zr7j"; type = "gem"; }; - version = "1.9.2"; + version = "2.1.1"; }; omniauth-facebook = { dependencies = ["omniauth-oauth2"]; @@ -1524,10 +1694,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xbk0dbxqfpyfb33ghz6vrlz3m6442rp18ryf13gwzlnifcawhlb"; + sha256 = "1m6a7kg3lxz2nm96prln2ja8r4wlm37m5vsy9199vnynqq5fgy4g"; type = "gem"; }; - version = "1.4.0"; + version = "2.0.1"; }; omniauth-gitlab = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -1535,21 +1705,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nbrg93p0nqxs1i2ddyij2rr7jn4vr3la4la39q4fknpin535k3z"; + sha256 = "04wnjnapgwsnyd3dfnp8dp1jjnsg64zkls5xharj10j822kiygsl"; type = "gem"; }; - version = "2.0.0"; + version = "4.1.0"; }; omniauth-google-oauth2 = { - dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; + dependencies = ["jwt" "oauth2" "omniauth" "omniauth-oauth2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pgqasl048irs2c6w6g57zvk0ygb5ml1krwir4qi4b6y53zyr55"; + sha256 = "0fahkghfa2iczmwss9bz5l4rh7siwzjnjp3akh7pdbsfx0kg35j4"; type = "gem"; }; - version = "0.8.0"; + version = "1.1.1"; }; omniauth-linkedin-oauth2 = { dependencies = ["omniauth-oauth2"]; @@ -1557,10 +1727,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ydkj9f2hd3fskpc2gazz9dim70z2k6z6pb8j3glnlhkd67iyzci"; + sha256 = "0xai5k6xzinc4d67n64y1acffs8p7xi2hikz493dz6jx8qv9b2g3"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; omniauth-microsoft-office365 = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -1590,10 +1760,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ia73zcbmhf02krlkq2rxmksx93jp777ax5x58fzkq3jzacqyniz"; + sha256 = "0y4y122xm8zgrxn5nnzwg6w39dnjss8pcq2ppbpx9qn7kiayky5j"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; omniauth-rails_csrf_protection = { dependencies = ["actionpack" "omniauth"]; @@ -1601,10 +1771,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xgkxwg17w39q3yjqcj0fm6hdkw37qm1l82dvm9zxn6q2pbzm2zv"; + sha256 = "1kwswnkyl8ym6i4wv65qh3qchqbf2n0c6lbhfgbvkds3gpmnlm7w"; type = "gem"; }; - version = "0.1.2"; + version = "1.0.1"; }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; @@ -1612,10 +1782,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gxl14lbksnjkl8dfn23lsjkk63md77icm5racrh6fsp5n4ni9d4"; + sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n"; type = "gem"; }; - version = "1.10.3"; + version = "2.1.0"; }; omniauth-twitter = { dependencies = ["omniauth-oauth" "rack"]; @@ -1633,9 +1803,11 @@ groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "02cz73lj38cjqkbrdnfr7iymzqdcxgqcjy992r5hmawgpqqgxvwb"; - type = "gem"; + fetchSubmodules = false; + rev = "06803ef97f822ede854322587db8049cc67dcfa6"; + sha256 = "10bsx11padnmd88xhkr583mgwwsn8155vpg2flw7wqjkd2hy6671"; + type = "git"; + url = "https://github.com/zammad-deps/omniauth-weibo-oauth2"; }; version = "0.5.2"; }; @@ -1644,10 +1816,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873"; + sha256 = "054d6ybgjdzxw567m7rbnd46yp6gkdbc5ihr536vxd3p15vbhjrw"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; + }; + openssl-signature_algorithm = { + dependencies = ["openssl"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "103yjl68wqhl5kxaciir5jdnyi7iv9yckishdr52s5knh9g0pd53"; + type = "gem"; + }; + version = "1.3.0"; }; overcommit = { dependencies = ["childprocess" "iniparse" "rexml"]; @@ -1665,21 +1848,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; + sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; type = "gem"; }; - version = "1.22.1"; + version = "1.23.0"; }; parser = { - dependencies = ["ast"]; + dependencies = ["ast" "racc"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; + sha256 = "0r69dbh6h6j4d54isany2ir4ni4gf2ysvk3k44awi6amz18nggpd"; type = "gem"; }; - version = "3.2.0.0"; + version = "3.2.2.4"; }; pg = { groups = ["postgres"]; @@ -1707,10 +1890,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17yx4bc0k182lhydwa8aqn0kx776kqymziydpb2szmxzx5q2sghx"; + sha256 = "1y2c5mvkq7zc5vh4ijs1wc9hc0yn4mwsbrjch34jf11pcz116pnd"; type = "gem"; }; - version = "2.0.2"; + version = "2.0.3"; }; "promise.rb" = { groups = ["default"]; @@ -1724,18 +1907,40 @@ }; pry = { dependencies = ["coderay" "method_source"]; - groups = ["default" "development" "test"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; + type = "gem"; + }; + version = "0.14.2"; + }; + pry-byebug = { + dependencies = ["byebug" "pry"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr"; + sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8"; type = "gem"; }; - version = "0.14.1"; + version = "3.10.1"; + }; + pry-doc = { + dependencies = ["pry" "yard"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pp43n69p6bjvc640wgcz295w1q2v9awcqgbwcqn082dbvq5xvnx"; + type = "gem"; + }; + version = "1.4.0"; }; pry-rails = { dependencies = ["pry"]; - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1746,7 +1951,7 @@ }; pry-remote = { dependencies = ["pry" "slop"]; - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1757,7 +1962,7 @@ }; pry-rescue = { dependencies = ["interception" "pry"]; - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1768,7 +1973,7 @@ }; pry-stack_explorer = { dependencies = ["binding_of_caller" "pry"]; - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1777,15 +1982,26 @@ }; version = "0.6.1"; }; + pry-theme = { + dependencies = ["coderay"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qhs1qmv6zhl45zhpv5qj6vkwm0nkdc37dqd49fwl8ph6f0sfh8h"; + type = "gem"; + }; + version = "1.3.1"; + }; public_suffix = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.3"; }; puma = { dependencies = ["nio4r"]; @@ -1793,10 +2009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0df9bknc2dllk8v9fhgidzbvbryaxa8fgifrk40cdz9csjsphbky"; + sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; type = "gem"; }; - version = "4.3.12"; + version = "6.4.0"; }; pundit = { dependencies = ["activesupport"]; @@ -1804,41 +2020,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wb03yzy1j41822rbfh9nn77im3zh1f5v8di05cd8rsrdpws542b"; + sha256 = "10diasjqi1g7s19ns14sldia4wl4c0z1m4pva66q4y2jqvks4qjw"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; pundit-matchers = { - dependencies = ["rspec-rails"]; + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hs0z7flj8yibk8jm5x7pnnfnl0rh0rhrvmq27b6pxvqxxvywsq3"; + sha256 = "0gmvppwknijhy013azyws85bkyck8x9ly7yh2162kxa59z1kbsgq"; type = "gem"; }; - version = "1.8.4"; + version = "3.1.2"; }; racc = { groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.3"; }; rack = { groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk"; + sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; type = "gem"; }; - version = "2.2.6.4"; + version = "2.2.8"; }; rack-attack = { dependencies = ["rack"]; @@ -1846,10 +2062,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq"; + sha256 = "0z6pj5vjgl6swq7a33gssf795k958mss8gpmdb4v4cydcs7px91w"; type = "gem"; }; - version = "6.6.1"; + version = "6.7.0"; + }; + rack-protection = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r"; + type = "gem"; + }; + version = "3.1.0"; }; rack-proxy = { dependencies = ["rack"]; @@ -1857,10 +2084,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147"; + sha256 = "12jw7401j543fj8cc83lmw72d8k6bxvkp9rvbifi88hh01blnsj4"; type = "gem"; }; - version = "0.7.6"; + version = "0.7.7"; }; rack-test = { dependencies = ["rack"]; @@ -1868,21 +2095,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; + sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; rails = { - dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07cs7qdkx6vwp66diwdy9g6mx52rsd8rxhbnsqf9bqam58g2aynj"; + sha256 = "0rsqin156dawz7gzpy1ijs02afqcr4704vqj56s6yxng3a9ayhwf"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -1896,37 +2123,37 @@ version = "1.0.5"; }; rails-dom-testing = { - dependencies = ["activesupport" "nokogiri"]; + dependencies = ["activesupport" "minitest" "nokogiri"]; groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5"; type = "gem"; }; - version = "2.0.3"; + version = "2.2.0"; }; rails-html-sanitizer = { - dependencies = ["loofah"]; + dependencies = ["loofah" "nokogiri"]; groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; + sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6"; type = "gem"; }; - version = "1.4.4"; + version = "1.6.0"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2snjnx1j848axppj2napy3zjgbka3fnw2528rcamhm6dp694nd"; + sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; type = "gem"; }; - version = "6.1.7.3"; + version = "7.0.8"; }; rainbow = { groups = ["default" "development" "test"]; @@ -1938,16 +2165,6 @@ }; version = "3.1.1"; }; - raindrops = { - groups = ["default" "unicorn"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wb2x51parf6v78w0cic90m33bdc92y5h8rj4wqs75dhw1b69hc7"; - type = "gem"; - }; - version = "0.20.0"; - }; rake = { groups = ["assets" "default" "development" "test"]; platforms = []; @@ -2004,20 +2221,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d6241adx6drsfzz74nx1ld3394nm6fjpv3ammzr0g659krvgf7q"; + sha256 = "1d9a5s3qrjdy50ll2s32gg3qmf10ryp3v2nr5k718kvfadp50ray"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.2"; }; rexml = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; + }; + rotp = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m48hv6wpmmm6cjr6q92q78h1i610riml19k5h1dil2yws3h1m3m"; + type = "gem"; + }; + version = "6.3.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -2025,10 +2252,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; + sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2036,10 +2263,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qldsmjhqr4344zdlamzggr3y98wdk2c4hihkhwx8imk800gkl8v"; + sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.3"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2047,10 +2274,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvwnb0x5d6d4ff3wlgahk0wcw72ic51gd2snr1xxc5ify41kabv"; + sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.6"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2058,10 +2285,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d3fnabkaw8n0na2dpnlg2xygggj51djzpj9x6y5rkiqbfyqwv01"; + sha256 = "086qdyz7c4s5dslm6j06mq7j4jmj958whc3yinhabnqqmz7i463d"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.3"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -2079,10 +2306,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; + sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.1"; }; rszr = { groups = ["default"]; @@ -2095,15 +2322,15 @@ version = "1.3.0"; }; rubocop = { - dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jsiy93y5c2sx2sr5jmdah208idw038m2fpihgan4klmldm3r1pm"; + sha256 = "06qnp5zs233j4f59yyqrg8al6hr9n4a7vcdg3p31v0np8bz9srwg"; type = "gem"; }; - version = "1.45.1"; + version = "1.57.2"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2111,10 +2338,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; + sha256 = "1cs9cc5p9q70valk4na3lki4xs88b52486p2v46yx3q1n5969bgs"; type = "gem"; }; - version = "1.24.1"; + version = "1.30.0"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -2122,10 +2349,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v"; + sha256 = "1jwwi5a05947q9zsk6i599zxn657hdphbmmbbpx17qsv307rwcps"; type = "gem"; }; - version = "2.17.0"; + version = "2.19.0"; + }; + rubocop-factory_bot = { + dependencies = ["rubocop"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y79flwjwlaslyhfpg84di9n756ir6bm52n964620xsj658d661h"; + type = "gem"; + }; + version = "2.24.0"; }; rubocop-faker = { dependencies = ["faker" "rubocop"]; @@ -2144,10 +2382,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hryrjmcl04br06ibjzzrbb2am8ybbhnl2l7w13xl3wz3k4jyjxs"; + sha256 = "1fmjnfhdaqxf4pdvfyjiayxazvqw52gj49m57abnri48ydvy4r06"; type = "gem"; }; - version = "0.19.0"; + version = "1.4.0"; }; rubocop-inflector = { dependencies = ["activesupport" "rubocop" "rubocop-rspec"]; @@ -2166,42 +2404,42 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; + sha256 = "1pzsrnjmrachdjxzl9jpw47cydicn3408vgdg3a4bss4v5r42rjj"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.1"; }; rubocop-rails = { - dependencies = ["activesupport" "rack" "rubocop"]; + dependencies = ["activesupport" "rack" "rubocop" "rubocop-ast"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nxyifly45y7dfiaf0ql8aq7xykrg0sh1l7dxmn3sb9p2jd18140"; + sha256 = "0ym0h2w97b8c2h6zl44m22lzg253qkmim0ali32aiy58ddvbj0mm"; type = "gem"; }; - version = "2.17.4"; + version = "2.22.2"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-capybara"]; + dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1"; + sha256 = "1wwrgcigdrrlgg4nwbl18qfyjks519kqbbly5adrdffvh428lgq8"; type = "gem"; }; - version = "2.18.1"; + version = "2.25.0"; }; ruby-progressbar = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; ruby-saml = { dependencies = ["nokogiri" "rexml"]; @@ -2209,10 +2447,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1irn32sy9gx6xj9jxc28h7dax7vp9z8j6hjjfsb2f5hd4qz0z20x"; + sha256 = "18vnbzin5ypxrgcs9lllg7x311b69dyrdw2w1pwz84438hmxm79s"; type = "gem"; }; - version = "1.14.0"; + version = "1.15.0"; }; ruby2_keywords = { groups = ["default" "development" "test"]; @@ -2244,6 +2482,17 @@ }; version = "2.3.2"; }; + safety_net_attestation = { + dependencies = ["jwt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1khq0y5w7lf2b9a220298hphf3pakd216jc9a4x4a9pdwxs2vgln"; + type = "gem"; + }; + version = "0.4.0"; + }; sassc = { dependencies = ["ffi"]; groups = ["assets" "default"]; @@ -2272,10 +2521,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dkcyq2hfvf4wdj7q5cqqlka1dw6gz28dckxf4r17jmd53ymwg28"; + sha256 = "15r2sl3c7jm6b8jghiqic9s7nhkp7iss66c5gqdqzyad7j44w4rn"; type = "gem"; }; - version = "4.8.0"; + version = "4.15.0"; }; shoulda-matchers = { dependencies = ["activesupport"]; @@ -2330,18 +2579,18 @@ version = "2.4.0"; }; slack-ruby-client = { - dependencies = ["faraday" "faraday-mashify" "faraday-multipart" "gli" "hashie" "websocket-driver"]; + dependencies = ["faraday" "faraday-mashify" "faraday-multipart" "gli" "hashie"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "110rhsxxf0g4qdrhy1ahyfjg1hqqwwwf4rjn8vrrbvpfd04b8xa5"; + sha256 = "13vmrak47ygwxmfq8abl3sj2hbkgmn3m28bgich3qs7g0m6cqjhs"; type = "gem"; }; - version = "2.0.0"; + version = "2.2.0"; }; slop = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2388,10 +2637,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14678jlva69bxx24sz5i882x25h357xmbmqsichvq8vdiw2xf6aa"; + sha256 = "0fq1dxyc34fzyi9ivjb4wb3b4cs5pjh1cl44jn7rbzb8qdg6hp3p"; type = "gem"; }; - version = "0.2.2"; + version = "0.4.0"; }; telegram-bot-ruby = { dependencies = ["dry-struct" "faraday" "faraday-multipart" "zeitwerk"]; @@ -2409,10 +2658,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c5cnx7w3wp6ddsw84s131asfs6pr650fhwqhzwx2v3987d38kz1"; + sha256 = "0fbzaizg3f7ydlsp88zshkf47d07pc5jjpn9z7qckvah62f8r7a0"; type = "gem"; }; - version = "1.4.19"; + version = "1.4.20"; }; terser = { dependencies = ["execjs"]; @@ -2420,10 +2669,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01c8wp7z6v71jqgn6fgi8wfw62488i4arxdjqjg8zkn0jsflyd8b"; + sha256 = "18alcxm37jh7lrr5hmp9s85n9wm57rccf8f1ifxv3hwq9k7gqba6"; type = "gem"; }; - version = "1.1.13"; + version = "1.1.19"; }; test-unit = { dependencies = ["power_assert"]; @@ -2431,20 +2680,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rdhpdi8mlk7jwv9pxz3mhchpd5q93jxzijqhw334w5yv1ajl5hf"; + sha256 = "02v0aa6rfanas00p47xi0anbza1ymcgv6h03ipil8pbj21cw998a"; type = "gem"; }; - version = "3.5.7"; + version = "3.6.1"; }; thor = { groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; thread_safe = { groups = ["default"]; @@ -2461,10 +2710,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; + sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; type = "gem"; }; - version = "2.0.11"; + version = "2.2.0"; }; time = { dependencies = ["date"]; @@ -2472,20 +2721,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13pzdsgf3v06mymzipcpa7p80shyw328ybn775nzpnhc6n8y9g30"; + sha256 = "0c15v19hyxjcfzaviqlwhgajgyrrlb0pjilza6mkv49bhspy6av6"; type = "gem"; }; - version = "0.2.2"; + version = "0.3.0"; }; timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; + sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; type = "gem"; }; - version = "0.3.2"; + version = "0.4.0"; + }; + tpm-key_attestation = { + dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1"; + type = "gem"; + }; + version = "0.12.0"; }; twilio-ruby = { dependencies = ["faraday" "jwt" "nokogiri"]; @@ -2493,10 +2753,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wn7ybr54i8p6rrg79k0z4pga4n91d9rvrlvwgms8mx3aq9dpbib"; + sha256 = "1kxp3rn2lk36qbcl3yin5c5ih295w8wns7c8nyr9cpfszy6hg0jg"; type = "gem"; }; - version = "5.74.3"; + version = "6.8.2"; }; twitter = { dependencies = ["addressable" "buftok" "equalizer" "http" "http-form_data" "http_parser.rb" "memoizable" "multipart-post" "naught" "simple_oauth"]; @@ -2526,10 +2786,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0drm9pygji01pyimxq65ngdvgpn228g7fhffmrqw0xn7l2rdhclp"; + sha256 = "0m2d0gpsgqnv29j5h2d6g57g0rayvd460b8s2vjr8sn46bqf89m5"; type = "gem"; }; - version = "1.2022.7"; + version = "1.2023.3"; }; unf = { dependencies = ["unf_ext"]; @@ -2557,51 +2817,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; type = "gem"; }; - version = "2.4.2"; - }; - unicorn = { - dependencies = ["kgio" "raindrops"]; - groups = ["unicorn"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h0gma14jjxiz6piyi6p99q7lya2mxrq79l03160hascvmx9ipa5"; - type = "gem"; - }; - version = "6.1.0"; + version = "2.5.0"; }; uri = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vigw7nfszfqgikr6n574k9bfh0rvs74z8xq46rz2zsm8249l8cc"; + sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; type = "gem"; }; - version = "0.12.1"; + version = "0.13.0"; }; vcr = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xzd8f17mmcq9f6lxg4w0x4nd9pyp41lr77gjzxwynijzp8rcgjl"; + sha256 = "02j9z7yapninfqwsly4l65596zhv2xqyfb91p9vkakwhiyhajq7r"; type = "gem"; }; - version = "6.1.0"; + version = "6.2.0"; }; version_gem = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v2vj7q1rk3wd7hdqa3i1d4hq7sfcgf55qc70g6dsichsbgacb9w"; + sha256 = "0q6zs0wgcrql9671fw6lmbvgh155snaak4fia24iji5wk9klpfh7"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.3"; }; viewpoint = { dependencies = ["httpclient" "logging" "nokogiri" "rubyntlm"]; @@ -2620,10 +2869,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "035bjh0db28bgjx6hf01ykrrl4088gygnsva1x7asznzd9aq4669"; + sha256 = "1k4bllg0zpmpkjfmk1gybc2ygca4v40l2fmlplf9h0jqwniqa3mr"; type = "gem"; }; - version = "3.0.14"; + version = "3.0.17"; }; vite_ruby = { dependencies = ["dry-cli" "rack-proxy" "zeitwerk"]; @@ -2631,10 +2880,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "119adbqdx4qb0hl5f34346j2w8a6z5xxy19wc6ad7bnc98v7l0hw"; + sha256 = "036qi8w4qzglhqrrrrkc0m7ivfzmagsdyj61r0h27p56hn1l6ph2"; type = "gem"; }; - version = "3.2.14"; + version = "3.3.4"; + }; + webauthn = { + dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "tpm-key_attestation"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ri09bf640kkw4v6k2g90q2nw1mx2hsghhngaqgb7958q8id8xrz"; + type = "gem"; + }; + version = "3.0.0"; }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; @@ -2642,34 +2902,34 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1myj44wvbbqvv18ragv3ihl0h61acgnfwrnj3lccdgp49bgmbjal"; + sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza"; type = "gem"; }; - version = "3.18.1"; + version = "3.19.1"; }; websocket = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + sha256 = "1a4zc8d0d91c3xqwapda3j3zgpfwdbj76hkb69xn6qvfkfks9h9c"; type = "gem"; }; - version = "1.2.9"; + version = "1.2.10"; }; websocket-driver = { dependencies = ["websocket-extensions"]; - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; websocket-extensions = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2678,15 +2938,16 @@ }; version = "0.1.5"; }; - writeexcel = { + write_xlsx = { + dependencies = ["rubyzip"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0waaf1drp17m5qdchxqlqzj51sfa9hxqccw7d71qdg73gzay1x34"; + sha256 = "0w89lrp5k1ayp28p8785cbrmsmqsr5zrhvajs68pg7vvgn3qmqva"; type = "gem"; }; - version = "1.0.5"; + version = "1.11.1"; }; xpath = { dependencies = ["nokogiri"]; @@ -2699,15 +2960,25 @@ }; version = "3.2.0"; }; + yard = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "013yrnwx1zhzhn1fnc19zck22a1qgimsaglp2iwgf5bz9l8h93js"; + type = "gem"; + }; + version = "0.9.34"; + }; zeitwerk = { - groups = ["assets" "default" "development" "nulldb" "test"]; + groups = ["assets" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; + sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; type = "gem"; }; - version = "2.6.7"; + version = "2.6.12"; }; zendesk_api = { dependencies = ["faraday" "faraday-multipart" "hashie" "inflection" "mini_mime" "multipart-post"]; @@ -2715,9 +2986,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yizpglgfwml6a2w696m97d1q50hq3v0vldja431rv93s9sjbgly"; + sha256 = "0cjiqm50zc4gpsn456235k8x0prafbmz921yqjgava4rp706467d"; type = "gem"; }; - version = "1.38.0.rc1"; + version = "2.0.1"; }; } diff --git a/pkgs/applications/networking/misc/zammad/package.json b/pkgs/applications/networking/misc/zammad/package.json index 09c7bc0ca139b..d4d983d1eda8a 100644 --- a/pkgs/applications/networking/misc/zammad/package.json +++ b/pkgs/applications/networking/misc/zammad/package.json @@ -1,12 +1,12 @@ { "private": true, "scripts": { - "generate-graphql-api": "RAILS_ENV=development bundle exec rails generate zammad:graphql_introspection > tmp/graphql_introspection.json && npx graphql-codegen -c .graphql_code_generator.yml && rm tmp/graphql_introspection.json", + "generate-graphql-api": "RAILS_ENV=development bundle exec rails generate zammad:graphql_introspection > app/graphql/graphql_introspection.json && npx graphql-codegen -c .graphql_code_generator.yml", + "generate-setting-types": "RAILS_ENV=development bundle exec rails generate zammad:setting_types", "dev": "RAILS_ENV=development forego start -f Procfile.dev", - "dev:https": "VITE_RUBY_HTTPS=true RAILS_ENV=development forego start -f Procfile.dev-https", - "https:generate": "sh contrib/ssl/generate-ssl.sh", + "dev:https": "VITE_RUBY_HOST=0.0.0.0 VITE_RUBY_HTTPS=true RAILS_ENV=development forego start -f Procfile.dev-https", "i18n": "rails generate zammad:translation_catalog", - "lint": "vue-tsc --noEmit && eslint --cache --cache-location ./tmp/eslintcache.js -c .eslintrc.js --ext .js,.ts,.vue app/frontend/ .eslint-plugin-zammad/", + "lint": "vue-tsc --noEmit && eslint --cache --cache-location ./tmp/eslintcache.js --cache-strategy content -c .eslintrc.js --ext .js,.ts,.vue app/frontend/ .eslint-plugin-zammad/", "lint:fix": "yarn lint -- --fix", "lint:css": "stylelint **/*.{css,vue,scss}", "lint:css:fix": "stylelint **/*.{css,vue,scss} --fix", @@ -15,138 +15,144 @@ "test:ci:ct": "CI=true yarn --cwd ./.cypress cypress run --component --project ../ --config-file .cypress/cypress.config.mjs --browser electron", "cypress:snapshots": "sh .cypress/visual-regression/snapshots.sh", "cypress:install": "yarn --cwd ./.cypress install", - "postinstall": "node script/fix-node-modules.mjs", "story": "histoire dev", "story:build": "HISTOIRE_BUILD=1 histoire build" }, "engines": { - "node": ">=16" + "node": ">=18" }, - "packageManager": "yarn@1.22.19", + "packageManager": "yarn@1.22.21", "devDependencies": { - "@graphql-codegen/cli": "^3.0.0", - "@graphql-codegen/introspection": "^3.0.0", - "@graphql-codegen/near-operation-file-preset": "^2.5.0", - "@graphql-codegen/typescript": "^3.0.0", - "@graphql-codegen/typescript-operations": "^3.0.0", - "@graphql-codegen/typescript-vue-apollo": "^3.3.7", - "@histoire/plugin-vue": "^0.14.2", - "@pinia/testing": "^0.0.14", - "@tailwindcss/line-clamp": "^0.4.2", - "@testing-library/jest-dom": "^5.16.5", - "@testing-library/user-event": "^14.4.3", - "@testing-library/vue": "^6.6.1", - "@types/lodash-es": "^4.17.6", - "@types/rails__actioncable": "^6.1.6", - "@types/ua-parser-js": "^0.7.36", - "@types/uuid": "^9.0.0", - "@typescript-eslint/eslint-plugin": "^5.51.0", - "@typescript-eslint/parser": "^5.51.0", - "@vitejs/plugin-vue": "^4.0.0", - "@vue/eslint-config-prettier": "^7.0.0", - "@vue/eslint-config-typescript": "^11.0.2", - "@vue/test-utils": "^2.2.10", - "autoprefixer": "^10.4.13", - "eslint": "^8.33.0", + "@faker-js/faker": "^8.3.1", + "@graphql-codegen/cli": "^5.0.0", + "@graphql-codegen/introspection": "^4.0.0", + "@graphql-codegen/near-operation-file-preset": "^3.0.0", + "@graphql-codegen/typescript": "^4.0.1", + "@graphql-codegen/typescript-operations": "^4.0.1", + "@graphql-codegen/typescript-vue-apollo": "^4.1.0", + "@histoire/plugin-vue": "^0.17.5", + "@pinia/testing": "^0.1.3", + "@testing-library/jest-dom": "^6.1.4", + "@testing-library/user-event": "^14.5.1", + "@testing-library/vue": "^7.0.0", + "@types/lodash-es": "^4.17.11", + "@types/rails__actioncable": "^6.1.9", + "@types/sinonjs__fake-timers": "^8.1.5", + "@types/ua-parser-js": "^0.7.39", + "@types/uuid": "^9.0.7", + "@typescript-eslint/eslint-plugin": "^6.10.0", + "@typescript-eslint/parser": "^6.10.0", + "@vitejs/plugin-vue": "^4.5.0", + "@vue/eslint-config-prettier": "^8.0.0", + "@vue/eslint-config-typescript": "^12.0.0", + "@vue/test-utils": "^2.4.2", + "autoprefixer": "^10.4.16", + "eslint": "^8.54.0", "eslint-config-airbnb-base": "^15.0.0", - "eslint-config-prettier": "^8.6.0", + "eslint-config-prettier": "^9.0.0", "eslint-import-resolver-alias": "^1.1.2", - "eslint-plugin-import": "^2.27.5", - "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-prettier-vue": "^4.2.0", + "eslint-import-resolver-typescript": "^3.6.1", + "eslint-plugin-import": "^2.29.0", + "eslint-plugin-prettier": "^5.0.1", + "eslint-plugin-prettier-vue": "^5.0.0", "eslint-plugin-security": "^1.7.1", - "eslint-plugin-sonarjs": "^0.18.0", - "eslint-plugin-vue": "^9.9.0", + "eslint-plugin-sonarjs": "^0.23.0", + "eslint-plugin-vue": "^9.18.1", "eslint-plugin-zammad": "file:.eslint-plugin-zammad", - "histoire": "^0.14.2", - "jsdom": "^21.1.0", + "histoire": "^0.17.5", + "jsdom": "^22.1.0", "mock-apollo-client": "^1.2.1", - "postcss": "^8.4.21", + "postcss": "^8.4.31", "postcss-html": "^1.5.0", - "prettier": "2.8.4", - "prettier-plugin-tailwindcss": "^0.2.2", - "regenerator-runtime": "^0.13.11", - "sass": "^1.58.0", - "stylelint": "^14.16.1", + "prettier": "3.1.0", + "prettier-plugin-tailwindcss": "^0.5.7", + "regenerator-runtime": "^0.14.0", + "sass": "^1.69.5", + "stylelint": "^15.11.0", "stylelint-config-prettier": "^9.0.5", - "stylelint-config-recommended-vue": "^1.4.0", - "stylelint-config-standard": "^29.0.0", - "stylelint-config-standard-scss": "^6.1.0", - "stylelint-prettier": "^2.0.0", - "stylelint-scss": "^4.4.0", - "tailwindcss": "^3.2.6", + "stylelint-config-recommended-vue": "^1.5.0", + "stylelint-config-standard": "^34.0.0", + "stylelint-config-standard-scss": "^11.1.0", + "stylelint-prettier": "^4.0.2", + "stylelint-scss": "^5.3.1", + "svg-baker": "^1.7.0", + "svgo": "^3.0.4", + "tailwindcss": "^3.3.5", "timezone-mock": "^1.3.6", - "ts-node": "^10.9.1", - "type-fest": "^3.5.7", - "typescript": "^4.9.5", - "vite": "^4.0.4", - "vite-plugin-pwa": "^0.14.1", - "vite-plugin-ruby": "^3.1.3", - "vite-plugin-svg-icons": "^2.0.1", - "vitest": "^0.28.4", + "type-fest": "^4.8.1", + "typescript": "^5.2.2", + "vite": "^4.5.0", + "vite-plugin-pwa": "^0.17.0", + "vite-plugin-ruby": "^3.2.2", + "vitest": "^0.34.6", "vitest-axe": "^0.1.0", - "vue-tsc": "^1.0.24" + "vue-tsc": "^1.8.22" }, "dependencies": { - "@apollo/client": "^3.7.7", - "@formkit/core": "^1.0.0-beta.13-c578106", - "@formkit/dev": "^1.0.0-beta.13-c578106", - "@formkit/i18n": "^1.0.0-beta.13-c578106", - "@formkit/inputs": "^1.0.0-beta.13-c578106", - "@formkit/rules": "^1.0.0-beta.13-c578106", - "@formkit/tailwindcss": "^1.0.0-beta.13-c578106", - "@formkit/themes": "^1.0.0-beta.13-c578106", - "@formkit/utils": "^1.0.0-beta.13-c578106", - "@formkit/validation": "^1.0.0-beta.13-c578106", - "@formkit/vue": "^1.0.0-beta.13-c578106", - "@rails/actioncable": "6.1.7", - "@tiptap/core": "^2.0.0-beta.217", - "@tiptap/extension-blockquote": "^2.0.0-beta.217", - "@tiptap/extension-character-count": "^2.0.0-beta.217", - "@tiptap/extension-image": "^2.0.0-beta.217", - "@tiptap/extension-link": "^2.0.0-beta.217", - "@tiptap/extension-list-item": "^2.0.0-beta.217", - "@tiptap/extension-mention": "^2.0.0-beta.217", - "@tiptap/extension-ordered-list": "^2.0.0-beta.217", - "@tiptap/extension-paragraph": "^2.0.0-beta.217", - "@tiptap/extension-strike": "^2.0.0-beta.217", - "@tiptap/extension-underline": "^2.0.0-beta.217", - "@tiptap/pm": "^2.0.0-beta.217", - "@tiptap/starter-kit": "^2.0.0-beta.217", - "@tiptap/suggestion": "^2.0.0-beta.217", - "@tiptap/vue-3": "^2.0.0-beta.217", - "@vue/apollo-composable": "^4.0.0-beta.2", - "@vueuse/core": "^9.12.0", - "@vueuse/router": "^9.12.0", - "@vueuse/shared": "^9.12.0", + "@apollo/client": "^3.8.7", + "@formkit/core": "^1.2.2", + "@formkit/dev": "^1.2.2", + "@formkit/i18n": "^1.2.2", + "@formkit/inputs": "^1.2.2", + "@formkit/rules": "^1.2.2", + "@formkit/tailwindcss": "^1.2.2", + "@formkit/themes": "^1.2.2", + "@formkit/utils": "^1.2.2", + "@formkit/validation": "^1.2.2", + "@formkit/vue": "^1.2.2", + "@github/webauthn-json": "^2.1.1", + "@rails/actioncable": "^7.0.8", + "@sinonjs/fake-timers": "^11.2.2", + "@tiptap/core": "^2.1.12", + "@tiptap/extension-blockquote": "^2.1.12", + "@tiptap/extension-character-count": "^2.1.12", + "@tiptap/extension-hard-break": "^2.1.12", + "@tiptap/extension-image": "^2.1.12", + "@tiptap/extension-link": "^2.1.12", + "@tiptap/extension-list-item": "^2.1.12", + "@tiptap/extension-mention": "^2.1.12", + "@tiptap/extension-ordered-list": "^2.1.12", + "@tiptap/extension-paragraph": "^2.1.12", + "@tiptap/extension-strike": "^2.1.12", + "@tiptap/extension-underline": "^2.1.12", + "@tiptap/pm": "^2.1.12", + "@tiptap/starter-kit": "^2.1.12", + "@tiptap/suggestion": "^2.1.12", + "@tiptap/vue-3": "^2.1.12", + "@vue/apollo-composable": "^4.0.0-beta.11", + "@vueuse/core": "^10.6.1", + "@vueuse/router": "^10.6.1", + "@vueuse/shared": "^10.6.1", "async-mutex": "^0.4.0", "flatpickr": "^4.6.13", - "graphql": "^16.6.0", - "graphql-ruby-client": "^1.11.5", + "graphql": "^16.8.1", + "graphql-ruby-client": "^1.11.10", "graphql-tag": "^2.12.6", - "linkify-string": "^4.1.0", - "linkifyjs": "^4.1.0", + "linkify-string": "^4.1.2", + "linkifyjs": "^4.1.2", "lodash-es": "^4.17.21", "loglevel": "^1.8.1", - "mitt": "^3.0.0", - "pinia": "^2.0.30", + "mitt": "^3.0.1", + "pinia": "^2.1.7", "tippy.js": "^6.3.7", - "ua-parser-js": "^1.0.33", - "uuid": "^9.0.0", - "vue": "^3.2.47", + "tiptap-text-direction": "^0.3.0", + "ua-parser-js": "^1.0.37", + "uuid": "^9.0.1", + "vue": "^3.3.8", "vue-advanced-cropper": "^2.8.8", - "vue-easy-lightbox": "1.12.0", - "vue-router": "^4.1.6", + "vue-easy-lightbox": "1.16.0", + "vue-router": "^4.2.5", "vue3-draggable-resizable": "^1.6.5", "vuedraggable": "^4.1.0", - "workbox-core": "^6.5.4", - "workbox-precaching": "^6.5.4", - "workbox-window": "^6.5.4" + "workbox-core": "^7.0.0", + "workbox-precaching": "^7.0.0", + "workbox-window": "^7.0.0" }, "resolutions": { "loader-utils": "^3.2.1", - "postcss": "^8.4.21" + "postcss": "^8.4.31", + "stylelint-config-recommended": "^13.0.0" }, "name": "Zammad", - "version": "5.4.1" + "version": "6.2.0" } diff --git a/pkgs/applications/networking/misc/zammad/source.json b/pkgs/applications/networking/misc/zammad/source.json index f7b7280b468d2..636ce43a2ecc3 100644 --- a/pkgs/applications/networking/misc/zammad/source.json +++ b/pkgs/applications/networking/misc/zammad/source.json @@ -1,8 +1,8 @@ { "owner": "zammad", "repo": "zammad", - "rev": "643aba6ba4ba66c6127038c8cc2cc7a20b912678", - "hash": "sha256-vLLn989M5ZN+jTh60BopEKbuaxOBfDsk6PiM+gHFClo=", + "rev": "6c358ca90cf7f7581aede5c45d10ac3f2e25bc52", + "hash": "sha256-kZss5A5tgKnsANt34kk5J+824ghJoVIWXFNlb+ZkZ2Y=", "fetchSubmodules": true } diff --git a/pkgs/applications/networking/misc/zammad/update.sh b/pkgs/applications/networking/misc/zammad/update.sh index dd030f10f0e60..b97e75e4bd599 100755 --- a/pkgs/applications/networking/misc/zammad/update.sh +++ b/pkgs/applications/networking/misc/zammad/update.sh @@ -55,11 +55,6 @@ pushd $SOURCE_DIR echo ":: Creating gemset.nix" bundix --lockfile=./Gemfile.lock --gemfile=./Gemfile --gemset=$TARGET_DIR/gemset.nix -echo ":: Creating yarn.nix" -yarn install -cp yarn.lock $TARGET_DIR -yarn2nix > $TARGET_DIR/yarn.nix - # needed to avoid import from derivation jq --arg VERSION "$VERSION" '. += {name: "Zammad", version: $VERSION}' package.json > $TARGET_DIR/package.json diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 174fa5e9d9f57..e68e8f8fe96b9 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -40,6 +40,7 @@ let license = licenses.gpl3Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + mainProgram = "msmtp"; }; binaries = stdenv.mkDerivation { diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index bd09e6b8be9ab..2aa8add652b17 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -64,7 +64,7 @@ let systemd ]; - version = "2023.5"; + version = "2023.6"; selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -74,8 +74,8 @@ let }; hash = selectSystem { - x86_64-linux = "sha256-FpVruI80PmpBo2JrMvgvOg7ou6LceTeit9HbWKgcPa4="; - aarch64-linux = "sha256-NlYh8K5Xbad4xSoZ02yC5fh3SrQzyNyS9uoA73REcpo="; + x86_64-linux = "sha256-IhE93NXX8iwlvso+ei9wbVyJJLtkjrZf8qB43AZre+4="; + aarch64-linux = "sha256-HRAGDps0Cf7qOWTS7die9uouxMpAaM83t1Ixz7ElF6g="; }; in diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix index 80087822bf858..be8b2c5ac1849 100644 --- a/pkgs/applications/networking/nali/default.nix +++ b/pkgs/applications/networking/nali/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nali"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "zu1k"; repo = "nali"; rev = "v${version}"; - hash = "sha256-JIP0QX1okCfDj2Y6wZ5TaV3QH0WP3oU3JjaKK6vMfWY="; + hash = "sha256-5AI8TAKYFqjgLVKob9imrf7yVmXmAPq/zHh1bDfC5r0="; }; vendorHash = "sha256-wIp/ShUddz+RIcsEuKWUfxsV/wNB2X1jZtIltBZ0ROM="; diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 086c9325f565e..c2967e0f35887 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-LfvO95jqzJzB44JxzB00GubTKJkvK/NR42eGYipirbM="; + hash = "sha256-0KyBRIMXGqg4MdTyN3Kw1rVbZ7ULlfW6M9DSfAUQF8A="; }; - vendorHash = "sha256-BRgzPH7uiUHcouEw0KNpM5k0/kZMImvI9MFn4ahXIRM="; + vendorHash = "sha256-B9r+p9kL/8h5qGmJ2WChnU3qKFf9z76YFqn6M2dXsDg="; inherit subPackages; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 37932a3a4b2b7..63e84cba1d628 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,5 +1,5 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake , extra-cmake-modules @@ -21,11 +21,12 @@ , sphinx , sqlite , xdg-utils +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.10.1"; + version = "3.11.0"; outputs = [ "out" "dev" ]; @@ -33,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-PtWg9IMwZU0HG2pVHdRKgPQH8i2e72Fbs+q5wCwBsfo="; + hash = "sha256-rqSnCIsXQDf3cNQn4ofjGQkCgwYGyDau/WWUPHziNp4="; }; patches = [ @@ -55,6 +56,7 @@ mkDerivation rec { extra-cmake-modules librsvg sphinx + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index abc75b8bb73f1..b9a5dce35f6fe 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "ostinato"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "pstavirs"; repo = "ostinato"; rev = "v${version}"; - sha256 = "sha256-yhfhNfkiZulF0FxNT+3CeGqUTXLmwPQntl2TLdCcMTQ="; + sha256 = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo="; }; ostinatoIcon = fetchurl { diff --git a/pkgs/applications/networking/p2p/flood-for-transmission/default.nix b/pkgs/applications/networking/p2p/flood-for-transmission/default.nix new file mode 100644 index 0000000000000..1de4e05c6cfca --- /dev/null +++ b/pkgs/applications/networking/p2p/flood-for-transmission/default.nix @@ -0,0 +1,37 @@ +# To use this package, use: `services.transmission.webHome = pkgs.flood-for-transmission;` +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "flood-for-transmission"; + version = "2023-11-17T12-46-13"; + + src = fetchFromGitHub { + owner = "johman10"; + repo = pname; + rev = version; + hash = "sha256-TaLWhly/4hOigWY1XP7FmgN4LbrdLb79NQ47z5JiiYE="; + }; + + npmDepsHash = "sha256-PCeknfS81K8ttU4hV2D841tgQsGfIVaAOVIEDXe8fVQ="; + + npmInstallFlags = [ "--legacy-peer-deps" ]; + + installPhase = '' + runHook preInstall + + cp -r public $out + + runHook postInstall + ''; + + meta = with lib; { + description = "A Flood clone for Transmission"; + homepage = "https://github.com/johman10/flood-for-transmission"; + maintainers = with maintainers; [ al3xtjames ]; + license = licenses.gpl3Only; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 61d42989705f7..2119e80a93f4c 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -1,25 +1,25 @@ { lib , stdenv , fetchFromGitHub -, python3Packages +, python310Packages , testers , stig }: -python3Packages.buildPythonApplication rec { +python310Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig - version = "0.12.5a0"; + version = "0.12.8a0"; src = fetchFromGitHub { owner = "rndusr"; repo = "stig"; rev = "v${version}"; - sha256 = "sha256-e27DBzing38llFxPIsMGkZJXp2q7jjFlQdtfsqLXNHw="; + sha256 = "sha256-vfmuA6DqWvAygcS6N+qX1h+Ag+P4eOwm41DhAFZR3r8="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python310Packages; [ urwid urwidtrees aiohttp @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { setproctitle ]; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python310Packages; [ asynctest pytestCheckHook ]; @@ -41,16 +41,15 @@ python3Packages.buildPythonApplication rec { export LC_ALL=C ''; - pytestFlagsArray = [ - "tests" - # TestScrollBarWithScrollable.test_wrapping_bug fails - "--deselect=tests/tui_test/scroll_test.py::TestScrollBarWithScrollable::test_wrapping_bug" - # https://github.com/rndusr/stig/issues/214 - "--deselect=tests/completion_test/classes_test.py::TestCandidates::test_candidates_are_sorted_case_insensitively" - ] ++ lib.optionals stdenv.isDarwin [ - "--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second" - "--deselect=tests/client_test/aiotransmission_test/api_torrent_test.py" - "--deselect=tests/client_test/aiotransmission_test/rpc_test.py" + disabledTestPaths = [ + # Almost all tests fail in this file, it is reported upstream in: + # https://github.com/rndusr/stig/issues/214 , and upstream fails to + # reproduce the issue unfortunately. + "tests/client_test/aiotransmission_test/api_settings_test.py" + ]; + disabledTests = [ + # Another failure with similar circumstances to the above + "test_candidates_are_sorted_case_insensitively" ]; passthru.tests = testers.testVersion { diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 027564ae7a011..9e0a1d69ef215 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -35,18 +35,17 @@ , enableCli ? true , installLib ? false , apparmorRulesFromClosure -, extraAppArmorPaths ? [] }: stdenv.mkDerivation (finalAttrs: { pname = "transmission"; - version = "4.0.4"; + version = "4.0.5"; src = fetchFromGitHub { owner = "transmission"; repo = "transmission"; rev = finalAttrs.version; - hash = "sha256-Sz3+5VvfOgET1aiormEnBOrF+yN79tiSQvjLAoGqTLw="; + hash = "sha256-gd1LGAhMuSyC/19wxkoE2mqVozjGPfupIPGojKY0Hn4="; fetchSubmodules = true; }; @@ -136,7 +135,6 @@ stdenv.mkDerivation (finalAttrs: { rwk /tmp/tr_session_id_*, r $out/share/transmission/public_html/**, - ${lib.strings.concatMapStrings (x: "r ${x},\n") extraAppArmorPaths} include <local/bin.transmission-daemon> } diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 5bc1cb7264435..fc8377a4d113b 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchPypi , python3 , makeWrapper , libtorrent-rasterbar-1_2_x @@ -12,16 +13,19 @@ let in stdenv.mkDerivation rec { pname = "tribler"; - version = "7.11.0"; + version = "7.13.0"; src = fetchurl { - url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0ffh8chb47iaar8872gvalgm84fjzyxph16nixsxknnprqdxyrkx"; + url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-${version}.tar.xz"; + hash = "sha256-j9+Kq6dOqiJCTY3vuRWGnciuwACU7L0pl73l6nkDLN4="; }; nativeBuildInputs = [ python3.pkgs.wrapPython makeWrapper + # we had a "copy" of this in tribler's makeWrapper + # but it went out of date and broke, so please just use it directly + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -31,38 +35,49 @@ stdenv.mkDerivation rec { pythonPath = [ libtorrent ] ++ (with python3.pkgs; [ + # requirements-core.txt aiohttp aiohttp-apispec - asynctest + anyio chardet - cherrypy configobj cryptography decorator faker - feedparser libnacl lz4 - m2crypto + marshmallow netifaces networkx - pillow pony psutil pyasn1 - pycrypto - pyqt5 - pyqtgraph - pytest-asyncio - pytest-timeout + pydantic + pyopenssl pyyaml - requests sentry-sdk service-identity - twisted yappi - pydantic - anyio + yarl + bitarray + (pyipv8.overrideAttrs (p: rec { + version = "2.10.0"; + src = fetchPypi { + inherit (p) pname; + inherit version; + hash = "sha256-yxiXBxBiPokequm+vjsHIoG9kQnRnbsOx3mYOd8nmiU="; + }; + })) + libtorrent + file-read-backwards + brotli + human-readable + # requirements.txt + pillow + pyqt5 + #pyqt5-sip + pyqtgraph + pyqtwebengine ]); installPhase = '' @@ -71,8 +86,6 @@ stdenv.mkDerivation rec { wrapPythonPrograms cp -prvd ./* $out/ makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ - --set QT_PLUGIN_PATH "${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" \ --set _TRIBLERPATH "$out/src" \ --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \ --set NO_AT_BRIDGE 1 \ @@ -82,6 +95,8 @@ stdenv.mkDerivation rec { mkdir -p $out/share/applications $out/share/icons cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/ cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm + mkdir -p $out/share/copyright/tribler + mv $out/LICENSE $out/share/copyright/tribler ''; shellHook = '' @@ -95,7 +110,7 @@ stdenv.mkDerivation rec { description = "Decentralised P2P filesharing client based on the Bittorrent protocol"; homepage = "https://www.tribler.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ xvapx viric ]; + maintainers = with maintainers; [ xvapx viric mkg20001 ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 09662f4eb56b3..adb5a70647dce 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,13 +38,13 @@ let pname = "pcloud"; - version = "1.14.2"; - code = "XZAwMrVZidapyDxpd2pCNlGy3BcjdbYCf1Yk"; + version = "1.14.3"; + code = "XZ7IM70ZtWFon9pgEbk4XuvzJsTduQUyGFwV"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-5dTo0/R+RA+C0PKzaCmcSy7YwzT3Qlwq1xMw6wPJt28="; + hash = "sha256-huv1XXghWwh/oTtOsukffZP3nnHS2K5VcsuVs6CjFYc="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 85922fea6551e..dbbe7586074c3 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.6.1"; + version = "3.7.1"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-1Dkw30WW7bCf89I+HUAvkfmlBbl+TcOVmAfBIFnTExE="; + hash = "sha256-KuXXXvuQhRQ0xKaw7tNO6HgQP7PsdxylDouwDQDDSJU="; }; - vendorHash = "sha256-1mBcYVmVLTFVyYU9QuJz1JoR0wAIREC0cCQZbHMdgZU="; + vendorHash = "sha256-QUJD7ICxaUClK82mKumyQVoINfWXSD64UfhZ4pu5dGU="; nativeBuildInputs = [ pkg-config ]; @@ -37,6 +37,8 @@ buildGoModule rec { postInstall = '' mv $out/bin/Desktop-Bridge $out/bin/protonmail-bridge # The cli is named like that in other distro packages + install -Dm444 dist/proton-bridge.desktop -t $out/share/applications + install -Dm444 dist/bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg ''; meta = with lib; { diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 14844161d18e2..df0afdee4da4d 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -1,74 +1,103 @@ { lib , buildPythonApplication , fetchFromGitHub -, wrapGAppsHook -, gdk-pixbuf -, glib-networking , gobject-introspection -, imagemagick -, librsvg -, pango -, webkitgtk -# Python libs -, protonvpn-nm-lib -, psutil -# Optionals +, setuptools +, wrapGAppsHook +, dbus-python +, packaging +, proton-core +, proton-keyring-linux +, proton-keyring-linux-secretservice +, proton-vpn-api-core +, proton-vpn-connection +, proton-vpn-killswitch +, proton-vpn-killswitch-network-manager +, proton-vpn-logger +, proton-vpn-network-manager +, proton-vpn-network-manager-openvpn +, proton-vpn-session +, pycairo +, pygobject3 +, pytestCheckHook , withIndicator ? true -, libappindicator-gtk3 }: +, libappindicator-gtk3 +, libayatana-appindicator +}: buildPythonApplication rec { pname = "protonvpn-gui"; - version = "1.12.0"; + version = "4.1.0-unstable-2023-10-25"; + pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; - repo = "linux-app"; - rev = "refs/tags/${version}"; - sha256 = "sha256-MPS4d/yNkccsc/j85h7/4k4xL8uSCvhj/9JWPa7ezLY="; + repo = "proton-vpn-gtk-app"; + rev = "713324e9e4ee9f030c8115072cae379eb3340c42"; + hash = "sha256-DfuM4b2cSIA8j9Ux3TzInRCvzQGb9LvJDSwRhfadBPY="; }; nativeBuildInputs = [ - gdk-pixbuf + # Needed for the NM namespace gobject-introspection - imagemagick + setuptools wrapGAppsHook ]; + buildInputs = lib.optionals withIndicator [ + # Adds AppIndicator3 namespace + libappindicator-gtk3 + # Adds AyatanaAppIndicator3 namespace + libayatana-appindicator + ]; + propagatedBuildInputs = [ - glib-networking # needed for the login captcha - protonvpn-nm-lib - psutil + dbus-python + packaging + proton-core + proton-keyring-linux + proton-keyring-linux-secretservice + proton-vpn-api-core + proton-vpn-connection + proton-vpn-killswitch + proton-vpn-killswitch-network-manager + proton-vpn-logger + proton-vpn-network-manager + proton-vpn-network-manager-openvpn + proton-vpn-session + pycairo + pygobject3 ]; - buildInputs = [ - librsvg - pango - webkitgtk - ] ++ lib.optionals withIndicator [ libappindicator-gtk3 ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=proton --cov-report=html --cov-report=term" "" + ''; postInstall = '' - # Setting icons - for size in 16 32 48 64 72 96 128 192 512 1024; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -resize $size'x'$size \ - protonvpn_gui/assets/icons/protonvpn-logo.png \ - $out/share/icons/hicolor/$size'x'$size/apps/protonvpn.png - done + mkdir -p $out/share/{applications,pixmaps} + install -Dm 644 ${src}/rpmbuild/SOURCES/protonvpn-app.desktop $out/share/applications + install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; - install -Dm644 protonvpn.desktop -t $out/share/applications/ - substituteInPlace $out/share/applications/protonvpn.desktop \ - --replace 'protonvpn-logo' protonvpn + preCheck = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) ''; - # Project has a dummy test + # Gets a segmentation fault after the widgets test doCheck = false; meta = with lib; { - description = "Official ProtonVPN Linux app"; - homepage = "https://github.com/ProtonVPN/linux-app"; - maintainers = with maintainers; [ wolfangaukang ]; + description = "Proton VPN GTK app for Linux"; + homepage = "https://github.com/ProtonVPN/proton-vpn-gtk-app"; license = licenses.gpl3Plus; - mainProgram = "protonvpn"; platforms = platforms.linux; + mainProgram = "protonvpn-app"; + maintainers = with maintainers; [ wolfangaukang ]; }; } diff --git a/pkgs/applications/networking/protonvpn-gui/legacy.nix b/pkgs/applications/networking/protonvpn-gui/legacy.nix new file mode 100644 index 0000000000000..7464a279cf8a9 --- /dev/null +++ b/pkgs/applications/networking/protonvpn-gui/legacy.nix @@ -0,0 +1,79 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, setuptools +, wrapGAppsHook +, gdk-pixbuf +, glib-networking +, gobject-introspection +, imagemagick +, librsvg +, pango +, python3 +, webkitgtk +# Python libs +, protonvpn-nm-lib +, psutil +# Optionals +, withIndicator ? true +, libappindicator-gtk3 }: + +buildPythonApplication rec { + pname = "protonvpn-gui"; + version = "1.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "linux-app"; + rev = "refs/tags/${version}"; + sha256 = "sha256-MPS4d/yNkccsc/j85h7/4k4xL8uSCvhj/9JWPa7ezLY="; + }; + + nativeBuildInputs = [ + gdk-pixbuf + gobject-introspection + imagemagick + setuptools + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + glib-networking # needed for the login captcha + protonvpn-nm-lib + psutil + ]; + + buildInputs = [ + librsvg + pango + webkitgtk + ] ++ lib.optionals withIndicator [ libappindicator-gtk3 ]; + + postInstall = '' + # Setting icons + for size in 16 32 48 64 72 96 128 192 512 1024; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert -resize $size'x'$size \ + protonvpn_gui/assets/icons/protonvpn-logo.png \ + $out/share/icons/hicolor/$size'x'$size/apps/protonvpn.png + done + + install -Dm644 protonvpn.desktop -t $out/share/applications/ + chmod 644 $out/${python3.sitePackages}/protonvpn_gui/assets/icons/plus-server.png + substituteInPlace $out/share/applications/protonvpn.desktop \ + --replace 'protonvpn-logo' protonvpn + ''; + + # Project has a dummy test + doCheck = false; + + meta = with lib; { + description = "Official ProtonVPN Linux app"; + homepage = "https://github.com/ProtonVPN/linux-app"; + maintainers = with maintainers; [ wolfangaukang ]; + license = licenses.gpl3Plus; + mainProgram = "protonvpn"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/pyload-ng/default.nix b/pkgs/applications/networking/pyload-ng/default.nix index ebe4db46aba0a..4ead723f76e1d 100644 --- a/pkgs/applications/networking/pyload-ng/default.nix +++ b/pkgs/applications/networking/pyload-ng/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, python3 }: python3.pkgs.buildPythonApplication rec { - version = "0.5.0b3.dev72"; + version = "0.5.0b3.dev75"; pname = "pyload-ng"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pcbJc23Fylh/JoWRmbZmC8xUzUqh2ej6gT+B2w8DHFQ="; + hash = "sha256-1lPIKkZESonDaVCnac0iUu/gCqXVDBhNZrk5S0eC6F0="; }; postPatch = '' @@ -50,5 +50,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/pyload/pyload"; license = licenses.agpl3Plus; maintainers = with maintainers; [ ruby0b ]; + mainProgram = "pyload"; }; } diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 66b8f8d59bd8d..1f60abbcf970a 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,44 +1,22 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip -, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils +, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils, copyDesktopItems , pulseaudio }: let description = "Desktop sharing application, providing remote support and online meetings"; - - desktopItem = makeDesktopItem { - name = "AnyDesk"; - exec = "@out@/bin/anydesk %u"; - icon = "anydesk"; - desktopName = "AnyDesk"; - genericName = description; - categories = [ "Network" ]; - startupNotify = false; - }; - in stdenv.mkDerivation rec { pname = "anydesk"; 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" + "https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/generic-linux/anydesk-${version}-amd64.tar.gz" ]; hash = "sha256-seMzfTXOGa+TljgpmIsgFOis+79r0bWt+4vH3Nb+5FI="; }; - passthru = { - updateScript = genericUpdater { - versionLister = writeShellScript "anydesk-versionLister" '' - curl -s https://anydesk.com/en/downloads/linux \ - | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \ - | uniq \ - | sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g' - ''; - }; - }; - buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango gnome2.gtkglext libGLU libGL minizip freetype @@ -48,7 +26,19 @@ in stdenv.mkDerivation rec { libXrandr libXtst libXt libICE libSM libXrender ]); - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + + desktopItems = [ + (makeDesktopItem { + name = "AnyDesk"; + exec = "${placeholder "out"}/bin/anydesk %u"; + icon = "anydesk"; + desktopName = "AnyDesk"; + genericName = description; + categories = [ "Network" ]; + startupNotify = false; + }) + ]; installPhase = '' runHook preInstall @@ -57,7 +47,6 @@ in stdenv.mkDerivation rec { install -m755 anydesk $out/bin/anydesk cp copyright README $out/share/doc/anydesk cp -r icons/hicolor/* $out/share/icons/hicolor/ - cp ${desktopItem}/share/applications/*.desktop $out/share/applications runHook postInstall ''; @@ -75,11 +64,19 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/anydesk \ --prefix PATH : ${lib.makeBinPath [ lsb-release pciutils ]} - - substituteInPlace $out/share/applications/*.desktop \ - --subst-var out ''; + passthru = { + updateScript = genericUpdater { + versionLister = writeShellScript "anydesk-versionLister" '' + curl -s https://anydesk.com/en/downloads/linux \ + | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \ + | uniq \ + | sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g' + ''; + }; + }; + meta = with lib; { inherit description; homepage = "https://www.anydesk.com"; diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index c73789ddeb7b1..f6004c2a3faee 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -5,7 +5,6 @@ let inherit (callPackage ./sources.nix { }) supportedVersions unsupportedVersions; - mkCitrix = callPackage ./generic.nix { }; toAttrName = x: "citrix_workspace_${builtins.replaceStrings [ "." ] [ "_" ] x}"; diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index f1b1a83102acb..3d93911685140 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -44,6 +44,17 @@ let x86hash = "95436fb289602cf31c65b7df89da145fc170233cb2e758a2f11116f15b57d382"; x64suffix = "24"; x86suffix = "24"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest9.html"; + }; + + "23.11.0" = { + major = "23"; + minor = "11"; + patch = "0"; + x64hash = "d3dde64baa6db7675a025eff546d552544d3523f4f3047621884f7830a9e2822"; + x86hash = "65b8c144e51b5bd78b98ae69e0fa76d6c020a857d74fd5254be49492527072b6"; + x64suffix = "82"; + x86suffix = "82"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6d3d6610cf918..0fd2de49dac3e 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -6,6 +6,7 @@ , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz +, wayland # The themes here are soft dependencies; only icons are missing without them. , gnome , withKf5Wallet ? stdenv.isLinux, libsForQt5 @@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium harfbuzz python3 + wayland ] ++ lib.optionals stdenv.isLinux [ libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ] ++ lib.optionals withLibsecret [ libsecret ] ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] @@ -81,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; homepage = "https://gitlab.com/Remmina/Remmina"; description = "Remote desktop client written in GTK"; + mainProgram = "remmina"; maintainers = with maintainers; [ bbigras melsigl ryantm ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index cb7d99b047996..e95bd9bc03afb 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -41,6 +41,15 @@ buildGoModule rec { IOKit ]; + postInstall = '' + for res in $(ls internal/assets/icons | sed -e 's/icon-//g' -e 's/.png//g'); do + install -Dm444 internal/assets/icons/icon-$res.png \ + $out/share/icons/hicolor/''${res}x''${res}/apps/io.github.jacalz.rymdport.png + done + install -Dm444 internal/assets/svg/icon.svg $out/share/icons/hicolor/scalable/apps/io.github.jacalz.rymdport.svg + install -Dm444 internal/assets/unix/io.github.jacalz.rymdport.desktop -t $out/share/applications + ''; + meta = { description = "Easy encrypted file, folder, and text sharing between devices"; homepage = "https://github.com/Jacalz/rymdport"; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index bc722b91fa029..e698f78c3e72c 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.13.4"; + version = "0.13.6"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-oUgxYVnSPlUxQW3egZuzGad1IduvG9pvgFiR9jmljQU="; + hash = "sha256-jdZNfNdykkpuIzA0TXEXkH21HTJzhndyRlMj3Kt7WlM="; }; modRoot = "./agent"; - vendorHash = "sha256-SNQuw9RRWuRndUwUiXwGs95CrXRrk72Gey5h1rtwWeo="; + vendorHash = "sha256-Dg9TL/B9KgYGA0lILxVt+kXy5kfnW2sYJuP0lc+CROM="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index f874db1e98d82..4008c5121c9e1 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, autoreconfHook , binutils , elfutils , fetchurl @@ -20,7 +21,7 @@ , python3 , sqlite , withNetworkManager ? false -, withPython ? true +, withPython ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , withSensors ? false , zlib }: @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile.in \ --replace "-m 4550" "" + substituteInPlace configure.ac \ + --replace "pkg-config" "$PKG_CONFIG" ''; postConfigure = '' @@ -47,10 +50,21 @@ stdenv.mkDerivation rec { -i Makefile ''; + strictDeps = true; + nativeBuildInputs = [ + autoreconfHook pkg-config + protobuf + protobufc ] ++ lib.optionals withPython [ - python3 + (python3.withPackages (ps: [ + ps.numpy + ps.protobuf + ps.pyserial + ps.setuptools + ps.websockets + ])) ]; buildInputs = [ @@ -75,17 +89,6 @@ stdenv.mkDerivation rec { lm_sensors ]; - propagatedBuildInputs = [ - ] ++ lib.optionals withPython [ - (python3.withPackages (ps: [ - ps.numpy - ps.protobuf - ps.pyserial - ps.setuptools - ps.websockets - ])) - ]; - configureFlags = [ "--disable-wifi-coconut" # Until https://github.com/kismetwireless/kismet/issues/478 ] ++ lib.optionals (!withNetworkManager) [ diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 36084ae3acda7..1e27a01fa5e6d 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -12,23 +12,15 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gFba2wOU4GwpOZTo5A2QpBgnC6OgDJEeyaPGHbA+7tA="; + sha256 = "sha256-9ccp5Pxhs7jOQuWHCmU9yvzLKeOAN8lEaieCIvnXJRA="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-36192.patch"; - url = "https://github.com/irontec/sngrep/commit/ad1daf15c8387bfbb48097c25197bf330d2d98fc.patch"; - hash = "sha256-g8fxvxi3d7jmZEKTbxqw29hJbm/ShsKKxstsOUGxTug="; - }) - ]; - nativeBuildInputs = [ autoconf automake diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/applications/networking/sniffnet/default.nix index b3cb5316ec0c8..6142aa3898e2a 100644 --- a/pkgs/applications/networking/sniffnet/default.nix +++ b/pkgs/applications/networking/sniffnet/default.nix @@ -50,6 +50,16 @@ rustPlatform.buildRustPackage rec { "--skip=secondary_threads::check_updates::tests::fetch_latest_release_from_github" ]; + postInstall = '' + for res in $(ls resources/packaging/linux/graphics | sed -e 's/sniffnet_//g' -e 's/x.*//g'); do + install -Dm444 resources/packaging/linux/graphics/sniffnet_''${res}x''${res}.png \ + $out/share/icons/hicolor/''${res}x''${res}/apps/sniffnet.png + done + install -Dm444 resources/packaging/linux/sniffnet.desktop -t $out/share/applications + substituteInPlace $out/share/applications/sniffnet.desktop \ + --replace 'Exec=/usr/bin/sniffnet' 'Exec=sniffnet' + ''; + postFixup = lib.optionalString stdenv.isLinux '' patchelf $out/bin/sniffnet \ --add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 ]} diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 10bc3ca686371..5245030fd7f35 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -71,5 +71,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ viric ]; platforms = platforms.unix; + mainProgram = "unison"; }; }) diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index 7424a3da049a3..f6eb3a326cbda 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/pkgs/applications/networking/sync/wdt/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2023-07-11"; + version = "unstable-2023-12-01"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "3b52ef573129fb799319630bd438717761111f57"; - sha256 = "sha256-TwHWeTVzUo42t1erD7lMT4vdXiV3/9Hy1sPnrvJpQE8="; + rev = "66f17af009ef6eaf2707bb8bb511ba6bcf3d9bbe"; + sha256 = "sha256-ucnFcpH9Duru35kRT769zMX2BMqufZJopd2srKPJkrU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/taler/default.nix b/pkgs/applications/networking/taler/default.nix index 6ba4bac67fcb8..474247d24b14c 100644 --- a/pkgs/applications/networking/taler/default.nix +++ b/pkgs/applications/networking/taler/default.nix @@ -9,22 +9,25 @@ let taler-wallet-core = fetchgit { url = "https://git.taler.net/wallet-core.git"; rev = "v${version}"; - sha256 = "sha256-uwbgIzSjLN+KQCY134VfnCuBEtvCO3a6mEw++HoZDHs="; + sha256 = "sha256-oL8vi8gxPjKxRpioMs0GLvkzlTkrm1kyvhsXOgrtvVQ="; }; -in rec { - taler-exchange = stdenv.mkDerivation rec { + + taler-exchange = stdenv.mkDerivation { pname = "taler-exchange"; inherit version; src = fetchgit { url = "https://git.taler.net/exchange.git"; rev = "v${version}"; - # REMOVEME: this should only be a problem for specifically v0.9.3 - # When fetching submodules without deep clone we get the following error: - # "Server does not allow request for unadvertised object" - deepClone = true; fetchSubmodules = true; - sha256 = "sha256-txWwW5vqTblNgVIXdDkpNNZOXpY0udMaz4Wog1GobzE="; + sha256 = "sha256-NgDZF6LNeJI4ZuXEwoRdFG6g0S9xNTVhszzlfAnzVOs="; + + # When fetching submodules without the .git folder we get the following error: + # "Server does not allow request for unadvertised object" + leaveDotGit = true; + postFetch = '' + rm -rf $out/.git + ''; }; nativeBuildInputs = [ @@ -76,7 +79,7 @@ in rec { }; }; - taler-merchant = stdenv.mkDerivation rec { + taler-merchant = stdenv.mkDerivation { pname = "taler-merchant"; inherit version; @@ -133,4 +136,6 @@ in rec { platforms = platforms.linux; }; }; +in { + inherit taler-exchange taler-merchant; } diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index b39b102c2f2f4..54e688c2e770d 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/pkgs/applications/networking/warp/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "warp"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = "v${version}"; - hash = "sha256-Uc9N2kRTpi9cCFskngkiclLpEcp4dtI2mhldG4s/GFY="; + hash = "sha256-pntHIY0cScDKhWR6kXp6YrEbBQiQjUId3MrJzy5l+K8="; }; postPatch = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-GN9TjsGBU3D/mc6/XtRAk5pliKRPTQ9f3fMdS6weCaE="; + hash = "sha256-Go/a7aVHF1Yt3yIccKJIVeFy5rckXhSKfd13hdhlLUQ="; }; nativeBuildInputs = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast and secure file transfer"; - homepage = "https://apps.gnome.org/app/app.drey.Warp"; + homepage = "https://apps.gnome.org/Warp/"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ]; platforms = lib.platforms.all; diff --git a/pkgs/applications/networking/wgcf/default.nix b/pkgs/applications/networking/wgcf/default.nix index a975f1c26cefc..a6f728c1bf37c 100644 --- a/pkgs/applications/networking/wgcf/default.nix +++ b/pkgs/applications/networking/wgcf/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "wgcf"; - version = "2.2.19"; + version = "2.2.20"; src = fetchFromGitHub { owner = "ViRb3"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wEBPaqqpiQdFohlzpVDVMwYq8+NjSQrh58yWl/W+n8M="; + hash = "sha256-k4oOejJiVZk9s4niG/r0mSoI363uuQh3C9OWVweELWc="; }; subPackages = "."; - vendorHash = "sha256-i1CM0rG2DmgYMa+Na0In4fVJSGZlMTRajjLEZUvrmE8="; + vendorHash = "sha256-U1VHbD2l5C5ws7Mt5a7PmtHQkZJ6hzDU1TyiEFqMYEM="; meta = with lib; { description = "Cross-platform, unofficial CLI for Cloudflare Warp"; diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index cd640e89bf876..947c9946e5d3f 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -90,5 +90,6 @@ stdenv.mkDerivation rec { license = with licenses; [ agpl3 gpl3Plus ]; platforms = platforms.all; maintainers = with maintainers; [ pacien dotlambda ]; + mainProgram = "beamerpresenter"; }; } diff --git a/pkgs/applications/office/calligra/qt5_11.patch b/pkgs/applications/office/calligra/qt5_11.patch deleted file mode 100644 index 66ff8c6eedcd5..0000000000000 --- a/pkgs/applications/office/calligra/qt5_11.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp -index 0ffdcf6..cdca006 100644 ---- a/libs/widgets/KoCsvImportDialog.cpp -+++ b/libs/widgets/KoCsvImportDialog.cpp -@@ -21,6 +21,7 @@ - #include "KoCsvImportDialog.h" - - // Qt -+#include <QButtonGroup> - #include <QTextCodec> - #include <QTextStream> - -diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp -index f91555c..a3816f9 100644 ---- a/libs/widgets/KoPageLayoutWidget.cpp -+++ b/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include <KoUnit.h> - -+#include <QButtonGroup> -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: -diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp -index c0d5136..d2a772e 100644 ---- a/plugins/chartshape/dialogs/TableEditorDialog.cpp -+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp -@@ -24,6 +24,7 @@ - - // Qt - #include <QAbstractItemModel> -+#include <QAction> - - // Calligra - #include <KoIcon.h> -diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp -index ed10919..8f52177 100644 ---- a/plugins/formulashape/FormulaToolWidget.cpp -+++ b/plugins/formulashape/FormulaToolWidget.cpp -@@ -30,6 +30,7 @@ - #include <QWidgetAction> - #include <QTableWidget> - #include <QAction> -+#include <QHeaderView> - #include <QMenu> - - FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) -diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp -index a0a9832..7d7db53 100644 ---- a/sheets/dialogs/LayoutDialog.cpp -+++ b/sheets/dialogs/LayoutDialog.cpp -@@ -36,6 +36,7 @@ - #include <math.h> - - #include <QIntValidator> -+#include <QButtonGroup> - #include <QCheckBox> - #include <QFrame> - #include <QLabel> -diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp -index d64208c..bfddb3a 100644 ---- a/words/part/dialogs/KWAnchoringProperties.cpp -+++ b/words/part/dialogs/KWAnchoringProperties.cpp -@@ -35,6 +35,7 @@ - - #include <kundo2command.h> - -+#include <QButtonGroup> - #include <QComboBox> - - const int KWAnchoringProperties::vertRels[4][20] = { -diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp -index e38599a..7e8b2d5 100644 ---- a/words/part/dialogs/KWRunAroundProperties.cpp -+++ b/words/part/dialogs/KWRunAroundProperties.cpp -@@ -28,6 +28,8 @@ - - #include <kundo2command.h> - -+#include <QButtonGroup> -+ - KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) - : m_state(state) - { -diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp -index ae743da..3007f91 100644 ---- a/stage/part/KPrPresentationTool.cpp -+++ b/stage/part/KPrPresentationTool.cpp -@@ -32,6 +32,7 @@ - #include <QDesktopServices> - #include <QUrl> - #include <QDBusConnection> -+#include <QFrame> - - #include <KoShape.h> - #include <KoShapeManager.h> diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 180e0f96aeb91..d4d0290277e11 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -1,4 +1,5 @@ { lib +, coreutils , fetchFromGitHub , rustPlatform , pkg-config @@ -106,7 +107,9 @@ rustPlatform.buildRustPackage rec { ]; postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace scripts/create_bundle.sh --replace target/mac/ $out/Applications/ + substituteInPlace scripts/create_bundle.sh \ + --replace target/mac/ $out/Applications/ \ + --replace /bin/echo ${coreutils}/bin/echo patchShebangs scripts/create_bundle.sh substituteInPlace espanso/src/res/macos/Info.plist \ --replace "<string>espanso</string>" "<string>${placeholder "out"}/Applications/Espanso.app/Contents/MacOS/espanso</string>" @@ -117,6 +120,11 @@ rustPlatform.buildRustPackage rec { --replace '"/usr/local/bin/espanso"' '"${placeholder "out"}/bin/espanso"' ''; + env = lib.optionalAttrs stdenv.cc.isClang { + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + # Some tests require networking doCheck = false; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 2e869daff5323..714feb8ab495e 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.2"; + version = "1.26.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-+rMuVfe6BDAcZgJkBb18YLFZirOBfad6WGbWtAT21uI="; + hash = "sha256-HjMcNZ+VV5PdTIW3q6Ja/gFIZl6xXDxk0pUCyIX4dPM="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 653eaf63f84c0..4a3272a4e5991 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-Mx1++I2Q8/NMpmEPfxjonpNUQ7GLCRqH2blL11Vjme8="; + hash = "sha256-ad8XKlmazWZim/mLNmnsFSy5Oni7yv3HQxYX3SXzXcU="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e49f4be07b2f8..9f4390621d10e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -415,7 +415,7 @@ in stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; configureFlags = [ - (lib.optionalString (!withHelp) "--without-help") + (lib.withFeature withHelp "help") "--with-boost=${getDev boost}" "--with-boost-libdir=${getLib boost}/lib" "--with-beanshell-jar=${bsh}" diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 31816fc203fa4..1e92978fb0cc1 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , buildNpmPackage , nixosTests , gettext @@ -17,16 +16,18 @@ , poppler_utils , liberation_ttf , xcbuild +, pango +, pkg-config }: let - version = "2.0.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-qSX+r99y7a/eITfaC/UYqSgcxx/xYOqJ4tY/iuvoeNA="; + hash = "sha256-jD0dRgU/9gtNZUuTV+zkjqWb8gBnvD/AOTPucdaVKwE="; }; python = python3; @@ -47,17 +48,22 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-uDaZ7j7IDgKy7wCWND2xzR1qHwUtdyjR4eyIAVy01dM="; + postPatch = '' + cd src-ui + ''; + + npmDepsHash = "sha256-K7wTYGGwEhPoXdRD+4swhSlMH0iem6YkF0tjnVHh7K8="; nativeBuildInputs = [ + pkg-config python3 ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; - postPatch = '' - cd src-ui - ''; + buildInputs = [ + pango + ]; CYPRESS_INSTALL_BINARY = "0"; NG_CLI_ANALYTICS = "false"; @@ -224,16 +230,18 @@ python.pkgs.buildPythonApplication rec { ${python.pythonOnBuildForHost.interpreter} src/manage.py compilemessages ''; - installPhase = '' + installPhase = let + pythonPath = python.pkgs.makePythonPath propagatedBuildInputs; + in '' mkdir -p $out/lib/paperless-ngx cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx ln -s ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/ chmod +x $out/lib/paperless-ngx/src/manage.py makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ - --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PYTHONPATH : "${pythonPath}" \ --prefix PATH : "${path}" makeWrapper ${python.pkgs.celery}/bin/celery $out/bin/celery \ - --prefix PYTHONPATH : "$PYTHONPATH:$out/lib/paperless-ngx/src" \ + --prefix PYTHONPATH : "${pythonPath}:$out/lib/paperless-ngx/src" \ --prefix PATH : "${path}" ''; @@ -271,10 +279,6 @@ python.pkgs.buildPythonApplication rec { # Disable unneeded code coverage test substituteInPlace src/setup.cfg \ --replace "--cov --cov-report=html --cov-report=xml" "" - # OCR on NixOS recognizes the space in the picture, upstream CI doesn't. - # See https://github.com/paperless-ngx/paperless-ngx/pull/2216 - substituteInPlace src/paperless_tesseract/tests/test_parser.py \ - --replace "this is awebp document" "this is a webp document" ''; disabledTests = [ diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index e4cca46bbd636..401dc150b27d6 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -16,6 +16,7 @@ , libgee , libical , libportal-gtk4 +, libsoup_3 , pantheon , sqlite , webkitgtk_6_0 @@ -23,16 +24,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.1.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; - # The commit is named as "Release 4.1.1", published to Flathub, but not tags - # https://github.com/flathub/io.github.alainm23.planify/commit/2a353ccfcf3379add6778d569f49da37f40accfa - # https://github.com/alainm23/planify/issues/1002 - rev = "adf3629bcacfc9978f6dde5b87eff0278533ab3e"; - hash = "sha256-xqklvSYmqBQ+IQ3lRjMbV4W4vD/rLCln7rBVCbYiBGo="; + rev = version; + hash = "sha256-i+Up92Gl3FjgQ4GpcZruvYD//TPNWktSuWXGgDTwbWw="; }; nativeBuildInputs = [ @@ -54,11 +52,16 @@ stdenv.mkDerivation rec { libgee libical libportal-gtk4 + libsoup_3 pantheon.granite7 sqlite webkitgtk_6_0 ]; + mesonFlags = [ + "-Dprofile=default" + ]; + meta = with lib; { description = "Task manager with Todoist support designed for GNU/Linux"; homepage = "https://github.com/alainm23/planify"; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 51957037cc2be..8dbcd13f1c99d 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "planner"; - version = "0.14.91"; + version = "0.14.92"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "planner"; rev = version; - hash = "sha256-LxctZv/CKolJ1I4Hql20E+/+p+ZoJLR1eZe34HPMqvY="; + hash = "sha256-2LmNeyZURVtA52Vosyn44wT8zSaJn8tR+8sPM9atAwM="; }; postPatch = '' diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index e507692d622eb..db85a0f579ac7 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.65.6"; + version = "0.66.2"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-sI2DqhR9LmXxjkkMTDiMG/f/QXcBVPmEjbHFsmEP8qE="; + hash = "sha256-jUakjgprf561OVwBW25+/+q+r2CZ6H1iDM3n6w54IfI="; }; nativeBuildInputs = [ @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = "https://www.portfolio-performance.info/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.epl10; - maintainers = with maintainers; [ elohmeier oyren shawn8901 ]; + maintainers = with maintainers; [ elohmeier kilianar oyren shawn8901 ]; mainProgram = "portfolio"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 1303afb9d66d6..e7f8cd804460e 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.11.1"; + version = "23.12.5"; 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-rsYB8aLVVpGGbiEDWCpGCPdZEsOajoGfoh6YYxilxpg="; + hash = "sha256-nPlaKbtG6ncHI9I/qHUFRtc98lWkz7C/VXFX/JkXhDo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/ticktick/default.nix b/pkgs/applications/office/ticktick/default.nix index c236ba45056b3..a3b333d1698c3 100644 --- a/pkgs/applications/office/ticktick/default.nix +++ b/pkgs/applications/office/ticktick/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ticktick"; - version = "1.0.80"; + version = "2.0.0"; src = fetchurl { url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb"; - hash = "sha256-EK+8NFEim2gcFj9t6AGYdGVlyFj9Yq7NaOia3XKy3cc="; + hash = "sha256-LOllYdte+Y+pbjXI2zOQrwptmUo4Ck6OyYoEX6suY08="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 824a20a31329a..8dec32cfc6c0b 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -10,7 +10,7 @@ let src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "sha256-RmWRNKy2w3BM/ipQyFpkNC3+XXsJXjN6VYWNo8OKpy0="; + hash = "sha256-kacJSlctE1bNAByH26Qpu609ZNbdkYTx6OUEgCmefqg="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 87c0183e7e3de..d336b9cd5ba54 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { version = "11.1.0.11711"; src = if useChineseVersion then fetchurl { - url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitString "." version)}/wps-office_${version}_amd64.deb"; + url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitVersion version)}/wps-office_${version}_amd64.deb"; hash = "sha256-JHSTZZnOZoTpj8zF4C5PmjTkftEdxbeaqweY3ITiJto="; } else fetchurl { - url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitString "." version)}/wps-office_${version}.XA_amd64.deb"; + url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitVersion version)}/wps-office_${version}.XA_amd64.deb"; hash = "sha256-2apkSE/8Wm6/OQ4x5n1PE1emhovqOgD0NVTY5QZZTYA="; }; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 32e42a8b944ff..a23d7d3d8849f 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { description = "Collect, organize, cite, and share your research sources"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ i077 ]; }; } diff --git a/pkgs/applications/office/zotero/zotero_7.nix b/pkgs/applications/office/zotero/zotero_7.nix new file mode 100644 index 0000000000000..941581d22df02 --- /dev/null +++ b/pkgs/applications/office/zotero/zotero_7.nix @@ -0,0 +1,150 @@ +{ lib +, stdenv +, fetchurl +, wrapGAppsHook +, autoPatchelfHook +, makeDesktopItem +, atk +, cairo +, coreutils +, curl +, cups +, dbus-glib +, dbus +, dconf +, fontconfig +, freetype +, gdk-pixbuf +, glib +, glibc +, gtk3 +, libX11 +, libXScrnSaver +, libxcb +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXinerama +, libXrender +, libXt +, libnotify +, gnome +, libGLU +, libGL +, nspr +, nss +, pango +, gsettings-desktop-schemas +, alsa-lib +, libXtst +}: + +stdenv.mkDerivation rec { + pname = "zotero"; + version = "7.0.0-beta"; + + src = fetchurl { + url = "https://download.zotero.org/client/beta/${version}.51%2B7c5600913/Zotero-${version}.51%2B7c5600913_linux-x86_64.tar.bz2"; + hash = "sha256-zJ+jG7zlvWq+WEYOPyMIhqHPfsUe9tn0cbRyibQ7bFw="; + }; + + nativeBuildInputs = [ + wrapGAppsHook + autoPatchelfHook + ]; + buildInputs = [ + gsettings-desktop-schemas + glib + gtk3 + gnome.adwaita-icon-theme + dconf + libXtst + alsa-lib + stdenv.cc.cc + atk + cairo + curl + cups + dbus-glib + dbus + fontconfig + freetype + gdk-pixbuf + glib + glibc + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libxcb + libXdamage + libXext + libXfixes + libXi + libXinerama + libXrender + libXt + libnotify + libGLU + libGL + nspr + nss + pango + ]; + + dontConfigure = true; + dontBuild = true; + dontStrip = true; + + + desktopItem = makeDesktopItem { + name = "zotero"; + exec = "zotero -url %U"; + icon = "zotero"; + comment = meta.description; + desktopName = "Zotero"; + genericName = "Reference Management"; + categories = [ "Office" "Database" ]; + startupNotify = true; + mimeTypes = [ "x-scheme-handler/zotero" "text/plain" ]; + }; + + + installPhase = '' + runHook preInstall + + mkdir -p "$prefix/usr/lib/zotero-bin-${version}" + cp -r * "$prefix/usr/lib/zotero-bin-${version}" + mkdir -p "$out/bin" + ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/" + + # install desktop file and icons. + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications/ + for size in 16 32 48 256; do + install -Dm444 chrome/icons/default/default$size.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png + done + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ coreutils ]} + ) + ''; + + meta = with lib; { + homepage = "https://www.zotero.org"; + description = "Collect, organize, cite, and share your research sources"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.agpl3Only; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/applications/radio/abracadabra/default.nix index 4c71a6a38a43e..417ca2bc3f428 100644 --- a/pkgs/applications/radio/abracadabra/default.nix +++ b/pkgs/applications/radio/abracadabra/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.2.4"; + version = "2.3.4"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - sha256 = "sha256-gpZ6ckV//fhDlpAqmMwL4XNXX7xFmGi58fkOC4oRcDM="; + hash = "sha256-giQJ6lOD5TaOa98e7nXf6/HHxP6/TxD9Pgr7xAxvZzs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/applications/radio/flex-ncat/default.nix index 5425c6b73ac8e..96912b95d1838 100644 --- a/pkgs/applications/radio/flex-ncat/default.nix +++ b/pkgs/applications/radio/flex-ncat/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flex-ncat"; - version = "0.2-20230126.0"; + version = "0.4-20231210.1"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nCAT"; rev = "v${version}"; - hash = "sha256-2taQQVTgAFyqtS06zZ+4Qmr/JIqU6mxNQYvxt+L/Mtc="; + hash = "sha256-oC7TPq+Xsl960B7qJP81cWF+GGc28Miv4L8+1vWo7jA="; }; - vendorHash = "sha256-Tv6sbfWNOHYwA7v1SpNeM9aHs+3DSFv4V4qxllxrzJc="; + vendorHash = "sha256-1i9v8Ej7TMIO+aMYFPFxdfD4b5j84/zkegaYb67WokU="; meta = with lib; { homepage = "https://github.com/kc2g-flex-tools/nCAT"; diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index a337470664af6..245e29fdb58a2 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-uCWdDmHzNx1vkZFttQZLD4YfXoXz5VZQfir9sGOoDhw="; + hash = "sha256-2TqlBlbMhBqe8WqoyYLJ9B82sAy3MdoaYvvk+XB5CdQ="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 4d10851b7e13a..62ee880ce2be2 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: (shared // { ''; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 - ./modtool-newmod-permissions.patch + ./modtool-newmod-permissions.3_9.patch ]; passthru = shared.passthru // { # Deps that are potentially overridden and are used inside GR plugins - the same version must diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index d1f0a3fd6fb66..7765b92c1d269 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -45,11 +45,11 @@ # If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" -, version ? "3.10.7.0" +, version ? "3.10.8.0" }: let - sourceSha256 = "sha256-7fIQMcx90wI4mAZmR26/rkBKPKhNxgu3oWpJTV3C+Ek="; + sourceSha256 = "sha256-4BoJciL3ffd9Dgk3HxXCOOwnGHqCEVuo+a1AtzJG4IY="; featuresInfo = { # Needed always basic = { @@ -291,12 +291,6 @@ stdenv.mkDerivation (finalAttrs: (shared // { patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch - # https://github.com/gnuradio/gnuradio/pull/6808 - (fetchpatch { - name = "gnuradio-fmt10.1.patch"; - url = "https://github.com/gnuradio/gnuradio/commit/9357c17721a27cc0aae3fe809af140c84e492f37.patch"; - hash = "sha256-w3b22PTqoORyYQ3RKRG+2htQWbITzQiOdSDyuejUtHQ="; - }) ]; passthru = shared.passthru // { # Deps that are potentially overridden and are used inside GR plugins - the same version must diff --git a/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch new file mode 100644 index 0000000000000..7cab73fede0cc --- /dev/null +++ b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch @@ -0,0 +1,15 @@ +diff --git c/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py +index babebfcde..9a02f663e 100644 +--- c/gr-utils/modtool/core/newmod.py ++++ w/gr-utils/modtool/core/newmod.py +@@ -62,7 +62,9 @@ class ModToolNewModule(ModTool): + self._setup_scm(mode='new') + logger.info(f"Creating out-of-tree module in {self.dir}...") + try: +- shutil.copytree(self.srcdir, self.dir) ++ # https://stackoverflow.com/a/17022146/4935114 ++ shutil.copystat = lambda x, y: x ++ shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile) + try: + shutil.copyfile(os.path.join(gr.prefix(), 'share', 'gnuradio', 'clang-format.conf'), + os.path.join(self.dir, '.clang-format')) diff --git a/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch index 7cab73fede0cc..671a7559f4e4a 100644 --- a/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch +++ b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.patch @@ -1,8 +1,8 @@ -diff --git c/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py -index babebfcde..9a02f663e 100644 ---- c/gr-utils/modtool/core/newmod.py +diff --git i/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py +index 8b222473f..c82fcd538 100644 +--- i/gr-utils/modtool/core/newmod.py +++ w/gr-utils/modtool/core/newmod.py -@@ -62,7 +62,9 @@ class ModToolNewModule(ModTool): +@@ -66,7 +66,9 @@ class ModToolNewModule(ModTool): self._setup_scm(mode='new') logger.info(f"Creating out-of-tree module in {self.dir}...") try: @@ -10,6 +10,6 @@ index babebfcde..9a02f663e 100644 + # https://stackoverflow.com/a/17022146/4935114 + shutil.copystat = lambda x, y: x + shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile) - try: - shutil.copyfile(os.path.join(gr.prefix(), 'share', 'gnuradio', 'clang-format.conf'), - os.path.join(self.dir, '.clang-format')) + source_dir = os.path.join(gr.prefix(), "share", "gnuradio") + for source_name, target_name in ( + ("clang-format.conf", ".clang-format"), diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix index d3a6d104dc26a..c961e1bd2d499 100644 --- a/pkgs/applications/radio/gridtracker/default.nix +++ b/pkgs/applications/radio/gridtracker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gridtracker"; - version = "1.23.1202"; + version = "1.23.1207"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker"; rev = "v${version}"; - sha256 = "sha256-XrHA+h6qAYyZjp/C7+oS3eAvX0ptD+T4UKFzM2ROBCw="; + sha256 = "sha256-r7H+fds8FbSLDxPQqn0XUPC6loLgsaNX+DBqJJ96/d4="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/radio/pat/default.nix b/pkgs/applications/radio/pat/default.nix index 991df60b24bca..bddb3b986a33c 100644 --- a/pkgs/applications/radio/pat/default.nix +++ b/pkgs/applications/radio/pat/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pat"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "la5nta"; repo = "pat"; rev = "v${version}"; - hash = "sha256-ydv7RQ6MJ+ifWr+babdsDRnaS7DSAU+jiFJkQszy/Ro="; + hash = "sha256-wNWqqGc4mf3z0ejMpU+jWhqCbjNJ2b6+pbBjDYKwKK8="; }; - vendorHash = "sha256-TMi5l9qzhhtdJKMkKdy7kiEJJ5UPPJLkfholl+dm/78="; + vendorHash = "sha256-m5yb6+TfRApw0ZROx9ZA3RPiKV+1DHo/73CNQpIfMlU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 03add3ba34f9d..9c43d40681f00 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -11,17 +11,18 @@ , hamlib , qtkeychain , pkg-config +, cups }: stdenv.mkDerivation rec { pname = "qlog"; - version = "0.29.2"; + version = "0.30.0"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-g7WgFQPMOaD+3YllZqpykslmPYT/jNVK7/1xaPdbti4="; + hash = "sha256-WgLUIWggUKHPjVa6brkJzeRMZli/qhfu4jatf+JYIRU="; fetchSubmodules = true; }; @@ -35,7 +36,9 @@ stdenv.mkDerivation rec { qtwebchannel hamlib qtkeychain - ]; + ] ++ (lib.optionals stdenv.isDarwin [ + cups + ]); nativeBuildInputs = [ wrapQtAppsHook diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index 310395c0308a9..7129a18cd11f9 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -8,11 +8,11 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.24"; + version = "4.2.27"; src = fetchPypi { inherit pname version; - sha256 = "sha256-myxWcx1/a9sMv+sfa0Gwjx72t0rGoxn5USEfFgfKEro="; + sha256 = "sha256-7pI9K7VOksQREbDFa02w48tcvanehBQ+5d/XYUD/gSo="; }; buildInputs = [ diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 44ecec312b3f6..8619179efae4c 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "22.11"; + version = "23.11"; pname = "rtl_433"; src = fetchFromGitHub { owner = "merbanan"; repo = "rtl_433"; rev = version; - sha256 = "sha256-qDY+prdf8O/dqmAgLU6lpsNIvL1R5V2AwsB+4CpOqGM="; + hash = "sha256-qCfPweJeYHIuM1DfDmeDilkV/RLzbzlIe1sIpSx/EYc="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 3b61c8dac2b89..cad727c75fd61 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -18,17 +18,19 @@ , indilib , libnova , qttools +, exiv2 +, nlopt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stellarium"; - version = "23.3"; + version = "23.4"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; - rev = "v${version}"; - hash = "sha256-bYvGmYu9jMHk2IUICz2kCVh56Ymz8JHqurdWV+xEdJY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-rDqDs6sFaZQbqJcCRhY5w8sFM2mYHHvw0Ud2Niimg4Y="; }; patches = [ @@ -66,12 +68,14 @@ stdenv.mkDerivation rec { qxlsx indilib libnova + exiv2 + nlopt ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; preConfigure = '' - export SOURCE_DATE_EPOCH=$(date -d 20${lib.versions.major version}0101 +%s) + export SOURCE_DATE_EPOCH=$(date -d 20${lib.versions.major finalAttrs.version}0101 +%s) '' + lib.optionalString stdenv.isDarwin '' export LC_ALL=en_US.UTF-8 ''; @@ -89,11 +93,11 @@ stdenv.mkDerivation rec { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - meta = with lib; { + meta = { description = "Free open-source planetarium"; homepage = "https://stellarium.org/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ kilianar ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ kilianar ]; }; -} +}) diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index fa96f32e8c932..19e5f99fe2f63 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.18"; + version = "1.19"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-2bnTYpPkzGKrdHOqJTk4nU4d55sakn1IP26R88POrH4="; + sha256 = "sha256-eCtfG8aQQVGSIx6CITs0k7BH9F5jDcjvbxVNYSarPmg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/applications/science/biology/gatk/default.nix index 43e5382b5d50b..9884e3a771111 100644 --- a/pkgs/applications/science/biology/gatk/default.nix +++ b/pkgs/applications/science/biology/gatk/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gatk"; - version = "4.4.0.0"; + version = "4.5.0.0"; src = fetchzip { url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; - sha256 = "sha256-svOtIS6gz9nwVgVmVQbk9z6Ufyobpn6bFbZY4zurvUI="; + sha256 = "sha256-c3YZsSCjZY75jooiqtc8x/xsWTvYm9labUcOydDlSRQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/kalign/default.nix b/pkgs/applications/science/biology/kalign/default.nix index b28c640cb7aa5..3ca83978d9690 100644 --- a/pkgs/applications/science/biology/kalign/default.nix +++ b/pkgs/applications/science/biology/kalign/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kalign"; - version = "3.3.5"; + version = "3.4.0"; src = fetchFromGitHub { owner = "TimoLassmann"; repo = "kalign"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-QufTiaiRcNOnLhOO4cnOE9bNcj9mlCg/ERFIHJB8KOU="; + hash = "sha256-QcFNaCTqj6CFiOzQ6ezfBL0mu8PDU11hyNdkcsLOPzA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 7cf1560d2492c..ed8690cd9c850 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1499"; + version = "1519"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-uofXtGGDloM1FxW0PYKKwfDOPlAJiapGVKwd1clFzp8="; + hash = "sha256-659YiC7NA6ottOR41jo3ayh4lwReWj46NKMhMPuebF4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 456e8f42dbaca..d4ce4071a274e 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.1"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - sha256 = "sha256-KC9MbIJi//ZYreoRS+DED8eQW7e4IPvGT+rLI+f7Zrk="; + sha256 = "sha256-mb6xcu28QYAFm2906lRNY0zciQBKSGcz3q/cvOEh/VE="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix index efbedf9a121a0..47ffd507efdaf 100644 --- a/pkgs/applications/science/biology/poretools/default.nix +++ b/pkgs/applications/science/biology/poretools/default.nix @@ -11,12 +11,13 @@ python2Packages.buildPythonPackage rec { sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am"; }; - propagatedBuildInputs = [python2Packages.h5py python2Packages.matplotlib python2Packages.seaborn python2Packages.pandas]; + propagatedBuildInputs = [ python2Packages.h5py python2Packages.matplotlib python2Packages.seaborn python2Packages.pandas ]; meta = { description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore"; license = lib.licenses.mit; homepage = "https://poretools.readthedocs.io/en/latest/"; - maintainers = [lib.maintainers.rybern]; + maintainers = [ lib.maintainers.rybern ]; + broken = true; # Build error: h5py-3.9.0 not supported for interpreter python2.7 }; } diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index b5743df9a7ca4..7db1edcbe9e9e 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "samtools"; - version = "1.18"; + version = "1.19"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-1ob/piECO6YYIqKlC3DoXQsY55Nx3lrbB4KFGdP8BuE="; + sha256 = "sha256-+ms7GOIIUbbzy1WvrzIF0C/LedrjuEn89S6PwQ/wi4M="; }; # tests require `bgzip` from the htslib package diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/applications/science/biology/seqkit/default.nix index 3c6ac45454424..7d1778867921f 100644 --- a/pkgs/applications/science/biology/seqkit/default.nix +++ b/pkgs/applications/science/biology/seqkit/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "seqkit"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "shenwei356"; repo = "seqkit"; rev = "v${version}"; - sha256 = "sha256-ahCLPYRRH6xIRFhgpjvnw7G1AIOfrkzLKPA8t9+k9gg="; + sha256 = "sha256-zdn5jyb8mQ8CXHu3bHpZ7+c6K6lwoSLnmhMspMeDzy0="; }; - vendorHash = "sha256-OpLLJdwEW7UnMKr6r8+EDUlpiahfa5k9AkBqcd+SE5k="; + vendorHash = "sha256-iVsLJ7UcUVTg14yEdThb6HBx6XutG0m+S9OW4iiFPUE="; meta = with lib; { description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation"; diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index 9730601e4e7d1..ad6c0d9e5a4cc 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, cmake, zlib, python2}: +{lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, zlib, python2}: stdenv.mkDerivation rec { pname = "strelka"; @@ -11,8 +11,28 @@ stdenv.mkDerivation rec { sha256 = "1nykbmim1124xh22nrhrsn8xgjb3s2y7akrdapn9sl1gdych4ppf"; }; + patches = [ + # Pull pending fix for gcc-12: + # https://github.com/Illumina/strelka/pull/204 + (fetchpatch { + name = "limits.patch"; + url = "https://github.com/Illumina/strelka/commit/98272cd345c6e4c672e6a5b7721204fcac0502d6.patch"; + hash = "sha256-psBiuN32nvwZ+QX51JQjIdRhEE3k7PfwbkD10ckqvZk="; + }) + ]; + + postPatch = '' + substituteInPlace src/cmake/boost.cmake \ + --replace "1.58.0" "${boost.version}" \ + --replace "Boost_USE_STATIC_LIBS ON" "Boost_USE_STATIC_LIBS OFF" + ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib python2 ]; + buildInputs = [ boost zlib python2 ]; + + cmakeFlags = [ + "-DCMAKE_CXX_STANDARD=14" + ]; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=maybe-uninitialized" @@ -37,7 +57,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; homepage = "https://github.com/Illumina/strelka"; maintainers = with maintainers; [ jbedo ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix index 2ff0cab1847a9..dad31b738a84e 100644 --- a/pkgs/applications/science/chemistry/avogadro2/default.nix +++ b/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -6,19 +6,19 @@ let avogadroI18N = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadro-i18n"; - rev = "3b8a86cc37e988b043d1503d2f11068389b0aca3"; - sha256 = "9wLY7/EJyIZYnlUAMsViCwD5kGc1vCNbk8vUhb90LMQ="; + rev = "7eef0b83ded6221a3ddb85c0118cc26f9a35375c"; + hash = "sha256-AR/y70zeYR9xBzWDB5JXjJdDM+NLOX6yxCQte2lYN/U="; }; in stdenv.mkDerivation rec { pname = "avogadro2"; - version = "1.97.0"; + version = "1.98.1"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadroapp"; rev = version; - hash = "sha256-gZpMgFSPz70QNfd8gH5Jb9RTxQfQalWx33LkgXLEqOQ="; + hash = "sha256-N35WGYZbgfjKnorzGKCnbBvlrlt9Vr04YIG2R3k+b8A="; }; postUnpack = '' diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index f006df2ae5c05..ce3b279deab1a 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.45"; + version = "16.1.47"; 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-rLq0QrY1M0OptmRZ/dKUVssREnH1im9Ti89AbpsiFtg="; + hash = "sha256-3hsH+RkPPoViKp1bc/88GDVSG8jf9hiPKPkUfe9PIkk="; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 9933d0d8c727f..4c44829197724 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -1,41 +1,119 @@ { lib , stdenv , fetchFromGitLab +, fetchFromGitHub +, fetchurl +, git +, cmake +, gnum4 , gfortran +, pkg-config , fftw , blas , lapack -, useMpi ? false +, scalapack +, wannier90 +, hdf5 +, libmbd +, libxc +, enableMpi ? true , mpi }: +assert ! blas.isILP64; +assert ! lapack.isILP64; + +let + # "rev"s must exactly match the git submodule commits in the QE repo + gitSubmodules = { + devxlib = fetchFromGitLab { + group = "max-centre"; + owner = "components"; + repo = "devicexlib"; + rev = "a6b89ef77b1ceda48e967921f1f5488d2df9226d"; + hash = "sha256-p3fRplVG4YSN6ILNlOwf+aSEhpTJPXqiS1+wnzWVA2U="; + }; + + pw2qmcpack = fetchFromGitHub { + owner = "QMCPACK"; + repo = "pw2qmcpack"; + rev = "f72ab25fa4ea755c1b4b230ae8074b47d5509c70"; + hash = "sha256-K1Z90xexsUvk4SdEb8FGryRal0GAFoLz3j1h/RT2nYw="; + }; + }; + +in stdenv.mkDerivation rec { - version = "6.6"; + version = "7.2"; pname = "quantum-espresso"; src = fetchFromGitLab { owner = "QEF"; repo = "q-e"; rev = "qe-${version}"; - sha256 = "1mkfmw0fq1dabplzdn6v1abhw0ds55gzlvbx3a9brv493whk21yp"; + hash = "sha256-0q0QWX4BVjVHjcbKOBpjbBADuL+2S5LAALyrxmjVs4c="; }; - passthru = { - inherit mpi; - }; + # add git submodules manually and fix pkg-config file + prePatch = '' + chmod -R +rwx external/ + + substituteInPlace external/devxlib.cmake \ + --replace "qe_git_submodule_update(external/devxlib)" "" + substituteInPlace external/CMakeLists.txt \ + --replace "qe_git_submodule_update(external/pw2qmcpack)" "" \ + --replace "qe_git_submodule_update(external/d3q)" "" \ + --replace "qe_git_submodule_update(external/qe-gipaw)" "" - preConfigure = '' - patchShebangs configure + ${builtins.toString (builtins.attrValues + (builtins.mapAttrs + (name: val: '' + cp -r ${val}/* external/${name}/. + chmod -R +rwx external/${name} + '') + gitSubmodules + ) + )} + + substituteInPlace cmake/quantum_espresso.pc.in \ + --replace 'libdir="''${prefix}/@CMAKE_INSTALL_LIBDIR@"' 'libdir="@CMAKE_INSTALL_FULL_LIBDIR@"' ''; - nativeBuildInputs = [ gfortran ]; + passthru = { inherit mpi; }; + + nativeBuildInputs = [ + cmake + gfortran + git + pkg-config + ]; - buildInputs = [ fftw blas lapack ] - ++ (lib.optionals useMpi [ mpi ]); + buildInputs = [ + fftw + blas + lapack + wannier90 + libmbd + libxc + hdf5 + ] ++ lib.optional enableMpi scalapack; - configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ]; + propagatedBuildInputs = lib.optional enableMpi mpi; + propagatedUserEnvPkgs = lib.optional enableMpi mpi; - makeFlags = [ "all" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DWANNIER90_ROOT=${wannier90}" + "-DMBD_ROOT=${libmbd}" + "-DQE_ENABLE_OPENMP=ON" + "-DQE_ENABLE_LIBXC=ON" + "-DQE_ENABLE_HDF5=ON" + "-DQE_ENABLE_PLUGINS=pw2qmcpack" + ] ++ lib.optionals enableMpi [ + "-DQE_ENABLE_MPI=ON" + "-DQE_ENABLE_MPI_MODULE=ON" + "-DQE_ENABLE_SCALAPACK=ON" + ]; meta = with lib; { description = "Electronic-structure calculations and materials modeling at the nanoscale"; diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix index 9b15ef8939c32..73c3c9a11f171 100644 --- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "QtRVSim"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "cvut"; repo = "qtrvsim"; rev = "refs/tags/v${version}"; - sha256 = "sha256-TKF7nkhnp+JXTD2J/FyVxQoVZgOSKX1IQ/RPqRBOI/4="; + sha256 = "sha256-cC3DvQj2VBnGad6ZDn3x4gHQfsPpySzjTi17PQoaxPU="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/applications/science/electronics/csxcad/default.nix index f6b0ff93fff5e..83ee992f4b28a 100644 --- a/pkgs/applications/science/electronics/csxcad/default.nix +++ b/pkgs/applications/science/electronics/csxcad/default.nix @@ -4,7 +4,7 @@ , fparser , tinyxml , hdf5 -, cgal_5 +, cgal , vtk , boost , gmp @@ -13,19 +13,19 @@ stdenv.mkDerivation rec { pname = "csxcad"; - version = "unstable-2022-05-18"; + version = "0.6.3"; src = fetchFromGitHub { owner = "thliebig"; repo = "CSXCAD"; - rev = "cd9decb4d9cebe3c8bf115e2c0ee73f730f22da1"; - sha256 = "1604amhvp7dm8ych7gwzxwawqvb9hpjglk5ffd4qm0y3k6r89arn"; + rev = "v${version}"; + sha256 = "sha256-SSV5ulx3rCJg99I/oOQbqe+gOSs+BfcCo6UkWHVhnSs="; }; patches = [./searchPath.patch ]; buildInputs = [ - cgal_5 + cgal boost gmp mpfr diff --git a/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch b/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch deleted file mode 100644 index d095eada9d6e1..0000000000000 --- a/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/shapely/geos.py b/shapely/geos.py -index 88c5f53..1ccd6e4 100644 ---- a/shapely/geos.py -+++ b/shapely/geos.py -@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'): - alt_paths = [ - 'libgeos_c.so.1', - 'libgeos_c.so', -+ '@libgeos_c@', - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -@@ -160,6 +161,7 @@ elif sys.platform == 'darwin': - "/usr/local/lib/libgeos_c.dylib", - # homebrew Apple Silicon - "/opt/homebrew/lib/libgeos_c.dylib", -+ "@libgeos_c@", - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -diff --git a/tests/test_dlls.py b/tests/test_dlls.py -index c71da8e..c36262c 100644 ---- a/tests/test_dlls.py -+++ b/tests/test_dlls.py -@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase): - '/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) - os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) - 'libgeos_c.so.1', -- 'libgeos_c.so']) -+ 'libgeos_c.so', -+ '@libgeos_c@']) diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 8d28e4da0f14e..2e4ef8003d15f 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.449"; + version = "8.3.454"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-y0+HS1LkIFwcgDbHEvs5SXJY2b340RDT7KVupp+ZX9Y="; + sha256 = "sha256-nHZJ2L54J2x+H7S29TeGPInTgjEhRFv3h2ki0ccGYB0="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index dc4991bf480bc..a6f2c9d447314 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.10.4"; + version = "1.11.1"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-f4VjSBoJnsGb8MHKegJDlomPG32DuTgFcyv1w0GxKvA="; + hash = "sha256-aBH3TtPFuJXtVvGTJcGJev5DYVwqjUAM9cf5PatJq9Y="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix index 083f01a42881a..864b120993d9c 100644 --- a/pkgs/applications/science/electronics/openems/default.nix +++ b/pkgs/applications/science/electronics/openems/default.nix @@ -18,15 +18,15 @@ , hyp2mat }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "openems"; - version = "unstable-2020-02-15"; + version = "0.0.36"; src = fetchFromGitHub { owner = "thliebig"; repo = "openEMS"; - rev = "ba793ac84e2f78f254d6d690bb5a4c626326bbfd"; - sha256 = "1dca6b6ccy771irxzsj075zvpa3dlzv4mjb8xyg9d889dqlgyl45"; + rev = "v${version}"; + sha256 = "sha256-wdH+Zw7G2ZigzBMX8p3GKdFVx/AhbTNL+P3w+YjI/dc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 596f220242bb2..c7242117b68ca 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, dpkg, makeWrapper , mono, gtk-sharp-3_0 -, glib, libusb1 , zlib, gtk3-x11, callPackage +, glib, libusb1 , zlib, gtk3-x11, callPackage, writeTextDir , scopes ? [ "picocv" "ps2000" @@ -114,7 +114,7 @@ in stdenv.mkDerivation rec { # services.udev.packages = [ pkgs.picoscope.rules ]; # users.groups.pico = {}; # users.users.you.extraGroups = [ "pico" ]; - passthru.rules = lib.writeTextDir "lib/udev/rules.d/95-pico.rules" '' + passthru.rules = writeTextDir "lib/udev/rules.d/95-pico.rules" '' SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ce9", MODE="664",GROUP="pico" ''; diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix index 663d6e025c5c6..30d8e0b8186d5 100644 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ b/pkgs/applications/science/electronics/xyce/default.nix @@ -32,21 +32,21 @@ assert withMPI -> trilinos.withMPI; let - version = "7.6.0"; + version = "7.7.0"; # useing fetchurl or fetchFromGitHub doesn't include the manuals # due to .gitattributes files xyce_src = fetchgit { url = "https://github.com/Xyce/Xyce.git"; rev = "Release-${version}"; - sha256 = "sha256-HYIzmODMWXBuVRZhcC7LntTysuyXN5A9lb2DeCQQtVw="; + sha256 = "sha256-F0kO86eliD1AfUUjeVllxJ231ZElXkfBfGJ3jhT0s9w="; }; regression_src = fetchFromGitHub { owner = "Xyce"; repo = "Xyce_Regression"; rev = "Release-${version}"; - sha256 = "sha256-uEoiKpYyHmdK7LZ1UNm2d3Jk8+sCwBwB0TCoHilIh74="; + sha256 = "sha256-iDxm0Vcn3JuuREciCt3/b7q94E8GhXoIUD/BCx0mW6Q="; }; in @@ -154,8 +154,11 @@ stdenv.mkDerivation rec { "doc/Reference_Guide/Xyce_RG" "doc/Release_Notes/Release_Notes_${lib.versions.majorMinor version}/Release_Notes_${lib.versions.majorMinor version}") - # Release notes refer to an image not in the repo. - sed -i -E 's/\\includegraphics\[height=(0.5in)\]\{snllineblubrd\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/' ''${docFiles[2]}.tex + # SANDIA LaTeX class and some organization logos are not publicly available see + # https://groups.google.com/g/xyce-users/c/MxeViRo8CT4/m/ppCY7ePLEAAJ + for img in "snllineblubrd" "snllineblk" "DOEbwlogo" "NNSA_logo"; do + sed -i -E "s/\\includegraphics\[height=(0.[1-9]in)\]\{$img\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/" ''${docFiles[2]}.tex + done install -d $doc/share/doc/${pname}-${version}/ for d in ''${docFiles[@]}; do diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index bc8c6ae485877..d84aa5b6918ac 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, ocamlPackages }: +{ darwin, fetchurl, lib, ocamlPackages, stdenv }: let pname = "alt-ergo"; @@ -28,7 +28,7 @@ ocamlPackages.buildDunePackage { inherit pname version src; - nativeBuildInputs = [ ocamlPackages.menhir ]; + nativeBuildInputs = [ ocamlPackages.menhir ] ++ lib.optionals stdenv.isDarwin [ darwin.sigtool ]; buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ]); meta = { diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index ddad93b1e18ae..b7524e47b3150 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cadical"; - version = "1.9.0"; + version = "1.9.3"; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "sha256-2cMaBo4u7uqrsp11dc9PHOI9ZBnir51BftPE4C6/U7Q="; + sha256 = "sha256-kjvbWFcoEe7Df2HDKKc2txrxpS8/StwiCLbS2RqnkyE="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 9717e69e9c260..039a5334969e2 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -56,6 +56,7 @@ let "8.17.0".sha256 = "sha256-TGwm7S6+vkeZ8cidvp8pkiAd9tk008jvvPvYgfEOXhM="; "8.17.1".sha256 = "sha256-x+RwkbxMg9aR0L3WSCtpIz8jwA5cJA4tXAtHMZb20y4="; "8.18.0".sha256 = "sha256-WhiBs4nzPHQ0R24xAdM49kmxSCPOxiOVMA1iiMYunz4="; + "8.19+rc1".sha256 = "sha256-hQ57tLj8lXTbMrW+F0skPtzpHJnXbqPIc/EzocRV5qo="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 0645fd29522fb..a028803db1399 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.14"; + version = "5.11.15"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - hash = "sha256-p/sVinjEh078PGtJ6JBRA8EmrJVcchBs9L3bRZvCHuo="; + hash = "sha256-OenuIPo5U0+egWMpxfaKWPLbO5YRQJSXLYptih+ZQQ0="; }; buildInputs = [ python3 boost ]; diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index 7c483ec185c7a..146381961e5ca 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.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - hash = "sha256-2sJKHD7Wzznut4hKOyxgc4LR4H+4u3m8Gq02+v+m5lM="; + hash = "sha256-AwUQHFftn51Xt6HtmDsWAdkOS8i64r2FhaHu31KYwZA="; }; nativeBuildInputs = [ pkg-config cmake flex ]; diff --git a/pkgs/applications/science/logic/dafny/default.nix b/pkgs/applications/science/logic/dafny/default.nix index 7da1958af3866..5f56d612ab249 100644 --- a/pkgs/applications/science/logic/dafny/default.nix +++ b/pkgs/applications/science/logic/dafny/default.nix @@ -8,36 +8,32 @@ buildDotnetModule rec { pname = "Dafny"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; rev = "v${version}"; - hash = "sha256-bnKaaqh1/921SRwnwqgYb31SJ8vguEBtzywPTz79S6I="; + hash = "sha256-rnPZms60vRtefEV+3IeVXoZJU9WMjVxPVioRaEcyw/o="; }; - postPatch = - # This version number seems to be hardcoded and didn't get updated with the - # version bump from 4.2.0 to 4.3.0. - let dafnyRuntimeJarVersion = "4.2.0"; - in '' - cp ${ - writeScript "fake-gradlew-for-dafny" '' - mkdir -p build/libs/ - javac $(find -name "*.java" | grep "^./src/main") -d classes - jar cf build/libs/DafnyRuntime-${dafnyRuntimeJarVersion}.jar -C classes dafny - ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew + postPatch = '' + cp ${ + writeScript "fake-gradlew-for-dafny" '' + mkdir -p build/libs/ + javac $(find -name "*.java" | grep "^./src/main") -d classes + jar cf build/libs/DafnyRuntime-${version}.jar -C classes dafny + ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew - # Needed to fix - # "error NETSDK1129: The 'Publish' target is not supported without - # specifying a target framework. The current project targets multiple - # frameworks, you must specify the framework for the published - # application." - substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ - --replace TargetFrameworks TargetFramework \ - --replace "netstandard2.0;net452" net6.0 - ''; + # Needed to fix + # "error NETSDK1129: The 'Publish' target is not supported without + # specifying a target framework. The current project targets multiple + # frameworks, you must specify the framework for the published + # application." + substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ + --replace TargetFrameworks TargetFramework \ + --replace "netstandard2.0;net452" net6.0 + ''; buildInputs = [ jdk11 ]; nugetDeps = ./deps.nix; diff --git a/pkgs/applications/science/logic/dafny/deps.nix b/pkgs/applications/science/logic/dafny/deps.nix index 895c359ce3352..a786d8b3d6fd4 100644 --- a/pkgs/applications/science/logic/dafny/deps.nix +++ b/pkgs/applications/science/logic/dafny/deps.nix @@ -2,21 +2,20 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Boogie"; version = "2.16.0"; sha256 = "1zcbbqhn7brxnywp3m5pfd7rcapg5w1xjr5pkfsqmmv8fk36nfja"; }) - (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "2.16.8"; sha256 = "1a4pfzc7r6yxzwixsij2xijiyk50ii84zlwl151naw0y05yj4zxn"; }) - (fetchNuGet { pname = "Boogie.BaseTypes"; version = "2.16.8"; sha256 = "17zii7d31bqlhn2ygfjh5a37nb98wkn377z8rm6fg44f83788ll9"; }) - (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "2.16.8"; sha256 = "18aixxw5xrivzpwrwj91dyhdnj3xd1apmjrgbdgg5f0z6p9863nq"; }) - (fetchNuGet { pname = "Boogie.Concurrency"; version = "2.16.8"; sha256 = "1qsp24ckvjz01mjq1fxssdvpsx6kvrdx8l7hd2rll86rrh1bc6w4"; }) - (fetchNuGet { pname = "Boogie.Core"; version = "2.16.8"; sha256 = "1qp6yaa0h16ihqrr2vgbgnakmvshd76skdhqrp1v7jcp7mw8af7n"; }) - (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "2.16.8"; sha256 = "1q3x8im85i68vz8ls51ywd4ayjsy53ygra01byscbnhc1qflpzia"; }) - (fetchNuGet { pname = "Boogie.Graph"; version = "2.16.8"; sha256 = "1pyd35rfv0bn0b1xxvqzixnprwjbps54zs0yaily9xxsyg33y1jr"; }) - (fetchNuGet { pname = "Boogie.Houdini"; version = "2.16.8"; sha256 = "1n6dlr84y9kni1sskgd6zx4cfflw28yavwwaz6hmmm01l8zg8y6w"; }) - (fetchNuGet { pname = "Boogie.Model"; version = "2.16.8"; sha256 = "0cbq5lyprz0m1kv6a8yyjnhyx42k1jbl00ljrj1bldlj7dz4ahw3"; }) - (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "2.16.8"; sha256 = "1q48xzmzch4mc8z0wg2ap8f9glmxcj59i9a645ybysf1jah6yphy"; }) - (fetchNuGet { pname = "Boogie.VCExpr"; version = "2.16.8"; sha256 = "130jmlvvjd2ls95ry7ds0y2h7pxa109dikx1p3a3psb9dph7zxkr"; }) - (fetchNuGet { pname = "Boogie.VCGeneration"; version = "2.16.8"; sha256 = "0fim2d7p1y6ms1m8f1d5yl4pq3167pi4i7nwink5ydv3fvsckh08"; }) + (fetchNuGet { pname = "Boogie"; version = "3.0.9"; sha256 = "12700rvm3zj73pkkjaypfa72fvqz8bp78hi3jkh89dqavhg3l7p5"; }) + (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.0.9"; sha256 = "1612d1x7smhcczmk21z9kswjjvq3h0r5mlf1zb8mznyx0154pckg"; }) + (fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.0.9"; sha256 = "0v6x8k61rl6bvp1zbvbhnlpkakbw11c2mf8glafmf4znrakwil23"; }) + (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.0.9"; sha256 = "045z0j7bhsb8fypzkz8spixfqdchcpsq3bb9bfwb95if2mna4zx2"; }) + (fetchNuGet { pname = "Boogie.Concurrency"; version = "3.0.9"; sha256 = "00k08qh614vciadzk7lr1dcwsvrcfpslvs342amq12c25rxh3125"; }) + (fetchNuGet { pname = "Boogie.Core"; version = "3.0.9"; sha256 = "03fip919iw7y3vwk5nj53jj73ry43z9fpn752j5fbgygkl2zbx4q"; }) + (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.0.9"; sha256 = "098l1qmya021raqgdapxvwq3pra4v7wpv7j3dmmhsnpg8zs30jgi"; }) + (fetchNuGet { pname = "Boogie.Graph"; version = "3.0.9"; sha256 = "1y8aai7wmsyh2pn9bl1rp2nifs3k9b8kb2lqx5rgs1fdiyk2q24j"; }) + (fetchNuGet { pname = "Boogie.Houdini"; version = "3.0.9"; sha256 = "1ssr82swqmjsap6v344v2kwkfsv70gx082dk54x7vpapr56f1fgp"; }) + (fetchNuGet { pname = "Boogie.Model"; version = "3.0.9"; sha256 = "1cy04a7dr1z7dxfkx6l9kfm30rx5wsn7g50b0wyzp4ns6sbkh47f"; }) + (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.0.9"; sha256 = "1ijzn67wl82ycr1k7gbh8dhq99zxqqjdc48glf4ld832l7sp3vam"; }) + (fetchNuGet { pname = "Boogie.VCExpr"; version = "3.0.9"; sha256 = "0hivg31c8v9ix5b8mici6mxz1yzydwiyvgb510bnghxciwbnd4gp"; }) + (fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.0.9"; sha256 = "1j9853vixzpgdfd60c3hr5padfdj3sbrbhmr6jg9a0cr3afk72sm"; }) (fetchNuGet { pname = "CocoR"; version = "2014.12.24"; sha256 = "0ps8h7aawkcc1910qnh13llzb01pvgsjmg862pxp0p4wca2dn7a2"; }) - (fetchNuGet { pname = "dotnet-format"; version = "5.1.250801"; sha256 = "1i0icx2yyp9141rjb2a221a71fvsy0knrfyvv631vb56r8fnsywh"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.1.0"; sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; }) (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index ec1fc6b11d25c..d4a8b7a6b2e87 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eprover"; - version = "3.0"; + version = "3.0.03"; src = fetchurl { url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - hash = "sha256-gBgDC+GH948JMsjzo/SOpWDzJXu0g58YX1VW28PeorI="; + hash = "sha256-cS5zUe2N9Kd9uzbNpeBtvLbgUN0c3N3tGcYczK3KsdQ="; }; buildInputs = [ which ]; diff --git a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix index 7587c4638c181..d9b8dd5cf28f6 100644 --- a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix +++ b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "isabelle-linter"; - version = "1.2.1"; + version = "2023-1.0.0"; src = fetchFromGitHub { owner = "isabelle-prover"; repo = "isabelle-linter"; - rev = "Isabelle2022-v${version}"; - sha256 = "sha256-qlojNCsm3/49TtAVq6J31BbQipdIoDcn71pBotZyquY="; + rev = "Isabelle2023-v1.0.0"; + sha256 = "sha256-q9+qN94NaTzvhbcNQj7yH/VVfs1QgCH8OU8HW+5+s9U="; }; nativeBuildInputs = [ isabelle ]; diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 2cb96bbc0a376..edc4483bcfa98 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -46,7 +46,7 @@ let }; in stdenv.mkDerivation (finalAttrs: rec { pname = "isabelle"; - version = "2022"; + version = "2023"; dirname = "Isabelle${version}"; @@ -56,18 +56,18 @@ in stdenv.mkDerivation (finalAttrs: rec { fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; - sha256 = "0b84rx9b7b5y8m1sg7xdp17j6yngd2dkx6v5bkd8h7ly102lai18"; + sha256 = "sha256-0VSW2SrHNI3/k4cCCZ724ruXaq7W1NCPsLrXFZ9l1/Q="; } else if stdenv.hostPlatform.isx86 then fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "1ih4gykkp1an43qdgc5xzyvf30fhs0dah3y0a5ksbmvmjsfnxyp7"; + sha256 = "sha256-Go4ZCsDz5gJ7uWG5VLrNJOddMPX18G99FAadpX53Rqg="; } else fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux_arm.tar.gz"; - hash = "sha256-qI/BR/KZwLjnkO5q/yYeW4lN4xyUe78VOM2INC/Z/io="; + hash = "sha256-Tzxxs0gKw6vymbaXIzH8tK5VgUrpOIp9vcWQ/zxnRCc="; }; nativeBuildInputs = [ java ]; @@ -134,8 +134,7 @@ in stdenv.mkDerivation (finalAttrs: rec { substituteInPlace src/Tools/Setup/src/Environment.java \ --replace 'cmd.add("/usr/bin/env");' "" \ - --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" \ - --replace 'private static read_file(path: Path): String =' 'private static String read_file(Path path) throws IOException' + --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" substituteInPlace src/Pure/General/sha1.ML \ --replace '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"' diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 0f3d9c99ba888..092489f844568 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.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${version}"; - hash = "sha256-2F6sibGMG1U5By/aKGluLgkXIlMpZ7m06gVEG2Uz4RQ="; + hash = "sha256-lU67wjl6yJP2r97lHYxrJqn+JhqMcBIbz/+qlCgY3/o="; }; postPatch = '' @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_GITHASH=OFF" + "-DINSTALL_LICENSE=OFF" ]; # Work around https://github.com/NixOS/nixpkgs/issues/166205. diff --git a/pkgs/applications/science/logic/naproche/default.nix b/pkgs/applications/science/logic/naproche/default.nix index ecc347080081b..f6743745a7b64 100644 --- a/pkgs/applications/science/logic/naproche/default.nix +++ b/pkgs/applications/science/logic/naproche/default.nix @@ -2,13 +2,13 @@ with haskellPackages; mkDerivation { pname = "Naproche-SAD"; - version = "2022-10-24"; + version = "unstable-2023-07-11"; src = fetchFromGitHub { owner = "naproche"; repo = "naproche"; - rev = "c8c4ca2d5fdb92bf17e0e54c99bd2a9691255d80"; - sha256 = "0xvh6kkl5k5ygp2nrbq3k0snvzczbmcp1yrwdkah3fzhf9i3yykx"; + rev = "4c399d49a86987369bec6e1ac5ae3739cd6db0a8"; + sha256 = "sha256-Ji6yxbDEcwuYAzIZwK5sHNltK1WBFBfpyoEtoID/U4k="; }; isExecutable = true; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 6165cfe8bd22a..26848e1397aa4 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -24,7 +24,7 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }: inherit version sha256 patches; src = fetchFromGitHub { owner = "Z3Prover"; - repo = pname; + repo = "z3"; rev = "${tag}-${version}"; sha256 = sha256; }; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 42c160393595b..6595f0b846ddb 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -26,24 +26,17 @@ let # The default for cudatoolkit 10.1 is CUDNN 8.0.5, the last version to support CUDA 10.1. # However, this caffe does not build with CUDNN 8.x, so we use CUDNN 7.6.5 instead. # Earlier versions of cudatoolkit use pre-8.x CUDNN, so we use the default. - cudnn = if lib.versionOlder cudatoolkit.version "10.1" - then cudaPackages.cudnn - else cudaPackages.cudnn_7_6; -in - -assert leveldbSupport -> (leveldb != null && snappy != null); -assert cudnnSupport -> cudaSupport; -assert ncclSupport -> cudaSupport; -assert pythonSupport -> (python != null && numpy != null); + hasCudnn = + if lib.versionOlder cudatoolkit.version "10.1" + then cudaPackages ? cudnn + else cudaPackages ? cudnn_7_6; -let toggle = bool: if bool then "ON" else "OFF"; test_model_weights = fetchurl { url = "http://dl.caffe.berkeleyvision.org/bvlc_reference_caffenet.caffemodel"; sha256 = "472d4a06035497b180636d8a82667129960371375bd10fcb6df5c6c7631f25e0"; }; - in stdenv.mkDerivation rec { @@ -74,7 +67,8 @@ stdenv.mkDerivation rec { buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv4 blas ] ++ lib.optional cudaSupport cudatoolkit - ++ lib.optional cudnnSupport cudnn + ++ lib.optional (lib.versionOlder cudatoolkit.version "10.1" && hasCudnn) cudaPackages.cudnn + ++ lib.optional (lib.versionAtLeast cudatoolkit.version "10.1" && hasCudnn) cudaPackages.cudnn_7_6 ++ lib.optional lmdbSupport lmdb ++ lib.optional ncclSupport nccl ++ lib.optionals leveldbSupport [ leveldb snappy ] @@ -154,7 +148,14 @@ stdenv.mkDerivation rec { ''; homepage = "http://caffe.berkeleyvision.org/"; maintainers = with maintainers; [ ]; - broken = (pythonSupport && (python.isPy310)) || cudaSupport; + broken = + (pythonSupport && (python.isPy310)) + || cudaSupport + || !(leveldbSupport -> (leveldb != null && snappy != null)) + || !(cudnnSupport -> (hasCudnn && cudaSupport)) + || !(ncclSupport -> cudaSupport) + || !(pythonSupport -> (python != null && numpy != null)) + ; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 86ec445d9b3e4..0f8982eac5b96 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "calc"; - version = "2.15.0.1"; + version = "2.15.0.2"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/v${finalAttrs.version}/calc-${finalAttrs.version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/calc-${finalAttrs.version}.tar.bz2" ]; - hash = "sha256-u/mt9y4805IWYDdEHz94dPb4V+d4YVrrhzz8v3B+q24="; + hash = "sha256-dPEj32SiR7RhI9fBa9ny9+EEuuiXS2WswRcDVuOMJXc="; }; postPatch = '' diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index 1909e4bb1d042..fb92b1cc98fbb 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { }; # or-tools has a hard dependency on Cbc static libraries, so we build both - configureFlags = [ "-C" "--enable-static" ]; + configureFlags = [ "-C" "--enable-static" ] + ++ lib.optionals stdenv.cc.isClang [ "CXXFLAGS=-std=c++14" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index 52a74ff3979c4..4cfff4702e69e 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { license = licenses.epl20; homepage = "https://github.com/coin-or/Clp"; description = "An open-source linear programming solver written in C++"; - platforms = platforms.darwin ++ [ "x86_64-linux" ]; + platforms = platforms.darwin ++ platforms.linux; maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index 1e80d9a06eba9..a2743b1632479 100644 --- a/pkgs/applications/science/math/eigenmath/default.nix +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "unstable-2023-11-17"; + version = "unstable-2023-12-12"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "b0d822f10243ad5b1c88efb5a82b43a0bbf1bfbc"; - hash = "sha256-eJ/EmzV5UZGxwZNIna/XXkYY+vkLc610KcywBFPRfyM="; + rev = "bec2c9bd0750ec7970f6c701e619565c9d348e84"; + hash = "sha256-+VohU8mkFjZ0zhjmri0KY1kTzPLn2q5Au4nEBdXcR+8="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index ade614c89b0fb..0c859fd95bea7 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "4.8.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-bG0hui5GjHWHny/8Rq5sZGz3s5rYnYlpc+K8I/LwDto="; + hash = "sha256-rQxOOxM4TazkDs/H3KEPbdo6WBl0ptyAlZwv8nnGMss="; }; hardeningDisable = [ "format" ]; @@ -23,6 +23,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ gebner doronbehar alyaeanyx ]; license = licenses.gpl2Plus; + mainProgram = "qalculate-gtk"; platforms = platforms.all; }; }) diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index adc43b5f9dab2..9932c7c2dcd91 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.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-hH+orU+5PmPcrhkLKCdsDhVCrD8Mvxp2RPTGSlsUP7Y="; + hash = "sha256-Ac8RRxLheaenlR7JqKzfBpPxsq7PHfE9qXFf3Vx4GSg="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; @@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ _4825764518 ]; license = licenses.gpl2Plus; + mainProgram = "qalculate-qt"; platforms = platforms.unix; }; }) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 23e4ffc8b5a5b..eff8969cbbe34 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs:{ pname = "wxmaxima"; - version = "23.11.0"; + version = "23.12.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${finalAttrs.version}"; - sha256 = "sha256-QOXRtWFY76aIvRPSN+i8jkvMZvuPO3Yr3yqFOh0PSXY="; + sha256 = "sha256-5MOj4loZsD1Fhy+D7V6ZL4QFyVkWyIaxTcHe7R2xypo="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/yacas/fix-test-script.patch b/pkgs/applications/science/math/yacas/fix-test-script.patch deleted file mode 100644 index da85f0dc0e1bc..0000000000000 --- a/pkgs/applications/science/math/yacas/fix-test-script.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git i/tests/test-yacas w/tests/test-yacas -index b375d78b..0e3a616b 100755 ---- i/tests/test-yacas -+++ w/tests/test-yacas -@@ -35,9 +35,9 @@ FAILED_TESTS="" # list of failed tests - FAILURES=0 # number of failed tests - TOTALTESTS=0 # total number of tests - --TESTFILE=/tmp/test-yacas.$$ --TIMEFILE=/tmp/time-yacas.$$ --VERSIONF=/tmp/version-yacas-$$.ys -+TESTFILE="$(mktemp -t test-yacas.XXX)" -+TIMEFILE="$(mktemp -t time-yacas.XXX)" -+VERSIONF="$(mktemp -t version-yacas-XXX.ys)" - LOGFILE=yacas-logfile.txt - echo "Print(Version());" > $VERSIONF - VERSION=`$CMD $VERSIONF` -@@ -69,7 +69,7 @@ for scr in $SCRIPTS; do - # fi - echo "Running $scr" - if [ -f $TESTFILE ]; then rm $TESTFILE ; fi -- /bin/bash -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \ -+ bash -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \ - 2> $TIMEFILE \ - || (echo "Error -- User interrupt" > $TESTFILE) - # cat $TIMEFILE diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix index cdc083a467d8e..f61fe5b018571 100644 --- a/pkgs/applications/science/misc/foldingathome/client.nix +++ b/pkgs/applications/science/misc/foldingathome/client.nix @@ -1,8 +1,11 @@ { lib -, stdenv +, buildFHSEnv , fetchFromGitHub -, scons +, ocl-icd , openssl +, scons +, stdenv +, extraPkgs ? [ ] }: let version = "8.1.18"; @@ -14,57 +17,64 @@ let hash = "sha256-G0rknVmZiyC4sRTOowFjf7EQ5peGf+HLPPcLWXXFlX4="; }; - fah-web-client-bastetSrc = fetchFromGitHub { - owner = "foldingathome"; - repo = "fah-web-client-bastet"; - rev = "v${version}"; - hash = lib.fakeHash; - }; -in -stdenv.mkDerivation { - pname = "fah-client"; - inherit version; - - src = fetchFromGitHub { - owner = "FoldingAtHome"; - repo = "fah-client-bastet"; - rev = "v${version}"; - hash = "sha256-IgT/5NqCwN8N8OObjtASuT4IRb2EN4bdixxUdjiyddI="; - }; + fah-client = stdenv.mkDerivation { + pname = "fah-client"; + inherit version; - nativeBuildInputs = [ scons ]; + src = fetchFromGitHub { + owner = "FoldingAtHome"; + repo = "fah-client-bastet"; + rev = "v${version}"; + hash = "sha256-IgT/5NqCwN8N8OObjtASuT4IRb2EN4bdixxUdjiyddI="; + }; - buildInputs = [ openssl ]; + nativeBuildInputs = [ scons ]; - postUnpack = '' - export CBANG_HOME=$NIX_BUILD_TOP/cbang + buildInputs = [ openssl ]; - cp -r --no-preserve=mode ${cbangSrc} $CBANG_HOME - ''; + postUnpack = '' + export CBANG_HOME=$NIX_BUILD_TOP/cbang - preBuild = '' - scons -C $CBANG_HOME - ''; + cp -r --no-preserve=mode ${cbangSrc} $CBANG_HOME + ''; + + preBuild = '' + scons -C $CBANG_HOME + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/applications,share/feh-client} - installPhase = '' - runHook preInstall + cp fah-client $out/bin/fah-client - mkdir -p $out/{bin,share/applications,share/feh-client} + cp install/lin/fah-client.desktop $out/share/applications/ + cp -r images $out/share/feh-client/ - cp fah-client $out/bin/fah-client + sed -e "s|Icon=.*|Icon=$out/share/feh-client/images/fahlogo.png|g" -i $out/share/applications/fah-client.desktop + + runHook postInstall + ''; + + }; +in +buildFHSEnv { + name = fah-client.name; - cp install/lin/fah-client.desktop $out/share/applications/ - cp -r images $out/share/feh-client/ + targetPkgs = _: [ fah-client ocl-icd ] ++ extraPkgs; - sed -e "s|Icon=.*|Icon=$out/share/feh-client/images/fahlogo.png|g" -i $out/share/applications/fah-client.desktop + runScript = "/bin/fah-client"; - runHook postInstall + extraInstallCommands = '' + mv $out/bin/$name $out/bin/fah-client ''; meta = { description = "Folding@home client"; homepage = "https://foldingathome.org/"; license = lib.licenses.gpl3; + mainProgram = "fah-client"; maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 2d830e3d10166..dfe7b5eca97f3 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { homepage = "https://root.cern.ch/"; description = "A data analysis framework"; platforms = platforms.unix; - broken = !stdenv.isx86_64; + broken = !stdenv.isx86_64 || stdenv.cc.isClang or false; maintainers = with maintainers; [ veprbl ]; license = licenses.lgpl21; }; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 3f3b64069bb14..ee3610c5f6f68 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.28.08"; + version = "6.30.02"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-o+ZLTAH4fNm75X5h75a0FibkmwRGCVBw1B2b+6NSaGI="; + hash = "sha256-eWWkVtGtHuDV/kdpv1qP7Cka9oTtk9sPMICpw2JDUYM="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -110,14 +110,25 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch + + # Fix for builtin_llvm=OFF + # https://github.com/root-project/root/pull/14238 + (fetchpatch { + url = "https://github.com/root-project/root/commit/1477d3adebf27a19f3a8b85f21c27a0a5649c7ff.diff"; + hash = "sha256-g+FqXBTWXA7t7F/rMarnmOK2014oCNnNJbHhjH+Tvjw="; + }) ]; preConfigure = '' - rm -rf builtins/* + for path in builtins/*; do + if [[ "$path" != "builtins/openui5" ]] && [[ "$path" != "builtins/rendercore" ]]; then + rm -rf "$path" + fi + done substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace 'set(lcgpackages ' '#set(lcgpackages ' - substituteInPlace interpreter/llvm/src/tools/clang/tools/driver/CMakeLists.txt \ + substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \ --replace 'add_clang_symlink(''${link} clang)' "" # Don't require textutil on macOS @@ -132,8 +143,8 @@ stdenv.mkDerivation rec { substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" '' + lib.optionalString stdenv.isDarwin '' # Eliminate impure reference to /System/Library/PrivateFrameworks - substituteInPlace core/CMakeLists.txt \ - --replace "-F/System/Library/PrivateFrameworks" "" + substituteInPlace core/macosx/CMakeLists.txt \ + --replace "-F/System/Library/PrivateFrameworks " "" '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; @@ -147,7 +158,7 @@ stdenv.mkDerivation rec { "-Dbuiltin_freetype=OFF" "-Dbuiltin_gtest=OFF" "-Dbuiltin_nlohmannjson=OFF" - "-Dbuiltin_openui5=OFF" + "-Dbuiltin_openui5=ON" "-Dalien=OFF" "-Dbonjour=OFF" "-Dcastor=OFF" @@ -176,12 +187,13 @@ stdenv.mkDerivation rec { "-Dpythia6=OFF" "-Dpythia8=OFF" "-Drfio=OFF" - "-Droot7=OFF" + "-Droot7=ON" "-Dsqlite=OFF" "-Dssl=ON" "-Dtmva=ON" + "-Dtmva-pymva=OFF" "-Dvdt=OFF" - "-Dwebgui=OFF" + "-Dwebgui=ON" "-Dxml=ON" "-Dxrootd=ON" ] diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch index 836bbb5b17a46..54ad1091392e1 100644 --- a/pkgs/applications/science/misc/root/sw_vers.patch +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -1,8 +1,8 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake --- a/cmake/modules/SetUpMacOS.cmake +++ b/cmake/modules/SetUpMacOS.cmake -@@ -28,17 +28,10 @@ if(CMAKE_VERSION VERSION_LESS 3.14.4) - endif() +@@ -8,17 +8,10 @@ + set(ROOT_PLATFORM macosx) if (CMAKE_SYSTEM_NAME MATCHES Darwin) - EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" @@ -19,7 +19,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake #TODO: check haveconfig and rpath -> set rpath true #TODO: check Thread, define link command #TODO: more stuff check configure script -@@ -57,22 +50,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) +@@ -37,22 +30,7 @@ SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") @@ -42,7 +42,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake if (CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wshadow -Wall -Woverloaded-virtual -fsigned-char -fno-common") -@@ -130,7 +108,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) +@@ -96,7 +74,6 @@ endif() #---Set Linker flags---------------------------------------------------------------------- @@ -53,7 +53,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake diff a/config/root-config.in b/config/root-config.in --- a/config/root-config.in +++ b/config/root-config.in -@@ -312,12 +312,6 @@ macosxicc) +@@ -307,12 +307,6 @@ ;; macosx64|macosxarm64) # MacOS X with gcc (GNU cc v4.x) in 64 bit mode @@ -66,7 +66,7 @@ diff a/config/root-config.in b/config/root-config.in auxcflags="${cxxversionflag} -m64" auxldflags="-m64" auxlibs="-lm -ldl" -@@ -378,18 +372,11 @@ freebsd* | openbsd* | linux*) +@@ -387,17 +381,11 @@ done ;; macosx*) @@ -74,7 +74,6 @@ diff a/config/root-config.in b/config/root-config.in auxcflags="-pthread $auxcflags" auxlibs="-lpthread $auxlibs" - else -- auxcflags="-D_REENTRANT $auxcflags" - auxlibs="-lpthread $auxlibs" - fi for f in $features ; do diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/applications/science/misc/toil/default.nix index 7fc070f4f9f75..9142676fff48d 100644 --- a/pkgs/applications/science/misc/toil/default.nix +++ b/pkgs/applications/science/misc/toil/default.nix @@ -6,21 +6,16 @@ python3.pkgs.buildPythonApplication rec { pname = "toil"; - version = "5.7.1"; + version = "5.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "DataBiosphere"; repo = pname; rev = "refs/tags/releases/${version}"; - hash = "sha256-m+XvNyzd0ly2YqKhgxezgGaCXLs3CmupJMnp5RIZqNI="; + hash = "sha256-cTpbQo9tPZifUO59vbnIa3XUinFJ2/5Slfe4yszglFM="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "docker>=3.7.2, <6" "docker" - ''; - propagatedBuildInputs = with python3.pkgs; [ addict dill @@ -42,7 +37,6 @@ python3.pkgs.buildPythonApplication rec { boto botocore flask - mypy-boto3-s3 pytestCheckHook stubserver ]); @@ -63,6 +57,10 @@ python3.pkgs.buildPythonApplication rec { "src/toil/test/src" "src/toil/test/wdl" "src/toil/test/utils/utilsTest.py" + "src/toil/test/cwl/cwlTest.py" + "src/toil/test/lib/test_ec2.py" + "src/toil/test/lib/aws/test_iam.py" + "src/toil/test/lib/aws/test_s3.py" ]; disabledTests = [ diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix index cf4584979ba2b..a13a071584fd0 100644 --- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix +++ b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation { cp -v ../build/MakePAR Makefile ''; + # https://gitlab.com/DL_POLY_Classic/dl_poly/-/blob/master/README + env.NIX_CFLAGS_COMPILE = "-fallow-argument-mismatch"; + buildPhase = '' make dlpoly ''; @@ -33,7 +36,7 @@ stdenv.mkDerivation { homepage = "https://www.ccp5.ac.uk/DL_POLY_C"; description = "DL_POLY Classic is a general purpose molecular dynamics simulation package"; license = licenses.bsdOriginal; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index e669562c9cc75..1daeeb81410a0 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, hwloc, fftw, perl, blas, lapack, mpi, cudatoolkit +{ lib +, stdenv +, fetchurl +, cmake +, hwloc +, fftw +, perl +, blas +, lapack +, mpi +, cudaPackages , plumed , singlePrec ? true , config @@ -9,6 +19,8 @@ }: let + inherit (cudaPackages.cudaFlags) cudaCapabilities dropDot; + # Select reasonable defaults for all major platforms # The possible values are defined in CMakeLists.txt: # AUTO None SSE2 SSE4.1 AVX_128_FMA AVX_256 AVX2_256 @@ -52,7 +64,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optional enablePlumed plumed - ; + ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; buildInputs = [ fftw @@ -61,13 +73,17 @@ in stdenv.mkDerivation rec { blas lapack ] ++ lib.optional enableMpi mpi - ++ lib.optional enableCuda cudatoolkit - ; + ++ lib.optionals enableCuda [ + cudaPackages.cuda_cudart + cudaPackages.libcufft + cudaPackages.cuda_profiler_api + ]; propagatedBuildInputs = lib.optional enableMpi mpi; propagatedUserEnvPkgs = lib.optional enableMpi mpi; cmakeFlags = [ + (lib.cmakeBool "GMX_HWLOC" true) "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}" "-DGMX_OPENMP:BOOL=TRUE" "-DBUILD_SHARED_LIBS=ON" @@ -87,7 +103,13 @@ in stdenv.mkDerivation rec { else [ "-DGMX_MPI:BOOL=FALSE" ] - ) ++ lib.optional enableCuda "-DGMX_GPU=CUDA"; + ) ++ lib.optionals enableCuda [ + "-DGMX_GPU=CUDA" + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" (builtins.concatStringsSep ";" (map dropDot cudaCapabilities))) + + # Gromacs seems to ignore and override the normal variables, so we add this ad hoc: + (lib.cmakeFeature "GMX_CUDA_TARGET_COMPUTE" (builtins.concatStringsSep ";" (map dropDot cudaCapabilities))) + ]; postInstall = '' moveToOutput share/cmake $dev diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 7924d044c2ab7..a6dc8592ae3cc 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { # LAMMPS has weird versioning convention. Updates should go smoothly with: # nix-update --commit lammps --version-regex 'stable_(.*)' - version = "2Aug2023_update1"; + version = "2Aug2023_update2"; pname = "lammps"; src = fetchFromGitHub { owner = "lammps"; repo = "lammps"; rev = "stable_${finalAttrs.version}"; - hash = "sha256-Zmn87a726qdidBfyvJlYleYv9jqyFAakxjGrg3lipc0="; + hash = "sha256-E918Jv6RAfXmHxyHZos2F7S8HFWzU6KjxDwXYNAYFMY="; }; preConfigure = '' cd cmake @@ -108,8 +108,8 @@ stdenv.mkDerivation (finalAttrs: { funding from the DOE. It is an open-source code, distributed freely under the terms of the GNU Public License (GPL). ''; - homepage = "https://lammps.sandia.gov"; - license = licenses.gpl2Plus; + homepage = "https://www.lammps.org"; + license = licenses.gpl2Only; platforms = platforms.linux; # compiling lammps with 64 bit support blas and lapack might cause runtime # segfaults. In anycase both blas and lapack should have the same #bits diff --git a/pkgs/applications/science/physics/nnpdf/default.nix b/pkgs/applications/science/physics/nnpdf/default.nix index ec29c02054df2..f6d3e94c1a057 100644 --- a/pkgs/applications/science/physics/nnpdf/default.nix +++ b/pkgs/applications/science/physics/nnpdf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "nnpdf"; - version = "4.0.6"; + version = "4.0.7"; src = fetchFromGitHub { owner = "NNPDF"; repo = pname; rev = version; - hash = "sha256-mwOMNlYFhHZq/wakO1/HGwcxvKGKh5OyFa2D9d3Y3IA="; + hash = "sha256-J5l+ZO+5pfxKlpFuy4PEQynbqs1QIqMK6hhMFvmb/zs="; }; postPatch = '' diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix index 3d9615cf5329f..eb60c12e9f0ce 100644 --- a/pkgs/applications/science/physics/xflr5/default.nix +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -1,11 +1,14 @@ -{ mkDerivation, lib, fetchzip, qmake }: +{ mkDerivation, lib, qmake, fetchsvn }: mkDerivation rec { pname = "xflr5"; version = "6.61"; - src = fetchzip { - url = "https://sourceforge.net/code-snapshots/svn/x/xf/xflr5/code/xflr5-code-r1481-tags-v6.61-xflr5.zip"; - sha256 = "sha256-voWnXiBo7+kBPiZLVpSiXyBsYJv/Phd3noA81SQ5Vtw="; + + sourceRoot = "${src.name}/xflr5"; + src = fetchsvn { + url = "https://svn.code.sf.net/p/xflr5/code/trunk"; + rev = "1480"; + sha256 = "sha256-Uj6R15OT5i5tAJEYWqyFyN5Z51Wz5RjO26mWC3Y6QAI="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/science/robotics/mujoco/default.nix b/pkgs/applications/science/robotics/mujoco/default.nix index 139e1140e7c9c..95d3e12693507 100644 --- a/pkgs/applications/science/robotics/mujoco/default.nix +++ b/pkgs/applications/science/robotics/mujoco/default.nix @@ -22,8 +22,8 @@ let benchmark = fetchFromGitHub { owner = "google"; repo = "benchmark"; - rev = "344117638c8ff7e239044fd0fa7085839fc03021"; - hash = "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME="; + rev = "e45585a4b8e75c28479fa4107182c28172799640"; + hash = "sha256-pgHvmRpPd99ePUVRsi7WXLVSZngZ5q6r1vWW4mdGvxY="; }; ccd = fetchFromGitHub { owner = "danfis"; @@ -34,8 +34,8 @@ let eigen3 = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "e8515f78ac098329ab9f8cab21c87caede090a3f"; - hash = "sha256-HXKtFJsKGpug+wNPjYynTuyaG0igo3oG4rFQktveh1g="; + rev = "454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3"; + hash = "sha256-a9QAnv6vIM8a9Bn8ZmfeMT0+kbtb0QGxM0+m5xwIqm8="; }; googletest = fetchFromGitHub { owner = "google"; @@ -129,13 +129,15 @@ let in stdenv.mkDerivation rec { pname = "mujoco"; - version = "3.0.1"; + version = "3.1.0"; + # Bumping version? Make sure to look though the MuJoCo's commit + # history for bumped dependency pins! src = fetchFromGitHub { owner = "google-deepmind"; repo = pname; rev = version; - hash = "sha256-UXE+7KDti8RarpoJoo9Ei3TgW/Qdnj3ASRo8uTWhGrU="; + hash = "sha256-a8h30psoAlj9dI4j8IfY3WzWjY4MrRosGbvgt79s1BQ="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; diff --git a/pkgs/applications/system/asusctl/Cargo.lock b/pkgs/applications/system/asusctl/Cargo.lock index e5958e7790111..3775e2e54ac54 100644 --- a/pkgs/applications/system/asusctl/Cargo.lock +++ b/pkgs/applications/system/asusctl/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.21" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39" +checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -53,9 +53,9 @@ checksum = "9f8df4021f31969877b295fa80c4b07fcc7eb83f1985b0d3aa4f889c3427c3d5" dependencies = [ "accesskit", "accesskit_consumer", - "async-channel", + "async-channel 1.9.0", "atspi", - "futures-lite", + "futures-lite 1.13.0", "serde", "zbus", ] @@ -104,20 +104,21 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -163,15 +164,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" [[package]] name = "arboard" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" +checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" dependencies = [ "clipboard-win", "log", @@ -198,10 +199,11 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asusctl" -version = "4.7.2" +version = "5.0.6" dependencies = [ "asusd", "cargo-husky", + "dmi_id", "gif", "glam", "gumdrop", @@ -210,38 +212,38 @@ dependencies = [ "rog_dbus", "rog_platform", "rog_profiles", - "sysfs-class", "tinybmp", "toml 0.5.11", ] [[package]] name = "asusd" -version = "4.7.2" +version = "5.0.6" dependencies = [ "async-trait", "cargo-husky", "concat-idents", "config-traits", + "dmi_id", "env_logger", + "futures-lite 2.1.0", "log", "logind-zbus", "rog_anime", "rog_aura", - "rog_dbus", "rog_platform", "rog_profiles", "serde", "serde_derive", - "sysfs-class", "systemd-zbus", "tokio", + "udev", "zbus", ] [[package]] name = "asusd-user" -version = "4.7.2" +version = "5.0.6" dependencies = [ "cargo-husky", "config-traits", @@ -265,7 +267,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -276,21 +278,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] +name = "async-channel" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +dependencies = [ + "concurrent-queue", + "event-listener 4.0.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] name = "async-executor" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock", + "async-lock 3.2.0", "async-task", "concurrent-queue", - "fastrand 1.9.0", - "futures-lite", + "fastrand 2.0.1", + "futures-lite 2.1.0", "slab", ] @@ -300,10 +315,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -312,56 +327,84 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix 0.37.23", + "polling 2.8.0", + "rustix 0.37.27", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", ] [[package]] +name = "async-io" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +dependencies = [ + "async-lock 3.2.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.1.0", + "parking", + "polling 3.3.1", + "rustix 0.38.28", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] name = "async-lock" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.1", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-net" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f" +checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" dependencies = [ - "async-io", - "autocfg", + "async-io 1.13.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", - "autocfg", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", "blocking", "cfg-if", - "event-listener", - "futures-lite", - "rustix 0.37.23", - "signal-hook", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -373,24 +416,42 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.43", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.2.2", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.28", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.43", ] [[package]] @@ -419,15 +480,15 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atomic_refcell" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905" +checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" [[package]] name = "atspi" @@ -439,7 +500,7 @@ dependencies = [ "async-trait", "atspi-macros", "enumflags2", - "futures-lite", + "futures-lite 1.13.0", "serde", "tracing", "zbus", @@ -485,17 +546,17 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.3" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bindgen" -version = "0.63.0" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cexpr", "clang-sys", "lazy_static", @@ -506,7 +567,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.43", ] [[package]] @@ -517,9 +578,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" dependencies = [ "serde", ] @@ -560,24 +621,25 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel", - "async-lock", + "async-channel 2.1.1", + "async-lock 3.2.0", "async-task", - "atomic-waker", - "fastrand 1.9.0", - "futures-lite", - "log", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.1.0", + "piper", + "tracing", ] [[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" @@ -596,14 +658,14 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.43", ] [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -683,9 +745,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -714,9 +776,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", @@ -770,21 +832,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.31", + "syn 2.0.43", ] [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] [[package]] name = "config-traits" -version = "4.7.2" +version = "5.0.6" dependencies = [ "cargo-husky", "log", @@ -797,9 +859,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -807,9 +869,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -826,9 +888,9 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -836,10 +898,14 @@ dependencies = [ ] [[package]] +name = "cpuctl" +version = "5.0.6" + +[[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -855,9 +921,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] @@ -874,9 +940,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +dependencies = [ + "powerfmt", +] [[package]] name = "derivative" @@ -952,7 +1021,15 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.0", + "libloading", +] + +[[package]] +name = "dmi_id" +version = "5.0.6" +dependencies = [ + "log", + "udev", ] [[package]] @@ -1072,9 +1149,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", @@ -1082,20 +1159,20 @@ 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.31", + "syn 2.0.43", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -1128,23 +1205,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1164,6 +1230,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.1", + "pin-project-lite", +] + +[[package]] name = "fastrand" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1174,15 +1272,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "7caf4086251adeba90011a7ff9bd1f6d7f7595be0871867daa4dbb0fcf2ca932" dependencies = [ "simd-adler32", ] @@ -1199,9 +1297,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide 0.7.1", @@ -1233,33 +1331,33 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1268,9 +1366,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1288,33 +1386,46 @@ dependencies = [ ] [[package]] +name = "futures-lite" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.43", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-io", @@ -1398,9 +1509,9 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" dependencies = [ "libc", "winapi", @@ -1408,9 +1519,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -1429,9 +1540,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" @@ -1565,7 +1676,7 @@ dependencies = [ "glutin_egl_sys", "glutin_glx_sys", "glutin_wgl_sys", - "libloading 0.7.4", + "libloading", "objc2", "once_cell", "raw-window-handle", @@ -1703,9 +1814,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1715,9 +1826,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 = "hex" @@ -1727,11 +1838,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1742,16 +1853,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core", ] [[package]] @@ -1765,9 +1876,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1775,9 +1886,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown", @@ -1835,7 +1946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.11", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -1850,9 +1961,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jni" @@ -1878,9 +1989,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -1932,15 +2043,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08fcb2bea89cee9613982501ec83eaa2d09256b24540ae463c52a28906163918" dependencies = [ "gtk-sys", - "libloading 0.7.4", + "libloading", "once_cell", ] [[package]] name = "libc" -version = "0.2.147" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libloading" @@ -1953,13 +2064,25 @@ dependencies = [ ] [[package]] -name = "libloading" -version = "0.8.0" +name = "libredox" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", ] [[package]] @@ -1992,15 +2115,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2046,9 +2169,9 @@ dependencies = [ [[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 = "memmap2" @@ -2120,9 +2243,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -2226,9 +2349,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -2282,16 +2405,10 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.43", ] [[package]] -name = "numtoa" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f" - -[[package]] name = "objc" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2348,26 +2465,26 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "orbclient" -version = "0.3.46" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" dependencies = [ - "redox_syscall 0.3.5", + "libredox 0.0.2", ] [[package]] @@ -2382,9 +2499,9 @@ dependencies = [ [[package]] name = "owned_ttf_parser" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" dependencies = [ "ttf-parser", ] @@ -2417,9 +2534,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -2433,13 +2550,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -2458,9 +2575,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" @@ -2475,6 +2592,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] name = "pix" version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2482,9 +2610,9 @@ checksum = "5de5067af0cd27add969cdb4ef2eecc955f59235f3b7a75a3c6ac9562cfb6b81" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "png" @@ -2526,6 +2654,26 @@ dependencies = [ ] [[package]] +name = "polling" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.28", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2538,7 +2686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -2567,18 +2715,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" dependencies = [ "unicode-ident", ] [[package]] name = "quick-xml" -version = "0.23.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -2630,38 +2778,38 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox 0.0.1", "thiserror", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -2671,9 +2819,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -2682,13 +2830,13 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rog-control-center" -version = "4.7.2" +version = "5.0.6" dependencies = [ "asusd", "cargo-husky", @@ -2721,9 +2869,10 @@ dependencies = [ [[package]] name = "rog_anime" -version = "4.7.2" +version = "5.0.6" dependencies = [ "cargo-husky", + "dmi_id", "gif", "glam", "log", @@ -2731,29 +2880,29 @@ dependencies = [ "png_pong", "serde", "serde_derive", - "sysfs-class", "typeshare", "zbus", ] [[package]] name = "rog_aura" -version = "4.7.2" +version = "5.0.6" dependencies = [ "cargo-husky", + "dmi_id", "log", "ron", "serde", "serde_derive", - "sysfs-class", "typeshare", "zbus", ] [[package]] name = "rog_dbus" -version = "4.7.2" +version = "5.0.6" dependencies = [ + "asusd", "cargo-husky", "rog_anime", "rog_aura", @@ -2764,18 +2913,16 @@ dependencies = [ [[package]] name = "rog_platform" -version = "4.7.2" +version = "5.0.6" dependencies = [ "cargo-husky", "concat-idents", "inotify", "log", "rog_aura", - "rog_profiles", "rusb", "serde", "serde_derive", - "sysfs-class", "typeshare", "udev", "zbus", @@ -2783,10 +2930,11 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "4.7.2" +version = "5.0.6" dependencies = [ "cargo-husky", "log", + "rog_platform", "serde", "serde_derive", "typeshare", @@ -2796,7 +2944,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "4.7.2" +version = "5.0.6" dependencies = [ "glam", "log", @@ -2812,7 +2960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64", - "bitflags 2.4.0", + "bitflags 2.4.1", "serde", "serde_derive", ] @@ -2850,9 +2998,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -2864,22 +3012,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.5", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "same-file" @@ -2940,35 +3088,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.43", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -2977,29 +3125,29 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.43", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -3013,16 +3161,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] name = "signal-hook-registry" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3048,24 +3186,24 @@ dependencies = [ [[package]] name = "slotmap" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ "version_check", ] [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smithay-client-toolkit" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" dependencies = [ "bitflags 1.3.2", "calloop", @@ -3096,22 +3234,22 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-net", "async-process", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -3119,9 +3257,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -3173,9 +3311,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" dependencies = [ "proc-macro2", "quote", @@ -3183,24 +3321,15 @@ dependencies = [ ] [[package]] -name = "sysfs-class" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1bbcf869732c45a77898f7f61ed6d411dfc37613517e444842f58d428856d1" -dependencies = [ - "numtoa", -] - -[[package]] name = "system-deps" -version = "6.1.1" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.7.6", + "toml 0.8.8", "version-compare", ] @@ -3216,78 +3345,79 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "tauri-winrt-notification" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f" +checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" dependencies = [ "quick-xml", - "windows 0.39.0", + "windows 0.51.1", ] [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall 0.3.5", - "rustix 0.38.11", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.28", "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.43", ] [[package]] name = "time" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", + "powerfmt", "serde", "time-core", ] [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "tiny-skia" @@ -3340,29 +3470,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.3", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.43", ] [[package]] @@ -3376,30 +3506,41 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.21.0", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap", "serde", @@ -3410,11 +3551,10 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3422,35 +3562,35 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.43", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "ttf-parser" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[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 = "typeshare" @@ -3487,10 +3627,11 @@ dependencies = [ [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.0", "tempfile", "winapi", ] @@ -3508,24 +3649,24 @@ dependencies = [ [[package]] name = "uhidrs-sys" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6432b20db843292d5843dec450eaf19b8a2f8603ec91e74e4ab916d4815d3c18" +checksum = "e24880fbcee511571ed9104b9a5273d1563d11ccaaf54b7c05cc6c100b652f9f" dependencies = [ "bindgen", ] [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[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" @@ -3538,9 +3679,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -3583,9 +3724,9 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" @@ -3766,9 +3907,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" +checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" dependencies = [ "core-foundation", "home", @@ -3805,9 +3946,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", ] @@ -3829,19 +3970,6 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" -dependencies = [ - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", -] - -[[package]] -name = "windows" version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" @@ -3853,9 +3981,19 @@ dependencies = [ [[package]] name = "windows" -version = "0.48.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets 0.48.5", ] @@ -3901,6 +4039,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3931,6 +4078,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3943,10 +4105,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" +name = "windows_aarch64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" @@ -3961,10 +4123,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] -name = "windows_i686_gnu" -version = "0.39.0" +name = "windows_aarch64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" @@ -3979,10 +4141,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] -name = "windows_i686_msvc" -version = "0.39.0" +name = "windows_i686_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" @@ -3997,10 +4159,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" +name = "windows_i686_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" @@ -4015,6 +4177,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4027,10 +4195,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" +name = "windows_x86_64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" @@ -4045,10 +4213,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winit" -version = "0.28.6" +version = "0.28.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196" +checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" dependencies = [ "android-activity", "bitflags 1.3.2", @@ -4081,9 +4255,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" dependencies = [ "memchr", ] @@ -4101,12 +4275,12 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" +checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" dependencies = [ "gethostname", - "nix 0.24.3", + "nix 0.26.4", "winapi", "winapi-wsapoll", "x11rb-protocol", @@ -4114,21 +4288,18 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" +checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" dependencies = [ - "nix 0.24.3", + "nix 0.26.4", ] [[package]] name = "xcursor" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xdg-home" @@ -4142,9 +4313,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.17" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eee6bf5926be7cf998d7381a9a23d833fd493f6a8034658a9505a4dc4b20444" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "zbus" @@ -4155,8 +4326,8 @@ dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-process", "async-recursion", "async-task", @@ -4165,7 +4336,7 @@ dependencies = [ "byteorder", "derivative", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", @@ -4213,6 +4384,26 @@ dependencies = [ ] [[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] name = "zvariant" version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/applications/system/asusctl/default.nix b/pkgs/applications/system/asusctl/default.nix index 9ff3ac38f8d31..9bc6d3e133792 100644 --- a/pkgs/applications/system/asusctl/default.nix +++ b/pkgs/applications/system/asusctl/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitLab -, e2fsprogs , systemd , coreutils , pkg-config @@ -9,17 +8,18 @@ , fontconfig , gtk3 , libappindicator +, libGL }: rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "4.7.2"; + version = "5.0.6"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-q4V0Cn6kZeyIMGxu/blVi/Ot8LIcv+GlZhpkTQNTjRU="; + hash = "sha256-xeskbfpznXki+MnPt+Tli7+DYprRnpZaNb/O5mdnZy0="; }; cargoHash = ""; @@ -44,8 +44,6 @@ rustPlatform.buildRustPackage rec { substituteInPlace $file --replace /usr/share $out/share done - substituteInPlace asusd/src/ctrl_platform.rs --replace /usr/bin/chattr ${e2fsprogs}/bin/chattr - substituteInPlace data/asusd.rules --replace systemctl ${systemd}/bin/systemctl substituteInPlace data/asusd.service \ --replace /usr/bin/asusd $out/bin/asusd \ @@ -67,7 +65,7 @@ rustPlatform.buildRustPackage rec { ''; postFixup = '' - patchelf --add-rpath "${libappindicator}/lib" "$out/bin/rog-control-center" + patchelf --add-rpath "${libappindicator}/lib:${libGL}/lib" "$out/bin/rog-control-center" ''; meta = with lib; { diff --git a/pkgs/applications/system/glances/skip-failing-tests.patch b/pkgs/applications/system/glances/skip-failing-tests.patch deleted file mode 100644 index f47f1218aea56..0000000000000 --- a/pkgs/applications/system/glances/skip-failing-tests.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/unitest.py b/unitest.py ---- a/unitest.py -+++ b/unitest.py -@@ -59,6 +59,7 @@ class TestGlances(unittest.TestCase): - """The function is called *every time* before test_*.""" - print('\n' + '=' * 78) - -+ @unittest.skip("Requires access to /etc/mtab") - def test_000_update(self): - """Update stats (mandatory step for all the stats). - -@@ -87,6 +88,7 @@ class TestGlances(unittest.TestCase): - for plugin in plugins_to_check: - self.assertTrue(plugin in plugins_list) - -+ @unittest.skip("Fails on NixOS") - def test_002_system(self): - """Check SYSTEM plugin.""" - stats_to_check = ['hostname', 'os_name'] -@@ -97,6 +99,7 @@ class TestGlances(unittest.TestCase): - self.assertTrue(stat in stats_grab, msg='Cannot find key: %s' % stat) - print('INFO: SYSTEM stats: %s' % stats_grab) - -+ @unittest.skip("Fails on NixOS") - def test_003_cpu(self): - """Check CPU plugin.""" - stats_to_check = ['system', 'user', 'idle'] -@@ -110,7 +113,7 @@ class TestGlances(unittest.TestCase): - self.assertLessEqual(stats_grab[stat], 100) - print('INFO: CPU stats: %s' % stats_grab) - -- @unittest.skipIf(WINDOWS, "Load average not available on Windows") -+ @unittest.skip("Fails on NixOS") - def test_004_load(self): - """Check LOAD plugin.""" - stats_to_check = ['cpucore', 'min1', 'min5', 'min15'] -@@ -123,6 +126,7 @@ class TestGlances(unittest.TestCase): - self.assertGreaterEqual(stats_grab[stat], 0) - print('INFO: LOAD stats: %s' % stats_grab) - -+ @unittest.skip("Fails on NixOS") - def test_005_mem(self): - """Check MEM plugin.""" - stats_to_check = ['available', 'used', 'free', 'total'] -@@ -135,6 +139,7 @@ class TestGlances(unittest.TestCase): - self.assertGreaterEqual(stats_grab[stat], 0) - print('INFO: MEM stats: %s' % stats_grab) - -+ @unittest.skip("Fails on NixOS") - def test_006_swap(self): - """Check MEMSWAP plugin.""" - stats_to_check = ['used', 'free', 'total'] diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix index 31c256f46c8e4..563d0904fc53f 100644 --- a/pkgs/applications/system/qjournalctl/default.nix +++ b/pkgs/applications/system/qjournalctl/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "qjournalctl"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "pentix"; repo = pname; rev = "v${version}"; - sha256 = "0j27cmfq29mwrbjfrrwi6m1grcamhbfhk47xzlfsx5wr2q9m6qkz"; + sha256 = "sha256-anNNzqjbIaQI+MAwwMwzy6v4SKqi4u9F5IbFBErm4q8="; }; postPatch = '' diff --git a/pkgs/applications/system/supergfxctl/default.nix b/pkgs/applications/system/supergfxctl/default.nix index 76fcfb459a629..cb05475dd0371 100644 --- a/pkgs/applications/system/supergfxctl/default.nix +++ b/pkgs/applications/system/supergfxctl/default.nix @@ -1,33 +1,22 @@ { lib , rustPlatform , fetchFromGitLab -, fetchpatch , pkg-config , systemd }: rustPlatform.buildRustPackage rec { pname = "supergfxctl"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitLab { owner = "asus-linux"; repo = "supergfxctl"; rev = version; - hash = "sha256-AThaZ9dp5T/DtLPE6gZ9qgkw0xksiq+VCL9Y4G41voE="; + hash = "sha256-HJGyjFeN3bq+ArCGfFHAMnjW76wSnNyxPWR0ELcyjLg="; }; - # fix reported version in Cargo.lock - # submitted upstream: https://gitlab.com/asus-linux/supergfxctl/-/merge_requests/31 - # FIXME: remove for next update - cargoPatches = [ - (fetchpatch { - url = "https://gitlab.com/asus-linux/supergfxctl/-/commit/8812dd208791d162881d72f785650a3344ec5151.diff"; - hash = "sha256-eFFj2nIwGXHV1vMIpZvdvFPtfNLDfgqyGRt+VvB03LE="; - }) - ]; - - cargoSha256 = "sha256-gbRGUWfpCQjCxuTdQ+qwOeCDU17G3nNFkIPAgzmeL+E="; + cargoSha256 = "sha256-wPqCXbpSYXwsUi1mv9ZBSxdhDgDqsjKxnPzQcURlnDU="; postPatch = '' substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index fc2b470178f3b..2aaa68801cb7a 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , lib -, go , pkg-config , libX11 , libXcursor @@ -12,20 +11,23 @@ , libXxf86vm , libGL , nixosTests +, buildGoModule }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "darktile"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "liamg"; repo = "darktile"; rev = "v${version}"; - sha256 = "0pdj4yv3qrq56gb67p85ara3g8qrzw5ha787bl2ls4vcx85q7303"; + hash = "sha256-M3vySAyYwqscR9n0GGXp1ttO/mhdSCponZNYJRBBI18="; }; - nativeBuildInputs = [ go pkg-config ]; + vendorHash = null; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 @@ -38,25 +40,6 @@ stdenv.mkDerivation rec { libGL ]; - postPatch = '' - substituteInPlace scripts/build.sh \ - --replace "bash" "sh" - ''; - - postConfigure = '' - export GOPATH=$TMP/go - ''; - - makeFlags = [ "HOME=$TMP" ]; - - installPhase = '' - runHook preInstall - - install -Dm755 darktile -t $out/bin - - runHook postInstall - ''; - passthru.tests.test = nixosTests.terminal-emulators.darktile; meta = with lib; { @@ -65,7 +48,9 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/liamg/darktile/releases"; changelog = "https://github.com/liamg/darktile/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ flexagoon ]; + platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; + maintainers = with maintainers; [ mikaelfangel ]; mainProgram = "darktile"; }; } diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 3614046f6846c..f11c456d43760 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -165,6 +165,10 @@ in stdenv.mkDerivation (finalAttrs: { --replace "-m 4755 -o root" " " ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types"; + }; + configureFlags = [ (withFeaturesList "type-engines" enableTypeEngines) (withFeaturesList "tools" enableTools) diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index 0aeed26fb5be2..8409ec883c520 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -31,6 +31,8 @@ let rlinkLibs = if stdenv.isDarwin then [ darwin.libobjc darwin.apple_sdk_11_0.frameworks.AppKit + darwin.apple_sdk_11_0.frameworks.AVFoundation + darwin.apple_sdk_11_0.frameworks.Vision ] else [ (lib.getLib gcc-unwrapped) fontconfig @@ -49,16 +51,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.28"; + version = "0.0.33"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-OkJYGX/yWOUb4cDwacDgDRgzc/fkAnNcCzUrHimiVgM="; + hash = "sha256-/SpSOcxuEL2vsqbZAqbjTgnLhcyr0/ckfvcI1nwkWFg="; }; - cargoHash = "sha256-vcIv3EGM8LEdg//FM/d+gDLLQFWukEE1/wfLVTXqN9w="; + cargoHash = "sha256-hXO/hdHmYjbwR3Ae5VV/HB1SVp/jhY05fIxi04n7X/Y="; nativeBuildInputs = [ ncurses @@ -112,7 +114,7 @@ rustPlatform.buildRustPackage rec { description = "A hardware-accelerated GPU terminal emulator powered by WebGPU"; homepage = "https://raphamorim.io/rio"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ otavio oluceps ]; + maintainers = with lib.maintainers; [ tornax otavio oluceps ]; platforms = lib.platforms.unix; changelog = "https://github.com/raphamorim/rio/blob/v${version}/CHANGELOG.md"; mainProgram = "rio"; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 5d8df1bec774a..4b90d39bd2819 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { pname = "commitizen"; - version = "3.12.0"; + version = "3.13.0"; format = "pyproject"; disabled = python3.pythonOlder "3.8"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { owner = "commitizen-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Gzx2DdCX8GyxYEi8OH2a21V6JkA50qA+39IInEjLReI="; + hash = "sha256-6Zo+d1OuaHYVf/KX8hKlyp/YS/1tHFmpNK6ssnxg7h0="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 4c99078ab275b..a45d76970664c 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "cvs-fast-export"; - version = "1.61"; + version = "1.62"; src = fetchurl { url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz"; - sha256 = "sha256-4iH8VKxVliVZKwZ40rGMb3fH1nxTBdMT5IcBzdp1mjw="; + sha256 = "sha256-ix0fg2wn2yStrgEhAxsSXvLu+C7sb2V5oyVCfhAe/R8="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/deepgit/default.nix b/pkgs/applications/version-management/deepgit/default.nix index c430a02b24c68..8a778526b4ad8 100644 --- a/pkgs/applications/version-management/deepgit/default.nix +++ b/pkgs/applications/version-management/deepgit/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "deepgit"; - version = "4.3.1"; + version = "4.4"; src = fetchurl { url = "https://www.syntevo.com/downloads/deepgit/deepgit-linux-${lib.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - hash = "sha256-Ovd9MjgpMJvNySW/FPXYVtpLoCSQP1W1nlcNkgI7sgA="; + hash = "sha256-ILqwXDyW7/hZzoSxxaxv4bF5xsB/JFaOBYAJFb7xmdk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 31a71d5b8ad7d..e07b538544002 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fnc"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz"; - sha256 = "sha256-8up844ekIOMcPlfB2DJzR/GgJY9s/sBeYpG+YtdauvU="; + url = "https://fnc.bsdbox.org/tarball/${finalAttrs.version}/fnc-${finalAttrs.version}.tar.gz"; + hash = "sha256-6I6wtSMHaKdnlUK4pYiaybJeODGu2P+smYW8lQDIWGM="; }; buildInputs = [ libiconv ncurses zlib ]; @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ # Needed with GCC 12 "-Wno-error=maybe-uninitialized" + ] ++ lib.optionals stdenv.isDarwin [ + # error: 'strtonum' is only available on macOS 11.0 or newer + "-Wno-error=unguarded-availability-new" ]); preInstall = '' @@ -35,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbe ]; mainProgram = "fnc"; }; -} +}) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 689167e3fbf8f..34d2103daa0bd 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -24,7 +24,7 @@ let pname = "forgejo-frontend"; inherit (forgejo) src version; - npmDepsHash = "sha256-7ruJczJ2cE51UmoER8C3JsGm0p3RTwfqKx0eErB7LZs="; + npmDepsHash = "sha256-bxgkJODph88aXYYj50gNNP4gpsd18uOj0dQEX6GqEsc="; patches = [ ./package-json-npm-build-frontend.patch @@ -39,17 +39,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.21.1-0"; + version = "1.21.3-0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-e7Y1YBJq3PwYl7hf5KUa/CSI4ihbpN/TjWwltjNwXRM="; + hash = "sha256-iBZIn2VGagG1RMBKm9qyg4RRscStr+PsdxOpprrInyo="; }; - vendorHash = "sha256-+/wOEF44dSqy7ZThZyd66xyI3wVnFwZbsAd4ujyVku8="; + vendorHash = "sha256-+ukS9+SxymwnMSnr/BaL4lhc83wYC6+4BWYTbBTrWy8="; subPackages = [ "." ]; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 4ec89b050931c..6883196756270 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.8.3"; + version = "3.9.1"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - hash = "sha256-EfXnJ7oyXsnAajUPJTmBQE/lUCW8Xm/hF4+N6BvX6fQ="; + hash = "sha256-WQjzkykKtrXfkNSWcM9GWy8LPMwxJpSbnWjpmslP0HA="; }; buildCommand = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; description = "A web based code review and repository management for the git version control system"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = with maintainers; [ flokli jammerful zimbatm ]; + maintainers = with maintainers; [ flokli zimbatm ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 622f5846f9907..4b158250b9c4f 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.39.2"; + version = "2.40.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-6FjsUEroHpAjQj+7Z/C935LunYbgAzRvQI2pORiLo3s="; + hash = "sha256-KdJZHouMTbbD/8k2VGFvRits7grbbVNUmCM6dSiJXBc="; }; vendorHash = "sha256-jM9nwTMOTh+eXztLvHIwwH4qu3ZIMOtBrPEtByB9Ry8="; diff --git a/pkgs/applications/version-management/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-annex-remote-rclone/default.nix index a38be753dfa9e..4d1a7b2ade1d8 100644 --- a/pkgs/applications/version-management/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-annex-remote-rclone/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "git-annex-remote-rclone"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "DanielDent"; repo = "git-annex-remote-rclone"; rev = "v${version}"; - sha256 = "sha256-H2C4zjM+kbC9qPl1F+bSnepuqANjZd1sz6XxOTkVVkU="; + sha256 = "sha256-B6x67XXE4BHd3x7a8pQlqPPmpy0c62ziDAldB4QpqQ4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-hound/default.nix b/pkgs/applications/version-management/git-hound/default.nix index 7a135b69a2e3b..86efeef1c4445 100644 --- a/pkgs/applications/version-management/git-hound/default.nix +++ b/pkgs/applications/version-management/git-hound/default.nix @@ -1,20 +1,32 @@ { buildGoModule , fetchFromGitHub +, fetchpatch , lib }: buildGoModule rec { pname = "git-hound"; - version = "1.4"; + version = "1.7.2"; src = fetchFromGitHub { owner = "tillson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E="; + hash = "sha256-W+rYDyRIw4jWWO4UZkUHFq/D/7ZXM+y5vdbclk6S0ro="; }; - vendorHash = null; + patches = [ + # https://github.com/tillson/git-hound/pull/66 + (fetchpatch { + url = "https://github.com/tillson/git-hound/commit/cd8aa19401cfdec9e4d76c1f6eb4d85928ec4b03.patch"; + hash = "sha256-EkdR2KkxxlMLNtKFGpxsQ/msJT5NcMF7irIUcU2WWJY="; + }) + ]; + + # tests fail outside of nix + doCheck = false; + + vendorHash = "sha256-8teIa083oMXm0SjzMP+mGOVAel1Hbsp3TSMhdvqVbQs="; meta = with lib; { description = "Reconnaissance tool for GitHub code search"; @@ -26,6 +38,6 @@ buildGoModule rec { homepage = "https://github.com/tillson/git-hound"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check + mainProgram = "git-hound"; }; } diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 54ce30907323e..6988e590cf72d 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-lfs"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "git-lfs"; repo = "git-lfs"; rev = "v${version}"; - hash = "sha256-lZx+sJQttclZPET0jkv3dmpQysCpsYani+La7yfSUlI="; + hash = "sha256-XqxkNCC2yzUTVOi/1iDsnxtLkw4jfQuBh9UsjtZ1zVc="; }; vendorHash = "sha256-VmPeQYWOHFqFLHKcKH3WHz50yx7GMHVIDPzqiVwwjSg="; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index a1f45d65db354..776ec66d3a77a 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.20.0"; + version = "3.22.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-6TntyAkDIcCVcAsNdAlgvKYO7Db0oMDWKW92rMRIDI4="; + hash = "sha256-2oEpBNMHj4qpkPp8rXEMsRRiRQeC30hQCQh7d8bOLUU="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 68b3fc6cd4675..a2e89614b1c95 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.178"; + version = "5.12.181"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-PyQhg3JJqfOVjT72kvfki4krLB3YRP9EHqbIptRI9nc="; + hash = "sha256-XXVLYKicFcYNx33eElqlZcDNZgq4FnbwvYSshZwwHls="; }; - cargoHash = "sha256-/8zrqj3Nlm84eAYfMzpZJ9Bgv5Tjyucfv9YcXdGXXFQ="; + cargoHash = "sha256-PskRV+LfHjHK0WTwb9Lt2E2R9g+lyyEY7A1vvFLhPdw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-quick-stats/default.nix b/pkgs/applications/version-management/git-quick-stats/default.nix index feb4bcafc1b44..7d629aa92a2b0 100644 --- a/pkgs/applications/version-management/git-quick-stats/default.nix +++ b/pkgs/applications/version-management/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-ff8n8SkeppZzJO58OrPQJ0MInZCIz8nTb7lmiCC0ATg="; + sha256 = "sha256-Fh8FSaclxOkTr49HixjwoM/367RjtdQ4dRyw87KylPs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index 661abe06f73e2..ca63fb9b4c1ef 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "9.0.1"; + version = "11.1.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-JvN7te59uRMC0TOWsBUYNEPLIn4nLlIvXI5gOQfQaCU="; + hash = "sha256-QQ+sIZzkzecs+pZBzsmCL048JZpMPvdYi0PRtMN4AhY="; }; vendorHash = null; @@ -55,7 +55,7 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = git-town; - command = "git-town version"; + command = "git-town --version"; version = "v${version}"; }; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 5cbc4a1bd493a..124e3eff217ab 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.21.1"; + version = "1.21.3"; # 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-5WEHUMQsQNgrglS+xJ4IWHUl0a6RLLPyx0l+ECJ4R9g="; + hash = "sha256-tJC9p7++lb3lD0yYR4qAtFOTRBQK2SkNCD6Tk+g9M78="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index a58ea68fe2b6d..0e25f63765e14 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -10,24 +10,24 @@ with lib; let pname = "gitkraken"; - version = "9.9.2"; + version = "9.10.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-UfzHkgqxEaSsoiDwFLsyIBW2min9AvSBrLPJ2MlKh3U="; + hash = "sha256-JVeJY0VUNyIeR/IQcfoLBN0I1WQNFy7PpCjzk5bPv/Q="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-ble0n+giM8xmuSewBVdj+RuT2093rW0taNzsyQLO92I="; + hash = "sha256-npc+dwHH0tlVKkAZxmGwpoiHXeDn0VHkivqbwoJsI7M="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "sha256-QYhYzjqbCO0/pRDK7c5jYifj+/UY7SLpRqQUQ3LBFkE="; + hash = "sha256-fszsGdNKcVgKdv97gBBf+fSODzjKbOBB4MyCvWzm3CA="; }; }; @@ -39,7 +39,7 @@ let sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ xnwdd evanjs arkivm ]; + maintainers = with maintainers; [ xnwdd evanjs arkivm nicolas-goudry ]; mainProgram = "gitkraken"; }; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 01773299cf1bc..9c708f176a917 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.5.1", - "repo_hash": "sha256-7vKdCFDgtXSTlYV9nfLuQ+LZCaGDLU9zp97rob4dj2A=", - "yarn_hash": "1df7lf2grxpfjy1vgwsxw9n310jgjb64vqcxn2a7wzgh0svr1yyf", + "version": "16.5.3", + "repo_hash": "sha256-0Tewet9A0+0wDcMWVhXMGx1zr/R2WN46h+pEP3pEkac=", + "yarn_hash": "03ryyk7dw7s8yjdx9wdrvllaydb0w5an06agkwf5npgr6x1bz3yv", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.5.1-ee", + "rev": "v16.5.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.5.1", - "GITLAB_PAGES_VERSION": "16.5.1", + "GITALY_SERVER_VERSION": "16.5.3", + "GITLAB_PAGES_VERSION": "16.5.3", "GITLAB_SHELL_VERSION": "14.29.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.4.0", - "GITLAB_WORKHORSE_VERSION": "16.5.1" + "GITLAB_WORKHORSE_VERSION": "16.5.3" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index eddab0b53c9dc..3144d39d1adfc 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.5.1"; + version = "16.5.3"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -18,7 +18,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-LrkFSsWIPqiEXUV5OyYkB2XUbCMXjbpcCmTacR33vOQ="; + hash = "sha256-lGwRGU24pyBypQRTvGRYaAmkVbPLaw+fSeAXJ1pyQaA="; }; vendorHash = "sha256-QLt/12P6OLpLqCINROLmzhoRpLGrB9WzME7FzhIcb0Q="; 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 44fc1630c1966..2ce13dba4355d 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.85.0"; + version = "3.86.2"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - sha256 = "sha256-F20f1qDsI+moBAL+Tpx5AALgOi0vTH7hZ5RIvRMwY1s="; + sha256 = "sha256-hZhlSZ/crwzc8KEkbMGY9zAYVbMT9p4y7Wm3B+F+iPU="; }; - vendorHash = "sha256-JWuSJD2Mi0om9vA6+mYbArfr2lmGlRua6IM0DhDzSBk="; + vendorHash = "sha256-3iBMn1kA/GZC/7FEFLd1/e7+mSsCOAo+zQo3dVpTHw4="; patches = [ ./Disable-inmemory-storage-driver-test.patch diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 72a12a81f3c28..966d6c445d05b 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.5.1"; + version = "16.5.3"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-1fcsliorkl118MyUnZ3yrQjwLBQGsNBBA4dIEFHBJAI="; + hash = "sha256-eE+QuzqNm3zA0le8MWR3Kbc+/kQtKIrSd9sTmVYaNbQ="; }; vendorHash = "sha256-YG+ERETxp0BPh/V4820pMXTXu9YcodRhzme6qZJBC9Q="; @@ -20,6 +20,6 @@ buildGoModule rec { homepage = "https://gitlab.com/gitlab-org/gitlab-pages"; changelog = "https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ajs124 das_j ] ++ teams.gitlab.members; + maintainers = teams.helsinki-systems.members ++ teams.gitlab.members; }; } diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 961d2d6dbd6c7..cc6823b1e4513 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.5.1"; + version = "16.5.3"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/version-management/hut/default.nix b/pkgs/applications/version-management/hut/default.nix index 931f85fd45f0b..0a22f17fbf139 100644 --- a/pkgs/applications/version-management/hut/default.nix +++ b/pkgs/applications/version-management/hut/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hut"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "hut"; rev = "v${version}"; - sha256 = "sha256-kr5EWQ3zHUp/oNPZV2d3j9AyoEmHEX8/rETiMKTBi3s="; + sha256 = "sha256-9RSJ+SRXYBjdiuHScgFm5i0/Xi81pJfURPKAGCk+l04="; }; - vendorHash = "sha256-aoqGb7g8UEC/ydmL3GbWGy3HDD1kfDJOMeUP4nO9waA="; + vendorHash = "sha256-OxnplvBx2sFctdNSVd0S0tgiRt5Yah3ga4mORT2Kz6U="; nativeBuildInputs = [ scdoc diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index a4e68c190ae1b..cd6515c67eace 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.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - hash = "sha256-yEW7+0MnJlW0WeZ6UItaCDrihPLA52mLcu15tJwZx9w="; + hash = "sha256-9m8GmVIZgHETkemzElXOfVxaZlzJwZaT2sJcTU7vZ2g="; }; - cargoHash = "sha256-xA9SDq1Kc0u8qFEPFFCic9uwE2Y/BXJzUHBCs1Czxtw="; + cargoHash = "sha256-g1gdFGj0nzczR2yyjCdjpCGtFlmX7yrdAQIa3sQRATg="; cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors useNextest = true; # nextest is the upstream integration framework diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 29dbe0573422d..82417f59352b1 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-r8OdcGeXZZPIMyuOl6Eq/Tk7VQN8X7nDyrGkLHVg9go="; + sha256 = "sha256-LNyB+t4SnPVrEoQXUn8ZC6cv13ZWc5TOVO7XZOZn59U="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-dcyHmLkRadNK30Vv0XsCEaZGTIcF/L29lLe58ggB3Lg="; + sha256 = "sha256-ob81zMUY4AVNIbkFKyImnj7QhHTh7LVOCcGeZDtTAXc="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/applications/version-management/radicle-upstream/default.nix b/pkgs/applications/version-management/radicle-upstream/default.nix index c88d0b9d38666..51365d0c4a31b 100644 --- a/pkgs/applications/version-management/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/radicle-upstream/default.nix @@ -76,6 +76,7 @@ let license = licenses.gpl3Plus; maintainers = with maintainers; [ d-xo ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; in if stdenv.isDarwin diff --git a/pkgs/applications/version-management/scriv/default.nix b/pkgs/applications/version-management/scriv/default.nix index fd7d78cc28a56..cd4f65e427111 100644 --- a/pkgs/applications/version-management/scriv/default.nix +++ b/pkgs/applications/version-management/scriv/default.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "scriv"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - hash = "sha256-vdGtdJGkaUzH2JoxuFsfM57OodlxbEHuLl81giKUn6U="; + hash = "sha256-+OTWFDnHCF2bxQU8f7DfULYG1cA9tOZCsNRPdKobns8="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec { click click-log jinja2 + markdown-it-py requests ] ++ lib.optionals (python3.pythonOlder "3.11") [ tomli diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index ecef523a0ec8f..693505b20305c 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , makeDesktopItem -, jre +, openjdk19 , gtk3 , glib , gnome @@ -10,14 +10,16 @@ , libXtst , which }: - +let + jre = openjdk19; +in stdenv.mkDerivation rec { pname = "smartgithg"; - version = "22.1.5"; + version = "23.1.1"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "sha256-s31sYEC1g7eLMhT9UkmjbBnHePY9wnQPmgGQXgVX4j4="; + sha256 = "sha256-LXB+OymApJjL4bgOZ8Vfd193jZHVbQ6G2zmrHNE/OJk="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 4831959d0fe0c..3eb45eb9e5284 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -11,6 +11,9 @@ , lxml , python , unzip +, pip +, pythonOlder +, setuptools }: let version = "0.86.10"; @@ -39,12 +42,20 @@ in buildPythonPackage rec { inherit src version; pname = "buildsrht"; + pyproject = true; + + disabled = pythonOlder "3.7"; postPatch = '' substituteInPlace Makefile \ --replace "all: api worker" "" ''; + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ srht redis diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index b413aa2c001d1..65eac84daf8d0 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -21,12 +21,17 @@ , importlib-metadata , tinycss2 , sassc +, pythonOlder , minify +, setuptools }: buildPythonPackage rec { pname = "srht"; version = "0.69.15"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -41,6 +46,10 @@ buildPythonPackage rec { patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch ]; + nativeBuildInputs = [ + setuptools + ]; + propagatedNativeBuildInputs = [ sassc minify diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 3a5163f9d1712..8f6adfde2ed3b 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -7,7 +7,10 @@ , scmsrht , pygit2 , minio +, pythonOlder , unzip +, pip +, setuptools }: let version = "0.84.2"; @@ -78,12 +81,20 @@ in buildPythonPackage rec { inherit src version; pname = "gitsrht"; + pyproject = true; + + disabled = pythonOlder "3.7"; postPatch = '' substituteInPlace Makefile \ --replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" "" ''; + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ srht scmsrht diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index f448109a6d7df..6bc2662329027 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -8,11 +8,17 @@ , unidiff , python , unzip +, pip +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "hgsrht"; version = "0.32.4"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -49,6 +55,11 @@ buildPythonPackage rec { ''; }; + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ python-hglib scmsrht diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 6f1b17b01c3e7..bc7d243a7c0a2 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -4,13 +4,19 @@ , buildPythonPackage , python , srht +, setuptools +, pip , pyyaml +, pythonOlder , unzip }: buildPythonPackage rec { pname = "hubsrht"; version = "0.17.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -30,6 +36,11 @@ buildPythonPackage rec { vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ srht pyyaml @@ -44,7 +55,13 @@ buildPythonPackage rec { ln -s ${hubsrht-api}/bin/api $out/bin/hubsrht-api ''; - pythonImportsCheck = [ "hubsrht" ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "hubsrht" + ]; meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/hub.sr.ht"; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 24b56b9dd3c15..6d62bdbdc1ecc 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -9,11 +9,17 @@ , emailthreads , python , unzip +, pip +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "listssrht"; version = "0.57.8"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -34,6 +40,11 @@ buildPythonPackage rec { --replace "all: api" "" ''; + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ srht aiosmtpd diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index b01d739a06009..04bfabb8053b2 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -6,11 +6,17 @@ , pygit2 , python , unzip +, pip +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "mansrht"; version = "0.16.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -30,6 +36,11 @@ buildPythonPackage rec { vendorHash = "sha256-K5EmZ4U+xItTR85+SCwhwg5KUGLkKHo9Nr2pkvmJpfo="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ srht pygit2 diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 28cab5852193c..cbfc610fdf5f7 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -13,6 +13,9 @@ , zxcvbn , python , unzip +, pip +, pythonOlder +, setuptools }: let version = "0.64.8"; @@ -35,12 +38,20 @@ in buildPythonPackage rec { pname = "metasrht"; inherit version src; + pyproject = true; + + disabled = pythonOlder "3.7"; postPatch = '' substituteInPlace Makefile \ --replace "all: api" "" ''; + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ alembic bcrypt diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index 9f1aa7f91a792..59bd7c8334fa6 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -3,8 +3,11 @@ , buildGoModule , buildPythonPackage , srht +, pip , pyyaml , python +, pythonOlder +, setuptools , unzip }: @@ -28,12 +31,20 @@ in buildPythonPackage rec { inherit src version; pname = "pastesrht"; + pyproject = true; + + disabled = pythonOlder "3.7"; postPatch = '' substituteInPlace Makefile \ --replace "all: api" "" ''; + nativeBuildInputs = [ + pip + setuptools + ]; + propagatedBuildInputs = [ srht pyyaml diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 810f3007c2537..cadf3d0989b97 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -4,11 +4,16 @@ , srht , pyyaml , buildsrht +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "scmsrht"; version = "0.22.23"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -17,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-058dOEYJDY3jtxH1VkV1CFq5CZTkauSnTWg57DCnNtw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ srht pyyaml @@ -28,6 +37,7 @@ buildPythonPackage rec { ''; dontUseSetuptoolsCheck = true; + pythonImportsCheck = [ "scmsrht" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 0a5cefc130d5c..2fc9c4485fd7b 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -8,11 +8,16 @@ , factory-boy , python , unzip +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "todosrht"; version = "0.74.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -33,6 +38,10 @@ buildPythonPackage rec { vendorHash = "sha256-rvfG5F6ez8UM0dYVhKfzwtb7ZEJlaKMBAfKDbo3Aofc="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ srht alembic diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix index a13f25e681955..ef7da9d880bfb 100644 --- a/pkgs/applications/version-management/sparkleshare/default.nix +++ b/pkgs/applications/version-management/sparkleshare/default.nix @@ -49,6 +49,9 @@ stdenv.mkDerivation rec { ]; patchPhase = '' + # SparkleShare's default desktop file falls back to flatpak. + sed -ie "s_^Exec=.*_Exec=$out/bin/sparkleshare_" SparkleShare/Linux/SparkleShare.Autostart.desktop + # Nix will manage the icon cache. echo '#!/bin/sh' >scripts/post-install.sh ''; diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix index f576859647c59..c88e5a219aaf0 100644 --- a/pkgs/applications/version-management/stgit/default.nix +++ b/pkgs/applications/version-management/stgit/default.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-+ipNSdEaz3nVBTYS+A4Fauan0DaKZR69No95FTS2/4o="; + hash = "sha256-5fMGWqvGbpRVAgarNO0zV8ID+X/RnguGHF927syCXGg="; }; - cargoHash = "sha256-G0g+53HWxhJfozMGByhmgnxws6P10FY9fAOleqhn+Mk="; + cargoHash = "sha256-U63r0tcxBTQMONHJp6WswqxTUH7uzw6a7Vc4Np1bATY="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index 389d00dc1a41e..375a930b02940 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -21,13 +21,13 @@ assert withMpv || withVlc || withIina; stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "4.6"; + version = "4.7"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - hash = "sha256-ahyCD4QsYyb3xtNK03HITeF0+hJFIHZ+PAjisuS/Kdo="; + hash = "sha256-Ll4bHKrDZukoQX35iiMI6rMSgiTC6wp7fHUnOMPagOA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/bilibili/default.nix b/pkgs/applications/video/bilibili/default.nix index f7a9bd8367452..7c9bbc4cfadf6 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.12.3-1"; + version = "1.12.5-2"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-F2y5daIdNJZGNjOctN9iA6kHSRVSMWK8s80X+kXxzb4="; + hash = "sha256-oaQvJQVHXm7I+3rjt0DPMwGOXLhwgJP6wWu2bhaA1s4="; }; unpackPhase = '' diff --git a/pkgs/applications/video/cutecapture/default.nix b/pkgs/applications/video/cutecapture/default.nix index 48d9c238964e9..a588ddb38a8d4 100644 --- a/pkgs/applications/video/cutecapture/default.nix +++ b/pkgs/applications/video/cutecapture/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' install -Dm644 -t $out/lib/udev/rules.d 95-{3,}dscapture.rules + install -Dm444 -t $out/share/applications Cute{3,}DSCapture.desktop + install -Dm444 -t $out/share/icons/hicolor/128x128/apps Cute{3,}DSCapture.png ''; meta = with lib; { diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 5b44ddc042a30..951d46d783b08 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -31,7 +31,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "18.6.3"; + version = "18.6.4"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } ) @@ -52,8 +52,8 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant - then "sha256-OX8PyMhfl0jRdXBNsjlwkCAh8XUNJv8HEbmyAdjIv18=" - else "sha256-PNzdVxGgXIHM2vi3ChHx67TQBFlCYBOZCiFkDi/RSu4="; + then "sha256-Us8DsxdGwBxUL+yUHT9DNJFIV7EO+J9CSN2Juyf8VQ4=" + else "sha256-yPdfmS42ID7MOTB3XlGXfOqp46kRLR8martJ9gWqDjA="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index d834f41604ab1..4909fe6fa7865 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "2.0.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-wTWdIPptbqt1cZgK6IDTZdrhno4Qlf4AujugfQ/xOT0="; + sha256 = "sha256-NZ6sKLE/Sq4VBJSf7iG0CgdVwmU8JXQH/utbobBEFi0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index daf785b7139fa..721368ae390ae 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, imagemagick +, autoreconfHook , libdvdread , libxml2 , freetype @@ -15,20 +15,18 @@ stdenv.mkDerivation rec { pname = "dvdauthor"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { url = "mirror://sourceforge/dvdauthor/dvdauthor-${version}.tar.gz"; - sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh"; + hash = "sha256-MCCpLen3jrNvSLbyLVoAHEcQeCZjSnhaYt/NCA9hLrc="; }; - buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi flex bison ]; - patches = [ - ./dvdauthor-0.7.1-automake-1.13.patch - ./dvdauthor-0.7.1-mga-strndup.patch - ./dvdauthor-imagemagick-0.7.0.patch + nativeBuildInputs = [ + pkg-config + autoreconfHook ]; meta = with lib; { diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch deleted file mode 100644 index 786f0c9685563..0000000000000 --- a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- dvdauthor/configure.ac~ 2013-01-04 08:27:40.713197029 +0800 -+++ dvdauthor/configure.ac 2013-01-04 08:27:53.273525273 +0800 -@@ -1,6 +1,6 @@ - AC_INIT(DVDAuthor,0.7.1,dvdauthor-users@lists.sourceforge.net) - --AM_CONFIG_HEADER(src/config.h) -+AC_CONFIG_HEADERS(src/config.h) - AC_CONFIG_AUX_DIR(autotools) - - AM_INIT_AUTOMAKE diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch deleted file mode 100644 index 5f77a68081a45..0000000000000 --- a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: dvdauthor/src/dvdvml.l -=================================================================== ---- dvdauthor/src/dvdvml.l -+++ dvdauthor/src/dvdvml.l 2014-09-14 19:36:05.098847465 +0000 -@@ -19,6 +19,7 @@ - * USA - */ - -+#include "config.h" - #include "compat.h" /* needed for bool */ - #include "dvdvm.h" - #include "dvdvmy.h" -Index: dvdauthor/src/dvdvmy.y -=================================================================== ---- dvdauthor/src/dvdvmy.y -+++ dvdauthor/src/dvdvmy.y 2014-09-14 19:36:28.251618378 +0000 -@@ -19,6 +19,7 @@ - * USA - */ - -+#include "config.h" - #include "compat.h" /* needed for bool */ - #include "dvdvm.h" - diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch b/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch deleted file mode 100644 index 52b6cc44cd590..0000000000000 --- a/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dvdauthor/configure.ac.orig 2010-10-23 04:26:49.000000000 +0200 -+++ dvdauthor/configure.ac 2010-10-24 14:37:45.489064778 +0200 -@@ -31,7 +31,7 @@ - - usemagick=0 - --AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config]) -+AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config]) - if test -n "$MAGICKCONFIG"; then - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LIBS="$LIBS" diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index e38b4dde3d29a..fd779bf0bf813 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -10,11 +10,11 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "filebot"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz"; - hash = "sha256-BCsZBRtT2Ka7WZw7WFnagwoJwIO1L3qpFk/6nlGdpmQ="; + hash = "sha256-+5I0t67asbCwaMCuqI/ixRHNAdcLTziuYOfepVThoPk="; }; unpackPhase = "tar xvf $src"; diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/applications/video/flowblade/default.nix index 29d095fe67fde..c9f3e9d3ab324 100644 --- a/pkgs/applications/video/flowblade/default.nix +++ b/pkgs/applications/video/flowblade/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "flowblade"; - version = "2.10.0.4"; + version = "2.12"; src = fetchFromGitHub { owner = "jliljebl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IjutDCp+wrvXSQzvELuPMdW/16Twi0ee8VjdAFyi+OE="; + sha256 = "sha256-HVDyrEgQ5Lgqpagh+DEb4BjoByJz6VdE/NWMCX1mabU="; }; buildInputs = [ diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index b573fa3a43f61..7b8113e906e49 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -60,5 +60,61 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; platforms = platforms.linux; + knownVulnerabilities = [ + "CVE-2023-48958" + "CVE-2023-48090" + "CVE-2023-48039" + "CVE-2023-48014" + "CVE-2023-48013" + "CVE-2023-48011" + "CVE-2023-47465" + "CVE-2023-47384" + "CVE-2023-46932" + "CVE-2023-46931" + "CVE-2023-46930" + "CVE-2023-46928" + "CVE-2023-46927" + "CVE-2023-46871" + "CVE-2023-46001" + "CVE-2023-42298" + "CVE-2023-41000" + "CVE-2023-39562" + "CVE-2023-37767" + "CVE-2023-37766" + "CVE-2023-37765" + "CVE-2023-37174" + "CVE-2023-23143" + "CVE-2023-5998" + "CVE-2023-5595" + "CVE-2023-5586" + "CVE-2023-5520" + "CVE-2023-5377" + "CVE-2023-4778" + "CVE-2023-4758" + "CVE-2023-4756" + "CVE-2023-4755" + "CVE-2023-4754" + "CVE-2023-4722" + "CVE-2023-4721" + "CVE-2023-4720" + "CVE-2023-4683" + "CVE-2023-4682" + "CVE-2023-4681" + "CVE-2023-4678" + "CVE-2023-3523" + "CVE-2023-3291" + "CVE-2023-3013" + "CVE-2023-3012" + "CVE-2023-1655" + "CVE-2023-1654" + "CVE-2023-1452" + "CVE-2023-1449" + "CVE-2023-1448" + "CVE-2023-0866" + "CVE-2023-0841" + "CVE-2023-0819" + "CVE-2023-0818" + "CVE-2023-0817" + ]; }; } diff --git a/pkgs/applications/video/gyroflow/Cargo.lock b/pkgs/applications/video/gyroflow/Cargo.lock new file mode 100644 index 0000000000000..2a3709e1b15e4 --- /dev/null +++ b/pkgs/applications/video/gyroflow/Cargo.lock @@ -0,0 +1,5084 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy 0.7.32", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "ahrs" +version = "0.6.0" +source = "git+https://github.com/jmagnuson/ahrs-rs.git?rev=bf7b41d#bf7b41d09115b47ce8f6060624ed6a8a9bc445d4" +dependencies = [ + "nalgebra 0.32.3", + "num-traits 0.2.17", + "simba 0.8.1", +] + +[[package]] +name = "akaze" +version = "0.7.0" +source = "git+https://github.com/rust-cv/cv.git?rev=82a25ee#82a25ee3a88c1200274182951ccd7dfeae4708d2" +dependencies = [ + "bitarray", + "cv-core", + "derive_more", + "float-ord", + "image", + "log", + "ndarray", + "nshare", + "primal", + "rayon", + "space", + "thiserror", + "wide", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "alsa" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" +dependencies = [ + "alsa-sys", + "bitflags 1.3.2", + "libc", + "nix 0.24.3", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[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 = "anyhow" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits 0.2.17", +] + +[[package]] +name = "argh" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7af5ba06967ff7214ce4c7419c7d185be7ecd6cc4965a8f6e1d8ce0398aad219" +dependencies = [ + "argh_derive", + "argh_shared", +] + +[[package]] +name = "argh_derive" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56df0aeedf6b7a2fc67d06db35b09684c3e8da0c95f8f27685cb17e08413d87a" +dependencies = [ + "argh_shared", + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "argh_shared" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5693f39141bda5760ecc4111ab08da40565d1771038c4a0250f03457ec707531" +dependencies = [ + "serde", +] + +[[package]] +name = "argmin" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897c18cfe995220bdd94a27455e5afedc7c688cbf62ad2be88ce7552452aa1b2" +dependencies = [ + "anyhow", + "argmin-math", + "instant", + "num-traits 0.2.17", + "paste", + "rand", + "rand_xoshiro", + "thiserror", +] + +[[package]] +name = "argmin-math" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8798ca7447753fcb3dd98d9095335b1564812a68c6e7c3d1926e1d5cf094e37" +dependencies = [ + "anyhow", + "cfg-if", + "nalgebra 0.32.3", + "num-complex", + "num-integer", + "num-traits 0.2.17", + "rand", + "thiserror", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "arrsac" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73be62e5831762e913e77db9787cc44682c132ebc81fae4e1b7257cdffcc4702" +dependencies = [ + "rand_core", + "sample-consensus", +] + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "assert_float_eq" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cea652ffbedecf29e9cd41bb4c066881057a42c0c119040f022802b26853e77" + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +dependencies = [ + "concurrent-queue", + "event-listener 4.0.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +dependencies = [ + "async-lock 3.2.0", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite 2.1.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +dependencies = [ + "async-lock 3.2.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.1.0", + "parking", + "polling 3.3.1", + "rustix 0.38.28", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.28", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.2.2", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.28", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" + +[[package]] +name = "async-trait" +version = "0.1.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.1.0" +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.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "base91" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb5fbae7b5ee422f239444a3dca9bdf5ecb3abf3af1bf87c8097db3f7bc025" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.64.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 1.0.109", +] + +[[package]] +name = "bindgen" +version = "0.69.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" +dependencies = [ + "bitflags 2.4.1", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.43", +] + +[[package]] +name = "biquad" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "820524f5e3e3add696ddf69f79575772e152c0e78e9f0370b56990a7e808ec3e" +dependencies = [ + "libm 0.1.4", +] + +[[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 = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitarray" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d5c2b9bdd54bc98d0b4838def530947f4b4631070de267a77a848feb561262" +dependencies = [ + "cfg-if", + "space", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "bitreader" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdd859c9d97f7c468252795b35aeccc412bdbb1e90ee6969c4fa6328272eaeff" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[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 = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock 3.2.0", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.1.0", + "piper", + "tracing", +] + +[[package]] +name = "breakpad-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f6fe478a0669c95a5c3f0a399b93dc9bf0edc648b5be981e89578fb52b6b2ff" +dependencies = [ + "cc", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cgl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" +dependencies = [ + "libc", +] + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits 0.2.17", + "wasm-bindgen", + "windows-targets 0.48.5", +] + +[[package]] +name = "ciborium" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half 1.8.2", +] + +[[package]] +name = "cl-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4febd824a957638c066180fbf72b2bed5bcee33740773f3dc59fe91f0a3e6595" +dependencies = [ + "libc", +] + +[[package]] +name = "clang" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c044c781163c001b913cd018fc95a628c50d0d2dfea8bca77dad71edb16e37" +dependencies = [ + "clang-sys", + "libc", +] + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading 0.7.4", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "com" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "coreaudio-rs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3120ebb80a9de008e638ad833d4127d50ea3d3a960ea23ea69bc66d9358a028" +dependencies = [ + "bindgen 0.69.1", +] + +[[package]] +name = "cpal" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "dasp_sample", + "jni 0.19.0", + "js-sys", + "libc", + "mach2", + "ndk 0.7.0", + "ndk-context", + "oboe", + "once_cell", + "parking_lot", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.46.0", +] + +[[package]] +name = "cpp" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa65869ef853e45c60e9828aa08cdd1398cb6e13f3911d9cb2a079b144fcd64" +dependencies = [ + "cpp_macros", +] + +[[package]] +name = "cpp_build" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e361fae2caf9758164b24da3eedd7f7d7451be30d90d8e7b5d2be29a2f0cf5b" +dependencies = [ + "cc", + "cpp_common", + "lazy_static", + "proc-macro2", + "regex", + "syn 2.0.43", + "unicode-xid", +] + +[[package]] +name = "cpp_common" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e1a2532e4ed4ea13031c13bc7bc0dbca4aae32df48e9d77f0d1e743179f2ea1" +dependencies = [ + "lazy_static", + "proc-macro2", + "syn 2.0.43", +] + +[[package]] +name = "cpp_macros" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47ec9cc90633446f779ef481a9ce5a0077107dd5b87016440448d908625a83fd" +dependencies = [ + "aho-corasick", + "byteorder", + "cpp_common", + "lazy_static", + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +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" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[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 = "cstr" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aa998c33a6d3271e3678950a22134cd7dd27cef86dee1b611b5b14207d1d90b" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "cv-core" +version = "0.15.0" +source = "git+https://github.com/rust-cv/cv.git?rev=82a25ee#82a25ee3a88c1200274182951ccd7dfeae4708d2" +dependencies = [ + "derive_more", + "nalgebra 0.30.1", + "num-traits 0.2.17", + "sample-consensus", +] + +[[package]] +name = "cv-pinhole" +version = "0.6.0" +source = "git+https://github.com/rust-cv/cv.git?rev=82a25ee#82a25ee3a88c1200274182951ccd7dfeae4708d2" +dependencies = [ + "cv-core", + "derive_more", + "float-ord", + "nalgebra 0.30.1", + "num-traits 0.2.17", +] + +[[package]] +name = "d3d12" +version = "0.7.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +dependencies = [ + "bitflags 2.4.1", + "libloading 0.8.1", + "winapi", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + +[[package]] +name = "deranged" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "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", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "dyn-clone" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" + +[[package]] +name = "eight-point" +version = "0.8.0" +source = "git+https://github.com/rust-cv/cv.git?rev=82a25ee#82a25ee3a88c1200274182951ccd7dfeae4708d2" +dependencies = [ + "arrayvec", + "cv-core", + "cv-pinhole", + "derive_more", + "float-ord", + "num-traits 0.2.17", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "enterpolation" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fadf5c8cbf7c6765ff05ccbd8811cd7bc3a763e4671755204552bf8740d042a" +dependencies = [ + "assert_float_eq", + "num-traits 0.2.17", + "serde", + "topology-traits", +] + +[[package]] +name = "enum_delegate" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8ea75f31022cba043afe037940d73684327e915f88f62478e778c3de914cd0a" +dependencies = [ + "enum_delegate_lib", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enum_delegate_lib" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e1f6c3800b304a6be0012039e2a45a322a093539c45ab818d9e6895a39c90fe" +dependencies = [ + "proc-macro2", + "quote", + "rand", + "syn 1.0.109", +] + +[[package]] +name = "enum_primitive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" +dependencies = [ + "num-traits 0.1.43", +] + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "enumn" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.1", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume", + "half 2.3.1", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fallible_collections" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" +dependencies = [ + "hashbrown 0.13.2", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fc-blackbox" +version = "0.2.0" +source = "git+https://github.com/AdrianEddy/fc-blackbox.git?rev=4e9e4e6#4e9e4e6c95e7bb98efc5e0186bd37937755e450f" +dependencies = [ + "chrono", + "integer-encoding", + "itertools 0.10.5", + "nom", + "num-rational", + "num-traits 0.2.17", + "thiserror", +] + +[[package]] +name = "fdeflate" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "ffmpeg-next" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f45d337871329d85f5aad1e3d7b09d033cd611d50f734fd6464c731fe7c769bf" +dependencies = [ + "bitflags 1.3.2", + "ffmpeg-sys-next", + "libc", +] + +[[package]] +name = "ffmpeg-sys-next" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2529ad916d08c3562c754c21bc9b17a26c7882c0f5706cc2cd69472175f1620" +dependencies = [ + "bindgen 0.64.0", + "cc", + "libc", + "num_cpus", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + +[[package]] +name = "filetime_creation" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aea213d5ab4e6cd49f50c0688a4e20e5b75ff3bc07ff63f814778bd9b1dd42d" +dependencies = [ + "cfg-if", + "filetime", + "windows-sys 0.48.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-ord" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-sink", + "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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +dependencies = [ + "libm 0.2.8", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "glow" +version = "0.13.0" +source = "git+https://github.com/grovesNL/glow.git?rev=29ff917a2b2ff7ce0a81b2cc5681de6d4735b36e#29ff917a2b2ff7ce0a81b2cc5681de6d4735b36e" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.4.1", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "gpu-allocator" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d79e648296d0cf46c494e594763b6b362c4567e447177bc82750c733398b2a" +dependencies = [ + "backtrace", + "log", + "presser", + "thiserror", + "winapi", + "windows 0.51.1", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.1", + "gpu-descriptor-types", + "hashbrown 0.14.3", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "gyroflow" +version = "1.5.4" +dependencies = [ + "argh", + "breakpad-sys", + "bytemuck", + "cc", + "core-foundation-sys", + "cpp", + "cpp_build", + "crc32fast", + "cstr", + "directories", + "fastrand 2.0.1", + "ffmpeg-next", + "filetime_creation", + "flate2", + "futures-intrusive", + "gyroflow-core", + "human-sort", + "indicatif", + "itertools 0.12.0", + "jni 0.21.1", + "keep-awake", + "lazy_static", + "log", + "log-panics", + "lru", + "metal", + "mp4-merge", + "nalgebra 0.32.3", + "ndk 0.8.0", + "ndk-context", + "ndk-sys 0.5.0+25.2.9519653", + "oslog", + "parking_lot", + "pollster", + "qmetaobject", + "qml-video-rs", + "qttypes", + "rayon", + "regex", + "rodio", + "rustfft", + "semver", + "serde", + "serde_json", + "simplelog", + "system_shutdown", + "tar", + "ureq", + "url", + "walkdir", + "whoami", + "windows 0.52.0", + "winres", +] + +[[package]] +name = "gyroflow-core" +version = "1.5.4" +dependencies = [ + "ahrs", + "akaze", + "arrsac", + "ash", + "base91", + "bincode", + "biquad", + "bitarray", + "bitflags 2.4.1", + "bytemuck", + "byteorder", + "ciborium", + "core-foundation-sys", + "crc32fast", + "cv-core", + "cv-pinhole", + "d3d12", + "dyn-clone", + "eight-point", + "enterpolation", + "enum_delegate", + "fastrand 2.0.1", + "flate2", + "futures-intrusive", + "half 2.3.1", + "image", + "include_dir", + "itertools 0.12.0", + "jni 0.21.1", + "lazy_static", + "libc", + "libloading 0.8.1", + "line_drawing", + "log", + "lru", + "metal", + "mimalloc", + "naga", + "nalgebra 0.32.3", + "ndk 0.8.0", + "ndk-context", + "ndk-sys 0.5.0+25.2.9519653", + "nt-hive", + "num", + "objc-foundation", + "ocl", + "ocl-interop", + "opencv", + "parking_lot", + "pollster", + "rand", + "rand_xoshiro", + "rayon", + "regex", + "rs-sync", + "rustfft", + "sample-consensus", + "serde", + "serde_json", + "simple-easing", + "space", + "stabilize_spirv", + "tar", + "telemetry-parser", + "thiserror", + "time", + "ureq", + "url", + "urlencoding", + "walkdir", + "wgpu", + "wgpu-core", + "wgpu-hal", + "wgpu-types", + "winapi", + "windows 0.52.0", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hamming" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65043da274378d68241eb9a8f8f8aa54e349136f7b8e12f63e3ef44043cc30e1" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" +dependencies = [ + "bitflags 2.4.1", + "com", + "libc", + "libloading 0.8.1", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "human-sort" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140a09c9305e6d5e557e2ed7cbc68e05765a7d4213975b87cb04920689cc6219" + +[[package]] +name = "iana-time-zone" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.51.1", +] + +[[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]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits 0.2.17", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "glob", + "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 = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", +] + +[[package]] +name = "indicatif" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "integer-encoding" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "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 = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "keep-awake" +version = "0.1.0" +source = "git+https://github.com/AdrianEddy/keep-awake-rs.git?rev=1b5eaad#1b5eaadbc1b3e1d6c48397b9d17bb7db75950e05" +dependencies = [ + "core-foundation", + "dispatch", + "jni 0.21.1", + "libc", + "log", + "mach", + "ndk-context", + "objc", + "windows 0.52.0", + "zbus", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.1", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "lewton" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" +dependencies = [ + "byteorder", + "ogg", + "tinyvec", +] + +[[package]] +name = "libc" +version = "0.2.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libmimalloc-sys" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] + +[[package]] +name = "line_drawing" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1478a313008a3e6c8149995e90a99ee9094034b5c5c3da1eeb81183cb61d1d" +dependencies = [ + "num-traits 0.2.17", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "log-panics" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" +dependencies = [ + "backtrace", + "log", +] + +[[package]] +name = "lru" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +dependencies = [ + "hashbrown 0.14.3", +] + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "matrixmultiply" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +dependencies = [ + "autocfg", + "rawpointer", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.4.1", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + +[[package]] +name = "mimalloc" +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +dependencies = [ + "libmimalloc-sys", +] + +[[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.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mp4-merge" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c86d5d99a15116fce87baea15314b7d455a3c9689382f6bb36092c11c0a4db7" +dependencies = [ + "byteorder", + "log", +] + +[[package]] +name = "mp4parse" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63a35203d3c6ce92d5251c77520acb2e57108c88728695aa883f70023624c570" +dependencies = [ + "bitreader", + "byteorder", + "fallible_collections", + "log", + "num-traits 0.2.17", + "static_assertions", +] + +[[package]] +name = "naga" +version = "0.14.2" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +dependencies = [ + "bit-set", + "bitflags 2.4.1", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits 0.2.17", + "petgraph", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "nalgebra" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb2d0de08694bed883320212c18ee3008576bfe8c306f4c3c4a58b4876998be" +dependencies = [ + "approx", + "matrixmultiply", + "num-complex", + "num-rational", + "num-traits 0.2.17", + "simba 0.7.3", + "typenum", +] + +[[package]] +name = "nalgebra" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" +dependencies = [ + "approx", + "matrixmultiply", + "nalgebra-macros", + "num-complex", + "num-rational", + "num-traits 0.2.17", + "serde", + "simba 0.8.1", + "typenum", +] + +[[package]] +name = "nalgebra-macros" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ndarray" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" +dependencies = [ + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits 0.2.17", + "rawpointer", +] + +[[package]] +name = "ndk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys 0.4.1+23.1.7779620", + "num_enum 0.5.11", + "raw-window-handle 0.5.2", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.4.1", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.1", + "raw-window-handle 0.6.0", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.4.1+23.1.7779620" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nshare" +version = "0.9.0" +source = "git+https://github.com/rust-cv/nshare.git?rev=cd4a5c007ecf4ef62c938a6ac64fd90edf895360#cd4a5c007ecf4ef62c938a6ac64fd90edf895360" +dependencies = [ + "image", + "ndarray", +] + +[[package]] +name = "nt-hive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d397d4a4328ae4ae705968cb21215adef115062e8f9513e7116355159f6dd9ca" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "displaydoc", + "enumn", + "memoffset 0.6.5", + "zerocopy 0.6.6", +] + +[[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 0.2.17", +] + +[[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 0.2.17", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits 0.2.17", + "serde", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits 0.2.17", +] + +[[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 0.2.17", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits 0.2.17", +] + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ + "num-traits 0.2.17", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", + "libm 0.2.8", +] + +[[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 = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" +dependencies = [ + "num_enum_derive 0.7.1", +] + +[[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.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" +dependencies = [ + "proc-macro-crate 2.0.1", + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[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" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "oboe" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +dependencies = [ + "jni 0.20.0", + "ndk 0.7.0", + "ndk-context", + "num-derive", + "num-traits 0.2.17", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +dependencies = [ + "cc", +] + +[[package]] +name = "ocl" +version = "0.19.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1c3ce118fd2f00eeb3c01f8073db1ee127cac0b2f79848192c7889b2bd7fe40" +dependencies = [ + "futures", + "nodrop", + "num-traits 0.2.17", + "ocl-core", + "qutex", + "thiserror", +] + +[[package]] +name = "ocl-core" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c145dd9f205b86611a5df15eb89517417b03005441cf6cec245c65a4b9248c52" +dependencies = [ + "bitflags 1.3.2", + "cl-sys", + "enum_primitive", + "num-complex", + "num-traits 0.2.17", + "ocl-core-vector", + "rustc_version", + "thiserror", +] + +[[package]] +name = "ocl-core-vector" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f562279e046ca160aeed5eaf6f7c4eb9fa56cb8fd9d038dbdbf56225caeb8074" +dependencies = [ + "num-traits 0.2.17", +] + +[[package]] +name = "ocl-interop" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e69e4b0cb245a6233d6ebd19dd920e2390a9b057e7b5031c3096a572256e026" +dependencies = [ + "cgl", + "gl_generator", + "ocl", +] + +[[package]] +name = "ogg" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" +dependencies = [ + "byteorder", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "opencv" +version = "0.88.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "980aa24534b9bcfb03c259779ffcbe422e0395cf45700d6d85657734ea1d5c57" +dependencies = [ + "cc", + "dunce", + "jobserver", + "libc", + "num-traits 0.2.17", + "once_cell", + "opencv-binding-generator", + "pkg-config", + "semver", + "shlex", + "vcpkg", +] + +[[package]] +name = "opencv-binding-generator" +version = "0.82.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ac010a66cd1e1dc457c20d467a16286cc83381307cace05357b414c06740f6" +dependencies = [ + "clang", + "clang-sys", + "dunce", + "once_cell", + "percent-encoding", + "regex", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "oslog" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d2043d1f61d77cb2f4b1f7b7b2295f40507f5f8e9d1c8bf10a1ca5f97a3969" +dependencies = [ + "cc", + "dashmap", + "log", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.43", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.28", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "pretty-hex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbc83ee4a840062f368f9096d80077a9841ec117e17e7f700df81958f1451254" + +[[package]] +name = "primal" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b53cc99c892c461727618e8a63806c94b09ae13c494dc5fc70a7557b3a2f071" +dependencies = [ + "primal-check", + "primal-estimate", + "primal-sieve", +] + +[[package]] +name = "primal-bit" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce4fe11b2a87850ca3bd5dc9c7cb9f66e32a09edab221be406ac5ff677f2241" +dependencies = [ + "hamming", +] + +[[package]] +name = "primal-check" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0" +dependencies = [ + "num-integer", +] + +[[package]] +name = "primal-estimate" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7374f14c76f23e1271e6be806981ac5dd9e52b59132b0a2f10bcc412495f9159" + +[[package]] +name = "primal-sieve" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f2a14766f8c543620824b5b2cec356abf2681b76966a7ac4b4ed2c0011e696a" +dependencies = [ + "primal-bit", + "primal-estimate", + "smallvec", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +dependencies = [ + "toml_datetime", + "toml_edit 0.20.2", +] + +[[package]] +name = "proc-macro2" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135ede8821cf6376eb7a64148901e1690b788c11ae94dc297ae917dbc91dc0e" + +[[package]] +name = "prost" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +dependencies = [ + "anyhow", + "itertools 0.11.0", + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "qmetaobject" +version = "0.2.10" +source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=59029b9#59029b9ac71a56db5cbb99c1d0f666e648fd9656" +dependencies = [ + "cpp", + "cpp_build", + "lazy_static", + "log", + "qmetaobject_impl", + "qttypes", + "semver", +] + +[[package]] +name = "qmetaobject_impl" +version = "0.2.10" +source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=59029b9#59029b9ac71a56db5cbb99c1d0f666e648fd9656" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "qml-video-rs" +version = "0.1.0" +source = "git+https://github.com/AdrianEddy/qml-video-rs.git?rev=63f35bf#63f35bfe96ba846e45c2bbf985e396bf634b29da" +dependencies = [ + "cpp", + "cpp_build", + "cstr", + "qmetaobject", + "qttypes", + "ureq", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "qttypes" +version = "0.2.11" +source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=59029b9#59029b9ac71a56db5cbb99c1d0f666e648fd9656" +dependencies = [ + "cpp", + "cpp_build", + "semver", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "qutex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda4a51ba3d773c196f9450a6b239077ad8dda608b15263b4c9f29e58909883f" +dependencies = [ + "crossbeam", + "futures", +] + +[[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_xoshiro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] +name = "ring" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "rodio" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" +dependencies = [ + "cpal", + "lewton", +] + +[[package]] +name = "rs-sync" +version = "0.1.0" +source = "git+https://github.com/gyroflow/rs-sync.git?rev=c73bf47#c73bf478e2f6442e5935bd6314d0cfc56239f7b5" +dependencies = [ + "argmin", + "argmin-math", + "libm 0.2.8", + "log", + "nalgebra 0.32.3", + "rand", + "rayon", + "superslice", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustfft" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" +dependencies = [ + "num-complex", + "num-integer", + "num-traits 0.2.17", + "primal-check", + "strength_reduce", + "transpose", + "version_check", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "safe_arch" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" +dependencies = [ + "bytemuck", +] + +[[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 = "sample-consensus" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3404fd9b14a035bdff14fc4097e5d7a16435fc4661e80f19ae5204f8bee3c718" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" + +[[package]] +name = "serde" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "serde_yaml" +version = "0.9.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simba" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f3fd720c48c53cace224ae62bef1bbff363a70c68c4802a78b5cc6159618176" +dependencies = [ + "approx", + "num-complex", + "num-traits 0.2.17", + "paste", + "wide", +] + +[[package]] +name = "simba" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" +dependencies = [ + "approx", + "libm 0.2.8", + "num-complex", + "num-traits 0.2.17", + "paste", + "wide", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simple-easing" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832ddd7df0d98d6fd93b973c330b7c8e0742d5cb8f1afc7dea89dba4d2531aa1" + +[[package]] +name = "simplelog" +version = "0.12.0" +source = "git+https://github.com/Drakulix/simplelog.rs.git?rev=4ef071d#4ef071dfd008d7729658cd5313e6d877bde272ca" +dependencies = [ + "log", + "termcolor", + "time", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "space" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5ab9701ae895386d13db622abf411989deff7109b13b46b6173bb4ce5c1d123" +dependencies = [ + "doc-comment", + "num-traits 0.2.17", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits 0.2.17", +] + +[[package]] +name = "spirv-std" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53ad6bf0206aea3e6ac6283cb88ef397239cd2d9276b8f71854d60ac2cf94e0b" +dependencies = [ + "bitflags 1.3.2", + "glam", + "num-traits 0.2.17", + "spirv-std-macros", + "spirv-std-types", +] + +[[package]] +name = "spirv-std-macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2058ef7585e7ef31ee7b00bdfee2e6726649d827c71070a50087598405e8b2cf" +dependencies = [ + "proc-macro2", + "quote", + "spirv-std-types", + "syn 1.0.109", +] + +[[package]] +name = "spirv-std-types" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cce2183deb9e7ada727867823fb8bbbc8b56e503801a332d155dde613130e1b" + +[[package]] +name = "stabilize_spirv" +version = "0.0.0" +dependencies = [ + "spirv-std", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strength_reduce" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" + +[[package]] +name = "superslice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system_shutdown" +version = "4.0.1" +source = "git+https://github.com/risoflora/system_shutdown.git?rev=4d93e5e#4d93e5e8c86ab94a1b7073b09b2b5b83096a35a8" +dependencies = [ + "windows 0.52.0", + "zbus", +] + +[[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 = "telemetry-parser" +version = "0.2.8" +source = "git+https://github.com/AdrianEddy/telemetry-parser.git?rev=8920009#89200095066ce8555a24ca90d1de3663216cc1df" +dependencies = [ + "argh", + "byteorder", + "chrono", + "csv", + "fc-blackbox", + "human-sort", + "jni 0.21.1", + "log", + "memchr", + "mp4parse", + "ndk-context", + "paste", + "pretty-hex", + "prost", + "serde", + "serde_json", + "serde_yaml", +] + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall", + "rustix 0.38.28", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "time" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +dependencies = [ + "deranged", + "itoa", + "libc", + "num_threads", + "powerfmt", + "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.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +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 = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "topology-traits" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0c8dab428531e30115d3bfd6e3092b55256a4a7b4f87cb3abe37a000b1f4032" +dependencies = [ + "num-traits 0.2.17", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "transpose" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" +dependencies = [ + "num-integer", + "strength_reduce", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.0", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[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-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" +dependencies = [ + "base64", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-webpki", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[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 = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +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.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.43", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" + +[[package]] +name = "web-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wgpu" +version = "0.18.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +dependencies = [ + "arrayvec", + "cfg-if", + "js-sys", + "log", + "naga", + "parking_lot", + "profiling", + "raw-window-handle 0.6.0", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.18.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga", + "parking_lot", + "profiling", + "raw-window-handle 0.6.0", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.18.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "once_cell", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle 0.6.0", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.18.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] + +[[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]] +name = "wide" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" +dependencies = [ + "bytemuck", + "safe_arch", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +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" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core 0.51.1", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[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.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "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]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" +dependencies = [ + "memchr", +] + +[[package]] +name = "winres" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +dependencies = [ + "toml", +] + +[[package]] +name = "xattr" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dae5072fe1f8db8f8d29059189ac175196e410e40ba42d5d4684ae2f750995" +dependencies = [ + "libc", + "linux-raw-sys 0.4.12", + "rustix 0.38.28", +] + +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix 0.26.4", + "winapi", +] + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zerocopy" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" +dependencies = [ + "byteorder", + "zerocopy-derive 0.6.6", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive 0.7.32", +] + +[[package]] +name = "zerocopy-derive" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/applications/video/gyroflow/default.nix b/pkgs/applications/video/gyroflow/default.nix new file mode 100644 index 0000000000000..bb7df1dfa01de --- /dev/null +++ b/pkgs/applications/video/gyroflow/default.nix @@ -0,0 +1,126 @@ +{ lib, rustPlatform, fetchFromGitHub, callPackage, makeDesktopItem +, clang, copyDesktopItems, patchelf, pkg-config, wrapQtAppsHook +, alsa-lib, bash, ffmpeg, mdk-sdk, ocl-icd, opencv, qtbase, qtdeclarative, qtsvg +}: + +rustPlatform.buildRustPackage rec { + pname = "gyroflow"; + version = "1.5.4-2023-12-25"; + + src = fetchFromGitHub { + owner = "gyroflow"; + repo = "gyroflow"; + rev = "e0869ffe648cb3fd88d81c807b1f7fa2e18d7430"; + hash = "sha256-KB/uoQR43im/m5uJhheAPCqUH9oIx85JaIUwW9rhAAw="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "ahrs-0.6.0" = "sha256-CxWyX8t+BjqIyNj1p1LdkCmNrtJkudmKgZPv0MVcghY="; + "akaze-0.7.0" = "sha256-KkGXKoVRZZ7HUTtWYBerrN36a7RqsHjYQb+bwG1JagY="; + "d3d12-0.7.0" = "sha256-FqAVwW2jtDE1BV31OfrCJljGhj5iD0OfN2fANQ1wasc="; + "fc-blackbox-0.2.0" = "sha256-gL8m9DpHJPVD8vvrmuYv+biJT4PA5LmtohJwFVO+khU="; + "glow-0.13.0" = "sha256-vhPWzsm7NZx9JiRZcVoUslTGySQbASRh/wNlo1nK5jg="; + "keep-awake-0.1.0" = "sha256-EoXhK4/Aij70f73+5NBUoCXqZISG1+n2eVavNqe8mq4="; + "nshare-0.9.0" = "sha256-PAV41mMLDmhkAz4+qyf+MZnYTAdMwjk83+f+RdaJji8="; + "qmetaobject-0.2.10" = "sha256-ldmpbOYoCOaAoipfcCSwuV+fzF9gg1PTbRz2Jm4zJvA="; + "qml-video-rs-0.1.0" = "sha256-rwdci0QhGYOnCf04u61xuon06p8Zm2wKCNrW/qti9+U="; + "rs-sync-0.1.0" = "sha256-sfym7zv5SUitopqNJ6uFP6AMzAGf4Y7U0dzXAKlvuGA="; + "simplelog-0.12.0" = "sha256-NvmtLbzahSw1WMS3LY+jWiX4SxfSRwidTMvICGcmDO4="; + "system_shutdown-4.0.1" = "sha256-arJWmEjDdaig/oAfwSolVmk9s1UovrQ5LNUgTpUvoOQ="; + "telemetry-parser-0.2.8" = "sha256-Nr4SWEERKEAiZppqzjn1LIuMiZ2BTQEOKOlSnLVAXAg="; + }; + }; + + lens-profiles = callPackage ./lens-profiles.nix { }; + + nativeBuildInputs = [ + clang copyDesktopItems patchelf pkg-config rustPlatform.bindgenHook wrapQtAppsHook + ]; + + buildInputs = [ alsa-lib bash ffmpeg mdk-sdk ocl-icd opencv qtbase qtdeclarative qtsvg ]; + + patches = [ ./no-static-zlib.patch ]; + + # qml-video-rs and gyroflow assume that all Qt headers are installed + # in a single (qtbase) directory. Apart form QtCore and QtGui from + # qtbase they need QtQuick and QtQml public and private headers from + # qtdeclarative: + # https://github.com/AdrianEddy/qml-video-rs/blob/bbf60090b966f0df2dd016e01da2ea78666ecea2/build.rs#L22-L40 + # https://github.com/gyroflow/gyroflow/blob/v1.5.4/build.rs#L163-L186 + # Additionally gyroflow needs QtQuickControls2: + # https://github.com/gyroflow/gyroflow/blob/v1.5.4/build.rs#L173 + env.NIX_CFLAGS_COMPILE = toString [ + "-I${qtdeclarative}/include/QtQuick" + "-I${qtdeclarative}/include/QtQuick/${qtdeclarative.version}" + "-I${qtdeclarative}/include/QtQuick/${qtdeclarative.version}/QtQuick" + "-I${qtdeclarative}/include/QtQml" + "-I${qtdeclarative}/include/QtQml/${qtdeclarative.version}" + "-I${qtdeclarative}/include/QtQml/${qtdeclarative.version}/QtQml" + "-I${qtdeclarative}/include/QtQuickControls2" + ]; + + # FFMPEG_DIR is used by ffmpeg-sys-next/build.rs and + # gyroflow/build.rs. ffmpeg-sys-next fails to build if this dir + # does not contain ffmpeg *headers*. gyroflow assumes that it + # contains ffmpeg *libraries*, but builds fine as long as it is set + # with any value. + env.FFMPEG_DIR = ffmpeg.dev; + + # These variables are needed by gyroflow/build.rs. + # OPENCV_LINK_LIBS is based on the value in gyroflow/_scripts/common.just, with opencv_dnn added to fix linking. + env.OPENCV_LINK_PATHS = "${opencv}/lib"; + env.OPENCV_LINK_LIBS = "opencv_core,opencv_calib3d,opencv_dnn,opencv_features2d,opencv_imgproc,opencv_video,opencv_flann,opencv_imgcodecs,opencv_objdetect,opencv_stitching,png"; + + # For qml-video-rs. It concatenates "lib/" to this value so it needs a trailing "/": + env.MDK_SDK = "${mdk-sdk}/"; + + preCheck = '' + # qml-video-rs/build.rs wants to overwrite it: + find target -name libmdk.so.0 -exec chmod +w {} \; + ''; + + doCheck = false; # No tests. + + postInstall = '' + mkdir -p $out/opt/Gyroflow + cp -r resources $out/opt/Gyroflow/ + ln -s ${lens-profiles} $out/opt/Gyroflow/resources/camera_presets + + rm -rf $out/lib + patchelf $out/bin/gyroflow --add-rpath ${mdk-sdk}/lib + + mv $out/bin/gyroflow $out/opt/Gyroflow/ + ln -s ../opt/Gyroflow/gyroflow $out/bin/ + + install -D ${./gyroflow-open.sh} $out/bin/gyroflow-open + install -Dm644 ${./gyroflow-mime.xml} $out/share/mime/packages/gyroflow.xml + install -Dm644 resources/icon.svg $out/share/icons/hicolor/scalable/apps/gyroflow.svg + ''; + + desktopItems = [ + (makeDesktopItem (rec { + name = "gyroflow"; + desktopName = "Gyroflow"; + genericName = "Video stabilization using gyroscope data"; + comment = meta.description; + icon = "gyroflow"; + exec = "gyroflow-open %u"; + terminal = false; + mimeTypes = [ "application/x-gyroflow" ]; + categories = [ "AudioVideo" "Video" "AudioVideoEditing" "Qt" ]; + startupNotify = true; + startupWMClass = "gyroflow"; + prefersNonDefaultGPU = true; + })) + ]; + + meta = with lib; { + description = "Advanced gyro-based video stabilization tool"; + homepage = "https://gyroflow.xyz/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/video/gyroflow/gyroflow-mime.xml b/pkgs/applications/video/gyroflow/gyroflow-mime.xml new file mode 100644 index 0000000000000..d9180e6b83966 --- /dev/null +++ b/pkgs/applications/video/gyroflow/gyroflow-mime.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/x-gyroflow"> + <glob pattern="*.gyroflow"/> + <comment xml:lang="en">Gyroflow project</comment> + <icon name="gyroflow"/> + </mime-type> +</mime-info> diff --git a/pkgs/applications/video/gyroflow/gyroflow-open.sh b/pkgs/applications/video/gyroflow/gyroflow-open.sh new file mode 100644 index 0000000000000..9bdcad70d99d5 --- /dev/null +++ b/pkgs/applications/video/gyroflow/gyroflow-open.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +if [ "$#" -ge 1 ]; then + exec "$(dirname "$0")"/gyroflow --open "$@" +else + exec "$(dirname "$0")"/gyroflow "$@" +fi diff --git a/pkgs/applications/video/gyroflow/lens-profiles.nix b/pkgs/applications/video/gyroflow/lens-profiles.nix new file mode 100644 index 0000000000000..850b6ca72f87a --- /dev/null +++ b/pkgs/applications/video/gyroflow/lens-profiles.nix @@ -0,0 +1,19 @@ +{ lib, fetchFromGitHub }: + +fetchFromGitHub { + pname = "gyroflow-lens-profiles"; + version = "2023-12-01"; + + owner = "gyroflow"; + repo = "lens_profiles"; + rev = "3e72169ae6b8601260497d7216d5fcbbc8b67194"; + hash = "sha256-18KtunSxTsJhBge+uOGBcNZRG3W26M/Osyxllu+N0UI="; + + meta = with lib; { + description = "Lens profile database for Gyroflow"; + homepage = "https://github.com/gyroflow/lens_profiles"; + license = licenses.cc0; + maintainers = with maintainers; [ orivej ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/video/gyroflow/no-static-zlib.patch b/pkgs/applications/video/gyroflow/no-static-zlib.patch new file mode 100644 index 0000000000000..e660b0db533c5 --- /dev/null +++ b/pkgs/applications/video/gyroflow/no-static-zlib.patch @@ -0,0 +1,6 @@ +diff --git a/build.rs b/build.rs +index 8ba86bf..f6f00a0 100644 +--- a/build.rs ++++ b/build.rs +@@ -203 +202,0 @@ fn main() { +- println!("cargo:rustc-link-lib=static:+whole-archive=z"); diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 8b112ed838a31..7e6cef757cd88 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -5,7 +5,7 @@ , breeze-qt5 , cmake , extra-cmake-modules -, ffmpeg-full +, ffmpeg-headless , kconfig , kcoreaddons , kfilemetadata @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-6UXgAb42DttNgmO5KRFC5M6kuYrv+GIxQ0EQ4P5cgUI="; + hash = "sha256-iYf8oTMQ65+6E1dlOj0GU6EezPul6p1GG2CcrcjDUik="; domain = "invent.kde.org"; }; @@ -47,7 +47,7 @@ mkDerivation rec { qqc2-desktop-style yt-dlp - ffmpeg-full + ffmpeg-headless kconfig kcoreaddons kfilemetadata diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index bcf09b962483e..49769961c08f2 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "4.0"; + version = "4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-0iJzlj5FRDXJdh+vWVvZaBJVNru7CfkvJtZUZYKoqPw="; + hash = "sha256-YmVMcNbvbkODAmEgv8Ofgo07Mew/F4xv5cBaWKsH1S4="; }; patches = [ diff --git a/pkgs/applications/video/kodi/addons/future/default.nix b/pkgs/applications/video/kodi/addons/future/default.nix index 30a1db9d6b2b6..c8078ff36d5aa 100644 --- a/pkgs/applications/video/kodi/addons/future/default.nix +++ b/pkgs/applications/video/kodi/addons/future/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "future"; namespace = "script.module.future"; - version = "0.18.2+matrix.1"; + version = "0.18.3+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-QBG7V70Dwmfq8ISILxGNvtmQT9fJp2e5gs2C9skRwIw="; + sha256 = "sha256-jKO2Qxi54z6UiCmMkxU+2pog40K2yb8/KYbNPFYuSsQ="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 61e5147be3601..60c67f75fa512 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -10,13 +10,13 @@ in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "20.3.13"; + version = "20.3.14"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-xvU+DcVEaQ/1sm6o21/6N1znCtzrct0qDhMxXGFZjL4="; + sha256 = "sha256-9S98LgeXq2Wc5CLd5WGo7iNM9ZkSuDBO/O35wf0SjZY="; }; extraCMakeFlags = [ diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix index 3352ae4c63d30..ce66665ee73bf 100644 --- a/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.22.3"; + version = "1.23.1"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "sha256-8NGj8n1p8euqYYdPDSeFh2ZE9lly5ThSmg69yXY3Te8="; + sha256 = "sha256-ZY59I3RR/gl24XqZiBkenHM/D4tW/5ZyE4UngtvODYQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix index 16c1520fc5f07..7747b9e44c0be 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "20.6.5"; + version = "20.7.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "sha256-NrSLWZn+aeWUKxM/ETvoE4gRo4JZsD1snpLvMLDlpFw="; + sha256 = "sha256-Mc540n+TfZiAV2uDSGrItsoPOkEBNyyQlW2DJZLwYA4="; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix index ba6470af873fc..28dd626502e80 100644 --- a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "20.11.1"; + version = "20.13.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-Dvnuy+2xW9hPjPVqN7X057B/1zWqIPbkS90kjexJvio="; + sha256 = "sha256-W/tFM/WpWdSvLEf0iwQoH2JVDjyfr1l8CRQkOG5q4hk="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/six/default.nix b/pkgs/applications/video/kodi/addons/six/default.nix index 5933c544735a5..5ce4817eae3bd 100644 --- a/pkgs/applications/video/kodi/addons/six/default.nix +++ b/pkgs/applications/video/kodi/addons/six/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "six"; namespace = "script.module.six"; - version = "1.15.0+matrix.1"; + version = "1.16.0+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-zjbPAEB39dWpNsgoBqCKpLLXmqBI/v0wnnbCTRhYGzE="; + sha256 = "sha256-d6BNpnTg6K7NPX3uWp5X0rog33C+B7YoAtLH/CrUYno="; }; passthru.updateScript = addonUpdateScript { diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix index 26e52997b1ab1..8d13052b950ea 100644 --- a/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "urllib3"; namespace = "script.module.urllib3"; - version = "1.26.16+matrix.1"; + version = "2.1.0"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-HI99Cle/SpwulbDCVoDNy/0EfHVt4q7+LR60YRMaSFY="; + sha256 = "sha256-UCvkeguxytPoP1gIIt8N79TVs98ATzsfrRSabtbgnGc="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/websocket/default.nix b/pkgs/applications/video/kodi/addons/websocket/default.nix index b05e6deede850..c2bbe9de09b68 100644 --- a/pkgs/applications/video/kodi/addons/websocket/default.nix +++ b/pkgs/applications/video/kodi/addons/websocket/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "websocket"; namespace = "script.module.websocket"; - version = "1.6.2"; + version = "1.6.4"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-vJGijCjIgLJAdJvl+hCAPtvq7fy2ksgjY90vjVyqDkI="; + sha256 = "sha256-1Wy+hxB059UoZnQlncytVT3sQ07dYAhNRnW3/QVD4ZE="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index dd0d4924aaea1..26620b25957d9 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-ucANfu28Co88btr4YEBENuxkOOTL/9V5JdN8cRq944Q="; + hash = "sha256-x2uM4z4nQd761aj8PVlFH0MbWzwWRiR7ItzLQVOc1Zw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 96c4113f4bfce..9e0873b407f91 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -25,6 +25,7 @@ , pugixml , qtbase , qtmultimedia +, utf8cpp , xdg-utils , zlib , withGUI ? true @@ -32,7 +33,8 @@ }: let - inherit (lib) enableFeature optional optionals optionalString; + inherit (lib) + enableFeature getDev getLib optionals optionalString; phase = name: args: '' @@ -46,13 +48,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "80.0"; + version = "81.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - hash = "sha256-/RqTfnxivghViFryCvj5RXSBziztb1Drb7tT89cGZ3o="; + hash = "sha256-Dh1XbC3uATTkc23m9rcehXs2/2zekwI6IzE04L/cXS0="; }; nativeBuildInputs = [ @@ -64,10 +66,9 @@ stdenv.mkDerivation rec { pkg-config rake ] - ++ optional withGUI wrapQtAppsHook; + ++ optionals withGUI [ wrapQtAppsHook ]; - # 1. qtbase and qtmultimedia are needed without the GUI - # 2. we have utf8cpp in nixpkgs but it doesn't find it + # qtbase and qtmultimedia are needed without the GUI buildInputs = [ boost expat @@ -84,11 +85,12 @@ stdenv.mkDerivation rec { pugixml qtbase qtmultimedia + utf8cpp xdg-utils zlib ] - ++ optional withGUI cmark - ++ optional stdenv.isDarwin libiconv; + ++ optionals withGUI [ cmark ] + ++ optionals stdenv.isDarwin [ libiconv ]; # autoupdate is not needed but it silences a ton of pointless warnings postPatch = '' @@ -103,9 +105,11 @@ stdenv.mkDerivation rec { "--disable-static-qt" "--disable-update-check" "--enable-optimization" - "--with-boost-libdir=${lib.getLib boost}/lib" + "--with-boost-libdir=${getLib boost}/lib" "--with-docbook-xsl-root=${docbook_xsl}/share/xml/docbook-xsl" "--with-gettext" + "--with-extra-includes=${getDev utf8cpp}/include/utf8cpp" + "--with-extra-libs=${getLib utf8cpp}/lib" (enableFeature withGUI "gui") ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 252f1637172fd..3fc3b4eb1a8b8 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -15,7 +15,7 @@ , freetype , libass , libpthreadstubs -, nv-codec-headers +, nv-codec-headers-11 , lua , libuchardet , libiconv @@ -198,7 +198,7 @@ in stdenv'.mkDerivation (finalAttrs: { ++ lib.optionals xineramaSupport [ libXinerama ] ++ lib.optionals xvSupport [ libXv ] ++ lib.optionals zimgSupport [ zimg ] - ++ lib.optionals stdenv.isLinux [ nv-codec-headers ] + ++ lib.optionals stdenv.isLinux [ nv-codec-headers-11 ] ++ lib.optionals stdenv.isDarwin [ libiconv ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer Accelerate ] ++ lib.optionals (stdenv.isDarwin && swiftSupport) [ AVFoundation CoreMedia ]; diff --git a/pkgs/applications/video/mpv/scripts/acompressor.nix b/pkgs/applications/video/mpv/scripts/acompressor.nix deleted file mode 100644 index d82d12f163e7f..0000000000000 --- a/pkgs/applications/video/mpv/scripts/acompressor.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib -, buildLua -, mpv-unwrapped -}: - -buildLua { - inherit (mpv-unwrapped) src version; - pname = "mpv-acompressor"; - scriptPath = "TOOLS/lua/acompressor.lua"; - - meta = with lib; { - inherit (mpv-unwrapped.meta) license; - description = "Script to toggle and control ffmpeg's dynamic range compression filter."; - homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/acompressor.lua"; - maintainers = with maintainers; [ nicoo ]; - }; -} diff --git a/pkgs/applications/video/mpv/scripts/autocrop.nix b/pkgs/applications/video/mpv/scripts/autocrop.nix deleted file mode 100644 index 645a4dd16899f..0000000000000 --- a/pkgs/applications/video/mpv/scripts/autocrop.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenvNoCC, mpv-unwrapped, lib }: - -stdenvNoCC.mkDerivation rec { - pname = "mpv-autocrop"; - version = mpv-unwrapped.version; - src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autocrop.lua"; - dontBuild = true; - dontUnpack = true; - installPhase = '' - install -Dm644 ${src} $out/share/mpv/scripts/autocrop.lua - ''; - passthru.scriptName = "autocrop.lua"; - - meta = { - description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video."; - homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autocrop.lua"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/video/mpv/scripts/autodeint.nix b/pkgs/applications/video/mpv/scripts/autodeint.nix deleted file mode 100644 index b5369b748faf6..0000000000000 --- a/pkgs/applications/video/mpv/scripts/autodeint.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenvNoCC, mpv-unwrapped, lib }: - -stdenvNoCC.mkDerivation rec { - pname = "mpv-autodeint"; - version = mpv-unwrapped.version; - src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autodeint.lua"; - dontBuild = true; - dontUnpack = true; - installPhase = '' - install -Dm644 ${src} $out/share/mpv/scripts/autodeint.lua - ''; - passthru.scriptName = "autodeint.lua"; - - meta = { - description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video."; - homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autodeint.lua"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/video/mpv/scripts/autoload.nix b/pkgs/applications/video/mpv/scripts/autoload.nix deleted file mode 100644 index c4a85c50d9384..0000000000000 --- a/pkgs/applications/video/mpv/scripts/autoload.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenvNoCC, mpv-unwrapped, lib }: - -stdenvNoCC.mkDerivation rec { - pname = "mpv-autoload"; - version = mpv-unwrapped.version; - src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autoload.lua"; - dontBuild = true; - dontUnpack = true; - installPhase = '' - install -Dm644 ${src} $out/share/mpv/scripts/autoload.lua - ''; - passthru.scriptName = "autoload.lua"; - - meta = { - description = "This script automatically loads playlist entries before and after the currently played file"; - homepage = "https://github.com/mpv-player/mpv/blob/master/TOOLS/lua/autoload.lua"; - maintainers = [ lib.maintainers.dawidsowa ]; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix index 046b0fa2ea969..37690d9874300 100644 --- a/pkgs/applications/video/mpv/scripts/buildLua.nix +++ b/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -2,34 +2,37 @@ , stdenvNoCC }: let - inherit (lib) hasPrefix hasSuffix removeSuffix; escapedList = with lib; concatMapStringsSep " " (s: "'${escape [ "'" ] s}'"); fileName = pathStr: lib.last (lib.splitString "/" pathStr); - nameFromPath = pathStr: - let fN = fileName pathStr; in - if hasSuffix ".lua" fN then - fN - else if !(hasPrefix "." fN) then - "${fN}.lua" - else - null - ; scriptsDir = "$out/share/mpv/scripts"; + + # similar to `lib.extends`, but with inverted precedence and recursive update + extendedBy = args: orig: self: + let super = args self; + in lib.recursiveUpdate (orig super) super + ; in -lib.makeOverridable ( + +lib.makeOverridable (args: stdenvNoCC.mkDerivation (extendedBy + (if lib.isFunction args then args else (_: args)) ( { pname , extraScripts ? [] , ... }@args: let + strippedName = with builtins; + let groups = match "mpv[-_](.*)" pname; in + if groups != null + then head groups + else pname + ; # either passthru.scriptName, inferred from scriptPath, or from pname scriptName = (args.passthru or {}).scriptName or ( - if args ? scriptPath && nameFromPath args.scriptPath != null - then nameFromPath args.scriptPath - else "${pname}.lua" + if args ? scriptPath + then fileName args.scriptPath + else "${strippedName}.lua" ); scriptPath = args.scriptPath or "./${scriptName}"; - in - stdenvNoCC.mkDerivation (lib.attrsets.recursiveUpdate { + in { dontBuild = true; preferLocalBuild = true; @@ -59,5 +62,5 @@ lib.makeOverridable ( passthru = { inherit scriptName; }; meta.platforms = lib.platforms.all; - } args) -) + }) +)) diff --git a/pkgs/applications/video/mpv/scripts/chapterskip.nix b/pkgs/applications/video/mpv/scripts/chapterskip.nix index bffc27bd1eacc..20de5d88fd331 100644 --- a/pkgs/applications/video/mpv/scripts/chapterskip.nix +++ b/pkgs/applications/video/mpv/scripts/chapterskip.nix @@ -14,7 +14,13 @@ buildLua { }; meta = { + description = "Automatically skips chapters based on title"; + longDescription = '' + MPV script that skips chapters based on their title, categorized using regexes. + The set of skipped categories can be configured globally, or by an auto-profile. + ''; homepage = "https://github.com/po5/chapterskip"; + license = lib.licenses.unfree; # https://github.com/po5/chapterskip/issues/10 maintainers = with lib.maintainers; [ nicoo ]; }; } diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix index 498fcb530a41f..4c385b766c78a 100644 --- a/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -1,19 +1,16 @@ -{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper }: +{ lib, buildLua, fetchFromGitHub, makeWrapper }: -stdenvNoCC.mkDerivation { +buildLua { pname = "video-cutter"; - version = "unstable-2021-02-03"; + version = "unstable-2023-11-09"; src = fetchFromGitHub { owner = "rushmj"; repo = "mpv-video-cutter"; - rev = "718d6ce9356e63fdd47208ec44f575a212b9068a"; - sha256 = "sha256-ramID1DPl0UqEzevpqdYKb9aaW3CAy3Dy9CPb/oJ4eY="; + rev = "01a0396c075d5f8bbd1de5b571e6231f8899ab65"; + sha256 = "sha256-veoRFzUCRH8TrvR7x+WWoycpDyxqrJZ/bnp61dVc0pE="; }; - dontBuild = true; - dontCheck = true; - nativeBuildInputs = [ makeWrapper ]; postPatch = '' @@ -27,21 +24,19 @@ stdenvNoCC.mkDerivation { --replace '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter" ''; - installPhase = '' - install -Dm755 c_concat.sh $out/share/mpv/scripts/c_concat.sh - install cutter.lua $out/share/mpv/scripts/cutter.lua + passthru.scriptName = "cutter.lua"; + extraScripts = [ "c_concat.sh" ]; + postInstall = '' + chmod 0755 $out/share/mpv/scripts/c_concat.sh wrapProgram $out/share/mpv/scripts/c_concat.sh \ --run "mkdir -p ~/.config/mpv/cutter/" ''; - passthru.scriptName = "cutter.lua"; - meta = with lib; { description = "Cut videos and concat them automatically"; homepage = "https://github.com/rushmj/mpv-video-cutter"; - # repo doesn't have a license - license = licenses.unfree; + license = licenses.mit; maintainers = with maintainers; [ lom ]; }; } diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index fb75464ab98e5..158a7c491007b 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -1,34 +1,98 @@ { lib -, callPackage , config +, newScope +, runCommand }: -let buildLua = callPackage ./buildLua.nix { }; -in lib.recurseIntoAttrs - ({ - acompressor = callPackage ./acompressor.nix { inherit buildLua; }; - autocrop = callPackage ./autocrop.nix { }; - autodeint = callPackage ./autodeint.nix { }; - autoload = callPackage ./autoload.nix { }; - chapterskip = callPackage ./chapterskip.nix { inherit buildLua; }; - convert = callPackage ./convert.nix { inherit buildLua; }; +let + unionOfDisjoints = lib.fold lib.attrsets.unionOfDisjoint {}; + + addTests = name: drv: + if ! lib.isDerivation drv then + drv + else let + inherit (drv) scriptName; + scriptPath = "share/mpv/scripts/${scriptName}"; + fullScriptPath = "${drv}/${scriptPath}"; + in drv.overrideAttrs (old: { passthru = (old.passthru or {}) // { tests = unionOfDisjoints [ + (old.passthru.tests or {}) + + { + scriptName-is-valid = runCommand "mpvScripts.${name}.passthru.tests.scriptName-is-valid" { + meta.maintainers = with lib.maintainers; [ nicoo ]; + preferLocalBuild = true; + } '' + if [ -e "${fullScriptPath}" ]; then + touch $out + else + echo "mpvScripts.\"${name}\" does not contain a script named \"${scriptName}\"" >&2 + exit 1 + fi + ''; + } + + # can't check whether `fullScriptPath` is a directory, in pure-evaluation mode + (with lib; optionalAttrs (! any (s: hasSuffix s drv.passthru.scriptName) [ ".js" ".lua" ".so" ]) { + single-main-in-script-dir = runCommand "mpvScripts.${name}.passthru.tests.single-main-in-script-dir" { + meta.maintainers = with lib.maintainers; [ nicoo ]; + preferLocalBuild = true; + } '' + die() { + echo "$@" >&2 + exit 1 + } + + cd "${drv}/${scriptPath}" # so the glob expands to filenames only + mains=( main.* ) + if [ "''${#mains[*]}" -eq 1 ]; then + touch $out + elif [ "''${#mains[*]}" -eq 0 ]; then + die "'${scriptPath}' contains no 'main.*' file" + else + die "'${scriptPath}' contains multiple 'main.*' files:" "''${mains[*]}" + fi + ''; + }) + ]; }; }); + + scope = self: let + inherit (self) callPackage; + in lib.mapAttrs addTests { + inherit (callPackage ./mpv.nix { }) + acompressor autocrop autodeint autoload; + inherit (callPackage ./occivink.nix { }) + blacklistExtensions seekTo; + + buildLua = callPackage ./buildLua.nix { }; + chapterskip = callPackage ./chapterskip.nix { }; + convert = callPackage ./convert.nix { }; + cutter = callPackage ./cutter.nix { }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; mpris = callPackage ./mpris.nix { }; - mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; }; - mpv-webm = callPackage ./mpv-webm.nix { inherit buildLua; }; - mpvacious = callPackage ./mpvacious.nix { inherit buildLua; }; - quality-menu = callPackage ./quality-menu.nix { inherit buildLua; }; - simple-mpv-webui = callPackage ./simple-mpv-webui.nix { inherit buildLua; }; + 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 { }; sponsorblock = callPackage ./sponsorblock.nix { }; - thumbfast = callPackage ./thumbfast.nix { inherit buildLua; }; - thumbnail = callPackage ./thumbnail.nix { inherit buildLua; }; + sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { }; + thumbfast = callPackage ./thumbfast.nix { }; + thumbnail = callPackage ./thumbnail.nix { }; uosc = callPackage ./uosc.nix { }; visualizer = callPackage ./visualizer.nix { }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; - cutter = callPackage ./cutter.nix { }; - } - // (callPackage ./occivink.nix { inherit buildLua; })) - // lib.optionalAttrs config.allowAliases { - youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 -} + }; + + aliases = { + youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 + }; +in + +with lib; pipe scope [ + (makeScope newScope) + (self: + assert builtins.intersectAttrs self aliases == {}; + self // optionalAttrs config.allowAliases aliases) + recurseIntoAttrs +] diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 8ec05a3cf6915..c164bae1495db 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -17,8 +17,6 @@ buildLua rec { 'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"', ''; - scriptPath = "playlistmanager.lua"; - meta = with lib; { description = "Mpv lua script to create and manage playlists"; homepage = "https://github.com/jonniek/mpv-playlistmanager"; diff --git a/pkgs/applications/video/mpv/scripts/mpv.nix b/pkgs/applications/video/mpv/scripts/mpv.nix new file mode 100644 index 0000000000000..06e9ccb4d74a8 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv.nix @@ -0,0 +1,35 @@ +{ lib +, buildLua +, mpv-unwrapped +}: + +let mkBuiltin = name: args: + let srcPath = "TOOLS/lua/${name}.lua"; + in buildLua (lib.attrsets.recursiveUpdate rec { + inherit (mpv-unwrapped) src version; + pname = "mpv-${name}"; + + dontUnpack = true; + scriptPath = "${src}/${srcPath}"; + + meta = with lib; { + inherit (mpv-unwrapped.meta) license; + homepage = "https://github.com/mpv-player/mpv/blob/v${version}/${srcPath}"; + }; + } args); + +in lib.mapAttrs (name: lib.makeOverridable (mkBuiltin name)) { + acompressor.meta = { + description = "Script to toggle and control ffmpeg's dynamic range compression filter."; + maintainers = with lib.maintainers; [ nicoo ]; + }; + + autocrop.meta.description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video."; + + autodeint.meta.description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video."; + + autoload.meta = { + description = "This script automatically loads playlist entries before and after the currently played file"; + maintainers = [ lib.maintainers.dawidsowa ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 93e1402289cd8..9c1c6ce80f621 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -32,6 +32,8 @@ buildLua rec { runHook postInstall ''; + passthru.scriptName = "mpvacious"; + meta = with lib; { description = "Adds mpv keybindings to create Anki cards from movies and TV shows"; homepage = "https://github.com/Ajatt-Tools/mpvacious"; diff --git a/pkgs/applications/video/mpv/scripts/occivink.nix b/pkgs/applications/video/mpv/scripts/occivink.nix index 167e2fef6ac09..f4ea27c1c1aae 100644 --- a/pkgs/applications/video/mpv/scripts/occivink.nix +++ b/pkgs/applications/video/mpv/scripts/occivink.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, unstableGitUpdater , buildLua }: @@ -10,15 +11,16 @@ let in stringAsChars (c: if isUpper c != null then "-${toLower c}" else c); mkScript = name: args: - buildLua (lib.attrsets.recursiveUpdate rec { + let self = rec { pname = camelToKebab name; + version = "unstable-2023-12-18"; src = fetchFromGitHub { owner = "occivink"; repo = "mpv-scripts"; - rev = "af360f332897dda907644480f785336bc93facf1"; - hash = "sha256-KdCrUkJpbxxqmyUHksVVc8KdMn8ivJeUA2eerFZfEE8="; + rev = "f0426bd6b107b1f4b124552dae923b62f58ce3b6"; + hash = "sha256-oag5lcDoezyNXs5EBr0r0UE3ikeftvbfxSzfbxV1Oy0="; }; - version = "unstable-2022-10-02"; + passthru.updateScript = unstableGitUpdater {}; scriptPath = "scripts/${pname}.lua"; @@ -27,19 +29,17 @@ let license = licenses.unlicense; maintainers = with maintainers; [ nicoo ]; }; - } args); + + # Sadly needed to make `common-updaters` work here + pos = builtins.unsafeGetAttrPos "version" self; + }; + in buildLua (lib.attrsets.recursiveUpdate self args); in lib.mapAttrs (name: lib.makeOverridable (mkScript name)) { # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.seekTo ]; }` - seekTo = { - meta.description = "Mpv script for seeking to a specific position"; - outputHash = "sha256-3RlbtUivmeoR9TZ6rABiZSd5jd2lFv/8p/4irHMLshs="; - }; - - blacklistExtensions = { - meta.description = "Automatically remove playlist entries based on their extension."; - outputHash = "sha256-qw9lz8ofmvvh23F9aWLxiU4YofY+YflRETu+nxMhvVE="; - }; + seekTo.meta.description = "Mpv script for seeking to a specific position"; + blacklistExtensions.meta.description = + "Automatically remove playlist entries based on their extension."; } diff --git a/pkgs/applications/video/mpv/scripts/quality-menu.nix b/pkgs/applications/video/mpv/scripts/quality-menu.nix index e4d82d17ca394..8b9aadaccbc76 100644 --- a/pkgs/applications/video/mpv/scripts/quality-menu.nix +++ b/pkgs/applications/video/mpv/scripts/quality-menu.nix @@ -15,7 +15,6 @@ buildLua rec { hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns="; }; - scriptPath = "quality-menu.lua"; extraScripts = lib.optional oscSupport "quality-menu-osc.lua"; meta = with lib; { diff --git a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix index c3b53c618396b..b1f3f45956321 100644 --- a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix +++ b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix @@ -13,7 +13,7 @@ buildLua rec { }; scriptPath = "."; - passthru.scriptName = "webui.lua"; + passthru.scriptName = "webui"; meta = with lib; { description = "A web based user interface with controls for the mpv mediaplayer"; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix new file mode 100644 index 0000000000000..f7f8049cbba33 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix @@ -0,0 +1,32 @@ +{ lib +, buildLua +, fetchFromGitea +, curl +}: + +buildLua { + pname = "mpv_sponsorblock_minimal"; + version = "unstable-2023-08-20"; + scriptPath = "sponsorblock_minimal.lua"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "jouni"; + repo = "mpv_sponsorblock_minimal"; + rev = "ca2844b8cf7674bfccd282d389a50427742251d3"; + hash = "sha256-28HWZ6nOhKiE+5Ya1N3Vscd8aeH9OKS0t72e/xPfFQQ="; + }; + + preInstall = '' + substituteInPlace sponsorblock_minimal.lua \ + --replace "curl" "${lib.getExe curl}" + ''; + + meta = with lib; { + description = "A minimal script to skip sponsored segments of YouTube videos"; + homepage = "https://codeberg.org/jouni/mpv_sponsorblock_minimal"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ arthsmn ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index 0226074ca31b0..3ddb701f6d1d4 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -2,21 +2,18 @@ buildLua { pname = "mpv-thumbfast"; - version = "unstable-2023-06-04"; + version = "unstable-2023-12-08"; src = fetchFromGitHub { owner = "po5"; repo = "thumbfast"; - rev = "4241c7daa444d3859b51b65a39d30e922adb87e9"; - hash = "sha256-7EnFJVjEzqhWXAvhzURoOp/kad6WzwyidWxug6u8lVw="; + rev = "03e93feee5a85bf7c65db953ada41b4826e9f905"; + hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c="; }; - postPatch = '' - substituteInPlace thumbfast.lua \ - --replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getExe mpv-unwrapped}"' - ''; - - scriptPath = "thumbfast.lua"; + passthru.extraWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.getBin mpv-unwrapped}/bin" + ]; meta = { description = "High-performance on-the-fly thumbnailer for mpv"; diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix index b88cd2c5b968b..4c434d49f368b 100644 --- a/pkgs/applications/video/mpv/scripts/uosc.nix +++ b/pkgs/applications/video/mpv/scripts/uosc.nix @@ -1,42 +1,50 @@ -{ stdenvNoCC, lib, fetchFromGitHub, makeFontsConf }: - -stdenvNoCC.mkDerivation (finalAttrs: { +{ lib +, fetchFromGitHub +, fetchpatch +, makeFontsConf +, buildLua +, buildGoModule +}: + +buildLua (finalAttrs: { pname = "uosc"; - version = "4.7.0"; + version = "5.1.1"; + scriptPath = "src/uosc"; src = fetchFromGitHub { owner = "tomasklaen"; repo = "uosc"; rev = finalAttrs.version; - hash = "sha256-JqlBjhwRgmXl6XfHYTwtNWZj656EDHjcdWOlCgihF5I="; + hash = "sha256-+4k8T1yX3IRXK3XkUShsuJSH9w1Zla7CaRENcIqX4iM="; }; - postPatch = '' - substituteInPlace scripts/uosc.lua \ - --replace "mp.find_config_file('scripts')" "\"$out/share/mpv/scripts\"" - ''; - - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/mpv/ - cp -r scripts $out/share/mpv - cp -r fonts $out/share + tools = buildGoModule { + pname = "uosc-bin"; + inherit (finalAttrs) version src; + vendorHash = "sha256-nkY0z2GiDxfNs98dpe+wZNI3dAXcuHaD/nHiZ2XnZ1Y="; + }; - runHook postInstall - ''; + # Patch lua script to get the path to its `ziggy` binary form the environment + patches = [ + # uosc#814: Support overriding `ziggy_path` via environment variable + (fetchpatch { + url = "https://github.com/tomasklaen/uosc/commit/4fdf68a1bcb510824d66f35ecc7672a6452a44b2.patch"; + hash = "sha256-igUqFf8e7LVIIjGxACdIWAeZxjF/yqaCL4QRXrzNQXk="; + }) + ]; - passthru.scriptName = "uosc.lua"; # the script uses custom "texture" fonts as the background for ui elements. # In order for mpv to find them, we need to adjust the fontconfig search path. + postInstall = "cp -r src/fonts $out/share"; passthru.extraWrapperArgs = [ "--set" "FONTCONFIG_FILE" (toString (makeFontsConf { fontDirectories = [ "${finalAttrs.finalPackage}/share/fonts" ]; })) + "--set" + "MPV_UOSC_ZIGGY" + (lib.getExe' finalAttrs.tools "ziggy") ]; meta = with lib; { diff --git a/pkgs/applications/video/mpv/scripts/visualizer.nix b/pkgs/applications/video/mpv/scripts/visualizer.nix index a248b63d503a1..dedc2c62e907e 100644 --- a/pkgs/applications/video/mpv/scripts/visualizer.nix +++ b/pkgs/applications/video/mpv/scripts/visualizer.nix @@ -1,34 +1,22 @@ { lib, - stdenvNoCC, + buildLua, fetchFromGitHub, }: -stdenvNoCC.mkDerivation { +buildLua { pname = "visualizer"; - version = "unstable-2021-07-10"; + version = "unstable-2023-08-13"; src = fetchFromGitHub { owner = "mfcc64"; repo = "mpv-scripts"; - rev = "a0cd87eeb974a4602c5d8086b4051b5ab72f42e1"; - sha256 = "1xgd1nd117lpj3ppynhgaa5sbkfm7l8n6c9a2fy8p07is2dkndrq"; + rev = "7dbbfb283508714b73ead2a57b6939da1d139bd3"; + sha256 = "zzB4uBc1M2Gdr/JKY2uk8MY0hmQl1XeomkfTzuM45oE="; }; - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/mpv/scripts - cp visualizer.lua $out/share/mpv/scripts - runHook postInstall - ''; - - passthru.scriptName = "visualizer.lua"; - meta = with lib; { description = "various audio visualization"; homepage = "https://github.com/mfcc64/mpv-scripts"; - platforms = platforms.all; maintainers = with maintainers; [kmein]; }; } diff --git a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix index a1713e24375f0..e870818fc64fe 100644 --- a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix +++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix @@ -2,23 +2,23 @@ buildNpmPackage rec { pname = "webtorrent-mpv-hook"; - version = "1.3.3"; + version = "1.4.1"; src = fetchFromGitHub { owner = "mrxdst"; repo = pname; rev = "v${version}"; - hash = "sha256-AFKX31kriacXygZy0Mw+QwO+SwFEu13687mJ/WeAoKY="; + hash = "sha256-/dMtXcIyfAs++Zgz2CxRW0tkzn5QjS+WVGChlCyrU0U="; }; postPatch = '' substituteInPlace src/webtorrent.ts --replace "node_path: 'node'" "node_path: '${nodejs}/bin/node'" # This executable is just for telling non-Nix users how to install - substituteInPlace package.json --replace '"bin": "build/bin.js",' "" + substituteInPlace package.json --replace '"bin": "build/bin.mjs",' "" rm -rf src/bin.ts ''; - npmDepsHash = "sha256-GpNUJ5ZCgMjSYLqsIE/RwkTSFT3uAhxrHPe7XvGDRHE="; + npmDepsHash = "sha256-EqHPBoYyBuW9elxQH/XVTZoPkKHC6+7aksYo60t7WA4="; makeCacheWritable = true; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fee8325bf6d5a..a19e996064a0c 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -170,7 +170,7 @@ stdenv.mkDerivation rec { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ jb55 MP2E V materus ]; + maintainers = with maintainers; [ jb55 MP2E materus ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index 6d11ed2ffd55e..3b5824f345292 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-gDM2S/ygN58iodfO5d34LYUclkzf+nAIBWp+wFeWWik="; + sha256 = "sha256-kJJepKUH/tc6iV/zFDtrAa4bM9Gaqc9M7IItytknkGA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index f418e997333d1..08109434a0b72 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-vkcapture"; - version = "1.4.5"; + version = "1.4.7"; src = fetchFromGitHub { owner = "nowrep"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-C5dMDfCFkUNENA4qQlmGeavKqYpbRHkUz79LVM5aVao="; + hash = "sha256-/EbavDDeFQys9zu3FAgsAeVVbs1Rrv8YR4949XCHc6s="; }; cmakeFlags = lib.optionals stdenv.isi686 [ diff --git a/pkgs/applications/video/obs-studio/plugins/wlrobs.nix b/pkgs/applications/video/obs-studio/plugins/wlrobs.nix index e309447d95276..360b3fb349f68 100644 --- a/pkgs/applications/video/obs-studio/plugins/wlrobs.nix +++ b/pkgs/applications/video/obs-studio/plugins/wlrobs.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with lib; { description = "An obs-studio plugin that allows you to screen capture on wlroots based wayland compositors"; homepage = "https://hg.sr.ht/~scoopta/wlrobs"; - maintainers = with maintainers; [ grahamc V ]; + maintainers = with maintainers; [ grahamc ]; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index f23ed20c797be..514da9c50d750 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -19,6 +19,18 @@ , qttools }: +let + # https://github.com/olive-editor/olive/issues/2284 + # we patch support for 2.3+, but 2.5 fails + openimageio' = openimageio.overrideAttrs (old: rec { + version = "2.4.15.0"; + src = (old.src.override { + rev = "v${version}"; + hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M="; + }); + }); +in + stdenv.mkDerivation { pname = "olive-editor"; version = "unstable-2023-06-12"; @@ -61,7 +73,7 @@ stdenv.mkDerivation { ffmpeg_4 frei0r opencolorio - openimageio + openimageio' imath openexr_3 portaudio diff --git a/pkgs/applications/video/olive-editor/q-painter-path.patch b/pkgs/applications/video/olive-editor/q-painter-path.patch deleted file mode 100644 index 232f157e7cdd9..0000000000000 --- a/pkgs/applications/video/olive-editor/q-painter-path.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/effects/internal/texteffect.cpp b/effects/internal/texteffect.cpp -index 279f406d9..7fe9e8e72 100644 ---- a/effects/internal/texteffect.cpp -+++ b/effects/internal/texteffect.cpp -@@ -20,6 +20,7 @@ - - #include "texteffect.h" - -+#include <QPainterPath> - #include <QGridLayout> - #include <QLabel> - #include <QOpenGLTexture> -diff --git a/effects/internal/timecodeeffect.cpp b/effects/internal/timecodeeffect.cpp -index 4de3e3497..fd0fa6224 100644 ---- a/effects/internal/timecodeeffect.cpp -+++ b/effects/internal/timecodeeffect.cpp -@@ -20,6 +20,7 @@ - - #include "timecodeeffect.h" - -+#include <QPainterPath> - #include <QGridLayout> - #include <QLabel> - #include <QOpenGLTexture> -diff --git a/ui/graphview.cpp b/ui/graphview.cpp -index 3e13075cd..c441133a8 100644 ---- a/ui/graphview.cpp -+++ b/ui/graphview.cpp -@@ -20,6 +20,7 @@ - - #include "graphview.h" - -+#include <QPainterPath> - #include <QPainter> - #include <QMouseEvent> - #include <QtMath> -diff --git a/ui/timelineheader.cpp b/ui/timelineheader.cpp -index f39065b4f..aa7fd638d 100644 ---- a/ui/timelineheader.cpp -+++ b/ui/timelineheader.cpp -@@ -20,6 +20,7 @@ - - #include "timelineheader.h" - -+#include <QPainterPath> - #include <QPainter> - #include <QMouseEvent> - #include <QScrollBar> diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index f209c092bdc1d..5c9b85e1f6808 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -2,7 +2,6 @@ , stdenv , mkDerivationWith , fetchFromGitHub -, fetchpatch , doxygen , gtk3 , libopenshot @@ -12,16 +11,20 @@ , wrapGAppsHook }: -mkDerivationWith python3.pkgs.buildPythonApplication rec { +let pname = "openshot-qt"; - version = "3.0.0"; - + version = "3.1.1"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - hash = "sha256-h4R2txi038m6tzdKYiXIB8CiqWt2MFFRNerp1CFP5as="; + hash = "sha256-kEz1APBitWLlnIbyloYMsqNrwC9RqU04kyyWzm5klYc="; }; +in +mkDerivationWith python3.pkgs.buildPythonApplication { + inherit pname version src; + + outputs = [ "out" ]; # "lib" can't be split nativeBuildInputs = [ doxygen @@ -41,8 +44,10 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { sip_4 ]; + strictDeps = true; + preConfigure = '' - # tries to create caching directories during install + # the builder tries to create caching directories during install export HOME=$(mktemp -d) ''; @@ -67,19 +72,19 @@ mkDerivationWith python3.pkgs.buildPythonApplication rec { inherit (libopenshot) libopenshot-audio; }; - meta = with lib; { + meta = { homepage = "http://openshot.org/"; description = "Free, open-source video editor"; longDescription = '' OpenShot Video Editor is a free, open-source video editor for Linux. - OpenShot can take your videos, photos, and music files and help you - create the film you have always dreamed of. Easily add sub-titles, - transitions, and effects, and then export your film to DVD, YouTube, - Vimeo, Xbox 360, and many other common formats. + OpenShot can take your videos, photos, and music files and help you create + the film you have always dreamed of. Easily add sub-titles, transitions, + and effects, and then export your film to DVD, YouTube, Vimeo, Xbox 360, + and many other common formats. ''; - license = with licenses; gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + license = with lib.licenses; [ gpl3Plus ]; mainProgram = "openshot-qt"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index 5fc574881cfbd..68c47df58da66 100644 --- a/pkgs/applications/video/pipe-viewer/default.nix +++ b/pkgs/applications/video/pipe-viewer/default.nix @@ -67,6 +67,11 @@ buildPerlModule rec { ]; dontWrapGApps = true; + + postInstall = '' + cp -r share/* $out/share + ''; + postFixup = '' wrapProgram "$out/bin/pipe-viewer" \ --prefix PATH : "${lib.makeBinPath [ ffmpeg wget youtube-dl yt-dlp ]}" diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index ecfd8a676bcaf..200fab2743396 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , cmake , opencv @@ -35,6 +36,19 @@ stdenv.mkDerivation rec { hash = "sha256-1xb8O3VrErldid2OgAUMG28mSUO7QBUsPuSz8p03tSI"; }; + patches = [ + # Fix build with g2o 20230806 + (fetchpatch { + url = "https://github.com/introlab/rtabmap/commit/85cc6fe3c742855ad16c8442895e12dbb10b6e8b.patch"; + hash = "sha256-P6GkYKCNwe9dgZdgF/oEhgjA3bJnwXFWJCPoyIknQCo="; + }) + # Fix typo in previous patch + (fetchpatch { + url = "https://github.com/introlab/rtabmap/commit/c4e94bcdc31b859c1049724dbb7671e4597d86de.patch"; + hash = "sha256-1btkV4/y+bnF3xEVqlUy/9F6BoANeTOEJjZLmRzG3iA="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ]; buildInputs = [ ## Required diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index efa7782891ceb..cb1a227dd060d 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,6 +1,8 @@ { lib , fetchFromGitHub -, mkDerivation +, stdenv +, wrapQtAppsHook +, substituteAll , SDL2 , frei0r , ladspaPlugins @@ -8,72 +10,54 @@ , mlt , jack1 , pkg-config +, fftw , qtbase -, qtmultimedia -, qtx11extras -, qtwebsockets -, qtquickcontrols2 -, qtgraphicaleffects -, qmake , qttools +, qtmultimedia +, qtcharts +, cmake , gitUpdater }: - -assert lib.versionAtLeast mlt.version "6.24.0"; - -mkDerivation rec { +stdenv.mkDerivation rec { pname = "shotcut"; - version = "21.09.20"; + version = "23.12.15"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1y46n5gmlayfl46l0vhg5g5dbbc0sg909mxb68sia0clkaas8xrh"; + hash = "sha256-wTFnf7YMFzFI+buAI2Cqy7+cfcdDS0O1vAwiIZZKWhU="; }; - nativeBuildInputs = [ pkg-config qmake ]; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; buildInputs = [ SDL2 frei0r ladspaPlugins gettext mlt + fftw qtbase + qttools qtmultimedia - qtx11extras - qtwebsockets - qtquickcontrols2 - qtgraphicaleffects + qtcharts ]; - env.NIX_CFLAGS_COMPILE = "-I${mlt.dev}/include/mlt++ -I${mlt.dev}/include/mlt"; - qmakeFlags = [ - "QMAKE_LRELEASE=${lib.getDev qttools}/bin/lrelease" - "SHOTCUT_VERSION=${version}" - "DEFINES+=SHOTCUT_NOUPGRADE" + env.NIX_CFLAGS_COMPILE = "-DSHOTCUT_NOUPGRADE"; + cmakeFlags = [ + "-DSHOTCUT_VERSION=${version}" ]; - prePatch = '' - sed 's_shotcutPath, "melt[^"]*"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp - sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp - sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp - NICE=$(type -P nice) - sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp - ''; + patches = [ + (substituteAll { inherit mlt; src = ./fix-mlt-ffmpeg-path.patch; }) + ]; qtWrapperArgs = [ - "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" - "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ jack1 SDL2 ]}" - "--prefix PATH : ${mlt}/bin" + "--set FREI0R_PATH ${frei0r}/lib/frei0r-1" + "--set LADSPA_PATH ${ladspaPlugins}/lib/ladspa" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [jack1 SDL2]}" ]; - postInstall = '' - mkdir -p $out/share/shotcut - cp -r src/qml $out/share/shotcut/ - ''; - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/applications/video/shotcut/fix-mlt-ffmpeg-path.patch b/pkgs/applications/video/shotcut/fix-mlt-ffmpeg-path.patch new file mode 100644 index 0000000000000..fa584162cbe83 --- /dev/null +++ b/pkgs/applications/video/shotcut/fix-mlt-ffmpeg-path.patch @@ -0,0 +1,80 @@ +diff --git a/src/docks/encodedock.cpp b/src/docks/encodedock.cpp +index 3359f676..24e44f98 100644 +--- a/src/docks/encodedock.cpp ++++ b/src/docks/encodedock.cpp +@@ -2177,7 +2177,7 @@ bool EncodeDock::detectHardwareEncoders() + { + MAIN.showStatusMessage(tr("Detecting hardware encoders...")); + QStringList hwlist; +- QFileInfo ffmpegPath(qApp->applicationDirPath(), "ffmpeg"); ++ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg"); + foreach (const QString &codec, codecs()) { + LOG_INFO() << "checking for" << codec; + QProcess proc; +@@ -2220,7 +2220,7 @@ bool EncodeDock::detectHardwareEncoders() + QString &EncodeDock::defaultFormatExtension() + { + auto format = ui->formatCombo->currentText(); +- QFileInfo ffmpegPath(qApp->applicationDirPath(), "ffmpeg"); ++ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg"); + QProcess proc; + QStringList args; + args << "-hide_banner" << "-h" << format.prepend("muxer="); +diff --git a/src/jobs/ffmpegjob.cpp b/src/jobs/ffmpegjob.cpp +index 1f15e647..b6ad6633 100644 +--- a/src/jobs/ffmpegjob.cpp ++++ b/src/jobs/ffmpegjob.cpp +@@ -54,7 +54,7 @@ FfmpegJob::~FfmpegJob() + void FfmpegJob::start() + { + QString shotcutPath = qApp->applicationDirPath(); +- QFileInfo ffmpegPath(shotcutPath, "ffmpeg"); ++ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg"); + setReadChannel(QProcess::StandardError); + LOG_DEBUG() << ffmpegPath.absoluteFilePath() + " " + m_args.join(' '); + AbstractJob::start(ffmpegPath.absoluteFilePath(), m_args); +diff --git a/src/jobs/meltjob.cpp b/src/jobs/meltjob.cpp +index fd8c00b8..9150fe7b 100644 +--- a/src/jobs/meltjob.cpp ++++ b/src/jobs/meltjob.cpp +@@ -98,9 +98,9 @@ void MeltJob::start() + } + QString shotcutPath = qApp->applicationDirPath(); + #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +- QFileInfo meltPath(shotcutPath, "melt-7"); ++ QFileInfo meltPath("@mlt@/bin/melt"); + #else +- QFileInfo meltPath(shotcutPath, "melt"); ++ QFileInfo meltPath("@mlt@/bin/melt"); + #endif + setReadChannel(QProcess::StandardError); + QStringList args; +diff --git a/src/mltcontroller.cpp b/src/mltcontroller.cpp +index 1e2299ac..b8f39f12 100644 +--- a/src/mltcontroller.cpp ++++ b/src/mltcontroller.cpp +@@ -1555,9 +1555,9 @@ int Controller::checkFile(const QString &path) + || path.endsWith(".aep")) { + QString shotcutPath = qApp->applicationDirPath(); + #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +- QFileInfo meltPath(shotcutPath, "melt-7"); ++ QFileInfo meltPath("@mlt@/bin/melt"); + #else +- QFileInfo meltPath(shotcutPath, "melt"); ++ QFileInfo meltPath("@mlt@/bin/melt"); + #endif + QStringList args; + args << "-quiet" << "-consumer" << "null" << "real_time=0" << "out=0" << "terminate_on_pause=1" << +diff --git a/src/widgets/directshowvideowidget.cpp b/src/widgets/directshowvideowidget.cpp +index c91ba821..73dd5a61 100644 +--- a/src/widgets/directshowvideowidget.cpp ++++ b/src/widgets/directshowvideowidget.cpp +@@ -35,7 +35,7 @@ DirectShowVideoWidget::DirectShowVideoWidget(QWidget *parent) : + ui->setupUi(this); + Util::setColorsToHighlight(ui->label); + #ifdef Q_OS_WIN +- QFileInfo ffmpegPath(qApp->applicationDirPath(), "ffmpeg"); ++ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg"); + QProcess proc; + QStringList args; + args << "-hide_banner" << "-list_devices" << "true" << "-f" << "dshow" << "-i" << "dummy"; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 8cd967606041e..513468cb16cf0 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "smplayer"; - version = "23.6.0.10170"; + version = "23.12.0"; src = fetchFromGitHub { owner = "smplayer-dev"; repo = "smplayer"; rev = "v${finalAttrs.version}"; - hash = "sha256-ByheWIXvCw9jL3lY63oRzRZhl0jZz4jr+rw5Wi7Mm8w="; + hash = "sha256-ip4y9GF2u1yl1Ts8T9XcFg9wdXVTYXfDrrPuHLz6oSs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index f6eef2ea9a246..83b734519d030 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.4.2"; + version = "6.5.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-tftxn0JRppLIh4ih1G4s0PoiMZYMUrKBy4IQhxxyLnY="; + hash = "sha256-j01hWTvM4Q+NXoTKlWqsT6Y5wKNJ5983mDQ3Oog5Zu0="; }; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/applications/video/video-trimmer/default.nix b/pkgs/applications/video/video-trimmer/default.nix index d3d55d2cb4a6b..3ff12dbffcce4 100644 --- a/pkgs/applications/video/video-trimmer/default.nix +++ b/pkgs/applications/video/video-trimmer/default.nix @@ -13,7 +13,7 @@ , gtk4 , libadwaita , gst_all_1 -, ffmpeg-full +, ffmpeg-headless }: stdenv.mkDerivation (finalAttrs: { @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ ffmpeg-full ]}" + --prefix PATH : "${lib.makeBinPath [ ffmpeg-headless ]}" ) ''; diff --git a/pkgs/applications/video/vivictpp/default.nix b/pkgs/applications/video/vivictpp/default.nix index 9b8a8773b1b4b..e2fc34340fc5b 100644 --- a/pkgs/applications/video/vivictpp/default.nix +++ b/pkgs/applications/video/vivictpp/default.nix @@ -7,7 +7,7 @@ , cacert }: let - version = "0.3.1"; + version = "1.0.0"; withSubprojects = stdenv.mkDerivation { name = "sources-with-subprojects"; @@ -15,7 +15,7 @@ let owner = "vivictorg"; repo = "vivictpp"; rev = "v${version}"; - hash = "sha256-6YfYeUrM7cq8hnOPMq0Uq/HToFBDri0N/r0SU0LeT/Y="; + hash = "sha256-dCtMjemEjXe63ELAfQhzJl3GecqWLcjL2y5Htn6hYgU="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-lIm2Bwy61St9d1e6QSm5ZpSIDR9ucaQKBPHATTDEgW4="; + outputHash = "sha256-a7NBQJt5T+KwP8Djc8TQiVLNZF8UcXlXrv2G/dZ54aM="; }; in stdenv.mkDerivation rec { pname = "vivictpp"; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index ca2c0f890d9a2..b921e63ec9fea 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,5 +1,5 @@ { stdenv, nixosTests, lib, edk2, util-linux, nasm, acpica-tools, llvmPackages -, csmSupport ? false, seabios ? null +, csmSupport ? false, seabios , fdSize2MB ? csmSupport , fdSize4MB ? false , secureBoot ? false @@ -12,8 +12,6 @@ , sourceDebug ? false }: -assert csmSupport -> seabios != null; - let projectDscPath = if stdenv.isi686 then @@ -68,7 +66,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { env.PYTHON_COMMAND = "python3"; postPatch = lib.optionalString csmSupport '' - cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin + cp ${seabios}/share/seabios/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin ''; postFixup = ( diff --git a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock index f40fbc0f42844..52afc0d15f831 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock +++ b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock @@ -36,16 +36,15 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] @@ -75,9 +74,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -147,15 +146,15 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock", + "async-lock 3.2.0", "async-task", "concurrent-queue", - "fastrand 1.9.0", - "futures-lite", + "fastrand 2.0.0", + "futures-lite 2.1.0", "slab", ] @@ -165,10 +164,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.7.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -177,15 +176,15 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.7.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", "polling", - "rustix 0.37.25", + "rustix 0.37.27", "slab", "socket2", "waker-fn", @@ -201,27 +200,38 @@ dependencies = [ ] [[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.0", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] name = "async-process" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf012553ce51eb7aa6dc2143804cc8252bd1cb681a1c5cb7fa94ca88682dee1d" dependencies = [ "async-io", - "async-lock", + "async-lock 2.7.0", "async-signal", "blocking", "cfg-if", "event-listener 3.0.0", - "futures-lite", + "futures-lite 1.13.0", "rustix 0.38.8", "windows-sys 0.48.0", ] [[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", @@ -235,7 +245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c99f3cb3f9ff89f7d718fbb942c9eb91bedff12e396adf09a622dfe7ffec2bc2" dependencies = [ "async-io", - "async-lock", + "async-lock 2.7.0", "atomic-waker", "cfg-if", "concurrent-queue", @@ -249,9 +259,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.4.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" @@ -361,11 +371,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ "async-channel", - "async-lock", + "async-lock 2.7.0", "async-task", "atomic-waker", "fastrand 1.9.0", - "futures-lite", + "futures-lite 1.13.0", "log", ] @@ -398,36 +408,35 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.3.11" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", "clap_lex", - "once_cell", "strsim", "terminal_size", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cloud-hypervisor" -version = "36.0.0" +version = "37.0.0" dependencies = [ "anyhow", "api_client", @@ -464,9 +473,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -719,6 +728,27 @@ dependencies = [ ] [[package]] +name = "event-listener" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.0", + "pin-project-lite", +] + +[[package]] name = "event_monitor" version = "0.1.0" dependencies = [ @@ -796,9 +826,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" @@ -833,6 +863,19 @@ dependencies = [ ] [[package]] +name = "futures-lite" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "fastrand 2.0.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] name = "futures-macro" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -851,9 +894,9 @@ checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" @@ -875,11 +918,11 @@ dependencies = [ [[package]] name = "gdbstub" -version = "0.6.6" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e02bf1b1a624d96925c608f1b268d82a76cbc587ce9e59f7c755e9ea11c75c" +checksum = "09a8b954f9d02b74fe8e89a1c77bd9a6b8206713ebf1b272bfad9573b4a86f88" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cfg-if", "log", "managed", @@ -889,9 +932,9 @@ dependencies = [ [[package]] name = "gdbstub_arch" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecb536c55c43593a00dde9074dbbdb0e81ce5f20dbca921400f8779c21dea9c" +checksum = "4e3b1357bd3203fc09a6601327ae0ab38865d14231d0b65d3143f5762cc7977d" dependencies = [ "gdbstub", "num-traits", @@ -1024,9 +1067,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown", @@ -1054,9 +1097,9 @@ dependencies = [ [[package]] name = "io-uring" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141a0f4546a50b2ed637c7a6df0d7dff45c9f41523254996764461c8ae0d9424" +checksum = "460648e47a07a43110fbfa2e0b14afb2be920093c31e5dccc50e49568e099762" dependencies = [ "bitflags 1.3.2", "libc", @@ -1157,9 +1200,9 @@ dependencies = [ [[package]] name = "linux-loader" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db6a725c8000971f83fa93ed7ee1b600e55a1471a2a653379d3c84f72effdcf" +checksum = "132a531b85b3a164012ab682c72f8f2cce7757f187be5f60782fd2b4cda9cb34" dependencies = [ "vm-memory", ] @@ -1188,12 +1231,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 = "managed" @@ -1219,7 +1259,7 @@ dependencies = [ [[package]] name = "micro_http" version = "0.1.0" -source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#0d0fdcd50ea10c1b4777f9a958873fc848a5b7bb" +source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#a4d632f2c5ea45712c0d2002dc909a63879e85c3" dependencies = [ "libc", "vmm-sys-util", @@ -1247,7 +1287,7 @@ dependencies = [ [[package]] name = "mshv-bindings" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#af397ea8514303d3a19d21d33730e867f7415ba9" +source = "git+https://github.com/rust-vmm/mshv?branch=main#0dd4d3452a7f2e95199f4b58380acc41458474de" dependencies = [ "libc", "serde", @@ -1259,7 +1299,7 @@ dependencies = [ [[package]] name = "mshv-ioctls" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#af397ea8514303d3a19d21d33730e867f7415ba9" +source = "git+https://github.com/rust-vmm/mshv?branch=main#0dd4d3452a7f2e95199f4b58380acc41458474de" dependencies = [ "libc", "mshv-bindings", @@ -1327,18 +1367,18 @@ checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[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 = [ "memchr", ] @@ -1413,9 +1453,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -1509,18 +1549,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", @@ -1670,9 +1710,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -1823,9 +1863,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.25" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -1908,9 +1948,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", @@ -2087,11 +2127,11 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.37.25", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -2138,9 +2178,9 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" @@ -2227,9 +2267,9 @@ dependencies = [ [[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 = "utf8parse" @@ -2288,7 +2328,7 @@ dependencies = [ [[package]] name = "vfio-bindings" version = "0.4.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#847b0aa504ac6367efe42ba7e96a2d050737d4f0" +source = "git+https://github.com/rust-vmm/vfio?branch=main#59c604fa6e42080f0a47c124ba29454fe4cb7475" dependencies = [ "vmm-sys-util", ] @@ -2296,7 +2336,7 @@ dependencies = [ [[package]] name = "vfio-ioctls" version = "0.2.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#847b0aa504ac6367efe42ba7e96a2d050737d4f0" +source = "git+https://github.com/rust-vmm/vfio?branch=main#59c604fa6e42080f0a47c124ba29454fe4cb7475" dependencies = [ "byteorder", "kvm-bindings", @@ -2314,7 +2354,7 @@ dependencies = [ [[package]] name = "vfio_user" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vfio-user?branch=main#2d96b90a7279547356ad8f83aaa3115ad5497302" +source = "git+https://github.com/rust-vmm/vfio-user?branch=main#6c72e997e61d9e84b8ee691ad63ece6c717cf5aa" dependencies = [ "bitflags 1.3.2", "libc", @@ -2330,11 +2370,11 @@ dependencies = [ [[package]] name = "vhost" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61957aeb36daf0b00b87fff9c10dd28a161bd35ab157553d340d183b3d8756e6" +checksum = "289adfce099c71f8310f895932ccd978f352ca494ea47496dbe20d4241888b82" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "libc", "vm-memory", "vmm-sys-util", @@ -2342,9 +2382,9 @@ dependencies = [ [[package]] name = "vhost-user-backend" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab069cdedaf18a0673766eb0a07a0f4ee3ed1b8e17fbfe4aafe5b988e2de1d01" +checksum = "61255322e3ebe93fb77d9f6d99577eca7089bbea4174076c5353a8024a463061" dependencies = [ "libc", "log", @@ -2394,9 +2434,9 @@ dependencies = [ [[package]] name = "virtio-bindings" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c18d7b74098a946470ea265b5bacbbf877abc3373021388454de0d47735a5b98" +checksum = "878bcb1b2812a10c30d53b0ed054999de3d98f25ece91fc173973f9c57aaae86" [[package]] name = "virtio-devices" @@ -2434,9 +2474,9 @@ dependencies = [ [[package]] name = "virtio-queue" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35aca00da06841bd99162c381ec65893cace23ca0fb89254302cfe4bec4c300f" +checksum = "73a01db2cfb6c4b9bc20608b1336263d16714ea8db05de9fec2a254e076f9385" dependencies = [ "log", "virtio-bindings", @@ -2473,9 +2513,9 @@ source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#77212bd0d62913e445c [[package]] name = "vm-memory" -version = "0.12.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dc276f0d00c17b9aeb584da0f1e1c673df0d183cc2539e3636ec8cbc5eae99b" +checksum = "5376c9ee5ebe2103a310d8241936cfb93c946734b0479a4fa5bdf7a64abbacd8" dependencies = [ "arc-swap", "libc", @@ -2525,15 +2565,20 @@ dependencies = [ "futures", "gdbstub", "gdbstub_arch", + "hex", "hypervisor", + "igvm", + "igvm_defs", "libc", "linux-loader", "log", "micro_http", + "mshv-bindings", "net_util", "once_cell", "option_parser", "pci", + "range_map_vec", "seccompiler", "serde", "serde_json", @@ -2837,7 +2882,7 @@ dependencies = [ "async-executor", "async-fs", "async-io", - "async-lock", + "async-lock 2.7.0", "async-process", "async-recursion", "async-task", diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index b1ca5fa1f2a55..8c0d6e9e1c1be 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "36.0"; + version = "37.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - hash = "sha256-SgzohTW0tDn/O65rujZh7hsbvTeu4nQ0HvvXu9f92Vc="; + hash = "sha256-zNk3KkKl0bEZUdsWe+9FEMKVepZeQWGasDIn68NEVyw="; }; cargoLock = { @@ -18,11 +18,11 @@ rustPlatform.buildRustPackage rec { "igvm-0.1.0" = "sha256-l+Qyhdy3b8h8hPLHg5M0os8aSkjM55hAP5nqi0AGmjo="; "kvm-bindings-0.6.0" = "sha256-wGdAuPwsgRIqx9dh0m+hC9A/Akz9qg9BM+p06Fi5ACM="; "kvm-ioctls-0.13.0" = "sha256-jHnFGwBWnAa2lRu4a5eRNy1Y26NX5MV8alJ86VR++QE="; - "micro_http-0.1.0" = "sha256-wX35VsrO1vxQcGbOrP+yZm9vG0gcTZLe7gH7xuAa12w="; - "mshv-bindings-0.1.1" = "sha256-vyNaKp89THzZ/UpfocEwaCUzCuQnBMyv/icuZEghZEQ="; + "micro_http-0.1.0" = "sha256-Ov75Gs+wSmsxOHJu024nWtOJp0cKpS8bkxJJGW6jiKw="; + "mshv-bindings-0.1.1" = "sha256-4ADpLvi9hmHsMyGtqDQ2Msa3aMZmJsi4BPW7B5ZfAMw="; "versionize_derive-0.1.4" = "sha256-oGuREJ5+FDs8ihmv99WmjIPpL2oPdOr4REk6+7cV/7o="; - "vfio-bindings-0.4.0" = "sha256-hGhfOE9q9sf/tzPuaAHOca+JKCutcm1Myu1Tt9spaIQ="; - "vfio_user-0.1.0" = "sha256-fAqvy3YTDKXQqtJR+R2nBCWIYe89zTwtbgvJfPLqs1Q="; + "vfio-bindings-0.4.0" = "sha256-grOV+7W1tB4YDRAFbDNQp5nQ1WaivH+N+qHTIj4WA+E="; + "vfio_user-0.1.0" = "sha256-Vi6dBu1mUwyWh7ryKDOBS6GeUD2sqqIrt/bth/LDW6s="; "vm-fdt-0.2.0" = "sha256-lKW4ZUraHomSDyxgNlD5qTaBTZqM0Fwhhh/08yhrjyE="; }; }; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 3cfd905bc5601..01b9960a5e88b 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cntr"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "Mic92"; repo = "cntr"; rev = version; - sha256 = "sha256-z+0bSxoLJTK4e5xS4CHZ2hNUI56Ci1gbWJsRcN6ZqZA="; + sha256 = "sha256-spa4qPEhpNSZIk16jeH9YEr4g9JcVmpetHz72A/ZAPY="; }; - cargoSha256 = "sha256-3e5wDne6Idu+kDinHPcAKHfH/d4DrGg90GkiMbyF280="; + cargoHash = "sha256-YN8EtUXKtT8Xc0RnW7QqL+awyWy5xFKWhYMxgYG28I4="; passthru.tests = nixosTests.cntr; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index f096b59efc996..f55cc5faecd95 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "colima"; - version = "0.6.5"; + version = "0.6.7"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lIYLoCFYOwu1iqGgE/jhaqrXAL5ooFHDUnwL56qcGIE="; + hash = "sha256-7s/e/fV6azT26oeEJhh6PPcnI/cjpmEHf9TsZHspcwE="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -35,7 +35,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ] ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; - vendorHash = "sha256-7DIhSjHpaCyHyXKhR8KWQc2YGaD8CMq+BZHF4zIkL50="; + vendorHash = "sha256-ET9n15+YK8ByodePztee6tKdFvvgk7jEKSUjRYSEpq8="; # disable flaky Test_extractZones # https://hydra.nixos.org/build/212378003/log diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index f929bac673c2e..124647e6ab7be 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , pkg-config , glib , glibc @@ -11,13 +12,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.8"; + version = "2.1.10"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-gdMNAU+w4u+9DZL9x96OAZihShkQdvSiqPCA+eNf600="; + hash = "sha256-WUXyx5OWIJDamzHUahN+0/rcn2pxQgCgYAE/d0mxk2A="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 82e814610dcef..47381e4d1a1b2 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.9"; + version = "1.7.11"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-/kCnzOL8CJuJJglHzmev3alt8cMwTUbIiZhNft9zwps="; + hash = "sha256-kvBD9Qh10kRowr32zDzjpHYh2IZC6+w+nOO4joShgEE="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 05de3c1626df9..1cd8b02bacf77 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.28.2"; + version = "1.29.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-g9J66CZOAoco7UmK+xPEE6T5Aes3LWEG3J40LuDcvYo="; + sha256 = "sha256-Vy/sW8Y9SFSBaoectehF7ROxuypD7k7tAkcfrEK+pmI="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix index 5ea3aa54b2ef7..3709b8dbd9012 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.5"; + version = "1.22.6"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-s4uRS/BIRjVVN3u+ocy2RcwSnvJLtWpkvxtvgumuWtk="; + hash = "sha256-i+uubmCQwJALt7YRuANpEN2AAn9i6880MaXkayIZ82g="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 62e424422fb0d..226e29ebd3ffd 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-slim"; - version = "1.40.6"; + version = "1.40.7"; src = fetchFromGitHub { owner = "slimtoolkit"; repo = "slim"; rev = version; - hash = "sha256-0rn+tqdPVjkIPxOwL9rDnolrpcsDOwOah0Y7924mjD4="; + hash = "sha256-X+7FMdIotnafUEKQUrvxYgN4qGqbtVJaZD+V4/whylM="; }; vendorHash = null; @@ -18,14 +18,14 @@ buildGoModule rec { nativeBuildInputs = [ makeBinaryWrapper ]; preBuild = '' - go generate github.com/docker-slim/docker-slim/pkg/appbom + go generate ./... ''; ldflags = [ "-s" "-w" - "-X github.com/docker-slim/docker-slim/pkg/version.appVersionTag=${version}" - "-X github.com/docker-slim/docker-slim/pkg/version.appVersionRev=${src.rev}" + "-X github.com/slimtoolkit/slim/pkg/version.appVersionTag=${version}" + "-X github.com/slimtoolkit/slim/pkg/version.appVersionRev=${src.rev}" ]; # docker-slim tries to create its state dir next to the binary (inside the nix diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index bd8dbab4cfcaa..24809f9450b48 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.23.1"; + version = "2.23.3"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-g8XaMvKt3tR7a7kq+n4ueDXx9iWuAu02ONb73W23ZGY="; + hash = "sha256-Rp13xK7pRyjHaDclAfL+yzNf4ppOy9S+XFbydj4TDL4="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-BeW39XN1CvPCCq4otX+Il2dGGcjGrTMzc4iSXmQZFmw="; + vendorHash = "sha256-iKBMd4e1oVNdKuk08tYPexQqs9JLofhdf4yEP1s97EQ="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch b/pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch deleted file mode 100644 index d3f207de00b29..0000000000000 --- a/pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Makefile b/Makefile -index 0070ada..802cef0 100644 ---- a/Makefile -+++ b/Makefile -@@ -202,7 +202,7 @@ $(BIN_NAME): $(BIN_OBJS) - ##### Public rules ##### - - all: CPPFLAGS += -DNDEBUG --all: shared static tools -+all: shared tools - - # Run with ASAN_OPTIONS="protect_shadow_gap=0" to avoid CUDA OOM errors - debug: CFLAGS += -pedantic -fsanitize=undefined -fno-omit-frame-pointer -fno-common -fsanitize=address -@@ -232,7 +232,6 @@ install: all - # Install header files - $(INSTALL) -m 644 $(LIB_INCS) $(DESTDIR)$(includedir) - # Install library files -- $(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir) - $(INSTALL) -m 755 $(LIB_SHARED) $(DESTDIR)$(libdir) - $(LN) -sf $(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SYMLINK) - $(LDCONFIG) -n $(DESTDIR)$(libdir) diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix index 6cbed6f41f601..622ba090e0ee0 100644 --- a/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -3,7 +3,7 @@ , addOpenGLRunpath , fetchFromGitHub , pkg-config -, libelf +, elfutils , libcap , libseccomp , rpcsvc-proto @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper removeReferencesTo ]; - buildInputs = [ libelf libcap libseccomp libtirpc ]; + buildInputs = [ elfutils libcap libseccomp libtirpc ]; makeFlags = [ "WITH_LIBELF=yes" diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix index 03a162f9b7f1c..ab863b63f9af0 100644 --- a/pkgs/applications/virtualization/lima/bin.nix +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -9,31 +9,31 @@ }: let - version = "0.18.0"; + version = "0.19.0"; dist = { aarch64-darwin = rec { archSuffix = "Darwin-arm64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "6c58ca1b7803c2eeb1eaeb124db57fdc426b45fa65ce41a3fd83856c9be5c233"; + sha256 = "d7b62ee446607c989610b1cd5f9ad5eaa3d1b9aa2b47210f198713b8f8bf9889"; }; x86_64-darwin = rec { archSuffix = "Darwin-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "e19b1067dcfc7d9d34d692d26b84e2b8589c3b39ac3316efc7b25fa82dcafbc6"; + sha256 = "e68b034023b52f3c61b6804e5f921d72981768925d6c2937e69904ecef46c6bd"; }; aarch64-linux = rec { archSuffix = "Linux-aarch64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "1a1113a8e3a6f6f12dd01a7bbf30017d3cccf1ed7705e61c06149d8fab57654e"; + sha256 = "8709ed5c483dc227d65adf215a9cb7127c71e25da3a78dfa7f82b7dcfbbb8afb"; }; x86_64-linux = rec { archSuffix = "Linux-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "efd100c65173d0dff885e61778fa61737a609fc543d8260b491c8090c000bd3b"; + sha256 = "fca174037ecc69810947b7cb444dfab2661407e8e5e7409321fa590a84250996"; }; }; in diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index a896829356b1f..c8ca4b8d20ee9 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.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yeZGhE+ImWXW3HPpAo+E1GOSEwPr7yK78XVmCocGqH4="; + sha256 = "sha256-EaJYuapTWzVD80UyhzjP1q1SCCNmUozf+hUl4wBgC14="; }; - cargoHash = "sha256-xqKYd80PCM7Rnj+9dV2XjigE4sweOnL4HfOQiOYzCEQ="; + cargoHash = "sha256-Vh5mdxxROVthDUzK+PRhl9AY5jcmvhEXP5UqOeqOm6o="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index 3372ea695ef47..cc91256e4371a 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "0.12.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-l6jbc/+Fi5xx7yhK0e5/iqcm7i8JnU37Qr4niVG4OvU="; + hash = "sha256-DXodgpa/oWDBlJYTXcJb8cBkG1DCjFv8vKEzLhu0pN4="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 8841abcd3671f..93ef717d5297a 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.7.2"; + version = "4.8.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-o5FTCuFUbTlENqvh+u6fPEfD816tKWPxHu2yhBi/Mf0="; + hash = "sha256-pRmSaquovfMG3+Aa13W+AW2s7MjK2V/mSje4CQZyURs="; }; 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 5663f5e8a018b..179ce41f02b27 100644 --- a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -1,5 +1,5 @@ diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go -index 649748947..a981d93bf 100644 +index 4e43dd54c..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. ` @@ -7,10 +7,10 @@ index 649748947..a981d93bf 100644 if len(helper) < 1 { fmt.Print(fmtString) - } else { -- fmtString += `If you would like to install it run the\nfollowing commands: +- fmtString += `If you would like to install it, run the following commands: - - sudo %s install -- podman machine stop%[1]s; podman machine start%[1]s +- podman machine stop%[2]s; podman machine start%[2]s - - ` - fmt.Printf(fmtString, helper, suffix) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 1dc000c3f41e6..1cdd9f07337a1 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages , pixman, vde2, alsa-lib, texinfo, flex -, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool +, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson +, sigtool , makeWrapper, removeReferencesTo , attr, libcap, libcap_ng, socat, libslirp , CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet @@ -53,11 +54,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils"; - version = "8.1.3"; + version = "8.2.0"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-Q8wXaAQQVYb3T5A5jzTp+FeH3/QA07ZA2B93efviZbs="; + hash = "sha256-vwDS+hIBDfiwrekzcd71jmMssypr/cX1oP+Oah+xvzI="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] @@ -65,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper removeReferencesTo - pkg-config flex bison meson ninja + pkg-config flex bison dtc meson ninja # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix deleted file mode 100644 index 6256660161c1c..0000000000000 --- a/pkgs/applications/virtualization/seabios/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchgit, acpica-tools, python3 }: - -stdenv.mkDerivation rec { - - pname = "seabios"; - version = "1.16.2"; - - src = fetchgit { - url = "https://git.seabios.org/seabios.git"; - rev = "rel-${version}"; - sha256 = "sha256-J2FuT+FXn9YoFLSfxDOxyKZvKrys59a6bP1eYvEXVNU="; - }; - - nativeBuildInputs = [ python3 ]; - - buildInputs = [ acpica-tools ]; - - strictDeps = true; - - hardeningDisable = [ "pic" "stackprotector" "fortify" ]; - - configurePhase = '' - # build SeaBIOS for CSM - cat > .config << EOF - CONFIG_CSM=y - CONFIG_QEMU_HARDWARE=y - CONFIG_PERMIT_UNALIGNED_PCIROM=y - EOF - - make olddefconfig - ''; - - installPhase = '' - mkdir $out - cp out/Csm16.bin $out/Csm16.bin - ''; - - meta = with lib; { - description = "Open source implementation of a 16bit X86 BIOS"; - longDescription = '' - SeaBIOS is an open source implementation of a 16bit X86 BIOS. - It can run in an emulator or it can run natively on X86 hardware with the use of coreboot. - SeaBIOS is the default BIOS for QEMU and KVM. - ''; - homepage = "http://www.seabios.org"; - license = licenses.lgpl3; - maintainers = with maintainers; [ ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index 6afe021c36c53..a72d7599e2030 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz"; - sha256 = "sha256-dCKUwDC7M3u8/8yJQp/v0zy7GuB7SvjnRmTLtodUz80="; + sha256 = "sha256-4G6HAfCx7PzFGN0hc8g5z545ierogNyGwex7/+lDFSQ="; }; sourceRoot = "."; diff --git a/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch b/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch deleted file mode 100644 index 0594a2f19d459..0000000000000 --- a/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: /trunk/configure -=================================================================== ---- a/configure (revision 90360) -+++ b/configure (revision 90377) -@@ -1588,5 +1588,5 @@ - if [ $? -eq 0 ]; then - echo "(Qt5 from pkg-config)" >> $LOG -- FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags` -+ FLGQT5=`pkg-config Qt5Core --cflags` - # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk) - [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11" diff --git a/pkgs/applications/virtualization/xen/4.15.nix b/pkgs/applications/virtualization/xen/4.15.nix index 11f5900ee84c5..5cc81fc0ab855 100644 --- a/pkgs/applications/virtualization/xen/4.15.nix +++ b/pkgs/applications/virtualization/xen/4.15.nix @@ -122,7 +122,7 @@ callPackage (import ./generic.nix (rec { ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional" ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional" - ++ optional (withSeabios) "--with-system-seabios=${seabios}" + ++ optional (withSeabios) "--with-system-seabios=${seabios}/share/seabios" ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index f070b1fd062c7..2f3add0356a90 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "project-repo"; repo = pname; rev = version; - hash = "sha256-cJEJ8V9lDbNb07eY3nWmNcT7ULGlcmOeyb9UDOLGWfI="; + hash = "sha256-ppNzc6ojxF9FkgsqSWBSbtmI9aRc+RGN1R1RQLwCtv0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index dc2f58b1d3a8f..0af274265bff8 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dwl"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "djpohly"; repo = "dwl"; rev = "v${finalAttrs.version}"; - hash = "sha256-OW7K7yMYSzqZWpQ9Vmpy8EgdWvyv3q1uh8A40f6AQF4="; + hash = "sha256-U/vqGE1dJKgEGTfPMw02z5KJbZLWY1vwDJWnJxT8urM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 424528e9c1aa8..1d5f84abe288b 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Gerschtli/dwm-status/blob/master/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; - mainProgram = pname; + mainProgram = "dwm-status"; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix index 611749c7e9b38..31d29af44d80a 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.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "fvwmorg"; repo = "fvwm3"; rev = finalAttrs.version; - hash = "sha256-nIxFoKo2HTF2qCawxN0WySwfjaNqtfBg1BMo0P6ZY88="; + hash = "sha256-SjAccEAQsrzfVCtesqULONmb9TLD5IF8uIwEX3UhrxU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index 402b358474465..ad8079be63c3e 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -28,7 +28,6 @@ , xcbutilwm , xwayland , debug ? false -, enableNvidiaPatches ? false , enableXWayland ? true , legacyRenderer ? false , withSystemd ? true @@ -36,18 +35,20 @@ # deprecated flags , nvidiaPatches ? false , hidpiXWayland ? false +, enableNvidiaPatches ? false }: -assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renamed `enableNvidiaPatches`"; +assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed."; +assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; 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.32.3"; + version = "0.33.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-8PP26+ybmScq5WpFd2JPqUDzG2VggYOvD6/rzY9/CJ4="; + hash = "sha256-p7el5oQZPy9l1zyIrlHu6nA4BAu59eLoSqBjhkw2jaw="; }; patches = [ @@ -99,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols pango pciutils - (wlroots.override { inherit enableNvidiaPatches; }) + wlroots ] ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ] ++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ] diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix new file mode 100644 index 0000000000000..f8742673f3d70 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix @@ -0,0 +1,51 @@ +{ lib +, callPackage +, pkg-config +, gcc13Stdenv +, hyprland +}: +let + mkHyprlandPlugin = + args@{ pluginName, ... }: + gcc13Stdenv.mkDerivation (args // { + pname = "${pluginName}"; + nativeBuildInputs = [ pkg-config ] ++ args.nativeBuildInputs or [ ]; + buildInputs = [ hyprland ] + ++ hyprland.buildInputs + ++ (args.buildInputs or [ ]); + meta = args.meta // { + description = (args.meta.description or ""); + longDescription = (args.meta.lonqDescription or "") + + "\n\nPlugins can be installed via a plugin entry in the Hyprland NixOS or Home Manager options."; + }; + }); + + plugins = { + hy3 = { fetchFromGitHub, cmake, hyprland }: + mkHyprlandPlugin rec { + pluginName = "hy3"; + version = "0.32.0"; + + src = fetchFromGitHub { + owner = "outfoxxed"; + repo = "hy3"; + rev = "hl${version}"; + hash = "sha256-j49bEOLjBa1CH2gTwM+A2Edrw/GspE2m8q1teAn6SuQ="; + }; + + nativeBuildInputs = [ cmake ]; + + dontStrip = true; + + meta = with lib; { + homepage = "https://github.com/outfoxxed/hy3"; + description = "Hyprland plugin for an i3 / sway like manual tiling layout"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.aacebedo ]; + }; + }; + }; +in +lib.mapAttrs (name: plugin: callPackage plugin { }) plugins + diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/portals.patch b/pkgs/applications/window-managers/hyprwm/hyprland/portals.patch deleted file mode 100644 index cb3d97c371cae..0000000000000 --- a/pkgs/applications/window-managers/hyprwm/hyprland/portals.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/Compositor.cpp b/src/Compositor.cpp -index 1d978aed..56665389 100644 ---- a/src/Compositor.cpp -+++ b/src/Compositor.cpp -@@ -2365,17 +2365,16 @@ void CCompositor::performUserChecks() { - - static auto* const PSUPPRESSPORTAL = &g_pConfigManager->getConfigValuePtr("misc:suppress_portal_warnings")->intValue; - -- if (!*PSUPPRESSPORTAL) { -- if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/" + portal + ".portal"); })) { -+ static auto* const PORTALDIRENV = getenv("XDG_DESKTOP_PORTAL_DIR"); -+ -+ static auto const PORTALDIR = PORTALDIRENV != NULL ? std::string(PORTALDIRENV) : ""; -+ -+ if (!*PSUPPRESSPORTAL && PORTALDIR != "") { -+ if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists(PORTALDIR + "/" + portal + ".portal"); })) { - // bad portal detected - g_pHyprNotificationOverlay->addNotification("You have one or more incompatible xdg-desktop-portal impls installed. Please remove incompatible ones to avoid issues.", - CColor(0), 15000, ICON_ERROR); - } -- -- if (std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/hyprland.portal") && std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/wlr.portal")) { -- g_pHyprNotificationOverlay->addNotification("You have xdg-desktop-portal-hyprland and -wlr installed simultaneously. Please uninstall one to avoid issues.", CColor(0), -- 15000, ICON_ERROR); -- } - } - } - diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index 8191582dfb3a8..84c1c79598f9e 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -1,70 +1,19 @@ { fetchFromGitLab -, hyprland , wlroots -, lib -, libdisplay-info -, libliftoff -, hwdata -, enableNvidiaPatches ? false }: -let - libdisplay-info-new = libdisplay-info.overrideAttrs (old: { - version = "0.1.1+date=2023-03-02"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "emersion"; - repo = old.pname; - rev = "147d6611a64a6ab04611b923e30efacaca6fc678"; - sha256 = "sha256-/q79o13Zvu7x02SBGu0W5yQznQ+p7ltZ9L6cMW5t/o4="; - }; - }); - - libliftoff-new = libliftoff.overrideAttrs (old: { - version = "0.5.0-dev"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "emersion"; - repo = old.pname; - rev = "d98ae243280074b0ba44bff92215ae8d785658c0"; - sha256 = "sha256-DjwlS8rXE7srs7A8+tHqXyUsFGtucYSeq6X0T/pVOc8="; - }; - - NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=sign-conversion" - ]; - }); -in wlroots.overrideAttrs (old: { - version = "0.17.0-dev"; + version = "0.18.0-dev"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1"; - hash = "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I="; + rev = "5d639394f3e83b01596dcd166a44a9a1a2583350"; + hash = "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo="; }; - pname = - old.pname - + "-hyprland" - + lib.optionalString enableNvidiaPatches "-nvidia"; - - patches = - (old.patches or [ ]) - ++ (lib.optionals enableNvidiaPatches [ - "${hyprland.src}/nix/patches/wlroots-nvidia.patch" - ]); - - # don't need old.postPatch for hwdata's path in wlroots 0.16 - postPatch = lib.optionalString enableNvidiaPatches '' - substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();" - ''; + patches = [ ]; # don't inherit old.patches - buildInputs = old.buildInputs ++ [ - hwdata - libdisplay-info-new - libliftoff-new - ]; + pname = "${old.pname}-hyprland"; }) 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 6a067878f22f4..9e17bbb61b9cd 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 @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (self: { pname = "xdg-desktop-portal-hyprland"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; rev = "v${self.version}"; - hash = "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE="; + hash = "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix index f3c2e13fbdcb0..bb0ea94e77c34 100644 --- a/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -19,5 +19,6 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/i3-balance-workspace/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pacien ]; + mainProgram = "i3_balance_workspace"; }; } diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index bbf1cefacd4ca..ea2a41413a08d 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -41,5 +41,6 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ yanganto ]; changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG.md"; + mainProgram = "leftwm"; }; } diff --git a/pkgs/applications/window-managers/tinywl/default.nix b/pkgs/applications/window-managers/tinywl/default.nix index c0b147e6ee585..d39373e781929 100644 --- a/pkgs/applications/window-managers/tinywl/default.nix +++ b/pkgs/applications/window-managers/tinywl/default.nix @@ -4,25 +4,25 @@ stdenv.mkDerivation { pname = "tinywl"; - inherit (wlroots) version src; - - sourceRoot = "${wlroots.src.name}/tinywl"; + inherit (wlroots) version src patches postPatch; nativeBuildInputs = [ pkg-config wayland-scanner ]; buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ]; + makeFlags = [ "-C" "tinywl" ]; + installPhase = '' runHook preInstall mkdir -p $out/bin - cp tinywl $out/bin + cp tinywl/tinywl $out/bin runHook postInstall ''; - meta = with lib; { - homepage = "https://github.com/swaywm/wlroots/tree/master/tinywl"; + meta = { + homepage = "https://gitlab.freedesktop.org/wlroots/wlroots/tree/master/tinywl"; description = ''A "minimum viable product" Wayland compositor based on wlroots''; - maintainers = with maintainers; [ qyliss ] ++ wlroots.meta.maintainers; - license = licenses.cc0; + maintainers = with lib.maintainers; [ qyliss ] ++ wlroots.meta.maintainers; + license = lib.licenses.cc0; inherit (wlroots.meta) platforms; mainProgram = "tinywl"; }; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 7b9bb239402bc..078570ec7aea3 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -173,6 +173,7 @@ rec { libpulseaudio libsamplerate libmikmod + libthai libtheora libtiff pixman diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index dd6032fc52cfa..525b44fe04800 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -316,10 +316,10 @@ stdenv.mkDerivation { '' ### - ### Remove LC_UUID + ### Remove certain timestamps from final binaries ### + optionalString (stdenv.targetPlatform.isDarwin && !(bintools.isGNU or false)) '' - echo "-no_uuid" >> $out/nix-support/libc-ldflags-before + echo "export ZERO_AR_DATE=1" >> $out/nix-support/setup-hook '' + '' diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 3500e5e9216f0..e13288371b5db 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -16,6 +16,7 @@ , extraInstallCommands ? "" , meta ? {} , passthru ? {} +, extraPreBwrapCmds ? "" , extraBwrapArgs ? [] , unshareUser ? false , unshareIpc ? false @@ -23,6 +24,7 @@ , unshareNet ? false , unshareUts ? false , unshareCgroup ? false +, privateTmp ? false , dieWithParent ? true , ... } @ args: @@ -38,8 +40,8 @@ let buildFHSEnv = callPackage ./buildFHSEnv.nix { }; fhsenv = buildFHSEnv (removeAttrs (args // { inherit name; }) [ - "runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent" - "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" + "runScript" "extraInstallCommands" "meta" "passthru" "extraPreBwrapCmds" "extraBwrapArgs" "dieWithParent" + "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" "privateTmp" "pname" "version" ]); @@ -116,7 +118,8 @@ let indentLines = str: lib.concatLines (map (s: " " + s) (filter (s: s != "") (lib.splitString "\n" str))); bwrapCmd = { initArgs ? "" }: '' - ignored=(/nix /dev /proc /etc) + ${extraPreBwrapCmds} + ignored=(/nix /dev /proc /etc ${lib.optionalString privateTmp "/tmp"}) ro_mounts=() symlinks=() etc_ignored=() @@ -146,14 +149,19 @@ let done fi + # propagate /etc from the actual host if nested + if [[ -e /.host-etc ]]; then + ro_mounts+=(--ro-bind /.host-etc /.host-etc) + else + ro_mounts+=(--ro-bind /etc /.host-etc) + fi + for i in ${lib.escapeShellArgs etcBindEntries}; do if [[ "''${etc_ignored[@]}" =~ "$i" ]]; then continue fi - if [[ -L $i ]]; then - symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$i") - else - ro_mounts+=(--ro-bind-try "$i" "$i") + if [[ -e $i ]]; then + symlinks+=(--symlink "/.host-etc/''${i#/etc/}" "$i") fi done @@ -179,6 +187,12 @@ let x11_args+=(--ro-bind-try "$local_socket" "$local_socket") fi + ${lib.optionalString privateTmp '' + # sddm places XAUTHORITY in /tmp + if [[ "$XAUTHORITY" == /tmp/* ]]; then + x11_args+=(--ro-bind-try "$XAUTHORITY" "$XAUTHORITY") + fi''} + cmd=( ${bubblewrap}/bin/bwrap --dev-bind /dev /dev @@ -192,6 +206,7 @@ let ${lib.optionalString unshareCgroup "--unshare-cgroup"} ${lib.optionalString dieWithParent "--die-with-parent"} --ro-bind /nix /nix + ${lib.optionalString privateTmp "--tmpfs /tmp"} # Our glibc will look for the cache in its own path in `/nix/store`. # As such, we need a cache to exist there, because pressure-vessel # depends on the existence of an ld cache. However, adding one @@ -200,6 +215,7 @@ let # Also, the cache needs to go to both 32 and 64 bit glibcs, for games # of both architectures to work. --tmpfs ${glibc}/etc \ + --tmpfs /etc \ --symlink /etc/ld.so.conf ${glibc}/etc/ld.so.conf \ --symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \ --ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \ diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index e5fe1abe1d11f..0612db2ad79bd 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -49,6 +49,13 @@ stdenv.mkDerivation ({ nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ]; + # Workaround GraalVM issue where the builder does not have access to the + # environment variables since 21.0.0 + # https://github.com/oracle/graal/pull/6095 + # https://github.com/oracle/graal/pull/6095 + # https://github.com/oracle/graal/issues/7502 + env.NATIVE_IMAGE_DEPRECATED_BUILDER_SANITATION = "true"; + buildPhase = args.buildPhase or '' runHook preBuild diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix deleted file mode 100644 index 5737989249af4..0000000000000 --- a/pkgs/build-support/build-setupcfg/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -# Build a python package from info made available by setupcfg2nix. -# -# * src: The source of the package. -# * info: The package information generated by setupcfg2nix. -# * meta: Standard nixpkgs metadata. -# * application: Whether this package is a python library or an -# application which happens to be written in python. -# * doCheck: Whether to run the test suites. -lib: pythonPackages: -{ src, info, meta ? {}, application ? false, doCheck ? true}: let - build = if application - then pythonPackages.buildPythonApplication - else pythonPackages.buildPythonPackage; -in build { - inherit (info) pname version; - - inherit src meta doCheck; - - nativeBuildInputs = map (p: pythonPackages.${p}) ( - (info.setup_requires or []) ++ - (lib.optionals doCheck (info.tests_require or [])) - ); - - propagatedBuildInputs = map (p: pythonPackages.${p}) - (info.install_requires or []); -} diff --git a/pkgs/build-support/checkpoint-build.nix b/pkgs/build-support/checkpoint-build.nix new file mode 100644 index 0000000000000..e08dde353e891 --- /dev/null +++ b/pkgs/build-support/checkpoint-build.nix @@ -0,0 +1,69 @@ +{ pkgs }: +rec { + /* Prepare a derivation for local builds. + * + * This function prepares checkpoint builds by provinding, + * containing the build output and the sources for cross checking. + * The build output can be used later to allow checkpoint builds + * by passing the derivation output to the `mkCheckpointBuild` function. + * + * To build a project with checkpoints follow these steps: + * - run prepareIncrementalBuild on the desired derivation + * e.G `incrementalBuildArtifacts = (pkgs.checkpointBuildTools.prepareCheckpointBuild pkgs.virtualbox);` + * - change something you want in the sources of the package( e.G using source override) + * changedVBox = pkgs.virtuabox.overrideAttrs (old: { + * src = path/to/vbox/sources; + * } + * - use `mkCheckpointedBuild changedVBox buildOutput` + * - enjoy shorter build times + */ + prepareCheckpointBuild = drv: drv.overrideAttrs (old: { + outputs = [ "out" ]; + name = drv.name + "-checkpointArtifacts"; + # To determine differences between the state of the build directory + # from an earlier build and a later one we store the state of the build + # directory before build, but after patch phases. + # This way, the same derivation can be used multiple times and only changes are detected. + # Additionally Removed files are handled correctly in later builds. + preBuild = (old.preBuild or "") + '' + mkdir -p $out/sources + cp -r ./* $out/sources/ + ''; + + # After the build the build directory is copied again + # to get the output files. + # We copy the complete build folder, to take care for + # Build tools, building in the source directory, instead of + # having a build root directory, e.G the Linux kernel. + installPhase = '' + runHook preCheckpointInstall + mkdir -p $out/outputs + cp -r ./* $out/outputs/ + runHook postCheckpointInstall + ''; + }); + + /* Build a derivation based on the checkpoint output generated by + * the `prepareCheckpointBuild function. + * + * Usage: + * let + * checkpointArtifacts = prepareCheckpointBuild drv + * in mkCheckpointedBuild drv checkpointArtifacts + */ + mkCheckpointedBuild = drv: previousBuildArtifacts: drv.overrideAttrs (old: { + # The actual checkpoint build phase. + # We compare the changed sources from a previous build with the current and create a patch + # Afterwards we clean the build directory to copy the previous output files (Including the sources) + # The source difference patch is applied to get the latest changes again to allow short build times. + preBuild = (old.preBuild or "") + '' + set +e + diff -ur ${previousBuildArtifacts}/sources ./ > sourceDifference.patch + set -e + shopt -s extglob dotglob + rm -r !("sourceDifference.patch") + ${pkgs.rsync}/bin/rsync -cutU --chown=$USER:$USER --chmod=+w -r ${previousBuildArtifacts}/outputs/* . + patch -p 1 -i sourceDifference.patch + ''; + }); +} diff --git a/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix index 1a98f98fb8e61..2cb193ac6f161 100644 --- a/pkgs/build-support/dart/build-dart-application/default.nix +++ b/pkgs/build-support/dart/build-dart-application/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchDartDeps, writeText, symlinkJoin, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }: +{ lib, stdenv, callPackage, fetchDartDeps, runCommand, symlinkJoin, writeText, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }: { sdkSetupScript ? "" , pubGetScript ? "dart pub get" @@ -37,13 +37,15 @@ let dartDeps = (fetchDartDeps.override { dart = symlinkJoin { - name = "dart-fod"; - paths = [ dart ]; - nativeBuildInputs = [ makeWrapper ]; - postBuild = '' - wrapProgram "$out/bin/dart" \ - --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" - ''; + name = "dart-sdk-fod"; + paths = [ + (runCommand "dart-fod" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p "$out/bin" + makeWrapper "${dart}/bin/dart" "$out/bin/dart" \ + --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" + '') + dart + ]; }; }) { buildDrvArgs = args; diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix index 51052cae18f48..29e5209a2877b 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/default.nix +++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -154,24 +154,67 @@ let outputHash = if vendorHash != "" then vendorHash else lib.fakeSha256; } // (removeAttrs drvArgs [ "name" "pname" ])); - depsListDrv = stdenvNoCC.mkDerivation ({ - name = "${name}-dart-deps-list.json"; - nativeBuildInputs = [ hook dart jq ]; + mkDepsDrv = args: stdenvNoCC.mkDerivation (args // { + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ hook dart ]; - configurePhase = '' + configurePhase = args.configurePhase or '' runHook preConfigure - doPubGet dart pub get --offline + + ${sdkSetupScript} + + _pub_get() { + ${pubGetScript} --offline + } + doPubGet _pub_get + runHook postConfigure ''; + } // (removeAttrs buildDrvInheritArgs [ "name" "pname" ])); + + depsListDrv = mkDepsDrv { + name = "${name}-dart-deps-list.json"; + + nativeBuildInputs = [ jq ]; buildPhase = '' runHook preBuild - dart pub deps --json | jq .packages > $out + if [ -e ${dart}/bin/flutter ]; then + flutter pub deps --json | jq .packages > $out + else + dart pub deps --json | jq .packages > $out + fi runHook postBuild ''; dontInstall = true; - } // (removeAttrs buildDrvInheritArgs [ "name" "pname" ])); + }; + + packageConfigDrv = mkDepsDrv { + name = "${name}-package-config.json"; + + nativeBuildInputs = [ jq ]; + + buildPhase = '' + runHook preBuild + + # Canonicalise the package_config.json, and replace references to the + # reconstructed package cache with the original FOD. + # + # The reconstructed package cache is not reproducible. The intended + # use-case of this derivation is for use with tools that use a + # package_config.json to load assets from packages, and not for use with + # Pub directly, which requires the setup performed by the hook before + # usage. + jq -S ' + .packages[] |= . + { rootUri: .rootUri | gsub("'"$PUB_CACHE"'"; "${hook.deps}/cache/.pub-cache") } + | .generated |= "1970-01-01T00:00:00.000Z" + ' .dart_tool/package_config.json > $out + + runHook postBuild + ''; + + dontInstall = true; + }; # As of Dart 3.0.0, Pub checks the revision of cached Git-sourced packages. # Git must be wrapped to return a positive result, as the real .git directory is wiped @@ -195,8 +238,10 @@ let substitutions = { inherit gitSourceWrapper deps; }; propagatedBuildInputs = [ dart git ]; passthru = { + inherit deps; files = deps.outPath; depsListFile = depsListDrv.outPath; + packageConfig = packageConfigDrv; }; }) ./setup-hook.sh; in diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index f8ed3a38890c3..573b270ee408f 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -165,7 +165,7 @@ stdenvNoCC.mkDerivation (args // { components = lib.pipe args.version [ lib.splitVersion (lib.filter (x: (lib.strings.match "[0-9]+" x) != null)) - (lib.filter (x: (lib.toInt x) < 65535)) # one version component in dotnet has to fit in 16 bits + (lib.filter (x: (lib.toIntBase10 x) < 65535)) # one version component in dotnet has to fit in 16 bits ]; in if (lib.length components) == 0 then null diff --git a/pkgs/build-support/dotnet/make-nuget-source/default.nix b/pkgs/build-support/dotnet/make-nuget-source/default.nix index a23a143ab2467..48de65e8a8810 100644 --- a/pkgs/build-support/dotnet/make-nuget-source/default.nix +++ b/pkgs/build-support/dotnet/make-nuget-source/default.nix @@ -6,10 +6,9 @@ }: let - nuget-source = stdenvNoCC.mkDerivation rec { + nuget-source = stdenvNoCC.mkDerivation { inherit name; - meta.description = description; nativeBuildInputs = [ python3 ]; buildCommand = '' @@ -18,17 +17,22 @@ let # use -L to follow symbolic links. When `projectReferences` is used in # buildDotnetModule, one of the deps will be a symlink farm. find -L ${lib.concatStringsSep " " deps} -type f -name '*.nupkg' -exec \ - cp --no-clobber '{}' $out/lib ';' + ln -s '{}' -t $out/lib ';' # Generates a list of all licenses' spdx ids, if available. # Note that this currently ignores any license provided in plain text (e.g. "LICENSE.txt") python ${./extract-licenses-from-nupkgs.py} $out/lib > $out/share/licenses ''; + + meta.description = description; } // { # We need data from `$out` for `meta`, so we have to use overrides as to not hit infinite recursion. - meta.licence = let - depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses"); - in (lib.flatten (lib.forEach depLicenses (spdx: - lib.optionals (spdx != "") (lib.getLicenseFromSpdxId spdx) - ))); + meta = nuget-source.meta // { + licenses = let + # TODO: avoid IFD + depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses"); + in lib.flatten (lib.forEach depLicenses (spdx: + lib.optionals (spdx != "") (lib.getLicenseFromSpdxId spdx) + )); + }; }; in nuget-source diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index 86bc4482088b1..34c42929857d1 100755 --- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh +++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -37,7 +37,7 @@ cd "$pkgs" for package in *; do cd "$package" for version in *; do - id=$(xq -r .package.metadata.id "$version/$package".nuspec) + id=$(xq -r .package.metadata.id "$version"/*.nuspec) if grep -qxF "$id.$version.nupkg" "$excluded_list"; then continue diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index f7027dc499d84..a43578fd3936b 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -2,7 +2,11 @@ { lib, stdenv, emacs, texinfo, writeText, gcc }: -with lib; +let + handledArgs = [ "files" "fileSpecs" "meta" ]; + genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; }; + +in { pname , version @@ -11,15 +15,7 @@ with lib; , ... }@args: -let - - defaultMeta = { - homepage = args.src.meta.homepage or "https://elpa.gnu.org/packages/${pname}.html"; - }; - -in - -import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ +genericBuild ({ dontUnpack = true; @@ -33,9 +29,9 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ runHook postInstall ''; - meta = defaultMeta // meta; + meta = { + homepage = args.src.meta.homepage or "https://elpa.gnu.org/packages/${pname}.html"; + } // meta; } -// removeAttrs args [ "files" "fileSpecs" - "meta" - ]) +// removeAttrs args handledArgs) diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index 291f45d513b7f..bdf1cd4e50f31 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -2,6 +2,26 @@ { lib, stdenv, emacs, texinfo, writeText, gcc, ... }: +let + inherit (lib) optionalAttrs getLib; + handledArgs = [ "buildInputs" "packageRequires" "meta" ]; + + setupHook = writeText "setup-hook.sh" '' + source ${./emacs-funcs.sh} + + if [[ ! -v emacsHookDone ]]; then + emacsHookDone=1 + + # If this is for a wrapper derivation, emacs and the dependencies are all + # run-time dependencies. If this is for precompiling packages into bytecode, + # emacs is a compile-time dependency of the package. + addEnvHooks "$hostOffset" addEmacsVars + addEnvHooks "$targetOffset" addEmacsVars + fi + ''; + +in + { pname , version , buildInputs ? [] @@ -10,15 +30,6 @@ , ... }@args: -let - defaultMeta = { - broken = false; - platforms = emacs.meta.platforms; - } // lib.optionalAttrs ((args.src.meta.homepage or "") != "") { - homepage = args.src.meta.homepage; - }; -in - stdenv.mkDerivation (finalAttrs: ({ name = "emacs-${pname}-${finalAttrs.version}"; @@ -42,28 +53,21 @@ stdenv.mkDerivation (finalAttrs: ({ propagatedBuildInputs = packageRequires; propagatedUserEnvPkgs = packageRequires; - setupHook = writeText "setup-hook.sh" '' - source ${./emacs-funcs.sh} - - if [[ ! -v emacsHookDone ]]; then - emacsHookDone=1 - - # If this is for a wrapper derivation, emacs and the dependencies are all - # run-time dependencies. If this is for precompiling packages into bytecode, - # emacs is a compile-time dependency of the package. - addEnvHooks "$hostOffset" addEmacsVars - addEnvHooks "$targetOffset" addEmacsVars - fi - ''; + inherit setupHook; doCheck = false; - meta = defaultMeta // meta; + meta = { + broken = false; + platforms = emacs.meta.platforms; + } // optionalAttrs ((args.src.meta.homepage or "") != "") { + homepage = args.src.meta.homepage; + } // meta; } -// lib.optionalAttrs (emacs.withNativeCompilation or false) { +// optionalAttrs (emacs.withNativeCompilation or false) { - LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; + LIBRARY_PATH = "${getLib stdenv.cc.libc}/lib"; nativeBuildInputs = [ gcc ]; @@ -83,4 +87,4 @@ stdenv.mkDerivation (finalAttrs: ({ ''; } -// removeAttrs args [ "buildInputs" "packageRequires" "meta" ])) +// removeAttrs args handledArgs)) diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 85bc8aa37b3aa..178f532d08712 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -3,37 +3,8 @@ { lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText, gcc }: -with lib; - -{ /* - pname: Nix package name without special symbols and without version or - "emacs-" prefix. - */ - pname - /* - ename: Original Emacs package name, possibly containing special symbols. - */ -, ename ? null -, version -, recipe -, meta ? {} -, ... -}@args: - let - - defaultMeta = { - homepage = args.src.meta.homepage or "https://melpa.org/#/${pname}"; - }; - -in - -import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ - - ename = - if ename == null - then pname - else ename; + genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; }; packageBuild = stdenv.mkDerivation { name = "package-build"; @@ -55,9 +26,35 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ "; }; +in + +{ /* + pname: Nix package name without special symbols and without version or + "emacs-" prefix. + */ + pname + /* + ename: Original Emacs package name, possibly containing special symbols. + */ +, ename ? null +, version +, recipe +, meta ? {} +, ... +}@args: + +genericBuild ({ + + ename = + if ename == null + then pname + else ename; + elpa2nix = ./elpa2nix.el; melpa2nix = ./melpa2nix.el; + inherit packageBuild; + preUnpack = '' mkdir -p "$NIX_BUILD_TOP/recipes" if [ -n "$recipe" ]; then @@ -104,7 +101,9 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ runHook postInstall ''; - meta = defaultMeta // meta; + meta = { + homepage = args.src.meta.homepage or "https://melpa.org/#/${pname}"; + } // meta; } // removeAttrs args [ "meta" ]) diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/build-support/emacs/trivial.nix index abe4d761c6b5c..11c28c0133e40 100644 --- a/pkgs/build-support/emacs/trivial.nix +++ b/pkgs/build-support/emacs/trivial.nix @@ -2,8 +2,6 @@ { callPackage, lib, ... }@envargs: -with lib; - args: callPackage ./generic.nix envargs ({ diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix index 2ccb81335cc20..749883f2365eb 100644 --- a/pkgs/build-support/fetchgitlab/default.nix +++ b/pkgs/build-support/fetchgitlab/default.nix @@ -1,9 +1,11 @@ -{ fetchgit, fetchzip, lib }: +{ lib, fetchgit, fetchzip }: lib.makeOverridable ( # gitlab example { owner, repo, rev, protocol ? "https", domain ? "gitlab.com", name ? "source", group ? null -, fetchSubmodules ? false, leaveDotGit ? false, deepClone ? false +, fetchSubmodules ? false, leaveDotGit ? false +, deepClone ? false, forceFetchGit ? false +, sparseCheckout ? [] , ... # For hash agility } @ args: @@ -11,15 +13,15 @@ let slug = lib.concatStringsSep "/" ((lib.optional (group != null) group) ++ [ owner repo ]); escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug; escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev; - passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" "fetchSubmodules" "leaveDotGit" "deepClone" ]; + passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" "fetchSubmodules" "forceFetchGit" "leaveDotGit" "deepClone" ]; - useFetchGit = deepClone || fetchSubmodules || leaveDotGit; + useFetchGit = fetchSubmodules || leaveDotGit || deepClone || forceFetchGit || (sparseCheckout != []); fetcher = if useFetchGit then fetchgit else fetchzip; gitRepoUrl = "${protocol}://${domain}/${slug}.git"; fetcherArgs = (if useFetchGit then { - inherit rev deepClone fetchSubmodules leaveDotGit; + inherit rev deepClone fetchSubmodules sparseCheckout leaveDotGit; url = gitRepoUrl; } else { url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}"; diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 0446851d64098..6e6c5270a750a 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -24,7 +24,7 @@ # the rest are given to fetchurl as is , ... } @ args: -assert (extraPostFetch != "") -> lib.warn "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub'." true; +assert (extraPostFetch != "") -> lib.warn "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'." true; let tmpFilename = diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 3e136211655b8..bcee31506df1e 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -48,6 +48,8 @@ flutter config --enable-linux-desktop >/dev/null ''; + inherit pubGetScript; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ wrapGAppsHook ]; buildInputs = (args.buildInputs or [ ]) ++ [ glib ]; diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index d0fd8928c91ab..2fb59c6348290 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -289,7 +289,8 @@ let disallowedReferences = lib.optional (!allowGoReference) go; - passthru = passthru // { inherit go goModules vendorHash; } // { inherit (args') vendorSha256; }; + passthru = passthru // { inherit go goModules vendorHash; } + // lib.optionalAttrs (args' ? vendorSha256 ) { inherit (args') vendorSha256; }; meta = { # Add default meta information diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix index f2f7aaa6d1b6d..65e143cb7349d 100644 --- a/pkgs/build-support/kernel/make-initrd-ng.nix +++ b/pkgs/build-support/kernel/make-initrd-ng.nix @@ -8,7 +8,7 @@ let # compression type and filename extension. compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1; in -{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, binutils, runCommand +{ stdenvNoCC, libarchive, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, binutils, runCommand # Name of the derivation (not of the resulting file!) , name ? "initrd" @@ -74,18 +74,18 @@ in passAsFile = ["contents"]; contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${lib.optionalString (symlink != null) symlink}") contents + "\n"; - nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils; + nativeBuildInputs = [makeInitrdNGTool libarchive] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils; STRIP = if strip then "${pkgsBuildHost.binutils.targetPrefix}strip" else null; }) '' mkdir -p ./root/var/empty make-initrd-ng "$contentsPath" ./root mkdir "$out" - (cd root && find * .[^.*] -exec touch -h -d '@1' '{}' +) + (cd root && find . -exec touch -h -d '@1' '{}' +) for PREP in $prepend; do cat $PREP >> $out/initrd done - (cd root && find . -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd") + (cd root && find . -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- | eval -- $compress >> "$out/initrd") if [ -n "$makeUInitrd" ]; then mkimage -A "$uInitrdArch" -O linux -T ramdisk -C "$uInitrdCompression" -d "$out/initrd" $out/initrd.img diff --git a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock b/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock index c407d36d90f48..fe3831a27cdf6 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock +++ b/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "eyre" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd" +checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" dependencies = [ "indenter", "once_cell", @@ -45,9 +45,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "plain" @@ -57,9 +57,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh index a2f77bdc6d430..56e3a883b99a3 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh @@ -5,16 +5,14 @@ npmInstallHook() { runHook preInstall - # `npm pack` writes to cache - npm config delete cache - local -r packageOut="$out/lib/node_modules/$(@jq@ --raw-output '.name' package.json)" + # `npm pack` writes to cache so temporarily override it while IFS= read -r file; do local dest="$packageOut/$(dirname "$file")" mkdir -p "$dest" cp "${npmWorkspace-.}/$file" "$dest" - done < <(@jq@ --raw-output '.[0].files | map(.path) | join("\n")' <<< "$(npm pack --json --dry-run --loglevel=warn --no-foreground-scripts ${npmWorkspace+--workspace=$npmWorkspace} $npmPackFlags "${npmPackFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}")") + done < <(@jq@ --raw-output '.[0].files | map(.path) | join("\n")' <<< "$(npm_config_cache="$HOME/.npm" npm pack --json --dry-run --loglevel=warn --no-foreground-scripts ${npmWorkspace+--workspace=$npmWorkspace} $npmPackFlags "${npmPackFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}")") # Based on code from Python's buildPythonPackage wrap.sh script, for # supporting both the case when makeWrapperArgs is an array and a @@ -32,12 +30,14 @@ npmInstallHook() { done < <(@jq@ --raw-output '(.bin | type) as $typ | if $typ == "string" then .name + " " + .bin elif $typ == "object" then .bin | to_entries | map(.key + " " + .value) | join("\n") + elif $typ == "null" then empty else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json") while IFS= read -r man; do installManPage "$packageOut/$man" done < <(@jq@ --raw-output '(.man | type) as $typ | if $typ == "string" then .man elif $typ == "list" then .man | join("\n") + elif $typ == "null" then empty else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json") local -r nodeModulesPath="$packageOut/node_modules" diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 2b28e290ad512..dc20c72970491 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -246,7 +246,9 @@ fn main() -> anyhow::Result<()> { packages.into_par_iter().try_for_each(|package| { eprintln!("{}", package.name); - let tarball = package.tarball()?; + let tarball = package + .tarball() + .map_err(|e| anyhow!("couldn't fetch {} at {}: {e:?}", package.name, package.url))?; let integrity = package.integrity().map(ToString::to_string); cache diff --git a/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs b/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs index e3580cfca0d37..c6e77153a0b80 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs @@ -214,29 +214,35 @@ fn to_new_packages( } if let UrlOrString::Url(v) = &package.version { - for (scheme, host) in [ - ("github", "github.com"), - ("bitbucket", "bitbucket.org"), - ("gitlab", "gitlab.com"), - ] { - if v.scheme() == scheme { - package.version = { - let mut new_url = initial_url.clone(); - - new_url.set_host(Some(host))?; - - if v.path().ends_with(".git") { - new_url.set_path(v.path()); - } else { - new_url.set_path(&format!("{}.git", v.path())); - } - - new_url.set_fragment(v.fragment()); - - UrlOrString::Url(new_url) - }; - - break; + if v.scheme() == "npm" { + if let Some(UrlOrString::Url(ref url)) = &package.resolved { + package.version = UrlOrString::Url(url.clone()); + } + } else { + for (scheme, host) in [ + ("github", "github.com"), + ("bitbucket", "bitbucket.org"), + ("gitlab", "gitlab.com"), + ] { + if v.scheme() == scheme { + package.version = { + let mut new_url = initial_url.clone(); + + new_url.set_host(Some(host))?; + + if v.path().ends_with(".git") { + new_url.set_path(v.path()); + } else { + new_url.set_path(&format!("{}.git", v.path())); + } + + new_url.set_fragment(v.fragment()); + + UrlOrString::Url(new_url) + }; + + break; + } } } } @@ -266,7 +272,8 @@ fn get_initial_url() -> anyhow::Result<Url> { #[cfg(test)] mod tests { use super::{ - get_initial_url, to_new_packages, Hash, HashCollection, OldPackage, Package, UrlOrString, + get_initial_url, packages, to_new_packages, Hash, HashCollection, OldPackage, Package, + UrlOrString, }; use std::{ cmp::Ordering, @@ -328,4 +335,36 @@ mod tests { Some(Hash(String::from("sha512-foo"))) ); } + + #[test] + fn parse_lockfile_correctly() { + let packages = packages( + r#"{ + "name": "node-ddr", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "string-width-cjs": { + "version": "npm:string-width@4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + } + } + }"#).unwrap(); + + assert_eq!(packages.len(), 1); + assert_eq!( + packages[0].resolved, + Some(UrlOrString::Url( + Url::parse("https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz") + .unwrap() + )) + ); + } } diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index 6fe1c4e5f7dde..6e7fb5d7503bf 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -155,7 +155,7 @@ composerInstallInstallHook() { cp -r . "$out"/share/php/"${pname}"/ # Create symlinks for the binaries. - jq -r -c 'try .bin[]' composer.json | while read -r bin; do + jq -r -c 'try (.bin[] | select(test(".bat$")? | not) )' composer.json | while read -r bin; do mkdir -p "$out"/share/php/"${pname}" "$out"/bin makeWrapper "$out"/share/php/"${pname}"/"$bin" "$out"/bin/"$(basename "$bin")" done diff --git a/pkgs/build-support/rust/replace-workspace-values.py b/pkgs/build-support/rust/replace-workspace-values.py index acbc38c8ae39c..2b88f1fa79bbe 100644 --- a/pkgs/build-support/rust/replace-workspace-values.py +++ b/pkgs/build-support/rust/replace-workspace-values.py @@ -96,6 +96,13 @@ def main() -> None: workspace_manifest, crate_manifest["target"][key] ) + if ( + "lints" in crate_manifest + and "workspace" in crate_manifest["lints"] + and crate_manifest["lints"]["workspace"] is True + ): + crate_manifest["lints"] = workspace_manifest["lints"] + if not changed: return diff --git a/pkgs/build-support/rust/rustc-wrapper/default.nix b/pkgs/build-support/rust/rustc-wrapper/default.nix new file mode 100644 index 0000000000000..d6034c08af47d --- /dev/null +++ b/pkgs/build-support/rust/rustc-wrapper/default.nix @@ -0,0 +1,30 @@ +{ lib, runCommand, rustc-unwrapped, sysroot ? null }: + +runCommand "${rustc-unwrapped.pname}-wrapper-${rustc-unwrapped.version}" { + preferLocalBuild = true; + strictDeps = true; + inherit (rustc-unwrapped) outputs; + + env = { + prog = "${rustc-unwrapped}/bin/rustc"; + sysroot = lib.optionalString (sysroot != null) "--sysroot ${sysroot}"; + }; + + passthru = { + inherit (rustc-unwrapped) pname version src llvm llvmPackages; + unwrapped = rustc-unwrapped; + }; + + meta = rustc-unwrapped.meta // { + description = "${rustc-unwrapped.meta.description} (wrapper script)"; + priority = 10; + }; +} '' + mkdir -p $out/bin + ln -s ${rustc-unwrapped}/bin/* $out/bin + rm $out/bin/rustc + substituteAll ${./rustc-wrapper.sh} $out/bin/rustc + chmod +x $out/bin/rustc + ${lib.concatMapStrings (output: "ln -s ${rustc-unwrapped.${output}} \$${output}\n") + (lib.remove "out" rustc-unwrapped.outputs)} +'' diff --git a/pkgs/build-support/rust/rustc-wrapper/rustc-wrapper.sh b/pkgs/build-support/rust/rustc-wrapper/rustc-wrapper.sh new file mode 100644 index 0000000000000..a62e35b8736f7 --- /dev/null +++ b/pkgs/build-support/rust/rustc-wrapper/rustc-wrapper.sh @@ -0,0 +1,16 @@ +#!@shell@ + +extraBefore=(@sysroot@) +extraAfter=($NIX_RUSTFLAGS) + +# Optionally print debug info. +if (( "${NIX_DEBUG:-0}" >= 1 )); then + echo "extra flags before to @prog@:" >&2 + printf " %q\n" "${extraBefore[@]}" >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" "$@" >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" "${extraAfter[@]}" >&2 +fi + +exec @prog@ "${extraBefore[@]}" "$@" "${extraAfter[@]}" diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.py b/pkgs/build-support/setup-hooks/auto-patchelf.py index 261f55854808e..4769179167b3b 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.py +++ b/pkgs/build-support/setup-hooks/auto-patchelf.py @@ -336,9 +336,12 @@ def main() -> None: ) parser.add_argument( "--extra-args", - nargs="*", + # Undocumented Python argparse feature: consume all remaining arguments + # as values for this one. This means this argument should always be passed + # last. + nargs="...", type=str, - help="Extra arguments to pass to patchelf" + help="Extra arguments to pass to patchelf. This argument should always come last." ) print("automatically fixing dependencies for ELF files") diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 3a16ac4fee906..197e8a920b702 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -1,7 +1,7 @@ export NIX_SET_BUILD_ID=1 export NIX_LDFLAGS+=" --compress-debug-sections=zlib" export NIX_CFLAGS_COMPILE+=" -ggdb -Wa,--compress-debug-sections" -export RUSTFLAGS+=" -g" +export NIX_RUSTFLAGS+=" -g" fixupOutputHooks+=(_separateDebugInfo) diff --git a/pkgs/build-support/templaterpm/default.nix b/pkgs/build-support/templaterpm/default.nix deleted file mode 100644 index 56c543e8a9301..0000000000000 --- a/pkgs/build-support/templaterpm/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, stdenv, makeWrapper, python, toposort, rpm}: - -stdenv.mkDerivation { - pname = "nix-template-rpm"; - version = "0.1"; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python toposort rpm ]; - - dontUnpack = true; - - installPhase = '' - mkdir -p $out/bin - cp ${./nix-template-rpm.py} $out/bin/nix-template-rpm - wrapProgram $out/bin/nix-template-rpm \ - --set PYTHONPATH "${rpm}/lib/${python.libPrefix}/site-packages":"${toposort}/lib/${python.libPrefix}/site-packages" - ''; - - meta = with lib; { - description = "Create templates of nix expressions from RPM .spec files"; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - hydraPlatforms = []; - }; -} diff --git a/pkgs/build-support/templaterpm/nix-template-rpm.py b/pkgs/build-support/templaterpm/nix-template-rpm.py deleted file mode 100755 index db8c0f2064c20..0000000000000 --- a/pkgs/build-support/templaterpm/nix-template-rpm.py +++ /dev/null @@ -1,518 +0,0 @@ -#!/bin/env python - -import sys -import os -import subprocess -import argparse -import re -import shutil -import rpm -import urlparse -import traceback -import toposort - - - - - -class SPECTemplate(object): - def __init__(self, specFilename, outputDir, inputDir=None, buildRootInclude=None, translateTable=None, repositoryDir=None, allPackagesDir=None, maintainer="MAINTAINER"): - rpm.addMacro("buildroot","$out") - rpm.addMacro("_libdir","lib") - rpm.addMacro("_libexecdir","libexec") - rpm.addMacro("_sbindir","sbin") - rpm.addMacro("_sysconfdir","etc") - rpm.addMacro("_topdir","SPACER_DIR_FOR_REMOVAL") - rpm.addMacro("_sourcedir","SOURCE_DIR_SPACER") - - self.packageGroups = [ "ocaml", "python" ] - - ts = rpm.TransactionSet() - - self.specFilename = specFilename - self.spec = ts.parseSpec(specFilename) - - self.inputDir = inputDir - self.buildRootInclude = buildRootInclude - self.repositoryDir = repositoryDir - self.allPackagesDir = allPackagesDir - self.maintainer = maintainer - - self.translateTable = translateTable - - self.facts = self.getFacts() - self.key = self.getSelfKey() - - tmpDir = os.path.join(outputDir, self.rewriteName(self.spec.sourceHeader['name'])) - if self.translateTable is not None: - self.relOutputDir = self.translateTable.path(self.key,tmpDir) - else: - self.relOutputDir = tmpDir - - self.final_output_dir = os.path.normpath( self.relOutputDir ) - - if self.repositoryDir is not None: - self.potential_repository_dir = os.path.normpath( os.path.join(self.repositoryDir,self.relOutputDir) ) - - - - def rewriteCommands(self, string): - string = string.replace('SPACER_DIR_FOR_REMOVAL/','') - string = string.replace('SPACER_DIR_FOR_REMOVAL','') - string = '\n'.join(map(lambda line: ' '.join(map(lambda x: x.replace('SOURCE_DIR_SPACER/',('${./' if (self.buildRootInclude is None) else '${buildRoot}/usr/share/buildroot/SOURCES/'))+('}' if (self.buildRootInclude is None) else '') if x.startswith('SOURCE_DIR_SPACER/') else x, line.split(' '))), string.split('\n'))) - string = string.replace('\n','\n ') - string = string.rstrip() - return string - - - def rewriteName(self, string): - parts = string.split('-') - parts = filter(lambda x: not x == "devel", parts) - parts = filter(lambda x: not x == "doc", parts) - if len(parts) > 1 and parts[0] in self.packageGroups: - return parts[0] + '-' + ''.join(parts[1:2] + map(lambda x: x.capitalize(), parts[2:])) - else: - return ''.join(parts[:1] + map(lambda x: x.capitalize(), parts[1:])) - - - def rewriteInputs(self,target,inputs): - camelcase = lambda l: l[:1] + map(lambda x: x.capitalize(), l[1:]) - filterDevel = lambda l: filter(lambda x: not x == "devel", l) - filterDoc = lambda l: filter(lambda x: not x == "doc", l) - rewrite = lambda l: ''.join(camelcase(filterDoc(filterDevel(l)))) - - def filterPackageGroup(target): - if target is None: - return [ rewrite(x.split('-')) for x in inputs if (not x.split('-')[0] in self.packageGroups) or (len(x.split('-')) == 1) ] - elif target in self.packageGroups: - return [ target + '_' + rewrite(x.split('-')[1:]) for x in inputs if (x.split('-')[0] == target) and (len(x.split('-')) > 1)] - else: - raise Exception("Unknown target") - return [] - - if target is None: - packages = filterPackageGroup(None) - packages.sort() - elif target in self.packageGroups: - packages = filterPackageGroup(target) - packages.sort() - elif target == "ALL": - packages = [] - for t in [None] + self.packageGroups: - tmp = filterPackageGroup(t) - tmp.sort() - packages += tmp - else: - raise Exception("Unknown target") - packages = [] - - return packages - - - def getBuildInputs(self,target=None): - inputs = self.rewriteInputs(target,self.spec.sourceHeader['requires']) - if self.translateTable is not None: - return map(lambda x: self.translateTable.name(x), inputs) - else: - return inputs - - def getSelfKey(self): - name = self.spec.sourceHeader['name'] - if len(name.split('-')) > 1 and name.split('-')[0] in self.packageGroups: - key = self.rewriteInputs(name.split('-')[0], [self.spec.sourceHeader['name']])[0] - else: - key = self.rewriteInputs(None, [self.spec.sourceHeader['name']])[0] - return key - - def getSelf(self): - if self.translateTable is not None: - return self.translateTable.name(self.key) - else: - return self.key - - - - - def copyPatches(self, input_dir, output_dir): - patches = [source for (source, _, flag) in self.spec.sources if flag==2] - for filename in patches: - shutil.copyfile(os.path.join(input_dir, filename), os.path.join(output_dir, filename)) - - - def copySources(self, input_dir, output_dir): - filenames = [source for (source, _, flag) in self.spec.sources if flag==1 if not urlparse.urlparse(source).scheme in ["http", "https"] ] - for filename in filenames: - shutil.copyfile(os.path.join(input_dir, filename), os.path.join(output_dir, filename)) - - - def getFacts(self): - facts = {} - facts["name"] = self.rewriteName(self.spec.sourceHeader['name']) - facts["version"] = self.spec.sourceHeader['version'] - - facts["url"] = [] - facts["sha256"] = [] - sources = [source for (source, _, flag) in self.spec.sources if flag==1 if urlparse.urlparse(source).scheme in ["http", "https"] ] - for url in sources: - p = subprocess.Popen(['nix-prefetch-url', url], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - output, err = p.communicate() - sha256 = output[:-1] #remove new line - facts["url"].append(url) - facts["sha256"].append(sha256) - - patches = [source for (source, _, flag) in self.spec.sources if flag==2] - if self.buildRootInclude is None: - facts["patches"] = map(lambda x: './'+x, patches) - else: - facts["patches"] = map(lambda x: '"${buildRoot}/usr/share/buildroot/SOURCES/'+x+'"', reversed(patches)) - - return facts - - - @property - def name(self): - out = ' name = "' + self.facts["name"] + '-' + self.facts["version"] + '";\n' - out += ' version = "' + self.facts['version'] + '";\n' - return out - - - @property - def src(self): - sources = [source for (source, _, flag) in self.spec.sources if flag==1 if urlparse.urlparse(source).scheme in ["http", "https"] ] - out = '' - for (url,sha256) in zip(self.facts['url'],self.facts['sha256']): - out += ' src = fetchurl {\n' - out += ' url = "' + url + '";\n' - out += ' sha256 = "' + sha256 + '";\n' - out += ' };\n' - return out - - - @property - def patch(self): - out = ' patches = [ ' + ' '.join(self.facts['patches']) + ' ];\n' - return out - - - @property - def buildInputs(self): - out = ' buildInputs = [ ' - out += ' '.join(self.getBuildInputs("ALL")) - out += ' ];\n' - return out - - - @property - def configure(self): - out = ' configurePhase = \'\'\n ' + self.rewriteCommands(self.spec.prep) + '\n \'\';\n'; - return out - - - @property - def build(self): - out = ' buildPhase = \'\'\n ' + self.rewriteCommands(self.spec.build) + '\n \'\';\n'; - return out - - - @property - def install(self): - out = ' installPhase = \'\'\n ' + self.rewriteCommands(self.spec.install) + '\n \'\';\n'; - return out - - @property - def ocamlExtra(self): - if "ocaml" in self.getBuildInputs("ALL"): - return ' createFindlibDestdir = true;\n' - else: - return '' - - - @property - def meta(self): - out = ' meta = with lib; {\n' - out += ' homepage = ' + self.spec.sourceHeader['url'] + ';\n' - out += ' description = "' + self.spec.sourceHeader['summary'] + '";\n' - out += ' license = lib.licenses.' + self.spec.sourceHeader['license'] + ';\n' - out += ' platforms = [ "i686-linux" "x86_64-linux" ];\n' - out += ' maintainers = with lib.maintainers; [ ' + self.maintainer + ' ];\n' - out += ' };\n' - out += '}\n' - return out - - - def __str__(self): - head = '{lib, stdenv, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' - head += 'stdenv.mkDerivation {\n' - body = [ self.name, self.src, self.patch, self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ] - return head + '\n'.join(body) - - - def getTemplate(self): - head = '{lib, stdenv, buildRoot, fetchurl, ' + ', '.join(self.getBuildInputs("ALL")) + '}:\n\n' - head += 'let\n' - head += ' buildRootInput = (import "${buildRoot}/usr/share/buildroot/buildRootInput.nix") { fetchurl=fetchurl; buildRoot=buildRoot; };\n' - head += 'in\n\n' - head += 'stdenv.mkDerivation {\n' - head += ' inherit (buildRootInput.'+self.rewriteName(self.spec.sourceHeader['name'])+') name version src;\n' - head += ' patches = buildRootInput.'+self.rewriteName(self.spec.sourceHeader['name'])+'.patches ++ [];\n\n' - body = [ self.buildInputs, self.configure, self.build, self.ocamlExtra, self.install, self.meta ] - return head + '\n'.join(body) - - - def getInclude(self): - head = self.rewriteName(self.spec.sourceHeader['name']) + ' = {\n' - body = [ self.name, self.src, self.patch ] - return head + '\n'.join(body) + '};\n' - - - def __cmp__(self,other): - if self.getSelf() in other.getBuildInputs("ALL"): - return 1 - else: - return -1 - - - def callPackage(self): - callPackage = ' ' + self.getSelf() + ' = callPackage ' + os.path.relpath(self.final_output_dir, self.allPackagesDir) + ' {' - newline = False; - for target in self.packageGroups: - tmp = self.getBuildInputs(target) - if len(tmp) > 0: - newline = True; - callPackage += '\n ' + 'inherit (' + target + 'Packages) ' + ' '.join(tmp) + ';' - if newline: - callPackage += '\n };' - else: - callPackage += ' };' - return callPackage - - - - def generateCombined(self): - if not os.path.exists(self.final_output_dir): - os.makedirs(self.final_output_dir) - - if self.inputDir is not None: - self.copySources(self.inputDir, self.final_output_dir) - self.copyPatches(self.inputDir, self.final_output_dir) - - nixfile = open(os.path.join(self.final_output_dir,'default.nix'), 'w') - nixfile.write(str(self)) - nixfile.close() - - shutil.copyfile(self.specFilename, os.path.join(self.final_output_dir, os.path.basename(self.specFilename))) - - - - def generateSplit(self): - if not os.path.exists(self.final_output_dir): - os.makedirs(self.final_output_dir) - - nixfile = open(os.path.join(self.final_output_dir,'default.nix'), 'w') - nixfile.write(self.getTemplate()) - nixfile.close() - - return self.getInclude() - - - - - - -class NixTemplate(object): - def __init__(self, nixfile): - self.nixfile = nixfile - self.original = { "name":None, "version":None, "url":None, "sha256":None, "patches":None } - self.update = { "name":None, "version":None, "url":None, "sha256":None, "patches":None } - self.matchedLines = {} - - if os.path.isfile(nixfile): - with file(nixfile, 'r') as infile: - for (n,line) in enumerate(infile): - name = re.match(r'^\s*name\s*=\s*"(.*?)"\s*;\s*$', line) - version = re.match(r'^\s*version\s*=\s*"(.*?)"\s*;\s*$', line) - url = re.match(r'^\s*url\s*=\s*"?(.*?)"?\s*;\s*$', line) - sha256 = re.match(r'^\s*sha256\s*=\s*"(.*?)"\s*;\s*$', line) - patches = re.match(r'^\s*patches\s*=\s*(\[.*?\])\s*;\s*$', line) - if name is not None and self.original["name"] is None: - self.original["name"] = name.group(1) - self.matchedLines[n] = "name" - if version is not None and self.original["version"] is None: - self.original["version"] = version.group(1) - self.matchedLines[n] = "version" - if url is not None and self.original["url"] is None: - self.original["url"] = url.group(1) - self.matchedLines[n] = "url" - if sha256 is not None and self.original["sha256"] is None: - self.original["sha256"] = sha256.group(1) - self.matchedLines[n] = "sha256" - if patches is not None and self.original["patches"] is None: - self.original["patches"] = patches.group(1) - self.matchedLines[n] = "patches" - - - def generateUpdated(self, nixOut): - nixTemplateFile = open(os.path.normpath(self.nixfile),'r') - nixOutFile = open(os.path.normpath(nixOut),'w') - for (n,line) in enumerate(nixTemplateFile): - if self.matchedLines.has_key(n) and self.update[self.matchedLines[n]] is not None: - nixOutFile.write(line.replace(self.original[self.matchedLines[n]], self.update[self.matchedLines[n]], 1)) - else: - nixOutFile.write(line) - nixTemplateFile.close() - nixOutFile.close() - - - def loadUpdate(self,orig): - if orig.has_key("name") and orig.has_key("version"): - self.update["name"] = orig["name"] + '-' + orig["version"] - self.update["version"] = orig["version"] - if orig.has_key("url") and orig.has_key("sha256") and len(orig["url"])>0: - self.update["url"] = orig["url"][0] - self.update["sha256"] = orig["sha256"][0] - for url in orig["url"][1:-1]: - sys.stderr.write("WARNING: URL has been dropped: %s\n" % url) - if orig.has_key("patches"): - self.update["patches"] = '[ ' + ' '.join(orig['patches']) + ' ]' - - -class TranslationTable(object): - def __init__(self): - self.tablePath = {} - self.tableName = {} - - def update(self, key, path, name=None): - self.tablePath[key] = path - if name is not None: - self.tableName[key] = name - - def readTable(self, tableFile): - with file(tableFile, 'r') as infile: - for line in infile: - match = re.match(r'^(.+?)\s+(.+?)\s+(.+?)\s*$', line) - if match is not None: - if not self.tablePath.has_key(match.group(1)): - self.tablePath[match.group(1)] = match.group(2) - if not self.tableName.has_key(match.group(1)): - self.tableName[match.group(1)] = match.group(3) - else: - match = re.match(r'^(.+?)\s+(.+?)\s*$', line) - if not self.tablePath.has_key(match.group(1)): - self.tablePath[match.group(1)] = match.group(2) - - def writeTable(self, tableFile): - outFile = open(os.path.normpath(tableFile),'w') - keys = self.tablePath.keys() - keys.sort() - for k in keys: - if self.tableName.has_key(k): - outFile.write( k + " " + self.tablePath[k] + " " + self.tableName[k] + "\n" ) - else: - outFile.write( k + " " + self.tablePath[k] + "\n" ) - outFile.close() - - def name(self, key): - if self.tableName.has_key(key): - return self.tableName[key] - else: - return key - - def path(self, key, orig): - if self.tablePath.has_key(key): - return self.tablePath[key] - else: - return orig - - - - - -if __name__ == "__main__": - #Parse command line options - parser = argparse.ArgumentParser(description="Generate .nix templates from RPM spec files") - parser.add_argument("specs", metavar="SPEC", nargs="+", help="spec file") - parser.add_argument("-o", "--output", metavar="OUT_DIR", required=True, help="output directory") - parser.add_argument("-b", "--buildRoot", metavar="BUILDROOT_DIR", default=None, help="buildroot output directory") - parser.add_argument("-i", "--inputSources", metavar="IN_DIR", default=None, help="sources input directory") - parser.add_argument("-m", "--maintainer", metavar="MAINTAINER", default="__NIX_MAINTAINER__", help="package maintainer") - parser.add_argument("-r", "--repository", metavar="REP_DIR", default=None, help="nix repository to compare output against") - parser.add_argument("-t", "--translate", metavar="TRANSLATE_TABLE", default=None, help="path of translation table for name and path") - parser.add_argument("-u", "--translateOut", metavar="TRANSLATE_OUT", default=None, help="output path for updated translation table") - parser.add_argument("-a", "--allPackages", metavar="ALL_PACKAGES", default=None, help="top level dir to call packages from") - args = parser.parse_args() - - allPackagesDir = os.path.normpath( os.path.dirname(args.allPackages) ) - if not os.path.exists(allPackagesDir): - os.makedirs(allPackagesDir) - - buildRootContent = {} - nameMap = {} - - newTable = TranslationTable() - if args.translate is not None: - table = TranslationTable() - table.readTable(args.translate) - newTable.readTable(args.translate) - else: - table = None - - for specPath in args.specs: - try: - sys.stderr.write("INFO: generate nix file from: %s\n" % specPath) - - spec = SPECTemplate(specPath, args.output, args.inputSources, args.buildRoot, table, args.repository, allPackagesDir, args.maintainer) - if args.repository is not None: - if os.path.exists(os.path.join(spec.potential_repository_dir,'default.nix')): - nixTemplate = NixTemplate(os.path.join(spec.potential_repository_dir,'default.nix')) - nixTemplate.loadUpdate(spec.facts) - if not os.path.exists(spec.final_output_dir): - os.makedirs(spec.final_output_dir) - nixTemplate.generateUpdated(os.path.join(spec.final_output_dir,'default.nix')) - else: - sys.stderr.write("WARNING: Repository does not contain template: %s\n" % os.path.join(spec.potential_repository_dir,'default.nix')) - if args.buildRoot is None: - spec.generateCombined() - else: - buildRootContent[spec.key] = spec.generateSplit() - else: - if args.buildRoot is None: - spec.generateCombined() - else: - buildRootContent[spec.key] = spec.generateSplit() - - newTable.update(spec.key,spec.relOutputDir,spec.getSelf()) - nameMap[spec.getSelf()] = spec - - except Exception, e: - sys.stderr.write("ERROR: %s failed with:\n%s\n%s\n" % (specPath,e.message,traceback.format_exc())) - - if args.translateOut is not None: - if not os.path.exists(os.path.dirname(os.path.normpath(args.translateOut))): - os.makedirs(os.path.dirname(os.path.normpath(args.translateOut))) - newTable.writeTable(args.translateOut) - - graph = {} - for k, v in nameMap.items(): - graph[k] = set(v.getBuildInputs("ALL")) - - sortedSpecs = toposort.toposort_flatten(graph) - sortedSpecs = filter( lambda x: x in nameMap.keys(), sortedSpecs) - - allPackagesFile = open(os.path.normpath( args.allPackages ), 'w') - allPackagesFile.write( '\n\n'.join(map(lambda x: x.callPackage(), map(lambda x: nameMap[x], sortedSpecs))) ) - allPackagesFile.close() - - if args.buildRoot is not None: - buildRootFilename = os.path.normpath( args.buildRoot ) - if not os.path.exists(os.path.dirname(buildRootFilename)): - os.makedirs(os.path.dirname(buildRootFilename)) - buildRootFile = open(buildRootFilename, 'w') - buildRootFile.write( "{ fetchurl, buildRoot }: {\n\n" ) - keys = buildRootContent.keys() - keys.sort() - for k in keys: - buildRootFile.write( buildRootContent[k] + '\n' ) - buildRootFile.write( "}\n" ) - buildRootFile.close() - - diff --git a/pkgs/build-support/trivial-builders/test/default.nix b/pkgs/build-support/trivial-builders/test/default.nix index cbd1b388ef666..59dbba3f18410 100644 --- a/pkgs/build-support/trivial-builders/test/default.nix +++ b/pkgs/build-support/trivial-builders/test/default.nix @@ -14,21 +14,24 @@ { callPackage, lib, stdenv }: let inherit (lib) recurseIntoAttrs; + references = callPackage ./references {}; in recurseIntoAttrs { concat = callPackage ./concat-test.nix {}; linkFarm = callPackage ./link-farm.nix {}; overriding = callPackage ../test-overriding.nix {}; + # VM test not supported beyond linux yet references = - # VM test not supported beyond linux yet if stdenv.hostPlatform.isLinux - then callPackage ./references.nix {} - else null; + then references + else {}; writeCBin = callPackage ./writeCBin.nix {}; writeShellApplication = callPackage ./writeShellApplication.nix {}; writeScriptBin = callPackage ./writeScriptBin.nix {}; writeShellScript = callPackage ./write-shell-script.nix {}; writeShellScriptBin = callPackage ./writeShellScriptBin.nix {}; - writeStringReferencesToFile = callPackage ./writeStringReferencesToFile.nix {}; + writeStringReferencesToFile = callPackage ./writeStringReferencesToFile.nix { + inherit (references) samples; + }; writeTextFile = callPackage ./write-text-file.nix {}; } diff --git a/pkgs/build-support/trivial-builders/test/invoke-writeDirectReferencesToFile.nix b/pkgs/build-support/trivial-builders/test/invoke-writeDirectReferencesToFile.nix deleted file mode 100644 index ead3f7a2f5712..0000000000000 --- a/pkgs/build-support/trivial-builders/test/invoke-writeDirectReferencesToFile.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs ? import ../../../.. { config = {}; overlays = []; } }: -pkgs.lib.mapAttrs - (k: v: pkgs.writeDirectReferencesToFile v) - (import ./sample.nix { inherit pkgs; }) diff --git a/pkgs/build-support/trivial-builders/test/invoke-writeReferencesToFile.nix b/pkgs/build-support/trivial-builders/test/invoke-writeReferencesToFile.nix deleted file mode 100644 index 99c6c2f7dcc43..0000000000000 --- a/pkgs/build-support/trivial-builders/test/invoke-writeReferencesToFile.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs ? import ../../../.. { config = {}; overlays = []; } }: -pkgs.lib.mapAttrs - (k: v: pkgs.writeReferencesToFile v) - (import ./sample.nix { inherit pkgs; }) diff --git a/pkgs/build-support/trivial-builders/test/references-test.sh b/pkgs/build-support/trivial-builders/test/references-test.sh deleted file mode 100755 index 473ca6e107694..0000000000000 --- a/pkgs/build-support/trivial-builders/test/references-test.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env bash - -# -------------------------------------------------------------------------- # -# -# trivial-builders test -# -# -------------------------------------------------------------------------- # -# -# This file can be run independently (quick): -# -# $ pkgs/build-support/trivial-builders/references-test.sh -# -# or in the build sandbox with a ~20s VM overhead -# -# $ nix-build -A tests.trivial-builders.references -# -# -------------------------------------------------------------------------- # - -# strict bash -set -euo pipefail - -# debug -# set -x -# PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }' - -cd "$(dirname ${BASH_SOURCE[0]})" # nixpkgs root - -if [[ -z ${SAMPLE:-} ]]; then - echo "Running the script directly is currently not supported." - echo "If you need to iterate, remove the raw path, which is not returned by nix-build." - exit 1 -# sample=( `nix-build --no-out-link sample.nix` ) -# directRefs=( `nix-build --no-out-link invoke-writeDirectReferencesToFile.nix` ) -# references=( `nix-build --no-out-link invoke-writeReferencesToFile.nix` ) -# echo "sample: ${#sample[@]}" -# echo "direct: ${#directRefs[@]}" -# echo "indirect: ${#references[@]}" -else - # Injected by Nix (to avoid evaluating in a derivation) - # turn them into arrays - sample=($SAMPLE) - directRefs=($DIRECT_REFS) - references=($REFERENCES) -fi - -echo >&2 Testing direct references... -for i in "${!sample[@]}"; do - echo >&2 Checking '#'$i ${sample[$i]} ${directRefs[$i]} - diff -U3 \ - <(sort <${directRefs[$i]}) \ - <(nix-store -q --references ${sample[$i]} | sort) -done - -echo >&2 Testing closure... -for i in "${!sample[@]}"; do - echo >&2 Checking '#'$i ${sample[$i]} ${references[$i]} - diff -U3 \ - <(sort <${references[$i]}) \ - <(nix-store -q --requisites ${sample[$i]} | sort) -done - -echo 'OK!' diff --git a/pkgs/build-support/trivial-builders/test/references.nix b/pkgs/build-support/trivial-builders/test/references.nix deleted file mode 100644 index 7c8ea83f3c8bf..0000000000000 --- a/pkgs/build-support/trivial-builders/test/references.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, testers, pkgs, writeText, hello, figlet, stdenvNoCC }: - -# -------------------------------------------------------------------------- # -# -# trivial-builders test -# -# -------------------------------------------------------------------------- # -# -# This file can be run independently (quick): -# -# $ pkgs/build-support/trivial-builders/references-test.sh -# -# or in the build sandbox with a ~20s VM overhead -# -# $ nix-build -A tests.trivial-builders.references -# -# -------------------------------------------------------------------------- # - -let - invokeSamples = file: - lib.concatStringsSep " " ( - lib.attrValues (import file { inherit pkgs; }) - ); -in -testers.nixosTest { - name = "nixpkgs-trivial-builders"; - nodes.machine = { ... }: { - virtualisation.writableStore = true; - - # Test runs without network, so we don't substitute and prepare our deps - nix.settings.substituters = lib.mkForce []; - environment.etc."pre-built-paths".source = writeText "pre-built-paths" ( - builtins.toJSON [hello figlet stdenvNoCC] - ); - environment.variables = { - SAMPLE = invokeSamples ./sample.nix; - REFERENCES = invokeSamples ./invoke-writeReferencesToFile.nix; - DIRECT_REFS = invokeSamples ./invoke-writeDirectReferencesToFile.nix; - }; - }; - testScript = - '' - machine.succeed(""" - ${./references-test.sh} 2>/dev/console - """) - ''; - meta = { - maintainers = with lib.maintainers; [ - roberth - ]; - }; -} diff --git a/pkgs/build-support/trivial-builders/test/references/default.nix b/pkgs/build-support/trivial-builders/test/references/default.nix new file mode 100644 index 0000000000000..3e21c905321e4 --- /dev/null +++ b/pkgs/build-support/trivial-builders/test/references/default.nix @@ -0,0 +1,124 @@ +{ lib +, stdenvNoCC +, testers +, callPackage +, writeText + # nativeBuildInputs +, shellcheck-minimal + # Samples +, samples ? cleanSamples (callPackage ./samples.nix { }) + # Filter out the non-string-like attributes such as <pkg>.override added by + # callPackage. +, cleanSamples ? lib.filterAttrs (n: lib.isStringLike) + # Test targets +, writeDirectReferencesToFile +, writeReferencesToFile +}: + +# -------------------------------------------------------------------------- # +# +# trivial-builders test +# +# -------------------------------------------------------------------------- # +# +# Execute this build script directly (quick): +# +# * Classic +# $ NIX_PATH="nixpkgs=$PWD" nix-shell -p tests.trivial-builders.references.testScriptBin --run references-test +# +# * Flake-based +# $ nix run .#tests.trivial-builders.references.testScriptBin +# +# or in the build sandbox with a ~20s VM overhead: +# +# * Classic +# $ nix-build --no-out-link -A tests.trivial-builders.references +# +# * Flake-based +# $ nix build -L --no-link .#tests.trivial-builders.references +# +# -------------------------------------------------------------------------- # + +let + # Map each attribute to an element specification of Bash associative arrary + # and concatenate them with white spaces, to be used to define a + # one-line Bash associative array. + samplesToString = attrs: + lib.concatMapStringsSep " " (name: "[${name}]=${lib.escapeShellArg "${attrs.${name}}"}") (builtins.attrNames attrs); + + references = lib.mapAttrs (n: v: writeReferencesToFile v) samples; + directReferences = lib.mapAttrs (n: v: writeDirectReferencesToFile v) samples; + + testScriptBin = stdenvNoCC.mkDerivation (finalAttrs: { + name = "references-test"; + + src = ./references-test.sh; + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p "$out/bin" + substitute "$src" "$out/bin/${finalAttrs.meta.mainProgram}" \ + --replace "@SAMPLES@" ${lib.escapeShellArg (samplesToString samples)} \ + --replace "@REFERENCES@" ${lib.escapeShellArg (samplesToString references)} \ + --replace "@DIRECT_REFS@" ${lib.escapeShellArg (samplesToString directReferences)} + runHook postInstall + chmod +x "$out/bin/${finalAttrs.meta.mainProgram}" + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + shellcheck-minimal + ]; + installCheckPhase = '' + runHook preInstallCheck + shellcheck "$out/bin/${finalAttrs.meta.mainProgram}" + runHook postInstallCheck + ''; + + passthru = { + inherit + directReferences + references + samples + ; + }; + + meta = with lib; { + mainProgram = "references-test"; + }; + }); +in +testers.nixosTest { + name = "nixpkgs-trivial-builders"; + nodes.machine = { ... }: { + virtualisation.writableStore = true; + + # Test runs without network, so we don't substitute and prepare our deps + nix.settings.substituters = lib.mkForce [ ]; + environment.etc."pre-built-paths".source = writeText "pre-built-paths" ( + builtins.toJSON [ testScriptBin ] + ); + }; + testScript = + '' + machine.succeed(""" + ${lib.getExe testScriptBin} 2>/dev/console + """) + ''; + passthru = { + inherit + directReferences + references + samples + testScriptBin + ; + }; + meta = { + maintainers = with lib.maintainers; [ + roberth + ShamrockLee + ]; + }; +} diff --git a/pkgs/build-support/trivial-builders/test/references/references-test.sh b/pkgs/build-support/trivial-builders/test/references/references-test.sh new file mode 100755 index 0000000000000..1b8f8e1504ec8 --- /dev/null +++ b/pkgs/build-support/trivial-builders/test/references/references-test.sh @@ -0,0 +1,61 @@ +#!/usr/bin/env bash + +# -------------------------------------------------------------------------- # +# +# trivial-builders test +# +# -------------------------------------------------------------------------- # +# +# Execute this build script directly (quick): +# +# * Classic +# $ NIX_PATH="nixpkgs=$PWD" nix-shell -p tests.trivial-builders.references.testScriptBin --run references-test +# +# * Flake-based +# $ nix run .#tests.trivial-builders.references.testScriptBin +# +# or in the build sandbox with a ~20s VM overhead: +# +# * Classic +# $ nix-build --no-out-link -A tests.trivial-builders.references +# +# * Flake-based +# $ nix build -L --no-link .#tests.trivial-builders.references +# +# -------------------------------------------------------------------------- # + +# strict bash +set -euo pipefail + +# debug +# set -x +# PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }' + +cd "$(dirname "${BASH_SOURCE[0]}")" # nixpkgs root + + # Injected by Nix (to avoid evaluating in a derivation) + # turn them into arrays + # shellcheck disable=SC2206 # deliberately unquoted + declare -A samples=( @SAMPLES@ ) + # shellcheck disable=SC2206 # deliberately unquoted + declare -A directRefs=( @DIRECT_REFS@ ) + # shellcheck disable=SC2206 # deliberately unquoted + declare -A references=( @REFERENCES@ ) + +echo >&2 Testing direct references... +for i in "${!samples[@]}"; do + echo >&2 Checking "$i" "${samples[$i]}" "${directRefs[$i]}" + diff -U3 \ + <(sort <"${directRefs[$i]}") \ + <(nix-store -q --references "${samples[$i]}" | sort) +done + +echo >&2 Testing closure... +for i in "${!samples[@]}"; do + echo >&2 Checking "$i" "${samples[$i]}" "${references[$i]}" + diff -U3 \ + <(sort <"${references[$i]}") \ + <(nix-store -q --requisites "${samples[$i]}" | sort) +done + +echo 'OK!' diff --git a/pkgs/build-support/trivial-builders/test/references/samples.nix b/pkgs/build-support/trivial-builders/test/references/samples.nix new file mode 100644 index 0000000000000..3afb970c08aeb --- /dev/null +++ b/pkgs/build-support/trivial-builders/test/references/samples.nix @@ -0,0 +1,30 @@ +{ lib +, runCommand +, writeText +, emptyFile +, emptyDirectory +, figlet +, hello +, zlib +}: +{ + inherit + figlet + hello + zlib + ; + zlib-dev = zlib.dev; + norefs = writeText "hi" "hello"; + norefsDup = writeText "hi" "hello"; + helloRef = writeText "hi" "hello ${hello}"; + helloRefDup = writeText "hi" "hello ${hello}"; + path = ./samples.nix; + pathLike.outPath = ./samples.nix; + helloFigletRef = writeText "hi" "hello ${hello} ${figlet}"; + selfRef = runCommand "self-ref-1" { } "echo $out >$out"; + selfRef2 = runCommand "self-ref-2" { } ''echo "${figlet}, $out" >$out''; + inherit + emptyFile + emptyDirectory + ; +} diff --git a/pkgs/build-support/trivial-builders/test/sample.nix b/pkgs/build-support/trivial-builders/test/sample.nix deleted file mode 100644 index a4eedce8417eb..0000000000000 --- a/pkgs/build-support/trivial-builders/test/sample.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs ? import ../../../.. { config = { }; overlays = [ ]; } }: -let - inherit (pkgs) - figlet - zlib - hello - writeText - runCommand - ; -in -{ - hello = hello; - figlet = figlet; - zlib = zlib; - zlib-dev = zlib.dev; - norefs = writeText "hi" "hello"; - norefsDup = writeText "hi" "hello"; - helloRef = writeText "hi" "hello ${hello}"; - helloRefDup = writeText "hi" "hello ${hello}"; - path = ./invoke-writeReferencesToFile.nix; - pathLike.outPath = ./invoke-writeReferencesToFile.nix; - helloFigletRef = writeText "hi" "hello ${hello} ${figlet}"; - selfRef = runCommand "self-ref-1" {} "echo $out >$out"; - selfRef2 = runCommand "self-ref-2" {} ''echo "${figlet}, $out" >$out''; - inherit (pkgs) - emptyFile - emptyDirectory - ; -} diff --git a/pkgs/build-support/trivial-builders/test/writeStringReferencesToFile.nix b/pkgs/build-support/trivial-builders/test/writeStringReferencesToFile.nix index b93b43b74aa49..dedd7e183a178 100644 --- a/pkgs/build-support/trivial-builders/test/writeStringReferencesToFile.nix +++ b/pkgs/build-support/trivial-builders/test/writeStringReferencesToFile.nix @@ -1,14 +1,13 @@ -{ callPackage, lib, pkgs, runCommand, writeText, writeStringReferencesToFile }: +{ callPackage, lib, pkgs, runCommand, samples, writeText, writeStringReferencesToFile }: let - sample = import ./sample.nix { inherit pkgs; }; - samplePaths = lib.unique (lib.attrValues sample); + samplePaths = lib.unique (lib.attrValues samples); stri = x: "${x}"; sampleText = writeText "sample-text" (lib.concatStringsSep "\n" (lib.unique (map stri samplePaths))); stringReferencesText = writeStringReferencesToFile ((lib.concatMapStringsSep "fillertext" stri - (lib.attrValues sample)) + '' + (lib.attrValues samples)) + '' STORE=${builtins.storeDir};\nsystemctl start bar-foo.service ''); in diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md index fbb8b0dc05c1e..948003bb55730 100644 --- a/pkgs/by-name/README.md +++ b/pkgs/by-name/README.md @@ -99,7 +99,9 @@ There's some limitations as to which packages can be defined using this structur - Only packages defined using `pkgs.callPackage`. This excludes packages defined using `pkgs.python3Packages.callPackage ...`. - Instead use the [category hierarchy](../README.md#category-hierarchy) for such attributes. + Instead: + - Either change the package definition to work with `pkgs.callPackage`. + - Or use the [category hierarchy](../README.md#category-hierarchy). - Only top-level packages. This excludes packages for other package sets like `pkgs.pythonPackages.*`. @@ -110,12 +112,11 @@ There's some limitations as to which packages can be defined using this structur CI performs [certain checks](../test/nixpkgs-check-by-name/README.md#validity-checks) on the `pkgs/by-name` structure. This is done using the [`nixpkgs-check-by-name` tool](../test/nixpkgs-check-by-name). -The version of this tool used is the one that corresponds to the NixOS channel of the PR base branch. -See [here](../../.github/workflows/check-by-name.yml) for details. -The tool can be run locally using +You can locally emulate the CI check using -```bash -nix-build -A tests.nixpkgs-check-by-name -result/bin/nixpkgs-check-by-name . ``` +$ ./pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh master +``` + +See [here](../../.github/workflows/check-by-name.yml) for more info. diff --git a/pkgs/games/aaaaxy/default.nix b/pkgs/by-name/aa/aaaaxy/package.nix index b6e5826be96a8..fcd71f6c66151 100644 --- a/pkgs/games/aaaaxy/default.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -19,17 +19,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.4.72"; + version = "1.4.119"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-wKnwyjgEV1M5CJR0uxs9vNbF3iJvDPWOqya0iLHXjGw="; + hash = "sha256-M+HNYQl53vQZdKn/CyF5OZPyKGq/4A9DPoDV3fRdWMY="; fetchSubmodules = true; }; - vendorHash = "sha256-hK5w3JhcYUW5bAUovv/ldHoYcY0oIh5q4LWxiGuP2NQ="; + vendorHash = "sha256-NoWfCn9P/i/8Xv0w2wqTFG3yoayGzc1TyF02zANP7Rg="; buildInputs = [ alsa-lib diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix new file mode 100644 index 0000000000000..d8134263c5f77 --- /dev/null +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -0,0 +1,44 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ad-miner"; + version = "0.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Mazars-Tech"; + repo = "AD_Miner"; + rev = "refs/tags/v${version}"; + hash = "sha256-Iwg00vAnCs9FbEAmB54vNDLmxyZeCtZMl/VEFoYeEcM="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + neo4j + numpy + pytz + tqdm + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "ad_miner" + ]; + + meta = with lib; { + description = "Active Directory audit tool that leverages cypher queries to crunch data from Bloodhound"; + homepage = "https://github.com/Mazars-Tech/AD_Miner"; + changelog = "https://github.com/Mazars-Tech/AD_Miner/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "AD-miner"; + }; +} diff --git a/pkgs/by-name/ae/aeron-cpp/aeron-all.patch b/pkgs/by-name/ae/aeron-cpp/aeron-all.patch new file mode 100644 index 0000000000000..40dd24c14b0c1 --- /dev/null +++ b/pkgs/by-name/ae/aeron-cpp/aeron-all.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -323,7 +323,7 @@ if (BUILD_AERON_ARCHIVE_API) + "${CMAKE_CURRENT_SOURCE_DIR}}/aeron-archive/src/main/java/*.java") + + add_custom_command(OUTPUT ${AERON_ALL_JAR} +- COMMAND ${CMAKE_COMMAND} -E env JAVA_HOME=$ENV{JAVA_HOME} BUILD_JAVA_HOME=$ENV{BUILD_JAVA_HOME} BUILD_JAVA_VERSION=$ENV{BUILD_JAVA_VERSION} ${GRADLE_WRAPPER} :aeron-all:clean :aeron-all:assemble --no-daemon -x javadoc --console=plain -q ++ COMMAND ln --symbolic ${CMAKE_CURRENT_SOURCE_DIR}/aeron-all.jar ${AERON_ALL_JAR} + DEPENDS ${AERON_ALL_SOURCES} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Generating aeron-all jar") diff --git a/pkgs/by-name/ae/aeron-cpp/aeron-archive-sbe.patch b/pkgs/by-name/ae/aeron-cpp/aeron-archive-sbe.patch new file mode 100644 index 0000000000000..d4a845f2bf7b2 --- /dev/null +++ b/pkgs/by-name/ae/aeron-cpp/aeron-archive-sbe.patch @@ -0,0 +1,11 @@ +--- a/aeron-archive/src/main/cpp/CMakeLists.txt ++++ b/aeron-archive/src/main/cpp/CMakeLists.txt +@@ -59,7 +59,7 @@ set(GENERATED_CODECS + ${ARCHIVE_CODEC_TARGET_DIR}/aeron_archive_client/RecordingSignalEvent.h) + + add_custom_command(OUTPUT ${GENERATED_CODECS} +- COMMAND ${CMAKE_COMMAND} -E env JAVA_HOME=$ENV{JAVA_HOME} BUILD_JAVA_HOME=$ENV{BUILD_JAVA_HOME} BUILD_JAVA_VERSION=$ENV{BUILD_JAVA_VERSION} ${GRADLE_WRAPPER} -Dcodec.target.dir=${ARCHIVE_CODEC_TARGET_DIR} :aeron-archive:generateCppCodecs --no-daemon --console=plain -q ++ COMMAND ${CMAKE_COMMAND} -E env JAVA_HOME=$ENV{JAVA_HOME} BUILD_JAVA_HOME=$ENV{BUILD_JAVA_HOME} BUILD_JAVA_VERSION=$ENV{BUILD_JAVA_VERSION} java -cp sbe.jar -Dsbe.output.dir=${ARCHIVE_CODEC_TARGET_DIR} -Dsbe.target.language=Cpp -Dsbe.target.namespace=aeron.archive.client uk.co.real_logic.sbe.SbeTool ${ARCHIVE_CODEC_SCHEMA_DIR}/aeron-archive-codecs.xml + DEPENDS ${CODEC_SCHEMA} aeron-all-jar + WORKING_DIRECTORY ${ARCHIVE_CODEC_WORKING_DIR} + COMMENT "Generating C++ Archive codecs") diff --git a/pkgs/by-name/ae/aeron-cpp/package.nix b/pkgs/by-name/ae/aeron-cpp/package.nix new file mode 100644 index 0000000000000..28feed78cc49b --- /dev/null +++ b/pkgs/by-name/ae/aeron-cpp/package.nix @@ -0,0 +1,134 @@ +{ + autoPatchelfHook, + cmake, + fetchFromGitHub, + fetchMavenArtifact, + jdk11, + lib, + libbsd, + libuuid, + makeWrapper, + patchelf, + stdenv, + zlib +}: + +let + version = "1.42.1"; + + aeronAll = fetchMavenArtifact { + artifactId = "aeron-all"; + groupId = "io.aeron"; + inherit version; + hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA=="; + }; + + sbeAll_1_29_0 = fetchMavenArtifact { + groupId = "uk.co.real-logic"; + version = "1.29.0"; + artifactId = "sbe-all"; + hash = "sha512-exklKS9MgOH369lyuv+5vAWRHt+Iwg/FmsWy8PsSMjenvjs8I2KA1VTa00pIXkw/YNqbUDBIWvS07b4mS8YdPQ=="; + }; + + sbeAll = sbeAll_1_29_0; + +in + +stdenv.mkDerivation { + pname = "aeron-cpp"; + inherit version; + + src = fetchFromGitHub { + owner = "real-logic"; + repo = "aeron"; + rev = version; + hash = "sha256-ODJeJ4XLazPeNLdzaoclPnE59NpxFUqZu3Aw3iTVQT8="; + }; + + patches = [ + ./aeron-all.patch + # Use pre-built aeron-all.jar from Maven repo, avoiding Gradle + + ./aeron-archive-sbe.patch + # Use SBE tool to generate C++ codecs, avoiding Gradle + ]; + + buildInputs = [ + jdk11 + libbsd + libuuid + zlib + ]; + + nativeBuildInputs = [ + autoPatchelfHook + cmake + makeWrapper + patchelf + ]; + + configurePhase = '' + runHook preConfigure + + mkdir --parents cppbuild/Release + ( + cd cppbuild/Release + cmake \ + -G "CodeBlocks - Unix Makefiles" \ + -DCMAKE_BUILD_TYPE=Release \ + -DAERON_TESTS=OFF \ + -DAERON_SYSTEM_TESTS=OFF \ + -DAERON_BUILD_SAMPLES=OFF \ + -DCMAKE_INSTALL_PREFIX:PATH=../../install \ + ../.. + ) + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + ln --symbolic "${aeronAll.jar}" ./aeron-all.jar + ln --symbolic "${sbeAll.jar}" ./sbe.jar + mkdir --parents aeron-all/build/libs + ( + cd cppbuild/Release + + make -j $NIX_BUILD_CORES \ + aeron \ + aeron_archive_client \ + aeron_client_shared \ + aeron_driver \ + aeron_client \ + aeron_driver_static \ + aeronmd + + make -j $NIX_BUILD_CORES install + ) + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir --parents "$out" + cp --archive --verbose --target-directory="$out" install/* + + runHook postInstall + ''; + + meta = with lib; { + description = "Aeron Messaging C++ Library"; + homepage = "https://aeron.io/"; + license = licenses.asl20; + mainProgram = "aeronmd"; + maintainers = [ maintainers.vaci ]; + sourceProvenance = [ + sourceTypes.fromSource + sourceTypes.binaryBytecode + ]; + }; +} + diff --git a/pkgs/games/alephone/apotheosis-x/default.nix b/pkgs/by-name/al/alephone-apotheosis-x/package.nix index 16bed9fad97e8..16bed9fad97e8 100644 --- a/pkgs/games/alephone/apotheosis-x/default.nix +++ b/pkgs/by-name/al/alephone-apotheosis-x/package.nix diff --git a/pkgs/games/alephone/durandal/default.nix b/pkgs/by-name/al/alephone-durandal/package.nix index cd7927d69a141..cd7927d69a141 100644 --- a/pkgs/games/alephone/durandal/default.nix +++ b/pkgs/by-name/al/alephone-durandal/package.nix diff --git a/pkgs/games/alephone/eternal/default.nix b/pkgs/by-name/al/alephone-eternal/package.nix index c212841506186..c212841506186 100644 --- a/pkgs/games/alephone/eternal/default.nix +++ b/pkgs/by-name/al/alephone-eternal/package.nix diff --git a/pkgs/games/alephone/evil/default.nix b/pkgs/by-name/al/alephone-evil/package.nix index a0120348c14e5..a0120348c14e5 100644 --- a/pkgs/games/alephone/evil/default.nix +++ b/pkgs/by-name/al/alephone-evil/package.nix diff --git a/pkgs/games/alephone/infinity/default.nix b/pkgs/by-name/al/alephone-infinity/package.nix index c49f9a8d2ac72..c49f9a8d2ac72 100644 --- a/pkgs/games/alephone/infinity/default.nix +++ b/pkgs/by-name/al/alephone-infinity/package.nix diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/by-name/al/alephone-marathon/package.nix index ea295b7dcdce7..ea295b7dcdce7 100644 --- a/pkgs/games/alephone/marathon/default.nix +++ b/pkgs/by-name/al/alephone-marathon/package.nix diff --git a/pkgs/games/alephone/pathways-into-darkness/default.nix b/pkgs/by-name/al/alephone-pathways-into-darkness/package.nix index 6c6de4b88e8f0..6c6de4b88e8f0 100644 --- a/pkgs/games/alephone/pathways-into-darkness/default.nix +++ b/pkgs/by-name/al/alephone-pathways-into-darkness/package.nix diff --git a/pkgs/games/alephone/pheonix/default.nix b/pkgs/by-name/al/alephone-pheonix/package.nix index 90db1aa7c73d6..90db1aa7c73d6 100644 --- a/pkgs/games/alephone/pheonix/default.nix +++ b/pkgs/by-name/al/alephone-pheonix/package.nix diff --git a/pkgs/games/alephone/red/default.nix b/pkgs/by-name/al/alephone-red/package.nix index f24c9010cd633..f24c9010cd633 100644 --- a/pkgs/games/alephone/red/default.nix +++ b/pkgs/by-name/al/alephone-red/package.nix diff --git a/pkgs/games/alephone/rubicon-x/default.nix b/pkgs/by-name/al/alephone-rubicon-x/package.nix index b59fa4cfeb626..b59fa4cfeb626 100644 --- a/pkgs/games/alephone/rubicon-x/default.nix +++ b/pkgs/by-name/al/alephone-rubicon-x/package.nix diff --git a/pkgs/games/alephone/yuge/default.nix b/pkgs/by-name/al/alephone-yuge/package.nix index 6ae73f984a4fc..6ae73f984a4fc 100644 --- a/pkgs/games/alephone/yuge/default.nix +++ b/pkgs/by-name/al/alephone-yuge/package.nix diff --git a/pkgs/by-name/al/alephone/package.nix b/pkgs/by-name/al/alephone/package.nix new file mode 100644 index 0000000000000..44349b7621e52 --- /dev/null +++ b/pkgs/by-name/al/alephone/package.nix @@ -0,0 +1,135 @@ +{ lib +, stdenv +, fetchurl +, alsa-lib +, boost +, curl +, ffmpeg_4 +, icoutils +, libGLU +, libmad +, libogg +, libpng +, libsndfile +, libvorbis +, lua +, makeDesktopItem +, makeWrapper +, miniupnpc +, openal +, pkg-config +, SDL2 +, SDL2_image +, SDL2_net +, SDL2_ttf +, speex +, unzip +, zlib +, zziplib +, alephone +}: + +stdenv.mkDerivation (finalAttrs: { + outputs = [ "out" "icons" ]; + pname = "alephone"; + version = "1.7"; + + src = fetchurl { + url = + let date = "20231125"; + in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2"; + sha256 = "sha256-qRHmtkzPi6PKeAzoMPdSbboiilG+L2fCXvXXu3vIchs="; + }; + + nativeBuildInputs = [ pkg-config icoutils ]; + + buildInputs = [ + alsa-lib + boost + curl + ffmpeg_4 + libGLU + libmad + libogg + libpng + libsndfile + libvorbis + lua + miniupnpc + openal + SDL2 + SDL2_image + SDL2_net + SDL2_ttf + speex + zlib + zziplib + ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + makeFlags = [ "AR:=$(AR)" ]; + + enableParallelBuilding = true; + + postInstall = '' + mkdir $icons + icotool -x -i 5 -o $icons Resources/Windows/*.ico + pushd $icons + for x in *_5_48x48x32.png; do + mv $x ''${x%_5_48x48x32.png}.png + done + popd + ''; + + meta = { + description = + "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine"; + homepage = "https://alephone.lhowon.org/"; + license = [ lib.licenses.gpl3 ]; + maintainers = with lib.maintainers; [ ehmry ]; + platforms = lib.platforms.linux; + }; + + passthru.makeWrapper = + { pname + , desktopName + , version + , zip + , meta + , icon ? alephone.icons + "/alephone.png" + , ... + }@extraArgs: + stdenv.mkDerivation ({ + inherit pname version; + + desktopItem = makeDesktopItem { + name = desktopName; + exec = pname; + genericName = pname; + categories = [ "Game" ]; + comment = meta.description; + inherit desktopName icon; + }; + + src = zip; + + nativeBuildInputs = [ makeWrapper unzip ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin $out/data/$pname $out/share/applications + cp -a * $out/data/$pname + cp $desktopItem/share/applications/* $out/share/applications + makeWrapper ${alephone}/bin/alephone $out/bin/$pname \ + --add-flags $out/data/$pname + ''; + } // extraArgs // { + meta = alephone.meta // { + license = lib.licenses.free; + mainProgram = pname; + hydraPlatforms = [ ]; + } // meta; + }); +}) diff --git a/pkgs/by-name/am/amphetype/package.nix b/pkgs/by-name/am/amphetype/package.nix new file mode 100644 index 0000000000000..a59febee6692a --- /dev/null +++ b/pkgs/by-name/am/amphetype/package.nix @@ -0,0 +1,32 @@ +{ fetchFromGitLab, lib, python3Packages, qt5 }: + +let + pname = "amphetype"; + version = "1.0.0"; +in python3Packages.buildPythonApplication { + inherit pname version; + + src = fetchFromGitLab { + owner = "franksh"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pve2f+XMfFokMCtW3KdeOJ9Ey330Gwv/dk1+WBtrBEQ="; + }; + + propagatedBuildInputs = with python3Packages; [ + editdistance + pyqt5 + translitcodec + ]; + + doCheck = false; + + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + + meta = with lib; { + description = "An advanced typing practice program"; + homepage = "https://gitlab.com/franksh/amphetype"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ rycee ]; + }; +} diff --git a/pkgs/by-name/an/anime4k/package.nix b/pkgs/by-name/an/anime4k/package.nix new file mode 100644 index 0000000000000..eef64ffc3ae91 --- /dev/null +++ b/pkgs/by-name/an/anime4k/package.nix @@ -0,0 +1,32 @@ +{ fetchFromGitHub +, lib +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "anime4k"; + version = "4.0.1"; + + src = fetchFromGitHub { + owner = "bloc97"; + repo = "Anime4k"; + rev = "v${finalAttrs.version}"; + hash = "sha256-OQWJWcDpwmnJJ/kc4uEReaO74dYFlxNQwf33E5Oagb0="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 glsl/*/*.glsl -t $out + + runHook postInstall + ''; + + meta = with lib; { + description = "A high-quality real time upscaler for anime"; + homepage = "https://github.com/bloc97/Anime4K"; + license = licenses.mit; + maintainers = with maintainers; [ surfaceflinger ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/by-name/an/anytype/package.nix index 71af8bc4c432f..c7c480d0ac231 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.35.25-beta"; + version = "0.37.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-55VT4t/SNl13Gdh7LG4SqLN9uo0cYDu0LnPFIuZ7Sm0="; + sha256 = "sha256-Z46GTcJoaqvjVuxUP+OuxD32KM0NQISWMlv3uco5r6g="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in @@ -26,15 +26,17 @@ appimageTools.wrapType2 { install -m 444 -D ${appimageContents}/anytype.desktop -t $out/share/applications substituteInPlace $out/share/applications/anytype.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/0x0/apps/anytype.png \ - $out/share/icons/hicolor/512x512/apps/anytype.png + for size in 16 32 64 128 256 512 1024; do + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/anytype.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/anytype.png + done ''; meta = with lib; { description = "P2P note-taking tool"; homepage = "https://anytype.io/"; license = licenses.unfree; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ running-grass ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/by-name/ar/arcan/package.nix index 1a46c693b0278..ce4fc7256b77d 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/by-name/ar/arcan/package.nix @@ -2,8 +2,9 @@ , stdenv , fetchFromGitHub , SDL2 +, callPackage , cmake -, espeak +, espeak-ng , ffmpeg , file , freetype @@ -54,11 +55,15 @@ let allSources = { - letoram-arcan-src = fetchFromGitHub { - owner = "letoram"; - repo = "arcan"; - rev = "85c8564bdbee8468a5716bea64daf1d78937ffbf"; - hash = "sha256-etmj1vpZTjxbmr4UiLBEK57WFJ1NeEnY5WfBYajX3ls="; + letoram-arcan = { + pname = "arcan"; + version = "0.6.2.1-unstable-2023-11-18"; + src = fetchFromGitHub { + owner = "letoram"; + repo = "arcan"; + rev = "0950ee236f96a555729498d0fdf91c16901037f5"; + hash = "sha256-TxadRlidy4KRaQ4HunPO6ISJqm6JwnMRM8y6dX6vqJ4="; + }; }; letoram-openal-src = fetchFromGitHub { owner = "letoram"; @@ -87,10 +92,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { - pname = "arcan"; - version = "0.6.2.1-unstable-2023-10-14"; - - src = allSources.letoram-arcan-src; + inherit (allSources.letoram-arcan) pname version src; nativeBuildInputs = [ cmake @@ -140,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { xz ] ++ lib.optionals useEspeak [ - espeak + espeak-ng ]; # Emulate external/git/clone.sh @@ -197,6 +199,10 @@ stdenv.mkDerivation (finalAttrs: { "format" ]; + passthru = { + wrapper = callPackage ./wrapper.nix { }; + }; + meta = { homepage = "https://arcan-fe.com/"; description = "Combined Display Server, Multimedia Framework, Game Engine"; diff --git a/pkgs/desktops/arcan/wrapper.nix b/pkgs/by-name/ar/arcan/wrapper.nix index b61c5a5becd87..b61c5a5becd87 100644 --- a/pkgs/desktops/arcan/wrapper.nix +++ b/pkgs/by-name/ar/arcan/wrapper.nix diff --git a/pkgs/by-name/ar/arduino-ide/package.nix b/pkgs/by-name/ar/arduino-ide/package.nix new file mode 100644 index 0000000000000..bcc947c1530c5 --- /dev/null +++ b/pkgs/by-name/ar/arduino-ide/package.nix @@ -0,0 +1,38 @@ +{ appimageTools +, fetchurl +, lib +}: + +let + pname = "arduino-ide"; + version = "2.2.1"; + + src = fetchurl { + url = "https://github.com/arduino/arduino-ide/releases/download/${version}/arduino-ide_${version}_Linux_64bit.AppImage"; + hash = "sha256-77uS/3ean3dWG/vDHG+ry238hiJlYub7H03f15eJu+I="; + }; + + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/{${pname}-${version},${pname}} + + install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/ + install -Dm444 ${appimageContents}/${pname}.png -t $out/share/pixmaps/ + ''; + + extraPkgs = pkgs: with pkgs; [ libsecret ]; + + meta = with lib; { + description = "Open-source electronics prototyping platform"; + homepage = "https://www.arduino.cc/en/software"; + changelog = "https://github.com/arduino/arduino-ide/releases/tag/${version}"; + license = licenses.agpl3Only; + mainProgram = "arduino-ide"; + maintainers = with maintainers; [ clerie ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix new file mode 100644 index 0000000000000..1339015a8c65b --- /dev/null +++ b/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -0,0 +1,60 @@ +{ lib +, python3Packages +, fetchFromGitHub +, nix-update-script +, ... +}: + +python3Packages.buildPythonPackage rec { + pname = "ark-pixel-font"; + version = "2023.11.26"; + + src = fetchFromGitHub { + owner = "TakWolf"; + repo = pname; + rev = version; + hash = "sha256-6a9wNmcXlEesPthpMt+GrWyO3x6WVtemVTXP8rbWmLk="; + }; + + format = "other"; + + nativeBuildInputs = with python3Packages; [ + pixel-font-builder + unidata-blocks + character-encoding-utils + pypng + pillow + beautifulsoup4 + jinja2 + gitpython + ]; + + buildPhase = '' + runHook preBuild + + python build.py + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm444 build/outputs/*.bdf -t $out/share/fonts/bdf + install -Dm444 build/outputs/*.otf -t $out/share/fonts/opentype + install -Dm444 build/outputs/*.ttf -t $out/share/fonts/truetype + install -Dm444 build/outputs/*.woff2 -t $out/share/fonts/woff2 + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Open source pan-CJK pixel font"; + homepage = "https://ark-pixel-font.takwolf.com/"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ h7x4 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 19dcf84116dc2..b68123dd42b16 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/bergercookie/asm-lsp"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ NotAShelf ]; - mainProgram = pname; + mainProgram = "asm-lsp"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/as/asn1editor/package.nix b/pkgs/by-name/as/asn1editor/package.nix new file mode 100644 index 0000000000000..a85d8f53fe6d1 --- /dev/null +++ b/pkgs/by-name/as/asn1editor/package.nix @@ -0,0 +1,37 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "asn1editor"; + version = "0.8.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Futsch1"; + repo = "asn1editor"; + rev = "v${version}"; + hash = "sha256-mgluhC2DMS4OyS/BoWqBdVf7GcxquOtOKTHZ/hbiHQM="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + asn1tools + coverage + wxPython_4_2 + ]; + + pythonImportsCheck = [ "asn1editor" ]; + + # Tests fail in sandbox, e.g. + # "SystemExit: Unable to access the X Display, is $DISPLAY set properly?" + doCheck = false; + + meta = with lib; { + description = "Python based editor for ASN.1 encoded data"; + homepage = "https://github.com/Futsch1/asn1editor"; + license = licenses.mit; + mainProgram = "asn1editor"; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 226174fd85c4e..a70c8bd626918 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.13.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-Wee+npgL0+7pv9ph3S93fIXr8z/FWp/TBthJhVSx3zI="; + hash = "sha256-eoi0kZunU0Jvy5TGK1Whkluk06k6fnsL54dSRXQu1TM="; }; - cargoHash = "sha256-OFNqBkPAKaSqDQUWisupj6FlDbm3kw0xq5nbvj04H5U="; + cargoHash = "sha256-xXOO3mOrAFhJuU3Zrpgys36q1sDikigDv4Ch8T8OVxY="; # Work around https://github.com/NixOS/nixpkgs/issues/166205. env = lib.optionalAttrs stdenv.cc.isClang { diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index 0dfee342a3c23..f483e465f2689 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -1,23 +1,24 @@ { lib , fetchFromGitHub -, buildGo121Module +, buildGoModule +, testers +, athens }: -buildGo121Module rec { +buildGoModule rec { pname = "athens"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "gomods"; - repo = pname; + repo = "athens"; rev = "v${version}"; - hash = "sha256-m75Ut1UVwz7uWneBwPxUL7aPOXIpy6YPqIXMwczHOpY="; + hash = "sha256-27BBPDK5lGwEFsgLf+/lE9CM8g1AbGUgM1iOL7XZqsU="; }; - vendorHash = "sha256-zK4EE242Gbgew33oxAUNxylKdhRdPhqP0Hrpu4sYiFg="; + vendorHash = "sha256-5U9ql0wszhr5H3hAo2utONuEh4mUSiO71XQHkAnMhZU="; CGO_ENABLED = "0"; ldflags = [ "-s" "-w" "-buildid=" "-X github.com/gomods/athens/pkg/build.version=${version}" ]; - flags = [ "-trimpath" ]; subPackages = [ "cmd/proxy" ]; @@ -25,6 +26,12 @@ buildGo121Module rec { mv $out/bin/proxy $out/bin/athens ''; + passthru = { + tests.version = testers.testVersion { + package = athens; + }; + }; + meta = with lib; { description = "A Go module datastore and proxy"; homepage = "https://github.com/gomods/athens"; diff --git a/pkgs/by-name/aw/aws-gate/disable-bootstrap.patch b/pkgs/by-name/aw/aws-gate/disable-bootstrap.patch new file mode 100644 index 0000000000000..63b6ebce3b8a9 --- /dev/null +++ b/pkgs/by-name/aw/aws-gate/disable-bootstrap.patch @@ -0,0 +1,51 @@ +diff --git a/aws_gate/cli.py b/aws_gate/cli.py +index ac37c2f..9743415 100644 +--- a/aws_gate/cli.py ++++ b/aws_gate/cli.py +@@ -7,7 +7,6 @@ from marshmallow import ValidationError + from yaml.scanner import ScannerError + + from aws_gate import __version__, __description__ +-from aws_gate.bootstrap import bootstrap + from aws_gate.config import load_config_from_files + from aws_gate.constants import ( + SUPPORTED_KEY_TYPES, +@@ -59,10 +58,14 @@ def get_argument_parser(*args, **kwargs): + + # 'bootstrap' subcommand + bootstrap_parser = subparsers.add_parser( +- "bootstrap", help="Download and install session-manager-plugin" ++ "bootstrap", ++ help="Download and install session-manager-plugin (disabled by nix)", + ) + bootstrap_parser.add_argument( +- "-f", "--force", action="store_true", help="Forces bootstrap operation" ++ "-f", ++ "--force", ++ action="store_true", ++ help="Forces bootstrap operation (disabled by nix)", + ) + + # 'exec' subcommand +@@ -268,7 +271,9 @@ def main(args=None, argument_parser=None): + logger.debug('Using AWS profile "%s" in region "%s"', profile, region) + + if args.subcommand == "bootstrap": +- bootstrap(force=args.force) ++ print( ++ f"The SSM Plugin will not be downloaded as aws-gate was installed from nixpkgs and the plugin comes pre-bundled. The '--force' flag will not override this behavior." ++ ) + elif args.subcommand == "exec": + exec( + config=config, +diff --git a/requirements/requirements.txt b/requirements/requirements.txt +index 50b203e..8c3496f 100644 +--- a/requirements/requirements.txt ++++ b/requirements/requirements.txt +@@ -3,5 +3,4 @@ cryptography==39.0.2 + marshmallow==3.19.0 + packaging==23.0 + PyYAML>=5.1,<6.1 +-requests==2.28.2 + unix-ar==0.2.1 + wrapt==1.15.0 \ No newline at end of file diff --git a/pkgs/by-name/aw/aws-gate/package.nix b/pkgs/by-name/aw/aws-gate/package.nix new file mode 100644 index 0000000000000..77e56026665d1 --- /dev/null +++ b/pkgs/by-name/aw/aws-gate/package.nix @@ -0,0 +1,55 @@ +{ lib +, fetchFromGitHub +, installShellFiles +, python3Packages +, ssm-session-manager-plugin +}: + +python3Packages.buildPythonApplication rec { + pname = "aws-gate"; + version = "0.11.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xen0l"; + repo = pname; + rev = version; + hash = "sha256-9w2jP4s1HXf1gYiXX05Dt2iXt0bR0U48yc8h9T5M+EQ="; + }; + + patches = [ + ./disable-bootstrap.patch + ]; + + postPatch = '' + rm aws_gate/bootstrap.py tests/unit/test_bootstrap.py + ''; + + nativeBuildInputs = [ + python3Packages.setuptools + python3Packages.wheel + installShellFiles + ]; + + propagatedBuildInputs = [ ssm-session-manager-plugin ] ++ builtins.attrValues { + inherit (python3Packages) marshmallow boto3 pyyaml wrapt cryptography; + }; + + postInstall = '' + installShellCompletion --bash completions/bash/aws-gate + installShellCompletion --zsh completions/zsh/_aws-gate + ''; + + checkPhase = '' + $out/bin/${pname} --version + ''; + + meta = with lib; { + description = "Better AWS SSM Session manager CLI client"; + homepage = "https://github.com/xen0l/aws-gate"; + license = licenses.bsd3; + maintainers = with maintainers; [ tirimia ]; + platforms = with platforms; linux ++ darwin; + mainProgram = "aws-gate"; + }; +} diff --git a/pkgs/by-name/bc/bc-ur/package.nix b/pkgs/by-name/bc/bc-ur/package.nix new file mode 100644 index 0000000000000..2e7cda7764b58 --- /dev/null +++ b/pkgs/by-name/bc/bc-ur/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fetchpatch +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bc-ur"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "BlockchainCommons"; + repo = "bc-ur"; + rev = finalAttrs.version; + hash = "sha256-j7nmAZH1OL7R5H3jqQomg7kwPOvIHMqrfSk7mq/f7Cg="; + }; + + patches = [ + # Fix missing includes, building on gcc13, add CMakeList.txt + (fetchpatch { + url = "https://raw.githubusercontent.com/feather-wallet/feather/632963a9e22bf4c8bbe6b5b4d895e31bda17bafd/contrib/depends/patches/bc-ur/build-fix.patch"; + hash = "sha256-F53/z0maUGfdzJ7qjcLjTzn6+80oxu4sqfQPsDo4HZ0="; + }) + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + homepage = "https://github.com/BlockchainCommons/bc-ur"; + description = "UR reference library in C++"; + license = licenses.bsd2Patent; + maintainers = with maintainers; [ surfaceflinger ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/bi/bitmagnet/package.nix b/pkgs/by-name/bi/bitmagnet/package.nix index a34802c5de1ef..e5af5e0bd43be 100644 --- a/pkgs/by-name/bi/bitmagnet/package.nix +++ b/pkgs/by-name/bi/bitmagnet/package.nix @@ -1,23 +1,28 @@ { lib , buildGoModule , fetchFromGitHub +, nix-update-script }: buildGoModule rec { pname = "bitmagnet"; - version = "0.0.6"; + version = "0.4.1"; src = fetchFromGitHub { owner = "bitmagnet-io"; repo = "bitmagnet"; rev = "v${version}"; - hash = "sha256-+KAIHg8M2CM+GRRv+htmev8MFe/Y1sJ8p+um/c7kI7c="; + hash = "sha256-Geukd4JYwmdG7M+HDCCqpiUjor1TWsqBY42ACd+LasU="; }; - vendorHash = "sha256-ydiZ3KMEiVkmdzhHjYYLJ7wuiKmwlMEn4OWrKSOnaSo="; + vendorHash = "sha256-TbfbrvXbO+eOb1Ot/gWRBjggTj9jkSGulHIJdziqsVc="; ldflags = [ "-s" "-w" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "A self-hosted BitTorrent indexer, DHT crawler, and torrent search engine"; longDescription = '' @@ -25,7 +30,7 @@ buildGoModule rec { ''; homepage = "https://bitmagnet.io/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ eclairevoyant viraptor ]; mainProgram = "bitmagnet"; }; } diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index 8355ef00b3e8c..0a8fed374b196 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.0.6"; + version = "3.0.9"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - sha256 = "sha256-A/nshihI1DxV0mvYYDLPWTNQkuduppxNC7OyWuGNCD8="; + sha256 = "sha256-8hujTiUO62yfv3T/Fu5unTuvJXLGgn9BXoCA2oag3jQ="; }; projectFile = [ "Source/Boogie.sln" ]; diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 9be7b663d4f30..1d8476c1142ca 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "bruno"; - version = "1.3.0"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb"; - hash = "sha256-E9aVyZWqY8XTwoUbHaj8VM32Eex7GNQcEpg8Hkk2O0U="; + hash = "sha256-ptrayWDnRXGUC/mgSnQ/8sIEdey+6uoa3LGBGPQYuY8="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index ae21cc0e50074..36cc9518514dc 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "c2FmZQ"; - version = "0.4.9"; + version = "0.4.16"; src = fetchFromGitHub { owner = "c2FmZQ"; repo = "c2FmZQ"; rev = "v${version}"; - hash = "sha256-xrQBL/Xjzsg0jZ7cFuDfjCQhmt/dTD8FoCSlw0sX5MQ="; + hash = "sha256-DJvcWUPIEu3zCVIVB/mUBqbOzHwUI+01gMQUdYk4qm4="; }; ldflags = [ "-s" "-w" ]; sourceRoot = "source/c2FmZQ"; - vendorHash = "sha256-Hz6P+ptn1i+8Ek3pp8j+iB8NN5Xks50jyZuT8Ullxbo="; + vendorHash = "sha256-lnoEh6etfVLx+GYWNCvra40qOYtzTIH3SC28T6mXC2U="; subPackages = [ "c2FmZQ-client" "c2FmZQ-server" ]; diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix new file mode 100644 index 0000000000000..f7da4eaef797b --- /dev/null +++ b/pkgs/by-name/ca/caido/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchurl +, appimageTools +, makeWrapper +}: + +let + pname = "caido"; + version = "0.29.2"; + src = fetchurl { + url = "https://storage.googleapis.com/caido-releases/v${version}/caido-desktop-linux-v${version}-e0f8102b.AppImage"; + hash = "sha256-4PgQK52LAX1zacmoUK0muIhrvFDF7anQ6sx35I+ErVs="; + }; + appimageContents = appimageTools.extractType2 { inherit pname src version; }; + +in appimageTools.wrapType2 { + inherit pname src version; + + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ]; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications + substituteInPlace $out/share/applications/caido.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + install -m 444 -D ${appimageContents}/caido.png \ + $out/share/icons/hicolor/512x512/apps/caido.png + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ''; + + meta = with lib; { + description = "A lightweight web security auditing toolkit"; + homepage = "https://caido.io/"; + changelog = "https://github.com/caido/caido/releases/tag/v${version}"; + license = licenses.unfree; + maintainers = with maintainers; [ octodi ]; + mainProgram = "caido"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix new file mode 100644 index 0000000000000..f9f1f6baa2f90 --- /dev/null +++ b/pkgs/by-name/ca/cargo-swift/package.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-swift"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "antoniusnaumann"; + repo = "cargo-swift"; + rev = "v${version}"; + hash = "sha256-v7ZZ3tMM8KmRk6y3uSw8ZBEcByQ95XQv3XPTUtDGUQ0="; + }; + + cargoHash = "sha256-K3xZytJJ9/CaHWHL1fX0vKYpzH9yz3xOs2J5PoZWWv0="; + + meta = with lib; { + description = "A cargo plugin to easily build Swift packages from Rust code"; + homepage = "https://github.com/antoniusnaumann/cargo-swift"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ elliot ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix new file mode 100644 index 0000000000000..6d62df94c517d --- /dev/null +++ b/pkgs/by-name/ca/cargo-typify/package.nix @@ -0,0 +1,31 @@ +{ lib, rustfmt, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-typify"; + version = "0.0.14"; + + src = fetchFromGitHub { + owner = "oxidecomputer"; + repo = "typify"; + rev = "v${version}"; + hash = "sha256-Clwm5hRjPPPRB6xpO8YOGpqnyNFtsSMkPbWBY3etPCI="; + }; + + cargoHash = "sha256-balx5xOtrWwMOFeGQkYQ2f+lcGMCJvdPqE8rH9adkfU="; + + cargoBuildFlags = [ "-p" "cargo-typify" ]; + + nativeCheckInputs = [ rustfmt ]; + + preCheck = '' + # cargo-typify depends on rustfmt-wrapper, which requires RUSTFMT: + export RUSTFMT="${lib.getExe rustfmt}" + ''; + + meta = with lib; { + description = "JSON Schema to Rust type converter"; + homepage = "https://github.com/oxidecomputer/typify"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ david-r-cox ]; + }; +} diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 0b759f520975c..274ab5ef77ecd 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xwin"; - version = "0.14.9"; + version = "0.16.3"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${version}"; - hash = "sha256-y2hlzewDWYxkKhr77JB3lkYo5hexcdmPiCRbXLtnolM="; + hash = "sha256-3i/XlCuHjVBSH4XZR5M457H+kheKZoJXlwqRwPhSnCM="; }; - cargoHash = "sha256-uIFjWgoNCU5kUX4i1Law/YE0TmFLOi6V3Y4b9BpQlI4="; + cargoHash = "sha256-yKoUcrAZy66qahDvRgOnbJmXuUXDjDBTGt2p5gXjVyI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/desktops/arcan/cat9/default.nix b/pkgs/by-name/ca/cat9/package.nix index 7bc6005b0c650..dac6f85656dcd 100644 --- a/pkgs/desktops/arcan/cat9/default.nix +++ b/pkgs/by-name/ca/cat9/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cat9"; - version = "unstable-2023-06-25"; + version = "unstable-2023-11-06"; src = fetchFromGitHub { owner = "letoram"; repo = "cat9"; - rev = "4d8a0c539a5c756acada96fd80e7eb3b9554ac05"; - hash = "sha256-T3RPuldKTzHm0EdfdMOtHv9kcr9oE9YQgdzv/jjPPnc="; + rev = "a807776a85237ab0bdd0a712fb33c176fc295e30"; + hash = "sha256-OlH8FgVBk76Qw+5mnsrryXOL9GbPJWlwUGtYlLuAPxQ="; }; dontConfigure = true; @@ -27,11 +27,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/letoram/cat9"; description = "A User shell for LASH"; - license = licenses.unlicense; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ unlicense ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/cg/cgl/package.nix b/pkgs/by-name/cg/cgl/package.nix new file mode 100644 index 0000000000000..e21029637181d --- /dev/null +++ b/pkgs/by-name/cg/cgl/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, clp +, coin-utils +, osi +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cgl"; + version = "0.60.8"; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Cgl"; + rev = "releases/${finalAttrs.version}"; + hash = "sha256-nyqrHC6UOKp1wn6Yvk+53oBn60wUqSWEPUrcNTuPN04="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + clp + coin-utils + osi + ]; + + meta = with lib; { + description = "Cut Generator Library"; + homepage = "https://github.com/coin-or/Cgl"; + license = licenses.epl20; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/cl/clamtk/package.nix b/pkgs/by-name/cl/clamtk/package.nix index a3304ffcd0b0e..de00d3ad9c026 100644 --- a/pkgs/by-name/cl/clamtk/package.nix +++ b/pkgs/by-name/cl/clamtk/package.nix @@ -9,13 +9,13 @@ perlPackages.buildPerlPackage rec { pname = "clamtk"; - version = "6.16"; + version = "6.17"; src = fetchFromGitHub { owner = "dave-theunsub"; repo = "clamtk"; rev = "v${version}"; - hash = "sha256-o6OaXOXLykTUuF/taKnEhZRV04/3nlU5aNY05ANr1Ko="; + hash = "sha256-2tWVfRijf78OiKBpLUrZWFberIL8mjqtxvW/IjPn1IE="; }; nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/by-name/cl/cloudlogoffline/package.nix b/pkgs/by-name/cl/cloudlogoffline/package.nix new file mode 100644 index 0000000000000..cc945302bf06d --- /dev/null +++ b/pkgs/by-name/cl/cloudlogoffline/package.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub +, qt5 +, makeDesktopItem +, copyDesktopItems +}: +stdenv.mkDerivation (self: { + pname = "cloudlogoffline"; + version = "1.1.4"; + rev = "185f294ec36d7ebe40e37d70148b15f58d60bf0d"; + hash = "sha256-UEi7q3NbTgkg4tSjiksEO05YE4yjRul4qB9hFPswnK0="; + + src = fetchFromGitHub { + inherit (self) rev hash; + owner = "myzinsky"; + repo = "cloudLogOffline"; + }; + + nativeBuildInputs = [ + qt5.qmake + qt5.wrapQtAppsHook + ] + ++ lib.optionals (!stdenv.isDarwin) [ + copyDesktopItems + ]; + + buildInputs = [ + qt5.qtbase + qt5.qtgraphicaleffects + qt5.qtlocation + qt5.qtpositioning + qt5.qtquickcontrols2 + qt5.qtsvg + ]; + + postPatch = let + targetDir = if stdenv.isDarwin then "Applications" else "bin"; + in '' + substituteInPlace CloudLogOffline.pro \ + --replace 'target.path = /opt/$''${TARGET}/bin' "target.path = $out/${targetDir}" + ''; + + postInstall = lib.optionalString (!stdenv.isDarwin) '' + install -d $out/share/pixmaps + install -m644 images/logo_circle.svg $out/share/pixmaps/cloudlogoffline.svg + ''; + + desktopItems = lib.optionals (!stdenv.isDarwin) [ + (makeDesktopItem { + name = "cloudlogoffline"; + desktopName = "CloudLogOffline"; + exec = "CloudLogOffline"; + icon = "cloudlogoffline"; + comment = self.meta.description; + genericName = "Ham radio contact logbook"; + categories = [ "Network" "Utility" "HamRadio" ]; + }) + ]; + + meta = { + description = "Offline frontend for Cloudlog"; + homepage = "https://github.com/myzinsky/cloudLogOffline"; + license = [ lib.licenses.lgpl3 ]; + mainProgram = "CloudLogOffline"; + maintainers = [ lib.maintainers.dblsaiko ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 1b8aefd1b9111..cc69b4de4ad27 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.27.7"; + version = "3.27.8"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-CPcaEGA2vwUfaSdg75VYwFd8Qqw56Wugl+dmK9QVjY4="; + hash = "sha256-/s4kVj9peHD7uYLqi/F0gsnV+FXYyb8LgkY9dsno0Mw="; }; patches = [ @@ -161,6 +161,12 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_CursesDialog" cursesUI) ]; + # `pkgsCross.musl64.cmake.override { stdenv = pkgsCross.musl64.llvmPackages_16.libcxxStdenv; }` + # fails with `The C++ compiler does not support C++11 (e.g. std::unique_ptr).` + # The cause is a compiler warning `warning: argument unused during compilation: '-pie' [-Wunused-command-line-argument]` + # interfering with the feature check. + env.NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument"; + # make install attempts to use the just-built cmake preInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile diff --git a/pkgs/by-name/cm/cmakerc/package.nix b/pkgs/by-name/cm/cmakerc/package.nix new file mode 100644 index 0000000000000..cf96ae46db5e1 --- /dev/null +++ b/pkgs/by-name/cm/cmakerc/package.nix @@ -0,0 +1,32 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "cmrc"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "vector-of-bool"; + repo = "cmrc"; + rev = finalAttrs.version; + hash = "sha256-++16WAs2K9BKk8384yaSI/YD1CdtdyXVBIjGhqi4JIk="; + }; + + installPhase = '' + runHook preInstall + + install CMakeRC.cmake -DT $out/share/cmakerc/cmakerc-config.cmake + + runHook postInstall + ''; + + meta = { + description = "A Resource Compiler in a Single CMake Script"; + homepage = "https://github.com/vector-of-bool/cmrc"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ guekka ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 87858931d8064..94ecb85b33570 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "305"; + version = "306"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-fCVnggso/wAvci9sLRVvwEsvZ+CeEfLBDnPPcAy/wGo="; + hash = "sha256-RB5RpwFTi//XNIIm/86JR4Jo3q5nuoW6ruH05JSfMSk="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index d84cb848cc7c2..866e32cd0311c 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-6dbgmYyXOUuWGOFXcO9eEZVoRjRLWK906SJh27wZ+PY="; - aarch64-linux = "sha256-cO1+ZVXC25zO5msU6Nbp29vkkNFRQ2jKSxtCZw1H104="; - x86_64-darwin = "sha256-3KMSoFQz7kYinD4QbS82dIq6UDetfdky6ClIfP83ISg="; - aarch64-darwin = "sha256-bj8PVJ4pfrNXo1yn5UbkHflskZMS61+LM9hi9mtdXtk="; + x86_64-linux = "sha256-rgA0n0XxYmP9mjjz8lQGL4dbqpXj9CNx3d8qT7e9Ye4="; + aarch64-linux = "sha256-pX+CPvJbhrrAxmZhy/aBeNFq9ShgYDQXbBNa6lbPnSo="; + x86_64-darwin = "sha256-vQj7tZghYZOcDpGT4DmFIrwiY8hguTtyo83M2BaUOkw="; + aarch64-darwin = "sha256-qd6newnk/9nRMM/7aaVO+CkTP74mMwAPKu658c6KZyY="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.4.16"; + version = "1.6.10"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix index 9b5d37dc16458..eec9ef0de8536 100644 --- a/pkgs/by-name/co/composefs/package.nix +++ b/pkgs/by-name/co/composefs/package.nix @@ -3,11 +3,10 @@ , fetchFromGitHub , autoreconfHook -, pandoc +, go-md2man , pkg-config , openssl , fuse3 -, yajl , libcap , libseccomp , python3 @@ -19,21 +18,18 @@ , 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.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "containers"; repo = "composefs"; rev = "v${finalAttrs.version}"; - hash = "sha256-8YbDKw4jYEU6l3Nmqu3gsT9VX0lwYF/39hhcwzgTynY="; + hash = "sha256-ViZkmuLFV5DN1nqWKGl+yaqhYUEOztZ1zGpxjr1U/dw="; }; strictDeps = true; @@ -43,14 +39,14 @@ stdenv.mkDerivation (finalAttrs: { sed -i "s/noinst_PROGRAMS +\?=/bin_PROGRAMS +=/g" tools/Makefile.am ''; - configureFlags = lib.optionals enableValgrindCheck [ - (lib.enableFeature true "valgrind-test") + configureFlags = [ + (lib.enableFeature true "man") + (lib.enableFeature enableValgrindCheck "valgrind-test") ]; - nativeBuildInputs = [ autoreconfHook pandoc pkg-config ]; + nativeBuildInputs = [ autoreconfHook go-md2man pkg-config ]; buildInputs = [ openssl ] ++ lib.optional fuseSupport fuse3 - ++ lib.optional yajlSupport yajl ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) ( [ libcap @@ -58,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: { ] ); - # yajl is required to read the test json files doCheck = true; nativeCheckInputs = [ python3 which ] ++ lib.optional enableValgrindCheck valgrind @@ -70,15 +65,6 @@ stdenv.mkDerivation (finalAttrs: { 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 enableValgrindCheck '' - # valgrind is incompatible with seccomp - substituteInPlace tests/test-checksums.sh \ - --replace "composefs-from-json" "composefs-from-json --no-sandbox" ''; passthru = { diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix new file mode 100644 index 0000000000000..f32529607c19e --- /dev/null +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, php +}: + +php.buildComposerProject (finalAttrs: { + pname = "composer-require-checker"; + version = "4.8.0"; + + src = fetchFromGitHub { + owner = "maglnet"; + repo = "ComposerRequireChecker"; + rev = finalAttrs.version; + hash = "sha256-qCHUNaPunCPuWax/YUbYXaVh1JlJEwYvG/NmaSc1VpA="; + }; + + vendorHash = "sha256-B5w5n2S/mTF7vpsLuHtf2DGR5aPBfO9QGmodYGXE+Cg="; + + meta = { + description = "A CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies"; + homepage = "https://github.com/maglnet/ComposerRequireChecker/"; + changelog = "https://github.com/maglnet/ComposerRequireChecker/releases/tag/${finalAttrs.version}"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "composer-require-checker"; + }; +}) diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index 4112246c743cb..5a2319139e69d 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - hash = "sha256-qf04mtxBqZy9kpFsqz8lVtyUzNtCYE8cNiVJVQ+sCn0="; + hash = "sha256-x01fkicoAH8NaJJqIF5jjbZ53TitnXBCdKEbr8xVCyE="; }; - cargoHash = "sha256-A1z8ccdsaBC9gY4rD/0NnuQHm7x4eVlMPBvkMKGHK54="; + cargoHash = "sha256-j2xuaAkycWp5sCAmVJLYfqH1ZGxIGU/a/97WpGyQcvU="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/by-name/co/corrupter/package.nix b/pkgs/by-name/co/corrupter/package.nix new file mode 100644 index 0000000000000..9e6f339023564 --- /dev/null +++ b/pkgs/by-name/co/corrupter/package.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule { + pname = "corrupter"; + version = "1.0-unstable-2023-01-11"; + + src = fetchFromGitHub { + owner = "r00tman"; + repo = "corrupter"; + # https://github.com/r00tman/corrupter/issues/15 + rev = "d7aecbb8b622a2c6fafe7baea5f718b46155be15"; + hash = "sha256-GEia3wZqI/j7/dpBbL1SQLkOXZqEwanKGM4wY9nLIqE="; + }; + + vendorHash = null; + + # There are no tests available for this package. + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Simple image glitcher suitable for producing lockscreens"; + homepage = "https://github.com/r00tman/corrupter"; + license = licenses.bsd2; + maintainers = [ maintainers.ivan770 ]; + mainProgram = "corrupter"; + }; +} diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix index e4e346f8c39f5..c14846d67ca06 100644 --- a/pkgs/by-name/co/cowsql/package.nix +++ b/pkgs/by-name/co/cowsql/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Embeddable, replicated and fault tolerant SQL engine"; homepage = "https://github.com/cowsql/cowsql"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ adamcstephens ]; + maintainers = teams.lxc.members; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index e287d379fe726..aacb3ea752258 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "cpu-x"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-g3k9P7EevVeDHvnc1dG8cI4C7xhjrDy7gwdoWj6G6zA="; + sha256 = "sha256-tdxIbs5jR4sQHt1ZLUmiAYszP2e5SCMqEFq+eW1k7+s="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; diff --git a/pkgs/by-name/cr/crawley/package.nix b/pkgs/by-name/cr/crawley/package.nix new file mode 100644 index 0000000000000..3e0f4bc205f01 --- /dev/null +++ b/pkgs/by-name/cr/crawley/package.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "crawley"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "s0rg"; + repo = "crawley"; + rev = "v${version}"; + hash = "sha256-IRhi6z2TQZOOw8EZkJ3/VEOBzAlg0DQjq9wSt+/c3ck="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + vendorHash = "sha256-0BUbALCBR9CGwkqz1cUnzF3xjQkkzfdS7JDDTXkGmN4="; + + ldflags = [ "-w" "-s" ]; + + postInstall = '' + installShellCompletion --cmd crawley \ + --bash <(echo "complete -C $out/bin/crawley crawley") \ + --zsh <(echo "complete -o nospace -C $out/bin/crawley crawley") + ''; + + meta = with lib; { + description = "The unix-way web crawler"; + homepage = "https://github.com/s0rg/crawley"; + license = licenses.mit; + maintainers = with maintainers; [ ltstf1re ]; + mainProgram = "crawley"; + }; +} diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix index 252b8ed84b2fe..ef1d14299b5ba 100644 --- a/pkgs/by-name/cr/crossplane-cli/package.nix +++ b/pkgs/by-name/cr/crossplane-cli/package.nix @@ -2,17 +2,19 @@ , buildGoModule , fetchFromGitHub , nix-update-script +, testers +, crossplane-cli }: buildGoModule rec { pname = "crossplane-cli"; - version = "1.14.3"; + version = "1.14.5"; src = fetchFromGitHub { owner = "crossplane"; repo = "crossplane"; rev = "v${version}"; - hash = "sha256-rxN0Zi1UgQjDOkY2OJlG6826ARBzlEObJk4nDEc9784="; + hash = "sha256-P7zfkrE+r/pQEEu0GK7v+bJ4ONeejZLXq2sYmU/V110="; }; vendorHash = "sha256-vkXvnEstD/czBDxmI96TIQB/L4jxhMwIS1XpHqVtxqY="; @@ -29,6 +31,12 @@ buildGoModule rec { mv $out/bin/crank $out/bin/crossplane ''; + passthru.tests.version = testers.testVersion { + package = crossplane-cli; + command = "crossplane --version"; + version = "v${version}"; + }; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix index 2e834111c9d9e..542601e7fb659 100644 --- a/pkgs/by-name/db/dbus-cpp/package.nix +++ b/pkgs/by-name/db/dbus-cpp/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { # pkg-config output patching hook expects prefix variable here substituteInPlace data/dbus-cpp.pc.in \ --replace 'includedir=''${exec_prefix}' 'includedir=''${prefix}' - '' + lib.optionalString (!finalAttrs.doCheck) '' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt ''; diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index 4d20c77dd5a39..8f27316e483b3 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.14"; + version = "5.15"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-gbqtBFWq6KtmGLvGkmhpSHkpoDglfAT1KjDoZ4Y0SbI="; + hash = "sha256-o9HPiJCKcTJSoVDCjUcYPkqa6wnAuvCFOFhPdPSKS3A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/decent-sampler/package.nix b/pkgs/by-name/de/decent-sampler/package.nix new file mode 100644 index 0000000000000..449a589c90868 --- /dev/null +++ b/pkgs/by-name/de/decent-sampler/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchzip +, buildFHSEnv +, alsa-lib +, freetype +, nghttp2 +, libX11 +, }: + +let + pname = "decent-sampler"; + version = "1.9.4"; + + decent-sampler = stdenv.mkDerivation { + inherit pname version; + + src = fetchzip { + # dropbox link: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\ + + url = "https://archive.org/download/decent-sampler-linux-static-download-mirror/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz"; + hash = "sha256-lTp/mukCwLNyeTcBT68eqa7aD0o11Bylbd93A5VCILU="; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 DecentSampler $out/bin/decent-sampler + + runHook postInstall + ''; + }; + +in + +buildFHSEnv { + inherit pname version; + + targetPkgs = pkgs: [ + alsa-lib + decent-sampler + freetype + nghttp2 + libX11 + ]; + + runScript = "decent-sampler"; + + meta = with lib; { + description = "An audio sample player"; + longDescription = '' + Decent Sampler is an audio sample player. + Allowing you to play sample libraries in the DecentSampler format + (files with extensions: dspreset and dslibrary). + ''; + mainProgram = "decent-sampler"; + homepage = "https://www.decentsamples.com/product/decent-sampler-plugin/"; + # It claims to be free but we currently cannot find any license + # that it is released under. + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ adam248 ]; + }; +} diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix new file mode 100644 index 0000000000000..48ba5c4c51ae6 --- /dev/null +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -0,0 +1,66 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "dep-scan"; + version = "5.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "owasp-dep-scan"; + repo = "dep-scan"; + rev = "refs/tags/v${version}"; + hash = "sha256-qiJyGBGxznNF4LNG9fbmjG7wX0odhrUO2LxOWABtLQA="; + }; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov-append --cov-report term --cov depscan" "" + ''; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + appthreat-vulnerability-db + defusedxml + jinja2 + oras + pdfkit + pygithub + pyyaml + quart + rich + toml + ]; + + nativeCheckInputs = with python3.pkgs; [ + httpretty + pytestCheckHook + ]; + + pythonImportsCheck = [ + "depscan" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = [ + # Test is not present + "test_query_metadata2" + ]; + + meta = with lib; { + description = "Security and risk audit tool based on known vulnerabilities, advisories, and license limitations for project dependencies"; + homepage = "https://github.com/owasp-dep-scan/dep-scan"; + changelog = "https://github.com/owasp-dep-scan/dep-scan/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "dep-scan"; + }; +} diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix new file mode 100644 index 0000000000000..3cd9b537d515d --- /dev/null +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -0,0 +1,62 @@ +{ buildGoModule +, dependabot-cli +, fetchFromGitHub +, fetchpatch +, installShellFiles +, lib +, testers +}: +let + pname = "dependabot-cli"; + version = "1.41.0"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "dependabot"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-CnSDvLcLupWKBp1Wr6E9BScA8VsBlfmmfPwh8cyERZg="; + }; + + vendorHash = "sha256-vN5r1OtHT16LeJ6iPmHmXTx9Oo+WALhV4PWqzMiUwSA="; + + ldflags = [ + "-s" + "-w" + "-X github.com/dependabot/cli/cmd/dependabot/internal/cmd.version=v${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd dependabot \ + --bash <($out/bin/dependabot completion bash) \ + --fish <($out/bin/dependabot completion fish) \ + --zsh <($out/bin/dependabot completion zsh) + ''; + + checkFlags = [ + "-skip=TestIntegration|TestNewProxy_customCert|TestRun" + ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/dependabot --help + ''; + + passthru.tests.version = testers.testVersion { + package = dependabot-cli; + command = "dependabot --version"; + version = "v${version}"; + }; + + meta = with lib; { + changelog = "https://github.com/dependabot/cli/releases/tag/v${version}"; + description = "A tool for testing and debugging Dependabot update jobs"; + homepage = "https://github.com/dependabot/cli"; + license = licenses.mit; + maintainers = with maintainers; [ l0b0 ]; + }; +} diff --git a/pkgs/by-name/de/dependency-track-exporter/package.nix b/pkgs/by-name/de/dependency-track-exporter/package.nix new file mode 100644 index 0000000000000..8a66db363c2c6 --- /dev/null +++ b/pkgs/by-name/de/dependency-track-exporter/package.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dependency-track-exporter"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "jetstack"; + repo = "dependency-track-exporter"; + rev = "refs/tags/v${version}"; + hash = "sha256-yvScGxgkyZzEdfeJCXk/tSk3cLW+jyw00XbJVrpU6MY="; + }; + + vendorHash = "sha256-bEJFTsGQMDfZOt67ouv3PkKy+De4mL9Yk7iuslo1qYU="; + + ldflags = [ + "-X=github.com/prometheus/common/version.Version=${version}" + "-X=github.com/prometheus/common/version.Revision=${src.rev}" + "-X=github.com/prometheus/common/version.Branch=${src.rev}" + "-X=github.com/prometheus/common/version.BuildDate=1970-01-01T00:00:00Z" + ]; + + meta = with lib; { + description = "Helper to export Prometheus metrics for Dependency-Track"; + homepage = "https://github.com/jetstack/dependency-track-exporter"; + changelog = "https://github.com/jetstack/dependency-track-exporter/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "dependency-track-exporter"; + }; +} diff --git a/pkgs/tools/graphics/didder/default.nix b/pkgs/by-name/di/didder/package.nix index 10e97e356daf4..3862c15996867 100644 --- a/pkgs/tools/graphics/didder/default.nix +++ b/pkgs/by-name/di/didder/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "didder"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "makew0rld"; repo = pname; rev = "v${version}"; - hash = "sha256-S1j2TdV0XCrSc7Ua+SdY3JJoWgnFuAMGhUinTKO2Xh4="; + hash = "sha256-wYAudEyOLxbNfk4M720absGkuWXcaBPyBAcmBNBaaWU="; }; - vendorHash = "sha256-TEp1YrQquqdEMVvZaNsEB1H/DZsTYmRL257RjQF2JqM="; + vendorHash = "sha256-UD90N3nE3H9GSdVhGt1zfCk8BhPaToKGu4i0zP0Lb3Q="; nativeBuildInputs = [ pandoc ]; diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 048b29d3e0bb3..4a7077d1a80c1 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.5"; + version = "1.1.8"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-W0WrI58RgAzxV9WiDAqmz800lcU67uk4IFetUR4Embg="; + hash = "sha256-gUYn1b5X1uP1Ig2u/XiEP6MRhWs2ID64GSdBUSP5YEQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dr/drone-scp/package.nix b/pkgs/by-name/dr/drone-scp/package.nix new file mode 100644 index 0000000000000..137c0c6578845 --- /dev/null +++ b/pkgs/by-name/dr/drone-scp/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule rec { + pname = "drone-scp"; + version = "1.6.12"; + + src = fetchFromGitHub { + owner = "appleboy"; + repo = "drone-scp"; + rev = "v${version}"; + hash = "sha256-pdVSb+hOW38LMP6fwAxVy/8SyfwKcMe4SgemPZ1PlSg="; + }; + + vendorHash = "sha256-HQeWj5MmVfR6PkL2FEnaptMH+4nSh7T2wfOaZyUZvbM="; + + # Needs a specific user... + doCheck = false; + + meta = with lib; { + description = "Copy files and artifacts via SSH using a binary, docker or Drone CI"; + homepage = "https://github.com/appleboy/drone-scp"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + mainProgram = "drone-scp"; + }; +} diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/by-name/du/durden/package.nix index f6677b9823ffb..3d72e132964ae 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/by-name/du/durden/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "durden"; - version = "unstable-2023-08-11"; + version = "unstable-2023-10-23"; src = fetchFromGitHub { owner = "letoram"; repo = "durden"; - rev = "728d7fc3292cc162b1cea505c8a71512b2e84925"; - hash = "sha256-UL36JeppnoFDdzdsJMsWKJL58ioz9eOaNEZp/7DGV9w="; + rev = "347dba6da011bbaa70c6edaf82a2d915f4057db3"; + hash = "sha256-iNf7fOzz7mf1CXG5leCenkSTrdCc9/KL8VLw8gUIyKE="; }; dontConfigure = true; @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://durden.arcan-fe.com/"; description = "Reference Desktop Environment for Arcan"; longDescription = '' @@ -36,8 +36,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { features in Arcan, and as a very competent entry to the advanced-user side of the desktop environment spectrum. ''; - license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix new file mode 100644 index 0000000000000..9b125a91d154b --- /dev/null +++ b/pkgs/by-name/ei/eigenlayer/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule rec { + pname = "eigenlayer"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "Layr-Labs"; + repo = "eigenlayer-cli"; + rev = "v${version}"; + hash = "sha256-zLTzDVXj2XTjgMuTLXVQStzDkkOGU2kCgIvBmJKohY4"; + }; + + vendorHash = "sha256-gAW+yEj4aRHTuuZLrqQs8lebs9/O0uGxkHRK3B1TG+Q="; + + ldflags = ["-s" "-w"]; + subPackages = ["cmd/eigenlayer"]; + + passthru.updateScript = nix-update-script {}; + + meta = with lib; { + homepage = "https://www.eigenlayer.xyz/"; + changelog = "https://github.com/Layr-Labs/eigenlayer-cli/releases/tag/${src.rev}"; + description = "Utility that manages core operator functionalities like local keys, operator registration and updates"; + mainProgram = "eigenlayer"; + license = licenses.bsl11; + maintainers = with maintainers; [selfuryon]; + }; +} diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 28ebab5239a64..98b53645a6222 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.164.0"; + version = "0.167.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-ENlMcwk4bMbIzV353vt+EG776+/ajrg5la3JeA81QS4="; + hash = "sha256-8CxXfjYN9i2AxuKeYmmYN0TQROGkurfmzbqU+aOMbTY="; }; - vendorHash = "sha256-NOhssVWEkvoXpmnsCVVT7Li0ePGWDSGIlB2MyFtMnpI="; + vendorHash = "sha256-cuLzn0OZ5VC+RWGsJ8DCdJN8wm0DrsjH55K/cnyuqB8="; doCheck = false; diff --git a/pkgs/by-name/en/endlines/package.nix b/pkgs/by-name/en/endlines/package.nix new file mode 100644 index 0000000000000..b03a0d733535a --- /dev/null +++ b/pkgs/by-name/en/endlines/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "endlines"; + version = "1.9.2"; + + src = fetchFromGitHub { + owner = "mdolidon"; + repo = "endlines"; + rev = finalAttrs.version; + hash = "sha256-M0IyY/WXR8qv9/qx5G0pG3EKqMoZAP3fJTZ6sSSMMyQ="; + }; + + postPatch = '' + substituteInPlace Makefile --replace "/usr/local" "$out" + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = { + homepage = "https://github.com/mdolidon/endlines"; + description = "Easy conversion between new-line conventions"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ zedseven ]; + mainProgram = "endlines"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 0e4a312bdea7d..192176d198273 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.16.2"; + version = "0.17.0"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-AqOvhi/26Nl3ex6iJ9DxC/jMdgZ331VdrJTsjBrc490="; + hash = "sha256-BYzt8PLqMbxlp8CdBJuBXGbTsC9e/dWhB4j1Ak2Fjbo="; }; - cargoHash = "sha256-1hZZvXOV6towMVpnlf4P8jZei2pAZTKAfi362RKL+Jo="; + cargoHash = "sha256-xyIFGPQkXZZLLXY5qwiRvFPvjhAIRc90RD2NpsuwrB4="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix index 5224d5157a969..f2ebe7582ddb7 100644 --- a/pkgs/by-name/fe/feather/package.nix +++ b/pkgs/by-name/fe/feather/package.nix @@ -1,4 +1,5 @@ -{ boost +{ bc-ur +, boost , cmake , fetchFromGitHub , hidapi @@ -20,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feather"; - version = "2.5.2"; + version = "2.6.1"; src = fetchFromGitHub { owner = "feather-wallet"; repo = "feather"; rev = finalAttrs.version; - hash = "sha256-OSBG2W35GYlViwz5eXokpScrMTtPSaWAgEUNw2urm6w="; + hash = "sha256-szMNSqkocf/aVs1aF+TLV1qu0MDHTNDiO4V1j4ySBvQ="; fetchSubmodules = true; }; @@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + bc-ur boost hidapi libsodium diff --git a/pkgs/by-name/ff/ff2mpv-go/package.nix b/pkgs/by-name/ff/ff2mpv-go/package.nix new file mode 100644 index 0000000000000..71e0f98a478dc --- /dev/null +++ b/pkgs/by-name/ff/ff2mpv-go/package.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchgit +, mpv +}: +buildGoModule rec { + pname = "ff2mpv-go"; + version = "1.0.1"; + + src = fetchgit { + url = "https://git.clsr.net/util/ff2mpv-go/"; + rev = "v${version}"; + hash = "sha256-e/AuOA3isFTyBf97Zwtr16yo49UdYzvktV5PKB/eH/s="; + }; + + vendorHash = null; + + postPatch = '' + substituteInPlace ff2mpv.go --replace '"mpv"' '"${lib.getExe mpv}"' + ''; + + postInstall = '' + mkdir -p "$out/lib/mozilla/native-messaging-hosts" + $out/bin/ff2mpv-go --manifest > "$out/lib/mozilla/native-messaging-hosts/ff2mpv.json" + ''; + + meta = with lib; { + description = "Native messaging host for ff2mpv written in Go"; + homepage = "https://git.clsr.net/util/ff2mpv-go/"; + license = licenses.publicDomain; + maintainers = with maintainers; [ ambroisie ]; + mainProgram = "ff2mpv-go"; + }; +} diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix new file mode 100644 index 0000000000000..8165e30c504d1 --- /dev/null +++ b/pkgs/by-name/ff/ffsubsync/package.nix @@ -0,0 +1,46 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "ffsubsync"; + version = "0.4.25"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "smacke"; + repo = "ffsubsync"; + rev = version; + hash = "sha256-ZdKZeKfAUe/FXLOur9Btb5RgXewmy3EHunQphqlxpIc="; + }; + + propagatedBuildInputs = with python3Packages; [ + auditok + charset-normalizer + faust-cchardet + ffmpeg-python + future + numpy + pysubs2 + chardet + rich + six + srt + tqdm + typing-extensions + webrtcvad + ]; + + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + + pythonImportsCheck = [ "ffsubsync" ]; + + meta = with lib; { + homepage = "https://github.com/smacke/ffsubsync"; + description = "Automagically synchronize subtitles with video"; + license = licenses.mit; + maintainers = with maintainers; [ Benjamin-L ]; + mainProgram = "ffsubsync"; + }; +} diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix index c59976c694c37..eaf6e0b6d78b8 100644 --- a/pkgs/by-name/fl/flarectl/package.nix +++ b/pkgs/by-name/fl/flarectl/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "flarectl"; - version = "0.82.0"; + version = "0.84.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-GWxtbPCo0t0HXCiLJEVtuJPiY8Ahlij8zaMwe67zjqU="; + hash = "sha256-RHt5Hu3N7gJIg7daylBSr9p7Hb9eQQUK2CfC6q/pblM="; }; - vendorHash = "sha256-VGePv/RzX1t5+Ftp3iTKYxm3mN6rr+Kdav4jRIKim9E="; + vendorHash = "sha256-XziR/ZB0kva/sl2Tj+m0pdK5HxLW6osBXD00+m/y0cQ="; subPackages = [ "cmd/flarectl" ]; diff --git a/pkgs/by-name/fm/fmtoy/package.nix b/pkgs/by-name/fm/fmtoy/package.nix new file mode 100644 index 0000000000000..a3fe819ae759e --- /dev/null +++ b/pkgs/by-name/fm/fmtoy/package.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, alsa-lib +, libfmvoice +, libjack2 +, pkg-config +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fmtoy"; + version = "0.0.0-unstable-2023-05-21"; + + src = fetchFromGitHub { + owner = "vampirefrog"; + repo = "fmtoy"; + rev = "2b54180d8edd0de90e2af01bf9ff303bc916e893"; + hash = "sha256-qoMw4P+QEw4Q/wKBvFPh+WxkmOW6qH9FuFFkO2ZRrMc="; + }; + + postPatch = '' + rmdir libfmvoice + cp --no-preserve=all -r ${libfmvoice.src} libfmvoice + + substituteInPlace Makefile \ + --replace 'pkg-config' "$PKG_CONFIG" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + libjack2 + zlib + ]; + + enableParallelBuilding = true; + + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 fmtoy_jack $out/bin/fmtoy_jack + + runHook postInstall + ''; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + description = "FM synthesiser based on emulated Yamaha YM chips (OPL, OPM and OPN series)"; + homepage = "https://github.com/vampirefrog/fmtoy"; + license = licenses.gpl3Only; + mainProgram = "fmtoy_jack"; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/tools/inputmethods/footswitch/default.nix b/pkgs/by-name/fo/footswitch/package.nix index a01069c9284fa..0856f758c8b8a 100644 --- a/pkgs/tools/inputmethods/footswitch/default.nix +++ b/pkgs/by-name/fo/footswitch/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "footswitch"; - version = "unstable-2022-04-12"; + version = "unstable-2023-10-10"; src = fetchFromGitHub { owner = "rgerganov"; repo = "footswitch"; - rev = "1cf63643e18e688e4ebe96451db24edf52338cc0"; - sha256 = "0gfvi2wgrljndyz889cjjh2q13994fnaf11n7hpdd82c4wgg06kj"; + rev = "b7493170ecc956ac87df2c36183253c945be2dcf"; + sha256 = "sha256-vwjeWjIXQiFJ0o/wgEBrKP3hQi8Xa/azVS1IE/Q/MyY="; }; nativeBuildInputs = [ pkg-config ]; @@ -27,9 +27,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Command line utlities for programming PCsensor and Scythe foot switches."; - homepage = "https://github.com/rgerganov/footswitch"; - license = licenses.mit; - platforms = platforms.linux; + homepage = "https://github.com/rgerganov/footswitch"; + license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ baloo ]; }; } diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index ca88e6f2197a5..80403d149f305 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fortune-kind"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "cafkafk"; repo = "fortune-kind"; rev = "v${version}"; - hash = "sha256-sk1Gj+QgU9eUjRySHsJTfM/tUcyLdqOxycAdrBPUSmg="; + hash = "sha256-1abke8wPvIFTmvEJ83TdfONFPBuJHbgmVHAoKddoTRw="; }; - cargoHash = "sha256-u2CwBV2sz2EIqwUR+sJ+xyvAIyoq3ujkx39e/Bq2V8s="; + cargoHash = "sha256-SRPhALRGkFZDl23Om/obg1Crd9yNXroN7F/7agobuqw="; nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/fr/framework-system-tools/Cargo.lock b/pkgs/by-name/fr/framework-system-tools/Cargo.lock deleted file mode 100644 index f887187a7c75c..0000000000000 --- a/pkgs/by-name/fr/framework-system-tools/Cargo.lock +++ /dev/null @@ -1,1312 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[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 = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bit_field" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "built" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9c056b9ed43aee5e064b683aa1ec783e19c6acec7559e3ae931b7490472fbe" -dependencies = [ - "cargo-lock", - "chrono", - "git2", -] - -[[package]] -name = "bumpalo" -version = "3.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" - -[[package]] -name = "cargo-lock" -version = "8.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" -dependencies = [ - "semver", - "serde", - "toml", - "url", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" -dependencies = [ - "iana-time-zone", - "num-integer", - "num-traits", - "winapi", -] - -[[package]] -name = "clap" -version = "4.0.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" -dependencies = [ - "bitflags", - "clap_derive", - "clap_lex", - "is-terminal", - "once_cell", - "strsim", - "termcolor", -] - -[[package]] -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_derive" -version = "4.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "clap_lex" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -dependencies = [ - "core-foundation-sys 0.6.2", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.13", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[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", - "quote", - "rustc_version", - "syn 1.0.107", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[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-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[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 = "framework_lib" -version = "0.1.0" -dependencies = [ - "built", - "clap", - "clap-verbosity-flag", - "env_logger", - "guid_macros", - "hidapi", - "lazy_static", - "libc", - "log", - "nix", - "no-std-compat", - "num", - "num-derive", - "num-traits", - "plain", - "redox_hwio", - "regex", - "rusb", - "smbios-lib", - "spin 0.9.4", - "uefi", - "uefi-services", - "windows 0.42.0", -] - -[[package]] -name = "framework_tool" -version = "0.1.0" -dependencies = [ - "framework_lib", -] - -[[package]] -name = "framework_uefi" -version = "0.1.0" -dependencies = [ - "framework_lib", - "log", - "uefi", - "uefi-services", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "git2" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "url", -] - -[[package]] -name = "guid_macros" -version = "0.11.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hidapi" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a090a12b53564bcb2f6053b8be08d5f9e7b91f26953d6e8e08c9affd8aeb4ec9" -dependencies = [ - "cc", - "libc", - "pkg-config", - "winapi", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "iana-time-zone" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" -dependencies = [ - "android_system_properties", - "core-foundation-sys 0.8.4", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows 0.48.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[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 = "io-kit-sys" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0" -dependencies = [ - "core-foundation-sys 0.6.2", - "mach 0.2.3", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" -dependencies = [ - "hermit-abi", - "io-lifetimes", - "rustix", - "windows-sys", -] - -[[package]] -name = "itoa" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -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 = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "libgit2-sys" -version = "0.14.2+1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[package]] -name = "libusb1-sys" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d0e2afce4245f2c9a418511e5af8718bcaf2fa408aefb259504d1a9cb25f27" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[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 = "mach" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" -dependencies = [ - "libc", -] - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "libc", - "memoffset", - "pin-utils", -] - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - -[[package]] -name = "num" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" -dependencies = [ - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[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-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" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - -[[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.107", - "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.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "ptr_meta" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcada80daa06c42ed5f48c9a043865edea5dc44cbf9ac009fda3b89526e28607" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca9224df2e20e7c5548aeb5f110a0f3b77ef05f8585139b7148b59056168ed2" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_hwio" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb516ad341a84372b5b15a5a35cf136ba901a639c8536f521b108253d7fce74" - -[[package]] -name = "regex" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "rusb" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703aa035c21c589b34fb5136b12e68fc8dcf7ea46486861381361dd8ebf5cee0" -dependencies = [ - "libc", - "libusb1-sys", -] - -[[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.36.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "ryu" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.151" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.151" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "serde_json" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "smbios-lib" -version = "0.9.1" -source = "git+https://github.com/FrameworkComputer/smbios-lib.git?branch=no-std#b3e2fff8a6f4b8c2d729467cbbf0c8c41974cd1c" -dependencies = [ - "core-foundation", - "core-foundation-sys 0.6.2", - "getopts", - "io-kit-sys", - "libc", - "mach 0.3.2", - "no-std-compat", - "serde", - "serde_json", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" -dependencies = [ - "lock_api", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[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 = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "ucs2" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad643914094137d475641b6bab89462505316ec2ce70907ad20102d28a79ab8" -dependencies = [ - "bit_field", -] - -[[package]] -name = "uefi" -version = "0.20.0" -source = "git+https://github.com/FrameworkComputer/uefi-rs?branch=merged#76130a0f1c1585012e598b8c514526bac09c68e0" -dependencies = [ - "bitflags", - "derive_more", - "log", - "ptr_meta", - "ucs2", - "uefi-macros", -] - -[[package]] -name = "uefi-macros" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0caeb0e7b31b9f1f347e541106be10aa8c66c76fa722a3298a4cd21433fabd4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "uefi-services" -version = "0.17.0" -source = "git+https://github.com/FrameworkComputer/uefi-rs?branch=merged#76130a0f1c1585012e598b8c514526bac09c68e0" -dependencies = [ - "cfg-if", - "log", - "uefi", -] - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[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-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[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 = "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 = "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.107", - "wasm-bindgen-shared", -] - -[[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.107", - "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 = "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" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0286ba339aa753e70765d521bb0242cc48e1194562bfa2a2ad7ac8a6de28f5d5" -dependencies = [ - "windows_aarch64_gnullvm 0.42.0", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm 0.42.0", - "windows_x86_64_msvc 0.42.0", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets", -] - -[[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.0", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm 0.42.0", - "windows_x86_64_msvc 0.42.0", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/by-name/fr/framework-system-tools/package.nix b/pkgs/by-name/fr/framework-system-tools/package.nix deleted file mode 100644 index fa225f574a99d..0000000000000 --- a/pkgs/by-name/fr/framework-system-tools/package.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, pkg-config -, udev -}: - -let - rev = "491a587342a5d79366a25d803b7065169314279c"; -in rustPlatform.buildRustPackage { - pname = "framework-system-tools"; - version = "unstable-2023-11-14"; - - src = fetchFromGitHub { - owner = "FrameworkComputer"; - repo = "framework-system"; - inherit rev; - hash = "sha256-qDtW4DvY19enCfkOBRaako9ngAkmSreoNWlL4QE2FAk="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - udev - ]; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "smbios-lib-0.9.1" = "sha256-3L8JaA75j9Aaqg1z9lVs61m6CvXDeQprEFRq+UDCHQo="; - "uefi-0.20.0" = "sha256-/3WNHuc27N89M7s+WT64SHyFOp7YRyzz6B+neh1vejY="; - }; - }; - - meta = with lib; { - description = "Rust libraries and tools to interact with the framework system."; - homepage = "https://github.com/FrameworkComputer/framework-system"; - mainProgram = "framework_tool"; - license = licenses.bsd3; - maintainers = with maintainers; [ kloenk leona ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix index d97b49fccf4b1..1f8cde1b6c5c4 100644 --- a/pkgs/by-name/fr/framework-tool/package.nix +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -1,6 +1,6 @@ { lib, rustPlatform, fetchFromGitHub, pkg-config, udev }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "framework-tool"; # Latest stable version 0.1.0 has an ssh:// git URL in Cargo.lock, @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/FrameworkComputer/framework-system"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ nickcao ]; + maintainers = with maintainers; [ nickcao leona kloenk ]; mainProgram = "framework_tool"; }; } diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index 3bc94389d67f4..878b176687f41 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -5,6 +5,9 @@ , php , testers , frankenphp +, darwin +, pkg-config +, makeBinaryWrapper , runCommand , writeText }: @@ -13,19 +16,22 @@ let phpEmbedWithZts = php.override { embedSupport = true; ztsSupport = true; + staticSupport = stdenv.isDarwin; + zendSignalsSupport = false; + zendMaxExecutionTimersSupport = stdenv.isLinux; }; phpUnwrapped = phpEmbedWithZts.unwrapped; phpConfig = "${phpUnwrapped.dev}/bin/php-config"; pieBuild = stdenv.hostPlatform.isMusl; in buildGoModule rec { pname = "frankenphp"; - version = "1.0.0-rc.4"; + version = "1.0.2"; src = fetchFromGitHub { owner = "dunglas"; repo = "frankenphp"; rev = "v${version}"; - hash = "sha256-4jNCKHt4eYI1BNaonIdS1Eq2OnJwgrU6qWZoiSpeIYk="; + hash = "sha256-iR47S52L2cMORE2MOzddFRDwlqaHAtB8dJs/UrufB0w="; }; sourceRoot = "source/caddy"; @@ -33,9 +39,10 @@ in buildGoModule rec { # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 proxyVendor = true; - vendorHash = "sha256-Lgj/pFtSQIgjrycajJ1zNY3ytvArmuk0E3IjsAzsNdM="; + vendorHash = "sha256-ZkbhpY8+BSTSdzQGsvXUfTBdTPUvQ8tHjbnr0lYho5I="; buildInputs = [ phpUnwrapped ] ++ phpUnwrapped.buildInputs; + nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config darwin.cctools darwin.autoSignDarwinBinariesHook ]; subPackages = [ "frankenphp" ]; @@ -52,7 +59,18 @@ in buildGoModule rec { export CGO_CFLAGS="$(${phpConfig} --includes)" export CGO_LDFLAGS="-DFRANKENPHP_VERSION=${version} \ $(${phpConfig} --ldflags) \ - -Wl,--start-group $(${phpConfig} --libs) -Wl,--end-group" + $(${phpConfig} --libs)" + '' + lib.optionalString stdenv.isDarwin '' + # replace hard-code homebrew path + substituteInPlace ../frankenphp.go \ + --replace "-L/opt/homebrew/opt/libiconv/lib" "-L${darwin.libiconv}/lib" + ''; + + preFixup = '' + mkdir -p $out/lib + ln -s "${phpEmbedWithZts}/lib/php.ini" "$out/lib/frankenphp.ini" + + wrapProgram $out/bin/frankenphp --set-default PHP_INI_SCAN_DIR $out/lib ''; doCheck = false; @@ -82,7 +100,7 @@ in buildGoModule rec { homepage = "https://github.com/dunglas/frankenphp"; license = licenses.mit; mainProgram = "frankenphp"; - maintainers = with maintainers; [ gaelreyrol ]; - platforms = platforms.linux; + maintainers = with maintainers; [ gaelreyrol shyim ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index d821bbf628f9c..445b116a3aa42 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "free42"; - version = "3.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "thomasokken"; repo = "free42"; rev = "v${finalAttrs.version}"; - hash = "sha256-v3nZMjV9KnoTefeu2jl3k1B7efnJnNVOAfDVLyce6QI="; + hash = "sha256-v7Qi0ZRLXEoZqnbIiHTkvsftwMi9vUhgH7wOtHN84nU="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { genericName = "Calculator"; exec = "free42bin"; type = "Application"; - comment = finalAttrs.meta.description; + comment = "A software clone of HP-42S Calculator"; categories = [ "Utility" "Calculator" ]; }) (makeDesktopItem { @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { genericName = "Calculator"; exec = "free42dec"; type = "Application"; - comment = finalAttrs.meta.description; + comment = "A software clone of HP-42S Calculator"; categories = [ "Utility" "Calculator" ]; }) ]; diff --git a/pkgs/by-name/fr/french-numbers/package.nix b/pkgs/by-name/fr/french-numbers/package.nix new file mode 100644 index 0000000000000..6589caeb68966 --- /dev/null +++ b/pkgs/by-name/fr/french-numbers/package.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "french-numbers"; + version = "1.2.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-6mcqT0RZddHlzjyZzx0JGTfCRcQ2UQ3Qlmk0VVNzsnI="; + }; + + cargoHash = "sha256-YmG+4837j7g3iK/nsP2P+WVcOqaPxKiS0jhcxkpEGXw="; + + cargoBuildFlags = [ "--features=cli" ]; + + meta = with lib; { + description = "Represent numbers in French language"; + homepage = "https://github.com/evenfurther/french-numbers"; + license = with licenses; [ asl20 /* or */ mit ]; + mainProgram = "french-numbers"; + maintainers = with maintainers; [ samueltardieu ]; + }; +} diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix index 081f96f0804ec..ff96de24f6ed1 100644 --- a/pkgs/by-name/gc/gcli/package.nix +++ b/pkgs/by-name/gc/gcli/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "gcli"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "herrhotzenplotz"; repo = "gcli"; rev = version; - hash = "sha256-ry+T39gFVPfHazAbv97UFpMIH1Dbbw6tZwsn9V4uRec="; + hash = "sha256-JZL0AcbrGYBceQ6ctspgnbzlVD4pg95deg9BWUFQCv8="; }; nativeBuildInputs = [ autoreconfHook pkg-config byacc flex ]; diff --git a/pkgs/by-name/gi/gickup/package.nix b/pkgs/by-name/gi/gickup/package.nix index 366796bd7c016..9253894968f69 100644 --- a/pkgs/by-name/gi/gickup/package.nix +++ b/pkgs/by-name/gi/gickup/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gickup"; - version = "0.10.22"; + version = "0.10.24"; src = fetchFromGitHub { owner = "cooperspencer"; repo = "gickup"; rev = "refs/tags/v${version}"; - hash = "sha256-pF8sckOSmih5rkDv7kvSL9gU4XwBrEIycjzEce01i64="; + hash = "sha256-c7IP5jYP8DbJkQEHmU2cMgClLqmMTAJkPCCHbdW5yLw="; }; - vendorHash = "sha256-kEy6Per8YibUHRp7E4jzkOgATq3Ub5WCNIe0WiHo2Ro="; + vendorHash = "sha256-fqtZL3Tr9QTFRUsczs11Y3b127CqoYkHV+dPI+vYpDk="; ldflags = ["-X main.version=${version}"]; diff --git a/pkgs/by-name/gi/git-releaser/package.nix b/pkgs/by-name/gi/git-releaser/package.nix new file mode 100644 index 0000000000000..f5be82cec2936 --- /dev/null +++ b/pkgs/by-name/gi/git-releaser/package.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule rec { + pname = "git-releaser"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "git-releaser"; + repo = "git-releaser"; + rev = "refs/tags/v${version}"; + hash = "sha256-rgnOXon68QMfVbyYhERy5z2pUlLCBwum7a/U9kdp5M0="; + }; + + vendorHash = "sha256-O6Rqdf6yZvW8aix51oIziip+WcVIiyDZZ2VOQfwP8Fs="; + + ldflags = [ "-X main.version=${version}" ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Tool for creating Git releases based on Semantic Versioning"; + homepage = "https://github.com/git-releaser/git-releaser"; + changelog = "https://github.com/git-releaser/git-releaser/releases/tag/v${version}"; + maintainers = with maintainers; [ jakuzure ]; + license = licenses.asl20; + mainProgram = "git-releaser"; + }; +} diff --git a/pkgs/by-name/gi/gitmoji-cli/package.nix b/pkgs/by-name/gi/gitmoji-cli/package.nix index 7787bd4ccf819..79a801000ad1b 100644 --- a/pkgs/by-name/gi/gitmoji-cli/package.nix +++ b/pkgs/by-name/gi/gitmoji-cli/package.nix @@ -6,6 +6,7 @@ , nodejs , prefetch-yarn-deps , yarn +, testers }: stdenv.mkDerivation (finalAttrs: { @@ -57,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { yarn --offline --production install mkdir -p "$out/lib/node_modules/gitmoji-cli" - cp -r lib node_modules "$out/lib/node_modules/gitmoji-cli" + cp -r lib node_modules package.json "$out/lib/node_modules/gitmoji-cli" makeWrapper "${nodejs}/bin/node" "$out/bin/gitmoji" \ --add-flags "$out/lib/node_modules/gitmoji-cli/lib/cli.js" @@ -65,6 +66,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + meta = { description = "Gitmoji client for using emojis on commit messages"; homepage = "https://github.com/carloscuesta/gitmoji-cli"; diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix new file mode 100644 index 0000000000000..dc2475c768d60 --- /dev/null +++ b/pkgs/by-name/gl/glide-media-player/package.nix @@ -0,0 +1,84 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, meson +, ninja +, rustc +, cargo +, wrapGAppsHook4 +, python3 +, libadwaita +, graphene +, gst_all_1 +, glib-networking +, darwin +, libsoup_3 +}: + +stdenv.mkDerivation rec { + pname = "glide-media-player"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "philn"; + repo = "glide"; + rev = version; + hash = "sha256-dIXuWaoTeyVBhzr6VWxYBsn+CnUYG/KzhzNJtLLdRuI="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-azvxW40fuKuF/N0qwzofFk1bZiNxyTN6YBFU5qHQkCA="; + }; + + postPatch = '' + substituteInPlace scripts/meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + patchShebangs --build scripts/meson_post_install.py + '' + lib.optionalString stdenv.isDarwin '' + sed -i "/wayland,x11egl,x11glx/d" meson.build + ''; + + nativeBuildInputs = [ + pkg-config + meson + ninja + rustPlatform.cargoSetupHook + rustc + cargo + wrapGAppsHook4 + python3 + ]; + + buildInputs = [ + libadwaita + graphene + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good + glib-networking + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.IOKit + ]; + + # FIXME: gst-plugins-good missing libsoup breaks streaming + # (https://github.com/nixos/nixpkgs/issues/271960) + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsoup_3 ]}") + ''; + + meta = with lib; { + description = "Linux/macOS media player based on GStreamer and GTK"; + homepage = "https://philn.github.io/glide"; + license = licenses.mit; + maintainers = with maintainers; [ aleksana ]; + mainProgram = "glide"; + platforms = platforms.unix; + # error: could not find system library 'gstreamer-gl-1.0' required by the 'gstreamer-gl-sys' crate + broken = stdenv.isDarwin && stdenv.isx86_64; + }; +} diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix index 69dccb00318c9..23b7a2069ab09 100644 --- a/pkgs/by-name/go/go-camo/package.nix +++ b/pkgs/by-name/go/go-camo/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.4.5"; + version = "2.4.8"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qELWl8kWQzgwQ8Mwp7MAxlYhHV6Us3kTuMjKVwJjZFs="; + sha256 = "sha256-Y2Zhr8MhIN13AYMq0t9QASfd2Mgp4tiFmrpc6VTIUq0="; }; - vendorHash = "sha256-PF7WqA3hdV+eFu++eoCo1m2m4o92vUtArH0uS+rjxGU="; + vendorHash = "sha256-O3JatOmQrNZRxKa9dTYQpVoPUIuFIbnEXpak3PXJquA="; ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; diff --git a/pkgs/by-name/go/goredo/package.nix b/pkgs/by-name/go/goredo/package.nix index a1c144508acd9..beb62fc1ce8a2 100644 --- a/pkgs/by-name/go/goredo/package.nix +++ b/pkgs/by-name/go/goredo/package.nix @@ -9,11 +9,11 @@ buildGoModule rec { pname = "goredo"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst"; - hash = "sha256-kVxCHXQ9PjaLYviB8sf8oHiFniyNrHMO6C/qSZhjK7k="; + hash = "sha256-XTL/otfCKC55TsUBBVors2kgFpOFh+6oekOOafOhcUs="; }; patches = [ diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/by-name/go/gosmore/package.nix index bd87e7b4aeb66..2bc778ff9cb29 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/by-name/go/gosmore/package.nix @@ -1,24 +1,26 @@ -{ lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkg-config } : +{ lib, stdenv, fetchFromGitHub, libxml2, gtk2, curl, pkg-config }: stdenv.mkDerivation rec { pname = "gosmore"; - version = "31801"; - # the gosmore svn repository does not lock revision numbers of its externals - # so we explicitly disable them to avoid breaking the hash - # especially as the externals appear to be unused - src = fetchsvn { - url = "http://svn.openstreetmap.org/applications/rendering/gosmore"; - sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi"; - rev = version; - ignoreExternals = true; + version = "unstable-2014-03-17"; + + src = fetchFromGitHub { + owner = "openstreetmap"; + repo = "svn-archive"; + rev = "89b1fbfbc9e9a8b5e78795fd40bdfa60550322fc"; + sparseCheckout = [ "applications/rendering/gosmore" ]; + hash = "sha256-MfuJVsyGWspGNAFD6Ktbbyawb4bPwUITe7WkyFs6JxI="; }; + sourceRoot = "${src.name}/applications/rendering/gosmore"; + buildInputs = [ libxml2 gtk2 curl ]; nativeBuildInputs = [ pkg-config ]; prePatch = '' sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp} + sed -e "24i #include <ctime>" -e "s/data/dat/g" -i jni/libgosm.cpp ''; patches = [ ./pointer_int_comparison.patch ]; diff --git a/pkgs/applications/misc/gosmore/pointer_int_comparison.patch b/pkgs/by-name/go/gosmore/pointer_int_comparison.patch index 4a715b6d85913..4a715b6d85913 100644 --- a/pkgs/applications/misc/gosmore/pointer_int_comparison.patch +++ b/pkgs/by-name/go/gosmore/pointer_int_comparison.patch diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix new file mode 100644 index 0000000000000..ffcd8b3f0b898 --- /dev/null +++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix @@ -0,0 +1,47 @@ +{ + lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, breeze-icons +, gnome-icon-theme +, hicolor-icon-theme +}: + +stdenvNoCC.mkDerivation { + pname = "gruvbox-plus-icons"; + version = "unstable-2023-12-07"; + + src = fetchFromGitHub { + owner = "SylEleuth"; + repo = "gruvbox-plus-icon-pack"; + rev = "f3109979fe93b31ea14eb2d5c04247a895302ea0"; + sha256 = "sha256-EijTEDkPmcDcMhCuL6fOWjU9eXFUwmeOEwfGlxadb1U="; + }; + + nativeBuildInputs = [ gtk3 ]; + + propagatedBuildInputs = [ breeze-icons gnome-icon-theme hicolor-icon-theme ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + cp -r Gruvbox-Plus-Dark $out/share/icons/ + gtk-update-icon-cache $out/share/icons/Gruvbox-Plus-Dark + + runHook postInstall + ''; + + dontDropIconThemeCache = true; + dontBuild = true; + dontConfigure = true; + + meta = with lib; { + description = "Icon pack for Linux desktops based on the Gruvbox color scheme"; + homepage = "https://github.com/SylEleuth/gruvbox-plus-icon-pack"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ eureka-cpu RGBCube ]; + }; +} diff --git a/pkgs/by-name/gu/guile-lzma/package.nix b/pkgs/by-name/gu/guile-lzma/package.nix index 66dddeb88ff78..89a361ef9e4c9 100644 --- a/pkgs/by-name/gu/guile-lzma/package.nix +++ b/pkgs/by-name/gu/guile-lzma/package.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { doCheck = true; + # In procedure bytevector-u8-ref: Argument 2 out of range + dontStrip = stdenv.isDarwin; + meta = with lib; { homepage = "https://ngyro.com/software/guile-lzma.html"; description = "Guile wrapper for lzma library"; diff --git a/pkgs/by-name/ha/hare/001-tzdata.patch b/pkgs/by-name/ha/hare/001-tzdata.patch new file mode 100644 index 0000000000000..bb510514eb530 --- /dev/null +++ b/pkgs/by-name/ha/hare/001-tzdata.patch @@ -0,0 +1,28 @@ +diff --git a/time/chrono/+freebsd.ha b/time/chrono/+freebsd.ha +index 26d78ab1..6861bfe8 100644 +--- a/time/chrono/+freebsd.ha ++++ b/time/chrono/+freebsd.ha +@@ -2,7 +2,7 @@ + // (c) Hare authors <https://harelang.org> + + def LOCALTIME_PATH: str = "/etc/localtime"; +-def ZONEINFO_PREFIX: str = "/usr/share/zoneinfo/"; ++def ZONEINFO_PREFIX: str = "@tzdata@/share/zoneinfo/"; + + // The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI + // leap second data. +diff --git a/time/chrono/+linux.ha b/time/chrono/+linux.ha +index 600f606c..8d5617e2 100644 +--- a/time/chrono/+linux.ha ++++ b/time/chrono/+linux.ha +@@ -2,8 +2,8 @@ + // (c) Hare authors <https://harelang.org> + + def LOCALTIME_PATH: str = "/etc/localtime"; +-def ZONEINFO_PREFIX: str = "/usr/share/zoneinfo/"; ++def ZONEINFO_PREFIX: str = "@tzdata@/share/zoneinfo/"; + + // The filepath of the system's "leap-seconds.list" file, which contains UTC/TAI + // leap second data. +-export def UTC_LEAPSECS_FILE: str = "/usr/share/zoneinfo/leap-seconds.list"; ++export def UTC_LEAPSECS_FILE: str = "@tzdata@/share/zoneinfo/leap-seconds.list"; diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix new file mode 100644 index 0000000000000..c509955c6f099 --- /dev/null +++ b/pkgs/by-name/ha/hare/package.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, fetchFromSourcehut +, binutils-unwrapped +, harec +, makeWrapper +, qbe +, scdoc +, tzdata +, substituteAll +}: + +let + # We use harec's override of qbe until 1.2 is released, but the `qbe` argument + # is kept to avoid breakage. + qbe = harec.qbeUnstable; + # https://harelang.org/platforms/ + arch = stdenv.hostPlatform.uname.processor; + platform = lib.strings.toLower stdenv.hostPlatform.uname.system; +in +stdenv.mkDerivation (finalAttrs: { + pname = "hare"; + version = "unstable-2023-11-27"; + + outputs = [ "out" "man" ]; + + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "hare"; + rev = "d94f355481a320fb2aec13ef62cb3bfe2416f5e4"; + hash = "sha256-Mpl3VO4xvLCKHeYr/FPuS6jl8CkyeqDz18mQ6Zv05oc="; + }; + + patches = [ + # Replace FHS paths with nix store + (substituteAll { + src = ./001-tzdata.patch; + inherit tzdata; + }) + ]; + + nativeBuildInputs = [ + harec + makeWrapper + qbe + scdoc + ]; + + buildInputs = [ + binutils-unwrapped + harec + qbe + tzdata + ]; + + makeFlags = [ + "HARECACHE=.harecache" + "PREFIX=${builtins.placeholder "out"}" + "PLATFORM=${platform}" + "ARCH=${arch}" + ]; + + enableParallelBuilding = true; + + # Append the distribution name to the version + env.LOCALVER = "nixpkgs"; + + strictDeps = true; + + doCheck = true; + + preConfigure = '' + ln -s config.example.mk config.mk + ''; + + postFixup = '' + wrapProgram $out/bin/hare \ + --prefix PATH : ${lib.makeBinPath [binutils-unwrapped harec qbe]} + ''; + + setupHook = ./setup-hook.sh; + + meta = { + homepage = "https://harelang.org/"; + description = "Systems programming language designed to be simple, stable, and robust"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ onemoresuza ]; + mainProgram = "hare"; + inherit (harec.meta) platforms badPlatforms; + }; +}) diff --git a/pkgs/development/compilers/hare/setup-hook.sh b/pkgs/by-name/ha/hare/setup-hook.sh index d2d2c34354d65..d2d2c34354d65 100644 --- a/pkgs/development/compilers/hare/setup-hook.sh +++ b/pkgs/by-name/ha/hare/setup-hook.sh diff --git a/pkgs/development/compilers/harec/default.nix b/pkgs/by-name/ha/harec/package.nix index 6ddb5ff1f01c4..cbcb53b1ac4e7 100644 --- a/pkgs/development/compilers/harec/default.nix +++ b/pkgs/by-name/ha/harec/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "harec"; - version = "unstable-2023-10-22"; + version = "unstable-2023-11-29"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "harec"; - rev = "64dea196ce040fbf3417e1b4fb11331688672aca"; - hash = "sha256-2Aeb+OZ/hYUyyxx6aTw+Oxiac+p+SClxtg0h68ZBSHc="; + rev = "ec3193e3870436180b0f3df82b769adc57a1c099"; + hash = "sha256-HXQIgFC4YVDJjo5xbyg1ea3jWYKLEwKkD1KFzWFz9UI= "; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/haredo/package.nix b/pkgs/by-name/ha/haredo/package.nix new file mode 100644 index 0000000000000..277250170e5d2 --- /dev/null +++ b/pkgs/by-name/ha/haredo/package.nix @@ -0,0 +1,71 @@ +{ stdenv +, lib +, fetchFromSourcehut +, hare +, scdoc +, nix-update-script +}: +stdenv.mkDerivation (finalAttrs: { + pname = "haredo"; + version = "1.0.5"; + + outputs = [ "out" "man" ]; + + src = fetchFromSourcehut { + owner = "~autumnull"; + repo = "haredo"; + rev = finalAttrs.version; + hash = "sha256-gpui5FVRw3NKyx0AB/4kqdolrl5vkDudPOgjHc/IE4U="; + }; + + nativeBuildInputs = [ + hare + scdoc + ]; + + preBuild = '' + HARECACHE="$(mktemp -d --tmpdir harecache.XXXXXXXX)" + export HARECACHE + export PREFIX=${builtins.placeholder "out"} + ''; + + buildPhase = '' + runHook preBuild + + ./bootstrap.sh + + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + + ./bin/haredo test + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + ./bootstrap.sh install + + runHook postInstall + ''; + + dontConfigure = true; + doCheck = true; + + setupHook = ./setup-hook.sh; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A simple and unix-idiomatic build automator"; + homepage = "https://sr.ht/~autumnull/haredo/"; + license = lib.licenses.wtfpl; + maintainers = with lib.maintainers; [ onemoresuza ]; + mainProgram = "haredo"; + inherit (hare.meta) platforms badPlatforms; + }; +}) diff --git a/pkgs/by-name/ha/haredo/setup-hook.sh b/pkgs/by-name/ha/haredo/setup-hook.sh new file mode 100644 index 0000000000000..44eb453087dbd --- /dev/null +++ b/pkgs/by-name/ha/haredo/setup-hook.sh @@ -0,0 +1,69 @@ +haredoBuildPhase() { + runHook preBuild + + local buildTargets jobs + read -ra buildTargets <<<"${haredoBuildTargets-}" + echoCmd "haredo build targets" "${buildTargets[@]}" + if [[ ! -v enableParallelBuilding || -n "${enableParallelBuilding-}" ]]; then + jobs="${NIX_BUILD_CORES}" + fi + haredo ${jobs:+"-j${jobs}"} "${buildTargets[@]}" + + runHook postBuild +} + +haredoCheckPhase() { + runHook preCheck + + local checkTargets jobs + + if [[ -n "${haredoCheckTargets:-}" ]]; then + read -ra checkTargets <<<"${haredoCheckTargets}" + else + for dofile in "check.do" "test.do"; do + [[ -r "${dofile}" ]] && { + checkTargets=("${dofile%".do"}") + break + } + done + fi + + if [[ -z "${checkTargets:-}" ]]; then + printf -- 'haredoCheckPhase ERROR: no check targets were found' 1>&2 + exit 1 + else + echoCmd "haredo check targets" "${checkTargets[@]}" + if [[ ! -v enableParallelChecking || -n "${enableParallelChecking-}" ]]; then + jobs="${NIX_BUILD_CORES}" + fi + haredo ${jobs:+"-j${jobs}"} "${checkTargets[@]}" + fi + + runHook postCheck +} + +haredoInstallPhase() { + runHook preInstall + + local installTargets jobs + read -ra installTargets <<<"${haredoInstallTargets:-"install"}" + echoCmd "haredo install targets" "${installTargets[@]}" + if [[ ! -v enableParallelInstalling || -n "${enableParallelInstalling-}" ]]; then + jobs="${NIX_BUILD_CORES}" + fi + haredo ${jobs:+"-j${jobs}"} "${installTargets[@]}" + + runHook postInstall +} + +if [[ -z "${dontUseHaredoBuild-}" && -z "${buildPhase-}" ]]; then + buildPhase="haredoBuildPhase" +fi + +if [[ -z "${dontUseHaredoCheck-}" && -z "${checkPhase-}" ]]; then + checkPhase="haredoCheckPhase" +fi + +if [[ -z "${dontUseHaredoInstall-}" && -z "${installPhase-}" ]]; then + installPhase="haredoInstallPhase" +fi diff --git a/pkgs/by-name/hd/hdrop/package.nix b/pkgs/by-name/hd/hdrop/package.nix new file mode 100755 index 0000000000000..940cdf8f66b33 --- /dev/null +++ b/pkgs/by-name/hd/hdrop/package.nix @@ -0,0 +1,52 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, makeWrapper +, scdoc +, coreutils +, util-linux +, jq +, libnotify +, withHyprland ? true +, hyprland +}: + +stdenvNoCC.mkDerivation rec { + pname = "hdrop"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "Schweber"; + repo = "hdrop"; + rev = "v${version}"; + hash = "sha256-VsM1wPl8edAnZUvYw3IeOHw/XQ2pvbLt0v3G0B8+iSA="; + }; + + nativeBuildInputs = [ + makeWrapper + scdoc + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/hdrop --prefix PATH ':' \ + "${lib.makeBinPath ([ + coreutils + util-linux + jq + libnotify + ] + ++ lib.optional withHyprland hyprland)}" + ''; + + meta = with lib; { + description = "Emulate 'tdrop' in Hyprland (run, show and hide specific programs per keybind)"; + homepage = "https://github.com/Schweber/hdrop"; + changelog = "https://github.com/Schweber/hdrop/releases/tag/v${version}"; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ Schweber ]; + mainProgram = "hdrop"; + }; +} diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index 8c8f9707a7d3f..d4a0c568b4ec8 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -1,20 +1,19 @@ { lib, appimageTools, fetchurl }: let - version = "0.9.9.6"; + version = "0.9.9.7"; pname = "hifile"; src = fetchurl { url = "https://www.hifile.app/files/HiFile-${version}.AppImage"; - hash = "sha256-qfBV4w4nChH2wUAHdcUFwVs+3OeqcKqMJ8WUucn31q4="; + hash = "sha256-/vFW+jHmtCEioJt0B5TnNDsaIyFlDuVABnHNccm6iEw="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 rec { +in appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' diff --git a/pkgs/development/tools/hjson-go/default.nix b/pkgs/by-name/hj/hjson-go/package.nix index 00af9d409f81c..0e625e2985b63 100644 --- a/pkgs/development/tools/hjson-go/default.nix +++ b/pkgs/by-name/hj/hjson-go/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hjson-go"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "hjson"; repo = pname; rev = "v${version}"; - hash = "sha256-ox6/PY7Nx282bUekLoXezWfKDiDzCBUZMa5/nu2qG40="; + hash = "sha256-fonPxk/9ue8LzHTdKpuHJcucQoMl4P6gq+tbjS8Ui7Q="; }; vendorHash = null; diff --git a/pkgs/by-name/ht/http3-ytproxy/dependencies.patch b/pkgs/by-name/ht/http3-ytproxy/dependencies.patch new file mode 100644 index 0000000000000..1394156b4d5b2 --- /dev/null +++ b/pkgs/by-name/ht/http3-ytproxy/dependencies.patch @@ -0,0 +1,378 @@ +diff --git a/go.mod b/go.mod +index 2343724..a734d33 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,8 +1,24 @@ + module github.com/FireMasterK/http3-ytproxy/v2 + +-go 1.16 ++go 1.18 + + require ( + github.com/kolesa-team/go-webp v1.0.1 +- github.com/lucas-clemente/quic-go v0.25.0 ++ github.com/quic-go/quic-go v0.40.0 ++) ++ ++require ( ++ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect ++ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect ++ github.com/onsi/ginkgo/v2 v2.9.5 // indirect ++ github.com/quic-go/qpack v0.4.0 // indirect ++ github.com/quic-go/qtls-go1-20 v0.4.1 // indirect ++ go.uber.org/mock v0.3.0 // indirect ++ golang.org/x/crypto v0.4.0 // indirect ++ golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect ++ golang.org/x/mod v0.11.0 // indirect ++ golang.org/x/net v0.10.0 // indirect ++ golang.org/x/sys v0.8.0 // indirect ++ golang.org/x/text v0.9.0 // indirect ++ golang.org/x/tools v0.9.1 // indirect + ) +diff --git a/go.sum b/go.sum +index 378f95e..214f9ff 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,289 +1,56 @@ +-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +-cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +-cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= +-dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= +-dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= +-dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= +-dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= +-git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= +-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +-github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= +-github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= +-github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= +-github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +-github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= ++github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= ++github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= ++github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= + github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= + github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +-github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= +-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +-github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +-github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= +-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +-github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= +-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +-github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +-github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= +-github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +-github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= +-github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= +-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +-github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +-github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +-github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= +-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= ++github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= ++github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= ++github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= ++github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= ++github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= ++github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= ++github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= ++github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= + github.com/kolesa-team/go-webp v1.0.1 h1:Btojkbzr6tt10zJ40xlbSfJeHFiNn0aR7H03QUqmMoI= + github.com/kolesa-team/go-webp v1.0.1/go.mod h1:oMvdivD6K+Q5qIIkVC2w4k2ZUnI1H+MyP7inwgWq9aA= +-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +-github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +-github.com/lucas-clemente/quic-go v0.25.0 h1:K+X9Gvd7JXsOHtU0N2icZ2Nw3rx82uBej3mP4CLgibc= +-github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg= +-github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= +-github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +-github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs= +-github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= +-github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= +-github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco= +-github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= +-github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk= +-github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= +-github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 h1:EnzzN9fPUkUck/1CuY1FlzBaIYMoiBsdwTNmNGkwUUM= +-github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI= +-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +-github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= +-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +-github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= +-github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= +-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +-github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +-github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= +-github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +-github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +-github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= +-github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= +-github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= +-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= ++github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= ++github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= + github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= + github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +-github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +-github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +-github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +-github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +-github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +-github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= +-github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM= +-github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0= +-github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +-github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= +-github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw= +-github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI= +-github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU= +-github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag= +-github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg= +-github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw= +-github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y= +-github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +-github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q= +-github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ= +-github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I= +-github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0= +-github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ= +-github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk= +-github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +-github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= +-github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= +-github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= +-github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= ++github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= ++github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= ++github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs= ++github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= ++github.com/quic-go/quic-go v0.40.0 h1:GYd1iznlKm7dpHD7pOVpUvItgMPo/jrMgDWZhMCecqw= ++github.com/quic-go/quic-go v0.40.0/go.mod h1:PeN7kuVJ4xZbxSv/4OX6S1USOX8MJvydwpTx31vx60c= + github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= ++github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= + github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= + github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +-github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= +-github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= +-github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= +-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +-go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= +-go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= +-golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= +-golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +-golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +-golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= ++go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo= ++go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= ++golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8= ++golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80= ++golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o= ++golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= + golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs= + golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +-golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= +-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +-golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +-golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +-golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0= +-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +-golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +-golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +-golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= +-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= +-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= ++golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= ++golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= ++golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= ++golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= ++golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= ++golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +-golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +-golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= ++golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= + golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +-golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +-golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +-golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs= +-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +-google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +-google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +-google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= +-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +-google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +-google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +-google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +-google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +-google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= +-google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +-google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +-google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= +-google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= +-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= ++golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= ++golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= ++google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +-grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= +-honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +-sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= +-sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= ++gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +diff --git a/main.go b/main.go +index 8c64018..2290108 100644 +--- a/main.go ++++ b/main.go +@@ -16,7 +16,7 @@ import ( + + "github.com/kolesa-team/go-webp/encoder" + "github.com/kolesa-team/go-webp/webp" +- "github.com/lucas-clemente/quic-go/http3" ++ "github.com/quic-go/quic-go/http3" + ) + + // http/3 client diff --git a/pkgs/by-name/ht/http3-ytproxy/package.nix b/pkgs/by-name/ht/http3-ytproxy/package.nix new file mode 100644 index 0000000000000..04e6965012937 --- /dev/null +++ b/pkgs/by-name/ht/http3-ytproxy/package.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, libwebp +}: +buildGoModule rec { + pname = "http3-ytproxy"; + version = "unstable-2022-07-03"; + + src = fetchFromGitHub { + owner = "TeamPiped"; + repo = pname; + rev = "4059da180bb9d7b0de10c1a041bd0e134f1b6408"; + hash = "sha256-ilIOkZ9lcuSigh/mMU7IGpWlFMFb2/Y11ri3659S8+I="; + }; + + patches = [ + # this patch was created by updating the quic-go dependency, bumping the go version + # and running `go mod tidy` + ./dependencies.patch + ]; + + vendorHash = "sha256-17y+kxlLSqCFoxinNNKzg7IqGpbiv0IBsUuC9EC8xnk="; + + buildInputs = [ libwebp ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "YouTube traffic proxy for video playback and images"; + homepage = "https://github.com/TeamPiped/http3-ytproxy"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ _999eagle ]; + mainProgram = "http3-ytproxy"; + }; +} diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/by-name/hu/hugo/package.nix index d8b81ce8bebcf..3c2cce32fb2c3 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.120.4"; + version = "0.121.1"; src = fetchFromGitHub { owner = "gohugoio"; - repo = pname; + repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-eBDlX+3Gb4bWRJ0ITwlx1c3q1RCFK2tyuKn9SALHbhI="; + hash = "sha256-XNOp0k2t5Tv4HKKz3ZqL/sAdiYedOACaZ/1T7t7/Q1A="; }; - vendorHash = "sha256-kUKnoUQzLbi0ssxvK2viNTHLtqx8vaHLYXO8ZWU2rmw="; + vendorHash = "sha256-J/me67pC+YWjGIQP6q1c+vsSXFxXoLZV7AyDv3+606k="; doCheck = false; @@ -48,10 +48,12 @@ buildGoModule rec { version = "v${version}"; }; - meta = with lib; { + meta = { + changelog = "https://github.com/gohugoio/hugo/releases/tag/v${version}"; description = "A fast and modern static website engine"; homepage = "https://gohugo.io"; - license = licenses.asl20; - maintainers = with maintainers; [ schneefux Br1ght0ne Frostman ]; + license = lib.licenses.asl20; + mainProgram = "hugo"; + maintainers = with lib.maintainers; [ schneefux Br1ght0ne Frostman ]; }; } diff --git a/pkgs/by-name/i3/i3-open-next-ws/package.nix b/pkgs/by-name/i3/i3-open-next-ws/package.nix new file mode 100644 index 0000000000000..129f170dd28e3 --- /dev/null +++ b/pkgs/by-name/i3/i3-open-next-ws/package.nix @@ -0,0 +1,24 @@ +{ + lib, + rustPlatform, + fetchCrate, +}: +rustPlatform.buildRustPackage rec { + pname = "i3-open-next-ws"; + version = "0.1.5"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-eYHCm8jEv6Ll6/h1kcYHNxWGnVWI41ZB96Jec9oZFsY="; + }; + cargoHash = "sha256-9U0bYCbkvcZJOCd4jZog4bSJkP1ntmAFjWm7lJDdcuo="; + + meta = { + description = "A workspace management utility for i3 and sway, that picks the first unused workspace automagically"; + homepage = "https://github.com/JohnDowson/i3-open-next-ws"; + license = lib.licenses.mit; + mainProgram = "i3-open-next-ws"; + maintainers = with lib.maintainers; [quantenzitrone]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/i3/i3bar-river/package.nix b/pkgs/by-name/i3/i3bar-river/package.nix index a53a4dddda559..b31e4ca12910d 100644 --- a/pkgs/by-name/i3/i3bar-river/package.nix +++ b/pkgs/by-name/i3/i3bar-river/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "i3bar-river"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "i3bar-river"; rev = "v${version}"; - hash = "sha256-AXa+K+njXkrJeqABD04WHpmvAzAL1Mw11ZhCfFNJxhY="; + hash = "sha256-wtyC8cGK408KZYpWniW2y4XI1ScTSBZJJlUt6b2Z5KA="; }; - cargoHash = "sha256-tNuv+D75wox3HlUZSJJ67KEBKmGJXBkXHfvDsNHeM6A="; + cargoHash = "sha256-PdSMDsV3yFy3kSNS6OBxFdrZsIn70gXOTd2AhyU4a9o="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ]; diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 186810876b32a..9f64d08ca7710 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-bnoNkBsNJ/6CVmm5I/nwy6LGxYhxPXssjZ3TT7FdEz8="; + hash = "sha256-Auuu+hRYVziAF3hXH7XSOyNlDehEKg6QmSJicY+XQLk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/id/idsk/package.nix b/pkgs/by-name/id/idsk/package.nix new file mode 100644 index 0000000000000..58774d62c31ad --- /dev/null +++ b/pkgs/by-name/id/idsk/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: + +stdenv.mkDerivation rec { + pname = "idsk"; + version = "0.20"; + + src = fetchFromGitHub { + owner = "cpcsdk"; + repo = "idsk"; + rev = "v${version}"; + hash = "sha256-rYClWq1Nl3COoG+eOJyFDTvBSzpHpGminU4bndZs6xc="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/cpcsdk/idsk/commit/52fa3cdcc10d4ba6c75cab10ca7067b129198d92.patch"; + hash = "sha256-Ll0apllNj+fP7kZ1n+bBowrlskLK1bIashxxgPVVxmg="; + }) + ]; + + nativeBuildInputs = [ + cmake + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 iDSK $out/bin/iDSK + + runHook postInstall + ''; + + meta = with lib; { + description = "Manipulating CPC dsk images and files"; + homepage = "https://github.com/cpcsdk/idsk"; + license = licenses.mit; + mainProgram = "iDSK"; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix new file mode 100644 index 0000000000000..839680bf83af2 --- /dev/null +++ b/pkgs/by-name/ig/ignite-cli/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +, go +, buf +}: + +buildGoModule rec { + pname = "ignite-cli"; + version = "28.1.0"; + + src = fetchFromGitHub { + repo = "cli"; + owner = "ignite"; + rev = "v${version}"; + hash = "sha256-/MsBVJ3aqlNfGtktjqDKGdibbZea/bdLuQbXnP3Ag0k="; + }; + + vendorHash = "sha256-VAXzwZ79TGvAoSRzjupL9XkXBn05tvaPCtRuxhls6XE="; + + nativeBuildInputs = [ makeWrapper ]; + + # Many tests require access to either executables, state or networking + doCheck = false; + + # Required for wrapProgram + allowGoReference = true; + + # Required for commands like `ignite version`, `ignite network` and others + postFixup = '' + wrapProgram $out/bin/ignite --prefix PATH : ${lib.makeBinPath [ go buf ]} + ''; + + meta = with lib; { + homepage = "https://ignite.com/"; + changelog = "https://github.com/ignite/cli/releases/tag/v${version}"; + description = "All-in-one platform to build, launch, and maintain any crypto application on a sovereign and secured blockchain"; + license = licenses.asl20; + maintainers = with maintainers; [ kashw2 ]; + mainProgram = "ignite"; + }; +} diff --git a/pkgs/by-name/im/immersed-vr/package.nix b/pkgs/by-name/im/immersed-vr/package.nix index 0cf8ef3e17abf..70cce2b976300 100644 --- a/pkgs/by-name/im/immersed-vr/package.nix +++ b/pkgs/by-name/im/immersed-vr/package.nix @@ -16,10 +16,6 @@ appimageTools.wrapType2 rec { mv $out/bin/{${name},${pname}} ''; - extraPkgs = pkgs: with pkgs; [ - libthai - ]; - meta = with lib; { description = "A VR coworking platform"; homepage = "https://immersed.com"; diff --git a/pkgs/by-name/in/incus-unwrapped/package.nix b/pkgs/by-name/in/incus-unwrapped/package.nix index 3beeff04f4fd2..43bf65bef83e7 100644 --- a/pkgs/by-name/in/incus-unwrapped/package.nix +++ b/pkgs/by-name/in/incus-unwrapped/package.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "incus-unwrapped"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lxc"; repo = "incus"; rev = "refs/tags/v${version}"; - hash = "sha256-oPBrIN4XUc9GnBszEWAAnEcNahV4hfB48XSKvkpq5Kk="; + hash = "sha256-crWepf5j3Gd1lhya2DGIh/to7l+AnjKJPR+qUd9WOzw="; }; - vendorHash = "sha256-TwrHWjBd6Hn7CQMxFhHobopeefCvYeDz8fAPYmTKV9M="; + vendorHash = "sha256-YfUvkN1qUS3FFKb1wysg40WcJA8fT9SGDChSdT+xnkc="; postPatch = '' substituteInPlace internal/usbid/load.go \ @@ -95,7 +95,7 @@ buildGoModule rec { homepage = "https://linuxcontainers.org/incus"; changelog = "https://github.com/lxc/incus/releases/tag/incus-${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ adamcstephens ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/in/indiepass-desktop/package.nix b/pkgs/by-name/in/indiepass-desktop/package.nix new file mode 100644 index 0000000000000..b028755fa67a0 --- /dev/null +++ b/pkgs/by-name/in/indiepass-desktop/package.nix @@ -0,0 +1,58 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, makeWrapper +, electron +}: + +buildNpmPackage rec { + pname = "indiepass-desktop"; + version = "1.4.0-unstable-2023-05-19"; + + src = fetchFromGitHub { + owner = "indiepass"; + repo = "indiepass-desktop"; + rev = "751660324d6bfc6f95af08bf9bc92e892841f2b2"; + hash = "sha256-cQqL8eNb23NFMWrK9xh6bZcr0EoYbyJiid+xXQRPqMk="; + }; + + npmDepsHash = "sha256-gp77eDxturBib0JRNVNSd+nDxQyVTJVKEj4ydB7eICE="; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + dontNpmBuild = true; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "indiepass"; + icon = "indiepass"; + comment = meta.description; + desktopName = "Indiepass"; + genericName = "Feed Reader"; + }) + ]; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + + postInstall = '' + install -Dm 644 $out/lib/node_modules/indiepass/images/icon.png $out/share/pixmaps/indiepass.png + + makeWrapper ${electron}/bin/electron $out/bin/indiepass \ + --add-flags $out/lib/node_modules/indiepass/main.js + ''; + + meta = with lib; { + description = "IndieWeb app with extensions for sharing to/reading from micropub endpoints"; + homepage = "https://github.com/IndiePass/indiepass-desktop"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "indiepass"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/by-name/in/intiface-central/corrosion.patch b/pkgs/by-name/in/intiface-central/corrosion.patch new file mode 100644 index 0000000000000..d8c8237aeba36 --- /dev/null +++ b/pkgs/by-name/in/intiface-central/corrosion.patch @@ -0,0 +1,23 @@ +diff --git a/linux/rust.cmake b/linux/rust.cmake +index a96586c..f9b8677 100644 +--- a/linux/rust.cmake ++++ b/linux/rust.cmake +@@ -2,17 +2,7 @@ + # many dependencies we would need to install Corrosion on the system. + # See instructions on https://github.com/AndrewGaspar/corrosion#cmake-install + # Once done, uncomment this line: +-# find_package(Corrosion REQUIRED) +- +-include(FetchContent) +- +-FetchContent_Declare( +- Corrosion +- GIT_REPOSITORY https://github.com/AndrewGaspar/corrosion.git +- GIT_TAG origin/master # Optionally specify a version tag or branch here +-) +- +-FetchContent_MakeAvailable(Corrosion) ++find_package(Corrosion REQUIRED) + + corrosion_import_crate(MANIFEST_PATH ../intiface-engine-flutter-bridge/Cargo.toml) + diff --git a/pkgs/by-name/in/intiface-central/deps.json b/pkgs/by-name/in/intiface-central/deps.json new file mode 100644 index 0000000000000..7f9ae104f35bd --- /dev/null +++ b/pkgs/by-name/in/intiface-central/deps.json @@ -0,0 +1,1761 @@ +[ + { + "name": "intiface_central", + "version": "2.5.3+21", + "kind": "root", + "source": "root", + "dependencies": [ + "flutter", + "device_info_plus", + "cupertino_icons", + "json_annotation", + "flutter_local_notifications", + "flutter_rust_bridge", + "plugin_platform_interface", + "ffi", + "path_provider", + "path", + "window_manager", + "web_socket_channel", + "network_info_plus", + "permission_handler", + "bloc", + "flutter_bloc", + "equatable", + "shared_preferences", + "settings_ui", + "flutter_markdown", + "loggy", + "flutter_loggy", + "github", + "markdown", + "version", + "package_info_plus", + "url_launcher", + "intl", + "easy_debounce", + "percent_indicator", + "buttplug", + "flutter_foreground_task", + "tuple", + "sentry_flutter", + "sentry", + "rxdart", + "screen_retriever", + "flutter_test", + "json_serializable", + "build_runner", + "flutter_lints", + "ffigen", + "flutter_launcher_icons" + ] + }, + { + "name": "flutter_launcher_icons", + "version": "0.13.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "args", + "checked_yaml", + "cli_util", + "image", + "json_annotation", + "path", + "yaml" + ] + }, + { + "name": "yaml", + "version": "3.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "path", + "version": "1.8.3", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "collection", + "version": "1.17.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "json_annotation", + "version": "4.8.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "meta", + "version": "1.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "image", + "version": "4.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "archive", + "meta", + "xml" + ] + }, + { + "name": "xml", + "version": "6.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "petitparser" + ] + }, + { + "name": "petitparser", + "version": "5.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "archive", + "version": "3.4.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto", + "path", + "pointycastle" + ] + }, + { + "name": "pointycastle", + "version": "3.7.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "convert", + "js" + ] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "convert", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "crypto", + "version": "3.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "cli_util", + "version": "0.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "checked_yaml", + "version": "2.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "json_annotation", + "source_span", + "yaml" + ] + }, + { + "name": "args", + "version": "2.4.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "ffigen", + "version": "9.0.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "ffi", + "yaml", + "path", + "quiver", + "args", + "logging", + "cli_util", + "glob", + "file", + "package_config", + "yaml_edit" + ] + }, + { + "name": "yaml_edit", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "source_span", + "yaml" + ] + }, + { + "name": "package_config", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "file", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "glob", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "file", + "path", + "string_scanner" + ] + }, + { + "name": "async", + "version": "2.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "logging", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "quiver", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher" + ] + }, + { + "name": "matcher", + "version": "0.12.16", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { + "name": "test_api", + "version": "0.6.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "stream_channel", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "stack_trace", + "version": "1.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "ffi", + "version": "2.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_lints", + "version": "3.0.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "lints" + ] + }, + { + "name": "lints", + "version": "3.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "build_runner", + "version": "2.4.6", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "async", + "build", + "build_config", + "build_daemon", + "build_resolvers", + "build_runner_core", + "code_builder", + "collection", + "crypto", + "dart_style", + "frontend_server_client", + "glob", + "graphs", + "http_multi_server", + "io", + "js", + "logging", + "meta", + "mime", + "package_config", + "path", + "pool", + "pub_semver", + "pubspec_parse", + "shelf", + "shelf_web_socket", + "stack_trace", + "stream_transform", + "timing", + "watcher", + "web_socket_channel", + "yaml" + ] + }, + { + "name": "web_socket_channel", + "version": "2.4.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "crypto", + "stream_channel" + ] + }, + { + "name": "watcher", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "timing", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "json_annotation" + ] + }, + { + "name": "stream_transform", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "shelf_web_socket", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "shelf", + "stream_channel", + "web_socket_channel" + ] + }, + { + "name": "shelf", + "version": "1.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "http_parser", + "path", + "stack_trace", + "stream_channel" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "pubspec_parse", + "version": "1.2.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "collection", + "json_annotation", + "pub_semver", + "yaml" + ] + }, + { + "name": "pub_semver", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "pool", + "version": "1.5.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "stack_trace" + ] + }, + { + "name": "mime", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "io", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "string_scanner" + ] + }, + { + "name": "http_multi_server", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "graphs", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "frontend_server_client", + "version": "3.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "dart_style", + "version": "2.3.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "path", + "pub_semver", + "source_span" + ] + }, + { + "name": "analyzer", + "version": "6.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "_fe_analyzer_shared", + "collection", + "convert", + "crypto", + "glob", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "watcher", + "yaml" + ] + }, + { + "name": "_fe_analyzer_shared", + "version": "64.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "code_builder", + "version": "4.7.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "built_value", + "collection", + "matcher", + "meta" + ] + }, + { + "name": "built_value", + "version": "8.6.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "collection", + "fixnum", + "meta" + ] + }, + { + "name": "fixnum", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "built_collection", + "version": "5.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "build_runner_core", + "version": "7.2.11", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "build", + "build_config", + "build_resolvers", + "collection", + "convert", + "crypto", + "glob", + "graphs", + "json_annotation", + "logging", + "meta", + "package_config", + "path", + "pool", + "timing", + "watcher", + "yaml" + ] + }, + { + "name": "build_resolvers", + "version": "2.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "collection", + "convert", + "crypto", + "graphs", + "logging", + "package_config", + "path", + "pool", + "pub_semver", + "stream_transform", + "yaml" + ] + }, + { + "name": "build", + "version": "2.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "convert", + "crypto", + "glob", + "logging", + "meta", + "package_config", + "path" + ] + }, + { + "name": "build_config", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "json_annotation", + "path", + "pubspec_parse", + "yaml" + ] + }, + { + "name": "build_daemon", + "version": "4.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "built_value", + "http_multi_server", + "logging", + "path", + "pool", + "shelf", + "shelf_web_socket", + "stream_transform", + "watcher", + "web_socket_channel" + ] + }, + { + "name": "json_serializable", + "version": "6.7.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "build_config", + "collection", + "json_annotation", + "meta", + "path", + "pub_semver", + "pubspec_parse", + "source_gen", + "source_helper" + ] + }, + { + "name": "source_helper", + "version": "1.3.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "collection", + "source_gen" + ] + }, + { + "name": "source_gen", + "version": "1.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "dart_style", + "glob", + "path", + "source_span", + "yaml" + ] + }, + { + "name": "flutter_test", + "version": "0.0.0", + "kind": "dev", + "source": "sdk", + "dependencies": [ + "flutter", + "test_api", + "matcher", + "path", + "fake_async", + "clock", + "stack_trace", + "vector_math", + "async", + "boolean_selector", + "characters", + "collection", + "material_color_utilities", + "meta", + "source_span", + "stream_channel", + "string_scanner", + "term_glyph", + "web" + ] + }, + { + "name": "web", + "version": "0.1.4-beta", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "material_color_utilities", + "version": "0.5.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "characters", + "version": "1.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "vector_math", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "clock", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "fake_async", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "clock", + "collection" + ] + }, + { + "name": "flutter", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "characters", + "collection", + "material_color_utilities", + "meta", + "vector_math", + "web", + "sky_engine" + ] + }, + { + "name": "sky_engine", + "version": "0.0.99", + "kind": "transitive", + "source": "sdk", + "dependencies": [] + }, + { + "name": "screen_retriever", + "version": "0.1.9", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "rxdart", + "version": "0.27.7", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "sentry", + "version": "7.10.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "http", + "meta", + "stack_trace", + "uuid" + ] + }, + { + "name": "uuid", + "version": "3.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto" + ] + }, + { + "name": "http", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta" + ] + }, + { + "name": "sentry_flutter", + "version": "7.10.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "sentry", + "package_info_plus", + "meta", + "ffi" + ] + }, + { + "name": "package_info_plus", + "version": "4.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "flutter_web_plugins", + "http", + "meta", + "path", + "package_info_plus_platform_interface", + "win32" + ] + }, + { + "name": "win32", + "version": "5.0.9", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi" + ] + }, + { + "name": "package_info_plus_platform_interface", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "plugin_platform_interface", + "version": "2.1.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "flutter_web_plugins", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "flutter", + "characters", + "collection", + "material_color_utilities", + "meta", + "vector_math", + "web" + ] + }, + { + "name": "tuple", + "version": "2.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_foreground_task", + "version": "6.1.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface", + "platform", + "shared_preferences" + ] + }, + { + "name": "shared_preferences", + "version": "2.2.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_android", + "shared_preferences_foundation", + "shared_preferences_linux", + "shared_preferences_platform_interface", + "shared_preferences_web", + "shared_preferences_windows" + ] + }, + { + "name": "shared_preferences_windows", + "version": "2.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "flutter", + "path", + "path_provider_platform_interface", + "path_provider_windows", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_platform_interface", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "path_provider_windows", + "version": "2.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "win32" + ] + }, + { + "name": "path_provider_platform_interface", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "platform", + "plugin_platform_interface" + ] + }, + { + "name": "platform", + "version": "3.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "shared_preferences_web", + "version": "2.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_linux", + "version": "2.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "flutter", + "path", + "path_provider_linux", + "path_provider_platform_interface", + "shared_preferences_platform_interface" + ] + }, + { + "name": "path_provider_linux", + "version": "2.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "xdg_directories" + ] + }, + { + "name": "xdg_directories", + "version": "1.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "shared_preferences_foundation", + "version": "2.3.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_android", + "version": "2.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "buttplug", + "version": "0.0.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "json_annotation", + "loggy", + "web_socket_channel" + ] + }, + { + "name": "loggy", + "version": "2.0.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "stack_trace" + ] + }, + { + "name": "percent_indicator", + "version": "4.2.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "easy_debounce", + "version": "2.0.3", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "intl", + "version": "0.18.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "meta", + "path" + ] + }, + { + "name": "url_launcher", + "version": "6.1.14", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_android", + "url_launcher_ios", + "url_launcher_linux", + "url_launcher_macos", + "url_launcher_platform_interface", + "url_launcher_web", + "url_launcher_windows" + ] + }, + { + "name": "url_launcher_windows", + "version": "3.0.8", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_platform_interface", + "version": "2.1.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "url_launcher_web", + "version": "2.0.20", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_macos", + "version": "3.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_linux", + "version": "3.0.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_ios", + "version": "6.1.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_android", + "version": "6.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "version", + "version": "3.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "markdown", + "version": "7.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "args", + "meta" + ] + }, + { + "name": "github", + "version": "9.19.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "http", + "http_parser", + "json_annotation", + "meta" + ] + }, + { + "name": "flutter_loggy", + "version": "2.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "loggy", + "rxdart" + ] + }, + { + "name": "flutter_markdown", + "version": "0.6.18", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "markdown", + "meta", + "path" + ] + }, + { + "name": "settings_ui", + "version": "2.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "equatable", + "version": "2.0.5", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "flutter_bloc", + "version": "8.1.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "bloc", + "flutter", + "provider" + ] + }, + { + "name": "provider", + "version": "6.0.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "flutter", + "nested" + ] + }, + { + "name": "nested", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "bloc", + "version": "8.1.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "permission_handler", + "version": "11.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "permission_handler_android", + "permission_handler_apple", + "permission_handler_windows", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_platform_interface", + "version": "3.12.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "permission_handler_windows", + "version": "0.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_apple", + "version": "9.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_android", + "version": "11.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "network_info_plus", + "version": "4.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "nm", + "flutter", + "flutter_web_plugins", + "meta", + "network_info_plus_platform_interface", + "win32", + "ffi" + ] + }, + { + "name": "network_info_plus_platform_interface", + "version": "1.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "nm", + "version": "0.5.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "dbus" + ] + }, + { + "name": "dbus", + "version": "0.7.8", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "ffi", + "meta", + "xml" + ] + }, + { + "name": "window_manager", + "version": "0.3.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path", + "screen_retriever" + ] + }, + { + "name": "path_provider", + "version": "2.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_android", + "path_provider_foundation", + "path_provider_linux", + "path_provider_platform_interface", + "path_provider_windows" + ] + }, + { + "name": "path_provider_foundation", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "path_provider_android", + "version": "2.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "flutter_rust_bridge", + "version": "1.82.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "args", + "build_cli_annotations", + "js", + "meta", + "path", + "puppeteer", + "shelf", + "shelf_static", + "shelf_web_socket", + "uuid", + "web_socket_channel", + "yaml", + "tuple" + ] + }, + { + "name": "shelf_static", + "version": "1.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "convert", + "http_parser", + "mime", + "path", + "shelf" + ] + }, + { + "name": "puppeteer", + "version": "3.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "archive", + "async", + "collection", + "http", + "logging", + "path", + "petitparser", + "pool" + ] + }, + { + "name": "build_cli_annotations", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "meta" + ] + }, + { + "name": "flutter_local_notifications", + "version": "16.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "flutter", + "flutter_local_notifications_linux", + "flutter_local_notifications_platform_interface", + "timezone" + ] + }, + { + "name": "timezone", + "version": "0.9.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "flutter_local_notifications_platform_interface", + "version": "7.0.0+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "flutter_local_notifications_linux", + "version": "4.0.0+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "dbus", + "ffi", + "flutter", + "flutter_local_notifications_platform_interface", + "path", + "xdg_directories" + ] + }, + { + "name": "cupertino_icons", + "version": "1.0.6", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "device_info_plus", + "version": "9.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "device_info_plus_platform_interface", + "ffi", + "file", + "flutter", + "flutter_web_plugins", + "meta", + "win32", + "win32_registry" + ] + }, + { + "name": "win32_registry", + "version": "1.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "win32" + ] + }, + { + "name": "device_info_plus_platform_interface", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + } +] diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix new file mode 100644 index 0000000000000..2081e5c688561 --- /dev/null +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -0,0 +1,79 @@ +{ lib +, fetchFromGitHub +, flutter +, corrosion +, rustPlatform +, cargo +, rustc +, udev +, copyDesktopItems +, makeDesktopItem +}: +flutter.buildFlutterApplication rec { + pname = "intiface-central"; + version = "2.5.3"; + src = fetchFromGitHub { + owner = "intiface"; + repo = pname; + rev = "v${version}"; + hash = "sha256-i0G3wCfJ9Q7DEmVMrQv2K6fy4YRWsEMNns9zMZkJxvY="; + }; + patches = [ + ./corrosion.patch + ]; + + depsListFile = ./deps.json; + vendorHash = "sha256-06I9ugwUmMT16A6l5Is5v35Fu7pyE8+1mnDDPKxCYxM="; + + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${version}-cargo-deps"; + inherit src; + sourceRoot = "source/intiface-engine-flutter-bridge"; + hash = "sha256-0sCHa3rMaLYaUG3E3fmsLi0dSdb9vGyv7qNR3JQkXuU="; + }; + cargoRoot = "intiface-engine-flutter-bridge"; + + preConfigure = '' + export CMAKE_PREFIX_PATH="${corrosion}:$CMAKE_PREFIX_PATH" + ''; + + nativeBuildInputs = [ + corrosion + rustPlatform.cargoSetupHook + cargo + rustc + copyDesktopItems + ]; + + buildInputs = [ + udev + ]; + + # without this, only the splash screen will be shown and the logs will contain the + # line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'` + extraWrapProgramArgs = "--chdir $out/app"; + + postInstall = '' + mkdir -p $out/share/pixmaps + cp $out/app/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png + ''; + + desktopItems = [ + (makeDesktopItem { + name = "intiface-central"; + exec = "intiface_central"; + icon = "intiface-central"; + comment = "Intiface Central (Buttplug Frontend) Application for Desktop"; + desktopName = "Intiface Central"; + }) + ]; + + meta = with lib; { + mainProgram = "intiface_central"; + description = "Intiface Central (Buttplug Frontend) Application for Desktop"; + homepage = "https://intiface.com/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ _999eagle ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/in/invidtui/package.nix b/pkgs/by-name/in/invidtui/package.nix index bf92bfbedc644..a0def40e132ce 100644 --- a/pkgs/by-name/in/invidtui/package.nix +++ b/pkgs/by-name/in/invidtui/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "invidtui"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "darkhz"; repo = "invidtui"; rev = "refs/tags/v${version}"; - hash = "sha256-zUr0zrIJPpqhHvL7PFFN7cgcgBXV+WHO/eRes7+HzxM="; + hash = "sha256-bzstO6xaVdu7u1vBgwUjnJ9CEep0UHT73FbybBRd8y8="; }; - vendorHash = "sha256-cKvY3/3N3SESBVol7Af3M3mJaPwxLzd/rKN8P+qh7sY="; + vendorHash = "sha256-F0Iyy8H6ZRYiAlMdYGQS2p2hFN9ICmfTiRP/F9kpW7c="; doCheck = true; diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index c90365bac287d..44a039e400299 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -16,13 +16,13 @@ assert lib.assertOneOf "graphicsLibrary" graphicsLibrary [ "SDL2" "GLFW" ]; stdenv.mkDerivation (finalAttrs: { pname = "jazz2"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "deathkiller"; repo = "jazz2-native"; rev = finalAttrs.version; - hash = "sha256-oBDBq2SToab94mK0kIB0H53jJMFZrHvsdPmfAd5ZjCY="; + hash = "sha256-Rv+fU2SGxdmxfDANX+HpZDZBm9HYzSvAQDqPSQ8WJps="; }; patches = [ ./nocontent.patch ]; diff --git a/pkgs/by-name/ji/jigdo/package.nix b/pkgs/by-name/ji/jigdo/package.nix new file mode 100644 index 0000000000000..4202bd4dd3dd0 --- /dev/null +++ b/pkgs/by-name/ji/jigdo/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchurl +, gettext +, bzip2 +, db +, zlib +}: + +stdenv.mkDerivation rec { + pname = "jigdo"; + version = "0.8.2"; + + src = fetchurl { + url = "https://www.einval.com/~steve/software/jigdo/download/jigdo-${version}.tar.xz"; + hash = "sha256-NvKG2T+mtr94hfSJnJl4lNIdo6YhdlkqwWLZxqhkT54="; + }; + + # unable to parse jigdo-file.sgml + postPatch = '' + sed \ + -e "s@.*cd doc.*@@g" \ + -e "s@.*/man1.*@\t\t:@g" \ + -i Makefile.in + ''; + + strictDeps = true; + + nativeBuildInputs = [ + gettext + ]; + + buildInputs = [ + bzip2 + db + zlib + ]; + + meta = with lib; { + description = "Download utility that can fetch files from several sources simultaneously"; + homepage = "https://www.einval.com/~steve/software/jigdo/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/kd/kdsingleapplication/package.nix b/pkgs/by-name/kd/kdsingleapplication/package.nix index 22522dd6dc97c..7994435b6a604 100644 --- a/pkgs/by-name/kd/kdsingleapplication/package.nix +++ b/pkgs/by-name/kd/kdsingleapplication/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "KDSingleApplication"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "KDAB"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5YprRbfiFI2UGMJqDf+3VDwXV904USEpMEpoNm0g7KY="; + hash = "sha256-Ymm+qOZMWULg7u5xEpGzcAfIrbWBQ3jsndnFSnh6/PA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix index 45209545aa3d3..886cca9738375 100644 --- a/pkgs/by-name/ki/kikit/default.nix +++ b/pkgs/by-name/ki/kikit/default.nix @@ -16,13 +16,10 @@ , pcbnew-transition , pybars3 , versioneer +, shapely_1_8 }: let solidpython = callPackage ./solidpython { }; - - # https://github.com/yaqwsx/KiKit/issues/574 - # copy-pasted from nixpkgs#8d8e62e74f511160a599471549a98bc9e4f4818d - shapely = callPackage ./shapely { }; in buildPythonApplication rec { pname = "kikit"; @@ -48,7 +45,8 @@ buildPythonApplication rec { wxPython_4_2 pcbnew-transition pybars3 - shapely + # https://github.com/yaqwsx/KiKit/issues/574 + shapely_1_8 # https://github.com/yaqwsx/KiKit/issues/576 solidpython ]; diff --git a/pkgs/by-name/ko/koodousfinder/package.nix b/pkgs/by-name/ko/koodousfinder/package.nix new file mode 100644 index 0000000000000..6697836570819 --- /dev/null +++ b/pkgs/by-name/ko/koodousfinder/package.nix @@ -0,0 +1,42 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "koodousfinder"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "teixeira0xfffff"; + repo = "KoodousFinder"; + # Not properly tagged, https://github.com/teixeira0xfffff/KoodousFinder/issues/7 + #rev = "refs/tags/v${version}"; + rev = "d9dab5572f44e5cd45c04e6fcda38956897855d1"; + hash = "sha256-skCbt2lDKgSyZdHY3WImbr6CF0icrDPTIXNV1736gKk="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + keyring + requests + ]; + + # Project has no tests, re-check with next release + doCheck = false; + + pythonImportsCheck = [ + "koodousfinder" + ]; + + meta = with lib; { + description = "Tool to allows users to search for and analyze Android apps"; + homepage = "https://github.com/teixeira0xfffff/KoodousFinder"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix new file mode 100644 index 0000000000000..eb383c7177295 --- /dev/null +++ b/pkgs/by-name/ko/kor/package.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kor"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "yonahd"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Ov+aad+6Tp6Mm+fyjR9+xTYVlRu7uv1kD14AgSFmPMA="; + }; + + vendorHash = "sha256-HPcLjeLw3AxqZg2f5v5G4uYX65D7yXaXDZUPUgWnLFA="; + + preCheck = '' + HOME=$(mktemp -d) + export HOME + ''; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "A Golang Tool to discover unused Kubernetes Resources"; + homepage = "https://github.com/yonahd/kor"; + changelog = "https://github.com/yonahd/kor/releases/tag/v${version}"; + license = licenses.mit; + maintainers = [ maintainers.ivankovnatsky ]; + mainProgram = "kor"; + }; +} diff --git a/pkgs/by-name/ks/kseexpr/cmake_libdir.patch b/pkgs/by-name/ks/kseexpr/cmake_libdir.patch new file mode 100644 index 0000000000000..f98d5bab93cce --- /dev/null +++ b/pkgs/by-name/ks/kseexpr/cmake_libdir.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/kseexpr.pc.in b/cmake/kseexpr.pc.in +index 4b9f15f..fc76153 100644 +--- a/cmake/kseexpr.pc.in ++++ b/cmake/kseexpr.pc.in +@@ -5,7 +5,7 @@ + + # pkg-config file for KSeExpr + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + includedir=${prefix}/include + + Name: KSeExpr diff --git a/pkgs/by-name/ks/kseexpr/package.nix b/pkgs/by-name/ks/kseexpr/package.nix new file mode 100644 index 0000000000000..37e29c3a10ed2 --- /dev/null +++ b/pkgs/by-name/ks/kseexpr/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, extra-cmake-modules +, qt5 +, libsForQt5 +, bison +, flex +, llvm +}: + +stdenv.mkDerivation rec { + pname = "kseexpr"; + version = "4.0.4.0"; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "graphics"; + repo = "kseexpr"; + rev = "v${version}"; + hash = "sha256-XjFGAN7kK2b0bLouYG3OhajhOQk4AgC4EQRzseccGCE="; + }; + patches = [ + # see https://github.com/NixOS/nixpkgs/issues/144170 + ./cmake_libdir.patch + ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + qt5.wrapQtAppsHook + ]; + buildInputs = [ + bison + flex + libsForQt5.ki18n + llvm + qt5.qtbase + ]; + + meta = with lib; { + homepage = "https://invent.kde.org/graphics/kseexpr"; + description = "An embeddable expression evaluation engine"; + maintainers = with maintainers; [ nek0 ]; + license = licenses.lgpl3Plus; + }; +} diff --git a/pkgs/by-name/kt/ktls-utils/package.nix b/pkgs/by-name/kt/ktls-utils/package.nix new file mode 100644 index 0000000000000..226c00373561a --- /dev/null +++ b/pkgs/by-name/kt/ktls-utils/package.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, gnutls +, keyutils +, glib +, libnl +, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +}: + +stdenv.mkDerivation rec { + pname = "ktls-utils"; + version = "0.10"; + + src = fetchFromGitHub { + owner = "oracle"; + repo = "ktls-utils"; + rev = "ktls-utils-${version}"; + hash = "sha256-1HceFajSSq1D3IMeGQF+i/iW1lL2opLLWFfsRHW9atg="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + gnutls + keyutils + glib + libnl + ]; + + outputs = [ "out" "man" ]; + + configureFlags = lib.optional withSystemd [ "--with-systemd" ]; + + makeFlags = lib.optional withSystemd [ "unitdir=$(out)/lib/systemd/system" ]; + + doCheck = true; + + meta = with lib; { + description = "TLS handshake utilities for in-kernel TLS consumers"; + homepage = "https://github.com/oracle/ktls-utils"; + changelog = "https://github.com/oracle/ktls-utils/blob/${src.rev}/NEWS"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ ]; + mainProgram = "ktls-utils"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/by-name/ku/kubo/package.nix index 117fbc850d063..ae20f84e8170b 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.24.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.25.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version @@ -15,7 +15,7 @@ buildGoModule rec { # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-stSjLvg8G1EiXon3Qby4wLgbhX7Aaj9pnxcvE32/42k="; + hash = "sha256-+Mk3rDdtjhETmdaOOSXEFdLTJ0nX9G3qUxctsu5vrSc="; }; # tarball contains multiple files/directories diff --git a/pkgs/applications/networking/kubo/test-repoVersion.nix b/pkgs/by-name/ku/kubo/test-repoVersion.nix index 25fd8fcfbf43a..25fd8fcfbf43a 100644 --- a/pkgs/applications/networking/kubo/test-repoVersion.nix +++ b/pkgs/by-name/ku/kubo/test-repoVersion.nix diff --git a/pkgs/by-name/la/lager/package.nix b/pkgs/by-name/la/lager/package.nix new file mode 100644 index 0000000000000..11b7595fcccb3 --- /dev/null +++ b/pkgs/by-name/la/lager/package.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, boost +, immer +, zug +}: + +stdenv.mkDerivation rec { + pname = "lager"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "arximboldi"; + repo = "lager"; + rev = "v${version}"; + hash = "sha256-KTHrVV/186l4klwlcfDwFsKVoOVqWCUPzHnIbWuatbg="; + }; + buildInputs = [ + boost + immer + zug + ]; + nativeBuildInputs = [ + cmake + ]; + cmakeFlags = [ + "-Dlager_BUILD_EXAMPLES=OFF" + ]; + meta = with lib; { + homepage = "https://github.com/arximboldi/lager"; + description = "C++ library for value-oriented design using the unidirectional data-flow architecture — Redux for C++"; + license = licenses.mit; + maintainers = with maintainers; [ nek0 ]; + }; +} diff --git a/pkgs/by-name/la/lazymc/Cargo.lock b/pkgs/by-name/la/lazymc/Cargo.lock new file mode 100644 index 0000000000000..b604ac700665e --- /dev/null +++ b/pkgs/by-name/la/lazymc/Cargo.lock @@ -0,0 +1,2079 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[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 = "anyhow" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" + +[[package]] +name = "async-channel" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-io" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +dependencies = [ + "async-lock", + "autocfg 1.1.0", + "concurrent-queue", + "futures-lite", + "libc", + "log", + "parking", + "polling", + "slab", + "socket2", + "waker-fn", + "windows-sys 0.42.0", +] + +[[package]] +name = "async-lock" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +dependencies = [ + "event-listener", + "futures-lite", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel", + "async-global-executor", + "async-io", + "async-lock", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-task" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" + +[[package]] +name = "atomic-waker" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" + +[[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 = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", +] + +[[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 = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "time", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "clap" +version = "4.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +dependencies = [ + "bitflags", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", + "unicase", + "unicode-width", +] + +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi 0.3.9", +] + +[[package]] +name = "concurrent-queue" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if 1.0.0", +] + +[[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 = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "cxx" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90d59d9acd2a682b4e40605a242f6670eaa58c5957471cbf85e8aa6a0b97a5e8" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebfa40bda659dd5c864e65f4c9a2b0aff19bea56b017b9b77c73d3766a453a38" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "457ce6757c5c70dc6ecdbda6925b958aae7f959bda7d8fb9bde889e34a09dc03" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebf883b7aacd7b2aeb2a7b338648ee19f57c140d4ee8e52c68979c6b2f7f2263" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "darling" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "err-derive" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "rustversion", + "syn", + "synstructure", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + +[[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 = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "windows-sys 0.45.0", +] + +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fsevent" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" +dependencies = [ + "bitflags", + "fsevent-sys", +] + +[[package]] +name = "fsevent-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" +dependencies = [ + "libc", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "futures" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" + +[[package]] +name = "futures-executor" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" + +[[package]] +name = "futures-lite" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-sink" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" + +[[package]] +name = "futures-task" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" + +[[package]] +name = "futures-util" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[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 = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "inotify" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" +dependencies = [ + "bitflags", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "is-terminal" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.45.0", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lazymc" +version = "0.2.10" +dependencies = [ + "anyhow", + "async-std", + "base64", + "bytes", + "chrono", + "clap", + "colored", + "derive_builder", + "dotenv", + "flate2", + "futures", + "libc", + "log", + "md-5", + "minecraft-protocol", + "named-binary-tag", + "nix", + "notify", + "pretty_env_logger", + "proxy-protocol", + "quartz_nbt", + "rand 0.8.5", + "rcon", + "serde", + "serde_json", + "shlex", + "thiserror", + "tokio", + "toml", + "uuid", + "version-compare", + "winapi 0.3.9", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if 1.0.0", + "value-bag", +] + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + +[[package]] +name = "md5" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e6bcd6433cff03a4bfc3d9834d504467db1f1cf6d0ea765d37d330249ed629d" + +[[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 1.1.0", +] + +[[package]] +name = "minecraft-protocol" +version = "0.1.0" +source = "git+https://github.com/timvisee/rust-minecraft-protocol?rev=edfdf87#edfdf876c0c21be02afdd885e3400983f3137ec9" +dependencies = [ + "byteorder", + "minecraft-protocol-derive", + "named-binary-tag", + "serde", + "serde_json", + "uuid", +] + +[[package]] +name = "minecraft-protocol-derive" +version = "0.0.0" +source = "git+https://github.com/timvisee/rust-minecraft-protocol?rev=edfdf87#edfdf876c0c21be02afdd885e3400983f3137ec9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.45.0", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log", + "mio 0.6.23", + "slab", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "named-binary-tag" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523298fac63bd954f9a2e03b962b8a4a0e95110ad1b2fa3e0d7048660ffecec3" +dependencies = [ + "byteorder", + "flate2", + "linked-hash-map", +] + +[[package]] +name = "net2" +version = "0.2.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "libc", + "memoffset", + "pin-utils", + "static_assertions", +] + +[[package]] +name = "notify" +version = "4.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" +dependencies = [ + "bitflags", + "filetime", + "fsevent", + "fsevent-sys", + "inotify", + "libc", + "mio 0.6.23", + "mio-extras", + "walkdir", + "winapi 0.3.9", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg 1.1.0", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg 1.1.0", +] + +[[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 = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + +[[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 = "polling" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" +dependencies = [ + "autocfg 1.1.0", + "cfg-if 1.0.0", + "libc", + "log", + "wepoll-ffi", + "windows-sys 0.42.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_env_logger" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" +dependencies = [ + "env_logger", + "log", +] + +[[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", + "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.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proxy-protocol" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e50c72c21c738f5c5f350cc33640aee30bf7cd20f9d9da20ed41bce2671d532" +dependencies = [ + "bytes", + "snafu", +] + +[[package]] +name = "quartz_nbt" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "348031720b71761481d77969dcb3c89ab06f04132ee1503aca1bd9313eef5e67" +dependencies = [ + "anyhow", + "byteorder", + "cesu8", + "flate2", + "quartz_nbt_macros", +] + +[[package]] +name = "quartz_nbt_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "289baa0c8a4d1f840d2de528a7f8c29e0e9af48b3018172b3edad4f716e8daed" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ + "autocfg 0.1.8", + "libc", + "rand_chacha 0.1.1", + "rand_core 0.4.2", + "rand_hc", + "rand_isaac", + "rand_jitter", + "rand_os", + "rand_pcg", + "rand_xorshift", + "winapi 0.3.9", +] + +[[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.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.3.1", +] + +[[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 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[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_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ + "libc", + "rand_core 0.4.2", + "winapi 0.3.9", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi 0.3.9", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rcon" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b7fdd146f86bd90fa2d4cf83a28b45f058e90bcf11ed0cce134e757928771e6" +dependencies = [ + "async-std", + "bytes", + "err-derive", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustix" +version = "0.36.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustversion" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[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 = "scratch" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "snafu" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eab12d3c261b2308b0d80c26fffb58d17eba81a4be97890101f416b478c79ca7" +dependencies = [ + "doc-comment", + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[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 = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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 0.3.9", +] + +[[package]] +name = "tokio" +version = "1.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +dependencies = [ + "autocfg 1.1.0", + "bytes", + "libc", + "memchr", + "mio 0.8.6", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.42.0", +] + +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "uuid" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" +dependencies = [ + "md5", + "rand 0.6.5", + "serde", +] + +[[package]] +name = "value-bag" +version = "1.0.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +dependencies = [ + "ctor", + "version_check", +] + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi 0.3.9", + "winapi-util", +] + +[[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" + +[[package]] +name = "wasm-bindgen" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if 1.0.0", + "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", + "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 1.0.0", + "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", + "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 = "wepoll-ffi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +dependencies = [ + "cc", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[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-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[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 0.3.9", +] + +[[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.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "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-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] diff --git a/pkgs/by-name/la/lazymc/package.nix b/pkgs/by-name/la/lazymc/package.nix new file mode 100644 index 0000000000000..ea79235245f35 --- /dev/null +++ b/pkgs/by-name/la/lazymc/package.nix @@ -0,0 +1,42 @@ +{ + lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "lazymc"; + version = "0.2.10"; + + src = fetchFromGitHub { + owner = "timvisee"; + repo = "lazymc"; + rev = "v${version}"; + hash = "sha256-IObLjxuMJDjZ3M6M1DaPvmoRqAydbLKdpTQ3Vs+B9Oo="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "minecraft-protocol-0.1.0" = "sha256-vSFS1yVxTBSpx/ZhzA3EjcZyOWHbmoGARl0eMn1fJ+4="; + }; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Remote wake-up daemon for minecraft servers"; + homepage = "https://github.com/timvisee/lazymc"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ h7x4 dandellion ]; + platforms = platforms.unix; + mainProgram = "lazymc"; + }; +} diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/by-name/le/ledger/package.nix index 2e8336660be7b..2e8336660be7b 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/by-name/le/ledger/package.nix diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 877f69ccbf2c3..60e3de2c5cc93 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.5.3"; + version = "1.5.5"; in buildGoModule rec { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule rec { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-pC6kEDOXNcuMfDvXomPZVMWpS/aHR4P4pIhqNkXAGuc="; + hash = "sha256-TNXnXQMlMNXKPxN5GneZr+LyByfQX2TToUebpdD/d+U="; }; vendorHash = "sha256-/VLS7+nPERjIU7V2CzqXH69Z3/y+GKZbAFn+KcRKRuA="; diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix index fcb3bea4a7b30..c4f52fcc0902c 100644 --- a/pkgs/by-name/le/legba/package.nix +++ b/pkgs/by-name/le/legba/package.nix @@ -4,23 +4,24 @@ , cmake , pkg-config , openssl +, samba }: rustPlatform.buildRustPackage rec { pname = "legba"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "evilsocket"; repo = "legba"; rev = "v${version}"; - hash = "sha256-/ASjvlsPQAPNZpzdTTyZYrcYImV2GS+SSfhSQP0K2n0="; + hash = "sha256-7HDW5M0lsKbcQw3p/CYmUeX2xE4BZXUSNqa9Ab/ZP0I="; }; - cargoHash = "sha256-QgnJ/oUpW4o2Hi2+xKfprxjCw4sho8kIyW+AUJ9pwuU="; + cargoHash = "sha256-rkqwc8BILW/OIHa95skkG4IDlBfH3qX1ROJgcn8f2W0="; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl.dev ]; + buildInputs = [ openssl.dev samba ]; # Paho C test fails due to permission issue doCheck = false; diff --git a/pkgs/by-name/li/liana/Cargo.lock b/pkgs/by-name/li/liana/Cargo.lock index 9fc3c2e592dab..0aaadec617379 100644 --- a/pkgs/by-name/li/liana/Cargo.lock +++ b/pkgs/by-name/li/liana/Cargo.lock @@ -61,6 +61,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] name = "ahash" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -96,6 +131,12 @@ dependencies = [ ] [[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] name = "approx" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -118,9 +159,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 = "ash" @@ -133,17 +174,18 @@ dependencies = [ [[package]] name = "async-hwi" -version = "0.0.11" +version = "0.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29e54987aab24867f5259b95d5c7f3d46bf69ad8ddfb01dde24a88c00a9e93d" +checksum = "2a1d739fac959bf5e332425995a1892f99d94f39acd8acf36fe6c212f9583e0c" dependencies = [ "async-trait", "base64 0.13.1", + "bitbox-api", "bitcoin", "futures", "hidapi", "ledger-apdu", - "ledger-transport-hid", + "ledger-transport-hidapi", "ledger_bitcoin_client", "regex", "serialport", @@ -184,6 +226,12 @@ dependencies = [ ] [[package]] +name = "base32" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" + +[[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -205,6 +253,12 @@ dependencies = [ ] [[package]] +name = "bdk_coin_select" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0320167c3655e83f0415d52f39618902e449186ffc7dfb090f922f79675c316" + +[[package]] name = "bech32" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -243,6 +297,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" [[package]] +name = "bitbox-api" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb3e44c693da4b4db46e2e3f2beb28479cb6a0bd4ebda12f1f22b39a48188f88" +dependencies = [ + "async-trait", + "base32", + "bitcoin", + "byteorder", + "getrandom", + "hex", + "hidapi", + "noise-protocol", + "noise-rust-crypto", + "num-bigint", + "prost 0.12.2", + "prost-build", + "semver", + "serde", + "serde_json", + "thiserror", + "tokio", + "zeroize", +] + +[[package]] name = "bitcoin" version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -288,12 +368,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[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" @@ -387,6 +485,30 @@ dependencies = [ ] [[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +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 = "checked_int_cast" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -408,6 +530,17 @@ dependencies = [ ] [[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] name = "clipboard-win" version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -601,6 +734,15 @@ dependencies = [ ] [[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -682,12 +824,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[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 = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] name = "cty" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] +name = "curve25519-dalek" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "fiat-crypto", + "platforms", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] name = "cxx" version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -784,6 +972,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] name = "dirs" version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -921,6 +1120,33 @@ 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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +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 = "error-code" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -978,6 +1204,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] name = "fern" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -987,6 +1222,12 @@ dependencies = [ ] [[package]] +name = "fiat-crypto" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" + +[[package]] name = "filetime" version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1008,6 +1249,12 @@ dependencies = [ ] [[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] name = "flate2" version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1245,6 +1492,16 @@ 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 = "gethostname" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1268,6 +1525,16 @@ dependencies = [ ] [[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] name = "gif" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1513,7 +1780,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1554,6 +1821,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" [[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] name = "hashlink" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1593,6 +1866,12 @@ dependencies = [ ] [[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1612,9 +1891,9 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "hidapi" -version = "1.5.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "798154e4b6570af74899d71155fb0072d5b17e6aa12f39c8ef22c60fb8ec99e7" +checksum = "723777263b0dcc5730aec947496bd8c3940ba63c15f5633b288cc615f4f6af79" dependencies = [ "cc", "libc", @@ -1935,6 +2214,25 @@ 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 = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1947,12 +2245,32 @@ dependencies = [ ] [[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.2", + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "ipnet" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[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" @@ -1975,9 +2293,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -2047,7 +2365,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d676038719d1c892f91e6e85121550143c75880b42f7feff6d413a078cf91fb3" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", ] [[package]] @@ -2084,10 +2402,10 @@ dependencies = [ ] [[package]] -name = "ledger-transport-hid" +name = "ledger-transport-hidapi" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ba81a1f5f24396b37211478aff7fbcd605dd4544df8dbed07b9da3c2057aee" +checksum = "e27139d540e4271fa55b67b8cb94c6f100931042dcc663db1c2395fa3ffb8599" dependencies = [ "byteorder", "cfg-if", @@ -2112,10 +2430,11 @@ dependencies = [ [[package]] name = "liana" -version = "2.0.0" -source = "git+https://github.com/wizardsardine/liana?branch=2.x#bb081099241b38d36942d9344668ed88fa05f993" +version = "4.0.0" +source = "git+https://github.com/wizardsardine/liana?branch=4.x#1e2fba15caac5bcbafac9248ec4bf01b3123ccd6" dependencies = [ "backtrace", + "bdk_coin_select", "bip39", "dirs 5.0.0", "fern", @@ -2132,7 +2451,7 @@ dependencies = [ [[package]] name = "liana_gui" -version = "2.0.0" +version = "4.0.0" dependencies = [ "async-hwi", "backtrace", @@ -2241,6 +2560,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[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" @@ -2285,7 +2610,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "euclid", "num-traits", ] @@ -2464,6 +2789,12 @@ dependencies = [ ] [[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] name = "mutate_once" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2479,7 +2810,7 @@ dependencies = [ "bitflags", "codespan-reporting", "hexf-parse", - "indexmap", + "indexmap 1.9.3", "log", "num-traits", "rustc-hash", @@ -2615,6 +2946,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" [[package]] +name = "noise-protocol" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2473d39689a839f5a363aaef7d99f76d5611bf352286682b25a6644fec18b1d3" +dependencies = [ + "arrayvec 0.7.4", +] + +[[package]] +name = "noise-rust-crypto" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c6159f60beb3bbbcdc266bc789bfc6c37fdad7d7ca7152d3e049ef5af633f0" +dependencies = [ + "aes-gcm", + "blake2", + "chacha20poly1305", + "noise-protocol", + "sha2", + "x25519-dalek", + "zeroize", +] + +[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2635,6 +2990,17 @@ dependencies = [ ] [[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2671,7 +3037,7 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] @@ -2751,6 +3117,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] name = "ordered-float" version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2896,6 +3268,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[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 = "phf" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2982,6 +3364,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] +name = "platforms" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" + +[[package]] name = "png" version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2994,12 +3382,45 @@ 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 = "polyval" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] name = "ppv-lite86" version = "0.2.17" 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 = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3041,9 +3462,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -3055,6 +3476,83 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74605f360ce573babfe43964cbe520294dcb081afbf8c108fc6e23036b4da2df" [[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive 0.11.9", +] + +[[package]] +name = "prost" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5a410fc7882af66deb8d01d01737353cf3ad6204c408177ba494291a626312" +dependencies = [ + "bytes", + "prost-derive 0.12.2", +] + +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes", + "heck", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease", + "prost 0.11.9", + "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" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-derive" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "065717a5dfaca4a83d2fe57db3487b311365200000551d7a364e715dbf4346bc" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost 0.11.9", +] + +[[package]] name = "qoi" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3074,9 +3572,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5907a1b7c277254a8b15170f6e7c97cfa60ee7872a3217663bb81151e48184bb" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -3373,6 +3871,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[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.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] name = "rustls" version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3495,6 +4016,12 @@ dependencies = [ ] [[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + +[[package]] name = "serde" version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3576,6 +4103,17 @@ dependencies = [ ] [[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] name = "sharded-slab" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3768,6 +4306,12 @@ 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 = "svg_fmt" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3836,6 +4380,20 @@ dependencies = [ ] [[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] name = "termcolor" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3927,7 +4485,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" dependencies = [ "arrayref", - "arrayvec 0.7.2", + "arrayvec 0.7.4", "bytemuck", "cfg-if", "png", @@ -4057,7 +4615,7 @@ version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ - "indexmap", + "indexmap 1.9.3", "toml_datetime", "winnow", ] @@ -4150,6 +4708,12 @@ dependencies = [ ] [[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" @@ -4219,6 +4783,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 = "untrusted" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4315,9 +4889,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4325,24 +4899,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -4352,9 +4926,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4362,22 +4936,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-timer" @@ -4505,7 +5079,7 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "cfg-if", "js-sys", "log", @@ -4529,7 +5103,7 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "bit-vec", "bitflags", "codespan-reporting", @@ -4553,7 +5127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" dependencies = [ "android_system_properties", - "arrayvec 0.7.2", + "arrayvec 0.7.4", "ash", "bit-set", "bitflags", @@ -4612,6 +5186,17 @@ dependencies = [ ] [[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + +[[package]] name = "widestring" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4949,6 +5534,17 @@ dependencies = [ ] [[package]] +name = "x25519-dalek" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +dependencies = [ + "curve25519-dalek", + "rand_core", + "zeroize", +] + +[[package]] name = "xcursor" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4976,6 +5572,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" [[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] name = "zip" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix index 5aaecac630878..043c35770955e 100644 --- a/pkgs/by-name/li/liana/package.nix +++ b/pkgs/by-name/li/liana/package.nix @@ -32,19 +32,19 @@ let in rustPlatform.buildRustPackage rec { pname = "liana"; - version = "2.0"; + version = "4.0"; src = fetchFromGitHub { owner = "wizardsardine"; repo = pname; rev = "v${version}"; - hash = "sha256-GQNPKlqOBoh684x57gVV3CImgO7HBqt3UFp6CHC13do="; + hash = "sha256-aeNbPtzS8QhZ+d/HC9/Nx1GvIWsCrjUrMqghIspt2+o="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "liana-2.0.0" = "sha256-Dv/Ad8Kv7Mit8yhewzANbUbngQjtQaap/NQy9jqnbfA="; + "liana-4.0.0" = "sha256-GT5/HlFU+Cf/Q5aQoT6ldZ+f+7I+S3wpUbq3JAhJjz8="; "iced_futures-0.6.0" = "sha256-ejkAxU6DwiX1/119eA0GRapSmz7dqwx9M0uMwyDHATQ="; }; }; @@ -81,6 +81,7 @@ rustPlatform.buildRustPackage rec { doCheck = true; meta = with lib; { + mainProgram = "liana-gui"; description = "A Bitcoin wallet leveraging on-chain timelocks for safety and recovery"; homepage = "https://wizardsardine.com/liana"; license = licenses.bsd3; diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix new file mode 100644 index 0000000000000..06284bfd5eafb --- /dev/null +++ b/pkgs/by-name/li/libfmvoice/package.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libfmvoice"; + version = "0.0.0-unstable-2023-12-05"; + + src = fetchFromGitHub { + owner = "vampirefrog"; + repo = "libfmvoice"; + rev = "38b1a0c627ef66fcd9c672c215d2b9849163df12"; + hash = "sha256-kXthY9TynIXNX9wmgn13vs4Mrrv/dmEr7zlWiKstjGk="; + }; + + strictDeps = true; + + enableParallelBuilding = true; + + buildInputs = [ + zlib + ]; + + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + installPhase = '' + runHook preInstall + + for prog in $(grep 'PROGS=' Makefile | cut -d'=' -f2); do + install -Dm755 $prog $out/bin/$prog + done + + runHook postInstall + ''; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + description = "C library for loading, saving and converting FM sound chip voice files in various formats"; + homepage = "https://github.com/vampirefrog/libfmvoice"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/li/libmbd/package.nix b/pkgs/by-name/li/libmbd/package.nix new file mode 100644 index 0000000000000..ccb42ef49cfb7 --- /dev/null +++ b/pkgs/by-name/li/libmbd/package.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitHub +, lib +, cmake +, mpi +, blas +, lapack +, scalapack +, gfortran +} : + +assert !blas.isILP64; +assert !lapack.isILP64; + +stdenv.mkDerivation rec { + pname = "libMBD"; + version = "0.12.7"; + + src = fetchFromGitHub { + owner = "libmbd"; + repo = pname; + rev = version; + hash = "sha256-39cvOUTAuuWLGOLdapR5trmCttCnijOWvPhSBTeTxTA="; + }; + + preConfigure = '' + cat > cmake/libMBDVersionTag.cmake << EOF + set(VERSION_TAG "${version}") + EOF + ''; + + nativeBuildInputs = [ cmake gfortran ]; + + buildInputs = [ blas lapack scalapack ]; + + propagatedBuildInputs = [ mpi ]; + + meta = with lib; { + description = "Many-body dispersion library"; + homepage = "https://github.com/libmbd/libmbd"; + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix new file mode 100644 index 0000000000000..c2c2f6b18ea2c --- /dev/null +++ b/pkgs/by-name/li/libui-ng/package.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, cmocka +, darwin +, fetchFromGitHub +, gtk3 +, meson +, ninja +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "libui-ng"; + version = "unstable-2023-12-19"; + + src = fetchFromGitHub { + owner = "libui-ng"; + repo = "libui-ng"; + rev = "8de4a5c8336f82310df1c6dad51cb732113ea114"; + hash = "sha256-ZMt2pEHwxXxLWtK8Rm7hky9Kxq5ZIB0olBLf1d9wVfc="; + }; + + postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace meson.build --replace "'-arch', 'arm64'" "" + ''; + + nativeBuildInputs = [ + cmocka + meson + ninja + pkg-config + ]; + + buildInputs = + if stdenv.isDarwin then [ + darwin.libobjc + darwin.apple_sdk_11_0.Libsystem + darwin.apple_sdk_11_0.frameworks.Cocoa + darwin.apple_sdk_11_0.frameworks.AppKit + darwin.apple_sdk_11_0.frameworks.CoreFoundation + ] else [ + gtk3 + ]; + + mesonFlags = [ + (lib.mesonBool "examples" (!stdenv.isDarwin)) + ]; + + meta = with lib; { + description = "A portable GUI library for C"; + homepage = "https://github.com/libui-ng/libui-ng"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/li/linien-gui/package.nix b/pkgs/by-name/li/linien-gui/package.nix new file mode 100644 index 0000000000000..ba6f6d6b58939 --- /dev/null +++ b/pkgs/by-name/li/linien-gui/package.nix @@ -0,0 +1,47 @@ +{ lib +, python3 +, qt5 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "linien-gui"; + pyproject = true; + + inherit (python3.pkgs.linien-common) src version; + + sourceRoot = "source/linien-gui"; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ] ++ [ + qt5.wrapQtAppsHook + ]; + + # Makes qt-wayland appear in the qt paths injected by the wrapper - helps users + # with `QT_QPA_PLATFORM=wayland` in their environment. + buildInputs = [ + qt5.qtwayland + ]; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + click + pyqtgraph + pyqt5 + superqt + linien-client + ]; + + dontWrapQtApps = true; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Graphical user interface of the Linien spectroscopy lock application"; + homepage = "https://github.com/linien-org/linien/tree/develop/linien-gui"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fsagbuya doronbehar ]; + }; +} diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index c93044c71a9f8..e2faec3d3fdb7 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "14.0.1"; + version = "15.2.0"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-xuHrxi/1zfeY2dd625iLDNJFoNO28JJrPvmECdqeZXk="; + hash = "sha256-Vziz8pV3pd1Rp6X6mHzyD22Z3q5LJJTXQ8kFuHpVgKc="; }; - npmDepsHash = "sha256-4lyTBmcX5k//kbFHmzbOQJp+Jd9TPY7bzm51QuiXUzE="; + npmDepsHash = "sha256-BKgncl53MKFDASXo6I2Vn3v54iTL/h9gykJ3PWNUGQU="; dontNpmBuild = true; diff --git a/pkgs/by-name/li/listen1/package.nix b/pkgs/by-name/li/listen1/package.nix new file mode 100644 index 0000000000000..c240c56f6fdfa --- /dev/null +++ b/pkgs/by-name/li/listen1/package.nix @@ -0,0 +1,33 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "listen1"; + version = "2.31.0"; + src = fetchurl { + url = "https://github.com/listen1/listen1_desktop/releases/download/v${version}/listen1_${version}_linux_x86_64.AppImage"; + hash = "sha256-nYDKexVzVuwPmv/eK9cB0oASgXEZbrPrzqPu5OHk6NQ="; + }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + install -m 444 -D ${appimageContents}/listen1.desktop -t $out/share/applications + substituteInPlace $out/share/applications/listen1.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/listen1.png \ + $out/share/icons/hicolor/512x512/apps/listen1.png + ''; + + meta = with lib; { + description = "One for all free music in China"; + homepage = "http://listen1.github.io/listen1/"; + license = licenses.mit; + maintainers = with maintainers; [ running-grass ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "listen1"; + }; +} diff --git a/pkgs/by-name/li/livekit-cli/package.nix b/pkgs/by-name/li/livekit-cli/package.nix new file mode 100644 index 0000000000000..2ed5129a6d137 --- /dev/null +++ b/pkgs/by-name/li/livekit-cli/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "livekit-cli"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "livekit"; + repo = "livekit-cli"; + rev = "v${version}"; + hash = "sha256-pzVzfs0bwG9n7fa0ouQiCFrbXAqkfovEIjVmrHFdqtI="; + }; + + vendorHash = "sha256-pM5DeaukY6x4RDryLvSEQASSwtOaLiiLObjhdWBYd8k="; + + subPackages = [ "cmd/livekit-cli" ]; + + meta = with lib; { + description = "Command line interface to LiveKit"; + homepage = "https://livekit.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ mgdelacroix ]; + mainProgram = "livekit-cli"; + }; +} diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix new file mode 100644 index 0000000000000..54cdfbcf25f8b --- /dev/null +++ b/pkgs/by-name/li/livekit/package.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "livekit"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "livekit"; + repo = "livekit"; + rev = "v${version}"; + hash = "sha256-3KRES/2mGO6b1ZZEGx29Yu5wgEG4NOJ7/J0xPvQiNWk="; + }; + + vendorHash = "sha256-5wByIkMs3321u4/2vPpsZ/L5zlcgrZo0b+NjeMR1RWE="; + + subPackages = [ "cmd/server" ]; + + postInstall = '' + mv $out/bin/server $out/bin/livekit-server + ''; + + meta = with lib; { + description = "End-to-end stack for WebRTC. SFU media server and SDKs"; + homepage = "https://livekit.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ mgdelacroix ]; + mainProgram = "livekit-server"; + }; +} diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 77a452a26cb0a..ee23810c35472 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -17,11 +17,15 @@ , openclSupport ? false , clblast -, openblasSupport ? true +, openblasSupport ? !rocmSupport , openblas , pkg-config }: +assert lib.assertMsg + (lib.count lib.id [openclSupport openblasSupport rocmSupport] == 1) + "llama-cpp: exactly one of openclSupport, openblasSupport and rocmSupport should be enabled"; + let cudatoolkit_joined = symlinkJoin { name = "${cudaPackages.cudatoolkit.name}-merged"; @@ -38,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "1573"; + version = "1710"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-FEH0SI87qtezc++TAR38wfldx6/1GknuTBWGn+UyFPI="; + hash = "sha256-fbzHjaL+qAE9HdtBVxboo8T2/KCdS5O1RkTQvDwD/xs="; }; patches = [ diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index a42fb0f87d59b..06820aa28a195 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -19,13 +19,13 @@ , gnome }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "loupe"; - version = "45.2"; + version = "45.3"; src = fetchurl { - url = "mirror://gnome/sources/loupe/${lib.versions.major version}/loupe-${version}.tar.xz"; - hash = "sha256-uLP/rzZXAmsX4E8Z4EDLqNUetNDKtU5CKVsOWlJxwKs="; + url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz"; + hash = "sha256-9l8tEgjQhatf+pmN1DyS/pUictTVm1HP7MEevf/KLYY="; }; patches = [ @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "loupe"; }; -} +}) diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix new file mode 100644 index 0000000000000..a6445fad4347c --- /dev/null +++ b/pkgs/by-name/lo/louvre/package.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, fontconfig +, icu +, libdrm +, libGL +, libinput +, libX11 +, libXcursor +, libxkbcommon +, mesa +, pixman +, seatd +, srm-cuarzo +, udev +, wayland +, xorgproto +}: +stdenv.mkDerivation (self: { + pname = "louvre"; + version = "1.1.0-1"; + rev = "v${self.version}"; + hash = "sha256-HwvX0ykl2+4MBcIixmEknFtsB0QC4w1QDzQz1589bl0="; + + src = fetchFromGitHub { + inherit (self) rev hash; + owner = "CuarzoSoftware"; + repo = "Louvre"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + fontconfig + icu + libdrm + libGL + libinput + libX11 + libXcursor + libxkbcommon + mesa + pixman + seatd + srm-cuarzo + udev + wayland + xorgproto + ]; + + outputs = [ "out" "dev" ]; + + preConfigure = '' + # The root meson.build file is in src/ + cd src + ''; + + meta = { + description = "C++ library for building Wayland compositors"; + homepage = "https://github.com/CuarzoSoftware/Louvre"; + mainProgram = "louvre-views"; + maintainers = [ lib.maintainers.dblsaiko ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/lx/lxd-to-incus/package.nix b/pkgs/by-name/lx/lxd-to-incus/package.nix index 1f416df6b2a4c..b9c15347d3ba3 100644 --- a/pkgs/by-name/lx/lxd-to-incus/package.nix +++ b/pkgs/by-name/lx/lxd-to-incus/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "lxd-to-incus"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lxc"; repo = "incus"; rev = "refs/tags/v${version}"; - hash = "sha256-oPBrIN4XUc9GnBszEWAAnEcNahV4hfB48XSKvkpq5Kk="; + hash = "sha256-crWepf5j3Gd1lhya2DGIh/to7l+AnjKJPR+qUd9WOzw="; }; modRoot = "cmd/lxd-to-incus"; - vendorHash = "sha256-/ONflpW1HGvXooPF+Xui8q4xFu/Zq5br+Vjm9d2gm5U="; + vendorHash = "sha256-cBAqJz3Y4CqyxTt7u/4mXoQPKmKgQ3gYJV1NiC/H+TA="; CGO_ENABLED = 0; @@ -33,7 +33,7 @@ buildGoModule rec { description = "LXD to Incus migration tool"; homepage = "https://linuxcontainers.org/incus"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ adamcstephens ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ma/maid/Gemfile b/pkgs/by-name/ma/maid/Gemfile new file mode 100644 index 0000000000000..9ac699f872dcf --- /dev/null +++ b/pkgs/by-name/ma/maid/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' +gem 'maid', '~> 0.10.0' +gem 'rake' diff --git a/pkgs/by-name/ma/maid/Gemfile.lock b/pkgs/by-name/ma/maid/Gemfile.lock new file mode 100644 index 0000000000000..c78adf5ba292d --- /dev/null +++ b/pkgs/by-name/ma/maid/Gemfile.lock @@ -0,0 +1,55 @@ +GEM + remote: https://rubygems.org/ + specs: + concurrent-ruby (1.2.2) + deprecated (3.0.1) + dimensions (1.3.0) + escape (0.0.4) + et-orbi (1.2.7) + tzinfo + exifr (1.3.10) + ffi (1.15.5) + fugit (1.8.1) + et-orbi (~> 1, >= 1.2.7) + raabro (~> 1.4) + geocoder (1.8.2) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + maid (0.10.0) + deprecated (~> 3.0.0) + dimensions (>= 1.0.0, < 2.0) + escape (>= 0.0.1, < 0.1.0) + exifr (~> 1.3.10) + geocoder (~> 1.8.1) + listen (~> 3.8.0) + mime-types (~> 3.0, < 4.0) + rubyzip (~> 2.3.2) + rufus-scheduler (~> 3.8.2) + thor (~> 1.2.1) + xdg (~> 2.2.3) + mime-types (3.5.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2023.0808) + raabro (1.4.0) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rubyzip (2.3.2) + rufus-scheduler (3.8.2) + fugit (~> 1.1, >= 1.1.6) + thor (1.2.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + xdg (2.2.5) + +PLATFORMS + ruby + +DEPENDENCIES + maid (~> 0.10.0) + rake + +BUNDLED WITH + 2.3.26 diff --git a/pkgs/by-name/ma/maid/gemset.nix b/pkgs/by-name/ma/maid/gemset.nix new file mode 100644 index 0000000000000..f82ef7bed37a2 --- /dev/null +++ b/pkgs/by-name/ma/maid/gemset.nix @@ -0,0 +1,230 @@ +{ + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + type = "gem"; + }; + version = "1.2.2"; + }; + deprecated = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ky20wy29jdhfy4xdw1lgxggciq4ywizmh265fyvwxbj6svw6b03"; + type = "gem"; + }; + version = "3.0.1"; + }; + dimensions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jlkyfqk14291wbw8ly46jvp8vrcvswlns4078y1m44bb3rgm123"; + type = "gem"; + }; + version = "1.3.0"; + }; + escape = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sa1xkfc9jvkwyw1jbz3jhkq0ms1zrvswi6mmfiwcisg5fp497z4"; + type = "gem"; + }; + version = "0.0.4"; + }; + et-orbi = { + dependencies = ["tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v"; + type = "gem"; + }; + version = "1.2.7"; + }; + exifr = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08fmmswa9fwymwsa2gzlm856ak3y9kjxdzm4zdrcrfyxs2p8yqwc"; + type = "gem"; + }; + version = "1.3.10"; + }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; + fugit = { + dependencies = ["et-orbi" "raabro"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cm2lrvhrpqq19hbdsxf4lq2nkb2qdldbdxh3gvi15l62dlb5zqq"; + type = "gem"; + }; + version = "1.8.1"; + }; + geocoder = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "120lqyq308q8hg8ykawd7cp3k2ck8z9g5f9ffijp8dn2k9f21fjc"; + type = "gem"; + }; + version = "1.8.2"; + }; + listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn"; + type = "gem"; + }; + version = "3.8.0"; + }; + maid = { + dependencies = ["deprecated" "dimensions" "escape" "exifr" "geocoder" "listen" "mime-types" "rubyzip" "rufus-scheduler" "thor" "xdg"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v1lhwgxyli10rinw6h33ikhskx9j3b20h7plrx8c69z05sfsdd9"; + type = "gem"; + }; + version = "0.10.0"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; + type = "gem"; + }; + version = "3.5.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; + type = "gem"; + }; + version = "3.2023.0808"; + }; + raabro = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10m8bln9d00dwzjil1k42i5r7l82x25ysbi45fwyv4932zsrzynl"; + type = "gem"; + }; + version = "1.4.0"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + rb-fsevent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; + type = "gem"; + }; + version = "0.11.2"; + }; + rb-inotify = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + type = "gem"; + }; + version = "0.10.1"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + rufus-scheduler = { + dependencies = ["fugit"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1as4yrb8y5lq49div8p3vqgwrrhdgwnvx4m73y3712nmnlpx6cws"; + type = "gem"; + }; + version = "3.8.2"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; + type = "gem"; + }; + version = "1.2.2"; + }; + tzinfo = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; + type = "gem"; + }; + version = "2.0.6"; + }; + xdg = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04xr4cavnzxlk926pkji7b5yiqy4qsd3gdvv8mg6jliq6sczg9gk"; + type = "gem"; + }; + version = "2.2.5"; + }; +} diff --git a/pkgs/by-name/ma/maid/package.nix b/pkgs/by-name/ma/maid/package.nix new file mode 100644 index 0000000000000..f7f237d085fda --- /dev/null +++ b/pkgs/by-name/ma/maid/package.nix @@ -0,0 +1,23 @@ +{ bundlerApp +, bundlerUpdateScript +, callPackage +, lib +}: + +bundlerApp { + pname = "maid"; + gemdir = ./.; + exes = [ "maid" ]; + + passthru.updateScript = bundlerUpdateScript "maid"; + + passthru.tests.run = callPackage ./test.nix { }; + + meta = with lib; { + description = "Rule-based file mover and cleaner in Ruby"; + homepage = "https://github.com/maid/maid"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ alanpearce ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/ma/maid/test.nix b/pkgs/by-name/ma/maid/test.nix new file mode 100644 index 0000000000000..722481f2dfcb2 --- /dev/null +++ b/pkgs/by-name/ma/maid/test.nix @@ -0,0 +1,20 @@ +{ runCommandLocal, maid }: + +runCommandLocal "test-maid-run" { + nativeBuildInputs = [ maid ]; +} + '' + mkdir -p $out/test + export HOME=$out + cd $out + touch test/a.iso test/b.txt + cat > rules.rb <<EOF + Maid.rules do + rule 'ISO' do + trash(dir('test/*.iso')) + end + end + EOF + maid clean --rules rules.rb --force + [ -f test/b.txt ] && [ ! -f test/a.iso ] + '' diff --git a/pkgs/by-name/ma/matlab-language-server/package.nix b/pkgs/by-name/ma/matlab-language-server/package.nix new file mode 100644 index 0000000000000..732d8ef9acd0f --- /dev/null +++ b/pkgs/by-name/ma/matlab-language-server/package.nix @@ -0,0 +1,39 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, fetchpatch +}: + +buildNpmPackage { + pname = "matlab-language-server"; + version = "1.1.6"; + + src = fetchFromGitHub { + owner = "mathworks"; + repo = "matlab-language-server"; + # Upstream doesn't tag commits unfortunatly, but lists versions and dates + # in README... See complaint at: + # https://github.com/mathworks/MATLAB-language-server/issues/24 + rev = "c8c901956e3bbfbd6eab440a1b60c3fe016cf567"; + hash = "sha256-D03gXyrvPYOMkJI2YuHfPAnWdXTz5baemykQ5j9L0rs="; + }; + patches = [ + # https://github.com/mathworks/MATLAB-language-server/pull/23 + (fetchpatch { + url = "https://github.com/mathworks/MATLAB-language-server/commit/56374de620b4855529c4136539f52ab6030e2c92.patch"; + hash = "sha256-F38ATP+eap0SnxQoib1JwIvNCFfB7g8EtXI9+iK5+HA="; + }) + ]; + + npmDepsHash = "sha256-P3MSrwk6FVt4lK58pjwy0YOg2UZI0TG8uXjqCPudgTE="; + + npmBuildScript = "package"; + + meta = { + description = "Language Server for MATLAB® code"; + homepage = "https://github.com/mathworks/MATLAB-language-server"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + mainProgram = "matlab-language-server"; + }; +} diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix index 2165b46e2b486..f69c3f8e95d31 100644 --- a/pkgs/by-name/me/memtree/package.nix +++ b/pkgs/by-name/me/memtree/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication { pname = "memtree"; - version = "unstable-2023-11-04"; + version = "unstable-2023-11-22"; pyproject = true; src = fetchFromGitHub { owner = "nbraud"; repo = "memtree"; - rev = "093caeef26ee944b5bf4408710f63494e442b5ff"; - hash = "sha256-j4LqWy7DxeV7pjwnCfpkHwug4p48kux6BM6oDJmvuUo="; + rev = "edc09d91dcd72f175d6adc1d08b261dd95cc4fbf"; + hash = "sha256-YLZm0wjkjaTw/lHY5k4cqPXCgINe+49SGPLZq+eRdI4="; }; nativeBuildInputs = with python3Packages; [ @@ -26,16 +26,11 @@ python3Packages.buildPythonApplication { nativeCheckInputs = with python3Packages; [ hypothesis - pytest + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - python -m pytest -v - runHook postCheck - ''; - - pythonImportChecks = [ "memtree" ]; + pytestFlagsArray = [ "-v" ]; + pythonImportsCheck = [ "memtree" ]; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; @@ -45,6 +40,7 @@ python3Packages.buildPythonApplication { description = "Render cgroups tree annotated by memory usage"; homepage = "https://github.com/nbraud/memtree"; maintainers = with maintainers; [ nicoo ]; + mainProgram = "memtree"; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix index e90bd8d10ba4c..06b674d6a5bbb 100644 --- a/pkgs/by-name/me/mercure/package.nix +++ b/pkgs/by-name/me/mercure/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "mercure"; - version = "0.15.5"; + version = "0.15.6"; src = fetchFromGitHub { owner = "dunglas"; repo = "mercure"; rev = "v${version}"; - hash = "sha256-DyKNKhxjnOfxYcp3w1nB6kxs9c4ZaHL0AN0Eb5vc6mA="; + hash = "sha256-sGMjb7Ilm+RqR6bRGLAYB/nciE5oHeitDllr4H11uHU="; }; sourceRoot = "source/caddy"; - vendorHash = "sha256-2SZv6iwEZjq/50WwwupfHjbg0vNpff/Cn21nPqeHJMw="; + vendorHash = "sha256-v0YKlkflo7eKXh38uqsnxZlLr3+fFl8EMeUsf8UMU48="; subPackages = [ "mercure" ]; excludedPackages = [ "../cmd/mercure" ]; diff --git a/pkgs/by-name/me/mev-boost/package.nix b/pkgs/by-name/me/mev-boost/package.nix new file mode 100644 index 0000000000000..6a7bb6d1e4a4c --- /dev/null +++ b/pkgs/by-name/me/mev-boost/package.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "mev-boost"; + version = "1.6"; + src = fetchFromGitHub { + owner = "flashbots"; + repo = "mev-boost"; + rev = "v${version}"; + hash = "sha256-vzgX9irpI5i85bohppyL5KWQuf71SryRu1gkhWSCVKk="; + }; + + vendorHash = "sha256-xw3xVbgKUIDXu4UQD5CGftON8E4o1u2FcrPo3n6APBE="; + + meta = with lib; { + description = "Ethereum block-building middleware"; + homepage = "https://github.com/flashbots/mev-boost"; + license = licenses.mit; + mainProgram = "mev-boost"; + maintainers = with maintainers; [ ekimber ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix index 24e83eef6d092..d7bdbb1a383ca 100644 --- a/pkgs/by-name/mo/mommy/package.nix +++ b/pkgs/by-name/mo/mommy/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "mommy"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "FWDekker"; repo = pname; rev = "v${version}"; - hash = "sha256-SqWhbhQeRUO0cD9Fv/nwKjTI3F0Sg2VhFZtrbyA9Wb4="; + hash = "sha256-5mf157hjDE/9YcLsThjadkknuEfPZS8Pp6mtNCWbvEw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index eecbbca3b3f20..02c39c1bbb500 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -8,10 +8,11 @@ , libadwaita , libsoup_3 , glib-networking +, nix-update-script }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "2.3.1"; + version = "2.5.1"; format = "other"; sourceRoot = "source/source"; @@ -19,7 +20,7 @@ python3Packages.buildPythonApplication rec { owner = "zehkira"; repo = "monophony"; rev = "v${version}"; - hash = "sha256-dpRTHsujaIwzgr+qY5LC9xtXz40g3akdpEiHuxiilZM="; + hash = "sha256-kBFznJcH6UOlzgUnhPSOUBxqqsHzIEpirN63gRYC/u0="; }; pythonPath = with python3Packages; [ @@ -34,18 +35,16 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook4 ]; - buildInputs = - [ - libadwaita - # needed for gstreamer https - libsoup_3 - glib-networking - ] - ++ (with gst_all_1; [ - gst-plugins-base - gst-plugins-good - gstreamer - ]); + buildInputs = [ + libadwaita + # needed for gstreamer https + libsoup_3 + glib-networking + ] ++ (with gst_all_1; [ + gst-plugins-base + gst-plugins-good + gstreamer + ]); installFlags = [ "prefix=$(out)" ]; @@ -55,10 +54,12 @@ python3Packages.buildPythonApplication rec { --prefix PYTHONPATH : "$program_PYTHONPATH" --prefix PATH : "${lib.makeBinPath [yt-dlp]}" # needed for gstreamer https - --prefix LD_LIBRARY_PATH : "${libsoup_3.out}/lib" + --prefix LD_LIBRARY_PATH : "${lib.getLib libsoup_3}/lib" ) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://gitlab.com/zehkira/monophony"; description = "Linux app for streaming music from YouTube"; diff --git a/pkgs/by-name/mo/mosdepth/package.nix b/pkgs/by-name/mo/mosdepth/package.nix index 313da810c001c..7c74901bc6ff7 100644 --- a/pkgs/by-name/mo/mosdepth/package.nix +++ b/pkgs/by-name/mo/mosdepth/package.nix @@ -2,7 +2,7 @@ buildNimPackage (finalAttrs: { pname = "mosdepth"; - version = "0.3.5"; + version = "0.3.6"; requiredNimVersion = 1; @@ -10,7 +10,7 @@ buildNimPackage (finalAttrs: { owner = "brentp"; repo = "mosdepth"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-tG3J51PS6A0WBCZ+j/Nf7aaukFV+DZJsxpbTbvwu0zc="; + sha256 = "sha256-7N42S3xfQRkrBmoLf0DsbLMpVULAFpHm5JugDMDzAgU="; }; lockFile = ./lock.json; diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index 37d746f7c7be5..6487e6e775aee 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msolve"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "algebraic-solving"; repo = "msolve"; rev = "v${finalAttrs.version}"; - hash = "sha256-mcq98zMWQcmlTZt9eIJJg+IW5UBMcKR+8TzuabpOBwE="; + hash = "sha256-hdrNqZjTGhGFrshswJGPVgBjOUfHh93aQUfBKLlk5Es="; }; postPatch = '' diff --git a/pkgs/by-name/mu/multirun/package.nix b/pkgs/by-name/mu/multirun/package.nix new file mode 100644 index 0000000000000..4f59a8bd73281 --- /dev/null +++ b/pkgs/by-name/mu/multirun/package.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "multirun"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "nicolas-van"; + repo = "multirun"; + rev = version; + hash = "sha256-I95nxZD65tHiok4MzsGG7gyaxPHbqQLuRWdHUPNhLu8="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "A minimalist init process designed for Docker"; + homepage = "https://github.com/nicolas-van/multirun"; + license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; + mainProgram = "multirun"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index 79fbff2f2b07e..3e49a70bd4d0f 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "mystmd"; - version = "1.1.31"; + version = "1.1.37"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-1zjz1HJxa8ww02MnqravCWM51bpuSpnLxn34Kazbt5o="; + hash = "sha256-P4+0oCXQGziYfVUxIZe3j25lO6ho/4BdtqxCv/TTGko="; }; - npmDepsHash = "sha256-7H3VKJAzbsKLhyFD7MoASsOyJwbt6vERO6LM2mpz/y0="; + npmDepsHash = "sha256-ZA9kiMTn+m9Q0C3DBVMiUEq5bfRsXM1VX0qrIH2GAQo="; dontNpmInstall = true; diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index c6c41c13c6ea2..20c16268cb8b9 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.307"; + version = "0.0.322"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-HcjHqZwT+PTK0ICCvdhaoczNG/DHpJQy1dvGieA2mNc="; + hash = "sha256-noxzIz3klw6kYW6qe2rmhOVG5N+qu8NlkWeoR4TBne0="; }; - vendorHash = "sha256-0HyKcn5xt9vezSn6crRsJ/Jshmnk4OM8HZqH/v7DUDM="; + vendorHash = "sha256-/Q8P1m71pqxejVcfzHY+JC3+BPz0r3kc4PgQnNZM0SQ="; subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; diff --git a/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix b/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix new file mode 100644 index 0000000000000..638d6ac671e15 --- /dev/null +++ b/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix @@ -0,0 +1,35 @@ +{ python3, fetchFromGitHub, gnome, stdenv, lib }: +stdenv.mkDerivation rec { + pname = "nautilus-open-in-blackbox"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "ppvan"; + repo = "nautilus-open-in-blackbox"; + rev = "refs/tags/${version}"; + hash = "sha256-5rvh3qNalpjamcBVQrnAW6GxhwPPlRxP5h045YDqvrM="; + }; + + # The Orignal Source code tries to execute `/usr/bin/blackbox` which is not valid in NixOS + # This patch replaces the call with `blackbox` + patches = [ ./paths.patch ]; + + buildInputs = [ + gnome.nautilus-python + python3.pkgs.pygobject3 + ]; + + installPhase = '' + runHook preInstall + install -Dm555 ./nautilus-open-in-blackbox.py -t $out/share/nautilus-python/extensions + runHook postInstall + ''; + + meta = with lib; { + description = "Extension for nautilus, which adds an context-entry for opening in blackbox"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ blankparticle ]; + homepage = "https://github.com/ppvan/nautilus-open-in-blackbox"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/na/nautilus-open-in-blackbox/paths.patch b/pkgs/by-name/na/nautilus-open-in-blackbox/paths.patch new file mode 100644 index 0000000000000..4705426a58de2 --- /dev/null +++ b/pkgs/by-name/na/nautilus-open-in-blackbox/paths.patch @@ -0,0 +1,23 @@ +diff --git a/nautilus-open-in-blackbox.py b/nautilus-open-in-blackbox.py +index 9a43f90..0a5b632 100755 +--- a/nautilus-open-in-blackbox.py ++++ b/nautilus-open-in-blackbox.py +@@ -78,17 +78,10 @@ class BlackBoxNautilus(GObject.GObject, Nautilus.MenuProvider): + + return item + +- def is_native(self): +- return shutil.which("blackbox") == "/usr/bin/blackbox" +- + def _nautilus_run(self, menu, path): + """'Open with BlackBox 's menu item callback.""" + print("Openning:", path) +- args = None +- if self.is_native(): +- args = args = ["blackbox", "-w", path] +- else: +- args = ["/usr/bin/flatpak", "run", TERMINAL_NAME, "-w", path] ++ args = ["blackbox", "-w", path] + + subprocess.Popen(args, cwd=path) + diff --git a/pkgs/by-name/ne/net-cpp/package.nix b/pkgs/by-name/ne/net-cpp/package.nix index d123e5bea2ec0..3397d7820ce3f 100644 --- a/pkgs/by-name/ne/net-cpp/package.nix +++ b/pkgs/by-name/ne/net-cpp/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - postPatch = lib.optionalString finalAttrs.doCheck '' + postPatch = lib.optionalString finalAttrs.finalPackage.doCheck '' # Use wrapped python. Removing just the /usr/bin doesn't seem to work? substituteInPlace tests/httpbin.h.in \ --replace '/usr/bin/python3' '${lib.getExe pythonEnv}' diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix index 029fd53cdc077..cfac6ad8f6d19 100644 --- a/pkgs/by-name/ne/netclient/package.nix +++ b/pkgs/by-name/ne/netclient/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "netclient"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "gravitl"; repo = "netclient"; rev = "v${version}"; - hash = "sha256-r5Du9Gwt+deeUe6AJDN85o4snybvzZIIsyt+cfgMq2Q="; + hash = "sha256-yUyC6QTNhTNN/npGXiwS7M6cGKjh4H9vR8/z2/Sckz4="; }; - vendorHash = "sha256-/RNteV+Ys7TVTJtQsWcGK/1C6mf/sQUahIeEzefBe3A="; + vendorHash = "sha256-cnzdqSd3KOITOAH++zxKTqvUzjFxszf/rwkCF6vDpMc="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ++ lib.optional stdenv.isLinux libX11; diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix new file mode 100644 index 0000000000000..c32b16876dd88 --- /dev/null +++ b/pkgs/by-name/nh/nh/package.nix @@ -0,0 +1,59 @@ +{ lib +, rustPlatform +, installShellFiles +, makeWrapper +, fetchFromGitHub +, nvd +, use-nom ? true +, nix-output-monitor ? null +}: + +assert use-nom -> nix-output-monitor != null; + +let + version = "3.4.12"; + runtimeDeps = [ nvd ] ++ lib.optionals use-nom [ nix-output-monitor ]; +in +rustPlatform.buildRustPackage { + inherit version; + pname = "nh"; + + src = fetchFromGitHub { + owner = "ViperML"; + repo = "nh"; + rev = "refs/tags/v${version}"; + hash = "sha256-V5TQ/1loQnegDjfLh61DxBWEQZivYEBq2kQpT0fn2cQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; + + preFixup = '' + mkdir completions + $out/bin/nh completions --shell bash > completions/nh.bash + $out/bin/nh completions --shell zsh > completions/nh.zsh + $out/bin/nh completions --shell fish > completions/nh.fish + + installShellCompletion completions/* + ''; + + postFixup = '' + wrapProgram $out/bin/nh \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} \ + ${lib.optionalString use-nom "--set-default NH_NOM 1"} + ''; + + cargoHash = "sha256-Ul4DM8WmKvKG32zBXzpdzHZknpTQAVvrxFcEd/C1buA="; + + meta = { + description = "Yet another nix cli helper"; + homepage = "https://github.com/ViperML/nh"; + license = lib.licenses.eupl12; + mainProgram = "nh"; + maintainers = with lib.maintainers; [ drupol viperML ]; + }; +} diff --git a/pkgs/by-name/ni/nitter/lock.json b/pkgs/by-name/ni/nitter/lock.json index 5e059f869af09..2a9106dc9ff42 100644 --- a/pkgs/by-name/ni/nitter/lock.json +++ b/pkgs/by-name/ni/nitter/lock.json @@ -62,11 +62,11 @@ "packages": [ "jsony" ], - "path": "/nix/store/bzcq8q439rdsqhhihikzv3rsx4l4ybdm-source", - "rev": "ea811be", - "sha256": "1720iqsxjhqmhw1zhhs7d2ncdz25r8fqadls1p1iry1wfikjlnba", + "path": "/nix/store/l84av0wdc0s4r4alsvkaxcxhpd6j4bzg-source", + "rev": "1de1f08", + "sha256": "0rj205cs3v6g80h8ys9flbdq4wyd1csmkwdxv0lz21972zcsrcfh", "srcDir": "src", - "url": "https://github.com/treeform/jsony/archive/ea811be.tar.gz" + "url": "https://github.com/treeform/jsony/archive/1de1f08.tar.gz" }, { "method": "fetchzip", @@ -95,11 +95,22 @@ "packages": [ "nimcrypto" ], - "path": "/nix/store/dnj20qh97ylf57nka9wbxs735wbw7yxv-source", - "rev": "4014ef9", - "sha256": "1kgqr2lqaffglc1fgbanwcvhkqcbbd20d5b6w4lf0nksfl9c357a", + "path": "/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source", + "rev": "a079df9", + "sha256": "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65", "srcDir": "", - "url": "https://github.com/cheatfate/nimcrypto/archive/4014ef9.tar.gz" + "url": "https://github.com/cheatfate/nimcrypto/archive/a079df9.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "oauth" + ], + "path": "/nix/store/bwmrrzs6xpwizmww35461x3lqpgd0942-source", + "rev": "b8c163b", + "sha256": "0k5slyzjngbdr6g0b0dykhqmaf8r8n2klbkg2gpid4ckm8hg62v5", + "srcDir": "src", + "url": "https://github.com/CORDEA/oauth/archive/b8c163b.tar.gz" }, { "method": "fetchzip", @@ -159,6 +170,18 @@ { "method": "fetchzip", "packages": [ + "sha1" + ], + "path": "/nix/store/a6a0ycxsaxpqks42aq9wicj8ars7z7ai-source", + "ref": "master", + "rev": "92ccc5800bb0ac4865b275a2ce3c1544e98b48bc", + "sha256": "00zvvd8ssy22srg74xzapknmgmi82v534npjdrk5805shswfhqdm", + "srcDir": "", + "url": "https://github.com/onionhammer/sha1/archive/92ccc5800bb0ac4865b275a2ce3c1544e98b48bc.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ "supersnappy" ], "path": "/nix/store/kibhdjpd3mvn9adsp67amj35a7zrnk6y-source", diff --git a/pkgs/by-name/ni/nitter/package.nix b/pkgs/by-name/ni/nitter/package.nix index 6b63037e103d4..feaaa2f490973 100644 --- a/pkgs/by-name/ni/nitter/package.nix +++ b/pkgs/by-name/ni/nitter/package.nix @@ -8,13 +8,13 @@ buildNimPackage (finalAttrs: prevAttrs: { pname = "nitter"; - version = "unstable-2023-10-31"; + version = "unstable-2023-12-03"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "b62d73dbd373f08af07c7a79efcd790d3bc1a49c"; - hash = "sha256-yCD7FbqWZMY0fyFf9Q3Ka06nw5Ha7jYLpmPONAhEVIM="; + rev = "583c858cdf3486451ed6a0627640844f27009dbe"; + hash = "sha256-3E6nfmOFhQ2bjwGMWdTmZ38Fg/SE36s6fxYDXwSJaTw="; }; lockFile = ./lock.json; @@ -40,7 +40,7 @@ buildNimPackage (finalAttrs: prevAttrs: { passthru = { tests = { inherit (nixosTests) nitter; }; - updateScript = unstableGitUpdater {}; + updateScript = unstableGitUpdater { branch = "guest_accounts"; }; }; meta = with lib; { diff --git a/pkgs/by-name/ni/nitter/update.sh b/pkgs/by-name/ni/nitter/update.sh deleted file mode 100755 index 30405f34b22e8..0000000000000 --- a/pkgs/by-name/ni/nitter/update.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq nix nix-update patchutils -set -euo pipefail - -info() { - if [ -t 2 ]; then - set -- '\033[32m%s\033[39m\n' "$@" - else - set -- '%s\n' "$@" - fi - printf "$@" >&2 -} - -nitter_old_rev=$(nix-instantiate --eval --strict --json -A nitter.src.rev . | jq -r .) -nix-update --version=branch --commit nitter -nitter_new_rev=$(nix-instantiate --eval --strict --json -A nitter.src.rev . | jq -r .) -if [ "$nitter_new_rev" = "$nitter_old_rev" ]; then - info "nitter is up-to-date." - exit -fi - -if curl -Sfs "https://github.com/zedeus/nitter/compare/$nitter_old_rev...$nitter_new_rev.patch" \ -| lsdiff | grep -Fxe 'a/nitter.nimble' -e 'b/nitter.nimble' > /dev/null; then - info "nitter.nimble changed, some dependencies probably need updating." -fi diff --git a/pkgs/by-name/ni/nix-direnv/package.nix b/pkgs/by-name/ni/nix-direnv/package.nix new file mode 100644 index 0000000000000..f718b1e9d6925 --- /dev/null +++ b/pkgs/by-name/ni/nix-direnv/package.nix @@ -0,0 +1,65 @@ +{ resholve, lib, coreutils, direnv, nix, fetchFromGitHub }: + +# resholve does not yet support `finalAttrs` call pattern hence `rec` +# https://github.com/abathur/resholve/issues/107 +resholve.mkDerivation rec { + pname = "nix-direnv"; + version = "3.0.3"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nix-direnv"; + rev = version; + hash = "sha256-dwSICqFshBI9/4u40fkEqOuhTndnAx/w88zsnIzEcBk="; + }; + + # skip min version checks which are redundant when built with nix + postPatch = '' + sed -i 1iNIX_DIRENV_SKIP_VERSION_CHECK=1 direnvrc + ''; + + installPhase = '' + runHook preInstall + install -m400 -D direnvrc $out/share/nix-direnv/direnvrc + runHook postInstall + ''; + + solutions = { + default = { + scripts = [ "share/nix-direnv/direnvrc" ]; + interpreter = "none"; + inputs = [ coreutils nix ]; + fake = { + builtin = [ + "PATH_add" + "direnv_layout_dir" + "has" + "log_error" + "log_status" + "watch_file" + ]; + function = [ + # not really a function - this is in an else branch for macOS/homebrew that + # cannot be reached when built with nix + "shasum" + ]; + }; + keep = { + "$cmd" = true; + "$direnv" = true; + }; + execer = [ + "cannot:${direnv}/bin/direnv" + "cannot:${nix}/bin/nix" + ]; + }; + }; + + meta = { + description = "A fast, persistent use_nix implementation for direnv"; + homepage = "https://github.com/nix-community/nix-direnv"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ mic92 bbenne10 ]; + }; +} diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index d7b992c1aa3eb..e8b7790ab1c8c 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -28,12 +28,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "numtide"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-43r1pwWv9SuMEG+Pe5laFsqE1/X0rFQ6s/wpEufPliE="; + hash = "sha256-GN0G3g3QEzb2ZG3zSzbRaRBsmQsWJu81CZy9mIofRZ0="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix b/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix new file mode 100644 index 0000000000000..a6317b1f7b288 --- /dev/null +++ b/pkgs/by-name/nl/nlohmann_json_schema_validator/package.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, fetchFromGitHub +, nlohmann_json +, cmake +}: +stdenv.mkDerivation (finalAttrs: { + pname = "nlohmann_json_schema_validator"; + version = "2.3.0"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "pboettch"; + repo = "json-schema-validator"; + rev = finalAttrs.version; + hash = "sha256-Ybr5dNmjBBPTYPvgorJ6t2+zvAjxYQISWXJmgUVHBVE="; + }; + + buildInputs = [ nlohmann_json ]; + nativeBuildInputs = [ cmake ]; + + meta = { + description = "JSON schema validator for JSON for Modern C++"; + homepage = "https://github.com/pboettch/json-schema-validator"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ br337 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/no/nofi/package.nix b/pkgs/by-name/no/nofi/package.nix index d1b39b7896000..8418a30e65414 100644 --- a/pkgs/by-name/no/nofi/package.nix +++ b/pkgs/by-name/no/nofi/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ellsclytn/nofi/"; changelog = "https://github.com/ellsclytn/nofi/raw/v${version}/CHANGELOG.md"; license = [ licenses.asl20 /* or */ licenses.mit ]; - mainProgram = pname; + mainProgram = "nofi"; maintainers = [ maintainers.magnetophon ]; }; } diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index fde0f3378c397..eed31c03f759b 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.0.5"; + version = "2.1.0"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; rev = "v${version}"; - hash = "sha256-mYE8cu7qHRyG/pZSr4u6tMEF3ZM5Qz+CX+oLf/chwl4="; + hash = "sha256-RKuaMgPYBD2G9WOKvfb+hj01aBVsCP0eOXULE+JpLR8="; }; vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI="; diff --git a/pkgs/by-name/no/nomnatong/package.nix b/pkgs/by-name/no/nomnatong/package.nix new file mode 100644 index 0000000000000..e4913f463e6b2 --- /dev/null +++ b/pkgs/by-name/no/nomnatong/package.nix @@ -0,0 +1,51 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, python3Packages +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "nomnatong"; + version = "5.07"; + + src = fetchFromGitHub { + owner = "nomfoundation"; + repo = "font"; + rev = "v${finalAttrs.version}"; + hash = "sha256-31sqjOIrJByfTx4Ez6KvQDApCeVYMQnGeiM9INMR3zI="; + }; + + nativeBuildInputs = [ + python3Packages.afdko + python3Packages.fonttools + ]; + + sourceRoot = "${finalAttrs.src.name}/src"; + + buildPhase = '' + runHook preBuild + + makeotf -r -f font.pfa -omitMacNames -ff features.txt -mf FontMenuNameDB -ga -ci UnicodeVariationSequences.txt + otf2ttf NomNaTong-Regular.otf + sfntedit -d DSIG NomNaTong-Regular.otf + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm444 NomNaTong-Regular.otf -t $out/share/fonts/opentype/ + install -Dm444 NomNaTong-Regular.ttf -t $out/share/fonts/truetype/ + + runHook postInstall + ''; + + meta = { + homepage = "http://nomfoundation.org/nom-tools/Nom-Font"; + description = "The Hán-Nôm Coded Character Set and Nom Na Tong Regular Reference Font"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ eclairevoyant ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix b/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix new file mode 100644 index 0000000000000..5c7ab7684b62c --- /dev/null +++ b/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix @@ -0,0 +1,49 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, nixosTests +, gitUpdater +}: + +stdenvNoCC.mkDerivation rec { + pname = "noto-fonts-cjk-sans"; + version = "2.004"; + + src = fetchFromGitHub { + owner = "notofonts"; + repo = "noto-cjk"; + rev = "Sans${version}"; + hash = "sha256-IgalJkiOAVjNxKaPAQWfb5hKeqclliR4qVXCq63FGWY="; + sparseCheckout = [ "Sans/Variable/OTC" ]; + }; + + installPhase = '' + install -m444 -Dt $out/share/fonts/opentype/noto-cjk Sans/Variable/OTC/*.otf.ttc + ''; + + passthru.tests.noto-fonts = nixosTests.noto-fonts; + + passthru.updateScript = gitUpdater { + rev-prefix = "Sans"; + }; + + meta = { + description = "Beautiful and free fonts for CJK languages"; + homepage = "https://www.google.com/get/noto/help/cjk/"; + longDescription = '' + Noto Sans CJK is a sans typeface designed as + an intermediate style between the modern and traditional. It is + intended to be a multi-purpose digital font for user interface + designs, digital content, reading on laptops, mobile devices, and + electronic books. Noto Sans CJK comprehensively covers + Simplified Chinese, Traditional Chinese, Japanese, and Korean in a + unified font family. It supports regional variants of ideographic + characters for each of the four languages. In addition, it supports + Japanese kana, vertical forms, and variant characters (itaiji); it + supports Korean hangeul — both contemporary and archaic. + ''; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ mathnerd314 emily ]; + }; +} diff --git a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix new file mode 100644 index 0000000000000..d9fddcc684c41 --- /dev/null +++ b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix @@ -0,0 +1,49 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, nixosTests +, gitUpdater +}: + +stdenvNoCC.mkDerivation rec { + pname = "noto-fonts-cjk-serif"; + version = "2.002"; + + src = fetchFromGitHub { + owner = "notofonts"; + repo = "noto-cjk"; + rev = "Serif${version}"; + hash = "sha256-GLjpTAiHfygj1J4AdUVDJh8kykkFOglq+h4kyat5W9s="; + sparseCheckout = [ "Serif/Variable/OTC" ]; + }; + + installPhase = '' + install -m444 -Dt $out/share/fonts/opentype/noto-cjk Serif/Variable/OTC/*.otf.ttc + ''; + + passthru.tests.noto-fonts = nixosTests.noto-fonts; + + passthru.updateScript = gitUpdater { + rev-prefix = "Serif"; + }; + + meta = with lib; { + description = "Beautiful and free fonts for CJK languages"; + homepage = "https://www.google.com/get/noto/help/cjk/"; + longDescription = '' + Noto Serif CJK is a serif typeface designed as + an intermediate style between the modern and traditional. It is + intended to be a multi-purpose digital font for user interface + designs, digital content, reading on laptops, mobile devices, and + electronic books. Noto Serif CJK comprehensively covers + Simplified Chinese, Traditional Chinese, Japanese, and Korean in a + unified font family. It supports regional variants of ideographic + characters for each of the four languages. In addition, it supports + Japanese kana, vertical forms, and variant characters (itaiji); it + supports Korean hangeul — both contemporary and archaic. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ mathnerd314 emily ]; + }; +} diff --git a/pkgs/by-name/no/noto-fonts-color-emoji/package.nix b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix new file mode 100644 index 0000000000000..37f56db62df19 --- /dev/null +++ b/pkgs/by-name/no/noto-fonts-color-emoji/package.nix @@ -0,0 +1,69 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, buildPackages +, pkg-config +, cairo +, imagemagick +, zopfli +, pngquant +, which +}: + +let + emojiPythonEnv = + buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); +in +stdenvNoCC.mkDerivation rec { + pname = "noto-fonts-color-emoji"; + version = "2.042"; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "noto-emoji"; + rev = "v${version}"; + hash = "sha256-otJQMXrBIPrxD1vCdgcrZ2h1a9XAMbqEBFumjz1XJ54="; + }; + + depsBuildBuild = [ + buildPackages.stdenv.cc + pkg-config + cairo + ]; + + nativeBuildInputs = [ + imagemagick + zopfli + pngquant + which + emojiPythonEnv + ]; + + postPatch = '' + patchShebangs *.py + patchShebangs third_party/color_emoji/*.py + # remove check for virtualenv, since we handle + # python requirements using python.withPackages + sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile + # Make the build verbose so it won't get culled by Hydra thinking that + # it somehow got stuck doing nothing. + sed -i 's;\t@;\t;' Makefile + ''; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/noto + cp NotoColorEmoji.ttf $out/share/fonts/noto + runHook postInstall + ''; + + meta = { + description = "Color emoji font"; + homepage = "https://github.com/googlefonts/noto-emoji"; + license = with lib.licenses; [ ofl asl20 ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ mathnerd314 sternenseemann ]; + }; +} diff --git a/pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix b/pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix new file mode 100644 index 0000000000000..311505c3ae48b --- /dev/null +++ b/pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix @@ -0,0 +1,30 @@ + { lib +, stdenvNoCC +, fetchurl +}: + +stdenvNoCC.mkDerivation rec { + pname = "noto-fonts-emoji-blob-bin"; + version = "15.0"; + + src = fetchurl { + url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; + hash = "sha256-3MPWZ1A2ups171dNIiFTJ3C1vZiGy6I8ZF70aUfrePk="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + install -Dm 444 $src $out/share/fonts/blobmoji/Blobmoji.ttf + runHook postInstall + ''; + + meta = { + description = "Noto Emoji with extended Blob support"; + homepage = "https://github.com/C1710/blobmoji"; + license = with lib.licenses; [ ofl asl20 ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ rileyinman jk ]; + }; +} diff --git a/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json b/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.hashes.json index e9ad1c327f4f9..e9ad1c327f4f9 100644 --- a/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json +++ b/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.hashes.json diff --git a/pkgs/data/fonts/noto-fonts/noto-emoji.json b/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.json index c729634b9e1e7..c729634b9e1e7 100644 --- a/pkgs/data/fonts/noto-fonts/noto-emoji.json +++ b/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.json diff --git a/pkgs/data/fonts/noto-fonts/noto-emoji.py b/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.py index 9f1eadd95bca5..9f1eadd95bca5 100755 --- a/pkgs/data/fonts/noto-fonts/noto-emoji.py +++ b/pkgs/by-name/no/noto-fonts-monochrome-emoji/noto-emoji.py diff --git a/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix b/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix new file mode 100644 index 0000000000000..08f78b613efc7 --- /dev/null +++ b/pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix @@ -0,0 +1,53 @@ +{ lib +, stdenvNoCC +, fetchurl +}: + +# Metadata fetched from +# https://www.googleapis.com/webfonts/v1/webfonts?key=${GOOGLE_FONTS_TOKEN}&family=Noto+Emoji +let + metadata = with builtins; head (fromJSON (readFile ./noto-emoji.json)).items; + urlHashes = with builtins; fromJSON (readFile ./noto-emoji.hashes.json); +in +stdenvNoCC.mkDerivation { + pname = "noto-fonts-monochrome-emoji"; + version = "${lib.removePrefix "v" metadata.version}.${metadata.lastModified}"; + preferLocalBuild = true; + + dontUnpack = true; + srcs = + let + weightNames = { + "300" = "Light"; + regular = "Regular"; + "500" = "Medium"; + "600" = "SemiBold"; + "700" = "Bold"; + }; + in + lib.mapAttrsToList + (variant: url: fetchurl { + name = "NotoEmoji-${weightNames.${variant}}.ttf"; + hash = urlHashes.${url}; + inherit url; + }) + metadata.files; + + installPhase = '' + runHook preInstall + for src in $srcs; do + install -D $src $out/share/fonts/noto/$(stripHash $src) + done + runHook postInstall + ''; + + meta = { + description = "Monochrome emoji font"; + homepage = "https://fonts.google.com/noto/specimen/Noto+Emoji"; + license = [ lib.licenses.ofl ]; + maintainers = [ lib.maintainers.nicoo ]; + + platforms = lib.platforms.all; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix new file mode 100644 index 0000000000000..2d47e7ee64ab3 --- /dev/null +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -0,0 +1,73 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +, variants ? [ ] +, suffix ? "" +, longDescription ? '' + When text is rendered by a computer, sometimes characters are + displayed as “tofu”. They are little boxes to indicate your device + doesn’t have a font to display the text. + Google has been developing a font family called Noto, which aims to + support all languages with a harmonious look and feel. Noto is + Google’s answer to tofu. The name noto is to convey the idea that + Google’s goal is to see “no more tofu”. Noto has multiple styles and + weights, and freely available to all. + '' +}: + +stdenvNoCC.mkDerivation rec { + pname = "noto-fonts${suffix}"; + version = "23.12.1"; + + src = fetchFromGitHub { + owner = "notofonts"; + repo = "notofonts.github.io"; + rev = "noto-monthly-release-${version}"; + hash = "sha256-Hmw6yGFbnxgKMdKjQCQzuVl+pFCVxbJrT3sGntXUPgk="; + }; + + _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; + + installPhase = '' + # We check availability in order of variable -> otf -> ttf + # unhinted -- the hinted versions use autohint + # maintaining maximum coverage. + # + # We have a mix of otf and ttf fonts + local out_font=$out/share/fonts/noto + '' + (if _variants == [ ] then '' + for folder in $(ls -d fonts/*/); do + if [[ -d "$folder"unhinted/variable-ttf ]]; then + install -m444 -Dt $out_font "$folder"unhinted/variable-ttf/*.ttf + elif [[ -d "$folder"unhinted/otf ]]; then + install -m444 -Dt $out_font "$folder"unhinted/otf/*.otf + else + install -m444 -Dt $out_font "$folder"unhinted/ttf/*.ttf + fi + done + '' else '' + for variant in $_variants; do + if [[ -d fonts/"$variant"/unhinted/variable-ttf ]]; then + install -m444 -Dt $out_font fonts/"$variant"/unhinted/variable-ttf/*.ttf + elif [[ -d fonts/"$variant"/unhinted/otf ]]; then + install -m444 -Dt $out_font fonts/"$variant"/unhinted/otf/*.otf + else + install -m444 -Dt $out_font fonts/"$variant"/unhinted/ttf/*.ttf + fi + done + ''); + + passthru.updateScript = gitUpdater { + rev-prefix = "noto-monthly-release-"; + }; + + meta = { + description = "Beautiful and free fonts for many languages"; + homepage = "https://www.google.com/get/noto/"; + inherit longDescription; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ mathnerd314 emily jopejoe1 ]; + }; +} diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index c658fd5930645..947292769110d 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "numbat"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "numbat"; rev = "v${version}"; - hash = "sha256-mwDpdQEIgvdGbcXEtA3TLP1e2yFNRCdcljaOzDEoKjg="; + hash = "sha256-zMgZ/QmpZaB+4xdxVBE3C8CWS/aNCDuowDWOg65PhTo="; }; - cargoHash = "sha256-hGNfB82m2w9wDiPs8PMUExWOBN9ZQ+XVs1v8jhHuVhA="; + cargoHash = "sha256-x6SMQoiDf0GoyOJGP8S69wJnY/nCvo6Bq5KQyrgY+Gs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index debff8429d886..976f99158c049 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -12,13 +12,13 @@ let pname = "nwg-drawer"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-drawer"; rev = "v${version}"; - hash = "sha256-2/YI91Rcm+N8tNoKBRIDAQ3T2M6T7+kWngbCzyaXOCc="; + hash = "sha256-1iylXR3WP39E/0L/vBe5LxXOKV+KisgUr2rxBEHahMo="; }; vendorHash = "sha256-8s8+ukMQpciQmKt77fNE7r+3cm/UDxO8VtkrNYdKhM8="; diff --git a/pkgs/by-name/oa/oauth2ms/package.nix b/pkgs/by-name/oa/oauth2ms/package.nix new file mode 100644 index 0000000000000..b32ea14d3a9f1 --- /dev/null +++ b/pkgs/by-name/oa/oauth2ms/package.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation { + pname = "oauth2ms"; + version = "2021-07-09"; + + src = fetchFromGitHub { + owner = "harishkrupo"; + repo = "oauth2ms"; + rev = "a1ef0cabfdea57e9309095954b90134604e21c08"; # No tags or releases in the repo + sha256 = "sha256-xPSWlHJAXhhj5I6UMjUtH1EZqCZWHJMFWTu3a4k1ETc"; + }; + + buildInputs = [ + (python3.withPackages (ps: with ps; [ + pyxdg + msal + python-gnupg + ])) + ]; + + installPhase = '' + runHook preInstall + install -m755 -D oauth2ms $out/bin/oauth2ms + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/harishkrupo/oauth2ms"; + description = "XOAUTH2 compatible Office365 token fetcher"; + platforms = platforms.all; + license = licenses.asl20; + maintainers = with maintainers; [ wentasah ]; + }; +} diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index 2f92fbb9c1f0c..20b638c90ac94 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "oelint-adv"; - version = "3.26.4"; + version = "3.26.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_adv"; - hash = "sha256-Gb4BQl/CJDpvzvwBDFWYUGvMQBbZZSMCDQh4xbOzp6Y="; + hash = "sha256-+kmPV42y4Za/ZLXLCyt73E8Nxn0zBftTZT5JDsAQkEw="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/of/offpunk/package.nix b/pkgs/by-name/of/offpunk/package.nix index e0814a43ef8a3..c3bc7424c5bbd 100644 --- a/pkgs/by-name/of/offpunk/package.nix +++ b/pkgs/by-name/of/offpunk/package.nix @@ -33,7 +33,7 @@ let in python3Packages.buildPythonPackage rec { pname = "offpunk"; - version = "2.0"; + version = "2.1"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.7"; @@ -42,7 +42,7 @@ python3Packages.buildPythonPackage rec { owner = "~lioploum"; repo = "offpunk"; rev = "v${version}"; - hash = "sha256-6ftc2goCNgvXf5kszvjeSHn24Hn73jq26Irl5jiN6pk="; + hash = "sha256-IFqasTI2dZCauLUAq6/rvwkfraVK7SGUXpHCPEgSPGk="; }; nativeBuildInputs = [ python3Packages.hatchling installShellFiles ]; @@ -52,6 +52,8 @@ python3Packages.buildPythonPackage rec { installManPage man/*.1 ''; + passthru.tests.version = testers.testVersion { package = offpunk; }; + meta = with lib; { description = "An Offline-First browser for the smolnet "; homepage = src.meta.homepage; diff --git a/pkgs/by-name/op/openai-triton-llvm/package.nix b/pkgs/by-name/op/openai-triton-llvm/package.nix index 5744cfa10c11b..7b6f40662a75e 100644 --- a/pkgs/by-name/op/openai-triton-llvm/package.nix +++ b/pkgs/by-name/op/openai-triton-llvm/package.nix @@ -45,7 +45,7 @@ let isNative = stdenv.hostPlatform == stdenv.buildPlatform; in stdenv.mkDerivation (finalAttrs: { pname = "openai-triton-llvm"; - version = "14.0.6-f28c006a5895"; + version = "17.0.0-c5dede880d17"; outputs = [ "out" @@ -60,8 +60,8 @@ in stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; - rev = "f28c006a5895fc0e329fe15fead81e37457cb1d1"; - hash = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; + rev = "c5dede880d175f7229c9b2923f4753e12702305d"; + hash = "sha256-v4r3+7XVFK+Dzxt/rErZNJ9REqFO3JmGN4X4vZ+77ew="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/openobserve/Cargo.lock b/pkgs/by-name/op/openobserve/Cargo.lock new file mode 100644 index 0000000000000..3a5fe87a8fa47 --- /dev/null +++ b/pkgs/by-name/op/openobserve/Cargo.lock @@ -0,0 +1,8238 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "actix-codec" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8" +dependencies = [ + "bitflags 1.3.2", + "bytes", + "futures-core", + "futures-sink", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "actix-cors" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b340e9cfa5b08690aae90fb61beb44e9b06f44fe3d0f93781aaa58cfba86245e" +dependencies = [ + "actix-utils", + "actix-web", + "derive_more", + "futures-util", + "log", + "once_cell", + "smallvec", +] + +[[package]] +name = "actix-http" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-service", + "actix-utils", + "ahash 0.8.6", + "base64 0.21.5", + "bitflags 2.4.1", + "brotli", + "bytes", + "bytestring", + "derive_more", + "encoding_rs", + "flate2", + "futures-core", + "h2", + "http", + "httparse", + "httpdate", + "itoa", + "language-tags", + "local-channel", + "mime", + "percent-encoding", + "pin-project-lite", + "rand", + "sha1", + "smallvec", + "tokio", + "tokio-util", + "tracing", + "zstd 0.12.4", +] + +[[package]] +name = "actix-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" +dependencies = [ + "quote", + "syn 2.0.39", +] + +[[package]] +name = "actix-multipart" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b960e2aea75f49c8f069108063d12a48d329fc8b60b786dfc7552a9d5918d2d" +dependencies = [ + "actix-multipart-derive", + "actix-utils", + "actix-web", + "bytes", + "derive_more", + "futures-core", + "futures-util", + "httparse", + "local-waker", + "log", + "memchr", + "mime", + "serde", + "serde_json", + "serde_plain", + "tempfile", + "tokio", +] + +[[package]] +name = "actix-multipart-derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a0a77f836d869f700e5b47ac7c3c8b9c8bc82e4aec861954c6198abee3ebd4d" +dependencies = [ + "darling", + "parse-size", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "actix-router" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" +dependencies = [ + "bytestring", + "http", + "regex", + "serde", + "tracing", +] + +[[package]] +name = "actix-rt" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" +dependencies = [ + "futures-core", + "tokio", +] + +[[package]] +name = "actix-server" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4" +dependencies = [ + "actix-rt", + "actix-service", + "actix-utils", + "futures-core", + "futures-util", + "mio", + "socket2 0.5.5", + "tokio", + "tracing", +] + +[[package]] +name = "actix-service" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" +dependencies = [ + "futures-core", + "paste", + "pin-project-lite", +] + +[[package]] +name = "actix-tls" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72616e7fbec0aa99c6f3164677fa48ff5a60036d0799c98cab894a44f3e0efc3" +dependencies = [ + "actix-rt", + "actix-service", + "actix-utils", + "futures-core", + "http", + "impl-more", + "pin-project-lite", + "rustls", + "rustls-webpki", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "actix-utils" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" +dependencies = [ + "local-waker", + "pin-project-lite", +] + +[[package]] +name = "actix-web" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9" +dependencies = [ + "actix-codec", + "actix-http", + "actix-macros", + "actix-router", + "actix-rt", + "actix-server", + "actix-service", + "actix-utils", + "actix-web-codegen", + "ahash 0.8.6", + "bytes", + "bytestring", + "cfg-if 1.0.0", + "cookie", + "derive_more", + "encoding_rs", + "futures-core", + "futures-util", + "itoa", + "language-tags", + "log", + "mime", + "once_cell", + "pin-project-lite", + "regex", + "serde", + "serde_json", + "serde_urlencoded", + "smallvec", + "socket2 0.5.5", + "time", + "url", +] + +[[package]] +name = "actix-web-codegen" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5" +dependencies = [ + "actix-router", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "actix-web-httpauth" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d613edf08a42ccc6864c941d30fe14e1b676a77d16f1dbadc1174d065a0a775" +dependencies = [ + "actix-utils", + "actix-web", + "base64 0.21.5", + "futures-core", + "futures-util", + "log", + "pin-project-lite", +] + +[[package]] +name = "actix-web-lab" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e15f180c2bf7abacfda7d8d9ee4169e7f792ec8983313dc38809e902f61c79d0" +dependencies = [ + "actix-http", + "actix-router", + "actix-service", + "actix-utils", + "actix-web", + "actix-web-lab-derive", + "ahash 0.8.6", + "arc-swap", + "async-trait", + "bytes", + "bytestring", + "csv", + "derive_more", + "futures-core", + "futures-util", + "http", + "impl-more", + "itertools 0.11.0", + "local-channel", + "mediatype", + "mime", + "once_cell", + "pin-project-lite", + "regex", + "serde", + "serde_html_form", + "serde_json", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "actix-web-lab-derive" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa0b287c8de4a76b691f29dbb5451e8dd5b79d777eaf87350c9b0cbfdb5e968" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "actix-web-opentelemetry" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d164a9fe425132ff4ae92ce04912f7e31529b48a6e7cdce769ab45d272de285c" +dependencies = [ + "actix-http", + "actix-web", + "futures-util", + "opentelemetry 0.21.0", + "opentelemetry-semantic-conventions", + "serde", +] + +[[package]] +name = "actix-web-prometheus" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad5228fd1a6b5d0f60d636776c2a70acc9fc667034bb4ac02ec4259f0eeeab6c" +dependencies = [ + "actix-service", + "actix-web", + "futures-lite", + "pin-project", + "prometheus", + "quanta", + "thiserror", +] + +[[package]] +name = "actix-web-rust-embed-responder" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd68c2339c8e4498a4b9b83392b58b85c337c835baf38c90757e3236e1121c97" +dependencies = [ + "actix-web", + "base64 0.21.5", + "brotli", + "chrono", + "flate2", + "futures-core", + "lazy_static", + "regex", + "rust-embed-for-web", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] +name = "aead" +version = "0.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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if 1.0.0", + "cipher", + "cpufeatures", +] + +[[package]] +name = "ahash" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +dependencies = [ + "cfg-if 1.0.0", + "const-random", + "getrandom", + "once_cell", + "serde", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[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" +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 = "anstream" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +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 = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "anymap" +version = "1.0.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72" + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "argon2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" +dependencies = [ + "base64ct", + "blake2", + "cpufeatures", + "password-hash", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "arrow" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc25126d18a012146a888a0298f2c22e1150327bd2765fc76d710a556b2d614" +dependencies = [ + "ahash 0.8.6", + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-csv", + "arrow-data", + "arrow-ipc", + "arrow-json", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", + "arrow-string", +] + +[[package]] +name = "arrow-arith" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34ccd45e217ffa6e53bbb0080990e77113bdd4e91ddb84e97b77649810bcf1a7" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "num", +] + +[[package]] +name = "arrow-array" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bda9acea48b25123c08340f3a8ac361aa0f74469bb36f5ee9acf923fce23e9d" +dependencies = [ + "ahash 0.8.6", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "chrono-tz", + "half", + "hashbrown 0.14.2", + "num", + "packed_simd", +] + +[[package]] +name = "arrow-buffer" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a0fc21915b00fc6c2667b069c1b64bdd920982f426079bc4a7cab86822886c" +dependencies = [ + "bytes", + "half", + "num", +] + +[[package]] +name = "arrow-cast" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dc0368ed618d509636c1e3cc20db1281148190a78f43519487b2daf07b63b4a" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "base64 0.21.5", + "chrono", + "comfy-table", + "half", + "lexical-core", + "num", +] + +[[package]] +name = "arrow-csv" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e09aa6246a1d6459b3f14baeaa49606cfdbca34435c46320e14054d244987ca" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "chrono", + "csv", + "csv-core", + "lazy_static", + "lexical-core", + "regex", +] + +[[package]] +name = "arrow-data" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907fafe280a3874474678c1858b9ca4cb7fd83fb8034ff5b6d6376205a08c634" +dependencies = [ + "arrow-buffer", + "arrow-schema", + "half", + "num", +] + +[[package]] +name = "arrow-ipc" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79a43d6808411886b8c7d4f6f7dd477029c1e77ffffffb7923555cc6579639cd" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "flatbuffers", + "lz4_flex", + "zstd 0.13.0", +] + +[[package]] +name = "arrow-json" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82565c91fd627922ebfe2810ee4e8346841b6f9361b87505a9acea38b614fee" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "indexmap 2.1.0", + "lexical-core", + "num", + "serde", + "serde_json", +] + +[[package]] +name = "arrow-ord" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b23b0e53c0db57c6749997fd343d4c0354c994be7eca67152dd2bdb9a3e1bb4" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "half", + "num", +] + +[[package]] +name = "arrow-row" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "361249898d2d6d4a6eeb7484be6ac74977e48da12a4dd81a708d620cc558117a" +dependencies = [ + "ahash 0.8.6", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "half", + "hashbrown 0.14.2", +] + +[[package]] +name = "arrow-schema" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09e28a5e781bf1b0f981333684ad13f5901f4cd2f20589eab7cf1797da8fc167" +dependencies = [ + "serde", +] + +[[package]] +name = "arrow-select" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f6208466590960efc1d2a7172bc4ff18a67d6e25c529381d7f96ddaf0dc4036" +dependencies = [ + "ahash 0.8.6", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "num", +] + +[[package]] +name = "arrow-string" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a48149c63c11c9ff571e50ab8f017d2a7cb71037a882b42f6354ed2da9acc7" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "num", + "regex", + "regex-syntax 0.8.2", +] + +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + +[[package]] +name = "askama" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139" +dependencies = [ + "askama_derive", + "askama_escape", + "askama_shared", +] + +[[package]] +name = "askama_derive" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71" +dependencies = [ + "askama_shared", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "askama_escape" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" + +[[package]] +name = "askama_shared" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf722b94118a07fcbc6640190f247334027685d4e218b794dbfe17c32bf38ed0" +dependencies = [ + "askama_escape", + "humansize", + "mime", + "mime_guess", + "nom", + "num-traits", + "percent-encoding", + "proc-macro2", + "quote", + "serde", + "syn 1.0.109", + "toml", +] + +[[package]] +name = "async-compression" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" +dependencies = [ + "bzip2", + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite", + "tokio", + "xz2", + "zstd 0.13.0", + "zstd-safe 7.0.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[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.39", +] + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "awc" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fa3c705a9c7917ac0f41c0757a0a747b43bbc29b0b364b081bd7c5fc67fb223" +dependencies = [ + "actix-codec", + "actix-http", + "actix-rt", + "actix-service", + "actix-tls", + "actix-utils", + "base64 0.21.5", + "bytes", + "cfg-if 1.0.0", + "cookie", + "derive_more", + "futures-core", + "futures-util", + "h2", + "http", + "itoa", + "log", + "mime", + "percent-encoding", + "pin-project-lite", + "rand", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", +] + +[[package]] +name = "aws-config" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6b3804dca60326e07205179847f17a4fce45af3a1106939177ad41ac08a6de" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-sdk-sso", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 2.0.1", + "hex", + "http", + "hyper", + "ring 0.16.20", + "time", + "tokio", + "tower", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-credential-types" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a66ac8ef5fa9cf01c2d999f39d16812e90ec1467bd382cbbb74ba23ea86201" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "fastrand 2.0.1", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-http" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e626370f9ba806ae4c439e49675fd871f5767b093075cdf4fef16cac42ba900" +dependencies = [ + "aws-credential-types", + "aws-smithy-http", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "http-body", + "lazy_static", + "percent-encoding", + "pin-project-lite", + "tracing", +] + +[[package]] +name = "aws-runtime" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ac5cf0ff19c1bca0cea7932e11b239d1025a45696a4f44f72ea86e2b8bdd07" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "fastrand 2.0.1", + "http", + "percent-encoding", + "tracing", + "uuid", +] + +[[package]] +name = "aws-sdk-dynamodb" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069e3c6f367a02ee0af86616b6bf9dcc4f1eab19e11b05d4b0f71da0c86fcd9d" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 2.0.1", + "http", + "regex", + "tokio-stream", + "tracing", +] + +[[package]] +name = "aws-sdk-sso" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "903f888ff190e64f6f5c83fb0f8d54f9c20481f1dc26359bb8896f5d99908949" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "regex", + "tokio-stream", + "tracing", +] + +[[package]] +name = "aws-sdk-sts" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47ad6bf01afc00423d781d464220bf69fb6a674ad6629cbbcb06d88cdc2be82" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7b28f4910bb956b7ab320b62e98096402354eca976c587d1eeccd523d9bac03" +dependencies = [ + "aws-smithy-http", + "form_urlencoded", + "hex", + "hmac", + "http", + "once_cell", + "percent-encoding", + "regex", + "sha2", + "time", + "tracing", +] + +[[package]] +name = "aws-smithy-async" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cdb73f85528b9d19c23a496034ac53703955a59323d581c06aa27b4e4e247af" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", + "tokio-stream", +] + +[[package]] +name = "aws-smithy-client" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c27b2756264c82f830a91cb4d2d485b2d19ad5bea476d9a966e03d27f27ba59a" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-http-tower", + "aws-smithy-types", + "bytes", + "fastrand 2.0.1", + "http", + "http-body", + "hyper", + "hyper-rustls", + "lazy_static", + "pin-project-lite", + "rustls", + "tokio", + "tower", + "tracing", +] + +[[package]] +name = "aws-smithy-http" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54cdcf365d8eee60686885f750a34c190e513677db58bbc466c44c588abf4199" +dependencies = [ + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http", + "http-body", + "hyper", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "aws-smithy-http-tower" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "822de399d0ce62829a69dfa8c5cd08efdbe61a7426b953e2268f8b8b52a607bd" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "http", + "http-body", + "pin-project-lite", + "tower", + "tracing", +] + +[[package]] +name = "aws-smithy-json" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1e7ab8fa7ad10c193af7ae56d2420989e9f4758bf03601a342573333ea34f" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-query" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28556a3902091c1f768a34f6c998028921bdab8d47d92586f363f14a4a32d047" +dependencies = [ + "aws-smithy-types", + "urlencoding", +] + +[[package]] +name = "aws-smithy-runtime" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "745e096b3553e7e0f40622aa04971ce52765af82bebdeeac53aa6fc82fe801e6" +dependencies = [ + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand 2.0.1", + "http", + "http-body", + "once_cell", + "pin-project-lite", + "pin-utils", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d0ae0c9cfd57944e9711ea610b48a963fb174a53aabacc08c5794a594b1d02" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "http", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-types" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d90dbc8da2f6be461fa3c1906b20af8f79d14968fe47f2b7d29d086f62a51728" +dependencies = [ + "base64-simd", + "itoa", + "num-integer", + "ryu", + "serde", + "time", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01d2dedcdd8023043716cfeeb3c6c59f2d447fce365d8e194838891794b23b6" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-types" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85aa0451bf8af1bf22a4f028d5d28054507a14be43cb8ac0597a8471fba9edfe" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-types", + "http", + "rustc_version", + "tracing", +] + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base16" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d27c3610c36aee21ce8ac510e6224498de4228ad772a171ed65643a24693a5a8" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref", + "vsimd", +] + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "base85rs" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7b7172542a3d446ca7b2be4e28e4f4c119a89c396712f7ca1ad2822bfc54ca2" + +[[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" +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 = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "blake3" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if 1.0.0", + "constant_time_eq", + "rayon", +] + +[[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 = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "borsh" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" +dependencies = [ + "once_cell", + "proc-macro-crate 2.0.0", + "proc-macro2", + "quote", + "syn 2.0.39", + "syn_derive", +] + +[[package]] +name = "brotli" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytecheck" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "bytes-utils" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" +dependencies = [ + "bytes", + "either", +] + +[[package]] +name = "bytestring" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" +dependencies = [ + "bytes", +] + +[[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 = "c_linked_list" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" + +[[package]] +name = "cactus" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf034765b7d19a011c6d619e880582bf95e8186b580e6fab56589872dd87dcf5" + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb-mode" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "738b8d467867f80a71351933f70461f5b56f24d5c93e0cf216e59229c968d330" +dependencies = [ + "cipher", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfgrammar" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf74ea341ae8905eac9a234b6a5a845e118c25bbbdecf85ec77431a8b3bfa0be" +dependencies = [ + "indexmap 1.9.3", + "lazy_static", + "num-traits", + "regex", + "serde", + "vob", +] + +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if 1.0.0", + "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" +checksum = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46" +dependencies = [ + "base64 0.13.1", + "encoding_rs", +] + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.48.5", +] + +[[package]] +name = "chrono-tz" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "cidr-utils" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2315f7119b7146d6a883de6acd63ddf96071b5f79d9d98d2adaa84d749f6abf1" +dependencies = [ + "debug-helper", + "num-bigint", + "num-traits", + "once_cell", + "regex", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] +name = "clap" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags 1.3.2", + "clap_derive 3.2.25", + "clap_lex 0.2.4", + "indexmap 1.9.3", + "once_cell", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +dependencies = [ + "clap_builder", + "clap_derive 4.4.7", +] + +[[package]] +name = "clap_builder" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 0.6.0", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "clipboard-win" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +dependencies = [ + "error-code", + "str-buf", + "winapi 0.3.9", +] + +[[package]] +name = "cloudevents-sdk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "801713078518ab05d7c78508c14cf55173a14a1a6659421d3352c2576a6167bf" +dependencies = [ + "actix-http", + "actix-web", + "async-trait", + "base64 0.12.3", + "bitflags 1.3.2", + "bytes", + "chrono", + "delegate-attr", + "futures", + "hostname", + "http", + "serde", + "serde_json", + "snafu 0.6.10", + "url", + "uuid", + "web-sys", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "comfy-table" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" +dependencies = [ + "strum", + "strum_macros", + "unicode-width", +] + +[[package]] +name = "community-id" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f6af96839c04974cf381e427792a99913ecf3f7bfb348f153dc8a8e5f9803ad" +dependencies = [ + "anyhow", + "base64 0.21.5", + "hex", + "lazy_static", + "num_enum", + "sha1", +] + +[[package]] +name = "const-oid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + +[[package]] +name = "const-random" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[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 = "cpp_demangle" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if 1.0.0", + "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 1.0.0", + "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 1.0.0", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "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.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[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", + "quote", + "strsim", + "syn 2.0.39", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown 0.14.2", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", + "serde", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "datafusion" +version = "33.0.0" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +dependencies = [ + "ahash 0.8.6", + "arrow", + "arrow-array", + "arrow-schema", + "async-compression", + "async-trait", + "bytes", + "bzip2", + "chrono", + "dashmap", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-optimizer", + "datafusion-physical-expr", + "datafusion-physical-plan", + "datafusion-sql", + "flate2", + "futures", + "glob", + "half", + "hashbrown 0.14.2", + "indexmap 2.1.0", + "itertools 0.12.0", + "log", + "num_cpus", + "object_store", + "parking_lot 0.12.1", + "parquet", + "pin-project-lite", + "rand", + "sqlparser", + "tempfile", + "tokio", + "tokio-util", + "url", + "uuid", + "xz2", + "zstd 0.13.0", +] + +[[package]] +name = "datafusion-common" +version = "33.0.0" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +dependencies = [ + "ahash 0.8.6", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-schema", + "chrono", + "half", + "libc", + "num_cpus", + "object_store", + "parquet", + "sqlparser", +] + +[[package]] +name = "datafusion-execution" +version = "33.0.0" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +dependencies = [ + "arrow", + "chrono", + "dashmap", + "datafusion-common", + "datafusion-expr", + "futures", + "hashbrown 0.14.2", + "log", + "object_store", + "parking_lot 0.12.1", + "rand", + "tempfile", + "url", +] + +[[package]] +name = "datafusion-expr" +version = "33.0.0" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +dependencies = [ + "ahash 0.8.6", + "arrow", + "arrow-array", + "datafusion-common", + "paste", + "sqlparser", + "strum", + "strum_macros", +] + +[[package]] +name = "datafusion-optimizer" +version = "33.0.0" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +dependencies = [ + "arrow", + "async-trait", + "chrono", + "datafusion-common", + "datafusion-expr", + "datafusion-physical-expr", + "hashbrown 0.14.2", + "itertools 0.12.0", + "log", + "regex-syntax 0.8.2", +] + +[[package]] +name = "datafusion-physical-expr" +version = "33.0.0" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +dependencies = [ + "ahash 0.8.6", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-ord", + "arrow-schema", + "base64 0.21.5", + "blake2", + "blake3", + "chrono", + "datafusion-common", + "datafusion-expr", + "half", + "hashbrown 0.14.2", + "hex", + "indexmap 2.1.0", + "itertools 0.12.0", + "log", + "md-5", + "paste", + "petgraph", + "rand", + "regex", + "sha2", + "unicode-segmentation", + "uuid", +] + +[[package]] +name = "datafusion-physical-plan" +version = "33.0.0" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +dependencies = [ + "ahash 0.8.6", + "arrow", + "arrow-array", + "arrow-buffer", + "arrow-schema", + "async-trait", + "chrono", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-expr", + "futures", + "half", + "hashbrown 0.14.2", + "indexmap 2.1.0", + "itertools 0.12.0", + "log", + "once_cell", + "parking_lot 0.12.1", + "pin-project-lite", + "rand", + "tokio", + "uuid", +] + +[[package]] +name = "datafusion-sql" +version = "33.0.0" +source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +dependencies = [ + "arrow", + "arrow-schema", + "datafusion-common", + "datafusion-expr", + "log", + "sqlparser", +] + +[[package]] +name = "debug-helper" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "uuid", +] + +[[package]] +name = "delegate-attr" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee7e7ea0dba407429d816e8e38dda1a467cd74737722f2ccc8eae60429a1a3ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case 0.4.0", + "proc-macro2", + "quote", + "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 = "digest" +version = "0.10.7" +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 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if 1.0.0", + "dirs-sys-next", +] + +[[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" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "dissimilar" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" + +[[package]] +name = "dns-lookup" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "socket2 0.5.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dotenv_config" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef519d2aabc15ca3dba4729976066fa23f80187bf2b19d623d24fe1a0ec3ea" +dependencies = [ + "anyhow", + "askama", + "convert_case 0.6.0", +] + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "dyn-clone" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +dependencies = [ + "serde", +] + +[[package]] +name = "ena" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +dependencies = [ + "log", +] + +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "enrichment" +version = "0.1.0" +source = "git+https://github.com/openobserve/vector?rev=66667dd291482a440c5eb2032ef3cbfb7377b53b#66667dd291482a440c5eb2032ef3cbfb7377b53b" +dependencies = [ + "arc-swap", + "chrono", + "dyn-clone", + "vrl", +] + +[[package]] +name = "enum-iterator" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" +dependencies = [ + "enum-iterator-derive", +] + +[[package]] +name = "enum-iterator-derive" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "env_logger" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +dependencies = [ + "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 = "errno" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "error-code" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" +dependencies = [ + "libc", + "str-buf", +] + +[[package]] +name = "etcd-client" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d982a3b3088a5f95d19882d298b352a2e0be20703e3080c1e6767731d5dec79" +dependencies = [ + "http", + "prost 0.12.2", + "tokio", + "tokio-stream", + "tonic 0.10.2", + "tonic-build 0.10.2", + "tower", + "tower-service", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if 1.0.0", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "exitcode" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" + +[[package]] +name = "expect-test" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" +dependencies = [ + "dissimilar", + "once_cell", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "faststr" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284eac9300ad17d2492e1e87219768b8ab97fb2c74a61cdbc0ced31d3f711159" +dependencies = [ + "bytes", + "serde", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "findshlibs" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" +dependencies = [ + "cc", + "lazy_static", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flatbuffers" +version = "23.5.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640" +dependencies = [ + "bitflags 1.3.2", + "rustc_version", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "libz-sys", + "miniz_oxide", +] + +[[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 = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", +] + +[[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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +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 0.3.9", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot 0.12.1", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gcc" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "get_if_addrs" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abddb55a898d32925f3148bd281174a68eeb68bbfd9a5938a57b18f506ee4ef7" +dependencies = [ + "c_linked_list", + "get_if_addrs-sys", + "libc", + "winapi 0.2.8", +] + +[[package]] +name = "get_if_addrs-sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d04f9fb746cf36b191c00f3ede8bde9c8e64f9f4b05ae2694a9ccf5e3f5ab48" +dependencies = [ + "gcc", + "libc", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "getset" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "grok" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "273797968160270573071022613fc4aa28b91fe68f3eef6c96a1b2a1947ddfbd" +dependencies = [ + "glob", + "onig", +] + +[[package]] +name = "h2" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if 1.0.0", + "crunchy", + "num-traits", +] + +[[package]] +name = "halfbrown" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5681137554ddff44396e5f149892c769d45301dd9aa19c51602a89ee214cb0ec" +dependencies = [ + "hashbrown 0.13.2", + "serde", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.7", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.6", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.6", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.2", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "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]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi 0.3.9", +] + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-auth-basic" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e17aacf7f4a2428def798e2ff4f4f883c0987bdaf47dd5c8bc027bc9f1ebc" +dependencies = [ + "base64 0.13.1", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humansize" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.10", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "log", + "rustls", + "rustls-native-certs", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[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]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[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 = "impl-more" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" + +[[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 = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", + "serde", +] + +[[package]] +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "integer-encoding" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.3", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "ipnetwork" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4088d739b183546b239688ddbc79891831df421773df95e236daf7867866d355" +dependencies = [ + "serde", +] + +[[package]] +name = "ipnetwork" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" +dependencies = [ + "serde", +] + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.3", + "rustix 0.38.24", + "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 = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if 1.0.0", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" + +[[package]] +name = "keccak" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +dependencies = [ + "cpufeatures", +] + +[[package]] +name = "lalrpop" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" +dependencies = [ + "ascii-canvas", + "bit-set", + "diff", + "ena", + "is-terminal", + "itertools 0.10.5", + "lalrpop-util", + "petgraph", + "regex", + "regex-syntax 0.7.5", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + +[[package]] +name = "lalrpop-util" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" + +[[package]] +name = "language-tags" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" + +[[package]] +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 = "lexical-core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "libflate" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" +dependencies = [ + "adler32", + "crc32fast", + "libflate_lz77", +] + +[[package]] +name = "libflate_lz77" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" +dependencies = [ + "rle-decode-fast", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libmimalloc-sys" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[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.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "linux-raw-sys" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" + +[[package]] +name = "local-channel" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8" +dependencies = [ + "futures-core", + "futures-sink", + "local-waker", +] + +[[package]] +name = "local-waker" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lrlex" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22b832738fbfa58ad036580929e973b3b6bd31c6d6c7f18f6b5ea7b626675c85" +dependencies = [ + "getopts", + "lazy_static", + "lrpar", + "num-traits", + "regex", + "serde", + "try_from", + "vergen", +] + +[[package]] +name = "lrpar" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f270b952b07995fe874b10a5ed7dd28c80aa2130e37a7de7ed667d034e0a521" +dependencies = [ + "bincode", + "cactus", + "cfgrammar", + "filetime", + "indexmap 1.9.3", + "lazy_static", + "lrtable", + "num-traits", + "packedvec", + "regex", + "serde", + "static_assertions", + "vergen", + "vob", +] + +[[package]] +name = "lrtable" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a854115c6a10772ac154261592b082436abc869c812575cadcf9d7ceda8eff0b" +dependencies = [ + "cfgrammar", + "fnv", + "num-traits", + "serde", + "sparsevec", + "static_assertions", + "vob", +] + +[[package]] +name = "lz4_flex" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" +dependencies = [ + "twox-hash", +] + +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "maxminddb" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe2ba61113f9f7a9f0e87c519682d39c43a6f3f79c2cc42c3ba3dda83b1fa334" +dependencies = [ + "ipnetwork 0.18.0", + "log", + "memchr", + "serde", +] + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if 1.0.0", + "digest", +] + +[[package]] +name = "mediatype" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c408dc227d302f1496c84d9dc68c00fec6f56f9228a18f3023f976f3ca7c945" + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mimalloc" +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[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.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "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 = "names" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" +dependencies = [ + "clap 3.2.25", + "rand", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "new_mime_guess" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2d684d1b59e0dc07b37e2203ef576987473288f530082512aff850585c61b1f" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi 0.3.9", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[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", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "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-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" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.3", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "object_store" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2524735495ea1268be33d200e1ee97455096a0846295a21548cd2f3541de7050" +dependencies = [ + "async-trait", + "base64 0.21.5", + "bytes", + "chrono", + "futures", + "humantime", + "hyper", + "itertools 0.11.0", + "parking_lot 0.12.1", + "percent-encoding", + "quick-xml", + "rand", + "reqwest", + "ring 0.17.5", + "rustls-pemfile", + "serde", + "serde_json", + "snafu 0.7.5", + "tokio", + "tracing", + "url", + "walkdir", +] + +[[package]] +name = "ofb" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cc40678e045ff4eb1666ea6c0f994b133c31f673c09aed292261b6d5b6963a0" +dependencies = [ + "cipher", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "openobserve" +version = "0.7.1" +dependencies = [ + "actix-cors", + "actix-multipart", + "actix-web", + "actix-web-httpauth", + "actix-web-lab", + "actix-web-opentelemetry", + "actix-web-prometheus", + "actix-web-rust-embed-responder", + "ahash 0.8.6", + "anyhow", + "argon2", + "arrow", + "arrow-schema", + "async-recursion", + "async-trait", + "awc", + "aws-config", + "aws-sdk-dynamodb", + "base64 0.21.5", + "blake3", + "byteorder", + "bytes", + "chrono", + "clap 4.4.8", + "cloudevents-sdk", + "csv", + "dashmap", + "datafusion", + "datafusion-expr", + "dotenv_config", + "dotenvy", + "enrichment", + "env_logger", + "etcd-client", + "expect-test", + "faststr", + "flate2", + "float-cmp", + "futures", + "get_if_addrs", + "getrandom", + "glob", + "hashlink", + "hex", + "http-auth-basic", + "indexmap 2.1.0", + "ipnetwork 0.20.0", + "itertools 0.12.0", + "log", + "maxminddb", + "memchr", + "mimalloc", + "object_store", + "once_cell", + "opentelemetry 0.18.0", + "opentelemetry-otlp", + "opentelemetry-proto 0.2.0", + "parking_lot 0.12.1", + "parquet", + "prometheus", + "promql-parser", + "prost 0.11.9", + "prost-build 0.11.9", + "pyroscope", + "pyroscope_pprofrs", + "rand", + "rayon", + "regex", + "regex-syntax 0.8.2", + "reqwest", + "rs-snowflake", + "rust-embed-for-web", + "segment", + "serde", + "serde_json", + "sha256", + "simd-json", + "sled", + "snap", + "sqlparser", + "sqlx", + "strum", + "sysinfo", + "syslog_loose 0.18.0", + "tempfile", + "thiserror", + "tikv-jemallocator", + "time", + "tokio", + "tokio-stream", + "tonic 0.8.3", + "tonic-build 0.8.4", + "tracing", + "tracing-opentelemetry", + "tracing-subscriber", + "uaparser", + "url", + "utoipa", + "utoipa-swagger-ui", + "uuid", + "vrl", + "walkdir", + "xxhash-rust", + "zstd 0.13.0", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +dependencies = [ + "opentelemetry_api 0.18.0", + "opentelemetry_sdk 0.18.0", +] + +[[package]] +name = "opentelemetry" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4b8347cc26099d3aeee044065ecc3ae11469796b4d65d065a23a584ed92a6f" +dependencies = [ + "opentelemetry_api 0.19.0", + "opentelemetry_sdk 0.19.0", +] + +[[package]] +name = "opentelemetry" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" +dependencies = [ + "futures-core", + "futures-sink", + "indexmap 2.1.0", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", +] + +[[package]] +name = "opentelemetry-http" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry_api 0.18.0", + "reqwest", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" +dependencies = [ + "async-trait", + "futures", + "futures-util", + "http", + "opentelemetry 0.18.0", + "opentelemetry-http", + "opentelemetry-proto 0.1.0", + "prost 0.11.9", + "reqwest", + "serde", + "thiserror", + "tokio", + "tonic 0.8.3", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" +dependencies = [ + "futures", + "futures-util", + "opentelemetry 0.18.0", + "prost 0.11.9", + "tonic 0.8.3", + "tonic-build 0.8.4", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "045f8eea8c0fa19f7d48e7bc3128a39c2e5c533d5c61298c548dfefc1064474c" +dependencies = [ + "futures", + "futures-util", + "opentelemetry 0.19.0", + "prost 0.11.9", + "protobuf", + "serde", + "serde_json", + "tonic 0.8.3", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" +dependencies = [ + "opentelemetry 0.21.0", +] + +[[package]] +name = "opentelemetry_api" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +dependencies = [ + "fnv", + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry_api" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed41783a5bf567688eb38372f2b7a8530f5a607a4b49d38dd7573236c23ca7e2" +dependencies = [ + "fnv", + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api 0.18.0", + "percent-encoding", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b3a2a91fdbfdd4d212c0dcc2ab540de2c2bcbbd90be17de7a7daf8822d010c1" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api 0.19.0", + "percent-encoding", + "rand", + "thiserror", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-float" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" +dependencies = [ + "num-traits", +] + +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "packed_simd" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d" +dependencies = [ + "cfg-if 1.0.0", + "num-traits", +] + +[[package]] +name = "packedvec" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bde3c690ec20e4a2b4fb46f0289a451181eb50011a1e2acc8d85e2fde9062a45" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[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.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "parquet" +version = "49.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af88740a842787da39b3d69ce5fbf6fce97d20211d3b299fee0a0da6430c74d4" +dependencies = [ + "ahash 0.8.6", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-ipc", + "arrow-schema", + "arrow-select", + "base64 0.21.5", + "brotli", + "bytes", + "chrono", + "flate2", + "futures", + "hashbrown 0.14.2", + "lz4_flex", + "num", + "num-bigint", + "object_store", + "paste", + "seq-macro", + "snap", + "thrift", + "tokio", + "twox-hash", + "zstd 0.13.0", +] + +[[package]] +name = "parse-size" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae" + +[[package]] +name = "parse-zoneinfo" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" +dependencies = [ + "regex", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "peeking_take_while" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9ed2178b0575fff8e1b83b58ba6f75e727aafac2e1b6c795169ad3b17eb518" + +[[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.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pest" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "pest_meta" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.1.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.39", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +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" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[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 = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "pprof" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978385d59daf9269189d052ca8a84c1acfd0715c0599a5d5188d4acc078ca46a" +dependencies = [ + "backtrace", + "cfg-if 1.0.0", + "findshlibs", + "libc", + "log", + "nix", + "once_cell", + "parking_lot 0.12.1", + "smallvec", + "symbolic-demangle", + "tempfile", + "thiserror", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[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 = "prettyplease" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +dependencies = [ + "proc-macro2", + "syn 2.0.39", +] + +[[package]] +name = "prettytable-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" +dependencies = [ + "encode_unicode", + "is-terminal", + "lazy_static", + "term", + "unicode-width", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + +[[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.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "procfs" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "hex", + "lazy_static", + "rustix 0.36.17", +] + +[[package]] +name = "prometheus" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +dependencies = [ + "cfg-if 1.0.0", + "fnv", + "lazy_static", + "libc", + "memchr", + "parking_lot 0.12.1", + "procfs", + "protobuf", + "thiserror", +] + +[[package]] +name = "promql-parser" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49ba47c84c4e66bcde38e8ac608feebddf65636d5fc8ed1763836e05013850f3" +dependencies = [ + "cfgrammar", + "lazy_static", + "lrlex", + "lrpar", + "regex", +] + +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive 0.11.9", +] + +[[package]] +name = "prost" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5a410fc7882af66deb8d01d01737353cf3ad6204c408177ba494291a626312" +dependencies = [ + "bytes", + "prost-derive 0.12.2", +] + +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes", + "heck", + "itertools 0.10.5", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease 0.1.25", + "prost 0.11.9", + "prost-types 0.11.9", + "regex", + "syn 1.0.109", + "tempfile", + "which", +] + +[[package]] +name = "prost-build" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa3d084c8704911bfefb2771be2f9b6c5c0da7343a71e0021ee3c665cada738" +dependencies = [ + "bytes", + "heck", + "itertools 0.11.0", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease 0.2.15", + "prost 0.12.2", + "prost-types 0.12.2", + "regex", + "syn 2.0.39", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-derive" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "065717a5dfaca4a83d2fe57db3487b311365200000551d7a364e715dbf4346bc" +dependencies = [ + "anyhow", + "itertools 0.11.0", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost 0.11.9", +] + +[[package]] +name = "prost-types" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8339f32236f590281e2f6368276441394fcd1b2133b549cc895d0ae80f2f9a52" +dependencies = [ + "prost 0.12.2", +] + +[[package]] +name = "protobuf" +version = "2.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pyroscope" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac8a53ce01af1087eaeee6ce7c4fbf50ea4040ab1825c0115c4bafa039644ba9" +dependencies = [ + "json", + "libc", + "libflate", + "log", + "names", + "prost 0.11.9", + "reqwest", + "thiserror", + "url", + "winapi 0.3.9", +] + +[[package]] +name = "pyroscope_pprofrs" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f010b2a981a7f8449a650f25f309e520b5206ea2d89512dcb146aaa5518ff4" +dependencies = [ + "log", + "pprof", + "pyroscope", + "thiserror", +] + +[[package]] +name = "quanta" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e31331286705f455e56cca62e0e717158474ff02b7936c1fa596d983f4ae27" +dependencies = [ + "crossbeam-utils", + "libc", + "mach", + "once_cell", + "raw-cpuid", + "wasi 0.10.2+wasi-snapshot-preview1", + "web-sys", + "winapi 0.3.9", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "quoted_printable" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[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 = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "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_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "ref-cast" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "regex-syntax 0.8.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-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "rend" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "base64 0.21.5", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots 0.25.2", + "winreg", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi 0.3.9", +] + +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "rkyv" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +dependencies = [ + "bitvec", + "bytecheck", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rle-decode-fast" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rs-snowflake" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e60ef3b82994702bbe4e134d98aadca4b49ed04440148985678d415c68127666" + +[[package]] +name = "rsa" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rust-embed" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-for-web" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb0ac27c82044eed85bb65ff80438d9c9a9b7335ccded5ee43d5d90c5e69be75" +dependencies = [ + "rust-embed-for-web-impl", + "rust-embed-for-web-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-for-web-impl" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8550045ff1cf11e67aaa2b651163256461cb6aa4ba1e13957a98ac1472206a3" +dependencies = [ + "brotli", + "flate2", + "globset", + "proc-macro2", + "quote", + "rust-embed-for-web-utils", + "shellexpand 3.1.0", + "syn 2.0.39", + "walkdir", +] + +[[package]] +name = "rust-embed-for-web-utils" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c747ac20c1b87c0a7dee62f2b47ca26a9112b164a66b1c2d2fafae958d8cfd75" +dependencies = [ + "base85rs", + "chrono", + "globset", + "new_mime_guess", + "sha2", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "shellexpand 2.1.2", + "syn 2.0.39", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust_decimal" +version = "1.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076ba1058b036d3ca8bcafb1d54d0b0572e99d7ecd3e4222723e18ca8e9ca9a8" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand", + "rkyv", + "serde", + "serde_json", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[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.36.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustix" +version = "0.38.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.11", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.21.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +dependencies = [ + "log", + "ring 0.17.5", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.5", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.5", + "untrusted 0.9.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rustyline" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" +dependencies = [ + "bitflags 2.4.1", + "cfg-if 1.0.0", + "clipboard-win", + "libc", + "log", + "memchr", + "nix", + "scopeguard", + "unicode-segmentation", + "unicode-width", + "utf8parse", + "winapi 0.3.9", +] + +[[package]] +name = "ryu" +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 = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[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.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring 0.17.5", + "untrusted 0.9.0", +] + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "segment" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12485833e00457a6bbba60397d3f19362751a0caefe27f6755fff1a2be4fd601" +dependencies = [ + "async-trait", + "reqwest", + "serde", + "serde_json", + "thiserror", + "time", +] + +[[package]] +name = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" + +[[package]] +name = "seq-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" + +[[package]] +name = "serde" +version = "1.0.192" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.192" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_html_form" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde65b75f2603066b78d6fa239b2c07b43e06ead09435f60554d3912962b4a3c" +dependencies = [ + "form_urlencoded", + "indexmap 2.1.0", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_plain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +dependencies = [ + "indexmap 1.9.3", + "ryu", + "serde", + "yaml-rust", +] + +[[package]] +name = "sha-1" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha256" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7895c8ae88588ccead14ff438b939b0c569cd619116f14b4d13fdff7b8333386" +dependencies = [ + "async-trait", + "bytes", + "hex", + "sha2", + "tokio", +] + +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest", + "keccak", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellexpand" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" +dependencies = [ + "dirs 4.0.0", +] + +[[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "dirs 5.0.1", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simd-json" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a3720326b20bf5b95b72dbbd133caae7e0dcf71eae8f6e6656e71a7e5c9aaa" +dependencies = [ + "getrandom", + "halfbrown", + "lexical-core", + "ref-cast", + "serde", + "serde_json", + "simdutf8", + "value-trait", +] + +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "sled" +version = "0.34.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935" +dependencies = [ + "crc32fast", + "crossbeam-epoch", + "crossbeam-utils", + "fs2", + "fxhash", + "libc", + "log", + "parking_lot 0.11.2", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "snafu" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eab12d3c261b2308b0d80c26fffb58d17eba81a4be97890101f416b478c79ca7" +dependencies = [ + "doc-comment", + "snafu-derive 0.6.10", +] + +[[package]] +name = "snafu" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +dependencies = [ + "doc-comment", + "snafu-derive 0.7.5", +] + +[[package]] +name = "snafu-derive" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "snafu-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "snap" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "sparsevec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928d1ef5df00aec8c5643c2ac37db4dd282763013c0fcc81efbb8e13db8dd8ec" +dependencies = [ + "num-traits", + "packedvec", + "serde", + "vob", +] + +[[package]] +name = "spin" +version = "0.5.2" +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" +dependencies = [ + "lock_api", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" +dependencies = [ + "itertools 0.11.0", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlparser" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7" +dependencies = [ + "log", + "serde", + "sqlparser_derive", +] + +[[package]] +name = "sqlparser_derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55fe75cb4a364c7f7ae06c7dbbc8d84bddd85d6cdf9975963c3935bc1991761e" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "sqlx" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" +dependencies = [ + "ahash 0.8.6", + "atoi", + "byteorder", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "dotenvy", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.1.0", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "webpki-roots 0.24.0", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" +dependencies = [ + "dotenvy", + "either", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" +dependencies = [ + "atoi", + "base64 0.21.5", + "bitflags 2.4.1", + "byteorder", + "bytes", + "chrono", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" +dependencies = [ + "atoi", + "base64 0.21.5", + "bitflags 2.4.1", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +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 = "str-buf" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot 0.12.1", + "phf_shared 0.10.0", + "precomputed-hash", +] + +[[package]] +name = "stringprep" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +dependencies = [ + "finl_unicode", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "strip-ansi-escapes" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" +dependencies = [ + "vte", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.39", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "symbolic-common" +version = "12.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "405af7bd5edd866cef462e22ef73f11cf9bf506c9d62824fef8364eb69d4d4ad" +dependencies = [ + "debugid", + "memmap2", + "stable_deref_trait", + "uuid", +] + +[[package]] +name = "symbolic-demangle" +version = "12.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bcd041ccfb77d9c70639efcd5b804b508ac7a273e9224d227379e225625daf9" +dependencies = [ + "cpp_demangle", + "rustc-demangle", + "symbolic-common", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sysinfo" +version = "0.29.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" +dependencies = [ + "cfg-if 1.0.0", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi 0.3.9", +] + +[[package]] +name = "syslog_loose" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb75f176928530867b2a659e470f9c9ff71904695bab6556f7ad30f9039efd" +dependencies = [ + "chrono", + "nom", +] + +[[package]] +name = "syslog_loose" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf5252d1adec0a489a0225f867c1a7fd445e41674530a396d0629cff0c4b211" +dependencies = [ + "chrono", + "nom", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if 1.0.0", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.24", + "windows-sys 0.48.0", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi 0.3.9", +] + +[[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + +[[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.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", +] + +[[package]] +name = "thrift" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" +dependencies = [ + "byteorder", + "integer-encoding", + "ordered-float 2.10.1", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.5.4+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "time" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +dependencies = [ + "deranged", + "itoa", + "powerfmt", + "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 = "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" +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.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[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", + "flate2", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost 0.11.9", + "prost-derive 0.11.9", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tower-layer", + "tower-service", + "tracing", + "tracing-futures", +] + +[[package]] +name = "tonic" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.5", + "bytes", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost 0.12.2", + "rustls", + "rustls-pemfile", + "tokio", + "tokio-rustls", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic-build" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" +dependencies = [ + "prettyplease 0.1.25", + "proc-macro2", + "prost-build 0.11.9", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tonic-build" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" +dependencies = [ + "prettyplease 0.2.15", + "proc-macro2", + "prost-build 0.12.2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[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" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" +dependencies = [ + "once_cell", + "opentelemetry 0.18.0", + "tracing", + "tracing-core", + "tracing-log 0.1.4", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log 0.2.0", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "try_from" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" +dependencies = [ + "cfg-if 0.1.10", +] + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if 1.0.0", + "static_assertions", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uaparser" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf694e7b0434d4fad6c879e984e8fdc3a62f5533c3d421762244f9e9d03f6927" +dependencies = [ + "derive_more", + "lazy_static", + "regex", + "serde", + "serde_derive", + "serde_yaml", +] + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[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.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[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-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[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 = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8-width" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "utoipa" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ff05e3bac2c9428f57ade702667753ca3f5cf085e2011fe697de5bfd49aa72d" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_json", + "utoipa-gen", +] + +[[package]] +name = "utoipa-gen" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0b6f4667edd64be0e820d6631a60433a269710b6ee89ac39525b872b76d61d" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "syn 2.0.39", +] + +[[package]] +name = "utoipa-swagger-ui" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "154517adf0d0b6e22e8e1f385628f14fcaa3db43531dc74303d3edef89d6dfe5" +dependencies = [ + "actix-web", + "mime_guess", + "regex", + "rust-embed", + "serde", + "serde_json", + "utoipa", + "zip", +] + +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +dependencies = [ + "getrandom", + "rand", + "uuid-macro-internal", + "wasm-bindgen", +] + +[[package]] +name = "uuid-macro-internal" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d8c6bba9b149ee82950daefc9623b32bb1dacbfb1890e352f6b887bd582adaf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-trait" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea87257cfcbedcb9444eda79c59fdfea71217e6305afee8ee33f500375c2ac97" +dependencies = [ + "float-cmp", + "halfbrown", + "itoa", + "ryu", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vergen" +version = "7.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749" +dependencies = [ + "anyhow", + "cfg-if 1.0.0", + "enum-iterator", + "getset", + "rustversion", + "thiserror", + "time", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vob" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c058f4c41e71a043c67744cb76dcc1ae63ece328c1732a72489ccccc2dec23e6" +dependencies = [ + "num-traits", + "rustc_version", + "serde", +] + +[[package]] +name = "vrl" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a93ee342590c4df0ff63961d7d76a347e0c7b6e6c0be4c001317ca1ff11b53" +dependencies = [ + "aes", + "anymap", + "base16", + "base64 0.21.5", + "bytes", + "cbc", + "cfb-mode", + "cfg-if 1.0.0", + "chacha20poly1305", + "charset", + "chrono", + "chrono-tz", + "cidr-utils", + "clap 4.4.8", + "codespan-reporting", + "community-id", + "crypto_secretbox", + "csv", + "ctr", + "data-encoding", + "dns-lookup", + "dyn-clone", + "exitcode", + "flate2", + "grok", + "hex", + "hmac", + "hostname", + "indexmap 2.1.0", + "indoc", + "itertools 0.11.0", + "lalrpop", + "lalrpop-util", + "md-5", + "nom", + "ofb", + "once_cell", + "onig", + "ordered-float 4.1.1", + "paste", + "peeking_take_while", + "percent-encoding", + "pest", + "pest_derive", + "prettytable-rs", + "quoted_printable", + "rand", + "regex", + "roxmltree", + "rust_decimal", + "rustyline", + "seahash", + "serde", + "serde_json", + "sha-1", + "sha2", + "sha3", + "snafu 0.7.5", + "strip-ansi-escapes", + "syslog_loose 0.19.0", + "termcolor", + "thiserror", + "tracing", + "uaparser", + "url", + "utf8-width", + "uuid", + "webbrowser", + "woothee", + "zstd 0.13.0", +] + +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[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.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" + +[[package]] +name = "wasm-streams" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webbrowser" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" +dependencies = [ + "core-foundation", + "home", + "jni", + "log", + "ndk-context", + "objc", + "raw-window-handle", + "url", + "web-sys", +] + +[[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 = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.24", +] + +[[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi 0.3.9", +] + +[[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-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[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.5", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "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]] +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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "woothee" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "896174c6a4779d4d7d4523dd27aef7d46609eda2497e370f6c998325c6bf6971" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xxhash-rust" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" + +[[package]] +name = "xz2" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" +dependencies = [ + "lzma-sys", +] + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "zerocopy" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "zeroize" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12a3946ecfc929b583800f4629b6c25b88ac6e92a40ea5670f77112a85d40a8b" + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", +] + +[[package]] +name = "zstd" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +dependencies = [ + "zstd-safe 6.0.6", +] + +[[package]] +name = "zstd" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +dependencies = [ + "zstd-safe 7.0.0", +] + +[[package]] +name = "zstd-safe" +version = "6.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-safe" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.9+zstd.1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/pkgs/by-name/op/openobserve/build.rs.patch b/pkgs/by-name/op/openobserve/build.rs.patch new file mode 100644 index 0000000000000..1cfb91c7c12b7 --- /dev/null +++ b/pkgs/by-name/op/openobserve/build.rs.patch @@ -0,0 +1,29 @@ +diff --git a/build.rs b/build.rs +index 0f66ace..be74fad 100644 +--- a/build.rs ++++ b/build.rs +@@ -99,24 +99,5 @@ fn main() -> Result<()> { + &["proto"], + )?; + +- // build information +- let output = Command::new("git") +- .args(["describe", "--tags", "--abbrev=0"]) +- .output() +- .unwrap(); +- let git_tag = String::from_utf8(output.stdout).unwrap(); +- println!("cargo:rustc-env=GIT_VERSION={git_tag}"); +- +- let output = Command::new("git") +- .args(["rev-parse", "HEAD"]) +- .output() +- .unwrap(); +- let git_commit = String::from_utf8(output.stdout).unwrap(); +- println!("cargo:rustc-env=GIT_COMMIT_HASH={git_commit}"); +- +- let now: DateTime<Utc> = Utc::now(); +- let build_date = now.to_rfc3339_opts(SecondsFormat::Secs, true); +- println!("cargo:rustc-env=GIT_BUILD_DATE={build_date}"); +- + Ok(()) + } diff --git a/pkgs/by-name/op/openobserve/package.nix b/pkgs/by-name/op/openobserve/package.nix new file mode 100644 index 0000000000000..3cc229348bba7 --- /dev/null +++ b/pkgs/by-name/op/openobserve/package.nix @@ -0,0 +1,139 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, protobuf +, bzip2 +, oniguruma +, sqlite +, xz +, zlib +, zstd +, stdenv +, darwin +, buildNpmPackage +}: + +let + version = "0.7.2"; + src = fetchFromGitHub { + owner = "openobserve"; + repo = "openobserve"; + rev = "v${version}"; + hash = "sha256-BFLQL3msDuurRSFOCbqN0vK4NrTS9M6k1hNwet/9mnw="; + }; + web = buildNpmPackage { + inherit src version; + pname = "openobserve-ui"; + + sourceRoot = "source/web"; + + npmDepsHash = "sha256-eYrspgejb5VR51wAXdGr+pSXDdGnRyX5cwwopK3Kex8="; + + preBuild = '' + # Patch vite config to not open the browser to visualize plugin composition + substituteInPlace vite.config.ts \ + --replace "open: true" "open: false"; + ''; + + env = { + # cypress tries to download binaries otherwise + CYPRESS_INSTALL_BINARY = 0; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share + mv dist $out/share/openobserve-ui + runHook postInstall + ''; + }; +in +rustPlatform.buildRustPackage { + pname = "openobserve"; + inherit version src; + + # prevent using git to determine version info during build time + patches = [ + ./build.rs.patch + ]; + + preBuild = '' + cp -r ${web}/share/openobserve-ui web/dist + ''; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "enrichment-0.1.0" = "sha256-FDPSCBkx+DPeWwTBz9+ORcbbiSBC2a8tJaay9Pxwz4w="; + "datafusion-33.0.0" = "sha256-RZAgk7up83zxPbmNzdnzB6M0yjjK9MYms+6TpXVDJ1o="; + }; + }; + + nativeBuildInputs = [ + pkg-config + protobuf + ]; + + buildInputs = [ + bzip2 + oniguruma + sqlite + xz + zlib + zstd + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation + IOKit + Security + SystemConfiguration + ]); + + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + + RUSTC_BOOTSTRAP = 1; # uses experimental features + + # the patched build.rs file sets these variables + GIT_VERSION = src.rev; + GIT_COMMIT_HASH = "builtByNix"; + GIT_BUILD_DATE = "1970-01-01T00:00:00Z"; + }; + + # requires network access or filesystem mutations + checkFlags = [ + "--skip handler::http::auth::tests::test_validate" + "--skip handler::http::router::ui::tests::test_index_not_ok" + "--skip handler::http::router::ui::tests::test_index_ok" + "--skip handler::http::request::search::saved_view::tests::test_create_view_post" + "--skip infra::cache::file_list::tests::test_get_file_from_cache" + "--skip infra::cache::tmpfs::tests::test_delete_prefix" + "--skip infra::cluster::tests::test_get_node_ip" + "--skip infra::db::tests::test_delete" + "--skip service::alerts::test::test_alerts" + "--skip service::compact::merge::tests::test_compact" + "--skip service::db::compact::file_list::tests::test_files" + "--skip service::db::compact::file_list::tests::test_file_list_offset" + "--skip service::db::compact::file_list::tests::test_file_list_process_offset" + "--skip service::db::compact::files::tests::test_compact_files" + "--skip service::db::user::tests::test_user" + "--skip service::ingestion::grpc::tests::test_get_val" + "--skip service::organization::tests::test_organization" + "--skip service::search::sql::tests::test_sql_full" + "--skip service::triggers::tests::test_triggers" + "--skip service::users::tests::test_post_user" + "--skip service::users::tests::test_user" + "--skip common::infra::cache::file_data::disk::tests::test_get_file_from_cache" + "--skip common::infra::db::tests::test_get" + "--skip common::utils::auth::tests::test_is_root_user2" + "--skip tests::e2e_test" + ]; + + meta = with lib; { + description = "10x easier, 🚀 140x lower storage cost, 🚀 high performance, 🚀 petabyte scale - Elasticsearch/Splunk/Datadog alternative for 🚀 (logs, metrics, traces"; + homepage = "https://github.com/openobserve/openobserve"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + mainProgram = "openobserve"; + }; +} diff --git a/pkgs/by-name/op/opensearch-cli/package.nix b/pkgs/by-name/op/opensearch-cli/package.nix new file mode 100644 index 0000000000000..ce0a671358045 --- /dev/null +++ b/pkgs/by-name/op/opensearch-cli/package.nix @@ -0,0 +1,38 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "opensearch-cli"; + version = "1.2.0"; + src = fetchFromGitHub { + repo = "opensearch-cli"; + owner = "opensearch-project"; + rev = version; + hash = "sha256-Ah64a9hpc2tnIXiwxg/slE6fUTAoHv9koNmlUHrVj/s="; + }; + + vendorHash = "sha256-r3Bnud8pd0Z9XmGkj9yxRW4U/Ry4U8gvVF4pAdN14lQ="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + export HOME="$(mktemp -d)" + installShellCompletion --cmd opensearch-cli \ + --bash <($out/bin/opensearch-cli completion bash) \ + --zsh <($out/bin/opensearch-cli completion zsh) \ + --fish <($out/bin/opensearch-cli completion fish) + ''; + + meta = { + description = "A full-featured command line interface (CLI) for OpenSearch."; + homepage = "https://github.com/opensearch-project/opensearch-cli"; + license = lib.licenses.asl20; + mainProgram = "opensearch-cli"; + maintainers = with lib.maintainers; [ shyim ]; + platforms = lib.platforms.unix; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + }; +} diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 04443e2f1698c..84c326270e44e 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-hQP48druIwkVVKeC1TKq+DEGOJOmkendc3Ij9ft+uDQ="; + hash = "sha256-9hxfRiZ3V65wvh8n1SGeTzNdjdoEfRtyFOv4+f/u+O8="; # 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; @@ -19,7 +19,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-opPxsCukXcLcrf/sD9AW1iIYOK5BmTLnc/QGUvzVLwg="; + vendorHash = "sha256-LBvd8qah+v0y3dHadSs69/y6pr8TyZ0nDJgHR+8qlEo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix new file mode 100644 index 0000000000000..e15bdf7c68acb --- /dev/null +++ b/pkgs/by-name/ot/oterm/package.nix @@ -0,0 +1,40 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "oterm"; + version = "0.1.17"; + pyproject = true; + src = fetchFromGitHub { + owner = "ggozad"; + repo = "oterm"; + rev = "refs/tags/${version}"; + hash = "sha256-huDxrhFtG2QoytJQHIikOP+LgYiKbj0XxbgS9bz6SHw="; + }; + propagatedBuildInputs = with python3Packages; [ + textual + typer + python-dotenv + httpx + aiosql + aiosqlite + pyperclip + packaging + rich-pixels + ]; + nativeBuildInputs = with python3Packages; [ poetry-core ]; + + # Tests require a HTTP connection to ollama + doCheck = false; + + meta = with lib; { + description = "A text-based terminal client for Ollama"; + homepage = "https://github.com/ggozad/oterm"; + changelog = "https://github.com/ggozad/oterm/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ suhr ]; + mainProgram = "oterm"; + }; +} diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix new file mode 100644 index 0000000000000..9ca167dd37ea5 --- /dev/null +++ b/pkgs/by-name/ov/overskride/package.nix @@ -0,0 +1,66 @@ +{ lib, fetchFromGitHub, rustPlatform, cargo, rustc, meson, ninja +, pkg-config, wrapGAppsHook4, desktop-file-utils, appstream-glib +, blueprint-compiler, dbus, gtk4, libadwaita, bluez, libpulseaudio }: let + +owner = "kaii-lb"; +name = "overskride"; +version = "0.5.6"; + +in rustPlatform.buildRustPackage { + + pname = name; + inherit version; + + src = fetchFromGitHub { + inherit owner; + repo = name; + rev = "v${version}"; + hash = "sha256-syQzHHT0s15oj8Yl2vhgyXlPI8UxOqIXGDqFeUc/dJQ="; + }; + + cargoHash = "sha256-NEsqVfKZqXSLieRO0BvQGdggmXXYO15qVhbfgAFATPc="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + desktop-file-utils + appstream-glib + blueprint-compiler + meson + ninja + cargo + rustc + ]; + + buildInputs = [ dbus gtk4 libadwaita bluez libpulseaudio ]; + + buildPhase = '' + runHook preBuild + + meson setup build --prefix $out && cd build + meson compile && meson devenv + + runHook postBuild + ''; + + # The "Validate appstream file" test fails. + # TODO: This appears to have been fixed upstream + # so checks should be enabled with the next version. + doCheck = false; + + preFixup = '' + glib-compile-schemas $out/share/gsettings-schemas/${name}-${version}/glib-2.0/schemas + ''; + + meta = with lib; { + description = + "A Bluetooth and Obex client that is straight to the point, DE/WM agnostic, and beautiful"; + homepage = "https://github.com/${owner}/${name}"; + changelog = "https://github.com/${owner}/${name}/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + mainProgram = name; + maintainers = with maintainers; [ mrcjkb ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/by-name/ov/ovn/generic.nix b/pkgs/by-name/ov/ovn/generic.nix new file mode 100644 index 0000000000000..0dfe1f80d653e --- /dev/null +++ b/pkgs/by-name/ov/ovn/generic.nix @@ -0,0 +1,96 @@ +{ + version, + hash, + updateScriptArgs ? "", +}: + +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + gnused, + libbpf, + libcap_ng, + numactl, + openssl, + pkg-config, + procps, + python3, + unbound, + xdp-tools, + writeScript, +}: + +stdenv.mkDerivation rec { + pname = "ovn"; + inherit version; + + src = fetchFromGitHub { + owner = "ovn-org"; + repo = "ovn"; + rev = "refs/tags/v${version}"; + inherit hash; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + python3 + ]; + + buildInputs = [ + libbpf + libcap_ng + numactl + openssl + unbound + xdp-tools + ]; + + # need to build the ovs submodule first + preConfigure = '' + pushd ovs + ./boot.sh + ./configure + make -j $NIX_BUILD_CORES + popd + ''; + + enableParallelBuilding = true; + + doCheck = true; + + nativeCheckInputs = [ + gnused + procps + ]; + + # https://docs.ovn.org/en/latest/topics/testing.html + preCheck = '' + export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" + # allow rechecks to retry flaky tests + export RECHECK=yes + + # hack to stop tests from trying to read /etc/resolv.conf + export OVS_RESOLV_CONF="$PWD/resolv.conf" + touch $OVS_RESOLV_CONF + ''; + + passthru.updateScript = writeScript "ovs-update.nu" '' + ${./update.nu} ${updateScriptArgs} + ''; + + meta = with lib; { + description = "Open Virtual Network"; + longDescription = '' + OVN (Open Virtual Network) is a series of daemons that translates virtual network configuration into OpenFlow, and installs them into Open vSwitch. + ''; + homepage = "https://github.com/ovn-org/ovn"; + changelog = "https://github.com/ovn-org/ovn/blob/${src.rev}/NEWS"; + license = licenses.asl20; + maintainers = with maintainers; [ adamcstephens ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ov/ovn/lts.nix b/pkgs/by-name/ov/ovn/lts.nix new file mode 100644 index 0000000000000..5a022fcd9f2d5 --- /dev/null +++ b/pkgs/by-name/ov/ovn/lts.nix @@ -0,0 +1,5 @@ +import ./generic.nix { + version = "22.03.5"; + hash = "sha256-DMDWR7Dbgak0azPcVqDdFHGovTbLX8byp+jQ3rYvvX4="; + updateScriptArgs = "--lts=true --regex '22.03.*'"; +} diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix new file mode 100644 index 0000000000000..50050d49a0886 --- /dev/null +++ b/pkgs/by-name/ov/ovn/package.nix @@ -0,0 +1,4 @@ +import ./generic.nix { + version = "23.09.1"; + hash = "sha256-t4DtV0wW/jQX7/TpsLFoDzzSPROrhUHHG09r9+lsdaQ="; +} diff --git a/pkgs/by-name/ov/ovn/update.nu b/pkgs/by-name/ov/ovn/update.nu new file mode 100755 index 0000000000000..ba55fce087ea9 --- /dev/null +++ b/pkgs/by-name/ov/ovn/update.nu @@ -0,0 +1,19 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i nu -p nushell common-updater-scripts + +def main [--lts: bool = false, --regex: string] { + let tags = list-git-tags --url=https://github.com/ovn-org/ovn | lines | sort --natural | str replace v '' + + let latest_tag = if $regex == null { $tags } else { $tags | find --regex $regex } | last + let current_version = nix eval --raw -f default.nix $"ovn(if $lts {"-lts"}).version" | str trim + + if $latest_tag != $current_version { + if $lts { + update-source-version ovn-lts $latest_tag $"--file=(pwd)/pkgs/by-name/ov/ovn/lts.nix" + } else { + update-source-version ovn $latest_tag $"--file=(pwd)/pkgs/by-name/ov/ovn/package.nix" + } + } + + {"lts?": $lts, before: $current_version, after: $latest_tag} +} diff --git a/pkgs/tools/networking/pacproxy/default.nix b/pkgs/by-name/pa/pacproxy/package.nix index f1fb107dd62c5..9b6538b1c85c2 100644 --- a/pkgs/tools/networking/pacproxy/default.nix +++ b/pkgs/by-name/pa/pacproxy/package.nix @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/williambailey/pacproxy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ terlar ]; + mainProgram = "pacproxy"; }; } diff --git a/pkgs/by-name/pa/passes/package.nix b/pkgs/by-name/pa/passes/package.nix index 35a8a94a9fe10..39a502038b527 100644 --- a/pkgs/by-name/pa/passes/package.nix +++ b/pkgs/by-name/pa/passes/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "passes"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "pablo-s"; repo = "passes"; rev = "v${finalAttrs.version}"; - hash = "sha256-SIJLBVWyW9+Hzb6ebfUnBfUuvNmYBm9ojKrnFOS3BGc="; + hash = "sha256-RfoqIyqc9zwrWZ5RLhQl+6vTccbCTwtDcMlnWPCDOag="; }; postPatch = '' diff --git a/pkgs/by-name/pa/passmark-performancetest/package.nix b/pkgs/by-name/pa/passmark-performancetest/package.nix new file mode 100644 index 0000000000000..5fbb4f3199c84 --- /dev/null +++ b/pkgs/by-name/pa/passmark-performancetest/package.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchurl +, curl +, unzip +, ncurses5 +, dmidecode +, coreutils +, util-linux +, autoPatchelfHook +, makeWrapper +}: +let + sources = { + "x86_64-linux" = { + url = "https://web.archive.org/web/20231205092714/https://www.passmark.com/downloads/pt_linux_x64.zip"; + hash = "sha256-q9H+/V4fkSwJJEp+Vs+MPvndi5DInx5MQCzAv965IJg="; + }; + "aarch64-linux" = { + url = "https://web.archive.org/web/20231205092807/https://www.passmark.com/downloads/pt_linux_arm64.zip"; + hash = "sha256-7fmd2fukJ56e0BJFJe3SitGlordyIFbNjIzQv+u6Zuw="; + }; + }; +in +stdenv.mkDerivation rec { + version = "11.0.1002"; + pname = "passmark-performancetest"; + + src = fetchurl (sources.${stdenv.system} or (throw "Unsupported system for PassMark performance test")); + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ unzip autoPatchelfHook makeWrapper ]; + + buildInputs = [ + stdenv.cc.cc.lib + curl + ncurses5 + ]; + + installPhase = '' + runHook preInstall + install -Dm555 pt_linux_* "$out/bin/performancetest" + runHook postInstall + ''; + + # Prefix since program will call sudo + postFixup = '' + wrapProgram $out/bin/performancetest \ + --prefix PATH ":" ${lib.makeBinPath [ + dmidecode + coreutils + util-linux + ]} + ''; + + meta = with lib; { + description = "A software tool that allows everybody to quickly assess the performance of their computer and compare it to a number of standard 'baseline' computer systems."; + homepage = "https://www.passmark.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ neverbehave ]; + platforms = builtins.attrNames sources; + mainProgram = "performancetest"; + }; +} diff --git a/pkgs/by-name/pe/perl-debug-adapter/package.nix b/pkgs/by-name/pe/perl-debug-adapter/package.nix new file mode 100644 index 0000000000000..4b1dd4e09ee67 --- /dev/null +++ b/pkgs/by-name/pe/perl-debug-adapter/package.nix @@ -0,0 +1,45 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, fetchpatch +, makeWrapper +, perl +# Needed if you want to use it for a perl script with dependencies. +, extraPerlPackages ? [] +}: + +let + perlInterpreter = perl.withPackages(ps: [ + ps.PadWalker + ] ++ extraPerlPackages); +in buildNpmPackage rec { + pname = "perl-debug-adapter"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "Nihilus118"; + repo = "perl-debug-adapter"; + rev = version; + hash = "sha256-IXXKhk4rzsWSPA0RT0L3CZuKlgTWtweZ4dQtruTigRs="; + }; + + npmDepsHash = "sha256-iw7+YC4qkrTVEJuZ9lnjNlUopTCp+fMNoIjFLutmrMw="; + + npmBuildScript = "compile"; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ perlInterpreter ]) + ]; + passthru = { + inherit perlInterpreter; + }; + + meta = { + description = "Debug adapter, invokes perl -d and handles communication with VS Code or other editors"; + homepage = "https://github.com/Nihilus118/perl-debug-adapter"; + changelog = "https://github.com/Nihilus118/perl-debug-adapter/blob/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + mainProgram = "perl-debug-adapter"; + }; +} diff --git a/pkgs/by-name/pe/persistent-cache-cpp/package.nix b/pkgs/by-name/pe/persistent-cache-cpp/package.nix new file mode 100644 index 0000000000000..c7d212a477afe --- /dev/null +++ b/pkgs/by-name/pe/persistent-cache-cpp/package.nix @@ -0,0 +1,131 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, boost +, cmake +, doxygen +, gtest +, leveldb +, lomiri +, pkg-config +, python3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "persistent-cache-cpp"; + version = "1.0.6"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lib-cpp/persistent-cache-cpp"; + rev = finalAttrs.version; + hash = "sha256-RLZiYY0Y9LT+ajM4Va4MpVVDBlu2yvCpn8bNGMB8ydo="; + }; + + outputs = [ + "out" + "dev" + "doc" + ]; + + patches = [ + # Version in CMakeLists.txt didn't get bumped, emits wrong version in pkg-config + # Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/13 merged & in release + (fetchpatch { + name = "0001-persistent-cache-cpp-CMakeLists-txt-Update-version.patch"; + url = "https://gitlab.com/OPNA2608/persistent-cache-cpp/-/commit/20d5d3f61563c62bcbe85e71ddc4fe16d7c995d5.patch"; + hash = "sha256-BKovtT9OvV+xEwBO8AZTxAzL9kqyDB9ip32t2Xx4eIk="; + }) + + # PersistentStringCacheImpl.exceptions test fails on LLVM's libcxx, it depends on std::system_error producing a very specific exception text + # Expects "Unknown error 666", gets "unspecified generic_category error" + # Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/14 merged & in release + (fetchpatch { + name = "0002-persistent-cache-cpp-persistent_string_cache_impl_test-libcxx-fix.patch"; + url = "https://gitlab.com/OPNA2608/persistent-cache-cpp/-/commit/a696dbd3093b8333f9ee1f0cad846b2256c729c5.patch"; + hash = "sha256-SJxdXeM7W+WKEmiLTwnQYAM7YmPayEk6vPb46y4thv4="; + }) + + # Enable usage of BUILD_TESTING to opting out of tests + # Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/15 merged & in release + (fetchpatch { + name = "0003-persistent-cache-cpp-Enable-opting-out-of-tests.patch"; + url = "https://gitlab.com/OPNA2608/persistent-cache-cpp/-/commit/1fb06d28c16325e90046e93662c0f5fd16c29b4a.patch"; + hash = "sha256-2/6EYBh71S4dzqWEde+3dLOGp015fN6IifAj1bI1XAI="; + }) + + # Enable linking based on stdenv (static or dynamic) + # Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/16 merged & in release + (fetchpatch { + name = "0004-persistent-cache-cpp-Un-hardcode-static-linking.patch"; + url = "https://gitlab.com/OPNA2608/persistent-cache-cpp/-/commit/45cd84fe76e3a0e1da41a662df695009a6f4f07e.patch"; + hash = "sha256-1UjdhzrjnIUO1ySaZTm0vkdNgok0RNlGtNOWUoAUlzU="; + }) + ]; + + postPatch = '' + # Wrong concatenation + substituteInPlace data/libpersistent-cache-cpp.pc.in \ + --replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "\''${prefix}/lib" + + # Runs in parallel to other tests, limit to 1 thread + substituteInPlace tests/headers/compile_headers.py \ + --replace 'multiprocessing.cpu_count()' '1' + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' + patchShebangs tests/{headers,whitespace}/*.py + ''; + + nativeBuildInputs = [ + cmake + doxygen + pkg-config + ]; + + buildInputs = [ + boost + lomiri.cmake-extras + ]; + + propagatedBuildInputs = [ + leveldb + ]; + + nativeCheckInputs = [ + python3 + ]; + + checkInputs = [ + gtest + ]; + + cmakeFlags = [ + # error: 'old_version' may be used uninitialized + (lib.cmakeBool "Werror" false) + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Cache of key-value pairs with persistent storage for C++ 11"; + longDescription = '' + A persistent cache for arbitrary (possibly large amount of data, such as + image files) that is fast, scalable, and crash-proof. + ''; + homepage = "https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp"; + license = licenses.lgpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.unix; + pkgConfigModules = [ + "libpersistent-cache-cpp" + ]; + }; +}) diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index dee9c6610b148..7ff1794850a2f 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-F3bQ3UytEunXf0w2Eo1vx3u0Q40usYhbCmCVuL9X9lI="; + hash = "sha256-sErdlHXMn97acVIxKapsnLkyOAgO7lOB0UQC5GkL4sQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index e9c87ebbdb32a..e68a56fd2ae46 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -18,6 +18,7 @@ php.buildComposerProject (finalAttrs: { description = "PHP Unit Testing framework"; homepage = "https://phpunit.de"; license = lib.licenses.bsd3; + mainProgram = "phpunit"; maintainers = [ lib.maintainers.onny ] ++ lib.teams.php.members; }; }) diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/by-name/pi/pipeworld/package.nix index 9474535133fdb..52c411d837774 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/by-name/pi/pipeworld/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalPackages: { pname = "pipeworld"; - version = "unstable-2023-03-02"; + version = "unstable-2023-02-05"; src = fetchFromGitHub { owner = "letoram"; repo = "pipeworld"; - rev = "9ea79f72ad500fe78b9f46e680be87eaac3bfb0e"; - hash = "sha256-/cjse6XXrdLoUB35GLgl871qINOm4SvKPTbfoBceLu0="; + rev = "edc3821404b3a1274b8a50d2fb1c6b523fbd4a1c"; + hash = "sha256-PbKejghMkLZdeQJD9fObw9xhGH24IX72X7pyjapTXJM="; }; dontConfigure = true; @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalPackages: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/letoram/pipeworld"; description = "Dataflow 'spreadsheet' desktop environment"; longDescription = '' @@ -43,8 +43,8 @@ stdenvNoCC.mkDerivation (finalPackages: { application within another desktop as a 'substitute' for your normal terminal emulator. ''; - license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/pl/platformsh/package.nix b/pkgs/by-name/pl/platformsh/package.nix index 458cad998ff77..5d9e6dc2d2f49 100644 --- a/pkgs/by-name/pl/platformsh/package.nix +++ b/pkgs/by-name/pl/platformsh/package.nix @@ -2,16 +2,16 @@ php.buildComposerProject (finalAttrs: { pname = "platformsh"; - version = "4.10.0"; + version = "4.11.4"; src = fetchFromGitHub { owner = "platformsh"; repo = "legacy-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-aEQxlotwMScEIfHrVDdXBgFxMqAIypkEl9TLi1Bvhnw="; + hash = "sha256-4Fo4vmTEo0rSJNtoGz/mRv5dRCMq5vJmnwAxsvfs9qo="; }; - vendorHash = "sha256-e89xxgTI6FajDfj8xr8VYlbxJD6lUZWz5+2UFQTClsY="; + vendorHash = "sha256-MuZKa4lKvfls85cYjOTHHd6lKVVS0QJD6Pdn7csSzUo="; prePatch = '' substituteInPlace config-defaults.yaml \ diff --git a/pkgs/by-name/pl/pls/Cargo.lock b/pkgs/by-name/pl/pls/Cargo.lock new file mode 100644 index 0000000000000..42856918831a8 --- /dev/null +++ b/pkgs/by-name/pl/pls/Cargo.lock @@ -0,0 +1,856 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[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", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "atomic" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +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" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", + "terminal_size", +] + +[[package]] +name = "clap_derive" +version = "4.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +dependencies = [ + "is-terminal", + "lazy_static", + "windows-sys", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "log", +] + +[[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" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] + +[[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 = "figment" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5" +dependencies = [ + "atomic", + "parking_lot", + "serde", + "serde_yaml", + "tempfile", + "uncased", + "version_check", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "git2" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +dependencies = [ + "bitflags 1.3.2", + "libc", + "libgit2-sys", + "log", + "url", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[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.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + +[[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 = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.3", + "windows-sys", +] + +[[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 = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libgit2-sys" +version = "0.15.2+1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + +[[package]] +name = "libz-sys" +version = "1.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121f7402cc6ab5821dad08d1b9d11618a9ea4da992343909fecf8e430e86364c" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +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 = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[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" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "once_cell" +version = "1.18.0" +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 = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "pls" +version = "0.0.1-beta.2" +dependencies = [ + "clap", + "colored", + "env_logger", + "figment", + "git2", + "home", + "lazy_static", + "log", + "number_prefix", + "regex", + "serde", + "serde_regex", + "terminal_size", + "time", + "unicode-segmentation", + "users", +] + +[[package]] +name = "proc-macro2" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +dependencies = [ + "proc-macro2", +] + +[[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 = "regex" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys", +] + +[[package]] +name = "ryu" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.166" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.166" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_regex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" +dependencies = [ + "regex", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "2.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix 0.37.23", + "windows-sys", +] + +[[package]] +name = "terminal_size" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +dependencies = [ + "rustix 0.37.23", + "windows-sys", +] + +[[package]] +name = "time" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +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 = "uncased" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68" +dependencies = [ + "version_check", +] + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" + +[[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-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "users" +version = "0.11.0" +source = "git+https://github.com/dhruvkb/rust-users.git#e6ba8a88e0127f0d17ddd99f80f85d2c1722b227" +dependencies = [ + "libc", +] + +[[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 = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/by-name/pl/pls/package.nix b/pkgs/by-name/pl/pls/package.nix new file mode 100644 index 0000000000000..cbd46d09e1ab4 --- /dev/null +++ b/pkgs/by-name/pl/pls/package.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "pls"; + version = "0.0.1-beta.2"; + + src = fetchFromGitHub { + owner = "dhruvkb"; + repo = "pls"; + rev = "v${version}"; + hash = "sha256-yMZygYrLi3V9MA+6vgqG+RHme5jtHMnork8aALbFVXc="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "users-0.11.0" = "sha256-xBds73h68oWjKivEw92jEx0dVh08H2EIlBWnGx9DhyE="; + }; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = { + description = "Prettier and powerful ls"; + homepage = "https://pls-rs.github.io/pls/"; + license = lib.licenses.gpl3Plus; + mainProgram = "pls"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/by-name/po/polybar-pulseaudio-control/package.nix b/pkgs/by-name/po/polybar-pulseaudio-control/package.nix new file mode 100644 index 0000000000000..a4063dd34f8c6 --- /dev/null +++ b/pkgs/by-name/po/polybar-pulseaudio-control/package.nix @@ -0,0 +1,44 @@ +{ lib +, bash +, coreutils +, fetchFromGitHub +, gawk +, makeWrapper +, pulseaudio +, stdenv +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "polybar-pulseaudio-control"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "marioortizmanero"; + repo = "polybar-pulseaudio-control"; + rev = "v${finalAttrs.version}"; + hash = "sha256-egCBCnhnmHHKFeDkpaF9Upv/oZ0K3XGyutnp4slq9Vc="; + }; + + dontConfigure = true; + dontBuild = true; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 pulseaudio-control.bash $out/bin/pulseaudio-control + wrapProgram "$out/bin/pulseaudio-control" \ + --prefix PATH : "${lib.makeBinPath [ bash coreutils gawk pulseaudio ]}" + + runHook postInstall + ''; + + meta = with lib; { + mainProgram = "pulseaudio-control"; + description = "Polybar module to control PulseAudio devices, also known as Pavolume"; + homepage = "https://github.com/marioortizmanero/polybar-pulseaudio-control"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ benlemasurier ]; + }; +}) diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index df5342311cd1d..ba1de5d9fb816 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -1,23 +1,34 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib +, fetchFromGitHub +, rustPlatform +, libsixel +}: rustPlatform.buildRustPackage rec { pname = "presenterm"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "mfontanini"; repo = "presenterm"; - rev = "v${version}"; - hash = "sha256-uwLVg/bURz2jLAQZgLujDR2Zewu5pcE9bwEBg/DQ4Iw="; + rev = "refs/tags/v${version}"; + hash = "sha256-OHp/qbuaZ7uVydKGnSiBR5KQGdf8rWQQWRHrka+PI1M="; }; - cargoHash = "sha256-tEgXqvSyScO/J/56ykCda3ERrTDQj5jCxlMEDof/fCA="; + buildInputs = [ + libsixel + ]; + + cargoHash = "sha256-ymSTloz7sPAtMZN1uDgLs89gMcU+UTsMVc6y5UHt7no="; + + buildFeatures = [ "sixel" ]; # Skip test that currently doesn't work checkFlags = [ "--skip=execute::test::shell_code_execution" ]; meta = with lib; { description = "A terminal based slideshow tool"; + changelog = "https://github.com/mfontanini/presenterm/releases/tag/v${version}"; homepage = "https://github.com/mfontanini/presenterm"; license = licenses.bsd2; maintainers = with maintainers; [ mikaelfangel ]; diff --git a/pkgs/by-name/pr/prettypst/Cargo.lock b/pkgs/by-name/pr/prettypst/Cargo.lock new file mode 100644 index 0000000000000..3bda3573ab4f0 --- /dev/null +++ b/pkgs/by-name/pr/prettypst/Cargo.lock @@ -0,0 +1,471 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anstream" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +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", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "clap" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "comemo" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" +dependencies = [ + "comemo-macros", + "siphasher", +] + +[[package]] +name = "comemo-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168cc09917f6a014a4cf6ed166d1b541a20a768c60f9cc348f25203ee8312940" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ecow" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02" +dependencies = [ + "serde", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "prettypst" +version = "1.0.0" +dependencies = [ + "clap", + "serde", + "thiserror", + "toml", + "typst-syntax", +] + +[[package]] +name = "proc-macro2" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "serde" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "serde", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typst-syntax" +version = "0.9.0" +source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" +dependencies = [ + "comemo", + "ecow", + "once_cell", + "serde", + "tracing", + "unicode-ident", + "unicode-math-class", + "unicode-segmentation", + "unscanny", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-math-class" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unscanny" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "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.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +dependencies = [ + "memchr", +] diff --git a/pkgs/by-name/pr/prettypst/package.nix b/pkgs/by-name/pr/prettypst/package.nix new file mode 100644 index 0000000000000..52529f1846b90 --- /dev/null +++ b/pkgs/by-name/pr/prettypst/package.nix @@ -0,0 +1,31 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage { + pname = "prettypst"; + version = "unstable-2023-11-27"; + + src = fetchFromGitHub { + owner = "antonWetzel"; + repo = "prettypst"; + rev = "0bf6aa013efa2b059d8c7dcae3441a6004b02fa1"; + hash = "sha256-8rAF7tzs+0qGphmanTvx6MXhYOSG6igAMY4ZLkljRp8="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "typst-syntax-0.9.0" = "sha256-LwRB/AQE8TZZyHEQ7kKB10itzEgYjg4R/k+YFqmutDc="; + }; + }; + + meta = { + description = "Formatter for Typst"; + homepage = "https://github.com/antonWetzel/prettypst"; + license = lib.licenses.mit; + mainProgram = "prettypst"; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/desktops/arcan/prio/default.nix b/pkgs/by-name/pr/prio/package.nix index f733b189757b3..620e4f9382cee 100644 --- a/pkgs/desktops/arcan/prio/default.nix +++ b/pkgs/by-name/pr/prio/package.nix @@ -27,11 +27,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/letoram/prio"; description = "Plan9- Rio like Window Manager for Arcan"; - license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix b/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix new file mode 100644 index 0000000000000..3aefd22b8c676 --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix @@ -0,0 +1,22 @@ +{ fetchCrate, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "protoc-gen-rust-grpc"; + version = "0.8.3"; + + src = fetchCrate { + pname = "grpc-compiler"; + inherit version; + hash = "sha256-gt+Qa68N5EkqhCAvU2ISvVPT9vYPXMySad4DCyTVHkQ="; + }; + + cargoHash = "sha256-08xEPc1GaRIYLbIlSRpfBvSQcs16vduJ7v/NDg7Awfs="; + + meta = with lib; { + description = "Protobuf plugin for generating Rust code for gRPC"; + homepage = "https://github.com/stepancheg/grpc-rust"; + license = licenses.mit; + maintainers = with maintainers; [ lucperkins ]; + mainProgram = "protoc-gen-rust-grpc"; + }; +} diff --git a/pkgs/by-name/pr/prr/package.nix b/pkgs/by-name/pr/prr/package.nix new file mode 100644 index 0000000000000..93d10a67a14e6 --- /dev/null +++ b/pkgs/by-name/pr/prr/package.nix @@ -0,0 +1,38 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, openssl +, pkg-config +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "prr"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "danobi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-mPFnMoYlOU0oJcasrCEHO+Ze1YuwJ0ap7+p2Fs75pcY="; + }; + + cargoHash = "sha256-HDNJ17SB9XdqDAAmEBJz/P52/QJcuV6sVsgxBVWKIRg="; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + nativeBuildInputs = [ pkg-config ]; + + meta = with lib; { + description = "A tool that brings mailing list style code reviews to Github PRs"; + homepage = "https://github.com/danobi/prr"; + license = licenses.gpl2Only; + mainProgram = "prr"; + maintainers = with maintainers; [ evalexpr ]; + }; +} + diff --git a/pkgs/by-name/pu/pushup/package.nix b/pkgs/by-name/pu/pushup/package.nix new file mode 100644 index 0000000000000..3d777479da905 --- /dev/null +++ b/pkgs/by-name/pu/pushup/package.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub, buildGoModule, lib, go, makeWrapper }: + +buildGoModule rec { + pname = "pushup"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "adhocteam"; + repo = "pushup"; + rev = "v${version}"; + hash = "sha256-9ENXeVON2/Bt8oXnyVw+Vl0bPVPP7iFSyhxwc091ZIs="; + }; + + vendorHash = null; + subPackages = "."; + # Pushup doesn't need CGO so disable it. + CGO_ENABLED=0; + ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ makeWrapper ]; + # The Go compiler is a runtime dependency of Pushup. + allowGoReference = true; + postInstall = '' + wrapProgram $out/bin/${meta.mainProgram} --prefix PATH : ${ + lib.makeBinPath [ go ] + } + ''; + + meta = with lib; { + description = "A web framework for Go"; + homepage = "https://pushup.adhoc.dev/"; + license = licenses.mit; + changelog = "https://github.com/adhocteam/pushup/blob/${src.rev}/CHANGELOG.md"; + mainProgram = "pushup"; + maintainers = with maintainers; [ paulsmith ]; + }; +} diff --git a/pkgs/by-name/pw/pwru/package.nix b/pkgs/by-name/pw/pwru/package.nix new file mode 100644 index 0000000000000..d8dca376fc3ba --- /dev/null +++ b/pkgs/by-name/pw/pwru/package.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, clang +, libpcap +}: + +buildGoModule rec { + pname = "pwru"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "cilium"; + repo = "pwru"; + rev = "v${version}"; + hash = "sha256-2CpjTVBuiGU5cYkdSIxIpk1EoZAUhlXxVU+KJXHosiA="; + }; + + vendorHash = null; + + nativeBuildInputs = [ clang ]; + + buildInputs = [ libpcap ]; + + postPatch = '' + substituteInPlace internal/libpcap/compile.go \ + --replace "-static" "" + ''; + + preBuild = '' + TARGET_GOARCH="$GOARCH" GOOS= GOARCH= go generate + ''; + + meta = with lib; { + description = "eBPF-based Linux kernel networking debugger"; + homepage = "https://github.com/cilium/pwru"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + platforms = platforms.linux; + mainProgram = "pwru"; + }; +} diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 51bf396095902..fd0b5583b36ed 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "1.6.0"; + version = "1.6.9"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = version; - hash = "sha256-QbbBpaBIlU4IoU/NM7igDap8TxOKePQ8JI3ZlH944Bs="; + hash = "sha256-qmITBg9csfCIcyTADUOfEo/Nrou01bXHORQ66+Jvodo="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index 6c9bd6982fd4d..306950a51532f 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; - version = "0.8.5"; + version = "0.10.1"; src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - sha256 = "sha256-jrvNZGO1VIDo6Mz3NKda1C7qZUtF9T00CAFK8yoGWjc="; + sha256 = "sha256-96k3VgxVGuKPLA4rD9B20AigFW03YvedT04UUzzmX38="; }; - cargoSha256 = "sha256-JOnvlabCr3fZsIIRc2qTjf50Ga83zL8Aoo2sqzMBs7g="; + cargoHash = "sha256-nAfW66vasnR0JHhz7n1XGA+OpPavOnGB6D6TfK9cr9Y="; nativeBuildInputs = [ asciidoctor installShellFiles ]; diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix new file mode 100644 index 0000000000000..13e728b4b66b3 --- /dev/null +++ b/pkgs/by-name/qu/quickjs-ng/package.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +, testers +, texinfo +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "quickjs-ng"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "quickjs-ng"; + repo = "quickjs"; + rev = "v${finalAttrs.version}"; + hash = "sha256-4nFc9xdxrfRWeOY9VNQAI4Ph7G1GMnw06XZiO6xA72o="; + }; + + outputs = [ "bin" "out" "dev" "doc" "info" ]; + + nativeBuildInputs = [ + cmake + texinfo + ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + (lib.cmakeBool "BUILD_STATIC_QJS_EXE" stdenv.hostPlatform.isStatic) + ]; + + postInstall = '' + (cd ../doc + makeinfo --output quickjs.info quickjs.texi + install -Dt $info/share/info/ quickjs.info) + ''; + + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "qjs --help || true"; + }; + }; + + meta = with lib; { + description = "A mighty JavaScript engine"; + homepage = "https://github.com/quickjs-ng/quickjs"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + platforms = platforms.all; + mainProgram = "qjs"; + }; +}) diff --git a/pkgs/by-name/ra/raft-cowsql/package.nix b/pkgs/by-name/ra/raft-cowsql/package.nix index f4e94d8f4106c..1731a4eeebd64 100644 --- a/pkgs/by-name/ra/raft-cowsql/package.nix +++ b/pkgs/by-name/ra/raft-cowsql/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "raft-cowsql"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "cowsql"; repo = "raft"; rev = "refs/tags/v${version}"; - hash = "sha256-CMcKXX2u+qiroleg5GIovTOVAg9ycXBsRDqfsOCL3yo="; + hash = "sha256-lfmn+GfdgZ5fdp3Y6ROzEuXsrLNlH/qA98Ni5QAv0oQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cowsql/raft"; license = licenses.lgpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ adamcstephens ]; + maintainers = teams.lxc.members; }; } diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index 6a429a77c57bf..796010d687ceb 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -1,15 +1,24 @@ -{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper -, python3, binutils-unwrapped, findutils, gawk, kmod, pciutils, libraspberrypi +{ stdenvNoCC +, lib +, fetchFromGitHub +, makeWrapper +, python3 +, binutils-unwrapped +, findutils +, gawk +, kmod +, pciutils +, libraspberrypi }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "raspberrypi-eeprom"; - version = "2023.01.11-138c0"; + version = "2023.12.06-2712"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; - rev = "v${version}"; - hash = "sha256-z3VyqdSkvxAgVmtMI/Is9qYrOeDXlyVLwHSSC2+AxcA="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-bX+WSWj8Lk0S9GgauJsqElur+AAp5JB8LMEstB6aRGo="; }; buildInputs = [ python3 ]; @@ -24,18 +33,21 @@ stdenvNoCC.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin $out/share/rpi-eeprom + mkdir -p "$out/bin" + cp rpi-eeprom-config rpi-eeprom-update rpi-eeprom-digest "$out/bin" - cp rpi-eeprom-config rpi-eeprom-update rpi-eeprom-digest $out/bin - cp -r firmware/{beta,critical,old,stable} $out/share/rpi-eeprom - cp -P firmware/default firmware/latest $out/share/rpi-eeprom + mkdir -p "$out/lib/firmware/raspberrypi" + for dirname in firmware-*; do + dirname_suffix="''${dirname/#firmware-}" + cp -rP "$dirname" "$out/lib/firmware/raspberrypi/bootloader-$dirname_suffix" + done ''; fixupPhase = '' patchShebangs $out/bin for i in rpi-eeprom-update rpi-eeprom-config; do wrapProgram $out/bin/$i \ - --set FIRMWARE_ROOT $out/share/rpi-eeprom \ + --set FIRMWARE_ROOT "$out/lib/firmware/raspberrypi/bootloader" \ ${lib.optionalString stdenvNoCC.isAarch64 "--set VCMAILBOX ${libraspberrypi}/bin/vcmailbox"} \ --prefix PATH : "${lib.makeBinPath ([ binutils-unwrapped @@ -51,9 +63,10 @@ stdenvNoCC.mkDerivation rec { ''; meta = with lib; { - description = "Installation scripts and binaries for the closed sourced Raspberry Pi 4 EEPROMs"; - homepage = "https://www.raspberrypi.org/documentation/hardware/raspberrypi/booteeprom.md"; + description = "Installation scripts and binaries for the closed sourced Raspberry Pi 4 and 5 bootloader EEPROMs"; + homepage = "https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-4-boot-eeprom"; license = with licenses; [ bsd3 unfreeRedistributableFirmware ]; - maintainers = with maintainers; [ das_j ]; + maintainers = with maintainers; [ das_j Luflosi ]; + platforms = platforms.linux; }; -} +}) diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix new file mode 100644 index 0000000000000..072c4ccafa05f --- /dev/null +++ b/pkgs/by-name/rc/rclip/package.nix @@ -0,0 +1,46 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: +python3Packages.buildPythonApplication rec { + pname = "rclip"; + version = "1.7.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "yurijmikhalevich"; + repo = "rclip"; + rev = "v${version}"; + hash = "sha256-lWaWq+dcAa/2pONka4xRpixqDuL6iYDF46vCyCmVWwE="; + }; + + nativeBuildInputs = with python3Packages; [ + poetry-core + ]; + + propagatedBuildInputs = with python3Packages; [ + open-clip-torch + pillow + requests + torch + torchvision + tqdm + ]; + + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + + pythonImportsCheck = [ "rclip" ]; + + disabledTestPaths = [ + # requires network + "tests/e2e/test_rclip.py" + ]; + + meta = with lib; { + description = "AI-Powered Command-Line Photo Search Tool"; + homepage = "https://github.com/yurijmikhalevich/rclip"; + license = licenses.mit; + maintainers = with maintainers; [ iynaix ]; + mainProgram = "rclip"; + }; +} diff --git a/pkgs/by-name/re/redocly-cli/package.nix b/pkgs/by-name/re/redocly-cli/package.nix new file mode 100644 index 0000000000000..d22b09b53a41d --- /dev/null +++ b/pkgs/by-name/re/redocly-cli/package.nix @@ -0,0 +1,52 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, makeWrapper +}: + +buildNpmPackage rec { + pname = "redocly-cli"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "Redocly"; + repo = "redocly-cli"; + rev = "@redocly/cli@${version}"; + hash = "sha256-Wi3IxPeNqD1s1Q0Pi9cCus6jCQM0noBTHIAp9HUSpZk="; + }; + + npmDepsHash = "sha256-BcjQ9z2i1YBt6lBqgkRcv29P/WZeuGjVSeVmekaFugM="; + + npmBuildScript = "prepare"; + + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + npm --prefix packages/cli run copy-assets + ''; + + postInstall = '' + rm $out/lib/node_modules/@redocly/cli/node_modules/@redocly/{cli,openapi-core} + cp -R packages/cli $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli + cp -R packages/core $out/lib/node_modules/@redocly/cli/node_modules/@redocly/openapi-core + + mkdir $out/bin + makeWrapper $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js $out/bin/redocly-cli --set REDOCLY_TELEMETRY off + ''; + + installCheckPhase = '' + runHook preInstallCheck + $out/bin/redocly-cli --version + runHook postInstallCheck + ''; + + doInstallCheck = true; + + meta = { + description = "Redocly CLI makes OpenAPI easy. Lint/validate to any standard, generate beautiful docs, and more."; + homepage = "https://github.com/Redocly/redocly-cli"; + license = lib.licenses.mit; + mainProgram = "redocly-cli"; + maintainers = with lib.maintainers; [ szlend ]; + }; +} diff --git a/pkgs/by-name/re/regex2json/package.nix b/pkgs/by-name/re/regex2json/package.nix new file mode 100644 index 0000000000000..e728adab04263 --- /dev/null +++ b/pkgs/by-name/re/regex2json/package.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitLab }: + +buildGoModule rec { + pname = "regex2json"; + version = "0.11.0"; + + src = fetchFromGitLab { + owner = "tozd"; + repo = "regex2json"; + rev = "v${version}"; + hash = "sha256-WoxrwAH2ocDuwRj52QHPN3sOMXIF3ygzKeb83BKZqKo="; + }; + + vendorHash = "sha256-myMUs9urHjYaOQ/UaPYlLZstvClOuvF5xJao4lTP5bY="; + + ldflags = [ "-s" "-w" ]; + + meta = { + description = "Convert text to JSON using only regular expressions"; + homepage = "https://gitlab.com/tozd/regex2json"; + changelog = "https://gitlab.com/tozd/regex2json/-/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nagy ]; + mainProgram = "regex2json"; + }; +} diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/by-name/re/regina/package.nix index 79258d2cc0fa0..7480ade5413c0 100644 --- a/pkgs/development/interpreters/regina/default.nix +++ b/pkgs/by-name/re/regina/package.nix @@ -1,12 +1,16 @@ -{ lib, stdenv, fetchurl, ncurses }: +{ lib +, stdenv +, fetchurl +, ncurses +}: stdenv.mkDerivation rec { - pname = "Regina-REXX"; - version = "3.9.1"; + pname = "regina-rexx"; + version = "3.9.5"; src = fetchurl { url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${pname}-${version}.tar.gz"; - sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx"; + hash = "sha256-COmpBhvuADjPtFRG3iB2b/2uUO6jf2ZCRG7E5zoqvFE="; }; buildInputs = [ ncurses ]; @@ -18,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "REXX interpreter"; maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl2; }; } diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix new file mode 100644 index 0000000000000..c3fc15b9f3940 --- /dev/null +++ b/pkgs/by-name/re/resources/package.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, appstream-glib +, cargo +, desktop-file-utils +, meson +, ninja +, pkg-config +, rustPlatform +, rustc +, wrapGAppsHook4 +, glib +, gtk4 +, libadwaita +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "resources"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "nokyan"; + repo = "resources"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-OVz1vsmOtH/5sEuyl2BfDqG2/9D1HGtHA0FtPntKQT0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + name = "resources-${finalAttrs.version}"; + hash = "sha256-MNYKfvbLQPWm7MKS5zYGrc+aoC9WeU5FTftkCrogZg0="; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook4 + rustPlatform.cargoSetupHook + cargo + rustc + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + mesonFlags = [ + (lib.mesonOption "profile" "default") + ]; + + meta = { + changelog = "https://github.com/nokyan/resources/releases/tag/${finalAttrs.version}"; + description = "Monitor your system resources and processes"; + homepage = "https://github.com/nokyan/resources"; + license = lib.licenses.gpl3Only; + mainProgram = "resources"; + maintainers = with lib.maintainers; [ lukas-heiligenbrunner ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ri/rita/package.nix b/pkgs/by-name/ri/rita/package.nix new file mode 100644 index 0000000000000..4ebe27f8fbe4e --- /dev/null +++ b/pkgs/by-name/ri/rita/package.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "rita"; + version = "4.8.1"; + + src = fetchFromGitHub { + owner = "activecm"; + repo = "rita"; + rev = "refs/tags/v${version}"; + hash = "sha256-By0JvQ4LTm+NEnRMadE1x2PiiYqnJQCsF3Fy+gHulXs="; + }; + + vendorHash = "sha256-KyC7VPgWlgKD6KWWRo3hFQHl2HjTub+VSMtJCpYE6Zk="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/activecm/rita/config.Version=${version}" + "-X=github.com/activecm/rita/config.ExactVersion=${version}" + ]; + + meta = with lib; { + description = "Framework for detecting command and control communication through network traffic analysis"; + homepage = "https://github.com/activecm/rita"; + changelog = "https://github.com/activecm/rita/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "rita"; + }; +} diff --git a/pkgs/by-name/rq/rqbit/Cargo.lock b/pkgs/by-name/rq/rqbit/Cargo.lock new file mode 100644 index 0000000000000..f0b3c3b2efbd4 --- /dev/null +++ b/pkgs/by-name/rq/rqbit/Cargo.lock @@ -0,0 +1,3093 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +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.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +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" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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", +] + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core 0.3.4", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.27", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "202651474fe73c62d9e0a56c6133f7a0ff1dc1c8cf7a5b03381af2a26553ac9d" +dependencies = [ + "async-trait", + "axum-core 0.4.1", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.0.1", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 0.2.11", + "http-body 0.4.6", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77cb22c689c44d4c07b0ab44ebc25d69d8ae601a2f28fb8d672d344178fa17aa" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "getrandom", + "instant", + "rand", +] + +[[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.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array 0.14.7", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.48.5", +] + +[[package]] +name = "clap" +version = "4.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "commoncrypto" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" +dependencies = [ + "commoncrypto-sys", +] + +[[package]] +name = "commoncrypto-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" +dependencies = [ + "libc", +] + +[[package]] +name = "console-api" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" +dependencies = [ + "futures-core", + "prost", + "prost-types", + "tonic", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" +dependencies = [ + "console-api", + "crossbeam-channel", + "crossbeam-utils", + "futures-task", + "hdrhistogram", + "humantime", + "prost-types", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +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" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 0.14.7", + "typenum", +] + +[[package]] +name = "crypto-hash" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a77162240fd97248d19a564a565eb563a3f592b386e4136fb300909e67dddca" +dependencies = [ + "commoncrypto", + "hex 0.3.2", + "openssl", + "winapi", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[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", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core", + "serde", +] + +[[package]] +name = "deranged" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +dependencies = [ + "typenum", +] + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "h2" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.11", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap 2.1.0", + "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 = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "hdrhistogram" +version = "7.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" +dependencies = [ + "base64", + "byteorder", + "flate2", + "nom", + "num-traits", +] + +[[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.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.22", + "http 0.2.11", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.10", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.0", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.11", + "hyper 0.14.27", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper 0.14.27", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper 0.14.27", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca339002caeb0d159cc6e023dff48e199f081e42fa039895c7c6f38b37f2e9d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.0.1", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[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]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +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 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", + "serde", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +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 = "leaky-bucket" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb491abd89e9794d50f93c8db610a29509123e3fbbc9c8c67a528e9391cd853" +dependencies = [ + "parking_lot", + "tokio", + "tracing", +] + +[[package]] +name = "libc" +version = "0.2.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] + +[[package]] +name = "librqbit" +version = "5.4.0" +dependencies = [ + "anyhow", + "axum 0.7.2", + "backoff", + "base64", + "bincode", + "bitvec", + "byteorder", + "bytes", + "crypto-hash", + "dashmap", + "futures", + "hex 0.4.3", + "http 1.0.0", + "itertools 0.12.0", + "librqbit-bencode", + "librqbit-buffers", + "librqbit-clone-to-owned", + "librqbit-core", + "librqbit-dht", + "librqbit-peer-protocol", + "librqbit-sha1-wrapper", + "librqbit-upnp", + "openssl", + "parking_lot", + "rand", + "regex", + "reqwest", + "rlimit", + "serde", + "serde_json", + "serde_urlencoded", + "serde_with", + "sha1", + "size_format", + "tokio", + "tokio-stream", + "tokio-test", + "tokio-util", + "tower-http", + "tracing", + "tracing-subscriber", + "url", + "urlencoding", + "uuid", +] + +[[package]] +name = "librqbit-bencode" +version = "2.2.1" +dependencies = [ + "anyhow", + "librqbit-buffers", + "librqbit-clone-to-owned", + "librqbit-sha1-wrapper", + "serde", +] + +[[package]] +name = "librqbit-buffers" +version = "2.2.1" +dependencies = [ + "librqbit-clone-to-owned", + "serde", +] + +[[package]] +name = "librqbit-clone-to-owned" +version = "2.2.1" + +[[package]] +name = "librqbit-core" +version = "3.4.0" +dependencies = [ + "anyhow", + "directories", + "hex 0.4.3", + "itertools 0.12.0", + "librqbit-bencode", + "librqbit-buffers", + "librqbit-clone-to-owned", + "parking_lot", + "serde", + "serde_json", + "tokio", + "tokio-util", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "librqbit-dht" +version = "5.0.0" +dependencies = [ + "anyhow", + "backoff", + "chrono", + "dashmap", + "futures", + "hex 0.4.3", + "indexmap 2.1.0", + "leaky-bucket", + "librqbit-bencode", + "librqbit-clone-to-owned", + "librqbit-core", + "parking_lot", + "rand", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "librqbit-peer-protocol" +version = "3.4.0" +dependencies = [ + "anyhow", + "bincode", + "bitvec", + "byteorder", + "librqbit-bencode", + "librqbit-buffers", + "librqbit-clone-to-owned", + "librqbit-core", + "serde", +] + +[[package]] +name = "librqbit-sha1-wrapper" +version = "2.2.1" +dependencies = [ + "crypto-hash", + "openssl", + "sha1", +] + +[[package]] +name = "librqbit-upnp" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-recursion", + "futures", + "network-interface", + "reqwest", + "serde", + "serde-xml-rs", + "tokio", + "tracing", + "tracing-subscriber", + "url", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[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.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[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", +] + +[[package]] +name = "network-interface" +version = "1.1.1" +source = "git+https://github.com/ikatson/network-interface?branch=compile-on-freebsd#aca8a95ab1bb41a27bc82c6a2425eb4824bf0352" +dependencies = [ + "cc", + "libc", + "thiserror", + "winapi", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[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.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +dependencies = [ + "autocfg", + "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-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.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[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 = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl" +version = "0.10.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +dependencies = [ + "bitflags 2.4.1", + "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", +] + +[[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 = "300.2.1+3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "backtrace", + "cfg-if", + "libc", + "petgraph", + "redox_syscall", + "smallvec", + "thread-id", + "windows-targets 0.48.5", +] + +[[package]] +name = "parse_duration" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7037e5e93e0172a5a96874380bf73bc6ecef022e26fa25f2be26864d6b3ba95d" +dependencies = [ + "lazy_static", + "num", + "regex", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.1.0", +] + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +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", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prost" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +dependencies = [ + "anyhow", + "itertools 0.11.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prost-types" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +dependencies = [ + "prost", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[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 = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "regex-syntax 0.8.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-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[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.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.22", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.27", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "rlimit" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" +dependencies = [ + "libc", +] + +[[package]] +name = "rqbit" +version = "5.4.0" +dependencies = [ + "anyhow", + "bytes", + "clap", + "console-subscriber", + "futures", + "librqbit", + "openssl", + "parking_lot", + "parse_duration", + "regex", + "reqwest", + "serde", + "serde_json", + "size_format", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[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.38.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +dependencies = [ + "serde_derive", +] + +[[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.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +dependencies = [ + "base64", + "chrono", + "hex 0.4.3", + "indexmap 1.9.3", + "indexmap 2.1.0", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "size_format" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed5f6ab2122c6dec69dca18c72fa4590a27e581ad20d44960fe74c032a0b23b" +dependencies = [ + "generic-array 0.12.4", + "num", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "2.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread-id" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" +dependencies = [ + "libc", + "winapi", +] + +[[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.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +dependencies = [ + "deranged", + "itoa", + "powerfmt", + "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.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2 0.5.5", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-test" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tonic" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +dependencies = [ + "async-stream", + "async-trait", + "axum 0.6.20", + "base64", + "bytes", + "h2 0.3.22", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.27", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09e12e6351354851911bdf8c2b8f2ab15050c567d70a8b9a37ae7b8301a4080d" +dependencies = [ + "bitflags 2.4.1", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", +] + +[[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" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "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.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +dependencies = [ + "getrandom", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "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.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" + +[[package]] +name = "web-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" + +[[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-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[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.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "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]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[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 = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index 078fd7a9b35d9..9c4f3fa8a607f 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -2,16 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "3.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - hash = "sha256-c0JYFr2yy1lcaJ+xOZnFsGzPVGPoFgCiFTGDlDaHdZk="; + hash = "sha256-sZb3DYk2gycANRZGtSQAo3G+fo7dxGF48PwC8kJOfio="; }; - cargoHash = "sha256-VnkAokOC5xSqO7MVASssKs0EqQ+re5EsEar4eLspTSA="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "network-interface-1.1.1" = "sha256-9fWdR5nr73oFP9FzHhDsbA4ifQf3LkzBygspxI9/ufs="; + }; + }; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; @@ -23,6 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A bittorrent client in Rust"; homepage = "https://github.com/ikatson/rqbit"; + changelog = "https://github.com/ikatson/rqbit/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ marsam ]; mainProgram = "rqbit"; diff --git a/pkgs/by-name/rs/rsgain/package.nix b/pkgs/by-name/rs/rsgain/package.nix new file mode 100644 index 0000000000000..79b86ca95493b --- /dev/null +++ b/pkgs/by-name/rs/rsgain/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, libebur128 +, taglib +, ffmpeg +, inih +, fmt +, zlib +}: + +stdenv.mkDerivation rec { + pname = "rsgain"; + version = "3.4"; + + src = fetchFromGitHub { + owner = "complexlogic"; + repo = "rsgain"; + rev = "v${version}"; + sha256 = "sha256-AiNjsrwTF6emcwXo2TPMbs8mLavGS7NsvytAppMGKfY="; + }; + + cmakeFlags = ["-DCMAKE_BUILD_TYPE='Release'"]; + + nativeBuildInputs = [pkg-config cmake]; + buildInputs = [libebur128 taglib ffmpeg inih fmt zlib]; + + meta = with lib; { + description = "A simple, but powerful ReplayGain 2.0 tagging utility"; + homepage = "https://github.com/complexlogic/rsgain"; + changelog = "https://github.com/complexlogic/rsgain/blob/v${version}/CHANGELOG"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = [maintainers.felipeqq2]; + }; +} diff --git a/pkgs/by-name/rs/rspamd-trainer/package.nix b/pkgs/by-name/rs/rspamd-trainer/package.nix new file mode 100644 index 0000000000000..0479b8f07da40 --- /dev/null +++ b/pkgs/by-name/rs/rspamd-trainer/package.nix @@ -0,0 +1,59 @@ +{ lib +, python3 +, python3Packages +, fetchFromGitLab +, makeWrapper +, stdenv +, fetchpatch +, rspamd +}: + +python3Packages.buildPythonApplication { + pname = "rspamd-trainer"; + version = "unstable-2023-11-27"; + format = "pyproject"; + + src = fetchFromGitLab { + owner = "onlime"; + repo = "rspamd-trainer"; + rev = "eb6639a78a019ade6781f3a8418eddc030f8fa14"; + hash = "sha256-Me6WZhQ6SvDGGBQQtSA/7bIfKtsz6D5rvQeU12sVzgY="; + }; + + patches = [ + # Refactor pyproject.toml + # https://gitlab.com/onlime/rspamd-trainer/-/merge_requests/2 + (fetchpatch { + url = "https://gitlab.com/onlime/rspamd-trainer/-/commit/8824bfb9a9826988a90a401b8e51c20f5366ed70.patch"; + hash = "sha256-qiXfwMUfM/iV+fHba8xdwQD92RQz627+HdUTgwgRZdc="; + name = "refactor_pyproject.patch"; + }) + ]; + + postPatch = '' + # Fix module path not applied by patch + mv helper src/ + touch src/helper/__init__.py + mv settings.py src/rspamd_trainer/ + sed -i 's/from settings/from .settings/' src/rspamd_trainer/run.py + + # Fix rspamc path + sed -i "s|/usr/bin/rspamc|${rspamd}/bin/rspamc|" src/rspamd_trainer/run.py + ''; + + nativeBuildInputs = with python3.pkgs; [ + setuptools-scm + ]; + + propagatedBuildInputs = with python3.pkgs; [ + python-dotenv + imapclient + ]; + + meta = { + homepage = "https://gitlab.com/onlime/rspamd-trainer"; + description = "Grabs messages from a spam mailbox via IMAP and feeds them to Rspamd for training"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ onny ]; + }; +} diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index 40592a3d7dc37..b22ea923a9591 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -9,31 +9,22 @@ , gtk4 , libadwaita , pango -, fetchpatch , copyDesktopItems }: rustPlatform.buildRustPackage rec { pname = "satty"; - version = "0.7.0"; + version = "0.8.3"; src = fetchFromGitHub { owner = "gabm"; repo = "Satty"; rev = "v${version}"; - hash = "sha256-x2ljheG7ZqaeiPersC/e8Er2jvk5TJs65Y3N1GjTiNU="; + hash = "sha256-KCHKR6DP8scd9xdWi0bLw3wObrEi0tOsflXHa9f4Z5k="; }; - cargoPatches = [ - (fetchpatch { - name = "fix-Cargo.lock"; - url = "https://github.com/gabm/Satty/commit/39be6ddce264552df971e949a6a3175b102530b2.patch"; - hash = "sha256-GUHupZE1A7AmXvZ8WvRzBkQyH7qlMTetBjHuakfIZ7w="; - }) - ]; - - cargoHash = "sha256-0GsbWd/gpKZm7nNXkuJhB02YKUj3XCrSfpRA9KBXydU="; + cargoHash = "sha256-pUBtUC+WOuiypLUpXCPR1pu0fRrMVTxg7FE2JSaszNw="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index 3b5682846987f..91139a255a161 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.29.1"; + version = "1.30.0"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = version; - hash = "sha256-xBf+LIwlpauJd/0xJIQdfEa0rxph3BJPuMY4+0s+Bb4="; + hash = "sha256-vgkVxQK18RBIhhL9gyuH9kmCueJFDZByhy0FE4JuVO8="; }; vendorHash = null; diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix new file mode 100644 index 0000000000000..713f587021134 --- /dev/null +++ b/pkgs/by-name/se/seabios/package.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchgit +, acpica-tools +, python3 +, writeText +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "seabios"; + version = "1.16.3"; + + src = fetchgit { + url = "https://git.seabios.org/seabios.git"; + rev = "rel-${finalAttrs.version}"; + hash = "sha256-hWemj83cxdY8p+Jhkh5GcPvI0Sy5aKYZJCsKDjHTUUk="; + }; + + outputs = [ "out" "doc" ]; + + nativeBuildInputs = [ python3 ]; + + buildInputs = [ acpica-tools ]; + + strictDeps = true; + + makeFlags = [ + # https://www.seabios.org/Build_overview#Distribution_builds + "EXTRAVERSION=\"-nixpkgs\"" + ]; + + hardeningDisable = [ "pic" "stackprotector" "fortify" ]; + + postConfigure = let + config = writeText "config.txt" (lib.generators.toKeyValue { } { + # SeaBIOS with CSM (Compatible Support Module) support; learn more at + # https://www.electronicshub.org/what-is-csm-bios/ + "CONFIG_CSM" = "y"; + "CONFIG_PERMIT_UNALIGNED_PCIROM" = "y"; + "CONFIG_QEMU_HARDWARE" = "y"; + }); + in '' + cp ${config} .config + make olddefconfig + ''; + + installPhase = '' + runHook preInstall + + mkdir -pv $doc/share/doc/seabios-${finalAttrs.version}/ + cp -v docs/* $doc/share/doc/seabios-${finalAttrs.version}/ + install -Dm644 out/Csm16.bin -t $out/share/seabios/ + + runHook postInstall + ''; + + meta = { + homepage = "https://www.seabios.org"; + description = "Open source implementation of a 16bit x86 BIOS"; + longDescription = '' + SeaBIOS is an open source implementation of a 16bit x86 BIOS. + It can run in an emulator or it can run natively on x86 hardware with the + use of coreboot. + ''; + license = with lib.licenses; [ lgpl3Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.systems.inspect.patternLogicalAnd + lib.systems.inspect.patterns.isUnix + lib.systems.inspect.patterns.isx86; + badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; + }; +}) diff --git a/pkgs/by-name/se/serverless/package-lock.json b/pkgs/by-name/se/serverless/package-lock.json new file mode 100644 index 0000000000000..e75ae77f4a939 --- /dev/null +++ b/pkgs/by-name/se/serverless/package-lock.json @@ -0,0 +1,13752 @@ +{ + "name": "serverless", + "version": "3.38.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "serverless", + "version": "3.38.0", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@serverless/dashboard-plugin": "^7.2.0", + "@serverless/platform-client": "^4.5.1", + "@serverless/utils": "^6.13.1", + "abort-controller": "^3.0.0", + "ajv": "^8.12.0", + "ajv-formats": "^2.1.1", + "archiver": "^5.3.1", + "aws-sdk": "^2.1404.0", + "bluebird": "^3.7.2", + "cachedir": "^2.3.0", + "chalk": "^4.1.2", + "child-process-ext": "^2.1.1", + "ci-info": "^3.8.0", + "cli-progress-footer": "^2.3.2", + "d": "^1.0.1", + "dayjs": "^1.11.8", + "decompress": "^4.2.1", + "dotenv": "^16.3.1", + "dotenv-expand": "^10.0.0", + "essentials": "^1.2.0", + "ext": "^1.7.0", + "fastest-levenshtein": "^1.0.16", + "filesize": "^10.0.7", + "fs-extra": "^10.1.0", + "get-stdin": "^8.0.0", + "globby": "^11.1.0", + "graceful-fs": "^4.2.11", + "https-proxy-agent": "^5.0.1", + "is-docker": "^2.2.1", + "js-yaml": "^4.1.0", + "json-colorizer": "^2.2.2", + "json-cycle": "^1.5.0", + "json-refs": "^3.0.15", + "lodash": "^4.17.21", + "memoizee": "^0.4.15", + "micromatch": "^4.0.5", + "node-fetch": "^2.6.11", + "npm-registry-utilities": "^1.0.0", + "object-hash": "^3.0.0", + "open": "^8.4.2", + "path2": "^0.1.0", + "process-utils": "^4.0.0", + "promise-queue": "^2.2.5", + "require-from-string": "^2.0.2", + "semver": "^7.5.3", + "signal-exit": "^3.0.7", + "stream-buffers": "^3.0.2", + "strip-ansi": "^6.0.1", + "supports-color": "^8.1.1", + "tar": "^6.1.15", + "timers-ext": "^0.1.7", + "type": "^2.7.2", + "untildify": "^4.0.0", + "uuid": "^9.0.0", + "ws": "^7.5.9", + "yaml-ast-parser": "0.0.43" + }, + "bin": { + "serverless": "bin/serverless.js", + "sls": "bin/serverless.js" + }, + "devDependencies": { + "@commitlint/cli": "^12.1.4", + "@serverless/eslint-config": "^5.1.0", + "@serverless/test": "^11.1.1", + "adm-zip": "^0.5.10", + "aws4": "^1.12.0", + "chai": "^4.3.7", + "chai-as-promised": "^7.1.1", + "cos-nodejs-sdk-v5": "^2.12.1", + "eslint": "^8.43.0", + "eslint-plugin-import": "^2.27.5", + "git-list-updated": "^1.2.1", + "github-release-from-cc-changelog": "^2.3.0", + "husky": "^4.3.8", + "jszip": "^3.10.1", + "lint-staged": "^13.2.2", + "log": "^6.3.1", + "log-node": "^8.0.3", + "mocha": "^9.2.2", + "mock-require": "^3.0.3", + "ncjsm": "^4.3.2", + "nyc": "^15.1.0", + "pkg": "^5.8.1", + "prettier": "^2.8.8", + "proxyquire": "^2.1.3", + "semver-regex": "^3.1.4", + "sinon": "^13.0.2", + "sinon-chai": "^3.7.0", + "standard-version": "^9.5.0", + "xml2js": "^0.4.23" + }, + "engines": { + "node": ">=12.0" + } + }, + "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/@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/@aws-crypto/crc32": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz", + "integrity": "sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==", + "dependencies": { + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", + "tslib": "^1.11.1" + } + }, + "node_modules/@aws-crypto/crc32/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/@aws-crypto/ie11-detection": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz", + "integrity": "sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==", + "dependencies": { + "tslib": "^1.11.1" + } + }, + "node_modules/@aws-crypto/ie11-detection/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/@aws-crypto/sha256-browser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz", + "integrity": "sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==", + "dependencies": { + "@aws-crypto/ie11-detection": "^3.0.0", + "@aws-crypto/sha256-js": "^3.0.0", + "@aws-crypto/supports-web-crypto": "^3.0.0", + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", + "@aws-sdk/util-locate-window": "^3.0.0", + "@aws-sdk/util-utf8-browser": "^3.0.0", + "tslib": "^1.11.1" + } + }, + "node_modules/@aws-crypto/sha256-browser/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/@aws-crypto/sha256-js": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz", + "integrity": "sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==", + "dependencies": { + "@aws-crypto/util": "^3.0.0", + "@aws-sdk/types": "^3.222.0", + "tslib": "^1.11.1" + } + }, + "node_modules/@aws-crypto/sha256-js/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/@aws-crypto/supports-web-crypto": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz", + "integrity": "sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==", + "dependencies": { + "tslib": "^1.11.1" + } + }, + "node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/@aws-crypto/util": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz", + "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==", + "dependencies": { + "@aws-sdk/types": "^3.222.0", + "@aws-sdk/util-utf8-browser": "^3.0.0", + "tslib": "^1.11.1" + } + }, + "node_modules/@aws-crypto/util/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/@aws-sdk/client-cloudformation": { + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.461.0.tgz", + "integrity": "sha512-A2u9B9IxSfx+NpWMRA/3rRTcddm3pj0set87pMmOgpmaQRxo9s7DHc6/0MANkd/y65ckEtP6wdPabt53yOEl5w==", + "dependencies": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/client-sts": "3.461.0", + "@aws-sdk/core": "3.451.0", + "@aws-sdk/credential-provider-node": "3.460.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/middleware-user-agent": "3.460.0", + "@aws-sdk/region-config-resolver": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", + "@smithy/config-resolver": "^2.0.18", + "@smithy/fetch-http-handler": "^2.2.6", + "@smithy/hash-node": "^2.0.15", + "@smithy/invalid-dependency": "^2.0.13", + "@smithy/middleware-content-length": "^2.0.15", + "@smithy/middleware-endpoint": "^2.2.0", + "@smithy/middleware-retry": "^2.0.20", + "@smithy/middleware-serde": "^2.0.13", + "@smithy/middleware-stack": "^2.0.7", + "@smithy/node-config-provider": "^2.1.5", + "@smithy/node-http-handler": "^2.1.9", + "@smithy/protocol-http": "^3.0.9", + "@smithy/smithy-client": "^2.1.15", + "@smithy/types": "^2.5.0", + "@smithy/url-parser": "^2.0.13", + "@smithy/util-base64": "^2.0.1", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.19", + "@smithy/util-defaults-mode-node": "^2.0.25", + "@smithy/util-endpoints": "^1.0.4", + "@smithy/util-retry": "^2.0.6", + "@smithy/util-utf8": "^2.0.2", + "@smithy/util-waiter": "^2.0.13", + "fast-xml-parser": "4.2.5", + "tslib": "^2.5.0", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/client-cloudformation/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@aws-sdk/client-sso": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.460.0.tgz", + "integrity": "sha512-p5D9C8LKJs5yoBn5cCs2Wqzrp5YP5BYcP774bhGMFEu/LCIUyWzudwN3+/AObSiq8R8SSvBY2zQD4h+k3NjgTQ==", + "dependencies": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/core": "3.451.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-user-agent": "3.460.0", + "@aws-sdk/region-config-resolver": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", + "@smithy/config-resolver": "^2.0.18", + "@smithy/fetch-http-handler": "^2.2.6", + "@smithy/hash-node": "^2.0.15", + "@smithy/invalid-dependency": "^2.0.13", + "@smithy/middleware-content-length": "^2.0.15", + "@smithy/middleware-endpoint": "^2.2.0", + "@smithy/middleware-retry": "^2.0.20", + "@smithy/middleware-serde": "^2.0.13", + "@smithy/middleware-stack": "^2.0.7", + "@smithy/node-config-provider": "^2.1.5", + "@smithy/node-http-handler": "^2.1.9", + "@smithy/protocol-http": "^3.0.9", + "@smithy/smithy-client": "^2.1.15", + "@smithy/types": "^2.5.0", + "@smithy/url-parser": "^2.0.13", + "@smithy/util-base64": "^2.0.1", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.19", + "@smithy/util-defaults-mode-node": "^2.0.25", + "@smithy/util-endpoints": "^1.0.4", + "@smithy/util-retry": "^2.0.6", + "@smithy/util-utf8": "^2.0.2", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/client-sts": { + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.461.0.tgz", + "integrity": "sha512-1u+t31m23vuc9zkiUk51L4QbwuRQEuBeMArHK/thmq4V+A0VmjoAr/x2D0eQ0deOuBqG5YC62oaqUfIhj03SIw==", + "dependencies": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/core": "3.451.0", + "@aws-sdk/credential-provider-node": "3.460.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-sdk-sts": "3.461.0", + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/middleware-user-agent": "3.460.0", + "@aws-sdk/region-config-resolver": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", + "@smithy/config-resolver": "^2.0.18", + "@smithy/fetch-http-handler": "^2.2.6", + "@smithy/hash-node": "^2.0.15", + "@smithy/invalid-dependency": "^2.0.13", + "@smithy/middleware-content-length": "^2.0.15", + "@smithy/middleware-endpoint": "^2.2.0", + "@smithy/middleware-retry": "^2.0.20", + "@smithy/middleware-serde": "^2.0.13", + "@smithy/middleware-stack": "^2.0.7", + "@smithy/node-config-provider": "^2.1.5", + "@smithy/node-http-handler": "^2.1.9", + "@smithy/protocol-http": "^3.0.9", + "@smithy/smithy-client": "^2.1.15", + "@smithy/types": "^2.5.0", + "@smithy/url-parser": "^2.0.13", + "@smithy/util-base64": "^2.0.1", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.19", + "@smithy/util-defaults-mode-node": "^2.0.25", + "@smithy/util-endpoints": "^1.0.4", + "@smithy/util-retry": "^2.0.6", + "@smithy/util-utf8": "^2.0.2", + "fast-xml-parser": "4.2.5", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/core": { + "version": "3.451.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.451.0.tgz", + "integrity": "sha512-SamWW2zHEf1ZKe3j1w0Piauryl8BQIlej0TBS18A4ACzhjhWXhCs13bO1S88LvPR5mBFXok3XOT6zPOnKDFktw==", + "dependencies": { + "@smithy/smithy-client": "^2.1.15", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-env": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.460.0.tgz", + "integrity": "sha512-WWdaRJFuYRc2Ue9NKDy2NIf8pQRNx/QRVmrsk6EkIID8uWlQIOePk3SWTVV0TZIyPrbfSEaSnJRZoShphJ6PAg==", + "dependencies": { + "@aws-sdk/types": "3.460.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-ini": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.460.0.tgz", + "integrity": "sha512-1IEUmyaWzt2M3mONO8QyZtPy0f9ccaEjCo48ZQLgptWxUI+Ohga9gPK0mqu1kTJOjv4JJGACYHzLwEnnpltGlA==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.460.0", + "@aws-sdk/credential-provider-process": "3.460.0", + "@aws-sdk/credential-provider-sso": "3.460.0", + "@aws-sdk/credential-provider-web-identity": "3.460.0", + "@aws-sdk/types": "3.460.0", + "@smithy/credential-provider-imds": "^2.0.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-node": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.460.0.tgz", + "integrity": "sha512-PbPo92WIgNlF6V4eWKehYGYjTqf0gU9vr09LeQUc3bTm1DJhJw1j+HU/3PfQ8LwTkBQePO7MbJ5A2n6ckMwfMg==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.460.0", + "@aws-sdk/credential-provider-ini": "3.460.0", + "@aws-sdk/credential-provider-process": "3.460.0", + "@aws-sdk/credential-provider-sso": "3.460.0", + "@aws-sdk/credential-provider-web-identity": "3.460.0", + "@aws-sdk/types": "3.460.0", + "@smithy/credential-provider-imds": "^2.0.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-process": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.460.0.tgz", + "integrity": "sha512-ng+0FMc4EaxLAwdttCwf2nzNf4AgcqAHZ8pKXUf8qF/KVkoyTt3UZKW7P2FJI01zxwP+V4yAwVt95PBUKGn4YQ==", + "dependencies": { + "@aws-sdk/types": "3.460.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-sso": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.460.0.tgz", + "integrity": "sha512-KnrQieOw17+aHEzE3SwfxjeSQ5ZTe2HeAzxkaZF++GxhNul/PkVnLzjGpIuB9bn71T9a2oNfG3peDUA+m2l2kw==", + "dependencies": { + "@aws-sdk/client-sso": "3.460.0", + "@aws-sdk/token-providers": "3.460.0", + "@aws-sdk/types": "3.460.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-web-identity": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.460.0.tgz", + "integrity": "sha512-7OeaZgC3HmJZGE0I0ZiKInUMF2LyA0IZiW85AYFnAZzAIfv1cXk/1UnDAoFIQhOZfnUBXivStagz892s480ryw==", + "dependencies": { + "@aws-sdk/types": "3.460.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-host-header": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.460.0.tgz", + "integrity": "sha512-qBeDyuJkEuHe87Xk6unvFO9Zg5j6zM8bQOOZITocTLfu9JN0u5V4GQ/yopvpv+nQHmC/MGr0G7p+kIXMrg/Q2A==", + "dependencies": { + "@aws-sdk/types": "3.460.0", + "@smithy/protocol-http": "^3.0.9", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-logger": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.460.0.tgz", + "integrity": "sha512-w2AJ6HOJ+Ggx9+VDKuWBHk5S0ZxYEo2EY2IFh0qtCQ1RDix/ur1QEzOOL5vNjHlZKPv/dseIwhgsTCac8UHXbQ==", + "dependencies": { + "@aws-sdk/types": "3.460.0", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-recursion-detection": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.460.0.tgz", + "integrity": "sha512-wmzm1/2NzpcCVCAsGqqiTBK+xNyLmQwTOq63rcW6eeq6gYOO0cyTZROOkVRrrsKWPBigrSFFHvDrEvonOMtKAg==", + "dependencies": { + "@aws-sdk/types": "3.460.0", + "@smithy/protocol-http": "^3.0.9", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-sdk-sts": { + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.461.0.tgz", + "integrity": "sha512-sgNxkwKdJ/NZm7SJZBnbYPkbspmzn3lDyRSJH7PTCvyzDBzY2PB6yS/dfnGkitR+PYwromuOYMha37W4su2SOw==", + "dependencies": { + "@aws-sdk/middleware-signing": "3.461.0", + "@aws-sdk/types": "3.460.0", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-signing": { + "version": "3.461.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.461.0.tgz", + "integrity": "sha512-aM/7VupHlsgeRG1UZSAQMWJX+2Jam4GG8ZGVAbLfBr9yh9cBwnUUndpUpYI9rU7atA8n+vISr162EbR7WTiFhQ==", + "dependencies": { + "@aws-sdk/types": "3.460.0", + "@smithy/property-provider": "^2.0.0", + "@smithy/protocol-http": "^3.0.9", + "@smithy/signature-v4": "^2.0.0", + "@smithy/types": "^2.5.0", + "@smithy/util-middleware": "^2.0.6", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/middleware-user-agent": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.460.0.tgz", + "integrity": "sha512-0gBSOCr+RtwRUCSRLn9H3RVnj9ercvk/QKTHIr33CgfEdyZtIGpHWUSs6uqiQydPTRzjCm5SfUa6ESGhRVMM6A==", + "dependencies": { + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@smithy/protocol-http": "^3.0.9", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/region-config-resolver": { + "version": "3.451.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.451.0.tgz", + "integrity": "sha512-3iMf4OwzrFb4tAAmoROXaiORUk2FvSejnHIw/XHvf/jjR4EqGGF95NZP/n/MeFZMizJWVssrwS412GmoEyoqhg==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.5", + "@smithy/types": "^2.5.0", + "@smithy/util-config-provider": "^2.0.0", + "@smithy/util-middleware": "^2.0.6", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/token-providers": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.460.0.tgz", + "integrity": "sha512-EvSIPMI1gXk3gEkdtbZCW+p3Bjmt2gOR1m7ibQD7qLj4l0dKXhp4URgTqB1ExH3S4qUq0M/XSGKbGLZpvunHNg==", + "dependencies": { + "@aws-crypto/sha256-browser": "3.0.0", + "@aws-crypto/sha256-js": "3.0.0", + "@aws-sdk/middleware-host-header": "3.460.0", + "@aws-sdk/middleware-logger": "3.460.0", + "@aws-sdk/middleware-recursion-detection": "3.460.0", + "@aws-sdk/middleware-user-agent": "3.460.0", + "@aws-sdk/region-config-resolver": "3.451.0", + "@aws-sdk/types": "3.460.0", + "@aws-sdk/util-endpoints": "3.460.0", + "@aws-sdk/util-user-agent-browser": "3.460.0", + "@aws-sdk/util-user-agent-node": "3.460.0", + "@smithy/config-resolver": "^2.0.18", + "@smithy/fetch-http-handler": "^2.2.6", + "@smithy/hash-node": "^2.0.15", + "@smithy/invalid-dependency": "^2.0.13", + "@smithy/middleware-content-length": "^2.0.15", + "@smithy/middleware-endpoint": "^2.2.0", + "@smithy/middleware-retry": "^2.0.20", + "@smithy/middleware-serde": "^2.0.13", + "@smithy/middleware-stack": "^2.0.7", + "@smithy/node-config-provider": "^2.1.5", + "@smithy/node-http-handler": "^2.1.9", + "@smithy/property-provider": "^2.0.0", + "@smithy/protocol-http": "^3.0.9", + "@smithy/shared-ini-file-loader": "^2.0.6", + "@smithy/smithy-client": "^2.1.15", + "@smithy/types": "^2.5.0", + "@smithy/url-parser": "^2.0.13", + "@smithy/util-base64": "^2.0.1", + "@smithy/util-body-length-browser": "^2.0.0", + "@smithy/util-body-length-node": "^2.1.0", + "@smithy/util-defaults-mode-browser": "^2.0.19", + "@smithy/util-defaults-mode-node": "^2.0.25", + "@smithy/util-endpoints": "^1.0.4", + "@smithy/util-retry": "^2.0.6", + "@smithy/util-utf8": "^2.0.2", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/types": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.460.0.tgz", + "integrity": "sha512-MyZSWS/FV8Bnux5eD9en7KLgVxevlVrGNEP3X2D7fpnUlLhl0a7k8+OpSI2ozEQB8hIU2DLc/XXTKRerHSefxQ==", + "dependencies": { + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-endpoints": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.460.0.tgz", + "integrity": "sha512-myH6kM5WP4IWULHDHMYf2Q+BCYVGlzqJgiBmO10kQEtJSeAGZZ49eoFFYgKW8ZAYB5VnJ+XhXVB1TRA+vR4l5A==", + "dependencies": { + "@aws-sdk/types": "3.460.0", + "@smithy/util-endpoints": "^1.0.4", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-locate-window": { + "version": "3.310.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.310.0.tgz", + "integrity": "sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/util-user-agent-browser": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.460.0.tgz", + "integrity": "sha512-FRCzW+TyjKnvxsargPVrjayBfp/rvObYHZyZ2OSqrVw8lkkPCb4e/WZOeIiXZuhdhhoah7wMuo6zGwtFF3bYKg==", + "dependencies": { + "@aws-sdk/types": "3.460.0", + "@smithy/types": "^2.5.0", + "bowser": "^2.11.0", + "tslib": "^2.5.0" + } + }, + "node_modules/@aws-sdk/util-user-agent-node": { + "version": "3.460.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.460.0.tgz", + "integrity": "sha512-+kSoR9ABGpJ5Xc7v0VwpgTQbgyI4zuezC8K4pmKAGZsSsVWg4yxptoy2bDqoFL7qfRlWviMVTkQRMvR4D44WxA==", + "dependencies": { + "@aws-sdk/types": "3.460.0", + "@smithy/node-config-provider": "^2.1.5", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "aws-crt": ">=1.0.0" + }, + "peerDependenciesMeta": { + "aws-crt": { + "optional": true + } + } + }, + "node_modules/@aws-sdk/util-utf8-browser": { + "version": "3.259.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz", + "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==", + "dependencies": { + "tslib": "^2.3.1" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.23.4", + "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==", + "dev": true, + "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==", + "dev": true, + "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==", + "dev": true, + "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==", + "dev": true + }, + "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==", + "dev": true, + "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==", + "dev": true, + "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==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz", + "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.5.tgz", + "integrity": "sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.23.5", + "@babel/parser": "^7.23.5", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.5", + "@babel/types": "^7.23.5", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/core/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "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.23.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz", + "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.23.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-compilation-targets": { + "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==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.22.9", + "@babel/helper-validator-option": "^7.22.15", + "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/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/@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-compilation-targets/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/@babel/helper-environment-visitor": { + "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==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-function-name": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "dev": true, + "dependencies": { + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.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-module-imports": { + "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==", + "dev": true, + "dependencies": { + "@babel/types": "^7.22.15" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", + "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", + "dev": true, + "dependencies": { + "@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.20" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.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-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-string-parser": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "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==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", + "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.5.tgz", + "integrity": "sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==", + "dev": true, + "dependencies": { + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.5", + "@babel/types": "^7.23.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0" + }, + "engines": { + "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==", + "dev": true, + "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==", + "dev": true, + "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==", + "dev": true, + "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==", + "dev": true + }, + "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==", + "dev": true, + "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==", + "dev": true, + "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==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/parser": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz", + "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==", + "dev": true, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/template": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "dev": true, + "dependencies": { + "@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.23.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.5.tgz", + "integrity": "sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.5", + "@babel/types": "^7.23.5", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/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/@babel/types": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz", + "integrity": "sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@commitlint/cli": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-12.1.4.tgz", + "integrity": "sha512-ZR1WjXLvqEffYyBPT0XdnSxtt3Ty1TMoujEtseW5o3vPnkA1UNashAMjQVg/oELqfaiAMnDw8SERPMN0e/0kLg==", + "dev": true, + "dependencies": { + "@commitlint/format": "^12.1.4", + "@commitlint/lint": "^12.1.4", + "@commitlint/load": "^12.1.4", + "@commitlint/read": "^12.1.4", + "@commitlint/types": "^12.1.4", + "lodash": "^4.17.19", + "resolve-from": "5.0.0", + "resolve-global": "1.0.0", + "yargs": "^16.2.0" + }, + "bin": { + "commitlint": "cli.js" + }, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/ensure": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-12.1.4.tgz", + "integrity": "sha512-MxHIBuAG9M4xl33qUfIeMSasbv3ktK0W+iygldBxZOL4QSYC2Gn66pZAQMnV9o3V+sVFHoAK2XUKqBAYrgbEqw==", + "dev": true, + "dependencies": { + "@commitlint/types": "^12.1.4", + "lodash": "^4.17.19" + }, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/execute-rule": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-12.1.4.tgz", + "integrity": "sha512-h2S1j8SXyNeABb27q2Ok2vD1WfxJiXvOttKuRA9Or7LN6OQoC/KtT3844CIhhWNteNMu/wE0gkTqGxDVAnJiHg==", + "dev": true, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/format": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-12.1.4.tgz", + "integrity": "sha512-h28ucMaoRjVvvgS6Bdf85fa/+ZZ/iu1aeWGCpURnQV7/rrVjkhNSjZwGlCOUd5kDV1EnZ5XdI7L18SUpRjs26g==", + "dev": true, + "dependencies": { + "@commitlint/types": "^12.1.4", + "chalk": "^4.0.0" + }, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/is-ignored": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-12.1.4.tgz", + "integrity": "sha512-uTu2jQU2SKvtIRVLOzMQo3KxDtO+iJ1p0olmncwrqy4AfPLgwoyCP2CiULq5M7xpR3+dE3hBlZXbZTQbD7ycIw==", + "dev": true, + "dependencies": { + "@commitlint/types": "^12.1.4", + "semver": "7.3.5" + }, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/is-ignored/node_modules/semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@commitlint/lint": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-12.1.4.tgz", + "integrity": "sha512-1kZ8YDp4to47oIPFELUFGLiLumtPNKJigPFDuHt2+f3Q3IKdQ0uk53n3CPl4uoyso/Og/EZvb1mXjFR/Yce4cA==", + "dev": true, + "dependencies": { + "@commitlint/is-ignored": "^12.1.4", + "@commitlint/parse": "^12.1.4", + "@commitlint/rules": "^12.1.4", + "@commitlint/types": "^12.1.4" + }, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/load": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-12.1.4.tgz", + "integrity": "sha512-Keszi0IOjRzKfxT+qES/n+KZyLrxy79RQz8wWgssCboYjKEp+wC+fLCgbiMCYjI5k31CIzIOq/16J7Ycr0C0EA==", + "dev": true, + "dependencies": { + "@commitlint/execute-rule": "^12.1.4", + "@commitlint/resolve-extends": "^12.1.4", + "@commitlint/types": "^12.1.4", + "chalk": "^4.0.0", + "cosmiconfig": "^7.0.0", + "lodash": "^4.17.19", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/message": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-12.1.4.tgz", + "integrity": "sha512-6QhalEKsKQ/Y16/cTk5NH4iByz26fqws2ub+AinHPtM7Io0jy4e3rym9iE+TkEqiqWZlUigZnTwbPvRJeSUBaA==", + "dev": true, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/parse": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-12.1.4.tgz", + "integrity": "sha512-yqKSAsK2V4X/HaLb/yYdrzs6oD/G48Ilt0EJ2Mp6RJeWYxG14w/Out6JrneWnr/cpzemyN5hExOg6+TB19H/Lw==", + "dev": true, + "dependencies": { + "@commitlint/types": "^12.1.4", + "conventional-changelog-angular": "^5.0.11", + "conventional-commits-parser": "^3.0.0" + }, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/read": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-12.1.4.tgz", + "integrity": "sha512-TnPQSJgD8Aod5Xeo9W4SaYKRZmIahukjcCWJ2s5zb3ZYSmj6C85YD9cR5vlRyrZjj78ItLUV/X4FMWWVIS38Jg==", + "dev": true, + "dependencies": { + "@commitlint/top-level": "^12.1.4", + "@commitlint/types": "^12.1.4", + "fs-extra": "^9.0.0", + "git-raw-commits": "^2.0.0" + }, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/read/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@commitlint/resolve-extends": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-12.1.4.tgz", + "integrity": "sha512-R9CoUtsXLd6KSCfsZly04grsH6JVnWFmVtWgWs1KdDpdV+G3TSs37tColMFqglpkx3dsWu8dsPD56+D9YnJfqg==", + "dev": true, + "dependencies": { + "import-fresh": "^3.0.0", + "lodash": "^4.17.19", + "resolve-from": "^5.0.0", + "resolve-global": "^1.0.0" + }, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/rules": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-12.1.4.tgz", + "integrity": "sha512-W8m6ZSjg7RuIsIfzQiFHa48X5mcPXeKT9yjBxVmjHvYfS2FDBf1VxCQ7vO0JTVIdV4ohjZ0eKg/wxxUuZHJAZg==", + "dev": true, + "dependencies": { + "@commitlint/ensure": "^12.1.4", + "@commitlint/message": "^12.1.4", + "@commitlint/to-lines": "^12.1.4", + "@commitlint/types": "^12.1.4" + }, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/to-lines": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-12.1.4.tgz", + "integrity": "sha512-TParumvbi8bdx3EdLXz2MaX+e15ZgoCqNUgqHsRLwyqLUTRbqCVkzrfadG1UcMQk8/d5aMbb327ZKG3Q4BRorw==", + "dev": true, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/top-level": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-12.1.4.tgz", + "integrity": "sha512-d4lTJrOT/dXlpY+NIt4CUl77ciEzYeNVc0VFgUQ6VA+b1rqYD2/VWFjBlWVOrklxtSDeKyuEhs36RGrppEFAvg==", + "dev": true, + "dependencies": { + "find-up": "^5.0.0" + }, + "engines": { + "node": ">=v10" + } + }, + "node_modules/@commitlint/types": { + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-12.1.4.tgz", + "integrity": "sha512-KRIjdnWNUx6ywz+SJvjmNCbQKcKP6KArhjZhY2l+CWKxak0d77SOjggkMwFTiSgLODOwmuLTbarR2ZfWPiPMlw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0" + }, + "engines": { + "node": ">=v10" + } + }, + "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.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", + "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "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/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/@eslint/eslintrc/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/@eslint/js": { + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", + "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.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": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "dev": true + }, + "node_modules/@hutson/parse-repository-url": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz", + "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/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/@istanbuljs/load-nyc-config/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/@istanbuljs/load-nyc-config/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/@istanbuljs/load-nyc-config/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/@istanbuljs/load-nyc-config/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/@istanbuljs/load-nyc-config/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/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "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.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@kwsites/file-exists": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz", + "integrity": "sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==", + "dependencies": { + "debug": "^4.1.1" + } + }, + "node_modules/@kwsites/promise-deferred": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz", + "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==" + }, + "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==", + "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==", + "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==", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@octokit/auth-token": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz", + "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==", + "dev": true, + "dependencies": { + "@octokit/types": "^6.0.3" + } + }, + "node_modules/@octokit/core": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz", + "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==", + "dev": true, + "dependencies": { + "@octokit/auth-token": "^2.4.4", + "@octokit/graphql": "^4.5.8", + "@octokit/request": "^5.6.3", + "@octokit/request-error": "^2.0.5", + "@octokit/types": "^6.0.3", + "before-after-hook": "^2.2.0", + "universal-user-agent": "^6.0.0" + } + }, + "node_modules/@octokit/endpoint": { + "version": "6.0.12", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz", + "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==", + "dev": true, + "dependencies": { + "@octokit/types": "^6.0.3", + "is-plain-object": "^5.0.0", + "universal-user-agent": "^6.0.0" + } + }, + "node_modules/@octokit/graphql": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz", + "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==", + "dev": true, + "dependencies": { + "@octokit/request": "^5.6.0", + "@octokit/types": "^6.0.3", + "universal-user-agent": "^6.0.0" + } + }, + "node_modules/@octokit/openapi-types": { + "version": "12.11.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz", + "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==", + "dev": true + }, + "node_modules/@octokit/plugin-paginate-rest": { + "version": "2.21.3", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz", + "integrity": "sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==", + "dev": true, + "dependencies": { + "@octokit/types": "^6.40.0" + }, + "peerDependencies": { + "@octokit/core": ">=2" + } + }, + "node_modules/@octokit/plugin-request-log": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", + "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==", + "dev": true, + "peerDependencies": { + "@octokit/core": ">=3" + } + }, + "node_modules/@octokit/plugin-rest-endpoint-methods": { + "version": "5.16.2", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz", + "integrity": "sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==", + "dev": true, + "dependencies": { + "@octokit/types": "^6.39.0", + "deprecation": "^2.3.1" + }, + "peerDependencies": { + "@octokit/core": ">=3" + } + }, + "node_modules/@octokit/request": { + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz", + "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==", + "dev": true, + "dependencies": { + "@octokit/endpoint": "^6.0.1", + "@octokit/request-error": "^2.1.0", + "@octokit/types": "^6.16.1", + "is-plain-object": "^5.0.0", + "node-fetch": "^2.6.7", + "universal-user-agent": "^6.0.0" + } + }, + "node_modules/@octokit/request-error": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz", + "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==", + "dev": true, + "dependencies": { + "@octokit/types": "^6.0.3", + "deprecation": "^2.0.0", + "once": "^1.4.0" + } + }, + "node_modules/@octokit/rest": { + "version": "18.12.0", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz", + "integrity": "sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==", + "dev": true, + "dependencies": { + "@octokit/core": "^3.5.1", + "@octokit/plugin-paginate-rest": "^2.16.8", + "@octokit/plugin-request-log": "^1.0.4", + "@octokit/plugin-rest-endpoint-methods": "^5.12.0" + } + }, + "node_modules/@octokit/types": { + "version": "6.41.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz", + "integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==", + "dev": true, + "dependencies": { + "@octokit/openapi-types": "^12.11.0" + } + }, + "node_modules/@serverless/dashboard-plugin": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-7.2.0.tgz", + "integrity": "sha512-Gqzgef+KmrX1OxJW9aubrIN6AvPrtDARMv+NegMNEe+pfkZA/IMuZiSyYUaHgARokdw2/IALOysTLgdFJIrXvA==", + "dependencies": { + "@aws-sdk/client-cloudformation": "^3.410.0", + "@aws-sdk/client-sts": "^3.410.0", + "@serverless/event-mocks": "^1.1.1", + "@serverless/platform-client": "^4.5.1", + "@serverless/utils": "^6.14.0", + "child-process-ext": "^3.0.1", + "chokidar": "^3.5.3", + "flat": "^5.0.2", + "fs-extra": "^9.1.0", + "js-yaml": "^4.1.0", + "jszip": "^3.10.1", + "lodash": "^4.17.21", + "memoizee": "^0.4.15", + "ncjsm": "^4.3.2", + "node-dir": "^0.1.17", + "node-fetch": "^2.6.8", + "open": "^7.4.2", + "semver": "^7.3.8", + "simple-git": "^3.16.0", + "timers-ext": "^0.1.7", + "type": "^2.7.2", + "uuid": "^8.3.2", + "yamljs": "^0.3.0" + }, + "engines": { + "node": ">=12.0" + } + }, + "node_modules/@serverless/dashboard-plugin/node_modules/child-process-ext": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/child-process-ext/-/child-process-ext-3.0.2.tgz", + "integrity": "sha512-oBePsLbQpTJFxzwyCvs9yWWF0OEM6vGGepHwt1stqmX7QQqOuDc8j2ywdvAs9Tvi44TT7d9ackqhR4Q10l1u8w==", + "dependencies": { + "cross-spawn": "^7.0.3", + "es5-ext": "^0.10.62", + "log": "^6.3.1", + "split2": "^3.2.2", + "stream-promise": "^3.2.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/@serverless/dashboard-plugin/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==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@serverless/dashboard-plugin/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@serverless/dashboard-plugin/node_modules/open": { + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", + "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", + "dependencies": { + "is-docker": "^2.0.0", + "is-wsl": "^2.1.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@serverless/dashboard-plugin/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==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@serverless/dashboard-plugin/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==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@serverless/dashboard-plugin/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==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@serverless/dashboard-plugin/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@serverless/dashboard-plugin/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@serverless/eslint-config": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@serverless/eslint-config/-/eslint-config-5.1.0.tgz", + "integrity": "sha512-tEqL5fjQf9ZRYwDHXh2XFDHx75cmrJncYjmpODYmxMKG2bytr1FkcLlZF6PuNzVJCjDUBa719xcif8WHnqcvsA==", + "dev": true, + "engines": { + "node": ">=6.0" + }, + "peerDependencies": { + "eslint": ">=6" + } + }, + "node_modules/@serverless/event-mocks": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@serverless/event-mocks/-/event-mocks-1.1.1.tgz", + "integrity": "sha512-YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A==", + "dependencies": { + "@types/lodash": "^4.14.123", + "lodash": "^4.17.11" + } + }, + "node_modules/@serverless/platform-client": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.5.1.tgz", + "integrity": "sha512-XltmO/029X76zi0LUFmhsnanhE2wnqH1xf+WBt5K8gumQA9LnrfwLgPxj+VA+mm6wQhy+PCp7H5SS0ZPu7F2Cw==", + "dependencies": { + "adm-zip": "^0.5.5", + "archiver": "^5.3.0", + "axios": "^1.6.2", + "fast-glob": "^3.2.7", + "https-proxy-agent": "^5.0.0", + "ignore": "^5.1.8", + "isomorphic-ws": "^4.0.1", + "js-yaml": "^3.14.1", + "jwt-decode": "^2.2.0", + "minimatch": "^3.0.4", + "querystring": "^0.2.1", + "run-parallel-limit": "^1.1.0", + "throat": "^5.0.0", + "traverse": "^0.6.6", + "ws": "^7.5.3" + }, + "engines": { + "node": ">=10.0" + } + }, + "node_modules/@serverless/platform-client/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/@serverless/platform-client/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==", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@serverless/test": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/@serverless/test/-/test-11.1.1.tgz", + "integrity": "sha512-oTDJdK3AV8TkF37T4uPK9f46zA+XPqyT4jqyGAE3EWMJqto7vcjZnyDtuXdpFmwx4Jogs4magKDjIAfJb8VXuw==", + "dev": true, + "dependencies": { + "@serverless/utils": "^6.11.1", + "bluebird": "^3.7.2", + "chalk": "^4.1.2", + "child-process-ext": "^2.1.1", + "cli-progress-footer": "^2.3.2", + "essentials": "^1.2.0", + "fs-extra": "^10.1.0", + "js-yaml": "^4.1.0", + "lodash": "^4.17.21", + "log": "^6.3.1", + "log-node": "^8.0.3", + "memoizee": "^0.4.15", + "minimist": "^1.2.8", + "ncjsm": "^4.3.2", + "p-limit": "^3.1.0", + "process-utils": "^4.0.0", + "sinon": "^13.0.2", + "timers-ext": "^0.1.7", + "type": "^2.7.2" + }, + "bin": { + "mocha-isolated": "bin/mocha-isolated.js" + }, + "engines": { + "node": ">=12.0" + }, + "peerDependencies": { + "mocha": "9 || 10" + }, + "peerDependenciesMeta": { + "mocha": { + "optional": true + } + } + }, + "node_modules/@serverless/utils": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/@serverless/utils/-/utils-6.15.0.tgz", + "integrity": "sha512-7eDbqKv/OBd11jjdZjUwFGN8sHWkeUqLeHXHQxQ1azja2IM7WIH+z/aLgzR6LhB3/MINNwtjesDpjGqTMj2JKQ==", + "dependencies": { + "archive-type": "^4.0.0", + "chalk": "^4.1.2", + "ci-info": "^3.8.0", + "cli-progress-footer": "^2.3.2", + "content-disposition": "^0.5.4", + "d": "^1.0.1", + "decompress": "^4.2.1", + "event-emitter": "^0.3.5", + "ext": "^1.7.0", + "ext-name": "^5.0.0", + "file-type": "^16.5.4", + "filenamify": "^4.3.0", + "get-stream": "^6.0.1", + "got": "^11.8.6", + "inquirer": "^8.2.5", + "js-yaml": "^4.1.0", + "jwt-decode": "^3.1.2", + "lodash": "^4.17.21", + "log": "^6.3.1", + "log-node": "^8.0.3", + "make-dir": "^4.0.0", + "memoizee": "^0.4.15", + "ms": "^2.1.3", + "ncjsm": "^4.3.2", + "node-fetch": "^2.6.11", + "open": "^8.4.2", + "p-event": "^4.2.0", + "supports-color": "^8.1.1", + "timers-ext": "^0.1.7", + "type": "^2.7.2", + "uni-global": "^1.0.0", + "uuid": "^8.3.2", + "write-file-atomic": "^4.0.2" + }, + "engines": { + "node": ">=12.0" + } + }, + "node_modules/@serverless/utils/node_modules/jwt-decode": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz", + "integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==" + }, + "node_modules/@serverless/utils/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@sindresorhus/is": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", + "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/is?sponsor=1" + } + }, + "node_modules/@sinonjs/commons": { + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", + "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", + "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.7.0" + } + }, + "node_modules/@sinonjs/samsam": { + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.3.tgz", + "integrity": "sha512-nhOb2dWPeb1sd3IQXL/dVPnKHDOAFfvichtBf4xV00/rU1QbPCQqKMbvIheIjqwVjh7qIgf2AHTHi391yMOMpQ==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.6.0", + "lodash.get": "^4.4.2", + "type-detect": "^4.0.8" + } + }, + "node_modules/@sinonjs/text-encoding": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz", + "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==", + "dev": true + }, + "node_modules/@smithy/abort-controller": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.14.tgz", + "integrity": "sha512-zXtteuYLWbSXnzI3O6xq3FYvigYZFW8mdytGibfarLL2lxHto9L3ILtGVnVGmFZa7SDh62l39EnU5hesLN87Fw==", + "dependencies": { + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/config-resolver": { + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.19.tgz", + "integrity": "sha512-JsghnQ5zjWmjEVY8TFOulLdEOCj09SjRLugrHlkPZTIBBm7PQitCFVLThbsKPZQOP7N3ME1DU1nKUc1UaVnBog==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.6", + "@smithy/types": "^2.6.0", + "@smithy/util-config-provider": "^2.0.0", + "@smithy/util-middleware": "^2.0.7", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/credential-provider-imds": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.1.2.tgz", + "integrity": "sha512-Y62jBWdoLPSYjr9fFvJf+KwTa1EunjVr6NryTEWCnwIY93OJxwV4t0qxjwdPl/XMsUkq79ppNJSEQN6Ohnhxjw==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.6", + "@smithy/property-provider": "^2.0.15", + "@smithy/types": "^2.6.0", + "@smithy/url-parser": "^2.0.14", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/eventstream-codec": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.14.tgz", + "integrity": "sha512-g/OU/MeWGfHDygoXgMWfG/Xb0QqDnAGcM9t2FRrVAhleXYRddGOEnfanR5cmHgB9ue52MJsyorqFjckzXsylaA==", + "dependencies": { + "@aws-crypto/crc32": "3.0.0", + "@smithy/types": "^2.6.0", + "@smithy/util-hex-encoding": "^2.0.0", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/fetch-http-handler": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.7.tgz", + "integrity": "sha512-iSDBjxuH9TgrtMYAr7j5evjvkvgwLY3y+9D547uep+JNkZ1ZT+BaeU20j6I/bO/i26ilCWFImrlXTPsfQtZdIQ==", + "dependencies": { + "@smithy/protocol-http": "^3.0.10", + "@smithy/querystring-builder": "^2.0.14", + "@smithy/types": "^2.6.0", + "@smithy/util-base64": "^2.0.1", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/hash-node": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.16.tgz", + "integrity": "sha512-Wbi9A0PacMYUOwjAulQP90Wl3mQ6NDwnyrZQzFjDz+UzjXOSyQMgBrTkUBz+pVoYVlX3DUu24gWMZBcit+wOGg==", + "dependencies": { + "@smithy/types": "^2.6.0", + "@smithy/util-buffer-from": "^2.0.0", + "@smithy/util-utf8": "^2.0.2", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/invalid-dependency": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.14.tgz", + "integrity": "sha512-d8ohpwZo9RzTpGlAfsWtfm1SHBSU7+N4iuZ6MzR10xDTujJJWtmXYHK1uzcr7rggbpUTaWyHpPFgnf91q0EFqQ==", + "dependencies": { + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/is-array-buffer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.0.0.tgz", + "integrity": "sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-content-length": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.16.tgz", + "integrity": "sha512-9ddDia3pp1d3XzLXKcm7QebGxLq9iwKf+J1LapvlSOhpF8EM9SjMeSrMOOFgG+2TfW5K3+qz4IAJYYm7INYCng==", + "dependencies": { + "@smithy/protocol-http": "^3.0.10", + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-endpoint": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.2.1.tgz", + "integrity": "sha512-dVDS7HNJl/wb0lpByXor6whqDbb1YlLoaoWYoelyYzLHioXOE7y/0iDwJWtDcN36/tVCw9EPBFZ3aans84jLpg==", + "dependencies": { + "@smithy/middleware-serde": "^2.0.14", + "@smithy/node-config-provider": "^2.1.6", + "@smithy/shared-ini-file-loader": "^2.2.5", + "@smithy/types": "^2.6.0", + "@smithy/url-parser": "^2.0.14", + "@smithy/util-middleware": "^2.0.7", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-retry": { + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.21.tgz", + "integrity": "sha512-EZS1EXv1k6IJX6hyu/0yNQuPcPaXwG8SWljQHYueyRbOxmqYgoWMWPtfZj0xRRQ4YtLawQSpBgAeiJltq8/MPw==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.6", + "@smithy/protocol-http": "^3.0.10", + "@smithy/service-error-classification": "^2.0.7", + "@smithy/types": "^2.6.0", + "@smithy/util-middleware": "^2.0.7", + "@smithy/util-retry": "^2.0.7", + "tslib": "^2.5.0", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-retry/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@smithy/middleware-serde": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.14.tgz", + "integrity": "sha512-hFi3FqoYWDntCYA2IGY6gJ6FKjq2gye+1tfxF2HnIJB5uW8y2DhpRNBSUMoqP+qvYzRqZ6ntv4kgbG+o3pX57g==", + "dependencies": { + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/middleware-stack": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.8.tgz", + "integrity": "sha512-7/N59j0zWqVEKExJcA14MrLDZ/IeN+d6nbkN8ucs+eURyaDUXWYlZrQmMOd/TyptcQv0+RDlgag/zSTTV62y/Q==", + "dependencies": { + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/node-config-provider": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.1.6.tgz", + "integrity": "sha512-HLqTs6O78m3M3z1cPLFxddxhEPv5MkVatfPuxoVO3A+cHZanNd/H5I6btcdHy6N2CB1MJ/lihJC92h30SESsBA==", + "dependencies": { + "@smithy/property-provider": "^2.0.15", + "@smithy/shared-ini-file-loader": "^2.2.5", + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/node-http-handler": { + "version": "2.1.10", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.10.tgz", + "integrity": "sha512-lkALAwtN6odygIM4nB8aHDahINM6WXXjNrZmWQAh0RSossySRT2qa31cFv0ZBuAYVWeprskRk13AFvvLmf1WLw==", + "dependencies": { + "@smithy/abort-controller": "^2.0.14", + "@smithy/protocol-http": "^3.0.10", + "@smithy/querystring-builder": "^2.0.14", + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/property-provider": { + "version": "2.0.15", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.15.tgz", + "integrity": "sha512-YbRFBn8oiiC3o1Kn3a4KjGa6k47rCM9++5W9cWqYn9WnkyH+hBWgfJAckuxpyA2Hq6Ys4eFrWzXq6fqHEw7iew==", + "dependencies": { + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/protocol-http": { + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.10.tgz", + "integrity": "sha512-6+tjNk7rXW7YTeGo9qwxXj/2BFpJTe37kTj3EnZCoX/nH+NP/WLA7O83fz8XhkGqsaAhLUPo/bB12vvd47nsmg==", + "dependencies": { + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/querystring-builder": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.14.tgz", + "integrity": "sha512-lQ4pm9vTv9nIhl5jt6uVMPludr6syE2FyJmHsIJJuOD7QPIJnrf9HhUGf1iHh9KJ4CUv21tpOU3X6s0rB6uJ0g==", + "dependencies": { + "@smithy/types": "^2.6.0", + "@smithy/util-uri-escape": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/querystring-parser": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.14.tgz", + "integrity": "sha512-+cbtXWI9tNtQjlgQg3CA+pvL3zKTAxPnG3Pj6MP89CR3vi3QMmD0SOWoq84tqZDnJCxlsusbgIXk1ngMReXo+A==", + "dependencies": { + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/service-error-classification": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.7.tgz", + "integrity": "sha512-LLxgW12qGz8doYto15kZ4x1rHjtXl0BnCG6T6Wb8z2DI4PT9cJfOSvzbuLzy7+5I24PAepKgFeWHRd9GYy3Z9w==", + "dependencies": { + "@smithy/types": "^2.6.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/shared-ini-file-loader": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.2.5.tgz", + "integrity": "sha512-LHA68Iu7SmNwfAVe8egmjDCy648/7iJR/fK1UnVw+iAOUJoEYhX2DLgVd5pWllqdDiRbQQzgaHLcRokM+UFR1w==", + "dependencies": { + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/signature-v4": { + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.16.tgz", + "integrity": "sha512-ilLY85xS2kZZzTb83diQKYLIYALvart0KnBaKnIRnMBHAGEio5aHSlANQoxVn0VsonwmQ3CnWhnCT0sERD8uTg==", + "dependencies": { + "@smithy/eventstream-codec": "^2.0.14", + "@smithy/is-array-buffer": "^2.0.0", + "@smithy/types": "^2.6.0", + "@smithy/util-hex-encoding": "^2.0.0", + "@smithy/util-middleware": "^2.0.7", + "@smithy/util-uri-escape": "^2.0.0", + "@smithy/util-utf8": "^2.0.2", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/smithy-client": { + "version": "2.1.16", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.16.tgz", + "integrity": "sha512-Lw67+yQSpLl4YkDLUzI2KgS8TXclXmbzSeOJUmRFS4ueT56B4pw3RZRF/SRzvgyxM/HxgkUan8oSHXCujPDafQ==", + "dependencies": { + "@smithy/middleware-stack": "^2.0.8", + "@smithy/types": "^2.6.0", + "@smithy/util-stream": "^2.0.21", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/types": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.6.0.tgz", + "integrity": "sha512-PgqxJq2IcdMF9iAasxcqZqqoOXBHufEfmbEUdN1pmJrJltT42b0Sc8UiYSWWzKkciIp9/mZDpzYi4qYG1qqg6g==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/url-parser": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.14.tgz", + "integrity": "sha512-kbu17Y1AFXi5lNlySdDj7ZzmvupyWKCX/0jNZ8ffquRyGdbDZb+eBh0QnWqsSmnZa/ctyWaTf7n4l/pXLExrnw==", + "dependencies": { + "@smithy/querystring-parser": "^2.0.14", + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/util-base64": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.0.1.tgz", + "integrity": "sha512-DlI6XFYDMsIVN+GH9JtcRp3j02JEVuWIn/QOZisVzpIAprdsxGveFed0bjbMRCqmIFe8uetn5rxzNrBtIGrPIQ==", + "dependencies": { + "@smithy/util-buffer-from": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-body-length-browser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-2.0.0.tgz", + "integrity": "sha512-JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg==", + "dependencies": { + "tslib": "^2.5.0" + } + }, + "node_modules/@smithy/util-body-length-node": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz", + "integrity": "sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-buffer-from": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.0.0.tgz", + "integrity": "sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==", + "dependencies": { + "@smithy/is-array-buffer": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-config-provider": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-2.0.0.tgz", + "integrity": "sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-defaults-mode-browser": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.20.tgz", + "integrity": "sha512-QJtnbTIl0/BbEASkx1MUFf6EaoWqWW1/IM90N++8NNscePvPf77GheYfpoPis6CBQawUWq8QepTP2QUSAdrVkw==", + "dependencies": { + "@smithy/property-provider": "^2.0.15", + "@smithy/smithy-client": "^2.1.16", + "@smithy/types": "^2.6.0", + "bowser": "^2.11.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@smithy/util-defaults-mode-node": { + "version": "2.0.26", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.26.tgz", + "integrity": "sha512-lGFPOFCHv1ql019oegYqa54BZH7HREw6EBqjDLbAr0wquMX0BDi2sg8TJ6Eq+JGLijkZbJB73m4+aK8OFAapMg==", + "dependencies": { + "@smithy/config-resolver": "^2.0.19", + "@smithy/credential-provider-imds": "^2.1.2", + "@smithy/node-config-provider": "^2.1.6", + "@smithy/property-provider": "^2.0.15", + "@smithy/smithy-client": "^2.1.16", + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/@smithy/util-endpoints": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-1.0.5.tgz", + "integrity": "sha512-K7qNuCOD5K/90MjHvHm9kJldrfm40UxWYQxNEShMFxV/lCCCRIg8R4uu1PFAxRvPxNpIdcrh1uK6I1ISjDXZJw==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.6", + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/@smithy/util-hex-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.0.0.tgz", + "integrity": "sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-middleware": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.7.tgz", + "integrity": "sha512-tRINOTlf1G9B0ECarFQAtTgMhpnrMPSa+5j4ZEwEawCLfTFTavk6757sxhE4RY5RMlD/I3x+DCS8ZUiR8ho9Pw==", + "dependencies": { + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-retry": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.7.tgz", + "integrity": "sha512-fIe5yARaF0+xVT1XKcrdnHKTJ1Vc4+3e3tLDjCuIcE9b6fkBzzGFY7AFiX4M+vj6yM98DrwkuZeHf7/hmtVp0Q==", + "dependencies": { + "@smithy/service-error-classification": "^2.0.7", + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/@smithy/util-stream": { + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.21.tgz", + "integrity": "sha512-0BUE16d7n1x7pi1YluXJdB33jOTyBChT0j/BlOkFa9uxfg6YqXieHxjHNuCdJRARa7AZEj32LLLEPJ1fSa4inA==", + "dependencies": { + "@smithy/fetch-http-handler": "^2.2.7", + "@smithy/node-http-handler": "^2.1.10", + "@smithy/types": "^2.6.0", + "@smithy/util-base64": "^2.0.1", + "@smithy/util-buffer-from": "^2.0.0", + "@smithy/util-hex-encoding": "^2.0.0", + "@smithy/util-utf8": "^2.0.2", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-uri-escape": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.0.0.tgz", + "integrity": "sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==", + "dependencies": { + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-utf8": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.0.2.tgz", + "integrity": "sha512-qOiVORSPm6Ce4/Yu6hbSgNHABLP2VMv8QOC3tTDNHHlWY19pPyc++fBTbZPtx6egPXi4HQxKDnMxVxpbtX2GoA==", + "dependencies": { + "@smithy/util-buffer-from": "^2.0.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-waiter": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.14.tgz", + "integrity": "sha512-Q6gSz4GUNjNGhrfNg+2Mjy+7K4pEI3r82x1b/+3dSc03MQqobMiUrRVN/YK/4nHVagvBELCoXsiHAFQJNQ5BeA==", + "dependencies": { + "@smithy/abort-controller": "^2.0.14", + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@szmarczak/http-timer": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", + "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", + "dependencies": { + "defer-to-connect": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@tokenizer/token": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz", + "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==" + }, + "node_modules/@types/cacheable-request": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", + "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", + "dependencies": { + "@types/http-cache-semantics": "*", + "@types/keyv": "^3.1.4", + "@types/node": "*", + "@types/responselike": "^1.0.0" + } + }, + "node_modules/@types/http-cache-semantics": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", + "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==" + }, + "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/keyv": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", + "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/lodash": { + "version": "4.14.202", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz", + "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==" + }, + "node_modules/@types/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", + "dev": true + }, + "node_modules/@types/node": { + "version": "20.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz", + "integrity": "sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==", + "dependencies": { + "undici-types": "~5.26.4" + } + }, + "node_modules/@types/normalize-package-data": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", + "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", + "dev": true + }, + "node_modules/@types/parse-json": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", + "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", + "dev": true + }, + "node_modules/@types/responselike": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz", + "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@ungap/promise-all-settled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", + "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "dev": true + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "node_modules/2-thenable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/2-thenable/-/2-thenable-1.0.0.tgz", + "integrity": "sha512-HqiDzaLDFCXkcCO/SwoyhRwqYtINFHF7t9BDRq4x90TOKNAJpiqUt9X5lQ08bwxYzc067HUywDjGySpebHcUpw==", + "dependencies": { + "d": "1", + "es5-ext": "^0.10.47" + } + }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, + "node_modules/acorn": { + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", + "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/add-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", + "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==", + "dev": true + }, + "node_modules/adm-zip": { + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz", + "integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==", + "engines": { + "node": ">=6.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "node_modules/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-escapes/node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "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==", + "engines": { + "node": ">=8" + } + }, + "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/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/append-transform": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", + "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", + "dev": true, + "dependencies": { + "default-require-extensions": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/archive-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz", + "integrity": "sha512-zV4Ky0v1F8dBrdYElwTvQhweQ0P7Kwc1aluqJsYtOBP01jXcWCyW2IEfI1YiqsG+Iy7ZR+o5LF1N+PGECBxHWA==", + "dependencies": { + "file-type": "^4.2.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/archive-type/node_modules/file-type": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz", + "integrity": "sha512-f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/archiver": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz", + "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==", + "dependencies": { + "archiver-utils": "^2.1.0", + "async": "^3.2.4", + "buffer-crc32": "^0.2.1", + "readable-stream": "^3.6.0", + "readdir-glob": "^1.1.2", + "tar-stream": "^2.2.0", + "zip-stream": "^4.1.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/archiver-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz", + "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", + "dependencies": { + "glob": "^7.1.4", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", + "readable-stream": "^2.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/archiver-utils/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/archiver-utils/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/archiver-utils/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/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/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, + "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-ify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz", + "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==", + "dev": true + }, + "node_modules/array-includes": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", + "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "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==", + "engines": { + "node": ">=8" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", + "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "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.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", + "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "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/arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==" + }, + "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==", + "dev": true, + "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==", + "dev": true, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/async": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", + "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==" + }, + "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/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/atomically": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz", + "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==", + "dev": true, + "engines": { + "node": ">=10.12.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==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/aws-sdk": { + "version": "2.1506.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1506.0.tgz", + "integrity": "sha512-jSBbofvPa7HJykyM7Xph9psMcWPl6UgdiKjG2E7fHJb6psW+BZN9ZvSGOBvRIlT8Y6+JGzI0qkouS1OLK9slhg==", + "dependencies": { + "buffer": "4.9.2", + "events": "1.1.1", + "ieee754": "1.1.13", + "jmespath": "0.16.0", + "querystring": "0.2.0", + "sax": "1.2.1", + "url": "0.10.3", + "util": "^0.12.4", + "uuid": "8.0.0", + "xml2js": "0.5.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/aws-sdk/node_modules/querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", + "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/aws-sdk/node_modules/uuid": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz", + "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/aws-sdk/node_modules/xml2js": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz", + "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==", + "dependencies": { + "sax": ">=0.6.0", + "xmlbuilder": "~11.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "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/axios": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", + "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "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==" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "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/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", + "dev": true, + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "node_modules/before-after-hook": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz", + "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==", + "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==", + "engines": { + "node": ">=8" + } + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/bl/node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "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": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "node_modules/bowser": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz", + "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==" + }, + "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/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "node_modules/browserslist": { + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", + "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", + "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.30001541", + "electron-to-chromium": "^1.4.535", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.13" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/buffer": { + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", + "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", + "dependencies": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" + } + }, + "node_modules/buffer-alloc": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", + "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", + "dependencies": { + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" + } + }, + "node_modules/buffer-alloc-unsafe": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", + "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" + }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", + "engines": { + "node": "*" + } + }, + "node_modules/buffer-fill": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", + "integrity": "sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==" + }, + "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/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==", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/builtins": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", + "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==" + }, + "node_modules/cacheable-lookup": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", + "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", + "engines": { + "node": ">=10.6.0" + } + }, + "node_modules/cacheable-request": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", + "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", + "dependencies": { + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^4.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^6.0.1", + "responselike": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cacheable-request/node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cachedir": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz", + "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/caching-transform": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", + "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", + "dev": true, + "dependencies": { + "hasha": "^5.0.0", + "make-dir": "^3.0.0", + "package-hash": "^4.0.0", + "write-file-atomic": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/caching-transform/node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/caching-transform/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/caching-transform/node_modules/write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/call-bind": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", + "dependencies": { + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" + }, + "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": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase-keys": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", + "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", + "dev": true, + "dependencies": { + "camelcase": "^5.3.1", + "map-obj": "^4.0.0", + "quick-lru": "^4.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/camelcase-keys/node_modules/quick-lru": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", + "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001565", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz", + "integrity": "sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==", + "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/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==", + "dev": true + }, + "node_modules/chai": { + "version": "4.3.10", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz", + "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==", + "dev": true, + "dependencies": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", + "pathval": "^1.1.1", + "type-detect": "^4.0.8" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chai-as-promised": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", + "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", + "dev": true, + "dependencies": { + "check-error": "^1.0.2" + }, + "peerDependencies": { + "chai": ">= 2.1.2 < 5" + } + }, + "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/chalk/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/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" + }, + "node_modules/check-error": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "dev": true, + "dependencies": { + "get-func-name": "^2.0.2" + }, + "engines": { + "node": "*" + } + }, + "node_modules/child-process-ext": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/child-process-ext/-/child-process-ext-2.1.1.tgz", + "integrity": "sha512-0UQ55f51JBkOFa+fvR76ywRzxiPwQS3Xe8oe5bZRphpv+dIMeerW5Zn5e4cUy4COJwVtJyU0R79RMnw+aCqmGA==", + "dependencies": { + "cross-spawn": "^6.0.5", + "es5-ext": "^0.10.53", + "log": "^6.0.0", + "split2": "^3.1.1", + "stream-promise": "^3.2.0" + } + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "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/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } + }, + "node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "engines": { + "node": ">=8" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/cli-color": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.3.tgz", + "integrity": "sha512-OkoZnxyC4ERN3zLzZaY9Emb7f/MhBOIpePv0Ycok0fJYT+Ouo00UBEIwsVsr0yoow++n5YWlSUgST9GKhNHiRQ==", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.61", + "es6-iterator": "^2.0.3", + "memoizee": "^0.4.15", + "timers-ext": "^0.1.7" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-progress-footer": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-2.3.2.tgz", + "integrity": "sha512-uzHGgkKdeA9Kr57eyH1W5HGiNShP8fV1ETq04HDNM1Un6ShXbHhwi/H8LNV9L1fQXKjEw0q5FUkEVNuZ+yZdSw==", + "dependencies": { + "cli-color": "^2.0.2", + "d": "^1.0.1", + "es5-ext": "^0.10.61", + "mute-stream": "0.0.8", + "process-utils": "^4.0.0", + "timers-ext": "^0.1.7", + "type": "^2.6.0" + }, + "engines": { + "node": ">=10.0" + } + }, + "node_modules/cli-spinners": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-sprintf-format": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/cli-sprintf-format/-/cli-sprintf-format-1.1.1.tgz", + "integrity": "sha512-BbEjY9BEdA6wagVwTqPvmAwGB24U93rQPBFZUT8lNCDxXzre5LFHQUTJc70czjgUomVg8u8R5kW8oY9DYRFNeg==", + "dependencies": { + "cli-color": "^2.0.1", + "es5-ext": "^0.10.53", + "sprintf-kit": "^2.0.1", + "supports-color": "^6.1.0" + }, + "engines": { + "node": ">=6.0" + } + }, + "node_modules/cli-sprintf-format/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/cli-sprintf-format/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==", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/cli-truncate": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", + "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==", + "dev": true, + "dependencies": { + "slice-ansi": "^5.0.0", + "string-width": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-truncate/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/cli-truncate/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, + "node_modules/cli-truncate/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-truncate/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/cli-width": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "engines": { + "node": ">= 10" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/clone-response": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", + "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", + "dependencies": { + "mimic-response": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "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/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/colorette": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", + "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==", + "engines": { + "node": ">= 6" + } + }, + "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/compare-func": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz", + "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==", + "dev": true, + "dependencies": { + "array-ify": "^1.0.0", + "dot-prop": "^5.1.0" + } + }, + "node_modules/compare-versions": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz", + "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==", + "dev": true + }, + "node_modules/component-emitter": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz", + "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/compress-commons": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz", + "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==", + "dependencies": { + "buffer-crc32": "^0.2.13", + "crc32-stream": "^4.0.2", + "normalize-path": "^3.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">= 10" + } + }, + "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/concat-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", + "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", + "dev": true, + "engines": [ + "node >= 6.0" + ], + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.0.2", + "typedarray": "^0.0.6" + } + }, + "node_modules/conf": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/conf/-/conf-9.0.2.tgz", + "integrity": "sha512-rLSiilO85qHgaTBIIHQpsv8z+NnVfZq3cKuYNCXN1AOqPzced0GWZEe/A517VldRLyQYXUMyV+vszavE2jSAqw==", + "dev": true, + "dependencies": { + "ajv": "^7.0.3", + "ajv-formats": "^1.5.1", + "atomically": "^1.7.0", + "debounce-fn": "^4.0.0", + "dot-prop": "^6.0.1", + "env-paths": "^2.2.0", + "json-schema-typed": "^7.0.3", + "make-dir": "^3.1.0", + "onetime": "^5.1.2", + "pkg-up": "^3.1.0", + "semver": "^7.3.4" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/conf/node_modules/ajv": { + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.2.4.tgz", + "integrity": "sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/conf/node_modules/ajv-formats": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-1.6.1.tgz", + "integrity": "sha512-4CjkH20If1lhR5CGtqkrVg3bbOtFEG80X9v6jDOIUhbzzbB+UzPBGy8GQhUNVZ0yvMHdMpawCOcy5ydGMsagGQ==", + "dev": true, + "dependencies": { + "ajv": "^7.0.0" + }, + "peerDependencies": { + "ajv": "^7.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "node_modules/conf/node_modules/dot-prop": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", + "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", + "dev": true, + "dependencies": { + "is-obj": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/conf/node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/conf/node_modules/make-dir/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/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/conventional-changelog": { + "version": "3.1.25", + "resolved": "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-3.1.25.tgz", + "integrity": "sha512-ryhi3fd1mKf3fSjbLXOfK2D06YwKNic1nC9mWqybBHdObPd8KJ2vjaXZfYj1U23t+V8T8n0d7gwnc9XbIdFbyQ==", + "dev": true, + "dependencies": { + "conventional-changelog-angular": "^5.0.12", + "conventional-changelog-atom": "^2.0.8", + "conventional-changelog-codemirror": "^2.0.8", + "conventional-changelog-conventionalcommits": "^4.5.0", + "conventional-changelog-core": "^4.2.1", + "conventional-changelog-ember": "^2.0.9", + "conventional-changelog-eslint": "^3.0.9", + "conventional-changelog-express": "^2.0.6", + "conventional-changelog-jquery": "^3.0.11", + "conventional-changelog-jshint": "^2.0.9", + "conventional-changelog-preset-loader": "^2.3.4" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-angular": { + "version": "5.0.13", + "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz", + "integrity": "sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==", + "dev": true, + "dependencies": { + "compare-func": "^2.0.0", + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-atom": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/conventional-changelog-atom/-/conventional-changelog-atom-2.0.8.tgz", + "integrity": "sha512-xo6v46icsFTK3bb7dY/8m2qvc8sZemRgdqLb/bjpBsH2UyOS8rKNTgcb5025Hri6IpANPApbXMg15QLb1LJpBw==", + "dev": true, + "dependencies": { + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-codemirror": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.8.tgz", + "integrity": "sha512-z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw==", + "dev": true, + "dependencies": { + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-config-spec": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.1.0.tgz", + "integrity": "sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ==", + "dev": true + }, + "node_modules/conventional-changelog-conventionalcommits": { + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.3.tgz", + "integrity": "sha512-LTTQV4fwOM4oLPad317V/QNQ1FY4Hju5qeBIM1uTHbrnCE+Eg4CdRZ3gO2pUeR+tzWdp80M2j3qFFEDWVqOV4g==", + "dev": true, + "dependencies": { + "compare-func": "^2.0.0", + "lodash": "^4.17.15", + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-core": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz", + "integrity": "sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg==", + "dev": true, + "dependencies": { + "add-stream": "^1.0.0", + "conventional-changelog-writer": "^5.0.0", + "conventional-commits-parser": "^3.2.0", + "dateformat": "^3.0.0", + "get-pkg-repo": "^4.0.0", + "git-raw-commits": "^2.0.8", + "git-remote-origin-url": "^2.0.0", + "git-semver-tags": "^4.1.1", + "lodash": "^4.17.15", + "normalize-package-data": "^3.0.0", + "q": "^1.5.1", + "read-pkg": "^3.0.0", + "read-pkg-up": "^3.0.0", + "through2": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-core/node_modules/find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", + "dev": true, + "dependencies": { + "locate-path": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/conventional-changelog-core/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/conventional-changelog-core/node_modules/locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", + "dev": true, + "dependencies": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/conventional-changelog-core/node_modules/p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "dependencies": { + "p-try": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/conventional-changelog-core/node_modules/p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", + "dev": true, + "dependencies": { + "p-limit": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/conventional-changelog-core/node_modules/p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/conventional-changelog-core/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==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/conventional-changelog-core/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/conventional-changelog-core/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/conventional-changelog-core/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/conventional-changelog-core/node_modules/read-pkg-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", + "integrity": "sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw==", + "dev": true, + "dependencies": { + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/conventional-changelog-core/node_modules/read-pkg/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/conventional-changelog-core/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/conventional-changelog-ember": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-2.0.9.tgz", + "integrity": "sha512-ulzIReoZEvZCBDhcNYfDIsLTHzYHc7awh+eI44ZtV5cx6LVxLlVtEmcO+2/kGIHGtw+qVabJYjdI5cJOQgXh1A==", + "dev": true, + "dependencies": { + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-eslint": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.9.tgz", + "integrity": "sha512-6NpUCMgU8qmWmyAMSZO5NrRd7rTgErjrm4VASam2u5jrZS0n38V7Y9CzTtLT2qwz5xEChDR4BduoWIr8TfwvXA==", + "dev": true, + "dependencies": { + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-express": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/conventional-changelog-express/-/conventional-changelog-express-2.0.6.tgz", + "integrity": "sha512-SDez2f3iVJw6V563O3pRtNwXtQaSmEfTCaTBPCqn0oG0mfkq0rX4hHBq5P7De2MncoRixrALj3u3oQsNK+Q0pQ==", + "dev": true, + "dependencies": { + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-jquery": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.11.tgz", + "integrity": "sha512-x8AWz5/Td55F7+o/9LQ6cQIPwrCjfJQ5Zmfqi8thwUEKHstEn4kTIofXub7plf1xvFA2TqhZlq7fy5OmV6BOMw==", + "dev": true, + "dependencies": { + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-jshint": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.9.tgz", + "integrity": "sha512-wMLdaIzq6TNnMHMy31hql02OEQ8nCQfExw1SE0hYL5KvU+JCTuPaDO+7JiogGT2gJAxiUGATdtYYfh+nT+6riA==", + "dev": true, + "dependencies": { + "compare-func": "^2.0.0", + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-preset-loader": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz", + "integrity": "sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-writer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz", + "integrity": "sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ==", + "dev": true, + "dependencies": { + "conventional-commits-filter": "^2.0.7", + "dateformat": "^3.0.0", + "handlebars": "^4.7.7", + "json-stringify-safe": "^5.0.1", + "lodash": "^4.17.15", + "meow": "^8.0.0", + "semver": "^6.0.0", + "split": "^1.0.0", + "through2": "^4.0.0" + }, + "bin": { + "conventional-changelog-writer": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-changelog-writer/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/conventional-commits-filter": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz", + "integrity": "sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA==", + "dev": true, + "dependencies": { + "lodash.ismatch": "^4.4.0", + "modify-values": "^1.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-commits-parser": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz", + "integrity": "sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q==", + "dev": true, + "dependencies": { + "is-text-path": "^1.0.1", + "JSONStream": "^1.0.4", + "lodash": "^4.17.15", + "meow": "^8.0.0", + "split2": "^3.0.0", + "through2": "^4.0.0" + }, + "bin": { + "conventional-commits-parser": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/conventional-recommended-bump": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz", + "integrity": "sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw==", + "dev": true, + "dependencies": { + "concat-stream": "^2.0.0", + "conventional-changelog-preset-loader": "^2.3.4", + "conventional-commits-filter": "^2.0.7", + "conventional-commits-parser": "^3.2.0", + "git-raw-commits": "^2.0.8", + "git-semver-tags": "^4.1.1", + "meow": "^8.0.0", + "q": "^1.5.1" + }, + "bin": { + "conventional-recommended-bump": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "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/cookiejar": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz", + "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==" + }, + "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/cos-nodejs-sdk-v5": { + "version": "2.12.5", + "resolved": "https://registry.npmjs.org/cos-nodejs-sdk-v5/-/cos-nodejs-sdk-v5-2.12.5.tgz", + "integrity": "sha512-LziLL0P4CjuaFUN5aingfrZySFaonoN5A5YWjATT+5UXBFbJI6Lz2MPXGOWzR+UBgqZqkQ7aNnd4Fb4krRE/+A==", + "dev": true, + "dependencies": { + "conf": "^9.0.0", + "fast-xml-parser": "4.2.5", + "mime-types": "^2.1.24", + "request": "^2.88.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/cosmiconfig": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", + "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "dev": true, + "dependencies": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/crc-32": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", + "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", + "bin": { + "crc32": "bin/crc32.njs" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/crc32-stream": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz", + "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==", + "dependencies": { + "crc-32": "^1.2.0", + "readable-stream": "^3.4.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dependencies": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, + "engines": { + "node": ">=4.8" + } + }, + "node_modules/cross-spawn/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/d": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "dependencies": { + "es5-ext": "^0.10.50", + "type": "^1.0.1" + } + }, + "node_modules/d/node_modules/type": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", + "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" + }, + "node_modules/dargs": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", + "integrity": "sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", + "dev": true, + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/dateformat": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", + "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/dayjs": { + "version": "1.11.10", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", + "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" + }, + "node_modules/debounce-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz", + "integrity": "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==", + "dev": true, + "dependencies": { + "mimic-fn": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/debug/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==" + }, + "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==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decamelize-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", + "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", + "dev": true, + "dependencies": { + "decamelize": "^1.1.0", + "map-obj": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decamelize-keys/node_modules/map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decompress": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz", + "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==", + "dependencies": { + "decompress-tar": "^4.0.0", + "decompress-tarbz2": "^4.0.0", + "decompress-targz": "^4.0.0", + "decompress-unzip": "^4.0.1", + "graceful-fs": "^4.1.10", + "make-dir": "^1.0.0", + "pify": "^2.3.0", + "strip-dirs": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decompress-response/node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/decompress-tar": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz", + "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==", + "dependencies": { + "file-type": "^5.2.0", + "is-stream": "^1.1.0", + "tar-stream": "^1.5.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-tar/node_modules/bl": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz", + "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==", + "dependencies": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } + }, + "node_modules/decompress-tar/node_modules/file-type": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", + "integrity": "sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-tar/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/decompress-tar/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/decompress-tar/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/decompress-tar/node_modules/tar-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", + "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", + "dependencies": { + "bl": "^1.0.0", + "buffer-alloc": "^1.2.0", + "end-of-stream": "^1.0.0", + "fs-constants": "^1.0.0", + "readable-stream": "^2.3.0", + "to-buffer": "^1.1.1", + "xtend": "^4.0.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/decompress-tarbz2": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", + "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", + "dependencies": { + "decompress-tar": "^4.1.0", + "file-type": "^6.1.0", + "is-stream": "^1.1.0", + "seek-bzip": "^1.0.5", + "unbzip2-stream": "^1.0.9" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-tarbz2/node_modules/file-type": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", + "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==", + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-targz": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz", + "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", + "dependencies": { + "decompress-tar": "^4.1.1", + "file-type": "^5.2.0", + "is-stream": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-targz/node_modules/file-type": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", + "integrity": "sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-unzip": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", + "integrity": "sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw==", + "dependencies": { + "file-type": "^3.8.0", + "get-stream": "^2.2.0", + "pify": "^2.3.0", + "yauzl": "^2.4.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress-unzip/node_modules/file-type": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "integrity": "sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decompress-unzip/node_modules/get-stream": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", + "integrity": "sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA==", + "dependencies": { + "object-assign": "^4.0.1", + "pinkie-promise": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decompress/node_modules/make-dir": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "dependencies": { + "pify": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/decompress/node_modules/make-dir/node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", + "engines": { + "node": ">=4" + } + }, + "node_modules/deep-eql": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", + "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", + "dev": true, + "dependencies": { + "type-detect": "^4.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "dev": true, + "engines": { + "node": ">=4.0.0" + } + }, + "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/default-require-extensions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz", + "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==", + "dev": true, + "dependencies": { + "strip-bom": "^4.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/defaults": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", + "dependencies": { + "clone": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/defer-to-connect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", + "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", + "engines": { + "node": ">=10" + } + }, + "node_modules/deferred": { + "version": "0.7.11", + "resolved": "https://registry.npmjs.org/deferred/-/deferred-0.7.11.tgz", + "integrity": "sha512-8eluCl/Blx4YOGwMapBvXRKxHXhA8ejDXYzEaK8+/gtcm8hRMhSLmXSqDmNUKNc/C8HNSmuyyp/hflhqDAvK2A==", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.50", + "event-emitter": "^0.3.5", + "next-tick": "^1.0.0", + "timers-ext": "^0.1.7" + } + }, + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "engines": { + "node": ">=8" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "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/deprecation": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz", + "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==", + "dev": true + }, + "node_modules/detect-indent": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", + "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/detect-libc": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz", + "integrity": "sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/dezalgo": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", + "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", + "dependencies": { + "asap": "^2.0.0", + "wrappy": "1" + } + }, + "node_modules/diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "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==", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "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/dot-prop": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", + "dev": true, + "dependencies": { + "is-obj": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/dotenv": { + "version": "16.3.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", + "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/motdotla/dotenv?sponsor=1" + } + }, + "node_modules/dotenv-expand": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz", + "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==", + "engines": { + "node": ">=12" + } + }, + "node_modules/dotgitignore": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/dotgitignore/-/dotgitignore-2.1.0.tgz", + "integrity": "sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==", + "dev": true, + "dependencies": { + "find-up": "^3.0.0", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/dotgitignore/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==", + "dev": true, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/dotgitignore/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==", + "dev": true, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/dotgitignore/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/dotgitignore/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==", + "dev": true, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/dotgitignore/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==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/duration": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/duration/-/duration-0.2.2.tgz", + "integrity": "sha512-06kgtea+bGreF5eKYgI/36A6pLXggY7oR4p1pq4SmdFBn1ReOL5D8RhG64VrqfTTKNucqqtBAwEj8aB88mcqrg==", + "dependencies": { + "d": "1", + "es5-ext": "~0.10.46" + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, + "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==", + "dev": true, + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.4.596", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.596.tgz", + "integrity": "sha512-zW3zbZ40Icb2BCWjm47nxwcFGYlIgdXkAx85XDO7cyky9J4QQfq8t0W19/TLZqq3JPQXtlv8BPIGmfa9Jb4scg==", + "dev": true + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "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.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", + "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.2", + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.5", + "es-set-tostringtag": "^2.0.1", + "es-to-primitive": "^1.2.1", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.2", + "get-symbol-description": "^1.0.0", + "globalthis": "^1.0.3", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0", + "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.12", + "is-weakref": "^1.0.2", + "object-inspect": "^1.13.1", + "object-keys": "^1.1.1", + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", + "safe-regex-test": "^1.0.0", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", + "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.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", + "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.2", + "has-tostringtag": "^1.0.0", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", + "dev": true, + "dependencies": { + "hasown": "^2.0.0" + } + }, + "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/es5-ext": { + "version": "0.10.62", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz", + "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", + "hasInstallScript": true, + "dependencies": { + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.3", + "next-tick": "^1.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "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/es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", + "dependencies": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "node_modules/es6-set": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz", + "integrity": "sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "es6-iterator": "~2.0.3", + "es6-symbol": "^3.1.3", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/es6-symbol": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", + "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", + "dependencies": { + "d": "^1.0.1", + "ext": "^1.1.2" + } + }, + "node_modules/es6-weak-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", + "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", + "dependencies": { + "d": "1", + "es5-ext": "^0.10.46", + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.1" + } + }, + "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": "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": { + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", + "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.3", + "@eslint/js": "8.54.0", + "@humanwhocodes/config-array": "^0.11.13", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "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.29.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz", + "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.8.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", + "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-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/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/eslint/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/eslint/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/eslint/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/eslint/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/eslint/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/eslint/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/eslint/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/esniff": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/esniff/-/esniff-1.1.0.tgz", + "integrity": "sha512-vmHXOeOt7FJLsqofvFk4WB3ejvcHizCd8toXXwADmYfd02p2QwHRgkUbhYDX54y08nqk818CUTWipgZGlyN07g==", + "dependencies": { + "d": "1", + "es5-ext": "^0.10.12" + } + }, + "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/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "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/essentials": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/essentials/-/essentials-1.2.0.tgz", + "integrity": "sha512-kP/j7Iw7KeNE8b/o7+tr9uX2s1wegElGOoGZ2Xm35qBr4BbbEcH3/bxR2nfH9l9JANCq9AUrvKw+gRuHtZp0HQ==", + "dependencies": { + "uni-global": "^1.0.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/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/event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "dependencies": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, + "node_modules/event-target-shim": { + "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==", + "engines": { + "node": ">=6" + } + }, + "node_modules/eventemitter3": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "dev": true + }, + "node_modules/events": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==", + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/execa": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.1", + "human-signals": "^4.3.0", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^3.0.7", + "strip-final-newline": "^3.0.0" + }, + "engines": { + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/execa/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/execa/node_modules/is-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/node_modules/mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/node_modules/onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, + "dependencies": { + "mimic-fn": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/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/execa/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/execa/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/execa/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/expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/ext": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", + "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", + "dependencies": { + "type": "^2.7.2" + } + }, + "node_modules/ext-list": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz", + "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==", + "dependencies": { + "mime-db": "^1.28.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ext-name": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz", + "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==", + "dependencies": { + "ext-list": "^2.0.0", + "sort-keys-length": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "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/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, + "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==", + "dev": true, + "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==" + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "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-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/fast-safe-stringify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", + "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" + }, + "node_modules/fast-xml-parser": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz", + "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==", + "funding": [ + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" + }, + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "dependencies": { + "strnum": "^1.0.5" + }, + "bin": { + "fxparser": "src/cli/cli.js" + } + }, + "node_modules/fastest-levenshtein": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "engines": { + "node": ">= 4.9.1" + } + }, + "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==", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", + "dependencies": { + "pend": "~1.2.0" + } + }, + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/figures/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/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/file-type": { + "version": "16.5.4", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz", + "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==", + "dependencies": { + "readable-web-to-node-stream": "^3.0.0", + "strtok3": "^6.2.4", + "token-types": "^4.1.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/file-type?sponsor=1" + } + }, + "node_modules/filename-reserved-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", + "integrity": "sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/filenamify": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", + "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", + "dependencies": { + "filename-reserved-regex": "^2.0.0", + "strip-outer": "^1.0.1", + "trim-repeated": "^1.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/filesize": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-10.1.0.tgz", + "integrity": "sha512-GTLKYyBSDz3nPhlLVPjPWZCnhkd9TrrRArNcy8Z+J2cqScB7h2McAzR6NBX6nYOoWafql0roY8hrocxnZBv9CQ==", + "engines": { + "node": ">= 10.4.0" + } + }, + "node_modules/fill-keys": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz", + "integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==", + "dev": true, + "dependencies": { + "is-object": "~1.0.1", + "merge-descriptors": "~1.0.0" + }, + "engines": { + "node": ">=0.10.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==", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "dev": true, + "dependencies": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/avajs/find-cache-dir?sponsor=1" + } + }, + "node_modules/find-cache-dir/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/find-cache-dir/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/find-cache-dir/node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/find-cache-dir/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/find-cache-dir/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/find-cache-dir/node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-cache-dir/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/find-requires": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/find-requires/-/find-requires-1.0.0.tgz", + "integrity": "sha512-UME7hNwBfzeISSFQcBEDemEEskpOjI/shPrpJM5PI4DSdn6hX0dmz+2dL70blZER2z8tSnTRL+2rfzlYgtbBoQ==", + "dependencies": { + "es5-ext": "^0.10.49", + "esniff": "^1.1.0" + }, + "bin": { + "find-requires": "bin/find-requires.js" + } + }, + "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/find-versions": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz", + "integrity": "sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==", + "dev": true, + "dependencies": { + "semver-regex": "^3.1.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "dev": true + }, + "node_modules/follow-redirects": { + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", + "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==", + "dependencies": { + "is-callable": "^1.1.3" + } + }, + "node_modules/foreground-child": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", + "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/foreground-child/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/foreground-child/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/foreground-child/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/foreground-child/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/foreground-child/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/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/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/formidable": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz", + "integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==", + "dependencies": { + "dezalgo": "^1.0.4", + "hexoid": "^1.0.0", + "once": "^1.4.0", + "qs": "^6.11.0" + }, + "funding": { + "url": "https://ko-fi.com/tunnckoCore/commissions" + } + }, + "node_modules/formidable/node_modules/qs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/from2": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", + "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" + } + }, + "node_modules/from2/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, + "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/from2/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 + }, + "node_modules/from2/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, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/fromentries": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz", + "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==", + "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/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + }, + "node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "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==" + }, + "node_modules/fs2": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/fs2/-/fs2-0.3.9.tgz", + "integrity": "sha512-WsOqncODWRlkjwll+73bAxVW3JPChDgaPX3DT4iTTm73UmG4VgALa7LaFblP232/DN60itkOrPZ8kaP1feksGQ==", + "dependencies": { + "d": "^1.0.1", + "deferred": "^0.7.11", + "es5-ext": "^0.10.53", + "event-emitter": "^0.3.5", + "ignore": "^5.1.8", + "memoizee": "^0.4.14", + "type": "^2.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" + }, + "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-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "dev": true + }, + "node_modules/get-func-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", + "dependencies": { + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-pkg-repo": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz", + "integrity": "sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==", + "dev": true, + "dependencies": { + "@hutson/parse-repository-url": "^3.0.0", + "hosted-git-info": "^4.0.0", + "through2": "^2.0.0", + "yargs": "^16.2.0" + }, + "bin": { + "get-pkg-repo": "src/cli.js" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-pkg-repo/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, + "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/get-pkg-repo/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 + }, + "node_modules/get-pkg-repo/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, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/get-pkg-repo/node_modules/through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "dev": true, + "dependencies": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "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/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", + "dev": true, + "dependencies": { + "assert-plus": "^1.0.0" + } + }, + "node_modules/git-list-updated": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/git-list-updated/-/git-list-updated-1.2.1.tgz", + "integrity": "sha512-llCzqjMEwMiU2TuX1PPajrX8cHBOaCVjw0aPDEXAIWvU3JuSZii8B4pvk8vEH8oibObQImFO/E2IwS20DoORCA==", + "dev": true, + "dependencies": { + "2-thenable": "^1.0.0", + "child-process-ext": "^2.0.0", + "es5-ext": "^0.10.50", + "essentials": "^1.0.0", + "minimist": "^1.2.0" + }, + "bin": { + "git-list-updated": "bin/git-list-updated.js", + "pipe-git-updated": "bin/pipe-git-updated.js" + } + }, + "node_modules/git-raw-commits": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.11.tgz", + "integrity": "sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==", + "dev": true, + "dependencies": { + "dargs": "^7.0.0", + "lodash": "^4.17.15", + "meow": "^8.0.0", + "split2": "^3.0.0", + "through2": "^4.0.0" + }, + "bin": { + "git-raw-commits": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/git-remote-origin-url": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz", + "integrity": "sha512-eU+GGrZgccNJcsDH5LkXR3PB9M958hxc7sbA8DFJjrv9j4L2P/eZfKhM+QD6wyzpiv+b1BpK0XrYCxkovtjSLw==", + "dev": true, + "dependencies": { + "gitconfiglocal": "^1.0.0", + "pify": "^2.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/git-semver-tags": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-4.1.1.tgz", + "integrity": "sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==", + "dev": true, + "dependencies": { + "meow": "^8.0.0", + "semver": "^6.0.0" + }, + "bin": { + "git-semver-tags": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/git-semver-tags/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/gitconfiglocal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz", + "integrity": "sha512-spLUXeTAVHxDtKsJc8FkFVgFtMdEN9qPGpL23VfSHx4fP4+Ds097IXLvymbnDH8FnmxX5Nr9bPw3A+AQ6mWEaQ==", + "dev": true, + "dependencies": { + "ini": "^1.3.2" + } + }, + "node_modules/github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", + "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", + "dev": true + }, + "node_modules/github-release-from-cc-changelog": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/github-release-from-cc-changelog/-/github-release-from-cc-changelog-2.3.0.tgz", + "integrity": "sha512-Zuwu1tS/wUq7uLvokZh02fCxIDvVP2wgIGGqfECUUtfj6TbPPBlsOym3Yq1Mp7j8l5PFNk3DZ2G3WsMj1ugESA==", + "dev": true, + "dependencies": { + "@octokit/rest": "^18.12.0", + "chalk": "^3.0.0", + "cli-progress-footer": "^1.1.1", + "essentials": "^1.2.0", + "event-emitter": "^0.3.5", + "minimist": "^1.2.6", + "parse-github-url": "^1.0.2", + "split2": "^3.2.2", + "stream-promise": "^3.2.0", + "type": "^2.6.0" + }, + "bin": { + "dump-release-notes-from-cc-changelog": "bin/dump-release-notes-from-cc-changelog.js", + "github-release-all-from-cc-changelog": "bin/github-release-all-from-cc-changelog.js", + "github-release-from-cc-changelog": "bin/github-release-from-cc-changelog.js" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/github-release-from-cc-changelog/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/github-release-from-cc-changelog/node_modules/chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/github-release-from-cc-changelog/node_modules/cli-color": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-1.4.0.tgz", + "integrity": "sha512-xu6RvQqqrWEo6MPR1eixqGPywhYBHRs653F9jfXB2Hx4jdM/3WxiNE1vppRmxtMIfl16SFYTpYlrnqH/HsK/2w==", + "dev": true, + "dependencies": { + "ansi-regex": "^2.1.1", + "d": "1", + "es5-ext": "^0.10.46", + "es6-iterator": "^2.0.3", + "memoizee": "^0.4.14", + "timers-ext": "^0.1.5" + } + }, + "node_modules/github-release-from-cc-changelog/node_modules/cli-progress-footer": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-1.1.1.tgz", + "integrity": "sha512-J0uW2u06pWI0tMKCbcCiMOZd8TbWj4EpuYgPo4Jiwih/FfGbd4dbLcJieO0Ior1pY1HBrnmCuHFk6GB9azE4pg==", + "dev": true, + "dependencies": { + "cli-color": "^1.4", + "d": "1", + "es5-ext": "^0.10.47", + "process-utils": "^2.0.1", + "timers-ext": "^0.1.7" + } + }, + "node_modules/github-release-from-cc-changelog/node_modules/process-utils": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/process-utils/-/process-utils-2.6.0.tgz", + "integrity": "sha512-2zKFADQDvHiUDyJQTsBTdu1+Q2D/WtReBotZwXmD9oUueb0kNv4rXulK/78hMM+nclBNFZ/ZlHOJtobt8oHpqQ==", + "dev": true, + "dependencies": { + "ext": "^1.1.0", + "type": "^2.0.0" + } + }, + "node_modules/github-release-from-cc-changelog/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/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "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": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/global-dirs": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", + "integrity": "sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==", + "dev": true, + "dependencies": { + "ini": "^1.3.4" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/globals": { + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "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==", + "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==", + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/got": { + "version": "11.8.6", + "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", + "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", + "dependencies": { + "@sindresorhus/is": "^4.0.0", + "@szmarczak/http-timer": "^4.0.5", + "@types/cacheable-request": "^6.0.1", + "@types/responselike": "^1.0.0", + "cacheable-lookup": "^5.0.3", + "cacheable-request": "^7.0.2", + "decompress-response": "^6.0.0", + "http2-wrapper": "^1.0.0-beta.5.2", + "lowercase-keys": "^2.0.0", + "p-cancelable": "^2.0.0", + "responselike": "^2.0.0" + }, + "engines": { + "node": ">=10.19.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/got?sponsor=1" + } + }, + "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/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, + "node_modules/graphlib": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz", + "integrity": "sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==", + "dependencies": { + "lodash": "^4.17.15" + } + }, + "node_modules/growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true, + "engines": { + "node": ">=4.x" + } + }, + "node_modules/handlebars": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "dev": true, + "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/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/har-validator/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/har-validator/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/hard-rejection": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", + "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/has": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz", + "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==", + "dev": true, + "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": "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/has-property-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "dependencies": { + "get-intrinsic": "^1.2.2" + }, + "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==", + "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==", + "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==", + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasha": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz", + "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==", + "dev": true, + "dependencies": { + "is-stream": "^2.0.0", + "type-fest": "^0.8.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/hasha/node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/hasha/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/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/hexoid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz", + "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==", + "engines": { + "node": ">=8" + } + }, + "node_modules/hosted-git-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "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-cache-semantics": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + }, + "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/http2-wrapper": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", + "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", + "dependencies": { + "quick-lru": "^5.1.1", + "resolve-alpn": "^1.0.0" + }, + "engines": { + "node": ">=10.19.0" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/human-signals": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", + "dev": true, + "engines": { + "node": ">=14.18.0" + } + }, + "node_modules/husky": { + "version": "4.3.8", + "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.8.tgz", + "integrity": "sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "chalk": "^4.0.0", + "ci-info": "^2.0.0", + "compare-versions": "^3.6.0", + "cosmiconfig": "^7.0.0", + "find-versions": "^4.0.0", + "opencollective-postinstall": "^2.0.2", + "pkg-dir": "^5.0.0", + "please-upgrade-node": "^3.2.0", + "slash": "^3.0.0", + "which-pm-runs": "^1.0.0" + }, + "bin": { + "husky-run": "bin/run.js", + "husky-upgrade": "lib/upgrader/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/husky" + } + }, + "node_modules/husky/node_modules/ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dev": true + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + }, + "node_modules/ignore": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", + "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", + "engines": { + "node": ">= 4" + } + }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" + }, + "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/import-fresh/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/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "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==", + "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/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true + }, + "node_modules/inquirer": { + "version": "8.2.6", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", + "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.1", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.21", + "mute-stream": "0.0.8", + "ora": "^5.4.1", + "run-async": "^2.4.0", + "rxjs": "^7.5.5", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6", + "wrap-ansi": "^6.0.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/internal-slot": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", + "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.2", + "hasown": "^2.0.0", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/into-stream": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-6.0.0.tgz", + "integrity": "sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA==", + "dev": true, + "dependencies": { + "from2": "^2.3.0", + "p-is-promise": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-arguments": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", + "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "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-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-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==", + "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-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "dev": true, + "dependencies": { + "hasown": "^2.0.0" + }, + "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-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", + "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "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==", + "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==", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-interactive": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-natural-number": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", + "integrity": "sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==" + }, + "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==", + "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-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz", + "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==", + "dev": true, + "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-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-promise": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", + "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==" + }, + "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-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-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "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-text-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", + "integrity": "sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==", + "dev": true, + "dependencies": { + "text-extensions": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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==", + "dependencies": { + "which-typed-array": "^1.1.11" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "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-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dependencies": { + "is-docker": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "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/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/isomorphic-ws": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz", + "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==", + "peerDependencies": { + "ws": "*" + } + }, + "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": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-hook": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", + "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "dev": true, + "dependencies": { + "append-transform": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "dev": true, + "dependencies": { + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument/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/istanbul-lib-processinfo": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz", + "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==", + "dev": true, + "dependencies": { + "archy": "^1.0.0", + "cross-spawn": "^7.0.3", + "istanbul-lib-coverage": "^3.2.0", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-processinfo/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/istanbul-lib-processinfo/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/istanbul-lib-processinfo/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/istanbul-lib-processinfo/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/istanbul-lib-processinfo/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/istanbul-lib-processinfo/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/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report/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/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz", + "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==", + "dev": true, + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jmespath": { + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz", + "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==", + "engines": { + "node": ">= 0.6.0" + } + }, + "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": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dependencies": { + "argparse": "^2.0.1" + }, + "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==", + "dev": true + }, + "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-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + }, + "node_modules/json-colorizer": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/json-colorizer/-/json-colorizer-2.2.2.tgz", + "integrity": "sha512-56oZtwV1piXrQnRNTtJeqRv+B9Y/dXAYLqBBaYl/COcUdoZxgLBLAO88+CnkbT6MxNs0c5E9mPBIb2sFcNz3vw==", + "dependencies": { + "chalk": "^2.4.1", + "lodash.get": "^4.4.2" + } + }, + "node_modules/json-colorizer/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/json-colorizer/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/json-colorizer/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/json-colorizer/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/json-colorizer/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/json-colorizer/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/json-colorizer/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/json-cycle": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/json-cycle/-/json-cycle-1.5.0.tgz", + "integrity": "sha512-GOehvd5PO2FeZ5T4c+RxobeT5a1PiGpF4u9/3+UvrMU4bhnVqzJY7hm39wg8PDCqkU91fWGH8qjWR4bn+wgq9w==", + "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-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-refs": { + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/json-refs/-/json-refs-3.0.15.tgz", + "integrity": "sha512-0vOQd9eLNBL18EGl5yYaO44GhixmImes2wiYn9Z3sag3QnehWrYWlB9AFtMxCL2Bj3fyxgDYkxGFEU/chlYssw==", + "dependencies": { + "commander": "~4.1.1", + "graphlib": "^2.1.8", + "js-yaml": "^3.13.1", + "lodash": "^4.17.15", + "native-promise-only": "^0.8.1", + "path-loader": "^1.0.10", + "slash": "^3.0.0", + "uri-js": "^4.2.2" + }, + "bin": { + "json-refs": "bin/json-refs" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/json-refs/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/json-refs/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==", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "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==", + "dev": true + }, + "node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "node_modules/json-schema-typed": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz", + "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==", + "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/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/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/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", + "dev": true, + "engines": [ + "node >= 0.2.0" + ] + }, + "node_modules/JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "dev": true, + "dependencies": { + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" + }, + "bin": { + "JSONStream": "bin.js" + }, + "engines": { + "node": "*" + } + }, + "node_modules/jsprim": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "dev": true, + "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/jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, + "node_modules/jszip/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/jszip/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/jszip/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/just-extend": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz", + "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", + "dev": true + }, + "node_modules/jwt-decode": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz", + "integrity": "sha512-86GgN2vzfUu7m9Wcj63iUkuDzFNYFVmjeDm2GzWpUk+opB0pEpMsw6ePCMrhYkumz2C1ihqtZzOMAg7FiXcNoQ==" + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/lazystream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", + "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", + "dependencies": { + "readable-stream": "^2.0.5" + }, + "engines": { + "node": ">= 0.6.3" + } + }, + "node_modules/lazystream/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/lazystream/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/lazystream/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/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/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dependencies": { + "immediate": "~3.0.5" + } + }, + "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/lint-staged": { + "version": "13.3.0", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.3.0.tgz", + "integrity": "sha512-mPRtrYnipYYv1FEE134ufbWpeggNTo+O/UPzngoaKzbzHAthvR55am+8GfHTnqNRQVRRrYQLGW9ZyUoD7DsBHQ==", + "dev": true, + "dependencies": { + "chalk": "5.3.0", + "commander": "11.0.0", + "debug": "4.3.4", + "execa": "7.2.0", + "lilconfig": "2.1.0", + "listr2": "6.6.1", + "micromatch": "4.0.5", + "pidtree": "0.6.0", + "string-argv": "0.3.2", + "yaml": "2.3.1" + }, + "bin": { + "lint-staged": "bin/lint-staged.js" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + }, + "funding": { + "url": "https://opencollective.com/lint-staged" + } + }, + "node_modules/lint-staged/node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/lint-staged/node_modules/commander": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz", + "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==", + "dev": true, + "engines": { + "node": ">=16" + } + }, + "node_modules/lint-staged/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/listr2": { + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz", + "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==", + "dev": true, + "dependencies": { + "cli-truncate": "^3.1.0", + "colorette": "^2.0.20", + "eventemitter3": "^5.0.1", + "log-update": "^5.0.1", + "rfdc": "^1.3.0", + "wrap-ansi": "^8.1.0" + }, + "engines": { + "node": ">=16.0.0" + }, + "peerDependencies": { + "enquirer": ">= 2.3.0 < 3" + }, + "peerDependenciesMeta": { + "enquirer": { + "optional": true + } + } + }, + "node_modules/listr2/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/listr2/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/listr2/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, + "node_modules/listr2/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/listr2/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/listr2/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "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/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/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/load-json-file/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/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==" + }, + "node_modules/lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==" + }, + "node_modules/lodash.difference": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", + "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==" + }, + "node_modules/lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==" + }, + "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/lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" + }, + "node_modules/lodash.ismatch": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz", + "integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==", + "dev": true + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "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/lodash.union": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", + "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==" + }, + "node_modules/log": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/log/-/log-6.3.1.tgz", + "integrity": "sha512-McG47rJEWOkXTDioZzQNydAVvZNeEkSyLJ1VWkFwfW+o1knW+QSi8D1KjPn/TnctV+q99lkvJNe1f0E1IjfY2A==", + "dependencies": { + "d": "^1.0.1", + "duration": "^0.2.2", + "es5-ext": "^0.10.53", + "event-emitter": "^0.3.5", + "sprintf-kit": "^2.0.1", + "type": "^2.5.0", + "uni-global": "^1.0.0" + } + }, + "node_modules/log-node": { + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/log-node/-/log-node-8.0.3.tgz", + "integrity": "sha512-1UBwzgYiCIDFs8A0rM2QdBFo8Wd8UQ0HrSTu/MNI+/2zN3NoHRj2fhplurAyuxTYUXu3Oohugq1jAn5s05u1MQ==", + "dependencies": { + "ansi-regex": "^5.0.1", + "cli-color": "^2.0.1", + "cli-sprintf-format": "^1.1.1", + "d": "^1.0.1", + "es5-ext": "^0.10.53", + "sprintf-kit": "^2.0.1", + "supports-color": "^8.1.1", + "type": "^2.5.0" + }, + "engines": { + "node": ">=10.0" + }, + "peerDependencies": { + "log": "^6.0.0" + } + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz", + "integrity": "sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==", + "dev": true, + "dependencies": { + "ansi-escapes": "^5.0.0", + "cli-cursor": "^4.0.0", + "slice-ansi": "^5.0.0", + "strip-ansi": "^7.0.1", + "wrap-ansi": "^8.0.1" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/ansi-escapes": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", + "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", + "dev": true, + "dependencies": { + "type-fest": "^1.0.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/log-update/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/log-update/node_modules/cli-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", + "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "dev": true, + "dependencies": { + "restore-cursor": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, + "node_modules/log-update/node_modules/restore-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", + "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "dev": true, + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/log-update/node_modules/type-fest": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", + "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/loupe": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", + "dev": true, + "dependencies": { + "get-func-name": "^2.0.1" + } + }, + "node_modules/lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "engines": { + "node": ">=8" + } + }, + "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==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/lru-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz", + "integrity": "sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==", + "dependencies": { + "es5-ext": "~0.10.2" + } + }, + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/map-obj": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/memoizee": { + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz", + "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.53", + "es6-weak-map": "^2.0.3", + "event-emitter": "^0.3.5", + "is-promise": "^2.2.2", + "lru-queue": "^0.1.0", + "next-tick": "^1.1.0", + "timers-ext": "^0.1.7" + } + }, + "node_modules/meow": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz", + "integrity": "sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q==", + "dev": true, + "dependencies": { + "@types/minimist": "^1.2.0", + "camelcase-keys": "^6.2.2", + "decamelize-keys": "^1.1.0", + "hard-rejection": "^2.1.0", + "minimist-options": "4.1.0", + "normalize-package-data": "^3.0.0", + "read-pkg-up": "^7.0.1", + "redent": "^3.0.0", + "trim-newlines": "^3.0.0", + "type-fest": "^0.18.0", + "yargs-parser": "^20.2.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/meow/node_modules/type-fest": { + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "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==", + "dev": true + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "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==", + "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/mimic-fn": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz", + "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", + "engines": { + "node": ">=4" + } + }, + "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/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==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minimist-options": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", + "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", + "dev": true, + "dependencies": { + "arrify": "^1.0.1", + "is-plain-obj": "^1.1.0", + "kind-of": "^6.0.3" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "dev": true + }, + "node_modules/mocha": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz", + "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==", + "dev": true, + "dependencies": { + "@ungap/promise-all-settled": "1.1.2", + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.3", + "debug": "4.3.3", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.2.0", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "4.2.1", + "ms": "2.1.3", + "nanoid": "3.3.1", + "serialize-javascript": "6.0.0", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "which": "2.0.2", + "workerpool": "6.2.0", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha" + }, + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mochajs" + } + }, + "node_modules/mocha/node_modules/debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/mocha/node_modules/debug/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/mocha/node_modules/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "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/mocha/node_modules/glob/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/mocha/node_modules/minimatch": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz", + "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha/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/mocha/node_modules/yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/mock-require": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz", + "integrity": "sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==", + "dev": true, + "dependencies": { + "get-caller-file": "^1.0.2", + "normalize-path": "^2.1.1" + }, + "engines": { + "node": ">=4.3.0" + } + }, + "node_modules/mock-require/node_modules/normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==", + "dev": true, + "dependencies": { + "remove-trailing-separator": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/modify-values": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz", + "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/module-not-found-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz", + "integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==", + "dev": true + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/multistream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz", + "integrity": "sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw==", + "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": { + "once": "^1.4.0", + "readable-stream": "^3.6.0" + } + }, + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + }, + "node_modules/nanoid": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", + "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", + "dev": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/napi-build-utils": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", + "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", + "dev": true + }, + "node_modules/native-promise-only": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz", + "integrity": "sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg==" + }, + "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/ncjsm": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ncjsm/-/ncjsm-4.3.2.tgz", + "integrity": "sha512-6d1VWA7FY31CpI4Ki97Fpm36jfURkVbpktizp8aoVViTZRQgr/0ddmlKerALSSlzfwQRBeSq1qwwVcBJK4Sk7Q==", + "dependencies": { + "builtin-modules": "^3.3.0", + "deferred": "^0.7.11", + "es5-ext": "^0.10.62", + "es6-set": "^0.1.6", + "ext": "^1.7.0", + "find-requires": "^1.0.0", + "fs2": "^0.3.9", + "type": "^2.7.2" + } + }, + "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==", + "dev": true + }, + "node_modules/next-tick": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" + }, + "node_modules/nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" + }, + "node_modules/nise": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.5.tgz", + "integrity": "sha512-VJuPIfUFaXNRzETTQEEItTOP8Y171ijr+JLq42wHes3DiryR8vT+1TXQW/Rx8JNUhyYYWyIvjXTU6dOhJcs9Nw==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^2.0.0", + "@sinonjs/fake-timers": "^10.0.2", + "@sinonjs/text-encoding": "^0.7.1", + "just-extend": "^4.0.2", + "path-to-regexp": "^1.7.0" + } + }, + "node_modules/nise/node_modules/@sinonjs/commons": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", + "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/nise/node_modules/@sinonjs/fake-timers": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^3.0.0" + } + }, + "node_modules/nise/node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", + "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/node-abi": { + "version": "3.51.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.51.0.tgz", + "integrity": "sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==", + "dev": true, + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-dir": { + "version": "0.1.17", + "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", + "integrity": "sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==", + "dependencies": { + "minimatch": "^3.0.2" + }, + "engines": { + "node": ">= 0.10.5" + } + }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-preload": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", + "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", + "dev": true, + "dependencies": { + "process-on-spawn": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "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": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", + "dev": true, + "dependencies": { + "hosted-git-info": "^4.0.1", + "is-core-module": "^2.5.0", + "semver": "^7.3.4", + "validate-npm-package-license": "^3.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "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==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/normalize-url": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/npm-registry-utilities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/npm-registry-utilities/-/npm-registry-utilities-1.0.0.tgz", + "integrity": "sha512-9xYfSJy2IFQw1i6462EJzjChL9e65EfSo2Cw6kl0EFeDp05VvU+anrQk3Fc0d1MbVCq7rWIxeer89O9SUQ/uOg==", + "dependencies": { + "ext": "^1.6.0", + "fs2": "^0.3.9", + "memoizee": "^0.4.15", + "node-fetch": "^2.6.7", + "semver": "^7.3.5", + "type": "^2.6.0", + "validate-npm-package-name": "^3.0.0" + }, + "engines": { + "node": ">=12.0" + } + }, + "node_modules/npm-run-path": { + "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==", + "dev": true, + "dependencies": { + "path-key": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/npm-run-path/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nyc": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", + "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==", + "dev": true, + "dependencies": { + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "caching-transform": "^4.0.0", + "convert-source-map": "^1.7.0", + "decamelize": "^1.2.0", + "find-cache-dir": "^3.2.0", + "find-up": "^4.1.0", + "foreground-child": "^2.0.0", + "get-package-type": "^0.1.0", + "glob": "^7.1.6", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-hook": "^3.0.0", + "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-processinfo": "^2.0.2", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "make-dir": "^3.0.0", + "node-preload": "^0.2.1", + "p-map": "^3.0.0", + "process-on-spawn": "^1.0.0", + "resolve-from": "^5.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "spawn-wrap": "^2.0.0", + "test-exclude": "^6.0.0", + "yargs": "^15.0.2" + }, + "bin": { + "nyc": "bin/nyc.js" + }, + "engines": { + "node": ">=8.9" + } + }, + "node_modules/nyc/node_modules/cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "node_modules/nyc/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/nyc/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==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/nyc/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/nyc/node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nyc/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/nyc/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/nyc/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/nyc/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==", + "dev": true + }, + "node_modules/nyc/node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, + "dependencies": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.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": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "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/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==", + "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==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/object-inspect": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "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.fromentries": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", + "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1" + } + }, + "node_modules/object.values": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "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==", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/onetime/node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/open": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", + "dependencies": { + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/opencollective-postinstall": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", + "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==", + "dev": true, + "bin": { + "opencollective-postinstall": "index.js" + } + }, + "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/ora": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "dependencies": { + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/p-cancelable": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", + "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/p-event": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz", + "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==", + "dependencies": { + "p-timeout": "^3.1.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", + "engines": { + "node": ">=4" + } + }, + "node_modules/p-is-promise": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz", + "integrity": "sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "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-map": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "dev": true, + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-timeout": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", + "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", + "dependencies": { + "p-finally": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "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/package-hash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", + "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.15", + "hasha": "^5.0.0", + "lodash.flattendeep": "^4.4.0", + "release-zalgo": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" + }, + "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-github-url": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz", + "integrity": "sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==", + "dev": true, + "bin": { + "parse-github-url": "cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", + "engines": { + "node": ">=4" + } + }, + "node_modules/path-loader": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/path-loader/-/path-loader-1.0.12.tgz", + "integrity": "sha512-n7oDG8B+k/p818uweWrOixY9/Dsr89o2TkCm6tOTex3fpdo2+BFDgR+KpB37mGKBRsBAlR8CIJMFN0OEy/7hIQ==", + "dependencies": { + "native-promise-only": "^0.8.1", + "superagent": "^7.1.6" + } + }, + "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-to-regexp": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", + "dev": true, + "dependencies": { + "isarray": "0.0.1" + } + }, + "node_modules/path-to-regexp/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==", + "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==", + "engines": { + "node": ">=8" + } + }, + "node_modules/path2": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/path2/-/path2-0.1.0.tgz", + "integrity": "sha512-TX+cz8Jk+ta7IvRy2FAej8rdlbrP0+uBIkP/5DTODez/AuL/vSb30KuAdDxGVREXzn8QfAiu5mJYJ1XjbOhEPA==" + }, + "node_modules/pathval": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/peek-readable": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz", + "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==", + "engines": { + "node": ">=8" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Borewit" + } + }, + "node_modules/pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" + }, + "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/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==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pidtree": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz", + "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==", + "dev": true, + "bin": { + "pidtree": "bin/pidtree.js" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", + "dependencies": { + "pinkie": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pkg": { + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/pkg/-/pkg-5.8.1.tgz", + "integrity": "sha512-CjBWtFStCfIiT4Bde9QpJy0KeH19jCfwZRJqHFDFXfhUklCx8JoFmMj3wgnEYIwGmZVNkhsStPHEOnrtrQhEXA==", + "dev": true, + "dependencies": { + "@babel/generator": "7.18.2", + "@babel/parser": "7.18.4", + "@babel/types": "7.19.0", + "chalk": "^4.1.2", + "fs-extra": "^9.1.0", + "globby": "^11.1.0", + "into-stream": "^6.0.0", + "is-core-module": "2.9.0", + "minimist": "^1.2.6", + "multistream": "^4.1.0", + "pkg-fetch": "3.4.2", + "prebuild-install": "7.1.1", + "resolve": "^1.22.0", + "stream-meter": "^1.0.4" + }, + "bin": { + "pkg": "lib-es5/bin.js" + }, + "peerDependencies": { + "node-notifier": ">=9.0.1" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/pkg-dir": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz", + "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==", + "dev": true, + "dependencies": { + "find-up": "^5.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/pkg-fetch": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.4.2.tgz", + "integrity": "sha512-0+uijmzYcnhC0hStDjm/cl2VYdrmVVBpe7Q8k9YBojxmR5tG8mvR9/nooQq3QSXiQqORDVOTY3XqMEqJVIzkHA==", + "dev": true, + "dependencies": { + "chalk": "^4.1.2", + "fs-extra": "^9.1.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.6", + "progress": "^2.0.3", + "semver": "^7.3.5", + "tar-fs": "^2.1.1", + "yargs": "^16.2.0" + }, + "bin": { + "pkg-fetch": "lib-es5/bin.js" + } + }, + "node_modules/pkg-fetch/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/pkg-up": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", + "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", + "dev": true, + "dependencies": { + "find-up": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-up/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==", + "dev": true, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-up/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==", + "dev": true, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/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/pkg-up/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==", + "dev": true, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-up/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==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/pkg/node_modules/@babel/generator": { + "version": "7.18.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz", + "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.18.2", + "@jridgewell/gen-mapping": "^0.3.0", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/pkg/node_modules/@babel/parser": { + "version": "7.18.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz", + "integrity": "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==", + "dev": true, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/pkg/node_modules/@babel/types": { + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", + "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.18.10", + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/pkg/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/pkg/node_modules/is-core-module": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "dev": true, + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/please-upgrade-node": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", + "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==", + "dev": true, + "dependencies": { + "semver-compare": "^1.0.0" + } + }, + "node_modules/prebuild-install": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", + "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", + "dev": true, + "dependencies": { + "detect-libc": "^2.0.0", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^1.0.1", + "node-abi": "^3.3.0", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^4.0.0", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=10" + } + }, + "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": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "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/process-on-spawn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", + "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", + "dev": true, + "dependencies": { + "fromentries": "^1.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/process-utils": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/process-utils/-/process-utils-4.0.0.tgz", + "integrity": "sha512-fMyMQbKCxX51YxR7YGCzPjLsU3yDzXFkP4oi1/Mt5Ixnk7GO/7uUTj8mrCHUwuvozWzI+V7QSJR9cZYnwNOZPg==", + "dependencies": { + "ext": "^1.4.0", + "fs2": "^0.3.9", + "memoizee": "^0.4.14", + "type": "^2.1.0" + }, + "engines": { + "node": ">=10.0" + } + }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/promise-queue": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/promise-queue/-/promise-queue-2.2.5.tgz", + "integrity": "sha512-p/iXrPSVfnqPft24ZdNNLECw/UrtLTpT3jpAAMzl/o5/rDsGCPo3/CQS2611flL6LkoEJ3oQZw7C8Q80ZISXRQ==", + "engines": { + "node": ">= 0.8.0" + } + }, + "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/proxyquire": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz", + "integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==", + "dev": true, + "dependencies": { + "fill-keys": "^1.0.2", + "module-not-found-error": "^1.0.1", + "resolve": "^1.11.1" + } + }, + "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/pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", + "dev": true, + "engines": { + "node": ">=0.6.0", + "teleport": ">=0.2.0" + } + }, + "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/querystring": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz", + "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==", + "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", + "engines": { + "node": ">=0.4.x" + } + }, + "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==", + "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/quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "dev": true, + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "node_modules/rc/node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "dev": true, + "engines": { + "node": ">=0.10.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-up/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/read-pkg/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/read-pkg/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/read-pkg/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/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/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/readable-web-to-node-stream": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz", + "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==", + "dependencies": { + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Borewit" + } + }, + "node_modules/readdir-glob": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz", + "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==", + "dependencies": { + "minimatch": "^5.1.0" + } + }, + "node_modules/readdir-glob/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/readdir-glob/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/redent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", + "dev": true, + "dependencies": { + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "set-function-name": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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/remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==", + "dev": true + }, + "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/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/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==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "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==", + "dev": true + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "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-alpn": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", + "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==" + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-global": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-global/-/resolve-global-1.0.0.tgz", + "integrity": "sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==", + "dev": true, + "dependencies": { + "global-dirs": "^0.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/responselike": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", + "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", + "dependencies": { + "lowercase-keys": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rfdc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", + "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==", + "dev": true + }, + "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/run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "engines": { + "node": ">=0.12.0" + } + }, + "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==", + "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/run-parallel-limit": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.1.0.tgz", + "integrity": "sha512-jJA7irRNM91jaKc3Hcl1npHsFLOXOoTkPCUL1JEa1R82O2miplXXRaGdjW/KM/98YQWDhJLiSs793CnXfblJUw==", + "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/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/safe-array-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", + "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-array-concat/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/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-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/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/sax": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", + "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==" + }, + "node_modules/seek-bzip": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz", + "integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==", + "dependencies": { + "commander": "^2.8.1" + }, + "bin": { + "seek-bunzip": "bin/seek-bunzip", + "seek-table": "bin/seek-bzip-table" + } + }, + "node_modules/seek-bzip/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, + "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==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", + "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", + "dev": true + }, + "node_modules/semver-regex": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.4.tgz", + "integrity": "sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "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==", + "dev": true + }, + "node_modules/set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dependencies": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" + }, + "node_modules/shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", + "dependencies": { + "shebang-regex": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "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==", + "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/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==" + }, + "node_modules/simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "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/simple-get": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", + "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", + "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": { + "decompress-response": "^6.0.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, + "node_modules/simple-git": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.21.0.tgz", + "integrity": "sha512-oTzw9248AF5bDTMk9MrxsRzEzivMlY+DWH0yWS4VYpMhNLhDWnN06pCtaUyPnqv/FpsdeNmRqmZugMABHRPdDA==", + "dependencies": { + "@kwsites/file-exists": "^1.1.1", + "@kwsites/promise-deferred": "^1.1.1", + "debug": "^4.3.4" + }, + "funding": { + "type": "github", + "url": "https://github.com/steveukx/git-js?sponsor=1" + } + }, + "node_modules/sinon": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-13.0.2.tgz", + "integrity": "sha512-KvOrztAVqzSJWMDoxM4vM+GPys1df2VBoXm+YciyB/OLMamfS3VXh3oGh5WtrAGSzrgczNWFFY22oKb7Fi5eeA==", + "deprecated": "16.1.1", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.8.3", + "@sinonjs/fake-timers": "^9.1.2", + "@sinonjs/samsam": "^6.1.1", + "diff": "^5.0.0", + "nise": "^5.1.1", + "supports-color": "^7.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/sinon" + } + }, + "node_modules/sinon-chai": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/sinon-chai/-/sinon-chai-3.7.0.tgz", + "integrity": "sha512-mf5NURdUaSdnatJx3uhoBOrY9dtL19fiOtAdT1Azxg3+lNJFiuN0uzaU3xX1LeAfL17kHQhTAJgpsfhbMJMY2g==", + "dev": true, + "peerDependencies": { + "chai": "^4.0.0", + "sinon": ">=4.0.0" + } + }, + "node_modules/sinon/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/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", + "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.0.0", + "is-fullwidth-code-point": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/slice-ansi/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/sort-keys": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==", + "dependencies": { + "is-plain-obj": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sort-keys-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz", + "integrity": "sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw==", + "dependencies": { + "sort-keys": "^1.0.0" + }, + "engines": { + "node": ">=0.10.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/spawn-wrap": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", + "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", + "dev": true, + "dependencies": { + "foreground-child": "^2.0.0", + "is-windows": "^1.0.2", + "make-dir": "^3.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "which": "^2.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/spawn-wrap/node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/spawn-wrap/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/spawn-wrap/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/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.16", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", + "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", + "dev": true + }, + "node_modules/split": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", + "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", + "dev": true, + "dependencies": { + "through": "2" + }, + "engines": { + "node": "*" + } + }, + "node_modules/split2": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", + "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", + "dependencies": { + "readable-stream": "^3.0.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" + }, + "node_modules/sprintf-kit": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/sprintf-kit/-/sprintf-kit-2.0.1.tgz", + "integrity": "sha512-2PNlcs3j5JflQKcg4wpdqpZ+AjhQJ2OZEo34NXDtlB0tIPG84xaaXhpA8XFacFiwjKA4m49UOYG83y3hbMn/gQ==", + "dependencies": { + "es5-ext": "^0.10.53" + } + }, + "node_modules/sshpk": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz", + "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==", + "dev": true, + "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/standard-version": { + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/standard-version/-/standard-version-9.5.0.tgz", + "integrity": "sha512-3zWJ/mmZQsOaO+fOlsa0+QK90pwhNd042qEcw6hKFNoLFs7peGyvPffpEBbK/DSGPbyOvli0mUIFv5A4qTjh2Q==", + "dev": true, + "dependencies": { + "chalk": "^2.4.2", + "conventional-changelog": "3.1.25", + "conventional-changelog-config-spec": "2.1.0", + "conventional-changelog-conventionalcommits": "4.6.3", + "conventional-recommended-bump": "6.1.0", + "detect-indent": "^6.0.0", + "detect-newline": "^3.1.0", + "dotgitignore": "^2.1.0", + "figures": "^3.1.0", + "find-up": "^5.0.0", + "git-semver-tags": "^4.0.0", + "semver": "^7.1.1", + "stringify-package": "^1.0.1", + "yargs": "^16.0.0" + }, + "bin": { + "standard-version": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/standard-version/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/standard-version/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/standard-version/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/standard-version/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/standard-version/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/standard-version/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/standard-version/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/stream-buffers": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-3.0.2.tgz", + "integrity": "sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==", + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/stream-meter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz", + "integrity": "sha512-4sOEtrbgFotXwnEuzzsQBYEV1elAeFSO8rSGeTwabuX1RRn/kEq9JVH7I0MRBhKVRR0sJkr0M0QCH7yOLf9fhQ==", + "dev": true, + "dependencies": { + "readable-stream": "^2.1.4" + } + }, + "node_modules/stream-meter/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, + "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/stream-meter/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 + }, + "node_modules/stream-meter/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, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/stream-promise": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/stream-promise/-/stream-promise-3.2.0.tgz", + "integrity": "sha512-P+7muTGs2C8yRcgJw/PPt61q7O517tDHiwYEzMWo1GSBCcZedUMT/clz7vUNsSxFphIlJ6QUL4GexQKlfJoVtA==", + "dependencies": { + "2-thenable": "^1.0.0", + "es5-ext": "^0.10.49", + "is-stream": "^1.1.0" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-argv": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", + "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==", + "dev": true, + "engines": { + "node": ">=0.6.19" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/stringify-package": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz", + "integrity": "sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==", + "deprecated": "This module is not used anymore, and has been replaced by @npmcli/package-json", + "dev": true + }, + "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==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-dirs": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz", + "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", + "dependencies": { + "is-natural-number": "^4.0.1" + } + }, + "node_modules/strip-final-newline": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "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/strip-outer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", + "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", + "dependencies": { + "escape-string-regexp": "^1.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/strip-outer/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/strnum": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", + "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" + }, + "node_modules/strtok3": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz", + "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==", + "dependencies": { + "@tokenizer/token": "^0.3.0", + "peek-readable": "^4.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Borewit" + } + }, + "node_modules/superagent": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-7.1.6.tgz", + "integrity": "sha512-gZkVCQR1gy/oUXr+kxJMLDjla434KmSOKbx5iGD30Ql+AkJQ/YlPKECJy2nhqOsHLjGHzoDTXNSjhnvWhzKk7g==", + "deprecated": "Please downgrade to v7.1.5 if you need IE/ActiveXObject support OR upgrade to v8.0.0 as we no longer support IE and published an incorrect patch version (see https://github.com/visionmedia/superagent/issues/1731)", + "dependencies": { + "component-emitter": "^1.3.0", + "cookiejar": "^2.1.3", + "debug": "^4.3.4", + "fast-safe-stringify": "^2.1.1", + "form-data": "^4.0.0", + "formidable": "^2.0.1", + "methods": "^1.1.2", + "mime": "2.6.0", + "qs": "^6.10.3", + "readable-stream": "^3.6.0", + "semver": "^7.3.7" + }, + "engines": { + "node": ">=6.4.0 <13 || >=14" + } + }, + "node_modules/superagent/node_modules/qs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "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/tar": { + "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", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar-fs": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "dev": true, + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "node_modules/tar-fs/node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/text-extensions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", + "integrity": "sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==", + "dev": true, + "engines": { + "node": ">=0.10" + } + }, + "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/throat": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", + "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==" + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" + }, + "node_modules/through2": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", + "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", + "dev": true, + "dependencies": { + "readable-stream": "3" + } + }, + "node_modules/timers-ext": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz", + "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==", + "dependencies": { + "es5-ext": "~0.10.46", + "next-tick": "1" + } + }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/to-buffer": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", + "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==" + }, + "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==", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/token-types": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz", + "integrity": "sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==", + "dependencies": { + "@tokenizer/token": "^0.3.0", + "ieee754": "^1.2.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Borewit" + } + }, + "node_modules/token-types/node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "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/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/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "node_modules/traverse": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.7.tgz", + "integrity": "sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/trim-newlines": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", + "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/trim-repeated": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", + "integrity": "sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg==", + "dependencies": { + "escape-string-regexp": "^1.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/trim-repeated/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/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/tsconfig-paths/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/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "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==", + "dev": true, + "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==", + "dev": true + }, + "node_modules/type": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" + }, + "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-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "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/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/typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", + "dev": true + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "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==", + "dev": true, + "optional": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "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/unbzip2-stream": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", + "dependencies": { + "buffer": "^5.2.1", + "through": "^2.3.8" + } + }, + "node_modules/unbzip2-stream/node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "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": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + }, + "node_modules/uni-global": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/uni-global/-/uni-global-1.0.0.tgz", + "integrity": "sha512-WWM3HP+siTxzIWPNUg7hZ4XO8clKi6NoCAJJWnuRL+BAqyFXF8gC03WNyTefGoUXYc47uYgXxpKLIEvo65PEHw==", + "dependencies": { + "type": "^2.5.0" + } + }, + "node_modules/universal-user-agent": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz", + "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==", + "dev": true + }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/untildify": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", + "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/update-browserslist-db": { + "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==", + "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==", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/url": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", + "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==", + "dependencies": { + "punycode": "1.3.2", + "querystring": "0.2.0" + } + }, + "node_modules/url/node_modules/punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" + }, + "node_modules/url/node_modules/querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", + "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/util": { + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", + "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", + "dependencies": { + "inherits": "^2.0.3", + "is-arguments": "^1.0.4", + "is-generator-function": "^1.0.7", + "is-typed-array": "^1.1.3", + "which-typed-array": "^1.1.2" + } + }, + "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": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "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/validate-npm-package-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", + "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==", + "dependencies": { + "builtins": "^1.0.3" + } + }, + "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==", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "node_modules/wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "dependencies": { + "defaults": "^1.0.3" + } + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "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-module": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", + "dev": true + }, + "node_modules/which-pm-runs": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz", + "integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/which-typed-array": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.4", + "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/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "dev": true + }, + "node_modules/workerpool": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz", + "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==", + "dev": true + }, + "node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "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": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/ws": { + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xml2js": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz", + "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==", + "dev": true, + "dependencies": { + "sax": ">=0.6.0", + "xmlbuilder": "~11.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/xmlbuilder": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/yaml-ast-parser": { + "version": "0.0.43", + "resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz", + "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==" + }, + "node_modules/yamljs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz", + "integrity": "sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==", + "dependencies": { + "argparse": "^1.0.7", + "glob": "^7.0.5" + }, + "bin": { + "json2yaml": "bin/json2yaml", + "yaml2json": "bin/yaml2json" + } + }, + "node_modules/yamljs/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs-unparser/node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs-unparser/node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/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==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "dependencies": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" + } + }, + "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" + } + }, + "node_modules/zip-stream": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz", + "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==", + "dependencies": { + "archiver-utils": "^3.0.4", + "compress-commons": "^4.1.2", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/zip-stream/node_modules/archiver-utils": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz", + "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==", + "dependencies": { + "glob": "^7.2.3", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">= 10" + } + } + } +} diff --git a/pkgs/by-name/se/serverless/package.nix b/pkgs/by-name/se/serverless/package.nix new file mode 100644 index 0000000000000..31745c7778c9b --- /dev/null +++ b/pkgs/by-name/se/serverless/package.nix @@ -0,0 +1,33 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "serverless"; + version = "3.38.0"; + + src = fetchFromGitHub { + owner = "serverless"; + repo = "serverless"; + rev = "v${version}"; + hash = "sha256-DplJRJOdIpZfIvpyPo9VcaXCHVPWB8FwhOH4vISUh3Q="; + }; + + postPatch = '' + cp ${./package-lock.json} ./package-lock.json + ''; + + npmDepsHash = "sha256-Vy3GQelssTqsGsvZqIdctsPlxZQkqrhN0p6AY1T2L/k="; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/serverless/serverless/blob/${src.rev}/CHANGELOG.md"; + description = "Build applications on AWS Lambda and other next-gen cloud services, that auto-scale and only charge you when they run"; + homepage = "https://serverless.com"; + license = lib.licenses.mit; + mainProgram = "serverless"; + maintainers = with lib.maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/by-name/sg/sgfutils/package.nix b/pkgs/by-name/sg/sgfutils/package.nix new file mode 100644 index 0000000000000..7548ab42107e1 --- /dev/null +++ b/pkgs/by-name/sg/sgfutils/package.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, openssl +, iconv +, makeWrapper +, imagemagick +, makeFontsConf +}: +stdenv.mkDerivation +{ + pname = "sgfutils"; + version = "0.25-unstable-2017-11-27"; + src = fetchFromGitHub { + owner = "yangboz"; + repo = "sgfutils"; + rev = "11ab171c46cc16cc71ac6fc901d38ea88d6532a4"; + hash = "sha256-KWYgTxz32WK3MKouj1WAJtZmleKt5giCpzQPwfWruZQ="; + }; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ iconv ]; + buildPhase = '' + runHook preBuild + make all + runHook postBuild + ''; + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp sgf sgfsplit sgfvarsplit sgfstrip sgfinfo sgfmerge sgftf \ + sgfcheck sgfdb sgfdbinfo sgfcharset sgfcmp sgfx \ + ngf2sgf nip2sgf nk2sgf gib2sgf sgftopng ugi2sgf \ + $out/bin + runHook postInstall + ''; + postFixup = '' + wrapProgram $out/bin/sgftopng \ + --prefix PATH : ${lib.makeBinPath [ imagemagick ]} \ + --set-default FONTCONFIG_FILE ${makeFontsConf { fontDirectories = []; }} + ''; + meta = with lib; { + homepage = "https://homepages.cwi.nl/~aeb/go/sgfutils/html/sgfutils.html"; + description = "Command line utilities that help working with SGF files"; + longDescription = '' + The package sgfutils is a collection of command line utilities that help working with SGF files, + especially when they describe go (igo, weiqi, baduk) games. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ggpeti ]; + platforms = platforms.all; # tested on x86_64-linux and aarch64-darwin + }; +} diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index 83059f1a281cb..9723eb530762b 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.3.12"; + version = "0.4.4"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-vGtHz1lSKbucR4MmXv542lv9kbON9Cwo7vB5TaeqoX8="; + hash = "sha256-cic2J1xm/DbZP/qL5jWE7H9x38QAVPwUGpaWEwGTdDk="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeCheckInputs = [ git dart-sass ]; - vendorHash = "sha256-vE9gh0u8j2NViK2dUd39zZtUuaoKv0hf8VhSX/P4ar8="; + vendorHash = "sha256-Cllujomvlf3u3MjIhoh2BpDD3Tfo6kIbJsoPInIUaPI"; postInstall = '' export HOME="$(mktemp -d)" diff --git a/pkgs/by-name/si/signal-export/package.nix b/pkgs/by-name/si/signal-export/package.nix index d1e20fa68a0ac..b142350c4214b 100644 --- a/pkgs/by-name/si/signal-export/package.nix +++ b/pkgs/by-name/si/signal-export/package.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "signal-export"; - version = "1.6.1"; + version = "1.7.1"; pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-1efc8jclXE4PQ/K9q1GC0mGqYo5lXXOIYEzz3RDNBGA="; + sha256 = "sha256-OikD5z0Ota0w4PTdLU4cz0YO/bJHAlzy3nup06GtiS4="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix index be7c2fdd308be..d7d18509ac516 100644 --- a/pkgs/by-name/si/signaturepdf/package.nix +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "signaturepdf"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "24eme"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-7yhvTxpjxHcmRxTE7avM+dN+yz9iVr8Ea/e2yfkBURA="; + hash = "sha256-5isvVyT8s2ZAhLP4x/jjxDssBQ2WAvYDkGOWf3NcjHM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 3822feb381f9f..200200bdaa1cb 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "4.0.5"; + version = "4.0.8"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-HNTVo/uB7UTCy5VVdmf6vka9T+htra7Vk7NF4hByGP4="; + hash = "sha256-QZH21dFUX3NVpk1zyS/zSV+uOJYV3+V6XmuKeOvfc6c="; }; # Fix build on darwin diff --git a/pkgs/by-name/sm/smlfut/package.nix b/pkgs/by-name/sm/smlfut/package.nix index 7bb3c7c05f2a8..b3d60ce133d1f 100644 --- a/pkgs/by-name/sm/smlfut/package.nix +++ b/pkgs/by-name/sm/smlfut/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smlfut"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "diku-dk"; repo = "smlfut"; rev = "v${version}"; - hash = "sha256-Ta0nCVD8N1k88sCdN4RhcugBgkQE7NdclCUtubgS6HM="; + hash = "sha256-bPqvHExAoOCd6Z2/rfKd6kHeYxu/jNDz5qTklqJtlzI="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/sn/snippetexpander/package.nix b/pkgs/by-name/sn/snippetexpander/package.nix new file mode 100644 index 0000000000000..1f5f3a954ec03 --- /dev/null +++ b/pkgs/by-name/sn/snippetexpander/package.nix @@ -0,0 +1,47 @@ +{ lib +, buildGoModule +, fetchFromSourcehut +, scdoc +, installShellFiles +, snippetexpanderd +}: + +buildGoModule rec { + inherit (snippetexpanderd) src version; + + pname = "snippetexpander"; + + vendorHash = "sha256-wSAho59yxcXTu1zQ5x783HT4gtfSM4GdsOEeC1wfHhE="; + + proxyVendor = true; + + modRoot = "cmd/snippetexpander"; + + nativeBuildInputs = [ + scdoc + installShellFiles + ]; + + buildInputs = [ + snippetexpanderd + ]; + + ldflags = [ + "-s" + "-w" + ]; + + postInstall = '' + make man + installManPage snippetexpander.1 + ''; + + meta = with lib; { + description = "Your little expandable text snippet helper CLI"; + homepage = "https://snippetexpander.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ianmjones ]; + platforms = platforms.linux; + mainProgram = "snippetexpander"; + }; +} diff --git a/pkgs/by-name/sn/snippetexpanderd/package.nix b/pkgs/by-name/sn/snippetexpanderd/package.nix new file mode 100644 index 0000000000000..308803ad9eec4 --- /dev/null +++ b/pkgs/by-name/sn/snippetexpanderd/package.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromSourcehut +, pkg-config +, makeWrapper +, scdoc +, installShellFiles +, xorg +, gtk3 +}: + +buildGoModule rec { + pname = "snippetexpanderd"; + version = "1.0.1"; + + src = fetchFromSourcehut { + owner = "~ianmjones"; + repo = "snippetexpander"; + rev = "v${version}"; + hash = "sha256-y3TJ+L3kXYfZFzAD1vmhvP6Yarctu5LHq/74005h8sI="; + }; + + vendorHash = "sha256-QX8HI8I1ZJI6HJ1sl86OiJ4nxwFAjHH8h1zB9ASJaQs="; + + modRoot = "cmd/snippetexpanderd"; + + nativeBuildInputs = [ + pkg-config + makeWrapper + scdoc + installShellFiles + ]; + + buildInputs = [ + xorg.libX11 + gtk3 + ]; + + ldflags = [ + "-s" + "-w" + ]; + + postInstall = '' + make man + installManPage snippetexpanderd.1 snippetexpander-placeholders.5 + ''; + + postFixup = '' + wrapProgram $out/bin/snippetexpanderd \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 ]} + ''; + + meta = with lib; { + description = "Your little expandable text snippet helper daemon"; + homepage = "https://snippetexpander.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ianmjones ]; + platforms = platforms.linux; + mainProgram = "snippetexpanderd"; + }; +} diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix new file mode 100644 index 0000000000000..1ce5f5d9cbe5e --- /dev/null +++ b/pkgs/by-name/sn/snippetexpandergui/package.nix @@ -0,0 +1,70 @@ +{ lib +, buildGoModule +, fetchFromSourcehut +, makeWrapper +, wails +, scdoc +, installShellFiles +, xorg +, gtk3 +, webkitgtk +, gsettings-desktop-schemas +, snippetexpanderd +}: + +buildGoModule rec { + inherit (snippetexpanderd) src version; + + pname = "snippetexpandergui"; + + vendorHash = "sha256-iZfZdT8KlfZMVLQcYmo6EooIdsSGrpO/ojwT9Ft1GQI="; + + proxyVendor = true; + + modRoot = "cmd/snippetexpandergui"; + + nativeBuildInputs = [ + makeWrapper + wails + scdoc + installShellFiles + ]; + + buildInputs = [ + xorg.libX11 + gtk3 + webkitgtk + gsettings-desktop-schemas + snippetexpanderd + ]; + + ldflags = [ + "-s" + "-w" + ]; + + tags = [ + "desktop" + "production" + ]; + + postInstall = '' + mv build/linux/share $out/share + make man + installManPage snippetexpandergui.1 + ''; + + postFixup = '' + wrapProgram $out/bin/snippetexpandergui \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name} + ''; + + meta = with lib; { + description = "Your little expandable text snippet helper GUI"; + homepage = "https://snippetexpander.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ianmjones ]; + platforms = platforms.linux; + mainProgram = "snippetexpandergui"; + }; +} diff --git a/pkgs/by-name/sn/snippetexpanderx/package.nix b/pkgs/by-name/sn/snippetexpanderx/package.nix new file mode 100644 index 0000000000000..3c91adbbbc0c8 --- /dev/null +++ b/pkgs/by-name/sn/snippetexpanderx/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromSourcehut +, pkg-config +, vala +, wrapGAppsHook +, installShellFiles +, scdoc +, at-spi2-atk +, at-spi2-core +, dbus +, gtk3 +, ibus +, libgee +, xorg +, snippetexpanderd +}: + +stdenv.mkDerivation rec { + inherit (snippetexpanderd) src version; + + pname = "snippetexpanderx"; + + sourceRoot = "source/cmd/snippetexpanderx"; + + nativeBuildInputs = [ + pkg-config + vala + wrapGAppsHook + installShellFiles + scdoc + ]; + + buildInputs = [ + at-spi2-atk + at-spi2-core + dbus + gtk3 + ibus + libgee + xorg.libX11 + snippetexpanderd + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -m555 snippetexpanderx $out/bin/ + installManPage snippetexpanderx.1 + runHook postInstall + ''; + + # There are no tests. + doCheck = false; + + meta = with lib; { + description = "Your little expandable text snippet helper auto expander daemon"; + homepage = "https://snippetexpander.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ianmjones ]; + platforms = platforms.linux; + mainProgram = "snippetexpanderx"; + }; +} diff --git a/pkgs/tools/audio/soco-cli/default.nix b/pkgs/by-name/so/soco-cli/package.nix index 068f916e4ef01..b2b415414c79b 100644 --- a/pkgs/tools/audio/soco-cli/default.nix +++ b/pkgs/by-name/so/soco-cli/package.nix @@ -5,16 +5,16 @@ python3.pkgs.buildPythonApplication rec { pname = "soco-cli"; - version = "0.4.55"; + version = "0.4.73"; format = "setuptools"; disabled = python3.pythonOlder "3.6"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "avantrec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zdu1eVtVBTYa47KjGc5fqKN6olxp98RoLGT2sNCfG9E="; + hash = "sha256-WxBwHjh5tCXclQXqrHrpvZdcQU93RObteAfZyyVvKf0="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -32,11 +32,11 @@ python3.pkgs.buildPythonApplication rec { "soco_cli" ]; - meta = with lib; { + meta = { description = "Command-line interface to control Sonos sound systems"; homepage = "https://github.com/avantrec/soco-cli"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ asl20 ]; mainProgram = "sonos"; + maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index 362b02043af7d..bf281e372709f 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -1,39 +1,77 @@ -{ lib, appimageTools, fetchurl, pkgs }: +{ lib +, pkgs +, stdenv +, fetchurl +, appimageTools +, undmg +, nix-update-script +}: let pname = "spacedrive"; version = "0.1.4"; src = fetchurl { - url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.AppImage"; - hash = "sha256-iBdW8iPuvztP0L5xLyVs7/K8yFe7kD7QwdTuKJLhB+c="; + aarch64-darwin = { + url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-aarch64.dmg"; + hash = "sha256-gKboB5W0vW6ssZHRRivqbVPE0d0FCUdiNCsP0rKKtNo="; + }; + x86_64-darwin = { + url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-x86_64.dmg"; + hash = "sha256-KD1hw6aDyqCsXLYM8WrOTI2AfFx7t++UWV7SaCmtypI="; + }; + x86_64-linux = { + url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.AppImage"; + hash = "sha256-iBdW8iPuvztP0L5xLyVs7/K8yFe7kD7QwdTuKJLhB+c="; + }; + }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); + + meta = { + description = "An open source file manager, powered by a virtual distributed filesystem"; + homepage = "https://www.spacedrive.com"; + changelog = "https://github.com/spacedriveapp/spacedrive/releases/tag/${version}"; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + license = lib.licenses.agpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ heisfer mikaelfangel stepbrobd ]; + mainProgram = "spacedrive"; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in appimageTools.wrapType2 { - inherit pname version src; + passthru.updateScript = nix-update-script { }; +in +if stdenv.isDarwin then stdenv.mkDerivation +{ + inherit pname version src meta passthru; - extraPkgs = pkgs: - (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ]; + sourceRoot = "Spacedrive.app"; - extraInstallCommands = '' - # Remove version from entrypoint - mv $out/bin/spacedrive-"${version}" $out/bin/spacedrive + nativeBuildInputs = [ undmg ]; - # Install .desktop files - install -Dm444 ${appimageContents}/spacedrive.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/spacedrive.png -t $out/share/pixmaps - substituteInPlace $out/share/applications/spacedrive.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=spacedrive' + installPhase = '' + mkdir -p "$out/Applications/Spacedrive.app" + cp -r . "$out/Applications/Spacedrive.app" + mkdir -p "$out/bin" + ln -s "$out/Applications/Spacedrive.app/Contents/MacOS/Spacedrive" "$out/bin/spacedrive" ''; +} +else appimageTools.wrapType2 { + inherit pname version src meta passthru; - meta = with lib; { - description = "An open source file manager, powered by a virtual distributed filesystem"; - homepage = "https://www.spacedrive.com/"; - platforms = [ "x86_64-linux" ]; - license = licenses.agpl3Plus; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ mikaelfangel heisfer ]; - mainProgram = "spacedrive"; - }; + extraPkgs = pkgs: + (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ]; + + extraInstallCommands = + let + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + # Remove version from entrypoint + mv $out/bin/spacedrive-"${version}" $out/bin/spacedrive + + # Install .desktop files + install -Dm444 ${appimageContents}/spacedrive.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/spacedrive.png -t $out/share/pixmaps + substituteInPlace $out/share/applications/spacedrive.desktop \ + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=spacedrive' + ''; } diff --git a/pkgs/by-name/sp/spade/Cargo.lock b/pkgs/by-name/sp/spade/Cargo.lock new file mode 100644 index 0000000000000..02f87b96c6b8b --- /dev/null +++ b/pkgs/by-name/sp/spade/Cargo.lock @@ -0,0 +1,1813 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +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.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anstream" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +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 = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[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 = "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.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "basic-toml" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f2139706359229bfa8f19142ac1155b4b80beafb7a60471ac5dd109d4a19778" +dependencies = [ + "serde", +] + +[[package]] +name = "beef" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[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.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "codespan" +version = "0.12.0" +source = "git+https://gitlab.com/spade-lang/codespan.git?branch=master#a5656af9ed33460258fd1921bc6bede1ba0fb00e" +dependencies = [ + "codespan-reporting 0.12.0", + "serde", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "codespan-reporting" +version = "0.12.0" +source = "git+https://gitlab.com/spade-lang/codespan.git?branch=master#a5656af9ed33460258fd1921bc6bede1ba0fb00e" +dependencies = [ + "serde", + "termcolor", + "unicode-width", +] + +[[package]] +name = "color-eyre" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +dependencies = [ + "is-terminal", + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "cxx" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5" +dependencies = [ + "cc", + "codespan-reporting 0.11.1", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.38", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "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 = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "errno" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "eyre" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[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.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indoc" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" + +[[package]] +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] +name = "insta" +version = "1.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "similar", + "yaml-rust", +] + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.3", + "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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[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.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "link-cplusplus" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" +dependencies = [ + "cc", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "local-impl" +version = "0.1.0" +source = "git+https://gitlab.com/sornas/local-impl#09293b492c653d78bb2f5fd64187e0c68ea51733" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "logos" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c000ca4d908ff18ac99b93a062cb8958d331c3220719c52e77cb19cc6ac5d2c1" +dependencies = [ + "logos-derive", +] + +[[package]] +name = "logos-codegen" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc487311295e0002e452025d6b580b77bb17286de87b57138f3b5db711cded68" +dependencies = [ + "beef", + "fnv", + "proc-macro2", + "quote", + "regex-syntax 0.6.29", + "syn 2.0.38", +] + +[[package]] +name = "logos-derive" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbfc0d229f1f42d790440136d941afd806bc9e949e2bcb8faa813b0f00d1267e" +dependencies = [ + "logos-codegen", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +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 = "nesty" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dac700f47763ee1984f0034c1b606e84fb00002cd2fbaabdd5a5473cf9e90ef5" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", + "serde", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", + "serde", +] + +[[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-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" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", + "serde", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "pad" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" +dependencies = [ + "unicode-width", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] + +[[package]] +name = "prettydiff" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11" +dependencies = [ + "ansi_term", + "pad", +] + +[[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.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b1ac5b3731ba34fdaa9785f8d74d17448cd18f30cf19e0c7e7b1fdb5272109" +dependencies = [ + "cfg-if", + "eyre", + "indoc 1.0.9", + "libc", + "memoffset", + "parking_lot", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent 0.1.11", +] + +[[package]] +name = "pyo3-build-config" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d39c55dab3fc5a4b25bbd1ac10a2da452c4aca13bb450f22818a002e29648d" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97daff08a4c48320587b5224cc98d609e3c27b6d437315bd40b605c98eeb5918" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "regex-syntax 0.8.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-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[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.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.1", + "serde", + "serde_derive", +] + +[[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.38.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "ryu" +version = "1.0.15" +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 = "scratch" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" + +[[package]] +name = "serde" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "similar" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" + +[[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "spade" +version = "0.4.0" +dependencies = [ + "atty", + "clap", + "codespan", + "codespan-reporting 0.12.0", + "color-eyre", + "colored", + "indoc 2.0.4", + "itertools", + "logos", + "pretty_assertions", + "prettydiff", + "ron", + "serde", + "spade-ast", + "spade-ast-lowering", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-hir-lowering", + "spade-macros", + "spade-mir", + "spade-parser", + "spade-typeinference", + "spade-types", + "spade-wordlength-inference", + "thiserror", + "tracing", + "tracing-subscriber", + "tracing-tree", +] + +[[package]] +name = "spade-ast" +version = "0.4.0" +dependencies = [ + "num", + "spade-common", +] + +[[package]] +name = "spade-ast-lowering" +version = "0.4.0" +dependencies = [ + "itertools", + "local-impl", + "matches", + "num", + "pretty_assertions", + "spade-ast", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-macros", + "spade-types", + "tracing", +] + +[[package]] +name = "spade-common" +version = "0.4.0" +dependencies = [ + "codespan", + "codespan-reporting 0.12.0", + "logos", + "num", + "serde", + "tracing", +] + +[[package]] +name = "spade-cxx" +version = "0.1.0" +dependencies = [ + "color-eyre", + "cxx", + "cxx-build", + "num", + "ron", + "spade", + "spade-mir", + "spade-simulation-ext", +] + +[[package]] +name = "spade-diagnostics" +version = "0.4.0" +dependencies = [ + "codespan", + "codespan-reporting 0.12.0", + "colored", + "insta", + "local-impl", + "logos", + "spade-ast", + "spade-common", + "spade-macros", + "thiserror", + "tracing", +] + +[[package]] +name = "spade-hir" +version = "0.4.0" +dependencies = [ + "codespan-reporting 0.12.0", + "colored", + "itertools", + "local-impl", + "num", + "serde", + "spade-common", + "spade-diagnostics", + "spade-types", + "tap", + "thiserror", + "tracing", +] + +[[package]] +name = "spade-hir-lowering" +version = "0.4.0" +dependencies = [ + "codespan", + "codespan-reporting 0.12.0", + "colored", + "indoc 2.0.4", + "itertools", + "local-impl", + "num", + "pretty_assertions", + "prettydiff", + "serde", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-mir", + "spade-typeinference", + "spade-types", + "spade-wordlength-inference", + "thiserror", + "tracing", +] + +[[package]] +name = "spade-macros" +version = "0.4.0" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", + "trybuild", +] + +[[package]] +name = "spade-mir" +version = "0.4.0" +dependencies = [ + "codespan", + "codespan-reporting 0.12.0", + "colored", + "derivative", + "indoc 2.0.4", + "itertools", + "logos", + "nesty", + "num", + "pretty_assertions", + "prettydiff", + "serde", + "spade-common", + "spade-diagnostics", + "spade-macros", +] + +[[package]] +name = "spade-parser" +version = "0.4.0" +dependencies = [ + "codespan", + "codespan-reporting 0.12.0", + "colored", + "itertools", + "local-impl", + "logos", + "num", + "spade-ast", + "spade-common", + "spade-diagnostics", + "spade-macros", + "thiserror", + "tracing", +] + +[[package]] +name = "spade-python" +version = "0.4.0" +dependencies = [ + "codespan-reporting 0.12.0", + "color-eyre", + "itertools", + "logos", + "num", + "pyo3", + "ron", + "spade", + "spade-ast", + "spade-ast-lowering", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-hir-lowering", + "spade-mir", + "spade-parser", + "spade-simulation-ext", + "spade-typeinference", + "spade-types", + "tracing", + "tracing-subscriber", + "tracing-tree", + "vcd-translate", +] + +[[package]] +name = "spade-simulation-ext" +version = "0.4.0" +dependencies = [ + "codespan-reporting 0.12.0", + "color-eyre", + "itertools", + "logos", + "num", + "pyo3", + "ron", + "spade", + "spade-ast", + "spade-ast-lowering", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-hir-lowering", + "spade-mir", + "spade-parser", + "spade-typeinference", + "spade-types", + "tracing", + "tracing-subscriber", + "tracing-tree", + "vcd-translate", +] + +[[package]] +name = "spade-tests" +version = "0.4.0" +dependencies = [ + "codespan-reporting 0.12.0", + "colored", + "indoc 2.0.4", + "insta", + "logos", + "pretty_assertions", + "prettydiff", + "spade", + "spade-ast-lowering", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-hir-lowering", + "spade-mir", + "spade-parser", + "spade-typeinference", + "spade-types", + "spade-wordlength-inference", + "tracing", + "tracing-subscriber", + "tracing-tree", + "unindent 0.2.3", +] + +[[package]] +name = "spade-typeinference" +version = "0.4.0" +dependencies = [ + "assert_matches", + "codespan", + "codespan-reporting 0.12.0", + "colored", + "itertools", + "local-impl", + "num", + "serde", + "spade-ast", + "spade-ast-lowering", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-macros", + "spade-types", + "thiserror", + "tracing", +] + +[[package]] +name = "spade-types" +version = "0.4.0" +dependencies = [ + "num", + "serde", + "spade-common", +] + +[[package]] +name = "spade-wordlength-inference" +version = "0.4.0" +dependencies = [ + "codespan", + "codespan-reporting 0.12.0", + "colored", + "local-impl", + "num", + "serde", + "spade-ast", + "spade-common", + "spade-diagnostics", + "spade-hir", + "spade-macros", + "spade-parser", + "spade-typeinference", + "spade-types", + "thiserror", + "tracing", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "target-lexicon" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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 = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "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", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-tree" +version = "0.2.0" +source = "git+https://github.com/jonathanmorley/tracing-tree?rev=8b97ec6e50e3f755644d1a0aaf4c45a2112607b2#8b97ec6e50e3f755644d1a0aaf4c45a2112607b2" +dependencies = [ + "ansi_term", + "atty", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "trybuild" +version = "1.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" +dependencies = [ + "basic-toml", + "glob", + "once_cell", + "serde", + "serde_derive", + "serde_json", + "termcolor", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unindent" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[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 = "vcd" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a5ed196124bf3bb32418e5f79cd7548a455500bba37e094f7ef4cfe91161fc" + +[[package]] +name = "vcd-translate" +version = "0.1.0" +dependencies = [ + "clap", + "color-eyre", + "itertools", + "num", + "ron", + "spade", + "spade-ast", + "spade-common", + "spade-hir-lowering", + "spade-mir", + "spade-typeinference", + "spade-types", + "vcd", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +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.5", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "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]] +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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix new file mode 100644 index 0000000000000..b8e00125753c8 --- /dev/null +++ b/pkgs/by-name/sp/spade/package.nix @@ -0,0 +1,44 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "spade"; + version = "0.5.0"; + + src = fetchFromGitLab { + owner = "spade-lang"; + repo = "spade"; + rev = "v${version}"; + hash = "sha256-PvheMYpsDWAXPf8K3K8yloCH0UTjzzVPuMBlcGC1xKU="; + # only needed for vatch, which contains test data + fetchSubmodules = true; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "codespan-0.12.0" = "sha256-3F2006BR3hyhxcUTaQiOjzTEuRECKJKjIDyXonS/lrE="; + "local-impl-0.1.0" = "sha256-w6kQ4wM/ZQJmOqmAAq9FFDzyt9xHOY14av5dsSIFRU0="; + "tracing-tree-0.2.0" = "sha256-/JNeAKjAXmKPh0et8958yS7joORDbid9dhFB0VUAhZc="; + }; + }; + + # Cargo.lock is outdated + postConfigure = '' + cargo metadata --offline + ''; + + meta = with lib; { + description = "A better hardware description language"; + homepage = "https://gitlab.com/spade-lang/spade"; + changelog = "https://gitlab.com/spade-lang/spade/-/blob/${src.rev}/CHANGELOG.md"; + # compiler is eupl12, spade-lang stdlib is both asl20 and mit + license = with licenses; [ eupl12 asl20 mit ]; + maintainers = with maintainers; [ pbsds ]; + mainProgram = "spade"; + broken = stdenv.isDarwin; # ld: symbol(s) not found for architecture ${system} + }; +} diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 7447f934c82e9..410dad2c898e5 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.27.2"; + version = "2.28.1"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-TT7ZPvpiiDAvvN2ec/qN4i/6XCxfeBTPLD3dCxVTKBY="; + hash = "sha256-PiOpj9FsolFZzoMATnJmMwjZrBLGXDIHv8SIaJQetRc="; }; - vendorHash = "sha256-H2kSTsYiD9HResHes+7YxUyNcjtM0SLpDPUC0Y518VM="; + vendorHash = "sha256-alNUJ+ejwZPvefCTHt0/NWSAIt4MFzbPmkMinMrpe2M="; ldflags = [ "-s -w" diff --git a/pkgs/by-name/sp/spirit/package.nix b/pkgs/by-name/sp/spirit/package.nix new file mode 100644 index 0000000000000..bdff50a531930 --- /dev/null +++ b/pkgs/by-name/sp/spirit/package.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "spirit"; + version = "unstable-2023-12-15"; + + src = fetchFromGitHub { + owner = "cashapp"; + repo = "spirit"; + rev = "3abce3e15c01b18e7a9fc12e19ad5c0f541d1ffd"; + hash = "sha256-B4z5bdb0hRx7U2RLTRDxRYt1ltACNXz/B6qAs4qjtAo="; + }; + + vendorHash = "sha256-hKTQvTWd48mnVODWE6W541TPuxCyELLgpz96XB29kec="; + + subPackages = [ "cmd/spirit" ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + homepage = "https://github.com/cashapp/spirit"; + description = "Online schema change tool for MySQL"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "spirit"; + }; +} diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix new file mode 100644 index 0000000000000..9e04a71d469b7 --- /dev/null +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, libdisplay-info +, libdrm +, libGL +, libinput +, mesa +, seatd +, udev +}: +stdenv.mkDerivation (self: { + pname = "srm-cuarzo"; + version = "0.4.0-1"; + rev = "v${self.version}"; + hash = "sha256-PWtDSBYw62sfyN2lpd7NY8SbqDrt5IN1rdLZRtDfals="; + + src = fetchFromGitHub { + inherit (self) rev hash; + owner = "CuarzoSoftware"; + repo = "SRM"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + libdisplay-info + libdrm + libGL + libinput + mesa + seatd + udev + ]; + + outputs = [ "out" "dev" ]; + + postPatch = '' + substituteInPlace src/meson.build \ + --replace "/usr/include/drm" "${libdrm.dev}/include/drm" \ + --replace "/usr/include/libdrm" "${libdrm.dev}/include/libdrm" + ''; + + preConfigure = '' + # The root meson.build file is in src/ + cd src + ''; + + meta = { + description = "Simple Rendering Manager"; + homepage = "https://github.com/CuarzoSoftware/SRM"; + maintainers = [ lib.maintainers.dblsaiko ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index d93cfa4b281cb..379bec22675bc 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "steamguard-cli"; - version = "0.12.3"; + version = "0.12.5"; src = fetchFromGitHub { owner = "dyc3"; repo = pname; rev = "v${version}"; - hash = "sha256-qfyo63u6gBkGNxVBmFsz9YXs6duRU/VnFly40C13vI8="; + hash = "sha256-YjJhCEg87xuUFjHD6cBN4dhQhx/c4F/XewyMYeA06+U="; }; - cargoHash = "sha256-B8/WCSHC905wDxYGLYVMT0QxgMiGR0/VMVzOlyTKPss="; + cargoHash = "sha256-Z1KWU7Z9iGs5yjuWilMSYhfIilSW8ng+pq5ENfunINo="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/by-name/su/sudachi-rs/package.nix b/pkgs/by-name/su/sudachi-rs/package.nix new file mode 100644 index 0000000000000..f55a24e41e795 --- /dev/null +++ b/pkgs/by-name/su/sudachi-rs/package.nix @@ -0,0 +1,49 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, sudachidict +, runCommand +, sudachi-rs +}: + +rustPlatform.buildRustPackage rec { + pname = "sudachi-rs"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "WorksApplications"; + repo = "sudachi.rs"; + rev = "refs/tags/v${version}"; + hash = "sha256-VzNOI6PP9sKBsNfB5yIxAI8jI8TEdM4tD49Jl/2tkSE="; + }; + + postPatch = '' + substituteInPlace sudachi/src/config.rs \ + --replace '"resources"' '"${placeholder "out"}/share/resources"' + ''; + + cargoHash = "sha256-b2NtgHcMkimzFFuqohAo9KdSaIq6oi3qo/k8/VugyFs="; + + # prepare the resources before the build so that the binary can find sudachidict + preBuild = '' + install -Dm644 ${sudachidict}/share/system.dic resources/system.dic + install -Dm644 resources/* -t $out/share/resources + ''; + + passthru.tests = { + # detects an error that sudachidict is not found + cli = runCommand "${pname}-cli-test" { } '' + mkdir $out + echo "高輪ゲートウェイ駅" | ${lib.getExe sudachi-rs} > $out/result + ''; + }; + + meta = with lib; { + description = "A Japanese morphological analyzer"; + homepage = "https://github.com/WorksApplications/sudachi.rs"; + changelog = "https://github.com/WorksApplications/sudachi.rs/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + mainProgram = "sudachi"; + }; +} diff --git a/pkgs/by-name/su/sudachidict/package.nix b/pkgs/by-name/su/sudachidict/package.nix new file mode 100644 index 0000000000000..7245b9696bf2a --- /dev/null +++ b/pkgs/by-name/su/sudachidict/package.nix @@ -0,0 +1,60 @@ +{ lib +, stdenvNoCC +, fetchzip +, dict-type ? "core" +}: + +let + pname = "sudachidict"; + version = "20230927"; + + srcs = { + core = fetchzip { + url = "https://github.com/WorksApplications/SudachiDict/releases/download/v${version}/sudachi-dictionary-${version}-core.zip"; + hash = "sha256-c88FfC03AU8eP37RVu9M3BAIlwFlTJqQJ60PK94mHOc="; + }; + small = fetchzip { + url = "https://github.com/WorksApplications/SudachiDict/releases/download/v${version}/sudachi-dictionary-${version}-small.zip"; + hash = "sha256-eaYD2C/qPeZJvmOeqH307a6OXtYfuksf6VZt+9kM7eM="; + }; + full = fetchzip { + url = "https://github.com/WorksApplications/SudachiDict/releases/download/v${version}/sudachi-dictionary-${version}-full.zip"; + hash = "sha256-yiO33UUQHcf6LvHJ1Is4MJtI5GSHuIP/tsE9m/KZ01o="; + }; + }; +in + +lib.checkListOfEnum "${pname}: dict-type" [ "core" "full" "small" ] [ dict-type ] + +stdenvNoCC.mkDerivation { + inherit pname version; + + src = srcs.${dict-type}; + + dontConfigure = true; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm644 system_${dict-type}.dic $out/share/system.dic + + runHook postInstall + ''; + + passthru = { + dict-type = dict-type; + }; + + meta = with lib; { + description = "A lexicon for Sudachi"; + homepage = "https://github.com/WorksApplications/SudachiDict"; + changelog = "https://github.com/WorksApplications/SudachiDict/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.all; + # it is a waste of space and time to build this package in hydra since it is just data + hydraPlatforms = []; + }; +} diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 6989e86a37298..20d126a92a267 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-rNM3kQrEkqLAW6Dia+VsEi9etUG218AL8tO0amWXb34="; + hash = "sha256-hhFnOxWXR91WpB51c4fvIENoAtqPj+VmPImGcXwTH0o="; }; - vendorHash = "sha256-I4ZZmQfYTMtNT+3WCs6/g42uF4EKGSjGHCqG8Du5rCo="; + vendorHash = "sha256-oAp3paXWXtTB+1UU/KGewCDQWye16rxNnNWQMdrhgP0="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/applications/window-managers/sway/assign-cgroups.nix b/pkgs/by-name/sw/sway-assign-cgroups/package.nix index c6029de3ee80e..c420a32cf37b0 100644 --- a/pkgs/applications/window-managers/sway/assign-cgroups.nix +++ b/pkgs/by-name/sw/sway-assign-cgroups/package.nix @@ -4,7 +4,7 @@ }: python3Packages.buildPythonApplication rec { - pname = "assign-cgroups"; + pname = "sway-assign-cgroups"; version = "0.4.0"; src = fetchFromGitHub { owner = "alebastr"; diff --git a/pkgs/applications/window-managers/sway/fix-paths.patch b/pkgs/by-name/sw/sway-unwrapped/fix-paths.patch index c52f65b146b79..c52f65b146b79 100644 --- a/pkgs/applications/window-managers/sway/fix-paths.patch +++ b/pkgs/by-name/sw/sway-unwrapped/fix-paths.patch diff --git a/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch b/pkgs/by-name/sw/sway-unwrapped/load-configuration-from-etc.patch index 46a170abc04a7..46a170abc04a7 100644 --- a/pkgs/applications/window-managers/sway/load-configuration-from-etc.patch +++ b/pkgs/by-name/sw/sway-unwrapped/load-configuration-from-etc.patch diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 38fa09e86f706..452925beeabb0 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -2,7 +2,7 @@ , meson, ninja, pkg-config, wayland-scanner, scdoc , libGL, wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, gdk-pixbuf, librsvg -, wlroots, wayland-protocols, libdrm +, wlroots_0_16, wayland-protocols, libdrm , nixosTests # Used by the NixOS module: , isNixOS ? false @@ -11,6 +11,9 @@ , trayEnabled ? systemdSupport }: +let + wlroots = wlroots_0_16; +in stdenv.mkDerivation (finalAttrs: { pname = "sway-unwrapped"; version = "1.8.1"; diff --git a/pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch b/pkgs/by-name/sw/sway-unwrapped/sway-config-nixos-paths.patch index bbb0f722b8bc2..bbb0f722b8bc2 100644 --- a/pkgs/applications/window-managers/sway/sway-config-nixos-paths.patch +++ b/pkgs/by-name/sw/sway-unwrapped/sway-config-nixos-paths.patch diff --git a/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch b/pkgs/by-name/sw/sway-unwrapped/sway-config-no-nix-store-references.patch index 009c129594301..009c129594301 100644 --- a/pkgs/applications/window-managers/sway/sway-config-no-nix-store-references.patch +++ b/pkgs/by-name/sw/sway-unwrapped/sway-config-no-nix-store-references.patch diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/by-name/sw/sway/package.nix index 7510e1e9582b3..3e9ed51613f82 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/by-name/sw/sway/package.nix @@ -31,8 +31,10 @@ let exec ${lib.optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${lib.getExe sway} "$@" fi ''; -in symlinkJoin { - name = "${sway.meta.mainProgram}-${sway.version}"; +in symlinkJoin rec { + pname = lib.replaceStrings ["-unwrapped"] [""] sway.pname; + inherit (sway) version; + name = "${pname}-${version}"; paths = (optional withBaseWrapper baseWrapper) ++ [ sway ]; diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/by-name/sw/swaybg/package.nix index aa5d12cdfc4fd..aa5d12cdfc4fd 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/by-name/sw/swaybg/package.nix diff --git a/pkgs/applications/window-managers/sway/swaycons.nix b/pkgs/by-name/sw/swaycons/package.nix index c990a2bb5186c..c990a2bb5186c 100644 --- a/pkgs/applications/window-managers/sway/swaycons.nix +++ b/pkgs/by-name/sw/swaycons/package.nix diff --git a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix b/pkgs/by-name/sw/swayest-workstyle/package.nix index 2867db53f371b..2867db53f371b 100644 --- a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix +++ b/pkgs/by-name/sw/swayest-workstyle/package.nix diff --git a/pkgs/applications/window-managers/sway/fx.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix index d8ca9cfb7f48e..b49496f1383da 100644 --- a/pkgs/applications/window-managers/sway/fx.nix +++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix @@ -1,7 +1,25 @@ -{ fetchFromGitHub, lib, sway-unwrapped }: +{ + lib, + fetchFromGitHub, + sway-unwrapped, + stdenv, + systemd, + # Used by the NixOS module: + isNixOS ? false, + enableXWayland ? true, + systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, + trayEnabled ? systemdSupport, +}: -sway-unwrapped.overrideAttrs (oldAttrs: rec { - pname = "swayfx"; +(sway-unwrapped.override { + inherit + isNixOS + enableXWayland + systemdSupport + trayEnabled + ; +}).overrideAttrs (oldAttrs: rec { + pname = "swayfx-unwrapped"; version = "0.3.2"; src = fetchFromGitHub { @@ -23,7 +41,6 @@ sway-unwrapped.overrideAttrs (oldAttrs: rec { (patch: !builtins.elem (patch.name or null) removePatches) (oldAttrs.patches or [ ]); - meta = with lib; { description = "Sway, but with eye candy!"; homepage = "https://github.com/WillPower3309/swayfx"; diff --git a/pkgs/by-name/sw/swayfx/package.nix b/pkgs/by-name/sw/swayfx/package.nix new file mode 100644 index 0000000000000..9583f9b7a7107 --- /dev/null +++ b/pkgs/by-name/sw/swayfx/package.nix @@ -0,0 +1,26 @@ +{ + lib, + swayfx-unwrapped, + sway, + # Used by the NixOS module: + withBaseWrapper ? true, + extraSessionCommands ? "", + withGtkWrapper ? false, + extraOptions ? [ ], # E.g.: [ "--verbose" ] + isNixOS ? false, + enableXWayland ? true, + dbusSupport ? true, +}: + +sway.override { + inherit + withBaseWrapper + extraSessionCommands + withGtkWrapper + extraOptions + isNixOS + enableXWayland + dbusSupport + ; + sway-unwrapped = swayfx-unwrapped; +} diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/by-name/sw/swayidle/package.nix index 0ee08dc7ca1d9..0ee08dc7ca1d9 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/by-name/sw/swayidle/package.nix diff --git a/pkgs/tools/wayland/swayimg/default.nix b/pkgs/by-name/sw/swayimg/package.nix index 78a7ab67bad9b..9b0cc438976f0 100644 --- a/pkgs/tools/wayland/swayimg/default.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -20,27 +19,21 @@ , libpng , libjxl , libexif +, openexr_3 , bash-completion +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "artemsen"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-UwIufR3EwbpNVHD1GypV3qNgiqDRllwtxAM0CZPodn0="; + repo = "swayimg"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-aKDt4lPh4w0AOucN7VrA7mo8SHI9eJqdrpJF+hG93gI="; }; - patches = [ - (fetchpatch { - name = "link-libwebp-1.3.1.patch"; - url = "https://github.com/artemsen/swayimg/commit/bd3d6c838c699b876fd8c19b408c475eb47e17b6.patch"; - hash = "sha256-2aMq/GTqyKw+CQr8o8ij4P4yNjBXYKXShQUknStUb5c="; - }) - ]; - strictDeps = true; depsBuildBuild = [ @@ -49,6 +42,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + mesonFlags = [ + (lib.mesonOption "version" finalAttrs.version) + ]; + buildInputs = [ bash-completion wayland @@ -65,8 +62,13 @@ stdenv.mkDerivation rec { libpng libjxl libexif + openexr_3 ]; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = with lib; { homepage = "https://github.com/artemsen/swayimg"; description = "Image viewer for Sway/Wayland"; @@ -76,4 +78,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "swayimg"; }; -} +}) diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/by-name/sw/swaylock-effects/package.nix index c5dbf3766f06c..c5dbf3766f06c 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/by-name/sw/swaylock-effects/package.nix diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/by-name/sw/swaylock-fancy/package.nix index 83d56def4dcce..83d56def4dcce 100644 --- a/pkgs/applications/window-managers/sway/lock-fancy.nix +++ b/pkgs/by-name/sw/swaylock-fancy/package.nix diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/by-name/sw/swaylock/package.nix index 0b438df13d289..0b438df13d289 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/by-name/sw/swaylock/package.nix diff --git a/pkgs/applications/window-managers/sway/osd.nix b/pkgs/by-name/sw/swayosd/package.nix index b2a7b17b43154..b2a7b17b43154 100644 --- a/pkgs/applications/window-managers/sway/osd.nix +++ b/pkgs/by-name/sw/swayosd/package.nix diff --git a/pkgs/applications/window-managers/sway/swayosd_systemd_paths.patch b/pkgs/by-name/sw/swayosd/swayosd_systemd_paths.patch index 189c761e9d363..189c761e9d363 100644 --- a/pkgs/applications/window-managers/sway/swayosd_systemd_paths.patch +++ b/pkgs/by-name/sw/swayosd/swayosd_systemd_paths.patch diff --git a/pkgs/applications/window-managers/sway/ws.nix b/pkgs/by-name/sw/swayws/package.nix index 999581153ac9e..999581153ac9e 100644 --- a/pkgs/applications/window-managers/sway/ws.nix +++ b/pkgs/by-name/sw/swayws/package.nix diff --git a/pkgs/applications/window-managers/sway/ws-update-Cargo-lock.patch b/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch index e1d7614e8bfaf..e1d7614e8bfaf 100644 --- a/pkgs/applications/window-managers/sway/ws-update-Cargo-lock.patch +++ b/pkgs/by-name/sw/swayws/ws-update-Cargo-lock.patch diff --git a/pkgs/applications/window-managers/sway/wsr.nix b/pkgs/by-name/sw/swaywsr/package.nix index 23a82bd2df08d..23a82bd2df08d 100644 --- a/pkgs/applications/window-managers/sway/wsr.nix +++ b/pkgs/by-name/sw/swaywsr/package.nix diff --git a/pkgs/by-name/sy/syn2mas/package.nix b/pkgs/by-name/sy/syn2mas/package.nix new file mode 100644 index 0000000000000..d6d30b6c8ed1b --- /dev/null +++ b/pkgs/by-name/sy/syn2mas/package.nix @@ -0,0 +1,30 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "syn2mas"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "matrix-authentication-service"; + rev = "v${version}"; + hash = "sha256-foipChunzRKIbeO+O+XYx0luzaA0G9LKrH59luQl9R0="; + }; + + sourceRoot = "source/tools/syn2mas"; + + npmDepsHash = "sha256-CdEjfT4rXINv0Fzy56T//XftuAzrn03lQd76/PC2QR8="; + + dontBuild = true; + + meta = with lib; { + description = "Tool to help with the migration of a Matrix Synapse installation to the Matrix Authentication Service"; + homepage = "https://github.com/matrix-org/matrix-authentication-service/tree/main/tools/syn2mas"; + license = licenses.asl20; + maintainers = with maintainers; [ teutat3s ]; + mainProgram = "syn2mas"; + }; +} diff --git a/pkgs/by-name/sy/syndicate_utils/lock.json b/pkgs/by-name/sy/syndicate_utils/lock.json new file mode 100644 index 0000000000000..4c58bce17c8fd --- /dev/null +++ b/pkgs/by-name/sy/syndicate_utils/lock.json @@ -0,0 +1,75 @@ +{ + "depends": [ + { + "method": "fetchzip", + "packages": [ + "hashlib" + ], + "path": "/nix/store/fav82xdbicvlk34nmcbl89zx99lr3mbs-source", + "rev": "f9455d4be988e14e3dc7933eb7cc7d7c4820b7ac", + "sha256": "1sx6j952lj98629qfgr7ds5aipyw9d6lldcnnqs205wpj4pkcjb3", + "srcDir": "", + "url": "https://github.com/ehmry/hashlib/archive/f9455d4be988e14e3dc7933eb7cc7d7c4820b7ac.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "illwill" + ], + "path": "/nix/store/3lmm3z36qn4gz7bfa209zv0pqrpm3di9-source", + "ref": "v0.3.2", + "rev": "1d12cb36ab7b76c31d2d25fa421013ecb382e625", + "sha256": "0f9yncl5gbdja18mrqf5ixrdgrh95k0khda923dm1jd1x1b7ar8z", + "srcDir": "", + "url": "https://github.com/johnnovak/illwill/archive/1d12cb36ab7b76c31d2d25fa421013ecb382e625.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "nimcrypto" + ], + "path": "/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source", + "ref": "traditional-api", + "rev": "602c5d20c69c76137201b5d41f788f72afb95aa8", + "sha256": "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65", + "srcDir": "", + "url": "https://github.com/cheatfate/nimcrypto/archive/602c5d20c69c76137201b5d41f788f72afb95aa8.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "npeg" + ], + "path": "/nix/store/ffkxmjmigfs7zhhiiqm0iw2c34smyciy-source", + "ref": "1.2.1", + "rev": "26d62fdc40feb84c6533956dc11d5ee9ea9b6c09", + "sha256": "0xpzifjkfp49w76qmaylan8q181bs45anmp46l4bwr3lkrr7bpwh", + "srcDir": "src", + "url": "https://github.com/zevv/npeg/archive/26d62fdc40feb84c6533956dc11d5ee9ea9b6c09.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "preserves" + ], + "path": "/nix/store/fmb2yckksz7iv3qdkk5gk1j060kppkq9-source", + "ref": "20231102", + "rev": "4faeb766dc3945bcfacaa1a836ef6ab29b20ceb0", + "sha256": "1a3g5bk1l1h250q3p6sqv6r1lpsplp330qqyp48r0i4a5r0jksq3", + "srcDir": "src", + "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/4faeb766dc3945bcfacaa1a836ef6ab29b20ceb0.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "syndicate" + ], + "path": "/nix/store/nhpvl223vbzdrlzikw7pgyfxs344w7ma-source", + "ref": "20231108", + "rev": "095418032180e360ea27ec7fcd63193944b68e2c", + "sha256": "09pbml2chzz0v5zpz67fs7raj0mfmg8qrih2vz85xxc51h7ncqvw", + "srcDir": "src", + "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/095418032180e360ea27ec7fcd63193944b68e2c.tar.gz" + } + ] +} diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix new file mode 100644 index 0000000000000..a467c3925fdc9 --- /dev/null +++ b/pkgs/by-name/sy/syndicate_utils/package.nix @@ -0,0 +1,23 @@ +{ lib, buildNimPackage, fetchFromGitea }: + +buildNimPackage (finalAttrs: { + pname = "syndicate_utils"; + version = "20231130"; + + src = fetchFromGitea { + domain = "git.syndicate-lang.org"; + owner = "ehmry"; + repo = "syndicate_utils"; + rev = finalAttrs.version; + hash = "sha256-a9EjHSrLyWoP4qUQM+fRjZrNavQfT+SUO44pnPK1j/Q="; + }; + + lockFile = ./lock.json; + + meta = finalAttrs.src.meta // { + description = "Utilities for the Syndicated Actor Model"; + homepage = "https://git.syndicate-lang.org/ehmry/syndicate_utils"; + maintainers = [ lib.maintainers.ehmry ]; + license = lib.licenses.unlicense; + }; +}) diff --git a/pkgs/by-name/sy/syntax/package.nix b/pkgs/by-name/sy/syntax/package.nix new file mode 100644 index 0000000000000..eceffd5aa0b4e --- /dev/null +++ b/pkgs/by-name/sy/syntax/package.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, buildNpmPackage +, stdenv +, nix-update-script +}: + +buildNpmPackage rec { + pname = "syntax"; + version = "0.1.27"; + src = fetchFromGitHub { + owner = "DmitrySoshnikov"; + repo = "syntax"; + rev = "v${version}"; + hash = "sha256-5ZbelnZQvJ9k4GbWR+lDEgxXGLt4VsXput9nBV8nUdc="; + }; + + npmDepsHash = "sha256-jZwbRGGg4tek6Jr+V7/SceJlsbIv7jFWQ+qa+fnChTw="; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/DmitrySoshnikov/syntax"; + description = "Syntactic analysis toolkit, language-agnostic parser generator"; + license = licenses.mit; + maintainers = with maintainers; [ h7x4 ]; + mainProgram = "syntax-cli"; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix new file mode 100644 index 0000000000000..37c72e94aa308 --- /dev/null +++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: + +let + version = "1.56.1"; +in +buildGoModule { + pname = "tailscale-nginx-auth"; + inherit version; + + src = fetchFromGitHub { + owner = "tailscale"; + repo = "tailscale"; + rev = "v${version}"; + hash = "sha256-kMk5Q/KvNcsohHNLDMmpBm+gUxQEOeO8o/odukcJi0A="; + }; + vendorHash = "sha256-bG/ydsJf2UncOcDo8/BXdvQJO3Mk0tl8JGje1b6kto4="; + + CGO_ENABLED = 0; + + subPackages = [ "cmd/nginx-auth" ]; + + ldflags = [ + "-w" + "-s" + "-X tailscale.com/version.longStamp=${version}" + "-X tailscale.com/version.shortStamp=${version}" + ]; + + postInstall = lib.optionalString stdenv.isLinux '' + mv $out/bin/nginx-auth $out/bin/tailscale.nginx-auth + sed -i -e "s#/usr/sbin#$out/bin#" ./cmd/nginx-auth/tailscale.nginx-auth.service + install -D -m0444 -t $out/lib/systemd/system ./cmd/nginx-auth/tailscale.nginx-auth.service + install -D -m0444 -t $out/lib/systemd/system ./cmd/nginx-auth/tailscale.nginx-auth.socket + ''; + + meta = with lib; { + homepage = "https://tailscale.com"; + description = "Tool that allows users to use Tailscale Whois authentication with NGINX as a reverse proxy."; + license = licenses.bsd3; + mainProgram = "tailscale.nginx-auth"; + maintainers = with maintainers; [ danderson phaer ]; + }; +} diff --git a/pkgs/by-name/te/terrapin-scanner/package.nix b/pkgs/by-name/te/terrapin-scanner/package.nix new file mode 100644 index 0000000000000..3b09e59532938 --- /dev/null +++ b/pkgs/by-name/te/terrapin-scanner/package.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "terrapin-scanner"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "RUB-NDS"; + repo = "Terrapin-Scanner"; + rev = "refs/tags/v${version}"; + hash = "sha256-d0aAs9dT74YQkzDQnmeEo+p/RnPHeG2+SgCCF/t1F+w="; + }; + + vendorHash = "sha256-skYMlL9SbBoC89tFCTIzyRViEJaviXENASEqr6zSvoo="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Vulnerability scanner for the Terrapin attack"; + homepage = "https://github.com/RUB-NDS/Terrapin-Scanner"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "Terrapin-Scanner"; + }; +} diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix new file mode 100644 index 0000000000000..8a3ebbb12bd14 --- /dev/null +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, zig_0_11 +, testers +, tigerbeetle +, nix-update-script +}: +stdenv.mkDerivation (finalAttrs: { + pname = "tigerbeetle"; + version = "0.14.171"; + + src = fetchFromGitHub { + owner = "tigerbeetle"; + repo = "tigerbeetle"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-MjsNQarRXsrWKJZ2aBi/Wc2HAYm3isLBNw81a75+nhc="; + }; + + nativeBuildInputs = [ zig_0_11.hook ]; + + zigBuildFlags = [ + "-Dgit-commit=0000000000000000000000000000000000000000" + "-Dversion=${finalAttrs.version}" + ]; + + passthru = { + tests.version = testers.testVersion { + package = tigerbeetle; + command = "tigerbeetle version"; + }; + updateScript = nix-update-script { }; + }; + + meta = { + homepage = "https://tigerbeetle.com/"; + description = "A financial accounting database designed to be distributed and fast"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ danielsidhion ]; + platforms = lib.platforms.unix; + mainProgram = "tigerbeetle"; + }; +}) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index c8fc25f206962..dfc5929015fad 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.30.7"; + version = "2.31.6"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-W0hcIeWbgORWBYuNbVJRA8NNnuBEG8HMLeVBxXtd2VQ="; + hash = "sha256-gptWmATDwcSOUE5YYLEi6r/gVIVk0+nCeynxhD1ra/c="; }; postPatch = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableSSL openssl ++ lib.optional (lineEditingLibrary == "readline") readline; - nativeCheckInputs = lib.optionals finalAttrs.doCheck [ valgrind ]; + nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [ valgrind ]; strictDeps = true; diff --git a/pkgs/by-name/tr/treecat/package.nix b/pkgs/by-name/tr/treecat/package.nix new file mode 100644 index 0000000000000..df184b9d10626 --- /dev/null +++ b/pkgs/by-name/tr/treecat/package.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromSourcehut +, hare +, haredo +, lib +, scdoc +}: +stdenv.mkDerivation (finalAttrs: { + pname = "treecat"; + version = "1.0.2-unstable-2023-11-28"; + + outputs = [ "out" "man" ]; + + src = fetchFromSourcehut { + owner = "~autumnull"; + repo = "treecat"; + rev = "d277aed99eb48eef891b76916a61029989c41d2d"; + hash = "sha256-4A01MAGkBSSzkyRw4omNbLoX8z+pHfoUO7/6QvEUu70="; + }; + + nativeBuildInputs = [ + hare + haredo + scdoc + ]; + + dontConfigure = true; + + preBuild = '' + HARECACHE="$(mktemp -d)" + export HARECACHE + export PREFIX="${builtins.placeholder "out"}" + ''; + + meta = { + description = "Serialize a directory to a tree diagram, and vice versa"; + longDescription = '' + Treecat is an amalgamation of `tree(1)` and `cat(1)`, with the added + bonus that it can reconstruct its output back into the original filetree. + ''; + homepage = "https://sr.ht/~autumnull/treecat/"; + license = lib.licenses.wtfpl; + maintainers = with lib.maintainers; [ onemoresuza ]; + mainProgram = "treecat"; + inherit (hare.meta) platforms badPlatforms; + }; +}) diff --git a/pkgs/by-name/tt/ttop/package.nix b/pkgs/by-name/tt/ttop/package.nix index 97db97e33d44b..013bac08fea24 100644 --- a/pkgs/by-name/tt/ttop/package.nix +++ b/pkgs/by-name/tt/ttop/package.nix @@ -2,13 +2,13 @@ buildNimPackage (finalAttrs: { pname = "ttop"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitHub { owner = "inv2004"; repo = "ttop"; rev = "v${finalAttrs.version}"; - hash = "sha256-oPdaUqh6eN1X5kAYVvevOndkB/xnQng9QVLX9bu5P5E="; + hash = "sha256-QMUrA3OjxlDa1OxptJL7T3SPDTzSwVz6zz+ueh9eovM="; }; lockFile = ./lock.json; diff --git a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/no-cpu-plugin.patch b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/no-cpu-plugin.patch new file mode 100644 index 0000000000000..d6d864fb97899 --- /dev/null +++ b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/no-cpu-plugin.patch @@ -0,0 +1,14 @@ +diff --git a/src/plugins/meson.build b/src/plugins/meson.build +index cdd3b5b..a5a2174 100644 +--- a/src/plugins/meson.build ++++ b/src/plugins/meson.build +@@ -63,9 +63,3 @@ if all_nvidia_linux_libs + install : true, + link_with : libtuxclocker) + endif +- +-shared_library('cpu', 'CPU.cpp', 'Utils.cpp', +- include_directories : [incdir, fplus_inc], +- install_dir : get_option('libdir') / 'tuxclocker' / 'plugins', +- install : true, +- link_with : libtuxclocker) diff --git a/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix new file mode 100644 index 0000000000000..dac3b342c4c2a --- /dev/null +++ b/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, boost +, libX11 +, libXext +, linuxPackages +, openssl +, tuxclocker-plugins +}: + +stdenv.mkDerivation { + pname = "tuxclocker-nvidia-plugin"; + + inherit (tuxclocker-plugins) src version meta BOOST_INCLUDEDIR BOOST_LIBRARYDIR nativeBuildInputs; + + buildInputs = [ + boost + libX11 + libXext + linuxPackages.nvidia_x11 + linuxPackages.nvidia_x11.settings.libXNVCtrl + openssl + ]; + + # Build doesn't have a way to disable building the CPU plugin, which is already + # provided by 'tuxclocker-plugins' + patches = [ ./no-cpu-plugin.patch ]; + + mesonFlags = [ + "-Ddaemon=false" + "-Dgui=false" + "-Drequire-nvidia=true" + ]; +} diff --git a/pkgs/by-name/tu/tuxclocker-plugins-with-unfree/package.nix b/pkgs/by-name/tu/tuxclocker-plugins-with-unfree/package.nix new file mode 100644 index 0000000000000..f055cf111fa3b --- /dev/null +++ b/pkgs/by-name/tu/tuxclocker-plugins-with-unfree/package.nix @@ -0,0 +1,16 @@ +{ symlinkJoin +, tuxclocker-nvidia-plugin +, tuxclocker-plugins +}: + +symlinkJoin rec { + inherit (tuxclocker-plugins) version meta; + + pname = "tuxclocker-plugins-with-unfree"; + name = "${pname}-${version}"; + + paths = [ + tuxclocker-nvidia-plugin + tuxclocker-plugins + ]; +} diff --git a/pkgs/by-name/tu/tuxclocker-plugins/package.nix b/pkgs/by-name/tu/tuxclocker-plugins/package.nix new file mode 100644 index 0000000000000..19c8fa52441bc --- /dev/null +++ b/pkgs/by-name/tu/tuxclocker-plugins/package.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, boost +, cmake +, gettext +, git +, libdrm +, meson +, ninja +, openssl +, pkg-config +, python3 +, tuxclocker +}: + +stdenv.mkDerivation { + inherit (tuxclocker) src version meta BOOST_INCLUDEDIR BOOST_LIBRARYDIR; + + pname = "tuxclocker-plugins"; + + nativeBuildInputs = [ + gettext + git + meson + ninja + pkg-config + (python3.withPackages(p: [ p.hwdata ])) + ]; + + buildInputs = [ + boost + libdrm + openssl + ]; + + mesonFlags = [ + "-Ddaemon=false" + "-Dgui=false" + "-Drequire-amd=true" + "-Drequire-python-hwdata=true" + ]; +} diff --git a/pkgs/tools/typesetting/typst/Cargo.lock b/pkgs/by-name/ty/typst/Cargo.lock index ae81d73200a35..b5a869b62793c 100644 --- a/pkgs/tools/typesetting/typst/Cargo.lock +++ b/pkgs/by-name/ty/typst/Cargo.lock @@ -9,28 +9,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "aes" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] name = "ahash" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -155,16 +133,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] name = "biblatex" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e41df82f0d1c4919d946bb0c7c3d179b6071246243d308a1bdee6cfecee3bc7" +checksum = "88be3c837773ba281f5fd6674c1c82565c62726abe3d76707da6fb9d434cc392" dependencies = [ "numerals", "paste", @@ -225,43 +197,12 @@ dependencies = [ ] [[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.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] -name = "bytecheck" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "bytemuck" version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -274,33 +215,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[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 = "cc" version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "jobserver", "libc", ] @@ -324,9 +243,9 @@ dependencies = [ [[package]] name = "chinese-variant" -version = "1.0.9" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeea139b89efab957972956e5d3e4efb66a6c261f726abf6911040cc8ef700f7" +checksum = "17df2e16b0704fc5413214165d1bfdd619f18b1044d5991d5c5351b05fee852e" [[package]] name = "chrono" @@ -368,20 +287,10 @@ dependencies = [ ] [[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] name = "citationberg" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c857faf24e89710f105b623c174508070a9e11e056a749f251ca4c56f59ad88" +checksum = "c15a0bf8014b266d11f20451dc9202d8d26180ffd8b094d73ecbe74d821f01fb" dependencies = [ "quick-xml 0.28.2", "serde", @@ -389,9 +298,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", @@ -399,9 +308,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", @@ -427,7 +336,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -476,32 +385,26 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comemo" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" +checksum = "bf5705468fa80602ee6a5f9318306e6c428bffd53e43209a78bc05e6e667c6f4" dependencies = [ "comemo-macros", - "siphasher", + "siphasher 1.0.0", ] [[package]] name = "comemo-macros" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168cc09917f6a014a4cf6ed166d1b541a20a768c60f9cc348f25203ee8312940" +checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[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-sys" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -517,15 +420,6 @@ dependencies = [ ] [[package]] -name = "cpufeatures" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" -dependencies = [ - "libc", -] - -[[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -578,16 +472,6 @@ dependencies = [ ] [[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 = "csv" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -615,7 +499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -623,29 +507,9 @@ dependencies = [ [[package]] name = "data-url" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "digest" -version = "0.10.7" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "dirs" @@ -676,7 +540,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -716,14 +580,14 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "log", ] @@ -746,9 +610,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ "libc", "windows-sys", @@ -787,9 +651,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] @@ -853,9 +717,9 @@ dependencies = [ [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -876,16 +740,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[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 = "getopts" version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -896,9 +750,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -926,29 +780,25 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.7", -] [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hayagriva" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5af3d464a6b5ae882f15fe1da4e696fd96b77fee78ded933e0ad81d1d87cbc5" +checksum = "f9f97c07366b7f686741521ca63cc14baf18cea53c39b0c09873cd1d4a1b2b8c" dependencies = [ "biblatex", "ciborium", "citationberg", - "indexmap 2.0.2", + "indexmap 2.1.0", "numerals", "paste", - "rkyv", "serde", "serde_yaml 0.9.27", "thiserror", @@ -971,15 +821,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] name = "hypher" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -988,7 +829,7 @@ checksum = "94bf16dd62ea2bec617a6f8a3e1ba03107311783069a647787ac689d1f35321e" [[package]] name = "iai" version = "0.1.1" -source = "git+https://github.com/typst/iai#3f0f92736408ebce6545808b98e0cb2aea89b7dd" +source = "git+https://github.com/typst/iai?rev=3f0f927#3f0f92736408ebce6545808b98e0cb2aea89b7dd" dependencies = [ "cfg-if", ] @@ -1018,9 +859,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3907b2246e8dd5a29ead8a965e7c0c8a90e9b928e614a4279257d45c5e553e91" +checksum = "137d96353afc8544d437e8a99eceb10ab291352699573b0de5b08bda38c78c60" dependencies = [ "displaydoc", "serde", @@ -1031,9 +872,9 @@ dependencies = [ [[package]] name = "icu_locid" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c" +checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" dependencies = [ "displaydoc", "litemap", @@ -1044,9 +885,9 @@ dependencies = [ [[package]] name = "icu_locid_transform" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7" +checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" dependencies = [ "displaydoc", "icu_locid", @@ -1058,15 +899,15 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44" +checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" [[package]] name = "icu_properties" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3477ae70f8ca8dc08ff7574b5398ed0a2f2e4e6b66bdff2558a92ed67e262be1" +checksum = "976e296217453af983efa25f287a4c1da04b9a63bf1ed63719455068e4453eb5" dependencies = [ "displaydoc", "icu_collections", @@ -1080,15 +921,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.3.4" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98507b488098f45eb95ef495612a2012e4d8ad6095dda86cb2f1728aa2204a60" +checksum = "f6a86c0e384532b06b6c104814f9c1b13bcd5b64409001c0d05713a1f3529d99" [[package]] name = "icu_provider" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934" +checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" dependencies = [ "displaydoc", "icu_locid", @@ -1105,9 +946,9 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b380ef2d3d93b015cd0563d7e0d005cc07f82a5503716dbc191798d0079e1d" +checksum = "a229f978260da7c3aabb68cb7dc7316589936680570fe55e50fdd3f97711a4dd" dependencies = [ "icu_locid", "icu_locid_transform", @@ -1118,33 +959,34 @@ dependencies = [ [[package]] name = "icu_provider_blob" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31326d28c7f95a964a4f0ee86c24002da5f6db907e3bcb079949b4ff103b6a9" +checksum = "4a7202cddda672db167c6352719959e9b01cb1ca576d32fa79103f61b5a73601" dependencies = [ "icu_provider", "postcard", "serde", "writeable", + "zerotrie", "zerovec", ] [[package]] name = "icu_provider_macros" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" +checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "icu_segmenter" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb3c1981ce2187a745f391a741cb14e77453325acb3b2e014b05da51c0a39f2" +checksum = "b2dc1e8f4ba33a6a4956770ac5c08570f255d6605519fb3a859a0c0a270a2f8f" dependencies = [ "core_maths", "displaydoc", @@ -1159,15 +1001,15 @@ dependencies = [ [[package]] name = "icu_segmenter_data" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9703f6713044d1c0a1335a6d78ffece4c9380582416ace6feeb608e84d279fc7" +checksum = "3673d6698dcffce08cfe8fc5da3c11c3f2c663d5d6137fd58ab2cbf44235ab46" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1232,12 +1074,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "rayon", "serde", ] @@ -1250,17 +1092,17 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "inferno" -version = "0.11.17" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50453ec3a6555fad17b1cd1a80d16af5bc7cb35094f64e429fd46549018c6a3" +checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" dependencies = [ - "ahash 0.8.6", + "ahash", "clap", "crossbeam-channel", "crossbeam-utils", "dashmap", "env_logger", - "indexmap 2.0.2", + "indexmap 2.1.0", "is-terminal", "itoa", "log", @@ -1292,15 +1134,6 @@ dependencies = [ ] [[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1346,15 +1179,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] name = "jpeg-decoder" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1362,9 +1186,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -1406,24 +1230,24 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libdeflate-sys" -version = "0.14.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "012437ac39c1e7d7ba12af3aceceb5c93149779aa17c2b1c483f33954957ddc8" +checksum = "67921a7f85100c1559efc3d1c7c472091b7da05f304b4bbd5356f075e97f1cc2" dependencies = [ "cc", ] [[package]] name = "libdeflater" -version = "0.14.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58b30f982ddb14aae2a24a7ed7b3d512d687c2483493f95de7a6d167942a19c3" +checksum = "3a31b22f662350ec294b13859f935aea772ba7b2bc8776269f4a5627308eab7d" dependencies = [ "libdeflate-sys", ] @@ -1435,6 +1259,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] name = "line-wrap" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1451,9 +1286,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lipsum" @@ -1467,9 +1302,12 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" +checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" +dependencies = [ + "serde", +] [[package]] name = "lock_api" @@ -1638,9 +1476,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "open" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" +checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" dependencies = [ "is-wsl", "libc", @@ -1661,13 +1499,14 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "oxipng" -version = "8.0.0" -source = "git+https://github.com/typst/oxipng?rev=b8ec65b#b8ec65b3ca42dde33c85149b6e402e891527f802" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28e5c341ef78a228e47a551bfd15ff885d8c501af49f953358763a538c01f14d" dependencies = [ "bitvec", "crossbeam-channel", "filetime", - "indexmap 2.0.2", + "indexmap 2.1.0", "libdeflater", "log", "rayon", @@ -1697,7 +1536,7 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1714,17 +1553,6 @@ dependencies = [ ] [[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", -] - -[[package]] name = "paste" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1737,22 +1565,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[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 = "pdf-writer" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "690874e8cf95d36ddffbdbdaad6ef8714c88bf8085996b673559389a04e38a02" +checksum = "644b654f2de28457bf1e25a4905a76a563d1128a33ce60cf042f721f6818feaf" dependencies = [ "bitflags 1.3.2", "itoa", @@ -1762,9 +1578,47 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher 0.3.11", +] [[package]] name = "pico-args" @@ -1832,12 +1686,6 @@ dependencies = [ ] [[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1845,9 +1693,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -1862,26 +1710,6 @@ dependencies = [ ] [[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "pulldown-cmark" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1942,6 +1770,8 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ + "libc", + "rand_chacha", "rand_core", ] @@ -1960,6 +1790,9 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] [[package]] name = "rayon" @@ -1989,15 +1822,6 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" @@ -2016,12 +1840,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] @@ -2061,15 +1885,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] -name = "rend" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" -dependencies = [ - "bytecheck", -] - -[[package]] name = "resvg" version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2110,34 +1925,6 @@ dependencies = [ ] [[package]] -name = "rkyv" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" -dependencies = [ - "bitvec", - "bytecheck", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "roff" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2169,9 +1956,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ "bitflags 2.4.1", "errno", @@ -2182,9 +1969,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "log", "ring", @@ -2194,9 +1981,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64", ] @@ -2271,15 +2058,10 @@ dependencies = [ ] [[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] name = "self-replace" -version = "1.3.5" -source = "git+https://github.com/typst/self-replace#2e6d5e4808bba73b713fd85cf5616b7d846143c2" +version = "1.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525db198616b2bcd0f245daf7bfd8130222f7ee6af9ff9984c19a61bf1160c55" dependencies = [ "fastrand 1.9.0", "tempfile", @@ -2294,22 +2076,22 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2350,7 +2132,7 @@ version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -2358,28 +2140,6 @@ dependencies = [ ] [[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] name = "sharded-slab" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2395,12 +2155,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] name = "simplecss" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2416,6 +2170,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] +name = "siphasher" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" + +[[package]] name = "slotmap" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2426,9 +2186,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "spin" @@ -2505,19 +2265,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" [[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] name = "svg2pdf" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363c5346967da04bf3ebb3d8bafa7f52c53c810167047904df1960eac3fc08b7" +checksum = "a81da66842e426278f20062cd249779565e13f9ab4bfe0ac9e94eb476bc3a0f3" dependencies = [ "image", "miniz_oxide", + "once_cell", "pdf-writer", "usvg", ] @@ -2529,7 +2284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d71499ff2d42f59d26edb21369a308ede691421f79ebc0f001e2b1fd3a7c9e52" dependencies = [ "kurbo", - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -2545,9 +2300,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -2562,7 +2317,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "unicode-xid", ] @@ -2619,9 +2374,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -2643,7 +2398,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2658,13 +2413,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "deranged", "itoa", - "powerfmt", "serde", "time-core", "time-macros", @@ -2672,15 +2425,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -2713,9 +2466,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" dependencies = [ "displaydoc", "serde", @@ -2739,9 +2492,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -2760,11 +2513,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -2790,7 +2543,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2826,9 +2579,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", @@ -2837,9 +2590,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -2862,62 +2615,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] name = "typst" -version = "0.9.0" +version = "0.10.0" dependencies = [ - "base64", + "az", "bitflags 2.4.1", - "bytemuck", + "chinese-number", + "ciborium", "comemo", + "csv", "ecow", - "flate2", "fontdb", + "hayagriva", + "hypher", + "icu_properties", + "icu_provider", + "icu_provider_adapters", + "icu_provider_blob", + "icu_segmenter", "image", - "indexmap 2.0.2", + "indexmap 2.1.0", "kurbo", + "lipsum", "log", - "miniz_oxide", "once_cell", "palette", - "pdf-writer", - "pixglyph", + "rayon", "regex", - "resvg", "roxmltree", "rustybuzz", "serde", - "siphasher", + "serde_json", + "serde_yaml 0.9.27", + "siphasher 1.0.0", + "smallvec", "stacker", - "subsetter", - "svg2pdf", + "syntect", "time", - "tiny-skia", "toml", "tracing", "ttf-parser", + "typed-arena", "typst-macros", "typst-syntax", - "unicode-ident", + "unicode-bidi", "unicode-math-class", - "unicode-properties", + "unicode-script", "unicode-segmentation", - "unscanny", "usvg", "wasmi", - "xmlparser", - "xmlwriter", - "xmp-writer", ] [[package]] name = "typst-cli" -version = "0.9.0" +version = "0.10.0" dependencies = [ "chrono", "clap", @@ -2928,7 +2679,6 @@ dependencies = [ "dirs", "ecow", "env_proxy", - "filetime", "flate2", "fontdb", "inferno", @@ -2944,7 +2694,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml 0.9.27", - "siphasher", + "siphasher 1.0.0", "tar", "tempfile", "tracing", @@ -2952,7 +2702,9 @@ dependencies = [ "tracing-flame", "tracing-subscriber", "typst", - "typst-library", + "typst-pdf", + "typst-render", + "typst-svg", "ureq", "xz2", "zip", @@ -2960,7 +2712,7 @@ dependencies = [ [[package]] name = "typst-docs" -version = "0.9.0" +version = "0.10.0" dependencies = [ "comemo", "ecow", @@ -2973,7 +2725,6 @@ dependencies = [ "syntect", "typed-arena", "typst", - "typst-library", "unicode_names2", "unscanny", "yaml-front-matter", @@ -2981,7 +2732,7 @@ dependencies = [ [[package]] name = "typst-ide" -version = "0.9.0" +version = "0.10.0" dependencies = [ "comemo", "ecow", @@ -2993,58 +2744,72 @@ dependencies = [ ] [[package]] -name = "typst-library" -version = "0.9.0" +name = "typst-macros" +version = "0.10.0" dependencies = [ - "az", - "chinese-number", - "ciborium", + "heck", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "typst-pdf" +version = "0.10.0" +dependencies = [ + "base64", + "bytemuck", "comemo", - "csv", "ecow", - "hayagriva", - "hypher", - "icu_properties", - "icu_provider", - "icu_provider_adapters", - "icu_provider_blob", - "icu_segmenter", - "indexmap 2.0.2", - "kurbo", - "lipsum", - "log", + "image", + "miniz_oxide", "once_cell", - "roxmltree", - "rustybuzz", - "serde_json", - "serde_yaml 0.9.27", - "smallvec", - "syntect", - "time", - "toml", + "pdf-writer", + "subsetter", + "svg2pdf", "tracing", "ttf-parser", - "typed-arena", "typst", - "unicode-bidi", - "unicode-math-class", - "unicode-script", - "unicode-segmentation", + "unicode-properties", + "unscanny", + "xmp-writer", ] [[package]] -name = "typst-macros" -version = "0.9.0" +name = "typst-render" +version = "0.10.0" dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.38", + "bytemuck", + "comemo", + "flate2", + "image", + "pixglyph", + "resvg", + "roxmltree", + "tiny-skia", + "ttf-parser", + "typst", + "usvg", +] + +[[package]] +name = "typst-svg" +version = "0.10.0" +dependencies = [ + "base64", + "comemo", + "ecow", + "flate2", + "tracing", + "ttf-parser", + "typst", + "xmlparser", + "xmlwriter", ] [[package]] name = "typst-syntax" -version = "0.9.0" +version = "0.10.0" dependencies = [ "comemo", "ecow", @@ -3053,13 +2818,14 @@ dependencies = [ "tracing", "unicode-ident", "unicode-math-class", + "unicode-script", "unicode-segmentation", "unscanny", ] [[package]] name = "typst-tests" -version = "0.9.0" +version = "0.10.0" dependencies = [ "clap", "comemo", @@ -3071,7 +2837,9 @@ dependencies = [ "tiny-skia", "ttf-parser", "typst", - "typst-library", + "typst-pdf", + "typst-render", + "typst-svg", "unscanny", "walkdir", ] @@ -3181,9 +2949,26 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unicode_names2" -version = "0.6.0" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5506ae2c3c1ccbdf468e52fc5ef536c2ccd981f01273a4cb81aa61021f3a5f" +dependencies = [ + "phf", + "unicode_names2_generator", +] + +[[package]] +name = "unicode_names2_generator" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446c96c6dd42604779487f0a981060717156648c1706aa1f464677f03c6cc059" +checksum = "b6dfc680313e95bc6637fa278cd7a22390c3c2cd7b8b2bd28755bc6c0fc811e7" +dependencies = [ + "getopts", + "log", + "phf_codegen", + "rand", + "time", +] [[package]] name = "unsafe-libyaml" @@ -3205,9 +2990,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" dependencies = [ "base64", "flate2", @@ -3223,9 +3008,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -3261,7 +3046,7 @@ dependencies = [ "log", "roxmltree", "simplecss", - "siphasher", + "siphasher 0.3.11", "svgtypes", "usvg-tree", ] @@ -3307,12 +3092,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] -name = "uuid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" - -[[package]] name = "valuable" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3342,9 +3121,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3352,24 +3131,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3377,22 +3156,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasmi" @@ -3436,9 +3215,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "weezl" @@ -3554,18 +3333,18 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] [[package]] name = "writeable" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" +checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e" [[package]] name = "wyz" @@ -3633,9 +3412,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" dependencies = [ "serde", "stable_deref_trait", @@ -3645,34 +3424,34 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.20" +version = "0.7.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.20" +version = "0.7.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3692,15 +3471,27 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "synstructure", ] [[package]] +name = "zerotrie" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0594125a0574fb93059c92c588ab209cc036a23d1baeb3410fa9181bea551a0" +dependencies = [ + "displaydoc", + "litemap", + "serde", + "zerovec", +] + +[[package]] name = "zerovec" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" +checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" dependencies = [ "serde", "yoke", @@ -3710,13 +3501,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" +checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3725,57 +3516,20 @@ 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", - "zstd", ] [[package]] name = "zopfli" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0650ae6a051326d798eb099b632f1afb0d323d25ee4ec82ffb0779512084d5" +checksum = "5c1f48f3508a3a3f2faee01629564400bc12260f6214a056d06a3aaaa6ef0736" dependencies = [ "crc32fast", "log", "simd-adler32", "typed-arena", ] - -[[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.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/tools/typesetting/typst/default.nix b/pkgs/by-name/ty/typst/package.nix index eeb25fa30bde6..24d333f669cc1 100644 --- a/pkgs/tools/typesetting/typst/default.nix +++ b/pkgs/by-name/ty/typst/package.nix @@ -8,21 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "typst"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "typst"; repo = "typst"; rev = "v${version}"; - hash = "sha256-LwRB/AQE8TZZyHEQ7kKB10itzEgYjg4R/k+YFqmutDc="; + hash = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0="; - "oxipng-8.0.0" = "sha256-KIbSsQEjwJ12DxYpBTUD1g9CqJqCfSAmnFcSTiGIoio="; - "self-replace-1.3.5" = "sha256-N57nmLHgxhVR1CDtkgjYwpo1ypdGyVpjJY7vzuncxDc="; }; }; @@ -45,12 +43,12 @@ rustPlatform.buildRustPackage rec { --zsh crates/typst-cli/artifacts/_typst ''; - meta = with lib; { - description = "A new markup-based typesetting system that is powerful and easy to learn"; - homepage = "https://typst.app"; + meta = { changelog = "https://github.com/typst/typst/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ drupol figsoda kanashimia ]; + description = "A new markup-based typesetting system that is powerful and easy to learn"; + homepage = "https://github.com/typst/typst"; + license = lib.licenses.asl20; mainProgram = "typst"; + maintainers = with lib.maintainers; [ drupol figsoda kanashimia ]; }; } diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index 5e91612f3613e..09fbbcf7ae7b9 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "uiua"; - version = "0.5.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; rev = version; - hash = "sha256-xDHr3U+Lc/C2L7jER2VqJvvw9mxCkDzO+K8tzC4Fw2A="; + hash = "sha256-cBwQdArVRiXH8TmgBSPpcB5oNu3Q/+Us9Azzw0lV5Vs="; }; - cargoHash = "sha256-9xjTXQJVGIvdx+SfJGPVa5Ax9wvS4Fms7blxAVrt6IY="; + cargoHash = "sha256-7cgKiEqklvUw64a6+lbHA9t6QWiTquYVi0evXkONEag="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { ''; meta = { - changelog = "https://github.com/uiua-lang/uiua/releases/tag/${src.rev}"; + changelog = "https://github.com/uiua-lang/uiua/blob/${src.rev}/changelog.md"; 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 diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index 07cada7aed51a..10de1a6116dd9 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "usql"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-XfzCJOr0lOkimUKbOW0+qFNQMmYc0DBgi+0ItmEOjwE="; + hash = "sha256-AcxtIdPflMT2SGM2dgbbiFx5S+NlM7neMuXrIhysFPo="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-sijt6YOp1pFNhaxLIOLH90Z5ODVbWFj/mp8Csx8n+ac="; + vendorHash = "sha256-UsYEhqsQUhRROe9HX4WIyi0OeMLHE87JOfp6vwbVMMo="; proxyVendor = true; # Exclude broken genji, hive & impala drivers (bad group) diff --git a/pkgs/by-name/ut/ut/package.nix b/pkgs/by-name/ut/ut/package.nix index 2ed2bdde444fb..3b4a7429d902c 100644 --- a/pkgs/by-name/ut/ut/package.nix +++ b/pkgs/by-name/ut/ut/package.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ut"; - version = "2.0.0"; + version = "2.0.1"; cmakeFlags = [ "-DBOOST_UT_ALLOW_CPM_USE=OFF" @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "boost-ext"; repo = "ut"; rev = "v${finalAttrs.version}"; - hash = "sha256-nMRhVtbnORMnZxIdrv6pvfj8/fv/buh4Y7mz0cr4p+E="; + hash = "sha256-4OZvDcUtw6x/E9yLRQukfn6PskxtVBrsLPP48yo/lN0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 251a16c8b6383..3b6a9ee4d6b02 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "unstable-2023-11-12"; + version = "unstable-2023-12-05"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "86c46be310032bc6588bdc813fae1bc235fac60b"; - hash = "sha256-qyFIJORrjONwyasDvO3COUcE4VJAjZEa3QJDQ+rhwqY="; + rev = "14bf95ba390f9cb84c23ed084b69787efe253e06"; + hash = "sha256-oQAt9jDO0FZm6+6bBt/nDimkbiKsvuhsxnFcsNWvop8="; }; outputs = [ "out" "projects" ]; diff --git a/pkgs/by-name/vc/vcpkg-tool/change-lock-location.patch b/pkgs/by-name/vc/vcpkg-tool/change-lock-location.patch new file mode 100644 index 0000000000000..d3cf8e0f8137e --- /dev/null +++ b/pkgs/by-name/vc/vcpkg-tool/change-lock-location.patch @@ -0,0 +1,14 @@ +diff --git a/src/vcpkg/vcpkgpaths.cpp b/src/vcpkg/vcpkgpaths.cpp +index 3f588c21..e6f2bbed 100644 +--- a/src/vcpkg/vcpkgpaths.cpp ++++ b/src/vcpkg/vcpkgpaths.cpp +@@ -579,7 +579,8 @@ namespace vcpkg + if (!args.do_not_take_lock) + { + std::error_code ec; +- const auto vcpkg_root_file = root / ".vcpkg-root"; ++ fs.create_directories(Path{"/tmp/vcpkg"}, VCPKG_LINE_INFO); ++ const auto vcpkg_root_file = Path{"/tmp/vcpkg"} / Hash::get_string_sha256(root.c_str()); + if (args.wait_for_lock.value_or(false)) + { + file_lock_handle = fs.take_exclusive_file_lock(vcpkg_root_file, ec); diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix new file mode 100644 index 0000000000000..0dbeac1643693 --- /dev/null +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchFromGitHub +, cacert +, cmake +, cmakerc +, fmt +, git +, gzip +, makeWrapper +, meson +, ninja +, openssh +, python3 +, zip +, zstd +, extraRuntimeDeps ? [] +}: +stdenv.mkDerivation (finalAttrs: { + pname = "vcpkg-tool"; + version = "2023-10-18"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "vcpkg-tool"; + rev = finalAttrs.version; + hash = "sha256-Hm+GSKov9A6tmN10BHOTVy8aWkLOJNBMOQJNm4HnWuI="; + }; + + nativeBuildInputs = [ + cmake + cmakerc + fmt + ninja + makeWrapper + ]; + + patches = [ + ./change-lock-location.patch + ]; + + cmakeFlags = [ + "-DVCPKG_DEPENDENCY_EXTERNAL_FMT=ON" + "-DVCPKG_DEPENDENCY_CMAKERC=ON" + ]; + + postFixup = let + # These are the most common binaries used by vcpkg + # Extra binaries can be added via overlay when needed + runtimeDeps = [ + cacert + cmake + git + gzip + meson + ninja + openssh + python3 + zip + zstd + ] ++ extraRuntimeDeps; + in '' + wrapProgram $out/bin/vcpkg --prefix PATH ${lib.makeBinPath runtimeDeps} + ''; + + meta = { + description = "Components of microsoft/vcpkg's binary"; + homepage = "https://github.com/microsoft/vcpkg-tool"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ guekka gracicot ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix new file mode 100644 index 0000000000000..e8beeb0756a16 --- /dev/null +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -0,0 +1,51 @@ +{ fetchFromGitHub +, stdenvNoCC +, lib +, vcpkg-tool +, writeShellScript +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "vcpkg"; + version = "2023.10.19"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "vcpkg"; + rev = finalAttrs.version; + hash = "sha256-u+4vyOphnowoaZgfkCbzF7Q4tuz2GN1bHylaKw352Lc="; + }; + + installPhase = let + # vcpkg needs two directories to write to that is independent of installation directory. + # Since vcpkg already creates $HOME/.vcpkg/ we use that to create a root where vcpkg can write into. + vcpkgScript = writeShellScript "vcpkg" '' + vcpkg_writable_path="$HOME/.vcpkg/root/" + + VCPKG_ROOT="@out@/share/vcpkg" ${vcpkg-tool}/bin/vcpkg \ + --x-downloads-root="$vcpkg_writable_path"/downloads \ + --x-buildtrees-root="$vcpkg_writable_path"/buildtrees \ + --x-packages-root="$vcpkg_writable_path"/packages \ + "$@" + ''; + in '' + runHook preInstall + + mkdir -p $out/bin $out/share/vcpkg/scripts/buildsystems + cp --preserve=mode -r ./{docs,ports,triplets,scripts,.vcpkg-root,versions,LICENSE.txt} $out/share/vcpkg/ + substitute ${vcpkgScript} $out/bin/vcpkg --subst-var-by out $out + chmod +x $out/bin/vcpkg + ln -s $out/bin/vcpkg $out/share/vcpkg/vcpkg + touch $out/share/vcpkg/vcpkg.disable-metrics + + runHook postInstall + ''; + + meta = { + description = "C++ Library Manager"; + homepage = "https://vcpkg.io/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ guekka gracicot ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 320e942012d41..74f52e2c92784 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -12,6 +12,7 @@ , pipewire , libpulseaudio , libicns +, libnotify , jq , moreutils , cacert @@ -116,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { # this is mainly required for venmic libPath = lib.makeLibraryPath [ libpulseaudio + libnotify pipewire gcc13Stdenv.cc.cc.lib ]; diff --git a/pkgs/by-name/vg/vgm2x/package.nix b/pkgs/by-name/vg/vgm2x/package.nix new file mode 100644 index 0000000000000..ff2fa28e7be79 --- /dev/null +++ b/pkgs/by-name/vg/vgm2x/package.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, libfmvoice +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vgm2x"; + version = "0.0.0-unstable-2023-08-27"; + + src = fetchFromGitHub { + owner = "vampirefrog"; + repo = "vgm2x"; + rev = "5128055ab2b356e173b53e2afd31202a59505a39"; + hash = "sha256-DwDcSUdfOsDlajYtzg5xM5P9QPOqLp8b0sEpE18kfzA="; + }; + + postPatch = '' + rmdir libfmvoice + cp --no-preserve=all -r ${libfmvoice.src} libfmvoice + ''; + + strictDeps = true; + + enableParallelBuilding = true; + + buildInputs = [ + zlib + ]; + + buildFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 vgm2opm $out/bin/vgm2opm + + runHook postInstall + ''; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + description = "VGM file extraction tools"; + homepage = "https://github.com/vampirefrog/vgm2x"; + license = licenses.gpl3Only; + mainProgram = "vgm2opm"; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/vi/vieb/package.nix b/pkgs/by-name/vi/vieb/package.nix index 8d3b3de6a124f..0c8afad3fb005 100644 --- a/pkgs/by-name/vi/vieb/package.nix +++ b/pkgs/by-name/vi/vieb/package.nix @@ -2,20 +2,20 @@ buildNpmPackage rec { pname = "vieb"; - version = "10.6.0"; + version = "11.0.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - hash = "sha256-WVG30wkyGiqd3uEhk2h2MHu4L0yE6DRP6NAKMExjuOs="; + hash = "sha256-OBOxT2leZYD3td1+PJdLv7Nph/gY6U9tVC7b/fUmUJw="; }; postPatch = '' sed -i '/"electron"/d' package.json ''; - npmDepsHash = "sha256-kvC1+odojkSFWqcyNUg2SbeEn1EkA+EdfaVWY9QmPz4="; + npmDepsHash = "sha256-vgp20qVT4JZ7U24uu9ZPkveXchMNcdbljodALAMAu9s="; makeCacheWritable = true; dontNpmBuild = true; diff --git a/pkgs/by-name/vi/vimix-cursors/package.nix b/pkgs/by-name/vi/vimix-cursors/package.nix new file mode 100644 index 0000000000000..33de66e19e548 --- /dev/null +++ b/pkgs/by-name/vi/vimix-cursors/package.nix @@ -0,0 +1,55 @@ +{ lib +, fetchFromGitHub +, stdenvNoCC +, inkscape +, python3Packages +, xcursorgen +}: +stdenvNoCC.mkDerivation { + pname = "vimix-cursors"; + version = "2020-02-24-unstable-2021-09-18"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = "vimix-cursors"; + rev = "9bc292f40904e0a33780eda5c5d92eb9a1154e9c"; + hash = "sha256-zW7nJjmB3e+tjEwgiCrdEe5yzJuGBNdefDdyWvgYIUU="; + }; + + nativeBuildInputs = [ + inkscape + python3Packages.cairosvg + xcursorgen + ]; + + postPatch = '' + patchShebangs . + ''; + + buildPhase = '' + runHook preBuild + + HOME="$NIX_BUILD_ROOT" ./build.sh + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -dm 755 $out/share/icons + for color in "" "-white"; do + cp -pr "dist$color/" "$out/share/icons/Vimix$color-cursors" + done + + runHook postInstall + ''; + + meta = with lib; { + description = "An X cursor theme inspired by Materia design"; + homepage = "https://github.com/vinceliuice/Vimix-cursors"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ambroisie ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index 6fe0035dab6bc..bee2a13d50272 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -1,54 +1,70 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, wine -, makeBinaryWrapper -, pkg-config -, libGL -, libxkbcommon -, xorg -}: +{ + lib, + buildGoModule, + fetchFromGitHub, + makeBinaryWrapper, + pkg-config, + libGL, + libxkbcommon, + xorg, + wineWowPackages, + fetchpatch, +}: let + # wine-staging doesn't support overrideAttrs for now + wine = wineWowPackages.stagingFull.overrideDerivation (oldAttrs: { + patches = + (oldAttrs.patches or []) + ++ [ + # upstream issue: https://bugs.winehq.org/show_bug.cgi?id=55604 + # Here are the currently applied patches for Roblox to run under WINE: + (fetchpatch { + name = "vinegar-wine-segrevert.patch"; + url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/8fc153c492542a522d6cc2dff7d1af0e030a529a/patches/wine/temp.patch"; + hash = "sha256-AnEBBhB8leKP0xCSr6UsQK7CN0NDbwqhe326tJ9dDjc="; + }) + ]; + }); +in + buildGoModule rec { + pname = "vinegar"; + version = "1.5.9"; -buildGoModule rec { - pname = "vinegar"; - version = "1.5.8"; + src = fetchFromGitHub { + owner = "vinegarhq"; + repo = "vinegar"; + rev = "v${version}"; + hash = "sha256-cLzQnNmQYyAIdTGygk/CNU/mxGgcgoFTg5G/0DNwpz4="; + }; - src = fetchFromGitHub { - owner = "vinegarhq"; - repo = "vinegar"; - rev = "v${version}"; - hash = "sha256-1KDcc9Hms1hQgpvf/49zFJ85kDUsieNcoOTYaZWV+S0="; - }; + vendorHash = "sha256-DZI4APnrldnwOmLZ9ucFBGQDxzPXTIi44eLu74WrSBI="; - vendorHash = "sha256-UJLwSOJ4vZt3kquKllm5OMfFheZtAG5gLSA20313PpA="; + nativeBuildInputs = [pkg-config makeBinaryWrapper]; + buildInputs = [libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wine]; - nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; - buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wine ]; + buildPhase = '' + runHook preBuild + make PREFIX=$out + runHook postBuild + ''; - buildPhase = '' - runHook preBuild - make PREFIX=$out - runHook postBuild - ''; + installPhase = '' + runHook preInstall + make PREFIX=$out install + runHook postInstall + ''; - installPhase = '' - runHook preInstall - make PREFIX=$out install - runHook postInstall - ''; + postInstall = '' + wrapProgram $out/bin/vinegar \ + --prefix PATH : ${lib.makeBinPath [wine]} + ''; - postInstall = '' - wrapProgram $out/bin/vinegar \ - --prefix PATH : ${lib.makeBinPath [ wine ]} - ''; - - meta = with lib; { - description = "An open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux"; - homepage = "https://github.com/vinegarhq/vinegar"; - changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}"; - mainProgram = "vinegar"; - license = licenses.gpl3Only; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ nyanbinary ]; - }; -} + meta = with lib; { + description = "An open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux"; + homepage = "https://github.com/vinegarhq/vinegar"; + changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}"; + mainProgram = "vinegar"; + license = licenses.gpl3Only; + platforms = ["x86_64-linux" "i686-linux"]; + maintainers = with maintainers; [nyanbinary]; + }; + } diff --git a/pkgs/by-name/wa/wannier90/package.nix b/pkgs/by-name/wa/wannier90/package.nix new file mode 100644 index 0000000000000..9a06bc5faabf6 --- /dev/null +++ b/pkgs/by-name/wa/wannier90/package.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, gfortran +, blas +, lapack +, python3 +, fetchFromGitHub +}: +assert (!blas.isILP64); +assert blas.isILP64 == lapack.isILP64; + +stdenv.mkDerivation rec { + pname = "wannier90"; + version = "3.1.0"; + + nativeBuildInputs = [ gfortran ]; + buildInputs = [ + blas + lapack + ]; + + src = fetchFromGitHub { + owner = "wannier-developers"; + repo = "wannier90"; + rev = "v${version}"; + hash = "sha256-+Mq7lM6WuwAnK/2FlDz9gNRIg2sRazQRezb3BfD0veY="; + }; + + # test cases are removed as error bounds of wannier90 are obviously to tight + postPatch = '' + rm -r test-suite/tests/testpostw90_{fe_kpathcurv,fe_kslicecurv,si_geninterp,si_geninterp_wsdistance} + rm -r test-suite/tests/testw90_example26 # Fails without AVX optimizations + patchShebangs test-suite/run_tests test-suite/testcode/bin/testcode.py + ''; + + configurePhase = '' + cp config/make.inc.gfort make.inc + ''; + + buildFlags = [ "all" "dynlib" ]; + + preInstall = '' + installFlagsArray+=( + PREFIX=$out + ) + ''; + + postInstall = '' + cp libwannier.so $out/lib/libwannier.so + + mkdir $out/include + find ./src/obj/ -name "*.mod" -exec cp {} $out/include/. \; + ''; + + doCheck = true; + checkInputs = [ python3 ]; + checkTarget = [ "test-serial" ]; + preCheck = '' + export OMP_NUM_THREADS=4 + ''; + + enableParallelBuilding = true; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + description = "Calculation of maximally localised Wannier functions"; + homepage = "https://github.com/wannier-developers/wannier90"; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index 4b78fa9b9ce3a..8544439986ddd 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -5,12 +5,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "warp-terminal"; - version = "0.2023.11.07.08.02.stable_00"; + version = "0.2023.12.05.08.02.stable_00"; src = fetchurl { url = "https://releases.warp.dev/stable/v${finalAttrs.version}/Warp.dmg"; - hash = "sha256-oGsoIzNlrknaZtrGWT3oUEzwJIutxB1wnAvxTzF6Fis="; + hash = "sha256-9olAmczIPRXV15NYCOYmwuEmJ7lMeaQRTTfukaYXMR0="; }; + sourceRoot = "."; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/wa/waybox/package.nix b/pkgs/by-name/wa/waybox/package.nix index 3274660b07529..70ec30f50db29 100644 --- a/pkgs/by-name/wa/waybox/package.nix +++ b/pkgs/by-name/wa/waybox/package.nix @@ -5,6 +5,8 @@ , libGL , libxkbcommon , libxml2 +, libevdev +, libinput , mesa , meson , ninja @@ -19,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waybox"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "wizbright"; repo = "waybox"; rev = finalAttrs.version; - hash = "sha256-G8dRa4hgev3x58uqp5To5OzF3zcPSuT3NL9MPnWf2M8="; + hash = "sha256-hAXS9laDfigWR2pfNmdPiOeez3NpTIuKHnpeQyYa9IQ="; }; nativeBuildInputs = [ @@ -40,6 +42,8 @@ stdenv.mkDerivation (finalAttrs: { libGL libxkbcommon libxml2 + libevdev + libinput mesa # for libEGL pixman udev diff --git a/pkgs/by-name/wh/when/package.nix b/pkgs/by-name/wh/when/package.nix new file mode 100644 index 0000000000000..65fe306f447f5 --- /dev/null +++ b/pkgs/by-name/wh/when/package.nix @@ -0,0 +1,44 @@ +{ lib +, stdenvNoCC +, perl +, installShellFiles +, fetchFromBitbucket +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "when"; + version = "1.1.45"; + + src = fetchFromBitbucket { + repo = "when"; + owner = "ben-crowell"; + rev = finalAttrs.version; + hash = "sha256-+ggYjY6/aTUrdvREn0TTQ4Pu/VR4QTjflDaicRXuOMs="; + }; + + buildInputs = [ perl ]; + + nativeBuildInputs = [ installShellFiles ]; + + postBuild = '' + pod2man $src/when when.1 + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 when $out/bin/when + installManPage when.1 + + runHook postInstall + ''; + + meta = with lib; { + description = "An extremely simple personal calendar program"; + homepage = "https://www.lightandmatter.com/when/when.html"; + license = licenses.gpl2Only; + mainProgram = "when"; + maintainers = with maintainers; [ vonixxx ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 6baf519b8af04..a471148a55aa1 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.59"; + version = "2.9.61"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-2eb31qV49r8U4arj4TuA+lyi9HTBPRgmW3vR+qF6QfE="; + hash = "sha256-q1uCN+DxYNTH2riWjnllWtiSewvYb+SRG4gh4o5Wqxg="; }; - npmDepsHash = "sha256-HkBcizAao4uV+EDJc3z8P97ivMhbYr27hwY7x2jqEIc="; + npmDepsHash = "sha256-ftBJ2ZkJOMdYXRWi2APhAoxju2tOQvLpanHLv4XMjeY="; dontNpmBuild = true; diff --git a/pkgs/by-name/wi/wifi-qr/package.nix b/pkgs/by-name/wi/wifi-qr/package.nix new file mode 100644 index 0000000000000..341077edaefa9 --- /dev/null +++ b/pkgs/by-name/wi/wifi-qr/package.nix @@ -0,0 +1,86 @@ +{ lib +, fetchFromGitHub +, installShellFiles +, makeWrapper +, gnome +, ncurses +, networkmanager +, patsh +, procps +, qrencode +, stdenvNoCC +, xdg-utils +, zbar +}: +stdenvNoCC.mkDerivation { + pname = "wifi-qr"; + version = "0.3-unstable-2023-09-30"; + + outputs = [ "out" "man" ]; + + src = fetchFromGitHub { + owner = "kokoye2007"; + repo = "wifi-qr"; + rev = "821892001f735dc250a549ea36329cdc767db9c9"; + hash = "sha256-kv0qjO+wn4t//NmKkHB+tZB4eRNm+WRUa5rij+7Syuk="; + }; + + buildInputs = [ + gnome.zenity + ncurses + networkmanager + procps + qrencode + xdg-utils + zbar + ]; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + patsh + ]; + + dontBuild = true; + + dontConfigure = true; + + postPatch = '' + substituteInPlace src/wifi-qr.desktop \ + --replace "Icon=wifi-qr.svg" "Icon=wifi-qr" + substituteInPlace src/wifi-qr \ + --replace "/usr/share/doc/wifi-qr/copyright" "$out/share/doc/wifi-qr/copyright" + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 src/wifi-qr $out/bin/wifi-qr + + install -Dm644 src/wifi-qr.desktop $out/share/applications/wifi-qr.desktop + install -Dm644 src/wifi-qr.svg $out/share/icons/hicolor/scalable/apps/wifi-qr.svg + install -Dm644 src/LICENSE $out/share/doc/wifi-qr/copyright + + installManPage src/wifi-qr.1 + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + + patchShebangs $out/bin/wifi-qr + patsh -f $out/bin/wifi-qr -s ${builtins.storeDir} + + runHook postFixup + ''; + + meta = with lib; { + description = "WiFi password sharing via QR codes"; + homepage = "https://github.com/kokoye2007/wifi-qr"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ ambroisie ]; + mainProgram = "wifi-qr"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/windmill/Cargo.lock b/pkgs/by-name/wi/windmill/Cargo.lock index 155987a1ab3a3..147cd4477e5e1 100644 --- a/pkgs/servers/windmill/Cargo.lock +++ b/pkgs/by-name/wi/windmill/Cargo.lock @@ -187,6 +187,15 @@ dependencies = [ ] [[package]] +name = "argminmax" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "202108b46429b765ef483f8a24d5c46f48c14acfdacc086dd4ab6dddf6bcdbd2" +dependencies = [ + "num-traits", +] + +[[package]] name = "argon2" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -205,12 +214,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc" [[package]] +name = "array-init-cursor" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" + +[[package]] name = "arrayvec" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] +name = "arrow-format" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07884ea216994cdc32a2d5f8274a8bee979cfe90274b83f86f440866ee3132c7" +dependencies = [ + "planus", + "serde", +] + +[[package]] name = "ast_node" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -236,12 +261,12 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 3.1.0", + "event-listener 4.0.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -280,30 +305,30 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 2.8.0", + "async-lock 3.1.2", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 1.13.0", + "futures-lite 2.0.1", "slab", ] [[package]] name = "async-global-executor" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "9b4353121d5644cdf2beb5726ab752e79a8db1ebb52031770ec47db31d245526" dependencies = [ - "async-channel 1.9.0", + "async-channel 2.1.1", "async-executor", - "async-io", - "async-lock 2.8.0", + "async-io 2.2.1", + "async-lock 3.1.2", "blocking", - "futures-lite 1.13.0", + "futures-lite 2.0.1", "once_cell", ] @@ -320,7 +345,7 @@ dependencies = [ "futures-lite 1.13.0", "log", "parking", - "polling", + "polling 2.8.0", "rustix 0.37.27", "slab", "socket2 0.4.10", @@ -328,6 +353,25 @@ dependencies = [ ] [[package]] +name = "async-io" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" +dependencies = [ + "async-lock 3.1.2", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.0.1", + "parking", + "polling 3.3.1", + "rustix 0.38.26", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] name = "async-lock" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -338,11 +382,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.1.0" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb2ab2aa8a746e221ab826c73f48bc6ba41be6763f0855cb249eb6d154cf1d7" +checksum = "dea8b3453dd7cc96711834b75400d671b73e3656975fa68d9f277163b7f7e316" dependencies = [ - "event-listener 3.1.0", + "event-listener 4.0.0", "event-listener-strategy", "pin-project-lite", ] @@ -385,7 +429,7 @@ checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ "async-channel 1.9.0", "async-global-executor", - "async-io", + "async-io 1.13.0", "async-lock 2.8.0", "crossbeam-utils", "futures-channel", @@ -404,6 +448,28 @@ dependencies = [ ] [[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.39", +] + +[[package]] name = "async-stripe" version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -492,12 +558,28 @@ dependencies = [ ] [[package]] +name = "atoi_simd" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccfc14f5c3e34de57539a7ba9c18ecde3d9bbde48d232ea1da3e468adb307fd0" + +[[package]] name = "atomic-waker" version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] +name = "atomic-write-file" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" +dependencies = [ + "nix", + "rand 0.8.5", +] + +[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -505,9 +587,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aws-config" -version = "0.57.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2bf00cb9416daab4ce4927c54ebe63c08b9caf4d7b9314b6d7a4a2c5a1afb09" +checksum = "80c950a809d39bc9480207cb1cfc879ace88ea7e3a4392a8e9999e45d6e5692e" dependencies = [ "aws-credential-types", "aws-http", @@ -527,7 +609,7 @@ dependencies = [ "hex", "http", "hyper", - "ring 0.17.5", + "ring 0.17.6", "time", "tokio", "tracing", @@ -536,9 +618,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "0.57.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9073c88dbf12f68ce7d0e149f989627a1d1ae3d2b680459f04ccc29d1cbd0f" +checksum = "8c1317e1a3514b103cf7d5828bbab3b4d30f56bd22d684f8568bc51b6cfbbb1c" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -548,11 +630,10 @@ dependencies = [ [[package]] name = "aws-http" -version = "0.57.2" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24067106d09620cf02d088166cdaedeaca7146d4d499c41b37accecbea11b246" +checksum = "361c4310fdce94328cc2d1ca0c8a48c13f43009c61d3367585685a50ca8c66b6" dependencies = [ - "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", @@ -565,9 +646,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "0.57.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6ee0152c06d073602236a4e94a8c52a327d310c1ecd596570ce795af8777ff" +checksum = "1ed7ef604a15fd0d4d9e43701295161ea6b504b63c44990ead352afea2bc15e9" dependencies = [ "aws-credential-types", "aws-http", @@ -582,14 +663,14 @@ dependencies = [ "http", "percent-encoding", "tracing", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] name = "aws-sdk-s3" -version = "0.36.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf188e8af89adb0b41ae2f21b6c666c618959e40242e79aaa43fafa9c0c90a8a" +checksum = "29223b1074621f1d011bac836d995c002936663052b1e7ad02927551b17d6625" dependencies = [ "aws-credential-types", "aws-http", @@ -617,9 +698,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "0.36.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb8158015232b4596ccef74a205600398e152d704b40b7ec9f486092474d7fa" +checksum = "0619ab97a5ca8982e7de073cdc66f93e5f6a1b05afc09e696bec1cb3607cd4df" dependencies = [ "aws-credential-types", "aws-http", @@ -639,9 +720,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "0.36.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36a1493e1c57f173e53621935bfb5b6217376168dbdb4cd459aebcf645924a48" +checksum = "f04b9f5474cc0f35d829510b2ec8c21e352309b46bf9633c5a81fb9321e9b1c7" dependencies = [ "aws-credential-types", "aws-http", @@ -661,9 +742,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "0.36.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e032b77f5cd1dd3669d777a38ac08cbf8ec68e29460d4ef5d3e50cffa74ec75a" +checksum = "798c8d82203af9e15a8b406574e0b36da91dd6db533028b74676489a1bc8bc7d" dependencies = [ "aws-credential-types", "aws-http", @@ -684,26 +765,28 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "0.57.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f81a6abc4daab06b53cabf27c54189928893283093e37164ca53aa47488a5b" +checksum = "380adcc8134ad8bbdfeb2ace7626a869914ee266322965276cbc54066186d236" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", "aws-smithy-http", "aws-smithy-runtime-api", + "aws-smithy-types", "bytes", + "crypto-bigint 0.5.5", "form_urlencoded", "hex", "hmac", "http", - "num-bigint", "once_cell", "p256", "percent-encoding", "regex", - "ring 0.17.5", + "ring 0.17.6", "sha2 0.10.8", + "subtle", "time", "tracing", "zeroize", @@ -711,9 +794,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "0.57.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe53fccd3b10414b9cae63767a15a2789b34e6c6727b6e32b33e8c7998a3e80" +checksum = "3e37ca17d25fe1e210b6d4bdf59b81caebfe99f986201a1228cb5061233b4b13" dependencies = [ "futures-util", "pin-project-lite", @@ -722,9 +805,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.57.2" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb5701fbfb40600cc0fa547f318552dfd4e632b2099bd75d95fb0faae70675d" +checksum = "c5a373ec01aede3dd066ec018c1bc4e8f5dd11b2c11c59c8eef1a5c68101f397" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -743,9 +826,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.57.2" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b33fa99f928a5815b94ee07e1377901bcf51aa749034a2c802dc38f9dcfacf5" +checksum = "1c669e1e5fc0d79561bf7a122b118bd50c898758354fe2c53eb8f2d31507cbc3" dependencies = [ "aws-smithy-types", "bytes", @@ -754,9 +837,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.57.2" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7972373213d1d6e619c0edc9dda2d6634154e4ed75c5e0b2bf065cd5ec9f0d1" +checksum = "5b1de8aee22f67de467b2e3d0dd0fb30859dc53f579a63bd5381766b987db644" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -775,18 +858,18 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.57.2" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d64d5af16dd585de9ff6c606423c1aaad47c6baa38de41c2beb32ef21c6645" +checksum = "6a46dd338dc9576d6a6a5b5a19bd678dcad018ececee11cf28ecd7588bd1a55c" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.57.2" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7527bf5335154ba1b285479c50b630e44e93d1b4a759eaceb8d0bf9fbc82caa5" +checksum = "feb5b8c7a86d4b6399169670723b7e6f21a39fc833a30f5c5a2f997608178129" dependencies = [ "aws-smithy-types", "urlencoding", @@ -794,9 +877,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "0.57.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "839b363adf3b2bdab2742a1f540fec23039ea8bc9ec0f9f61df48470cfe5527b" +checksum = "273479291efc55e7b0bce985b139d86b6031adb8e50f65c1f712f20ba38f6388" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -804,6 +887,7 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand 2.0.1", + "h2", "http", "http-body", "hyper", @@ -818,9 +902,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "0.57.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24ecc446e62c3924539e7c18dec8038dba4fdf8718d5c2de62f9d2fecca8ba9" +checksum = "c6cebff0d977b6b6feed2fd07db52aac58ba3ccaf26cdd49f1af4add5061bef9" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -834,9 +918,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "0.57.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051de910296522a21178a2ea402ea59027eef4b63f1cef04a0be2bb5e25dea03" +checksum = "d7f48b3f27ddb40ab19892a5abda331f403e3cb877965e4e51171447807104af" dependencies = [ "base64-simd", "bytes", @@ -857,18 +941,18 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.57.2" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb1e3ac22c652662096c8e37a6f9af80c6f3520cab5610b2fe76c725bce18eac" +checksum = "0ec40d74a67fd395bc3f6b4ccbdf1543672622d905ef3f979689aea5b730cb95" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "0.57.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048bbf1c24cdf4eb1efcdc243388a93a90ebf63979e25fc1c7b8cbd9cb6beb38" +checksum = "8403fc56b1f3761e8efe45771ddc1165e47ec3417c68e68a4519b5cb030159ca" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -1159,8 +1243,8 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 2.1.0", - "async-lock 3.1.0", + "async-channel 2.1.1", + "async-lock 3.1.2", "async-task", "fastrand 2.0.1", "futures-io", @@ -1491,9 +1575,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.8" +version = "4.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" dependencies = [ "clap_builder", "clap_derive", @@ -1501,9 +1585,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" dependencies = [ "anstream", "anstyle", @@ -1559,6 +1643,18 @@ dependencies = [ ] [[package]] +name = "comfy-table" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" +dependencies = [ + "crossterm", + "strum", + "strum_macros", + "unicode-width", +] + +[[package]] name = "concurrent-queue" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1657,9 +1753,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -1667,9 +1763,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" @@ -1801,6 +1897,28 @@ dependencies = [ ] [[package]] +name = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.4.1", + "crossterm_winapi", + "libc", + "parking_lot 0.12.1", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] name = "crunchy" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1819,6 +1937,16 @@ dependencies = [ ] [[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1905,7 +2033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core 0.9.9", @@ -1913,9 +2041,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "data-url" @@ -1925,9 +2053,9 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] name = "data-url" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "debug-helper" @@ -1942,7 +2070,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] @@ -2063,7 +2191,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a798670c20308e5770cc0775de821424ff9e85665b602928509c8c70430b3ee0" dependencies = [ - "data-url 0.3.0", + "data-url 0.3.1", "serde", "url", ] @@ -2129,7 +2257,7 @@ dependencies = [ "flate2", "serde", "tokio", - "uuid 1.5.0", + "uuid 1.6.1", "windows-sys 0.48.0", ] @@ -2313,6 +2441,12 @@ dependencies = [ ] [[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] name = "dotenv" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2390,7 +2524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", - "crypto-bigint", + "crypto-bigint 0.4.9", "der 0.6.1", "digest 0.10.7", "ff", @@ -2495,6 +2629,18 @@ dependencies = [ ] [[package]] +name = "enum_dispatch" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "enumflags2" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2522,12 +2668,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2551,6 +2697,12 @@ dependencies = [ ] [[package]] +name = "ethnum" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c" + +[[package]] name = "event-listener" version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2558,9 +2710,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" dependencies = [ "concurrent-queue", "parking", @@ -2569,11 +2721,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 3.1.0", + "event-listener 4.0.0", "pin-project-lite", ] @@ -2584,6 +2736,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fast-float" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" + +[[package]] name = "fastrand" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2671,10 +2835,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] +name = "foreign_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee1b05cbd864bcaecbd3455d6d967862d446e4ebfc3c2e5e5b9841e53cba6673" + +[[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -2850,7 +3020,11 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" dependencies = [ + "fastrand 2.0.1", "futures-core", + "futures-io", + "memchr", + "parking", "pin-project-lite", ] @@ -3092,9 +3266,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "git-version" @@ -3149,9 +3323,9 @@ dependencies = [ [[package]] name = "gosyn" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c003b8c167a1abb8b170baacf075dcdac2aaf5732bc94fead3d6ce429df7aa8" +checksum = "099e29e0cf77a5b706f9e05e425cfeeed0debb2ee6c74c2c86bd9b17178bf8e0" dependencies = [ "anyhow", "strum", @@ -3223,12 +3397,13 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash 0.8.6", "allocator-api2", + "rayon", ] [[package]] @@ -3237,7 +3412,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -3391,6 +3566,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] name = "hyper" version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3474,9 +3655,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -3506,7 +3687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -3623,6 +3804,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] +name = "itoap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" + +[[package]] name = "jobserver" version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3633,9 +3820,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -3778,9 +3965,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "pkg-config", @@ -3828,9 +4015,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" @@ -3863,11 +4050,31 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" +checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", +] + +[[package]] +name = "lz4" +version = "1.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" +dependencies = [ + "libc", + "lz4-sys", +] + +[[package]] +name = "lz4-sys" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +dependencies = [ + "cc", + "libc", ] [[package]] @@ -3936,7 +4143,7 @@ dependencies = [ "smtp-proto", "tokio", "tokio-rustls 0.24.1", - "webpki-roots 0.25.2", + "webpki-roots 0.25.3", ] [[package]] @@ -4127,6 +4334,28 @@ dependencies = [ ] [[package]] +name = "multiversion" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2c7b9d7fe61760ce5ea19532ead98541f6b4c495d87247aff9826445cf6872a" +dependencies = [ + "multiversion-macros", + "target-features", +] + +[[package]] +name = "multiversion-macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26a83d8500ed06d68877e9de1dde76c1dbb83885dcdbda4ef44ccbc3fbda2ac8" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "target-features", +] + +[[package]] name = "mysql-common-derive" version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4213,7 +4442,7 @@ dependencies = [ "subprocess", "thiserror", "time", - "uuid 1.5.0", + "uuid 1.6.1", "zstd 0.12.4", ] @@ -4263,6 +4492,24 @@ dependencies = [ ] [[package]] +name = "now" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d89e9874397a1f0a52fc1f197a8effd9735223cb2390e9dcc83ac6cd02923d0" +dependencies = [ + "chrono", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] name = "nu-ansi-term" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4369,6 +4616,35 @@ dependencies = [ ] [[package]] +name = "object_store" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2524735495ea1268be33d200e1ee97455096a0846295a21548cd2f3541de7050" +dependencies = [ + "async-trait", + "base64 0.21.5", + "bytes", + "chrono", + "futures", + "humantime", + "hyper", + "itertools 0.11.0", + "parking_lot 0.12.1", + "percent-encoding", + "quick-xml 0.31.0", + "rand 0.8.5", + "reqwest", + "ring 0.17.6", + "serde", + "serde_json", + "snafu", + "tokio", + "tracing", + "url", + "walkdir", +] + +[[package]] name = "once_cell" version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4415,9 +4691,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.59" +version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" +checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -4447,9 +4723,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.95" +version = "0.9.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" +checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" dependencies = [ "cc", "libc", @@ -4541,6 +4817,16 @@ dependencies = [ ] [[package]] +name = "parquet-format-safe" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1131c54b167dd4e4799ce762e1ab01549ebb94d5bdd13e6ec1b467491c378e1f" +dependencies = [ + "async-trait", + "futures", +] + +[[package]] name = "parse-zoneinfo" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4640,9 +4926,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pg-embed" @@ -4822,7 +5108,7 @@ checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ "der 0.7.8", "pkcs8 0.10.2", - "spki 0.7.2", + "spki 0.7.3", ] [[package]] @@ -4842,7 +5128,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der 0.7.8", - "spki 0.7.2", + "spki 0.7.3", ] [[package]] @@ -4852,6 +5138,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] +name = "planus" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1691dd09e82f428ce8d6310bd6d5da2557c82ff17694d2a32cad7242aea89f" +dependencies = [ + "array-init-cursor", +] + +[[package]] name = "pmutil" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4874,6 +5169,330 @@ dependencies = [ ] [[package]] +name = "polars" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8e52f9236eb722da0990a70bbb1216dcc7a77bcb00c63439d2d982823e90d5" +dependencies = [ + "getrandom 0.2.11", + "polars-core", + "polars-io", + "polars-lazy", + "polars-ops", + "polars-sql", + "polars-time", + "version_check", +] + +[[package]] +name = "polars-arrow" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd503430a6d9779b07915d858865fe998317ef3cfef8973881f578ac5d4baae7" +dependencies = [ + "ahash 0.8.6", + "arrow-format", + "atoi 2.0.0", + "atoi_simd", + "bytemuck", + "chrono", + "dyn-clone", + "either", + "ethnum", + "fast-float", + "foreign_vec", + "futures", + "getrandom 0.2.11", + "hashbrown 0.14.3", + "itoa", + "lz4", + "multiversion", + "num-traits", + "polars-error", + "polars-utils", + "rustc_version 0.4.0", + "ryu", + "simdutf8", + "streaming-iterator", + "strength_reduce", + "zstd 0.13.0", +] + +[[package]] +name = "polars-core" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae73d5b8e55decde670caba1cc82b61f14bfb9a72503198f0997d657a98dcfd6" +dependencies = [ + "ahash 0.8.6", + "bitflags 2.4.1", + "bytemuck", + "chrono", + "comfy-table", + "either", + "hashbrown 0.14.3", + "indexmap 2.1.0", + "itoap", + "num-traits", + "once_cell", + "polars-arrow", + "polars-error", + "polars-row", + "polars-utils", + "rand 0.8.5", + "rand_distr", + "rayon", + "regex", + "smartstring", + "thiserror", + "version_check", + "xxhash-rust", +] + +[[package]] +name = "polars-error" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb0520d68eaa9993ae0c741409d1526beff5b8f48e1d73e4381616f8152cf488" +dependencies = [ + "arrow-format", + "object_store", + "regex", + "simdutf8", + "thiserror", +] + +[[package]] +name = "polars-io" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96e10a0745acd6009db64bef0ceb9e23a70b1c27b26a0a6517c91f3e6363bc06" +dependencies = [ + "ahash 0.8.6", + "async-trait", + "atoi_simd", + "bytes", + "chrono", + "fast-float", + "flate2", + "futures", + "home", + "itoa", + "memchr", + "memmap2", + "num-traits", + "object_store", + "once_cell", + "percent-encoding", + "polars-arrow", + "polars-core", + "polars-error", + "polars-parquet", + "polars-time", + "polars-utils", + "rayon", + "regex", + "reqwest", + "ryu", + "simdutf8", + "smartstring", + "tokio", + "tokio-util", + "url", + "zstd 0.13.0", +] + +[[package]] +name = "polars-lazy" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3555f759705be6dd0d3762d16a0b8787b2dc4da73b57465f3b2bf1a070ba8f20" +dependencies = [ + "ahash 0.8.6", + "bitflags 2.4.1", + "futures", + "glob", + "once_cell", + "polars-arrow", + "polars-core", + "polars-io", + "polars-ops", + "polars-pipe", + "polars-plan", + "polars-time", + "polars-utils", + "rayon", + "smartstring", + "tokio", + "version_check", +] + +[[package]] +name = "polars-ops" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a7eb218296aaa7f79945f08288ca32ca3cf25fa505649eeee689ec21eebf636" +dependencies = [ + "ahash 0.8.6", + "argminmax", + "bytemuck", + "either", + "hashbrown 0.14.3", + "indexmap 2.1.0", + "memchr", + "num-traits", + "polars-arrow", + "polars-core", + "polars-error", + "polars-utils", + "rayon", + "regex", + "smartstring", + "version_check", +] + +[[package]] +name = "polars-parquet" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146010e4b7dd4d2d0e58ddc762f6361f77d7a0385c54471199370c17164f67dd" +dependencies = [ + "ahash 0.8.6", + "async-stream", + "base64 0.21.5", + "brotli", + "ethnum", + "flate2", + "futures", + "lz4", + "num-traits", + "parquet-format-safe", + "polars-arrow", + "polars-error", + "polars-utils", + "seq-macro", + "simdutf8", + "snap", + "streaming-decompression", + "zstd 0.13.0", +] + +[[package]] +name = "polars-pipe" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66094e7df64c932a9a7bdfe7df0c65efdcb192096e11a6a765a9778f78b4bdec" +dependencies = [ + "crossbeam-channel", + "crossbeam-queue", + "enum_dispatch", + "futures", + "hashbrown 0.14.3", + "num-traits", + "polars-arrow", + "polars-core", + "polars-io", + "polars-ops", + "polars-plan", + "polars-row", + "polars-utils", + "rayon", + "smartstring", + "tokio", + "version_check", +] + +[[package]] +name = "polars-plan" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10e32a0958ef854b132bad7f8369cb3237254635d5e864c99505bc0bc1035fbc" +dependencies = [ + "ahash 0.8.6", + "bytemuck", + "once_cell", + "percent-encoding", + "polars-arrow", + "polars-core", + "polars-io", + "polars-ops", + "polars-parquet", + "polars-time", + "polars-utils", + "rayon", + "regex", + "smartstring", + "strum_macros", + "version_check", +] + +[[package]] +name = "polars-row" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135ab81cac2906ba74ea8984c7e6025d081ae5867615bcefb4d84dfdb456dac" +dependencies = [ + "polars-arrow", + "polars-error", + "polars-utils", +] + +[[package]] +name = "polars-sql" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dbd7786849a5e3ad1fde188bf38141632f626e3a57319b0bbf7a5f1d75519e" +dependencies = [ + "polars-arrow", + "polars-core", + "polars-error", + "polars-lazy", + "polars-plan", + "rand 0.8.5", + "serde", + "serde_json", + "sqlparser", +] + +[[package]] +name = "polars-time" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae56f79e9cedd617773c1c8f5ca84a31a8b1d593714959d5f799e7bdd98fe51" +dependencies = [ + "atoi 2.0.0", + "chrono", + "now", + "once_cell", + "polars-arrow", + "polars-core", + "polars-error", + "polars-ops", + "polars-utils", + "regex", + "smartstring", +] + +[[package]] +name = "polars-utils" +version = "0.35.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da6ce68169fe61d46958c8eab7447360f30f2f23f6e24a0ce703a14b0a3cfbfc" +dependencies = [ + "ahash 0.8.6", + "bytemuck", + "hashbrown 0.14.3", + "indexmap 2.1.0", + "num-traits", + "once_cell", + "polars-error", + "rayon", + "smartstring", + "sysinfo", + "version_check", +] + +[[package]] name = "polling" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4890,6 +5509,20 @@ dependencies = [ ] [[package]] +name = "polling" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.26", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] name = "portable-atomic" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4953,7 +5586,7 @@ dependencies = [ "postgres-protocol", "serde", "serde_json", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] @@ -5051,9 +5684,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -5213,9 +5846,9 @@ dependencies = [ [[package]] name = "pulp" -version = "0.18.4" +version = "0.18.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7057c1435edb390ebfc51743abad043377f1f698ce8e649a9b52a4b378be5e4d" +checksum = "16785ee69419641c75affff7c9fdbdb7c0ab26dc9a5fb5218c2a2e9e4ef2087d" dependencies = [ "bytemuck", "libm", @@ -5234,6 +5867,16 @@ dependencies = [ ] [[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", + "serde", +] + +[[package]] name = "quick_cache" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5241,7 +5884,7 @@ checksum = "f69f8d22fa3f34f3083d9a4375c038732c7a7e964de1beb81c544da92dfc40b8" dependencies = [ "ahash 0.8.6", "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "parking_lot 0.12.1", ] @@ -5565,7 +6208,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots 0.25.3", "winreg", ] @@ -5575,7 +6218,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ - "crypto-bigint", + "crypto-bigint 0.4.9", "hmac", "zeroize", ] @@ -5603,9 +6246,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "684d5e6e18f669ccebf64a92236bb7db9a34f07be010e3627368182027180866" dependencies = [ "cc", "getrandom 0.2.11", @@ -5629,7 +6272,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] @@ -5666,9 +6309,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" +checksum = "af6c4b23d99685a1408194da11270ef8e9809aff951cc70ec9b17350b087e474" dependencies = [ "const-oid", "digest 0.10.7", @@ -5679,7 +6322,7 @@ dependencies = [ "pkcs8 0.10.2", "rand_core 0.6.4", "signature 2.2.0", - "spki 0.7.2", + "spki 0.7.3", "subtle", "zeroize", ] @@ -5809,15 +6452,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.24" +version = "0.38.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" +checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.11", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", ] [[package]] @@ -5839,7 +6482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "log", - "ring 0.17.5", + "ring 0.17.6", "rustls-webpki", "sct", ] @@ -5871,7 +6514,7 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.5", + "ring 0.17.6", "untrusted 0.9.0", ] @@ -5973,12 +6616,12 @@ dependencies = [ "openssl-probe", "openssl-sys", "pkg-config", - "quick-xml", + "quick-xml 0.28.2", "rand 0.8.5", "serde", "thiserror", "url", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] @@ -6016,7 +6659,7 @@ dependencies = [ "schemars_derive", "serde", "serde_json", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] @@ -6049,7 +6692,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.5", + "ring 0.17.6", "untrusted 0.9.0", ] @@ -6128,9 +6771,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -6168,9 +6811,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", @@ -6476,6 +7119,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4b756ac662e92a0e5b360349bea5f0b0784d4be4541eff2972049dfdfd7f862" [[package]] +name = "snafu" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +dependencies = [ + "doc-comment", + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "snap" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6544,9 +7209,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der 0.7.8", @@ -6586,6 +7251,15 @@ dependencies = [ ] [[package]] +name = "sqlparser" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7" +dependencies = [ + "log", +] + +[[package]] name = "sqlx" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6597,12 +7271,12 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" +checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" dependencies = [ - "sqlx-core 0.7.2", - "sqlx-macros 0.7.2", + "sqlx-core 0.7.3", + "sqlx-macros 0.7.3", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", @@ -6663,9 +7337,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" +checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" dependencies = [ "ahash 0.8.6", "atoi 2.0.0", @@ -6703,8 +7377,8 @@ dependencies = [ "tokio-stream", "tracing", "url", - "uuid 1.5.0", - "webpki-roots 0.24.0", + "uuid 1.6.1", + "webpki-roots 0.25.3", ] [[package]] @@ -6728,23 +7402,24 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" +checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" dependencies = [ "proc-macro2", "quote", - "sqlx-core 0.7.2", + "sqlx-core 0.7.3", "sqlx-macros-core", "syn 1.0.109", ] [[package]] name = "sqlx-macros-core" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" +checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" dependencies = [ + "atomic-write-file", "dotenvy", "either", "heck", @@ -6755,7 +7430,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx-core 0.7.2", + "sqlx-core 0.7.3", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", @@ -6767,9 +7442,9 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" +checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" dependencies = [ "atoi 2.0.0", "base64 0.21.5", @@ -6797,24 +7472,24 @@ dependencies = [ "once_cell", "percent-encoding", "rand 0.8.5", - "rsa 0.9.3", + "rsa 0.9.5", "serde", "sha1", "sha2 0.10.8", "smallvec", - "sqlx-core 0.7.2", + "sqlx-core 0.7.3", "stringprep", "thiserror", "tracing", - "uuid 1.5.0", + "uuid 1.6.1", "whoami", ] [[package]] name = "sqlx-postgres" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" +checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" dependencies = [ "atoi 2.0.0", "base64 0.21.5", @@ -6845,11 +7520,11 @@ dependencies = [ "sha1", "sha2 0.10.8", "smallvec", - "sqlx-core 0.7.2", + "sqlx-core 0.7.3", "stringprep", "thiserror", "tracing", - "uuid 1.5.0", + "uuid 1.6.1", "whoami", ] @@ -6866,9 +7541,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" +checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" dependencies = [ "atoi 2.0.0", "chrono", @@ -6882,10 +7557,11 @@ dependencies = [ "log", "percent-encoding", "serde", - "sqlx-core 0.7.2", + "sqlx-core 0.7.3", "tracing", "url", - "uuid 1.5.0", + "urlencoding", + "uuid 1.6.1", ] [[package]] @@ -6914,6 +7590,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] +name = "streaming-decompression" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf6cc3b19bfb128a8ad11026086e31d3ce9ad23f8ea37354b31383a187c44cf3" +dependencies = [ + "fallible-streaming-iterator", +] + +[[package]] +name = "streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" + +[[package]] +name = "strength_reduce" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" + +[[package]] name = "string_cache" version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7398,6 +8095,20 @@ dependencies = [ ] [[package]] +name = "sysinfo" +version = "0.29.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "winapi", +] + +[[package]] name = "system-configuration" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7436,6 +8147,12 @@ dependencies = [ ] [[package]] +name = "target-features" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb5fa503293557c5158bd215fdc225695e567a77e453f5d4452a50a193969bd" + +[[package]] name = "tempfile" version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7444,7 +8161,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.4.1", - "rustix 0.38.24", + "rustix 0.38.26", "windows-sys 0.48.0", ] @@ -7521,7 +8238,7 @@ dependencies = [ "tokio-rustls 0.23.4", "tokio-util", "tracing", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] @@ -8065,9 +8782,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f" +checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" dependencies = [ "serde", "stable_deref_trait", @@ -8153,7 +8870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" dependencies = [ "rand 0.8.5", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] @@ -8315,9 +9032,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" dependencies = [ "base64 0.21.5", "flate2", @@ -8329,14 +9046,14 @@ dependencies = [ "serde", "serde_json", "url", - "webpki-roots 0.25.2", + "webpki-roots 0.25.3", ] [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -8380,9 +9097,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ "getrandom 0.2.11", "serde", @@ -8469,9 +9186,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -8479,9 +9196,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", @@ -8494,9 +9211,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -8506,9 +9223,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -8516,9 +9233,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", @@ -8529,15 +9246,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-bindgen-test" -version = "0.3.38" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6433b7c56db97397842c46b67e11873eda263170afeb3a2dc74a7cb370fee0d" +checksum = "2cf9242c0d27999b831eae4767b2a146feb0b27d332d553e605864acd2afd403" dependencies = [ "console_error_panic_hook", "js-sys", @@ -8549,9 +9266,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.38" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "493fcbab756bb764fa37e6bee8cec2dd709eb4273d06d0c282a5e74275ded735" +checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89" dependencies = [ "proc-macro2", "quote", @@ -8582,9 +9299,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -8596,7 +9313,7 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.5", + "ring 0.17.6", "untrusted 0.9.0", ] @@ -8611,18 +9328,9 @@ 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 = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "which" @@ -8633,7 +9341,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.24", + "rustix 0.38.26", ] [[package]] @@ -8679,7 +9387,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windmill" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "axum", @@ -8699,12 +9407,12 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx 0.7.2", + "sqlx 0.7.3", "tokio", "tokio-metrics", "tracing", "url", - "uuid 1.5.0", + "uuid 1.6.1", "windmill-api", "windmill-api-client", "windmill-common", @@ -8714,7 +9422,7 @@ dependencies = [ [[package]] name = "windmill-api" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "argon2", @@ -8745,6 +9453,9 @@ dependencies = [ "magic-crypt", "mail-send", "mime_guess", + "object_store", + "polars", + "polars-io", "prometheus", "quick_cache", "rand 0.8.5", @@ -8759,7 +9470,7 @@ dependencies = [ "serde_urlencoded", "sha2 0.10.8", "sql-builder", - "sqlx 0.7.2", + "sqlx 0.7.3", "tempfile", "time", "tinyvector", @@ -8773,7 +9484,7 @@ dependencies = [ "tracing", "tracing-subscriber", "urlencoding", - "uuid 1.5.0", + "uuid 1.6.1", "windmill-audit", "windmill-common", "windmill-parser", @@ -8783,7 +9494,7 @@ dependencies = [ [[package]] name = "windmill-api-client" -version = "1.210.1" +version = "1.219.1" dependencies = [ "base64 0.21.5", "chrono", @@ -8796,25 +9507,25 @@ dependencies = [ "serde", "serde_json", "syn 1.0.109", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] name = "windmill-audit" -version = "1.210.1" +version = "1.219.1" dependencies = [ "chrono", "serde", "serde_json", "sql-builder", - "sqlx 0.7.2", + "sqlx 0.7.3", "tracing", "windmill-common", ] [[package]] name = "windmill-common" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "axum", @@ -8833,19 +9544,19 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx 0.7.2", + "sqlx 0.7.3", "thiserror", "tokio", "tracing", "tracing-flame", "tracing-loki", "tracing-subscriber", - "uuid 1.5.0", + "uuid 1.6.1", ] [[package]] name = "windmill-parser" -version = "1.210.1" +version = "1.219.1" dependencies = [ "serde", "serde_json", @@ -8853,7 +9564,7 @@ dependencies = [ [[package]] name = "windmill-parser-bash" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "lazy_static", @@ -8864,7 +9575,7 @@ dependencies = [ [[package]] name = "windmill-parser-go" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "gosyn", @@ -8876,7 +9587,7 @@ dependencies = [ [[package]] name = "windmill-parser-graphql" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "lazy_static", @@ -8887,7 +9598,7 @@ dependencies = [ [[package]] name = "windmill-parser-py" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "itertools 0.12.0", @@ -8898,7 +9609,7 @@ dependencies = [ [[package]] name = "windmill-parser-py-imports" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "async-recursion", @@ -8908,14 +9619,14 @@ dependencies = [ "regex", "rustpython-parser", "serde_json", - "sqlx 0.7.2", + "sqlx 0.7.3", "windmill-common", "windmill-parser", ] [[package]] name = "windmill-parser-sql" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "lazy_static", @@ -8926,7 +9637,7 @@ dependencies = [ [[package]] name = "windmill-parser-ts" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -8943,7 +9654,7 @@ dependencies = [ [[package]] name = "windmill-parser-wasm" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "getrandom 0.2.11", @@ -8961,7 +9672,7 @@ dependencies = [ [[package]] name = "windmill-queue" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "async-recursion", @@ -8980,19 +9691,20 @@ dependencies = [ "rsmq_async", "serde", "serde_json", + "serde_urlencoded", "sql-builder", - "sqlx 0.7.2", + "sqlx 0.7.3", "tokio", "tracing", "ulid", - "uuid 1.5.0", + "uuid 1.6.1", "windmill-audit", "windmill-common", ] [[package]] name = "windmill-worker" -version = "1.210.1" +version = "1.219.1" dependencies = [ "anyhow", "async-recursion", @@ -9004,6 +9716,7 @@ dependencies = [ "deno_console", "deno_core", "deno_fetch", + "deno_tls", "deno_url", "deno_web", "deno_webidl", @@ -9031,14 +9744,14 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx 0.7.2", + "sqlx 0.7.3", "tiberius", "tokio", "tokio-postgres", "tokio-util", "tracing", "urlencoding", - "uuid 1.5.0", + "uuid 1.6.1", "windmill-audit", "windmill-common", "windmill-parser", @@ -9080,6 +9793,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9110,6 +9832,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9122,6 +9859,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9134,6 +9877,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9146,6 +9895,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9158,6 +9913,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9170,6 +9931,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9182,6 +9949,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9194,6 +9967,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9237,6 +10016,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] +name = "xxhash-rust" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" + +[[package]] name = "xz2" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9271,18 +10056,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.26" +version = "0.7.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +checksum = "7d6f15f7ade05d2a4935e34a457b936c23dc70a05cc1d97133dc99e7a3fe0f0e" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.26" +version = "0.7.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +checksum = "dbbad221e3f78500350ecbd7dfa4e63ef945c05f4c61cb7f4d3f84cd0bba649b" dependencies = [ "proc-macro2", "quote", @@ -9355,6 +10140,15 @@ dependencies = [ ] [[package]] +name = "zstd" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +dependencies = [ + "zstd-safe 7.0.0", +] + +[[package]] name = "zstd-safe" version = "5.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9375,6 +10169,15 @@ dependencies = [ ] [[package]] +name = "zstd-safe" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +dependencies = [ + "zstd-sys", +] + +[[package]] name = "zstd-sys" version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/servers/windmill/default.nix b/pkgs/by-name/wi/windmill/package.nix index d40ec9f4f0cf2..6a1f9e771f7e4 100644 --- a/pkgs/servers/windmill/default.nix +++ b/pkgs/by-name/wi/windmill/package.nix @@ -24,26 +24,25 @@ let pname = "windmill"; - version = "1.210.1"; + version = "1.219.1"; - fullSrc = fetchFromGitHub { + src = fetchFromGitHub { owner = "windmill-labs"; repo = "windmill"; rev = "v${version}"; - hash = "sha256-ss3EsIqfuctPOEdI5IQtyFFcDzIqnFm6UUG1vA+OlkQ="; + hash = "sha256-HGZuIun9PWi3Fv/kX95k4xnXu1L604teWUKXzjVXKF0="; }; pythonEnv = python3.withPackages (ps: [ ps.pip-tools ]); frontend-build = buildNpmPackage { - inherit version; + inherit version src; pname = "windmill-ui"; - src = fullSrc; - sourceRoot = "${fullSrc.name}/frontend"; + sourceRoot = "${src.name}/frontend"; - npmDepsHash = "sha256-l9MRaa6TaBg9vFoVuIGZNC9jLS29TlWeSniIBRNDRgU="; + npmDepsHash = "sha256-1uya/4FjMHTDW/KX1YinhTT/Mb7bJ9XVTWc6cU0oqJ8="; # without these you get a # FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory @@ -64,7 +63,7 @@ let in rustPlatform.buildRustPackage { inherit pname version; - src = "${fullSrc}/backend"; + src = "${src}/backend"; env = { SQLX_OFFLINE = "true"; @@ -92,10 +91,10 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "progenitor-0.3.0" = "sha256-F6XRZFVIN6/HfcM8yI/PyNke45FL7jbcznIiqj22eIQ="; - "tinyvector-0.1.0" = "sha256-NYGhofU4rh+2IAM+zwe04YQdXY8Aa4gTmn2V2HtzRfI="; "archiver-rs-0.5.1" = "sha256-ZIik0mMABmhdx/ullgbOrKH5GAtqcOKq5A6vB7aBSjk="; "pg-embed-0.7.2" = "sha256-R/SrlzNK7aAOyXVTQ/WPkiQb6FyMg9tpsmPTsiossDY="; + "progenitor-0.3.0" = "sha256-F6XRZFVIN6/HfcM8yI/PyNke45FL7jbcznIiqj22eIQ="; + "tinyvector-0.1.0" = "sha256-NYGhofU4rh+2IAM+zwe04YQdXY8Aa4gTmn2V2HtzRfI="; }; }; @@ -115,6 +114,14 @@ rustPlatform.buildRustPackage { substituteInPlace src/main.rs \ --replace 'unknown-version' 'v${version}' + + pushd .. + + mkdir -p frontend/build + cp -R ${frontend-build}/share/windmill-frontend/* frontend/build + cp ${src}/openflow.openapi.yaml . + + popd ''; buildInputs = [ @@ -131,17 +138,6 @@ rustPlatform.buildRustPackage { cmake # for libz-ng-sys crate ]; - preBuild = '' - pushd .. - - mkdir -p frontend/build - - cp -R ${frontend-build}/share/windmill-frontend/* frontend/build - cp ${fullSrc}/openflow.openapi.yaml . - - popd - ''; - # needs a postgres database running doCheck = false; @@ -150,7 +146,7 @@ rustPlatform.buildRustPackage { wrapProgram "$out/bin/windmill" \ --prefix PATH : ${lib.makeBinPath [go pythonEnv deno nsjail bash]} \ - --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc.lib}/lib" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [stdenv.cc.cc.lib]} \ --set PYTHON_PATH "${pythonEnv}/bin/python3" \ --set GO_PATH "${go}/bin/go" \ --set DENO_PATH "${deno}/bin/deno" \ @@ -158,7 +154,7 @@ rustPlatform.buildRustPackage { ''; meta = { - changelog = "https://github.com/windmill-labs/windmill/blob/${fullSrc.rev}/CHANGELOG.md"; + changelog = "https://github.com/windmill-labs/windmill/blob/${src.rev}/CHANGELOG.md"; description = "Open-source developer platform to turn scripts into workflows and UIs"; homepage = "https://windmill.dev"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/windmill/run.bash.config.proto.patch b/pkgs/by-name/wi/windmill/run.bash.config.proto.patch index 874fe0607ee70..874fe0607ee70 100644 --- a/pkgs/servers/windmill/run.bash.config.proto.patch +++ b/pkgs/by-name/wi/windmill/run.bash.config.proto.patch diff --git a/pkgs/servers/windmill/run.go.config.proto.patch b/pkgs/by-name/wi/windmill/run.go.config.proto.patch index a5e3b68b07d7c..a5e3b68b07d7c 100644 --- a/pkgs/servers/windmill/run.go.config.proto.patch +++ b/pkgs/by-name/wi/windmill/run.go.config.proto.patch diff --git a/pkgs/servers/windmill/run.python3.config.proto.patch b/pkgs/by-name/wi/windmill/run.python3.config.proto.patch index 85e87d7b34330..85e87d7b34330 100644 --- a/pkgs/servers/windmill/run.python3.config.proto.patch +++ b/pkgs/by-name/wi/windmill/run.python3.config.proto.patch diff --git a/pkgs/servers/windmill/swagger-cli.patch b/pkgs/by-name/wi/windmill/swagger-cli.patch index 61b92db48072c..61b92db48072c 100644 --- a/pkgs/servers/windmill/swagger-cli.patch +++ b/pkgs/by-name/wi/windmill/swagger-cli.patch diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix index 73255a38208b8..e8378f2fc5606 100644 --- a/pkgs/by-name/wi/wio/package.nix +++ b/pkgs/by-name/wi/wio/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wio"; - version = "unstable-2023-05-28"; + version = "unstable-2023-11-23"; src = fetchFromGitHub { owner = "Rubo3"; repo = "wio"; - rev = "9d33d60839d3005ee16b5b04ae7f42c049939058"; - hash = "sha256-ylJ8VHQU4TWLrhxGRo6HHOB7RWTVAThMQRw0uAFboNE="; + rev = "77c33b555589068350078d634a256a8fbb7ffe6b"; + hash = "sha256-Wff8RPHfmgPYJ3cO0h5onHtWIvOYDqLjvF1O4uODuCY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wl/wl-gammarelay-rs/package.nix b/pkgs/by-name/wl/wl-gammarelay-rs/package.nix new file mode 100644 index 0000000000000..b406e1466408d --- /dev/null +++ b/pkgs/by-name/wl/wl-gammarelay-rs/package.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "wl-gammarelay-rs"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "MaxVerevkin"; + repo = "wl-gammarelay-rs"; + rev = "v${version}"; + hash = "sha256-md6e9nRCs6TZarwFD3/GQEoJSIhtdq++rIZTP7Vl0wQ="; + }; + + cargoHash = "sha256-TDP5RC7B7/ldpK22WsmXd6fSl2rHtvG0hP9NYzoEVYo="; + + meta = { + description = "A simple program that provides DBus interface to control display temperature and brightness under wayland without flickering"; + homepage = "https://github.com/MaxVerevkin/wl-gammarelay-rs"; + license = lib.licenses.gpl3Plus; + mainProgram = "wl-gammarelay-rs"; + maintainers = with lib.maintainers; [quantenzitrone]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/arcan/xarcan/default.nix b/pkgs/by-name/xa/xarcan/package.nix index b979b64a06c5b..fb43766e72077 100644 --- a/pkgs/desktops/arcan/xarcan/default.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation (finalPackages: { pname = "xarcan"; - version = "unstable-2022-06-14"; + version = "unstable-2023-11-03"; src = fetchFromGitHub { owner = "letoram"; repo = "xarcan"; - rev = "02111f4925453c0c545e9193c6a5e22c0d4e98c3"; - hash = "sha256-rp2sNRbv0OZdfyqZfsv/v3TGQY5uyXWqbvlmUDd7iBk="; + rev = "380ea856307f593535dfc8b23799938db69e31b0"; + hash = "sha256-RdizezCbJylQDkOmUdqL0lBTNLsjyvo+lKAjfZXTXf4="; }; nativeBuildInputs = [ @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalPackages: { "--with-xkb-path=${xkeyboard_config}/share/X11/xkb" ]; - meta = with lib; { + meta = { homepage = "https://github.com/letoram/letoram"; description = "Patched Xserver that bridges connections to Arcan"; longDescription = '' @@ -112,8 +112,8 @@ stdenv.mkDerivation (finalPackages: { arcan-shmif to map Xlib/Xcb/X clients to a running arcan instance. It allows running an X session as a window under Arcan. ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock new file mode 100644 index 0000000000000..accafaf77a08b --- /dev/null +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/Cargo.lock @@ -0,0 +1,2754 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +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.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "annotate-snippets" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" +dependencies = [ + "unicode-width", + "yansi-term", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "ashpd" +version = "0.7.0" +source = "git+https://github.com/bilelmoussaoui/ashpd#8b7fb6d993112edcda379ab187968256f2eba690" +dependencies = [ + "async-std", + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "url", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +dependencies = [ + "concurrent-queue", + "event-listener 4.0.0", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +dependencies = [ + "async-lock 3.2.0", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite 2.1.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-global-executor" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4353121d5644cdf2beb5726ab752e79a8db1ebb52031770ec47db31d245526" +dependencies = [ + "async-channel 2.1.1", + "async-executor", + "async-io 2.2.1", + "async-lock 3.2.0", + "blocking", + "futures-lite 2.1.0", + "once_cell", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" +dependencies = [ + "async-lock 3.2.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.1.0", + "parking", + "polling 3.3.1", + "rustix 0.38.26", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.0", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.26", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.2.1", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.26", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel 1.9.0", + "async-global-executor", + "async-io 1.13.0", + "async-lock 2.8.0", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite 1.13.0", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-task" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.1.0" +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 = "bindgen" +version = "0.68.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +dependencies = [ + "annotate-snippets", + "bitflags 2.4.1", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.39", +] + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[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 = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel 2.1.1", + "async-lock 3.2.0", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.1.0", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" +dependencies = [ + "bitflags 2.4.1", + "log", + "polling 3.3.1", + "rustix 0.38.26", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.26", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-expr" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading 0.7.4", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie-factory" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" + +[[package]] +name = "cosmic-client-toolkit" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols#c1b651630c2b71cd8dfd2eb4ab47ede9dbd63840" +dependencies = [ + "cosmic-protocols", + "smithay-client-toolkit", + "wayland-client", +] + +[[package]] +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols#c1b651630c2b71cd8dfd2eb4ab47ede9dbd63840" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +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-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[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 = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "drm" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e58eefd79f5173683872c0c82d0f05c2dc3c583d631259f60bb7a323756b7ff2" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "rustix 0.38.26", +] + +[[package]] +name = "drm-ffi" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "220dd8c12ebf2b0cbaffa19e00de02f5f090d363fb900f16ea012c077eea1174" +dependencies = [ + "drm-sys", + "rustix 0.38.26", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5115283ec60c99da8a9e5dc3c55f27680211e974c948cb6f3b51f0373190503b" +dependencies = [ + "libc", + "linux-raw-sys 0.6.2", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "env_logger" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +dependencies = [ + "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 = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.0", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.71.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gbm" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65dffaf38d96aa22cb748ccd9b1ffe624931e899f54c0225815ef7ac757a409f" +dependencies = [ + "bitflags 1.3.2", + "drm", + "drm-fourcc", + "gbm-sys", + "libc", + "wayland-backend", + "wayland-server", +] + +[[package]] +name = "gbm-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58" +dependencies = [ + "libc", +] + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "half" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[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.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "io-lifetimes" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.26", + "windows-sys 0.48.0", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libspa" +version = "0.7.2" +source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#cd7070a114e75d9b8d7e0dde72d32f2b7b261002" +dependencies = [ + "bitflags 2.4.1", + "cc", + "convert_case", + "cookie-factory", + "libc", + "libspa-sys", + "nix", + "nom", + "system-deps", +] + +[[package]] +name = "libspa-sys" +version = "0.7.2" +source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#cd7070a114e75d9b8d7e0dde72d32f2b7b261002" +dependencies = [ + "bindgen", + "cc", + "system-deps", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "linux-raw-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33d399c713b009e1604320479fddb3f029b8c4c7840715ea50217c0df599d804" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +dependencies = [ + "value-bag", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +dependencies = [ + "libc", +] + +[[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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[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.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[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-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pipewire" +version = "0.7.2" +source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#cd7070a114e75d9b8d7e0dde72d32f2b7b261002" +dependencies = [ + "anyhow", + "bitflags 2.4.1", + "libc", + "libspa", + "libspa-sys", + "nix", + "once_cell", + "pipewire-sys", + "thiserror", +] + +[[package]] +name = "pipewire-sys" +version = "0.7.2" +source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#cd7070a114e75d9b8d7e0dde72d32f2b7b261002" +dependencies = [ + "bindgen", + "libspa-sys", + "system-deps", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.26", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro2" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[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 = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes 1.0.11", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[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.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_repr" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.0" +source = "git+https://github.com/smithay/client-toolkit?rev=2e9bf9f#2e9bf9f31698851ca373e5f1e7ba3e6e804e4db1" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.0", + "pkg-config", + "rustix 0.38.26", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall", + "rustix 0.38.26", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[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.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[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-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "value-bag" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[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.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" + +[[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.1", + "nix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.1", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +dependencies = [ + "nix", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend", + "wayland-client", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-server" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce" +dependencies = [ + "bitflags 2.4.1", + "downcast-rs", + "io-lifetimes 2.0.3", + "nix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "libc", + "log", + "memoffset 0.9.0", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "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]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" +dependencies = [ + "memchr", +] + +[[package]] +name = "xcursor" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" +dependencies = [ + "nom", +] + +[[package]] +name = "xdg-desktop-portal-cosmic" +version = "0.1.0" +dependencies = [ + "anyhow", + "ashpd", + "cosmic-client-toolkit", + "cosmic-protocols", + "env_logger", + "futures", + "gbm", + "image", + "libspa-sys", + "log", + "memmap2 0.9.0", + "pipewire", + "png", + "rustix 0.38.26", + "serde", + "tempfile", + "tokio", + "wayland-client", + "wayland-protocols", + "zbus", +] + +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix", + "winapi", +] + +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix new file mode 100644 index 0000000000000..ea90ed1c9fea5 --- /dev/null +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -0,0 +1,61 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, mesa +, libglvnd +, libxkbcommon +, pipewire +, wayland +}: + +rustPlatform.buildRustPackage rec { + pname = "xdg-desktop-portal-cosmic"; + version = "unstable-2023-12-07"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = "23b3e5a1b9fa76e30266f29949d54e97c2fadf6e"; + hash = "sha256-AqwJ3bV8Xz0MpY/ZmWgE9vNJIACX5SVeIYbSewyG/Bs="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE="; + "cosmic-protocols-0.1.0" = "sha256-AEgvF7i/OWPdEMi8WUaAg99igBwE/AexhAXHxyeJMdc="; + "ashpd-0.7.0" = "sha256-jBuxKJ2ADBvkJPPv4gzmFlZFybrfZBkCjerzeKe2Tt4="; + "libspa-0.7.2" = "sha256-QWOcNWzEyxfTdjUIB33s9dpWJ7Fsfmb5jd70CXOP/bw="; + }; + }; + + separateDebugInfo = true; + + nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ]; + buildInputs = [ libglvnd libxkbcommon mesa pipewire wayland ]; + + # Force linking to libEGL, which is always dlopen()ed, and to + # libwayland-client, which is always dlopen()ed except by the + # obscure winit backend. + RUSTFLAGS = map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-lwayland-client" + "-Wl,--pop-state" + ]; + + postInstall = '' + mkdir -p $out/share/{dbus-1/services,xdg-desktop-portal/portals} + cp data/*.service $out/share/dbus-1/services/ + cp data/cosmic.portal $out/share/xdg-desktop-portal/portals/ + ''; + + meta = with lib; { + homepage = "https://github.com/pop-os/xdg-desktop-portal-cosmic"; + description = "XDG Desktop Portal for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nyanbinary ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/xd/xdg-terminal-exec/package.nix b/pkgs/by-name/xd/xdg-terminal-exec/package.nix new file mode 100644 index 0000000000000..1dd07bd22396d --- /dev/null +++ b/pkgs/by-name/xd/xdg-terminal-exec/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "xdg-terminal-exec"; + version = "unstable-2023-12-08"; + + src = fetchFromGitHub { + owner = "Vladimir-csp"; + repo = "xdg-terminal-exec"; + rev = "04f37d4337b6ce157d4a7338dd600a32deb43a28"; + hash = "sha256-QIPdF+/dMUEVcz5j9o+wQ4dnw2yWwz7slnLdMNETkGs="; + }; + + dontBuild = true; + installPhase = '' + runHook preInstall + install -Dm555 xdg-terminal-exec -t $out/bin + runHook postInstall + ''; + + meta = { + description = "Proposal for XDG terminal execution utility"; + homepage = "https://github.com/Vladimir-csp/xdg-terminal-exec"; + license = lib.licenses.gpl3Plus; + mainProgram = "xdg-terminal-exec"; + maintainers = with lib.maintainers; [quantenzitrone]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/xo/xorriso/package.nix b/pkgs/by-name/xo/xorriso/package.nix index 057f61c9fe27d..9fba38fb9044a 100644 --- a/pkgs/by-name/xo/xorriso/package.nix +++ b/pkgs/by-name/xo/xorriso/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xorriso"; - version = "1.5.7"; + version = "1.5.7-unstable-2023-12-06"; src = fetchurl { - url = "https://www.gnu.org/software/xorriso/xorriso-${finalAttrs.version}.tar.gz"; - hash = "sha256-hnV3w4f2tKmjIk60Qd7Y+xY432y8Bg+NGh5dAPMY9QI="; + url = "https://web.archive.org/web/20231206123448/https://www.gnu.org/software/xorriso/xorriso-1.5.7.tar.gz"; + hash = "sha256-B7lV3n3e1aF7yJsLxwi8C8m3sBmUUePpCV9KfWRuTm0="; }; buildInputs = [ diff --git a/pkgs/applications/file-managers/xplr/default.nix b/pkgs/by-name/xp/xplr/package.nix index b16c59503848f..c4aa17a32a9c7 100644 --- a/pkgs/applications/file-managers/xplr/default.nix +++ b/pkgs/by-name/xp/xplr/package.nix @@ -24,8 +24,8 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - mkdir -p $out/share - cp assets/desktop/xplr.desktop $out/share + mkdir -p $out/share/applications + cp assets/desktop/xplr.desktop $out/share/applications mkdir -p $out/share/icons/hicolor/scalable/apps cp assets/icon/xplr.svg $out/share/icons/hicolor/scalable/apps diff --git a/pkgs/by-name/xw/xwayland-run/package.nix b/pkgs/by-name/xw/xwayland-run/package.nix new file mode 100644 index 0000000000000..580af8afa8d0f --- /dev/null +++ b/pkgs/by-name/xw/xwayland-run/package.nix @@ -0,0 +1,58 @@ +{ cage +, fetchFromGitLab +, gnome +, lib +, meson +, ninja +, python3 +, weston +, xorg +, xwayland +, withMutter ? false +, withCage ? false +}: +let + compositors = [ weston ] + ++ lib.optional withMutter gnome.mutter + ++ lib.optional withCage cage + ; +in +python3.pkgs.buildPythonApplication rec { + pname = "xwayland-run"; + version = "0.0.2"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "ofourdan"; + repo = "xwayland-run"; + rev = version; + hash = "sha256-+HdRLIizEdtKWD8HadQQf750e2t1AWa14U/Xwu3xPK4="; + }; + + pyproject = false; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ + meson + ninja + ]; + + + postInstall = '' + wrapProgram $out/bin/wlheadless-run \ + --prefix PATH : ${lib.makeBinPath compositors} + wrapProgram $out/bin/xwayland-run \ + --prefix PATH : ${lib.makeBinPath [ xwayland xorg.xauth ]} + wrapProgram $out/bin/xwfb-run \ + --prefix PATH : ${lib.makeBinPath (compositors ++ [ xwayland xorg.xauth ])} + ''; + + meta = with lib; { + description = "A set of small utilities revolving around running Xwayland and various Wayland compositor headless"; + homepage = "https://gitlab.freedesktop.org/ofourdan/xwayland-run"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ arthsmn ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix index abdbdbc2e7965..9ba083e0fb34b 100644 --- a/pkgs/by-name/yg/yggdrasil/package.nix +++ b/pkgs/by-name/yg/yggdrasil/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "sha256-+E8CJs6m6iyMQNIqBbKLg8ghZR0FIuY5D1iDoUlaDyo="; + sha256 = "sha256-or+XTt8V/1BuLSJ53w1aKqJfx3Pka6VmC4TpvpP83+0="; }; - vendorHash = "sha256-FXlIrsl3fbWpEpwrY5moaJI0H0yXtrTQhHFu+ktWRVM="; + vendorHash = "sha256-K7VJ+1x7+DgdwTjEgZ7sJ7SaCssBg+ukQupJ/1FN4F0="; subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ]; diff --git a/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff b/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff new file mode 100644 index 0000000000000..7a682ce7e4c60 --- /dev/null +++ b/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff @@ -0,0 +1,39 @@ +diff -Naur ytree-2.06-old/Makefile ytree-2.06-new/Makefile +--- ytree-2.06-old/Makefile 2023-11-26 06:15:34.000000000 -0300 ++++ ytree-2.06-new/Makefile 2023-12-01 12:25:36.641958285 -0300 +@@ -11,13 +11,13 @@ + # ADD_CFLAGS: Add -DVI_KEYS if you want vi-cursor-keys + # + +-DESTDIR = /usr ++PREFIX = /usr + + ADD_CFLAGS = -O # -DVI_KEYS + +-BINDIR = $(DESTDIR)/bin +-MANDIR = $(DESTDIR)/share/man/man1 +-MANESDIR = $(DESTDIR)/share/man/es/man1 ++BINDIR = $(DESTDIR)$(PREFIX)/bin ++MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1 ++MANESDIR = $(DESTDIR)$(PREFIX)/share/man/es/man1 + + + # Uncomment the lines for your system (default is linux) +@@ -224,14 +224,14 @@ + + install: $(MAIN) + install $(MAIN) $(BINDIR) +- gzip -9c ytree.1 > ytree.1.gz ++ gzip -n -9c ytree.1 > ytree.1.gz + if [ -d $(MANDIR) ]; then install -m 0644 ytree.1.gz $(MANDIR)/; fi +- gzip -9c ytree.1.es > ytree.1.es.gz ++ gzip -n -9c ytree.1.es > ytree.1.es.gz + if [ -d $(MANESDIR) ]; then install -m 0644 ytree.1.es.gz $(MANESDIR)/; fi + + clean: + rm -f core *.o *~ *.orig *.bak +- ++ + clobber: clean + rm -f $(MAIN) ytree.1.es.gz ytree.1.gz + diff --git a/pkgs/by-name/yt/ytree/package.nix b/pkgs/by-name/yt/ytree/package.nix new file mode 100644 index 0000000000000..6307d39b6629d --- /dev/null +++ b/pkgs/by-name/yt/ytree/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchurl +, ncurses +, readline +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ytree"; + version = "2.06"; + + src = fetchurl { + url = "https://han.de/~werner/ytree-${finalAttrs.version}.tar.gz"; + hash = "sha256-QRqI779ZnnytVUC7A7Zt0zyWexRwBnp+CVQcNvnvWeY="; + }; + + patches = [ + # Two fixups (because diff files can't be smaller): + # - Create PREFIX instead of using DESTDIR + # - use gzip without timestamp, to improve reproducibility + ./0001-use-prefix-and-gzip-n.diff + ]; + + buildInputs = [ + ncurses + readline + ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + installFlags = [ "PREFIX=${placeholder "out"}" ]; + + preInstall = '' + mkdir -p $out/bin $out/share/man/man1 + ''; + + meta = { + homepage = "https://www.han.de/~werner/ytree.html"; + description = "A curses-based file manager similar to DOS Xtree(TM)"; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "ytree"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) +# TODO: X11 support diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix new file mode 100644 index 0000000000000..893e43eed712a --- /dev/null +++ b/pkgs/by-name/za/zapzap/package.nix @@ -0,0 +1,70 @@ +{ lib +, fetchFromGitHub +, python3Packages +, qt6 +, fetchpatch +}: + +python3Packages.buildPythonApplication rec { + pname = "zapzap"; + version = "4.5.5.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "zapzap-linux"; + repo = "zapzap"; + rev = version; + hash = "sha256-8IeFGTI+5kbeFGqH5DpHCY8pqzGhE48hPCEIKIe7jAM="; + }; + + patches = [ + # fixes that the tray icon was not installed + (fetchpatch { + url = "https://github.com/zapzap-linux/zapzap/pull/25/commits/4107b019555492e2c2692dd4c40553503047e6a8.patch"; + hash = "sha256-NQPGPXYFhVwsPXopEELG1n/f8yUj/74OFE1hTyt93Ng="; + }) + ]; + + nativeBuildInputs = with python3Packages; [ + setuptools + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtwayland + qt6.qtsvg + ]; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + propagatedBuildInputs = with python3Packages; [ + dbus-python + pyqt6 + pyqt6-webengine + pyqt6-sip + ]; + + postInstall = '' + install -Dm555 share/applications/com.rtosta.zapzap.desktop -t $out/share/applications/ + install -Dm555 share/icons/com.rtosta.zapzap.svg -t $out/share/icons/hicolor/scalable/apps/ + ''; + + dontWrapQtApps = true; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "WhatsApp desktop application for Linux"; + homepage = "https://zapzap-linux.github.io/"; + mainProgram = "zapzap"; + license = licenses.gpl3Only; + changelog = "https://github.com/zapzap-linux/zapzap/releases/tag/${version}"; + maintainers = [ maintainers.eymeric ]; + }; +} diff --git a/pkgs/by-name/zb/zbus-xmlgen/package.nix b/pkgs/by-name/zb/zbus-xmlgen/package.nix new file mode 100644 index 0000000000000..2e0dc5715f518 --- /dev/null +++ b/pkgs/by-name/zb/zbus-xmlgen/package.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchCrate, makeBinaryWrapper, rustfmt }: + +rustPlatform.buildRustPackage rec { + pname = "zbus_xmlgen"; + version = "3.1.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-vaefyfasOLFFYWPjSJFgjIFkvnRiJVe/GLYUQxUYlt0="; + }; + + cargoHash = "sha256-WXJ49X4B2aNy1zPbTllIzRhZJvF+RwfQ0Hhm/D+LQfk="; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + postInstall = '' + wrapProgram $out/bin/zbus-xmlgen \ + --prefix PATH : ${lib.makeBinPath [ rustfmt ]} + ''; + + meta = with lib; { + homepage = "https://crates.io/crates/zbus_xmlgen"; + description = "D-Bus XML interface Rust code generator"; + mainProgram = "zbus-xmlgen"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.mit; + }; +} diff --git a/pkgs/by-name/ze/zesarux/package.nix b/pkgs/by-name/ze/zesarux/package.nix index e19dd5b60f08a..915bfe3905cfe 100644 --- a/pkgs/by-name/ze/zesarux/package.nix +++ b/pkgs/by-name/ze/zesarux/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' - patchShebangs ./configure *.sh + patchShebangs *.sh ''; configureFlags = [ diff --git a/pkgs/by-name/zu/zug/package.nix b/pkgs/by-name/zu/zug/package.nix new file mode 100644 index 0000000000000..f3356dd51ae65 --- /dev/null +++ b/pkgs/by-name/zu/zug/package.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, pkgs +, fetchFromGitHub +, cmake +, boost +}: + + +stdenv.mkDerivation rec { + pname = "zug"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "arximboldi"; + repo = "zug"; + rev = "v${version}"; + hash = "sha256-7xTMDhPIx1I1PiYNanGUsK8pdrWuemMWM7BW+NQs2BQ="; + }; + nativeBuildInputs = [ + cmake + ]; + buildInputs = [ + boost + ]; + cmakeFlags = [ + "-Dzug_BUILD_EXAMPLES=OFF" + ]; + meta = with lib; { + homepage = "https://github.com/arximboldi/zug"; + description = "library for functional interactive c++ programs"; + maintainers = with maintainers; [ nek0 ]; + license = licenses.boost; + }; +} diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 57e32d8640532..adb735c38a1ef 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { outputDevdoc = "out"; preConfigure = " - patchShebangs ./configure patchShebangs ./do_install "; diff --git a/pkgs/data/fonts/commit-mono/default.nix b/pkgs/data/fonts/commit-mono/default.nix index 895e70a544b99..16fd6b7dd1a1f 100644 --- a/pkgs/data/fonts/commit-mono/default.nix +++ b/pkgs/data/fonts/commit-mono/default.nix @@ -4,11 +4,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "commit-mono"; - version = "1.141"; + version = "1.142"; src = fetchzip { url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip"; - hash = "sha256-ErC4ZM17rYq+5FRW9m9nIbQOjQGTCCoNhXHxb7Swd84="; + hash = "sha256-ZOEo+uD1Vug+F38/eXD6xG1netEIAYn25bPBZ1H7aEE="; stripRoot = false; }; diff --git a/pkgs/data/fonts/fg-virgil/default.nix b/pkgs/data/fonts/fg-virgil/default.nix index fdf83df42e031..e0837c71d8eb1 100644 --- a/pkgs/data/fonts/fg-virgil/default.nix +++ b/pkgs/data/fonts/fg-virgil/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "fg-virgil"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "excalidraw"; repo = "excalidraw"; rev = "v${finalAttrs.version}"; - hash = "sha256-iziCCHacaShPqb0f5nI8cCinFFs5fB3TcMJrifNhg4I="; + hash = "sha256-awd5jTz4sSiliEq7xt6dUR31C85oDcCP5GLuQn0ohj0="; }; installPhase = '' diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index fa44d5d6449d7..6b343bcb163d1 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.051"; + version = "0.053"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-JdoCblRW9Vih7zQyvTb/VXhZJJDNV0sPDfTQ+wRKotE="; + hash = "sha256-KvDyT0T8ecpSoNmqvsvDMooWNNe+z/PvxYj1Nd6qqfA="; }; installPhase = '' diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix index 2fc6731b850a8..0e7a9888aed8c 100644 --- a/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.106"; + version = "1.108"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-AXEOoU9gvml1bqjPTYV+mmhVGLG4R6mH8e/h3wQgySo="; + hash = "sha256-Wx2fmvIEHgimu7BJ49xWK7c08Rsf3fsjMLTdyedgK3I="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/lxgw-wenkai/default.nix b/pkgs/data/fonts/lxgw-wenkai/default.nix index cd15891f2f4a7..991fff3c0bdc0 100644 --- a/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.311"; + version = "1.315"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-R7j6SBWGbkS4cJI1J8M5NDIDeJDFMjtXZnGiyxm2rjg="; + hash = "sha256-btiF6jij8sw/kynQedUdy9//5rPPhtnRhmZ59FY+S0c="; }; installPhase = '' diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix deleted file mode 100644 index fee51ebacf4a9..0000000000000 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ /dev/null @@ -1,305 +0,0 @@ -{ stdenv -, stdenvNoCC -, lib -, gitUpdater -, fetchFromGitHub -, fetchurl -, cairo -, nixosTests -, pkg-config -, pngquant -, which -, imagemagick -, zopfli -, buildPackages -, variants ? [ ] -}: -let - notoLongDescription = '' - When text is rendered by a computer, sometimes characters are - displayed as “tofu”. They are little boxes to indicate your device - doesn’t have a font to display the text. - - Google has been developing a font family called Noto, which aims to - support all languages with a harmonious look and feel. Noto is - Google’s answer to tofu. The name noto is to convey the idea that - Google’s goal is to see “no more tofu”. Noto has multiple styles and - weights, and freely available to all. - ''; -in -rec { - mkNoto = - { pname - , variants ? [ ] - , longDescription ? notoLongDescription - }: - stdenvNoCC.mkDerivation rec { - inherit pname; - version = "23.11.1"; - - src = fetchFromGitHub { - owner = "notofonts"; - repo = "notofonts.github.io"; - rev = "noto-monthly-release-${version}"; - hash = "sha256-qBHLCOfVBOn9CV194S4cYw9nhHyAe2AUBJHQMvyEfW8="; - }; - - _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; - - installPhase = '' - # We check availability in order of variable -> otf -> ttf - # unhinted -- the hinted versions use autohint - # maintaining maximum coverage. - # - # We have a mix of otf and ttf fonts - local out_font=$out/share/fonts/noto - '' + (if _variants == [ ] then '' - for folder in $(ls -d fonts/*/); do - if [[ -d "$folder"unhinted/variable-ttf ]]; then - install -m444 -Dt $out_font "$folder"unhinted/variable-ttf/*.ttf - elif [[ -d "$folder"unhinted/otf ]]; then - install -m444 -Dt $out_font "$folder"unhinted/otf/*.otf - else - install -m444 -Dt $out_font "$folder"unhinted/ttf/*.ttf - fi - done - '' else '' - for variant in $_variants; do - if [[ -d fonts/"$variant"/unhinted/variable-ttf ]]; then - install -m444 -Dt $out_font fonts/"$variant"/unhinted/variable-ttf/*.ttf - elif [[ -d fonts/"$variant"/unhinted/otf ]]; then - install -m444 -Dt $out_font fonts/"$variant"/unhinted/otf/*.otf - else - install -m444 -Dt $out_font fonts/"$variant"/unhinted/ttf/*.ttf - fi - done - ''); - - passthru.updateScript = gitUpdater { - rev-prefix = "noto-monthly-release-"; - }; - - meta = with lib; { - description = "Beautiful and free fonts for many languages"; - homepage = "https://www.google.com/get/noto/"; - inherit longDescription; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ mathnerd314 emily jopejoe1 ]; - }; - }; - - mkNotoCJK = { typeface, version, sha256 }: - stdenvNoCC.mkDerivation { - pname = "noto-fonts-cjk-${lib.toLower typeface}"; - inherit version; - - src = fetchFromGitHub { - owner = "googlefonts"; - repo = "noto-cjk"; - rev = "${typeface}${version}"; - inherit sha256; - sparseCheckout = [ "${typeface}/Variable/OTC" ]; - }; - - installPhase = '' - install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/Variable/OTC/*.otf.ttc - ''; - - passthru.tests.noto-fonts = nixosTests.noto-fonts; - - meta = with lib; { - description = "Beautiful and free fonts for CJK languages"; - homepage = "https://www.google.com/get/noto/help/cjk/"; - longDescription = '' - Noto ${typeface} CJK is a ${lib.toLower typeface} typeface designed as - an intermediate style between the modern and traditional. It is - intended to be a multi-purpose digital font for user interface - designs, digital content, reading on laptops, mobile devices, and - electronic books. Noto ${typeface} CJK comprehensively covers - Simplified Chinese, Traditional Chinese, Japanese, and Korean in a - unified font family. It supports regional variants of ideographic - characters for each of the four languages. In addition, it supports - Japanese kana, vertical forms, and variant characters (itaiji); it - supports Korean hangeul — both contemporary and archaic. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ mathnerd314 emily ]; - }; - }; - - noto-fonts = mkNoto { - pname = "noto-fonts"; - }; - - noto-fonts-lgc-plus = mkNoto { - pname = "noto-fonts-lgc-plus"; - variants = [ - "Noto Sans" - "Noto Serif" - "Noto Sans Mono" - "Noto Music" - "Noto Sans Symbols" - "Noto Sans Symbols 2" - "Noto Sans Math" - ]; - longDescription = '' - This package provides the Noto Fonts, but only for latin, greek - and cyrillic scripts, as well as some extra fonts. To create a - custom Noto package with custom variants, see the `mkNoto` - helper function. - ''; - }; - - noto-fonts-cjk-sans = mkNotoCJK { - typeface = "Sans"; - version = "2.004"; - sha256 = "sha256-IgalJkiOAVjNxKaPAQWfb5hKeqclliR4qVXCq63FGWY="; - }; - - noto-fonts-cjk-serif = mkNotoCJK { - typeface = "Serif"; - version = "2.002"; - sha256 = "sha256-GLjpTAiHfygj1J4AdUVDJh8kykkFOglq+h4kyat5W9s="; - }; - - noto-fonts-color-emoji = - let - version = "2.038"; - emojiPythonEnv = - buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); - in - stdenvNoCC.mkDerivation { - pname = "noto-fonts-emoji"; - inherit version; - - src = fetchFromGitHub { - owner = "googlefonts"; - repo = "noto-emoji"; - rev = "v${version}"; - sha256 = "1rgmcc6nqq805iqr8kvxxlk5cf50q714xaxk3ld6rjrd69kb8ix9"; - }; - - depsBuildBuild = [ - buildPackages.stdenv.cc - pkg-config - cairo - ]; - - nativeBuildInputs = [ - imagemagick - zopfli - pngquant - which - emojiPythonEnv - ]; - - postPatch = '' - patchShebangs *.py - patchShebangs third_party/color_emoji/*.py - # remove check for virtualenv, since we handle - # python requirements using python.withPackages - sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile - - # Make the build verbose so it won't get culled by Hydra thinking that - # it somehow got stuck doing nothing. - sed -i 's;\t@;\t;' Makefile - ''; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/fonts/noto - cp NotoColorEmoji.ttf $out/share/fonts/noto - runHook postInstall - ''; - - meta = with lib; { - description = "Color emoji font"; - homepage = "https://github.com/googlefonts/noto-emoji"; - license = with licenses; [ ofl asl20 ]; - platforms = platforms.all; - maintainers = with maintainers; [ mathnerd314 sternenseemann ]; - }; - }; - - noto-fonts-monochrome-emoji = - # Metadata fetched from - # https://www.googleapis.com/webfonts/v1/webfonts?key=${GOOGLE_FONTS_TOKEN}&family=Noto+Emoji - let metadata = with builtins; head (fromJSON (readFile ./noto-emoji.json)).items; - urlHashes = with builtins; fromJSON (readFile ./noto-emoji.hashes.json); - - in - stdenvNoCC.mkDerivation { - pname = "noto-fonts-monochrome-emoji"; - version = "${lib.removePrefix "v" metadata.version}.${metadata.lastModified}"; - preferLocalBuild = true; - - dontUnpack = true; - srcs = let - weightNames = { - "300" = "Light"; - regular = "Regular"; - "500" = "Medium"; - "600" = "SemiBold"; - "700" = "Bold"; - }; - in lib.mapAttrsToList - (variant: url: fetchurl { name = "NotoEmoji-${weightNames.${variant}}.ttf"; - hash = urlHashes.${url}; - inherit url; } ) - metadata.files; - - installPhase = '' - runHook preInstall - for src in $srcs; do - install -D $src $out/share/fonts/noto/$(stripHash $src) - done - runHook postInstall - ''; - - meta = with lib; { - description = "Monochrome emoji font"; - homepage = "https://fonts.google.com/noto/specimen/Noto+Emoji"; - license = [ licenses.ofl ]; - maintainers = [ maintainers.nicoo ]; - - platforms = platforms.all; - sourceProvenance = [ sourceTypes.binaryBytecode ]; - }; - }; - - noto-fonts-emoji-blob-bin = - let - pname = "noto-fonts-emoji-blob-bin"; - version = "15.0"; - in - stdenvNoCC.mkDerivation { - inherit pname version; - - src = fetchurl { - url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; - hash = "sha256-3MPWZ1A2ups171dNIiFTJ3C1vZiGy6I8ZF70aUfrePk="; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - install -Dm 444 $src $out/share/fonts/blobmoji/Blobmoji.ttf - - runHook postInstall - ''; - - meta = with lib; { - description = "Noto Emoji with extended Blob support"; - homepage = "https://github.com/C1710/blobmoji"; - license = with licenses; [ ofl asl20 ]; - platforms = platforms.all; - maintainers = with maintainers; [ rileyinman jk ]; - }; - }; -} diff --git a/pkgs/data/fonts/sketchybar-app-font/default.nix b/pkgs/data/fonts/sketchybar-app-font/default.nix index 8364c84f1ffc8..006738fd4850e 100644 --- a/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "1.0.20"; + version = "1.0.21"; src = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-pf3SSxzlNIdbXXHfRauFCnrVUMOd5J9sSUE9MsfWrwo="; + hash = "sha256-k3Ok5qizXQvRCzW0oRilLWNJelYI0BGQ6qLbjhxosTA="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 0c114b176abd5..e97d8416610c0 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "spleen"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; - hash = "sha256-N9kJrWaQN9eeNoOVJu9UN2+jcEbHqRWxV+X0DXNJLuA="; + hash = "sha256-+TDrAolKoG61CuqqELAEICVNcjIPoow6QPFXqMKUN1U="; }; nativeBuildInputs = [ xorg.mkfontscale ]; diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index c3e41cca36dd1..69aae92d966a0 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -14,14 +14,14 @@ }: let - version = "14.1.2"; + version = "15.0.2"; twemojiSrc = fetchFromGitHub { name = "twemoji"; owner = "jdecked"; repo = "twemoji"; rev = "v${version}"; - sha256 = "sha256-UQ4PwO4D1kw7JOMf6xSaRBfT822KwrvWBPDmaQjkRVQ="; + hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo="; }; pythonEnv = diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 280b89cf63953..87093b2f357e8 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-ZPjtY6s3Sgl0aU2pAxagTMFIOcwDAZQRYtvOC0FBJaI="; + sha256 = "sha256-ZXAS22Oe6C34DR1BfGmCGr1qh9mu1PCY5IQWxrm1EfY="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 947ca68b6a1e4..60515e76692f1 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.11.11"; + version = "23.12.10"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-sIC5GYROj53vrMRdKKEHprGP+jHZqgz2lbPPFIVuj74="; + sha256 = "sha256-DZmjSMJ1I+Ir/Hz/fmsw36dFSp5S3YF024nJLb/Xxig="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 1652415295ac2..3dac6c8d95c6e 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "23.11.11"; + version = "23.12.10"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-yu9ufr1l21l6v8bRXLJcVkpBD0fDIlgePbStTLH+CDc="; + sha256 = "sha256-kNO0YHHapoIKAosGvCMUEhjP6FkD/CRNhrv5D3dxgoI="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 8070b352c7d22..24eb68ceed221 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme"; - version = "23.11.20"; + version = "23.12.02"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-jH3bzwyiDRovrH8GyJhwMJRHM5du8ek4leKnFSO8vAo="; + sha256 = "sha256-ks2JJROSYzeDqq7i6Y4iJAB994ZRcDOGGRcCL3Dt1zI="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 75237237e2033..e940bc7d52beb 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20231101"; + version = "20231201"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - hash = "sha256-0ooHuMqGzlMLVTR/u+kCJLibfqTAtq662EG8i3JIzPA="; + hash = "sha256-nLc2nt8YI193loMHjzzEwgvb+tdNrVTZskqssX2oFrU="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index d489c23c6b8d0..30f2ee38c72f8 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , writeText -, fetchurl +, fetchFromGitHub , buildcatrust , blacklist ? [] , extraCertificateFiles ? [] @@ -17,20 +17,10 @@ }: let - blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" (blacklist ++ [ - # Mozilla does not trust new certificates issued by these CAs after 2022/11/30¹ - # in their products, but unfortunately we don't have such a fine-grained - # solution for most system packages², so we decided to eject these. - # - # [1] https://groups.google.com/a/mozilla.org/g/dev-security-policy/c/oxX69KFvsm4/m/yLohoVqtCgAJ - # [2] https://utcc.utoronto.ca/~cks/space/blog/linux/CARootStoreTrustProblem - "TrustCor ECA-1" - "TrustCor RootCert CA-1" - "TrustCor RootCert CA-2" - ])); + blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.92"; + srcVersion = "3.95"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -43,9 +33,11 @@ let pname = "nss-cacert-certdata"; inherit version; - src = if nssOverride != null then nssOverride.src else fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz"; - hash = "sha256-PbGS1uiCA5rwKufq8yF+0RS7etg0FMZGdyq4Ah4kolQ="; + src = if nssOverride != null then nssOverride.src else fetchFromGitHub { + owner = "nss-dev"; + repo = "nss"; + rev = "NSS_${lib.replaceStrings ["."] ["_"] version}_RTM"; + hash = "sha256-qgSbzlRbU+gElC2ae3FEGRUFSM1JHd/lNGNXC0x4xt4="; }; dontBuild = true; @@ -54,7 +46,7 @@ let runHook preInstall mkdir $out - cp nss/lib/ckfw/builtins/certdata.txt $out + cp lib/ckfw/builtins/certdata.txt $out runHook postInstall ''; diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index c7ca80ccb0081..7dcb0c63e8de8 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 = "20231112"; + version = "20231212"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-CTygf2/CbxNO/9e8OfxeGZFaSrKXdlQdvUgywZX1U9o="; + sha256 = "sha256-h6EojfOWfDwD5Akvb8NrSvg3xyQZhOUrKhUxlWwio8A="; }; dontUnpack = true; diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix index 6d06d49eb7115..953ae55626280 100644 --- a/pkgs/data/misc/cldr-annotations/default.nix +++ b/pkgs/data/misc/cldr-annotations/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "cldr-annotations"; - version = "43.0"; + version = "44.0"; src = fetchzip { url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip"; stripRoot = false; - hash = "sha256-L8ikzRpSw4mDCV79TiUqhPHWC0PmGi4i4He0OAB54R0="; + hash = "sha256-oK+NlzuRF45laEMJKhNDzr12RF4CHIfDFNBFsIjJh1I="; }; installPhase = '' diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix index abf945e9df555..1c6121473c748 100644 --- a/pkgs/data/misc/dns-root-data/default.nix +++ b/pkgs/data/misc/dns-root-data/default.nix @@ -6,11 +6,11 @@ let # Original source https://www.internic.net/domain/named.root # occasionally suffers from pointless hash changes, # and having stable sources for older versions has advantages, too. - urls = map (prefix: prefix + "cc5e14a264912/etc/root.hints") [ + urls = map (prefix: prefix + "d9c96ae96f066a85d7/etc/root.hints") [ "https://gitlab.nic.cz/knot/knot-resolver/raw/" "https://raw.githubusercontent.com/CZ-NIC/knot-resolver/" ]; - sha256 = "0vdrff4l8s8grif52dnh091s8qydhh88k25zqd9rj66sf1qwcwxl"; + hash = "sha256-4lG/uPnNHBNIZ/XIeDM1w3iukrpeW0JIjTnGSwkJ8U4="; }; rootKey = ./root.key; @@ -20,7 +20,7 @@ in stdenv.mkDerivation { pname = "dns-root-data"; - version = "2019-01-11"; + version = "2023-11-27"; buildCommand = '' mkdir $out diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 8de13f2eaf368..6bad73e683927 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config @@ -14,7 +13,7 @@ stdenv.mkDerivation rec { pname = "shared-mime-info"; - version = "2.3"; + version = "2.4"; outputs = [ "out" "dev" ]; @@ -23,15 +22,9 @@ stdenv.mkDerivation rec { owner = "xdg"; repo = pname; rev = version; - sha256 = "sha256-cEfknRVtOJykEO9Iqlb0UoiayYtu+ugvmmZqAD5cGnE="; + hash = "sha256-5eyMkfSBUOD7p8woIYTgz5C/L8uQMXyr0fhL0l23VMA="; }; - patches = [ - # Submitted upstream at - # https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/211 - ./fix-clang-warnings.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch b/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch deleted file mode 100644 index 2d185549c4e6b..0000000000000 --- a/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/meson.build b/meson.build -index 1780c44..7998a51 100644 ---- a/meson.build -+++ b/meson.build -@@ -49,12 +49,7 @@ endif - ############################################################################### - # Dependencies - --check_functions = [ -- 'fdatasync', --] --foreach function : check_functions -- config.set('HAVE_'+function.to_upper(), cc.has_function(function)) --endforeach -+config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include <unistd.h>')) - - - if get_option('build-translations') -diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp -index 733ba06..4ca6d06 100644 ---- a/src/update-mime-database.cpp -+++ b/src/update-mime-database.cpp -@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path) - - env = getenv("XDG_DATA_DIRS"); - if (!env) -- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; -+ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/"; - dirs = g_strsplit(env, PATH_SEPARATOR, 0); - g_return_if_fail(dirs != NULL); - for (n = 0; dirs[n]; n++) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 98aeb7638e127..f04005af7452b 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; outputs = [ "out" "bin" "man" "dev" ]; - propagatedBuildOutputs = []; + propagatedBuildOutputs = [ ]; makeFlags = [ "TOPDIR=$(out)" @@ -59,6 +59,8 @@ stdenv.mkDerivation rec { ( cd $out/share/zoneinfo/posix; ln -s ../* .; rm posix ) mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right + cp leap-seconds.list $out/share/zoneinfo + mkdir -p "$dev/include" cp tzfile.h "$dev/include/tzfile.h" ''; diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 88ff72c28c76a..7b2a05e97349b 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,14 +3,14 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20231201183121"; + version = "20231219144426"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-BOq4hT8K+m/bdAj6f1TbT3BvAn05bH3EdphcaWqFYFk="; + hash = "sha256-xiHQL4fyGcb0yY++aqwaaZ8spPINQwbhI/VIer2LOe0="; }; - vendorHash = "sha256-6167kRAC5m5FlBr7uk+qKUcjWsb45P5Vvovyb6hHSVQ="; + vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY="; meta = with lib; { description = "community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix index 79dcc88a6f5dc..db4fa114110fa 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 = "5.1"; + version = "5.2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vRB6+C27M4u7v10c6dqGsKpxHMGfpCSiScZ+8qlJRr0="; + sha256 = "sha256-S6Yo67DTyRzS9uz/6g87SRmfPIBmAKfy4c23M5aENNg="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/catppuccin/default.nix b/pkgs/data/themes/catppuccin/default.nix index e8cdb0456d173..c9a51ba241d48 100644 --- a/pkgs/data/themes/catppuccin/default.nix +++ b/pkgs/data/themes/catppuccin/default.nix @@ -1,5 +1,5 @@ let - validThemes = [ "bat" "bottom" "btop" "grub" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "refind" "rofi" "waybar" ]; + validThemes = [ "bat" "bottom" "btop" "grub" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "qt5ct" "refind" "rofi" "waybar" ]; in { fetchFromGitHub , lib @@ -88,6 +88,14 @@ let hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE="; }; + qt5ct = fetchFromGitHub { + name = "qt5ct"; + owner = "catppuccin"; + repo = "qt5ct"; + rev = "89ee948e72386b816c7dad72099855fb0d46d41e"; + hash = "sha256-t/uyK0X7qt6qxrScmkTU2TvcVJH97hSQuF0yyvSO/qQ="; + }; + refind = fetchFromGitHub { name = "refind"; owner = "catppuccin"; @@ -174,6 +182,10 @@ stdenvNoCC.mkDerivation { cp ${sources.plymouth}/themes/catppuccin-${variant}/* $out/share/plymouth/themes/catppuccin-${variant} sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' $out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth + '' + lib.optionalString (lib.elem "qt5ct" themeList) '' + mkdir -p $out/qt5ct + cp ${sources.qt5ct}/themes/Catppuccin-"$capitalizedVariant".conf $out/qt5ct/ + '' + lib.optionalString (lib.elem "rofi" themeList) '' mkdir -p $out/rofi cp ${sources.rofi}/basic/.local/share/rofi/themes/catppuccin-${variant}.rasi $out/rofi/ 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 13ea576b3fbf8..64fc67b300268 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.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "stepanzubkov"; repo = pname; rev = "v${version}"; - hash = "sha256-T6b+rxjlxZCQ/KDaxBM8ZryA3n6a+3jo+J2nETBYslM="; + hash = "sha256-EK0bB2dRXNtDKFiyf+nMoDq9XK2f3PFwoNbQDZamB3Y="; }; propagatedUserEnvPkgs = [ qtgraphicaleffects ]; diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix deleted file mode 100644 index 76cc6a2a4a03d..0000000000000 --- a/pkgs/desktops/arcan/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, lib, pkgs }: - -lib.makeScope pkgs.newScope (self: with self; { - # Dependencies - - espeak = pkgs.espeak-ng; - ffmpeg = pkgs.ffmpeg-full; - harfbuzz = pkgs.harfbuzzFull; - - # Arcan - - arcan = callPackage ./arcan { }; - arcan-wrapped = callPackage ./wrapper.nix { }; - xarcan = callPackage ./xarcan { }; - - # Appls - - cat9 = callPackage ./cat9 { }; - cat9-wrapped = callPackage ./wrapper.nix { - name = "cat9-wrapped"; - appls = [ cat9 ]; - }; - - durden = callPackage ./durden { }; - durden-wrapped = callPackage ./wrapper.nix { - name = "durden-wrapped"; - appls = [ durden ]; - }; - - pipeworld = callPackage ./pipeworld { }; - pipeworld-wrapped = callPackage ./wrapper.nix { - name = "pipeworld-wrapped"; - appls = [ pipeworld ]; - }; - - # Warning: prio is deprecated; however it works and is useful for testing - prio = callPackage ./prio { }; - prio-wrapped = callPackage ./wrapper.nix { - name = "prio-wrapped"; - appls = [ prio ]; - }; - - # One Expression to SymlinkJoin Them All - - all-wrapped = callPackage ./wrapper.nix { - name = "all-wrapped"; - appls = [ durden cat9 pipeworld ]; - }; -}) diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 8b6cfb87dd127..5abfdd2ec81df 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - hash = "sha256-8/Q8ess+qF7kdjiS2y2alUSnjKlJ74yuSe4UTPVChNQ="; + hash = "sha256-akEweZpnfNeLuiUK1peI83uYsjVrFeQ0Is/+bpdNwdU="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index fd1ad256d20cc..2f6f2f77ba4c1 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -71,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "6.0.0"; + version = "6.0.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-kQvPdamS0t7YcWyCekdsLNXZfidaV3tdSptzHPGMSZ0="; + hash = "sha256-8Y+WUnNQ4p/JeUR4q6Ti6HdoN5bghXs6XJsuWGY66S4="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 1690a93364744..17d846f305b25 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -28,20 +28,15 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.0.0"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-5hXhCPXC7b2SsmvNSLDe/WYQcufN7FfhnaAgTNtqg0I="; + hash = "sha256-6Js670Z3/5BwAHvEJrXJkBZvEvx1NeT+eXOKaqKqFqI="; }; - patches = [ - # See https://github.com/linuxmint/cinnamon-screensaver/issues/446#issuecomment-1819580053 - ./fix-broken-theming-with-pygobject-3-46.patch - ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/fix-broken-theming-with-pygobject-3-46.patch b/pkgs/desktops/cinnamon/cinnamon-screensaver/fix-broken-theming-with-pygobject-3-46.patch deleted file mode 100644 index c594826d52613..0000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/fix-broken-theming-with-pygobject-3-46.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/cinnamon-screensaver-main.py b/src/cinnamon-screensaver-main.py -index 05b727c..a185159 100755 ---- a/src/cinnamon-screensaver-main.py -+++ b/src/cinnamon-screensaver-main.py -@@ -139,9 +139,9 @@ class Main(Gtk.Application): - - fallback_prov = Gtk.CssProvider() - -- if fallback_prov.load_from_data(fallback_css.encode()): -- Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default(), fallback_prov, 600) -- Gtk.StyleContext.reset_widgets(Gdk.Screen.get_default()) -+ fallback_prov.load_from_data(fallback_css.encode()) -+ Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default(), fallback_prov, 600) -+ Gtk.StyleContext.reset_widgets(Gdk.Screen.get_default()) - - if __name__ == "__main__": - setproctitle.setproctitle('cinnamon-screensaver') diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch b/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch new file mode 100644 index 0000000000000..6c44f93d8f3c2 --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch @@ -0,0 +1,76 @@ +From 174d14edcbb401aa2bfb77932b214512befb486c Mon Sep 17 00:00:00 2001 +From: Bobby Rong <rjl931189261@126.com> +Date: Sat, 23 Dec 2023 23:24:59 +0800 +Subject: [PATCH] cinnamon-session: make sure wayland sessions get a login + shell + +Users expect their shell profiles to get sourced at startup, which +doesn't happen with wayland sessions. + +This commit brings back that feature, by making the cinnamon-session +wrapper script run a login shell. + +ref: https://gitlab.gnome.org/GNOME/gnome-session/-/commit/7e307f8ddb91db5d4051c4c792519a660ba67f35 +--- + cinnamon-session/cinnamon-session.in | 16 ++++++++++++++++ + cinnamon-session/meson.build | 14 +++++++++++++- + 2 files changed, 29 insertions(+), 1 deletion(-) + create mode 100755 cinnamon-session/cinnamon-session.in + +diff --git a/cinnamon-session/cinnamon-session.in b/cinnamon-session/cinnamon-session.in +new file mode 100755 +index 0000000..d9d7cb2 +--- /dev/null ++++ b/cinnamon-session/cinnamon-session.in +@@ -0,0 +1,16 @@ ++#!/bin/sh ++ ++if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && ++ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && ++ [ -n "$SHELL" ] && ++ grep -q "$SHELL" /etc/shells && ++ ! (echo "$SHELL" | grep -q "false") && ++ ! (echo "$SHELL" | grep -q "nologin"); then ++ if [ "$1" != '-l' ]; then ++ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" ++ else ++ shift ++ fi ++fi ++ ++exec @libexecdir@/cinnamon-session-binary "$@" +diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build +index 10092ee..3d32fdc 100644 +--- a/cinnamon-session/meson.build ++++ b/cinnamon-session/meson.build +@@ -54,7 +54,7 @@ cinnamon_session_sources = [ + ] + + dbus_glib = dependency('dbus-glib-1') +-executable('cinnamon-session', ++executable('cinnamon-session-binary', + cinnamon_session_sources, + dependencies: [ + cinnamon_desktop, +@@ -76,6 +76,18 @@ executable('cinnamon-session', + ], + include_directories: [ rootInclude ], + install: true, ++ install_dir: get_option('libexecdir'), ++) ++ ++script_conf = configuration_data() ++script_conf.set('libexecdir', get_option('prefix') / get_option('libexecdir')) ++ ++configure_file( ++ input: 'cinnamon-session.in', ++ output: 'cinnamon-session', ++ install: true, ++ install_dir: get_option('bindir'), ++ configuration: script_conf + ) + + units = [ +-- +2.42.0 + diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index a6800f94737d5..a0dfab6503c2b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-Use-dbus_glib-instead-of-elogind.patch + ./0002-Use-login-shell-for-wayland-session.patch ]; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index bacd1d3518d89..845c5e849ebaf 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-lbJ4Hhd+7Hd70ZrEw0Q7Yts9yciXzqSuNTerW6oY93A="; + hash = "sha256-nzPveo48rLu5CFEXj1GV3cJG6DepAFosWBibxoiYvIs="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix index 8f75fb2b61455..69a3aade31d7e 100644 --- a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix +++ b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix @@ -7,14 +7,14 @@ stdenvNoCC.mkDerivation rec { pname = "folder-color-switcher"; - version = "1.5.9"; + version = "1.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. - rev = "b735ed90b798eda541885735368930d045430e6e"; - sha256 = "sha256-acbBghi3LWpGH1dBF8icuTGgliA+NM+pE8YDN3WxOic="; + rev = "ebab2114649cc688a05e30857f6706f16fe82307"; + sha256 = "sha256-/VbgFuSoeDIiJG4owXbn7yT0ILrAdKkkhSkScnnJa+8="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec { postPatch = '' substituteInPlace usr/share/nemo-python/extensions/nemo-folder-color-switcher.py \ - --replace "/usr/share/locale" "$out/share" \ + --replace "/usr/share/locale" "$out/share/locale" \ --replace "/usr/share/folder-color-switcher/colors.d" "/run/current-system/sw/share/folder-color-switcher/colors.d" \ --replace "/usr/share/folder-color-switcher/color.svg" "$out/share/folder-color-switcher/color.svg" diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index 4025bb570fb80..d20be81f37a6b 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.7.7"; + version = "1.7.9"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20231123132622/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20231214142428/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" ]; - hash = "sha256-FwhZmquT+tByqBIhsoLQOtqsbkp+v4eWIoFenVlgCGc="; + hash = "sha256-64S7NAQtJuhSeMiSTbW2bqosL4A9M/nzmPYJI/ZAi0U="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-l-icons/default.nix b/pkgs/desktops/cinnamon/mint-l-icons/default.nix index 7361ddb7fde41..d4ace1290ccff 100644 --- a/pkgs/desktops/cinnamon/mint-l-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-l-icons/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-icons"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-3bLMuygijkDZ6sIqDzh6Ypwlmz+hpKgdITqrz7Jg3zY="; + hash = "sha256-4fBqdJq/JG9SZOLRxv/wXYG9g4wWGkvGwkWzUTDDjXY="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 1ec2ded837172..4742e7af83089 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.6.9"; + version = "1.7.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-rVcYt7lnQGS8Bs0aneMFu580K0XTUh4P0kcVwps4l6Q="; + hash = "sha256-8dwJyvM5sQNtUzhreBCgSWeElGlp/z3Dk7/xCeUSGKU="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 98ee19c27e783..893ddf0653335 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "6.0.0"; + version = "6.0.1"; outputs = [ "out" "dev" "man" ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-17B2C3SW9smTgLBBGJc9LwFpXoP9WidZEGgI2hbJTH8="; + hash = "sha256-yd23naaPIa6xrdf7ipOvVZKqkr7/CMxNqDZ3CQ2QH+Y="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix index d298827487e95..bd9f808638f2c 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-emblems/default.nix @@ -1,6 +1,7 @@ { python3 , lib , fetchFromGitHub +, cinnamon-translations }: let @@ -17,6 +18,9 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ --replace "/usr/share" "share" + + substituteInPlace nemo-extension/nemo-emblems.py \ + --replace "/usr/share/locale" "${cinnamon-translations}/share/locale" ''; meta = with lib; { diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix index 71c61db992a8e..7bf706f83b5f9 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix @@ -8,6 +8,7 @@ , gtk3 , nemo , gnome +, cinnamon-translations }: let @@ -33,7 +34,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/nemo-fileroller.c \ - --replace "file-roller" "${lib.getExe gnome.file-roller}" + --replace "file-roller" "${lib.getExe gnome.file-roller}" \ + --replace "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale" ''; PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; diff --git a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix b/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix index c59538a40a44e..a5ab9dfe9b3ec 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix +++ b/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix @@ -4,12 +4,12 @@ rec { # When you bump this, you should make sure all nemo-extensions # are actually using this file since we try to deal with tags # like nemo-fileroller-5.6.1 according to upstream's wishes. - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; rev = version; - sha256 = "sha256-M8ImntyfFfSL591UpqZosE7F8ydbpfrBhcLOBtW/sGQ="; + sha256 = "sha256-zuE0SO5VJ2kKjK7JgsSf+wJgfyffTHhfICslEoPKK8Q="; }; } diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 406bcd1325110..7b124c7987daf 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 = "6.0.0"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-JeiBhgfGyGyNT9eNhtUl6Pp1jgG02NRlm5lam592lS0="; + sha256 = "sha256-vSLFp0sgqGsZtcXdv82PVH0HcBbmcxrMySLFCBrLJpA="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index d9324fb30d24d..d7e320d1a64b3 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-hhtW2QyexGIyovhWOReeJ0bxgye8LJl1RrEs0/5+q24="; + sha256 = "sha256-ufm8f0mR35fGFOAL89MH6z88n3ZHG0IcQzIFrUjSQ1c="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 1274550df2e9e..0539075ca51d3 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -29,17 +29,20 @@ let cryptography pynacl netifaces + netaddr + ifaddr + qrcode ]); in stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.6.4"; + version = "1.8.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-BKptTQbSBTQyc5V6WWdsPdC76sH0CFMXOyahfRmvQzc="; + hash = "sha256-wBln4YqjZ8aI3D4Arwa7UgDKxNPSlC5fRZtjanTHl4Q="; }; nativeBuildInputs = [ @@ -60,6 +63,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ + "-Dbundle-grpc=false" "-Dbundle-zeroconf=false" ]; diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 3043d7c7ed4fc..77613562fd785 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.8.0"; + version = "2.8.1"; outputs = [ "out" "dev" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-kpVNzBvUo2Ktzln51xLbySeKutVeJaI57kL8cBZscTM="; + hash = "sha256-JsaH74h36FTIYVKiULmisK/RFGMZ79rhr7sacFnpFas="; }; # Recommended by upstream, which enables the build of xapp-debug. diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index c1ef0ca15c140..c20177e043ee3 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -7,6 +7,7 @@ , shared-mime-info , gtk3 , wrapGAppsHook +, libarchive , libxml2 , xapp , meson @@ -26,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.8.3"; + version = "4.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-fLnpBJJzrsQSyN+Ok1u/+CwHzBg+bzFR2Jwkc5mpMPA="; + sha256 = "sha256-sADdslxDtI+zV8DLnczlzNtB9W+BhMP8vb5riSnPYaw="; }; nativeBuildInputs = [ @@ -54,6 +55,7 @@ stdenv.mkDerivation rec { gtk3 xapp cairo + libarchive libxml2 libsecret poppler diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 1c7e03de9204f..301ec24f8f7c0 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-bI0TFJYulj1XlgKU5YLrlYKnkHORVYz4TK9mhl9mGag="; + sha256 = "sha256-q8Eg84mnsu+dJkF6K27HISfSF6OI3GcTdo0Fft50G9A="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix index 012d37a6cdef5..581eb1fa35802 100644 --- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "deepin-system-monitor"; - version = "6.0.8"; + version = "6.0.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-7XvS5HviK9XRsxTGnreYX9IQxxGWk7x7MHtcsHCz1rc="; + hash = "sha256-ompsCTPmmF7S0UHNNU0YDQiTdvcFglpEoS4o+XMZ7jg="; }; postPatch = '' @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { deepin-system-monitor-main/process/priority_controller.cpp \ deepin-system-monitor-main/service/service_manager.cpp \ deepin-system-monitor-main/translations/policy/com.deepin.pkexec.deepin-system-monitor.policy \ - --replace "/usr/bin/kill" "${util-linux}/bin/kill" \ - --replace "/usr/bin/renice" "${util-linux}/bin/renice" \ + --replace "/usr/bin/kill" "${lib.getBin util-linux}/bin/kill" \ + --replace "/usr/bin/renice" "${lib.getBin util-linux}/bin/renice" \ --replace '/usr/bin/systemctl' '${lib.getBin systemd}/systemctl' substituteInPlace deepin-system-monitor-main/{service/service_manager.cpp,process/{priority_controller.cpp,process_controller.cpp}} \ diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 01902209c4150..7356d6342c4db 100644 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "deepin-terminal"; - version = "6.0.8"; + version = "6.0.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-7Yyw4aw+44JX9SKuwmJSrLz04WETvs3E3cnt0/O+Ls0="; + hash = "sha256-QdODR4zmbMuzSVy6eJhwJHNPXkAn6oCLHq+YZEOmtIU="; }; cmakeFlags = [ "-DVERSION=${version}" ]; diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix index dce0807faa97e..13124f82b7aa7 100644 --- a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config , qttools @@ -10,6 +9,7 @@ , dtkwidget , qt5integration , qt5platform-plugins +, qtsvg , dde-qt-dbus-factory , qtmultimedia , qtwebengine @@ -20,27 +20,17 @@ stdenv.mkDerivation rec { pname = "deepin-voice-note"; - version = "6.0.13"; + version = "6.0.15"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-yDlWyMGkSToGCN7tuZNR8Mz7MUOZ7355w4H0OzeHBrs="; + hash = "sha256-k6LFMs2/OQQyeGI5WXBGWkAAY4GeP8LaA8hTXFwbaCM="; }; patches = [ ./use_v23_dbus_interface.diff - (fetchpatch { - name = "Adjust-the-audio-port-available-range.patch"; - url = "https://github.com/linuxdeepin/deepin-voice-note/commit/a876e4c4cf7d77e50071246f9fb6998aa62def77.patch"; - hash = "sha256-J/PPdj1Am/v2Sw2Dv2XvZJAy/6Tf7OoTfrbOB9rc5m8="; - }) - (fetchpatch { - name = "fix-build-error-with-new-dtk.patch"; - url = "https://github.com/linuxdeepin/deepin-voice-note/commit/9ce211f603deaff21b881e1c4f43d53e33a85347.patch"; - hash = "sha256-oP+AzMniONxjYIFust8fGaD8/UOjKr4yZiRUkdTMd5w="; - }) ]; postPatch = '' @@ -59,8 +49,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase + qtsvg dtkwidget - qt5integration qt5platform-plugins dde-qt-dbus-factory qtmultimedia @@ -77,6 +67,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + preFixup = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix index 9ab40fc0b3372..95e715e4d375d 100644 --- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "deepin-icon-theme"; - version = "2023.04.03"; + version = "2023.11.28"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-YRmpJr3tvBxomgb7yJPTqE3u4tXQKE5HHOP0CpjbQEg="; + hash = "sha256-kCWJAmJa0VmhnuegE+acj82Ojl4Z5D8g7/q2PzppJwg="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix index 28bedd7187aca..a9a3af0adee16 100644 --- a/pkgs/desktops/deepin/core/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dde-calendar"; - version = "5.11.0"; + version = "5.11.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-AgomXDydGHzfybE3r4IW94zIWKtwURmLW68MwqjLBWE="; + hash = "sha256-EQcB+a0dK2c6NdvGFbyp65a8nN2PmOpZLWx61UDOTJg="; }; patches = [ diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix index 92311a49352c9..a6104d61c9223 100644 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "dde-launchpad"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-o9YKmtaqa4ykoR75V2OpXm4GRPWHI6WKbxWAzY1b8I0="; + hash = "sha256-8m0DjQYih3hB/n2VHuJgUYBe8tpGwBU0NdkLxr1OsFc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix index d82d758adf3b8..aa31bf975ad05 100644 --- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix @@ -4,13 +4,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "deepin-desktop-base"; - version = "2022.11.15-deepin"; + version = "2023.09.05"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-GTgIHWz+x1Pl3F4zKA9V8o2oq6c53OK94q95WoMG+Qo="; + hash = "sha256-Gqp56TbkuTOI3aT7UmRuYBjUwRiOoIUHiRf0DaY0yew="; }; makeFlags = [ "DESTDIR=${placeholder "out"}" ]; diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 8419c1a7d730e..33430f453ab58 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -11,14 +11,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 libxml2 python3 ] + strictDeps = true; + + buildInputs = [ ORBit2 libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ lib.optional (!stdenv.isDarwin) polkit; propagatedBuildInputs = [ glib dbus-glib ]; - nativeBuildInputs = [ pkg-config intltool ]; + nativeBuildInputs = [ pkg-config intltool python3 glib ]; configureFlags = # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index a45095ba49780..28bc04697b878 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libIDL, libintl }: +{ lib, stdenv, fetchurl, pkg-config, glib, libIDL, libintl, buildPackages }: stdenv.mkDerivation rec { pname = "ORBit2"; @@ -9,11 +9,34 @@ stdenv.mkDerivation rec { sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; + strictDeps = true; + + # Processing file orbit-interface.idl + # sh: gcc: not found + # output does not contain binaries for build + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config libintl ]; propagatedBuildInputs = [ glib libIDL ]; outputs = [ "out" "dev" ]; + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "--with-idl-compiler=${lib.getExe' buildPackages.gnome2.ORBit2 "orbit-idl-2"}" + # https://github.com/void-linux/void-packages/blob/e5856e02aa6ef7e4f2725afbff2915f89d39024b/srcpkgs/ORBit2/template#L17-L35 + "ac_cv_alignof_CORBA_boolean=1" + "ac_cv_alignof_CORBA_char=1" + "ac_cv_alignof_CORBA_double=8" + "ac_cv_alignof_CORBA_float=4" + "ac_cv_alignof_CORBA_long=4" + "ac_cv_alignof_CORBA_long_double=8" + "ac_cv_alignof_CORBA_long_long=8" + "ac_cv_alignof_CORBA_octet=1" + "ac_cv_alignof_CORBA_short=2" + "ac_cv_alignof_CORBA_struct=1" + "ac_cv_alignof_CORBA_wchar=2" + "ac_cv_alignof_CORBA_pointer=${if stdenv.hostPlatform.is64bit then "8" else "4"}" + ]; + preBuild = '' sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile ''; diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix index 61b21ba88c015..c8c40de9d44cf 100644 --- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix +++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5"; }; + strictDeps = true; + buildInputs = [ glib gettext ]; nativeBuildInputs = [ flex bison pkg-config ]; + + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + # before openembedded removed libIDL + # the result was always ll https://lists.openembedded.org/g/openembedded-core/topic/85775262?p=%2C%2C%2C20%2C0%2C0%2C0%3A%3A%2C%2C%2C0%2C0%2C0%2C85775262 + "libIDL_cv_long_long_format=ll" + ]; } diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 2f2641a9a5c80..dc6e192ed1616 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -11,10 +11,18 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 gettext ]; - - NIX_LDFLAGS = "-lgmodule-2.0"; + strictDeps = true; + nativeBuildInputs = [ pkg-config gettext ]; + buildInputs = [ gtk2 ]; propagatedBuildInputs = [ libxml2 ]; + + postPatch = '' + # uses pkg-config in some places and uses the correct $PKG_CONFIG in some + # it's an ancient library so it has very old configure scripts and m4 + substituteInPlace ./configure \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + + NIX_LDFLAGS = "-lgmodule-2.0"; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix index b856442290a4a..529e73b874787 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade, glib }: stdenv.mkDerivation rec { pname = "libgnomecanvas"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + strictDeps = true; + buildInputs = [ libglade ]; - nativeBuildInputs = [ pkg-config intltool ]; + nativeBuildInputs = [ pkg-config intltool glib ]; propagatedBuildInputs = [ libart_lgpl gtk2 ]; } diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index 97508ed418c1a..650a2a2d2b0cc 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -23,13 +23,13 @@ , nautilus }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "file-roller"; - version = "43.0"; + version = "43.1"; src = fetchurl { - url = "mirror://gnome/sources/file-roller/${lib.versions.major version}/file-roller-${version}.tar.xz"; - sha256 = "KYcp/b252oEywLvGCQdRfWVoWwVhiuBRZzNeZIT1c6E="; + url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz"; + sha256 = "hJlAI5lyk76zRdl5Pbj18Lu0H6oVXG/7SDKPIDlXrQg="; }; nativeBuildInputs = [ @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members ++ teams.pantheon.members; mainProgram = "file-roller"; }; -} +}) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 03a3c63afd61a..5203941d06f1e 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -26,13 +26,13 @@ , geocode-glib_2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-maps"; - version = "45.1"; + version = "45.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-v2nFDi4ZsV280KDvOCfUAqGVq0ogKbm2LlSr8472334="; + url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz"; + hash = "sha256-6es3CnlxtPhC+qME0xpIXb2P+K7EKnZScvL8GnqAmPI="; }; doCheck = true; @@ -84,8 +84,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-maps"; + attrPath = "gnome.gnome-maps"; }; }; @@ -96,4 +96,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index a2959626c837b..f02f2e323e25e 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -140,6 +140,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; + mainProgram = "evince"; maintainers = teams.gnome.members ++ teams.pantheon.members; }; } diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index f44278f896c3c..25f9fe8c63401 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -5,7 +5,6 @@ , substituteAll , meson , ninja -, rsync , pkg-config , glib , itstool @@ -70,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - rsync gobject-introspection ]; @@ -131,33 +129,36 @@ stdenv.mkDerivation (finalAttrs: { ''; preInstall = '' - install -D ${override} $DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override + install -D ${override} "$DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override" ''; postInstall = '' # Move stuff from DESTDIR to proper location. - # We use rsync to merge the directories. - rsync --archive "$DESTDIR/etc" "$out" - rm --recursive "$DESTDIR/etc" for o in $(getAllOutputNames); do + # debug is created later by _separateDebugInfo hook. if [[ "$o" = "debug" ]]; then continue; fi - rsync --archive "$DESTDIR/''${!o}" "$(dirname "''${!o}")" - rm --recursive "$DESTDIR/''${!o}" + mv "$DESTDIR''${!o}" "$(dirname "''${!o}")" done - # Ensure the DESTDIR is removed. - rmdir "$DESTDIR/nix/store" "$DESTDIR/nix" "$DESTDIR" + + mv "$DESTDIR/etc" "$out" + + # Ensure we did not forget to install anything. + rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}" + ! test -e "$DESTDIR" # We are setting DESTDIR so the post-install script does not compile the schemas. glib-compile-schemas "$out/share/glib-2.0/schemas" ''; - # HACK: We want to install configuration files to $out/etc - # but GDM should read them from /etc on a NixOS system. - # With autotools, it was possible to override Make variables - # at install time but Meson does not support this - # so we need to convince it to install all files to a temporary - # location using DESTDIR and then move it to proper one in postInstall. - DESTDIR = "${placeholder "out"}/dest"; + env = { + # HACK: We want to install configuration files to $out/etc + # but GDM should read them from /etc on a NixOS system. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + DESTDIR = "dest"; + }; separateDebugInfo = true; diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index d59b5a1390655..69feddaaa84bf 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -66,13 +66,13 @@ , xvfb-run }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "45.1"; + version = "45.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0obHYnFQ4RKqy7S3uRcX+tjokHYGFHnfxhCy3XRLV3o="; + url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-DPo8My1u2stz0GxrJv/KEHjob/WerIGbKTHglndT33A="; }; patches = [ @@ -201,8 +201,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-control-center"; + attrPath = "gnome.gnome-control-center"; }; }; @@ -212,4 +212,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index 165497f11e2a7..be2ca4b5e09e6 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -38,7 +38,7 @@ index f6c84e3d2..cd897f8f5 100644 else gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE); diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h -index a2376f8a4..98769e08f 100644 +index feef16580..4b88ef7b1 100644 --- a/panels/datetime/tz.h +++ b/panels/datetime/tz.h @@ -27,11 +27,7 @@ @@ -55,26 +55,23 @@ index a2376f8a4..98769e08f 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c -index 505b8ee25..62e94009f 100644 +index ec5a905a5..689fdbebe 100644 --- a/panels/network/connection-editor/net-connection-editor.c +++ b/panels/network/connection-editor/net-connection-editor.c -@@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) - g_autoptr(GError) error = NULL; +@@ -377,7 +377,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) + GPid child_pid; - if (self->is_new_connection) { -- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); - } else { -- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'", -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'", - nm_connection_get_uuid (self->connection)); - } + builder = g_strv_builder_new (); +- g_strv_builder_add (builder, "nm-connection-editor"); ++ g_strv_builder_add (builder, "@networkmanagerapplet@/bin/nm-connection-editor"); + if (self->is_new_connection) { + g_autofree gchar *type_str = NULL; diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c -index 74dfb0e9a..5f53d1a20 100644 +index 303f4a8af..e5afc4dff 100644 --- a/panels/network/net-device-bluetooth.c +++ b/panels/network/net-device-bluetooth.c -@@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) +@@ -80,7 +80,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) update_off_switch_from_device_state (self->device_off_switch, state, self); /* set up the Options button */ @@ -83,7 +80,7 @@ index 74dfb0e9a..5f53d1a20 100644 gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); } -@@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) +@@ -131,7 +131,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); @@ -92,7 +89,7 @@ index 74dfb0e9a..5f53d1a20 100644 g_debug ("Launching '%s'\n", cmdline); if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) +@@ -173,7 +173,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) gtk_widget_init_template (GTK_WIDGET (self)); @@ -102,10 +99,10 @@ index 74dfb0e9a..5f53d1a20 100644 } diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c -index 34eb86241..50d0a2bed 100644 +index 166670224..36f720d36 100644 --- a/panels/network/net-device-mobile.c +++ b/panels/network/net-device-mobile.c -@@ -508,7 +508,7 @@ options_button_clicked_cb (NetDeviceMobile *self) +@@ -521,7 +521,7 @@ options_button_clicked_cb (NetDeviceMobile *self) connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); @@ -114,7 +111,7 @@ index 34eb86241..50d0a2bed 100644 g_debug ("Launching '%s'\n", cmdline); if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -797,7 +797,7 @@ net_device_mobile_init (NetDeviceMobile *self) +@@ -810,7 +810,7 @@ net_device_mobile_init (NetDeviceMobile *self) self->cancellable = g_cancellable_new (); @@ -137,12 +134,12 @@ index a31a606e3..ed5133d29 100644 /* Use SNMP to get printer's informations */ diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c -index 86f53d4fc..0b052856f 100644 +index edbc99830..1e1d90141 100644 --- a/panels/user-accounts/run-passwd.c +++ b/panels/user-accounts/run-passwd.c -@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) +@@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) gchar **envp; - gint my_stdin, my_stdout, my_stderr; + gint my_stdin, my_stdout; - argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ + argv[0] = "/run/wrappers/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ @@ -150,10 +147,10 @@ index 86f53d4fc..0b052856f 100644 envp = g_get_environ (); diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c -index 83d4cd091..e8784c722 100644 +index 5b7bc1f02..13ffe6ca8 100644 --- a/panels/user-accounts/user-utils.c +++ b/panels/user-accounts/user-utils.c -@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username, +@@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username, * future, so it would be nice to have some official way for this * instead of relying on the current "--login" implementation. */ diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 493e0342333f1..5c17a3eb59064 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -11,13 +11,13 @@ , substituteAll }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "45.1"; + version = "45.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JC4VoMBuggw/2N1q6sGo74Zc5YiC5Zda8dZZNLtNQmE="; + url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; + sha256 = "7jL2OHotGK2/96lWaJvHR4ZrSocS1zeQwAKr6uTMqq8="; }; patches = [ @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-shell-extensions"; + attrPath = "gnome.gnome-shell-extensions"; }; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 2471061ae4f09..85f5b5d42cb04 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -65,15 +65,15 @@ let pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "45.1"; + version = "45.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "FfykvWEpqLP5kBl/vR7ljXS2QVEK+q8Igqf6NmNPxfI="; + url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; + sha256 = "igz7+HKxp2JpbIbhPe/p82dekteVFOup0AC1thHCaiM="; }; patches = [ @@ -231,4 +231,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 03414346f6435..119ee0efeb54e 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -67,13 +67,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "45.1"; + version = "45.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "LNPF77Itt2x5MRyxiJoaqy/rNbSk3QPzgiqreZnaISw="; + sha256 = "rz+Ym/IqVg3CSS+44Z+do3zm1xRLPgUZgLDVUFiWANw="; }; mesonFlags = [ diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 395b4f41c76b6..6c96c54f86b5d 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -36,15 +36,15 @@ , gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "45.1"; + version = "45.2.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "I72qmoVGbFk3qJ2t3QgO0DvMK0notkr2ByBjU73oL+M="; + url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; + sha256 = "ul1T3zmhVVYt+XHvXjHoJwdJBdDEjqseskIaEChLmQ0="; }; patches = [ @@ -119,8 +119,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "nautilus"; + attrPath = "gnome.nautilus"; }; }; @@ -131,4 +131,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index e8be274a1f608..277d00f19d619 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -14,13 +14,13 @@ , wrapGAppsHook4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zenity"; - version = "3.99.2"; + version = "4.0.0"; src = fetchurl { - url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "oZR4kGuYi082fl6mOlkh5PmMuCVbugXrXK2LWhikFo8="; + url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz"; + sha256 = "C4yN7xjasFzEm9RkuQyn+UWuUv9eCSQtpwKhXZTT6N0="; }; nativeBuildInputs = [ @@ -54,4 +54,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index d356094942f32..0659e1fa56602 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -260,18 +260,6 @@ lib.makeScope pkgs.newScope (self: with self; { }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. - empathy = throw "The ‘gnome.empathy’ package was removed as it is unmaintained and no longer launches due to libsoup3 migration."; # added 2023-01-20 - gedit = pkgs.gedit; # added 2023-07-05 - gnome-desktop = throw "The ‘gnome.gnome-desktop’ alias was removed. Please use ‘pkgs.gnome-desktop’ directly."; # converted to throw on 2022-10-26 - gnome-todo = pkgs.endeavour; # added 2022-07-30 - libgnome-games-support = throw "The ‘gnome.libgnome-games-support’ alias was removed. Please use ‘pkgs.libgnome-games-support’ directly."; # converted to throw on 2022-10-26 - - gnome-books = throw "The ‘gnome.gnome-books’ package was removed as it is broken and abandoned."; # added 2022-10-26 - gnome-documents = throw "The ‘gnome.gnome-documents’ package was removed as it is broken and abandoned."; # added 2022-10-26 - gnome-devel-docs = throw "The ‘gnome.gnome-devel-docs’ package was removed as it is outdated and no longer relevant."; # added 2022-10-26 - - mutter338 = throw "The ‘gnome.mutter338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 - mutter42 = throw "The ‘gnome.mutter42’ package was removed as it is no longer needed by Pantheon."; # added 2023-03-23 - gnome-settings-daemon338 = throw "The ‘gnome.gnome-settings-daemon338’ package was removed as it is no longer needed by Pantheon."; # added 2023-02-22 - gnome-settings-daemon42 = throw "The ‘gnome.gnome-settings-daemon42’ package was removed as it is no longer needed by Pantheon."; # added 2023-03-23 + gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ directly."; # converted to throw on 2023-12-27 + gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27 } diff --git a/pkgs/desktops/gnome/extensions/argos/default.nix b/pkgs/desktops/gnome/extensions/argos/default.nix index 83828b99b16d0..cc12c5dc2015d 100644 --- a/pkgs/desktops/gnome/extensions/argos/default.nix +++ b/pkgs/desktops/gnome/extensions/argos/default.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, lib, stdenv }: stdenv.mkDerivation rec { - pname = "argos-unstable"; - version = "20230404"; + pname = "argos"; + version = "unstable-2023-09-26"; src = fetchFromGitHub { owner = "p-e-w"; repo = "argos"; - rev = "e2d68ea23eed081fccaec06c384e2c5d2acb5b6b"; - hash = "sha256-OJ/bUQkBQdlfEIqmneyUeIJoytTxyfibdyUDf3SJc0Q="; + rev = "adfaa31e8c08f7b59e9492891a7e6f753c29b35e"; # https://github.com/p-e-w/argos/pull/150 + hash = "sha256-st8AeMRtkvM4M/Z70qopjw9Yx0t9l0DsUke4ClQtcBU="; }; installPhase = '' diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index 686f8031ec865..bfb5f4ff33e63 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -35,6 +35,7 @@ let lib.trivial.pipe extensions [ (map (extension: lib.nameValuePair extension.extensionUuid extension)) builtins.listToAttrs + (attrs: attrs // { __attrsFailEvaluation = true; }) ]; # Map the list of extensions to an attrset based on the pname as key, which is more human readable than the UUID @@ -66,6 +67,7 @@ in rec { # Keep the last three versions in here gnomeExtensions = lib.trivial.pipe (gnome43Extensions // gnome44Extensions // gnome45Extensions) [ + (v: builtins.removeAttrs v [ "__attrsFailEvaluation" ]) # Apply some custom patches for automatically packaged extensions (callPackage ./extensionOverrides.nix {}) # Add all manually packaged extensions @@ -88,4 +90,5 @@ in rec { # Make the set "public" lib.recurseIntoAttrs ]; + } diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index d200a80a30fbe..77b09d870509d 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -23,7 +23,6 @@ , vte , wrapGAppsHook , xdg-utils -, xprop }: let # Helper method to reduce redundancy @@ -50,6 +49,7 @@ super: lib.trivial.pipe super [ nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; buildInputs = [ vte ]; postFixup = '' + substituteInPlace "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/bin/com.github.amezin.ddterm" --replace "gjs" "${gjs}/bin/gjs" wrapGApp "$out/share/gnome-shell/extensions/ddterm@amezin.github.com/bin/com.github.amezin.ddterm" ''; })) @@ -119,6 +119,16 @@ super: lib.trivial.pipe super [ ]; })) + (patchExtension "system-monitor-next@paradoxxx.zero.gmail.com" (old: { + patches = [ + (substituteAll { + src = ./extensionOverridesPatches/system-monitor-next_at_paradoxxx.zero.gmail.com.patch; + gtop_path = "${libgtop}/lib/girepository-1.0"; + }) + ]; + meta.maintainers = with lib.maintainers; [ andersk ]; + })) + (patchExtension "tophat@fflewddur.github.io" (old: { patches = [ (substituteAll { @@ -137,12 +147,6 @@ super: lib.trivial.pipe super [ ]; })) - (patchExtension "unite@hardpixel.eu" (old: { - buildInputs = [ xprop ]; - - meta.maintainers = with lib.maintainers; [ rhoriguchi ]; - })) - (patchExtension "x11gestures@joseexposito.github.io" (old: { # Extension can't find Touchegg # https://github.com/NixOS/nixpkgs/issues/137621 diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/shell-volume-mixer_at_derhofbauer.at.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/shell-volume-mixer_at_derhofbauer.at.patch deleted file mode 100644 index f1064feb54b8d..0000000000000 --- a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/shell-volume-mixer_at_derhofbauer.at.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/lib/utils/paHelper.js b/lib/utils/paHelper.js -index be28d21..a410a63 100755 ---- a/lib/utils/paHelper.js -+++ b/lib/utils/paHelper.js -@@ -57,13 +57,7 @@ async function execHelper(type, index = undefined) { - return null; - } - -- const python = await findPython(); -- -- if (!python) { -- return null; -- } -- -- const args = ['/usr/bin/env', python, paUtilPath, type]; -+ const args = ['@python3@/bin/python', paUtilPath, type]; - - if (!isNaN(index)) { - args.push(index); -diff --git a/pautils/lib/libpulse.py b/pautils/lib/libpulse.py -index a32c272..8225f2f 100755 ---- a/pautils/lib/libpulse.py -+++ b/pautils/lib/libpulse.py -@@ -16,7 +16,7 @@ - from ctypes import * - - try: -- lib = CDLL('libpulse.so.0') -+ lib = CDLL('@pulseaudio@/lib/libpulse.so.0') - except: - lib = CDLL('libpulse.so') - diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/system-monitor-next_at_paradoxxx.zero.gmail.com.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/system-monitor-next_at_paradoxxx.zero.gmail.com.patch new file mode 100644 index 0000000000000..19eedbf27a985 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/system-monitor-next_at_paradoxxx.zero.gmail.com.patch @@ -0,0 +1,30 @@ +diff --git a/extension.js b/extension.js +index ee8c3a9..ca72885 100644 +--- a/extension.js ++++ b/extension.js +@@ -21,6 +21,7 @@ + import { Extension, gettext as _ } from "resource:///org/gnome/shell/extensions/extension.js"; + + import Clutter from "gi://Clutter"; ++import GIRepository from "gi://GIRepository"; + import GLib from "gi://GLib"; + import GObject from "gi://GObject"; + +@@ -28,7 +29,6 @@ import Gio from "gi://Gio"; + import Shell from "gi://Shell"; + import St from "gi://St"; + import UPowerGlib from "gi://UPowerGlib"; +-import GTop from "gi://GTop"; + import NM from "gi://NM"; + + import * as ModalDialog from "resource:///org/gnome/shell/ui/modalDialog.js"; +@@ -41,6 +41,9 @@ import * as PopupMenu from "resource:///org/gnome/shell/ui/popupMenu.js"; + + import * as Util from "resource:///org/gnome/shell/misc/util.js"; + ++GIRepository.Repository.prepend_search_path('@gtop_path@'); ++const GTop = (await import("gi://GTop")).default; ++ + const NetworkManager = NM; + const UPower = UPowerGlib; + // Copied as of https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/5fa08fe53376f5dca755360bd005a4a51ca78917/js/ui/panel.js#L45 diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix index ebd2cc93f2a2e..28bc635a7ad4b 100644 --- a/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -88,7 +88,6 @@ # ####### GNOME 40 ####### - "system-monitor@paradoxxx.zero.gmail.com" = "system-monitor"; # manually packaged "System_Monitor@bghome.gmail.com" = "system-monitor-2"; "Hide_Activities@shay.shayel.org" = "hide-activities-button"; @@ -110,9 +109,6 @@ "azan@faissal.bensefia.id" = "azan-islamic-prayer-times"; "azan@hatem.masmoudi.org" = null; - # That extension is broken because of https://github.com/NixOS/nixpkgs/issues/118612 - "flypie@schneegans.github.com" = null; - # ############################################################################ # Overrides for extensions that were manually packaged in the past but are gradually # being replaced by automatic packaging where possible. diff --git a/pkgs/desktops/gnome/extensions/extensions.json b/pkgs/desktops/gnome/extensions/extensions.json index eae2f796108ea..7b2abf6d2ee5e 100644 --- a/pkgs/desktops/gnome/extensions/extensions.json +++ b/pkgs/desktops/gnome/extensions/extensions.json @@ -32,7 +32,7 @@ "42": {"version": "51", "sha256": "016ngp84g47p904kk9jzfn5mkpy774fj7h70v53dlqc9s7c58r6s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"}, "43": {"version": "52", "sha256": "0h9b0kw919sfcx4l4ffi96fgvhgqnvssgwkbf3qh4lyqs4avb2xy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "44": {"version": "53", "sha256": "18wh0z8pq991i2kcp4a5dpx6m05qansm357k98n258j1q3jxac5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mwp9"}, - "45": {"version": "55", "sha256": "1vdbc460b1v7r5i9afdrdi7w77dk1gflzwa18ndgl083v4pzk1lh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NQp9"} + "45": {"version": "56", "sha256": "1k8048dmqyyh3vzamafj90qsn4m98kj7gz5f4hj7z9bqdi38nn6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Ngp9"} }} , {"uuid": "drive-menu@gnome-shell-extensions.gcampax.github.com", "name": "Removable Drive Menu", "pname": "removable-drive-menu", "description": "A status menu for accessing and unmounting removable devices.", "link": "https://extensions.gnome.org/extension/7/removable-drive-menu/", "shell_version_map": { "38": {"version": "45", "sha256": "1f5a9md2gxbl65shbdm498y5dwhhqdpj96gvf2m81ad7gsgxzliv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlJlbW92YWJsZSBEcml2ZSBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyaXZlLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJkcml2ZS1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="}, @@ -41,7 +41,7 @@ "42": {"version": "51", "sha256": "1mjxrmlcrn1c9plcmvs4pgmm13jxc7c7v3s4d3xbl2bp096878dc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTEKfQ=="}, "43": {"version": "52", "sha256": "0zn9xkw5r0j1kwbs78j7chp4l2404d177w3a4shjd765hvjy6wam", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTIKfQ=="}, "44": {"version": "53", "sha256": "01wn2icq1cnly9xg7pr2pzk4vqw4l5fhasy5hvq3pq8mbidmdm5s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTMKfQ=="}, - "45": {"version": "56", "sha256": "1wvghdv26sda93q1m48lmqsh0946nmh8ff84pz2fqlc54c9aclad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTYKfQ=="} + "45": {"version": "57", "sha256": "1a2j8l2wmxx97snqrj5hs9y0qcjwkv9g00bgr0968h8rpy4fl56y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="} }} , {"uuid": "places-menu@gnome-shell-extensions.gcampax.github.com", "name": "Places Status Indicator", "pname": "places-status-indicator", "description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/8/places-status-indicator/", "shell_version_map": { "38": {"version": "48", "sha256": "05m8nkg2km72iwnmadx6f4br8qnzqagp78mlhz8r2z6hp19nqsh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiUGxhY2VzIFN0YXR1cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGxhY2VzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"}, @@ -50,7 +50,7 @@ "42": {"version": "54", "sha256": "1sfifdzglmn5x3qxs9k0dn4rwislsyzvp2w3dn47x26mvc90zb90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "43": {"version": "55", "sha256": "19pw472bjz3j9z1s23q4rxsjmz0x54fcpi968yw7k8ivd1cihfx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NQp9"}, "44": {"version": "56", "sha256": "0fc52km2aj7c4n1q6y4yf2l4nzzwawyizi8d6d0b1wrcqa8n64n6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Ngp9"}, - "45": {"version": "58", "sha256": "0qpgd7m5ps9hn02miy4irih9fgiqpwccak8w8lsbv00viyxidq5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1OAp9"} + "45": {"version": "59", "sha256": "1sai071js4l70mm8cfnr8yavisiy5wbdifkhc9wl4pqj12g33x31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1OQp9"} }} , {"uuid": "windowsNavigator@gnome-shell-extensions.gcampax.github.com", "name": "windowNavigator", "pname": "windownavigator", "description": "Allow keyboard selection of windows and workspaces in overlay mode. <Ctrl>number selects a workspace, and <Alt>number selects a window.", "link": "https://extensions.gnome.org/extension/10/windownavigator/", "shell_version_map": { "38": {"version": "49", "sha256": "1rzfnssk0iw1ysaya79ksghikkr1rpm41h2w39cz142fby6kip2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAid2luZG93TmF2aWdhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInphc3BpcmVAcmFtYmxlci5ydSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3dzTmF2aWdhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93c05hdmlnYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OQp9"}, @@ -59,7 +59,7 @@ "42": {"version": "57", "sha256": "1w3rf6y7l2qgg4ya8cqlj8a6wf8l4yqfjlh17mpmi6gmfzsxplnf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="}, "43": {"version": "58", "sha256": "1l5fiajbv9484ln7kkq5nm4ph71ir9fnav6gqhyzbfhbx94qh9gd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU4Cn0="}, "44": {"version": "59", "sha256": "1pa1i7scsjj91dql0v6zajyx30w446r1cxknl0dp1fpmydqwxjpl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU5Cn0="}, - "45": {"version": "61", "sha256": "10a8xpvsfbwvjpzd1q7afni0zv0pvha63jk2skvxhjdmxxvcc2fw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYxCn0="} + "45": {"version": "62", "sha256": "10d6hj0nbnfq55lqjjmilb8f6v2cv70kk6bnzyj3cn832hrz959a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYyCn0="} }} , {"uuid": "Applications_Menu@rmy.pobox.com", "name": "Frippery Applications Menu", "pname": "applications-menu", "description": "Replace Activities button with an Applications menu", "link": "https://extensions.gnome.org/extension/13/applications-menu/", "shell_version_map": { "38": {"version": "45", "sha256": "0kg9dq1ssa11xizb31kcq3p724qzm1cmf30wriqffj043n5nd125", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBBcHBsaWNhdGlvbnMgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImZyaXBwZXJ5LWFwcGxpY2F0aW9ucy1tZW51IiwKICAibmFtZSI6ICJGcmlwcGVyeSBBcHBsaWNhdGlvbnMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkuYXBwbGljYXRpb25zLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHA6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiQXBwbGljYXRpb25zX01lbnVAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"}, @@ -77,7 +77,7 @@ "42": {"version": "49", "sha256": "031ppsjqv3y81wcjjsm14rqfh0l7vvaavy01hlqfyglpk8vlfvml", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "43": {"version": "50", "sha256": "0s0ky7sslyf2cy68xlqrrz01py82wi861gpcfqj97qdwdf9hzq2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUwCn0="}, "44": {"version": "51", "sha256": "1j9nba9r5a56c2ks61jbrr6n8gc470g4c0lig9r4angqhc6sn7bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUxCn0="}, - "45": {"version": "53", "sha256": "1lvmmmg9gp0zsgd8x2i91b34vhpmjvmc9w6ym18qw7jir1193wcb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUzCn0="} + "45": {"version": "54", "sha256": "11gxlyp83096ky0iqd8svn802ih7knvhn3qml6532c1h2xv8krlp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU0Cn0="} }} , {"uuid": "native-window-placement@gnome-shell-extensions.gcampax.github.com", "name": "Native Window Placement", "pname": "native-window-placement", "description": "Arrange windows in overview in a more compact way.", "link": "https://extensions.gnome.org/extension/18/native-window-placement/", "shell_version_map": { "38": {"version": "45", "sha256": "15vhdcfrfbsinp0m1jfygjl4djccafhvgwc1rsi321jvykqhajmm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTmF0aXZlIFdpbmRvdyBQbGFjZW1lbnQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndlcG1hc2NoZGFAZ214LmRlIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXRpdmUtd2luZG93LXBsYWNlbWVudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="}, @@ -86,7 +86,7 @@ "42": {"version": "51", "sha256": "1i9grnrd07zpsshf1710ag4y0zqwgi1c7rrarb8l55w45slg2254", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUxCn0="}, "43": {"version": "52", "sha256": "09660cb8y0549py4d4wrl2fhg7grl0c1fnakzznvfwzh0cdr3f8r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUyCn0="}, "44": {"version": "53", "sha256": "18k0b7vsjmvbvnzb5b5qa3jk0i14ah93cwi1399m6ma9llhyhwjw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUzCn0="}, - "45": {"version": "55", "sha256": "06jaxz3j9hyv3whmqgayp2bzng1019q7vgskjs6xr0plj14zkzlx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU1Cn0="} + "45": {"version": "56", "sha256": "0g864ji4bazc7x25qqjrcayhpq8sqrabxdwfl7iviz7s0yc40iz0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU2Cn0="} }} , {"uuid": "user-theme@gnome-shell-extensions.gcampax.github.com", "name": "User Themes", "pname": "user-themes", "description": "Load shell themes from user directory.", "link": "https://extensions.gnome.org/extension/19/user-themes/", "shell_version_map": { "38": {"version": "42", "sha256": "0jykwcd8pmvr03dm2vala6nzzhi9i83c11svgx8wymfvxr5qrya8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVc2VyIFRoZW1lcyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInVzZXItdGhlbWVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, @@ -95,7 +95,7 @@ "42": {"version": "49", "sha256": "0ykaw2602iixn87fc65h6vwxzlcjidpp9hpcsmf66r0f6xibgpah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OQp9"}, "43": {"version": "50", "sha256": "0jyd2rn2nlvcmx8xn2azhbaqf5k0kgyx8ciy6bj1iq35s7k5sp7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}, "44": {"version": "51", "sha256": "0m7gw3lcds1r6d8q5962bjxb4b2hqy633c73axxc5gvyr9i0bjf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"}, - "45": {"version": "53", "sha256": "0hmd7hkzb8rcr3r65km07jkdgmm92xhkvi9zj5628z4hd648h0c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mwp9"} + "45": {"version": "54", "sha256": "0gpkxmjaaq9rmh16wf5cf24q2w2wb0z0z8v7mcg7wrwsjszg7xhb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"} }} , {"uuid": "workspace-indicator@gnome-shell-extensions.gcampax.github.com", "name": "Workspace Indicator", "pname": "workspace-indicator", "description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one.", "link": "https://extensions.gnome.org/extension/21/workspace-indicator/", "shell_version_map": { "38": {"version": "45", "sha256": "16y7zhlsj0qjwwj78fvcr81m7081i2y30gwjm35qahr3j0gfrk16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlcmljay5yZWRAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid29ya3NwYWNlLWluZGljYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"}, @@ -104,7 +104,7 @@ "42": {"version": "52", "sha256": "1i0jm0k3rjk97283p0iv0nx2cclij0kx7dqb35a7kd2pxh89jn8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUyCn0="}, "43": {"version": "53", "sha256": "0idl8n6205ymh1z3w15sxv98940q8qch2pp5wk9gzd594i2aya2p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUzCn0="}, "44": {"version": "54", "sha256": "03jq25xa3z0b32vczqv12gkfdmw4ll56zb0walm5gfmmmzivsn1i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU0Cn0="}, - "45": {"version": "56", "sha256": "059y1pjnlihihvs41aka19aqpj1r2qh3xs8w7379l780x943wa6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU2Cn0="} + "45": {"version": "57", "sha256": "0qpzc1njng95ck1svw9nig2j9i5p7nqbgaxm1x7gg3i9jn8rgwqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="} }} , {"uuid": "gTile@vibou", "name": "gTile", "pname": "gtile", "description": "Tile windows on a grid", "link": "https://extensions.gnome.org/extension/28/gtile/", "shell_version_map": { "38": {"version": "52", "sha256": "0j3mva9qzsz3nvww9d99ig5z4nr9g339lirmavfzry9yf8l29cwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTIKfQ=="}, @@ -112,7 +112,8 @@ "41": {"version": "52", "sha256": "0j3mva9qzsz3nvww9d99ig5z4nr9g339lirmavfzry9yf8l29cwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTIKfQ=="}, "42": {"version": "52", "sha256": "0j3mva9qzsz3nvww9d99ig5z4nr9g339lirmavfzry9yf8l29cwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTIKfQ=="}, "43": {"version": "52", "sha256": "0j3mva9qzsz3nvww9d99ig5z4nr9g339lirmavfzry9yf8l29cwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTIKfQ=="}, - "44": {"version": "52", "sha256": "0j3mva9qzsz3nvww9d99ig5z4nr9g339lirmavfzry9yf8l29cwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTIKfQ=="} + "44": {"version": "52", "sha256": "0j3mva9qzsz3nvww9d99ig5z4nr9g339lirmavfzry9yf8l29cwz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZSIsCiAgInV1aWQiOiAiZ1RpbGVAdmlib3UiLAogICJ2ZXJzaW9uIjogNTIKfQ=="}, + "45": {"version": "55", "sha256": "1v420fy9935f13m56z5nxj7f6g530njb4cxxlq28wd9s1p04h9d1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dUaWxlIiwKICAidXVpZCI6ICJnVGlsZUB2aWJvdSIsCiAgInZlcnNpb24iOiA1NQp9"} }} , {"uuid": "lockkeys@vaina.lt", "name": "Lock Keys", "pname": "lock-keys", "description": "Numlock & Capslock status on the panel.", "link": "https://extensions.gnome.org/extension/36/lock-keys/", "shell_version_map": { "38": {"version": "52", "sha256": "02190kcp0c1mzlxf4ax0shk7r6zh9adynidxnjdhbkwl9knxalra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYXp5c21hc3Rlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbG9ja2tleXMiLAogICJ1dWlkIjogImxvY2trZXlzQHZhaW5hLmx0IiwKICAidmVyc2lvbiI6IDUyCn0="}, @@ -350,7 +351,7 @@ "42": {"version": "34", "sha256": "1vx1dbb8sq5ss3ilqah92nja6ivqnijywj2wkg29akz8ijbss19f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "43": {"version": "35", "sha256": "1i96p4jzi3yfkccbzv7r7x059xr834wispzg1n2888im51zz6x4h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}, "44": {"version": "36", "sha256": "06rhp1difpb7j1l49lay3h5wscf8nv2p0xqs70rss6yvjywsgi34", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}, - "45": {"version": "38", "sha256": "0y6c8s90cy5qzmaly9j8ccyr7ac7798rfv1v9y12jccwmmqr6y1f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="} + "45": {"version": "39", "sha256": "0ap68r89z2z95vvmr6k009gczijanlkp002dbvkr5dpvzknzzc09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="} }} , {"uuid": "window-list@gnome-shell-extensions.gcampax.github.com", "name": "Window List", "pname": "window-list", "description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/602/window-list/", "shell_version_map": { "38": {"version": "34", "sha256": "06jww5sv3a32plbvnl1xch10y19q807dx6zn6z5gwpvq8n0nvnx3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIldpbmRvdyBMaXN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvdy1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, @@ -359,7 +360,7 @@ "42": {"version": "46", "sha256": "12h8601f1hl4cfr3gh9pykibb9lh7l0v01s80cjz0lc72c64j9qz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDYKfQ=="}, "43": {"version": "47", "sha256": "1nzdl0zb8i7wipsnnrixkpj6rrsv3vz4c1snqspb23h494232wmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "44": {"version": "48", "sha256": "121n3vcy1kk3vj7say292synnl5ig3kl94i039d2b40pslh4zlq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDgKfQ=="}, - "45": {"version": "50", "sha256": "1p4v0z4k74j4w4glsm8zivmh6kjpqc3ywb2zi29ncilxh5fvvfl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="} + "45": {"version": "51", "sha256": "1nb3iwyhn08m9ylyb8jn9lncqmj08vrldvjvn642wkibi0vg1dwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTEKfQ=="} }} , {"uuid": "MultiClock@mibus.org", "name": "MultiClock", "pname": "multiclock", "description": "A clock for showing a second timezone in the panel.", "link": "https://extensions.gnome.org/extension/605/multiclock/", "shell_version_map": { "40": {"version": "8", "sha256": "1pp1cnmpix668mrywpv6mkyb45lw7f6cwibjl6bc7cgb01hkzd53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgY2xvY2sgZm9yIHNob3dpbmcgYSBzZWNvbmQgdGltZXpvbmUgaW4gdGhlIHBhbmVsLiIsCiAgIm5hbWUiOiAiTXVsdGlDbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5taWJ1c011bHRpQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWJ1cy9NdWx0aUNsb2NrIiwKICAidXVpZCI6ICJNdWx0aUNsb2NrQG1pYnVzLm9yZyIsCiAgInZlcnNpb24iOiA4Cn0="} @@ -379,7 +380,8 @@ "41": {"version": "65", "sha256": "10jg1ixk0zfb67licr807wf68bzsdiv9fb9j40xjg49li72c6hrf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY1IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLWJpdGNvaW4tbWFya2V0cy8iLAogICJ1dWlkIjogImJpdGNvaW4tbWFya2V0c0BvdHRvYWxsbWVuZGluZ2VyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="}, "42": {"version": "66", "sha256": "0a1156n4ding1ypjnxm1xz5cqihrf5m2d4bf2zmci29nsjina9c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY2IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Ngp9"}, "43": {"version": "67", "sha256": "114kwp1q0qzkd03851mky1syxz8i5zgvazb53rh800wacb4wsh5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY3IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Nwp9"}, - "44": {"version": "68", "sha256": "1b936kcvc29p19nzwk32bswgjd7bsj5ap47fw65cz81rracb46fi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY4IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2OAp9"} + "44": {"version": "68", "sha256": "1b936kcvc29p19nzwk32bswgjd7bsj5ap47fw65cz81rracb46fi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY4IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2OAp9"}, + "45": {"version": "70", "sha256": "0xn36w185lzx2zxcrr2d8kx5qavn4ymj2yrcdkwdxkl3madg1b29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjcwIiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3MAp9"} }} , {"uuid": "ShellTile@emasab.it", "name": "ShellTile", "pname": "shelltile", "description": "A tiling window extension for GNOME Shell. Just move a window to the edges of the screen to create a tiling, otherwise move a window over another one, holding down the Control key. Grouped windows minimize, resize, raise and change workspace together. Move or maximize a window to remove it from the group.", "link": "https://extensions.gnome.org/extension/657/shelltile/", "shell_version_map": { "38": {"version": "69", "sha256": "1kpsqaq2fcj1z3jcbvgh23c8k6bv9l6vyl05kpw0fclzsmy60mh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGlsaW5nIHdpbmRvdyBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBKdXN0IG1vdmUgYSB3aW5kb3cgdG8gdGhlIGVkZ2VzIG9mIHRoZSBzY3JlZW4gdG8gY3JlYXRlIGEgdGlsaW5nLCBvdGhlcndpc2UgbW92ZSBhIHdpbmRvdyBvdmVyIGFub3RoZXIgb25lLCBob2xkaW5nIGRvd24gdGhlIENvbnRyb2wga2V5LiBHcm91cGVkIHdpbmRvd3MgbWluaW1pemUsIHJlc2l6ZSwgcmFpc2UgYW5kIGNoYW5nZSB3b3Jrc3BhY2UgdG9nZXRoZXIuIE1vdmUgb3IgbWF4aW1pemUgYSB3aW5kb3cgdG8gcmVtb3ZlIGl0IGZyb20gdGhlIGdyb3VwLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsdGlsZSIsCiAgIm5hbWUiOiAiU2hlbGxUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsdGlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW1hc2FiL3NoZWxsdGlsZSIsCiAgInV1aWQiOiAiU2hlbGxUaWxlQGVtYXNhYi5pdCIsCiAgInZlcnNpb24iOiA2OQp9"} @@ -575,7 +577,7 @@ "42": {"version": "29", "sha256": "1qsqdasff8b3m8h4739y98jcmi5dvv0shq1f4mglkrfh6cx2ry23", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "43": {"version": "30", "sha256": "036h42fs0yjgfjncvv97wpb2y860rhncfhz0znw4npj0gab5pn42", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "44": {"version": "32", "sha256": "1km4mvmv9350172fjihzmjd18l6ypm8hb22vz1k09xpcas01p448", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}, - "45": {"version": "34", "sha256": "083lg2cgkqcx6g7a6ixfbbd105zw5kxydkgab7l35mk3qykqkwwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="} + "45": {"version": "35", "sha256": "0id9z143wm1xqb4ppvvwrfqrjm9qwaqgxz6hb37s0h2gvr5lamw2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="} }} , {"uuid": "mailnag@pulb.github.com", "name": "Mailnag", "pname": "mailnag", "description": "Mail indicator (GMail, IMAP, POP) for GNOME.\n\nPlease note that this extension requires the mailnag daemon.\nInstall it from your distros package repositories or get it here:\nhttps://github.com/pulb/mailnag\n\nPlease also note that this version of the extension does not support avatars (as shown in the screenshot).\nIf you like to have avatar support install this extension from your distros package repositories or get a package from here:\nhttps://github.com/pulb/mailnag-gnome-shell\n\nIMPORTANT:\nI do not get notifications for user comments. Please always report bugs here:\nhttps://github.com/pulb/mailnag-gnome-shell/issues", "link": "https://extensions.gnome.org/extension/886/mailnag/", "shell_version_map": { "38": {"version": "20", "sha256": "15n816y34qlc7va72q75ngzw1my3n5j7xhg9a6dc0g8q4dd0g2r9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1haWwgaW5kaWNhdG9yIChHTWFpbCwgSU1BUCwgUE9QKSBmb3IgR05PTUUuXG5cblBsZWFzZSBub3RlIHRoYXQgdGhpcyBleHRlbnNpb24gcmVxdWlyZXMgdGhlIG1haWxuYWcgZGFlbW9uLlxuSW5zdGFsbCBpdCBmcm9tIHlvdXIgZGlzdHJvcyBwYWNrYWdlIHJlcG9zaXRvcmllcyBvciBnZXQgaXQgaGVyZTpcbmh0dHBzOi8vZ2l0aHViLmNvbS9wdWxiL21haWxuYWdcblxuUGxlYXNlIGFsc28gbm90ZSB0aGF0IHRoaXMgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGRvZXMgbm90IHN1cHBvcnQgYXZhdGFycyAoYXMgc2hvd24gaW4gdGhlIHNjcmVlbnNob3QpLlxuSWYgeW91IGxpa2UgdG8gaGF2ZSBhdmF0YXIgc3VwcG9ydCBpbnN0YWxsIHRoaXMgZXh0ZW5zaW9uIGZyb20geW91ciBkaXN0cm9zIHBhY2thZ2UgcmVwb3NpdG9yaWVzIG9yIGdldCBhIHBhY2thZ2UgZnJvbSBoZXJlOlxuaHR0cHM6Ly9naXRodWIuY29tL3B1bGIvbWFpbG5hZy1nbm9tZS1zaGVsbFxuXG5JTVBPUlRBTlQ6XG5JIGRvIG5vdCBnZXQgbm90aWZpY2F0aW9ucyBmb3IgdXNlciBjb21tZW50cy4gUGxlYXNlIGFsd2F5cyByZXBvcnQgYnVncyBoZXJlOlxuaHR0cHM6Ly9naXRodWIuY29tL3B1bGIvbWFpbG5hZy1nbm9tZS1zaGVsbC9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJtYWlsbmFnLWdub21lLXNoZWxsIiwKICAibmFtZSI6ICJNYWlsbmFnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1haWxuYWciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibWFpbG5hZ0BwdWxiLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, @@ -737,7 +739,8 @@ , {"uuid": "text-scaler@gnome-shell-extensions.mariospr.org", "name": "Text Scaler", "pname": "text-scaler", "description": "Simple extension to easily define arbitrary values for the text scaling factor", "link": "https://extensions.gnome.org/extension/1018/text-scaler/", "shell_version_map": { "42": {"version": "14", "sha256": "11k6gnk2riry80brvfkjx5m5x51613l8g7gpgdzigjk5krdbhc6p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gZWFzaWx5IGRlZmluZSBhcmJpdHJhcnkgdmFsdWVzIGZvciB0aGUgdGV4dCBzY2FsaW5nIGZhY3RvciIsCiAgImdldHRleHQtZG9tYWluIjogInRleHQtc2NhbGVyIiwKICAibmFtZSI6ICJUZXh0IFNjYWxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmlvc3ByL3RleHQtc2NhbGVyLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGV4dC1zY2FsZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5tYXJpb3Nwci5vcmciLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "43": {"version": "14", "sha256": "11k6gnk2riry80brvfkjx5m5x51613l8g7gpgdzigjk5krdbhc6p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gZWFzaWx5IGRlZmluZSBhcmJpdHJhcnkgdmFsdWVzIGZvciB0aGUgdGV4dCBzY2FsaW5nIGZhY3RvciIsCiAgImdldHRleHQtZG9tYWluIjogInRleHQtc2NhbGVyIiwKICAibmFtZSI6ICJUZXh0IFNjYWxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmlvc3ByL3RleHQtc2NhbGVyLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGV4dC1zY2FsZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5tYXJpb3Nwci5vcmciLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, - "44": {"version": "14", "sha256": "11k6gnk2riry80brvfkjx5m5x51613l8g7gpgdzigjk5krdbhc6p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gZWFzaWx5IGRlZmluZSBhcmJpdHJhcnkgdmFsdWVzIGZvciB0aGUgdGV4dCBzY2FsaW5nIGZhY3RvciIsCiAgImdldHRleHQtZG9tYWluIjogInRleHQtc2NhbGVyIiwKICAibmFtZSI6ICJUZXh0IFNjYWxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmlvc3ByL3RleHQtc2NhbGVyLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGV4dC1zY2FsZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5tYXJpb3Nwci5vcmciLAogICJ2ZXJzaW9uIjogMTQKfQ=="} + "44": {"version": "14", "sha256": "11k6gnk2riry80brvfkjx5m5x51613l8g7gpgdzigjk5krdbhc6p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gZWFzaWx5IGRlZmluZSBhcmJpdHJhcnkgdmFsdWVzIGZvciB0aGUgdGV4dCBzY2FsaW5nIGZhY3RvciIsCiAgImdldHRleHQtZG9tYWluIjogInRleHQtc2NhbGVyIiwKICAibmFtZSI6ICJUZXh0IFNjYWxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmlvc3ByL3RleHQtc2NhbGVyLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGV4dC1zY2FsZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5tYXJpb3Nwci5vcmciLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, + "45": {"version": "16", "sha256": "0127qq7cwsr300mkvmwpll9m6dwj1xnly0z8y4djspw3rhyqrc7r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gZWFzaWx5IGRlZmluZSBhcmJpdHJhcnkgdmFsdWVzIGZvciB0aGUgdGV4dCBzY2FsaW5nIGZhY3RvciIsCiAgImdldHRleHQtZG9tYWluIjogInRleHQtc2NhbGVyIiwKICAibmFtZSI6ICJUZXh0IFNjYWxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJpb3Nwci90ZXh0LXNjYWxlci1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRleHQtc2NhbGVyQGdub21lLXNoZWxsLWV4dGVuc2lvbnMubWFyaW9zcHIub3JnIiwKICAidmVyc2lvbiI6IDE2Cn0="} }} , {"uuid": "icinga-checker@sosulski.net", "name": "Icinga checker", "pname": "icinga-checker", "description": "Icinga/Nagios checker", "link": "https://extensions.gnome.org/extension/1029/icinga-checker/", "shell_version_map": { "38": {"version": "17", "sha256": "1j14ibzkqfy3zvk09nxnb9yaw4rlw7gb1nzg49h29c5cmnv57l1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImljaW5nYS1jaGVja2VyQHNvc3Vsc2tpLm5ldCIsCiAgInZlcnNpb24iOiAxNwp9"}, @@ -794,7 +797,8 @@ "41": {"version": "28", "sha256": "0kv6s72wg5ws02ixy6nddwdlinipqkr7wv549rgm4cgb73qb2mvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "42": {"version": "28", "sha256": "0kv6s72wg5ws02ixy6nddwdlinipqkr7wv549rgm4cgb73qb2mvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "43": {"version": "28", "sha256": "0kv6s72wg5ws02ixy6nddwdlinipqkr7wv549rgm4cgb73qb2mvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, - "44": {"version": "28", "sha256": "0kv6s72wg5ws02ixy6nddwdlinipqkr7wv549rgm4cgb73qb2mvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="} + "44": {"version": "28", "sha256": "0kv6s72wg5ws02ixy6nddwdlinipqkr7wv549rgm4cgb73qb2mvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, + "45": {"version": "31", "sha256": "0fxj3gc5p0s84nclpxqqhdxqmlwdsm1xjmzbjncfyd1ashpx7fy1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbHZldGVtZWR2ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogIlN5c3RlbV9Nb25pdG9yQGJnaG9tZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzEKfQ=="} }} , {"uuid": "syncthing@gnome.2nv2u.com", "name": "Syncthing Indicator", "pname": "syncthing-indicator", "description": "Shell indicator for starting, monitoring and controlling the Syncthing daemon using SystemD", "link": "https://extensions.gnome.org/extension/1070/syncthing-indicator/", "shell_version_map": { "38": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, @@ -1004,9 +1008,9 @@ "41": {"version": "9", "sha256": "1ckrf3y20wp3dv4aig44rycj7kbrxj14gh3rzs17vcqma3aw76bq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBkaWZmZXJlbnQgd2FsbHBhcGVyIGZvciBlYWNoIHdvcmtzcGFjZSBieSBoYXZpbmcgdGhlIHdhbGxwYXBlciBzd2l0Y2ggb24gd29ya3NwYWNlIGNoYW5nZS4iLAogICJleHRlbnNpb24taWQiOiAid2Fsa3BhcGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZW5nbGlzaCIsCiAgIm5hbWUiOiAiV2Fsa3BhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndhbGtwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmxpbmtCUC93YWxrcGFwZXIiLAogICJ1dWlkIjogIndhbGtwYXBlckB3YWxrcGFwZXIuYmxpbmticC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="} }} , {"uuid": "nasa_apod@elinvention.ovh", "name": "NASA APOD Wallpaper Changer", "pname": "nasa-apod", "description": "Change your wallpaper daily to the NASA's astronomy picture of the day", "link": "https://extensions.gnome.org/extension/1202/nasa-apod/", "shell_version_map": { - "40": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, - "41": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, - "42": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, + "40": {"version": "39", "sha256": "1p7k1jlbbi8ahbwi6bcscykikifdl4sr0bhl9war1m5aiasf2dk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDM5Cn0="}, + "41": {"version": "39", "sha256": "1p7k1jlbbi8ahbwi6bcscykikifdl4sr0bhl9war1m5aiasf2dk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDM5Cn0="}, + "42": {"version": "39", "sha256": "1p7k1jlbbi8ahbwi6bcscykikifdl4sr0bhl9war1m5aiasf2dk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDM5Cn0="}, "43": {"version": "36", "sha256": "0cgjsq1m508255pnr28l7a3170iz6nh92vzzzcb9a1w6lk7wws14", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VsaW52ZW50aW9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1uYXNhLWFwb2QiLAogICJ1dWlkIjogIm5hc2FfYXBvZEBlbGludmVudGlvbi5vdmgiLAogICJ2ZXJzaW9uIjogMzYKfQ=="}, "44": {"version": "36", "sha256": "0cgjsq1m508255pnr28l7a3170iz6nh92vzzzcb9a1w6lk7wws14", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VsaW52ZW50aW9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1uYXNhLWFwb2QiLAogICJ1dWlkIjogIm5hc2FfYXBvZEBlbGludmVudGlvbi5vdmgiLAogICJ2ZXJzaW9uIjogMzYKfQ=="}, "45": {"version": "38", "sha256": "0ycjwzg7p6lsw06czbahiayfnw8s3am9mpxd2ninlirgmx95158d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hc2EtYXBvZCIsCiAgInV1aWQiOiAibmFzYV9hcG9kQGVsaW52ZW50aW9uLm92aCIsCiAgInZlcnNpb24iOiAzOAp9"} @@ -1064,14 +1068,14 @@ "42": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1zqxykbfcc11xmk201d7dgi2qy0srzcm9il0q745dh4sllz1ar9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3dzIGlzIHJlYWR5JyBub3RpZmljYXRpb24gYW5kIHB1dHMgdGhlIHdpbmRvdyBpbnRvIGZvY3VzLiIsCiAgIm5hbWUiOiAiTm9Bbm5veWFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2luZGV4L25vLWFubm95YW5jZSIsCiAgInV1aWQiOiAibm9hbm5veWFuY2VAc2luZGV4LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="} }} -, {"uuid": "SomaFm-Radio@alireza6677.gmail.com", "name": "SomaFM internet radio", "pname": "somafm-internet-radio", "description": "Listen to SomaFm free internet radio in your GNOME desktop\n\n* Featues:\n- 32+ Channels\n- Volume slider\n- Favorites menu\n- Good sound quality\n- Supports most gnome-shell versions\n- Channel logos\n\n* Requirements:\n- Gstreamer and plugins:\nYou need to install 'gstreamer' and multimedia codecs/plugins for your distro.", "link": "https://extensions.gnome.org/extension/1237/somafm-internet-radio/", "shell_version_map": { +, {"uuid": "SomaFm-Radio@alireza6677.gmail.com", "name": "SomaFM internet radio", "pname": "somafm-internet-radio", "description": "Listen to SomaFm free internet radio in your GNOME desktop\n\n* Featues:\n- 32+ Channels\n- Volume slider\n- Favorites menu\n- Good sound quality\n- Supports most gnome-shell versions\n- Channel logos\n- Holiday channels (only in December)\n\n* Requirements:\n- Gstreamer and plugins:\nYou need to install 'gstreamer' and multimedia codecs/plugins for your distro.", "link": "https://extensions.gnome.org/extension/1237/somafm-internet-radio/", "shell_version_map": { "38": {"version": "29", "sha256": "07l6sa58azf3sav6858q48cbqazavq9bflfxdn0p9ys29h6mf50c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "40": {"version": "31", "sha256": "0f6wsvdfqzf7fpsk0rgp7rjm267xsy64ksq504krdlg9wpgammhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "41": {"version": "31", "sha256": "0f6wsvdfqzf7fpsk0rgp7rjm267xsy64ksq504krdlg9wpgammhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "42": {"version": "31", "sha256": "0f6wsvdfqzf7fpsk0rgp7rjm267xsy64ksq504krdlg9wpgammhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "43": {"version": "31", "sha256": "0f6wsvdfqzf7fpsk0rgp7rjm267xsy64ksq504krdlg9wpgammhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "44": {"version": "31", "sha256": "0f6wsvdfqzf7fpsk0rgp7rjm267xsy64ksq504krdlg9wpgammhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, - "45": {"version": "35", "sha256": "1vk85ranr4dyclm23gml1nszaigv170z9dfryxvj95k5i9pp4iq5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL1RoZVdlaXJkRGV2L3NvbWFmbS1yYWRpby1nbm9tZS1leHQiLAogICJ1dWlkIjogIlNvbWFGbS1SYWRpb0BhbGlyZXphNjY3Ny5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzUKfQ=="} + "45": {"version": "38", "sha256": "1j5bk8w1z5wpn5jy1zfssyiibd8c66fyqrph8k2z67jsag0dk0sj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG4tIEhvbGlkYXkgY2hhbm5lbHMgKG9ubHkgaW4gRGVjZW1iZXIpXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL1RoZVdlaXJkRGV2L3NvbWFmbS1yYWRpby1nbm9tZS1leHQiLAogICJ1dWlkIjogIlNvbWFGbS1SYWRpb0BhbGlyZXphNjY3Ny5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="} }} , {"uuid": "timepp@zagortenay333", "name": "Time++", "pname": "time", "description": "All-in-one timer, stopwatch, pomodoro, alarm, todo and time tracker\n\nThis extension has been renamed and is available at:\n\nhttps://extensions.gnome.org/extension/6003/cronomix/\n", "link": "https://extensions.gnome.org/extension/1238/time/", "shell_version_map": { "38": {"version": "155", "sha256": "0q3612mlccfzma6i9vs3g42xg71axach3gi7llajrlx59y5jjgb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQWxsLWluLW9uZSB0aW1lciwgc3RvcHdhdGNoLCBwb21vZG9ybywgYWxhcm0sIHRvZG8gYW5kIHRpbWUgdHJhY2tlclxuXG5UaGlzIGV4dGVuc2lvbiBoYXMgYmVlbiByZW5hbWVkIGFuZCBpcyBhdmFpbGFibGUgYXQ6XG5cbmh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzYwMDMvY3Jvbm9taXgvXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lKysiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidHJhbnNsYXRpb25zX3VybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lL3RyZWUvbWFzdGVyL2RhdGEvcG9fZmlsZXMiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvY3Jvbm9taXgiLAogICJ1dWlkIjogInRpbWVwcEB6YWdvcnRlbmF5MzMzIiwKICAidmVyc2lvbiI6IDE1NQp9"}, @@ -1249,14 +1253,14 @@ , {"uuid": "files-view@argonauta.framagit.org", "name": "Files View", "pname": "files-view", "description": "", "link": "https://extensions.gnome.org/extension/1395/files-view/", "shell_version_map": { "38": {"version": "11", "sha256": "0367kzrpzbx1b2l1m68n2pmazlsy4207a1anvyr2n1a4xpq3vwb0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiIsCiAgImdldHRleHQtZG9tYWluIjogImZpbGVzLXZpZXciLAogICJuYW1lIjogIkZpbGVzIFZpZXciLAogICJyZWNlbnRseS1vcGVuLXBlcnNpc3RlbnQtZmlsZW5hbWUiOiAicmVjZW50bHktb3Blbi1mb2xkZXJzLWZpbGVzLXZpZXctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLmpzb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmlsZXMtdmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJmaWxlcy12aWV3QGFyZ29uYXV0YS5mcmFtYWdpdC5vcmciLAogICJ2ZXJzaW9uIjogMTEKfQ=="} }} -, {"uuid": "bluetooth-quick-connect@bjarosze.gmail.com", "name": "Bluetooth Quick Connect", "pname": "bluetooth-quick-connect", "description": "Allow to connect to paired devices from gnome control panel.\n", "link": "https://extensions.gnome.org/extension/1401/bluetooth-quick-connect/", "shell_version_map": { +, {"uuid": "bluetooth-quick-connect@bjarosze.gmail.com", "name": "Bluetooth Quick Connect", "pname": "bluetooth-quick-connect", "description": "This extension allows paired Bluetooth devices to be connected and disconnected via the GNOME system menu, Shows battery status and more.\n", "link": "https://extensions.gnome.org/extension/1401/bluetooth-quick-connect/", "shell_version_map": { "38": {"version": "16", "sha256": "1fkx12xx1m8pchyfvq0vmyd21m79s9s0jw4ackqg1nqcpwyqd1c3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmphcm9zemUvZ25vbWUtYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogImJsdWV0b290aC1xdWljay1jb25uZWN0QGJqYXJvc3plLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "40": {"version": "34", "sha256": "0yv1igdh95s70jrqz3y6p0135a2yzzsjvqm2l2lg81qkfms6jk3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "41": {"version": "34", "sha256": "0yv1igdh95s70jrqz3y6p0135a2yzzsjvqm2l2lg81qkfms6jk3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "42": {"version": "34", "sha256": "0yv1igdh95s70jrqz3y6p0135a2yzzsjvqm2l2lg81qkfms6jk3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "43": {"version": "34", "sha256": "0yv1igdh95s70jrqz3y6p0135a2yzzsjvqm2l2lg81qkfms6jk3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "44": {"version": "37", "sha256": "0ydch21gzvndvbr7hlhps4l6gcncd6whdswf8rj23axl4q1smx4w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JqYXJvc3plL2dub21lLWJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJibHVldG9vdGgtcXVpY2stY29ubmVjdEBiamFyb3N6ZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="}, - "45": {"version": "40", "sha256": "1s7hhgnrxzkyy8ksynwvhwp7xp1rv2lick82h4w3zg5vpqhd8a2m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0V4dGVuc2lvbnMtVmFsaGFsbGEvZ25vbWUtYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogImJsdWV0b290aC1xdWljay1jb25uZWN0QGJqYXJvc3plLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MAp9"} + "45": {"version": "42", "sha256": "1h8hp5gnxmcpawmarqpj9lin0hm95k0nh3wd1vxgx29hmw8yc2y2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBwYWlyZWQgQmx1ZXRvb3RoIGRldmljZXMgdG8gYmUgY29ubmVjdGVkIGFuZCBkaXNjb25uZWN0ZWQgdmlhIHRoZSBHTk9NRSBzeXN0ZW0gbWVudSwgU2hvd3MgYmF0dGVyeSBzdGF0dXMgYW5kIG1vcmUuXG4iLAogICJkb25hdGlvbnMiOiB7CiAgICAiZ2l0aHViIjogIkJsYW5rUGFydGljbGUiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0V4dGVuc2lvbnMtVmFsaGFsbGEvZ25vbWUtYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogImJsdWV0b290aC1xdWljay1jb25uZWN0QGJqYXJvc3plLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Mgp9"} }} , {"uuid": "syspeek-gs@gs.eros2.info", "name": "SysPeek-GS", "pname": "syspeek-gs", "description": "Minimalistic CPU load monitor widget inspired by SysPeek indicator", "link": "https://extensions.gnome.org/extension/1409/syspeek-gs/", "shell_version_map": { "38": {"version": "12", "sha256": "0bdspqf9vyhfv9rcj1xz9jkswh4gy3laj2vhnfsl64skfp2c8qsl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, @@ -1653,13 +1657,14 @@ "43": {"version": "4", "sha256": "1ps75ilgnlspimsxgwc0j1yfbfxp6qp8is4g9kg7k3c5n9dzlp8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IFRvcGJhciB3aXRoIE11bHRpIG1vbml0b3JzIHN1cHBvcnQiLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNvcmlvL3RyYW5zcGFyZW50LXRvcGJhciIsCiAgInV1aWQiOiAiVHJhbnNwYXJlbnRUb3BiYXJAZW5yaWNvLnNvcmlvLm5ldCIsCiAgInZlcnNpb24iOiA0Cn0="}, "44": {"version": "4", "sha256": "1ps75ilgnlspimsxgwc0j1yfbfxp6qp8is4g9kg7k3c5n9dzlp8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IFRvcGJhciB3aXRoIE11bHRpIG1vbml0b3JzIHN1cHBvcnQiLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXNvcmlvL3RyYW5zcGFyZW50LXRvcGJhciIsCiAgInV1aWQiOiAiVHJhbnNwYXJlbnRUb3BiYXJAZW5yaWNvLnNvcmlvLm5ldCIsCiAgInZlcnNpb24iOiA0Cn0="} }} -, {"uuid": "colortint@matt.serverus.co.uk", "name": "ColorTint", "pname": "colortint", "description": "Tint your desktop with a color of your choice to help with dyslexia, scopic sensitivity, and related conditions.", "link": "https://extensions.gnome.org/extension/1789/colortint/", "shell_version_map": { +, {"uuid": "colortint@matt.serverus.co.uk", "name": "ColorTint", "pname": "colortint", "description": "Tint your desktop with a color of your choice to help with dyslexia, scopic sensitivity, and related conditions.\n\nPlease make feature requests and bug reports on GitHub\n", "link": "https://extensions.gnome.org/extension/1789/colortint/", "shell_version_map": { "38": {"version": "14", "sha256": "09ayk3xwywbisgazhfnzv0ka0xpakskjqa6g4awkwrjdlxd450rs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJuYW1lIjogIkNvbG9yVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXR0QnlOYW1lL2NvbG9yLXRpbnQiLAogICJ1dWlkIjogImNvbG9ydGludEBtYXR0LnNlcnZlcnVzLmNvLnVrIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "40": {"version": "14", "sha256": "09ayk3xwywbisgazhfnzv0ka0xpakskjqa6g4awkwrjdlxd450rs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJuYW1lIjogIkNvbG9yVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXR0QnlOYW1lL2NvbG9yLXRpbnQiLAogICJ1dWlkIjogImNvbG9ydGludEBtYXR0LnNlcnZlcnVzLmNvLnVrIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "09ayk3xwywbisgazhfnzv0ka0xpakskjqa6g4awkwrjdlxd450rs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJuYW1lIjogIkNvbG9yVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXR0QnlOYW1lL2NvbG9yLXRpbnQiLAogICJ1dWlkIjogImNvbG9ydGludEBtYXR0LnNlcnZlcnVzLmNvLnVrIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "19", "sha256": "1rn5w2gf4s1wr2lwa65l4xf9kxk821f2nm956ava4ci4kamv7qnv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJtYXR0YnluYW1lIgogIH0sCiAgIm5hbWUiOiAiQ29sb3JUaW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9ydGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "43": {"version": "19", "sha256": "1rn5w2gf4s1wr2lwa65l4xf9kxk821f2nm956ava4ci4kamv7qnv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJtYXR0YnluYW1lIgogIH0sCiAgIm5hbWUiOiAiQ29sb3JUaW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9ydGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, - "44": {"version": "19", "sha256": "1rn5w2gf4s1wr2lwa65l4xf9kxk821f2nm956ava4ci4kamv7qnv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJtYXR0YnluYW1lIgogIH0sCiAgIm5hbWUiOiAiQ29sb3JUaW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9ydGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTkKfQ=="} + "44": {"version": "19", "sha256": "1rn5w2gf4s1wr2lwa65l4xf9kxk821f2nm956ava4ci4kamv7qnv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJtYXR0YnluYW1lIgogIH0sCiAgIm5hbWUiOiAiQ29sb3JUaW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9ydGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdHRCeU5hbWUvY29sb3ItdGludCIsCiAgInV1aWQiOiAiY29sb3J0aW50QG1hdHQuc2VydmVydXMuY28udWsiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, + "45": {"version": "21", "sha256": "11cbfis71ya4zlpbvfwv23lbxhhvdq1xxk5f35zyr58y7wsjpl5d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbnQgeW91ciBkZXNrdG9wIHdpdGggYSBjb2xvciBvZiB5b3VyIGNob2ljZSB0byBoZWxwIHdpdGggZHlzbGV4aWEsIHNjb3BpYyBzZW5zaXRpdml0eSwgYW5kIHJlbGF0ZWQgY29uZGl0aW9ucy4iLAogICJkb25hdGlvbnMiOiB7CiAgICAia29maSI6ICJtYXR0YnluYW1lIgogIH0sCiAgIm5hbWUiOiAiQ29sb3JUaW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9ydGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXR0QnlOYW1lL2NvbG9yLXRpbnQiLAogICJ1dWlkIjogImNvbG9ydGludEBtYXR0LnNlcnZlcnVzLmNvLnVrIiwKICAidmVyc2lvbiI6IDIxCn0="} }} , {"uuid": "sermon@rovellipaolo-gmail.com", "name": "SerMon: Service Monitor", "pname": "sermon", "description": "SerMon: an extension for monitoring and managing systemd services, cron jobs, docker and podman containers", "link": "https://extensions.gnome.org/extension/1804/sermon/", "shell_version_map": { "38": {"version": "27", "sha256": "0v7wh402s7g9ikavlma27yfx4ijy14qzay0lklrn4v0z0mfkznsy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlck1vbjogYW4gZXh0ZW5zaW9uIGZvciBtb25pdG9yaW5nIGFuZCBtYW5hZ2luZyBzeXN0ZW1kIHNlcnZpY2VzLCBjcm9uIGpvYnMsIGRvY2tlciBhbmQgcG9kbWFuIGNvbnRhaW5lcnMiLAogICJuYW1lIjogIlNlck1vbjogU2VydmljZSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlcm1vbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcm92ZWxsaXBhb2xvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZXJtb24iLAogICJ1dWlkIjogInNlcm1vbkByb3ZlbGxpcGFvbG8tZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}, @@ -2096,7 +2101,7 @@ "42": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "43": {"version": "37", "sha256": "1v8mwc6sy99mnxqzpcgrnc06sdnnm6digwpn6yk7prsfgygpd00i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQnJpbmctT3V0LVN1Ym1lbnUtb2YtUG93ZXItT2ZmLUxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMzcKfQ=="}, "44": {"version": "43", "sha256": "1s49pdsab7qw4g14b3ghns2jlsi7h97zz9k9fiqpy4ff6mk41kni", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQnJpbmctT3V0LVN1Ym1lbnUtb2YtUG93ZXItT2ZmLUxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogNDMKfQ=="}, - "45": {"version": "51", "sha256": "08zdg1hprkpb2ny1zv7pa2jwbijfcpym3yxvmbz5i6svj3nivprq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZiBCdXR0b24iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIiwKICAgICJwYXlwYWwiOiAicHJhdGFwcGFuYWJha2EiCiAgfSwKICAibmFtZSI6ICJCcmluZyBPdXQgU3VibWVudSBPZiBQb3dlciBPZmYgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJyaW5nLW91dC1zdWJtZW51LW9mLXBvd2VyLW9mZi1sb2dvdXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2JyaW5nLW91dC1zdWJtZW51LW9mLXBvd2VyLW9mZi1sb2dvdXQiLAogICJ1dWlkIjogIkJyaW5nT3V0U3VibWVudU9mUG93ZXJPZmZMb2dvdXRCdXR0b25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDUxCn0="} + "45": {"version": "52", "sha256": "1hb3qabkyzglcswd1ilxzd7bjqwqj5b71nrzsali0l1bvhh3l64m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZiBCdXR0b24iLAogICJkb25hdGlvbnMiOiB7CiAgICAiYnV5bWVhY29mZmVlIjogInByYXRhcHBhbmFiYWthIiwKICAgICJwYXlwYWwiOiAicHJhdGFwcGFuYWJha2EiCiAgfSwKICAibmFtZSI6ICJCcmluZyBPdXQgU3VibWVudSBPZiBQb3dlciBPZmYgQnV0dG9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJyaW5nLW91dC1zdWJtZW51LW9mLXBvd2VyLW9mZi1sb2dvdXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL2JyaW5nLW91dC1zdWJtZW51LW9mLXBvd2VyLW9mZi1sb2dvdXQiLAogICJ1dWlkIjogIkJyaW5nT3V0U3VibWVudU9mUG93ZXJPZmZMb2dvdXRCdXR0b25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDUyCn0="} }} , {"uuid": "batterytimepercentagecompact@sagrland.de", "name": "Battery Time (Percentage) Compact", "pname": "battery-time-percentage-compact", "description": "Show the remaining time until fully charged/discharged as well as percentage of battery charge in the panel.", "link": "https://extensions.gnome.org/extension/2929/battery-time-percentage-compact/", "shell_version_map": { "38": {"version": "8", "sha256": "143gj2xmi1hhma2fjggk6vaq3sx7p0glszayds1jbnz7003xc89q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBhcyB3ZWxsIGFzIHBlcmNlbnRhZ2Ugb2YgYmF0dGVyeSBjaGFyZ2UgaW4gdGhlIHBhbmVsLiIsCiAgImdldHRleHQtZG9tYWluIjogImJhdHRlcnl0aW1lcGVyY2VudGFnZWNvbXBhY3QiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSAoUGVyY2VudGFnZSkgQ29tcGFjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA4Cn0="}, @@ -2171,7 +2176,7 @@ "42": {"version": "11", "sha256": "0p0crv91n0lals20hkrvivj00yhsadkwy9s2bfdyzmk6slwa35rb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGF1cmVudG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWlkZWFwYWQiLAogICJ1dWlkIjogImlkZWFwYWRAbGF1cmVudG8uZnJpdHRlbGxhIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "12", "sha256": "1z9n3qfr129ismgzw7nwgmq0gwjwf7y7lzq7mcdw0dc227gkxww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJlbnRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1pZGVhcGFkIiwKICAidXVpZCI6ICJpZGVhcGFkQGxhdXJlbnRvLmZyaXR0ZWxsYSIsCiAgInZlcnNpb24iOiAxMgp9"}, "44": {"version": "14", "sha256": "1s5nzq74q4zvb3mmzrxkzlwb24m520c3yssddgwkqx956xi0h743", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJlbnRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1pZGVhcGFkIiwKICAidXVpZCI6ICJpZGVhcGFkQGxhdXJlbnRvLmZyaXR0ZWxsYSIsCiAgInZlcnNpb24iOiAxNAp9"}, - "45": {"version": "16", "sha256": "0g1r22vb3ls5mgdiq77qvw4lvs93n4h2ii87gcw3kf4drrhlsqng", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJlbnRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1pZGVhcGFkIiwKICAidXVpZCI6ICJpZGVhcGFkQGxhdXJlbnRvLmZyaXR0ZWxsYSIsCiAgInZlcnNpb24iOiAxNgp9"} + "45": {"version": "17", "sha256": "1mxy3g0q16mhf18gc4yvxdmwrrrhg7rxis2ccabl6zb0sinskfkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJlbnRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1pZGVhcGFkIiwKICAidXVpZCI6ICJpZGVhcGFkQGxhdXJlbnRvLmZyaXR0ZWxsYSIsCiAgInZlcnNpb24iOiAxNwp9"} }} , {"uuid": "system-monitor-next@paradoxxx.zero.gmail.com", "name": "system-monitor-next", "pname": "system-monitor-next", "description": "Display system information in GNOME Shell status bar, such as memory, CPU, disk and battery usages, network rates…\n\nThis is a fork of the seemingly abandoned paradoxxxzero/gnome-shell-system-monitor-applet.\n\nIf you get an error after updating, try logging out and logging back in (this is a known issue that is being worked on).", "link": "https://extensions.gnome.org/extension/3010/system-monitor-next/", "shell_version_map": { "40": {"version": "55", "sha256": "0fwxj41ka95mxrjy3xbywqxm0fp00irypkwcg316pyy9cva4rk01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLCBvY2Nhc2lvbmFsbHkgaW5jbHVkaW5nIHBhdGNoZXMgdGhhdCBoYXZlbid0IHlldCBtZXJnZWQgdXBzdHJlYW0uXG5cblRoaXMgaXMgcHJlZmVyYWJsZSBmb3IgdXNlcnMgb24gYmxlZWRpbmcgZWRnZSBkaXN0cmlidXRpb25zIHRoYXQgcHJlZmVyIG5vdCB0byB3YWl0IGZvciBhIHN0YWJsZSByZWxlYXNlIGZyb20gdGhlIG1haW4gcmVwby4gT2YgY291cnNlLCBzaW5jZSB3ZSdyZSByZWxlYXNpbmcgZGlyZWN0bHkgZnJvbSBtYXN0ZXIgc29tZSBpbnN0YWJpbGl0eSBpcyBpbmV2aXRhYmxlLlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgcmVzdGFydGluZyBHbm9tZSBTaGVsbCB3aXRoIEFsdC1GMiB0aGVuICdyJy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="}, @@ -2179,7 +2184,7 @@ "42": {"version": "55", "sha256": "0fwxj41ka95mxrjy3xbywqxm0fp00irypkwcg316pyy9cva4rk01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLCBvY2Nhc2lvbmFsbHkgaW5jbHVkaW5nIHBhdGNoZXMgdGhhdCBoYXZlbid0IHlldCBtZXJnZWQgdXBzdHJlYW0uXG5cblRoaXMgaXMgcHJlZmVyYWJsZSBmb3IgdXNlcnMgb24gYmxlZWRpbmcgZWRnZSBkaXN0cmlidXRpb25zIHRoYXQgcHJlZmVyIG5vdCB0byB3YWl0IGZvciBhIHN0YWJsZSByZWxlYXNlIGZyb20gdGhlIG1haW4gcmVwby4gT2YgY291cnNlLCBzaW5jZSB3ZSdyZSByZWxlYXNpbmcgZGlyZWN0bHkgZnJvbSBtYXN0ZXIgc29tZSBpbnN0YWJpbGl0eSBpcyBpbmV2aXRhYmxlLlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgcmVzdGFydGluZyBHbm9tZSBTaGVsbCB3aXRoIEFsdC1GMiB0aGVuICdyJy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="}, "43": {"version": "55", "sha256": "0fwxj41ka95mxrjy3xbywqxm0fp00irypkwcg316pyy9cva4rk01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLCBvY2Nhc2lvbmFsbHkgaW5jbHVkaW5nIHBhdGNoZXMgdGhhdCBoYXZlbid0IHlldCBtZXJnZWQgdXBzdHJlYW0uXG5cblRoaXMgaXMgcHJlZmVyYWJsZSBmb3IgdXNlcnMgb24gYmxlZWRpbmcgZWRnZSBkaXN0cmlidXRpb25zIHRoYXQgcHJlZmVyIG5vdCB0byB3YWl0IGZvciBhIHN0YWJsZSByZWxlYXNlIGZyb20gdGhlIG1haW4gcmVwby4gT2YgY291cnNlLCBzaW5jZSB3ZSdyZSByZWxlYXNpbmcgZGlyZWN0bHkgZnJvbSBtYXN0ZXIgc29tZSBpbnN0YWJpbGl0eSBpcyBpbmV2aXRhYmxlLlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgcmVzdGFydGluZyBHbm9tZSBTaGVsbCB3aXRoIEFsdC1GMiB0aGVuICdyJy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="}, "44": {"version": "55", "sha256": "0fwxj41ka95mxrjy3xbywqxm0fp00irypkwcg316pyy9cva4rk01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLCBvY2Nhc2lvbmFsbHkgaW5jbHVkaW5nIHBhdGNoZXMgdGhhdCBoYXZlbid0IHlldCBtZXJnZWQgdXBzdHJlYW0uXG5cblRoaXMgaXMgcHJlZmVyYWJsZSBmb3IgdXNlcnMgb24gYmxlZWRpbmcgZWRnZSBkaXN0cmlidXRpb25zIHRoYXQgcHJlZmVyIG5vdCB0byB3YWl0IGZvciBhIHN0YWJsZSByZWxlYXNlIGZyb20gdGhlIG1haW4gcmVwby4gT2YgY291cnNlLCBzaW5jZSB3ZSdyZSByZWxlYXNpbmcgZGlyZWN0bHkgZnJvbSBtYXN0ZXIgc29tZSBpbnN0YWJpbGl0eSBpcyBpbmV2aXRhYmxlLlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgcmVzdGFydGluZyBHbm9tZSBTaGVsbCB3aXRoIEFsdC1GMiB0aGVuICdyJy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWdhbGdzL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCIsCiAgInV1aWQiOiAic3lzdGVtLW1vbml0b3ItbmV4dEBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNTUKfQ=="}, - "45": {"version": "63", "sha256": "1wdskkx0afb3ajmb0742wifybvz1nj17irqychs7r0v393b2jfx3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgaXMgYSBmb3JrIG9mIHRoZSBzZWVtaW5nbHkgYWJhbmRvbmVkIHBhcmFkb3h4eHplcm8vZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0LlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgbG9nZ2luZyBvdXQgYW5kIGxvZ2dpbmcgYmFjayBpbiAodGhpcyBpcyBhIGtub3duIGlzc3VlIHRoYXQgaXMgYmVpbmcgd29ya2VkIG9uKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZ2FsZ3MvZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0IiwKICAidXVpZCI6ICJzeXN0ZW0tbW9uaXRvci1uZXh0QHBhcmFkb3h4eC56ZXJvLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Mwp9"} + "45": {"version": "64", "sha256": "1sx2jrwclqx8jsn60bj9gi0xllnwvrix9jc5wfx4qzv210is5g1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgaXMgYSBmb3JrIG9mIHRoZSBzZWVtaW5nbHkgYWJhbmRvbmVkIHBhcmFkb3h4eHplcm8vZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0LlxuXG5JZiB5b3UgZ2V0IGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCB0cnkgbG9nZ2luZyBvdXQgYW5kIGxvZ2dpbmcgYmFjayBpbiAodGhpcyBpcyBhIGtub3duIGlzc3VlIHRoYXQgaXMgYmVpbmcgd29ya2VkIG9uKS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzeXN0ZW0tbW9uaXRvciIsCiAgIm5hbWUiOiAic3lzdGVtLW1vbml0b3ItbmV4dCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZ2FsZ3MvZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0IiwKICAidXVpZCI6ICJzeXN0ZW0tbW9uaXRvci1uZXh0QHBhcmFkb3h4eC56ZXJvLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2NAp9"} }} , {"uuid": "user-theme-x@tuberry.github.io", "name": "User Theme X", "pname": "user-themes-x", "description": "Customizable user-theme with user stylesheet and dark theme auto-switch based on the Night Light\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3019/user-themes-x/", "shell_version_map": { "38": {"version": "21", "sha256": "0qiahmg2nmrnlyablyava1488rvy0r2rq8pyv932lsx6vrn9gh6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIGJhc2VkIG9uIHRoZSBOaWdodCBMaWdodFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJleHRlbnNpb24taWQiOiAidXNlci10aGVtZS14IiwKICAiZ2V0dGV4dC1kb21haW4iOiAidXNlci10aGVtZS14IiwKICAibmFtZSI6ICJVc2VyIFRoZW1lIFgiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3VzZXItdGhlbWUteCIsCiAgInV1aWQiOiAidXNlci10aGVtZS14QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIxCn0="}, @@ -2334,7 +2339,7 @@ "42": {"version": "5", "sha256": "0d4y9rzq0v9iwph408mf0d9zfx2g5fyrbbk63dn61ri525v0qlzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0Mi41IiwKICAgICI0NC4yIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA1Cn0="}, "44": {"version": "5", "sha256": "0d4y9rzq0v9iwph408mf0d9zfx2g5fyrbbk63dn61ri525v0qlzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0Mi41IiwKICAgICI0NC4yIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA1Cn0="} }} -, {"uuid": "translate-indicator@athenstaedt.net", "name": "Translate Indicator", "pname": "translate-indicator", "description": "Translate extension for Gnome-Shell - based on translate-shell, inspired by Tudmotu's clipboard-indicator and gufoe's text-translator", "link": "https://extensions.gnome.org/extension/3318/translate-indicator/", "shell_version_map": { +, {"uuid": "translate-indicator@athenstaedt.net", "name": "Translate Indicator", "pname": "translate-indicator", "description": "Translate extension for Gnome-Shell - based on translate-shell, inspired by Tudmotu's clipboard-indicator and gufoe's text-translator\n\nMenu to translate everything on your desktop.\n\nSuper + T to toggle menu. Cntl + Alt + T to use notification translation.\n\nShortcuts can be changed in the settings.\n\nOn X.org, you can translate selected text. This can be enabled in the settings. This is not supported on wayland. There, you have to copy to the clipboard for translation.\n\nBy default, this extension uses the included translate-shell version, which is probably not the newest. You can change this in the settings.\n\nIf you use the the included trans file, make sure that it is executable. You find the source of the extension usually here:\n\n~/.local/share/gnome-shell/extensions/translate-indicator@athenstaedt.net", "link": "https://extensions.gnome.org/extension/3318/translate-indicator/", "shell_version_map": { "38": {"version": "3", "sha256": "04c3hjbcbn8y9d94swmc3qiv63sjynn71jnwp08sgqa79nrn4cyg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsIC0gYmFzZWQgb24gdHJhbnNsYXRlLXNoZWxsLCBpbnNwaXJlZCBieSBUdWRtb3R1J3MgY2xpcGJvYXJkLWluZGljYXRvciBhbmQgZ3Vmb2UncyB0ZXh0LXRyYW5zbGF0b3IiLAogICJuYW1lIjogIlRyYW5zbGF0ZSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXZlbnV6L2dub21lLXRyYW5zbGF0ZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1pbmRpY2F0b3JAYXRoZW5zdGFlZHQubmV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "45": {"version": "5", "sha256": "05vsi19d754kywmq4lrgf5n5n96z88wqwynf3fi473yqjxs3w3gg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsIC0gYmFzZWQgb24gdHJhbnNsYXRlLXNoZWxsLCBpbnNwaXJlZCBieSBUdWRtb3R1J3MgY2xpcGJvYXJkLWluZGljYXRvciBhbmQgZ3Vmb2UncyB0ZXh0LXRyYW5zbGF0b3IiLAogICJuYW1lIjogIlRyYW5zbGF0ZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNsYXRlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXZlbnV6L2dub21lLXRyYW5zbGF0ZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1pbmRpY2F0b3JAYXRoZW5zdGFlZHQubmV0IiwKICAidmVyc2lvbiI6IDUKfQ=="} }} @@ -2879,7 +2884,8 @@ "41": {"version": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "34", "sha256": "1g0w2z3zcbpl7ca4fnsdgl110hy3md54bc1nani7kvc323yn038f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01pY2hhbFcvZ25vbWUtYmx1ZXRvb3RoLWJhdHRlcnktaW5kaWNhdG9yIiwKICAidXVpZCI6ICJibHVldG9vdGgtYmF0dGVyeUBtaWNoYWx3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "43": {"version": "34", "sha256": "1g0w2z3zcbpl7ca4fnsdgl110hy3md54bc1nani7kvc323yn038f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01pY2hhbFcvZ25vbWUtYmx1ZXRvb3RoLWJhdHRlcnktaW5kaWNhdG9yIiwKICAidXVpZCI6ICJibHVldG9vdGgtYmF0dGVyeUBtaWNoYWx3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, - "44": {"version": "34", "sha256": "1g0w2z3zcbpl7ca4fnsdgl110hy3md54bc1nani7kvc323yn038f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01pY2hhbFcvZ25vbWUtYmx1ZXRvb3RoLWJhdHRlcnktaW5kaWNhdG9yIiwKICAidXVpZCI6ICJibHVldG9vdGgtYmF0dGVyeUBtaWNoYWx3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="} + "44": {"version": "34", "sha256": "1g0w2z3zcbpl7ca4fnsdgl110hy3md54bc1nani7kvc323yn038f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01pY2hhbFcvZ25vbWUtYmx1ZXRvb3RoLWJhdHRlcnktaW5kaWNhdG9yIiwKICAidXVpZCI6ICJibHVldG9vdGgtYmF0dGVyeUBtaWNoYWx3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, + "45": {"version": "38", "sha256": "1vd87x9d8h6zdv2v8aqy7l1061yrv3zwbj0wgs6535alcbhp6dld", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWxXL2dub21lLWJsdWV0b290aC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiYmx1ZXRvb3RoLWJhdHRlcnlAbWljaGFsdy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="} }} , {"uuid": "gnome-extension-all-ip-addresses@havekes.eu", "name": "All IP Addresses", "pname": "all-ip-addresses", "description": "Show IP addresses for LAN, WAN IPv6 and VPN in the GNOME panel. Click on the address to cycle trough different interfaces.", "link": "https://extensions.gnome.org/extension/3994/all-ip-addresses/", "shell_version_map": { "38": {"version": "12", "sha256": "0sxw8igvjv2hx1d42cibxbrjdl61983s9054l0jbnvszr30jyf7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9waGF2ZWtlcy9nbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3NlcyIsCiAgInV1aWQiOiAiZ25vbWUtZXh0ZW5zaW9uLWFsbC1pcC1hZGRyZXNzZXNAaGF2ZWtlcy5ldSIsCiAgInZlcnNpb24iOiAxMgp9"}, @@ -2894,7 +2900,7 @@ "40": {"version": "4", "sha256": "17hriwcwhkjp3n20q7bm7iylr8862ghvnagf2xk0ci2hxwwbyc92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuIiwKICAiZGVzY3JpcHRpb24iOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuXG5cblNldCB0aGUgcm93cywgY29sdW1ucyBhbmQgdGhlIGFwcCBpY29uIHNpemUgZm9yIGEgcGFydGljdWxhciBjb25maWd1cmF0aW9uIHRvIHdvcmsuXG5JZiB0aGUgc2NyZWVuIHNwYWNlIGlzIG91dCBudW1iZXJlZCwgcmVkdWNlIHRoZSBpY29uIHNpemUgdG8gZml0IGFsbCB0aGUgcm93cyBhbmQgY29sdW1ucy5cbk9yIHJlZHVjZSB0aGUgbnVtYmVyIG9mIHJvd3MgYW5kIGNvbHVtbnMuXG5cblByZXNzIHRoZSBSZWZyZXNoIGJ1dHRvbiBvbiB0aGUgbGVmdCBvZiBoZWFkZXIgYmFyIHRvIGFwcGx5IGNoYW5nZXMiLAogICJuYW1lIjogIkFwcCBHcmlkIFR3ZWFrcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHAtZ3JpZC10d2Vha3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdGF0dXMiOiAiIiwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TZWxlbml1bS1IL0FwcC1HcmlkLVR3ZWFrcyIsCiAgInV1aWQiOiAiYXBwLWdyaWQtdHdlYWtzQFNlbGVuaXVtLUgiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "17hriwcwhkjp3n20q7bm7iylr8862ghvnagf2xk0ci2hxwwbyc92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuIiwKICAiZGVzY3JpcHRpb24iOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuXG5cblNldCB0aGUgcm93cywgY29sdW1ucyBhbmQgdGhlIGFwcCBpY29uIHNpemUgZm9yIGEgcGFydGljdWxhciBjb25maWd1cmF0aW9uIHRvIHdvcmsuXG5JZiB0aGUgc2NyZWVuIHNwYWNlIGlzIG91dCBudW1iZXJlZCwgcmVkdWNlIHRoZSBpY29uIHNpemUgdG8gZml0IGFsbCB0aGUgcm93cyBhbmQgY29sdW1ucy5cbk9yIHJlZHVjZSB0aGUgbnVtYmVyIG9mIHJvd3MgYW5kIGNvbHVtbnMuXG5cblByZXNzIHRoZSBSZWZyZXNoIGJ1dHRvbiBvbiB0aGUgbGVmdCBvZiBoZWFkZXIgYmFyIHRvIGFwcGx5IGNoYW5nZXMiLAogICJuYW1lIjogIkFwcCBHcmlkIFR3ZWFrcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHAtZ3JpZC10d2Vha3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdGF0dXMiOiAiIiwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TZWxlbml1bS1IL0FwcC1HcmlkLVR3ZWFrcyIsCiAgInV1aWQiOiAiYXBwLWdyaWQtdHdlYWtzQFNlbGVuaXVtLUgiLAogICJ2ZXJzaW9uIjogNAp9"} }} -, {"uuid": "babar@fthx", "name": "BaBar Task Bar", "pname": "babar", "description": "NOT MAINTAINED ANYMORE\n\nTask bar. App grid, favorites, workspaces and tasks in panel. Light extension.\n\n Replace 'Activities' button by all current workspaces and apps buttons. Switch workspace/app or toggle overview by clicking on these buttons. Drag and drop favorite, task, dash item or app grid item to any workspace (you cannot reorder tasks inside a workspace). Persistent window preview with right-click (right-click again or click on preview to close it). You can move this preview anywhere. Change 'Places' label to an icon. Settings in preferences UI.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.\n\n Changelog: https://github.com/fthx/babar/issues/2", "link": "https://extensions.gnome.org/extension/4000/babar/", "shell_version_map": { +, {"uuid": "babar@fthx", "name": "BaBar Task Bar", "pname": "babar", "description": "NOT MAINTAINED ANYMORE\nPlease use instead:\nhttps://extensions.gnome.org/extension/6556/task-up/\n\nTask bar. App grid, favorites, workspaces and tasks in panel. Light extension.\n\n Replace 'Activities' button by all current workspaces and apps buttons. Switch workspace/app or toggle overview by clicking on these buttons. Drag and drop favorite, task, dash item or app grid item to any workspace (you cannot reorder tasks inside a workspace). Persistent window preview with right-click (right-click again or click on preview to close it). You can move this preview anywhere. Change 'Places' label to an icon. Settings in preferences UI.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.\n\n Changelog: https://github.com/fthx/babar/issues/2", "link": "https://extensions.gnome.org/extension/4000/babar/", "shell_version_map": { "38": {"version": "58", "sha256": "13iq5smrg965sgxvln6p31i68jl6m87s74vg7hr0lizsx0v901pc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuVGFzayBiYXIuIEFwcCBncmlkLCBmYXZvcml0ZXMsIHdvcmtzcGFjZXMgYW5kIHRhc2tzIGluIHBhbmVsLiBMaWdodCBleHRlbnNpb24uXG5cbiBSZXBsYWNlICdBY3Rpdml0aWVzJyBidXR0b24gYnkgYWxsIGN1cnJlbnQgd29ya3NwYWNlcyBhbmQgYXBwcyBidXR0b25zLiBTd2l0Y2ggd29ya3NwYWNlL2FwcCBvciB0b2dnbGUgb3ZlcnZpZXcgYnkgY2xpY2tpbmcgb24gdGhlc2UgYnV0dG9ucy4gRHJhZyBhbmQgZHJvcCBmYXZvcml0ZSwgdGFzaywgZGFzaCBpdGVtIG9yIGFwcCBncmlkIGl0ZW0gdG8gYW55IHdvcmtzcGFjZSAoeW91IGNhbm5vdCByZW9yZGVyIHRhc2tzIGluc2lkZSBhIHdvcmtzcGFjZSkuIFBlcnNpc3RlbnQgd2luZG93IHByZXZpZXcgd2l0aCByaWdodC1jbGljayAocmlnaHQtY2xpY2sgYWdhaW4gb3IgY2xpY2sgb24gcHJldmlldyB0byBjbG9zZSBpdCkuIFlvdSBjYW4gbW92ZSB0aGlzIHByZXZpZXcgYW55d2hlcmUuIENoYW5nZSAnUGxhY2VzJyBsYWJlbCB0byBhbiBpY29uLiBTZXR0aW5ncyBpbiBwcmVmZXJlbmNlcyBVSS5cblxuIFlvdSBjYW4gdXNlIG5hbWVzIGZvciB3b3Jrc3BhY2VzOiB0aGVyZSBhcmUgdHdvIHdheXMgZm9yIHRoYXQuIDEpIEVkaXQgdGhlIHN0cmluZyBhcnJheSAnb3JnLmdub21lLmRlc2t0b3Aud20ucHJlZmVyZW5jZXMud29ya3NwYWNlLW5hbWVzJyBnc2V0dGluZ3Mga2V5ICh0aHJvdWdoIGRjb25mIGVkaXRvciwgZS5nLikuIDIpIFVzZSBvZmZpY2lhbCBHTk9NRSBleHRlbnNpb24gV29ya3NwYWNlcyBJbmRpY2F0b3IncyBzZXR0aW5ncy4gWW91IGRvbid0IGhhdmUgdG8gd3JpdGUgYSBsb25nIGVub3VnaCBsaXN0OiBudW1iZXJzIGFyZSBkaXNwbGF5ZWQgaWYgbm8gd29ya3NwYWNlIG5hbWUgaXMgZGVmaW5lZC5cblxuIENoYW5nZWxvZzogaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIvaXNzdWVzLzIiLAogICJuYW1lIjogIkJhQmFyIFRhc2sgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9iYWJhciIsCiAgInV1aWQiOiAiYmFiYXJAZnRoeCIsCiAgInZlcnNpb24iOiA1OAp9"}, "40": {"version": "58", "sha256": "13iq5smrg965sgxvln6p31i68jl6m87s74vg7hr0lizsx0v901pc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuVGFzayBiYXIuIEFwcCBncmlkLCBmYXZvcml0ZXMsIHdvcmtzcGFjZXMgYW5kIHRhc2tzIGluIHBhbmVsLiBMaWdodCBleHRlbnNpb24uXG5cbiBSZXBsYWNlICdBY3Rpdml0aWVzJyBidXR0b24gYnkgYWxsIGN1cnJlbnQgd29ya3NwYWNlcyBhbmQgYXBwcyBidXR0b25zLiBTd2l0Y2ggd29ya3NwYWNlL2FwcCBvciB0b2dnbGUgb3ZlcnZpZXcgYnkgY2xpY2tpbmcgb24gdGhlc2UgYnV0dG9ucy4gRHJhZyBhbmQgZHJvcCBmYXZvcml0ZSwgdGFzaywgZGFzaCBpdGVtIG9yIGFwcCBncmlkIGl0ZW0gdG8gYW55IHdvcmtzcGFjZSAoeW91IGNhbm5vdCByZW9yZGVyIHRhc2tzIGluc2lkZSBhIHdvcmtzcGFjZSkuIFBlcnNpc3RlbnQgd2luZG93IHByZXZpZXcgd2l0aCByaWdodC1jbGljayAocmlnaHQtY2xpY2sgYWdhaW4gb3IgY2xpY2sgb24gcHJldmlldyB0byBjbG9zZSBpdCkuIFlvdSBjYW4gbW92ZSB0aGlzIHByZXZpZXcgYW55d2hlcmUuIENoYW5nZSAnUGxhY2VzJyBsYWJlbCB0byBhbiBpY29uLiBTZXR0aW5ncyBpbiBwcmVmZXJlbmNlcyBVSS5cblxuIFlvdSBjYW4gdXNlIG5hbWVzIGZvciB3b3Jrc3BhY2VzOiB0aGVyZSBhcmUgdHdvIHdheXMgZm9yIHRoYXQuIDEpIEVkaXQgdGhlIHN0cmluZyBhcnJheSAnb3JnLmdub21lLmRlc2t0b3Aud20ucHJlZmVyZW5jZXMud29ya3NwYWNlLW5hbWVzJyBnc2V0dGluZ3Mga2V5ICh0aHJvdWdoIGRjb25mIGVkaXRvciwgZS5nLikuIDIpIFVzZSBvZmZpY2lhbCBHTk9NRSBleHRlbnNpb24gV29ya3NwYWNlcyBJbmRpY2F0b3IncyBzZXR0aW5ncy4gWW91IGRvbid0IGhhdmUgdG8gd3JpdGUgYSBsb25nIGVub3VnaCBsaXN0OiBudW1iZXJzIGFyZSBkaXNwbGF5ZWQgaWYgbm8gd29ya3NwYWNlIG5hbWUgaXMgZGVmaW5lZC5cblxuIENoYW5nZWxvZzogaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIvaXNzdWVzLzIiLAogICJuYW1lIjogIkJhQmFyIFRhc2sgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9iYWJhciIsCiAgInV1aWQiOiAiYmFiYXJAZnRoeCIsCiAgInZlcnNpb24iOiA1OAp9"}, "41": {"version": "58", "sha256": "13iq5smrg965sgxvln6p31i68jl6m87s74vg7hr0lizsx0v901pc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PVCBNQUlOVEFJTkVEIEFOWU1PUkVcblxuVGFzayBiYXIuIEFwcCBncmlkLCBmYXZvcml0ZXMsIHdvcmtzcGFjZXMgYW5kIHRhc2tzIGluIHBhbmVsLiBMaWdodCBleHRlbnNpb24uXG5cbiBSZXBsYWNlICdBY3Rpdml0aWVzJyBidXR0b24gYnkgYWxsIGN1cnJlbnQgd29ya3NwYWNlcyBhbmQgYXBwcyBidXR0b25zLiBTd2l0Y2ggd29ya3NwYWNlL2FwcCBvciB0b2dnbGUgb3ZlcnZpZXcgYnkgY2xpY2tpbmcgb24gdGhlc2UgYnV0dG9ucy4gRHJhZyBhbmQgZHJvcCBmYXZvcml0ZSwgdGFzaywgZGFzaCBpdGVtIG9yIGFwcCBncmlkIGl0ZW0gdG8gYW55IHdvcmtzcGFjZSAoeW91IGNhbm5vdCByZW9yZGVyIHRhc2tzIGluc2lkZSBhIHdvcmtzcGFjZSkuIFBlcnNpc3RlbnQgd2luZG93IHByZXZpZXcgd2l0aCByaWdodC1jbGljayAocmlnaHQtY2xpY2sgYWdhaW4gb3IgY2xpY2sgb24gcHJldmlldyB0byBjbG9zZSBpdCkuIFlvdSBjYW4gbW92ZSB0aGlzIHByZXZpZXcgYW55d2hlcmUuIENoYW5nZSAnUGxhY2VzJyBsYWJlbCB0byBhbiBpY29uLiBTZXR0aW5ncyBpbiBwcmVmZXJlbmNlcyBVSS5cblxuIFlvdSBjYW4gdXNlIG5hbWVzIGZvciB3b3Jrc3BhY2VzOiB0aGVyZSBhcmUgdHdvIHdheXMgZm9yIHRoYXQuIDEpIEVkaXQgdGhlIHN0cmluZyBhcnJheSAnb3JnLmdub21lLmRlc2t0b3Aud20ucHJlZmVyZW5jZXMud29ya3NwYWNlLW5hbWVzJyBnc2V0dGluZ3Mga2V5ICh0aHJvdWdoIGRjb25mIGVkaXRvciwgZS5nLikuIDIpIFVzZSBvZmZpY2lhbCBHTk9NRSBleHRlbnNpb24gV29ya3NwYWNlcyBJbmRpY2F0b3IncyBzZXR0aW5ncy4gWW91IGRvbid0IGhhdmUgdG8gd3JpdGUgYSBsb25nIGVub3VnaCBsaXN0OiBudW1iZXJzIGFyZSBkaXNwbGF5ZWQgaWYgbm8gd29ya3NwYWNlIG5hbWUgaXMgZGVmaW5lZC5cblxuIENoYW5nZWxvZzogaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIvaXNzdWVzLzIiLAogICJuYW1lIjogIkJhQmFyIFRhc2sgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9iYWJhciIsCiAgInV1aWQiOiAiYmFiYXJAZnRoeCIsCiAgInZlcnNpb24iOiA1OAp9"}, @@ -3269,12 +3275,12 @@ "40": {"version": "1", "sha256": "1awjnic8zca2f6viah2l4ai0pyfdyisxna9ys1zzpya11rwj6jk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBhbGxvd3MgeW91IGRvIGhhdmUgaW5kZXBlbmRlbnQgYXBwIHN3aXRjaGVyIChhbHQtdGFiKSBmb3IgZWFjaCB3b3Jrc3BhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJpdmF0ZS1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiUHJpdmF0ZSBTd2l0Y2hlciIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcml2YXRlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tIiwKICAidXVpZCI6ICJwcml2YXRlLXN3aXRjaGVyQGR6aWJhbi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"} }} , {"uuid": "colosseum@sereneblue", "name": "Colosseum", "pname": "colosseum", "description": "View live scores for your favorite sports teams.", "link": "https://extensions.gnome.org/extension/4207/colosseum/", "shell_version_map": { - "40": {"version": "22", "sha256": "1qnvdrb84dn3nyfs4nw797dinjhqpxh4smc7fb2rbgjz8nxqz5xk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDIyCn0="}, - "41": {"version": "22", "sha256": "1qnvdrb84dn3nyfs4nw797dinjhqpxh4smc7fb2rbgjz8nxqz5xk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDIyCn0="}, - "42": {"version": "22", "sha256": "1qnvdrb84dn3nyfs4nw797dinjhqpxh4smc7fb2rbgjz8nxqz5xk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDIyCn0="}, - "43": {"version": "22", "sha256": "1qnvdrb84dn3nyfs4nw797dinjhqpxh4smc7fb2rbgjz8nxqz5xk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDIyCn0="}, - "44": {"version": "22", "sha256": "1qnvdrb84dn3nyfs4nw797dinjhqpxh4smc7fb2rbgjz8nxqz5xk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDIyCn0="}, - "45": {"version": "23", "sha256": "1kgk08cshvfnwq0kml6f9xrcikbs2mw9cspxq7qk7zd2qz8wkf9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMjMKfQ=="} + "40": {"version": "26", "sha256": "1wd401gfykm3vf30kga21ip97fx4sv81n2fdbmbwfrnickzdwwal", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDI2Cn0="}, + "41": {"version": "26", "sha256": "1wd401gfykm3vf30kga21ip97fx4sv81n2fdbmbwfrnickzdwwal", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDI2Cn0="}, + "42": {"version": "26", "sha256": "1wd401gfykm3vf30kga21ip97fx4sv81n2fdbmbwfrnickzdwwal", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDI2Cn0="}, + "43": {"version": "26", "sha256": "1wd401gfykm3vf30kga21ip97fx4sv81n2fdbmbwfrnickzdwwal", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDI2Cn0="}, + "44": {"version": "26", "sha256": "1wd401gfykm3vf30kga21ip97fx4sv81n2fdbmbwfrnickzdwwal", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDI2Cn0="}, + "45": {"version": "25", "sha256": "18xcak2wwhjgzs21lq7dihmhh6vhcxi2b7wcwwam81wp6lwswkvk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMjUKfQ=="} }} , {"uuid": "gnome-plat-workspace@stonegate.me", "name": "Gnome 40 Flat Workspace", "pname": "gnome-40-plat-workspace", "description": "Remove shadow for workspace background in gnome 40.\nSource code https://github.com/stonega/gnome-extension-flat-workspace", "link": "https://extensions.gnome.org/extension/4215/gnome-40-plat-workspace/", "shell_version_map": { "40": {"version": "3", "sha256": "0ly2dab9c0l7w1axnqs7xk2szd5jm2ifgniz2snw5mwkr5pw76nb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBzaGFkb3cgZm9yIHdvcmtzcGFjZSBiYWNrZ3JvdW5kIGluIGdub21lIDQwLlxuU291cmNlIGNvZGUgaHR0cHM6Ly9naXRodWIuY29tL3N0b25lZ2EvZ25vbWUtZXh0ZW5zaW9uLWZsYXQtd29ya3NwYWNlIiwKICAibmFtZSI6ICJHbm9tZSA0MCBGbGF0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1wbGF0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZ25vbWUtcGxhdC13b3Jrc3BhY2VAc3RvbmVnYXRlLm1lIiwKICAidmVyc2lvbiI6IDMKfQ=="} @@ -3872,7 +3878,8 @@ "41": {"version": "11", "sha256": "1id2glrzcb2ppk1kfjldpdcz0v88az6nqi6vkms3r4cgnjyy88b0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2FwcHMuc2RvcmUubWUvZ25vbWUtZXh0ZW5zaW9uLWh1YXdlaS13bWkiLAogICJ1dWlkIjogImh1YXdlaS13bWlAYXBwcy5zZG9yZS5tZSIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "1id2glrzcb2ppk1kfjldpdcz0v88az6nqi6vkms3r4cgnjyy88b0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2FwcHMuc2RvcmUubWUvZ25vbWUtZXh0ZW5zaW9uLWh1YXdlaS13bWkiLAogICJ1dWlkIjogImh1YXdlaS13bWlAYXBwcy5zZG9yZS5tZSIsCiAgInZlcnNpb24iOiAxMQp9"}, "43": {"version": "11", "sha256": "1id2glrzcb2ppk1kfjldpdcz0v88az6nqi6vkms3r4cgnjyy88b0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2FwcHMuc2RvcmUubWUvZ25vbWUtZXh0ZW5zaW9uLWh1YXdlaS13bWkiLAogICJ1dWlkIjogImh1YXdlaS13bWlAYXBwcy5zZG9yZS5tZSIsCiAgInZlcnNpb24iOiAxMQp9"}, - "44": {"version": "11", "sha256": "1id2glrzcb2ppk1kfjldpdcz0v88az6nqi6vkms3r4cgnjyy88b0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2FwcHMuc2RvcmUubWUvZ25vbWUtZXh0ZW5zaW9uLWh1YXdlaS13bWkiLAogICJ1dWlkIjogImh1YXdlaS13bWlAYXBwcy5zZG9yZS5tZSIsCiAgInZlcnNpb24iOiAxMQp9"} + "44": {"version": "11", "sha256": "1id2glrzcb2ppk1kfjldpdcz0v88az6nqi6vkms3r4cgnjyy88b0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2FwcHMuc2RvcmUubWUvZ25vbWUtZXh0ZW5zaW9uLWh1YXdlaS13bWkiLAogICJ1dWlkIjogImh1YXdlaS13bWlAYXBwcy5zZG9yZS5tZSIsCiAgInZlcnNpb24iOiAxMQp9"}, + "45": {"version": "13", "sha256": "1j38vy3ihkb45rplzr9dpkql5sy65xfqm6fp3j89x88lhw9ijz7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LiIsCiAgImdldHRleHQtZG9tYWluIjogImh1YXdlaS13bWkiLAogICJuYW1lIjogIkh1YXdlaSBXTUkgY29udHJvbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHVhd2VpLXdtaSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYXBwcy5zZG9yZS5tZS9nbm9tZS1leHRlbnNpb24taHVhd2VpLXdtaSIsCiAgInV1aWQiOiAiaHVhd2VpLXdtaUBhcHBzLnNkb3JlLm1lIiwKICAidmVyc2lvbiI6IDEzCn0="} }} , {"uuid": "username-hotname@it-und-entwicklung-fg.de", "name": "Username and Hostname to panel", "pname": "username-and-hostname-to-panel", "description": "Adds your avatar icon, user displayname und username to the menu panel. Also it adds the hostname to the left of the panel.", "link": "https://extensions.gnome.org/extension/4583/username-and-hostname-to-panel/", "shell_version_map": { "38": {"version": "5", "sha256": "1g9jsfwxxz2as2nwkqdzr0km24ykkzhdfmya9mqxvr68fsanw27n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9pdC11bmQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lLyIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNQp9"}, @@ -4326,14 +4333,14 @@ "42": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "34", "sha256": "0ii1pxbnfjjli8jj0fq1g1rlhzpbn1j9088jp0sjrxvdlrmksdzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY29zZGFsdmFyZXovdGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "44": {"version": "34", "sha256": "0ii1pxbnfjjli8jj0fq1g1rlhzpbn1j9088jp0sjrxvdlrmksdzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY29zZGFsdmFyZXovdGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, - "45": {"version": "39", "sha256": "1c960xdqfvq10inx6qhx4v1x63195hkbgns7mihgpqai0r4jk3qr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJjb3NkYWx2YXJlei90aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZC1leHRlbnNpb24iLAogICJ1dWlkIjogInRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgInZlcnNpb24iOiAzOQp9"} + "45": {"version": "41", "sha256": "03ad2g9k9i87nhcjb0r78jv2m7m2sl5kh02647zgjy1rq2kbn6ab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJjb3NkYWx2YXJlei90aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZC1leHRlbnNpb24iLAogICJ1dWlkIjogInRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgInZlcnNpb24iOiA0MQp9"} }} , {"uuid": "lock-screen-message@advendradeswanta.gitlab.com", "name": "Lock Screen Message", "pname": "lock-screen-message", "description": "Simple extension that let's you add your message to the lock screen (unlockDialog)", "link": "https://extensions.gnome.org/extension/4801/lock-screen-message/", "shell_version_map": { "40": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="} }} -, {"uuid": "panel-corners@aunetx", "name": "Panel corners", "pname": "panel-corners", "description": "A GNOME shell extension to keep the old topbar corners, which were removed for GNOME 42. It also allows you to customize the rounded corners, even if you use GNOME 40 or 41.\n\nIt is widely based on already existing gnome-shell code, and on a merge request by Alexander Mikhaylenko: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1328", "link": "https://extensions.gnome.org/extension/4805/panel-corners/", "shell_version_map": { +, {"uuid": "panel-corners@aunetx", "name": "Panel corners", "pname": "panel-corners", "description": "A GNOME shell extension to keep the old topbar corners, which were removed for GNOME 42. It also allows you to customize the rounded corners, even if you use GNOME 40 or 41.\n\nIt also permits you to use screen corners, in order to have your monitors rounded!\n\nIt is widely based on already existing gnome-shell code, and on a merge request by Alexander Mikhaylenko: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1328", "link": "https://extensions.gnome.org/extension/4805/panel-corners/", "shell_version_map": { "40": {"version": "3", "sha256": "0piacfxwa5ca5cnvrz0s8pqykfixynmvvdmh1rznfsh407v1kw1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0piacfxwa5ca5cnvrz0s8pqykfixynmvvdmh1rznfsh407v1kw1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "7", "sha256": "1waws1iwsk0li6x3c9l9w80kijsmfynrlp506hmq8zqqqxrh5npy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogNwp9"}, @@ -4525,7 +4532,7 @@ "42": {"version": "17", "sha256": "1m6103r9hlamd5nzxqvcavssnacjxrjypby52gpgngp3aj8698sz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "43": {"version": "17", "sha256": "1m6103r9hlamd5nzxqvcavssnacjxrjypby52gpgngp3aj8698sz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "44": {"version": "17", "sha256": "1m6103r9hlamd5nzxqvcavssnacjxrjypby52gpgngp3aj8698sz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, - "45": {"version": "19", "sha256": "00v8dk1n68f7mkybx378nsdh8y9bq8186552wg7hh204fn9jk7s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VsdmlsbGUvZWVwcmVzZXRzZWxlY3RvciIsCiAgInV1aWQiOiAiZWVwcmVzZXRzZWxlY3RvckB1bHZpbGxlLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOQp9"} + "45": {"version": "20", "sha256": "1wqmqsi2z3snnrdlbxymdqvzllcvgda7674ma17zchmnas2sqlzx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAiZ2V0dGV4dF9kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVlcHJlc2V0c2VsZWN0b3IiLAogICJuYW1lIjogIkVhc3lFZmZlY3RzIFByZXNldCBTZWxlY3RvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lZXByZXNldHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VsdmlsbGUvZWVwcmVzZXRzZWxlY3RvciIsCiAgInV1aWQiOiAiZWVwcmVzZXRzZWxlY3RvckB1bHZpbGxlLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyMAp9"} }} , {"uuid": "gnomehub@gnome-hub.github.io", "name": "gnomehub", "pname": "gnomehub", "description": "An all in one extension which catagorizes notifications and displays system information", "link": "https://extensions.gnome.org/extension/4913/gnomehub/", "shell_version_map": { "38": {"version": "6", "sha256": "15dgj0jbfhsa0p87gi0ai6c55kj4nj9yz5ydpzamwy69k9jjjcd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsbCBpbiBvbmUgZXh0ZW5zaW9uIHdoaWNoIGNhdGFnb3JpemVzIG5vdGlmaWNhdGlvbnMgYW5kIGRpc3BsYXlzIHN5c3RlbSBpbmZvcm1hdGlvbiIsCiAgIm5hbWUiOiAiZ25vbWVodWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dub21lLWh1Yi5naXRodWIuaW8vIiwKICAidXVpZCI6ICJnbm9tZWh1YkBnbm9tZS1odWIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, @@ -4596,7 +4603,7 @@ "42": {"version": "4", "sha256": "004m77f5hkg9bq9lk2cf79x9va7np37q7yv474bwg165v7a0s8v1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4gWW91IGNhbiBlZGl0IHRoZSBjb2xvdXIgc2NoZW1lIGZyb20gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLiIsCiAgIm5hbWUiOiAiR3JhZGllbnQgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGV0YXItdi9ncmFkaWVudHRvcGJhciIsCiAgInV1aWQiOiAiZ3JhZGllbnR0b3BiYXJAcHNob3cub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "11", "sha256": "0nb4jcxhx994kgmsv0aksrjwxnw58bjw0hsijkg6bb8idm32s1pp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4gWW91IGNhbiBlZGl0IHRoZSBjb2xvdXIgc2NoZW1lIGZyb20gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5wc2hvdy5ncmFkaWVudHRvcGJhciIsCiAgImhhc1ByZWZzIjogdHJ1ZSwKICAiaWNvbiI6ICIuL2Fzc2V0cy9sb2dvLnBuZyIsCiAgIm5hbWUiOiAiR3JhZGllbnQgVG9wIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcmcucHNob3cuZ3JhZGllbnR0b3BiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiAxMQp9"}, "44": {"version": "11", "sha256": "0nb4jcxhx994kgmsv0aksrjwxnw58bjw0hsijkg6bb8idm32s1pp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgdG9wYmFyJ3MgYmFja2dyb3VuZCBncmFkaWVudC4gWW91IGNhbiBlZGl0IHRoZSBjb2xvdXIgc2NoZW1lIGZyb20gdGhlIGV4dGVuc2lvbidzIHNldHRpbmdzLiIsCiAgImdldHRleHQtZG9tYWluIjogIm9yZy5wc2hvdy5ncmFkaWVudHRvcGJhciIsCiAgImhhc1ByZWZzIjogdHJ1ZSwKICAiaWNvbiI6ICIuL2Fzc2V0cy9sb2dvLnBuZyIsCiAgIm5hbWUiOiAiR3JhZGllbnQgVG9wIEJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcmcucHNob3cuZ3JhZGllbnR0b3BiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BldGFyLXYvZ3JhZGllbnR0b3BiYXIiLAogICJ1dWlkIjogImdyYWRpZW50dG9wYmFyQHBzaG93Lm9yZyIsCiAgInZlcnNpb24iOiAxMQp9"}, - "45": {"version": "17", "sha256": "18i8h4gw8k1ssyfxyhk22ggmrxxw1wcn5q1bd6jxg6zli82xnvji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgcGFuZWwncyBiYWNrZ3JvdW5kIGdyYWRpZW50LiBZb3UgY2FuIGVkaXQgdGhlIGNvbG91ciBzY2hlbWUgZnJvbSB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MgaW4gR25vbWUgNDUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJwZXRhci12IiwKICAgICJwYXlwYWwiOiAicGV0YXJ2NzMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLnBzaG93LmdyYWRpZW50dG9wYmFyIiwKICAiaGFzUHJlZnMiOiB0cnVlLAogICJpY29uIjogIi4vYXNzZXRzL2xvZ28ucG5nIiwKICAibmFtZSI6ICJHcmFkaWVudCBUb3AgQmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9yZy5wc2hvdy5ncmFkaWVudHRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXRhci12L2dyYWRpZW50dG9wYmFyIiwKICAidXVpZCI6ICJncmFkaWVudHRvcGJhckBwc2hvdy5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="} + "45": {"version": "18", "sha256": "0q263vhm4cpgrydc6ab8i6yp573i1ywvzjqxpg8pyg9737lyw5vi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdOT01FJ3MgcGFuZWwncyBiYWNrZ3JvdW5kIGdyYWRpZW50LiBZb3UgY2FuIGVkaXQgdGhlIGNvbG91ciBzY2hlbWUgZnJvbSB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MgaW4gR25vbWUgNDUuIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJwZXRhci12IiwKICAgICJwYXlwYWwiOiAicGV0YXJ2NzMiCiAgfSwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLnBzaG93LmdyYWRpZW50dG9wYmFyIiwKICAiaGFzUHJlZnMiOiB0cnVlLAogICJpY29uIjogIi4vYXNzZXRzL2xvZ28ucG5nIiwKICAibmFtZSI6ICJHcmFkaWVudCBUb3AgQmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9yZy5wc2hvdy5ncmFkaWVudHRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXRhci12L2dyYWRpZW50dG9wYmFyIiwKICAidXVpZCI6ICJncmFkaWVudHRvcGJhckBwc2hvdy5vcmciLAogICJ2ZXJzaW9uIjogMTgKfQ=="} }} , {"uuid": "note@eexpss.gmail.com", "name": "note", "pname": "note", "description": "Add selected text to Note.\n- Notes automatic recognition and sort as 'Directory' 'Command' 'Clipboard'.\n- 'Directory': Mouse 1/2/3 act as 'Open in Files/Open in termianl/Paste dir'. It can be used as a temporary bookmark. And any click will change the working diretory in real time.\n- 'Command': Mouse 1/3 as 'Excute command in Terminal/Paste cmd'.\n- 'Clipboard': Mouse act as 'Paste to Clipboard(PRIMARY)'.\n- Terminal support kgx(new gnome-console) and gnome-terminal.", "link": "https://extensions.gnome.org/extension/4962/note/", "shell_version_map": { "42": {"version": "7", "sha256": "1niwlhls41l92g0bcllp4y4bdhn7k310514xkd36rn61pqz9b7q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBzZWxlY3RlZCB0ZXh0IHRvIE5vdGUuXG4tIE5vdGVzIGF1dG9tYXRpYyByZWNvZ25pdGlvbiBhbmQgc29ydCBhcyAnRGlyZWN0b3J5JyAnQ29tbWFuZCcgJ0NsaXBib2FyZCcuXG4tICdEaXJlY3RvcnknOiBNb3VzZSAxLzIvMyBhY3QgYXMgJ09wZW4gaW4gRmlsZXMvT3BlbiBpbiB0ZXJtaWFubC9QYXN0ZSBkaXInLiBJdCBjYW4gYmUgdXNlZCBhcyBhIHRlbXBvcmFyeSBib29rbWFyay4gQW5kIGFueSBjbGljayB3aWxsIGNoYW5nZSB0aGUgd29ya2luZyBkaXJldG9yeSBpbiByZWFsIHRpbWUuXG4tICdDb21tYW5kJzogTW91c2UgMS8zIGFzICdFeGN1dGUgY29tbWFuZCBpbiBUZXJtaW5hbC9QYXN0ZSBjbWQnLlxuLSAnQ2xpcGJvYXJkJzogTW91c2UgYWN0IGFzICdQYXN0ZSB0byBDbGlwYm9hcmQoUFJJTUFSWSknLlxuLSBUZXJtaW5hbCBzdXBwb3J0IGtneChuZXcgZ25vbWUtY29uc29sZSkgYW5kIGdub21lLXRlcm1pbmFsLiIsCiAgImdldHRleHQtZG9tYWluIjogIm5vdGUiLAogICJuYW1lIjogIm5vdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1ub3RlIiwKICAidXVpZCI6ICJub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"} @@ -5108,7 +5115,7 @@ "42": {"version": "4", "sha256": "0ih1zrbsky7qdhm3ga8q6xdr5mwi87b2w96lqaqiy6pmxqnbfc78", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuc3VyZSB0aGF0IEZpcmVmb3ggUGljdHVyZS1pbi1QaWN0dXJlIHdpbmRvdyBhcmUgYWx3YXlzIG9uIHRvcCIsCiAgIm5hbWUiOiAiRmlyZWZveCBQaVAgQWx3YXlzIG9uIFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jlbm55cG93ZXJzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXJlZm94LXBpcCIsCiAgInV1aWQiOiAiZmlyZWZveC1waXBAYmVubnlwb3dlcnMuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0ih1zrbsky7qdhm3ga8q6xdr5mwi87b2w96lqaqiy6pmxqnbfc78", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuc3VyZSB0aGF0IEZpcmVmb3ggUGljdHVyZS1pbi1QaWN0dXJlIHdpbmRvdyBhcmUgYWx3YXlzIG9uIHRvcCIsCiAgIm5hbWUiOiAiRmlyZWZveCBQaVAgQWx3YXlzIG9uIFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jlbm55cG93ZXJzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXJlZm94LXBpcCIsCiAgInV1aWQiOiAiZmlyZWZveC1waXBAYmVubnlwb3dlcnMuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "44": {"version": "4", "sha256": "0ih1zrbsky7qdhm3ga8q6xdr5mwi87b2w96lqaqiy6pmxqnbfc78", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuc3VyZSB0aGF0IEZpcmVmb3ggUGljdHVyZS1pbi1QaWN0dXJlIHdpbmRvdyBhcmUgYWx3YXlzIG9uIHRvcCIsCiAgIm5hbWUiOiAiRmlyZWZveCBQaVAgQWx3YXlzIG9uIFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jlbm55cG93ZXJzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXJlZm94LXBpcCIsCiAgInV1aWQiOiAiZmlyZWZveC1waXBAYmVubnlwb3dlcnMuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, - "45": {"version": "7", "sha256": "0ax7i8c1n1nvlj2fh4g2niyy2xvvsdvay73i44ff7iypa76dgpj0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuc3VyZSB0aGF0IEZpcmVmb3ggUGljdHVyZS1pbi1QaWN0dXJlIHdpbmRvdyBhcmUgYWx3YXlzIG9uIHRvcCIsCiAgIm5hbWUiOiAiRmlyZWZveCBQaVAgQWx3YXlzIG9uIFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iZW5ueXBvd2Vycy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmlyZWZveC1waXAiLAogICJ1dWlkIjogImZpcmVmb3gtcGlwQGJlbm55cG93ZXJzLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="} + "45": {"version": "8", "sha256": "13jd2arnhr9kqhrjhn7v448wmc17clzk9wbdq6dj19sidqcpyhxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuc3VyZSB0aGF0IEZpcmVmb3ggUGljdHVyZS1pbi1QaWN0dXJlIHdpbmRvdyBhcmUgYWx3YXlzIG9uIHRvcCIsCiAgIm5hbWUiOiAiRmlyZWZveCBQaVAgQWx3YXlzIG9uIFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iZW5ueXBvd2Vycy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmlyZWZveC1waXAiLAogICJ1dWlkIjogImZpcmVmb3gtcGlwQGJlbm55cG93ZXJzLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="} }} , {"uuid": "activitiesworkspacename@ahmafi.ir", "name": "Activities Workspace Name", "pname": "activities-workspace-name", "description": "Replace Activities Text with Current Workspace Name", "link": "https://extensions.gnome.org/extension/5311/activities-workspace-name/", "shell_version_map": { "42": {"version": "8", "sha256": "1ncp8pdflbb0xkpgnp619pgqj2a30svb77b4v3rbrf31cdhcw0zw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBUZXh0IHdpdGggQ3VycmVudCBXb3Jrc3BhY2UgTmFtZSIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBXb3Jrc3BhY2UgTmFtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FobWFmaS9nbm9tZS1hY3Rpdml0aWVzLXdvcmtzcGFjZS1uYW1lIiwKICAidXVpZCI6ICJhY3Rpdml0aWVzd29ya3NwYWNlbmFtZUBhaG1hZmkuaXIiLAogICJ2ZXJzaW9uIjogOAp9"}, @@ -5341,7 +5348,8 @@ }} , {"uuid": "compact-quick-settings@gnome-shell-extensions.mariospr.org", "name": "Compact Quick Settings", "pname": "compact-quick-settings", "description": "Compact quick settings menu for GNOME 43 and newer", "link": "https://extensions.gnome.org/extension/5527/compact-quick-settings/", "shell_version_map": { "43": {"version": "3", "sha256": "04ffksmfc27gya24x2fj0zpax3yj1kwjdwn33a99rxpypmicvpwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBhY3QgcXVpY2sgc2V0dGluZ3MgbWVudSBmb3IgR05PTUUgNDMgYW5kIG5ld2VyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiIiwKICAibmFtZSI6ICJDb21wYWN0IFF1aWNrIFNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmlvc3ByL2NvbXBhY3QtcXVpY2stc2V0dGluZ3MtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJjb21wYWN0LXF1aWNrLXNldHRpbmdzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMubWFyaW9zcHIub3JnIiwKICAidmVyc2lvbiI6IDMKfQ=="}, - "44": {"version": "4", "sha256": "05cssrkk4kk9vix98abvy3i6ms3495sz5jpi496srnnbxs500y4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBhY3QgcXVpY2sgc2V0dGluZ3MgbWVudSBmb3IgR05PTUUgNDMgYW5kIG5ld2VyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiIiwKICAibmFtZSI6ICJDb21wYWN0IFF1aWNrIFNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmlvc3ByL2NvbXBhY3QtcXVpY2stc2V0dGluZ3MtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJjb21wYWN0LXF1aWNrLXNldHRpbmdzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMubWFyaW9zcHIub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="} + "44": {"version": "4", "sha256": "05cssrkk4kk9vix98abvy3i6ms3495sz5jpi496srnnbxs500y4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBhY3QgcXVpY2sgc2V0dGluZ3MgbWVudSBmb3IgR05PTUUgNDMgYW5kIG5ld2VyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiIiwKICAibmFtZSI6ICJDb21wYWN0IFF1aWNrIFNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmlvc3ByL2NvbXBhY3QtcXVpY2stc2V0dGluZ3MtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJjb21wYWN0LXF1aWNrLXNldHRpbmdzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMubWFyaW9zcHIub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, + "45": {"version": "7", "sha256": "1ir3wqcg9cdy1hs8icvkv7rv5hr47s1lrdz04y75vviwv406r6jm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBhY3QgcXVpY2sgc2V0dGluZ3MgbWVudSBmb3IgR05PTUUgNDMgYW5kIG5ld2VyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiIiwKICAibmFtZSI6ICJDb21wYWN0IFF1aWNrIFNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmlvc3ByL2NvbXBhY3QtcXVpY2stc2V0dGluZ3MtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJjb21wYWN0LXF1aWNrLXNldHRpbmdzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMubWFyaW9zcHIub3JnIiwKICAidmVyc2lvbiI6IDcKfQ=="} }} , {"uuid": "circular@widgets.io", "name": "Circular Widgets", "pname": "circular-widgets", "description": "Conky Like widgets but with few customisation options\n- Drag and Drop Support\n- Added Non customisable Calendar\n- Added Net Speed Widget\n- Highly Customisable Ram, Cpu, Clock and Net Speed Widget\nFor any issues,bugs and suggestions plz open an issue on Github", "link": "https://extensions.gnome.org/extension/5530/circular-widgets/", "shell_version_map": { "43": {"version": "6", "sha256": "1cbgjlyfh8y741aswps61qyi3cz6vlv6wn1isbv47x7p40rhfxy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmt5IExpa2Ugd2lkZ2V0cyBidXQgd2l0aCBmZXcgY3VzdG9taXNhdGlvbiBvcHRpb25zXG4tIERyYWcgYW5kIERyb3AgU3VwcG9ydFxuLSBBZGRlZCBOb24gY3VzdG9taXNhYmxlIENhbGVuZGFyXG4tIEFkZGVkIE5ldCBTcGVlZCBXaWRnZXRcbi0gSGlnaGx5IEN1c3RvbWlzYWJsZSBSYW0sIENwdSwgQ2xvY2sgYW5kIE5ldCBTcGVlZCBXaWRnZXRcbkZvciBhbnkgaXNzdWVzLGJ1Z3MgYW5kIHN1Z2dlc3Rpb25zIHBseiBvcGVuIGFuIGlzc3VlIG9uIEdpdGh1YiIsCiAgIm5hbWUiOiAiQ2lyY3VsYXIgV2lkZ2V0cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jaXJjdWxhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL2NpcmN1bGFyLXdpZGdldHMiLAogICJ1dWlkIjogImNpcmN1bGFyQHdpZGdldHMuaW8iLAogICJ2ZXJzaW9uIjogNgp9"} @@ -5507,7 +5515,7 @@ "43": {"version": "3", "sha256": "1ncyvlk5d9lq7lbimq5ihd8p929abwrbyvlgv45has5gwl7hd2i8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBEb3dubG9hZHMgbWFuYWdlciBmb3IgdGhlIGdub21lIHNoZWxsLlxuIiwKICAibmFtZSI6ICJEb3dubG9hZHMgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJEaWVnMEpzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EaWVnMEpzL2dub21lLWRvd25sb2Fkcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRvd25sb2Fkcy1pbmRpY2F0b3JARGllZzBKcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}, "44": {"version": "3", "sha256": "1ncyvlk5d9lq7lbimq5ihd8p929abwrbyvlgv45has5gwl7hd2i8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBEb3dubG9hZHMgbWFuYWdlciBmb3IgdGhlIGdub21lIHNoZWxsLlxuIiwKICAibmFtZSI6ICJEb3dubG9hZHMgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJEaWVnMEpzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EaWVnMEpzL2dub21lLWRvd25sb2Fkcy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImRvd25sb2Fkcy1pbmRpY2F0b3JARGllZzBKcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"} }} -, {"uuid": "trash-indicator@Dieg0Js.github.io", "name": "Trash Indicator", "pname": "trash-indicator", "description": "A minimal Trash manager for the gnome shell. \n- View\n- Restore\n- Delete\nFork of Gnome Trash from Axel von Bertoldi.", "link": "https://extensions.gnome.org/extension/5715/trash-indicator/", "shell_version_map": { +, {"uuid": "trash-indicator@Dieg0Js.github.io", "name": "Trash Indicator", "pname": "trash-indicator", "description": "A minimal Trash manager for the gnome shell. Fork of Gnome Trash from Axel von Bertoldi.", "link": "https://extensions.gnome.org/extension/5715/trash-indicator/", "shell_version_map": { "40": {"version": "4", "sha256": "0vzbygakbp52yvpsgkv3d6krl37fnjv8nkgjvl77h0rigb47nd5g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBUcmFzaCBtYW5hZ2VyIGZvciB0aGUgZ25vbWUgc2hlbGwuIFxuLSBWaWV3XG4tIFJlc3RvcmVcbi0gRGVsZXRlXG5Gb3JrIG9mIEdub21lIFRyYXNoIGZyb20gQXhlbCB2b24gQmVydG9sZGkuIiwKICAibmFtZSI6ICJUcmFzaCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtdHJhc2gtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ0cmFzaC1pbmRpY2F0b3JARGllZzBKcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0vzbygakbp52yvpsgkv3d6krl37fnjv8nkgjvl77h0rigb47nd5g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBUcmFzaCBtYW5hZ2VyIGZvciB0aGUgZ25vbWUgc2hlbGwuIFxuLSBWaWV3XG4tIFJlc3RvcmVcbi0gRGVsZXRlXG5Gb3JrIG9mIEdub21lIFRyYXNoIGZyb20gQXhlbCB2b24gQmVydG9sZGkuIiwKICAibmFtZSI6ICJUcmFzaCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtdHJhc2gtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ0cmFzaC1pbmRpY2F0b3JARGllZzBKcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0vzbygakbp52yvpsgkv3d6krl37fnjv8nkgjvl77h0rigb47nd5g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBUcmFzaCBtYW5hZ2VyIGZvciB0aGUgZ25vbWUgc2hlbGwuIFxuLSBWaWV3XG4tIFJlc3RvcmVcbi0gRGVsZXRlXG5Gb3JrIG9mIEdub21lIFRyYXNoIGZyb20gQXhlbCB2b24gQmVydG9sZGkuIiwKICAibmFtZSI6ICJUcmFzaCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtdHJhc2gtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ0cmFzaC1pbmRpY2F0b3JARGllZzBKcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}, @@ -5519,18 +5527,18 @@ "44": {"version": "8", "sha256": "18nqax5gs2nrkjgndj7ikvl6hhxbpxgv355krzz36dsmw2mvzqa4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAidXVpZCI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uQERlbWluZGVyIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "45": {"version": "10", "sha256": "036hf7f1gkkikd0crzgq8sfcax6ax7x84hmbi95p78mqwm5wzfgk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIGJhdHRlcnkgaW5kaWNhdG9yIGljb24gd2l0aCBhIGNpcmNsZSBvciBwb3J0cmFpdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IEluZGljYXRvciBJY29uIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci1pY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RlbWluZGVyL2JhdHRlcnktaW5kaWNhdG9yLWljb24iLAogICJ1dWlkIjogImJhdHRlcnktaW5kaWNhdG9yLWljb25ARGVtaW5kZXIiLAogICJ2ZXJzaW9uIjogMTAKfQ=="} }} -, {"uuid": "clipboard-indicator@Dieg0Js.github.io", "name": "Clipboard Indicator", "pname": "clipboard-indicator", "description": "A minimal clipboard indicator for the gnome shell", "link": "https://extensions.gnome.org/extension/5721/clipboard-indicator/", "shell_version_map": { +, {"uuid": "clipboard-indicator@Dieg0Js.github.io", "name": "Clipboard Indicator", "pname": "clipboard-indicator", "description": "A minimal clipboard indicator for the gnome shell. Fork of Clipman by popov895.", "link": "https://extensions.gnome.org/extension/5721/clipboard-indicator/", "shell_version_map": { "40": {"version": "4", "sha256": "0jszkq48sac8i7pgdgyfcyyqpc4jq3shaj0ghm9hwahs9qd040h3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwiLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0jszkq48sac8i7pgdgyfcyyqpc4jq3shaj0ghm9hwahs9qd040h3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwiLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "0jszkq48sac8i7pgdgyfcyyqpc4jq3shaj0ghm9hwahs9qd040h3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwiLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "0jszkq48sac8i7pgdgyfcyyqpc4jq3shaj0ghm9hwahs9qd040h3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwiLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}, "44": {"version": "4", "sha256": "0jszkq48sac8i7pgdgyfcyyqpc4jq3shaj0ghm9hwahs9qd040h3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBjbGlwYm9hcmQgaW5kaWNhdG9yIGZvciB0aGUgZ25vbWUgc2hlbGwiLAogICJuYW1lIjogIkNsaXBib2FyZCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkRpZWcwSnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RpZWcwSnMvZ25vbWUtY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckBEaWVnMEpzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="} }} -, {"uuid": "Battery-Health-Charging@maniacx.github.com", "name": "Battery Health Charging", "pname": "battery-health-charging", "description": "Set battery charging threshold / charging limit / charging mode\nBattery Health Charging: An extension to maximize the battery life of laptops by setting their charging threshold or modes.\n\nCompatible with\n- Asus \n- LG \n- Samsung \n- Sony \n- Huawei \n- Toshiba \n- System76 \n- Lenovo (Ideapad, Legion) \n- Thinkpad \n- Panasonic \n- Acer (dependecies: custom dkms) \n- MSI (dependecies: custom dkms) \n- Tuxedo (dependecies: custom dkms) \n- Slimbook IntelQC71 (dependecies: custom dkms) \n- Tuxedo IntelQC71 (dependecies: custom dkms) \n- XMG IntelQC71 (dependecies: custom dkms) \n- Eluktronics IntelQC71 (dependecies: custom dkms) \n- Gigabyte Aero/Aorus (dependecies: custom dkms) \n- Dell (dependecies: custom package libsmbios) \n- Dell (dependecies: custom package Dell Command Center) \n- Apple Macbook Intel-series chip (dependecies: custom dkms) \n- Apple Macbook M-series chip (dependecies: custom kernel) \n- Razer (dependecies: custom package razer-cli) \n\nNot all models are comaptible. Please read about the compatibility and dependencies of your device on github link below.\n\nhttps://maniacx.github.io/Battery-Health-Charging/", "link": "https://extensions.gnome.org/extension/5724/battery-health-charging/", "shell_version_map": { - "42": {"version": "36", "sha256": "1bsa8kgfnpninir036c87xjcmxjd3c7rn3f8l0r5rwqdnnigkf6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzIFxuLSBMRyBcbi0gU2Ftc3VuZyBcbi0gU29ueSBcbi0gSHVhd2VpIFxuLSBUb3NoaWJhIFxuLSBTeXN0ZW03NiBcbi0gTGVub3ZvIChJZGVhcGFkLCBMZWdpb24pIFxuLSBUaGlua3BhZCBcbi0gUGFuYXNvbmljIFxuLSBBY2VyIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBNU0kgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIFR1eGVkbyAoZGVwZW5kZWNpZXM6IGN1c3RvbSBka21zKSBcbi0gU2xpbWJvb2sgSW50ZWxRQzcxIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBUdXhlZG8gSW50ZWxRQzcxIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBFbHVrdHJvbmljcyBJbnRlbFFDNzEgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIERlbGwgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpIFxuLSBEZWxsIChkZXBlbmRlY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcikgXG4tIEFwcGxlIE1hY2Jvb2sgSW50ZWwtc2VyaWVzIGNoaXAgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoZGVwZW5kZWNpZXM6IGN1c3RvbSBrZXJuZWwpIFxuLSBSYXplciAoZGVwZW5kZWNpZXM6IGN1c3RvbSBwYWNrYWdlIHJhemVyLWNsaSkgXG5cbk5vdCBhbGwgbW9kZWxzIGFyZSBjb21hcHRpYmxlLiBQbGVhc2UgcmVhZCBhYm91dCB0aGUgY29tcGF0aWJpbGl0eSBhbmQgZGVwZW5kZW5jaWVzIG9mIHlvdXIgZGV2aWNlIG9uIGdpdGh1YiBsaW5rIGJlbG93LlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nLyIsCiAgImdldHRleHQtZG9tYWluIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInV1aWQiOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="}, - "43": {"version": "36", "sha256": "1bsa8kgfnpninir036c87xjcmxjd3c7rn3f8l0r5rwqdnnigkf6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzIFxuLSBMRyBcbi0gU2Ftc3VuZyBcbi0gU29ueSBcbi0gSHVhd2VpIFxuLSBUb3NoaWJhIFxuLSBTeXN0ZW03NiBcbi0gTGVub3ZvIChJZGVhcGFkLCBMZWdpb24pIFxuLSBUaGlua3BhZCBcbi0gUGFuYXNvbmljIFxuLSBBY2VyIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBNU0kgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIFR1eGVkbyAoZGVwZW5kZWNpZXM6IGN1c3RvbSBka21zKSBcbi0gU2xpbWJvb2sgSW50ZWxRQzcxIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBUdXhlZG8gSW50ZWxRQzcxIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBFbHVrdHJvbmljcyBJbnRlbFFDNzEgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIERlbGwgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpIFxuLSBEZWxsIChkZXBlbmRlY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcikgXG4tIEFwcGxlIE1hY2Jvb2sgSW50ZWwtc2VyaWVzIGNoaXAgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoZGVwZW5kZWNpZXM6IGN1c3RvbSBrZXJuZWwpIFxuLSBSYXplciAoZGVwZW5kZWNpZXM6IGN1c3RvbSBwYWNrYWdlIHJhemVyLWNsaSkgXG5cbk5vdCBhbGwgbW9kZWxzIGFyZSBjb21hcHRpYmxlLiBQbGVhc2UgcmVhZCBhYm91dCB0aGUgY29tcGF0aWJpbGl0eSBhbmQgZGVwZW5kZW5jaWVzIG9mIHlvdXIgZGV2aWNlIG9uIGdpdGh1YiBsaW5rIGJlbG93LlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nLyIsCiAgImdldHRleHQtZG9tYWluIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInV1aWQiOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="}, - "44": {"version": "36", "sha256": "1bsa8kgfnpninir036c87xjcmxjd3c7rn3f8l0r5rwqdnnigkf6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzIFxuLSBMRyBcbi0gU2Ftc3VuZyBcbi0gU29ueSBcbi0gSHVhd2VpIFxuLSBUb3NoaWJhIFxuLSBTeXN0ZW03NiBcbi0gTGVub3ZvIChJZGVhcGFkLCBMZWdpb24pIFxuLSBUaGlua3BhZCBcbi0gUGFuYXNvbmljIFxuLSBBY2VyIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBNU0kgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIFR1eGVkbyAoZGVwZW5kZWNpZXM6IGN1c3RvbSBka21zKSBcbi0gU2xpbWJvb2sgSW50ZWxRQzcxIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBUdXhlZG8gSW50ZWxRQzcxIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBFbHVrdHJvbmljcyBJbnRlbFFDNzEgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIERlbGwgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpIFxuLSBEZWxsIChkZXBlbmRlY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcikgXG4tIEFwcGxlIE1hY2Jvb2sgSW50ZWwtc2VyaWVzIGNoaXAgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoZGVwZW5kZWNpZXM6IGN1c3RvbSBrZXJuZWwpIFxuLSBSYXplciAoZGVwZW5kZWNpZXM6IGN1c3RvbSBwYWNrYWdlIHJhemVyLWNsaSkgXG5cbk5vdCBhbGwgbW9kZWxzIGFyZSBjb21hcHRpYmxlLiBQbGVhc2UgcmVhZCBhYm91dCB0aGUgY29tcGF0aWJpbGl0eSBhbmQgZGVwZW5kZW5jaWVzIG9mIHlvdXIgZGV2aWNlIG9uIGdpdGh1YiBsaW5rIGJlbG93LlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nLyIsCiAgImdldHRleHQtZG9tYWluIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInV1aWQiOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="}, - "45": {"version": "37", "sha256": "043avgmh2zjbcj4rs2kjyi6yrpxam4i7hm9rp9x4m6vixxgsz6r3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzIFxuLSBMRyBcbi0gU2Ftc3VuZyBcbi0gU29ueSBcbi0gSHVhd2VpIFxuLSBUb3NoaWJhIFxuLSBTeXN0ZW03NiBcbi0gTGVub3ZvIChJZGVhcGFkLCBMZWdpb24pIFxuLSBUaGlua3BhZCBcbi0gUGFuYXNvbmljIFxuLSBBY2VyIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBNU0kgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIFR1eGVkbyAoZGVwZW5kZWNpZXM6IGN1c3RvbSBka21zKSBcbi0gU2xpbWJvb2sgSW50ZWxRQzcxIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBUdXhlZG8gSW50ZWxRQzcxIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlY2llczogY3VzdG9tIGRrbXMpIFxuLSBFbHVrdHJvbmljcyBJbnRlbFFDNzEgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIEdpZ2FieXRlIEFlcm8vQW9ydXMgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIERlbGwgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpIFxuLSBEZWxsIChkZXBlbmRlY2llczogY3VzdG9tIHBhY2thZ2UgRGVsbCBDb21tYW5kIENlbnRlcikgXG4tIEFwcGxlIE1hY2Jvb2sgSW50ZWwtc2VyaWVzIGNoaXAgKGRlcGVuZGVjaWVzOiBjdXN0b20gZGttcykgXG4tIEFwcGxlIE1hY2Jvb2sgTS1zZXJpZXMgY2hpcCAoZGVwZW5kZWNpZXM6IGN1c3RvbSBrZXJuZWwpIFxuLSBSYXplciAoZGVwZW5kZWNpZXM6IGN1c3RvbSBwYWNrYWdlIHJhemVyLWNsaSkgXG5cbk5vdCBhbGwgbW9kZWxzIGFyZSBjb21hcHRpYmxlLiBQbGVhc2UgcmVhZCBhYm91dCB0aGUgY29tcGF0aWJpbGl0eSBhbmQgZGVwZW5kZW5jaWVzIG9mIHlvdXIgZGV2aWNlIG9uIGdpdGh1YiBsaW5rIGJlbG93LlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nLyIsCiAgImdldHRleHQtZG9tYWluIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbmlhY3gvQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJ1dWlkIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"} +, {"uuid": "Battery-Health-Charging@maniacx.github.com", "name": "Battery Health Charging", "pname": "battery-health-charging", "description": "Set battery charging threshold / charging limit / charging mode\nBattery Health Charging: An extension to maximize the battery life of laptops by setting their charging threshold or modes.\n\nCompatible with\n- Asus\n- LG\n- Samsung\n- Sony\n- Huawei\n- Toshiba\n- System76\n- Lenovo (Ideapad, Legion)\n- Thinkpad\n- Panasonic\n- Acer (dependecies: kernel module)\n- MSI (dependecies: kernel module)\n- Tuxedo (dependecies: kernel module)\n- Slimbook (dependecies: kernel module)\n- Tuxedo IntelQC71 (dependecies: kernel module)\n- XMG IntelQC71 (dependecies: kernel module)\n- Eluktronics IntelQC71 (dependecies: kernel module)\n- Gigabyte Aero/Aorus (dependecies: kernel module)\n- Dell (dependecies: custom package libsmbios)\n- Dell (dependecies: custom package Dell Command Center)\n- Apple Macbook Intel-series chip (dependecies: kernel module)\n- Apple Macbook M-series chip (dependecies: custom kernel)\n- Razer (dependecies: custom package razer-cli)\n- Framework (dependecies: kernel module)\n\nNot all models are comaptible. Please read about the compatibility and dependencies of your device on github link below.\n\nhttps://maniacx.github.io/Battery-Health-Charging/", "link": "https://extensions.gnome.org/extension/5724/battery-health-charging/", "shell_version_map": { + "42": {"version": "39", "sha256": "1qq62hkb1j1ngq65x68l3lamx6mi32sjappm7dx06psfw2yav3hb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueVxuLSBIdWF3ZWlcbi0gVG9zaGliYVxuLSBTeXN0ZW03NlxuLSBMZW5vdm8gKElkZWFwYWQsIExlZ2lvbilcbi0gVGhpbmtwYWRcbi0gUGFuYXNvbmljXG4tIEFjZXIgKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBNU0kgKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoZGVwZW5kZWNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFR1eGVkbyBJbnRlbFFDNzEgKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlY2llczoga2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChkZXBlbmRlY2llczoga2VybmVsIG1vZHVsZSlcbi0gR2lnYWJ5dGUgQWVyby9Bb3J1cyAoZGVwZW5kZWNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIERlbGwgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSBEZWxsIENvbW1hbmQgQ2VudGVyKVxuLSBBcHBsZSBNYWNib29rIEludGVsLXNlcmllcyBjaGlwIChkZXBlbmRlY2llczoga2VybmVsIG1vZHVsZSlcbi0gQXBwbGUgTWFjYm9vayBNLXNlcmllcyBjaGlwIChkZXBlbmRlY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSByYXplci1jbGkpXG4tIEZyYW1ld29yayAoZGVwZW5kZWNpZXM6IGtlcm5lbCBtb2R1bGUpXG5cbk5vdCBhbGwgbW9kZWxzIGFyZSBjb21hcHRpYmxlLiBQbGVhc2UgcmVhZCBhYm91dCB0aGUgY29tcGF0aWJpbGl0eSBhbmQgZGVwZW5kZW5jaWVzIG9mIHlvdXIgZGV2aWNlIG9uIGdpdGh1YiBsaW5rIGJlbG93LlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nLyIsCiAgImdldHRleHQtZG9tYWluIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInV1aWQiOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM5Cn0="}, + "43": {"version": "39", "sha256": "1qq62hkb1j1ngq65x68l3lamx6mi32sjappm7dx06psfw2yav3hb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueVxuLSBIdWF3ZWlcbi0gVG9zaGliYVxuLSBTeXN0ZW03NlxuLSBMZW5vdm8gKElkZWFwYWQsIExlZ2lvbilcbi0gVGhpbmtwYWRcbi0gUGFuYXNvbmljXG4tIEFjZXIgKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBNU0kgKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoZGVwZW5kZWNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFR1eGVkbyBJbnRlbFFDNzEgKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlY2llczoga2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChkZXBlbmRlY2llczoga2VybmVsIG1vZHVsZSlcbi0gR2lnYWJ5dGUgQWVyby9Bb3J1cyAoZGVwZW5kZWNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIERlbGwgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSBEZWxsIENvbW1hbmQgQ2VudGVyKVxuLSBBcHBsZSBNYWNib29rIEludGVsLXNlcmllcyBjaGlwIChkZXBlbmRlY2llczoga2VybmVsIG1vZHVsZSlcbi0gQXBwbGUgTWFjYm9vayBNLXNlcmllcyBjaGlwIChkZXBlbmRlY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSByYXplci1jbGkpXG4tIEZyYW1ld29yayAoZGVwZW5kZWNpZXM6IGtlcm5lbCBtb2R1bGUpXG5cbk5vdCBhbGwgbW9kZWxzIGFyZSBjb21hcHRpYmxlLiBQbGVhc2UgcmVhZCBhYm91dCB0aGUgY29tcGF0aWJpbGl0eSBhbmQgZGVwZW5kZW5jaWVzIG9mIHlvdXIgZGV2aWNlIG9uIGdpdGh1YiBsaW5rIGJlbG93LlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nLyIsCiAgImdldHRleHQtZG9tYWluIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInV1aWQiOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM5Cn0="}, + "44": {"version": "39", "sha256": "1qq62hkb1j1ngq65x68l3lamx6mi32sjappm7dx06psfw2yav3hb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueVxuLSBIdWF3ZWlcbi0gVG9zaGliYVxuLSBTeXN0ZW03NlxuLSBMZW5vdm8gKElkZWFwYWQsIExlZ2lvbilcbi0gVGhpbmtwYWRcbi0gUGFuYXNvbmljXG4tIEFjZXIgKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBNU0kgKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoZGVwZW5kZWNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFR1eGVkbyBJbnRlbFFDNzEgKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlY2llczoga2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChkZXBlbmRlY2llczoga2VybmVsIG1vZHVsZSlcbi0gR2lnYWJ5dGUgQWVyby9Bb3J1cyAoZGVwZW5kZWNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIERlbGwgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSBEZWxsIENvbW1hbmQgQ2VudGVyKVxuLSBBcHBsZSBNYWNib29rIEludGVsLXNlcmllcyBjaGlwIChkZXBlbmRlY2llczoga2VybmVsIG1vZHVsZSlcbi0gQXBwbGUgTWFjYm9vayBNLXNlcmllcyBjaGlwIChkZXBlbmRlY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSByYXplci1jbGkpXG4tIEZyYW1ld29yayAoZGVwZW5kZWNpZXM6IGtlcm5lbCBtb2R1bGUpXG5cbk5vdCBhbGwgbW9kZWxzIGFyZSBjb21hcHRpYmxlLiBQbGVhc2UgcmVhZCBhYm91dCB0aGUgY29tcGF0aWJpbGl0eSBhbmQgZGVwZW5kZW5jaWVzIG9mIHlvdXIgZGV2aWNlIG9uIGdpdGh1YiBsaW5rIGJlbG93LlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nLyIsCiAgImdldHRleHQtZG9tYWluIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFuaWFjeC9CYXR0ZXJ5LUhlYWx0aC1DaGFyZ2luZyIsCiAgInV1aWQiOiAiQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmdAbWFuaWFjeC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM5Cn0="}, + "45": {"version": "40", "sha256": "03d0bpfmkqh6s88xp4ia9i22r7qdqfljmn521x7pfwqs5ax1aha1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBiYXR0ZXJ5IGNoYXJnaW5nIHRocmVzaG9sZCAvIGNoYXJnaW5nIGxpbWl0IC8gY2hhcmdpbmcgbW9kZVxuQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmc6IEFuIGV4dGVuc2lvbiB0byBtYXhpbWl6ZSB0aGUgYmF0dGVyeSBsaWZlIG9mIGxhcHRvcHMgYnkgc2V0dGluZyB0aGVpciBjaGFyZ2luZyB0aHJlc2hvbGQgb3IgbW9kZXMuXG5cbkNvbXBhdGlibGUgd2l0aFxuLSBBc3VzXG4tIExHXG4tIFNhbXN1bmdcbi0gU29ueVxuLSBIdWF3ZWlcbi0gVG9zaGliYVxuLSBTeXN0ZW03NlxuLSBMZW5vdm8gKElkZWFwYWQsIExlZ2lvbilcbi0gVGhpbmtwYWRcbi0gUGFuYXNvbmljXG4tIEFjZXIgKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBNU0kgKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBUdXhlZG8gKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBTbGltYm9vayAoZGVwZW5kZWNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIFR1eGVkbyBJbnRlbFFDNzEgKGRlcGVuZGVjaWVzOiBrZXJuZWwgbW9kdWxlKVxuLSBYTUcgSW50ZWxRQzcxIChkZXBlbmRlY2llczoga2VybmVsIG1vZHVsZSlcbi0gRWx1a3Ryb25pY3MgSW50ZWxRQzcxIChkZXBlbmRlY2llczoga2VybmVsIG1vZHVsZSlcbi0gR2lnYWJ5dGUgQWVyby9Bb3J1cyAoZGVwZW5kZWNpZXM6IGtlcm5lbCBtb2R1bGUpXG4tIERlbGwgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSBsaWJzbWJpb3MpXG4tIERlbGwgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSBEZWxsIENvbW1hbmQgQ2VudGVyKVxuLSBBcHBsZSBNYWNib29rIEludGVsLXNlcmllcyBjaGlwIChkZXBlbmRlY2llczoga2VybmVsIG1vZHVsZSlcbi0gQXBwbGUgTWFjYm9vayBNLXNlcmllcyBjaGlwIChkZXBlbmRlY2llczogY3VzdG9tIGtlcm5lbClcbi0gUmF6ZXIgKGRlcGVuZGVjaWVzOiBjdXN0b20gcGFja2FnZSByYXplci1jbGkpXG4tIEZyYW1ld29yayAoZGVwZW5kZWNpZXM6IGtlcm5lbCBtb2R1bGUpXG5cbk5vdCBhbGwgbW9kZWxzIGFyZSBjb21hcHRpYmxlLiBQbGVhc2UgcmVhZCBhYm91dCB0aGUgY29tcGF0aWJpbGl0eSBhbmQgZGVwZW5kZW5jaWVzIG9mIHlvdXIgZGV2aWNlIG9uIGdpdGh1YiBsaW5rIGJlbG93LlxuXG5odHRwczovL21hbmlhY3guZ2l0aHViLmlvL0JhdHRlcnktSGVhbHRoLUNoYXJnaW5nLyIsCiAgImdldHRleHQtZG9tYWluIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiQmF0dGVyeSBIZWFsdGggQ2hhcmdpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbmlhY3gvQmF0dGVyeS1IZWFsdGgtQ2hhcmdpbmciLAogICJ1dWlkIjogIkJhdHRlcnktSGVhbHRoLUNoYXJnaW5nQG1hbmlhY3guZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0MAp9"} }} , {"uuid": "oneclickbios@sao.studio", "name": "One-Click BIOS", "pname": "one-click-bios", "description": "Restart into firmware settings directly from OS\n\nHold Shift and click the power menu button to trigger restart into firmware settings.\n\nAny suggestion is appreciated on GitHub!", "link": "https://extensions.gnome.org/extension/5733/one-click-bios/", "shell_version_map": { "43": {"version": "5", "sha256": "07r9vspq35s632j0pzywrhb8islb9fq49dv0a1s6yvp23d7bzni7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncyBkaXJlY3RseSBmcm9tIE9TXG5cbkhvbGQgU2hpZnQgYW5kIGNsaWNrIHRoZSBwb3dlciBtZW51IGJ1dHRvbiB0byB0cmlnZ2VyIHJlc3RhcnQgaW50byBmaXJtd2FyZSBzZXR0aW5ncy5cblxuQW55IHN1Z2dlc3Rpb24gaXMgYXBwcmVjaWF0ZWQgb24gR2l0SHViISIsCiAgIm5hbWUiOiAiT25lLUNsaWNrIEJJT1MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbTFuaWNydXNoZXIvb25lLWNsaWNrLWJpb3MiLAogICJ1dWlkIjogIm9uZWNsaWNrYmlvc0BzYW8uc3R1ZGlvIiwKICAidmVyc2lvbiI6IDUKfQ=="} @@ -5640,7 +5648,7 @@ "44": {"version": "23", "sha256": "00clk8w8p1sxsqpmwsmlgki2vvx9cjlvnzsrn9j69n1img4vbiwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiSGVhZHNldENvbnRyb2wiLAogICJuYW1lIjogIkhlYWRzZXRDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhlYWRzZXRDb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9nbm9tZS1zaGVsbC1leHRlbnNpb24tSGVhZHNldENvbnRyb2wiLAogICJ1dWlkIjogIkhlYWRzZXRDb250cm9sQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "45": {"version": "24", "sha256": "0yqqak6s2vhz6c870j5p8h76n3d8sw24i358amzkcprnhz414azx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFNoZWxsIEV4dGVuc2lvbiB0byB2aXN1YWxpemUgaGVhZHNldCBzdGF0dXMgZnJvbSBIZWFkc2V0Q29udHJvbCAoaHR0cHM6Ly9naXRodWIuY29tL1NhcGQvSGVhZHNldENvbnRyb2wpIGNvbW1hbmQgbGluZSB0b29sIiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJDaHJpc0xhdWluZ2VyNzciLAogICAgInBheXBhbCI6ICJDaHJpc0xhdWluZ2VyIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIkhlYWRzZXRDb250cm9sIiwKICAibmFtZSI6ICJIZWFkc2V0Q29udHJvbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5IZWFkc2V0Q29udHJvbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUhlYWRzZXRDb250cm9sIiwKICAidXVpZCI6ICJIZWFkc2V0Q29udHJvbEBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDI0Cn0="} }} -, {"uuid": "true-color-window-invert@lynet101", "name": "True Color Window Invert", "pname": "true-color-invert", "description": "Inverts the color of individual windows so they are hue-preserved.\nDefault shortcut is Super+I (Fork from JackKenney, due to 2+ years of inactivity)\n\npatch notes v3:\nFixed an issue where windows would occasionally disappear upon inversion\n\nAbout Gnome 45:\nThere will be made an effort to port this extension to gnome 45, but gnome has decided to revamp large parts of the framework used for these sorts of extensions, and as I'm a solo developer, don't expect it to be ported immediately .\n\nI apologize for any inconvenience this may cause ;(", "link": "https://extensions.gnome.org/extension/5829/true-color-invert/", "shell_version_map": { +, {"uuid": "true-color-window-invert@lynet101", "name": "True Color Window Invert", "pname": "true-color-invert", "description": "Inverts the color of individual windows so they are hue-preserved.\nDefault shortcut is Super+I (Fork from JackKenney, due to 2+ years of inactivity)\n\n!!!IMPORTANT!!!\nDue to changes in personal and professional life, developer lynet_101 will no longer be able to maintain this project, and the extension, as a result, is from December the 5th 2023 orphaned\n\npatch notes v3:\nFixed an issue where windows would occasionally disappear upon inversion\n\nAbout Gnome 45:\nThere will be made an effort to port this extension to gnome 45, but gnome has decided to revamp large parts of the framework used for these sorts of extensions, and as I'm a solo developer, don't expect it to be ported immediately .\n\nI apologize for any inconvenience this may cause ;(", "link": "https://extensions.gnome.org/extension/5829/true-color-invert/", "shell_version_map": { "38": {"version": "3", "sha256": "01hsx7mrd0z8fy797x3xn8jqjjw8a34dxj4vvf9w43zdixj5i6z4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIChGb3JrIGZyb20gSmFja0tlbm5leSwgZHVlIHRvIDIrIHllYXJzIG9mIGluYWN0aXZpdHlcblxucGF0Y2ggbm90ZXMgdjM6XG5GaXhlZCBhbiBpc3N1ZSB3aGVyZSB3aW5kb3dzIHdvdWxkIG9jY2FzaW9uYWxseSBkaXNhcHBlYXIgdXBvbiBpbnZlcnNpb25cblxuTm90ZXM6XG5BcyB0aGlzIGlzIGEgZmFpcmx5IG5ldyBhZG9wdGlvbiwgb2YgYSBmYWlybHkgb2xkIHByb2plY3QsIGV4cGVjdCBmcmVxdWVudCB1cGRhdGVzIGFuZCBidWcgcGF0Y2hlcyBpbiB0aGUgYmVnaW5uaW5nLiB0aGFuayB5b3UgZm9yIHVuZGVyc3RhbmRpbmciLAogICJuYW1lIjogIlRydWUgQ29sb3IgV2luZG93IEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLXdpbmRvdy1pbnZlcnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x5bmV0MTAxL2dub21lLXRydWUtY29sb3ItaW52ZXJ0IiwKICAidXVpZCI6ICJ0cnVlLWNvbG9yLXdpbmRvdy1pbnZlcnRAbHluZXQxMDEiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "01hsx7mrd0z8fy797x3xn8jqjjw8a34dxj4vvf9w43zdixj5i6z4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIChGb3JrIGZyb20gSmFja0tlbm5leSwgZHVlIHRvIDIrIHllYXJzIG9mIGluYWN0aXZpdHlcblxucGF0Y2ggbm90ZXMgdjM6XG5GaXhlZCBhbiBpc3N1ZSB3aGVyZSB3aW5kb3dzIHdvdWxkIG9jY2FzaW9uYWxseSBkaXNhcHBlYXIgdXBvbiBpbnZlcnNpb25cblxuTm90ZXM6XG5BcyB0aGlzIGlzIGEgZmFpcmx5IG5ldyBhZG9wdGlvbiwgb2YgYSBmYWlybHkgb2xkIHByb2plY3QsIGV4cGVjdCBmcmVxdWVudCB1cGRhdGVzIGFuZCBidWcgcGF0Y2hlcyBpbiB0aGUgYmVnaW5uaW5nLiB0aGFuayB5b3UgZm9yIHVuZGVyc3RhbmRpbmciLAogICJuYW1lIjogIlRydWUgQ29sb3IgV2luZG93IEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLXdpbmRvdy1pbnZlcnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x5bmV0MTAxL2dub21lLXRydWUtY29sb3ItaW52ZXJ0IiwKICAidXVpZCI6ICJ0cnVlLWNvbG9yLXdpbmRvdy1pbnZlcnRAbHluZXQxMDEiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "01hsx7mrd0z8fy797x3xn8jqjjw8a34dxj4vvf9w43zdixj5i6z4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIChGb3JrIGZyb20gSmFja0tlbm5leSwgZHVlIHRvIDIrIHllYXJzIG9mIGluYWN0aXZpdHlcblxucGF0Y2ggbm90ZXMgdjM6XG5GaXhlZCBhbiBpc3N1ZSB3aGVyZSB3aW5kb3dzIHdvdWxkIG9jY2FzaW9uYWxseSBkaXNhcHBlYXIgdXBvbiBpbnZlcnNpb25cblxuTm90ZXM6XG5BcyB0aGlzIGlzIGEgZmFpcmx5IG5ldyBhZG9wdGlvbiwgb2YgYSBmYWlybHkgb2xkIHByb2plY3QsIGV4cGVjdCBmcmVxdWVudCB1cGRhdGVzIGFuZCBidWcgcGF0Y2hlcyBpbiB0aGUgYmVnaW5uaW5nLiB0aGFuayB5b3UgZm9yIHVuZGVyc3RhbmRpbmciLAogICJuYW1lIjogIlRydWUgQ29sb3IgV2luZG93IEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLXdpbmRvdy1pbnZlcnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x5bmV0MTAxL2dub21lLXRydWUtY29sb3ItaW52ZXJ0IiwKICAidXVpZCI6ICJ0cnVlLWNvbG9yLXdpbmRvdy1pbnZlcnRAbHluZXQxMDEiLAogICJ2ZXJzaW9uIjogMwp9"}, @@ -5665,7 +5673,8 @@ "41": {"version": "9", "sha256": "1mx02i0nl3cv3pmv7ck1g4ddkjk4mqpcv6hlxsfsvn46ijwrjrjd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlIHRoZSBzdHlsaW5nLiAgSXQgbWFrZXMgZ25vbWUtc2hlbGwgZGVmYXVsdCB0aGVtZSBmaXQgdG8gVWJ1bnR1LiIsCiAgIm5hbWUiOiAiQWRtaXNzaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29yYml0Y29ycmVjdG9uL1ZhbmlsbGEvdHJlZS9leHBlcmltZW50YWwyIiwKICAidXVpZCI6ICJhZG1pc3Npb25AZ2l0aHViLmNvbS5vcmJpdGNvcnJlY3Rpb24iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "1mx02i0nl3cv3pmv7ck1g4ddkjk4mqpcv6hlxsfsvn46ijwrjrjd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlIHRoZSBzdHlsaW5nLiAgSXQgbWFrZXMgZ25vbWUtc2hlbGwgZGVmYXVsdCB0aGVtZSBmaXQgdG8gVWJ1bnR1LiIsCiAgIm5hbWUiOiAiQWRtaXNzaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29yYml0Y29ycmVjdG9uL1ZhbmlsbGEvdHJlZS9leHBlcmltZW50YWwyIiwKICAidXVpZCI6ICJhZG1pc3Npb25AZ2l0aHViLmNvbS5vcmJpdGNvcnJlY3Rpb24iLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "1mx02i0nl3cv3pmv7ck1g4ddkjk4mqpcv6hlxsfsvn46ijwrjrjd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlIHRoZSBzdHlsaW5nLiAgSXQgbWFrZXMgZ25vbWUtc2hlbGwgZGVmYXVsdCB0aGVtZSBmaXQgdG8gVWJ1bnR1LiIsCiAgIm5hbWUiOiAiQWRtaXNzaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29yYml0Y29ycmVjdG9uL1ZhbmlsbGEvdHJlZS9leHBlcmltZW50YWwyIiwKICAidXVpZCI6ICJhZG1pc3Npb25AZ2l0aHViLmNvbS5vcmJpdGNvcnJlY3Rpb24iLAogICJ2ZXJzaW9uIjogOQp9"}, - "44": {"version": "8", "sha256": "0fkphjqxnm2c6vg90w3pi36pnc39ffgav10gc0mxdmlq9xqp3q4c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlIHRoZSBzdHlsaW5nLiAgSXQgbWFrZXMgZ25vbWUtc2hlbGwgZGVmYXVsdCB0aGVtZSBmaXQgdG8gVWJ1bnR1LiIsCiAgIm5hbWUiOiAiQWRtaXNzaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29yYml0Y29ycmVjdG9uL1ZhbmlsbGEvdHJlZS9leHBlcmltZW50YWwyIiwKICAidXVpZCI6ICJhZG1pc3Npb25AZ2l0aHViLmNvbS5vcmJpdGNvcnJlY3Rpb24iLAogICJ2ZXJzaW9uIjogOAp9"} + "44": {"version": "8", "sha256": "0fkphjqxnm2c6vg90w3pi36pnc39ffgav10gc0mxdmlq9xqp3q4c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlIHRoZSBzdHlsaW5nLiAgSXQgbWFrZXMgZ25vbWUtc2hlbGwgZGVmYXVsdCB0aGVtZSBmaXQgdG8gVWJ1bnR1LiIsCiAgIm5hbWUiOiAiQWRtaXNzaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29yYml0Y29ycmVjdG9uL1ZhbmlsbGEvdHJlZS9leHBlcmltZW50YWwyIiwKICAidXVpZCI6ICJhZG1pc3Npb25AZ2l0aHViLmNvbS5vcmJpdGNvcnJlY3Rpb24iLAogICJ2ZXJzaW9uIjogOAp9"}, + "45": {"version": "10", "sha256": "1glyd6xf4q3h1945c4y03v44js3vcqi5g5mbc9n91wwys0nnb7i3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlIHRoZSBzdHlsaW5nLiAgSXQgbWFrZXMgZ25vbWUtc2hlbGwgZGVmYXVsdCB0aGVtZSBmaXQgdG8gVWJ1bnR1LiIsCiAgIm5hbWUiOiAiQWRtaXNzaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhZG1pc3Npb25AZ2l0aHViLmNvbS5vcmJpdGNvcnJlY3Rpb24iLAogICJ2ZXJzaW9uIjogMTAKfQ=="} }} , {"uuid": "enhunceactivitiese@github.com.orbitcorrection", "name": "Activities Icon & Label", "pname": "enhunce-activities", "description": "Add an icon to the Activities button. \nbased on GNOME gnome-shell and RHEL gnome-shell patch", "link": "https://extensions.gnome.org/extension/5847/enhunce-activities/", "shell_version_map": { "40": {"version": "9", "sha256": "15bl13jhxnrr1q64d9p0rh2scy3fx4bwh36n6p0dpry8dgzp8qk9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhbiBpY29uIHRvIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbi4gIFxuYmFzZWQgb24gR05PTUUgZ25vbWUtc2hlbGwgYW5kIFJIRUwgZ25vbWUtc2hlbGwgcGF0Y2giLAogICJuYW1lIjogIkFjdGl2aXRpZXMgSWNvbiAmICBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3JiaXRjb3JyZWN0b24vZW5odW5jZS1hY3Rpdml0ZXMvdHJlZS9leHBlcmltZW50YWwiLAogICJ1dWlkIjogImVuaHVuY2VhY3Rpdml0aWVzZUBnaXRodWIuY29tLm9yYml0Y29ycmVjdGlvbiIsCiAgInZlcnNpb24iOiA5Cn0="}, @@ -5706,7 +5715,7 @@ , {"uuid": "launcher@hedgie.tech", "name": "Launcher", "pname": "launcher", "description": "Launch scripts from a Panel Indicator", "link": "https://extensions.gnome.org/extension/5874/launcher/", "shell_version_map": { "43": {"version": "8", "sha256": "1k6dlhd4bbb6kcmq1hninz0lsgcdb1ys2krnfgqyc1zs2dccqs2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBzY3JpcHRzIGZyb20gYSBQYW5lbCBJbmRpY2F0b3IiLAogICJuYW1lIjogIkxhdW5jaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2xhdW5jaGVyIiwKICAidXVpZCI6ICJsYXVuY2hlckBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiA4Cn0="}, "44": {"version": "8", "sha256": "1k6dlhd4bbb6kcmq1hninz0lsgcdb1ys2krnfgqyc1zs2dccqs2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBzY3JpcHRzIGZyb20gYSBQYW5lbCBJbmRpY2F0b3IiLAogICJuYW1lIjogIkxhdW5jaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2xhdW5jaGVyIiwKICAidXVpZCI6ICJsYXVuY2hlckBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiA4Cn0="}, - "45": {"version": "9", "sha256": "1zpkvna8krbc0g03nkl5h74m7zijc52msiy91126a64k2fnwvsgs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBzY3JpcHRzIGZyb20gYSBQYW5lbCBJbmRpY2F0b3IiLAogICJuYW1lIjogIkxhdW5jaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGdpZWluc29ja3MvbGF1bmNoZXIiLAogICJ1dWlkIjogImxhdW5jaGVyQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDkKfQ=="} + "45": {"version": "10", "sha256": "0zphryl8k8sqwaqyif4xhn75dcyag9av9sjr17zr851c31k2zdda", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBzY3JpcHRzIGZyb20gYSBQYW5lbCBJbmRpY2F0b3IiLAogICJuYW1lIjogIkxhdW5jaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGdpZWluc29ja3MvbGF1bmNoZXIiLAogICJ1dWlkIjogImxhdW5jaGVyQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDEwCn0="} }} , {"uuid": "just_shows_memory_usage@troizet.github.com", "name": "Just shows memory usage", "pname": "just-shows-memory-usage", "description": "Just shows memory usage", "link": "https://extensions.gnome.org/extension/5877/just-shows-memory-usage/", "shell_version_map": { "38": {"version": "2", "sha256": "1smj4fsfskdrzzh4q1hqhdwaa8bdh21x82sfmdw4gpvfwx9cpgcw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2hvd3MgbWVtb3J5IHVzYWdlIiwKICAibmFtZSI6ICJKdXN0IHNob3dzIG1lbW9yeSB1c2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Ryb2l6ZXQvanVzdC1zaG93cy1tZW1vcnktdXNhZ2UiLAogICJ1dWlkIjogImp1c3Rfc2hvd3NfbWVtb3J5X3VzYWdlQHRyb2l6ZXQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, @@ -5717,7 +5726,7 @@ , {"uuid": "copier@hedgie.tech", "name": "Copier", "pname": "copier", "description": "Navigate and copy text notes to clipboard from a Panel Indicator", "link": "https://extensions.gnome.org/extension/5883/copier/", "shell_version_map": { "43": {"version": "2", "sha256": "0czac27h8fdywwzr5vsfhp7jll2m7ikfb6ivlrnm9193a52gx9i3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5hdmlnYXRlIGFuZCBjb3B5IHRleHQgbm90ZXMgdG8gY2xpcGJvYXJkIGZyb20gYSBQYW5lbCBJbmRpY2F0b3JcblxuSWYgeW91IGhhdmUgZmFjZWQgYW4gaXNzdWUsIHBsZWFzZSByZXBvcnQgaXQgb24gdGhlIEdpdEh1YiBwYWdlIiwKICAibmFtZSI6ICJDb3BpZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29waWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2NvcGllciIsCiAgInV1aWQiOiAiY29waWVyQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "44": {"version": "2", "sha256": "0czac27h8fdywwzr5vsfhp7jll2m7ikfb6ivlrnm9193a52gx9i3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5hdmlnYXRlIGFuZCBjb3B5IHRleHQgbm90ZXMgdG8gY2xpcGJvYXJkIGZyb20gYSBQYW5lbCBJbmRpY2F0b3JcblxuSWYgeW91IGhhdmUgZmFjZWQgYW4gaXNzdWUsIHBsZWFzZSByZXBvcnQgaXQgb24gdGhlIEdpdEh1YiBwYWdlIiwKICAibmFtZSI6ICJDb3BpZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29waWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZWRnaWVpbnNvY2tzL2NvcGllciIsCiAgInV1aWQiOiAiY29waWVyQGhlZGdpZS50ZWNoIiwKICAidmVyc2lvbiI6IDIKfQ=="}, - "45": {"version": "4", "sha256": "0ssfxsh9rn1rbb354qr2qzb0a50rav8i0121jaby4jzdxn0h2m5d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5hdmlnYXRlIGFuZCBjb3B5IHRleHQgbm90ZXMgdG8gY2xpcGJvYXJkIGZyb20gYSBQYW5lbCBJbmRpY2F0b3IiLAogICJuYW1lIjogIkNvcGllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb3BpZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9jb3BpZXIiLAogICJ1dWlkIjogImNvcGllckBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiA0Cn0="} + "45": {"version": "5", "sha256": "1cshw3980cg44259k3jhbjbk1jzra26rlwjcb5mi14zfgn2y1ibv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5hdmlnYXRlIGFuZCBjb3B5IHRleHQgbm90ZXMgdG8gY2xpcGJvYXJkIGZyb20gYSBQYW5lbCBJbmRpY2F0b3IiLAogICJuYW1lIjogIkNvcGllciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb3BpZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9jb3BpZXIiLAogICJ1dWlkIjogImNvcGllckBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiA1Cn0="} }} , {"uuid": "quicktext@brainstormtrooper.github.io", "name": "Quick Text", "pname": "quick-text", "description": "Quickly capture text snippets and ideas, then convert them to tasks or events", "link": "https://extensions.gnome.org/extension/5892/quick-text/", "shell_version_map": { "44": {"version": "8", "sha256": "09ybjnfgf4pnyj4q9xck5cs5yi0mwin47d3mbq55m25mk8sd8grm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2FwdHVyZSB0ZXh0IHNuaXBwZXRzIGFuZCBpZGVhcywgdGhlbiBjb252ZXJ0IHRoZW0gdG8gdGFza3Mgb3IgZXZlbnRzIiwKICAibmFtZSI6ICJRdWljayBUZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JyYWluc3Rvcm10cm9vcGVyL3F1aWNrdGV4dCIsCiAgInV1aWQiOiAicXVpY2t0ZXh0QGJyYWluc3Rvcm10cm9vcGVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, @@ -5834,7 +5843,7 @@ "42": {"version": "95", "sha256": "0myj4g5351fi04w3iwpshjhy9a5vgq85nwd186ymlvnjby12d6fh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi4iLAogICJuYW1lIjogIkdpdGh1YiBBY3Rpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhcm9ub25ha0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGh1Yi1hY3Rpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcm9ub25hay9naXRodWItYWN0aW9ucy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGh1Yi1hY3Rpb25zQGFyb25vbmFrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5NQp9"}, "43": {"version": "95", "sha256": "0myj4g5351fi04w3iwpshjhy9a5vgq85nwd186ymlvnjby12d6fh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi4iLAogICJuYW1lIjogIkdpdGh1YiBBY3Rpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhcm9ub25ha0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGh1Yi1hY3Rpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcm9ub25hay9naXRodWItYWN0aW9ucy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGh1Yi1hY3Rpb25zQGFyb25vbmFrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5NQp9"}, "44": {"version": "95", "sha256": "0myj4g5351fi04w3iwpshjhy9a5vgq85nwd186ymlvnjby12d6fh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi4iLAogICJuYW1lIjogIkdpdGh1YiBBY3Rpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhcm9ub25ha0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdpdGh1Yi1hY3Rpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcm9ub25hay9naXRodWItYWN0aW9ucy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGh1Yi1hY3Rpb25zQGFyb25vbmFrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA5NQp9"}, - "45": {"version": "111", "sha256": "1r8bzjjk6lwid3bmwv8bzsgr3w9a179z0qbrxf5wzyf71y72kad9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi5cblxuVmVyc2lvbnMgYmVsb3cgZ25vbWUgNDUgd2lsbCBubyBsb25nZXIgYmUgc3VwcG9ydGVkIDovIiwKICAibmFtZSI6ICJHaXRodWIgQWN0aW9ucyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiYXJvbm9uYWtAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5naXRodWItYWN0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcm9ub25hay9naXRodWItYWN0aW9ucy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGh1Yi1hY3Rpb25zQGFyb25vbmFrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMTEKfQ=="} + "45": {"version": "112", "sha256": "1cnh8fz1jsbckb6w2kkdlh7ry79mbkrl63v3w8yg1x4wvmg7pnhl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvb2wgdG8gU2hvdyBHaXRodWIgQWN0aW9ucyBzdGF0dXMgb24gR25vbWUgRGVza3RvcC5cblxuQ2hlY2sgb24gZ2l0aHViIGhvdyB0byBpbnN0YWxsLlxuaWYgeW91IGxpa2UgaXQgZ2l2ZSBtZSBhIHN0YXIgb24gZ2l0aHViICFcblxuQWZ0ZXIgdXBkYXRpbmcsIGlmIHlvdSBnZXQgYW4gZXJyb3IsIHBsZWFzZSByZWxvZ2luLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBNaWNyb3NvZnQgYW5kIEdpdEh1Yi5cblxuVmVyc2lvbnMgYmVsb3cgZ25vbWUgNDUgd2lsbCBubyBsb25nZXIgYmUgc3VwcG9ydGVkIDovIiwKICAibmFtZSI6ICJHaXRodWIgQWN0aW9ucyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiYXJvbm9uYWtAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5naXRodWItYWN0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcm9ub25hay9naXRodWItYWN0aW9ucy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdpdGh1Yi1hY3Rpb25zQGFyb25vbmFrLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMTIKfQ=="} }} , {"uuid": "dim-completed-calendar-events@marcinjahn.com", "name": "Dim Completed Calendar Events", "pname": "dim-completed-calendar-events", "description": "Dim completed events in the top panel menu to easily distinguish between upcoming and past events. You can also highlight events that are ongoing.", "link": "https://extensions.gnome.org/extension/5979/dim-completed-calendar-events/", "shell_version_map": { "44": {"version": "3", "sha256": "0dpyrhdc70f77wv8hx7d6xnpxx13c2qfp7dbx716mqq90raij39f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpbSBjb21wbGV0ZWQgZXZlbnRzIGluIHRoZSB0b3AgcGFuZWwgbWVudSB0byBlYXNpbHkgZGlzdGluZ3Vpc2ggYmV0d2VlbiB1cGNvbWluZyBhbmQgcGFzdCBldmVudHMuIFlvdSBjYW4gYWxzbyBoaWdobGlnaHQgZXZlbnRzIHRoYXQgYXJlIG9uZ29pbmcuIiwKICAibmFtZSI6ICJEaW0gQ29tcGxldGVkIENhbGVuZGFyIEV2ZW50cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXJjaW5qYWhuL2dub21lLWRpbS1jb21wbGV0ZWQtY2FsZW5kYXItZXZlbnRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLWNvbXBsZXRlZC1jYWxlbmRhci1ldmVudHNAbWFyY2luamFobi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, @@ -5971,7 +5980,7 @@ "44": {"version": "4", "sha256": "1nzzsm6ai8b0l8c5xvx83cspm4gzx1n6wfdrbik3g7xam06hr861", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcGFzdGUgRW1vamlzIGZyb20gdGhlIFNtaWxlIGVtb2ppIHBpY2tlciIsCiAgIm5hbWUiOiAiU21pbGUgLSBjb21wbGVtZW50YXJ5IGV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pam9ydXMvc21pbGUtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzbWlsZS1leHRlbnNpb25AbWlqb3J1cy5pdCIsCiAgInZlcnNpb24iOiA0Cn0="}, "45": {"version": "7", "sha256": "1fjcwgifggnckk0p7mskpgaz3wm71nz4qgcc1f1jqynwdbidds7l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcGFzdGUgRW1vamlzIGZyb20gdGhlIFNtaWxlIGVtb2ppIHBpY2tlciIsCiAgIm5hbWUiOiAiU21pbGUgLSBjb21wbGVtZW50YXJ5IGV4dGVuc2lvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3NtaWxlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic21pbGUtZXh0ZW5zaW9uQG1pam9ydXMuaXQiLAogICJ2ZXJzaW9uIjogNwp9"} }} -, {"uuid": "paperwm@paperwm.github.com", "name": "PaperWM", "pname": "paperwm", "description": "Tiling window manager with a twist", "link": "https://extensions.gnome.org/extension/6099/paperwm/", "shell_version_map": { +, {"uuid": "paperwm@paperwm.github.com", "name": "PaperWM", "pname": "paperwm", "description": "Tiling window manager with a twist!\n\n PaperWM is a Gnome Shell extension which provides scrollable tiling of windows and per monitor workspaces. It's inspired by paper notebooks and tiling window managers.\n\nPlease see our github page to report issues, understand features, and learn how to configure PaperWM to your liking.", "link": "https://extensions.gnome.org/extension/6099/paperwm/", "shell_version_map": { "42": {"version": "69", "sha256": "15wfc31wz04sil1ys75sw7awhydwh6ydcbrlnf3xwsjbhqym3s83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjksCiAgInZlcnNpb24tbmFtZSI6ICI0NC4xNi4wIgp9"}, "43": {"version": "69", "sha256": "15wfc31wz04sil1ys75sw7awhydwh6ydcbrlnf3xwsjbhqym3s83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjksCiAgInZlcnNpb24tbmFtZSI6ICI0NC4xNi4wIgp9"}, "44": {"version": "69", "sha256": "15wfc31wz04sil1ys75sw7awhydwh6ydcbrlnf3xwsjbhqym3s83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGEgdHdpc3QiLAogICJuYW1lIjogIlBhcGVyV00iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGFwZXJ3bSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcGVyd20vUGFwZXJXTSIsCiAgInV1aWQiOiAicGFwZXJ3bUBwYXBlcndtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjksCiAgInZlcnNpb24tbmFtZSI6ICI0NC4xNi4wIgp9"}, @@ -6069,10 +6078,11 @@ "45": {"version": "7", "sha256": "0045lld30k30425scg2f686isnh2sqvwq41n62p9jc2lx4kvh5kg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVTRCAoVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gVFJZIChUdXJraXNoIExpcmEpLiBVcGRhdGVzIGFyZSByZWNlaXZlZCBldmVyeSAzMCBzZWNvbmRzLlxuXG5JdCBpcyBhIGZvcmsgb2YgRG9sbGFyLVBLUi4gVGhpcyBleHRlbnNpb24gdXNlcyBlY29ub21pYS5hd2Vzb21lYXBpLmNvbS5iciIsCiAgIm5hbWUiOiAiVVNELVRSWSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmlmZXNhdC9VU0QtVFJZLUdTaGVsbCIsCiAgInV1aWQiOiAidXNkLXRyeS1nc2hlbGxAYXJpZmVzYXQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="} }} , {"uuid": "hide-dock-in-overview@roslax", "name": "Hide the dock in overview", "pname": "hide-the-dock-in-overview", "description": "hides the dock in overview mode", "link": "https://extensions.gnome.org/extension/6195/hide-the-dock-in-overview/", "shell_version_map": { - "44": {"version": "3", "sha256": "12f1qrc9hahjrqxvdviqz99pkgzs75f9k6qnnz4fh9v61bqwi31d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIHRoZSBkb2NrIGluIG92ZXJ2aWV3IG1vZGUiLAogICJuYW1lIjogIkhpZGUgdGhlIGRvY2sgaW4gb3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm9zR3RIdWIvSGlkZS1kb2NrLWluLW92ZXJ2aWV3L3RyZWUvbWFpbiIsCiAgInV1aWQiOiAiaGlkZS1kb2NrLWluLW92ZXJ2aWV3QHJvc2xheCIsCiAgInZlcnNpb24iOiAzCn0="} + "44": {"version": "3", "sha256": "12f1qrc9hahjrqxvdviqz99pkgzs75f9k6qnnz4fh9v61bqwi31d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIHRoZSBkb2NrIGluIG92ZXJ2aWV3IG1vZGUiLAogICJuYW1lIjogIkhpZGUgdGhlIGRvY2sgaW4gb3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm9zR3RIdWIvSGlkZS1kb2NrLWluLW92ZXJ2aWV3L3RyZWUvbWFpbiIsCiAgInV1aWQiOiAiaGlkZS1kb2NrLWluLW92ZXJ2aWV3QHJvc2xheCIsCiAgInZlcnNpb24iOiAzCn0="}, + "45": {"version": "6", "sha256": "07bpr6xfpcbyx1braaada0n257fcgyisfpif42c6w9cann6ffq6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIHRoZSBkb2NrIGluIG92ZXJ2aWV3IG1vZGUiLAogICJuYW1lIjogIkhpZGUgdGhlIGRvY2sgaW4gb3ZlcnZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm9zR3RIdWIvSGlkZS1kb2NrLWluLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJoaWRlLWRvY2staW4tb3ZlcnZpZXdAcm9zbGF4IiwKICAidmVyc2lvbiI6IDYKfQ=="} }} , {"uuid": "light-style@gnome-shell-extensions.gcampax.github.com", "name": "Light Style", "pname": "light-style", "description": "Switch default to light style", "link": "https://extensions.gnome.org/extension/6198/light-style/", "shell_version_map": { - "45": {"version": "2", "sha256": "03b5brsdxax54bgpy0aqbnq6fpspwy6m04cj3f76ww1bz34v71cs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBkZWZhdWx0IHRvIGxpZ2h0IHN0eWxlIiwKICAiZXh0ZW5zaW9uLWlkIjogImxpZ2h0LXN0eWxlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxpZ2h0LXN0eWxlIiwKICAibmFtZSI6ICJMaWdodCBTdHlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1zdHlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsaWdodC1zdHlsZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="} + "45": {"version": "3", "sha256": "1x846d9s4knv36g0wh3zmkmpkvv14jbb15qh9pa5xwmysbpbawh7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBkZWZhdWx0IHRvIGxpZ2h0IHN0eWxlIiwKICAiZXh0ZW5zaW9uLWlkIjogImxpZ2h0LXN0eWxlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxpZ2h0LXN0eWxlIiwKICAibmFtZSI6ICJMaWdodCBTdHlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1zdHlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsaWdodC1zdHlsZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="} }} , {"uuid": "transmission-daemon-ng@glerro.pm.me", "name": "Transmission Daemon Indicator NG", "pname": "transmission-daemon-indicator-ng", "description": "Monitor and control transmission-daemon or transmission-gtk.\nThe extension use the Transmission RPC protocol for interacting with it.\n\nFragments 2.0 user also can use this extension because it is a frontend for transmission-daemon.\n\nThis extension is only for Gnome Shell version major or equal to 43 because it use libsoup3.", "link": "https://extensions.gnome.org/extension/6204/transmission-daemon-indicator-ng/", "shell_version_map": { "43": {"version": "5", "sha256": "1g4dxrw7d9yik2y86l66nm50p7glyym6x0ff005kxmd42cl7dv9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vbml0b3IgYW5kIGNvbnRyb2wgdHJhbnNtaXNzaW9uLWRhZW1vbiBvciB0cmFuc21pc3Npb24tZ3RrLlxuVGhlIGV4dGVuc2lvbiB1c2UgdGhlIFRyYW5zbWlzc2lvbiBSUEMgcHJvdG9jb2wgZm9yIGludGVyYWN0aW5nIHdpdGggaXQuXG5cbkZyYWdtZW50cyAyLjAgdXNlciBhbHNvIGNhbiB1c2UgdGhpcyBleHRlbnNpb24gYmVjYXVzZSBpdCBpcyBhIGZyb250ZW5kIGZvciB0cmFuc21pc3Npb24tZGFlbW9uLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBvbmx5IGZvciBHbm9tZSBTaGVsbCB2ZXJzaW9uIG1ham9yIG9yIGVxdWFsIHRvIDQzIGJlY2F1c2UgaXQgdXNlIGxpYnNvdXAzLiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJrb2ZpIjogImdsZXJybyIKICB9LAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgIm5hbWUiOiAiVHJhbnNtaXNzaW9uIERhZW1vbiBJbmRpY2F0b3IgTkciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNtaXNzaW9uLWRhZW1vbi1uZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvZ2xlcnJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc21pc3Npb24tZGFlbW9uLW5nIiwKICAidXVpZCI6ICJ0cmFuc21pc3Npb24tZGFlbW9uLW5nQGdsZXJyby5wbS5tZSIsCiAgInZlcnNpb24iOiA1Cn0="}, @@ -6116,13 +6126,13 @@ "42": {"version": "9", "sha256": "1832867id0z8jbd98dxfywj7k3xr4jjrdi7cblb4dhi2sii6svn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZlbGlwZWZ0bi9lbW9qaS1jb3B5IiwKICAidXVpZCI6ICJlbW9qaS1jb3B5QGZlbGlwZWZ0biIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "1832867id0z8jbd98dxfywj7k3xr4jjrdi7cblb4dhi2sii6svn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZlbGlwZWZ0bi9lbW9qaS1jb3B5IiwKICAidXVpZCI6ICJlbW9qaS1jb3B5QGZlbGlwZWZ0biIsCiAgInZlcnNpb24iOiA5Cn0="}, "44": {"version": "9", "sha256": "1832867id0z8jbd98dxfywj7k3xr4jjrdi7cblb4dhi2sii6svn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZlbGlwZWZ0bi9lbW9qaS1jb3B5IiwKICAidXVpZCI6ICJlbW9qaS1jb3B5QGZlbGlwZWZ0biIsCiAgInZlcnNpb24iOiA5Cn0="}, - "45": {"version": "13", "sha256": "1af6rwk9y6v5if1wck8vb5db4vrv9g84swmjg57rgwj0zgvabxbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmVsaXBlZnRuL2Vtb2ppLWNvcHkiLAogICJ1dWlkIjogImVtb2ppLWNvcHlAZmVsaXBlZnRuIiwKICAidmVyc2lvbiI6IDEzCn0="} + "45": {"version": "14", "sha256": "0zwq0aydj2m9s7bi6ph8k3ag4h7h4d76v1qdavspmz1msh4k1qkj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVtb2ppIGNvcHkgaXMgYSB2ZXJzYXRpbGUgZXh0ZW5zaW9uIGRlc2lnbmVkIHRvIHNpbXBsaWZ5IGVtb2ppIHNlbGVjdGlvbiBhbmQgY2xpcGJvYXJkIG1hbmFnZW1lbnQuXG5cbkl0IGlzIGEgZm9yayBvZiBFbW9qaSBTZWxlY3Rvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1jb3B5IiwKICAibmFtZSI6ICJFbW9qaSBDb3B5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmVtb2ppLWNvcHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmVsaXBlZnRuL2Vtb2ppLWNvcHkiLAogICJ1dWlkIjogImVtb2ppLWNvcHlAZmVsaXBlZnRuIiwKICAidmVyc2lvbiI6IDE0Cn0="} }} , {"uuid": "notification-icons@muhammad_ans.github", "name": "Top Panel Notification Icons Revived", "pname": "top-panel-notification-icons-revived", "description": "Displays notifications icon in top panel", "link": "https://extensions.gnome.org/extension/6248/top-panel-notification-icons-revived/", "shell_version_map": { "45": {"version": "4", "sha256": "0s5bk169l1c7xhvrc07g1y6wjdzsgb3bylc1b3r38kjazdbyr3zp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG5vdGlmaWNhdGlvbnMgaWNvbiBpbiB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMgUmV2aXZlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24taWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXVoYW1tYWQtYW5zL25vdGlmaWNhdGlvbi1pY29ucyIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWljb25zQG11aGFtbWFkX2Fucy5naXRodWIiLAogICJ2ZXJzaW9uIjogNAp9"} }} , {"uuid": "huanghaohhoa@163.com", "name": "Application Tabs", "pname": "application-tabs", "description": "Panel will include a different window tab for the same application that is currently launched.\n1. You can see the application window intuitively\n2. Click tab to jump to the corresponding window immediately\n3. Click the Close button to close the window", "link": "https://extensions.gnome.org/extension/6254/application-tabs/", "shell_version_map": { - "45": {"version": "9", "sha256": "1j6a61cfz1d4kdl1y290m3g0z5lwricpym8niz0nmgqdngcsnjrr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIHRoZSBjb3JyZXNwb25kaW5nIHdpbmRvdyBpbW1lZGlhdGVseVxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93IiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hob2FvL2FwcF90YWJzIiwKICAidXVpZCI6ICJodWFuZ2hhb2hob2FAMTYzLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="} + "45": {"version": "12", "sha256": "0bpf011hpmg4s0vs9m0s8kz58zgizyb42h543q18ipci22kvsssx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsIHdpbGwgaW5jbHVkZSBhIGRpZmZlcmVudCB3aW5kb3cgdGFiIGZvciB0aGUgc2FtZSBhcHBsaWNhdGlvbiB0aGF0IGlzIGN1cnJlbnRseSBsYXVuY2hlZC5cbjEuIFlvdSBjYW4gc2VlIHRoZSBhcHBsaWNhdGlvbiB3aW5kb3cgaW50dWl0aXZlbHlcbjIuIENsaWNrIHRhYiB0byBqdW1wIHRvIHRoZSBjb3JyZXNwb25kaW5nIHdpbmRvdyBpbW1lZGlhdGVseVxuMy4gQ2xpY2sgdGhlIENsb3NlIGJ1dHRvbiB0byBjbG9zZSB0aGUgd2luZG93IiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBUYWJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFwcF90YWJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hob2FvL2FwcF90YWJzIiwKICAidXVpZCI6ICJodWFuZ2hhb2hob2FAMTYzLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"} }} , {"uuid": "ping@prasanthc41m.github.com", "name": "Ping", "pname": "ping", "description": "A Ping Extension", "link": "https://extensions.gnome.org/extension/6260/ping/", "shell_version_map": { "44": {"version": "1", "sha256": "10s0hsrgs8p0xc1iwcjhg7x690si8pw9q5n8c881pf5lz6cs23gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUGluZyBFeHRlbnNpb24iLAogICJuYW1lIjogIlBpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wcmFzYW50aGM0MW0vcGluZy1leHRlbnNpb24iLAogICJ1dWlkIjogInBpbmdAcHJhc2FudGhjNDFtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"} @@ -6159,7 +6169,7 @@ , {"uuid": "indicator@hedgie.tech", "name": "Indicator", "pname": "indicator", "description": "Add an indicator for a custom service", "link": "https://extensions.gnome.org/extension/6293/indicator/", "shell_version_map": { "45": {"version": "2", "sha256": "1nrpmccdhxdsrz76qfawpycr4jhnqvpm6kcfdhhxax3zwxl28sva", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhbiBpbmRpY2F0b3IgZm9yIGEgY3VzdG9tIHNlcnZpY2UiLAogICJuYW1lIjogIkluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVkZ2llaW5zb2Nrcy9pbmRpY2F0b3IiLAogICJ1dWlkIjogImluZGljYXRvckBoZWRnaWUudGVjaCIsCiAgInZlcnNpb24iOiAyCn0="} }} -, {"uuid": "dark-style@fthx", "name": "Dark Style", "pname": "dark-style", "description": "Switch Shell-only default to dark style. Useful for Ubuntu.", "link": "https://extensions.gnome.org/extension/6296/dark-style/", "shell_version_map": { +, {"uuid": "dark-style@fthx", "name": "Dark Style", "pname": "dark-style", "description": "Switch Shell-only default to dark style. Useful for Ubuntu.\n\nNOT USEFUL ANYMORE", "link": "https://extensions.gnome.org/extension/6296/dark-style/", "shell_version_map": { "45": {"version": "1", "sha256": "1cx0gwbc020jwdpjysm1kabhdnip16kzsgz5l9sf8pv9lrrdmj06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBTaGVsbC1vbmx5IGRlZmF1bHQgdG8gZGFyayBzdHlsZS4gVXNlZnVsIGZvciBVYnVudHUuIiwKICAiZXh0ZW5zaW9uLWlkIjogImRhcmstc3R5bGUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJEYXJrIFN0eWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhcmstc3R5bGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kYXJrLXN0eWxlIiwKICAidXVpZCI6ICJkYXJrLXN0eWxlQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"} }} , {"uuid": "custom-window-controls@icedman.github.com", "name": "Custom Window Controls", "pname": "custom-window-controls", "description": "Theme the window control buttons. (Warning: Highly Experimental)", "link": "https://extensions.gnome.org/extension/6300/custom-window-controls/", "shell_version_map": { @@ -6168,8 +6178,8 @@ , {"uuid": "workspace-indicator-left@gmtborges.com", "name": "Workspace Indicator Left", "pname": "workspace-indicator-left", "description": "The same as Workspace Indicator, but on the left like swaywm.\n\nIt is a fork of Workspace Indicator by fmuellner.", "link": "https://extensions.gnome.org/extension/6303/workspace-indicator-left/", "shell_version_map": { "44": {"version": "2", "sha256": "0yhczb1cbh39ryrk2zw5nqmda819h748pdslpm0rxn4jy3dzpn4i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBzYW1lIGFzIFdvcmtzcGFjZSBJbmRpY2F0b3IsIGJ1dCBvbiB0aGUgbGVmdCBsaWtlIHN3YXl3bS5cblxuSXQgaXMgYSBmb3JrIG9mIFdvcmtzcGFjZSBJbmRpY2F0b3IgYnkgZm11ZWxsbmVyLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yLWxlZnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvci1sZWZ0IiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIExlZnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3VzdGF2b210Ym9yZ2VzL2dub21lLXdvcmtzcGFjZS1pbmRpY2F0b3ItbGVmdC5naXQiLAogICJ1dWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3ItbGVmdEBnbXRib3JnZXMuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="} }} -, {"uuid": "quake-terminal@diegodario88.github.io", "name": "Quake Terminal", "pname": "quake-terminal", "description": "Quickly launch a terminal in Quake mode using a keyboard shortcut.\n\nPlease use the repository for efficient issue reporting, enhancing communication between users and developers. ", "link": "https://extensions.gnome.org/extension/6307/quake-terminal/", "shell_version_map": { - "45": {"version": "16", "sha256": "1zmw57dnn9i8shnh7vi042xq0zl52hh1lhp0wx7hi7l57ljwpwkf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RpZWdvZGFyaW84OC9xdWFrZS10ZXJtaW5hbCIsCiAgInV1aWQiOiAicXVha2UtdGVybWluYWxAZGllZ29kYXJpbzg4LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNgp9"} +, {"uuid": "quake-terminal@diegodario88.github.io", "name": "Quake Terminal", "pname": "quake-terminal", "description": "Quickly launch a terminal in Quake mode using a keyboard shortcut", "link": "https://extensions.gnome.org/extension/6307/quake-terminal/", "shell_version_map": { + "45": {"version": "17", "sha256": "1an42lksgrj143r9cr3f397sp1xbjcjb1zccygbzi8z2jmvcsd1i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbGF1bmNoIGEgdGVybWluYWwgaW4gUXVha2UgbW9kZSB1c2luZyBhIGtleWJvYXJkIHNob3J0Y3V0IiwKICAiZG9uYXRpb25zIjogewogICAgImdpdGh1YiI6ICJkaWVnb2RhcmlvODgiLAogICAgImtvZmkiOiAiZGllZ29kYXJpbyIKICB9LAogICJuYW1lIjogIlF1YWtlIFRlcm1pbmFsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1YWtlLXRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RpZWdvZGFyaW84OC9xdWFrZS10ZXJtaW5hbCIsCiAgInV1aWQiOiAicXVha2UtdGVybWluYWxAZGllZ29kYXJpbzg4LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNywKICAidmVyc2lvbi1uYW1lIjogIjEuNi4xIgp9"} }} , {"uuid": "window-title-is-back@fthx", "name": "Window title is back", "pname": "window-title-is-back", "description": "Focused window icon + app name + title + menu in the top bar.\n\n Options in preferences UI: toggle items, colored icon, icon size.", "link": "https://extensions.gnome.org/extension/6310/window-title-is-back/", "shell_version_map": { "45": {"version": "23", "sha256": "19xr10p9wdq3gws408j5kydlbgqc6wblsscjm15a1wf3p0n6jcdl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzZWQgd2luZG93IGljb24gKyBhcHAgbmFtZSArIHRpdGxlICsgbWVudSBpbiB0aGUgdG9wIGJhci5cblxuIE9wdGlvbnMgaW4gcHJlZmVyZW5jZXMgVUk6IHRvZ2dsZSBpdGVtcywgY29sb3JlZCBpY29uLCBpY29uIHNpemUuIiwKICAibmFtZSI6ICJXaW5kb3cgdGl0bGUgaXMgYmFjayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3ctdGl0bGUtaXMtYmFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3dpbmRvdy10aXRsZS1pcy1iYWNrIiwKICAidXVpZCI6ICJ3aW5kb3ctdGl0bGUtaXMtYmFja0BmdGh4IiwKICAidmVyc2lvbiI6IDIzCn0="} @@ -6263,8 +6273,8 @@ , {"uuid": "utc-clock@swsnr.de", "name": "UTC clock", "pname": "utc-clock", "description": "A customizable UTC clock.\n\nAdd a second clock to the bar which shows the current UTC time, in a completely customizable format.", "link": "https://extensions.gnome.org/extension/6409/utc-clock/", "shell_version_map": { "45": {"version": "9", "sha256": "04rd1gc3ha2lryp7f98hvx88bjxgzqgf2xvxcmdhns6jyllp2lgp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgY3VzdG9taXphYmxlIFVUQyBjbG9jay5cblxuQWRkIGEgc2Vjb25kIGNsb2NrIHRvIHRoZSBiYXIgd2hpY2ggc2hvd3MgdGhlIGN1cnJlbnQgVVRDIHRpbWUsIGluIGEgY29tcGxldGVseSBjdXN0b21pemFibGUgZm9ybWF0LiIsCiAgImRvbmF0aW9ucyI6IHsKICAgICJwYXlwYWwiOiAic3dzbnIiCiAgfSwKICAibmFtZSI6ICJVVEMgY2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3dzbnItdXRjLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N3c25yL2dub21lLXNoZWxsLWV4dGVuc2lvbi11dGMtY2xvY2sjcmVhZG1lIiwKICAidXVpZCI6ICJ1dGMtY2xvY2tAc3dzbnIuZGUiLAogICJ2ZXJzaW9uIjogOSwKICAidmVyc2lvbi1uYW1lIjogIjQ1LjIiCn0="} }} -, {"uuid": "iso8601ish@S410", "name": "ISO8601-ish Clock", "pname": "iso8601-ish-clock", "description": "Overrides Gnome's clock format with ISO8601-inspired one.\n\nClock preferences in Date & Time section of Gnome Settings are respected, in a way.\n`Date` and `Seconds` behave as usual.\n`Week Day` inserts ISO Week and Weekday between the date and time. E.g. `2023-10-16 W42-1 19:45`.", "link": "https://extensions.gnome.org/extension/6413/iso8601-ish-clock/", "shell_version_map": { - "45": {"version": "3", "sha256": "09gjz40bpjqskg0gj7mndm563658ywdkysg49g0h2szf7n6hh02v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuYERhdGVgIGFuZCBgU2Vjb25kc2AgYmVoYXZlIGFzIHVzdWFsLlxuYFdlZWsgRGF5YCBpbnNlcnMgSVNPIFdlZWsgYW5kIFdlZWtkYXkgYmV0d2VlbiB0aGUgZGF0ZSBhbmQgdGltZS4gRS5nLiBgMjAyMy0xMC0xNiBXNDItMSAxOTo0NWAuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9TNDEwL2lzbzg2MDFpc2giLAogICJ1dWlkIjogImlzbzg2MDFpc2hAUzQxMCIsCiAgInZlcnNpb24iOiAzCn0="} +, {"uuid": "iso8601ish@S410", "name": "ISO8601-ish Clock", "pname": "iso8601-ish-clock", "description": "Overrides Gnome's clock format with ISO8601-inspired one.\n\nClock preferences in Date & Time section of Gnome Settings are respected, in a way.\n\"Date\" and \"Seconds\" behave as usual.\n\"Week Day\" inserts ISO Week and Weekday between the date and time. E.g. \"2023-10-16 W42-1 19:45\".", "link": "https://extensions.gnome.org/extension/6413/iso8601-ish-clock/", "shell_version_map": { + "45": {"version": "4", "sha256": "0q4wzs9mi8rw589dd8gwq2wm0sijngjszdj20vjxc2hyf2g4538i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlcyBHbm9tZSdzIGNsb2NrIGZvcm1hdCB3aXRoIElTTzg2MDEtaW5zcGlyZWQgb25lLlxuXG5DbG9jayBwcmVmZXJlbmNlcyBpbiBEYXRlICYgVGltZSBzZWN0aW9uIG9mIEdub21lIFNldHRpbmdzIGFyZSByZXNwZWN0ZWQsIGluIGEgd2F5LlxuXCJEYXRlXCIgYW5kIFwiU2Vjb25kc1wiIGJlaGF2ZSBhcyB1c3VhbC5cblwiV2VlayBEYXlcIiBpbnNlcnRzIElTTyBXZWVrIGFuZCBXZWVrZGF5IGJldHdlZW4gdGhlIGRhdGUgYW5kIHRpbWUuIEUuZy4gXCIyMDIzLTEwLTE2IFc0Mi0xIDE5OjQ1XCIuIiwKICAibmFtZSI6ICJJU084NjAxLWlzaCBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9TNDEwL2lzbzg2MDFpc2giLAogICJ1dWlkIjogImlzbzg2MDFpc2hAUzQxMCIsCiAgInZlcnNpb24iOiA0Cn0="} }} , {"uuid": "lu-wotd@praczet.github.com", "name": "Luxembourgish - Word Of The Day", "pname": "luxembourgish-word-of-the-day", "description": "Displays Luxembourgish's The Word of the Day. It gets them (wotds) from LOD.lu", "link": "https://extensions.gnome.org/extension/6418/luxembourgish-word-of-the-day/", "shell_version_map": { "44": {"version": "3", "sha256": "0mn2xbvcjzqw8h95khp1sj2jaq7mpfd53wyzfcsmcc3jv4f72ipn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIEx1eGVtYm91cmdpc2gncyBUaGUgV29yZCBvZiB0aGUgRGF5LiBJdCBnZXRzIHRoZW0gKHdvdGRzKSBmcm9tIExPRC5sdSIsCiAgImdldHRleHQtZG9tYWluIjogImx1LXdvdGQiLAogICJuYW1lIjogIkx1eGVtYm91cmdpc2ggLSBXb3JkIE9mIFRoZSBEYXkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHUtd290ZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wcmFjemV0L2x1LXdvdGQiLAogICJ1dWlkIjogImx1LXdvdGRAcHJhY3pldC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="} @@ -6272,8 +6282,8 @@ , {"uuid": "command-menu@astrapi.de", "name": "Command Menu", "pname": "command-menu", "description": "A GNOME Shell Extension to manage shortcuts in Top Bar (Inspired by Shuttle and SSHMenu). Edit the .commands.json file to add your own shortcuts.\n\nSample Config in the README - https://gitlab.com/astrapi/gnome-extensions/command-menu/-/blob/main/README.md\n\nFork of great work from arunk140 and joostn", "link": "https://extensions.gnome.org/extension/6421/command-menu/", "shell_version_map": { "45": {"version": "1", "sha256": "0sqkj3r97wnyq4gpmiimxixqbk7g098vrzbah2qaplmj1x2cwrb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIG1hbmFnZSBzaG9ydGN1dHMgaW4gVG9wIEJhciAoSW5zcGlyZWQgYnkgU2h1dHRsZSBhbmQgU1NITWVudSkuIEVkaXQgdGhlIC5jb21tYW5kcy5qc29uIGZpbGUgdG8gYWRkIHlvdXIgb3duIHNob3J0Y3V0cy5cblxuU2FtcGxlIENvbmZpZyBpbiB0aGUgUkVBRE1FIC0gaHR0cHM6Ly9naXRsYWIuY29tL2FzdHJhcGkvZ25vbWUtZXh0ZW5zaW9ucy9jb21tYW5kLW1lbnUvLS9ibG9iL21haW4vUkVBRE1FLm1kXG5cbkZvcmsgb2YgZ3JlYXQgd29yayBmcm9tIGFydW5rMTQwIGFuZCBqb29zdG4iLAogICJuYW1lIjogIkNvbW1hbmQgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21tYW5kbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hc3RyYXBpL2dub21lLWV4dGVuc2lvbnMvY29tbWFuZC1tZW51IiwKICAidXVpZCI6ICJjb21tYW5kLW1lbnVAYXN0cmFwaS5kZSIsCiAgInZlcnNpb24iOiAxCn0="} }} -, {"uuid": "disable-extension-updates@swsnr.de", "name": "Disable extension updates", "pname": "disable-extension-updates", "description": "Disable automatic extension updates in GNOME", "link": "https://extensions.gnome.org/extension/6424/disable-extension-updates/", "shell_version_map": { - "45": {"version": "2", "sha256": "1mgj2wlx5i9mjmn0zlhwbj13ks4kwj15jgxvq216zbzkvcfvkxgi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYXV0b21hdGljIGV4dGVuc2lvbiB1cGRhdGVzIGluIEdOT01FIiwKICAibmFtZSI6ICJEaXNhYmxlIGV4dGVuc2lvbiB1cGRhdGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N3c25yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLWV4dGVuc2lvbi11cGRhdGVzIiwKICAidXVpZCI6ICJkaXNhYmxlLWV4dGVuc2lvbi11cGRhdGVzQHN3c25yLmRlIiwKICAidmVyc2lvbiI6IDIKfQ=="} +, {"uuid": "disable-extension-updates@swsnr.de", "name": "Disable extension updates", "pname": "disable-extension-updates", "description": "Disable automatic extension updates in GNOME\n\nThis extension patches GNOME Shell to entirely disable updates of user-installed extensions.", "link": "https://extensions.gnome.org/extension/6424/disable-extension-updates/", "shell_version_map": { + "45": {"version": "3", "sha256": "0k78gjqv1zb8dy0g60ij84bi12lnxddwzkkkgp75y83pk4sawqj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYXV0b21hdGljIGV4dGVuc2lvbiB1cGRhdGVzIGluIEdOT01FXG5cblRoaXMgZXh0ZW5zaW9uIHBhdGNoZXMgR05PTUUgU2hlbGwgdG8gZW50aXJlbHkgZGlzYWJsZSB1cGRhdGVzIG9mIHVzZXItaW5zdGFsbGVkIGV4dGVuc2lvbnMuIiwKICAiZG9uYXRpb25zIjogewogICAgInBheXBhbCI6ICJzd3NuciIKICB9LAogICJuYW1lIjogIkRpc2FibGUgZXh0ZW5zaW9uIHVwZGF0ZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3dzbnIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpc2FibGUtZXh0ZW5zaW9uLXVwZGF0ZXMiLAogICJ1dWlkIjogImRpc2FibGUtZXh0ZW5zaW9uLXVwZGF0ZXNAc3dzbnIuZGUiLAogICJ2ZXJzaW9uIjogMywKICAidmVyc2lvbi1uYW1lIjogIjQ1LjEiCn0="} }} , {"uuid": "soundcard-switch@xnow.me", "name": "SoundCard Switch", "pname": "soundcard-switch", "description": "Enable or disable the sound card entirely by adding or removing the sound device. This precaution prevents the computer from unexpectedly making noise at inopportune moments in public places.", "link": "https://extensions.gnome.org/extension/6427/soundcard-switch/", "shell_version_map": { "42": {"version": "4", "sha256": "0ddwxl88dxwjdhi7awqv2rlqgk1ac8yhyqbry565y0qsrhk06j0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBvciBkaXNhYmxlIHRoZSBzb3VuZCBjYXJkIGVudGlyZWx5IGJ5IGFkZGluZyBvciByZW1vdmluZyB0aGUgc291bmQgZGV2aWNlLiBUaGlzIHByZWNhdXRpb24gcHJldmVudHMgdGhlIGNvbXB1dGVyIGZyb20gdW5leHBlY3RlZGx5IG1ha2luZyBub2lzZSBhdCBpbm9wcG9ydHVuZSBtb21lbnRzIGluIHB1YmxpYyBwbGFjZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic291bmRjYXJkLXN3aXRjaEB4bm93Lm1lIiwKICAibmFtZSI6ICJTb3VuZENhcmQgU3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hub3ctbWUvc291bmRjYXJkLXN3aXRjaC5naXQiLAogICJ1dWlkIjogInNvdW5kY2FyZC1zd2l0Y2hAeG5vdy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="} @@ -6291,7 +6301,7 @@ "42": {"version": "1", "sha256": "0lw047iqjzmsnz19wajr73n1zprgh8r4mhh9srjkhm65k5h4gfs5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bHRpbW9uaXRvciBkaW1taW5nIG92ZXJsYXkgd2l0aCBSR0IgcmVndWxhdGlvbjogZXh0ZW5zaW9uIGFkZHMgYSBidXR0b24gd2l0aCBhIGxpZ2h0IGJ1bGIgaWNvbiB0byB5b3VyIHBhbmVsLiBDbGlja2luZyB0aGlzIGJ1dHRvbiByZXZlYWxzIGluZGl2aWR1YWwgc2xpZGVycyBmb3IgZWFjaCBjb25uZWN0ZWQgbW9uaXRvciwgYWxsb3dpbmcgeW91IHRvIGFkanVzdCB0aGUgZGltbWluZyBsZXZlbC4gQWRkaXRpb25hbGx5LCB5b3UgY2FuIHRvZ2dsZSB0aGUgY29sb3Igb2YgdGhlIGRpbW1pbmcgZWZmZWN0IGFuZCBjdXN0b21pemUgaXQgdXNpbmcgUkdCIHNsaWRlcnMgbG9jYXRlZCBhdCB0aGUgYm90dG9tIG9mIHRoZSBtZW51LiBcblxuVGVzdGVkIHdpdGggVWJ1bnR1IDIyLjA0LjMgTFRTIGFuZCBHTk9NRSBTaGVsbCA0Mi45LiBcblxuSXQgaXMgYSBmb3JrIG9mIERpbSBEZXNrdG9wIDcwLiIsCiAgIm5hbWUiOiAiVml2aWRTaGFkZTogTXVsdGktTW9uaXRvciBSR0IgRGltbWluZyBDb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21vem82NC9WaXZpZFNoYWRlIiwKICAidXVpZCI6ICJWaXZpZFNoYWRlQG1vem82NC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"} }} , {"uuid": "picture-of-the-day@swsnr.de", "name": "Picture of the Day", "pname": "picture-of-the-day", "description": "Get a picture of the day as desktop background.\n\nSupports the following sources:\n\n* NASA Astronomy Picture of the Day (APOD) from https://apod.nasa.gov/apod/astropix.html\n* NASA Earth Observatory Image of the Day from https://earthobservatory.nasa.gov/topic/image-of-the-day\n* Bing from https://www.bing.com\n* Wikimedia from https://commons.wikimedia.org/wiki/Main_Page\n", "link": "https://extensions.gnome.org/extension/6469/picture-of-the-day/", "shell_version_map": { - "45": {"version": "13", "sha256": "1j3l0605d2i9w96c2lppjp0s254qyld2mb5hffgpv2jibb78s7ca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBhIHBpY3R1cmUgb2YgdGhlIGRheSBhcyBkZXNrdG9wIGJhY2tncm91bmQuXG5cblN1cHBvcnRzIHRoZSBmb2xsb3dpbmcgc291cmNlczpcblxuKiBOQVNBIEFzdHJvbm9teSBQaWN0dXJlIG9mIHRoZSBEYXkgKEFQT0QpIGZyb20gaHR0cHM6Ly9hcG9kLm5hc2EuZ292L2Fwb2QvYXN0cm9waXguaHRtbFxuKiBOQVNBIEVhcnRoIE9ic2VydmF0b3J5IEltYWdlIG9mIHRoZSBEYXkgZnJvbSBodHRwczovL2VhcnRob2JzZXJ2YXRvcnkubmFzYS5nb3YvdG9waWMvaW1hZ2Utb2YtdGhlLWRheVxuKiBCaW5nIGZyb20gaHR0cHM6Ly93d3cuYmluZy5jb21cbiogV2lraW1lZGlhIGZyb20gaHR0cHM6Ly9jb21tb25zLndpa2ltZWRpYS5vcmcvd2lraS9NYWluX1BhZ2VcbiIsCiAgImdldHRleHQtZG9tYWluIjogInBpY3R1cmUtb2YtdGhlLWRheUBzd3Nuci5kZSIsCiAgIm5hbWUiOiAiUGljdHVyZSBvZiB0aGUgRGF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3c25yLXBpY3R1cmUtb2YtdGhlLWRheSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zd3Nuci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGljdHVyZS1vZi10aGUtZGF5IiwKICAidXVpZCI6ICJwaWN0dXJlLW9mLXRoZS1kYXlAc3dzbnIuZGUiLAogICJ2ZXJzaW9uIjogMTMsCiAgInZlcnNpb24tbmFtZSI6ICI0NS42Igp9"} + "45": {"version": "16", "sha256": "0ax1g5i13kd57bzzwsp2ggyl3k617afbjmbnjw96w5hm51sdg6ag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBhIHBpY3R1cmUgb2YgdGhlIGRheSBhcyBkZXNrdG9wIGJhY2tncm91bmQuXG5cblN1cHBvcnRzIHRoZSBmb2xsb3dpbmcgc291cmNlczpcblxuKiBOQVNBIEFzdHJvbm9teSBQaWN0dXJlIG9mIHRoZSBEYXkgKEFQT0QpIGZyb20gaHR0cHM6Ly9hcG9kLm5hc2EuZ292L2Fwb2QvYXN0cm9waXguaHRtbFxuKiBOQVNBIEVhcnRoIE9ic2VydmF0b3J5IEltYWdlIG9mIHRoZSBEYXkgZnJvbSBodHRwczovL2VhcnRob2JzZXJ2YXRvcnkubmFzYS5nb3YvdG9waWMvaW1hZ2Utb2YtdGhlLWRheVxuKiBCaW5nIGZyb20gaHR0cHM6Ly93d3cuYmluZy5jb21cbiogV2lraW1lZGlhIGZyb20gaHR0cHM6Ly9jb21tb25zLndpa2ltZWRpYS5vcmcvd2lraS9NYWluX1BhZ2VcbiIsCiAgImdldHRleHQtZG9tYWluIjogInBpY3R1cmUtb2YtdGhlLWRheUBzd3Nuci5kZSIsCiAgIm5hbWUiOiAiUGljdHVyZSBvZiB0aGUgRGF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3c25yLXBpY3R1cmUtb2YtdGhlLWRheSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zd3Nuci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGljdHVyZS1vZi10aGUtZGF5IiwKICAidXVpZCI6ICJwaWN0dXJlLW9mLXRoZS1kYXlAc3dzbnIuZGUiLAogICJ2ZXJzaW9uIjogMTYsCiAgInZlcnNpb24tbmFtZSI6ICI0NS45Igp9"} }} , {"uuid": "overviewnow@thesola.io", "name": "Overview Flick", "pname": "overview-flick", "description": "Flick from the right to get the Overview.\n\nThis extension was revived to GNOME 45 from the original, https://extensions.gnome.org/extension/1088/overview-now/\n\nOriginal description:\n\nThis is my first extension. Thanks, GNOME!. Based on \"Slide for Keyboard\", https://extensions.gnome.org/extension/993/slide-for-keyboard/\n\nWhy did I do this? Well, if you do a gesture with your thumb, on your touchscreen, from the right to the center, you'll get the Overview. If you do that, your thumb will be placed in the Desktop selector, so you will be able to move between desktops with your thumb. Perfect! This is also easier to trigger than the default GNOME gesture (three fingers closing).", "link": "https://extensions.gnome.org/extension/6478/overview-flick/", "shell_version_map": { "45": {"version": "2", "sha256": "14bbic6vx13vaj5xqws34mlwmvfq436al63lzvwa41hkckqyxk6s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsaWNrIGZyb20gdGhlIHJpZ2h0IHRvIGdldCB0aGUgT3ZlcnZpZXcuXG5cblRoaXMgZXh0ZW5zaW9uIHdhcyByZXZpdmVkIHRvIEdOT01FIDQ1IGZyb20gdGhlIG9yaWdpbmFsLCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMDg4L292ZXJ2aWV3LW5vdy9cblxuT3JpZ2luYWwgZGVzY3JpcHRpb246XG5cblRoaXMgaXMgbXkgZmlyc3QgZXh0ZW5zaW9uLiBUaGFua3MsIEdOT01FIS4gQmFzZWQgb24gXCJTbGlkZSBmb3IgS2V5Ym9hcmRcIiwgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vOTkzL3NsaWRlLWZvci1rZXlib2FyZC9cblxuV2h5IGRpZCBJIGRvIHRoaXM/IFdlbGwsIGlmIHlvdSBkbyBhIGdlc3R1cmUgd2l0aCB5b3VyIHRodW1iLCBvbiB5b3VyIHRvdWNoc2NyZWVuLCBmcm9tIHRoZSByaWdodCB0byB0aGUgY2VudGVyLCB5b3UnbGwgZ2V0IHRoZSBPdmVydmlldy4gSWYgeW91IGRvIHRoYXQsIHlvdXIgdGh1bWIgd2lsbCBiZSBwbGFjZWQgaW4gdGhlIERlc2t0b3Agc2VsZWN0b3IsIHNvIHlvdSB3aWxsIGJlIGFibGUgdG8gbW92ZSBiZXR3ZWVuIGRlc2t0b3BzIHdpdGggeW91ciB0aHVtYi4gUGVyZmVjdCEgVGhpcyBpcyBhbHNvIGVhc2llciB0byB0cmlnZ2VyIHRoYW4gdGhlIGRlZmF1bHQgR05PTUUgZ2VzdHVyZSAodGhyZWUgZmluZ2VycyBjbG9zaW5nKS4iLAogICJuYW1lIjogIk92ZXJ2aWV3IEZsaWNrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoZXNvbGExMC9nbm9tZS1zaGVsbC1vdmVydmlldy1mbGljayIsCiAgInV1aWQiOiAib3ZlcnZpZXdub3dAdGhlc29sYS5pbyIsCiAgInZlcnNpb24iOiAyCn0="} @@ -6333,8 +6343,8 @@ "44": {"version": "8", "sha256": "0751blv9h3dj9i61y9ywjmn34sjq5b9lf2nci2anm3ngm5rzskzq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGxvZ28gdG8gdGhlIGRlc2t0b3AuIFRoaXMgaXMgYSBmb3JrIG9mIEJhY2tncm91bmQgTG9nbyBleHRlbnNpb24gXG4gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vODg5L2JhY2tncm91bmQtbG9nby8gXG4gaHR0cHM6Ly9wYWd1cmUuaW8vYmFja2dyb3VuZC1sb2dvLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiTG9nbyBXaWRnZXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9nby13aWRnZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob3diZWEvbG9nby13aWRnZXQiLAogICJ1dWlkIjogImxvZ293aWRnZXRAZ2l0aHViLmNvbS5ob3diZWEiLAogICJ2ZXJzaW9uIjogOAp9"}, "45": {"version": "7", "sha256": "09fmvv0nimyfai39xr0hrcgp5979i8n80zi42y7lbanczcc71n6a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGxvZ28gdG8gdGhlIGRlc2t0b3AuIFRoaXMgaXMgYSBmb3JrIG9mIEJhY2tncm91bmQgTG9nbyBleHRlbnNpb24gXG4gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vODg5L2JhY2tncm91bmQtbG9nby8gXG4gaHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmFja2dyb3VuZC1sb2dvIiwKICAibmFtZSI6ICJMb2dvIFdpZGdldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sb2dvLXdpZGdldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ob3diZWEvbG9nby13aWRnZXQiLAogICJ1dWlkIjogImxvZ293aWRnZXRAZ2l0aHViLmNvbS5ob3diZWEiLAogICJ2ZXJzaW9uIjogNwp9"} }} -, {"uuid": "azan@a7medkhalaf", "name": "xAzanTimes", "pname": "xazantimes", "description": "Azan is an Islamic prayer times extension for Gnome Shell.\nIt's a fork of \"Azan Islamic Prayer Times\" by faissaloo which is based on the extension by Fahrinh.\n\nFeatures\n- List compulsory prayer times\n- Optionally display Imsak, Sunrise, Sunset and Midnight\n- Show remaining time for the upcoming prayer.\n- Show current date in Hijri calendar.\n- Display a notification when it's time for prayer.\n- Automatic Geoclue2 location detection\n- Show times in 24 hour and 12 hour formats\n- Hijri date adjusment\n- Iqamah option", "link": "https://extensions.gnome.org/extension/6538/xazantimes/", "shell_version_map": { - "45": {"version": "2", "sha256": "18q8566d72js01qx1gq9i322hxghkg0bh6b1xfzcmq54cmfab47d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF6YW4gaXMgYW4gSXNsYW1pYyBwcmF5ZXIgdGltZXMgZXh0ZW5zaW9uIGZvciBHbm9tZSBTaGVsbCBiYXNlZCBvbiB0aGUgZXh0ZW5zaW9uIGJ5IGZhaXNzYWxvby5cblxuRmVhdHVyZXNcbi0gTGlzdCBjb21wdWxzb3J5IHByYXllciB0aW1lc1xuIE9wdGlvbmFsbHkgZGlzcGxheSBJbXNhaywgU3VucmlzZSwgU3Vuc2V0IGFuZCBNaWRuaWdodFxuLSBTaG93IHJlbWFpbmluZyB0aW1lIGZvciB0aGUgdXBjb21pbmcgcHJheWVyLlxuLSBTaG93IGN1cnJlbnQgZGF0ZSBpbiBIaWpyaSBjYWxlbmRhci5cbi0gRGlzcGxheSBhIG5vdGlmaWNhdGlvbiB3aGVuIGl0J3MgdGltZSBmb3IgcHJheWVyLlxuLSBBdXRvbWF0aWMgR2VvY2x1ZTIgbG9jYXRpb24gZGV0ZWN0aW9uXG4tIFNob3cgdGltZXMgaW4gMjQgaG91ciBhbmQgMTIgaG91ciBmb3JtYXRzXG4tIEhpanJpIGRhdGUgYWRqdXNtZW50XG4tIElxYW1haCBvcHRpb24iLAogICJuYW1lIjogInhBemFuVGltZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXphbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hN21lZGtoYWxhZi9hemFuLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXphbkBhN21lZGtoYWxhZiIsCiAgInZlcnNpb24iOiAyCn0="} +, {"uuid": "azan@a7medkhalaf", "name": "xAzanTimes", "pname": "xazantimes", "description": "Azan is an Islamic prayer times extension for Gnome Shell.\nIt's a fork of the extension by faissaloo.\n\nFeatures\n- List compulsory prayer times\n- Optionally display Imsak, Sunrise, Sunset and Midnight\n- Show remaining time for the upcoming prayer.\n- Show current date in Hijri calendar.\n- Display a notification when it's time for prayer.\n- Automatic Geoclue2 location detection\n- Show times in 24 hour and 12 hour formats\n- Hijri date adjusment\n- Iqamah option", "link": "https://extensions.gnome.org/extension/6538/xazantimes/", "shell_version_map": { + "45": {"version": "4", "sha256": "1yvxwkxfa6nd5cvy1n79w4zc1abqmq04razd5yp3lva4lpzkfcbd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF6YW4gaXMgYW4gSXNsYW1pYyBwcmF5ZXIgdGltZXMgZXh0ZW5zaW9uIGZvciBHbm9tZSBTaGVsbC5cbkl0J3MgYSBmb3JrIG9mIHRoZSBleHRlbnNpb24gYnkgZmFpc3NhbG9vLlxuXG5GZWF0dXJlc1xuLSBMaXN0IGNvbXB1bHNvcnkgcHJheWVyIHRpbWVzXG4tIE9wdGlvbmFsbHkgZGlzcGxheSBJbXNhaywgU3VucmlzZSwgU3Vuc2V0IGFuZCBNaWRuaWdodFxuLSBTaG93IHJlbWFpbmluZyB0aW1lIGZvciB0aGUgdXBjb21pbmcgcHJheWVyLlxuLSBTaG93IGN1cnJlbnQgZGF0ZSBpbiBIaWpyaSBjYWxlbmRhci5cbi0gRGlzcGxheSBhIG5vdGlmaWNhdGlvbiB3aGVuIGl0J3MgdGltZSBmb3IgcHJheWVyLlxuLSBBdXRvbWF0aWMgR2VvY2x1ZTIgbG9jYXRpb24gZGV0ZWN0aW9uXG4tIFNob3cgdGltZXMgaW4gMjQgaG91ciBhbmQgMTIgaG91ciBmb3JtYXRzXG4tIEhpanJpIGRhdGUgYWRqdXNtZW50XG4tIElxYW1haCBvcHRpb24iLAogICJuYW1lIjogInhBemFuVGltZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXphbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hN21lZGtoYWxhZi9hemFuLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXphbkBhN21lZGtoYWxhZiIsCiAgInZlcnNpb24iOiA0Cn0="} }} , {"uuid": "clown@markocic", "name": "Clown", "pname": "clown", "description": "Displays clown emoji in the panel and plays clown theme song on click", "link": "https://extensions.gnome.org/extension/6544/clown/", "shell_version_map": { "45": {"version": "3", "sha256": "13ybvk48whny007fxvspdpx7slg42l7fgrg0drcfrh9w6c6jvq0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGNsb3duIGVtb2ppIGluIHRoZSBwYW5lbCBhbmQgcGxheXMgY2xvd24gdGhlbWUgc29uZyBvbiBjbGljayIsCiAgIm5hbWUiOiAiQ2xvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFya29jaWMvY2xvd24tZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJjbG93bkBtYXJrb2NpYyIsCiAgInZlcnNpb24iOiAzCn0="} @@ -6348,13 +6358,13 @@ "44": {"version": "4", "sha256": "1krp4001aphvjnp245262llv0xzwbga17skq94f2wkv87yqd1ggp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ25ldC9SZWN0YW5nbGUgbGlrZSBtYW51YWwgdGlsaW5nIiwKICAibmFtZSI6ICJSZWN0YW5nbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVjdGFuZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWNyaXN0b2ZmZXJzL2dub21lLXJlY3RhbmdsZSIsCiAgInV1aWQiOiAicmVjdGFuZ2xlQGFjcmlzdG9mZmVycy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "45": {"version": "3", "sha256": "15gv4y4rwqgz54y86ik09izp0fl4rsw2x7bra959ih60dy3vs00i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ25ldC9SZWN0YW5nbGUgbGlrZSBtYW51YWwgdGlsaW5nIiwKICAibmFtZSI6ICJSZWN0YW5nbGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucmVjdGFuZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FjcmlzdG9mZmVycy9nbm9tZS1yZWN0YW5nbGUiLAogICJ1dWlkIjogInJlY3RhbmdsZUBhY3Jpc3RvZmZlcnMubWUiLAogICJ2ZXJzaW9uIjogMwp9"} }} -, {"uuid": "task-up@fthx", "name": "Task Up", "pname": "task-up", "description": "Task bar. Handles multiple workspaces. Very light extension.\n\n Complete rewrite of BaBar task bar extension, light code only has 300 lines.\n\n Some settings.", "link": "https://extensions.gnome.org/extension/6556/task-up/", "shell_version_map": { - "45": {"version": "13", "sha256": "06rnaagwpcj6qzb53cmi81kx71ssjy1qhm6abcrkyd8113gmag3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBIYW5kbGVzIG11bHRpcGxlIHdvcmtzcGFjZXMuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gQ29tcGxldGUgcmV3cml0ZSBvZiBCYUJhciB0YXNrIGJhciBleHRlbnNpb24sIGxpZ2h0IGNvZGUgb25seSBoYXMgMzAwIGxpbmVzLlxuXG4gU29tZSBzZXR0aW5ncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJUYXNrIFVwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2stdXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC90YXNrLXVwIiwKICAidXVpZCI6ICJ0YXNrLXVwQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="} +, {"uuid": "task-up@fthx", "name": "Task Up", "pname": "task-up", "description": "Task bar. Handles multiple workspaces. Very light extension.\n\n Complete rewrite of BaBar task bar extension, light code only has 300 lines.\n\n Some settings including show icon and/or title.", "link": "https://extensions.gnome.org/extension/6556/task-up/", "shell_version_map": { + "45": {"version": "14", "sha256": "1gybwvg887bffzi338d7z7gh4m70g8wrdkkicgvbcdn5c48rb6ar", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBIYW5kbGVzIG11bHRpcGxlIHdvcmtzcGFjZXMuIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gQ29tcGxldGUgcmV3cml0ZSBvZiBCYUJhciB0YXNrIGJhciBleHRlbnNpb24sIGxpZ2h0IGNvZGUgb25seSBoYXMgMzAwIGxpbmVzLlxuXG4gU29tZSBzZXR0aW5ncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJUYXNrIFVwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2stdXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC90YXNrLXVwIiwKICAidXVpZCI6ICJ0YXNrLXVwQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTQKfQ=="} }} -, {"uuid": "workspace-switch-buttons@rajan-31", "name": "Workspace Switch Buttons", "pname": "workspace-switch-buttons", "description": "Adds buttons to switch to left and right workspace, and hides \"Activities\" button", "link": "https://extensions.gnome.org/extension/6562/workspace-switch-buttons/", "shell_version_map": { - "42": {"version": "2", "sha256": "03hzxb0b6ckqhjj7syv5bh5sl0k5jajnfrpy82ifw4aa89apin81", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYnV0dG9ucyB0byBzd2l0Y2ggdG8gbGVmdCBhbmQgcmlnaHQgd29ya3NwYWNlLCBhbmQgaGlkZXMgXCJBY3Rpdml0aWVzXCIgYnV0dG9uIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoIEJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWphbi0zMS9Xb3Jrc3BhY2UtU3dpdGNoLUJ1dHRvbnMiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2gtYnV0dG9uc0ByYWphbi0zMSIsCiAgInZlcnNpb24iOiAyCn0="}, - "43": {"version": "2", "sha256": "03hzxb0b6ckqhjj7syv5bh5sl0k5jajnfrpy82ifw4aa89apin81", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYnV0dG9ucyB0byBzd2l0Y2ggdG8gbGVmdCBhbmQgcmlnaHQgd29ya3NwYWNlLCBhbmQgaGlkZXMgXCJBY3Rpdml0aWVzXCIgYnV0dG9uIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoIEJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWphbi0zMS9Xb3Jrc3BhY2UtU3dpdGNoLUJ1dHRvbnMiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2gtYnV0dG9uc0ByYWphbi0zMSIsCiAgInZlcnNpb24iOiAyCn0="}, - "44": {"version": "2", "sha256": "03hzxb0b6ckqhjj7syv5bh5sl0k5jajnfrpy82ifw4aa89apin81", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYnV0dG9ucyB0byBzd2l0Y2ggdG8gbGVmdCBhbmQgcmlnaHQgd29ya3NwYWNlLCBhbmQgaGlkZXMgXCJBY3Rpdml0aWVzXCIgYnV0dG9uIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoIEJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWphbi0zMS9Xb3Jrc3BhY2UtU3dpdGNoLUJ1dHRvbnMiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2gtYnV0dG9uc0ByYWphbi0zMSIsCiAgInZlcnNpb24iOiAyCn0="} +, {"uuid": "workspace-switch-buttons@rajan-31", "name": "Workspace Switch Buttons", "pname": "workspace-switch-buttons", "description": "This GNOME Shell extension offers following features:\n\n- Buttons to switch to left and right workspace\n\n- Shows index of active workspace (click it for overview)\n[Can hide it in preferences]\n\n- Hides \"Activities\" button\n[Can turn this off in preferences]", "link": "https://extensions.gnome.org/extension/6562/workspace-switch-buttons/", "shell_version_map": { + "42": {"version": "4", "sha256": "1gx26lb72d1lflxpcn66laribdpxz8gma1r6bz97sa57sjirxmya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYnV0dG9ucyB0byBzd2l0Y2ggdG8gbGVmdCBhbmQgcmlnaHQgd29ya3NwYWNlLCBzaG93cyBhY3RpdmUgd29ya3NwYWNlIGluZGV4LCBhbmQgaGlkZXMgXCJBY3Rpdml0aWVzXCIgYnV0dG9uIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoIEJ1dHRvbnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaC1idXR0b25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFqYW4tMzEvV29ya3NwYWNlLVN3aXRjaC1CdXR0b25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoLWJ1dHRvbnNAcmFqYW4tMzEiLAogICJ2ZXJzaW9uIjogNAp9"}, + "43": {"version": "4", "sha256": "1gx26lb72d1lflxpcn66laribdpxz8gma1r6bz97sa57sjirxmya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYnV0dG9ucyB0byBzd2l0Y2ggdG8gbGVmdCBhbmQgcmlnaHQgd29ya3NwYWNlLCBzaG93cyBhY3RpdmUgd29ya3NwYWNlIGluZGV4LCBhbmQgaGlkZXMgXCJBY3Rpdml0aWVzXCIgYnV0dG9uIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoIEJ1dHRvbnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaC1idXR0b25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFqYW4tMzEvV29ya3NwYWNlLVN3aXRjaC1CdXR0b25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoLWJ1dHRvbnNAcmFqYW4tMzEiLAogICJ2ZXJzaW9uIjogNAp9"}, + "44": {"version": "4", "sha256": "1gx26lb72d1lflxpcn66laribdpxz8gma1r6bz97sa57sjirxmya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYnV0dG9ucyB0byBzd2l0Y2ggdG8gbGVmdCBhbmQgcmlnaHQgd29ya3NwYWNlLCBzaG93cyBhY3RpdmUgd29ya3NwYWNlIGluZGV4LCBhbmQgaGlkZXMgXCJBY3Rpdml0aWVzXCIgYnV0dG9uIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoIEJ1dHRvbnMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLXN3aXRjaC1idXR0b25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQ0IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFqYW4tMzEvV29ya3NwYWNlLVN3aXRjaC1CdXR0b25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoLWJ1dHRvbnNAcmFqYW4tMzEiLAogICJ2ZXJzaW9uIjogNAp9"} }} , {"uuid": "langTray@a7medkhalaf", "name": "xLanguageTray", "pname": "xlanguagetray", "description": "Move Region/Language Tray To Quick Settings", "link": "https://extensions.gnome.org/extension/6565/xlanguagetray/", "shell_version_map": { "45": {"version": "2", "sha256": "056x6bg3z8vqrknyqgr8hfgd8x04nj626jxw30p3qszvazajr8bj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgUmVnaW9uL0xhbmd1YWdlIFRyYXkgVG8gUXVpY2sgU2V0dGluZ3MiLAogICJuYW1lIjogInhMYW5ndWFnZVRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYTdtZWRraGFsYWYvTGFuZ1RyYXkiLAogICJ1dWlkIjogImxhbmdUcmF5QGE3bWVka2hhbGFmIiwKICAidmVyc2lvbiI6IDIKfQ=="} @@ -6362,4 +6372,21 @@ , {"uuid": "simplebreakreminder@castillodel.com", "name": "Simple Break Reminder", "pname": "simple-break-reminder", "description": "It's important to remember to take a break", "link": "https://extensions.gnome.org/extension/6568/simple-break-reminder/", "shell_version_map": { "45": {"version": "2", "sha256": "07014vqkcxhrndwywbprxkngvvyn0fvwpq7iaky04m8zb88jhk4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0J3MgaW1wb3J0YW50IHRvIHJlbWVtYmVyIHRvIHRha2UgYSBicmVhayIsCiAgIm5hbWUiOiAiU2ltcGxlIEJyZWFrIFJlbWluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXBsZWJyZWFrcmVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2FzdGlsbG9EZWwvc2ltcGxlYnJlYWtyZW1pbmRlciIsCiAgInV1aWQiOiAic2ltcGxlYnJlYWtyZW1pbmRlckBjYXN0aWxsb2RlbC5jb20iLAogICJ2ZXJzaW9uIjogMgp9"} }} +, {"uuid": "OnTheTop@fablevi.github.io", "name": "On The Top", "pname": "on-the-top", "description": "Always on top button in the top bar", "link": "https://extensions.gnome.org/extension/6571/on-the-top/", "shell_version_map": { + "45": {"version": "4", "sha256": "0z13kqafgbs7csxhqfax56gfb4q70a6xqkr9dx4w5fj13fy2zzqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBvbiB0b3AgYnV0dG9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJPbiBUaGUgVG9wIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0NSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZhYmxldmkvT25UaGVUb3AtZmFibGV2aS5naXRodWIuaW8iLAogICJ1dWlkIjogIk9uVGhlVG9wQGZhYmxldmkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="} + }} +, {"uuid": "openbar@neuromorph", "name": "Open Bar", "pname": "open-bar", "description": "Top Bar ( Top Panel ) customization / styling. Open the Top Bar and let the colors 🍹 flow.\n\nBar Type: Fixed, Floating or Islands\nCustomize:\n- Bar height, margin\n- Bar foreground color, font\n- Bar background color, transparency, gradient, border\n- Shape rectangular to pill\n- Neon, shadow effects\n- Menu background color, transparency, border \netc.\n\nNote:\nMenus are more involved with many subitems and their colors. Right now it only has option to set primary colors for menu and will need to be used in alignment with whatever theme you are using.\nThere can be issues with subsections and submenus. Some fixes coming in next update.\n\nGnome 45 support will be available soon.", "link": "https://extensions.gnome.org/extension/6580/open-bar/", "shell_version_map": { + "42": {"version": "3", "sha256": "1bk7gkkmcvmafiy5fh7b4g0pfdms1zadcvix7fs9x33n3xm04v15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBCYXIgKCBUb3AgUGFuZWwgKSBjdXN0b21pemF0aW9uIC8gc3R5bGluZy4gT3BlbiB0aGUgVG9wIEJhciBhbmQgbGV0IHRoZSBjb2xvcnMgXHVkODNjXHVkZjc5IGZsb3cuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJuZXVyb21vcnBoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm9wZW5iYXIiLAogICJuYW1lIjogIk9wZW4gQmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9wZW5iYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZXVyb21vcnBoL29wZW5iYXIiLAogICJ1dWlkIjogIm9wZW5iYXJAbmV1cm9tb3JwaCIsCiAgInZlcnNpb24iOiAzCn0="}, + "43": {"version": "3", "sha256": "1bk7gkkmcvmafiy5fh7b4g0pfdms1zadcvix7fs9x33n3xm04v15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBCYXIgKCBUb3AgUGFuZWwgKSBjdXN0b21pemF0aW9uIC8gc3R5bGluZy4gT3BlbiB0aGUgVG9wIEJhciBhbmQgbGV0IHRoZSBjb2xvcnMgXHVkODNjXHVkZjc5IGZsb3cuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJuZXVyb21vcnBoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm9wZW5iYXIiLAogICJuYW1lIjogIk9wZW4gQmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9wZW5iYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZXVyb21vcnBoL29wZW5iYXIiLAogICJ1dWlkIjogIm9wZW5iYXJAbmV1cm9tb3JwaCIsCiAgInZlcnNpb24iOiAzCn0="}, + "44": {"version": "3", "sha256": "1bk7gkkmcvmafiy5fh7b4g0pfdms1zadcvix7fs9x33n3xm04v15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBCYXIgKCBUb3AgUGFuZWwgKSBjdXN0b21pemF0aW9uIC8gc3R5bGluZy4gT3BlbiB0aGUgVG9wIEJhciBhbmQgbGV0IHRoZSBjb2xvcnMgXHVkODNjXHVkZjc5IGZsb3cuIiwKICAiZG9uYXRpb25zIjogewogICAgImJ1eW1lYWNvZmZlZSI6ICJuZXVyb21vcnBoIgogIH0sCiAgImdldHRleHQtZG9tYWluIjogIm9wZW5iYXIiLAogICJuYW1lIjogIk9wZW4gQmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9wZW5iYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZXVyb21vcnBoL29wZW5iYXIiLAogICJ1dWlkIjogIm9wZW5iYXJAbmV1cm9tb3JwaCIsCiAgInZlcnNpb24iOiAzCn0="} + }} +, {"uuid": "auto-power-profile@dmy3k.github.io", "name": "Auto Power Profile", "pname": "auto-power-profile", "description": "Automatically switch between power profiles based on power supply and battery status.", "link": "https://extensions.gnome.org/extension/6583/auto-power-profile/", "shell_version_map": { + "45": {"version": "3", "sha256": "11y3snf4vslf6z27bp11b3mwa6b4fwcq268lhcrq7zmjgdij79hf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBiYXR0ZXJ5IHN0YXR1cy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJuYW1lIjogIkF1dG8gUG93ZXIgUHJvZmlsZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLXBvd2VyLXByb2ZpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG15M2svYXV0by1wb3dlci1wcm9maWxlIiwKICAidXVpZCI6ICJhdXRvLXBvd2VyLXByb2ZpbGVAZG15M2suZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="} + }} +, {"uuid": "system-monitor-indicator@mknap.com", "name": "System Monitor Tray Indicator", "pname": "system-monitor-tray-indicator", "description": "Displays CPU and Memory usage on the top bar.", "link": "https://extensions.gnome.org/extension/6586/system-monitor-tray-indicator/", "shell_version_map": { + "45": {"version": "1", "sha256": "0hap8f9yzs3vv2ia4ndnjxcvmz0b7ah1xfgb9j4lmzms0c60xg9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIENQVSBhbmQgTWVtb3J5IHVzYWdlIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiU3lzdGVtIE1vbml0b3IgVHJheSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQ1IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGFlbGtuYXAvZ25vbWUtc3lzdGVtLW1vbml0b3ItaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzeXN0ZW0tbW9uaXRvci1pbmRpY2F0b3JAbWtuYXAuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="} + }} +, {"uuid": "enhancedosk@cass00.github.io", "name": "Enhanced OSK", "pname": "enhanced-osk", "description": "Makes Gnome's OnScreen Keyboard more usable.\n\nFeatures:\n* Includes additional buttons: Arrow keys, Esc, Tab, Ctrl, Alt, Super, F1-12\n* Supports key combinations like `Ctrl + C`, `Alt + Tab`, `Ctrl + Shift + C`, `Super + A, Alt + F2` etc.\n* Configurable keyboard size (landscape/portrait)\n* Statusbar indicator to toggle keyboard\n* Works in Gnome password modals\n\nThis extension is a fork of https://github.com/nick-shmyrev/improved-osk-gnome-ext. Formerly known as Improved OSK.", "link": "https://extensions.gnome.org/extension/6595/enhanced-osk/", "shell_version_map": { + "45": {"version": "3", "sha256": "1w02yp5hpmwbpzd02y6mqyb40aksbrbp4vwqrw5y2p9d3hrzn05k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3MgT25TY3JlZW4gS2V5Ym9hcmQgbW9yZSB1c2FibGUuXG5cbkZlYXR1cmVzOlxuKiBJbmNsdWRlcyBhZGRpdGlvbmFsIGJ1dHRvbnM6IEFycm93IGtleXMsIEVzYywgVGFiLCBDdHJsLCBBbHQsIFN1cGVyLCBGMS0xMlxuKiBTdXBwb3J0cyBrZXkgY29tYmluYXRpb25zIGxpa2UgYEN0cmwgKyBDYCwgYEFsdCArIFRhYmAsIGBDdHJsICsgU2hpZnQgKyBDYCwgYFN1cGVyICsgQSwgQWx0ICsgRjJgIGV0Yy5cbiogQ29uZmlndXJhYmxlIGtleWJvYXJkIHNpemUgKGxhbmRzY2FwZS9wb3J0cmFpdClcbiogU3RhdHVzYmFyIGluZGljYXRvciB0byB0b2dnbGUga2V5Ym9hcmRcbiogV29ya3MgaW4gR25vbWUgcGFzc3dvcmQgbW9kYWxzXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQuIEZvcm1lcmx5IGtub3duIGFzIEltcHJvdmVkIE9TSy4iLAogICJuYW1lIjogIkVuaGFuY2VkIE9TSyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jYXNzMDAvZW5oYW5jZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiZW5oYW5jZWRvc2tAY2FzczAwLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="} + }} ] diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 6e8da3840f086..c0dc65bb3fa6c 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -12,10 +12,11 @@ "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; "pop-shell@system76.com" = callPackage ./pop-shell { }; "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; - "system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { }; "taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { }; "tilingnome@rliang.github.com" = callPackage ./tilingnome { }; "TopIcons@phocean.net" = callPackage ./topicons-plus { }; + # Can be removed when https://github.com/hardpixel/unite-shell/issues/353 resolved + "unite@hardpixel.eu" = callPackage ./unite { }; "valent@andyholmes.ca" = callPackage ./valent { }; "window-corner-preview@fabiomereu.it" = callPackage ./window-corner-preview { }; } diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix deleted file mode 100644 index 7295e2e392a44..0000000000000 --- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, fetchpatch, glib, glib-networking, libgtop, gnome }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-system-monitor"; - version = "unstable-2023-01-21"; - - src = fetchFromGitHub { - owner = "paradoxxxzero"; - repo = "gnome-shell-system-monitor-applet"; - rev = "21d7b4e7a03ec8145b0b90c4f0b15c27d6f53788"; - hash = "sha256-XDqWxTyaFEWPdXMTklcNQxqql73ESXAIF6TjMFHaj7g="; - }; - - nativeBuildInputs = [ - glib - gnome.gnome-shell - ]; - - patches = [ - # GNOME 44 compatibility - (fetchpatch { - url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/788/commits/e69349942791140807c01d472dfe5e0ddf5c73c0.patch"; - hash = "sha256-g5Ocpvp7eO/pBkDBZsxgXH7e8rdPBUUxDSwK2hJHKbY="; - }) - (substituteAll { - src = ./paths_and_nonexisting_dirs.patch; - clutter_path = gnome.mutter.libdir; # only needed for GNOME < 40. - gtop_path = "${libgtop}/lib/girepository-1.0"; - glib_net_path = "${glib-networking}/lib/girepository-1.0"; - }) - ]; - - makeFlags = [ - "VERSION=${version}" - "INSTALLBASE=$(out)/share/gnome-shell/extensions" - "SUDO=" - ]; - - passthru = { - extensionUuid = "system-monitor@paradoxxx.zero.gmail.com"; - extensionPortalSlug = "system-monitor"; - }; - - meta = with lib; { - description = "Display system informations in gnome shell status bar"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ andersk ]; - homepage = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch deleted file mode 100644 index 280af965af3f6..0000000000000 --- a/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js -index de5e3d7..2d7824d 100644 ---- a/system-monitor@paradoxxx.zero.gmail.com/extension.js -+++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js -@@ -18,6 +18,9 @@ - - // Author: Florian Mounier aka paradoxxxzero - -+imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@'); -+imports.gi.GIRepository.Repository.prepend_search_path('@glib_net_path@'); -+ - /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily - * by loading the new libnm.so. Should go away eventually */ - -@@ -407,7 +410,7 @@ const smMountsMonitor = class SystemMonitor_smMountsMonitor { - this.connected = false; - - this._volumeMonitor = Gio.VolumeMonitor.get(); -- let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local']; -+ let sys_mounts = ['/home', '/tmp', '/boot']; - this.base_mounts = ['/']; - sys_mounts.forEach((sMount) => { - if (this.is_sys_mount(sMount + '/')) { -diff --git a/system-monitor@paradoxxx.zero.gmail.com/prefs.js b/system-monitor@paradoxxx.zero.gmail.com/prefs.js -index 81d667c..0da4809 100644 ---- a/system-monitor@paradoxxx.zero.gmail.com/prefs.js -+++ b/system-monitor@paradoxxx.zero.gmail.com/prefs.js -@@ -1,3 +1,5 @@ -+imports.gi.GIRepository.Repository.prepend_search_path('@clutter_path@'); -+ - const Gtk = imports.gi.Gtk; - const Gio = imports.gi.Gio; - const Gdk = imports.gi.Gdk; diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix new file mode 100644 index 0000000000000..ef975ffddf45f --- /dev/null +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, gnome, fetchFromGitHub, xprop, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-unite"; + version = "77"; + + src = fetchFromGitHub { + owner = "hardpixel"; + repo = "unite-shell"; + rev = "v${version}"; + hash = "sha256-5PClGWOxqwTVaqBySu5I+qavaV1vcKHUvoYJ3Qgcq2o="; + }; + + passthru = { + extensionUuid = "unite@hardpixel.eu"; + extensionPortalSlug = "unite"; + }; + + nativeBuildInputs = [ glib ]; + + buildInputs = [ xprop ]; + + buildPhase = '' + runHook preBuild + glib-compile-schemas --strict --targetdir="unite@hardpixel.eu/schemas/" "unite@hardpixel.eu/schemas" + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/gnome-shell/extensions + cp -r "unite@hardpixel.eu" $out/share/gnome-shell/extensions + runHook postInstall + ''; + + meta = with lib; { + description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ rhoriguchi ]; + homepage = "https://github.com/hardpixel/unite-shell"; + broken = versionOlder gnome.gnome-shell.version "3.32"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/valent/default.nix b/pkgs/desktops/gnome/extensions/valent/default.nix index 3813e02ffc03f..7bb529b743bbb 100644 --- a/pkgs/desktops/gnome/extensions/valent/default.nix +++ b/pkgs/desktops/gnome/extensions/valent/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-valent"; - version = "unstable-2023-03-18"; + version = "unstable-2023-11-10"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-valent"; - rev = "e7f759047c45833cd211ef18a8554008cb1b8b12"; - hash = "sha256-ylCyQbFbzCuSM2YrLuI36eXL2qQjTt1mYewJlCywKvI="; + rev = "c0fad083db3c23382efca623488834054bbbd5cd"; + hash = "sha256-H0EjR7sYK0mepT59PoHgecbk4ksQN8Vyisf6Y+2vT8g="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome/games/gnome-nibbles/default.nix index 741006bdec191..30812f9400718 100644 --- a/pkgs/desktops/gnome/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome/games/gnome-nibbles/default.nix @@ -3,30 +3,28 @@ , fetchurl , pkg-config , gnome -, gtk3 -, wrapGAppsHook +, gtk4 +, wrapGAppsHook4 , librsvg , gsound -, clutter-gtk , gettext , itstool , vala , libxml2 , libgee -, libgnome-games-support +, libgnome-games-support_2_0 , meson , ninja , desktop-file-utils -, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-nibbles"; - version = "3.38.3"; + version = "4.0.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "l1/eHYPHsVs5Lqx6NZFhKQ/IrrdgXBHnHO4MPDJrXmE="; + url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz"; + sha256 = "xrG89vesx0RQAmveV7OONcJJ08K3xC2c/hH4YvPW12I="; }; nativeBuildInputs = [ @@ -34,22 +32,19 @@ stdenv.mkDerivation rec { ninja vala pkg-config - wrapGAppsHook + wrapGAppsHook4 gettext itstool libxml2 desktop-file-utils - hicolor-icon-theme ]; buildInputs = [ - gtk3 + gtk4 librsvg gsound - clutter-gtk - gnome.adwaita-icon-theme libgee - libgnome-games-support + libgnome-games-support_2_0 ]; passthru = { @@ -62,8 +57,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Guide a worm around a maze"; homepage = "https://wiki.gnome.org/Apps/Nibbles"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/misc/gnome-screensaver/fix-dbus-service-dir.patch b/pkgs/desktops/gnome/misc/gnome-screensaver/fix-dbus-service-dir.patch deleted file mode 100644 index 81e037ee690de..0000000000000 --- a/pkgs/desktops/gnome/misc/gnome-screensaver/fix-dbus-service-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac 2019-01-20 20:28:01.309231507 +0100 -+++ b/configure.ac 2019-01-20 20:31:54.927978927 +0100 -@@ -137,7 +137,7 @@ - - # Find out where the session service file goes - # The sad sed hack is recomended by section 27.10 of the automake manual. --DBUS_SESSION_SERVICE_DIR=`pkg-config --variable session_bus_services_dir dbus-1 | sed -e 's,/usr/share,${datarootdir},g'` -+DBUS_SESSION_SERVICE_DIR=`pkg-config --variable session_bus_services_dir dbus-1 --define-variable 'datadir=${datadir}'` - AC_SUBST(DBUS_SESSION_SERVICE_DIR) - - dnl --------------------------------------------------------------------------- \ No newline at end of file diff --git a/pkgs/desktops/gnome/misc/pomodoro/default.nix b/pkgs/desktops/gnome/misc/pomodoro/default.nix index 3067c5de5fb8c..ab1513305197d 100644 --- a/pkgs/desktops/gnome/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome/misc/pomodoro/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gnome-pomodoro"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-Yn0lDCFpc8o25iiPib1n1NEBeodNAdTzRWcnLbXUA5g="; + hash = "sha256-Ml3znMz1Q9593rMgfAST8k9QglxMG9ocFD7W8kaFWCw="; }; patches = [ diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix index e8c3ea27fa4d3..962d6eef7fded 100644 --- a/pkgs/desktops/gnustep/gui/default.nix +++ b/pkgs/desktops/gnustep/gui/default.nix @@ -1,12 +1,12 @@ { gsmakeDerivation, fetchzip, base }: gsmakeDerivation rec { - version = "0.29.0"; + version = "0.30.0"; pname = "gnustep-gui"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; - sha256 = "0x6n48p178r4zd8f4sqjfqd6rp49w00wr59w19lpwlmrdv7bn538"; + sha256 = "sha256-24hL4TeIY6izlhQUcxKI0nXITysAPfRrncRqsDm2zNk="; }; buildInputs = [ base ]; patches = [ diff --git a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix new file mode 100644 index 0000000000000..796dc05d819aa --- /dev/null +++ b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix @@ -0,0 +1,57 @@ +{ stdenvNoCC +, lib +, fetchFromGitLab +, gitUpdater +, gtk3 +, hicolor-icon-theme +, ubuntu-themes +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "suru-icon-theme"; + version = "20.05.1"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/suru-icon-theme"; + rev = finalAttrs.version; + hash = "sha256-jJ6J+SjSABZCgnCF9cIFBpeSXX2LMnV+nPLPpoXQv30="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + gtk3 # gtk-update-icon-cache + hicolor-icon-theme # theme setup hook + ]; + + propagatedBuildInputs = [ + ubuntu-themes + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + cp -r suru $out/share/icons/ + + gtk-update-icon-cache $out/share/icons/suru + + runHook postInstall + ''; + + dontDropIconThemeCache = true; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Suru Icon Theme for Lomiri Operating Environment"; + homepage = "https://gitlab.com/ubports/development/core/suru-icon-theme"; + license = licenses.cc-by-sa-30; + maintainers = teams.lomiri.members; + platforms = platforms.all; + }; +}) diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 2de3a7c9d409b..70caa9d644203 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -9,6 +9,7 @@ let in { #### Data lomiri-schemas = callPackage ./data/lomiri-schemas { }; + suru-icon-theme = callPackage ./data/suru-icon-theme { }; #### Development tools / libraries cmake-extras = callPackage ./development/cmake-extras { }; @@ -17,10 +18,24 @@ let gmenuharness = callPackage ./development/gmenuharness { }; libusermetrics = callPackage ./development/libusermetrics { }; lomiri-api = callPackage ./development/lomiri-api { }; + lomiri-app-launch = callPackage ./development/lomiri-app-launch { }; + trust-store = callPackage ./development/trust-store { }; + u1db-qt = callPackage ./development/u1db-qt { }; + + #### QML / QML-related + lomiri-action-api = callPackage ./qml/lomiri-action-api { }; + lomiri-notifications = callPackage ./qml/lomiri-notifications { }; + lomiri-settings-components = callPackage ./qml/lomiri-settings-components { }; + lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { }; + lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { }; #### Services biometryd = callPackage ./services/biometryd { }; hfd-service = callPackage ./services/hfd-service { }; + history-service = callPackage ./services/history-service { }; + lomiri-download-manager = callPackage ./services/lomiri-download-manager { }; + lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { }; + mediascanner2 = callPackage ./services/mediascanner2 { }; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/lomiri/development/deviceinfo/default.nix b/pkgs/desktops/lomiri/development/deviceinfo/default.nix index 04abf4f88f46d..00ba1d864bf67 100644 --- a/pkgs/desktops/lomiri/development/deviceinfo/default.nix +++ b/pkgs/desktops/lomiri/development/deviceinfo/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DDISABLE_TESTS=${lib.boolToString (!finalAttrs.doCheck)}" + "-DDISABLE_TESTS=${lib.boolToString (!finalAttrs.finalPackage.doCheck)}" ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/desktops/lomiri/development/geonames/default.nix b/pkgs/desktops/lomiri/development/geonames/default.nix index ee4a3b77b72ba..8fc5a65b72ff1 100644 --- a/pkgs/desktops/lomiri/development/geonames/default.nix +++ b/pkgs/desktops/lomiri/development/geonames/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # Tests need to be able to check locale - LC_ALL = lib.optionalString finalAttrs.doCheck "en_US.UTF-8"; + LC_ALL = lib.optionalString finalAttrs.finalPackage.doCheck "en_US.UTF-8"; nativeCheckInputs = [ glibcLocales ]; @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DWANT_DOC=${lib.boolToString withDocumentation}" "-DWANT_DEMO=${lib.boolToString withExamples}" - "-DWANT_TESTS=${lib.boolToString finalAttrs.doCheck}" + "-DWANT_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" # Keeps finding & using glib-compile-resources from buildInputs otherwise "-DCMAKE_PROGRAM_PATH=${lib.makeBinPath [ buildPackages.glib.dev ]}" ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ diff --git a/pkgs/desktops/lomiri/development/gmenuharness/default.nix b/pkgs/desktops/lomiri/development/gmenuharness/default.nix index d5143e94d9147..101b6e2167774 100644 --- a/pkgs/desktops/lomiri/development/gmenuharness/default.nix +++ b/pkgs/desktops/lomiri/development/gmenuharness/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-Denable_tests=${lib.boolToString finalAttrs.doCheck}" + "-Denable_tests=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; dontWrapQtApps = true; diff --git a/pkgs/desktops/lomiri/development/libusermetrics/default.nix b/pkgs/desktops/lomiri/development/libusermetrics/default.nix index 7ccaccfa395e0..0c4ed003e5971 100644 --- a/pkgs/desktops/lomiri/development/libusermetrics/default.nix +++ b/pkgs/desktops/lomiri/development/libusermetrics/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace doc/CMakeLists.txt \ --replace "\''${CMAKE_INSTALL_DATAROOTDIR}/doc/libusermetrics-doc" "\''${CMAKE_INSTALL_DOCDIR}" - '' + lib.optionalString (!finalAttrs.doCheck) '' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' # Only needed by tests sed -i -e '/QTDBUSTEST/d' CMakeLists.txt ''; @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DGSETTINGS_LOCALINSTALL=ON" "-DGSETTINGS_COMPILE=ON" - "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix new file mode 100644 index 0000000000000..92139688b1270 --- /dev/null +++ b/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix @@ -0,0 +1,129 @@ +{ stdenv +, lib +, fetchFromGitLab +, gitUpdater +, testers +, cmake +, cmake-extras +, curl +, dbus +, dbus-test-runner +, dpkg +, gobject-introspection +, gtest +, json-glib +, libxkbcommon +, lomiri-api +, lttng-ust +, pkg-config +, properties-cpp +, python3 +, systemd +, ubports-click +, zeitgeist +, withDocumentation ? true +, doxygen +, python3Packages +, sphinx +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-app-launch"; + version = "0.1.8"; + + outputs = [ + "out" + "dev" + ] ++ lib.optionals withDocumentation [ + "doc" + ]; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-app-launch"; + rev = finalAttrs.version; + hash = "sha256-NIBZk5H0bPwAwkI0Qiq2S9dZvchAFPBCHKi2inUVZmI="; + }; + + postPatch = '' + patchShebangs tests/{desktop-hook-test.sh.in,repeat-until-pass.sh} + + # used pkg_get_variable, cannot replace prefix + substituteInPlace data/CMakeLists.txt \ + --replace 'DESTINATION "''${SYSTEMD_USER_UNIT_DIR}"' 'DESTINATION "${placeholder "out"}/lib/systemd/user"' + + substituteInPlace tests/jobs-systemd.cpp \ + --replace '^(/usr)?' '^(/nix/store/\\w+-bash-.+)?' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + dpkg # for setting LOMIRI_APP_LAUNCH_ARCH + gobject-introspection + pkg-config + ] ++ lib.optionals withDocumentation [ + doxygen + python3Packages.breathe + sphinx + ]; + + buildInputs = [ + cmake-extras + curl + dbus + json-glib + libxkbcommon + lomiri-api + lttng-ust + properties-cpp + systemd + ubports-click + zeitgeist + ]; + + nativeCheckInputs = [ + dbus + (python3.withPackages (ps: with ps; [ + python-dbusmock + ])) + ]; + + checkInputs = [ + dbus-test-runner + gtest + ]; + + cmakeFlags = [ + "-DENABLE_MIRCLIENT=OFF" + "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + ]; + + postBuild = lib.optionalString withDocumentation '' + make -C ../docs html + ''; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + postInstall = lib.optionalString withDocumentation '' + mkdir -p $doc/share/doc/lomiri-app-launch + mv ../docs/_build/html $doc/share/doc/lomiri-app-launch/ + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "System and associated utilities to launch applications in a standard and confined way"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-app-launch"; + license = licenses.gpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "lomiri-app-launch-0" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix new file mode 100644 index 0000000000000..477cdd0511f86 --- /dev/null +++ b/pkgs/desktops/lomiri/development/trust-store/default.nix @@ -0,0 +1,119 @@ +{ stdenv +, lib +, fetchFromGitLab +, testers +, boost +, cmake +, cmake-extras +, dbus +, dbus-cpp +, doxygen +, gettext +, glog +, graphviz +, gtest +, libapparmor +, newt +, pkg-config +, process-cpp +, properties-cpp +, qtbase +, qtdeclarative +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "trust-store"; + version = "unstable-2023-10-17"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/trust-store"; + rev = "7aa7ab5b7f3843e24c13ae6d9b8607455296d60e"; + hash = "sha256-j+4FZzbG3qh1pGRapFuuMiwT4Lv9P6Ji9/3Z0uGvXmw="; + }; + + outputs = [ + "out" + "dev" + "doc" + "bin" + ]; + + postPatch = '' + # pkg-config patching hook expects prefix variable + substituteInPlace data/trust-store.pc.in \ + --replace 'includedir=''${exec_prefix}' 'includedir=''${prefix}' + + substituteInPlace src/core/trust/terminal_agent.h \ + --replace '/bin/whiptail' '${lib.getExe' newt "whiptail"}' + '' + lib.optionalString (!finalAttrs.doCheck) '' + sed -i CMakeLists.txt -e '/add_subdirectory(tests)/d' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + doxygen + gettext + graphviz + pkg-config + ]; + + buildInputs = [ + boost + cmake-extras + dbus-cpp + glog + libapparmor + newt + process-cpp + properties-cpp + qtbase + qtdeclarative + ]; + + nativeCheckInputs = [ + dbus + ]; + + checkInputs = [ + gtest + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + # Requires mirclient API, unavailable in Mir 2.x + # https://gitlab.com/ubports/development/core/trust-store/-/issues/2 + "-DTRUST_STORE_MIR_AGENT_ENABLED=OFF" + "-DTRUST_STORE_ENABLE_DOC_GENERATION=ON" + ]; + + # Not working + # - remote_agent_test cases using unix domain socket fail to do *something*, with std::system_error "Invalid argument" + follow-up "No such file or directory". + # potentially something broken/missing on our end + # - dbus_test hangs indefinitely waiting for a std::future, not provicient enough to debug this. + # same hang on upstream CI + doCheck = false; + + preCheck = '' + export XDG_DATA_HOME=$TMPDIR + ''; + + # Starts & talks to DBus + enableParallelChecking = false; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { + description = "Common implementation of a trust store to be used by trusted helpers"; + homepage = "https://gitlab.com/ubports/development/core/trust-store"; + license = licenses.lgpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "trust-store" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/development/u1db-qt/default.nix b/pkgs/desktops/lomiri/development/u1db-qt/default.nix new file mode 100644 index 0000000000000..275fe85a55d24 --- /dev/null +++ b/pkgs/desktops/lomiri/development/u1db-qt/default.nix @@ -0,0 +1,102 @@ +{ stdenv +, lib +, fetchFromGitLab +, gitUpdater +, testers +, cmake +, dbus-test-runner +, pkg-config +, qtbase +, qtdeclarative +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "u1db-qt"; + version = "0.1.7"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/u1db-qt"; + rev = finalAttrs.version; + hash = "sha256-qlWkxpiVEUbpsKhzR0s7SKaEFCLM2RH+v9XmJ3qLoGY="; + }; + + outputs = [ + "out" + "dev" + "examples" + ]; + + postPatch = '' + patchShebangs tests/strict-qmltestrunner.sh + + # QMake query response is broken + substituteInPlace modules/U1db/CMakeLists.txt \ + --replace "\''${QT_IMPORTS_DIR}" "$out/$qtQmlPrefix" + '' + lib.optionalString (!finalAttrs.doCheck) '' + # Other locations add dependencies to custom check target from tests + substituteInPlace CMakeLists.txt \ + --replace 'add_subdirectory(tests)' 'add_custom_target(check COMMAND "echo check dummy")' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + qtdeclarative # qmlplugindump + ]; + + buildInputs = [ + qtbase + qtdeclarative + ]; + + nativeCheckInputs = [ + dbus-test-runner + ]; + + cmakeFlags = [ + # Needs qdoc + "-DBUILD_DOCS=OFF" + ]; + + dontWrapQtApps = true; + + preBuild = '' + # Executes qmlplugindump + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + ''; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + preCheck = '' + export QT_QPA_PLATFORM=minimal + ''; + + postInstall = '' + # Example seems unmaintained & depends on old things + # (unity-icon-theme, QtWebKit, Ubuntu namespace compat in LUITK) + # With an uneducated attempt at porting it to QtWebView, only displays blank window. Just throw it away. + rm -r $out/share/applications + + moveToOutput share/u1db-qt/qtcreator $dev + moveToOutput share/u1db-qt/examples $examples + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Qt5 binding and QtQuick2 plugin for U1DB"; + homepage = "https://gitlab.com/ubports/development/core/u1db-qt"; + license = licenses.lgpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "libu1db-qt5" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix new file mode 100644 index 0000000000000..34a8f8740ac07 --- /dev/null +++ b/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix @@ -0,0 +1,93 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, cmake +, dbus +, dbus-test-runner +, pkg-config +, qtbase +, qtdeclarative +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-action-api"; + version = "1.1.2"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-action-api"; + rev = finalAttrs.version; + hash = "sha256-FOHjZ5F4IkjSn/SpZEz25CbTR/gaK4D7BRxDVSDuAl8="; + }; + + outputs = [ + "out" + "dev" + ]; + + patches = [ + # Drop deprecated qt5_use_modules usage + # Remove when https://gitlab.com/ubports/development/core/lomiri-action-api/-/merge_requests/4 merged & in release + (fetchpatch { + url = "https://gitlab.com/OPNA2608/lomiri-action-api/-/commit/ff1d7f7eb127f6a00a99e8b278c963899d0303f0.patch"; + hash = "sha256-nLUoRl260hMbtEPjOQJI/3w54xgFxjcxerAqNN5FU/0="; + }) + ]; + + postPatch = '' + # Queries QMake for broken Qt variable: '/build/qtbase-<commit>/$(out)/$(qtQmlPrefix)' + substituteInPlace qml/Lomiri/Action/CMakeLists.txt \ + --replace "\''${QT_IMPORTS_DIR}/Lomiri" '${qtbase.qtQmlPrefix}/Lomiri' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + qtbase + qtdeclarative + ]; + + nativeCheckInputs = [ + dbus + dbus-test-runner + ]; + + cmakeFlags = [ + "-DENABLE_TESTING=${lib.boolToString finalAttrs.finalPackage.doCheck}" + "-Duse_libhud2=OFF" # Use vendored libhud2, TODO package libhud2 separately? + "-DGENERATE_DOCUMENTATION=OFF" # QML docs need qdoc, https://github.com/NixOS/nixpkgs/pull/245379 + ]; + + dontWrapQtApps = true; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + preCheck = '' + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + export QML2_IMPORT_PATH=${lib.getBin qtdeclarative}/${qtbase.qtQmlPrefix} + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Allow applications to export actions in various forms to the Lomiri Shell"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-action-api"; + license = licenses.lgpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "lomiri-action-qt-1" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix new file mode 100644 index 0000000000000..56b86eaa39185 --- /dev/null +++ b/pkgs/desktops/lomiri/qml/lomiri-notifications/default.nix @@ -0,0 +1,92 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, cmake +, dbus +, libqtdbustest +, lomiri-api +, pkg-config +, qtbase +, qtdeclarative +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-notifications"; + version = "1.3.0"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-notifications"; + rev = finalAttrs.version; + hash = "sha256-EGslfTgfADrmVGhNLG7HWqcDKhu52H/r41j7fxoliko="; + }; + + patches = [ + # Drop use of deprecated qt5_use_modules + # Remove when https://gitlab.com/ubports/development/core/lomiri-notifications/-/merge_requests/11 merged & in release + (fetchpatch { + url = "https://gitlab.com/OPNA2608/lomiri-notifications/-/commit/5d164d6d8d68efe1d14154eca4d0d736ce2a1265.patch"; + hash = "sha256-nUg0zUft1n4AlotOaZgDqWbiVDvWvMizdlClavwygoI="; + }) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + + # Need to replace prefix to not try to install into lomiri-api prefix + substituteInPlace src/CMakeLists.txt \ + --replace '--variable=plugindir' '--define-variable=prefix=''${CMAKE_INSTALL_PREFIX} --variable=plugindir' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' + sed -i CMakeLists.txt -e '/add_subdirectory(test)/d' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + lomiri-api + qtbase + qtdeclarative + ]; + + nativeCheckInputs = [ + dbus + ]; + + checkInputs = [ + libqtdbustest + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + # In case anything still depends on deprecated hints + "-DENABLE_UBUNTU_COMPAT=ON" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # Deals with DBus + enableParallelChecking = false; + + preCheck = '' + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Free Desktop Notification server QML implementation for Lomiri"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-notifications"; + license = licenses.gpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix new file mode 100644 index 0000000000000..1adb7372b7f98 --- /dev/null +++ b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, lib +, fetchFromGitLab +, gitUpdater +, cmake +, cmake-extras +, pkg-config +, python3 +, qtbase +, qtdeclarative +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-settings-components"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-settings-components"; + rev = finalAttrs.version; + hash = "sha256-13uxUBM+uOmt8X0uLGWNP8YbwCdb2QCChB8IP3td5a4="; + }; + + postPatch = '' + patchShebangs tests/imports/check_imports.py + + substituteInPlace CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" '${placeholder "out"}/${qtbase.qtQmlPrefix}' + '' + lib.optionalString (!finalAttrs.doCheck) '' + sed -i CMakeLists.txt \ + -e '/add_subdirectory(tests)/d' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + cmake-extras + qtbase + qtdeclarative + ]; + + nativeCheckInputs = [ + python3 + ]; + + # No apps, just QML components + dontWrapQtApps = true; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "QML settings components for the Lomiri Desktop Environment"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-settings-components"; + license = licenses.lgpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix new file mode 100644 index 0000000000000..06d5c1c319410 --- /dev/null +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix @@ -0,0 +1,125 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, cmake +, cmake-extras +, cups +, exiv2 +, lomiri-ui-toolkit +, pam +, pkg-config +, qtbase +, qtdeclarative +, xvfb-run +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-ui-extras"; + version = "0.6.2"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-ui-extras"; + rev = finalAttrs.version; + hash = "sha256-RZTGTe18ebqKz8kWOpRgFJO2sR97sVbdPQMW/XLHs68="; + }; + + patches = [ + # Fix compatibility with Exiv2 0.28.0 + # Remove when version > 0.6.2 + (fetchpatch { + name = "0001-lomiri-ui-extras-Fix-for-exiv2-0.28.0.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/commit/f337ceefa7c4f8f39dc7c75d51df8b86f148891a.patch"; + hash = "sha256-dm50un46eTeBZsyHJF1npGBqOAF1BopJZ1Uln1PqSOE="; + }) + + # Remove deprecated qt5_use_modules usage + # Remove when version > 0.6.2 + (fetchpatch { + name = "0002-lomiri-ui-extras-Stop-using-qt5_use_modules.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/commit/df506e7ebe7107dd0465d7d65727753f07abd122.patch"; + hash = "sha256-VmOhJaUgjp9BHoYAO780uxI5tE7F0Gtp9gRNe0QCrhs="; + }) + + # Find qmltestrunner via PATH instead of hardcoded path + # https://gitlab.com/ubports/development/core/lomiri-ui-extras/-/merge_requests/84 + (fetchpatch { + name = "0003-lomiri-ui-extras-Dont-insist-on-finding-qmltestrunner-only-at-hardcoded-guess.patch"; + url = "https://gitlab.com/OPNA2608/lomiri-ui-extras/-/commit/b0c4901818761b516a45b7f0524ac713ddf33cfe.patch"; + hash = "sha256-oFeaGiYEDr9XHRlCpXX+0ALlVdfb0FmGBFF1RzIXSBE="; + }) + ]; + + postPatch = '' + substituteInPlace modules/Lomiri/Components/Extras{,/{plugin,PamAuthentication}}/CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + + # tst_busy_indicator runs into a codepath in lomiri-ui-toolkit that expects a working GL context + sed -i tests/qml/CMakeLists.txt \ + -e '/declare_qml_test("tst_busy_indicator"/d' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + cmake-extras + cups + exiv2 + pam + qtbase + qtdeclarative + ]; + + nativeCheckInputs = [ + qtdeclarative # qmltestrunner + xvfb-run + ]; + + checkInputs = [ + lomiri-ui-toolkit + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" + ]; + + # tst_PhotoEditorPhoto and tst_PhotoEditorPhotoImageProvider randomly fail, haven't had time to debug + doCheck = false; + + # Parallelism breaks xvfb-run-launched script for QML tests + enableParallelChecking = false; + + preCheck = let + listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix; + in '' + export QT_PLUGIN_PATH=${listToQtVar qtbase.qtPluginPrefix [ qtbase ]} + export QML2_IMPORT_PATH=${listToQtVar qtbase.qtQmlPrefix ([ qtdeclarative lomiri-ui-toolkit ] ++ lomiri-ui-toolkit.propagatedBuildInputs)} + export XDG_RUNTIME_DIR=$PWD + ''; + + passthru = { + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Lomiri UI Extra Components"; + longDescription = '' + A collection of UI components that for various reasons can't be included in + the main Lomiri UI toolkit - mostly because of the level of quality, lack of + documentation and/or lack of automated tests. + ''; + homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-extras"; + license = licenses.gpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch new file mode 100644 index 0000000000000..1eac4fde58b4b --- /dev/null +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch @@ -0,0 +1,158 @@ +From 243477a2bd6e315c77ebaf5b2ed4a9c9c4e1e22a Mon Sep 17 00:00:00 2001 +From: OPNA2608 <christoph.neidahl@gmail.com> +Date: Sat, 25 Nov 2023 10:49:32 +0100 +Subject: [PATCH] Mark problematic tests + +- ShapeMaterial requires a Qt OpenGL context, doesn't work in our sandbox +- SignalSpy on QML shaders compilers don't see changes +- Scaling value from environment not picked up properly since Qt 5.15.11 + https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/34 +- TypeError on some properties with Qt 5.15 + https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/9 +--- + tests/checkresults.sh | 89 ++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 83 insertions(+), 6 deletions(-) + +diff --git a/tests/checkresults.sh b/tests/checkresults.sh +index fc498985e..730b9d406 100755 +--- a/tests/checkresults.sh ++++ b/tests/checkresults.sh +@@ -22,6 +22,7 @@ ERRORS_PATTERN='<failure' + + FAILURES=0 + FATAL_WARNINGS=0 ++EXCEPTED_FAILURES=0 + EXCEPTED=0 + for _XML in $*; do + _TESTNAME=$(basename $_XML | sed -r 's@(.+)\.xml@\1@' -) +@@ -31,7 +32,72 @@ for _XML in $*; do + exit 1 + fi + +- EXCEPTIONS='components_benchmark \ ++ ERROR_EXCEPTIONS='\ ++ tst_actionbar.13.qml \ ++ tst_actionlist.13.qml \ ++ tst_adaptivepagelayout.13.qml \ ++ tst_adaptivepagelayout_configuration.13.qml \ ++ tst_combobutton.11.qml \ ++ tst_combobutton.13.qml \ ++ tst_contextual_actions.13.qml \ ++ tst_focus.13.qml \ ++ tst_header.13.qml \ ++ tst_hide_chrome.11.qml \ ++ tst_listitem.12.qml \ ++ tst_listitem.13.qml \ ++ tst_listitem_actions_breaks_selectmode.12.qml \ ++ tst_listitem_extras.13.qml \ ++ tst_listitem_focus.13.qml \ ++ tst_listitem_horizontal_navigation.13.qml \ ++ tst_listitem_selectmode.12.qml \ ++ tst_listitem_selectmode.13.qml \ ++ tst_listitems_itemselector.11.qml \ ++ tst_listitems_standard.11.qml \ ++ tst_listitems_standard.13.qml \ ++ tst_lomirilistview.11.qml \ ++ tst_lomiritestcase.qml \ ++ tst_multicolumnheader.13.qml \ ++ tst_optionselector.11.qml \ ++ tst_optionselector.13.qml \ ++ tst_page_with_header.13.qml \ ++ tst_pagehead_back_action.13.qml \ ++ tst_pagehead_contents_width.13.qml \ ++ tst_pagehead_sections.13.qml \ ++ tst_pagehead_visible.13.qml \ ++ tst_pageheader.13.qml \ ++ tst_pagestack.13.qml \ ++ tst_pagestack.DEPRECATED_APPHEADER_TABS.13.qml \ ++ tst_picker.11.qml \ ++ tst_picker.13.qml \ ++ tst_popover.12.qml \ ++ tst_popover.13.qml \ ++ tst_popups_dialog.13.qml \ ++ tst_popups_pagestack.13.qml \ ++ tst_pulltorefresh_pagestack_topmargin.13.qml \ ++ tst_slider.11.qml \ ++ tst_slider.13.qml \ ++ tst_switch_bug1510919.13.qml \ ++ tst_tabs.11.qml \ ++ tst_tabs.13.qml \ ++ tst_tabs.DEPRECATED_TOOLBAR.11.qml \ ++ tst_textarea.11.qml \ ++ tst_textarea_in_flickable.11.qml \ ++ tst_textfield.11.qml \ ++ tst_textinput_common.12.qml \ ++ tst_textinput_common.13.qml \ ++ tst_toggles.13.qml \ ++ inversemousearea \ ++ layouts \ ++ recreateview \ ++ subtheming \ ++ swipearea \ ++ tst_icon.11.qml \ ++ tst_icon.13.qml \ ++ dpr1 \ ++ ' ++ ++ EXCEPTIONS='\ ++ components_benchmark \ + tst_tabbar.11.qml \ + tst_datepicker.bug1567840.SEGFAULT.12.qml \ + tst_datepicker.bug1567840.SEGFAULT.13.qml \ +@@ -49,22 +115,28 @@ for _XML in $*; do + inversemousearea \ + tst_listitem_focus_bug.13.qml \ + tst_shortcuts.13.qml \ ++ tst_pagestack.DEPRECATED_TOOLBAR.11.qml \ + ' + + WARNINGS=$(grep -c -P "$WARNINGS_PATTERN" $_XML) + ERRORS=$(grep -c -P "$ERRORS_PATTERN" $_XML) + if [ $ERRORS -ne 0 ]; then +- FAILURES_FILES="${FAILURES_FILES} ${_TESTNAME}\n" +- ((FAILURES+=$ERRORS)) ++ if [[ $ERROR_EXCEPTIONS == *" $_TESTNAME "* ]]; then ++ EXCEPTED_FAILURES_FILES="${EXCEPTED_FAILURES_FILES} ${_TESTNAME}\n" ++ ((EXCEPTED_FAILURES+=$ERRORS)) ++ else ++ FAILURES_FILES="${FAILURES_FILES} ${_TESTNAME}\n" ++ ((FAILURES+=$ERRORS)) ++ fi + elif [ $WARNINGS -ne 0 ]; then +- if [[ $EXCEPTIONS == *$_TESTNAME* ]]; then ++ if [[ $EXCEPTIONS == *" $_TESTNAME "* ]]; then + EXCEPTED_FILES="${EXCEPTED_FILES} ${_TESTNAME}\n" + ((EXCEPTED+=$WARNINGS)) + else + FATAL_WARNINGS_FILES="${FATAL_WARNINGS_FILES} ${_TESTNAME}\n" + ((FATAL_WARNINGS+=$WARNINGS)) + fi +- elif [[ $EXCEPTIONS == *$_TESTNAME* ]]; then ++ elif [[ $ERROR_EXCEPTIONS == *" $_TESTNAME "* || $EXCEPTIONS == *" $_TESTNAME "* ]]; then + WOOT_FILES="${WOOT_FILES} ${_TESTNAME}\n" + fi + done +@@ -82,6 +154,11 @@ if [ -n "$FATAL_WARNINGS_FILES" ]; then + echo -e "$FATAL_WARNINGS_FILES" + fi + ++if [ -n "$EXCEPTED_FAILURES_FILES" ]; then ++ echo The following tests issued $EXCEPTED_FAILURES expected failures: ++ echo -e "$EXCEPTED_FAILURES_FILES" ++fi ++ + if [ -n "$EXCEPTED_FILES" ]; then + echo The following tests issued $EXCEPTED expected warnings: + echo -e "$EXCEPTED_FILES" +@@ -89,7 +166,7 @@ fi + + if [ -n "$WOOT_FILES" ]; then + echo Woot! Known problematic tests passed! +- echo Consider removing these from EXCEPTIONS in ${0#$(pwd)/}! ++ echo Consider removing these from ERROR_EXCEPTIONS/EXCEPTIONS in ${0#$(pwd)/}! + echo -e "$WOOT_FILES" + fi + +-- +2.40.1 + diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix new file mode 100644 index 0000000000000..bac495acdc7cb --- /dev/null +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix @@ -0,0 +1,254 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, dbus-test-runner +, dpkg +, gdb +, glib +, lttng-ust +, perl +, pkg-config +, python3 +, qmake +, qtbase +, qtdeclarative +, qtfeedback +, qtgraphicaleffects +, qtpim +, qtquickcontrols2 +, qtsvg +, qtsystems +, suru-icon-theme +, wrapQtAppsHook +, xvfb-run +}: + +let + listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix; + qtPluginPaths = listToQtVar qtbase.qtPluginPrefix [ qtbase qtpim qtsvg ]; + qtQmlPaths = listToQtVar qtbase.qtQmlPrefix [ qtdeclarative qtfeedback qtgraphicaleffects ]; +in +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-ui-toolkit"; + version = "1.3.5011"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-ui-toolkit"; + rev = finalAttrs.version; + hash = "sha256-z/EEmC9LjQtBx5MRDLeImxpRrzH4w6v6o+NmqX+L4dw="; + }; + + outputs = [ "out" "dev" ]; + + patches = [ + # Upstreaming effort for these two patches: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/merge_requests/44 + (fetchpatch { + name = "0001-lomiri-ui-toolkit-fix-tests-on-qt-5.15.4.patch"; + url = "https://salsa.debian.org/ubports-team/lomiri-ui-toolkit/-/raw/1ad650c326ba9706d549d1dbe8335c70f6b382c8/debian/patches/0001-fix-tests-on-qt-5.15.4.patch"; + hash = "sha256-Y5HVvulR2760DBzlmYkImbJ/qIeqMISqPpUppbv8xJA="; + }) + (fetchpatch { + name = "0002-lomiri-ui-toolkit-fix-tests-on-qt-5.15.5.patch"; + url = "https://salsa.debian.org/ubports-team/lomiri-ui-toolkit/-/raw/03bcafadd3e4fda34bcb5af23454f4b202cf5517/debian/patches/0002-fix-tests-on-qt-5.15.5.patch"; + hash = "sha256-x8Zk7+VBSlM16a3V1yxJqIB63796H0lsS+F4dvR/z80="; + }) + + # Small fixes to statesaver & tst_imageprovider.11.qml tests + # Remove when version > 1.3.5011 + (fetchpatch { + name = "0003-lomiri-ui-toolkit-tests-Minor-fixes.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/commit/a8324d670b813a48ac7d48aa0bc013773047a01d.patch"; + hash = "sha256-W6q3LuQqWmUVSBzORcJsTPoLfbWwytABMDR6JITHrDI="; + }) + + # Fix Qt 5.15.11 compatibility + # Remove when version > 1.3.5011 + (fetchpatch { + name = "0004-lomiri-ui-toolkit-Fix-compilation-with-Qt-5.15.11.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/commit/4f999077dc6bc5591bdfede64fd21cb3acdcaac1.patch"; + hash = "sha256-5VCQFOykxgspNBxH94XYuBpdHsH9a3+8FwV6xQE55Xc="; + }) + + ./2001-Mark-problematic-tests.patch + ]; + + postPatch = '' + patchShebangs documentation/docs.sh tests/ + + substituteInPlace tests/tests.pro \ + --replace "\''$\''$PYTHONDIR" "$dev/${python3.sitePackages}" + + for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do + substituteInPlace $subproject/$subproject.pro \ + --replace "\''$\''$[QT_INSTALL_PREFIX]" "$out" \ + --replace "\''$\''$[QT_INSTALL_LIBS]" "$out/lib" + done + + # Install apicheck tool into bin + substituteInPlace apicheck/apicheck.pro \ + --replace "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin" + + # Causes redefinition error with our own fortify hardening + sed -i '/DEFINES += _FORTIFY_SOURCE/d' features/lomiri_common.prf + + # Reverse dependencies (and their reverse dependencies too) access the function patched here to register their gettext catalogues, + # so hardcoding any prefix here will make only catalogues in that prefix work. APP_DIR envvar will override this, but with domains from multiple derivations being + # used in a single application (lomiri-system-settings), that's of not much use either. + # https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/dcb3a523c56a400e5c3c163c2836cafca168767e/src/LomiriToolkit/i18n.cpp#L101-129 + # + # This could be solved with a reference to the prefix of whoever requests the domain, but the call happens via some automatic Qt / QML callback magic, + # I'm not sure what the best way of injecting that there would be. + # https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/blob/dcb3a523c56a400e5c3c163c2836cafca168767e/src/LomiriToolkit/i18n_p.h#L34 + # + # Using /run/current-system/sw/share/locale instead of /usr/share/locale isn't a great + # solution, but at least it should get us working localisations + substituteInPlace src/LomiriToolkit/i18n.cpp \ + --replace "/usr" "/run/current-system/sw" + + # The code here overrides the regular QML import variables so the just-built modules are found & used in the tests + # But we need their QML dependencies too, so put them back in there + substituteInPlace export_qml_dir.sh \ + --replace '_IMPORT_PATH=$BUILD_DIR/qml' '_IMPORT_PATH=$BUILD_DIR/qml:${qtQmlPaths}' + + # These tests try to load Suru theme icons, but override XDG_DATA_DIRS / use full paths to load them + substituteInPlace \ + tests/unit/visual/tst_visual.cpp \ + tests/unit/visual/tst_icon.{11,13}.qml \ + tests/unit/visual/tst_imageprovider.11.qml \ + --replace '/usr/share' '${suru-icon-theme}/share' + ''; + + # With strictDeps, QMake only picks up Qt dependencies from nativeBuildInputs + strictDeps = false; + + nativeBuildInputs = [ + perl + pkg-config + python3 + qmake + wrapQtAppsHook + ]; + + buildInputs = [ + glib + lttng-ust + qtbase + qtdeclarative + qtpim + qtquickcontrols2 + qtsystems + ]; + + propagatedBuildInputs = [ + qtfeedback + qtgraphicaleffects + qtsvg + ]; + + nativeCheckInputs = [ + dbus-test-runner + dpkg # `dpkg-architecture -qDEB_HOST_ARCH` response decides how tests are run + gdb + xvfb-run + ]; + + qmakeFlags = [ + # docs require Qt5's qdoc, which we don't have before https://github.com/NixOS/nixpkgs/pull/245379 + "CONFIG+=no_docs" + # Ubuntu UITK compatibility, for older / not-yet-migrated applications + "CONFIG+=ubuntu-uitk-compat" + "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # Explicitly not parallel-safe, large parts are always run in series and at least qquick_image_extension fails with parallelism + enableParallelChecking = false; + + checkPhase = '' + runHook preCheck + + export HOME=$PWD + + # XDG_RUNTIME_DIR with wrong permissions causes warnings that are interpreted as errors in the test suite + export XDG_RUNTIME_DIR=$PWD/runtime-dir + mkdir -p $XDG_RUNTIME_DIR + chmod -R 700 $XDG_RUNTIME_DIR + + # Tests need some Qt plugins + # Many tests try to load Suru theme icons via XDG_DATA_DIRS + export QT_PLUGIN_PATH=${qtPluginPaths} + export XDG_DATA_DIRS=${suru-icon-theme}/share + + tests/xvfb.sh make check ''${enableParallelChecking:+-j''${NIX_BUILD_CORES}} + + runHook postCheck + ''; + + preInstall = '' + # wrapper script calls qmlplugindump, crashes due to lack of minimal platform plugin + # Could not find the Qt platform plugin "minimal" in "" + # Available platform plugins are: wayland-egl, wayland, wayland-xcomposite-egl, wayland-xcomposite-glx. + export QT_PLUGIN_PATH=${qtPluginPaths} + + # Qt-generated wrapper script lacks QML paths to dependencies + for qmlModule in Components PerformanceMetrics Test; do + substituteInPlace src/imports/$qmlModule/wrapper.sh \ + --replace 'QML2_IMPORT_PATH=' 'QML2_IMPORT_PATH=${qtQmlPaths}:' + done + ''; + + postInstall = '' + # Code loads Qt's qt_module.prf, which force-overrides all QMAKE_PKGCONFIG_* variables except PREFIX for QMake-generated pkg-config files + for pcFile in Lomiri{Gestures,Metrics,Toolkit}.pc; do + substituteInPlace $out/lib/pkgconfig/$pcFile \ + --replace "${lib.getLib qtbase}/lib" "\''${prefix}/lib" \ + --replace "${lib.getDev qtbase}/include" "\''${prefix}/include" + done + + # These are all dev-related tools, but declaring a bin output also moves around the QML modules + moveToOutput "bin" "$dev" + ''; + + postFixup = '' + for qtBin in $dev/bin/{apicheck,lomiri-ui-toolkit-launcher}; do + wrapQtApp $qtBin + done + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "QML components to ease the creation of beautiful applications in QML"; + longDescription = '' + This project consists of a set of QML components to ease the creation of beautiful applications in QML for Lomiri. + + QML alone lacks built-in components for basic widgets like Button, Slider, Scrollbar, etc, meaning a developer has + to build them from scratch. + This toolkit aims to stop this duplication of work, supplying beautiful components ready-made and with a clear and + consistent API. + + These components are fully themeable so the look and feel can be easily customized. Resolution independence + technology is built in so UIs are scaled to best suit the display. + + Other features: + - localisation through gettext + ''; + homepage = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit"; + license = with licenses; [ gpl3Only cc-by-sa-30 ]; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "LomiriGestures" + "LomiriMetrics" + "LomiriToolkit" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/services/history-service/default.nix b/pkgs/desktops/lomiri/services/history-service/default.nix new file mode 100644 index 0000000000000..de8b614ae3ea4 --- /dev/null +++ b/pkgs/desktops/lomiri/services/history-service/default.nix @@ -0,0 +1,203 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, cmake +, dbus +, dbus-test-runner +, dconf +, gnome +, libphonenumber +, libqtdbustest +, pkg-config +, protobuf +, qtbase +, qtdeclarative +, qtpim +, sqlite +, telepathy +, telepathy-mission-control +, wrapQtAppsHook +, xvfb-run +}: + +let + replaceDbusService = pkg: name: "--replace \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\""; +in +stdenv.mkDerivation (finalAttrs: { + pname = "history-service"; + version = "0.4"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/history-service"; + rev = finalAttrs.version; + hash = "sha256-oCX+moGQewzstbpddEYYp1kQdO2mVXpWJITfvzDzQDI="; + }; + + outputs = [ + "out" + "dev" + ]; + + patches = [ + # Deprecation warnings with Qt5.15, allow disabling -Werror + # Remove when version > 0.4 + (fetchpatch { + url = "https://gitlab.com/ubports/development/core/history-service/-/commit/1370777952c6a2efb85f582ff8ba085c2c0e290a.patch"; + hash = "sha256-Z/dFrFo7WoPZlKto6wNGeWdopsi8iBjmd5ycbqMKgxo="; + }) + + # Drop deprecated qt5_use_modules usage + # Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/36 merged & in release + (fetchpatch { + url = "https://gitlab.com/OPNA2608/history-service/-/commit/b36ab377aca93555b29d1471d6eaa706b5c843ca.patch"; + hash = "sha256-mOpXqqd4JI7lHtcWDm9LGCrtB8ERge04jMpHIagDM2k="; + }) + + # Add more / correct existing GNUInstallDirs usage + # Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/37 merged & in release + (fetchpatch { + url = "https://gitlab.com/OPNA2608/history-service/-/commit/bb4dbdd16e80dcd286d8edfb86b08f0b61bc7fec.patch"; + hash = "sha256-C/XaygI663yaU06klQD9g0NnbqYxHSmzdbrRxcfiJkk="; + }) + + # Correct version information + # Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/38 merged & in release + (fetchpatch { + url = "https://gitlab.com/OPNA2608/history-service/-/commit/30d9fbee203205ec1ea8fd19c9b6eb54c080a9e2.patch"; + hash = "sha256-vSZ1ii5Yhw7pB+Pd1pjWnW7JsQxKnn+LeuBKo6qZjQs="; + }) + + # Make tests optional + # Remove when https://gitlab.com/ubports/development/core/history-service/-/merge_requests/39 merged & in release + (fetchpatch { + url = "https://gitlab.com/OPNA2608/history-service/-/commit/cb5c80cffc35611657244e15a7eb10edcd598ccd.patch"; + hash = "sha256-MFHGu4OMScdThq9htUgFMpezP7Ym6YTIZUHWol20wqw="; + }) + ]; + + postPatch = '' + # Upstream's way of generating their schema doesn't work for us, don't quite understand why. + # (gdb) bt + # #0 QSQLiteResult::prepare (this=0x4a4650, query=...) at qsql_sqlite.cpp:406 + # #1 0x00007ffff344bcf4 in QSQLiteResult::reset (this=0x4a4650, query=...) at qsql_sqlite.cpp:378 + # #2 0x00007ffff7f95f39 in QSqlQuery::exec (this=this@entry=0x7fffffffaad8, query=...) at kernel/qsqlquery.cpp:406 + # #3 0x00000000004084cb in SQLiteDatabase::dumpSchema (this=<optimized out>) at /build/source/plugins/sqlite/sqlitedatabase.cpp:148 + # #4 0x0000000000406d70 in main (argc=<optimized out>, argv=<optimized out>) + # at /build/source/plugins/sqlite/schema/generate_schema.cpp:56 + # (gdb) p lastError().driverText().toStdString() + # $17 = {_M_dataplus = {<std::allocator<char>> = {<std::__new_allocator<char>> = {<No data fields>}, <No data fields>}, + # _M_p = 0x4880d0 "Unable to execute statement"}, _M_string_length = 27, { + # _M_local_buf = "\033\000\000\000\000\000\000\000+\344\371\367\377\177\000", _M_allocated_capacity = 27}} + # (gdb) p lastError().databaseText().toStdString() + # $18 = {_M_dataplus = {<std::allocator<char>> = {<std::__new_allocator<char>> = {<No data fields>}, <No data fields>}, + # _M_p = 0x48c480 "no such column: rowid"}, _M_string_length = 21, { + # _M_local_buf = "\025\000\000\000\000\000\000\000A\344\371\367\377\177\000", _M_allocated_capacity = 21}} + # + # This makes the tests stall indefinitely and breaks history-service usage. + # This replacement script should hopefully achieve the same / a similar-enough result with just sqlite + cp ${./update_schema.sh.in} plugins/sqlite/schema/update_schema.sh.in + + # libphonenumber -> protobuf -> abseil-cpp demands C++14 + # But uses std::string_view which is C++17? + substituteInPlace CMakeLists.txt \ + --replace '-std=c++11' '-std=c++17' + + # Uses pkg_get_variable, cannot substitute prefix with that + substituteInPlace daemon/CMakeLists.txt \ + --replace 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_UNIT_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")' + + # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory + substituteInPlace CMakeLists.txt \ + --replace "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}" + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' + # Tests launch these DBus services, fix paths related to them + substituteInPlace tests/common/dbus-services/CMakeLists.txt \ + ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.MissionControl5.service"} \ + ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.AccountManager.service"} \ + ${replaceDbusService dconf "ca.desrt.dconf.service"} + + substituteInPlace cmake/modules/GenerateTest.cmake \ + --replace '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \ + --replace '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + sqlite + wrapQtAppsHook + ]; + + buildInputs = [ + libphonenumber + protobuf + qtbase + qtdeclarative + qtpim + telepathy + ]; + + nativeCheckInputs = [ + dbus + dbus-test-runner + dconf + gnome.gnome-keyring + telepathy-mission-control + xvfb-run + ]; + + cmakeFlags = [ + # Many deprecation warnings with Qt 5.15 + (lib.cmakeBool "ENABLE_WERROR" false) + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [ + # DaemonTest is flaky + # https://gitlab.com/ubports/development/core/history-service/-/issues/13 + "-E" "^DaemonTest" + ])) + ]; + + preBuild = '' + # SQLiteDatabase is used on host to generate SQL schemas + # Tests also need this to use SQLiteDatabase for verifying correct behaviour + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + ''; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # Starts & talks to D-Bus services, breaks with parallelism + enableParallelChecking = false; + + preCheck = '' + export QT_PLUGIN_PATH=${lib.getBin qtpim}/${qtbase.qtPluginPrefix}:$QT_PLUGIN_PATH + export HOME=$PWD + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Service that provides call log and conversation history"; + longDescription = '' + History service provides the database and an API to store/retrieve the call log (used by dialer-app) and the sms/mms history (used by messaging-app). + + See as well telepathy-ofono for incoming message events. + + Database location: ~/.local/share/history-service/history.sqlite + ''; + homepage = "https://gitlab.com/ubports/development/core/history-service"; + license = licenses.gpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "history-service" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/services/history-service/update_schema.sh.in b/pkgs/desktops/lomiri/services/history-service/update_schema.sh.in new file mode 100644 index 0000000000000..3911c59ebe3ad --- /dev/null +++ b/pkgs/desktops/lomiri/services/history-service/update_schema.sh.in @@ -0,0 +1,34 @@ +#!/bin/sh + +if [ $# -lt 3 ]; then + echo "Usage: $0 <source directory> <target file> <version info file>" + exit 1 +fi + +SOURCE_DIR=$1 +TARGET_FILE=$2 +VERSION_FILE=$3 + +VERSION="1" +LATEST_VERSION="1" +MERGED_COMMANDS="merged.sql" + +[ -e $MERGED_COMMANDS ] && rm $MERGED_COMMANDS +SCHEMA_FILE="$SOURCE_DIR/v${VERSION}.sql" +while [ -e $SCHEMA_FILE ]; do + cat $SCHEMA_FILE >> $MERGED_COMMANDS + LATEST_VERSION=$VERSION + VERSION=$(($VERSION+1)) + SCHEMA_FILE="$SOURCE_DIR/v${VERSION}.sql" +done + +# To output the schema +echo ".fullschema" >> $MERGED_COMMANDS + +# The schemas may use functions that history-service defines in C which don't affect the generated schema in a meaningful way. +# sqlite will return an error after processing queries with such function calls, so remove them. +sed -i -e '/normalizeId(/d' $MERGED_COMMANDS + +sqlite3 <$MERGED_COMMANDS >$TARGET_FILE + +echo $LATEST_VERSION > $VERSION_FILE diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix new file mode 100644 index 0000000000000..ea2032c7fffac --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix @@ -0,0 +1,159 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, boost +, cmake +, cmake-extras +, dbus +, dbus-test-runner +, withDocumentation ? true +, doxygen +, glog +, graphviz +, gtest +, lomiri-api +, pkg-config +, python3 +, qtbase +, qtdeclarative +, wrapQtAppsHook +, xvfb-run +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-download-manager"; + version = "0.1.2"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-download-manager"; + rev = finalAttrs.version; + hash = "sha256-a9C+hactBMHMr31E+ImKDPgpzxajy1klkjDcSEkPHqI="; + }; + + outputs = [ + "out" + "dev" + ] ++ lib.optionals withDocumentation [ + "doc" + ]; + + patches = [ + # Remove when version > 0.1.2 + (fetchpatch { + name = "0001-lomiri-download-manager-Make-documentation-build-optional.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/32d7369714c01bd425af9c6de5bdc04399a12e0a.patch"; + hash = "sha256-UztcBAAFXDX2j0X5D3kMp9q0vFm3/PblUAKPJ5nZyiY="; + }) + + # Remove when version > 0.1.2 + (fetchpatch { + name = "0002-lomiri-download-manager-Upgrade-C++-standard-to-C++17.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/a6bc7ae80f2ff4c4743978c6c694149707d9d2e2.patch"; + hash = "sha256-iA1sZhHI8Osgo1ofL5RTqgVzUG32zx0dU/28qcEqmQc="; + }) + + # Remove when version > 0.1.2 + (fetchpatch { + name = "0003-lomiri-download-manager-Bump-version-make-Werror-and-tests-optional.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/73ec04c429e5285f05dd72d5bb9720ba6ff31be2.patch"; + hash = "sha256-0BrJSKCvUhITwfln05OrHgHEpldbgBoh4rivAvw+qrc="; + }) + + # Remove when version > 0.1.2 + (fetchpatch { + name = "0004-lomiri-download-manager-Use-GNUInstallDirs-variables-for-more-install-destinations.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/5d40daf053de62150aa5ee618285e415d7d3f1c8.patch"; + hash = "sha256-r5fpiJkZkDsYX9fcX5JuPsE/qli9z5/DatmGJ9/QauU="; + }) + ]; + + postPatch = '' + # fetchpatch strips renames + # Remove when version > 0.1.2 + for service in src/{uploads,downloads}/daemon/{lomiri-*-manager,lomiri-*-manager-systemd,com.lomiri.*}.service; do + mv "$service" "$service".in + done + + # pkg_get_variable doesn't let us substitute prefix pkg-config variable from systemd + substituteInPlace CMakeLists.txt \ + --replace 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_DIR "${placeholder "out"}/lib/systemd/user")' \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ] ++ lib.optionals withDocumentation [ + doxygen + graphviz + ]; + + buildInputs = [ + boost + cmake-extras + glog + lomiri-api + qtbase + qtdeclarative + ]; + + nativeCheckInputs = [ + dbus + dbus-test-runner + python3 + xvfb-run + ]; + + checkInputs = [ + gtest + ]; + + cmakeFlags = [ + "-DENABLE_DOC=${lib.boolToString withDocumentation}" + # Deprecation warnings on Qt 5.15 + # https://gitlab.com/ubports/development/core/lomiri-download-manager/-/issues/1 + "-DENABLE_WERROR=OFF" + ]; + + makeTargets = [ + "all" + ] ++ lib.optionals withDocumentation [ + "doc" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # xvfb tests are flaky on xvfb shutdown when parallelised + enableParallelChecking = false; + + preCheck = '' + export HOME=$TMPDIR # temp files in home + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} # xcb platform & sqlite driver + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Performs uploads and downloads from a centralized location"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-download-manager"; + license = licenses.lgpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "ldm-common" + "lomiri-download-manager-client" + "lomiri-download-manager-common" + "lomiri-upload-manager-common" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix new file mode 100644 index 0000000000000..7629da2cbb849 --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix @@ -0,0 +1,169 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, cmake +, cmake-extras +, dbus +, dbus-test-runner +, glib +, gtest +, intltool +, json-glib +, libapparmor +, libxkbcommon +, lomiri-app-launch +, lomiri-ui-toolkit +, makeWrapper +, pkg-config +, python3 +, qtbase +, qtdeclarative +, qtwayland +, runtimeShell +, sqlite +, systemd +, wrapQtAppsHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-url-dispatcher"; + version = "0.1.3"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-url-dispatcher"; + rev = finalAttrs.version; + hash = "sha256-kde/HzhBHxTeyc2TCUJwpG7IfC8doDd/jNMF8KLM7KU="; + }; + + outputs = [ + "out" + "dev" + ]; + + patches = [ + # Fix case-sensitivity in tests + # Remove when https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/merge_requests/8 merged & in release + (fetchpatch { + url = "https://gitlab.com/sunweaver/lomiri-url-dispatcher/-/commit/ebdd31b9640ca243e90bc7b8aca7951085998bd8.patch"; + hash = "sha256-g4EohB3oDcWK4x62/3r/g6CFxqb7/rdK51+E/Fji1Do="; + }) + ]; + + postPatch = '' + substituteInPlace data/CMakeLists.txt \ + --replace "\''${SYSTEMD_USER_UNIT_DIR}" "\''${CMAKE_INSTALL_LIBDIR}/systemd/user" + + substituteInPlace tests/url_dispatcher_testability/CMakeLists.txt \ + --replace "\''${PYTHON_PACKAGE_DIR}" "$out/${python3.sitePackages}" + + # Update URI handler database whenever new url-handler is installed system-wide + substituteInPlace data/lomiri-url-dispatcher-update-system-dir.*.in \ + --replace '@CMAKE_INSTALL_FULL_DATAROOTDIR@' '/run/current-system/sw/share' + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' + patchShebangs tests/test-sql.sh + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + glib # for gdbus-codegen + intltool + makeWrapper + pkg-config + (python3.withPackages (ps: with ps; [ + setuptools + ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ + python-dbusmock + ])) + wrapQtAppsHook + ]; + + buildInputs = [ + cmake-extras + dbus-test-runner + glib + gtest + json-glib + libapparmor + lomiri-app-launch + lomiri-ui-toolkit + qtdeclarative + sqlite + systemd + libxkbcommon + ]; + + nativeCheckInputs = [ + dbus + sqlite + ]; + + cmakeFlags = [ + "-DLOCAL_INSTALL=ON" + "-Denable_mirclient=OFF" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # Tests work with an sqlite db, cannot handle >1 test at the same time + enableParallelChecking = false; + + dontWrapQtApps = true; + + preFixup = '' + substituteInPlace $out/bin/lomiri-url-dispatcher-dump \ + --replace '/bin/sh' '${runtimeShell}' + + wrapProgram $out/bin/lomiri-url-dispatcher-dump \ + --prefix PATH : ${lib.makeBinPath [ sqlite ]} + + # Move from qmlscene call in desktop file to easier-to-wrap script + guiScript=$out/bin/lomiri-url-dispatcher-gui + guiExec=$(grep 'Exec=' $out/share/applications/lomiri-url-dispatcher-gui.desktop | cut -d'=' -f2-) + + cat <<EOF >$guiScript + #!${runtimeShell} + $guiExec + EOF + chmod +x $guiScript + + mkdir -p $out/share/icons/hicolor/scalable/apps + ln -s $out/share/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg $out/share/icons/hicolor/scalable/apps/ + + substituteInPlace $out/share/applications/lomiri-url-dispatcher-gui.desktop \ + --replace "Exec=$guiExec" "Exec=$(basename $guiScript)" \ + --replace "Icon=$out/share/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg" "Icon=lomiri-url-dispatcher-gui" + + # Calls qmlscene from PATH, needs Qt plugins & QML components + qtWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ qtdeclarative.dev ]} + ) + wrapQtApp $guiScript + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Lomiri operating environment service for requesting URLs to be opened"; + longDescription = '' + Allows applications to request a URL to be opened and handled by another + process without seeing the list of other applications on the system or + starting them inside its own Application Confinement. + ''; + homepage = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher"; + license = with licenses; [ lgpl3Only gpl3Only ]; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "lomiri-url-dispatcher" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix new file mode 100644 index 0000000000000..d9470668ce1dd --- /dev/null +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -0,0 +1,122 @@ +{ stdenv +, lib +, fetchFromGitLab +, gitUpdater +, testers +, boost +, cmake +, cmake-extras +, dbus +, dbus-cpp +, gdk-pixbuf +, glib +, gst_all_1 +, gtest +, libapparmor +, libexif +, pkg-config +, properties-cpp +, qtbase +, qtdeclarative +, shared-mime-info +, sqlite +, taglib +, udisks +, wrapQtAppsHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mediascanner2"; + version = "0.115"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/mediascanner2"; + rev = finalAttrs.version; + hash = "sha256-UEwFe65VB2asxQhuWGEAVow/9rEvZxry4dd2/60fXN4="; + }; + + outputs = [ + "out" + "dev" + ]; + + postPatch = '' + substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + + # Lomiri desktop doesn't identify itself under Canonical's name anymore + substituteInPlace src/daemon/scannerdaemon.cc \ + --replace 'Unity8' 'Lomiri' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gst_all_1.gstreamer # GST_PLUGIN_SYSTEM_PATH_1_0 setup hook + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + boost + cmake-extras + dbus + dbus-cpp + gdk-pixbuf + glib + libapparmor + libexif + properties-cpp + qtbase + qtdeclarative + shared-mime-info + sqlite + taglib + udisks + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]); + + checkInputs = [ + gtest + ]; + + cmakeFlags = [ + "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + preCheck = '' + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + export XDG_DATA_DIRS=${shared-mime-info}/share:$XDG_DATA_DIRS + ''; + + preFixup = '' + qtWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --prefix XDG_DATA_DIRS : ${shared-mime-info}/share + ) + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Media scanner service & access library"; + homepage = "https://gitlab.com/ubports/development/core/mediascanner2"; + license = licenses.gpl3Only; + maintainers = teams.lomiri.members; + mainProgram = "mediascanner-service-2.0"; + platforms = platforms.linux; + pkgConfigModules = [ + "mediascanner-2.0" + ]; + }; +}) diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index b65a91e00442d..4c7e6eb6c023d 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "libmateweather"; - version = "1.26.2"; + version = "1.26.3"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ylCoFYZlXPU6j5Z2a5zpCk0H7Q/hYr1eFdra3QBgx/Y="; + sha256 = "XmzSRBiEfLRazxfaW0NacTHLTsKs/2joKPNCob8T70o="; }; strictDeps = true; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 764f86cf061e9..dfb4e4620c516 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -15,6 +15,7 @@ , libgtop , libxml2 , libnotify +, mate-desktop , mate-panel , polkit , upower @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { libnotify libwnck libxml2 + mate-desktop # for org.mate.lockdown mate-panel polkit upower diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 5eb6df4f4453e..8e2e3ea621c29 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { mate.mate-desktop mate.libmatekbd mate.mate-menus + mate.mate-panel # for org.mate.panel schema, see m-c-c#678 mate.marco mate.mate-settings-daemon ]; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index ae1a654bd5875..0b5eae0172e07 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "mate-media"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "KLKiGiltkVx8BtnSFvSahUHNPOyJWzJZvKBoqF4m6ws="; + sha256 = "r0ZjlXTMOIUTCJyhC7FB/8Pm0awz5zDkII21dZZChQ8="; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 6c39e69f0c0e7..a4f79e1221223 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "mate-system-monitor"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HrX7m2y0qK2DCyboR6m70B1WiqvTg8Yo7p8IQJuJKOc="; + sha256 = "vm2X3saPXza94S+KyvGsVkLSOaXSQWGoL/9QZPRQJUQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 66042844d8b46..e1e0db005d658 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -11,7 +11,8 @@ , json-glib , libgee , libhandy -, libsoup +, libportal-gtk3 +, libsoup_3 , libxml2 , meson , ninja @@ -23,13 +24,15 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "7.4.0"; + version = "7.4.0-unstable-2023-12-04"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = version; - sha256 = "sha256-L6MGbzzujr4tEB2Cpd7IU+3mOtSCt2hLPw4mOfZ4TkQ="; + # Add support for AppStream 1.0. + # https://github.com/elementary/appcenter/pull/2099 + rev = "d93e135a0b0c9a6e0fbad18fe90d46425823a42c"; + hash = "sha256-b7xux6MuvYZFxufQ5T7DoDNBlsJ/fDR0aUY2Hk/xJoY="; }; nativeBuildInputs = [ @@ -50,7 +53,8 @@ stdenv.mkDerivation rec { json-glib libgee libhandy - libsoup + libportal-gtk3 + libsoup_3 libxml2 polkit ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index c06448bdc41a5..dda264380dbc8 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, python3 , vala , wrapGAppsHook4 , elementary-gtk-theme @@ -17,20 +16,19 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "elementary"; repo = "calculator"; rev = version; - sha256 = "sha256-PLdPu43ns03vhBwaGw4BWCLNvcJbhUA+5Gr5b//TqfA="; + sha256 = "sha256-VPxCW2lVA/nS2aJsjLgkuEM9wnAzyEr864XY8tfLQAY="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 vala wrapGAppsHook4 ]; @@ -42,11 +40,6 @@ stdenv.mkDerivation rec { libgee ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - preFixup = '' gappsWrapperArgs+=( # The GTK theme is hardcoded. diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index d1ccd49f1a886..f796053cec928 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -32,6 +33,13 @@ stdenv.mkDerivation rec { # https://github.com/ximion/appstream/blob/v0.15.2/src/as-pool.c#L117 # https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location ./fix-metadata-path.patch + + # Add support for AppStream 1.0. + # https://github.com/elementary/feedback/pull/102 + (fetchpatch { + url = "https://github.com/elementary/feedback/commit/037b20328f5200a0dac25e6835c0c3f8a7c36f39.patch"; + hash = "sha256-tjUNTCsEBjy/3lzwyIwR4VED57ATiG2CWCmRh7qps+4="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 12d0740c4384b..a77e440bfe392 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -14,7 +14,6 @@ , libhandy , granite , pango -, elementary-dock , bamf , sqlite , zeitgeist @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.5.2"; + version = "6.5.3"; outputs = [ "out" "dev" ]; @@ -34,7 +33,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-YwXyqZ0exwQ3Qx+VWWyTTmhqCVr6be8tqzS1k3Luo8o="; + sha256 = "sha256-geJLHRo1Bd2oFT+UtirHj9FVSFTFMK/v/5h+NF9woFo="; }; nativeBuildInputs = [ @@ -48,7 +47,6 @@ stdenv.mkDerivation rec { buildInputs = [ bamf - elementary-dock glib granite gtk3 diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 3c9fc107a9780..5aff02f081701 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -29,6 +30,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-MJybc2yAchU6qMqkoRz45QdhR7bj/UFk2nyxcBivsHI="; }; + patches = [ + # Add support for AppStream 1.0 + # https://github.com/elementary/switchboard-plug-about/pull/275 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-about/commit/72d7da13da2824812908276751fd3024db2dd0f8.patch"; + hash = "sha256-R7oW3mL77/JNqxuMiqxtdMlHWMJgGRQBBzVeRiqx8PY="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch new file mode 100644 index 0000000000000..8ec7a34d97605 --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-esbuild-config.patch @@ -0,0 +1,13 @@ +diff --git a/src/kwinscript/CMakeLists.txt b/src/kwinscript/CMakeLists.txt +index 9e2f7054..ed607027 100644 +--- a/src/kwinscript/CMakeLists.txt ++++ b/src/kwinscript/CMakeLists.txt +@@ -39,7 +39,7 @@ endif() + set(ESBUILD_COMMAND + "esbuild" "--bundle" "${CMAKE_CURRENT_SOURCE_DIR}/index.ts" + "--outfile=${CMAKE_CURRENT_BINARY_DIR}/bismuth/contents/code/index.mjs" +- "--format=esm" "--platform=neutral") ++ "--format=esm" "--platform=neutral" "--target=es6") + if(USE_NPM) + list(PREPEND ESBUILD_COMMAND "npx") + endif() diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix index ee43f98fda207..ca54ff8887804 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix @@ -21,6 +21,10 @@ mkDerivation rec { sha256 = "sha256-c13OFEw6E/I8j/mqeLnuc9Chi6pc3+AgwAMPpCzh974="; }; + patches = [ + ./0001-esbuild-config.patch + ]; + cmakeFlags = [ "-DUSE_TSC=OFF" "-DUSE_NPM=OFF" diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix b/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix new file mode 100644 index 0000000000000..7bfe963e0e8b4 --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix @@ -0,0 +1,51 @@ +{ lib +, fetchFromGitHub +, buildNpmPackage +, plasma-framework +}: + +# how to update: +# 1. check out the tag for the version in question +# 2. run `prefetch-npm-deps package-lock.json` +# 3. update npmDepsHash with the output of the previous step + +buildNpmPackage rec { + pname = "polonium"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "zeroxoneafour"; + repo = pname; + rev = "v" + version; + hash = "sha256-fZgNOcOq+owmqtplwnxeOIQpWmrga/WitCNCj89O5XA="; + }; + + npmDepsHash = "sha256-25AtM1FweWIbFot+HUMSPYTu47/0eKNpRWSlBEL0yKk="; + + dontConfigure = true; + + # the installer does a bunch of stuff that fails in our sandbox, so just build here and then we + # manually do the install + buildFlags = [ "res" "src" ]; + + nativeBuildInputs = [ plasma-framework ]; + + dontNpmBuild = true; + + dontWrapQtApps = true; + + installPhase = '' + runHook preInstall + + plasmapkg2 --install pkg --packageroot $out/share/kwin/scripts + + runHook postInstall + ''; + + meta = with lib; { + description = "Auto-tiler that uses KWin 5.27+ tiling functionality"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + inherit (plasma-framework.meta) platforms; + }; +} diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix index b499ab034e508..3ecc5d5e5b0d1 100644 --- a/pkgs/desktops/plasma-5/breeze-gtk.nix +++ b/pkgs/desktops/plasma-5/breeze-gtk.nix @@ -1,6 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, sassc, python3, breeze-qt5 }: - -let inherit (lib) getLib; in +{ mkDerivation, extra-cmake-modules, qtbase, sassc, python3, breeze-qt5 }: mkDerivation { pname = "breeze-gtk"; @@ -9,9 +7,5 @@ mkDerivation { patches = [ ./patches/0001-fix-add-executable-bit.patch ]; - postPatch = '' - sed -i cmake/FindGTKEngine.cmake \ - -e "s|\''${KDE_INSTALL_FULL_LIBDIR}|${getLib gtk2}/lib|" - ''; cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ]; } diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 0c501b4c5a4cf..781bf16067096 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -49,7 +49,7 @@ let mirror = "mirror://kde"; }; - qtStdenv = libsForQt5.callPackage ({ stdenv }: stdenv) {}; + qtStdenv = libsForQt5.callPackage ({ stdenv }: stdenv) { }; packages = self: let @@ -96,7 +96,7 @@ let defaultSetupHook = if hasBin && hasDev then propagateBin else null; setupHook = args.setupHook or defaultSetupHook; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ libsForQt5.wrapQtAppsHook ]; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ libsForQt5.wrapQtAppsHook ]; meta = let meta = args.meta or { }; in @@ -183,6 +183,7 @@ let kzones = callPackage ./3rdparty/kwin/scripts/kzones.nix { }; lightly = callPackage ./3rdparty/lightly { }; parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { }; + polonium = callPackage ./3rdparty/addons/polonium.nix { }; }; } // lib.optionalAttrs config.allowAliases { diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 533240fc8f024..3d1df94ce8750 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.9/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.10/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index a61fc328236d2..c55193ae6429a 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,6 @@ , extra-cmake-modules , wrapGAppsHook , glib -, gtk2 , gtk3 , karchive , kcmutils @@ -25,7 +24,6 @@ mkDerivation { ki18n kio glib - gtk2 gtk3 karchive kcmutils @@ -39,7 +37,6 @@ mkDerivation { ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; # The gtkconfig KDED module will crash the daemon if the GSettings schemas diff --git a/pkgs/desktops/plasma-5/patches/0001-Add-a-logging-category-config-file.patch b/pkgs/desktops/plasma-5/patches/0001-Add-a-logging-category-config-file.patch deleted file mode 100644 index d8d54a117eb25..0000000000000 --- a/pkgs/desktops/plasma-5/patches/0001-Add-a-logging-category-config-file.patch +++ /dev/null @@ -1,210 +0,0 @@ -From e63a0dc2a7b185906a93d60e9d5d6deee4950efc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven.car@enioka.com> -Date: Wed, 20 May 2020 14:02:07 +0200 -Subject: [PATCH] Add a logging category config file - -Makes powerdevil default logging level Warning ---- - CMakeLists.txt | 2 ++ - daemon/CMakeLists.txt | 6 ++++++ - daemon/actions/dpms/CMakeLists.txt | 2 +- - daemon/backends/CMakeLists.txt | 6 +++--- - daemon/powerdevil_debug.cpp | 21 --------------------- - daemon/powerdevil_debug.h | 26 -------------------------- - kcmodule/activities/CMakeLists.txt | 2 +- - kcmodule/common/CMakeLists.txt | 2 +- - kcmodule/profiles/CMakeLists.txt | 2 +- - powerdevil.categories | 1 + - 10 files changed, 16 insertions(+), 54 deletions(-) - delete mode 100644 daemon/powerdevil_debug.cpp - delete mode 100644 daemon/powerdevil_debug.h - create mode 100644 powerdevil.categories - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ded8f5a..52a7318c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,6 +11,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - - include(ECMSetupVersion) -+include(ECMQtDeclareLoggingCategory) - include(FeatureSummary) - include(KDEInstallDirs) - include(KDECMakeSettings) -@@ -76,6 +77,7 @@ add_subdirectory(daemon) - add_subdirectory(kcmodule) - add_subdirectory(doc) - -+install( FILES powerdevil.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - install( FILES powerdevil.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} ) - - feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) -diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt -index 33ca655b..96cc9b7b 100644 ---- a/daemon/CMakeLists.txt -+++ b/daemon/CMakeLists.txt -@@ -48,6 +48,12 @@ set(powerdevilcore_SRCS - kwinkscreenhelpereffect.cpp - ) - -+ecm_qt_declare_logging_category(powerdevilcore_SRCS -+ HEADER powerdevil_debug.h -+ IDENTIFIER POWERDEVIL -+ CATEGORY_NAME org.kde.powerdevil -+ DEFAULT_SEVERITY Warning) -+ - kconfig_add_kcfg_files(powerdevilcore_SRCS ../PowerDevilSettings.kcfgc) - - # Action DBus Adaptors -diff --git a/daemon/actions/dpms/CMakeLists.txt b/daemon/actions/dpms/CMakeLists.txt -index f8ca4e20..3b8bd95b 100644 ---- a/daemon/actions/dpms/CMakeLists.txt -+++ b/daemon/actions/dpms/CMakeLists.txt -@@ -3,7 +3,7 @@ include_directories(${PowerDevil_SOURCE_DIR}/daemon - ${CMAKE_CURRENT_BINARY_DIR}) - - set(powerdevildpmsaction_SRCS -- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp -+ ${CMAKE_CURRENT_BINARY_DIR}/../../powerdevil_debug.cpp - powerdevildpmsaction.cpp - abstractdpmshelper.cpp - xcbdpmshelper.cpp -diff --git a/daemon/backends/CMakeLists.txt b/daemon/backends/CMakeLists.txt -index 89400446..05c4263e 100644 ---- a/daemon/backends/CMakeLists.txt -+++ b/daemon/backends/CMakeLists.txt -@@ -4,7 +4,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/upower - ${X11_Xrandr_INCLUDE_PATH}) - - set(powerdevilupowerbackend_SRCS -- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp -+ ${CMAKE_CURRENT_BINARY_DIR}/../powerdevil_debug.cpp - upower/upowersuspendjob.cpp - upower/login1suspendjob.cpp - upower/powerdevilupowerbackend.cpp -@@ -33,14 +33,14 @@ ${CMAKE_CURRENT_SOURCE_DIR}/upower/dbus/org.freedesktop.UPower.KbdBacklight.xml - upower_kbdbacklight_interface) - - ## backlight helper executable --add_executable(backlighthelper upower/backlighthelper.cpp ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp ${backlighthelper_mocs}) -+add_executable(backlighthelper upower/backlighthelper.cpp ${CMAKE_CURRENT_BINARY_DIR}/../powerdevil_debug.cpp ${backlighthelper_mocs}) - target_link_libraries(backlighthelper Qt5::Core KF5::AuthCore KF5::I18n) - install(TARGETS backlighthelper DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) - kauth_install_helper_files(backlighthelper org.kde.powerdevil.backlighthelper root) - kauth_install_actions(org.kde.powerdevil.backlighthelper ${CMAKE_CURRENT_SOURCE_DIR}/upower/backlight_helper_actions.actions) - - ## discrete gpu helper executable --add_executable(discretegpuhelper upower/discretegpuhelper.cpp ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp ${discretegpuhelper_mocs}) -+add_executable(discretegpuhelper upower/discretegpuhelper.cpp ${CMAKE_CURRENT_BINARY_DIR}/../powerdevil_debug.cpp ${discretegpuhelper_mocs}) - target_link_libraries(discretegpuhelper Qt5::Core KF5::AuthCore) - install(TARGETS discretegpuhelper DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) - kauth_install_helper_files(discretegpuhelper org.kde.powerdevil.discretegpuhelper root) -diff --git a/daemon/powerdevil_debug.cpp b/daemon/powerdevil_debug.cpp -deleted file mode 100644 -index 86172c1b..00000000 ---- a/daemon/powerdevil_debug.cpp -+++ /dev/null -@@ -1,21 +0,0 @@ --/* This file is part of the KDE project -- Copyright (C) 2014 Hrvoje Senjan <hrvoje.senjan@gmail.com> -- -- This library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Library General Public -- License as published by the Free Software Foundation; either -- version 2 of the License, or (at your option) any later version. -- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public License -- along with this library; see the file COPYING.LIB. If not, write to -- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- Boston, MA 02110-1301, USA. --*/ -- --#include "powerdevil_debug.h" --Q_LOGGING_CATEGORY(POWERDEVIL, "powerdevil") -diff --git a/daemon/powerdevil_debug.h b/daemon/powerdevil_debug.h -deleted file mode 100644 -index fcd9c10f..00000000 ---- a/daemon/powerdevil_debug.h -+++ /dev/null -@@ -1,26 +0,0 @@ --/* This file is part of the KDE project -- Copyright (C) 2014 Hrvoje Senjan <hrvoje.senjan@gmail.com> -- -- This library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Library General Public -- License as published by the Free Software Foundation; either -- version 2 of the License, or (at your option) any later version. -- -- This library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public License -- along with this library; see the file COPYING.LIB. If not, write to -- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- Boston, MA 02110-1301, USA. --*/ -- --#ifndef PROCESSCORE_DEBUG_H --#define PROCESSCORE_DEBUG_H -- --#include <QLoggingCategory> --Q_DECLARE_LOGGING_CATEGORY(POWERDEVIL) -- --#endif -diff --git a/kcmodule/activities/CMakeLists.txt b/kcmodule/activities/CMakeLists.txt -index 41a6da48..6e248e91 100644 ---- a/kcmodule/activities/CMakeLists.txt -+++ b/kcmodule/activities/CMakeLists.txt -@@ -1,7 +1,7 @@ - add_definitions(-DTRANSLATION_DOMAIN=\"powerdevilactivitiesconfig\") - - set( kcm_powerdevil_activities_SRCS -- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp -+ ${CMAKE_CURRENT_BINARY_DIR}/../../daemon/powerdevil_debug.cpp - activitypage.cpp - activitywidget.cpp - ../common/ErrorOverlay.cpp -diff --git a/kcmodule/common/CMakeLists.txt b/kcmodule/common/CMakeLists.txt -index ca483fa7..400b7746 100644 ---- a/kcmodule/common/CMakeLists.txt -+++ b/kcmodule/common/CMakeLists.txt -@@ -1,7 +1,7 @@ - add_definitions(-DTRANSLATION_DOMAIN=\"libpowerdevilcommonconfig\") - - set( powerdevil_config_common_private_SRCS -- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp -+ ${CMAKE_CURRENT_BINARY_DIR}/../../daemon/powerdevil_debug.cpp - actionconfigwidget.cpp - actioneditwidget.cpp - ErrorOverlay.cpp -diff --git a/kcmodule/profiles/CMakeLists.txt b/kcmodule/profiles/CMakeLists.txt -index ac5c96e0..32279089 100644 ---- a/kcmodule/profiles/CMakeLists.txt -+++ b/kcmodule/profiles/CMakeLists.txt -@@ -1,7 +1,7 @@ - add_definitions(-DTRANSLATION_DOMAIN=\"powerdevilprofilesconfig\") - - set( kcm_powerdevil_profiles_SRCS -- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp -+ ${CMAKE_CURRENT_BINARY_DIR}/../../daemon/powerdevil_debug.cpp - EditPage.cpp - ${PowerDevil_SOURCE_DIR}/daemon/powerdevilprofilegenerator.cpp - ) -diff --git a/powerdevil.categories b/powerdevil.categories -new file mode 100644 -index 00000000..3147de54 ---- /dev/null -+++ b/powerdevil.categories -@@ -0,0 +1 @@ -+org.kde.powerdevil Powerdevil DEFAULT_SEVERITY [WARNING] IDENTIFIER [POWERDEVIL] --- -2.25.4 - diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index c20ded466eec3..0876308cb311d 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,475 +4,483 @@ { aura-browser = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/aura-browser-5.27.9.tar.xz"; - sha256 = "1962h3m52yzvj60r9y6cwfzqz4sgg0867n420w27r40cz23nr0fy"; - name = "aura-browser-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/aura-browser-5.27.10.tar.xz"; + sha256 = "0rc5vsk3hy4i3fqzrj7kkshijkkrfin3km7n9agv9xs6bjrrca2k"; + name = "aura-browser-5.27.10.tar.xz"; }; }; bluedevil = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/bluedevil-5.27.9.tar.xz"; - sha256 = "0vjbcaalsmkbx1bccflpvjpdmw8gcym28qqybp0h2z983mj6i0b6"; - name = "bluedevil-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/bluedevil-5.27.10.tar.xz"; + sha256 = "1051gx6xv514qa7g102mv51927b7408mv2jrfpryji8r5s6da7vp"; + name = "bluedevil-5.27.10.tar.xz"; }; }; breeze = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/breeze-5.27.9.tar.xz"; - sha256 = "0ks6y9qhwkqbbfivnbw46vk41kapaxgdzmhnbzzywpwpbqlidias"; - name = "breeze-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/breeze-5.27.10.tar.xz"; + sha256 = "18h08w3ylgvhgcs63ai8airh59yb4kc0bz2zi6lm77fsa83rdg5y"; + name = "breeze-5.27.10.tar.xz"; }; }; breeze-grub = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/breeze-grub-5.27.9.tar.xz"; - sha256 = "1bbmwj5b0xzqrb3w318l805an6rnvbnrd03ad05qnf84fg24cvn9"; - name = "breeze-grub-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/breeze-grub-5.27.10.tar.xz"; + sha256 = "072zqs723phm27cn359lpaw29zqbx23w4gi4shk00x1n0j5s0spz"; + name = "breeze-grub-5.27.10.tar.xz"; }; }; breeze-gtk = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/breeze-gtk-5.27.9.tar.xz"; - sha256 = "03h1kbrh1rp7h4pslghpb9fjnyg0gg8khkds0la4bvjy85a3jsx8"; - name = "breeze-gtk-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/breeze-gtk-5.27.10.tar.xz"; + sha256 = "1dk9f2l4jqdhzr5xd7ym107zayygjdmibl3jkhnbnq97rs6gk8qx"; + name = "breeze-gtk-5.27.10.tar.xz"; }; }; breeze-plymouth = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/breeze-plymouth-5.27.9.tar.xz"; - sha256 = "1wqnfzwjgwma2cxvnawwicj3z8kxwh0yjvrh3x5kzc586q0zj01r"; - name = "breeze-plymouth-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/breeze-plymouth-5.27.10.tar.xz"; + sha256 = "1xabkvnpxh2qw1x5w1fkrcg31h8j0baq4ls6ckw6647gikvnf7h8"; + name = "breeze-plymouth-5.27.10.tar.xz"; }; }; discover = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/discover-5.27.9.tar.xz"; - sha256 = "1m97zn2q22842dhamavpa6q49bm0vxl3kq1qgr3nhbmskk1swfg7"; - name = "discover-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/discover-5.27.10.tar.xz"; + sha256 = "1a4z21qrc6wjwcv0hnw8wnkk8w0bli12hfm8bdd07b2rlzi8k48z"; + name = "discover-5.27.10.tar.xz"; }; }; drkonqi = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/drkonqi-5.27.9.tar.xz"; - sha256 = "04nx1wkgz5cdc615611jn1672mnrsl2z3a8xznrqr6cbfpw9ghsm"; - name = "drkonqi-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/drkonqi-5.27.10.tar.xz"; + sha256 = "1l3zcmjjndqq6y25v74kmzddkkqr8j4030z7rz5333hxraa4gsm3"; + name = "drkonqi-5.27.10.tar.xz"; }; }; flatpak-kcm = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/flatpak-kcm-5.27.9.tar.xz"; - sha256 = "0zcadkabnp37ab0p5adih9kh81iapn5hzc0j07rx81kk40j9p58s"; - name = "flatpak-kcm-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/flatpak-kcm-5.27.10.tar.xz"; + sha256 = "0masi1nciqzrymcq5i4b2jmhxliqf88z9g11607aqfgsli070lms"; + name = "flatpak-kcm-5.27.10.tar.xz"; }; }; kactivitymanagerd = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kactivitymanagerd-5.27.9.tar.xz"; - sha256 = "1gn9a2rkyqljm9ry54kwfca7crmad71fr7fkan9l5cjsjrqqk3sn"; - name = "kactivitymanagerd-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kactivitymanagerd-5.27.10.tar.xz"; + sha256 = "1nax1vbl5cxqf8rxmmqfnjnrh36ic16yrbdmcqzgp1s9dkxn5qlf"; + name = "kactivitymanagerd-5.27.10.tar.xz"; }; }; kde-cli-tools = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kde-cli-tools-5.27.9.tar.xz"; - sha256 = "01kx8xg6mlkl3n710vas536vwrni023h1655bs0ixzp12ngsdw86"; - name = "kde-cli-tools-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kde-cli-tools-5.27.10.tar.xz"; + sha256 = "0gsdl33bnxfg2zf8dgbg3wk40g0j4qjjzk9mz6a43qghkj4nvakv"; + name = "kde-cli-tools-5.27.10.tar.xz"; }; }; kde-gtk-config = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kde-gtk-config-5.27.9.tar.xz"; - sha256 = "04lrc6anqljfyqhw9mwanxhjbbknfd1hkk2baxlhi49f9rzdhjw0"; - name = "kde-gtk-config-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kde-gtk-config-5.27.10.tar.xz"; + sha256 = "0swfyvq687ankny7qj7imj691c0mmgifwircxw4w7d9qn5832fvg"; + name = "kde-gtk-config-5.27.10.tar.xz"; }; }; kdecoration = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kdecoration-5.27.9.tar.xz"; - sha256 = "0zjk51pww3z6vsgdm5dxya2b3ngrdpxbmizdcin40zj37mkpz7bm"; - name = "kdecoration-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kdecoration-5.27.10.tar.xz"; + sha256 = "1plxczgqj8g99jh1c8jiy5ji086xs4gv12halmfval4b4nw6r5k4"; + name = "kdecoration-5.27.10.tar.xz"; }; }; kdeplasma-addons = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kdeplasma-addons-5.27.9.tar.xz"; - sha256 = "0ysg5rzr0zywxx9wyg82x3l0skg7ld0wn270i4rryia8agdx49ps"; - name = "kdeplasma-addons-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kdeplasma-addons-5.27.10.tar.xz"; + sha256 = "139y1zsw720j19bzx9m6xlf46n7i7sz12bcdkzs5b8wav0yyyr4y"; + name = "kdeplasma-addons-5.27.10.tar.xz"; + }; + }; + kgamma = { + version = "5.27.10"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.27.10/kgamma-5.27.10.tar.xz"; + sha256 = "0w7m9via36qk8s92mflh27ngjl1a0zj9im1f93jgrr2wldibp0fx"; + name = "kgamma-5.27.10.tar.xz"; }; }; kgamma5 = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kgamma5-5.27.9.tar.xz"; - sha256 = "1ks4f1v2cm770j0q2fpd432kpmsg6daa29hjvcbdczfg8gxrnjn8"; - name = "kgamma5-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kgamma5-5.27.10.tar.xz"; + sha256 = "0w7m9via36qk8s92mflh27ngjl1a0zj9im1f93jgrr2wldibp0fx"; + name = "kgamma5-5.27.10.tar.xz"; }; }; khotkeys = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/khotkeys-5.27.9.tar.xz"; - sha256 = "1s6whyqbz331j8nyz0f5k54ww22awcyq0gqpg2sfjwm5rclms6kn"; - name = "khotkeys-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/khotkeys-5.27.10.tar.xz"; + sha256 = "1rznv44ixb8l5flcc4rqnj1cfldna0ikbmg50lqznsvsnbkm2p34"; + name = "khotkeys-5.27.10.tar.xz"; }; }; kinfocenter = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kinfocenter-5.27.9.tar.xz"; - sha256 = "0qp89b2js74qnfcc3b79ywi8g329scc0xypz9kjlzcncp6q79gq3"; - name = "kinfocenter-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kinfocenter-5.27.10.tar.xz"; + sha256 = "04fa5bdw84k9ikv7chl1nrh857sb1gzq43f7rc7vb1q7hhs2lp6f"; + name = "kinfocenter-5.27.10.tar.xz"; }; }; kmenuedit = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kmenuedit-5.27.9.tar.xz"; - sha256 = "1ngbf7jrgsp5qnk38zw22vm07lpr2hizi5l5n6jy4754d756ndn8"; - name = "kmenuedit-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kmenuedit-5.27.10.tar.xz"; + sha256 = "1mr09zx37wky8cnf3r2mcvnl8nmhdi9rwdawsz946l66jrz0n28w"; + name = "kmenuedit-5.27.10.tar.xz"; }; }; kpipewire = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kpipewire-5.27.9.tar.xz"; - sha256 = "086h2mfb8isravj9wypvislwwg2yf72rkzly4zsnx3r0dh8lyyqv"; - name = "kpipewire-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kpipewire-5.27.10.tar.xz"; + sha256 = "1vn3g3rmgwyhrzg9hv7y9249v1gzwid7q43r3ndhdvz2k8baag62"; + name = "kpipewire-5.27.10.tar.xz"; }; }; kscreen = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kscreen-5.27.9.tar.xz"; - sha256 = "0nz1lm2i4h2w9m6pdw2diqii11sx38lwz2yrk4mzxsq229c97rij"; - name = "kscreen-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kscreen-5.27.10.tar.xz"; + sha256 = "0g0wk17fs0rg7myfv6wf4asw0ahlwk245zwhj0i7lqg8nk6vz1w9"; + name = "kscreen-5.27.10.tar.xz"; }; }; kscreenlocker = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kscreenlocker-5.27.9.tar.xz"; - sha256 = "0kc7j69rbf66ji8s250iza4aq1cvpfgz43r59vrzr1in1a6a9077"; - name = "kscreenlocker-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kscreenlocker-5.27.10.tar.xz"; + sha256 = "129xrdlg86qlcp2ssk46xq1h2v00z4cqha2wc5fr3d65gyw80kfp"; + name = "kscreenlocker-5.27.10.tar.xz"; }; }; ksshaskpass = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/ksshaskpass-5.27.9.tar.xz"; - sha256 = "0wwarxw8xrmwmyfscvy9dr5r2g8zmdk0qjipydg3i8dcpxqd1n67"; - name = "ksshaskpass-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/ksshaskpass-5.27.10.tar.xz"; + sha256 = "0sp275r8jqlh1as47r0df3lli17lnw6m2h5j9k85hglwrgfyg3fk"; + name = "ksshaskpass-5.27.10.tar.xz"; }; }; ksystemstats = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/ksystemstats-5.27.9.tar.xz"; - sha256 = "0lbr84jv70qqayq6a8nvmcbd582696zpcrf108kzpxzd0smbbnij"; - name = "ksystemstats-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/ksystemstats-5.27.10.tar.xz"; + sha256 = "0f723yq5wyfxfj9cx13cpvxhq28blglzpsgdh843has3xlnxlpjs"; + name = "ksystemstats-5.27.10.tar.xz"; }; }; kwallet-pam = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kwallet-pam-5.27.9.tar.xz"; - sha256 = "1kjjrd84fxnpm9jv7n9ndbnfch2x904l2xxi0g85fv4ipfm0z6bn"; - name = "kwallet-pam-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kwallet-pam-5.27.10.tar.xz"; + sha256 = "1yx18j9823xfqwrhzy3wnzqzw7zhdya9r3xh84qg9j9psqa1f6dc"; + name = "kwallet-pam-5.27.10.tar.xz"; }; }; kwayland-integration = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kwayland-integration-5.27.9.tar.xz"; - sha256 = "1rg2vyry9lv9d1bkhwnlhxx8pjridbqhs1758kgls5dk9q4g05wn"; - name = "kwayland-integration-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kwayland-integration-5.27.10.tar.xz"; + sha256 = "17xxlfs63sxcziv8nl50qlpcy8w0h259mblxxvx99cmnc930azgk"; + name = "kwayland-integration-5.27.10.tar.xz"; }; }; kwin = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kwin-5.27.9.tar.xz"; - sha256 = "1fvqamjhl5vij7kqd7sk0xcpv12rv965a1qk9pbnd2gqlqgnjkyr"; - name = "kwin-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kwin-5.27.10.tar.xz"; + sha256 = "1inswsd078lbbr7pwc84a3smhnn4i089c2f6lfsjrdh0b492anmq"; + name = "kwin-5.27.10.tar.xz"; }; }; kwrited = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/kwrited-5.27.9.tar.xz"; - sha256 = "1x2mci8bnwpfcccc9ps7aaqpmg7yzc37hdr13vaqy71i8qkf7a76"; - name = "kwrited-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/kwrited-5.27.10.tar.xz"; + sha256 = "0haddznfis4fhz7nkjpqakxwk4zh50q7g578ksng17gbd2x9x8as"; + name = "kwrited-5.27.10.tar.xz"; }; }; layer-shell-qt = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/layer-shell-qt-5.27.9.tar.xz"; - sha256 = "0vw8cvp27is951dlzfzwkrx7l6480wdxsdfp16ihsa34yzcpw837"; - name = "layer-shell-qt-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/layer-shell-qt-5.27.10.tar.xz"; + sha256 = "1hn3sjimplsbl5afid0rwj08qqydb8hl6lyzhv0k6c0l5b7q1v8a"; + name = "layer-shell-qt-5.27.10.tar.xz"; }; }; libkscreen = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/libkscreen-5.27.9.tar.xz"; - sha256 = "0awvqchf48027f1zfl4n0llavl6nfnp30jvg7sx9anvzx6jb4ggs"; - name = "libkscreen-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/libkscreen-5.27.10.tar.xz"; + sha256 = "167z7bgqzjclqvcqiplgnpjxscl8m6fznly3c2spzg19i449zx97"; + name = "libkscreen-5.27.10.tar.xz"; }; }; libksysguard = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/libksysguard-5.27.9.tar.xz"; - sha256 = "0xi1fb1irp9nxnnqgqwhdza5rf6bw2hpqlz5l0mwipd0xdgarx3h"; - name = "libksysguard-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/libksysguard-5.27.10.tar.xz"; + sha256 = "1r9wzx0r1m3m2gb9k4xgwra84vc05lxyjilcns8j69yb52q37z0p"; + name = "libksysguard-5.27.10.tar.xz"; }; }; milou = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/milou-5.27.9.tar.xz"; - sha256 = "1y2si9gpmj363asvqd2iil14fwzmdd66f1fpsig05w1680dc35p8"; - name = "milou-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/milou-5.27.10.tar.xz"; + sha256 = "1hqa25grsdmwr1y3fra6k09czrd6iagf9fqq85cxz6yc2s5xs6bw"; + name = "milou-5.27.10.tar.xz"; }; }; oxygen = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/oxygen-5.27.9.tar.xz"; - sha256 = "0wx96v6v65yjal1x2c25adp3hnfrmsd2r1m5fzicfcbdk33yn834"; - name = "oxygen-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/oxygen-5.27.10.tar.xz"; + sha256 = "02q95nx0706p9zhzbvx89ssk20mv7cizvqf0kyavn4gfwpizc5jv"; + name = "oxygen-5.27.10.tar.xz"; }; }; oxygen-sounds = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/oxygen-sounds-5.27.9.tar.xz"; - sha256 = "0n9plr4xs6wl4v4qm71mxbvgl22cz5c5523bjv5mv5jgvp5wpzg1"; - name = "oxygen-sounds-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/oxygen-sounds-5.27.10.tar.xz"; + sha256 = "0py37frx59f3c4dxv3llsxky1cb03ynyqfphdx3ndsgfma8g1893"; + name = "oxygen-sounds-5.27.10.tar.xz"; }; }; plank-player = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plank-player-5.27.9.tar.xz"; - sha256 = "0vfmab3fab7izz43j6hssly001sp773swc53xf6z4dx0j210zb3d"; - name = "plank-player-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plank-player-5.27.10.tar.xz"; + sha256 = "04idirgwrgys6p4b6l86z46lxjw9m1chi3fhp9yk4s52grdwx3ib"; + name = "plank-player-5.27.10.tar.xz"; }; }; plasma-bigscreen = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-bigscreen-5.27.9.tar.xz"; - sha256 = "14dq3smb8rnpazr8mjs034gg9fidzj08nyggkqqwjiq774khv4wb"; - name = "plasma-bigscreen-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-bigscreen-5.27.10.tar.xz"; + sha256 = "06420vpfjjg5zy21r6l6vdj2vs37aqy02hw351n5q3l2kc3snc9p"; + name = "plasma-bigscreen-5.27.10.tar.xz"; }; }; plasma-browser-integration = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-browser-integration-5.27.9.tar.xz"; - sha256 = "1d9f6fppaqxiwxixxngsvpawx2zbdnj9mwl47x107axnc7gn6355"; - name = "plasma-browser-integration-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-browser-integration-5.27.10.tar.xz"; + sha256 = "1kncrxz08w9fvvl2ag3gk3iw1gwbwm5kpc23iq6fypfjk6pbwzd1"; + name = "plasma-browser-integration-5.27.10.tar.xz"; }; }; plasma-desktop = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-desktop-5.27.9.tar.xz"; - sha256 = "1rgjq7sla2x0icphaph2682k67n89znlyhp9nw95p8czpyqgbmkd"; - name = "plasma-desktop-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-desktop-5.27.10.tar.xz"; + sha256 = "17yhrz4i7d52ywgjcmcwbmgr67f8lyph72lrhlys4kfk474my0fy"; + name = "plasma-desktop-5.27.10.tar.xz"; }; }; plasma-disks = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-disks-5.27.9.tar.xz"; - sha256 = "0ikz5wv5429bc5i1ms8bdgmkm6x0f3jhs79ry8x2xq9q8f9cdraw"; - name = "plasma-disks-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-disks-5.27.10.tar.xz"; + sha256 = "0ysqaky2bv7yk76swkrvyqcv2y41xr4m9b61bn5cj5lzb8a4v3qy"; + name = "plasma-disks-5.27.10.tar.xz"; }; }; plasma-firewall = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-firewall-5.27.9.tar.xz"; - sha256 = "0mkkz6n7yi382lm5hsgn5pwi8dxz4csmry5jvrscmhg9azcwghpr"; - name = "plasma-firewall-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-firewall-5.27.10.tar.xz"; + sha256 = "1k443ikbnny7xpi52xmbfnl5iy8alx7jnrx9grb6wlwghh06lnkm"; + name = "plasma-firewall-5.27.10.tar.xz"; }; }; plasma-integration = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-integration-5.27.9.tar.xz"; - sha256 = "1csx7sr9ilr2q5mm6qar945srqm6qak95g9x02g70pyl6d58fajq"; - name = "plasma-integration-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-integration-5.27.10.tar.xz"; + sha256 = "1fzz581pfdzli62riw7mnfhqdp5pp929rkdw9g6il1c6hlgciwim"; + name = "plasma-integration-5.27.10.tar.xz"; }; }; plasma-mobile = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-mobile-5.27.9.tar.xz"; - sha256 = "095fjn91zcipkh2blwjs70ff39yfrmh73ny2h6f2djkhgnr1xng0"; - name = "plasma-mobile-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-mobile-5.27.10.tar.xz"; + sha256 = "0bjv890m9pf5f8zynhjnhhc3dbd5iz5fvhrsa7jjgds8v26gza1c"; + name = "plasma-mobile-5.27.10.tar.xz"; }; }; plasma-nano = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-nano-5.27.9.tar.xz"; - sha256 = "1g3dyqwx05506mgq3v7n9n1j5dlnhf7lbb8kbk7whk8lfjc468n6"; - name = "plasma-nano-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-nano-5.27.10.tar.xz"; + sha256 = "170w5vf91dr8l3m6jljwrm1xlzha8nxixwnh9ic0j4kyy8dirxjb"; + name = "plasma-nano-5.27.10.tar.xz"; }; }; plasma-nm = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-nm-5.27.9.tar.xz"; - sha256 = "0k2qxyf09k3nk2n2dyg7a1xwx45r7m72nz0azvidlpy0v1j64g1a"; - name = "plasma-nm-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-nm-5.27.10.tar.xz"; + sha256 = "1c6wngqmvdqkypifi5p0s0ax092wagiw6f7la3ipq4sfcakx6pdp"; + name = "plasma-nm-5.27.10.tar.xz"; }; }; plasma-pa = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-pa-5.27.9.tar.xz"; - sha256 = "07am1kk6sj9kr5vl2333lnlh3xjd8f7wkww7ra6vjif21wy7gm94"; - name = "plasma-pa-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-pa-5.27.10.tar.xz"; + sha256 = "021zdcqrhwmdkklzlv8hlnykycv2zfcwxn3qwviqf9a7y513fw8d"; + name = "plasma-pa-5.27.10.tar.xz"; }; }; plasma-remotecontrollers = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-remotecontrollers-5.27.9.tar.xz"; - sha256 = "10zk35yrzpzkjw6a1g7mlr6w0nsi33h1hzrwqsvsqyac5j0yi25y"; - name = "plasma-remotecontrollers-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-remotecontrollers-5.27.10.tar.xz"; + sha256 = "0wzly5r4bhl1m661hww98008fpbgmz9ymsndj426xf3wnkgjc12i"; + name = "plasma-remotecontrollers-5.27.10.tar.xz"; }; }; plasma-sdk = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-sdk-5.27.9.tar.xz"; - sha256 = "10rshr3d618gis6spi93zj5q012jhi9mm3ixgbvbxvhlzp8k0b3x"; - name = "plasma-sdk-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-sdk-5.27.10.tar.xz"; + sha256 = "08q1d74iqkg7aa1pvvk7p0gl4a8y6c0hf15kxlk032na1qfymagf"; + name = "plasma-sdk-5.27.10.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-systemmonitor-5.27.9.tar.xz"; - sha256 = "1c9lyzfx21033335160j3cndkv19icm1lf9nnn88f7gz0zhkz73c"; - name = "plasma-systemmonitor-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-systemmonitor-5.27.10.tar.xz"; + sha256 = "03laxgby4ms7rzxv96z0anqzh44vh88qn9g81gny2axljxbp18b4"; + name = "plasma-systemmonitor-5.27.10.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-thunderbolt-5.27.9.tar.xz"; - sha256 = "0rbmj0b0ckyaz5sqrrzxp4n049asb5hxyap0lslhg9js2vjdk239"; - name = "plasma-thunderbolt-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-thunderbolt-5.27.10.tar.xz"; + sha256 = "15k161q4qvx7zg9303074grc10z95q0137lk76mqqg9prgjmw92d"; + name = "plasma-thunderbolt-5.27.10.tar.xz"; }; }; plasma-vault = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-vault-5.27.9.tar.xz"; - sha256 = "1p6wdvqprr3bfia0lchvmk8c5ii3c629c9c8qy2r4c0xy3l0f42i"; - name = "plasma-vault-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-vault-5.27.10.tar.xz"; + sha256 = "0nqss7ijlamjzxycs5m8vsq61fxzhfk4wky1zv43ymdcc5bd1wbm"; + name = "plasma-vault-5.27.10.tar.xz"; }; }; plasma-welcome = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-welcome-5.27.9.tar.xz"; - sha256 = "1la7sb1ar06x79p80fh1qa09r3qd1gk53f3acr5az5k7gmjhpi1n"; - name = "plasma-welcome-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-welcome-5.27.10.tar.xz"; + sha256 = "008wga32j5f7cmwabxvlc3dzfj17fa0wkfj8dbvfd2gv34sf08w4"; + name = "plasma-welcome-5.27.10.tar.xz"; }; }; plasma-workspace = { - version = "5.27.9.1"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-workspace-5.27.9.1.tar.xz"; - sha256 = "8d00b691cfbb4d7218f97d0c68a677f41cba6eaf18e8fe29976c92d3718201b8"; - name = "plasma-workspace-5.27.9.1.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-workspace-5.27.10.tar.xz"; + sha256 = "0y4p6lk481byracfhvvqf7bbk13isl9m1zsl7prk0rqsqrjc2paj"; + name = "plasma-workspace-5.27.10.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-workspace-wallpapers-5.27.9.tar.xz"; - sha256 = "1gkk4ihpqbyfq394n1dhfkwrdfhnrvkgqbfp7xba82iygcx3zcwf"; - name = "plasma-workspace-wallpapers-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plasma-workspace-wallpapers-5.27.10.tar.xz"; + sha256 = "1l345rzg626krmriz54j480lh9zza7liq6bfz7vmifck558jv1l2"; + name = "plasma-workspace-wallpapers-5.27.10.tar.xz"; }; }; plymouth-kcm = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plymouth-kcm-5.27.9.tar.xz"; - sha256 = "15cximix1cajylbb0c14q2rz1573kiby7c4h9iysap3ask7g633b"; - name = "plymouth-kcm-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/plymouth-kcm-5.27.10.tar.xz"; + sha256 = "10p6ikppr1vzafx2qvb4pmzkgpja2bnqp60np46q1nnajgng4w3z"; + name = "plymouth-kcm-5.27.10.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.27.9"; + version = "1-5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/polkit-kde-agent-1-5.27.9.tar.xz"; - sha256 = "14h883ghn22xpjwbdld168m59zdmd6i5a7p6gszv2c6y3lpw3f03"; - name = "polkit-kde-agent-1-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/polkit-kde-agent-1-5.27.10.tar.xz"; + sha256 = "1nwbiwwz5x1h4xhx021izrm685pq5bh9mi5v85x32s74hlkjm5d3"; + name = "polkit-kde-agent-1-5.27.10.tar.xz"; }; }; powerdevil = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/powerdevil-5.27.9.tar.xz"; - sha256 = "1x78cjlkiz6jl79jhcd3l04glpxzsqbb6rhw1f5az7i3ywc2qh7f"; - name = "powerdevil-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/powerdevil-5.27.10.tar.xz"; + sha256 = "1wf89sh8b7v6hhjkr8vf2q7qm3anv24n20n8wdh21pc0k30a7h86"; + name = "powerdevil-5.27.10.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/qqc2-breeze-style-5.27.9.tar.xz"; - sha256 = "1allsvr51si8v5b4xvzhpms3i4446vr9a9cfwhg72ll8ssfa46ld"; - name = "qqc2-breeze-style-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/qqc2-breeze-style-5.27.10.tar.xz"; + sha256 = "0fwbgfm8n79zslmm4ww177zlk7gjklhyj1h71kzmdb7p32z6z2ix"; + name = "qqc2-breeze-style-5.27.10.tar.xz"; }; }; sddm-kcm = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/sddm-kcm-5.27.9.tar.xz"; - sha256 = "0s5swqzmvb3hxsn66r99r70ha2gx9913c5vlffv1mawf5p2pzvk1"; - name = "sddm-kcm-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/sddm-kcm-5.27.10.tar.xz"; + sha256 = "1bgljl6ybm7bgz2brv2a6nq81nyv2fwrnd0psv2v5mw3pxvk3r43"; + name = "sddm-kcm-5.27.10.tar.xz"; }; }; systemsettings = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/systemsettings-5.27.9.tar.xz"; - sha256 = "0q9qy7i1ndf0pw2irf15l9mvc451s0gwz7hx0wjf5kjppwx2z9ab"; - name = "systemsettings-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/systemsettings-5.27.10.tar.xz"; + sha256 = "0f8dhqnbix813fkwa03mzsfr0wsfmgb6kbgai63wv9g3rgr4fk5g"; + name = "systemsettings-5.27.10.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.27.9"; + version = "5.27.10"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/xdg-desktop-portal-kde-5.27.9.tar.xz"; - sha256 = "1i2xqks1lx68rf79j67mzibsya43288sf0sl6azhwc14cw15xcdb"; - name = "xdg-desktop-portal-kde-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.10/xdg-desktop-portal-kde-5.27.10.tar.xz"; + sha256 = "0azggffvjxzxs3qibfdv9y5aslxgfrrb1qcjh9r96wp2qgq1ywxx"; + name = "xdg-desktop-portal-kde-5.27.10.tar.xz"; }; }; } diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index b08a59a5aae2d..7e7f19c566671 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.18.8"; + version = "4.18.9"; - sha256 = "sha256-+VS8Mn9J8VySNEKUMq4xUXXvVgMpWkNVdpv5dzxhZ/M="; + sha256 = "sha256-FiJAxELdt/1g5ThTBshTSFK54f9Ncqhn/C+rWQ+zrig="; nativeBuildInputs = [ docbook_xsl diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 4aec72ea334b2..94ca82b4388bb 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -122,6 +122,8 @@ makeScopeWithSplicing' { xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { }; + xfce4-docklike-plugin = callPackage ./panel-plugins/xfce4-docklike-plugin { }; + xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { }; xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { }; diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix index 608053fcbf550..17939e5e2058c 100644 --- a/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -9,6 +9,8 @@ , sha256 , odd-unstable ? true , patchlevel-unstable ? true +, passthru ? { } +, meta ? { } , ... } @ args: @@ -22,9 +24,7 @@ let concatAttrLists = attrsets: zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets; - template = rec { - inherit pname version; - + template = { nativeBuildInputs = [ pkg-config xfce4-dev-tools wrapGAppsHook ]; buildInputs = [ hicolor-icon-theme ]; configureFlags = [ "--enable-maintainer-mode" ]; @@ -41,19 +41,21 @@ let pos = builtins.unsafeGetAttrPos "pname" args; - passthru.updateScript = gitUpdater { - inherit rev-prefix odd-unstable patchlevel-unstable; - }; + passthru = { + updateScript = gitUpdater { + inherit rev-prefix odd-unstable patchlevel-unstable; + }; + } // passthru; meta = with lib; { homepage = "https://gitlab.xfce.org/${category}/${pname}"; license = licenses.gpl2Plus; # some libraries are under LGPLv2+ platforms = platforms.linux; - }; + } // meta; }; - publicArgs = removeAttrs args [ "category" "pname" "sha256" ]; + publicArgs = removeAttrs args [ "category" "sha256" ]; in -stdenv.mkDerivation (recursiveUpdate template publicArgs // concatAttrLists [ template args ]) +stdenv.mkDerivation (publicArgs // template // concatAttrLists [ template args ]) # TODO [ AndersonTorres ]: verify if it allows using hash attribute as an option to sha256 diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index 113d8b18f26a9..f138d84189666 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -14,10 +14,10 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-cpugraph-plugin"; - version = "1.2.8"; + version = "1.2.10"; rev-prefix = "xfce4-cpugraph-plugin-"; odd-unstable = false; - sha256 = "sha256-GNoODnw9Z9MTlvxCOTeZt61A/0AGhMwjrRGdM35XU+M="; + sha256 = "sha256-VPelWTtFHmU4ZgWLTzZKbtmQ4LOtVwJvpLG9rHtGoNs="; buildInputs = [ exo diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix new file mode 100644 index 0000000000000..0451afc54b22f --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix @@ -0,0 +1,39 @@ +{ lib +, mkXfceDerivation +, cairo +, glib +, gtk3 +, libX11 +, libxfce4ui +, libxfce4util +, xfce4-panel +, libwnck +}: + +mkXfceDerivation { + category = "panel-plugins"; + pname = "xfce4-docklike-plugin"; + version = "0.4.2"; + sha256 = "sha256-M/V8cnEU/nSEDjQ3k8fWiklF5OuNg3uzzJMHBSZBiLU="; + + buildInputs = [ + cairo + glib + gtk3 + libX11 + libxfce4ui + libxfce4util + xfce4-panel + libwnck + ]; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + meta = with lib; { + homepage = "https://docs.xfce.org/panel-plugins/xfce4-docklike-plugin/start"; + description = "A modern, minimalist taskbar for Xfce"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ ] ++ teams.xfce.members; + }; +} diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 4c5ad3f6fa246..d61b5e91556bd 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -5,6 +5,11 @@ , src , buildInputs ? [ ] , nativeBuildInputs ? [ ] +, erlangCompilerOptions ? [ ] + # Deterministic Erlang builds remove full system paths from debug information + # among other things to keep builds more reproducible. See their docs for more: + # https://www.erlang.org/doc/man/compile +, erlangDeterministicBuilds ? true , beamDeps ? [ ] , propagatedBuildInputs ? [ ] , postPatch ? "" @@ -31,6 +36,13 @@ let MIX_ENV = mixEnv; MIX_DEBUG = if enableDebugInfo then 1 else 0; HEX_OFFLINE = 1; + + ERL_COMPILER_OPTIONS = + let + options = erlangCompilerOptions ++ lib.optionals erlangDeterministicBuilds [ "deterministic" ]; + in + "[${lib.concatStringsSep "," options}]"; + LC_ALL = "C.UTF-8"; # add to ERL_LIBS so other modules can find at runtime. @@ -108,4 +120,3 @@ let }); in lib.fix pkg - diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index b7b2cc9c7dcfe..791f596be4160 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -45,6 +45,11 @@ let # BEAM-based languages. elixir = elixir_1_15; + elixir_1_16 = lib'.callElixir ../interpreters/elixir/1.16.nix { + inherit erlang; + debugInfo = true; + }; + elixir_1_15 = lib'.callElixir ../interpreters/elixir/1.15.nix { inherit erlang; debugInfo = true; diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 167ffa0b5cc87..c2f688efce4d8 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,12 +4,12 @@ let pname = "elixir-ls"; - version = "0.17.10"; + version = "0.18.1"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-LUAYfR6MNNGLaqv8EBx0JQ8KYYD7jRvez3HJFnczV+Y="; + hash = "sha256-o5/H2FeDXzT/ZyWtLmRs+TWJQfmuDUnnR5Brvkifn6E="; fetchSubmodules = true; }; in @@ -21,7 +21,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-MVGYENy6/xI/ph/X0DxquigCuLK1FAEIONzoQU7TXoM="; + hash = "sha256-q4VKtGxrRaAhtNIJFjNN7tF+HFgU/UX9sKq0BkOIiQI="; }; # elixir-ls is an umbrella app @@ -50,9 +50,9 @@ mixRelease { --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" chmod +x $out/bin/elixir-ls - substitute release/debugger.sh $out/bin/elixir-debugger \ + substitute release/debug_adapter.sh $out/bin/elixir-debug-adapter \ --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" - chmod +x $out/bin/elixir-debugger + chmod +x $out/bin/elixir-debug-adapter # prepare the launcher substituteInPlace $out/lib/launch.sh \ --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index e5b44bc5dcdb0..a762b8e0bc2e8 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -8,6 +8,8 @@ , rebar3 , fetchMixDeps , findutils +, ripgrep +, bbe , makeWrapper , coreutils , gnused @@ -25,6 +27,17 @@ , mixEnv ? "prod" , compileFlags ? [ ] + # Options to be passed to the Erlang compiler. As documented in the reference + # manual, these must be valid Erlang terms. They will be turned into an + # erlang list and set as the ERL_COMPILER_OPTIONS environment variable. + # See https://www.erlang.org/doc/man/compile +, erlangCompilerOptions ? [ ] + + # Deterministic Erlang builds remove full system paths from debug information + # among other things to keep builds more reproducible. See their docs for more: + # https://www.erlang.org/doc/man/compile +, erlangDeterministicBuilds ? true + # Mix dependencies provided as a fixed output derivation , mixFodDeps ? null @@ -36,6 +49,7 @@ , mixNixDeps ? { } , elixir ? inputs.elixir +, erlang ? inputs.erlang , hex ? inputs.hex.override { inherit elixir; } # Remove releases/COOKIE @@ -63,7 +77,7 @@ }@attrs: let # Remove non standard attributes that cannot be coerced to strings - overridable = builtins.removeAttrs attrs [ "compileFlags" "mixNixDeps" ]; + overridable = builtins.removeAttrs attrs [ "compileFlags" "erlangCompilerOptions" "mixNixDeps" ]; in assert mixNixDeps != { } -> mixFodDeps == null; assert stripDebug -> !enableDebugInfo; @@ -75,7 +89,7 @@ stdenv.mkDerivation (overridable // { # Mix deps (builtins.attrValues mixNixDeps) ++ # other compile-time deps - [ findutils makeWrapper ]; + [ findutils ripgrep bbe makeWrapper ]; buildInputs = buildInputs; @@ -89,6 +103,12 @@ stdenv.mkDerivation (overridable // { MIX_REBAR = "${rebar}/bin/rebar"; MIX_REBAR3 = "${rebar3}/bin/rebar3"; + ERL_COMPILER_OPTIONS = + let + options = erlangCompilerOptions ++ lib.optionals erlangDeterministicBuilds [ "deterministic" ]; + in + "[${lib.concatStringsSep "," options}]"; + LC_ALL = "C.UTF-8"; postUnpack = '' @@ -161,10 +181,10 @@ stdenv.mkDerivation (overridable // { ''; postFixup = '' - # Remove files for Microsoft Windows + echo "removing files for Microsoft Windows" rm -f "$out"/bin/*.bat - # Wrap programs in $out/bin with their runtime deps + echo "wrapping programs in $out/bin with their runtime deps" for f in $(find $out/bin/ -type f -executable); do wrapProgram "$f" \ --prefix PATH : ${lib.makeBinPath [ @@ -176,34 +196,41 @@ stdenv.mkDerivation (overridable // { done '' + lib.optionalString removeCookie '' if [ -e $out/releases/COOKIE ]; then + echo "removing $out/releases/COOKIE" rm $out/releases/COOKIE fi + '' + '' + if [ -e $out/erts-* ]; then + # ERTS is included in the release, then erlang is not required as a runtime dependency. + # But, erlang is still referenced in some places. To removed references to erlang, + # following steps are required. + + # 1. remove references to erlang from plain text files + for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches); do + echo "removing references to erlang in $file" + substituteInPlace "$file" --replace "${erlang}/lib/erlang" "$out" + done + + # 2. remove references to erlang from .beam files + # + # No need to do anything, because it has been handled by "deterministic" option specified + # by ERL_COMPILER_OPTIONS. + + # 3. remove references to erlang from normal binary files + for file in $(rg "${erlang}/lib/erlang" "$out" --files-with-matches --binary --iglob '!*.beam'); do + echo "removing references to erlang in $file" + # use bbe to substitute strings in binary files, because using substituteInPlace + # on binaries will raise errors + bbe -e "s|${erlang}/lib/erlang|$out|" -o "$file".tmp "$file" + rm -f "$file" + mv "$file".tmp "$file" + done + + # References to erlang should be removed from output after above processing. + fi '' + lib.optionalString stripDebug '' # Strip debug symbols to avoid hardreferences to "foreign" closures actually # not needed at runtime, while at the same time reduce size of BEAM files. erl -noinput -eval 'lists:foreach(fun(F) -> io:format("Stripping ~p.~n", [F]), beam_lib:strip(F) end, filelib:wildcard("'"$out"'/**/*.beam"))' -s init stop ''; - - # TODO: remove erlang references in resulting derivation - # - # # Step 1 - investigate why the resulting derivation still has references to erlang. - # - # The reason is that the generated binaries contains erlang reference. Here's a repo to - # demonstrate the problem - <https://github.com/plastic-gun/nix-mix-release-unwanted-references>. - # - # - # # Step 2 - remove erlang references from the binaries - # - # As said in above repo, it's hard to remove erlang references from `.beam` binaries. - # - # We need more experienced developers to resolve this issue. - # - # - # # Tips - # - # When resolving this issue, it is convenient to fail the build when erlang is referenced, - # which can be achieved by using: - # - # disallowedReferences = [ erlang ]; - # }) diff --git a/pkgs/development/compilers/assemblyscript/default.nix b/pkgs/development/compilers/assemblyscript/default.nix index a47d1f6bb74fc..c297ad56c557d 100644 --- a/pkgs/development/compilers/assemblyscript/default.nix +++ b/pkgs/development/compilers/assemblyscript/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "assemblyscript"; - version = "0.27.9"; + version = "0.27.22"; src = fetchFromGitHub { owner = "AssemblyScript"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UOMWUM1wOhX2pR29DSYpPKLnjb1CWrKk6BtyXK7kqDk="; + sha256 = "sha256-8j012eAM+tl8AH5vNhg9xKDRJt5pZKV9KNwJFmUgXMY="; }; - npmDepsHash = "sha256-9ILa1qY2GpP2RckcZYcCMmgCwdXIImOm+D8nldeoQL8="; + npmDepsHash = "sha256-y7gY9VhbR+xfXf3OvKvpcohk2mwfa0uOQO7Nmg+L6ug="; meta = with lib; { homepage = "https://github.com/AssemblyScript/${pname}"; diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index 29ca54632478b..8b528aa77a952 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.8.2"; + version = "2201.8.3"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - hash = "sha256-vTrVcWo7fjcj9oZqIzvVTTynf4dSh5D7PAUYj3Vs8Gg="; + hash = "sha256-Vj+q0pm8uwsNt6n0o6Y/XpoWnb4HksJBgCujDFubS3w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index dcadf054bc30f..bb933eac9af00 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, python3, fetchFromGitHub, emscripten, +{ lib, stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten, gtest, lit, nodejs, filecheck }: @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { hash = "sha256-gMwbWiP+YDCVafQMBWhTuJGWmkYtnhEdn/oofKaUT08="; }; + # Fix build with Node 20 + # FIXME: remove for next release + patches = [ + (fetchpatch { + url = "https://github.com/WebAssembly/binaryen/commit/889422e0c92552ff484659f9b41e777ba7ab35c1.patch"; + hash = "sha256-acM8mytL9nhm4np9tpUbd1X0wJ7y308HV2fvgcAW1lY="; + }) + ]; + nativeBuildInputs = [ cmake python3 ]; preConfigure = '' diff --git a/pkgs/development/compilers/cairo/default.nix b/pkgs/development/compilers/cairo/default.nix index daf086e587b8f..0e7283e52caa8 100644 --- a/pkgs/development/compilers/cairo/default.nix +++ b/pkgs/development/compilers/cairo/default.nix @@ -6,16 +6,21 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-5UOLfsNgtg5EDDId23ysmWfeqMeh8R2UfMeBAtFCx6s="; + hash = "sha256-5bCPklk9u21/9cZYisszK0Lo7is9+iFrQxve41Fy5hg="; }; - cargoHash = "sha256-YoPStyPeEqLoUvGLEPwXR8XVhXtb6XwFuPNoDCiT7OA="; + cargoPatches = [ + # Upstream Cargo.lock is not up-to-date. + # https://github.com/starkware-libs/cairo/issues/4530 + ./ensure-consistency-of-cargo-lock.patch + ]; + cargoHash = "sha256-YCW6nwmUXMiP65QHCH6k29672gIkuz+MCmTqI+qaOyA="; nativeCheckInputs = [ rustfmt diff --git a/pkgs/development/compilers/cairo/ensure-consistency-of-cargo-lock.patch b/pkgs/development/compilers/cairo/ensure-consistency-of-cargo-lock.patch new file mode 100644 index 0000000000000..c2c9a7ed7be31 --- /dev/null +++ b/pkgs/development/compilers/cairo/ensure-consistency-of-cargo-lock.patch @@ -0,0 +1,1165 @@ +From c99824dd005062d1df8c6df79a36dc4e368159f3 Mon Sep 17 00:00:00 2001 +From: Raito Bezarius <masterancpp@gmail.com> +Date: Fri, 8 Dec 2023 23:32:20 +0100 +Subject: [PATCH] packaging: ensure consistency of Cargo.lock with Cargo.toml + +2.4.0 failed to generate a consistent Cargo.lock, which made impossible +offline installs of Cairo 2.4.0. +--- + Cargo.lock | 384 +++++++++++++++++++++++++++++++---------------------- + 1 file changed, 223 insertions(+), 161 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 17d139184..67c438c18 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -57,9 +57,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + + [[package]] + name = "anstream" +-version = "0.6.4" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" ++checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" + dependencies = [ + "anstyle", + "anstyle-parse", +@@ -77,30 +77,30 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + + [[package]] + name = "anstyle-parse" +-version = "0.2.2" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" ++checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" + dependencies = [ + "utf8parse", + ] + + [[package]] + name = "anstyle-query" +-version = "1.0.0" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" ++checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" + dependencies = [ +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "anstyle-wincon" +-version = "3.0.1" ++version = "3.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" ++checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" + dependencies = [ + "anstyle", +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -395,7 +395,7 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + + [[package]] + name = "cairo-compile" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-lang-compiler", +@@ -419,7 +419,7 @@ dependencies = [ + + [[package]] + name = "cairo-format" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-lang-formatter", +@@ -432,7 +432,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-casm" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-utils", + "env_logger", +@@ -452,7 +452,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-compiler" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-lang-defs", +@@ -473,7 +473,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-debug" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-proc-macros", + "cairo-lang-utils", +@@ -484,7 +484,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-defs" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-debug", + "cairo-lang-diagnostics", +@@ -504,7 +504,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-diagnostics" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-debug", + "cairo-lang-filesystem", +@@ -518,7 +518,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-eq-solver" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-utils", + "env_logger", +@@ -528,7 +528,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-filesystem" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-debug", + "cairo-lang-utils", +@@ -543,7 +543,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-formatter" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-lang-diagnostics", +@@ -563,7 +563,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-language-server" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-lang-compiler", +@@ -591,7 +591,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-lowering" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-debug", + "cairo-lang-defs", +@@ -621,7 +621,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-parser" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-diagnostics", + "cairo-lang-filesystem", +@@ -643,7 +643,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-plugins" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-debug", + "cairo-lang-defs", +@@ -665,7 +665,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-proc-macros" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-debug", + "quote", +@@ -674,7 +674,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-project" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-filesystem", + "cairo-lang-utils", +@@ -687,7 +687,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-runner" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "ark-ff", + "ark-secp256k1", +@@ -714,7 +714,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-semantic" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-debug", + "cairo-lang-defs", +@@ -742,7 +742,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-sierra" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "bimap", +@@ -772,7 +772,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-sierra-ap-change" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-eq-solver", + "cairo-lang-sierra", +@@ -785,7 +785,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-sierra-gas" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-eq-solver", + "cairo-lang-sierra", +@@ -803,7 +803,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-sierra-generator" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-debug", + "cairo-lang-defs", +@@ -833,7 +833,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-sierra-to-casm" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "assert_matches", + "cairo-felt", +@@ -856,7 +856,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-sierra-type-size" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-sierra", + "cairo-lang-utils", +@@ -864,7 +864,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-starknet" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-felt", +@@ -905,7 +905,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-syntax" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-debug", + "cairo-lang-filesystem", +@@ -922,7 +922,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-syntax-codegen" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "env_logger", + "genco", +@@ -932,7 +932,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-test-plugin" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-felt", +@@ -957,7 +957,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-test-runner" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-felt", +@@ -978,7 +978,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-test-utils" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-utils", + "colored", +@@ -990,7 +990,7 @@ dependencies = [ + + [[package]] + name = "cairo-lang-utils" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "env_logger", + "indexmap 2.1.0", +@@ -1009,7 +1009,7 @@ dependencies = [ + + [[package]] + name = "cairo-language-server" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-language-server", + "cairo-lang-utils", +@@ -1019,7 +1019,7 @@ dependencies = [ + + [[package]] + name = "cairo-run" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-lang-compiler", +@@ -1032,7 +1032,7 @@ dependencies = [ + + [[package]] + name = "cairo-test" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-lang-compiler", +@@ -1051,7 +1051,7 @@ dependencies = [ + "bitvec", + "cairo-felt", + "generic-array", +- "hashbrown 0.14.2", ++ "hashbrown 0.14.3", + "hex", + "keccak", + "lazy_static", +@@ -1081,9 +1081,9 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.0.84" ++version = "1.0.83" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856" ++checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" + dependencies = [ + "libc", + ] +@@ -1096,9 +1096,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "clap" +-version = "4.4.8" ++version = "4.4.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" ++checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" + dependencies = [ + "clap_builder", + "clap_derive", +@@ -1106,9 +1106,9 @@ dependencies = [ + + [[package]] + name = "clap_builder" +-version = "4.4.8" ++version = "4.4.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" ++checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" + dependencies = [ + "anstream", + "anstyle", +@@ -1249,9 +1249,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + + [[package]] + name = "crypto-bigint" +-version = "0.5.3" ++version = "0.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" ++checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" + dependencies = [ + "generic-array", + "subtle", +@@ -1275,7 +1275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" + dependencies = [ + "cfg-if", +- "hashbrown 0.14.2", ++ "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", +@@ -1283,9 +1283,9 @@ dependencies = [ + + [[package]] + name = "deranged" +-version = "0.3.9" ++version = "0.3.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" ++checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" + dependencies = [ + "powerfmt", + ] +@@ -1396,12 +1396,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + + [[package]] + name = "errno" +-version = "0.3.6" ++version = "0.3.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" ++checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" + dependencies = [ + "libc", +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -1418,9 +1418,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + + [[package]] + name = "form_urlencoded" +-version = "1.2.0" ++version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" ++checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" + dependencies = [ + "percent-encoding", + ] +@@ -1550,7 +1550,7 @@ dependencies = [ + + [[package]] + name = "generate-syntax" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "cairo-lang-syntax-codegen", + "cairo-lang-utils", +@@ -1582,9 +1582,9 @@ dependencies = [ + + [[package]] + name = "gimli" +-version = "0.28.0" ++version = "0.28.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" ++checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + + [[package]] + name = "glob" +@@ -1594,15 +1594,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + + [[package]] + name = "globset" +-version = "0.4.13" ++version = "0.4.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" ++checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" + dependencies = [ + "aho-corasick", + "bstr", +- "fnv", + "log", +- "regex", ++ "regex-automata", ++ "regex-syntax 0.8.2", + ] + + [[package]] +@@ -1635,9 +1635,9 @@ dependencies = [ + + [[package]] + name = "hashbrown" +-version = "0.14.2" ++version = "0.14.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" ++checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + dependencies = [ + "ahash 0.8.6", + "allocator-api2", +@@ -1700,9 +1700,9 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + + [[package]] + name = "idna" +-version = "0.4.0" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" ++checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" + dependencies = [ + "unicode-bidi", + "unicode-normalization", +@@ -1710,17 +1710,16 @@ dependencies = [ + + [[package]] + name = "ignore" +-version = "0.4.20" ++version = "0.4.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" ++checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" + dependencies = [ ++ "crossbeam-deque", + "globset", +- "lazy_static", + "log", + "memchr", +- "regex", ++ "regex-automata", + "same-file", +- "thread_local", + "walkdir", + "winapi-util", + ] +@@ -1760,7 +1759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" + dependencies = [ + "equivalent", +- "hashbrown 0.14.2", ++ "hashbrown 0.14.3", + "serde", + ] + +@@ -1829,9 +1828,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + + [[package]] + name = "js-sys" +-version = "0.3.65" ++version = "0.3.66" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" ++checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" + dependencies = [ + "wasm-bindgen", + ] +@@ -1915,9 +1914,9 @@ dependencies = [ + + [[package]] + name = "linux-raw-sys" +-version = "0.4.11" ++version = "0.4.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" ++checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + + [[package]] + name = "lock_api" +@@ -2017,9 +2016,9 @@ dependencies = [ + + [[package]] + name = "mio" +-version = "0.8.9" ++version = "0.8.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" ++checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" + dependencies = [ + "libc", + "wasi", +@@ -2179,9 +2178,9 @@ dependencies = [ + + [[package]] + name = "once_cell" +-version = "1.18.0" ++version = "1.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" ++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + + [[package]] + name = "oorandom" +@@ -2197,9 +2196,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + + [[package]] + name = "parity-scale-codec" +-version = "3.6.5" ++version = "3.6.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" ++checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" + dependencies = [ + "arrayvec", + "bitvec", +@@ -2210,9 +2209,9 @@ dependencies = [ + + [[package]] + name = "parity-scale-codec-derive" +-version = "3.6.5" ++version = "3.6.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" ++checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" + dependencies = [ + "proc-macro-crate", + "proc-macro2", +@@ -2282,9 +2281,9 @@ checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" + + [[package]] + name = "percent-encoding" +-version = "2.3.0" ++version = "2.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" ++checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + + [[package]] + name = "petgraph" +@@ -2345,9 +2344,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + + [[package]] + name = "portable-atomic" +-version = "1.5.1" ++version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" ++checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + + [[package]] + name = "powerfmt" +@@ -2379,12 +2378,11 @@ dependencies = [ + + [[package]] + name = "proc-macro-crate" +-version = "1.3.1" ++version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" ++checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" + dependencies = [ +- "once_cell", +- "toml_edit 0.19.15", ++ "toml_edit 0.20.7", + ] + + [[package]] +@@ -2413,9 +2411,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.69" ++version = "1.0.70" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" ++checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" + dependencies = [ + "unicode-ident", + ] +@@ -2623,15 +2621,15 @@ dependencies = [ + + [[package]] + name = "rustix" +-version = "0.38.21" ++version = "0.38.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" ++checksum = "bfeae074e687625746172d639330f1de242a178bf3189b51e35a7a21573513ac" + dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", +- "windows-sys 0.48.0", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -2739,18 +2737,18 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.192" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" ++checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.192" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" ++checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" + dependencies = [ + "proc-macro2", + "quote", +@@ -2822,7 +2820,7 @@ dependencies = [ + + [[package]] + name = "sierra-compile" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-lang-sierra", +@@ -2901,7 +2899,7 @@ dependencies = [ + + [[package]] + name = "starknet-compile" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-lang-compiler", +@@ -2992,7 +2990,7 @@ dependencies = [ + + [[package]] + name = "starknet-sierra-compile" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-lang-sierra", +@@ -3005,7 +3003,7 @@ dependencies = [ + + [[package]] + name = "starknet-sierra-extract-code" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-lang-starknet", +@@ -3015,7 +3013,7 @@ dependencies = [ + + [[package]] + name = "starknet-sierra-upgrade-validate" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "anyhow", + "cairo-lang-starknet", +@@ -3093,30 +3091,29 @@ dependencies = [ + + [[package]] + name = "termcolor" +-version = "1.3.0" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" ++checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" + dependencies = [ + "winapi-util", + ] + + [[package]] + name = "test-case" +-version = "3.2.1" ++version = "3.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" ++checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" + dependencies = [ + "test-case-macros", + ] + + [[package]] + name = "test-case-core" +-version = "3.2.1" ++version = "3.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" ++checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" + dependencies = [ + "cfg-if", +- "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", +@@ -3124,11 +3121,10 @@ dependencies = [ + + [[package]] + name = "test-case-macros" +-version = "3.2.1" ++version = "3.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" ++checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" + dependencies = [ +- "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", +@@ -3137,9 +3133,19 @@ dependencies = [ + + [[package]] + name = "test-log" +-version = "0.2.13" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f66edd6b6cd810743c0c71e1d085e92b01ce6a72782032e3f794c8284fe4bcdd" ++checksum = "6159ab4116165c99fc88cce31f99fa2c9dbe08d3691cb38da02fc3b45f357d2b" ++dependencies = [ ++ "env_logger", ++ "test-log-macros", ++] ++ ++[[package]] ++name = "test-log-macros" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ba277e77219e9eea169e8508942db1bf5d8a41ff2db9b20aab5a5aadc9fa25d" + dependencies = [ + "proc-macro2", + "quote", +@@ -3148,7 +3154,7 @@ dependencies = [ + + [[package]] + name = "tests" +-version = "2.4.0-rc5" ++version = "2.4.0" + dependencies = [ + "assert_matches", + "cairo-felt", +@@ -3220,16 +3226,6 @@ dependencies = [ + "thiserror-impl-no-std", + ] + +-[[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.30" +@@ -3352,9 +3348,9 @@ dependencies = [ + + [[package]] + name = "toml_edit" +-version = "0.19.15" ++version = "0.20.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" ++checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" + dependencies = [ + "indexmap 2.1.0", + "toml_datetime", +@@ -3473,18 +3469,18 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + + [[package]] + name = "unescaper" +-version = "0.1.2" ++version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a96a44ae11e25afb520af4534fd7b0bd8cd613e35a78def813b8cf41631fa3c8" ++checksum = "d8f0f68e58d297ba8b22b8b5a96a87b863ba6bb46aaf51e19a4b02c5a6dd5b7f" + dependencies = [ + "thiserror", + ] + + [[package]] + name = "unicode-bidi" +-version = "0.3.13" ++version = "0.3.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" ++checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + + [[package]] + name = "unicode-ident" +@@ -3521,9 +3517,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + + [[package]] + name = "url" +-version = "2.4.1" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" ++checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" + dependencies = [ + "form_urlencoded", + "idna", +@@ -3561,9 +3557,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.88" ++version = "0.2.89" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" ++checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" + dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +@@ -3571,9 +3567,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.88" ++version = "0.2.89" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" ++checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" + dependencies = [ + "bumpalo", + "log", +@@ -3586,9 +3582,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.88" ++version = "0.2.89" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" ++checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -3596,9 +3592,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.88" ++version = "0.2.89" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" ++checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" + dependencies = [ + "proc-macro2", + "quote", +@@ -3609,9 +3605,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.88" ++version = "0.2.89" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" ++checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" + + [[package]] + name = "winapi" +@@ -3662,6 +3658,15 @@ dependencies = [ + "windows-targets 0.48.5", + ] + ++[[package]] ++name = "windows-sys" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" ++dependencies = [ ++ "windows-targets 0.52.0", ++] ++ + [[package]] + name = "windows-targets" + version = "0.42.2" +@@ -3692,6 +3697,21 @@ dependencies = [ + "windows_x86_64_msvc 0.48.5", + ] + ++[[package]] ++name = "windows-targets" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.52.0", ++ "windows_aarch64_msvc 0.52.0", ++ "windows_i686_gnu 0.52.0", ++ "windows_i686_msvc 0.52.0", ++ "windows_x86_64_gnu 0.52.0", ++ "windows_x86_64_gnullvm 0.52.0", ++ "windows_x86_64_msvc 0.52.0", ++] ++ + [[package]] + name = "windows_aarch64_gnullvm" + version = "0.42.2" +@@ -3704,6 +3724,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" ++ + [[package]] + name = "windows_aarch64_msvc" + version = "0.42.2" +@@ -3716,6 +3742,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" ++ + [[package]] + name = "windows_i686_gnu" + version = "0.42.2" +@@ -3728,6 +3760,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + ++[[package]] ++name = "windows_i686_gnu" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" ++ + [[package]] + name = "windows_i686_msvc" + version = "0.42.2" +@@ -3740,6 +3778,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + ++[[package]] ++name = "windows_i686_msvc" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" ++ + [[package]] + name = "windows_x86_64_gnu" + version = "0.42.2" +@@ -3752,6 +3796,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" ++ + [[package]] + name = "windows_x86_64_gnullvm" + version = "0.42.2" +@@ -3764,6 +3814,12 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" ++ + [[package]] + name = "windows_x86_64_msvc" + version = "0.42.2" +@@ -3776,11 +3832,17 @@ version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" ++ + [[package]] + name = "winnow" +-version = "0.5.19" ++version = "0.5.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" ++checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" + dependencies = [ + "memchr", + ] +@@ -3817,18 +3879,18 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + + [[package]] + name = "zerocopy" +-version = "0.7.25" ++version = "0.7.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" ++checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7" + dependencies = [ + "zerocopy-derive", + ] + + [[package]] + name = "zerocopy-derive" +-version = "0.7.25" ++version = "0.7.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" ++checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" + dependencies = [ + "proc-macro2", + "quote", +@@ -3837,9 +3899,9 @@ dependencies = [ + + [[package]] + name = "zeroize" +-version = "1.6.0" ++version = "1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" ++checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + dependencies = [ + "zeroize_derive", + ] +-- +2.42.0 + diff --git a/pkgs/development/compilers/chicken/4/default.nix b/pkgs/development/compilers/chicken/4/default.nix index de64d20d3e059..7502a7a9f1e72 100644 --- a/pkgs/development/compilers/chicken/4/default.nix +++ b/pkgs/development/compilers/chicken/4/default.nix @@ -3,7 +3,7 @@ let callPackage = newScope self; self = { - pkgs = self; + pkgs = self // { recurseForDerivations = false; }; fetchegg = callPackage ./fetchegg { }; diff --git a/pkgs/development/compilers/chicken/5/default.nix b/pkgs/development/compilers/chicken/5/default.nix index e66b4940ff03f..61bf45dd54ac7 100644 --- a/pkgs/development/compilers/chicken/5/default.nix +++ b/pkgs/development/compilers/chicken/5/default.nix @@ -27,12 +27,29 @@ lib.makeScope newScope (self: { "https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${pname}/${version}"; meta.description = synopsis; meta.license = (lib.licenses // { + "agpl" = lib.licenses.agpl3Only; + "artistic" = lib.licenses.artistic2; + "bsd" = lib.licenses.bsd3; "bsd-1-clause" = lib.licenses.bsd1; "bsd-2-clause" = lib.licenses.bsd2; "bsd-3-clause" = lib.licenses.bsd3; + "gpl" = lib.licenses.gpl3Only; + "gpl-2" = lib.licenses.gpl2Only; + "gplv2" = lib.licenses.gpl2Only; + "gpl-3" = lib.licenses.gpl3Only; + "gpl-3.0" = lib.licenses.gpl3Only; + "gplv3" = lib.licenses.gpl3Only; + "lgpl" = lib.licenses.lgpl3Only; + "lgpl-2" = lib.licenses.lgpl2Only; "lgpl-2.0+" = lib.licenses.lgpl2Plus; + "lgpl-2.1" = lib.licenses.lgpl21Only; "lgpl-2.1-or-later" = lib.licenses.lgpl21Plus; + "lgpl-3" = lib.licenses.lgpl3Only; + "lgplv3" = lib.licenses.lgpl3Only; "public-domain" = lib.licenses.publicDomain; + "srfi" = lib.licenses.bsd3; + "unicode" = lib.licenses.ucd; + "zlib-acknowledgement" = lib.licenses.zlib; }).${license} or license; }) (lib.importTOML ./deps.toml)))); diff --git a/pkgs/development/compilers/circt/circt-llvm.nix b/pkgs/development/compilers/circt/circt-llvm.nix new file mode 100644 index 0000000000000..b3005af55fbbd --- /dev/null +++ b/pkgs/development/compilers/circt/circt-llvm.nix @@ -0,0 +1,59 @@ +{ stdenv +, cmake +, ninja +, circt +, llvm +, python3 +}: stdenv.mkDerivation { + pname = circt.pname + "-llvm"; + inherit (circt) version src; + + requiredSystemFeatures = [ "big-parallel" ]; + + nativeBuildInputs = [ cmake ninja python3 ]; + + preConfigure = '' + cd llvm/llvm + ''; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DLLVM_ENABLE_BINDINGS=OFF" + "-DLLVM_ENABLE_OCAMLDOC=OFF" + "-DLLVM_BUILD_EXAMPLES=OFF" + "-DLLVM_OPTIMIZED_TABLEGEN=ON" + "-DLLVM_ENABLE_PROJECTS=mlir" + "-DLLVM_TARGETS_TO_BUILD=" + + # This option is needed to install llvm-config + "-DLLVM_INSTALL_UTILS=ON" + ]; + + outputs = [ "out" "lib" "dev" ]; + + postInstall = '' + # move llvm-config to $dev to resolve a circular dependency + moveToOutput "bin/llvm-config*" "$dev" + + # move all lib files to $lib except lib/cmake + moveToOutput "lib" "$lib" + moveToOutput "lib/cmake" "$dev" + + # patch configuration files so each path points to the new $lib or $dev paths + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' + substituteInPlace \ + "$dev/lib/cmake/llvm/LLVMExports-release.cmake" \ + "$dev/lib/cmake/mlir/MLIRTargets-release.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "\''${_IMPORT_PREFIX}/lib/objects-Release" "$lib/lib/objects-Release" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" # patch path for llvm-config + ''; + + doCheck = true; + checkTarget = "check-mlir"; + + meta = llvm.meta // { + inherit (circt.meta) maintainers; + }; +} diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 4c4f69bc74ff2..6fb609699bad4 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -6,36 +6,37 @@ , git , fetchFromGitHub , ninja +, lit , gitUpdater +, callPackage }: let pythonEnv = python3.withPackages (ps: [ ps.psutil ]); + circt-llvm = callPackage ./circt-llvm.nix { }; in stdenv.mkDerivation rec { pname = "circt"; - version = "1.59.0"; + version = "1.61.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-HsfvLxXyYvzUL+FO/i8iRbyQV8OFF3Cx8/g8/9aJE2M="; + sha256 = "sha256-3zuaruaveUeJ7uKP5fMiDFPOGKcs6aTNuGOuhxV6nss="; fetchSubmodules = true; }; requiredSystemFeatures = [ "big-parallel" ]; nativeBuildInputs = [ cmake ninja git pythonEnv ]; + buildInputs = [ circt-llvm ]; - cmakeDir = "../llvm/llvm"; cmakeFlags = [ - "-DLLVM_ENABLE_BINDINGS=OFF" - "-DLLVM_ENABLE_OCAMLDOC=OFF" - "-DLLVM_BUILD_EXAMPLES=OFF" - "-DLLVM_OPTIMIZED_TABLEGEN=ON" - "-DLLVM_ENABLE_PROJECTS=mlir" - "-DLLVM_EXTERNAL_PROJECTS=circt" - "-DLLVM_EXTERNAL_CIRCT_SOURCE_DIR=.." + "-DBUILD_SHARED_LIBS=ON" + "-DMLIR_DIR=${circt-llvm.dev}/lib/cmake/mlir" + + # LLVM_EXTERNAL_LIT is executed by python3, the wrapped bash script will not work + "-DLLVM_EXTERNAL_LIT=${lit}/bin/.lit-wrapped" "-DCIRCT_LLHD_SIM_ENABLED=OFF" ]; @@ -60,18 +61,20 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/GenVersionFile.cmake --replace "unknown git version" "${src.rev}" ''; - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mv bin/{{fir,hls}tool,circt-{as,dis,lsp-server,opt,reduce,translate}} $out/bin - runHook postInstall - ''; - doCheck = true; checkTarget = "check-circt check-circt-integration"; - passthru.updateScript = gitUpdater { - rev-prefix = "firtool-"; + outputs = [ "out" "lib" "dev" ]; + + postInstall = '' + moveToOutput lib "$lib" + ''; + + passthru = { + updateScript = gitUpdater { + rev-prefix = "firtool-"; + }; + llvm = circt-llvm; }; meta = { @@ -82,4 +85,3 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; }; } - diff --git a/pkgs/development/compilers/clasp/clasp-pin-repos-commits.patch b/pkgs/development/compilers/clasp/clasp-pin-repos-commits.patch index 433c44b7da301..203ad59514119 100644 --- a/pkgs/development/compilers/clasp/clasp-pin-repos-commits.patch +++ b/pkgs/development/compilers/clasp/clasp-pin-repos-commits.patch @@ -1,15 +1,19 @@ diff --git a/repos.sexp b/repos.sexp -index 2b2459655..ad346d8e5 100644 +index d31d4d62d..cd3238585 100644 --- a/repos.sexp +++ b/repos.sexp -@@ -7,15 +7,15 @@ +@@ -5,17 +5,17 @@ + ;;;; 4. src/ - C/C++ dependencies for iclasp + ;;;; 5. extensions/ - extensions and their dependencies ((:name :ansi-test - :repository "https://gitlab.common-lisp.net/yitzchak/ansi-test" +- :repository "https://gitlab.common-lisp.net/yitzchak/ansi-test" ++ :repository "https://github.com/clasp-developers/ansi-test.git" :directory "dependencies/ansi-test/" - :branch "add-expected-failures") -+ :commit "346cf2eb1133942054df8ce2125ed7e999b6d82b") ++ :commit "33ae7c1ddd3e814bbe6f55b9e7a6a92b39404664") (:name :cl-bench - :repository "https://gitlab.common-lisp.net/ansi-test/cl-bench.git" +- :repository "https://gitlab.common-lisp.net/ansi-test/cl-bench.git" ++ :repository "https://github.com/clasp-developers/cl-bench.git" :directory "dependencies/cl-bench/" - :branch "master") + :commit "7d184b4ef2a6272f0e3de88f6c243edb20f7071a") @@ -21,7 +25,7 @@ index 2b2459655..ad346d8e5 100644 (:name :quicklisp-client :repository "https://github.com/quicklisp/quicklisp-client.git" :directory "dependencies/quicklisp-client/" -@@ -23,15 +23,15 @@ +@@ -23,21 +23,21 @@ (:name :shasht :repository "https://github.com/yitzchak/shasht.git" :directory "dependencies/shasht/" @@ -40,6 +44,13 @@ index 2b2459655..ad346d8e5 100644 (:name :acclimation :repository "https://github.com/robert-strandh/Acclimation.git" :directory "src/lisp/kernel/contrib/Acclimation/" + :commit "dd15c86b0866fc5d8b474be0da15c58a3c04c45c") + (:name :alexandria +- :repository "https://gitlab.common-lisp.net/alexandria/alexandria.git" ++ :repository "https://github.com/clasp-developers/alexandria.git" + :directory "src/lisp/kernel/contrib/alexandria/" + :commit "v1.4") + (:name :anaphora @@ -128,7 +128,7 @@ (:name :lparallel :repository "https://github.com/yitzchak/lparallel.git" @@ -49,12 +60,31 @@ index 2b2459655..ad346d8e5 100644 :extension :cando) (:name :parser.common-rules :repository "https://github.com/scymtym/parser.common-rules.git" -@@ -152,7 +152,7 @@ +@@ -150,9 +150,9 @@ + :commit "87a447a8eaef9cf4fd1c16d407a49f9adaf8adad" + :extension :cando) (:name :trivial-features ; Needed both by the host and eclasp - :repository "https://github.com/yitzchak/trivial-features.git" +- :repository "https://github.com/yitzchak/trivial-features.git" ++ :repository "https://github.com/trivial-features/trivial-features.git" :directory "src/lisp/kernel/contrib/trivial-features/" - :branch "asdf-feature") -+ :commit "0008ef4f3376fb76f63c35ecee6573d0d0f98d57") ++ :commit "d249a62aaf022902398a7141ae17217251fc61db") (:name :trivial-garbage :repository "https://github.com/trivial-garbage/trivial-garbage.git" :directory "src/lisp/kernel/contrib/trivial-garbage/" +@@ -176,7 +176,7 @@ + :directory "src/lisp/kernel/contrib/usocket/" + :commit "7ad6582cc1ce9e7fa5931a10e73b7d2f2688fa81") + (:name :asdf +- :repository "https://gitlab.common-lisp.net/asdf/asdf.git" ++ :repository "https://github.com/clasp-developers/asdf.git" + :directory "src/lisp/modules/asdf/" + :commit "3.3.5") + (:name :mps +@@ -205,4 +205,4 @@ + :repository "https://github.com/seqan/seqan.git" + :directory "extensions/seqan-clasp/seqan/" + :commit "f5f658343c366c9c3d44ba358ffc9317e78a09ed" +- :extension :seqan-clasp)) +\ No newline at end of file ++ :extension :seqan-clasp)) diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index c9fecafbd4600..64617d01f156e 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -1,7 +1,37 @@ -{ pkgs, lib, fetchFromGitHub, llvmPackages_15 }: - +{ lib +, llvmPackages_15 +, fetchFromGitHub +, sbcl +, git +, pkg-config +, fmt_9 +, gmpxx +, libelf +, boost +, libunwind +, ninja +, cacert +}: let + inherit (llvmPackages_15) stdenv llvm libclang; + + # Gathered from https://github.com/clasp-developers/clasp/raw/2.2.0/repos.sexp + dependencies = import ./dependencies.nix { + inherit fetchFromGitHub; + }; + + # Shortened version of `_defaultUnpack` + unpackDependency = elem: '' + mkdir -p "source/${elem.directory}" + cp -pr --reflink=auto -- ${elem.src}/* "source/${elem.directory}" + chmod -R u+w -- "source/${elem.directory}" + ''; +in + +stdenv.mkDerivation { + pname = "clasp"; + version = "2.2.0"; src = fetchFromGitHub { owner = "clasp-developers"; @@ -10,48 +40,12 @@ let hash = "sha256-gvUqUb0dftW1miiBcAPJur0wOunox4y2SUYeeJpR9R4="; }; - reposDirs = [ - "dependencies" - "src/lisp/kernel/contrib" - "src/lisp/modules/asdf" - "src/mps" - "src/bdwgc" - "src/libatomic_ops" + patches = [ + ./clasp-pin-repos-commits.patch + ./remove-unused-command-line-argument.patch ]; - reposTarball = llvmPackages_15.stdenv.mkDerivation { - pname = "clasp-repos"; - version = "tarball"; - inherit src; - patches = [ ./clasp-pin-repos-commits.patch ]; - nativeBuildInputs = with pkgs; [ - sbcl - git - cacert - ]; - buildPhase = '' - export SOURCE_DATE_EPOCH=1 - export ASDF_OUTPUT_TRANSLATIONS=$(pwd):$(pwd)/__fasls - sbcl --script koga --help - for x in {${lib.concatStringsSep "," reposDirs}}; do - find $x -type d -name .git -exec rm -rvf {} \; || true - done - ''; - installPhase = '' - tar --owner=0 --group=0 --numeric-owner --format=gnu \ - --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ - -czf $out ${lib.concatStringsSep " " reposDirs} - ''; - outputHashMode = "flat"; - outputHashAlgo = "sha256"; - outputHash = "sha256-vgwThjn2h3nKnShtKoHgaPdH/FDHv28fLMQvKFEwG6o="; - }; - -in llvmPackages_15.stdenv.mkDerivation { - pname = "clasp"; - version = "2.2.0"; - inherit src; - nativeBuildInputs = (with pkgs; [ + nativeBuildInputs = [ sbcl git pkg-config @@ -61,30 +55,27 @@ in llvmPackages_15.stdenv.mkDerivation { boost libunwind ninja - ]) ++ (with llvmPackages_15; [ llvm libclang - ]); + ]; + + ninjaFlags = [ "-C" "build" ]; + + postUnpack = lib.concatStringsSep "\n" (builtins.map unpackDependency dependencies); + configurePhase = '' - export SOURCE_DATE_EPOCH=1 - export ASDF_OUTPUT_TRANSLATIONS=$(pwd):$(pwd)/__fasls - tar xf ${reposTarball} - sbcl --script koga \ - --skip-sync \ - --cc=$NIX_CC/bin/cc \ - --cxx=$NIX_CC/bin/c++ \ - --reproducible-build \ - --package-path=/ \ - --bin-path=$out/bin \ - --lib-path=$out/lib \ - --share-path=$out/share -''; - buildPhase = '' - ninja -C build -''; - installPhase = '' - ninja -C build install -''; + export SOURCE_DATE_EPOCH=1 + export ASDF_OUTPUT_TRANSLATIONS=$(pwd):$(pwd)/__fasls + sbcl --script koga \ + --skip-sync \ + --cc=$NIX_CC/bin/cc \ + --cxx=$NIX_CC/bin/c++ \ + --reproducible-build \ + --package-path=/ \ + --bin-path=$out/bin \ + --lib-path=$out/lib \ + --share-path=$out/share + ''; meta = { description = "A Common Lisp implementation based on LLVM with C++ integration"; @@ -93,9 +84,7 @@ in llvmPackages_15.stdenv.mkDerivation { platforms = ["x86_64-linux" "x86_64-darwin"]; # Upstream claims support, but breaks with: # error: use of undeclared identifier 'aligned_alloc' - broken = llvmPackages_15.stdenv.isDarwin; + broken = stdenv.isDarwin; homepage = "https://github.com/clasp-developers/clasp"; }; - } - diff --git a/pkgs/development/compilers/clasp/dependencies.nix b/pkgs/development/compilers/clasp/dependencies.nix new file mode 100644 index 0000000000000..abcd0f17747de --- /dev/null +++ b/pkgs/development/compilers/clasp/dependencies.nix @@ -0,0 +1,457 @@ +# Gathered from https://github.com/clasp-developers/clasp/raw/2.2.0/repos.sexp +# Generated using https://gist.github.com/philiptaron/8ea1394b049c2ca975e4b03965d9ac00 +# and then light editing using Vim + +{ fetchFromGitHub }: + +[ + { + directory = "dependencies/ansi-test/"; + src = fetchFromGitHub { + owner = "clasp-developers"; + repo = "ansi-test"; + rev = "33ae7c1ddd3e814bbe6f55b9e7a6a92b39404664"; + hash = "sha256-dGF7CScvfPNMRxQXJM4v6Vfc/VjdUXNz0yCjUOsYM3I="; + }; + } + + { + directory = "dependencies/cl-bench/"; + src = fetchFromGitHub { + owner = "clasp-developers"; + repo = "cl-bench"; + rev = "7d184b4ef2a6272f0e3de88f6c243edb20f7071a"; + hash = "sha256-7ZEIWNEj7gzYFMTqW7nnZgjNE1zoTAMeJHj547gRtPs="; + }; + } + + { + directory = "dependencies/cl-who/"; + src = fetchFromGitHub { + owner = "edicl"; + repo = "cl-who"; + rev = "07dafe9b351c32326ce20b5804e798f10d4f273d"; + hash = "sha256-5T762W3qetAjXtHP77ko6YZR6w5bQ04XM6QZPELQu+U="; + }; + } + + { + directory = "dependencies/quicklisp-client/"; + src = fetchFromGitHub { + owner = "quicklisp"; + repo = "quicklisp-client"; + rev = "8b63e00b3a2b3f96e24c113d7601dd03a128ce94"; + hash = "sha256-1HLVPhl8aBaeG8dRLxBh0j0X/0wqFeNYK1CEfiELToA="; + }; + } + + { + directory = "dependencies/shasht/"; + src = fetchFromGitHub { + owner = "yitzchak"; + repo = "shasht"; + rev = "f38e866990c6b5381a854d63f7ea0227c87c2f6d"; + hash = "sha256-Ki5JNevMvVZoUz3tP6cv7qA4xDLzjd2MXmf4x9ew5bw="; + }; + } + + { + directory = "dependencies/trivial-do/"; + src = fetchFromGitHub { + owner = "yitzchak"; + repo = "trivial-do"; + rev = "a19f93227cb80a6bec8846655ebcc7998020bd7e"; + hash = "sha256-Tjd9VJan6pQpur292xtklvb28MDGGjq2+ub5T6o6FG8="; + }; + } + + { + directory = "dependencies/trivial-gray-streams/"; + src = fetchFromGitHub { + owner = "trivial-gray-streams"; + repo = "trivial-gray-streams"; + rev = "2b3823edbc78a450db4891fd2b566ca0316a7876"; + hash = "sha256-9vN74Gum7ihKSrCygC3hRLczNd15nNCWn5r60jjHN8I="; + }; + } + + { + directory = "src/lisp/kernel/contrib/Acclimation/"; + src = fetchFromGitHub { + owner = "robert-strandh"; + repo = "Acclimation"; + rev = "dd15c86b0866fc5d8b474be0da15c58a3c04c45c"; + hash = "sha256-AuoVdv/MU73A8X+GsxyG0K+xgzCKLQfbpu79oTERgmI="; + }; + } + + { + directory = "src/lisp/kernel/contrib/alexandria/"; + src = fetchFromGitHub { + owner = "clasp-developers"; + repo = "alexandria"; + rev = "49e82add16cb9f1ffa72c77cd687271247181ff3"; + hash = "sha256-1Hzxt65dZvgOFIljjjlSGgKYkj+YBLwJCACi5DZsKmQ="; + }; + } + + { + directory = "src/lisp/kernel/contrib/anaphora/"; + src = fetchFromGitHub { + owner = "spwhitton"; + repo = "anaphora"; + rev = "bcf0f7485eec39415be1b2ec6ca31cf04a8ab5c5"; + hash = "sha256-CzApbUmdDmD+BWPcFGJN0rdZu991354EdTDPn8FSRbc="; + }; + } + + { + directory = "src/lisp/kernel/contrib/architecture.builder-protocol/"; + src = fetchFromGitHub { + owner = "scymtym"; + repo = "architecture.builder-protocol"; + rev = "0c1a9ebf9ab14e699c2b9c85fc20265b8c5364dd"; + hash = "sha256-AdZeI4UCMnmuYpmSaWqIt+egdkNN3kzEn/zOqIBTnww="; + }; + } + + { + directory = "src/lisp/kernel/contrib/array-utils/"; + src = fetchFromGitHub { + owner = "Shinmera"; + repo = "array-utils"; + rev = "5acd90fa3d9703cea33e3825334b256d7947632f"; + hash = "sha256-Br3H39F+hqYnTgYtVezuRhwRQJwJlxohu+M033sYPOI="; + }; + } + + { + directory = "src/lisp/kernel/contrib/babel/"; + src = fetchFromGitHub { + owner = "cl-babel"; + repo = "babel"; + rev = "f892d0587c7f3a1e6c0899425921b48008c29ee3"; + hash = "sha256-U2E8u3ZWgH9eG4SV/t9CE1dUpcthuQMXgno/W1Ow2RE="; + }; + } + + { + directory = "src/lisp/kernel/contrib/bordeaux-threads/"; + src = fetchFromGitHub { + owner = "sionescu"; + repo = "bordeaux-threads"; + rev = "3d25cd01176f7c9215ebc792c78313cb99ff02f9"; + hash = "sha256-KoOaIKQZaZgEbtM6PGVwQn/xg+/slt+uloR4EaMlBeg="; + }; + } + + { + directory = "src/lisp/kernel/contrib/cffi/"; + src = fetchFromGitHub { + owner = "cffi"; + repo = "cffi"; + rev = "9c912e7b89eb09dd347d3ebae16e4dc5f53e5717"; + hash = "sha256-umt0HmX7M3SZM2VSrxqxUmNt9heTG/Ulwzphs2NRYTs="; + }; + } + + { + directory = "src/lisp/kernel/contrib/cl-markup/"; + src = fetchFromGitHub { + owner = "arielnetworks"; + repo = "cl-markup"; + rev = "e0eb7debf4bdff98d1f49d0f811321a6a637b390"; + hash = "sha256-50LZDaNfXhOZ6KoTmXClo5Bo2D9q1zbdCLSFkwqZhoI="; + }; + } + + { + directory = "src/lisp/kernel/contrib/cl-ppcre/"; + src = fetchFromGitHub { + owner = "edicl"; + repo = "cl-ppcre"; + rev = "b4056c5aecd9304e80abced0ef9c89cd66ecfb5e"; + hash = "sha256-6xeiSeYVwzAaisLQP/Bjqlc/Rhw8JMy0FT93hDQi5Y8="; + }; + } + + { + directory = "src/lisp/kernel/contrib/cl-svg/"; + src = fetchFromGitHub { + owner = "wmannis"; + repo = "cl-svg"; + rev = "1e988ebd2d6e2ee7be4744208828ef1b59e5dcdc"; + hash = "sha256-nwOvHGK0wIOZxAnZ68xyOhchAp8CBl/wsfRI42v8NYc="; + }; + } + + { + directory = "src/lisp/kernel/contrib/Cleavir/"; + src = fetchFromGitHub { + owner = "s-expressionists"; + repo = "Cleavir"; + rev = "a73d313735447c63b4b11b6f8984f9b1e3e74ec9"; + hash = "sha256-VQ8sB5W7JYnVsvfx2j7d2LQcECst79MCIW9QSuwm8GA="; + }; + } + + { + directory = "src/lisp/kernel/contrib/closer-mop/"; + src = fetchFromGitHub { + owner = "pcostanza"; + repo = "closer-mop"; + rev = "d4d1c7aa6aba9b4ac8b7bb78ff4902a52126633f"; + hash = "sha256-bHBYMBz45EOY727d4BWP75gRV4nzRAWxAlivPRzYrKo="; + }; + } + + { + directory = "src/lisp/kernel/contrib/Concrete-Syntax-Tree/"; + src = fetchFromGitHub { + owner = "s-expressionists"; + repo = "Concrete-Syntax-Tree"; + rev = "4f01430c34f163356f3a2cfbf0a8a6963ff0e5ac"; + hash = "sha256-0XfLkihztWUhqu7DrFiuwcEx/x+EILEivPfsHb5aMZk="; + }; + } + + { + directory = "src/lisp/kernel/contrib/documentation-utils/"; + src = fetchFromGitHub { + owner = "Shinmera"; + repo = "documentation-utils"; + rev = "98630dd5f7e36ae057fa09da3523f42ccb5d1f55"; + hash = "sha256-uMUyzymyS19ODiUjQbE/iJV7HFeVjB45gbnWqfGEGCU="; + }; + } + + { + directory = "src/lisp/kernel/contrib/Eclector/"; + src = fetchFromGitHub { + owner = "s-expressionists"; + repo = "Eclector"; + rev = "dddb4d8af3eae78017baae7fb9b99e73d2a56e6b"; + hash = "sha256-OrkWEI5HGlmejH9gg7OwJz2QXgAgE3kDHwen5yzhKgM="; + }; + } + + { + directory = "src/lisp/kernel/contrib/esrap/"; + src = fetchFromGitHub { + owner = "scymtym"; + repo = "esrap"; + rev = "7588b430ad7c52f91a119b4b1c9a549d584b7064"; + hash = "sha256-C0GiTyRna9BMIMy1/XdMZAkhjpLaoAEF1+ps97xQyMY="; + }; + } + + { + directory = "src/lisp/kernel/contrib/global-vars/"; + src = fetchFromGitHub { + owner = "lmj"; + repo = "global-vars"; + rev = "c749f32c9b606a1457daa47d59630708ac0c266e"; + hash = "sha256-bXxeNNnFsGbgP/any8rR3xBvHE9Rb4foVfrdQRHroxo="; + }; + } + + { + directory = "src/lisp/kernel/contrib/let-plus/"; + src = fetchFromGitHub { + owner = "sharplispers"; + repo = "let-plus"; + rev = "455e657e077235829b197f7ccafd596fcda69e30"; + hash = "sha256-SyZRx9cyuEN/h4t877TOWw35caQqMf2zSGZ9Qg22gAE="; + }; + } + + { + directory = "src/lisp/kernel/contrib/cl-netcdf/"; + src = fetchFromGitHub { + owner = "clasp-developers"; + repo = "cl-netcdf"; + rev = "593c6c47b784ec02e67580aa12a7775ed6260200"; + hash = "sha256-3VCTSsIbk0GovCM+rWPZj2QJdYq+UZksjfRd18UYY5s="; + }; + } + + { + directory = "src/lisp/kernel/contrib/lparallel/"; + src = fetchFromGitHub { + owner = "yitzchak"; + repo = "lparallel"; + rev = "9c98bf629328b27a5a3fbb7a637afd1db439c00f"; + hash = "sha256-sUM1WKXxZk7un64N66feXh21m7yzJsdcaWC3jIOd2W4="; + }; + } + + { + directory = "src/lisp/kernel/contrib/parser.common-rules/"; + src = fetchFromGitHub { + owner = "scymtym"; + repo = "parser.common-rules"; + rev = "b7652db5e3f98440dce2226d67a50e8febdf7433"; + hash = "sha256-ik+bteIjBN6MfMFiRBjn/nP7RBzv63QgoRKVi4F8Ho0="; + }; + } + + { + directory = "src/lisp/kernel/contrib/plump/"; + src = fetchFromGitHub { + owner = "Shinmera"; + repo = "plump"; + rev = "d8ddda7514e12f35510a32399f18e2b26ec69ddc"; + hash = "sha256-FjeZAWD81137lXWyN/RIr+L+anvwh/Glze497fcpHUY="; + }; + } + + { + directory = "src/lisp/kernel/contrib/split-sequence/"; + src = fetchFromGitHub { + owner = "sharplispers"; + repo = "split-sequence"; + rev = "89a10b4d697f03eb32ade3c373c4fd69800a841a"; + hash = "sha256-faF2EiQ+xXWHX9JlZ187xR2mWhdOYCpb4EZCPNoZ9uQ="; + }; + } + + { + directory = "src/lisp/kernel/contrib/static-vectors/"; + src = fetchFromGitHub { + owner = "sionescu"; + repo = "static-vectors"; + rev = "87a447a8eaef9cf4fd1c16d407a49f9adaf8adad"; + hash = "sha256-q4E+VPX/pOyuCdzJZ6CFEIiR58E6JIxJySROl/WcMyI="; + }; + } + + { + directory = "src/lisp/kernel/contrib/trivial-features/"; + src = fetchFromGitHub { + owner = "trivial-features"; + repo = "trivial-features"; + rev = "d249a62aaf022902398a7141ae17217251fc61db"; + hash = "sha256-g50OSfrMRH5hTRy077C1kCln2vz0Qeb1oq9qHh7zY2Q="; + }; + } + + { + directory = "src/lisp/kernel/contrib/trivial-garbage/"; + src = fetchFromGitHub { + owner = "trivial-garbage"; + repo = "trivial-garbage"; + rev = "b3af9c0c25d4d4c271545f1420e5ea5d1c892427"; + hash = "sha256-CCLZHHW3/0Id0uHxrbjf/WM3yC8netkcQ8p9Qtssvc4="; + }; + } + + { + directory = "src/lisp/kernel/contrib/trivial-http/"; + src = fetchFromGitHub { + owner = "gwkkwg"; + repo = "trivial-http"; + rev = "ca45656587f36378305de1a4499c308acc7a03af"; + hash = "sha256-0VKWHJYn1XcXVNHduxKiABe7xFUxj8M4/u92Usvq54o="; + }; + } + + { + directory = "src/lisp/kernel/contrib/trivial-indent/"; + src = fetchFromGitHub { + owner = "Shinmera"; + repo = "trivial-indent"; + rev = "8d92e94756475d67fa1db2a9b5be77bc9c64d96c"; + hash = "sha256-G+YCIB3bKN4RotJUjT/6bnivSBalseFRhIlwsEm5EUk="; + }; + } + + { + directory = "src/lisp/kernel/contrib/trivial-with-current-source-form/"; + src = fetchFromGitHub { + owner = "scymtym"; + repo = "trivial-with-current-source-form"; + rev = "3898e09f8047ef89113df265574ae8de8afa31ac"; + hash = "sha256-IKJOyJYqGBx0b6Oomddvb+2K6q4W508s3xnplleMJIQ="; + }; + } + + { + directory = "src/lisp/kernel/contrib/usocket/"; + src = fetchFromGitHub { + owner = "usocket"; + repo = "usocket"; + rev = "7ad6582cc1ce9e7fa5931a10e73b7d2f2688fa81"; + hash = "sha256-0HiItuc6fV70Rpk/5VevI1I0mGnY1JJvhnyPpx6r0uo="; + }; + } + + { + directory = "src/lisp/modules/asdf/"; + src = fetchFromGitHub { + owner = "clasp-developers"; + repo = "asdf"; + rev = "97b279faf3cc11a5cfdd19b5325025cc8ec1e7bd"; + hash = "sha256-4LhF+abor5NK4HgbGCYM5kSaH7TLISW5w5HXYOm4wqw="; + }; + } + + { + directory = "src/mps/"; + src = fetchFromGitHub { + owner = "Ravenbrook"; + repo = "mps"; + rev = "b8a05a3846430bc36c8200f24d248c8293801503"; + hash = "sha256-Zuc77cdap0xNYEqM8IkMQMUMY0f5QZ84uFmKgXjDXeA="; + }; + } + + { + directory = "src/bdwgc/"; + src = fetchFromGitHub { + owner = "ivmai"; + repo = "bdwgc"; + rev = "036becee374b84fed5d56a6df3ae097b7cc0ff73"; + hash = "sha256-WB1sFfVL6lWL+DEypg3chCJS/w0J4tPGi5tL1o3W73U="; + }; + } + + { + directory = "src/libatomic_ops/"; + src = fetchFromGitHub { + owner = "ivmai"; + repo = "libatomic_ops"; + rev = "4b7d0b9036f9a645b03010dad1c7b7f86ea75772"; + hash = "sha256-zThdbX2/l5/ZZVYobJf9KAd+IjIDIrk+08SUhTQs2gE="; + }; + } + + { + directory = "extensions/cando/"; + src = fetchFromGitHub { + owner = "cando-developers"; + repo = "cando"; + rev = "a6934eddfce2ff1cb7131affce427ce652392f08"; + hash = "sha256-AUmBLrk7lofJNagvI3KhPebvV8GkrDbBXrsAa3a1Bwo="; + }; + } + + { + directory = "extensions/seqan-clasp/"; + src = fetchFromGitHub { + owner = "clasp-developers"; + repo = "seqan-clasp"; + rev = "5caa2e1e6028525276a6b6ba770fa6e334563d58"; + hash = "sha256-xAvAd/kBr8n9SSw/trgWTqDWQLmpOp8+JX5L+JO2+Ls="; + }; + } + + { + directory = "extensions/seqan-clasp/seqan/"; + src = fetchFromGitHub { + owner = "seqan"; + repo = "seqan"; + rev = "f5f658343c366c9c3d44ba358ffc9317e78a09ed"; + hash = "sha256-AzZlONf7SNxCa9+SKQFC/rA6fx6rhWH96caZSmKnlsU="; + }; + } +] diff --git a/pkgs/development/compilers/clasp/remove-unused-command-line-argument.patch b/pkgs/development/compilers/clasp/remove-unused-command-line-argument.patch new file mode 100644 index 0000000000000..b5c2d0bf39c3b --- /dev/null +++ b/pkgs/development/compilers/clasp/remove-unused-command-line-argument.patch @@ -0,0 +1,13 @@ +diff --git a/src/koga/units.lisp b/src/koga/units.lisp +index 808cebd17..2bbf965fd 100644 +--- a/src/koga/units.lisp ++++ b/src/koga/units.lisp +@@ -197,7 +197,7 @@ + :type :cxxflags) + #+darwin (append-cflags configuration "-stdlib=libc++" :type :cxxflags) + #+darwin (append-cflags configuration "-I/usr/local/include") +- #+linux (append-cflags configuration "-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fno-stack-protector -stdlib=libstdc++" ++ #+linux (append-cflags configuration "-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fno-stack-protector" + :type :cxxflags) + #+linux (append-cflags configuration "-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fno-stack-protector" + :type :cflags) diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 8d3e738aa1b49..ad84e13d369ec 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, stanc, python3, buildPackages, runtimeShell }: +{ lib +, stdenv +, fetchFromGitHub +, python3 +, stanc +, buildPackages +, runtimeShell +, runCommandCC +, cmdstan +}: stdenv.mkDerivation rec { pname = "cmdstan"; @@ -12,39 +21,43 @@ stdenv.mkDerivation rec { hash = "sha256-c+L/6PjW7YgmXHuKhKjiRofBRAhKYCzFCZ6BOX5AmC4="; }; - nativeBuildInputs = [ stanc ]; - - buildFlags = [ "build" ]; - enableParallelBuilding = true; - - doCheck = true; - nativeCheckInputs = [ python3 ]; - - CXXFLAGS = lib.optionalString stdenv.isDarwin "-D_BOOST_LGAMMA"; - postPatch = '' substituteInPlace stan/lib/stan_math/make/libraries \ --replace "/usr/bin/env bash" "bash" - patchShebangs . - '' + lib.optionalString stdenv.isAarch64 '' - sed -z -i "s/TEST(CommandStansummary, check_console_output).*TEST(CommandStansummary, check_csv_output)/TEST(CommandStansummary, check_csv_output)/" \ - src/test/interface/stansummary_test.cpp ''; + nativeBuildInputs = [ + python3 + stanc + ]; + preConfigure = '' + patchShebangs test-all.sh runCmdStanTests.py stan/ + '' + # Fix inclusion of hardcoded paths in PCH files, by building in the store. + + '' + mkdir -p $out/opt + cp -R . $out/opt/cmdstan + cd $out/opt/cmdstan mkdir -p bin ln -s ${buildPackages.stanc}/bin/stanc bin/stanc ''; - makeFlags = lib.optional stdenv.isDarwin "arch=${stdenv.hostPlatform.darwinArch}"; + makeFlags = [ + "build" + ] ++ lib.optionals stdenv.isDarwin [ + "arch=${stdenv.hostPlatform.darwinArch}" + ]; - checkPhase = '' - ./runCmdStanTests.py -j$NIX_BUILD_CORES src/test/interface - ''; + # Disable inclusion of timestamps in PCH files when using Clang. + env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-Xclang -fno-pch-timestamp"; + + enableParallelBuilding = true; installPhase = '' - mkdir -p $out/opt $out/bin - cp -r . $out/opt/cmdstan + runHook preInstall + + mkdir -p $out/bin ln -s $out/opt/cmdstan/bin/stanc $out/bin/stanc ln -s $out/opt/cmdstan/bin/stansummary $out/bin/stansummary cat > $out/bin/stan <<EOF @@ -52,10 +65,19 @@ stdenv.mkDerivation rec { make -C $out/opt/cmdstan "\$(realpath "\$1")" EOF chmod a+x $out/bin/stan + + runHook postInstall ''; - # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. - preFixup = "rm -rf stan"; + passthru.tests = { + test = runCommandCC "cmdstan-test" { } '' + cp -R ${cmdstan}/opt/cmdstan cmdstan + chmod -R +w cmdstan + cd cmdstan + ./runCmdStanTests.py -j$NIX_BUILD_CORES src/test/interface + touch $out + ''; + }; meta = with lib; { description = "Command-line interface to Stan"; diff --git a/pkgs/development/compilers/cone/default.nix b/pkgs/development/compilers/cone/default.nix index 9344160ad7628..d94432be12d38 100644 --- a/pkgs/development/compilers/cone/default.nix +++ b/pkgs/development/compilers/cone/default.nix @@ -6,13 +6,13 @@ llvmPackages.stdenv.mkDerivation rec { pname = "cone"; - version = "unstable-2021-07-25"; + version = "unstable-2022-12-12"; src = fetchFromGitHub { owner = "jondgoodwin"; repo = pname; - rev = "5feaabc342bcff3755f638a7e25155cd12127592"; - sha256 = "CTDS83AWtuDY5g6NDn7O2awrYsKFf3Kp35FkMEjfbVw="; + rev = "698bd6afc75777eabbc8ef576d64d683c6a1c5ab"; + sha256 = "0y2s9xgkci8n72v6gnc1i7shr2y3g2sa8fbr25gpxa9ipiq9khg7"; }; nativeBuildInputs = [ cmake ]; @@ -21,10 +21,10 @@ llvmPackages.stdenv.mkDerivation rec { llvmPackages.llvm ]; + # M68k is an experimental target, so not enabled by default postPatch = '' sed -i CMakeLists.txt \ - -e 's/LLVM 7/LLVM/' \ - -e '/AVR/d' + -e '/M68k/d' ''; installPhase = '' diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index 026316f2fa732..adc6a86d98e29 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -104,12 +104,14 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: { }; }; - meta = with lib; { + + # Some of the OpenJDK derivation set their `pos` by hand. We need to + # overwrite this in order to point to Corretto, not OpenJDK. + pos = __curPos; + meta = with lib; oldAttrs.meta // { homepage = "https://aws.amazon.com/corretto"; license = licenses.gpl2Only; description = "Amazon's distribution of OpenJDK"; - platforms = jdk.meta.platforms; - mainProgram = "java"; maintainers = with maintainers; [ rollf ]; }; }) diff --git a/pkgs/development/compilers/critcl/default.nix b/pkgs/development/compilers/critcl/default.nix new file mode 100644 index 0000000000000..5caf63d9dba64 --- /dev/null +++ b/pkgs/development/compilers/critcl/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, tcl +, tcllib +}: + +tcl.mkTclDerivation rec { + pname = "critcl"; + version = "3.2"; + + src = fetchFromGitHub { + owner = "andreas-kupries"; + repo = "critcl"; + rev = version; + hash = "sha256-IxScn9ZTlqD9mG9VJLG+TtplLFhhahOiFhQCjxp22Uk="; + }; + + buildInputs = [ + tcl + tcllib + ]; + + dontBuild = true; + doCheck = true; + + checkPhase = '' + runHook preInstall + HOME="$(mktemp -d)" tclsh ./build.tcl test + runHook postInstall + ''; + + installPhase = '' + runHook preInstall + tclsh ./build.tcl install --prefix $out + runHook postInstall + ''; + + meta = with lib; { + description = "Easily embed C code in Tcl"; + homepage = "https://andreas-kupries.github.io/critcl/"; + license = licenses.tcltk; + mainProgram = "critcl"; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix deleted file mode 100644 index 681549fa62dbe..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ /dev/null @@ -1,367 +0,0 @@ -args@ -{ version -, sha256 -, url ? "" -, name ? "" -, developerProgram ? false -, runPatches ? [] -, autoPatchelfHook -, autoAddOpenGLRunpathHook -, addOpenGLRunpath -, alsa-lib -, curlMinimal -, expat -, fetchurl -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc -, gst_all_1 -, gtk2 -, lib -, libxkbcommon -, libkrb5 -, krb5 -, makeWrapper -, markForCudatoolkitRootHook -, ncurses5 -, numactl -, nss -, perl -, python3 # FIXME: CUDAToolkit 10 may still need python27 -, pulseaudio -, requireFile -, setupCudaHook -, stdenv -, backendStdenv # E.g. gcc11Stdenv, set in extension.nix -, unixODBC -, wayland -, xorg -, zlib -, freeglut -, libGLU -, libsForQt5 -, libtiff -, qt6Packages -, qt6 -, rdma-core -, ucx -, rsync -}: - -backendStdenv.mkDerivation rec { - pname = "cudatoolkit"; - inherit version runPatches; - - dontPatchELF = true; - dontStrip = true; - - src = - if developerProgram then - requireFile { - message = '' - This nix expression requires that ${args.name} is already part of the store. - Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the CUDA toolkit - at https://developer.nvidia.com/cuda-toolkit, and run the following command in the download directory: - nix-prefetch-url file://\$PWD/${args.name} - ''; - inherit (args) name sha256; - } - else - fetchurl { - inherit (args) url sha256; - }; - - outputs = [ "out" "lib" "doc" ]; - - nativeBuildInputs = [ - perl - makeWrapper - rsync - addOpenGLRunpath - autoPatchelfHook - autoAddOpenGLRunpathHook - markForCudatoolkitRootHook - ] ++ lib.optionals (lib.versionOlder version "11") [ - libsForQt5.wrapQtAppsHook - ] ++ lib.optionals (lib.versionAtLeast version "11.8") [ - qt6Packages.wrapQtAppsHook - ]; - depsTargetTargetPropagated = [ - setupCudaHook - ]; - buildInputs = lib.optionals (lib.versionOlder version "11") [ - libsForQt5.qt5.qtwebengine - freeglut - libGLU - ] ++ [ - # To get $GDK_PIXBUF_MODULE_FILE via setup-hook - gdk-pixbuf - - # For autoPatchelf - ncurses5 - expat - python3 - zlib - glibc - xorg.libX11 - xorg.libXext - xorg.libXrender - xorg.libXt - xorg.libXtst - xorg.libXi - xorg.libXext - xorg.libXdamage - xorg.libxcb - xorg.xcbutilimage - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.xcbutilkeysyms - pulseaudio - libxkbcommon - libkrb5 - krb5 - gtk2 - glib - fontconfig - freetype - numactl - nss - unixODBC - alsa-lib - wayland - ] ++ lib.optionals (lib.versionAtLeast version "11.8") [ - (lib.getLib libtiff) - qt6Packages.qtwayland - rdma-core - (ucx.override { enableCuda = false; }) # Avoid infinite recursion - xorg.libxshmfence - xorg.libxkbfile - ] ++ (lib.optionals (lib.versionAtLeast version "12") (map lib.getLib ([ - # Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for: - # - `libcurl.so.4` - curlMinimal - - # Used by `/host-linux-x64/Scripts/WebRTCContainer/setup/neko/server/bin/neko` - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ]) ++ (with qt6; [ - qtmultimedia - qttools - qtpositioning - qtscxml - qtsvg - qtwebchannel - qtwebengine - ]))); - - # Prepended to runpaths by autoPatchelf. - # The order inherited from older rpath preFixup code - runtimeDependencies = [ - (placeholder "lib") - (placeholder "out") - "${placeholder "out"}/nvvm" - # NOTE: use the same libstdc++ as the rest of nixpkgs, not from backendStdenv - "${lib.getLib stdenv.cc.cc}/lib64" - "${placeholder "out"}/jre/lib/amd64/jli" - "${placeholder "out"}/lib64" - "${placeholder "out"}/nvvm/lib64" - ]; - - autoPatchelfIgnoreMissingDeps = [ - # This is the hardware-dependent userspace driver that comes from - # nvidia_x11 package. It must be deployed at runtime in - # /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather - # than pinned in runpath - "libcuda.so.1" - - # The krb5 expression ships libcom_err.so.3 but cudatoolkit asks for the - # older - # This dependency is asked for by target-linux-x64/CollectX/RedHat/x86_64/libssl.so.10 - # - do we even want to use nvidia-shipped libssl? - "libcom_err.so.2" - ]; - - preFixup = if lib.versionOlder version "11" then '' - patchelf $out/targets/*/lib/libnvrtc.so --add-needed libnvrtc-builtins.so - '' else '' - patchelf $out/lib64/libnvrtc.so --add-needed libnvrtc-builtins.so - ''; - - unpackPhase = '' - sh $src --keep --noexec - - ${lib.optionalString (lib.versionOlder version "10.1") '' - cd pkg/run_files - sh cuda-linux*.run --keep --noexec - sh cuda-samples*.run --keep --noexec - mv pkg ../../$(basename $src) - cd ../.. - rm -rf pkg - - for patch in $runPatches; do - sh $patch --keep --noexec - mv pkg $(basename $patch) - done - ''} - ''; - - installPhase = '' - runHook preInstall - mkdir $out - ${lib.optionalString (lib.versionOlder version "10.1") '' - cd $(basename $src) - export PERL5LIB=. - perl ./install-linux.pl --prefix="$out" - cd .. - for patch in $runPatches; do - cd $(basename $patch) - perl ./install_patch.pl --silent --accept-eula --installdir="$out" - cd .. - done - ''} - ${lib.optionalString (lib.versionAtLeast version "10.1" && lib.versionOlder version "11") '' - cd pkg/builds/cuda-toolkit - mv * $out/ - ''} - ${lib.optionalString (lib.versionAtLeast version "11") '' - mkdir -p $out/bin $out/lib64 $out/include $doc - for dir in pkg/builds/* pkg/builds/cuda_nvcc/nvvm pkg/builds/cuda_cupti/extras/CUPTI; do - if [ -d $dir/bin ]; then - mv $dir/bin/* $out/bin - fi - if [ -d $dir/doc ]; then - (cd $dir/doc && find . -type d -exec mkdir -p $doc/\{} \;) - (cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $doc/\{} \;) - fi - if [ -L $dir/include ] || [ -d $dir/include ]; then - (cd $dir/include && find . -type d -exec mkdir -p $out/include/\{} \;) - (cd $dir/include && find . \( -type f -o -type l \) -exec mv \{} $out/include/\{} \;) - fi - if [ -L $dir/lib64 ] || [ -d $dir/lib64 ]; then - (cd $dir/lib64 && find . -type d -exec mkdir -p $out/lib64/\{} \;) - (cd $dir/lib64 && find . \( -type f -o -type l \) -exec mv \{} $out/lib64/\{} \;) - fi - done - mv pkg/builds/cuda_nvcc/nvvm $out/nvvm - - mv pkg/builds/cuda_sanitizer_api $out/cuda_sanitizer_api - ln -s $out/cuda_sanitizer_api/compute-sanitizer/compute-sanitizer $out/bin/compute-sanitizer - - mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64 - mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64 - rm $out/host-linux-x64/libstdc++.so* - ''} - ${lib.optionalString (lib.versionAtLeast version "11.8") - # error: auto-patchelf could not satisfy dependency libtiff.so.5 wanted by /nix/store/.......-cudatoolkit-12.0.1/host-linux-x64/Plugins/imageformats/libqtiff.so - # we only ship libtiff.so.6, so let's use qt plugins built by Nix. - # TODO: don't copy, come up with a symlink-based "merge" - '' - rsync ${lib.getLib qt6Packages.qtimageformats}/lib/qt-6/plugins/ $out/host-linux-x64/Plugins/ -aP - ''} - - rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? - - ${lib.optionalString (lib.versionOlder version "10.1") '' - # let's remove the 32-bit libraries, they confuse the lib64->lib mover - rm -rf $out/lib - ''} - - ${lib.optionalString (lib.versionAtLeast version "12.0") '' - rm $out/host-linux-x64/libQt6* - ''} - - # Remove some cruft. - ${lib.optionalString ((lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1")) - "rm $out/bin/uninstall*"} - - # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them) - if [ -d "$out"/cuda-samples ]; then - mv "$out"/cuda-samples "$out"/samples - fi - - # Change the #error on GCC > 4.9 to a #warning. - sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/' - - # Fix builds with newer glibc version - sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h" - '' + - # Point NVCC at a compatible compiler - # CUDA_TOOLKIT_ROOT_DIR is legacy, - # Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables - '' - mkdir -p $out/nix-support - cat <<EOF >> $out/nix-support/setup-hook - cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out' - EOF - - # Move some libraries to the lib output so that programs that - # depend on them don't pull in this entire monstrosity. - mkdir -p $lib/lib - mv -v $out/lib64/libcudart* $lib/lib/ - - # Remove OpenCL libraries as they are provided by ocl-icd and driver. - rm -f $out/lib64/libOpenCL* - ${lib.optionalString (lib.versionAtLeast version "10.1" && (lib.versionOlder version "11")) '' - mv $out/lib64 $out/lib - mv $out/extras/CUPTI/lib64/libcupti* $out/lib - ''} - - # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set - wrapProgram $out/bin/nvprof \ - --prefix LD_LIBRARY_PATH : $out/lib - '' + lib.optionalString (lib.versionOlder version "8.0") '' - # Hack to fix building against recent Glibc/GCC. - echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook - '' - # 11.8 includes a broken symlink, include/include, pointing to targets/x86_64-linux/include - + lib.optionalString (lib.versions.majorMinor version == "11.8") '' - rm $out/include/include - '' + '' - runHook postInstall - ''; - - postInstall = '' - for b in nvvp ${lib.optionalString (lib.versionOlder version "11") "nsight"}; do - wrapProgram "$out/bin/$b" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" - done - ''; - - - # cuda-gdb doesn't run correctly when not using sandboxing, so - # temporarily disabling the install check. This should be set to true - # when we figure out how to get `cuda-gdb --version` to run correctly - # when not using sandboxing. - doInstallCheck = false; - postInstallCheck = let - in '' - # Smoke test binaries - pushd $out/bin - for f in *; do - case $f in - crt) continue;; - nvcc.profile) continue;; - nsight_ee_plugins_manage.sh) continue;; - uninstall_cuda_toolkit_6.5.pl) continue;; - computeprof|nvvp|nsight) continue;; # GUIs don't feature "--version" - *) echo "Executing '$f --version':"; ./$f --version;; - esac - done - popd - ''; - passthru = { - inherit (backendStdenv) cc; - majorMinorVersion = lib.versions.majorMinor version; - majorVersion = lib.versions.majorMinor version; - }; - - meta = with lib; { - description = "A compiler for NVIDIA GPUs, math libraries, and tools"; - homepage = "https://developer.nvidia.com/cuda-toolkit"; - platforms = [ "x86_64-linux" ]; - license = licenses.nvidiaCuda; - maintainers = teams.cuda.members; - }; -} diff --git a/pkgs/development/compilers/cudatoolkit/extension.nix b/pkgs/development/compilers/cudatoolkit/extension.nix index 93800a0dbc6b1..016675fa07015 100644 --- a/pkgs/development/compilers/cudatoolkit/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/extension.nix @@ -47,13 +47,16 @@ final: prev: let ./hooks/mark-for-cudatoolkit-root-hook.sh) { }); - # Normally propagated by cuda_nvcc or cudatoolkit through their depsHostHostPropagated + # Currently propagated by cuda_nvcc or cudatoolkit, rather than used directly setupCudaHook = (final.callPackage ({ makeSetupHook, backendStdenv }: makeSetupHook { name = "setup-cuda-hook"; + substitutions.setupCudaHook = placeholder "out"; + + # Point NVCC at a compatible compiler substitutions.ccRoot = "${backendStdenv.cc}"; # Required in addition to ccRoot as otherwise bin/gcc is looked up diff --git a/pkgs/development/compilers/cudatoolkit/flags.nix b/pkgs/development/compilers/cudatoolkit/flags.nix deleted file mode 100644 index be1d98e87122f..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/flags.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ config -, lib -, cudaVersion -}: - -# Type aliases -# Gpu :: AttrSet -# - See the documentation in ./gpus.nix. - -let - inherit (lib) attrsets lists strings trivial versions; - - # Flags are determined based on your CUDA toolkit by default. You may benefit - # from improved performance, reduced file size, or greater hardware support by - # passing a configuration based on your specific GPU environment. - # - # config.cudaCapabilities :: List Capability - # List of hardware generations to build. - # E.g. [ "8.0" ] - # Currently, the last item is considered the optional forward-compatibility arch, - # but this may change in the future. - # - # config.cudaForwardCompat :: Bool - # Whether to include the forward compatibility gencode (+PTX) - # to support future GPU generations. - # E.g. true - # - # Please see the accompanying documentation or https://github.com/NixOS/nixpkgs/pull/205351 - - # gpus :: List Gpu - gpus = builtins.import ./gpus.nix; - - # isSupported :: Gpu -> Bool - isSupported = gpu: - let - inherit (gpu) minCudaVersion maxCudaVersion; - lowerBoundSatisfied = strings.versionAtLeast cudaVersion minCudaVersion; - upperBoundSatisfied = (maxCudaVersion == null) - || !(strings.versionOlder maxCudaVersion cudaVersion); - in - lowerBoundSatisfied && upperBoundSatisfied; - - # isDefault :: Gpu -> Bool - isDefault = gpu: - let - inherit (gpu) dontDefaultAfter; - newGpu = dontDefaultAfter == null; - recentGpu = newGpu || strings.versionAtLeast dontDefaultAfter cudaVersion; - in - recentGpu; - - # supportedGpus :: List Gpu - # GPUs which are supported by the provided CUDA version. - supportedGpus = builtins.filter isSupported gpus; - - # defaultGpus :: List Gpu - # GPUs which are supported by the provided CUDA version and we want to build for by default. - defaultGpus = builtins.filter isDefault supportedGpus; - - # supportedCapabilities :: List Capability - supportedCapabilities = lists.map (gpu: gpu.computeCapability) supportedGpus; - - # defaultCapabilities :: List Capability - # The default capabilities to target, if not overridden by the user. - defaultCapabilities = lists.map (gpu: gpu.computeCapability) defaultGpus; - - # cudaArchNameToVersions :: AttrSet String (List String) - # Maps the name of a GPU architecture to different versions of that architecture. - # For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ]. - cudaArchNameToVersions = - lists.groupBy' - (versions: gpu: versions ++ [ gpu.computeCapability ]) - [ ] - (gpu: gpu.archName) - supportedGpus; - - # cudaComputeCapabilityToName :: AttrSet String String - # Maps the version of a GPU architecture to the name of that architecture. - # For example, "8.0" maps to "Ampere". - cudaComputeCapabilityToName = builtins.listToAttrs ( - lists.map - (gpu: { - name = gpu.computeCapability; - value = gpu.archName; - }) - supportedGpus - ); - - # dropDot :: String -> String - dropDot = ver: builtins.replaceStrings [ "." ] [ "" ] ver; - - # archMapper :: String -> List String -> List String - # Maps a feature across a list of architecture versions to produce a list of architectures. - # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "sm_80" "sm_86" "sm_87" ]. - archMapper = feat: lists.map (computeCapability: "${feat}_${dropDot computeCapability}"); - - # gencodeMapper :: String -> List String -> List String - # Maps a feature across a list of architecture versions to produce a list of gencode arguments. - # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "-gencode=arch=compute_80,code=sm_80" - # "-gencode=arch=compute_86,code=sm_86" "-gencode=arch=compute_87,code=sm_87" ]. - gencodeMapper = feat: lists.map ( - computeCapability: - "-gencode=arch=compute_${dropDot computeCapability},code=${feat}_${dropDot computeCapability}" - ); - - formatCapabilities = { cudaCapabilities, enableForwardCompat ? true }: rec { - inherit cudaCapabilities enableForwardCompat; - - # archNames :: List String - # E.g. [ "Turing" "Ampere" ] - archNames = lists.unique (builtins.map (cap: cudaComputeCapabilityToName.${cap} or (throw "missing cuda compute capability")) cudaCapabilities); - - # realArches :: List String - # The real architectures are physical architectures supported by the CUDA version. - # E.g. [ "sm_75" "sm_86" ] - realArches = archMapper "sm" cudaCapabilities; - - # virtualArches :: List String - # The virtual architectures are typically used for forward compatibility, when trying to support - # an architecture newer than the CUDA version allows. - # E.g. [ "compute_75" "compute_86" ] - virtualArches = archMapper "compute" cudaCapabilities; - - # arches :: List String - # By default, build for all supported architectures and forward compatibility via a virtual - # architecture for the newest supported architecture. - # E.g. [ "sm_75" "sm_86" "compute_86" ] - arches = realArches ++ - lists.optional enableForwardCompat (lists.last virtualArches); - - # gencode :: List String - # A list of CUDA gencode arguments to pass to NVCC. - # E.g. [ "-gencode=arch=compute_75,code=sm_75" ... "-gencode=arch=compute_86,code=compute_86" ] - gencode = - let - base = gencodeMapper "sm" cudaCapabilities; - forward = gencodeMapper "compute" [ (lists.last cudaCapabilities) ]; - in - base ++ lib.optionals enableForwardCompat forward; - }; - -in -# When changing names or formats: pause, validate, and update the assert -assert (formatCapabilities { cudaCapabilities = [ "7.5" "8.6" ]; }) == { - cudaCapabilities = [ "7.5" "8.6" ]; - enableForwardCompat = true; - - archNames = [ "Turing" "Ampere" ]; - realArches = [ "sm_75" "sm_86" ]; - virtualArches = [ "compute_75" "compute_86" ]; - arches = [ "sm_75" "sm_86" "compute_86" ]; - - gencode = [ "-gencode=arch=compute_75,code=sm_75" "-gencode=arch=compute_86,code=sm_86" "-gencode=arch=compute_86,code=compute_86" ]; -}; -{ - # formatCapabilities :: { cudaCapabilities: List Capability, cudaForwardCompat: Boolean } -> { ... } - inherit formatCapabilities; - - # cudaArchNameToVersions :: String => String - inherit cudaArchNameToVersions; - - # cudaComputeCapabilityToName :: String => String - inherit cudaComputeCapabilityToName; - - # dropDot :: String -> String - inherit dropDot; -} // formatCapabilities { - cudaCapabilities = config.cudaCapabilities or defaultCapabilities; - enableForwardCompat = config.cudaForwardCompat or true; -} diff --git a/pkgs/development/compilers/cudatoolkit/gpus.nix b/pkgs/development/compilers/cudatoolkit/gpus.nix deleted file mode 100644 index be157df89624f..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/gpus.nix +++ /dev/null @@ -1,148 +0,0 @@ -[ - # Type alias - # Gpu = { - # archName: String - # - The name of the microarchitecture. - # computeCapability: String - # - The compute capability of the GPU. - # minCudaVersion: String - # - The minimum (inclusive) CUDA version that supports this GPU. - # dontDefaultAfter: null | String - # - The CUDA version after which to exclude this GPU from the list of default capabilities - # we build. null means we always include this GPU in the default capabilities if it is - # supported. - # maxCudaVersion: null | String - # - The maximum (exclusive) CUDA version that supports this GPU. null means there is no - # maximum. - # } - { - archName = "Kepler"; - computeCapability = "3.0"; - minCudaVersion = "10.0"; - dontDefaultAfter = "10.2"; - maxCudaVersion = "10.2"; - } - { - archName = "Kepler"; - computeCapability = "3.2"; - minCudaVersion = "10.0"; - dontDefaultAfter = "10.2"; - maxCudaVersion = "10.2"; - } - { - archName = "Kepler"; - computeCapability = "3.5"; - minCudaVersion = "10.0"; - dontDefaultAfter = "11.0"; - maxCudaVersion = "11.8"; - } - { - archName = "Kepler"; - computeCapability = "3.7"; - minCudaVersion = "10.0"; - dontDefaultAfter = "11.0"; - maxCudaVersion = "11.8"; - } - { - archName = "Maxwell"; - computeCapability = "5.0"; - minCudaVersion = "10.0"; - dontDefaultAfter = "11.0"; - maxCudaVersion = null; - } - { - archName = "Maxwell"; - computeCapability = "5.2"; - minCudaVersion = "10.0"; - dontDefaultAfter = "11.0"; - maxCudaVersion = null; - } - { - archName = "Maxwell"; - computeCapability = "5.3"; - minCudaVersion = "10.0"; - dontDefaultAfter = "11.0"; - maxCudaVersion = null; - } - { - archName = "Pascal"; - computeCapability = "6.0"; - minCudaVersion = "10.0"; - dontDefaultAfter = null; - maxCudaVersion = null; - } - { - archName = "Pascal"; - computeCapability = "6.1"; - minCudaVersion = "10.0"; - dontDefaultAfter = null; - maxCudaVersion = null; - } - { - archName = "Pascal"; - computeCapability = "6.2"; - minCudaVersion = "10.0"; - dontDefaultAfter = null; - maxCudaVersion = null; - } - { - archName = "Volta"; - computeCapability = "7.0"; - minCudaVersion = "10.0"; - dontDefaultAfter = null; - maxCudaVersion = null; - } - { - archName = "Volta"; - computeCapability = "7.2"; - minCudaVersion = "10.0"; - dontDefaultAfter = null; - maxCudaVersion = null; - } - { - archName = "Turing"; - computeCapability = "7.5"; - minCudaVersion = "10.0"; - dontDefaultAfter = null; - maxCudaVersion = null; - } - { - archName = "Ampere"; - computeCapability = "8.0"; - minCudaVersion = "11.2"; - dontDefaultAfter = null; - maxCudaVersion = null; - } - { - archName = "Ampere"; - computeCapability = "8.6"; - minCudaVersion = "11.2"; - dontDefaultAfter = null; - maxCudaVersion = null; - } - { - archName = "Ampere"; - computeCapability = "8.7"; - minCudaVersion = "11.5"; - # NOTE: This is purposefully before 11.5 to ensure it is never a capability we target by - # default. 8.7 is the Jetson Orin series of devices which are a very specific platform. - # We keep this entry here in case we ever want to target it explicitly, but we don't - # want to target it by default. - dontDefaultAfter = "11.4"; - maxCudaVersion = null; - } - { - archName = "Ada"; - computeCapability = "8.9"; - minCudaVersion = "11.8"; - dontDefaultAfter = null; - maxCudaVersion = null; - } - { - archName = "Hopper"; - computeCapability = "9.0"; - minCudaVersion = "11.8"; - dontDefaultAfter = null; - maxCudaVersion = null; - } -] diff --git a/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh b/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh deleted file mode 100644 index 5c18760a3a2b0..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/hooks/mark-for-cudatoolkit-root-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -# shellcheck shell=bash - -markForCUDAToolkit_ROOT() { - mkdir -p "${prefix}/nix-support" - touch "${prefix}/nix-support/include-in-cudatoolkit-root" -} - -fixupOutputHooks+=(markForCUDAToolkit_ROOT) diff --git a/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh b/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh deleted file mode 100644 index e75a84a9550e7..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -# shellcheck shell=bash - -# CMake's enable_language(CUDA) runs a compiler test and it doesn't account for -# CUDAToolkit_ROOT. We have to help it locate libcudart -export NVCC_APPEND_FLAGS+=" -L@cudartLib@/lib -L@cudartStatic@/lib -I@cudartInclude@/include" diff --git a/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh b/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh deleted file mode 100644 index 5ea57594211c4..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh +++ /dev/null @@ -1,68 +0,0 @@ -# shellcheck shell=bash - -echo Sourcing setup-cuda-hook >&2 - -extendCUDAToolkit_ROOT() { - if [[ -f "$1/nix-support/include-in-cudatoolkit-root" ]] ; then - addToSearchPathWithCustomDelimiter ";" CUDAToolkit_ROOT "$1" - - if [[ -d "$1/include" ]] ; then - addToSearchPathWithCustomDelimiter ";" CUDAToolkit_INCLUDE_DIR "$1/include" - fi - fi -} - -addEnvHooks "$targetOffset" extendCUDAToolkit_ROOT - -setupCUDAToolkitCompilers() { - echo Executing setupCUDAToolkitCompilers >&2 - - if [[ -n "${dontSetupCUDAToolkitCompilers-}" ]] ; then - return - fi - - # Point NVCC at a compatible compiler - - # For CMake-based projects: - # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables - # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html - # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html - - export cmakeFlags+=" -DCUDA_HOST_COMPILER=@ccFullPath@" - export cmakeFlags+=" -DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@" - - # For non-CMake projects: - # We prepend --compiler-bindir to nvcc flags. - # Downstream packages can override these, because NVCC - # uses the last --compiler-bindir it gets on the command line. - # FIXME: this results in "incompatible redefinition" warnings. - # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin - if [ -z "${CUDAHOSTCXX-}" ]; then - export CUDAHOSTCXX="@ccFullPath@"; - fi - - export NVCC_PREPEND_FLAGS+=" --compiler-bindir=@ccRoot@/bin" - - # NOTE: We set -Xfatbin=-compress-all, which reduces the size of the compiled - # binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as - # the default set of CUDA capabilities we build can regularly cause this to occur (for - # example, with Magma). - # - # @SomeoneSerge: original comment was made by @ConnorBaker in .../cudatoolkit/common.nix - if [[ -z "${dontCompressFatbin-}" ]]; then - export NVCC_PREPEND_FLAGS+=" -Xfatbin=-compress-all" - fi - - # CMake's enable_language(CUDA) runs a compiler test and it doesn't account for - # CUDAToolkit_ROOT. We have to help it locate libcudart - if [[ -z "${nvccDontPrependCudartFlags-}" ]] ; then - export NVCC_APPEND_FLAGS+=" -L@cudartLib@/lib -L@cudartStatic@/lib -I@cudartInclude@/include" - fi -} - -setupCMakeCUDAToolkit_ROOT() { - export cmakeFlags+=" -DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR -DCUDAToolkit_ROOT=$CUDAToolkit_ROOT" -} - -postHooks+=(setupCUDAToolkitCompilers) -preConfigureHooks+=(setupCMakeCUDAToolkit_ROOT) diff --git a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix deleted file mode 100644 index 1e4a3ab178559..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ /dev/null @@ -1,178 +0,0 @@ -# Type Aliases -# -# See ./extension.nix: -# - ReleaseAttrs -# - ReleaseFeaturesAttrs -# -# General callPackage-supplied arguments -{ lib -, stdenv -, backendStdenv -, fetchurl -, autoPatchelfHook -, autoAddOpenGLRunpathHook -, markForCudatoolkitRootHook -, lndir -, symlinkJoin -}: -# Function arguments -{ - # Short package name (e.g., "cuda_cccl") - # pname : String - pname -, # Long package name (e.g., "CXX Core Compute Libraries") - # description : String - description -, # platforms : List System - platforms -, # version : Version - version -, # releaseAttrs : ReleaseAttrs - releaseAttrs -, # releaseFeaturesAttrs : ReleaseFeaturesAttrs - releaseFeaturesAttrs -, -}: -let - # Useful imports - inherit (lib.lists) optionals; - inherit (lib.meta) getExe; - inherit (lib.strings) optionalString; -in -backendStdenv.mkDerivation (finalAttrs: { - # NOTE: Even though there's no actual buildPhase going on here, the derivations of the - # redistributables are sensitive to the compiler flags provided to stdenv. The patchelf package - # is sensitive to the compiler flags provided to stdenv, and we depend on it. As such, we are - # also sensitive to the compiler flags provided to stdenv. - inherit pname version; - strictDeps = true; - - outputs = with releaseFeaturesAttrs; - [ "out" ] - ++ optionals hasBin [ "bin" ] - ++ optionals hasLib [ "lib" ] - ++ optionals hasStatic [ "static" ] - ++ optionals hasDev [ "dev" ] - ++ optionals hasDoc [ "doc" ] - ++ optionals hasSample [ "sample" ]; - - src = fetchurl { - url = "https://developer.download.nvidia.com/compute/cuda/redist/${releaseAttrs.relative_path}"; - inherit (releaseAttrs) sha256; - }; - - # We do need some other phases, like configurePhase, so the multiple-output setup hook works. - dontBuild = true; - - nativeBuildInputs = [ - autoPatchelfHook - # This hook will make sure libcuda can be found - # in typically /lib/opengl-driver by adding that - # directory to the rpath of all ELF binaries. - # Check e.g. with `patchelf --print-rpath path/to/my/binary - autoAddOpenGLRunpathHook - markForCudatoolkitRootHook - ]; - - buildInputs = [ - # autoPatchelfHook will search for a libstdc++ and we're giving it - # one that is compatible with the rest of nixpkgs, even when - # nvcc forces us to use an older gcc - # NB: We don't actually know if this is the right thing to do - stdenv.cc.cc.lib - ]; - - # Picked up by autoPatchelf - # Needed e.g. for libnvrtc to locate (dlopen) libnvrtc-builtins - appendRunpaths = [ - "$ORIGIN" - ]; - - installPhase = with releaseFeaturesAttrs; - # Pre-install hook - '' - runHook preInstall - '' - # doc and dev have special output handling. Other outputs need to be moved to their own - # output. - # Note that moveToOutput operates on all outputs: - # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107 - + '' - mkdir -p "$out" - rm LICENSE - mv * "$out" - '' - # Handle bin, which defaults to out - + optionalString hasBin '' - moveToOutput "bin" "$bin" - '' - # Handle lib, which defaults to out - + optionalString hasLib '' - moveToOutput "lib" "$lib" - '' - # Handle static libs, which isn't handled by the setup hook - + optionalString hasStatic '' - moveToOutput "**/*.a" "$static" - '' - # Handle samples, which isn't handled by the setup hook - + optionalString hasSample '' - moveToOutput "samples" "$sample" - '' - # Post-install hook - + '' - runHook postInstall - ''; - - # The out output leverages the same functionality which backs the `symlinkJoin` function in - # Nixpkgs: - # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510 - # - # That should allow us to emulate "fat" default outputs without having to actually create them. - # - # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency. - postPhases = [ "postPatchelf" ]; - # For each output, create a symlink to it in the out output. - # NOTE: We must recreate the out output here, because the setup hook will have deleted it - # if it was empty. - # NOTE: Do not use optionalString based on whether `outputs` contains only `out` -- phases - # which are empty strings are skipped/unset and result in errors of the form "command not - # found: <customPhaseName>". - postPatchelf = '' - mkdir -p "$out" - for output in $outputs; do - if [ "$output" = "out" ]; then - continue - fi - ${getExe lndir} "''${!output}" "$out" - done - ''; - - # Make the CUDA-patched stdenv available - passthru.stdenv = backendStdenv; - - # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs - # from depending on `out` by default. - # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196 - # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs. - propagatedBuildOutputs = false; - - # By default, if the dev output exists it just uses that. - # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or - # anything of the sort. To remedy this, we set outputSpecified to true, and use - # outputsToInstall, which tells Nix which outputs to use when the package name is used - # unqualified (that is, without an explicit output). - outputSpecified = true; - - meta = { - inherit platforms; - description = "${description}. By downloading and using the packages you accept the terms and conditions of the ${finalAttrs.meta.license.shortName}"; - license = lib.licenses.nvidiaCudaRedist // { - url = "https://developer.download.nvidia.com/compute/cuda/redist/${releaseAttrs.license_path or "${pname}/LICENSE.txt"}"; - }; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - maintainers = lib.teams.cuda.members; - # Force the use of the default, fat output by default (even though `dev` exists, which - # causes Nix to prefer that output over the others if outputSpecified isn't set). - outputsToInstall = [ "out" ]; - }; -}) diff --git a/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/pkgs/development/compilers/cudatoolkit/redist/extension.nix deleted file mode 100644 index ea6fd581cde4f..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/extension.nix +++ /dev/null @@ -1,139 +0,0 @@ -# Type Aliases -# -# ReleaseAttrs : { -# "relative_path" : String, -# "sha256" : String, -# "md5" : String, -# "size" : String, -# } -# -# NOTE: PackageAttrs must have at least one of the arches. -# PackageAttrs : { -# "name" : String, -# "license" : String, -# "version" : String, -# "license_path" : None | String, -# "linux-aarch64" : None | ReleaseAttrs, -# "linux-ppc64le" : None | ReleaseAttrs, -# "linux-sbsa" : None | ReleaseAttrs, -# "linux-x86_64" : None | ReleaseAttrs, -# "windows-x86_64" : None | ReleaseAttrs, -# } -# -# ReleaseFeaturesAttrs : { -# "hasBin" : Boolean, -# "hasDev" : Boolean, -# "hasDoc" : Boolean, -# "hasLib" : Boolean, -# "hasOut" : Boolean, -# "hasSample" : Boolean, -# "hasStatic" : Boolean, -# "rootDirs" : List String, -# } -# -# NOTE: PackageFeatureAttrs must have at least one of the arches. -# PackageFeatureAttrs : { -# "linux-aarch64" : None | ReleaseFeaturesAttrs, -# "linux-ppc64le" : None | ReleaseFeaturesAttrs, -# "linux-sbsa" : None | ReleaseFeaturesAttrs, -# "linux-x86_64" : None | ReleaseFeaturesAttrs, -# "windows-x86_64" : None | ReleaseFeaturesAttrs, -# } -# -final: prev: -let - # NOTE: We use hasAttr throughout instead of the (?) operator because hasAttr does not require - # us to interpolate our variables into strings (like ${attrName}). - inherit (builtins) attrNames concatMap hasAttr listToAttrs removeAttrs; - inherit (final) callPackage; - inherit (prev) cudaVersion; - inherit (prev.lib.attrsets) nameValuePair optionalAttrs; - inherit (prev.lib.lists) optionals; - inherit (prev.lib.trivial) flip importJSON pipe; - - # Manifest files for CUDA redistributables (aka redist). These can be found at - # https://developer.download.nvidia.com/compute/cuda/redist/ - # Maps a cuda version to the specific version of the manifest. - cudaVersionMap = { - "11.4" = "11.4.4"; - "11.5" = "11.5.2"; - "11.6" = "11.6.2"; - "11.7" = "11.7.0"; - "11.8" = "11.8.0"; - "12.0" = "12.0.1"; - "12.1" = "12.1.1"; - "12.2" = "12.2.0"; - }; - - # Check if the current CUDA version is supported. - cudaVersionMappingExists = hasAttr cudaVersion cudaVersionMap; - - # Maps a cuda version to its manifest files. - # The manifest itself is from NVIDIA, but the features manifest is generated - # by us ahead of time and allows us to split pacakges into multiple outputs. - # Package names (e.g., "cuda_cccl") are mapped to their attributes or features. - # Since we map each attribute to a package name, we need to make sure to get rid of meta - # attributes included in the manifest. Currently, these are any of the following: - # - release_date - # - release_label - # - release_product - redistManifests = - let - # Remove meta attributes from the manifest - # removeAttrs : AttrSet String b -> Attr String b - removeMetaAttrs = flip removeAttrs [ "release_date" "release_label" "release_product" ]; - # processManifest : Path -> Attr Set (String PackageAttrs) - processManifest = flip pipe [ importJSON removeMetaAttrs ]; - # fullCudaVersion : String - fullCudaVersion = cudaVersionMap.${cudaVersion}; - in - { - # features : Attr Set (String PackageFeatureAttrs) - features = processManifest (./manifests + "/redistrib_features_${fullCudaVersion}.json"); - # manifest : Attr Set (String PackageAttrs) - manifest = processManifest (./manifests + "/redistrib_${fullCudaVersion}.json"); - }; - - # Function to build a single redist package - buildRedistPackage = callPackage ./build-cuda-redist-package.nix { }; - - # Function that builds all redist packages given manifests - buildRedistPackages = { features, manifest }: - let - wrapper = pname: - let - # Get the redist architectures the package provides distributables for - packageAttrs = manifest.${pname}; - - # Check if supported - # TODO(@connorbaker): Currently hardcoding x86_64-linux as the only supported platform. - isSupported = packageAttrs ? linux-x86_64; - - # Build the derivation - drv = buildRedistPackage { - inherit pname; - # TODO(@connorbaker): We currently discard the license attribute. - inherit (manifest.${pname}) version; - description = manifest.${pname}.name; - platforms = [ "x86_64-linux" ]; - releaseAttrs = manifest.${pname}.linux-x86_64; - releaseFeaturesAttrs = features.${pname}.linux-x86_64; - }; - - # Wrap in an optional so we can filter out the empty lists created by unsupported - # packages with concatMap. - wrapped = optionals isSupported [ (nameValuePair pname drv) ]; - in - wrapped; - - # concatMap provides us an easy way to filter out packages for unsupported platforms. - # We wrap the buildRedistPackage call in a list to prevent errors when the package is not - # supported (by returning an empty list). - redistPackages = listToAttrs (concatMap wrapper (attrNames manifest)); - in - redistPackages; - - # All redistributable packages for the current CUDA version - redistPackages = optionalAttrs cudaVersionMappingExists (buildRedistPackages redistManifests); -in -redistPackages diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json deleted file mode 100644 index 2fc999afd700a..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json +++ /dev/null @@ -1,879 +0,0 @@ -{ - "release_date": "2022-05-11", - "cuda_cccl": { - "name": "CXX Core Compute Libraries", - "license": "CUDA Toolkit", - "version": "11.7.58", - "linux-x86_64": { - "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-11.7.58-archive.tar.xz", - "sha256": "a66261d174a3f8fea87e0dc91e5cd084dda89be8bb0a1f5ca0ab5d05a93ade4a", - "md5": "674edc3ec85126c08f78e4e3280789fd", - "size": "1004048" - }, - "linux-ppc64le": { - "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-11.7.58-archive.tar.xz", - "sha256": "5482355647143e61b15cb6193f33a317dce94bb2475123d4b08eebbd7a801802", - "md5": "64c9f42b84cb64a7f67645cb74d2153f", - "size": "1004332" - }, - "linux-sbsa": { - "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-11.7.58-archive.tar.xz", - "sha256": "70a8a42135e4ab817cd3c3413dd993bfc7920a42f057838d2a4a2ff0966258bd", - "md5": "f6ac243b4b8d182941025040b0c375c3", - "size": "1003936" - }, - "windows-x86_64": { - "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-11.7.58-archive.zip", - "sha256": "29958e300229c7af43df57bed0519f34f3aa64332c84fb80e481c131e4594938", - "md5": "3a40e674c975fc35376e66b08b93a42c", - "size": "2563581" - } - }, - "cuda_cudart": { - "name": "CUDA Runtime (cudart)", - "license": "CUDA Toolkit", - "version": "11.7.60", - "linux-x86_64": { - "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-11.7.60-archive.tar.xz", - "sha256": "1c079add60a107f6dd9e72a0cc9cde03eb9d833506f355c22b9177c47a977552", - "md5": "1ef515eb31691f2c43fb0de1443893a3", - "size": "854744" - }, - "linux-ppc64le": { - "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-11.7.60-archive.tar.xz", - "sha256": "95ea51eb4d60754a080920105aa578cc8da8772295912f198fcaa13fafce6d24", - "md5": "ce9c3ac2d0a25de182e5519354e0e01b", - "size": "795244" - }, - "linux-sbsa": { - "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-11.7.60-archive.tar.xz", - "sha256": "bdfdb8467a0d1a5c6aeb696ec0c203d1da732093b5e5ee0a79b03ef53f5ab622", - "md5": "7d6290b6e7a0086c5dbf5706013dfdda", - "size": "798208" - }, - "windows-x86_64": { - "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-11.7.60-archive.zip", - "sha256": "e1c72413c42e9bda52d1868bb67136d66d03b394b9accdfd9224080bb5a9663e", - "md5": "bbeee57a158e8ce3abce79b19eae7110", - "size": "2884824" - } - }, - "cuda_cuobjdump": { - "name": "cuobjdump", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "f901085d83f83ae549de45e4410c74c3adddd2d541ba2780c23105df39008820", - "md5": "76a614c84b7221cc9282a3bf009ca401", - "size": "127416" - }, - "linux-ppc64le": { - "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "2fe257ab7027c7598d1351bb473d6a67a8da81fec17f60b389d16ef076c31da7", - "md5": "9ffb04f10fced993411d0601709c80fd", - "size": "140924" - }, - "linux-sbsa": { - "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "d44352344de0408d175b045401865ab82db4a53f3894e50c01445f42bbebdf8f", - "md5": "0b3bb58d13089bea74b3351cd7ed03d2", - "size": "123968" - }, - "windows-x86_64": { - "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-11.7.50-archive.zip", - "sha256": "3e7072d0a09c021252925ff9644d67294793afc5dc55ff2fac291528711ba0f9", - "md5": "070b5f13066888c471b90868485767ae", - "size": "2523866" - } - }, - "cuda_cupti": { - "name": "CUPTI", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "441f7da2608d1965f0e3e2e03aeea86b0a3454cbea8e7af8112529c9acef3853", - "md5": "6433be7629030ddbcf37f5286464bb0d", - "size": "16577596" - }, - "linux-ppc64le": { - "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "df70ad634864572b4eff7ebe15b768d48d909aabddf3b54da05cf7e27442bd8f", - "md5": "011ea37fd2f4af0755414c5432ba2649", - "size": "8627816" - }, - "linux-sbsa": { - "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "4615695d9240a423926238640c69d4b39044acc44d3d513bc08c51f16bea371e", - "md5": "53cefdd716d8c40ff7143822341c09b7", - "size": "8436580" - }, - "windows-x86_64": { - "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-11.7.50-archive.zip", - "sha256": "42a04b9ef71e4d95bc235a68dd4a75d1501a44e9964371435994f7a7c59cd489", - "md5": "4c61155dc79555ef6b389284a4f7b65a", - "size": "11546349" - } - }, - "cuda_cuxxfilt": { - "name": "CUDA cuxxfilt (demangler)", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "8a9cb0af698fe39c1b92d179e9ac22e8acb752eb8c531dbfdd049ddcd3c2caa6", - "md5": "0f7eb48184c16e51ad76574cc112e01c", - "size": "186432" - }, - "linux-ppc64le": { - "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "a2a9a5ace0908071f0bcf4fa1e537c8373d7ef6a18d086d85a2c72cb8dc245b7", - "md5": "6be41e32ff0274c1be4cb3b6a6429b21", - "size": "181612" - }, - "linux-sbsa": { - "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "c7c014ec407c77eae16451559a7499c8ff371606abc8e1b40e47eedab8d5a5b8", - "md5": "2a7553a48f6c8048d1667c16fec03035", - "size": "172292" - }, - "windows-x86_64": { - "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-11.7.50-archive.zip", - "sha256": "e93e1d37332ad5adf663a712250710d03a718f4d85702aec4e24b5bf98e2fe7a", - "md5": "f34c83f9a81d0fdae3950a9778442345", - "size": "168940" - } - }, - "cuda_demo_suite": { - "name": "CUDA Demo Suite", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "10dec9f42f7c60ba8d2e839bedf155addb6a02ebf9a3b2b1c7acbcc47e6e4721", - "md5": "4501fa48dcf450f1de5e7b0352859dfa", - "size": "3985972" - }, - "windows-x86_64": { - "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-11.7.50-archive.zip", - "sha256": "803bab94b1b4f304ddba4c2adcc013a1aaf5251f962d154287f6d880cb3f16a1", - "md5": "a240da5cbf8ddcbf44ec969a7c57d68d", - "size": "5023822" - } - }, - "cuda_documentation": { - "name": "CUDA Documentation", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "90a169f4c1c782cdd1b1bf1e13f3e9f4ef57f731d87d8fefae115b166032a084", - "md5": "1d5f61928ed525f7324e1f600719a786", - "size": "67056" - }, - "linux-ppc64le": { - "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "8c799c128afcf870ea63e73b8a33d924d60bc4281ef77c32c92d0081a7d523c8", - "md5": "e5f4d0b477f90698adb4919e1341c407", - "size": "67060" - }, - "linux-sbsa": { - "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "a2f50b49fe31b0637602743a756df16e6ec3dfc95279d4bb25a9eb1f6de3a80b", - "md5": "9316169eca11c975157e77e3649f8a1f", - "size": "67060" - }, - "windows-x86_64": { - "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-11.7.50-archive.zip", - "sha256": "2c497e6ca5ffb440d0504adef51d4e979273959d42a6a22b20cd702085b71f39", - "md5": "957cde6fd6211919ac4ca823d3cc90e9", - "size": "105283" - } - }, - "cuda_gdb": { - "name": "CUDA GDB", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "ff44bffb8034a694ba6a2c5e171fc766ddc6d9e328b29eab8dd02177d6914f6c", - "md5": "72b1fa5a914443acc3eeda12da0aa059", - "size": "64209508" - }, - "linux-ppc64le": { - "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "e442ef2eaaa778ffadb6af3ed92316eddff0dff15b69e334338da5f450203f43", - "md5": "6a02488128531898f252163a41c84f93", - "size": "64109072" - }, - "linux-sbsa": { - "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "f67bae946aaa60a57d7b781a2fe044bde267da58c418067d8be6cbb63959966b", - "md5": "3a654d775d9b1466ca00585adc179744", - "size": "64025944" - } - }, - "cuda_memcheck": { - "name": "CUDA Memcheck", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_memcheck/linux-x86_64/cuda_memcheck-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "12fa99422d9a7ce1714e100cc9faa4c9d37590d79d0af93abc8321217cbf5abd", - "md5": "5b29092a20eb8501651f64af028623aa", - "size": "139652" - }, - "linux-ppc64le": { - "relative_path": "cuda_memcheck/linux-ppc64le/cuda_memcheck-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "3bed410c4fcaf106f1411a9373bb0091ee46a29f2e980eba4ee274710d8e4f19", - "md5": "952e68b3e321df1bdc94327ea186603d", - "size": "148036" - }, - "windows-x86_64": { - "relative_path": "cuda_memcheck/windows-x86_64/cuda_memcheck-windows-x86_64-11.7.50-archive.zip", - "sha256": "79294688bdbed786b68873bc02f8a279b6ce7a468486da365642e3c727cedd9e", - "md5": "a6512b0c6fe6aa4f81a6027a64110860", - "size": "172868" - } - }, - "cuda_nsight": { - "name": "Nsight Eclipse Edition Plugin", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "483a4970a38c9366c2d3bf7d2ea9d2e2486a13ecaa3bd6ed143a4b18a8fe84b9", - "md5": "50eaa0de2047b89aa358682c6937a83a", - "size": "118603148" - }, - "linux-ppc64le": { - "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "93ece42ff578135e10cc7d8bfa4c42449f259d955cf1b71652b7436e2f6854f2", - "md5": "9e2cfb70f748efcc22c611938099ccbf", - "size": "118603136" - } - }, - "cuda_nvcc": { - "name": "CUDA NVCC", - "license": "CUDA Toolkit", - "version": "11.7.64", - "linux-x86_64": { - "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-11.7.64-archive.tar.xz", - "sha256": "7721fcfa3eb183ecb1d7fe138ce52d8238f0a6ecf1e9964cf8cfe5d8b7ec3c92", - "md5": "640e1e412e0ff6d7eee95e513f67cadb", - "size": "37056600" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-11.7.64-archive.tar.xz", - "sha256": "59792975fe7ba2cb75977965a1eebfc684d4e301a34c43f5f4295124d21c097c", - "md5": "0f409845cbe3ed70a6abc971024b1d72", - "size": "34873208" - }, - "linux-sbsa": { - "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-11.7.64-archive.tar.xz", - "sha256": "4ba91cfcc7b12b997ed2ceced176f6aa1f7c101a65c0ab6faae9a8fee6d107f1", - "md5": "a3ef626196d63f7db7c3c62d80564ab3", - "size": "32632012" - }, - "windows-x86_64": { - "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-11.7.64-archive.zip", - "sha256": "dcb47e8c04560a369cc6154242afdb29223e8ceaaf6ea6097e2add09ed64d386", - "md5": "de3eb321caac960358731fb07c26e2a2", - "size": "47659565" - } - }, - "cuda_nvdisasm": { - "name": "CUDA nvdisasm", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "4e22b735b9553a286390dc76b02e5a7f21dc71234852d7f4f8cf2572fef1a479", - "md5": "471deeab3bc3ce504c75b77670ad5140", - "size": "32776640" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "1111d62bd0baefdf86de2dd148e44815d04c53d66dff2a1f5a700dd6ec32cce5", - "md5": "a1ec03d58d37927080425425a820dee8", - "size": "32780884" - }, - "linux-sbsa": { - "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "3a9ece8dfb6e93c0e9b6da6753c77c9fb815b42ffc91ee710fbc02b421b0d864", - "md5": "3e2cb3ff5390077d97d0d847c423d499", - "size": "32730316" - }, - "windows-x86_64": { - "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-11.7.50-archive.zip", - "sha256": "03403fc8ea81178855e5338623700421c91606e71ef8747568554a0ab5b18355", - "md5": "03ea5bb697502568d5b9fb9577974cf7", - "size": "33004702" - } - }, - "cuda_nvml_dev": { - "name": "CUDA NVML Headers", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "b6f101106e5ed980bf89b2868cf0b32dd36a28c47e879ee70fca1b85de047fba", - "md5": "f8c3a8033eda7215cf2a7b0b1325b5f1", - "size": "76548" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "a3f4dbeeec6d6eb6562fd4c432c70a5071aa3e0bbf008118a1676079b4bf646f", - "md5": "cd92d1a16f3e60e9620320d18c0e5a6a", - "size": "76088" - }, - "linux-sbsa": { - "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "ddc4d1c7dafa9a05e387048a561ec01cad16e33276358201f8682780e451037d", - "md5": "156e76ed54c7547a11fc6a725d212762", - "size": "76728" - }, - "windows-x86_64": { - "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-11.7.50-archive.zip", - "sha256": "f3cea20a5c75dbe341b11c3fabfbafcc2da6d0d60654cdd46960e941e33dca50", - "md5": "2d92f9c4ef5dac8253f5e73e6f428251", - "size": "106750" - } - }, - "cuda_nvprof": { - "name": "CUDA nvprof", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "8222eebaf3fe6ca1e4df6fda09cbd58f11de6d5b80b5596dcf5c5c45ae246028", - "md5": "1fa983b921821b0d38dfc7c5b8234d88", - "size": "1944796" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "dbf2f41b1c42fe05c9ce0865dfefe867c91a22394acfb03606a4de9cbf07f236", - "md5": "865a189bcdc7900e55f1a3e545c312da", - "size": "1600116" - }, - "linux-sbsa": { - "relative_path": "cuda_nvprof/linux-sbsa/cuda_nvprof-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "5894195fdaf1e550601649fdf93aa93fa042bd3e298867cf95007080b10757ac", - "md5": "e3e336dd70f215866864131b889a8261", - "size": "16148" - }, - "windows-x86_64": { - "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-11.7.50-archive.zip", - "sha256": "3a115b5bc3bf733cb6fe9d414ae5375928ea75fb1f84112b897015434bc4fc25", - "md5": "7fc781f7e740bb6a7a45b593fe8c70a0", - "size": "1603305" - } - }, - "cuda_nvprune": { - "name": "CUDA nvprune", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "b5c13830f910979be229943cefe70297382ba6c1bddba91174d4837a94c7922d", - "md5": "d57409d45bd27a917b90e05e78941326", - "size": "55220" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "ecace952b4b4631fa347f77371de485f7611525773bc90587f4c639cd51362e7", - "md5": "5359a59af33523f5d5d58d0bf6cb6b9a", - "size": "55928" - }, - "linux-sbsa": { - "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "dfc069568ca54425a8bb8c674f2d70218546f64a6836fb918d233becff046624", - "md5": "6fdc59145fe540946f9e3ea793f09152", - "size": "47656" - }, - "windows-x86_64": { - "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-11.7.50-archive.zip", - "sha256": "605aed14b9832712c81cf36acf389a22023a0737604ff3a1cbdd7338b0780ea4", - "md5": "3f105e39da981703ab5a95bfeaf112b9", - "size": "144827" - } - }, - "cuda_nvrtc": { - "name": "CUDA NVRTC", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "a0891b98d5d38f6ae64833c483ccf51417e25b54f0242a5872fabc7c96300f3a", - "md5": "e1e1bdd085b979196fc87d2d7d20d237", - "size": "28103056" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "b801983bd480b6a75eeb3b4db41a840de66d3f764ca89440e135d62ae249144e", - "md5": "f39ef8fbca0ed175a4815b2c4482b676", - "size": "26239068" - }, - "linux-sbsa": { - "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "5d4788a5b3c06d88179824976c8e5e7c76683dfe3bd1e5634ac2037de62b385f", - "md5": "609d991b06e17e9f0a85c6e93bbf052b", - "size": "26084572" - }, - "windows-x86_64": { - "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-11.7.50-archive.zip", - "sha256": "252ae0cd65b1b73208454966f91239d0e8f11232de966c41d8cf3009fe402415", - "md5": "6476681ad45cfd18e7cc3f5b16c9111b", - "size": "93548358" - } - }, - "cuda_nvtx": { - "name": "CUDA NVTX", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "b90454efe80e4fcd328e6250279e4392a01db9035c7317355760c66048899568", - "md5": "b14a508a57f1311321b6cb552fde7a9f", - "size": "48176" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "3dc37a91b9a7769d4ab329d99d8779b7f6feaae63e8fc69d7d5da284cb82efe9", - "md5": "eae8b204b8af373dc52ec1cad399dce5", - "size": "48156" - }, - "linux-sbsa": { - "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "b803160fe20715c23a6266849d2a23d298fe7c7e427ec77aca9121d667526441", - "md5": "5262caba03904cf79884266f30962f8b", - "size": "48768" - }, - "windows-x86_64": { - "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-11.7.50-archive.zip", - "sha256": "cec2aabca78c95a2d6c793372684b060fc695035f568225fd735880331d71e25", - "md5": "27b8357312c82ee327b3ec86cb2cecec", - "size": "65690" - } - }, - "cuda_nvvp": { - "name": "CUDA NVVP", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "6489169df1a4f37cba0c00c3c0e24ac6265bfe06fcca1d4bf3f5824bc937ef9f", - "md5": "94951715e2f099553ddd57f40ab4f06c", - "size": "117571592" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "b54fa7fc79788f991332139ecf722cc834b544d111f476531a3db82b8c15c2b0", - "md5": "ece4a0e7524037f64cd81a9a6c85db0c", - "size": "117008156" - }, - "windows-x86_64": { - "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-11.7.50-archive.zip", - "sha256": "8b8ddaca9958a58a78f7f50f87ecee3ecb148fe99b0cce6ed37e3ba0ecb6d14f", - "md5": "6880ab3d2ae9526e6d5a376fb24dea8e", - "size": "120360546" - } - }, - "cuda_sanitizer_api": { - "name": "CUDA Compute Sanitizer API", - "license": "CUDA Toolkit", - "version": "11.7.50", - "linux-x86_64": { - "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-11.7.50-archive.tar.xz", - "sha256": "9555ae397290608c7a64c929fc80186860008cc8c4afb0bd49deece3a5ca2fc4", - "md5": "6b5910c5096decaa4b5c30f3bff3df38", - "size": "8314100" - }, - "linux-ppc64le": { - "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-11.7.50-archive.tar.xz", - "sha256": "f303a56fd501ce13aa7f12c03137fefd823899b19c26ab53cd314baf47b9b3c7", - "md5": "6dc14023de7354aa6f17b833d3adf89e", - "size": "7739868" - }, - "linux-sbsa": { - "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-11.7.50-archive.tar.xz", - "sha256": "14c5ffde6606c97a92b7e72dd0987509c3fe876ad57bfe3a88d2b897125a442e", - "md5": "84fd52cea0512e63d95ebf62038137f0", - "size": "6453516" - }, - "windows-x86_64": { - "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-11.7.50-archive.zip", - "sha256": "090f657396b35d749f0f755b684151d274ae3f392790055f3b659daeee068622", - "md5": "685f72ea969afbbebeaba721310618ed", - "size": "13477221" - } - }, - "fabricmanager": { - "name": "NVIDIA Fabric Manager", - "license": "NVIDIA Driver", - "version": "515.43.04", - "linux-x86_64": { - "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-515.43.04-archive.tar.xz", - "sha256": "2f4bce4620ce69683428d1752464adcaef466fc471d82618e28d554c7591efe6", - "md5": "3dfc3ea1f13a346cfc155c09d80fb48c", - "size": "1470572" - }, - "linux-sbsa": { - "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-515.43.04-archive.tar.xz", - "sha256": "eb5cda2505cb5fcc3508ab84e8703d9cf318e0df5c2e5b0a832b4fa243b88bea", - "md5": "6fd2d3c94b8ccb826d4986fa970261f1", - "size": "1358156" - } - }, - "libcublas": { - "name": "CUDA cuBLAS", - "license": "CUDA Toolkit", - "version": "11.10.1.25", - "linux-x86_64": { - "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-11.10.1.25-archive.tar.xz", - "sha256": "27f5975b0b373f5fc96ac2f4ec9f28de3eb07f674acc0b0a5262dd2c76ddc5ff", - "md5": "f183769621c14cd447bb50fa51088c7b", - "size": "432986132" - }, - "linux-ppc64le": { - "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-11.10.1.25-archive.tar.xz", - "sha256": "85aa62b4c23f42f28bc428e84604b4dcb04960db1926c8c2216d5747f0366ab1", - "md5": "ca6ce43480df02cd6e5b96e416a02e64", - "size": "422295044" - }, - "linux-sbsa": { - "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-11.10.1.25-archive.tar.xz", - "sha256": "76c50490afd19dc5fdab31281380e0d1a7217dfebecb31477e78e452cac4e0a6", - "md5": "748bd159248469f80f67edd4028ac2dd", - "size": "422563144" - }, - "windows-x86_64": { - "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-11.10.1.25-archive.zip", - "sha256": "d1b47527b0fc33f1b185af38590a1d5d7d04c0c71c74c19a488547f9c0a62e7c", - "md5": "989c46ebd961d177f8bc2ba0a03955b7", - "size": "311249638" - } - }, - "libcufft": { - "name": "CUDA cuFFT", - "license": "CUDA Toolkit", - "version": "10.7.2.50", - "linux-x86_64": { - "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-10.7.2.50-archive.tar.xz", - "sha256": "70c4c2abb9d77210a5d2313abfdddf1857d654d1cf925946a645793bc14714c5", - "md5": "fe80583fbf4ce9195db760dc9465da2f", - "size": "213404700" - }, - "linux-ppc64le": { - "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-10.7.2.50-archive.tar.xz", - "sha256": "f229818bfee4d90aa4a9022a00d26efa749fdb4f61af1ba47b65a9f8dffd1521", - "md5": "66768c4e73bd0402be32486ef9ff4952", - "size": "213735112" - }, - "linux-sbsa": { - "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-10.7.2.50-archive.tar.xz", - "sha256": "9aaeae3c1a53ee4cc17c05557f2e30b65581d5d590130d5e205193beceed345d", - "md5": "967617dbb350fdd19771bea836e68744", - "size": "212335968" - }, - "windows-x86_64": { - "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-10.7.2.50-archive.zip", - "sha256": "931f380e666dd8dc44b72fb79224c27c720d37310312e9e421e71f16a5e312e1", - "md5": "24eb68afe151ab2d7a2c787aeb382d9a", - "size": "287120306" - } - }, - "libcufile": { - "name": "CUDA cuFile", - "license": "CUDA Toolkit", - "version": "1.3.0.44", - "linux-x86_64": { - "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.3.0.44-archive.tar.xz", - "sha256": "2a0a9102596c84afa9afed014fee73630a534ceaef2857c43646f6c9ffba2b95", - "md5": "1bacdbc9a48e4e188dfffe15ab062358", - "size": "46784140" - } - }, - "libcurand": { - "name": "CUDA cuRAND", - "license": "CUDA Toolkit", - "version": "10.2.10.50", - "linux-x86_64": { - "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.2.10.50-archive.tar.xz", - "sha256": "a05411f1775d5783800b71f6b43fae660e3baf900ae07efb853e615116ee479b", - "md5": "a9f272f6683a79c7b8fa02ae1149f3ad", - "size": "82110640" - }, - "linux-ppc64le": { - "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.2.10.50-archive.tar.xz", - "sha256": "4c9bc79ab38c3aca8081ea4fcd05876742657659f640c87f7af2a00f4f968787", - "md5": "6c714d6725554dd57265812c7a721454", - "size": "82156504" - }, - "linux-sbsa": { - "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.2.10.50-archive.tar.xz", - "sha256": "78577951e086501bb9222a55a07bd271dceae5fecdce17625bc453db549e96eb", - "md5": "911370c7ba791366d281e4ff62daa2b4", - "size": "82100856" - }, - "windows-x86_64": { - "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.2.10.50-archive.zip", - "sha256": "c96a539a76e6062222e66abde64ca19ff6d89729af81a0efc157ba50277edfa9", - "md5": "6afa80c834b57ab398708e735b564592", - "size": "53656547" - } - }, - "libcusolver": { - "name": "CUDA cuSOLVER", - "license": "CUDA Toolkit", - "version": "11.3.5.50", - "linux-x86_64": { - "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.3.5.50-archive.tar.xz", - "sha256": "7ed168c7fda04a4a640f6225cb76d5251a39e3d35db7630d3646cec58de724f8", - "md5": "cc6b0e4d97d7d73f302095cda1499167", - "size": "80742472" - }, - "linux-ppc64le": { - "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.3.5.50-archive.tar.xz", - "sha256": "341889b3c3107f7e3700693fcf815f816a8ffdfc6f2a1ca0f132ea651cb51739", - "md5": "0f038f45a4d5195d771d812ba47a34fa", - "size": "80769552" - }, - "linux-sbsa": { - "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.3.5.50-archive.tar.xz", - "sha256": "4832fd6dca50b2b05d07f086eaa44f953e9b1cd0f00b083f780e0ee1c17461db", - "md5": "a7361cc09dc63a6dee54937a12a8004b", - "size": "79972404" - }, - "windows-x86_64": { - "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.3.5.50-archive.zip", - "sha256": "918a8ed855ef683fa2b4f38e50e8275246b48c266e1066fdcf2bf6db16c9fc6a", - "md5": "68c75bd8d556a24d6d204e8007eb1f38", - "size": "111712983" - } - }, - "libcusparse": { - "name": "CUDA cuSPARSE", - "license": "CUDA Toolkit", - "version": "11.7.3.50", - "linux-x86_64": { - "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-11.7.3.50-archive.tar.xz", - "sha256": "c56ddd2d4deebb02bf1e082905f13cac7c685bfa415f1c489dd5fe382cf1f5de", - "md5": "04a62c2f92bc0608989bd82b4034d91f", - "size": "199048536" - }, - "linux-ppc64le": { - "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-11.7.3.50-archive.tar.xz", - "sha256": "d756707e6c84c9ae4b174467d8afba10883f8f286aba26a9230698b73fd187e3", - "md5": "bf56661d346440de2242530fed4027b9", - "size": "199115552" - }, - "linux-sbsa": { - "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-11.7.3.50-archive.tar.xz", - "sha256": "e2f8a0339739c3d7aa163d98452dcf3e6b71b164d7ff5b999dd35af31d950bc4", - "md5": "21ae0da8af1b60bb0e9f658c16730300", - "size": "198793236" - }, - "windows-x86_64": { - "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-11.7.3.50-archive.zip", - "sha256": "e7044f4cbce8712f407d041f2116cf61a8831e21d96f28c4c9ca8512847afc28", - "md5": "b20eef48a3a956b8643eb7cf457764b9", - "size": "167174067" - } - }, - "libnpp": { - "name": "CUDA NPP", - "license": "CUDA Toolkit", - "version": "11.7.3.21", - "linux-x86_64": { - "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-11.7.3.21-archive.tar.xz", - "sha256": "4d5f12e756304828cdbbe67dfa94a75432ee07cfe11f034aa4325e59e3c708f7", - "md5": "9c7ba42831e40f15b5b94543c659a74b", - "size": "164601168" - }, - "linux-ppc64le": { - "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-11.7.3.21-archive.tar.xz", - "sha256": "e3064176e6e0843e5f2d1bd247512be76ca3018364fd7bf77fec34b0bfae37a2", - "md5": "4106d95423169f59b5af3bbe3a9e38bf", - "size": "164864392" - }, - "linux-sbsa": { - "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-11.7.3.21-archive.tar.xz", - "sha256": "9cb63cd9d79a490a2504dbf8186d35d391d3e69f74353784955d33d550c83010", - "md5": "d5780f7e9a1ba1c3441f810fad68fc32", - "size": "163688528" - }, - "windows-x86_64": { - "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-11.7.3.21-archive.zip", - "sha256": "490a171c6db5e42f67502c0774678166f8018fe464f7e6c8a7b47e10c9fa3861", - "md5": "db863d019ff3029a9a14855ff85f6958", - "size": "125480452" - } - }, - "libnvidia_nscq": { - "name": "NVIDIA NSCQ API", - "license": "NVIDIA Driver", - "version": "515.43.04", - "linux-x86_64": { - "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-515.43.04-archive.tar.xz", - "sha256": "b0690b271e65cc2096a0de15aa7003c64e336bc5f4c48a7fc87a9b355d240e2a", - "md5": "03edfd4d08b358ec3cc98cef63e5138c", - "size": "334904" - } - }, - "libnvjpeg": { - "name": "CUDA nvJPEG", - "license": "CUDA Toolkit", - "version": "11.7.2.34", - "linux-x86_64": { - "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-11.7.2.34-archive.tar.xz", - "sha256": "0457a11af6903d63aec942e2884e02002c3d579071eacd89f08a25cab339f5eb", - "md5": "d6acf73e518edb33c4b7e7f3cb85aa46", - "size": "2042120" - }, - "linux-ppc64le": { - "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-11.7.2.34-archive.tar.xz", - "sha256": "70afb2d27b430dd4c43f1dc342e8725d148701093cdebc68a75d6dbaf6615d3f", - "md5": "acdf6594c58b6178cf0d83948e8c69b5", - "size": "2060012" - }, - "linux-sbsa": { - "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-11.7.2.34-archive.tar.xz", - "sha256": "8638f70021ad0e9006ec78c0b4f88f787e9d7862176447288f84a2b7d68769f2", - "md5": "e3d6b429ab22b4c16476df2f936e46ba", - "size": "1893316" - }, - "windows-x86_64": { - "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-11.7.2.34-archive.zip", - "sha256": "a3594ff7a5431495bc70763c2578ade0a32c74745803b820e49ef52cca2a872b", - "md5": "c4c259d4b7833e6cbe1505bf6b62229d", - "size": "2055730" - } - }, - "nsight_compute": { - "name": "Nsight Compute", - "license": "NVIDIA SLA", - "version": "2022.2.0.13", - "linux-x86_64": { - "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2022.2.0.13-archive.tar.xz", - "sha256": "426949d42646164b884ee3025bd5e6b6fef8e904ed69705b7cf3cab9af1fc531", - "md5": "0f5700c465c92210a1eadea199b9e07a", - "size": "420951860" - }, - "linux-ppc64le": { - "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2022.2.0.13-archive.tar.xz", - "sha256": "42c090ffe500b3a6c54c60a17b4f4856d230c558642841edb2b7bb725438be8c", - "md5": "ee1f8f57b827862c36bc6807e9a38424", - "size": "126737380" - }, - "linux-sbsa": { - "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2022.2.0.13-archive.tar.xz", - "sha256": "4a442d5b6d0b599669ae30d342f46a0c8d047b3a7476b4419435dfe7187e23b8", - "md5": "11eec62f941d071b9f7c46855cc75a0b", - "size": "246004808" - }, - "windows-x86_64": { - "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2022.2.0.13-archive.zip", - "sha256": "1f06f2d769c9c61c691c59f8c33f214aae6514d41f3eac5073c9310b7b487764", - "md5": "c2eb253d66b9258babc1bf9471033691", - "size": "354364680" - } - }, - "nsight_nvtx": { - "name": "Nsight NVTX", - "license": "CUDA Toolkit", - "version": "1.21018621", - "windows-x86_64": { - "relative_path": "nsight_nvtx/windows-x86_64/nsight_nvtx-windows-x86_64-1.21018621-archive.zip", - "sha256": "d99b015bfb1308206f9d7c16ea401bf426fed3a5a99953b855fe4e68be5ed2d1", - "md5": "34ee04d45cfca1c4e3cbfba0ec8f6f80", - "size": "315692" - } - }, - "nsight_systems": { - "name": "Nsight Systems", - "license": "NVIDIA SLA", - "version": "2022.1.3.3", - "linux-x86_64": { - "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2022.1.3.3-archive.tar.xz", - "sha256": "bd95553d573f117be2e3b2bda6e79d14dbb038b136c12c6e5467bbd9a891681d", - "md5": "40d12d33aa2d496817d959a9551418aa", - "size": "166785296" - }, - "linux-ppc64le": { - "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2022.1.3.3-archive.tar.xz", - "sha256": "4c228bfbd38b80612afeb65a406cba829d2b2e2352ea4a810cd6a386d6190151", - "md5": "0d5da67cb5393a0e961509cd7dab98f1", - "size": "49700384" - }, - "linux-sbsa": { - "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2022.1.3.3-archive.tar.xz", - "sha256": "9025f56b9fe70288ee3f2d30477c9cfbe8c17a304b31f7f22caf7f78153d8d23", - "md5": "3559eeb8416d9a984012d2b397560740", - "size": "50415564" - }, - "windows-x86_64": { - "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2022.1.3.3-archive.zip", - "sha256": "294738ba0aa0621395740a6d039a490aa0bf5fceec449b1fd4135a97b81eda0f", - "md5": "91e316744714c168c1a75804c9a198c9", - "size": "315748009" - } - }, - "nsight_vse": { - "name": "Nsight Visual Studio Edition (VSE)", - "license": "NVIDIA SLA", - "version": "2022.2.0.22095", - "windows-x86_64": { - "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2022.2.0.22095-archive.zip", - "sha256": "b346aadf59d633b114b5e5b3ed437f8eee2bb2b8d532da0ee374ef8af9149cb2", - "md5": "63d3a5f0c9abaa027efbe0f476dc7c21", - "size": "459001482" - } - }, - "nvidia_driver": { - "name": "NVIDIA Linux Driver", - "license": "NVIDIA Driver", - "version": "515.43.04", - "linux-x86_64": { - "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-515.43.04-archive.tar.xz", - "sha256": "933ffd8f73e86e78299daf0b8612f8c24fe4b55cc15c2be353fbfbda3f1d62ea", - "md5": "19cf2b2e3d3f6f7786791db89e3a193a", - "size": "361628336" - }, - "linux-ppc64le": { - "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-515.43.04-archive.tar.xz", - "sha256": "369998c33a867945193cc3c1c3c78defa7c0309767d926bc871cc02ad659ed61", - "md5": "486f222d765d7ce5163d257a4b0e5420", - "size": "75667264" - }, - "linux-sbsa": { - "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-515.43.04-archive.tar.xz", - "sha256": "a534d8112bc15deb5f0e1c471382d776f4daebef25244869eaf5c935016b8fb7", - "md5": "5e699844a414a6f40e8c1399dd0f4c9d", - "size": "221246660" - } - }, - "nvidia_fs": { - "name": "NVIDIA filesystem", - "license": "CUDA Toolkit", - "version": "2.12.4", - "linux-x86_64": { - "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.12.4-archive.tar.xz", - "sha256": "913010942a7b6781a9e8fb8082654fda7ad0cce703f726e05d571fe6551f450a", - "md5": "48d30f73ec1b6c8df7e70139aefeec4e", - "size": "67152" - } - }, - "visual_studio_integration": { - "name": "CUDA Visual Studio Integration", - "license": "CUDA Toolkit", - "version": "11.7.50", - "windows-x86_64": { - "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-11.7.50-archive.zip", - "sha256": "4eb993cfb46ec925b6907f1433102ae00f0141e57bcfd40489eeaf72e67f0eeb", - "md5": "d770d51465dc15345a1ca1307e269832", - "size": "517028" - } - } -} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.2.0.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.2.0.json deleted file mode 100644 index f4ba3034ca8ec..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.2.0.json +++ /dev/null @@ -1,1151 +0,0 @@ -{ - "release_date": "2023-06-28", - "release_label": "12.2.0", - "release_product": "cuda", - "cuda_cccl": { - "name": "CXX Core Compute Libraries", - "license": "CUDA Toolkit", - "license_path": "cuda_cccl/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "3a665ffb51a3d21dc08f28e316ee035ad2381301eca65a36e657d434a27f8aa2", - "md5": "1a44f8f3bb192c8139ddfc109818e41d", - "size": "1106044" - }, - "linux-ppc64le": { - "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-12.2.53-archive.tar.xz", - "sha256": "6cb035a15fd91436b17c66c06c15f7bff6efe70a2ca6d7a89fc1c85ab3b146ad", - "md5": "52073df19d7f2925956888c72e2de461", - "size": "1106412" - }, - "linux-sbsa": { - "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.2.53-archive.tar.xz", - "sha256": "fe020baf2784a7745cb7db1df22d9abe13528a4ce0984c10ffc892a27507a7d9", - "md5": "e991c3c63effb228b0ea38edb84414f6", - "size": "1105768" - }, - "windows-x86_64": { - "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.2.53-archive.zip", - "sha256": "a2f5579e23f24dd50cfb72d2ee28fb8ed3a7cb1484602df66fa808fe9defb6b3", - "md5": "0e23f2e0f3dd484ae4b770183f9d63d3", - "size": "2957130" - }, - "linux-aarch64": { - "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.2.53-archive.tar.xz", - "sha256": "6e6b4c01334778beed0b4320f067758c5c77701e573d8e502a7ffc51843faf7e", - "md5": "29a3d1c635fc4ee82aa1ab17a3aadc71", - "size": "1106468" - } - }, - "cuda_compat": { - "name": "CUDA compat L4T", - "license": "CUDA Toolkit", - "license_path": "cuda_compat/LICENSE.txt", - "version": "12.2.33189084", - "linux-aarch64": { - "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.2.33189084-archive.tar.xz", - "sha256": "e31c801017be83f2ba875f5b9afec91f8ff7b9c71d19b6591f7a85c03043236e", - "md5": "7cbaca4d76bacbb657f0b21aa815deb4", - "size": "18690068" - } - }, - "cuda_cudart": { - "name": "CUDA Runtime (cudart)", - "license": "CUDA Toolkit", - "license_path": "cuda_cudart/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "e21fb4fc9152f5bbeea94b860b70546545d4a9a36ae3e33f508de15908d47b76", - "md5": "025fbfcecbb9b09e0ae2427b6d5a8472", - "size": "1000396" - }, - "linux-ppc64le": { - "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-12.2.53-archive.tar.xz", - "sha256": "fa18c6c76182ded75ea76a5db54097ed852b1e164e15f29d48b95bd589e2a872", - "md5": "535ced6ae08940680ed4dd80735a4138", - "size": "989476" - }, - "linux-sbsa": { - "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.2.53-archive.tar.xz", - "sha256": "77310096876cd6c4fae7508225d180f30f4ab6cca73634aa18a11c2e4f0ebde6", - "md5": "fab5c7525a3c4d959f042b4043556d4f", - "size": "999804" - }, - "windows-x86_64": { - "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.2.53-archive.zip", - "sha256": "950c71e53aa168d8459ad49050eae5d531b0c024cf0a2d176024d83dea9d3555", - "md5": "3772988f5a5771c914aee8a2c9a2163a", - "size": "2416404" - }, - "linux-aarch64": { - "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.2.53-archive.tar.xz", - "sha256": "7aaa03032bc9abb7a04f9215bc13e7a5fff5f8fd83a537b79c4f9dd7983bd1d1", - "md5": "9fd906e2964883d3df346ec5b0f8b6cb", - "size": "1066396" - } - }, - "cuda_cuobjdump": { - "name": "cuobjdump", - "license": "CUDA Toolkit", - "license_path": "cuda_cuobjdump/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "420e0a60e11b0187e107d791007b63f87eec143fdab50ba08cadcf45dfbba8c5", - "md5": "a5398dd80c504cc52138b3fb3bd58e9a", - "size": "170828" - }, - "linux-ppc64le": { - "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-12.2.53-archive.tar.xz", - "sha256": "831692e3e23c9655fd02f9b19704d0adcd65c7cc1f2cf6143bc2dddbf0f2f468", - "md5": "292ace508f5c82d7e113b3fe2360817f", - "size": "212824" - }, - "linux-sbsa": { - "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.2.53-archive.tar.xz", - "sha256": "b77c73ab4ea28a98f41ee88884bcfe3c93b7f6d646984376a0dca870cd73ec87", - "md5": "0da93b2444f0f7d413556a396607aab6", - "size": "179248" - }, - "windows-x86_64": { - "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.2.53-archive.zip", - "sha256": "36676a17558a3a8137c7259f255854bd6eac8489787a4dc72796da8f100ad9bd", - "md5": "0def615994e278707a4609da17ed8a5d", - "size": "3776112" - }, - "linux-aarch64": { - "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.2.53-archive.tar.xz", - "sha256": "aae7adce1a84af830c8a92dd46a60eeb7dcb8cedb9a18c6d9e619f50c6adf9f5", - "md5": "bf9ea89b071cfcab146add4ed365dcd0", - "size": "163804" - } - }, - "cuda_cupti": { - "name": "CUPTI", - "license": "CUDA Toolkit", - "license_path": "cuda_cupti/LICENSE.txt", - "version": "12.2.60", - "linux-x86_64": { - "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.2.60-archive.tar.xz", - "sha256": "494663c1ac68f5f8ee86adc31de34089ec4f4fb5e174503298722474adf864f9", - "md5": "f6c81c9267e8af1188e6ef3a05b01049", - "size": "18800604" - }, - "linux-ppc64le": { - "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-12.2.60-archive.tar.xz", - "sha256": "cbec530bb1c666a5ea336344705c1927f41f42254bb0051261ad8c13b35bd4b1", - "md5": "ec629ff4843c39b6b509b3b2e1238f80", - "size": "10630824" - }, - "linux-sbsa": { - "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.2.60-archive.tar.xz", - "sha256": "653684dd10af3b810c69bfabe7d8b0ddee59629c779c1f005993cb50b774756e", - "md5": "53bcf073b379637c03984d55e59e5a2b", - "size": "9781820" - }, - "windows-x86_64": { - "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.2.60-archive.zip", - "sha256": "cf85306b44197720e5078629e627874c7015891e83a94b1a298a7db2c8baa4b7", - "md5": "6d547a40c28f38cb63b34a863cebe476", - "size": "13151576" - }, - "linux-aarch64": { - "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.2.60-archive.tar.xz", - "sha256": "e951c00abc6928928dbb687743841f0c0d73c436ffe797e6413e4627d749f96a", - "md5": "bee88796d6ef238540a5f517fec4e1b9", - "size": "7731940" - } - }, - "cuda_cuxxfilt": { - "name": "CUDA cuxxfilt (demangler)", - "license": "CUDA Toolkit", - "license_path": "cuda_cuxxfilt/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "becedc25d308be46b63ebcbc041dd791c5e10a9ff24227eb481b3cc0c53499b2", - "md5": "90257b8ec952759368e008b89d7c0ad8", - "size": "188028" - }, - "linux-ppc64le": { - "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-12.2.53-archive.tar.xz", - "sha256": "0c5af08176f55c939692e0df87d3f61affe527a665fb321b65e49f608a88f0b0", - "md5": "510a67ba8e82af333848c4f25468f391", - "size": "179980" - }, - "linux-sbsa": { - "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.2.53-archive.tar.xz", - "sha256": "069b5005b271ba1ba5de3edbbb3aabf945bdf7466ba89ee25477448c1ec27d04", - "md5": "991fbe08fc7e7ed0afe5da73833a8d7c", - "size": "174668" - }, - "windows-x86_64": { - "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.2.53-archive.zip", - "sha256": "d1a8b508c33dc7488337b4744747d6a1deaf3e67f6279a04f2e9de638ba8334d", - "md5": "c6e567c6fa6339e4c50739f7f5c648b6", - "size": "169417" - }, - "linux-aarch64": { - "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.2.53-archive.tar.xz", - "sha256": "d3aaa8f58aa6a7164f097bfec4ab2640d59224671465927f6dce328137c074b5", - "md5": "558919c2abb5c55d35d2b229737f69da", - "size": "167304" - } - }, - "cuda_demo_suite": { - "name": "CUDA Demo Suite", - "license": "CUDA Toolkit", - "license_path": "cuda_demo_suite/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "074d80c5b3eafa80efa18010b51e17b256ed84422cb9970c77391839bd2e86e8", - "md5": "edfd69322632e5a36f285951b8049177", - "size": "4011816" - }, - "windows-x86_64": { - "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.2.53-archive.zip", - "sha256": "c90a2683593652cf7feae460a96c6240f61e9468ee49cef2ab848d30c3e5022e", - "md5": "ad5f3a4d59b3bcff7bbef6c771ddeaab", - "size": "5052163" - } - }, - "cuda_documentation": { - "name": "CUDA Documentation", - "license": "CUDA Toolkit", - "license_path": "cuda_documentation/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "166a02868d57a635b3810e2557ac0d0233b2de554a7070c412709eae8ec06ec9", - "md5": "c6a19cbc239d694066c6ee211288d369", - "size": "67148" - }, - "linux-ppc64le": { - "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-12.2.53-archive.tar.xz", - "sha256": "790b9b948b058bda215bf8af0693638c90a2201a6910aa618ddbb4b540bdda15", - "md5": "9d8ca1deb21491627bc68e3b1c00a50c", - "size": "67072" - }, - "linux-sbsa": { - "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.2.53-archive.tar.xz", - "sha256": "1a6ef53db09820f685792042c72c25d4395953a1ff63a6a6b8a63bd472c67959", - "md5": "88198884d70f7f5d29863becfb553348", - "size": "67076" - }, - "windows-x86_64": { - "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.2.53-archive.zip", - "sha256": "b110874271a51c1ff1ecb91b421f75850400a3be8aee6cad9385c2a80ec93f5d", - "md5": "0d8949ba742832f32c90d6060e0d0032", - "size": "105364" - }, - "linux-aarch64": { - "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.2.53-archive.tar.xz", - "sha256": "42bc8a0467a16b62c8976c433f9598d2835eec2c95e81cbe37b640301b118853", - "md5": "a9d34a1d043919b3abf79084925ad736", - "size": "67228" - } - }, - "cuda_gdb": { - "name": "CUDA GDB", - "license": "CUDA Toolkit", - "license_path": "cuda_gdb/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "7360b3b126052712d86e760cc9cd2e5977bda98f25a32a25a36f4e3e1d86477e", - "md5": "454e9bbcb8c44b12610372d67edc16f0", - "size": "65702272" - }, - "linux-ppc64le": { - "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-12.2.53-archive.tar.xz", - "sha256": "d58bdf87458af81be178d0457ed666cdbf9307bca35819e92e13c9069a13bd7c", - "md5": "fadcec8f26e76b85740734b525596149", - "size": "65469448" - }, - "linux-sbsa": { - "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.2.53-archive.tar.xz", - "sha256": "350fd284c81258b5a7e60eddfb74984d2369254d7a2cc2bbfc0afd14096ff501", - "md5": "aaf51203301579f7fd2517786ff00078", - "size": "65360012" - }, - "linux-aarch64": { - "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.2.53-archive.tar.xz", - "sha256": "5659d69039b9215086fd294e437ed669bdacf2b9a203f4348b820a68d1564cde", - "md5": "ddfca3180674496e161f8de6fa858b2c", - "size": "65285732" - } - }, - "cuda_nsight": { - "name": "Nsight Eclipse Edition Plugin", - "license": "CUDA Toolkit", - "license_path": "cuda_nsight/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "6f3674d4ba97ba18152e5aaa9f36e38b43017441b002cf801d5177bccdd52679", - "md5": "5e60e672c7be453b4cde6243180663ba", - "size": "118606032" - }, - "linux-ppc64le": { - "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-12.2.53-archive.tar.xz", - "sha256": "8599079e194fb17e08459d8f92e6dc4bb7910869158db83f02413946605a6aad", - "md5": "342c5efc729e3794aa975a2e1bd25cb0", - "size": "118606032" - } - }, - "cuda_nvcc": { - "name": "CUDA NVCC", - "license": "CUDA Toolkit", - "license_path": "cuda_nvcc/LICENSE.txt", - "version": "12.2.91", - "linux-x86_64": { - "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.2.91-archive.tar.xz", - "sha256": "d703af09bea3999b40c8c04095a78ec76ccf02b11094059300a3a9c2bd52ec61", - "md5": "b3b07d9b0b874c09a0cafadfc32b8760", - "size": "46508716" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-12.2.91-archive.tar.xz", - "sha256": "a39ebc6ce0f952ae0a3272b770dda7752fa298a0d522f3799ccc3400a7ed0460", - "md5": "92f38d3dafbda1cfe42d5f4ff5fe514d", - "size": "41981244" - }, - "linux-sbsa": { - "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.2.91-archive.tar.xz", - "sha256": "dcdb55340adc6239ed3cbdc1ad8c3b0409f4d71c488f10a819d9ee1a57e097d2", - "md5": "23440328c7ef2fe44e58d197c1c0e09e", - "size": "41062040" - }, - "windows-x86_64": { - "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.2.91-archive.zip", - "sha256": "c83baba72ec53a9c69fac2a5db098ccbb0dbe029bb4552b13b07f624ddfc8fcf", - "md5": "905a2cb1107a480613972f7804ca1048", - "size": "60255563" - }, - "linux-aarch64": { - "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.2.91-archive.tar.xz", - "sha256": "e338332a7c585cd79c7fab4aa17bf6b53f474156f6766c8d599d47a8bbbebb29", - "md5": "76f51119161076f894b9bd61c3e85144", - "size": "42640072" - } - }, - "cuda_nvdisasm": { - "name": "CUDA nvdisasm", - "license": "CUDA Toolkit", - "license_path": "cuda_nvdisasm/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "30ac135c709a39eb58f6a1f30bd340965499198c9fb0030762253fbaad1c43ff", - "md5": "4f6bd5e1ff724738b2d1909037f1629e", - "size": "49881548" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-12.2.53-archive.tar.xz", - "sha256": "2219a350d2d02e53a16190d17d6ae4384f6b77ac89f5d5530622d3edc974c72d", - "md5": "ff3a9c319c988267f318857d28df78f7", - "size": "49858640" - }, - "linux-sbsa": { - "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.2.53-archive.tar.xz", - "sha256": "88d5394f92dd0e65e43ddc46b536f7db9425cb9ad12462e5cc9dc2b589c2a9b3", - "md5": "672fa265e1330a0a718766ebd58e7e6f", - "size": "49811968" - }, - "windows-x86_64": { - "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.2.53-archive.zip", - "sha256": "2ffcff04d7134f6e7f262da5ebd37e1ca6119660e8d07963d86fa97b809ba344", - "md5": "04083830287f39e180a9073399709621", - "size": "50125121" - }, - "linux-aarch64": { - "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.2.53-archive.tar.xz", - "sha256": "7cd16a90c25503073334ae896b6b176afa297a0e30556e61596e8c8e5ca0ebfa", - "md5": "5fce580872b7211d4d3c03d46139b0e9", - "size": "49808416" - } - }, - "cuda_nvml_dev": { - "name": "CUDA NVML Headers", - "license": "CUDA Toolkit", - "license_path": "cuda_nvml_dev/LICENSE.txt", - "version": "12.2.81", - "linux-x86_64": { - "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.2.81-archive.tar.xz", - "sha256": "07efe02d5ecf7f9079150dfaea06e6b6b9f284e9b0322bb8e07fc743ca39ba98", - "md5": "cf77fec8ce77ade6dfb803d0f471ea6d", - "size": "85072" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-12.2.81-archive.tar.xz", - "sha256": "a72c79f32672a5fe3afa20fdabee9621fd57f5b21bbcdea6deb042026e040df1", - "md5": "0ad388bc765a0f483e2d8c51e5c070db", - "size": "84424" - }, - "linux-sbsa": { - "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.2.81-archive.tar.xz", - "sha256": "d8c76caf01a2a9399c59f2a368fceec5b12df5d7ff2bbf0e5bdeb6d01a8b9e3c", - "md5": "fcd43cdaf216afc39ebcc5f96e18f514", - "size": "85016" - }, - "windows-x86_64": { - "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.2.81-archive.zip", - "sha256": "04657b81d0012c7517f27da80eb572c3fbd0d354821e7a368cc0a677182baa78", - "md5": "63722c5bc70003a028d2ee057d443b50", - "size": "119150" - }, - "linux-aarch64": { - "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.2.81-archive.tar.xz", - "sha256": "d585c5c3cdf3ae7253a78624776edf81b1a5ae1ad18c0a7fa5b61bdb3727a845", - "md5": "ff412e9af3a1d5fa9ebdab1a83997442", - "size": "85032" - } - }, - "cuda_nvprof": { - "name": "CUDA nvprof", - "license": "CUDA Toolkit", - "license_path": "cuda_nvprof/LICENSE.txt", - "version": "12.2.60", - "linux-x86_64": { - "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.2.60-archive.tar.xz", - "sha256": "09dca174f073657b915de9be6585e654477b7336bf1f04753391cc35b1b9d660", - "md5": "42c6e437e27d8eee8aaad720de749e71", - "size": "2441200" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-12.2.60-archive.tar.xz", - "sha256": "db8302b6b5f9c490325d5f29e94f1b42c618e27fcf95f468ab9cce350cd77c66", - "md5": "2f98ce48278ceded6a9d721abb9c9089", - "size": "2119668" - }, - "windows-x86_64": { - "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.2.60-archive.zip", - "sha256": "1330fd4803a37c2f8cb8ffdac62a538bf5e2a5d69169519b3bccecafa4b266ef", - "md5": "c4ed24f3d7a59a3ffc028f17abed7acf", - "size": "1700986" - } - }, - "cuda_nvprune": { - "name": "CUDA nvprune", - "license": "CUDA Toolkit", - "license_path": "cuda_nvprune/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "79550967b7975a3ad38d2b94605a71cbaeb6d24e37ed8cb604253bfeefdef241", - "md5": "066300fa3fa03553acec2ba4ca435330", - "size": "56152" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-12.2.53-archive.tar.xz", - "sha256": "59da797aaaed54f2a3e9e4d225c4552d15ef3e9d5af02a79979814c8bdda7f84", - "md5": "3cbbf747e4f2a41caf709b4d9bc92731", - "size": "57076" - }, - "linux-sbsa": { - "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.2.53-archive.tar.xz", - "sha256": "5fb12b382a59ac9d7094f2885d769bc15b60da8ebdf259cab426348732f2bce9", - "md5": "384e0c4725ab1898a512338c01215198", - "size": "48144" - }, - "windows-x86_64": { - "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.2.53-archive.zip", - "sha256": "581721f4a28ff1209e41d163d3575842a21f81d206569862d6d988d5cac16a68", - "md5": "b77d2561d486c69a8eb3e5c2292b6799", - "size": "145868" - }, - "linux-aarch64": { - "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.2.53-archive.tar.xz", - "sha256": "e27db910927c1c84adc3d7982c49518428f6d331f149eb7ba4e98bebd4af81c1", - "md5": "f0f3e29643c1b45544c7e352d7757ec2", - "size": "49716" - } - }, - "cuda_nvrtc": { - "name": "CUDA NVRTC", - "license": "CUDA Toolkit", - "license_path": "cuda_nvrtc/LICENSE.txt", - "version": "12.2.91", - "linux-x86_64": { - "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.2.91-archive.tar.xz", - "sha256": "c366d551840268b66420b216066f64ad471dc1063156bf8c63cf8538bf606141", - "md5": "01d50d7b944941e10c2cd5000d365a29", - "size": "30600936" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-12.2.91-archive.tar.xz", - "sha256": "74ca0a176515fb7f5fb73a8ea1b550425e376b5f471d45f793759045b85daddc", - "md5": "a7d0a50025a122d7f7b2db86b7b31066", - "size": "28230692" - }, - "linux-sbsa": { - "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.2.91-archive.tar.xz", - "sha256": "be057dbc9cc098a2923057be985e068199d16ca1ead802f427ad2e9eee1b15e0", - "md5": "9bbff4319f82a1faf4f10fa996175078", - "size": "28229148" - }, - "windows-x86_64": { - "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.2.91-archive.zip", - "sha256": "f92f8e71ac6a6efdfcb1bec23cb10bef6901861d8fcdfd0e95f7c22af3246158", - "md5": "ffc97eb7fd177e31dfa2be0ffc4d8c83", - "size": "96122917" - }, - "linux-aarch64": { - "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.2.91-archive.tar.xz", - "sha256": "a00c80a98b7582e94601e7b82845d065acef7d9f10805a73a6f8736745a8b71f", - "md5": "156feaa39450acb83deb6e1a768a7b47", - "size": "29471304" - } - }, - "cuda_nvtx": { - "name": "CUDA NVTX", - "license": "CUDA Toolkit", - "license_path": "cuda_nvtx/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "3bcbec1b2ed198bf044f8a85f73fdf011719e5567b418376fcdcde28b0b29c3e", - "md5": "7eb7e5ca661f27fd2b6bc8b816dfc774", - "size": "48372" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-12.2.53-archive.tar.xz", - "sha256": "446e02152814f41cc3eb725c8adccb3d597a36934fefc4fdfd53c78e012571c6", - "md5": "3a1dbd4cbf2e8a93837873d795dc9b07", - "size": "48428" - }, - "linux-sbsa": { - "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.2.53-archive.tar.xz", - "sha256": "8d8b10154b55212ace5ab9e9be4c24c6579b3ef4940fafb0090274e30aa44a49", - "md5": "b24cc3a2b3b4432c80910978595eb541", - "size": "49004" - }, - "windows-x86_64": { - "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.2.53-archive.zip", - "sha256": "04a54a3bf04ca81750c5495d5c5c69f218338c2f01b8e433dd7858f61760e729", - "md5": "1e497aa200c0827f2da7486d6961f6bd", - "size": "65690" - }, - "linux-aarch64": { - "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.2.53-archive.tar.xz", - "sha256": "5b85fabb3a212832180be0e79b4af225e73a8d2202646a9166995efb3e0ff22e", - "md5": "c44c019829a1270f030704014cc01fbf", - "size": "51548" - } - }, - "cuda_nvvp": { - "name": "CUDA NVVP", - "license": "CUDA Toolkit", - "license_path": "cuda_nvvp/LICENSE.txt", - "version": "12.2.60", - "linux-x86_64": { - "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.2.60-archive.tar.xz", - "sha256": "b213d80a96d6fa22dd48a1e471de817c8c462a52a7cebcffceb37bc942dc00f2", - "md5": "726c6d43ef0e28996f2e7e6aa6ee5751", - "size": "117694060" - }, - "linux-ppc64le": { - "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-12.2.60-archive.tar.xz", - "sha256": "c597d50e6345739f63bcec8b7af2bfc096da348f1be0721ffcd7f4037cc8be26", - "md5": "966f4b457038d6cb5e4cc2ce1ddda338", - "size": "117147564" - }, - "windows-x86_64": { - "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.2.60-archive.zip", - "sha256": "225a86ef18bdb5ec49a53d89fbf2b37eabc623f817dc668e536a02ae6f6052d6", - "md5": "0a3ba61f91a92dee25aef180d3f199e2", - "size": "120358259" - } - }, - "cuda_opencl": { - "name": "CUDA OpenCL", - "license": "CUDA Toolkit", - "license_path": "cuda_opencl/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "139fc9d16f4aaaa68a9161367829a927fe1ae2602e82a1d93adf2a9250b506d3", - "md5": "dd671fd1df845bcef67fd854fa66b2a1", - "size": "74936" - }, - "windows-x86_64": { - "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.2.53-archive.zip", - "sha256": "5fc4f66532f797c1daaa2539e55ca32d9accb9d41429e0f3ca6112f893c6627c", - "md5": "5b54f604183a206896e9d0e81f72991c", - "size": "112902" - } - }, - "cuda_profiler_api": { - "name": "CUDA Profiler API", - "license": "CUDA Toolkit", - "license_path": "cuda_profiler_api/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "b534489386c9e1df62a5a8544da86fabaae872ef12b3209d8cf222fbb1678ba4", - "md5": "806822db69e151e01992422a5e92fca0", - "size": "16060" - }, - "linux-ppc64le": { - "relative_path": "cuda_profiler_api/linux-ppc64le/cuda_profiler_api-linux-ppc64le-12.2.53-archive.tar.xz", - "sha256": "2b7473f96fac0af92d13fb3a40eaf2c4fa5df60b4ab8afc3a9f2e0f252b8b084", - "md5": "b9fe730c03d14430e258c7634407ab5d", - "size": "16056" - }, - "linux-sbsa": { - "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.2.53-archive.tar.xz", - "sha256": "42c7463dcc2f1ee1c06576d103ad9886ba3620e8348ea760f22aaa963100fd99", - "md5": "628d561d285e45aa5ec28b20d7f57abb", - "size": "16052" - }, - "windows-x86_64": { - "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.2.53-archive.zip", - "sha256": "4b07eb70491d31ee48c6b181a4923dbcf98c2b5b9d14f7c8e12a1a519320b7c9", - "md5": "38d7cc004f8f921271faaaf1e1ee6c0e", - "size": "20075" - }, - "linux-aarch64": { - "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.2.53-archive.tar.xz", - "sha256": "72d6f489b77deb65aa576fef66e4b6015fbe7a1a0a5695d45acf76682c9ab7c8", - "md5": "28b71ef7ca59a5fb6546b5dfe701b0cf", - "size": "16048" - } - }, - "cuda_sanitizer_api": { - "name": "CUDA Compute Sanitizer API", - "license": "CUDA Toolkit", - "license_path": "cuda_sanitizer_api/LICENSE.txt", - "version": "12.2.53", - "linux-x86_64": { - "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.2.53-archive.tar.xz", - "sha256": "ad70fb519239cd7b53178938c73183ee3cb1b3b3639eeacf3e63fcea8ef32a92", - "md5": "d7c6c2ad94fc0640009c84286da5274e", - "size": "8063936" - }, - "linux-ppc64le": { - "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-12.2.53-archive.tar.xz", - "sha256": "1d5f46fc86e34f9279fe9acde1efc688388db72dc08ea3b95cf0f27df68124eb", - "md5": "2651d09b3f8acfc1586a449863da3f83", - "size": "7638524" - }, - "linux-sbsa": { - "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.2.53-archive.tar.xz", - "sha256": "9e1c66bd3d3b81d5b28c3cbabf798a853a63ea31eb86d14d4e259c0d49b27613", - "md5": "aaba9569e08361ad47794e54cf3bde39", - "size": "6215664" - }, - "windows-x86_64": { - "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.2.53-archive.zip", - "sha256": "1d3f7a07a5fe18e0bccf859e58c98f92a6e40080b156fc65ebf89d9967ed4f7e", - "md5": "ad145cb1bf0bdd1a08045a33f01809a8", - "size": "13897178" - }, - "linux-aarch64": { - "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.2.53-archive.tar.xz", - "sha256": "24cbb446c763a49875d15aba1a2878d408c796d6412118884a130e54f585409b", - "md5": "9478627e21ed32a1fd2f682da606eb51", - "size": "3538240" - } - }, - "fabricmanager": { - "name": "NVIDIA Fabric Manager", - "license": "NVIDIA Driver", - "license_path": "fabricmanager/LICENSE.txt", - "version": "535.54.03", - "linux-x86_64": { - "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-535.54.03-archive.tar.xz", - "sha256": "a04f72d5491d102e402d48f91096272276caf38c868852ad5d13a151bcb41a62", - "md5": "7fa84b39ceee1f56f075284413c8d0ac", - "size": "1819128" - }, - "linux-sbsa": { - "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-535.54.03-archive.tar.xz", - "sha256": "d5d9ca3e4aad2fc5382b490b99c3a79e4bffce90b433dabcee99d66bbc8766d6", - "md5": "ad6b474572fea29a14044c92d9ad1454", - "size": "1679976" - } - }, - "libcublas": { - "name": "CUDA cuBLAS", - "license": "CUDA Toolkit", - "license_path": "libcublas/LICENSE.txt", - "version": "12.2.1.16", - "linux-x86_64": { - "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.2.1.16-archive.tar.xz", - "sha256": "59b7509bc16c438b88469705f7c46cbcfb20848d6738845c1e4f39e2ea3b1d2c", - "md5": "d1cbebbf93af112a80a8fd2b71e7d098", - "size": "486327288" - }, - "linux-ppc64le": { - "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-12.2.1.16-archive.tar.xz", - "sha256": "0174812ce96bd997d8bb3707140788d7283c054c8f04ea0674f286816ebfe331", - "md5": "27f53db7127c73fcdf68a92f0b74dc55", - "size": "389457560" - }, - "linux-sbsa": { - "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.2.1.16-archive.tar.xz", - "sha256": "0bde331f46d0251a6416a198697a5ff07b9ff73b30794ee6a3647248d3793973", - "md5": "ef9244b625a693e85e093b72832271de", - "size": "484681612" - }, - "windows-x86_64": { - "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.2.1.16-archive.zip", - "sha256": "70c8bbc1cb1b58e8987623fef465477398839f14118cf9026868327159b8ec89", - "md5": "02630f7d68d31841c521f49c4f0931c3", - "size": "433276035" - }, - "linux-aarch64": { - "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.2.1.16-archive.tar.xz", - "sha256": "5d3dd3e92964c48e2ad976410cef944820964649683f15b3d090ea259efcfc91", - "md5": "ec74be5b9456476f1735eb1e472a58a2", - "size": "442689448" - } - }, - "libcudla": { - "name": "cuDLA", - "license": "CUDA Toolkit", - "license_path": "libcudla/LICENSE.txt", - "version": "12.2.53", - "linux-aarch64": { - "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.2.53-archive.tar.xz", - "sha256": "c0c5ec192110a4eb556a2d042c07281574aa0ffbf27aa354f017152dd26dd8e6", - "md5": "7766e66ace29d881556eb3b8f8205869", - "size": "37856" - } - }, - "libcufft": { - "name": "CUDA cuFFT", - "license": "CUDA Toolkit", - "license_path": "libcufft/LICENSE.txt", - "version": "11.0.8.15", - "linux-x86_64": { - "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.0.8.15-archive.tar.xz", - "sha256": "ce0991bff7d17caddf38262573ce783afbf4faf68034ae2e0543472f8dd90f40", - "md5": "152eaa27cf4c2c23b9bfc68dbcc797bd", - "size": "170425736" - }, - "linux-ppc64le": { - "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-11.0.8.15-archive.tar.xz", - "sha256": "9df5e513987601cc4dbfe3ee084da21d0e318e448fa94550e5d4762ecf4d6aae", - "md5": "1b9df07f5b2c2803ca46a9b3fa2b5d74", - "size": "170536256" - }, - "linux-sbsa": { - "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.0.8.15-archive.tar.xz", - "sha256": "3eeb365441549334ae582318653260c92137943c1ad285bb325eeccfba9e15e7", - "md5": "b4adab68ba9ab153f5b0b16c57f40cbb", - "size": "170569432" - }, - "windows-x86_64": { - "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.0.8.15-archive.zip", - "sha256": "cbec006d998561eed5d89fc8365247dce597bba5280e3642e0e4ba34db083645", - "md5": "e79fcca7c4ffcc1a67bda6f32e85044e", - "size": "97456840" - }, - "linux-aarch64": { - "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.0.8.15-archive.tar.xz", - "sha256": "a877d212db7cc4b2320d9579a9e2344609a3ec86b8b0c3f1716b0eec98dd8e11", - "md5": "a2a0df7cbd1373e93ede7be8d1015069", - "size": "170665012" - } - }, - "libcufile": { - "name": "CUDA cuFile", - "license": "CUDA Toolkit", - "license_path": "libcufile/LICENSE.txt", - "version": "1.7.0.149", - "linux-x86_64": { - "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.7.0.149-archive.tar.xz", - "sha256": "dbcec7913ad9b59162a60aa5818335d3dbb5aee207ed2c3c65c8995a77746a96", - "md5": "41b451c16c1657e1126f11cb9bae080e", - "size": "41848568" - }, - "linux-sbsa": { - "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.7.0.149-archive.tar.xz", - "sha256": "86f5b0b910e3813ea190a074bb743f319ad9b95bfc31bb402d663ac5c284b2c8", - "md5": "a19e71dc765d85a3007493a9b31484a4", - "size": "41294576" - }, - "linux-aarch64": { - "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.7.0.149-archive.tar.xz", - "sha256": "39a7dbd1763b6d4c7da2cb5b15db75501e723844a8f8a5914a29fcaa6ad9eca3", - "md5": "7855d4c52825274fb5acfb2d27387e7b", - "size": "41274348" - } - }, - "libcurand": { - "name": "CUDA cuRAND", - "license": "CUDA Toolkit", - "license_path": "libcurand/LICENSE.txt", - "version": "10.3.3.53", - "linux-x86_64": { - "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.3.53-archive.tar.xz", - "sha256": "890181ef02a4752fd4cf4113770c27340f19112d81cd6076d0630dba8f746ed6", - "md5": "c11537005ba88971f536effdc0825a5a", - "size": "81945064" - }, - "linux-ppc64le": { - "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.3.3.53-archive.tar.xz", - "sha256": "d0d819e85139346229aef2000231e42ff8d20e13c9ad6acae780e265d3dc8b8e", - "md5": "501debf6ad4405494bfee9a769a976f0", - "size": "81983028" - }, - "linux-sbsa": { - "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.3.53-archive.tar.xz", - "sha256": "4367394f6d57dd0ff9b597f5f7471b8b346f6c878ad5dca6f2b8f377d0b23d72", - "md5": "6a16970981b6c64be5cbeec2245a5f07", - "size": "81931700" - }, - "windows-x86_64": { - "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.3.53-archive.zip", - "sha256": "39a68f5049825bb52af30cabf2f29b20a1cfe0f127875ae11a3684824efd41d5", - "md5": "f8654726922d89040d8679cddc5bd150", - "size": "55279087" - }, - "linux-aarch64": { - "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.3.53-archive.tar.xz", - "sha256": "759082826aea2bfd4d63f7dafb84518a24a306f3007ffc061554d28faf9b4dc6", - "md5": "ae3d27bf5dcb77af666bb89463ce5c88", - "size": "84107132" - } - }, - "libcusolver": { - "name": "CUDA cuSOLVER", - "license": "CUDA Toolkit", - "license_path": "libcusolver/LICENSE.txt", - "version": "11.5.0.53", - "linux-x86_64": { - "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.5.0.53-archive.tar.xz", - "sha256": "0ce1f6058005117fc1aa2dd731e1c6009aa79993c179cbdb2d01f17959dfdc87", - "md5": "2df25f844d081afb79b3cffe6bc53ce6", - "size": "123332556" - }, - "linux-ppc64le": { - "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.5.0.53-archive.tar.xz", - "sha256": "1f690cabb35ae92ef5a1cd3d6f1222a535bafea86a259d88cf8d2410558b6414", - "md5": "46670044a53afbf7ebdb2fff57bd2a64", - "size": "122967236" - }, - "linux-sbsa": { - "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.5.0.53-archive.tar.xz", - "sha256": "5135dff78a3cf7353362b7c6547af61fdca164e8b792fbff4066989c36183925", - "md5": "419bad18195a23817c76aba940d8e5ff", - "size": "122295788" - }, - "windows-x86_64": { - "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.5.0.53-archive.zip", - "sha256": "36bac40d8f8f9a05bf9936a2348cfe71c848fbb52d40750dfb6600c3e84ef9ff", - "md5": "edad14e88c2faeae872a53ee1975575b", - "size": "120629517" - }, - "linux-aarch64": { - "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.5.0.53-archive.tar.xz", - "sha256": "4eaec6e813dded192cef54252902b915de9116149c52aa840b7631bab7e244a3", - "md5": "f93615f925e87ad318f1307d303a4c5c", - "size": "133342388" - } - }, - "libcusparse": { - "name": "CUDA cuSPARSE", - "license": "CUDA Toolkit", - "license_path": "libcusparse/LICENSE.txt", - "version": "12.1.1.53", - "linux-x86_64": { - "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.1.1.53-archive.tar.xz", - "sha256": "3b38e39c27fc9e91ccae949bc06692a76e5d6d88320177d8b1795be3086ea305", - "md5": "9333e20cba966d557186fa32ad47008b", - "size": "211590820" - }, - "linux-ppc64le": { - "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-12.1.1.53-archive.tar.xz", - "sha256": "4c5297adea9229fd820c7891694e851f39ecbe69bd642449007e7eca62c6124f", - "md5": "acd166b34c7f6e5dbe60ddea1ad4a76a", - "size": "211736192" - }, - "linux-sbsa": { - "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.1.1.53-archive.tar.xz", - "sha256": "504b2a6bfd588cda6cb293f030f98b7aa36a6d60a30063c4c4aa9b74ab27dc92", - "md5": "e233abe1bd165db5619d1bfa1abbe3a9", - "size": "211253852" - }, - "windows-x86_64": { - "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.1.1.53-archive.zip", - "sha256": "39b9d0927c5f3ac9a3b92523b60aac7871b41fa7a72a210bc9bb3b5828b8d5f8", - "md5": "6d8e6e1c410d3cf50ad95d3df21d0d67", - "size": "192210264" - }, - "linux-aarch64": { - "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.1.1.53-archive.tar.xz", - "sha256": "b86fcc1f706080bc6cdc5f2f8f99f99ceab62977a40aa13f97eb01e10ad97334", - "md5": "88264e9ac0334655f5b80eb8cea03a2e", - "size": "226908380" - } - }, - "libnpp": { - "name": "CUDA NPP", - "license": "CUDA Toolkit", - "license_path": "libnpp/LICENSE.txt", - "version": "12.1.1.14", - "linux-x86_64": { - "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.1.1.14-archive.tar.xz", - "sha256": "efc53c1d554dab8cd4f75b21528b68f39a32b20eaabc5d8d2585e0db91f4353d", - "md5": "902f1d530b9245d35a61ba56ec8cd516", - "size": "182561952" - }, - "linux-ppc64le": { - "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-12.1.1.14-archive.tar.xz", - "sha256": "4d58706c834addf38613eaa76eed01690762ee337faeab085ecbf7528d6fac70", - "md5": "ce315e5b89199106aa93a03db65ca39f", - "size": "182373984" - }, - "linux-sbsa": { - "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.1.1.14-archive.tar.xz", - "sha256": "e99c853cd9ec8526cc053228d1b90597e6bb89ae1856af72bf85a7095b83106c", - "md5": "0a3254d7e4042d88ac522b14a43e278f", - "size": "181513452" - }, - "windows-x86_64": { - "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.1.1.14-archive.zip", - "sha256": "846e7ba7d473a10918a97f81ce6b3742a11282ae0126ca99692971a4d30736b1", - "md5": "cb84a09751bceb3380a8f9e028e8f1c5", - "size": "151773014" - }, - "linux-aarch64": { - "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.1.1.14-archive.tar.xz", - "sha256": "77c0b1cccd53e2dec1928dfc22cbce819f51140ede32edcf567840119f51f89d", - "md5": "82a83bf87d10da2f80e443e45deef998", - "size": "199197524" - } - }, - "libnvidia_nscq": { - "name": "NVIDIA NSCQ API", - "license": "NVIDIA Driver", - "license_path": "libnvidia_nscq/LICENSE.txt", - "version": "535.54.03", - "linux-x86_64": { - "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-535.54.03-archive.tar.xz", - "sha256": "3433f2b46c47efeec54fc1eef990859b070801af9dfdcb5305783380e322e833", - "md5": "6e4728a04c1de840190f481b6b9cc0f0", - "size": "349948" - }, - "linux-sbsa": { - "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-535.54.03-archive.tar.xz", - "sha256": "8ee52b4f763062e68ab41ed0af7b0daf2ce9d4c0bd3d27aeb14059584703e915", - "md5": "ead66878ffdf57c8875c0151855828b6", - "size": "317244" - } - }, - "libnvjitlink": { - "name": "NVIDIA compiler library for JIT LTO functionality", - "license": "CUDA Toolkit", - "license_path": "libnvjitlink/LICENSE.txt", - "version": "12.2.91", - "linux-x86_64": { - "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.2.91-archive.tar.xz", - "sha256": "5f99b51c7dbb7420ad2559f295d651064259c42780298a1fcb6e647560421a98", - "md5": "377b9a77093f05b73e023164ccd58ff1", - "size": "26077128" - }, - "linux-ppc64le": { - "relative_path": "libnvjitlink/linux-ppc64le/libnvjitlink-linux-ppc64le-12.2.91-archive.tar.xz", - "sha256": "18c703ad153525b14d69c0e5ff46b5505b22354e406923887e2d26f3a09f2f9b", - "md5": "09721fd552a006237fe8aad0b6e5dc03", - "size": "23976600" - }, - "linux-sbsa": { - "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.2.91-archive.tar.xz", - "sha256": "8b2141ffa23e030fdc7d707b6eebda2b3f32c3e33379c0fe75868640c0f5c701", - "md5": "0d728f150ca04bae7f8f5f6930d27be6", - "size": "23937120" - }, - "windows-x86_64": { - "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.2.91-archive.zip", - "sha256": "bb66172487d485d4aa969600a6128d92f0a6e4c02687c5008d282648b9f087e0", - "md5": "fedd2335f22e42106f76966845e031bf", - "size": "86994854" - }, - "linux-aarch64": { - "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.2.91-archive.tar.xz", - "sha256": "6676827058de20c4d63819050fb8b53528dc19fd24982fc381ff28456472f6c4", - "md5": "6703a7759c62a74b658859913d5a4c63", - "size": "25130600" - } - }, - "libnvjpeg": { - "name": "CUDA nvJPEG", - "license": "CUDA Toolkit", - "license_path": "libnvjpeg/LICENSE.txt", - "version": "12.1.1.14", - "linux-x86_64": { - "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.1.1.14-archive.tar.xz", - "sha256": "7ffeea14fc61f6600c29fd7872edbebad57abf360b3db15308d96902cbec34e7", - "md5": "36c92e8bd55423399dc64a80b1e4e2d5", - "size": "2506196" - }, - "linux-ppc64le": { - "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-12.1.1.14-archive.tar.xz", - "sha256": "c56eea8afd8f500b827041f26bfe127d836ba08b15028a48fd41c122e8f06e5c", - "md5": "5d42d6e37898c2f612da15e455fd1ef9", - "size": "2490368" - }, - "linux-sbsa": { - "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.1.1.14-archive.tar.xz", - "sha256": "cb17129e4dcbb7338ef7e37149de9ce4023ca9e2efad97de1ae0806bf67bdd10", - "md5": "b020197978d730b63a92caa140bb2a2a", - "size": "2336180" - }, - "windows-x86_64": { - "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.1.1.14-archive.zip", - "sha256": "bf4107f5993c6595834821da5e2d50b1b1cd1dd687cb6224176656c198cacbbd", - "md5": "0da427edeea81414df1466fd5bc9b791", - "size": "2766220" - }, - "linux-aarch64": { - "relative_path": "libnvjpeg/linux-aarch64/libnvjpeg-linux-aarch64-12.1.1.14-archive.tar.xz", - "sha256": "9b39d91814bf077c89e4ad5fbd5608acda0dd2fae4a0ccf0c91da6e45b11eaa6", - "md5": "e36afb6fd678c4846d1202f22a97b2fa", - "size": "2474640" - } - }, - "nsight_compute": { - "name": "Nsight Compute", - "license": "NVIDIA SLA", - "license_path": "nsight_compute/LICENSE.txt", - "version": "2023.2.0.16", - "linux-x86_64": { - "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2023.2.0.16-archive.tar.xz", - "sha256": "d4232eecbdb709f1482629af916c8fe6c6c6084764fff9fe5d4eec289cc10cb8", - "md5": "bad0c0f76173996c9995884bfb6ae3b6", - "size": "724640244" - }, - "linux-ppc64le": { - "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2023.2.0.16-archive.tar.xz", - "sha256": "ac3e1530830cf70b4d298818d5ed4e33864c1ebd6c44455ecafaaa264b8d3be7", - "md5": "7fcdf966becc5b915dcd65700e7f6e38", - "size": "185175700" - }, - "linux-sbsa": { - "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2023.2.0.16-archive.tar.xz", - "sha256": "5d9f2daeed1aaf87ac4fd8237699d0c915ef2de52b66a1f4ab4bda0057f47c7f", - "md5": "d9639e34e406f705530a25ccfcb55358", - "size": "350199152" - }, - "windows-x86_64": { - "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2023.2.0.16-archive.zip", - "sha256": "16579328355102bd1dd27f6969ab6bda426ea9e8a1bdf2f62f2bbf8b9370d5b9", - "md5": "c6be0d2ff8d1f1fe7cce5181393b79a8", - "size": "664635780" - }, - "linux-aarch64": { - "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2023.2.0.16-archive.tar.xz", - "sha256": "09a815a8e00fde87acc4b32c6409dfb616b8b49b7ae8f931c66de7c795db87e4", - "md5": "f3879107229a1a031b5971e77cd18916", - "size": "740361468" - } - }, - "nsight_systems": { - "name": "Nsight Systems", - "license": "NVIDIA SLA", - "license_path": "nsight_systems/LICENSE.txt", - "version": "2023.2.3.1001", - "linux-x86_64": { - "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2023.2.3.1001-archive.tar.xz", - "sha256": "3c5ff99cd44d99808e25d72059372cf8d36cd435ff4724e840a227cc674d79d0", - "md5": "4addd2a842d5e753e992bb2595babf15", - "size": "222188232" - }, - "linux-ppc64le": { - "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2023.2.3.1001-archive.tar.xz", - "sha256": "c71f3e39355bb23c6da411450360acb763b4effc5752918d0735517633d38352", - "md5": "2ef6e9dc891b39439541b123056b69c7", - "size": "64464952" - }, - "linux-sbsa": { - "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2023.2.3.1001-archive.tar.xz", - "sha256": "6e559924fcdcfbc677490131f343ea9a2ab2a9ecb994906b3a23791601428dfc", - "md5": "92dfed2062891bc73e4b5f488cf48467", - "size": "197068636" - }, - "windows-x86_64": { - "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2023.2.3.1001-archive.zip", - "sha256": "928d40a3edd0434d82fd5a48d70781e41a01071db8095891588d0299ba888962", - "md5": "1bb802ca720f4dabdbc5933f426f35ee", - "size": "335353534" - } - }, - "nsight_vse": { - "name": "Nsight Visual Studio Edition (VSE)", - "license": "NVIDIA SLA", - "license_path": "nsight_vse/LICENSE.txt", - "version": "2023.2.0.23143", - "windows-x86_64": { - "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2023.2.0.23143-archive.zip", - "sha256": "07a819f72797cae9aa95e4308ae65b712384d1e76ed104842cc2d51ac6196b9f", - "md5": "5cd16b1761028a887351148ac8e078f1", - "size": "526806378" - } - }, - "nvidia_driver": { - "name": "NVIDIA Linux Driver", - "license": "NVIDIA Driver", - "license_path": "nvidia_driver/LICENSE.txt", - "version": "535.54.03", - "linux-x86_64": { - "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-535.54.03-archive.tar.xz", - "sha256": "c394729dc4a52d47d88d2573265fd29037709732f20f489a37ac4ab47f6822f1", - "md5": "955c14cf3dd6178547257a50f07b8c6f", - "size": "399961036" - }, - "linux-ppc64le": { - "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-535.54.03-archive.tar.xz", - "sha256": "72176f44f8317fcaa4e3a14ad28dbff0c4d999a1b72f9cd91171cda3d7f0d66c", - "md5": "4a459d6fdd07d8dd9b94d26e96cf9f23", - "size": "99839420" - }, - "linux-sbsa": { - "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-535.54.03-archive.tar.xz", - "sha256": "01bca95203ebac62fc7e87b4142cb0b2ebdaed5290e957fb13999e6c460f78ef", - "md5": "3a69e12fd2d28c957156512021a0dc3e", - "size": "313982992" - } - }, - "nvidia_fs": { - "name": "NVIDIA filesystem", - "license": "CUDA Toolkit", - "license_path": "nvidia_fs/LICENSE.txt", - "version": "2.16.1", - "linux-x86_64": { - "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.16.1-archive.tar.xz", - "sha256": "c899c58d07dbbe337abead01337a2aec72a7fd4600b95838b044335c85199c6b", - "md5": "f6f00d81e1e0dcb0847fea3b3c83d3a1", - "size": "57608" - }, - "linux-sbsa": { - "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.16.1-archive.tar.xz", - "sha256": "779d2b669d5021125da6689dfc1c45772996abb63ace42d388cbc03a85dfa4fb", - "md5": "c462ac53d3318e5fb73bc04201a78046", - "size": "57580" - }, - "linux-aarch64": { - "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.16.1-archive.tar.xz", - "sha256": "a6f56b158246178637a5e87889d81ec3796407a6105ae8b17844842a3d0beafb", - "md5": "ee4bdba81554d3548cf778a72e6321a7", - "size": "57596" - } - }, - "visual_studio_integration": { - "name": "CUDA Visual Studio Integration", - "license": "CUDA Toolkit", - "license_path": "visual_studio_integration/LICENSE.txt", - "version": "12.2.53", - "windows-x86_64": { - "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.2.53-archive.zip", - "sha256": "427c33b33f67f0d412d37e1e34c72c16e9fd34ef25f6d15b90ab91488ed3d0f5", - "md5": "ddf0c3651191623c29c63e268c6720f2", - "size": "517874" - } - } -} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json deleted file mode 100644 index 04a33a88a8635..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json +++ /dev/null @@ -1,1518 +0,0 @@ -{ - "cuda_cccl": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_cudart": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "lib32" - ] - } - }, - "cuda_cuobjdump": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_cupti": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - } - }, - "cuda_cuxxfilt": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_demo_suite": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - } - }, - "cuda_documentation": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - } - }, - "cuda_gdb": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - } - }, - "cuda_memcheck": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nsight": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - } - }, - "cuda_nvcc": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - } - }, - "cuda_nvdisasm": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvml_dev": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "nvml" - ] - } - }, - "cuda_nvprof": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_nvprune": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvrtc": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "cuda_nvtx": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_nvvp": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - } - }, - "cuda_sanitizer_api": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "compute-sanitizer" - ] - } - }, - "fabricmanager": { - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - } - }, - "libcublas": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "src" - ] - } - }, - "libcufft": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "libcufile": { - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - } - }, - "libcurand": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "libcusolver": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "libcusparse": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "src" - ] - } - }, - "libnpp": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "libnvjpeg": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "nsight_compute": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-compute" - ] - } - }, - "nsight_nvtx": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "NvToolsExt" - ] - } - }, - "nsight_systems": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-systems" - ] - } - }, - "nsight_vse": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "NvToolsExt", - "nsight_vse" - ] - } - }, - "nvidia_driver": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "kernel", - "lib", - "man", - "sbin", - "share", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "kernel", - "lib", - "man", - "sbin", - "share", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "lib", - "lib32", - "man", - "sbin", - "share", - "supported-gpus", - "systemd", - "tests", - "wine" - ] - } - }, - "nvidia_fs": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - } - }, - "visual_studio_integration": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "visual_studio_integration" - ] - } - } -} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json deleted file mode 100644 index f07f1826dec8d..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json +++ /dev/null @@ -1,1536 +0,0 @@ -{ - "cuda_cccl": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "cuda_cudart": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "lib32" - ] - } - }, - "cuda_cuobjdump": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_cupti": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - } - }, - "cuda_cuxxfilt": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_demo_suite": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - } - }, - "cuda_documentation": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - } - }, - "cuda_gdb": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - } - }, - "cuda_memcheck": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nsight": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - } - }, - "cuda_nvcc": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - } - }, - "cuda_nvdisasm": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvml_dev": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "nvml" - ] - } - }, - "cuda_nvprof": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_nvprune": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvrtc": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "cuda_nvtx": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_nvvp": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - } - }, - "cuda_sanitizer_api": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "compute-sanitizer" - ] - } - }, - "fabricmanager": { - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - } - }, - "libcublas": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "src" - ] - } - }, - "libcufft": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "libcufile": { - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - } - }, - "libcurand": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "libcusolver": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "libcusparse": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "src" - ] - } - }, - "libnpp": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "libnvidia_nscq": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "lib" - ] - } - }, - "libnvjpeg": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "nsight_compute": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-compute" - ] - } - }, - "nsight_nvtx": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "NvToolsExt" - ] - } - }, - "nsight_systems": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-systems" - ] - } - }, - "nsight_vse": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "NvToolsExt", - "nsight_vse" - ] - } - }, - "nvidia_driver": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "kernel", - "lib", - "man", - "sbin", - "share", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "lib", - "man", - "sbin", - "share", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "lib", - "lib32", - "man", - "sbin", - "share", - "supported-gpus", - "systemd", - "tests", - "wine" - ] - } - }, - "nvidia_fs": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - } - }, - "visual_studio_integration": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "visual_studio_integration" - ] - } - } -} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json deleted file mode 100644 index c4f02188c4d48..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json +++ /dev/null @@ -1,1546 +0,0 @@ -{ - "cuda_cccl": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "cuda_cudart": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "lib32" - ] - } - }, - "cuda_cuobjdump": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_cupti": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - } - }, - "cuda_cuxxfilt": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_demo_suite": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - } - }, - "cuda_documentation": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - } - }, - "cuda_gdb": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - } - }, - "cuda_memcheck": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nsight": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - } - }, - "cuda_nvcc": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - } - }, - "cuda_nvdisasm": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvml_dev": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "nvml" - ] - } - }, - "cuda_nvprof": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include" - ] - } - }, - "cuda_nvprune": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvrtc": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_nvtx": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_nvvp": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - } - }, - "cuda_sanitizer_api": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "compute-sanitizer" - ] - } - }, - "fabricmanager": { - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - } - }, - "libcublas": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "src" - ] - } - }, - "libcufft": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcufile": { - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - } - }, - "libcurand": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcusolver": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcusparse": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "src" - ] - } - }, - "libnpp": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libnvidia_nscq": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "lib" - ] - } - }, - "libnvjpeg": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "nsight_compute": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-compute" - ] - } - }, - "nsight_nvtx": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "NvToolsExt" - ] - } - }, - "nsight_systems": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-systems" - ] - } - }, - "nsight_vse": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "NvToolsExt", - "nsight_vse" - ] - } - }, - "nvidia_driver": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "kernel", - "lib", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "lib", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "lib", - "lib32", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests", - "wine" - ] - } - }, - "nvidia_fs": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - } - }, - "visual_studio_integration": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "visual_studio_integration" - ] - } - } -} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json deleted file mode 100644 index 56ef5a91b0386..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json +++ /dev/null @@ -1,1565 +0,0 @@ -{ - "cuda_cccl": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "cuda_cudart": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_cuobjdump": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_cupti": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - } - }, - "cuda_cuxxfilt": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_demo_suite": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - } - }, - "cuda_documentation": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - } - }, - "cuda_gdb": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - } - }, - "cuda_memcheck": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nsight": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - } - }, - "cuda_nvcc": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - } - }, - "cuda_nvdisasm": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvml_dev": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "nvml" - ] - } - }, - "cuda_nvprof": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include" - ] - } - }, - "cuda_nvprune": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvrtc": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_nvtx": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_nvvp": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - } - }, - "cuda_sanitizer_api": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "compute-sanitizer" - ] - } - }, - "fabricmanager": { - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - } - }, - "libcublas": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "src" - ] - } - }, - "libcufft": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcufile": { - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - } - }, - "libcurand": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcusolver": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcusparse": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "src" - ] - } - }, - "libnpp": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libnvidia_nscq": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "lib" - ] - } - }, - "libnvjpeg": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "nsight_compute": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-compute" - ] - } - }, - "nsight_nvtx": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "NvToolsExt" - ] - } - }, - "nsight_systems": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-systems" - ] - } - }, - "nsight_vse": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "NvToolsExt", - "nsight_vse" - ] - } - }, - "nvidia_driver": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "kernel", - "lib", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "kernel-open", - "lib", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "kernel-open", - "lib", - "lib32", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests", - "wine" - ] - } - }, - "nvidia_fs": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - } - }, - "visual_studio_integration": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "visual_studio_integration" - ] - } - } -} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json deleted file mode 100644 index 4a71b484e2871..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json +++ /dev/null @@ -1,1938 +0,0 @@ -{ - "cuda_cccl": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "cuda_compat": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "compat" - ] - } - }, - "cuda_cudart": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_cuobjdump": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_cupti": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "samples" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - } - }, - "cuda_cuxxfilt": { - "linux-aarch64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_demo_suite": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - } - }, - "cuda_documentation": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - } - }, - "cuda_gdb": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - } - }, - "cuda_memcheck": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nsight": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - } - }, - "cuda_nvcc": { - "linux-aarch64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - } - }, - "cuda_nvdisasm": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvml_dev": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "nvml" - ] - } - }, - "cuda_nvprof": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvprune": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvrtc": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_nvtx": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_nvvp": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - } - }, - "cuda_profiler_api": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_sanitizer_api": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "compute-sanitizer" - ] - } - }, - "fabricmanager": { - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - } - }, - "libcublas": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "src" - ] - } - }, - "libcudla": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - } - }, - "libcufft": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcufile": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - } - }, - "libcurand": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcusolver": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcusparse": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "src" - ] - } - }, - "libnpp": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libnvidia_nscq": { - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "lib" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "lib" - ] - } - }, - "libnvjpeg": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "nsight_compute": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-compute" - ] - } - }, - "nsight_nvtx": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "NvToolsExt" - ] - } - }, - "nsight_systems": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-systems" - ] - } - }, - "nsight_vse": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight_vse" - ] - } - }, - "nvidia_driver": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "kernel", - "lib", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "kernel-open", - "lib", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "kernel-open", - "lib", - "lib32", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests", - "wine" - ] - } - }, - "nvidia_fs": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - } - }, - "visual_studio_integration": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "visual_studio_integration" - ] - } - } -} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json deleted file mode 100644 index f02ba5bfca84b..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json +++ /dev/null @@ -1,2050 +0,0 @@ -{ - "cuda_cccl": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "cuda_compat": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "compat" - ] - } - }, - "cuda_cudart": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_cuobjdump": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_cupti": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "samples" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - } - }, - "cuda_cuxxfilt": { - "linux-aarch64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_demo_suite": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - } - }, - "cuda_documentation": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - } - }, - "cuda_gdb": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - } - }, - "cuda_nsight": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - } - }, - "cuda_nvcc": { - "linux-aarch64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - } - }, - "cuda_nvdisasm": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvml_dev": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "nvml" - ] - } - }, - "cuda_nvprof": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvprune": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvrtc": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_nvtx": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_nvvp": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - } - }, - "cuda_opencl": { - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "cuda_profiler_api": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_sanitizer_api": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "compute-sanitizer" - ] - } - }, - "fabricmanager": { - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - } - }, - "libcublas": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "src" - ] - } - }, - "libcudla": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - } - }, - "libcufft": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcufile": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - } - }, - "libcurand": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcusolver": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcusparse": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "src" - ] - } - }, - "libnpp": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libnvidia_nscq": { - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libnvjitlink": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "res" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "res" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "res" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "res" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "res" - ] - } - }, - "libnvjpeg": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libnvvm_samples": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nvvm" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nvvm" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nvvm" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nvvm" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nvvm" - ] - } - }, - "nsight_compute": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-compute" - ] - } - }, - "nsight_systems": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-systems" - ] - } - }, - "nsight_vse": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight_vse" - ] - } - }, - "nvidia_driver": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "kernel", - "lib", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "kernel-open", - "lib", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "kernel-open", - "lib", - "lib32", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests", - "wine" - ] - } - }, - "nvidia_fs": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - } - }, - "visual_studio_integration": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "visual_studio_integration" - ] - } - } -} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json deleted file mode 100644 index f02ba5bfca84b..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json +++ /dev/null @@ -1,2050 +0,0 @@ -{ - "cuda_cccl": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "cuda_compat": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "compat" - ] - } - }, - "cuda_cudart": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_cuobjdump": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_cupti": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "samples" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - } - }, - "cuda_cuxxfilt": { - "linux-aarch64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_demo_suite": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - } - }, - "cuda_documentation": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - } - }, - "cuda_gdb": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - } - }, - "cuda_nsight": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - } - }, - "cuda_nvcc": { - "linux-aarch64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - } - }, - "cuda_nvdisasm": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvml_dev": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "nvml" - ] - } - }, - "cuda_nvprof": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvprune": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvrtc": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_nvtx": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_nvvp": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - } - }, - "cuda_opencl": { - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "cuda_profiler_api": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_sanitizer_api": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "compute-sanitizer" - ] - } - }, - "fabricmanager": { - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - } - }, - "libcublas": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "src" - ] - } - }, - "libcudla": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - } - }, - "libcufft": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcufile": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - } - }, - "libcurand": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcusolver": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcusparse": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "src" - ] - } - }, - "libnpp": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libnvidia_nscq": { - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libnvjitlink": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "res" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "res" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "res" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "res" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "res" - ] - } - }, - "libnvjpeg": { - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libnvvm_samples": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nvvm" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nvvm" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nvvm" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nvvm" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nvvm" - ] - } - }, - "nsight_compute": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-compute" - ] - } - }, - "nsight_systems": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-systems" - ] - } - }, - "nsight_vse": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight_vse" - ] - } - }, - "nvidia_driver": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "kernel", - "lib", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "kernel-open", - "lib", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "kernel-open", - "lib", - "lib32", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests", - "wine" - ] - } - }, - "nvidia_fs": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - } - }, - "visual_studio_integration": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "visual_studio_integration" - ] - } - } -} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json deleted file mode 100644 index e5201f7f81eb4..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json +++ /dev/null @@ -1,2030 +0,0 @@ -{ - "cuda_cccl": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "cuda_compat": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "compat" - ] - } - }, - "cuda_cudart": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_cuobjdump": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_cupti": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "samples" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": false, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "doc", - "include", - "lib", - "samples" - ] - } - }, - "cuda_cuxxfilt": { - "linux-aarch64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_demo_suite": { - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "demo_suite" - ] - } - }, - "cuda_documentation": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "tools" - ] - } - }, - "cuda_gdb": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "extras", - "share" - ] - } - }, - "cuda_nsight": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsightee_plugins" - ] - } - }, - "cuda_nvcc": { - "linux-aarch64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "nvvm" - ] - } - }, - "cuda_nvdisasm": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvml_dev": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "nvml", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "nvml" - ] - } - }, - "cuda_nvprof": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvprune": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin" - ] - } - }, - "cuda_nvrtc": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "cuda_nvtx": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_nvvp": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "libnvvp" - ] - } - }, - "cuda_opencl": { - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib" - ] - } - }, - "cuda_profiler_api": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include" - ] - } - }, - "cuda_sanitizer_api": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "compute-sanitizer" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "compute-sanitizer" - ] - } - }, - "fabricmanager": { - "linux-sbsa": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "etc", - "include", - "lib", - "sbin", - "share", - "systemd" - ] - } - }, - "libcublas": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "src" - ] - } - }, - "libcudla": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - } - }, - "libcufft": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcufile": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": true, - "hasStatic": true, - "rootDirs": [ - "etc", - "include", - "lib", - "man", - "pkg-config", - "samples", - "tools" - ] - } - }, - "libcurand": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcusolver": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libcusparse": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "src" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "src" - ] - } - }, - "libnpp": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "libnvidia_nscq": { - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "lib" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "lib" - ] - } - }, - "libnvjitlink": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "res" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "res" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "res" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config", - "res" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib", - "res" - ] - } - }, - "libnvjpeg": { - "linux-aarch64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-ppc64le": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": true, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "include", - "lib", - "pkg-config" - ] - }, - "windows-x86_64": { - "hasBin": true, - "hasDev": true, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": true, - "rootDirs": [ - "bin", - "include", - "lib" - ] - } - }, - "nsight_compute": { - "linux-aarch64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-compute" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-compute" - ] - } - }, - "nsight_systems": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "nsight-systems" - ] - }, - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight-systems" - ] - } - }, - "nsight_vse": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "nsight_vse" - ] - } - }, - "nvidia_driver": { - "linux-ppc64le": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "kernel", - "lib", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-sbsa": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "kernel-open", - "lib", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests" - ] - }, - "linux-x86_64": { - "hasBin": true, - "hasDev": false, - "hasDoc": false, - "hasLib": true, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "bin", - "docs", - "etc", - "firmware", - "kernel", - "kernel-open", - "lib", - "lib32", - "man", - "sbin", - "share", - "src", - "supported-gpus", - "systemd", - "tests", - "wine" - ] - } - }, - "nvidia_fs": { - "linux-aarch64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - }, - "linux-sbsa": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - }, - "linux-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "src" - ] - } - }, - "visual_studio_integration": { - "windows-x86_64": { - "hasBin": false, - "hasDev": false, - "hasDoc": false, - "hasLib": false, - "hasSample": false, - "hasStatic": false, - "rootDirs": [ - "visual_studio_integration" - ] - } - } -} diff --git a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix deleted file mode 100644 index a0ac0b0fcb1fb..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ /dev/null @@ -1,142 +0,0 @@ -final: prev: -let - inherit (prev) lib pkgs; - cudaVersionOlder = lib.versionOlder final.cudaVersion; - cudaVersionAtLeast = lib.versionAtLeast final.cudaVersion; -in -(lib.filterAttrs (attr: _: (prev ? "${attr}")) { - ### Overrides to fix the components of cudatoolkit-redist - - # Attributes that don't exist in the previous set are removed. - # That means only overrides can go here, and not new expressions! - - libcufile = prev.libcufile.overrideAttrs (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ - final.libcublas.lib - pkgs.numactl - pkgs.rdma-core - ]; - # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = - ["libcuda.so.1"] - # Before 12.0 libcufile depends on itself for some reason. - ++ lib.optionals (cudaVersionOlder "12.0") [ - "libcufile.so.0" - ]; - }); - - libcusolver = final.addBuildInputs prev.libcusolver ( - # Always depends on this - [final.libcublas.lib] - # Dependency from 12.0 and on - ++ lib.optionals (cudaVersionAtLeast "12.0") [ - final.libnvjitlink.lib - ] - # Dependency from 12.1 and on - ++ lib.optionals (cudaVersionAtLeast "12.1") [ - final.libcusparse.lib - ] - ); - - libcusparse = final.addBuildInputs prev.libcusparse ( - lib.optionals (cudaVersionAtLeast "12.0") [ - final.libnvjitlink.lib - ] - ); - - cuda_gdb = final.addBuildInputs prev.cuda_gdb ( - # x86_64 only needs gmp from 12.0 and on - lib.optionals (cudaVersionAtLeast "12.0") [ - pkgs.gmp - ] - ); - - cuda_nvcc = prev.cuda_nvcc.overrideAttrs (_: { - # Required by cmake's enable_language(CUDA) to build a test program - # When implementing cross-compilation support: this is - # final.pkgs.targetPackages.cudaPackages.cuda_cudart - env = { - # Given the multiple-outputs each CUDA redist has, we can specify the exact components we - # need from the package. CMake requires: - # - the cuda_runtime.h header, which is in the dev output - # - the dynamic library, which is in the lib output - # - the static library, which is in the static output - cudartInclude = "${final.cuda_cudart.dev}"; - cudartLib = "${final.cuda_cudart.lib}"; - cudartStatic = "${final.cuda_cudart.static}"; - }; - - # Point NVCC at a compatible compiler - - # Desiredata: whenever a package (e.g. magma) adds cuda_nvcc to - # nativeBuildInputs (offsets `(-1, 0)`), magma should also source the - # setupCudaHook, i.e. we want it the hook to be propagated into the - # same nativeBuildInputs. - # - # Logically, cuda_nvcc should include the hook in depsHostHostPropagated, - # so that the final offsets for the propagated hook would be `(-1, 0) + - # (0, 0) = (-1, 0)`. - # - # In practice, TargetTarget appears to work: - # https://gist.github.com/fd80ff142cd25e64603618a3700e7f82 - depsTargetTargetPropagated = [ - final.setupCudaHook - ]; - }); - - cuda_nvprof = prev.cuda_nvprof.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.addOpenGLRunpath ]; - buildInputs = oldAttrs.buildInputs ++ [ final.cuda_cupti.lib ]; - # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = ["libcuda.so.1"]; - }); - - cuda_demo_suite = final.addBuildInputs prev.cuda_demo_suite [ - pkgs.freeglut - pkgs.libGLU - pkgs.libglvnd - pkgs.mesa - final.libcufft.lib - final.libcurand.lib - ]; - - nsight_compute = prev.nsight_compute.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs - ++ (if (lib.versionOlder prev.nsight_compute.version "2022.2.0") - then [ pkgs.qt5.wrapQtAppsHook ] - else [ pkgs.qt6.wrapQtAppsHook ]); - buildInputs = oldAttrs.buildInputs - ++ (if (lib.versionOlder prev.nsight_compute.version "2022.2.0") - then [ pkgs.qt5.qtwebview ] - else [ pkgs.qt6.qtwebview ]); - }); - - nsight_systems = prev.nsight_systems.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ - pkgs.addOpenGLRunpath - pkgs.qt5.wrapQtAppsHook - ]; - buildInputs = oldAttrs.buildInputs ++ [ - pkgs.alsa-lib - pkgs.e2fsprogs - pkgs.nss - pkgs.numactl - pkgs.pulseaudio - pkgs.wayland - pkgs.xorg.libXcursor - pkgs.xorg.libXdamage - pkgs.xorg.libXrandr - pkgs.xorg.libXtst - ]; - # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = true; - }); - - nvidia_driver = prev.nvidia_driver.overrideAttrs (oldAttrs: { - # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = ["libcuda.so.1"]; - # No need to support this package as we have drivers already - # in linuxPackages. - meta.broken = true; - }); -}) diff --git a/pkgs/development/compilers/cudatoolkit/saxpy/default.nix b/pkgs/development/compilers/cudatoolkit/saxpy/default.nix deleted file mode 100644 index f347b43d1d11c..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/saxpy/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ autoAddOpenGLRunpathHook -, backendStdenv -, cmake -, cuda_cccl -, cuda_cudart -, cudaFlags -, cuda_nvcc -, lib -, libcublas -, setupCudaHook -, stdenv -}: - -backendStdenv.mkDerivation { - pname = "saxpy"; - version = "unstable-2023-07-11"; - - src = ./.; - - buildInputs = [ - libcublas - cuda_cudart - cuda_cccl - ]; - nativeBuildInputs = [ - cmake - - # NOTE: this needs to be pkgs.buildPackages.cudaPackages_XX_Y.cuda_nvcc for - # cross-compilation to work. This should work automatically once we move to - # spliced scopes. Delete this comment once that happens - cuda_nvcc - - # Alternatively, we could remove the propagated hook from cuda_nvcc and add - # directly: - # setupCudaHook - autoAddOpenGLRunpathHook - ]; - - cmakeFlags = [ - "-DCMAKE_VERBOSE_MAKEFILE=ON" - "-DCMAKE_CUDA_ARCHITECTURES=${with cudaFlags; builtins.concatStringsSep ";" (map dropDot cudaCapabilities)}" - ]; - - meta = { - description = "A simple (Single-precision AX Plus Y) FindCUDAToolkit.cmake example for testing cross-compilation"; - license = lib.licenses.mit; - maintainers = lib.teams.cuda.members; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/compilers/cudatoolkit/stdenv.nix b/pkgs/development/compilers/cudatoolkit/stdenv.nix deleted file mode 100644 index 95e783a682bff..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/stdenv.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, nixpkgsCompatibleLibstdcxx -, nvccCompatibleCC -, overrideCC -, stdenv -, wrapCCWith -}: - -let - cc = wrapCCWith - { - cc = nvccCompatibleCC; - - # This option is for clang's libcxx, but we (ab)use it for gcc's libstdc++. - # Note that libstdc++ maintains forward-compatibility: if we load a newer - # libstdc++ into the process, we can still use libraries built against an - # older libstdc++. This, in practice, means that we should use libstdc++ from - # the same stdenv that the rest of nixpkgs uses. - # We currently do not try to support anything other than gcc and linux. - libcxx = nixpkgsCompatibleLibstdcxx; - }; - cudaStdenv = overrideCC stdenv cc; - passthruExtra = { - inherit nixpkgsCompatibleLibstdcxx; - # cc already exposed - }; - assertCondition = true; -in -lib.extendDerivation - assertCondition - passthruExtra - cudaStdenv - diff --git a/pkgs/development/compilers/cudatoolkit/versions.toml b/pkgs/development/compilers/cudatoolkit/versions.toml deleted file mode 100644 index 509b7d6bffd7c..0000000000000 --- a/pkgs/development/compilers/cudatoolkit/versions.toml +++ /dev/null @@ -1,91 +0,0 @@ -["10.0"] -version = "10.0.130" -url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux" -sha256 = "16p3bv1lwmyqpxil8r951h385sy9asc578afrc7lssa68c71ydcj" -gcc = "gcc7" - -["10.1"] -version = "10.1.243" -url = "https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run" -sha256 = "0caxhlv2bdq863dfp6wj7nad66ml81vasq2ayf11psvq2b12vhp7" -gcc = "gcc7" - -["10.2"] -version = "10.2.89" -url = "http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run" -sha256 = "04fasl9sjkb1jvchvqgaqxprnprcz7a8r52249zp2ijarzyhf3an" -gcc = "gcc7" - -["11.0"] -version = "11.0.3" -url = "https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run" -sha256 = "1h4c69nfrgm09jzv8xjnjcvpq8n4gnlii17v3wzqry5d13jc8ydh" -gcc = "gcc9" - -["11.1"] -version = "11.1.1" -url = "https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda_11.1.1_455.32.00_linux.run" -sha256 = "13yxv2fgvdnqqbwh1zb80x4xhyfkbajfkwyfpdg9493010kngbiy" -gcc = "gcc9" - -["11.2"] -version = "11.2.1" -url = "https://developer.download.nvidia.com/compute/cuda/11.2.1/local_installers/cuda_11.2.1_460.32.03_linux.run" -sha256 = "sha256-HamMuJfMX1inRFpKZspPaSaGdwbLOvWKZpzc2Nw9F8g=" -gcc = "gcc9" - -["11.3"] -version = "11.3.1" -url = "https://developer.download.nvidia.com/compute/cuda/11.3.1/local_installers/cuda_11.3.1_465.19.01_linux.run" -sha256 = "0d19pwcqin76scbw1s5kgj8n0z1p4v1hyfldqmamilyfxycfm4xd" -gcc = "gcc9" - -["11.4"] -version = "11.4.2" -url = "https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run" -sha256 = "sha256-u9h8oOkT+DdFSnljZ0c1E83e9VUILk2G7Zo4ZZzIHwo=" -gcc = "gcc10" - -["11.5"] -version = "11.5.0" -url = "https://developer.download.nvidia.com/compute/cuda/11.5.0/local_installers/cuda_11.5.0_495.29.05_linux.run" -sha256 = "sha256-rgoWk9lJfPPYHmlIlD43lGNpANtxyY1Y7v2sr38aHkw=" -# cuda 11.5 has problems with glibc 2.4 -> keeping gcc10 -# cf. https://forums.developer.nvidia.com/t/cuda-11-5-samples-throw-multiple-error-attribute-malloc-does-not-take-arguments/192750/15 -gcc = "gcc10" - -["11.6"] -version = "11.6.1" -url = "https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run" -sha256 = "sha256-qyGa/OALdCABEyaYZvv/derQN7z8I1UagzjCaEyYTX4=" -gcc = "gcc11" - -["11.7"] -version = "11.7.0" -url = "https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda_11.7.0_515.43.04_linux.run" -sha256 = "sha256-CH/fy7ofeVQ7H3jkOo39rF9tskLQQt3oIOFtwYWJLyY=" -gcc = "gcc11" - -["11.8"] -version = "11.8.0" -url = "https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux.run" -sha256 = "sha256-kiPErzrr5Ke77Zq9mxY7A6GzS4VfvCtKDRtwasCaWhY=" -gcc = "gcc11" - -["12.0"] -version = "12.0.1" -url = "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run" -sha256 = "sha256-GyBaBicvFGP0dydv2rkD8/ZmkXwGjlIHOAAeacehh1s=" -gcc = "gcc12" - -["12.1"] -version = "12.1.1" -url = "https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_530.30.02_linux.run" -sha256 = "sha256-10Ai1B2AEFMZ36Ib7qObd6W5kZU5wEh6BcqvJEbWpw4=" -gcc = "gcc12" - -["12.2"] -version = "12.2.0" -url = "https://developer.download.nvidia.com/compute/cuda/12.2.0/local_installers/cuda_12.2.0_535.54.03_linux.run" -sha256 = "sha256-7PPSr63LrAKfD0UFeFgQ1S0AbkuHunn/P5hDNqK79Rg=" -gcc = "gcc12" diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index 0526825ee2114..c711e02d396ff 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.1.3"; in +let version = "3.2.0"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "00bjyjya5hb1aaywbbaqbsxas5q93xvxrz9sd3x40m3792zxdbfx"; + sha256 = "0a1mbi2si0ww9b96hx633xviwrbqk4skf7gxs0h95npw2cf6n9kd"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "0nansfrnzb8ximg15my8yv5kc2gih60rkann7r008h7zk5cd8nkr"; + sha256 = "0yhmhvfq8w6l8q5ahlxk5qbr3ji319snb8ghpi6y7px2pfbv5gwr"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "08njr5n7z94dfkmbi9wcdv5yciy94nzfgvjbdhsjswyq3h030a1b"; + sha256 = "052vz5zjjwjbww81qws3vyj39wkw2i9mqqs8fcifzgzbfdyc8lb0"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "0ff73ws20i2j5lk2h2dy6k3fbfx7l9na9gqyji37c0dc67vxyl01"; + sha256 = "0wvpyjpvyaasazjmizb0ha3p70q3rhqpqq8bzl1bv9jrsgcniqsf"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "1703vsmw0m867gqzd2wy93bab0gg7z40r9rfin4lzhxw20x2brs4"; + sha256 = "1z187sl652fzkp3nf044snjh09svnvmlxh0ribzf3b955a40l8cd"; }; } diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index f73804874cc62..59a8ad8c63c65 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "2.105.2"; - dmdSha256 = "sha256-IjzIQZttB1711VayKDWcpYvf1MAan+GWGTdpdDTgo1k="; - phobosSha256 = "sha256-2hAq48sBC1qvS1XBWZhGIPUlsA4pGcn4pHNok6lC8R0="; + version = "2.106.0"; + dmdSha256 = "sha256-H28X+8qAjnc5KIvZ7HRVCtjNpf1hBwSPL6QIVeWCjKM="; + phobosSha256 = "sha256-umsPMQbomJUu/QBMSgSC0jEajxiJwv1Lay4q4tvfnsI="; } diff --git a/pkgs/development/compilers/dmd/generic.nix b/pkgs/development/compilers/dmd/generic.nix index 0f6abb574a597..5cf07454141bc 100644 --- a/pkgs/development/compilers/dmd/generic.nix +++ b/pkgs/development/compilers/dmd/generic.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation rec { rm dmd/compiler/test/runnable/gdb15729.sh rm dmd/compiler/test/runnable/gdb4149.d rm dmd/compiler/test/runnable/gdb4181.d + rm dmd/compiler/test/compilable/ddocYear.d # Disable tests that rely on objdump whitespace until fixed upstream: # https://issues.dlang.org/show_bug.cgi?id=23317 @@ -103,12 +104,7 @@ stdenv.mkDerivation rec { rm dmd/compiler/test/compilable/cdcmp.d '' - + lib.optionalString (lib.versionOlder version "2.091.0") '' - # This one has tested against a hardcoded year, then against a current year on - # and off again. It just isn't worth it to patch all the historical versions - # of it, so just remove it until the most recent change. - rm dmd/compiler/test/compilable/ddocYear.d - '' + lib.optionalString (lib.versionAtLeast version "2.089.0" && lib.versionOlder version "2.092.2") '' + + lib.optionalString (lib.versionAtLeast version "2.089.0" && lib.versionOlder version "2.092.2") '' rm dmd/compiler/test/dshell/test6952.d '' + lib.optionalString (lib.versionAtLeast version "2.092.2") '' substituteInPlace dmd/compiler/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash" diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index bba1b3026362a..a9a7471275e56 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "ecl"; - version = "21.2.1"; + version = "23.9.9"; src = fetchurl { url = "https://common-lisp.net/project/ecl/static/files/release/ecl-${version}.tgz"; - sha256 = "sha256-sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA="; + sha256 = "107q6gmxlsya4yv38r1x1axrgyyfgdrfkkz97zfp64bcrasdl6y5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch b/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch index 6a57e423bd72b..4171906d5e368 100644 --- a/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch +++ b/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch @@ -1,4 +1,4 @@ -From 4bbbb640934aa653bcfec0335798b77a8935b815 Mon Sep 17 00:00:00 2001 +From 86fc9ce2b381748813b372f7e86909be6f955cbd Mon Sep 17 00:00:00 2001 From: Yureka <yuka@yuka.dev> Date: Sat, 7 Aug 2021 09:16:46 +0200 Subject: [PATCH] emulate clang 'sysroot + /include' logic @@ -16,27 +16,23 @@ in the include search order, right after the resource root. Hence usage of -idirafter. Clang also documents an -isystem-after flag but it doesn't appear to work --- - emcc.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + emcc.py | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/emcc.py b/emcc.py -index ba8d1b556..7d89644c5 100755 +index 279f6d4d9..26e20e2cc 100644 --- a/emcc.py +++ b/emcc.py -@@ -883,7 +883,12 @@ def parse_s_args(args): +@@ -400,6 +400,9 @@ def get_cflags(user_args, is_cxx): + # We add these to the user's flags (newargs), but not when building .s or .S assembly files + cflags = get_clang_flags(user_args) + cflags.append('--sysroot=' + cache.get_sysroot(absolute=True)) ++ cflags.append('-resource-dir=@resourceDir@') ++ cflags.append('-idirafter' + cache.get_sysroot(absolute=True) + os.path.join('/include')) ++ cflags.append('-iwithsysroot' + os.path.join('/include','c++','v1')) - - def emsdk_cflags(user_args): -- cflags = ['--sysroot=' + cache.get_sysroot(absolute=True)] -+ cflags = [ -+ '--sysroot=' + cache.get_sysroot(absolute=True), -+ '-resource-dir=@resourceDir@', -+ '-idirafter' + cache.get_sysroot(absolute=True) + os.path.join('/include'), -+ '-iwithsysroot' + os.path.join('/include','c++','v1') -+ ] - - def array_contains_any_of(hay, needles): - for n in needles: + if settings.EMSCRIPTEN_TRACING: + cflags.append('-D__EMSCRIPTEN_TRACING__=1') -- -2.40.0 +2.42.0 diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 436fda2a05217..1f8d2f55da347 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.47"; + version = "3.1.50"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-cRNkQ+7vUqJLNlf5dieeDcyT1jlBUeVxO8avoUvOPHI="; + hash = "sha256-iFZF+DxGaq279QPPugoLhYmoXmyLPkmn1x4rBCkdW+I="; rev = version; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./0001-emulate-clang-sysroot-include-logic.patch; - resourceDir = "${llvmEnv}/lib/clang/16/"; + resourceDir = "${llvmEnv}/lib/clang/17/"; }) ]; @@ -51,11 +51,12 @@ stdenv.mkDerivation rec { patchShebangs . + # emscripten 3.1.50 requires LLVM tip-of-tree instead of LLVM 17 + sed -i -e "s/EXPECTED_LLVM_VERSION = 18/EXPECTED_LLVM_VERSION = 17.0/g" tools/shared.py + # fixes cmake support sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py - # disables cache in user home, use installation directory instead - sed -i '/^def/!s/root_is_writable()/True/' tools/config.py sed -i "/^def check_sanity/a\\ return" tools/shared.py echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten @@ -108,7 +109,11 @@ stdenv.mkDerivation rec { # TODO: get library cache to build with both enabled and function exported $out/bin/emcc $LTO $BIND test.c $out/bin/emcc $LTO $BIND -s RELOCATABLE test.c - $out/bin/emcc $LTO $BIND -s USE_PTHREADS test.c + # starting with emscripten 3.1.48+, + # to use pthreads, _emscripten_check_mailbox must be exported + # (see https://github.com/emscripten-core/emscripten/pull/20604) + # TODO: get library cache to build with pthreads at all + # $out/bin/emcc $LTO $BIND -s USE_PTHREADS test.c done done popd @@ -133,7 +138,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/emscripten-core/emscripten"; description = "An LLVM-to-JavaScript Compiler"; platforms = platforms.all; - maintainers = with maintainers; [ qknight matthewbauer raitobezarius ]; + maintainers = with maintainers; [ qknight matthewbauer raitobezarius willcohen ]; license = licenses.ncsa; }; } diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index e894d2607bc00..f23e9540928ab 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -1,24 +1,28 @@ { stdenvNoCC, lib, fetchurl }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "fasm-bin"; - - version = "1.73.31"; + version = "1.73.32"; src = fetchurl { - url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "sha256-jzjLIayR+xulSGKhvQ9VxWhZC6qRZ/4IHSe3lD8LD+M="; + url = "https://flatassembler.net/fasm-${finalAttrs.version}.tgz"; + hash = "sha256-WVXL4UNWXa9e7K3MSS0CXK3lczgog9V4XUoYChvvym8="; }; installPhase = '' + runHook preInstall + install -D fasm${lib.optionalString stdenvNoCC.isx86_64 ".x64"} $out/bin/fasm + + runHook postInstall ''; - meta = with lib; { + meta = { description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF"; homepage = "https://flatassembler.net/download.php"; - license = licenses.bsd2; - maintainers = with maintainers; [ orivej ]; + license = lib.licenses.bsd2; + mainProgram = "fasm"; + maintainers = with lib.maintainers; [ orivej ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/development/compilers/fbc/default.nix b/pkgs/development/compilers/fbc/default.nix index 8609c841b22a4..631bf9c7bfe02 100644 --- a/pkgs/development/compilers/fbc/default.nix +++ b/pkgs/development/compilers/fbc/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { pname = "fbc"; - version = "1.10.0"; + version = "1.10.1"; src = fetchzip { # Bootstrap tarball has sources pretranslated from FreeBASIC to C url = "https://github.com/freebasic/fbc/releases/download/${version}/FreeBASIC-${version}-source-bootstrap.tar.xz"; - hash = "sha256-7FmyEfykOAgHaL2AG8zIgftzOszhwVzNKEqskiLGpfk="; + hash = "sha256-LBROv3m1DrEfSStMbNuLC+fldYNfSS+D09bJyNMNPP0="; }; postPatch = '' diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix new file mode 100644 index 0000000000000..e0c1440a604fe --- /dev/null +++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix @@ -0,0 +1,54 @@ +{ lib +, runCommand +, xorg +, cacert +, unzip + +, platform +, flutter +, hash +}: + +let + platforms = [ + "android" + "ios" + "web" + "linux" + "windows" + "macos" + "fuchsia" + "universal" + ]; + + flutter' = flutter.override { + # Use a version of Flutter with just enough capabilities to download + # artifacts. + supportedTargetPlatforms = [ ]; + }; +in +runCommand "flutter-artifacts-${platform}" +{ + nativeBuildInputs = [ xorg.lndir flutter' unzip ]; + + NIX_FLUTTER_TOOLS_VM_OPTIONS = "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt"; + + outputHash = hash; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + + passthru = { + inherit platform; + }; +} '' + export FLUTTER_ROOT="$NIX_BUILD_TOP" + lndir -silent '${flutter'}' "$FLUTTER_ROOT" + rm -rf "$FLUTTER_ROOT/bin/cache" + mkdir "$FLUTTER_ROOT/bin/cache" + + HOME="$(mktemp -d)" flutter precache -v '--${platform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove platform platforms))} + rm -rf "$FLUTTER_ROOT/bin/cache/lockfile" + find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete + + cp -r bin/cache "$out" +'' diff --git a/pkgs/development/compilers/flutter/artifacts/hashes.nix b/pkgs/development/compilers/flutter/artifacts/hashes.nix new file mode 100644 index 0000000000000..551975acf6625 --- /dev/null +++ b/pkgs/development/compilers/flutter/artifacts/hashes.nix @@ -0,0 +1,75 @@ +# NOTICE: When updating these hashes, make sure that no additional platforms +# have been added to the `flutter precache` CLI. If any have, they may be +# included in every derivation, unless they are also added to the platform list +# in fetch-artifacts.nix. +# +# The known arguments are as follows: +# $ flutter precache --help --verbose +# Usage: flutter precache [arguments] +# -h, --help Print this usage information. +# -a, --all-platforms Precache artifacts for all host platforms. +# -f, --force Force re-downloading of artifacts. +# --[no-]android Precache artifacts for Android development. +# --[no-]android_gen_snapshot Precache gen_snapshot for Android development. +# --[no-]android_maven Precache Gradle dependencies for Android development. +# --[no-]android_internal_build Precache dependencies for internal Android development. +# --[no-]ios Precache artifacts for iOS development. +# --[no-]web Precache artifacts for web development. +# --[no-]linux Precache artifacts for Linux desktop development. +# --[no-]windows Precache artifacts for Windows desktop development. +# --[no-]macos Precache artifacts for macOS desktop development. +# --[no-]fuchsia Precache artifacts for Fuchsia development. +# --[no-]universal Precache artifacts required for any development platform. +# (defaults to on) +# --[no-]flutter_runner Precache the flutter runner artifacts. +# --[no-]use-unsigned-mac-binaries Precache the unsigned macOS binaries when available. + +# Schema: +# ${flutterVersion}.${targetPlatform}.${hostPlatform} +# +# aarch64-darwin as a host is not yet supported. +# https://github.com/flutter/flutter/issues/60118 +{ + "3.13.8" = { + android = { + x86_64-linux = "sha256-Uc36aBq8wQo2aEvjAPOoixZElWOE/GNRm2GUfhbwT3Y="; + aarch64-linux = "sha256-Uc36aBq8wQo2aEvjAPOoixZElWOE/GNRm2GUfhbwT3Y="; + x86_64-darwin = "sha256-v/6/GTj7732fEOIgSaoM00yaw2qNwOMuvbuoCvii7vQ="; + }; + fuchsia = { + x86_64-linux = "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="; + aarch64-linux = "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="; + x86_64-darwin = "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="; + }; + ios = { + x86_64-linux = "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao="; + aarch64-linux = "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao="; + x86_64-darwin = "sha256-QwkeGnutTVsm682CqxRtEd9rKUvN7zlAJcqkvAQYwao="; + }; + linux = { + x86_64-linux = "sha256-0gIOwux3YBdmcXgwICr8dpftj1CauaBUX8Rt5GG0WSs="; + aarch64-linux = "sha256-drGHsuJoOCLqrhVrXczqJRCOtpeWVlqdWW0OSMS/l5M="; + x86_64-darwin = "sha256-0gIOwux3YBdmcXgwICr8dpftj1CauaBUX8Rt5GG0WSs="; + }; + macos = { + x86_64-linux = "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc="; + aarch64-linux = "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc="; + x86_64-darwin = "sha256-9WqCJQ37mcGc5tzfqQoY5CqHWHGTizjXf9p73bdnNWc="; + }; + universal = { + x86_64-linux = "sha256-wATt1UPjo/fh7RFO1vvcUAdo0dMAaaOUIuzYodsM0v0="; + aarch64-linux = "sha256-Z9bszNaIpCccG7OfvE5WFsw36dITiyCQAZ6p29+Yq68="; + x86_64-darwin = "sha256-qN5bAXRfQ78TWF3FLBIxWzUB5y5OrZVQTEilY5J/+2k="; + }; + web = { + x86_64-linux = "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0="; + aarch64-linux = "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0="; + x86_64-darwin = "sha256-DVXJOOFxv7tKt3d0NaYMexkphEcr7+gDFV67I6iAYa0="; + }; + windows = { + x86_64-linux = "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI="; + aarch64-linux = "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI="; + x86_64-darwin = "sha256-s8fJtwQkuZaGXr6vrPiKfpwP/NfewbETwyp9ERGqHYI="; + }; + }; +} diff --git a/pkgs/development/compilers/flutter/artifacts/overrides/linux.nix b/pkgs/development/compilers/flutter/artifacts/overrides/linux.nix new file mode 100644 index 0000000000000..bc6114415b909 --- /dev/null +++ b/pkgs/development/compilers/flutter/artifacts/overrides/linux.nix @@ -0,0 +1,10 @@ +{ gtk3 +}: + +{ buildInputs ? [ ] +, ... +}: + +{ + buildInputs = buildInputs ++ [ gtk3 ]; +} diff --git a/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix new file mode 100644 index 0000000000000..9714d25c6f9b6 --- /dev/null +++ b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, callPackage +, autoPatchelfHook +, src +}: + +(stdenv.mkDerivation { + inherit (src) name; + inherit src; + + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + cp -r . "$out/bin/cache" + + runHook postInstall + ''; +}).overrideAttrs ( + if builtins.pathExists ./overrides/${src.platform}.nix + then callPackage ./overrides/${src.platform}.nix { } + else ({ ... }: { }) +) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index ff18036677a1b..f9c0320edec81 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -1,14 +1,24 @@ -{ callPackage, fetchzip, dart, lib, stdenv }: +{ callPackage, fetchzip, fetchFromGitHub, dart, lib, stdenv }: let mkCustomFlutter = args: callPackage ./flutter.nix args; wrapFlutter = flutter: callPackage ./wrapper.nix { inherit flutter; }; getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - mkFlutter = { version, engineVersion, dartVersion, flutterHash, dartHash, patches }: + mkFlutter = + { version + , engineVersion + , dartVersion + , flutterHash + , dartHash + , patches + , pubspecLockFile + , vendorHash + , depsListFile + }: let args = { - inherit version engineVersion patches; + inherit version engineVersion patches pubspecLockFile vendorHash depsListFile; dart = dart.override { version = dartVersion; @@ -31,24 +41,12 @@ let }; }; }; - src = { - x86_64-linux = fetchzip { - url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz"; - sha256 = flutterHash.x86_64-linux; - }; - aarch64-linux = fetchzip { - url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz"; - sha256 = flutterHash.aarch64-linux; - }; - x86_64-darwin = fetchzip { - url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_${version}-stable.zip"; - sha256 = flutterHash.x86_64-darwin; - }; - aarch64-darwin = fetchzip { - url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_${version}-stable.zip"; - sha256 = flutterHash.aarch64-darwin; - }; - }.${stdenv.hostPlatform.system}; + src = fetchFromGitHub { + owner = "flutter"; + repo = "flutter"; + rev = version; + hash = flutterHash; + }; }; in (mkCustomFlutter args).overrideAttrs (prev: next: { @@ -57,13 +55,7 @@ let buildFlutterApplication = callPackage ../../../build-support/flutter { # Package a minimal version of Flutter that only uses Linux desktop release artifacts. flutter = (wrapFlutter (mkCustomFlutter args)).override { - supportsAndroid = false; - includedEngineArtifacts = { - common = [ "flutter_patched_sdk_product" ]; - platform.linux = lib.optionals stdenv.hostPlatform.isLinux - (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64")) - (architecture: [ "release" ])); - }; + supportedTargetPlatforms = [ "universal" "linux" ]; }; }; }; @@ -83,12 +75,10 @@ in x86_64-darwin = "sha256-BchKowKd6BscVuk/dXibcQzdFkW9//GDfll77mHEI4M="; aarch64-darwin = "sha256-9yrx09vYrOTmdqkfJI7mfh7DI1/rg67tPlf82m5+iKI="; }; - flutterHash = rec { - x86_64-linux = "sha256-ouI1gjcynSQfPTnfTVXQ4r/NEDdhmzUsKdcALLRiCbg="; - aarch64-linux = x86_64-linux; - x86_64-darwin = "sha256-k6KNazP/I71zG5mbx3iEtXBJ8EZi9Qq+7PgL/HAJrgE="; - aarch64-darwin = "sha256-Duvw8EqrGb3PmBHBH/prZjyij2xJd9sLkNfPRYpC0pQ="; - }; + flutterHash = "sha256-00G030FvZZTsdf9ruFs9jdIHcC5h+xpp4NlmL64qVZA="; patches = flutter3Patches; + pubspecLockFile = ./lockfiles/stable/pubspec.lock; + vendorHash = "sha256-lsFOvvmhszBcFb9XvabpqfL2Ek4wjhmB0OrcWUOURFQ="; + depsListFile = ./lockfiles/stable/deps.json; }; } diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix deleted file mode 100644 index 30c293c8d75db..0000000000000 --- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix +++ /dev/null @@ -1,243 +0,0 @@ -{ lib -, stdenv -, hostPlatform -, engineVersion -, fetchurl -, fetchzip -, autoPatchelfHook -, gtk3 -, flutterVersion -, unzip -, stdenvNoCC -}: - -let - hashes = (import ./hashes.nix).${engineVersion} or - (throw "There are no known artifact hashes for Flutter engine version ${engineVersion}."); - noticeText = stdenvNoCC.mkDerivation (finalAttrs: { - pname = "flutter-notice"; - version = engineVersion; - dontUnpack = true; - src = fetchurl { - pname = "flutter-sky_engine-LICENSE"; - version = engineVersion; - url = "https://raw.githubusercontent.com/flutter/engine/${engineVersion}/sky/packages/sky_engine/LICENSE"; - sha256 = hashes.skyNotice; - }; - flutterNotice = fetchurl { - pname = "flutter-LICENSE"; - version = engineVersion; - url = "https://raw.githubusercontent.com/flutter/flutter/${flutterVersion}/LICENSE"; - sha256 = hashes.flutterNotice; - }; - installPhase = - '' - SRC_TEXT="$(cat $src)" - FLUTTER_NOTICE_TEXT="$(cat $flutterNotice)" - cat << EOF > $out - This artifact is from the Flutter SDK's engine. - This file carries third-party notices for its dependencies. - See also other files, that have LICENSE in the name, in the artifact directory. - - Appendix 1/2: merged sky_engine LICENSE file (also found at ${finalAttrs.src.url}) - $SRC_TEXT - - Appendix 2/2: Flutter license (also found at ${finalAttrs.flutterNotice.url}) - $FLUTTER_NOTICE_TEXT - EOF - ''; - }); - artifacts = - { - common = { - flutter_patched_sdk = { archive = "flutter_patched_sdk.zip"; }; - flutter_patched_sdk_product = { archive = "flutter_patched_sdk_product.zip"; }; - }; - platform = { - android = - (lib.genAttrs - [ "arm" "arm64" "x64" ] - (arch: - { - base = [ - { archive = "artifacts.zip"; } - ]; - variants = lib.genAttrs [ "profile" "release" ] - (variant: [ - { archive = "artifacts.zip"; } - { subdirectory = true; archive = "${lib.toLower hostPlatform.uname.system}-x64.zip"; } - ]); - })) // - { - "x86" = { - base = [ - { archive = "artifacts.zip"; } - ]; - variants.jit-release = [ - { archive = "artifacts.zip"; } - ]; - }; - }; - - darwin = { - "arm64" = { - base = [ - { archive = "artifacts.zip"; } - { archive = "font-subset.zip"; } - ]; - variants = lib.genAttrs [ "profile" "release" ] - (variant: [ - { archive = "artifacts.zip"; } - ]); - }; - "x64" = { - base = [ - { archive = "FlutterEmbedder.framework.zip"; } - { archive = "FlutterMacOS.framework.zip"; } - { archive = "artifacts.zip"; } - { archive = "font-subset.zip"; } - { archive = "gen_snapshot.zip"; } - ]; - variants.profile = [ - { archive = "FlutterMacOS.framework.zip"; } - { archive = "artifacts.zip"; } - { archive = "gen_snapshot.zip"; } - ]; - variants.release = [ - { archive = "FlutterMacOS.dSYM.zip"; } - { archive = "FlutterMacOS.framework.zip"; } - { archive = "artifacts.zip"; } - { archive = "gen_snapshot.zip"; } - ]; - }; - }; - - ios = - (lib.genAttrs - [ "" ] - (arch: - { - base = [ - { archive = "artifacts.zip"; } - ]; - variants.profile = [ - { archive = "artifacts.zip"; } - ]; - variants.release = [ - { archive = "artifacts.zip"; } - { archive = "Flutter.dSYM.zip"; } - ]; - })); - - linux = lib.genAttrs - [ "arm64" "x64" ] - (arch: - let - linux-flutter-gtk = { - archive = "linux-${arch}-flutter-gtk.zip"; - buildInputs = [ gtk3 ]; - }; - in - { - base = [ - ({ archive = "artifacts.zip"; } // lib.optionalAttrs (arch == "arm64") { - # For some reason, the arm64 artifacts are missing shader code in Flutter < 3.10.0. - postPatch = '' - if [ ! -d shader_lib ]; then - ln -s ${lib.findSingle - (pkg: lib.getName pkg == "flutter-artifact-linux-x64-artifacts") - (throw "Could not find the x64 artifact archive.") - (throw "Could not find the correct x64 artifact archive.") - artifactDerivations.platform.linux.x64.base - }/shader_lib . - fi - ''; - }) - { archive = "font-subset.zip"; } - (linux-flutter-gtk // { - # https://github.com/flutter/flutter/commit/9d94a51b607600a39c14470c35c676eb3e30eed6 - variant = "debug"; - }) - ]; - variants = lib.genAttrs [ "debug" "profile" "release" ] (variant: [ - linux-flutter-gtk - ]); - }); - }; - }; - - mkArtifactDerivation = { platform ? null, variant ? null, subdirectory ? null, archive, ... }@args: - let - artifactDirectory = if platform == null then null else "${platform}${lib.optionalString (variant != null) "-${variant}"}"; - archiveBasename = lib.removeSuffix ".${(lib.last (lib.splitString "." archive))}" archive; - overrideUnpackCmd = builtins.elem archive [ "FlutterEmbedder.framework.zip" "FlutterMacOS.framework.zip" ]; - in - stdenv.mkDerivation ({ - pname = "flutter-artifact${lib.optionalString (platform != null) "-${artifactDirectory}"}-${archiveBasename}"; - version = engineVersion; - - nativeBuildInputs = [ unzip ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - - src = - if overrideUnpackCmd then - (fetchurl { - url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}"; - hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive}; - }) else - (fetchzip { - url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}"; - stripRoot = false; - hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive}; - }); - - sourceRoot = if overrideUnpackCmd then "." else null; - unpackCmd = if overrideUnpackCmd then "unzip -o $src -d $out" else null; - - installPhase = - let - destination = "$out/${if subdirectory == true then archiveBasename else if subdirectory != null then subdirectory else "."}"; - in - '' - # ship the notice near all artifacts. if the artifact directory is / multiple directories are nested in $src, link it there. If there isn't a directory, link it in root - # this *isn't the same as the subdirectory variable above* - DIR_CNT="$(echo */ | wc -w)" - if [[ "$DIR_CNT" == 0 ]]; then - ln -s ${noticeText} LICENSE.README - else - for dir in */ - do - ln -s ${noticeText} "$dir/LICENSE.README" - done - fi - mkdir -p "${destination}" - cp -r . "${destination}" - ''; - } // args); - - artifactDerivations = { - common = builtins.mapAttrs (name: mkArtifactDerivation) artifacts.common; - platform = - builtins.mapAttrs - (os: architectures: - builtins.mapAttrs - (architecture: variants: { - base = map - (args: mkArtifactDerivation ({ - platform = "${os}${lib.optionalString (architecture != "") "-${architecture}"}"; - } // args)) - variants.base; - variants = builtins.mapAttrs - (variant: variantArtifacts: map - (args: mkArtifactDerivation ({ - platform = "${os}${lib.optionalString (architecture != "") "-${architecture}"}"; - inherit variant; - } // args)) - variantArtifacts) - variants.variants; - }) - architectures) - artifacts.platform; - }; -in -artifactDerivations diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix deleted file mode 100644 index 7bfb60d7a9acb..0000000000000 --- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ - "767d8c75e898091b925519803830fc2721658d07" = { - skyNotice = "sha256-bJMktK26wC9fVzdhLNcTHqOg5sHRZ535LB5u5dgwjlY="; - flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; - android-arm = { - "artifacts.zip" = "sha256-pnUDY2sUN2r/LrivyNkfTUpQC90GKOI6Ya+0lgIz+c0="; - }; - android-arm-profile = { - "artifacts.zip" = "sha256-/kDNI+no4u2Ri/FqqsQEp2iEqifULYGqzz8w0G4pzCM="; - "linux-x64.zip" = "sha256-fUfaDJIo1VcdJHcd0jO98Az3OdNQ+JtA5Mp6nQVVU4E="; - "darwin-x64.zip" = "sha256-J7vDD5VEsgnWmbI8acM3vQwrnrqcfMaCijiItDfniLY="; - }; - android-arm-release = { - "artifacts.zip" = "sha256-tVAFHHG8A8vlgQu6l6ybdfm6OmBf2vrYf3PZByWvs08="; - "linux-x64.zip" = "sha256-lrejG7zpUBox9kPvs1uPM/lyR1d/SAc1w+c6kcqghHI="; - "darwin-x64.zip" = "sha256-8lKOsqLgbnuoCR87v84dn8V3PRzl1+maWFIHopiGvbc="; - }; - android-arm64 = { - "artifacts.zip" = "sha256-rcU2mX0nP1ot+6DU+uxvILUOAuwTPGH23UQ6riBs0d4="; - }; - android-arm64-profile = { - "artifacts.zip" = "sha256-x4TEJWi3c6mEPGh+3l4PtRqsg4Tq7mxHtGz+4MqwzPw="; - "linux-x64.zip" = "sha256-PsDKOq3DXaNeNtaFtDQJ9JIEESXBHm8XHHpOw2u1cGg="; - "darwin-x64.zip" = "sha256-K4W1CEBOlZVsHjuhvKCUZWv45VSohRd23vviaLqMNjQ="; - }; - android-arm64-release = { - "artifacts.zip" = "sha256-w+J4sNhYoj44IiHpZ0BkemCYlE9wOTvWL57Y8RCstkI="; - "linux-x64.zip" = "sha256-MJsmck27V14/f0IAT6b/R47p8/eCMX9Nn//PEAbEeOY="; - "darwin-x64.zip" = "sha256-xXa5GFatJPiwBANqeWUpAdM9gibD4xH85aI6YpJrcpI="; - }; - android-x64 = { - "artifacts.zip" = "sha256-doNUwEJkwncHPIf2c8xOZByUU8dmogtWlc6q7n7ElDY="; - }; - android-x64-profile = { - "artifacts.zip" = "sha256-N3AjdHdzj4s6v3f3Gf6n/1Xk0W7xFQP70SneCNlj2sk="; - "linux-x64.zip" = "sha256-pNn75iZqLwOGO3ZmymmrSasDPMmDWwp9ZWBv9Xti4cU="; - "darwin-x64.zip" = "sha256-6O4lA/4wZ91ODUUYHe4HpjvraAEbhHiehBmf3sT37Dc="; - }; - android-x64-release = { - "artifacts.zip" = "sha256-odDS/m8fgSA24EYt+W2sEDmOlPO17FZxxomWuYUHmns="; - "linux-x64.zip" = "sha256-sVQYmu0KaPADlL59XZc26Ks+TbmaJxRGPiJKlWxUhRA="; - "darwin-x64.zip" = "sha256-dep/CmBIDkvqYKQPWMCDTDbFhVvOk6N7JAF8v3dr/P8="; - }; - android-x86 = { - "artifacts.zip" = "sha256-MzTFQ0XPtd9OXvKfM98bwpxN/xfEcXox24gn/4aS/Do="; - }; - android-x86-jit-release = { - "artifacts.zip" = "sha256-cUsBqJxOOluwnYEFzdtZof8c4Vp1D81HkEEH8aRGLyY="; - }; - darwin-arm64 = { - "artifacts.zip" = "sha256-df+rmN0RqLM7MgEKjTcybMY0bFYCB1jsTvaVE1J0BzY="; - "font-subset.zip" = "sha256-hJ5fECxN4oZX6E9ivzSDGejNSj56t2SKccbyfozXxps="; - }; - darwin-arm64-profile = { - "artifacts.zip" = "sha256-EaXOr998zE4cG5G5FRtsDGt3jjg1GjkRGE/ZDD3Coto="; - }; - darwin-arm64-release = { - "artifacts.zip" = "sha256-1XMoM8jDRoUSPMauKD5lsgC25B7Htod8wYouDKSEGJY="; - }; - darwin-x64 = { - "FlutterEmbedder.framework.zip" = "sha256-vzvt0pwo1HbIxxym/jn2Y+1+Iqm/Gw2TfymEcuUHIXQ="; - "FlutterMacOS.framework.zip" = "sha256-cMTCULaVOKDq8VrqCmZLo0IPBve0GSh0K2yvtdCvX8c="; - "artifacts.zip" = "sha256-8BViZUz4b0XurQJM+FCU2toONKmhajabCc66gBUVGgY="; - "font-subset.zip" = "sha256-VgqNdUmvTbSedQtJNT+Eq90GWS4hXCDCBDBjno6s1dk="; - "gen_snapshot.zip" = "sha256-4O0ZfKt96x8/Jwh8DgBoPFiv84Tqf9tR/f0PVRJlJiQ="; - }; - darwin-x64-profile = { - "FlutterMacOS.framework.zip" = "sha256-IrXK0Mjllic3OKaYKKpAE9gPIceTO32hGqgxGR66QmY="; - "artifacts.zip" = "sha256-IHllbxwRMrEWA1MI0DRCYYRzYAdQIL8B9b5rZHsOvjc="; - "gen_snapshot.zip" = "sha256-bPI6pHrWQR1X7CzytbJA90TYe3cg1yN+9v7JtsCCrbQ="; - }; - darwin-x64-release = { - "FlutterMacOS.dSYM.zip" = "sha256-HjU8sLPwvOwO3LP7krpZZW6/t3sN3rX2frFnBp1Kk0I="; - "FlutterMacOS.framework.zip" = "sha256-GuTWojZFdSEeOiSYxH8XGSWsxcrkUpnXA61B0NpDa5A="; - "artifacts.zip" = "sha256-tQCm1HHrhffNz9a0lNIHXLBqFMbT4QiaibKvRKuuhJ4="; - "gen_snapshot.zip" = "sha256-0na+yx0Nxe/FuHVZqhgbRniZLInShoKE3USaJg0829o="; - }; - "flutter_patched_sdk.zip" = "sha256-AVjXLND3nJAaGyBAhytBRUvbkJtwZEcndQSrq+D2c08="; - "flutter_patched_sdk_product.zip" = "sha256-31qgieDI897sXtEf8ok2SdFgrlN57bwhT3FUfdofZi0="; - ios = { - "artifacts.zip" = "sha256-RicBTTBX5aIQwfcolDrKe0MVG9uTp56RYMWgR75AVEw="; - }; - ios-profile = { - "artifacts.zip" = "sha256-6EXHvy36K+rRGpjt0GL/DyuOhpAGeaOrZAZvPZuLyys="; - }; - ios-release = { - "Flutter.dSYM.zip" = "sha256-zYqlX4QhxnDb9LasMcBcPO/+30LCfVbwC+z+wZiiEqk="; - "artifacts.zip" = "sha256-DVpynf2LxU6CPC1BPQbi8OStcIwJKX55rDSWNiJ4KNk="; - }; - linux-arm64 = { - "artifacts.zip" = "sha256-djesma+IqQZgGlxQj4Gv6hAkQhQKQp7Gsa1I4hksqNc="; - "font-subset.zip" = "sha256-Wo11dks0uhLI2nu+9QJ7aLmvfsPcuqvcmquak4qv5XM="; - }; - linux-arm64-debug = { - "linux-arm64-flutter-gtk.zip" = "sha256-6T2Ycxe3GTVnFGfBFfXLZwPklIndQ6hojnCSnMeXJso="; - }; - linux-arm64-profile = { - "linux-arm64-flutter-gtk.zip" = "sha256-ycInFHuRu7r+50GsoFR4v/rIRiAQaQ9zFemd2d9AnpQ="; - }; - linux-arm64-release = { - "linux-arm64-flutter-gtk.zip" = "sha256-J60MU8pHDVL9DyX5A3YdCRkKXnTgvALhHiEzYiPSSuA="; - }; - linux-x64 = { - "artifacts.zip" = "sha256-ZUMRJ0dzaeRQUYy5S7gDLWa3w9CVhNPORN9l+lwxAMs="; - "font-subset.zip" = "sha256-pmtHAgIj5tXzUsDrrxB5JwfLDNzMCqouUCOyYN5BOEQ="; - }; - linux-x64-debug = { - "linux-x64-flutter-gtk.zip" = "sha256-otmghZAiUlpLYfFaWd18UWlfctKcYsMRBMP78ZyBj/E="; - }; - linux-x64-profile = { - "linux-x64-flutter-gtk.zip" = "sha256-bT6xMYlwTB9JOV1790cJqTSEXYstdI4sZCQzFzcpa5s="; - }; - linux-x64-release = { - "linux-x64-flutter-gtk.zip" = "sha256-E8Eogr0nD7yaxjuoNhpvF4tTx9N53y3iOkI71Eqx5Ko="; - }; - }; -} - diff --git a/pkgs/development/compilers/flutter/flutter-tools.nix b/pkgs/development/compilers/flutter/flutter-tools.nix new file mode 100644 index 0000000000000..0aedd174e2edb --- /dev/null +++ b/pkgs/development/compilers/flutter/flutter-tools.nix @@ -0,0 +1,51 @@ +{ hostPlatform +, buildDartApplication +, git +, which +, dart +, version +, flutterSrc +, patches ? [ ] +, pubspecLockFile +, vendorHash +, depsListFile +}: + +buildDartApplication.override { inherit dart; } rec { + pname = "flutter-tools"; + inherit version; + dartOutputType = "jit-snapshot"; + + src = flutterSrc; + sourceRoot = "source/packages/flutter_tools"; + postUnpack = ''chmod -R u+w "$NIX_BUILD_TOP/source"''; + + inherit patches; + # The given patches are made for the entire SDK source tree. + prePatch = ''pushd "$NIX_BUILD_TOP/source"''; + postPatch = ''popd''; + + # When the JIT snapshot is being built, the application needs to run. + # It attempts to generate configuration files, and relies on a few external + # tools. + nativeBuildInputs = [ git which ]; + preConfigure = '' + export HOME=. + export FLUTTER_ROOT="$NIX_BUILD_TOP/source" + mkdir -p "$FLUTTER_ROOT/bin/cache" + ln -s '${dart}' "$FLUTTER_ROOT/bin/cache/dart-sdk" + ''; + + dartEntryPoints."flutter_tools.snapshot" = "bin/flutter_tools.dart"; + dartCompileFlags = [ "--define=NIX_FLUTTER_HOST_PLATFORM=${hostPlatform.system}" ]; + + # The Dart wrapper launchers are useless for the Flutter tool - it is designed + # to be launched from a snapshot by the SDK. + postInstall = '' + pushd "$out" + rm ${builtins.concatStringsSep " " (builtins.attrNames dartEntryPoints)} + popd + ''; + + inherit pubspecLockFile vendorHash depsListFile; +} diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index da45fee420d00..69efe678dc5ac 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -3,23 +3,33 @@ , patches , dart , src +, pubspecLockFile +, vendorHash +, depsListFile , lib , stdenv +, callPackage +, makeWrapper , darwin , git , which }: let + tools = callPackage ./flutter-tools.nix { + inherit dart version; + flutterSrc = src; + inherit patches; + inherit pubspecLockFile vendorHash depsListFile; + }; + unwrapped = stdenv.mkDerivation { name = "flutter-${version}-unwrapped"; inherit src patches version; - outputs = [ "out" "cache" ]; - buildInputs = [ git ]; - nativeBuildInputs = [ ] + nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; preConfigure = '' @@ -34,46 +44,31 @@ let ''; buildPhase = '' - export FLUTTER_ROOT="$(pwd)" - export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" - export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" - - export SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" - export STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" - - export DART_SDK_PATH="${dart}" - - # The Flutter tool compilation requires dependencies to be cached, as there is no Internet access. - # Dart expects package caches to be mutable, and does not support composing cache directories. - # The packages cached during the build therefore cannot be easily used. They are provided through - # the derivation's "cache" output, though, in case they are needed. - # - # Note that non-cached packages will normally be fetched from the Internet when they are needed, so Flutter - # will function without an existing package cache as long as it has an Internet connection. - export PUB_CACHE="$cache" - - if [ -d .pub-preload-cache ]; then - ${dart}/bin/dart pub cache preload .pub-preload-cache/* - elif [ -d .pub-cache ]; then - mv .pub-cache "$PUB_CACHE" - else - echo 'ERROR: Failed to locate the Dart package cache required to build the Flutter tool.' - exit 1 - fi + # The flutter_tools package tries to run many Git commands. In most + # cases, unexpected output is handled gracefully, but commands are never + # expected to fail completely. A blank repository needs to be created. + rm -rf .git # Remove any existing Git directory + git init -b nixpkgs + GIT_AUTHOR_NAME=Nixpkgs GIT_COMMITTER_NAME=Nixpkgs \ + GIT_AUTHOR_EMAIL= GIT_COMMITTER_EMAIL= \ + GIT_AUTHOR_DATE='1/1/1970 00:00:00 +0000' GIT_COMMITTER_DATE='1/1/1970 00:00:00 +0000' \ + git commit --allow-empty -m "Initial commit" + (. '${../../../build-support/fetchgit/deterministic-git}'; make_deterministic_repo .) + + mkdir -p bin/cache + + # Add a flutter_tools artifact stamp, and build a snapshot. + # This is the Flutter CLI application. + echo "$(git rev-parse HEAD)" > bin/cache/flutter_tools.stamp + ln -s '${tools}/share/flutter_tools.snapshot' bin/cache/flutter_tools.snapshot + + # Some of flutter_tools's dependencies contain static assets. The + # application attempts to read its own package_config.json to find these + # assets at runtime. + mkdir -p packages/flutter_tools/.dart_tool + ln -s '${tools.dartDeps.packageConfig}' packages/flutter_tools/.dart_tool/package_config.json - pushd "$FLUTTER_TOOLS_DIR" - ${dart}/bin/dart pub get --offline - popd - - local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)" - ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" "$SCRIPT_PATH" - echo "$revision" > "$STAMP_PATH" echo -n "${version}" > version - - # Certain prebuilts should be replaced with Nix-built (or at least Nix-patched) equivalents. - rm -r \ - $FLUTTER_ROOT/bin/cache/dart-sdk \ - $FLUTTER_ROOT/bin/cache/artifacts/engine ''; installPhase = '' @@ -81,8 +76,19 @@ let mkdir -p $out cp -r . $out + rm -rf $out/bin/cache/dart-sdk ln -sf ${dart} $out/bin/cache/dart-sdk + # The regular launchers are designed to download/build/update SDK + # components, and are not very useful in Nix. + # Replace them with simple links and wrappers. + rm "$out/bin"/{dart,flutter} + ln -s "$out/bin/cache/dart-sdk/bin/dart" "$out/bin/dart" + makeShellWrapper "$out/bin/dart" "$out/bin/flutter" \ + --set-default FLUTTER_ROOT "$out" \ + --set FLUTTER_ALREADY_LOCKED true \ + --add-flags "--disable-dart-dev \$NIX_FLUTTER_TOOLS_VM_OPTIONS $out/bin/cache/flutter_tools.snapshot" + runHook postInstall ''; @@ -95,13 +101,13 @@ let export HOME="$(mktemp -d)" $out/bin/flutter config --android-studio-dir $HOME $out/bin/flutter config --android-sdk $HOME - $out/bin/flutter --version | fgrep -q '${version}' + $out/bin/flutter --version | fgrep -q '${builtins.substring 0 10 engineVersion}' runHook postInstallCheck ''; passthru = { - inherit dart engineVersion; + inherit dart engineVersion tools; # The derivation containing the original Flutter SDK files. # When other derivations wrap this one, any unmodified files # found here should be included as-is, for tooling compatibility. @@ -116,7 +122,7 @@ let ''; homepage = "https://flutter.dev"; license = licenses.bsd3; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ babariviere ericdallo FlafyDev hacker1024 ]; }; }; diff --git a/pkgs/development/compilers/flutter/lockfiles/stable/deps.json b/pkgs/development/compilers/flutter/lockfiles/stable/deps.json new file mode 100644 index 0000000000000..30924f7d513b2 --- /dev/null +++ b/pkgs/development/compilers/flutter/lockfiles/stable/deps.json @@ -0,0 +1,1020 @@ +[ + { + "name": "flutter_tools", + "version": "0.0.0", + "kind": "root", + "source": "root", + "dependencies": [ + "archive", + "args", + "browser_launcher", + "dds", + "dwds", + "completion", + "coverage", + "crypto", + "file", + "flutter_template_images", + "html", + "http", + "intl", + "meta", + "multicast_dns", + "mustache_template", + "package_config", + "process", + "fake_async", + "stack_trace", + "usage", + "webdriver", + "webkit_inspection_protocol", + "xml", + "yaml", + "native_stack_traces", + "shelf", + "vm_snapshot_analysis", + "uuid", + "web_socket_channel", + "stream_channel", + "shelf_web_socket", + "shelf_static", + "pub_semver", + "pool", + "path", + "mime", + "logging", + "http_multi_server", + "convert", + "async", + "unified_analytics", + "test_api", + "test_core", + "vm_service", + "standard_message_codec", + "_fe_analyzer_shared", + "analyzer", + "boolean_selector", + "built_collection", + "built_value", + "clock", + "csslib", + "dap", + "dds_service_extensions", + "devtools_shared", + "fixnum", + "frontend_server_client", + "glob", + "http_parser", + "io", + "js", + "json_rpc_2", + "matcher", + "petitparser", + "platform", + "shelf_packages_handler", + "shelf_proxy", + "source_map_stack_trace", + "source_maps", + "source_span", + "sse", + "string_scanner", + "sync_http", + "term_glyph", + "typed_data", + "watcher", + "collection", + "file_testing", + "pubspec_parse", + "checked_yaml", + "json_annotation", + "node_preamble", + "test" + ] + }, + { + "name": "test", + "version": "1.24.3", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "boolean_selector", + "collection", + "coverage", + "http_multi_server", + "io", + "js", + "node_preamble", + "package_config", + "path", + "pool", + "shelf", + "shelf_packages_handler", + "shelf_static", + "shelf_web_socket", + "source_span", + "stack_trace", + "stream_channel", + "typed_data", + "web_socket_channel", + "webkit_inspection_protocol", + "yaml", + "test_api", + "test_core", + "matcher" + ] + }, + { + "name": "matcher", + "version": "0.12.16", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { + "name": "test_api", + "version": "0.6.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.10.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "path", + "version": "1.8.3", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "collection", + "version": "1.17.2", + "kind": "dev", + "source": "hosted", + "dependencies": [] + }, + { + "name": "stream_channel", + "version": "2.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "async", + "version": "2.11.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "meta", + "version": "1.9.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "stack_trace", + "version": "1.11.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "test_core", + "version": "0.5.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "args", + "boolean_selector", + "collection", + "coverage", + "frontend_server_client", + "glob", + "io", + "meta", + "package_config", + "path", + "pool", + "source_map_stack_trace", + "source_maps", + "source_span", + "stack_trace", + "stream_channel", + "vm_service", + "yaml", + "test_api" + ] + }, + { + "name": "yaml", + "version": "3.1.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "vm_service", + "version": "11.7.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "source_maps", + "version": "0.10.12", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_map_stack_trace", + "version": "2.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "path", + "source_maps", + "stack_trace" + ] + }, + { + "name": "pool", + "version": "1.5.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "stack_trace" + ] + }, + { + "name": "package_config", + "version": "2.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "io", + "version": "1.0.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "string_scanner" + ] + }, + { + "name": "glob", + "version": "2.1.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "file", + "path", + "string_scanner" + ] + }, + { + "name": "file", + "version": "6.1.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "frontend_server_client", + "version": "3.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "coverage", + "version": "1.6.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "args", + "logging", + "package_config", + "path", + "source_maps", + "stack_trace", + "vm_service" + ] + }, + { + "name": "logging", + "version": "1.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "args", + "version": "2.4.2", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "analyzer", + "version": "5.13.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "_fe_analyzer_shared", + "collection", + "convert", + "crypto", + "glob", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "watcher", + "yaml" + ] + }, + { + "name": "watcher", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "pub_semver", + "version": "2.1.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "crypto", + "version": "3.0.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "convert", + "version": "3.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "_fe_analyzer_shared", + "version": "61.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "webkit_inspection_protocol", + "version": "1.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "logging" + ] + }, + { + "name": "web_socket_channel", + "version": "2.4.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "crypto", + "stream_channel" + ] + }, + { + "name": "shelf_web_socket", + "version": "1.0.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "shelf", + "stream_channel", + "web_socket_channel" + ] + }, + { + "name": "shelf", + "version": "1.4.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "http_parser", + "path", + "stack_trace", + "stream_channel" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "shelf_static", + "version": "1.1.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "convert", + "http_parser", + "mime", + "path", + "shelf" + ] + }, + { + "name": "mime", + "version": "1.0.4", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "shelf_packages_handler", + "version": "3.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "path", + "shelf", + "shelf_static" + ] + }, + { + "name": "node_preamble", + "version": "2.0.2", + "kind": "dev", + "source": "hosted", + "dependencies": [] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "http_multi_server", + "version": "3.2.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "json_annotation", + "version": "4.8.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "checked_yaml", + "version": "2.0.3", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "json_annotation", + "source_span", + "yaml" + ] + }, + { + "name": "pubspec_parse", + "version": "1.2.3", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "collection", + "json_annotation", + "pub_semver", + "yaml" + ] + }, + { + "name": "file_testing", + "version": "3.0.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "test" + ] + }, + { + "name": "sync_http", + "version": "0.3.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "sse", + "version": "4.1.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "js", + "logging", + "pool", + "shelf", + "stream_channel" + ] + }, + { + "name": "shelf_proxy", + "version": "1.0.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "http", + "path", + "shelf" + ] + }, + { + "name": "http", + "version": "0.13.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta" + ] + }, + { + "name": "platform", + "version": "3.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "petitparser", + "version": "5.4.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "json_rpc_2", + "version": "3.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "stack_trace", + "stream_channel" + ] + }, + { + "name": "fixnum", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "devtools_shared", + "version": "2.24.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "path", + "shelf", + "usage", + "vm_service", + "webkit_inspection_protocol" + ] + }, + { + "name": "usage", + "version": "4.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "dds_service_extensions", + "version": "1.5.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "dap", + "vm_service" + ] + }, + { + "name": "dap", + "version": "1.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "csslib", + "version": "1.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "clock", + "version": "1.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "built_value", + "version": "8.6.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "built_collection", + "collection", + "fixnum", + "meta" + ] + }, + { + "name": "built_collection", + "version": "5.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "standard_message_codec", + "version": "0.0.1+3", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "unified_analytics", + "version": "2.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "file", + "http", + "intl", + "meta", + "path" + ] + }, + { + "name": "intl", + "version": "0.18.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "meta", + "path" + ] + }, + { + "name": "uuid", + "version": "3.0.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "crypto" + ] + }, + { + "name": "vm_snapshot_analysis", + "version": "0.7.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "args", + "collection", + "path" + ] + }, + { + "name": "native_stack_traces", + "version": "0.5.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "args", + "path" + ] + }, + { + "name": "xml", + "version": "6.3.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "petitparser" + ] + }, + { + "name": "webdriver", + "version": "3.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "matcher", + "path", + "stack_trace", + "sync_http" + ] + }, + { + "name": "fake_async", + "version": "1.3.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "collection" + ] + }, + { + "name": "process", + "version": "4.2.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "file", + "path", + "platform" + ] + }, + { + "name": "mustache_template", + "version": "2.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "multicast_dns", + "version": "0.3.2+3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "html", + "version": "0.15.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "csslib", + "source_span" + ] + }, + { + "name": "flutter_template_images", + "version": "4.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "completion", + "version": "1.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "args", + "logging", + "path" + ] + }, + { + "name": "dwds", + "version": "19.0.1+1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "built_collection", + "built_value", + "collection", + "crypto", + "dds", + "file", + "http", + "http_multi_server", + "logging", + "meta", + "package_config", + "path", + "pool", + "pub_semver", + "shelf", + "shelf_packages_handler", + "shelf_proxy", + "shelf_static", + "shelf_web_socket", + "source_maps", + "stack_trace", + "sse", + "uuid", + "vm_service", + "web_socket_channel", + "webkit_inspection_protocol" + ] + }, + { + "name": "dds", + "version": "2.9.0+hotfix", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "args", + "async", + "browser_launcher", + "collection", + "dds_service_extensions", + "dap", + "devtools_shared", + "http_multi_server", + "json_rpc_2", + "meta", + "path", + "shelf_proxy", + "shelf_static", + "shelf_web_socket", + "shelf", + "sse", + "stack_trace", + "stream_channel", + "vm_service", + "web_socket_channel" + ] + }, + { + "name": "browser_launcher", + "version": "1.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "path", + "webkit_inspection_protocol" + ] + }, + { + "name": "archive", + "version": "3.3.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "crypto", + "path" + ] + } +] diff --git a/pkgs/development/compilers/flutter/lockfiles/stable/pubspec.lock b/pkgs/development/compilers/flutter/lockfiles/stable/pubspec.lock new file mode 100644 index 0000000000000..8b11ae73ee03e --- /dev/null +++ b/pkgs/development/compilers/flutter/lockfiles/stable/pubspec.lock @@ -0,0 +1,677 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: "direct main" + description: + name: _fe_analyzer_shared + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a + url: "https://pub.dev" + source: hosted + version: "61.0.0" + analyzer: + dependency: "direct main" + description: + name: analyzer + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 + url: "https://pub.dev" + source: hosted + version: "5.13.0" + archive: + dependency: "direct main" + description: + name: archive + sha256: "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb" + url: "https://pub.dev" + source: hosted + version: "3.3.2" + args: + dependency: "direct main" + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" + async: + dependency: "direct main" + description: + name: async + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" + source: hosted + version: "2.11.0" + boolean_selector: + dependency: "direct main" + description: + name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + browser_launcher: + dependency: "direct main" + description: + name: browser_launcher + sha256: "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + built_collection: + dependency: "direct main" + description: + name: built_collection + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" + source: hosted + version: "5.1.1" + built_value: + dependency: "direct main" + description: + name: built_value + sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" + url: "https://pub.dev" + source: hosted + version: "8.6.1" + checked_yaml: + dependency: "direct dev" + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" + clock: + dependency: "direct main" + description: + name: clock + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" + source: hosted + version: "1.1.1" + collection: + dependency: "direct dev" + description: + name: collection + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + url: "https://pub.dev" + source: hosted + version: "1.17.2" + completion: + dependency: "direct main" + description: + name: completion + sha256: f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60 + url: "https://pub.dev" + source: hosted + version: "1.0.1" + convert: + dependency: "direct main" + description: + name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + coverage: + dependency: "direct main" + description: + name: coverage + sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097" + url: "https://pub.dev" + source: hosted + version: "1.6.3" + crypto: + dependency: "direct main" + description: + name: crypto + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" + source: hosted + version: "3.0.3" + csslib: + dependency: "direct main" + description: + name: csslib + sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + dap: + dependency: "direct main" + description: + name: dap + sha256: "2120d4a8cbad45e5dbd518b713e8f064274e0a4c0e3edcaef1f4cf9ccbc90cd9" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + dds: + dependency: "direct main" + description: + name: dds + sha256: "397c3c80919ee187b2efc28205af3c0378b6b757ea6d059083dece145a2e31e9" + url: "https://pub.dev" + source: hosted + version: "2.9.0+hotfix" + dds_service_extensions: + dependency: "direct main" + description: + name: dds_service_extensions + sha256: "9ac669bef49a4c13ed62073685089be121200fb213800ec59c202e90d569ea44" + url: "https://pub.dev" + source: hosted + version: "1.5.0" + devtools_shared: + dependency: "direct main" + description: + name: devtools_shared + sha256: ad58ac3a5df41adf08d0d6f0a4d73349533edcc383ee93a30ac3d0fd0bb6df49 + url: "https://pub.dev" + source: hosted + version: "2.24.0" + dwds: + dependency: "direct main" + description: + name: dwds + sha256: b6dad73ae56f00bff7647f531b9db018005f713328e816e7a277b544184e9170 + url: "https://pub.dev" + source: hosted + version: "19.0.1+1" + fake_async: + dependency: "direct main" + description: + name: fake_async + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" + source: hosted + version: "1.3.1" + file: + dependency: "direct main" + description: + name: file + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" + source: hosted + version: "6.1.4" + file_testing: + dependency: "direct dev" + description: + name: file_testing + sha256: "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5" + url: "https://pub.dev" + source: hosted + version: "3.0.0" + fixnum: + dependency: "direct main" + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + flutter_template_images: + dependency: "direct main" + description: + name: flutter_template_images + sha256: fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6 + url: "https://pub.dev" + source: hosted + version: "4.2.0" + frontend_server_client: + dependency: "direct main" + description: + name: frontend_server_client + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + url: "https://pub.dev" + source: hosted + version: "3.2.0" + glob: + dependency: "direct main" + description: + name: glob + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + html: + dependency: "direct main" + description: + name: html + sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + url: "https://pub.dev" + source: hosted + version: "0.15.4" + http: + dependency: "direct main" + description: + name: http + sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + url: "https://pub.dev" + source: hosted + version: "0.13.6" + http_multi_server: + dependency: "direct main" + description: + name: http_multi_server + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" + source: hosted + version: "3.2.1" + http_parser: + dependency: "direct main" + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + intl: + dependency: "direct main" + description: + name: intl + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + url: "https://pub.dev" + source: hosted + version: "0.18.1" + io: + dependency: "direct main" + description: + name: io + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + js: + dependency: "direct main" + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + json_annotation: + dependency: "direct dev" + description: + name: json_annotation + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + url: "https://pub.dev" + source: hosted + version: "4.8.1" + json_rpc_2: + dependency: "direct main" + description: + name: json_rpc_2 + sha256: "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + logging: + dependency: "direct main" + description: + name: logging + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + matcher: + dependency: "direct main" + description: + name: matcher + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" + source: hosted + version: "0.12.16" + meta: + dependency: "direct main" + description: + name: meta + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + mime: + dependency: "direct main" + description: + name: mime + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" + source: hosted + version: "1.0.4" + multicast_dns: + dependency: "direct main" + description: + name: multicast_dns + sha256: "80e54aba906a7cc68fdc6a201e76b135af27155e2f8e958181d85e2b73786591" + url: "https://pub.dev" + source: hosted + version: "0.3.2+3" + mustache_template: + dependency: "direct main" + description: + name: mustache_template + sha256: a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c + url: "https://pub.dev" + source: hosted + version: "2.0.0" + native_stack_traces: + dependency: "direct main" + description: + name: native_stack_traces + sha256: c797830b9910d13b0f4e70ddef15cde034214fe3bdb8092c4ea5ffad2f74013f + url: "https://pub.dev" + source: hosted + version: "0.5.6" + node_preamble: + dependency: "direct dev" + description: + name: node_preamble + sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" + url: "https://pub.dev" + source: hosted + version: "2.0.2" + package_config: + dependency: "direct main" + description: + name: package_config + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path: + dependency: "direct main" + description: + name: path + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" + source: hosted + version: "1.8.3" + petitparser: + dependency: "direct main" + description: + name: petitparser + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" + source: hosted + version: "5.4.0" + platform: + dependency: "direct main" + description: + name: platform + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" + source: hosted + version: "3.1.0" + pool: + dependency: "direct main" + description: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + process: + dependency: "direct main" + description: + name: process + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" + source: hosted + version: "4.2.4" + pub_semver: + dependency: "direct main" + description: + name: pub_semver + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + pubspec_parse: + dependency: "direct dev" + description: + name: pubspec_parse + sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + url: "https://pub.dev" + source: hosted + version: "1.2.3" + shelf: + dependency: "direct main" + description: + name: shelf + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" + source: hosted + version: "1.4.1" + shelf_packages_handler: + dependency: "direct main" + description: + name: shelf_packages_handler + sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + shelf_proxy: + dependency: "direct main" + description: + name: shelf_proxy + sha256: a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3 + url: "https://pub.dev" + source: hosted + version: "1.0.4" + shelf_static: + dependency: "direct main" + description: + name: shelf_static + sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e + url: "https://pub.dev" + source: hosted + version: "1.1.2" + shelf_web_socket: + dependency: "direct main" + description: + name: shelf_web_socket + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + source_map_stack_trace: + dependency: "direct main" + description: + name: source_map_stack_trace + sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + source_maps: + dependency: "direct main" + description: + name: source_maps + sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703" + url: "https://pub.dev" + source: hosted + version: "0.10.12" + source_span: + dependency: "direct main" + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + sse: + dependency: "direct main" + description: + name: sse + sha256: "3ff9088cac3f45aa8b91336f1962e3ea6c81baaba0bbba361c05f8aa7fb59442" + url: "https://pub.dev" + source: hosted + version: "4.1.2" + stack_trace: + dependency: "direct main" + description: + name: stack_trace + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" + source: hosted + version: "1.11.0" + standard_message_codec: + dependency: "direct main" + description: + name: standard_message_codec + sha256: "906e66549f0ea90d87c5320e0b0f04738c5d14bc7fb121a15da31b60e84f5b15" + url: "https://pub.dev" + source: hosted + version: "0.0.1+3" + stream_channel: + dependency: "direct main" + description: + name: stream_channel + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + string_scanner: + dependency: "direct main" + description: + name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + sync_http: + dependency: "direct main" + description: + name: sync_http + sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961" + url: "https://pub.dev" + source: hosted + version: "0.3.1" + term_glyph: + dependency: "direct main" + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + test: + dependency: "direct dev" + description: + name: test + sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46" + url: "https://pub.dev" + source: hosted + version: "1.24.3" + test_api: + dependency: "direct main" + description: + name: test_api + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + url: "https://pub.dev" + source: hosted + version: "0.6.0" + test_core: + dependency: "direct main" + description: + name: test_core + sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e" + url: "https://pub.dev" + source: hosted + version: "0.5.3" + typed_data: + dependency: "direct main" + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" + unified_analytics: + dependency: "direct main" + description: + name: unified_analytics + sha256: "4f9f29e5fd357d68fce270e37c7ad9bb489ee20098529199d6bc786b2b624298" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + usage: + dependency: "direct main" + description: + name: usage + sha256: "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15" + url: "https://pub.dev" + source: hosted + version: "4.1.1" + uuid: + dependency: "direct main" + description: + name: uuid + sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + url: "https://pub.dev" + source: hosted + version: "3.0.7" + vm_service: + dependency: "direct main" + description: + name: vm_service + sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f + url: "https://pub.dev" + source: hosted + version: "11.7.1" + vm_snapshot_analysis: + dependency: "direct main" + description: + name: vm_snapshot_analysis + sha256: "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8" + url: "https://pub.dev" + source: hosted + version: "0.7.6" + watcher: + dependency: "direct main" + description: + name: watcher + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web_socket_channel: + dependency: "direct main" + description: + name: web_socket_channel + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + url: "https://pub.dev" + source: hosted + version: "2.4.0" + webdriver: + dependency: "direct main" + description: + name: webdriver + sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + webkit_inspection_protocol: + dependency: "direct main" + description: + name: webkit_inspection_protocol + sha256: "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + xml: + dependency: "direct main" + description: + name: xml + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + url: "https://pub.dev" + source: hosted + version: "6.3.0" + yaml: + dependency: "direct main" + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" +sdks: + dart: ">=3.0.0 <4.0.0" diff --git a/pkgs/development/compilers/flutter/patches/flutter3/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/patches/flutter3/deregister-pub-dependencies-artifact.patch new file mode 100644 index 0000000000000..01e34c6d292c9 --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/flutter3/deregister-pub-dependencies-artifact.patch @@ -0,0 +1,19 @@ +diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart +index 252021cf78..e50ef0885d 100644 +--- a/packages/flutter_tools/lib/src/flutter_cache.dart ++++ b/packages/flutter_tools/lib/src/flutter_cache.dart +@@ -51,14 +51,6 @@ class FlutterCache extends Cache { + registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); + } + registerArtifact(FontSubsetArtifacts(this, platform: platform)); +- registerArtifact(PubDependencies( +- logger: logger, +- // flutter root and pub must be lazily initialized to avoid accessing +- // before the version is determined. +- flutterRoot: () => Cache.flutterRoot!, +- pub: () => pub, +- projectFactory: projectFactory, +- )); + } + } + \ No newline at end of file diff --git a/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch index ceaf59b5f535f..23a657e7c6a9e 100644 --- a/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch +++ b/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch @@ -11,18 +11,19 @@ index 3532c23114..25dfcae4c7 100644 BIN_NAME="$(basename "$PROG_NAME")" case "$BIN_NAME" in flutter*) -diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index 13efbde879..467b3a7cbf 100644 ---- a/packages/flutter_tools/lib/src/cache.dart -+++ b/packages/flutter_tools/lib/src/cache.dart -@@ -664,6 +664,7 @@ class Cache { +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart +index b7e624b4e2..edfdde118b 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart +@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and - /// Update the cache to contain all `requiredArtifacts`. - Future<void> updateAll(Set<DevelopmentArtifact> requiredArtifacts, {bool offline = false}) async { -+ return; - if (!_lockEnabled) { - return; - } + // Populate the cache. We call this before pub get below so that the + // sky_engine package is available in the flutter cache for pub to find. +- if (shouldUpdateCache) { ++ if (false) { + // First always update universal artifacts, as some of these (e.g. + // ios-deploy on macOS) are required to determine `requiredArtifacts`. + final bool offline; diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart index 5d6d78639f..90a4dfa555 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart diff --git a/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch deleted file mode 100644 index cc6e5e8f49e01..0000000000000 --- a/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index dd80b1e46e..8e54517765 100644 ---- a/packages/flutter_tools/lib/src/cache.dart -+++ b/packages/flutter_tools/lib/src/cache.dart -@@ -22,6 +22,7 @@ import 'base/user_messages.dart'; - import 'build_info.dart'; - import 'convert.dart'; - import 'features.dart'; -+import 'globals.dart' as globals; - - const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo) - const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo) -@@ -318,8 +319,13 @@ class Cache { - return; - } - assert(_lock == null); -+ final Directory dir = _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter')); -+ if (!dir.existsSync()) { -+ dir.createSync(recursive: true); -+ globals.os.chmod(dir, '755'); -+ } - final File lockFile = -- _fileSystem.file(_fileSystem.path.join(flutterRoot!, 'bin', 'cache', 'lockfile')); -+ _fileSystem.file(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'lockfile')); - try { - _lock = lockFile.openSync(mode: FileMode.write); - } on FileSystemException catch (e) { -@@ -378,8 +384,7 @@ class Cache { - - String get devToolsVersion { - if (_devToolsVersion == null) { -- const String devToolsDirPath = 'dart-sdk/bin/resources/devtools'; -- final Directory devToolsDir = getCacheDir(devToolsDirPath, shouldCreate: false); -+ final Directory devToolsDir = _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin/cache/dart-sdk/bin/resources/devtools')); - if (!devToolsDir.existsSync()) { - throw Exception('Could not find directory at ${devToolsDir.path}'); - } -diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index 1c31c1b5db..76c7210d3b 100644 ---- a/packages/flutter_tools/lib/src/cache.dart -+++ b/packages/flutter_tools/lib/src/cache.dart -@@ -529,6 +529,11 @@ class Cache { - - /// Return the top-level directory in the cache; this is `bin/cache`. - Directory getRoot() { -+ const Platform platform = LocalPlatform(); -+ if (platform.environment.containsKey('FLUTTER_CACHE_DIR')) { -+ return _fileSystem.directory(platform.environment['FLUTTER_CACHE_DIR']); -+ } -+ - if (_rootOverride != null) { - return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache')); - } else { diff --git a/pkgs/development/compilers/flutter/patches/flutter3/override-host-platform.patch b/pkgs/development/compilers/flutter/patches/flutter3/override-host-platform.patch new file mode 100644 index 0000000000000..51dcfdb5cc57d --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/flutter3/override-host-platform.patch @@ -0,0 +1,21 @@ +diff --git a/packages/flutter_tools/lib/src/base/os.dart b/packages/flutter_tools/lib/src/base/os.dart +index 1ce1951cef..1bd7602318 100644 +--- a/packages/flutter_tools/lib/src/base/os.dart ++++ b/packages/flutter_tools/lib/src/base/os.dart +@@ -260,7 +260,15 @@ class _PosixUtils extends OperatingSystemUtils { + @override + String get pathVarSeparator => ':'; + +- HostPlatform? _hostPlatform; ++ // uname outputs build platform characteristics, not host platform characteristics. ++ // _MacOSUtils uses sysctl instead, which is still incorrect. ++ HostPlatform? _hostPlatform = switch (const String.fromEnvironment('NIX_FLUTTER_HOST_PLATFORM')) { ++ 'x86_64-linux' => HostPlatform.linux_x64, ++ 'aarch64-linux' => HostPlatform.linux_arm64, ++ 'x86_64-darwin' => HostPlatform.darwin_x64, ++ 'arm64-darwin' => HostPlatform.darwin_arm64, ++ String value => throw ArgumentError.value(value, 'NIX_FLUTTER_HOST_PLATFORM', 'Unknown Nix host platform!'), ++ }; + + @override + HostPlatform get hostPlatform { diff --git a/pkgs/development/compilers/flutter/sdk-symlink.nix b/pkgs/development/compilers/flutter/sdk-symlink.nix index 6fb4f5edc0eeb..044a508805f58 100644 --- a/pkgs/development/compilers/flutter/sdk-symlink.nix +++ b/pkgs/development/compilers/flutter/sdk-symlink.nix @@ -1,10 +1,23 @@ -{ symlinkJoin }: flutter: +{ symlinkJoin +, makeWrapper +}: flutter: let self = symlinkJoin { name = "${flutter.name}-sdk-links"; - paths = [ flutter flutter.sdk ]; + paths = [ flutter flutter.cacheDir flutter.sdk ]; + + nativeBuildInputs = [ makeWrapper ]; + postBuild = '' + wrapProgram "$out/bin/flutter" \ + --set-default FLUTTER_ROOT "$out" + + # symlinkJoin seems to be missing the .git directory for some reason. + if [ -d '${flutter.sdk}/.git' ]; then + ln -s '${flutter.sdk}/.git' "$out" + fi + ''; passthru = flutter.passthru // { # Update the SDK attribute. diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index f525bcc7ab314..38c2eb289310c 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -3,27 +3,14 @@ , darwin , callPackage , flutter -, supportsLinuxDesktop ? stdenv.hostPlatform.isLinux -, supportsAndroid ? (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isDarwin) -, supportsDarwin ? stdenv.hostPlatform.isDarwin -, supportsIOS ? stdenv.hostPlatform.isDarwin -, includedEngineArtifacts ? { - common = [ - "flutter_patched_sdk" - "flutter_patched_sdk_product" - ]; - platform = { - android = lib.optionalAttrs supportsAndroid - ((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; }); - darwin = lib.optionalAttrs supportsDarwin - ((lib.genAttrs [ "arm64" "x64" ] (architecture: [ "profile" "release" ]))); - ios = lib.optionalAttrs supportsIOS - ((lib.genAttrs [ "" ] (architecture: [ "profile" "release" ]))); - linux = lib.optionalAttrs supportsLinuxDesktop - (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64")) - (architecture: [ "debug" "profile" "release" ])); - }; - } +, supportedTargetPlatforms ? [ + "universal" + "web" + ] + ++ lib.optional stdenv.hostPlatform.isLinux "linux" + ++ lib.optional (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isDarwin) "android" + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "macos" "ios" ] +, artifactHashes ? (import ./artifacts/hashes.nix).${flutter.version} , extraPkgConfigPackages ? [ ] , extraLibraries ? [ ] , extraIncludes ? [ ] @@ -57,70 +44,31 @@ }: let - engineArtifacts = callPackage ./engine-artifacts { - inherit (flutter) engineVersion; - flutterVersion = flutter.version; - }; - mkCommonArtifactLinkCommand = { artifact }: - '' - mkdir -p $out/artifacts/engine/common - lndir -silent ${artifact} $out/artifacts/engine/common - ''; - mkPlatformArtifactLinkCommand = { artifact, os, architecture, variant ? null }: - let - artifactDirectory = "${os}-${architecture}${lib.optionalString (variant != null) "-${variant}"}"; - in - '' - mkdir -p $out/artifacts/engine/${artifactDirectory} - lndir -silent ${artifact} $out/artifacts/engine/${artifactDirectory} - ''; - engineArtifactDirectory = - runCommandLocal "flutter-engine-artifacts-${flutter.version}" { nativeBuildInputs = [ lndir ]; } - ( - builtins.concatStringsSep "\n" - ((map - (name: mkCommonArtifactLinkCommand { - artifact = engineArtifacts.common.${name}; - }) - (includedEngineArtifacts.common or [ ])) ++ - (builtins.foldl' - (commands: os: commands ++ - (builtins.foldl' - (commands: architecture: commands ++ - (builtins.foldl' - (commands: variant: commands ++ - (map - (artifact: mkPlatformArtifactLinkCommand { - inherit artifact os architecture variant; - }) - engineArtifacts.platform.${os}.${architecture}.variants.${variant})) - (map - (artifact: mkPlatformArtifactLinkCommand { - inherit artifact os architecture; - }) - engineArtifacts.platform.${os}.${architecture}.base) - includedEngineArtifacts.platform.${os}.${architecture})) - [ ] - (builtins.attrNames includedEngineArtifacts.platform.${os}))) - [ ] - (builtins.attrNames (includedEngineArtifacts.platform or { })))) - ); - - cacheDir = symlinkJoin { + supportsLinuxDesktopTarget = builtins.elem "linux" supportedTargetPlatforms; + + platformArtifacts = lib.genAttrs supportedTargetPlatforms (platform: + (callPackage ./artifacts/prepare-artifacts.nix { + src = callPackage ./artifacts/fetch-artifacts.nix { + inherit platform; + flutter = callPackage ./wrapper.nix { inherit flutter; }; + hash = artifactHashes.${platform}.${stdenv.hostPlatform.system} or ""; + }; + })); + + cacheDir = symlinkJoin rec { name = "flutter-cache-dir"; - paths = [ - engineArtifactDirectory - "${flutter}/bin/cache" - ]; + paths = builtins.attrValues platformArtifacts; + postBuild = '' + mkdir -p "$out/bin/cache" + ln -s '${flutter}/bin/cache/dart-sdk' "$out/bin/cache" + ''; + passthru.platform = platformArtifacts; }; # By default, Flutter stores downloaded files (such as the Pub cache) in the SDK directory. # Wrap it to ensure that it does not do that, preferring home directories instead. - # The sh file `$out/bin/internal/shared.sh` runs when launching Flutter and calls `"$FLUTTER_ROOT/bin/cache/` instead of our environment variable `FLUTTER_CACHE_DIR`. - # We do not patch it since the script doesn't require engine artifacts(which are the only thing not added by the unwrapped derivation), so it shouldn't fail, and patching it will just be harder to maintain. immutableFlutter = writeShellScript "flutter_immutable" '' export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} - export FLUTTER_CACHE_DIR=${cacheDir} ${flutter}/bin/flutter "$@" ''; @@ -128,7 +76,7 @@ let tools = [ git which ]; # Libraries that Flutter apps depend on at runtime. - appRuntimeDeps = lib.optionals supportsLinuxDesktop [ + appRuntimeDeps = lib.optionals supportsLinuxDesktopTarget [ atk cairo gdk-pixbuf @@ -152,10 +100,10 @@ let # Some header files and libraries are not properly located by the Flutter SDK. # They must be manually included. - appStaticBuildDeps = (lib.optionals supportsLinuxDesktop [ libX11 xorgproto zlib ]) ++ extraLibraries; + appStaticBuildDeps = (lib.optionals supportsLinuxDesktopTarget [ libX11 xorgproto zlib ]) ++ extraLibraries; # Tools used by the Flutter SDK to compile applications. - buildTools = lib.optionals supportsLinuxDesktop [ + buildTools = lib.optionals supportsLinuxDesktopTarget [ pkg-config cmake ninja @@ -174,12 +122,12 @@ in nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ] - ++ lib.optionals supportsLinuxDesktop [ glib wrapGAppsHook ]; + ++ lib.optionals supportsLinuxDesktopTarget [ glib wrapGAppsHook ]; passthru = flutter.passthru // { inherit (flutter) version; unwrapped = flutter; - inherit engineArtifacts; + inherit cacheDir; }; dontUnpack = true; diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 8bb3366655c77..773a0dde281f4 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,7 +1,17 @@ -{ lib, stdenv, writeScript, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles, removeReferencesTo }: +{ callPackage +, fetchFromGitHub +, installShellFiles +, lib +, makeWrapper +, ocamlPackages +, removeReferencesTo +, stdenv +, writeScript +, z3 +}: + +let -stdenv.mkDerivation rec { - pname = "fstar"; version = "2023.09.03"; src = fetchFromGitHub { @@ -11,66 +21,54 @@ stdenv.mkDerivation rec { hash = "sha256-ymoP5DvaLdrdwJcnhZnLEvwNxUFzhkICajPyK4lvacc="; }; - strictDeps = true; + fstar-dune = ocamlPackages.callPackage ./dune.nix { inherit version src; }; + + fstar-ulib = callPackage ./ulib.nix { inherit version src fstar-dune z3; }; + +in + +stdenv.mkDerivation { + pname = "fstar"; + inherit version src; nativeBuildInputs = [ - z3 - makeWrapper installShellFiles + makeWrapper removeReferencesTo - ] ++ (with ocamlPackages; [ - ocaml - dune_3 - findlib - ocamlbuild - menhir - ]); - - buildInputs = with ocamlPackages; [ - batteries - zarith - stdint - yojson - fileutils - memtrace - menhirLib - pprint - sedlex - ppxlib - ppx_deriving - ppx_deriving_yojson - process ]; - makeFlags = [ "PREFIX=$(out)" ]; + inherit (fstar-dune) propagatedBuildInputs; - enableParallelBuilding = true; + dontBuild = true; - postPatch = '' - patchShebangs ulib/install-ulib.sh - ''; + installPhase = '' + mkdir $out - preInstall = '' - mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib - ''; - postInstall = '' - # Remove build artifacts - find $out -name _build -type d | xargs -I{} rm -rf "{}" + CP="cp -r --no-preserve=mode" + $CP ${fstar-dune}/* $out + $CP ${fstar-ulib}/* $out + + PREFIX=$out make -C src/ocaml-output install-sides + + chmod +x $out/bin/fstar.exe + wrapProgram $out/bin/fstar.exe --prefix PATH ":" ${z3}/bin remove-references-to -t '${ocamlPackages.ocaml}' $out/bin/fstar.exe - wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" + substituteInPlace $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstar/dune-package \ + --replace ${fstar-dune} $out + installShellCompletion --bash .completion/bash/fstar.exe.bash installShellCompletion --fish .completion/fish/fstar.exe.fish installShellCompletion --zsh --name _fstar.exe .completion/zsh/__fstar.exe ''; passthru.updateScript = writeScript "update-fstar" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p git gnugrep common-updater-scripts - set -eu -o pipefail + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p git gnugrep common-updater-scripts + set -eu -o pipefail - version="$(git ls-remote --tags git@github.com:FStarLang/FStar.git | grep -Po 'v\K\d{4}\.\d{2}\.\d{2}' | sort | tail -n1)" - update-source-version fstar "$version" + version="$(git ls-remote --tags git@github.com:FStarLang/FStar.git | grep -Po 'v\K\d{4}\.\d{2}\.\d{2}' | sort | tail -n1)" + update-source-version fstar "$version" ''; meta = with lib; { diff --git a/pkgs/development/compilers/fstar/dune.nix b/pkgs/development/compilers/fstar/dune.nix new file mode 100644 index 0000000000000..1ca476838c8bb --- /dev/null +++ b/pkgs/development/compilers/fstar/dune.nix @@ -0,0 +1,51 @@ +{ batteries +, buildDunePackage +, memtrace +, menhir +, menhirLib +, pprint +, ppx_deriving +, ppx_deriving_yojson +, ppxlib +, process +, sedlex +, src +, stdint +, version +, yojson +, zarith +}: + +buildDunePackage { + pname = "fstar"; + inherit version src; + + postPatch = '' + patchShebangs ocaml/fstar-lib/make_fstar_version.sh + cd ocaml + ''; + + nativeBuildInputs = [ + menhir + ]; + + buildInputs = [ + memtrace + ]; + + propagatedBuildInputs = [ + batteries + menhirLib + pprint + ppx_deriving + ppx_deriving_yojson + ppxlib + process + sedlex + stdint + yojson + zarith + ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/development/compilers/fstar/ulib.nix b/pkgs/development/compilers/fstar/ulib.nix new file mode 100644 index 0000000000000..4390a7bdb55e3 --- /dev/null +++ b/pkgs/development/compilers/fstar/ulib.nix @@ -0,0 +1,26 @@ +{ fstar-dune +, src +, stdenv +, version +, z3 +}: + +stdenv.mkDerivation { + pname = "fstar-ulib"; + inherit version src; + + nativeBuildInputs = [ + z3 + ]; + + postPatch = '' + mkdir -p bin + cp ${fstar-dune}/bin/fstar.exe bin + patchShebangs ulib/install-ulib.sh + cd ulib + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 597cbedb13e3d..f8c19640dd58a 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,16 +1,16 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix rec { - version = "unstable-2023-10-07"; - git-version = "4.9.5-59-g342399c7"; - stampYmd = 20231007; - stampHms = 170745; - rev = "342399c736ec560c0ff4faeaeb9599b45633f26c"; + version = "unstable-2023-12-04"; + git-version = "4.9.5-84-g6b19d0c9"; + stampYmd = 20231204; + stampHms = 204859; + rev = "6b19d0c9084341306bbb7d6895321090a82988a0"; src = fetchFromGitHub { owner = "gambit"; repo = "gambit"; inherit rev; - sha256 = "121pj6lxihjjnfq33lq4m5hi461xbs9f41qd4l46556dr15cyf8f"; + sha256 = "0njcz9krak8nfyk3x6bc6m1rixzsjc1fyzhbz2g3aq5v8kz9mkl5"; }; gambit-params = gambit-support.unstable-params; } diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 628b259acbd9c..eef6faf26424e 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -29,7 +29,7 @@ , buildPackages , pkgsBuildTarget , libxcrypt -, disableGdbPlugin ? !enablePlugin +, disableGdbPlugin ? !enablePlugin || (stdenv.targetPlatform.isAvr && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) , nukeReferences , callPackage , majorMinorVersion @@ -423,7 +423,11 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ maintainers ; } // lib.optionalAttrs (!atLeast11) { - badPlatforms = if !(is48 || is49) then [ "aarch64-darwin" ] else lib.platforms.darwin; + badPlatforms = + # avr-gcc8 is maintained for the `qmk` package + if (is8 && targetPlatform.isAvr) then [] + else if !(is48 || is49) then [ "aarch64-darwin" ] + else lib.platforms.darwin; } // lib.optionalAttrs is11 { badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ]; }; diff --git a/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch index d938d67a2d068..4e6c392ce76e3 100644 --- a/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch +++ b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch @@ -17,10 +17,10 @@ Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver -fmacro-prefix-map=/nix/... -In practice it quickly exhausts argument lengtth limit due to `gcc` +In practice it quickly exhausts argument length limit due to `gcc` deficiency: https://gcc.gnu.org/PR111527 -Until it;s fixed let's hardcode header mangling if $NIX_STORE variable +Until it's fixed let's hardcode header mangling if $NIX_STORE variable is present in the environment. Tested as: diff --git a/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch index 57ae2111f020a..ea0673219eb1f 100644 --- a/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch +++ b/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch @@ -17,10 +17,10 @@ Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver -fmacro-prefix-map=/nix/... -In practice it quickly exhausts argument lengtth limit due to `gcc` +In practice it quickly exhausts argument length limit due to `gcc` deficiency: https://gcc.gnu.org/PR111527 -Until it;s fixed let's hardcode header mangling if $NIX_STORE variable +Until it's fixed let's hardcode header mangling if $NIX_STORE variable is present in the environment. Tested as: diff --git a/pkgs/development/compilers/gcc/patches/6/fix-objdump-check.patch b/pkgs/development/compilers/gcc/patches/6/fix-objdump-check.patch deleted file mode 100644 index f9adbe9eb1ca5..0000000000000 --- a/pkgs/development/compilers/gcc/patches/6/fix-objdump-check.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 4c38abe0967bad78dd6baa61c86923e4d4b346d3 -Author: Ben Gamari <ben@smart-cactus.org> -Date: Sun Nov 5 13:14:19 2017 -0500 - - Fix it - -diff --git a/config/gcc-plugin.m4 b/config/gcc-plugin.m4 -index dd06a58..f4435b8 100644 ---- a/config/gcc-plugin.m4 -+++ b/config/gcc-plugin.m4 -@@ -13,6 +13,32 @@ dnl the same distribution terms as the rest of that program. - # Sets the shell variables enable_plugin and pluginlibs. - AC_DEFUN([GCC_ENABLE_PLUGINS], - [# Check for plugin support -+ -+ # Figure out what objdump we will be using. -+ AS_VAR_SET_IF(gcc_cv_objdump,, [ -+ if test -f $gcc_cv_binutils_srcdir/configure.ac \ -+ && test -f ../binutils/Makefile \ -+ && test x$build = x$host; then -+ # Single tree build which includes binutils. -+ gcc_cv_objdump=../binutils/objdump$build_exeext -+ elif test -x objdump$build_exeext; then -+ gcc_cv_objdump=./objdump$build_exeext -+ elif ( set dummy $OBJDUMP_FOR_TARGET; test -x $[2] ); then -+ gcc_cv_objdump="$OBJDUMP_FOR_TARGET" -+ else -+ AC_PATH_PROG(gcc_cv_objdump, $OBJDUMP_FOR_TARGET) -+ fi]) -+ -+ AC_MSG_CHECKING(what objdump to use) -+ if test "$gcc_cv_objdump" = ../binutils/objdump$build_exeext; then -+ # Single tree build which includes binutils. -+ AC_MSG_RESULT(newly built objdump) -+ elif test x$gcc_cv_objdump = x; then -+ AC_MSG_RESULT(not found) -+ else -+ AC_MSG_RESULT($gcc_cv_objdump) -+ fi -+ - AC_ARG_ENABLE(plugin, - [AS_HELP_STRING([--enable-plugin], [enable plugin support])], - enable_plugin=$enableval, diff --git a/pkgs/development/compilers/gcc/patches/8/avr-gcc-8-darwin.patch b/pkgs/development/compilers/gcc/patches/8/avr-gcc-8-darwin.patch new file mode 100644 index 0000000000000..3705ed99c49a2 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/8/avr-gcc-8-darwin.patch @@ -0,0 +1,16 @@ +From https://gist.githubusercontent.com/DavidEGrayson/88bceb3f4e62f45725ecbb9248366300/raw/c1f515475aff1e1e3985569d9b715edb0f317648/gcc-11-arm-darwin.patch + +diff -ur a/gcc/config/host-darwin.c b/gcc/config/host-darwin.c +--- a/gcc/config/host-darwin.c 2021-04-27 03:00:13.000000000 -0700 ++++ b/gcc/config/host-darwin.c 2021-06-11 14:49:13.754000000 -0700 +@@ -22,6 +22,10 @@ + #include "coretypes.h" + #include "diagnostic-core.h" + #include "config/host-darwin.h" ++#include "hosthooks.h" ++#include "hosthooks-def.h" ++ ++const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER; + + /* Yes, this is really supposed to work. */ + /* This allows for a pagesize of 16384, which we have on Darwin20, but should \ No newline at end of file diff --git a/pkgs/development/compilers/gcc/patches/9/avoid-cycling-subreg-reloads.patch b/pkgs/development/compilers/gcc/patches/9/avoid-cycling-subreg-reloads.patch deleted file mode 100644 index 17a4e0a2447b3..0000000000000 --- a/pkgs/development/compilers/gcc/patches/9/avoid-cycling-subreg-reloads.patch +++ /dev/null @@ -1,261 +0,0 @@ -From 6001db79c477b03eacc7e7049560921fb54b7845 Mon Sep 17 00:00:00 2001 -From: Richard Sandiford <richard.sandiford@arm.com> -Date: Mon, 7 Sep 2020 20:15:36 +0100 -Subject: [PATCH] lra: Avoid cycling on certain subreg reloads [PR96796] - -This PR is about LRA cycling for a reload of the form: - ----------------------------------------------------------------------------- -Changing pseudo 196 in operand 1 of insn 103 on equiv [r105:DI*0x8+r140:DI] - Creating newreg=287, assigning class ALL_REGS to slow/invalid mem r287 - Creating newreg=288, assigning class ALL_REGS to slow/invalid mem r288 - 103: r203:SI=r288:SI<<0x1+r196:DI#0 - REG_DEAD r196:DI - Inserting slow/invalid mem reload before: - 316: r287:DI=[r105:DI*0x8+r140:DI] - 317: r288:SI=r287:DI#0 ----------------------------------------------------------------------------- - -The problem is with r287. We rightly give it a broad starting class of -POINTER_AND_FP_REGS (reduced from ALL_REGS by preferred_reload_class). -However, we never make forward progress towards narrowing it down to -a specific choice of class (POINTER_REGS or FP_REGS). - -I think in practice we rely on two things to narrow a reload pseudo's -class down to a specific choice: - -(1) a restricted class is specified when the pseudo is created - - This happens for input address reloads, where the class is taken - from the target's chosen base register class. It also happens - for simple REG reloads, where the class is taken from the chosen - alternative's constraints. - -(2) uses of the reload pseudo as a direct input operand - - In this case get_reload_reg tries to reuse the existing register - and narrow its class, instead of creating a new reload pseudo. - -However, neither occurs here. As described above, r287 rightly -starts out with a wide choice of class, ultimately derived from -ALL_REGS, so we don't get (1). And as the comments in the PR -explain, r287 is never used as an input reload, only the subreg is, -so we don't get (2): - ----------------------------------------------------------------------------- - Choosing alt 13 in insn 317: (0) r (1) w {*movsi_aarch64} - Creating newreg=291, assigning class FP_REGS to r291 - 317: r288:SI=r291:SI - Inserting insn reload before: - 320: r291:SI=r287:DI#0 ----------------------------------------------------------------------------- - -IMO, in this case we should rely on the reload of r316 to narrow -down the class of r278. Currently we do: - ----------------------------------------------------------------------------- - Choosing alt 7 in insn 316: (0) r (1) m {*movdi_aarch64} - Creating newreg=289 from oldreg=287, assigning class GENERAL_REGS to r289 - 316: r289:DI=[r105:DI*0x8+r140:DI] - Inserting insn reload after: - 318: r287:DI=r289:DI ---------------------------------------------------- - -i.e. we create a new pseudo register r289 and give *that* pseudo -GENERAL_REGS instead. This is because get_reload_reg only narrows -down the existing class for OP_IN and OP_INOUT, not OP_OUT. - -But if we have a reload pseudo in a reload instruction and have chosen -a specific class for the reload pseudo, I think we should simply install -it for OP_OUT reloads too, if the class is a subset of the existing class. -We will need to pick such a register whatever happens (for r289 in the -example above). And as explained in the PR, doing this actually avoids -an unnecessary move via the FP registers too. - -The patch is quite aggressive in that it does this for all reload -pseudos in all reload instructions. I wondered about reusing the -condition for a reload move in in_class_p: - - INSN_UID (curr_insn) >= new_insn_uid_start - && curr_insn_set != NULL - && ((OBJECT_P (SET_SRC (curr_insn_set)) - && ! CONSTANT_P (SET_SRC (curr_insn_set))) - || (GET_CODE (SET_SRC (curr_insn_set)) == SUBREG - && OBJECT_P (SUBREG_REG (SET_SRC (curr_insn_set))) - && ! CONSTANT_P (SUBREG_REG (SET_SRC (curr_insn_set))))))) - -but I can't really justify that on first principles. I think we -should apply the rule consistently until we have a specific reason -for doing otherwise. - -gcc/ - PR rtl-optimization/96796 - * lra-constraints.c (in_class_p): Add a default-false - allow_all_reload_class_changes_p parameter. Do not treat - reload moves specially when the parameter is true. - (get_reload_reg): Try to narrow the class of an existing OP_OUT - reload if we're reloading a reload pseudo in a reload instruction. - -gcc/testsuite/ - PR rtl-optimization/96796 - * gcc.c-torture/compile/pr96796.c: New test. ---- - gcc/lra-constraints.c | 54 ++++++++++++++---- - gcc/testsuite/gcc.c-torture/compile/pr96796.c | 55 +++++++++++++++++++ - 2 files changed, 99 insertions(+), 10 deletions(-) - create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr96796.c - -diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c -index 580da9c3ed6..161b721efb1 100644 ---- a/gcc/lra-constraints.c -+++ b/gcc/lra-constraints.c -@@ -236,12 +236,17 @@ get_reg_class (int regno) - CL. Use elimination first if REG is a hard register. If REG is a - reload pseudo created by this constraints pass, assume that it will - be allocated a hard register from its allocno class, but allow that -- class to be narrowed to CL if it is currently a superset of CL. -+ class to be narrowed to CL if it is currently a superset of CL and -+ if either: -+ -+ - ALLOW_ALL_RELOAD_CLASS_CHANGES_P is true or -+ - the instruction we're processing is not a reload move. - - If NEW_CLASS is nonnull, set *NEW_CLASS to the new allocno class of - REGNO (reg), or NO_REGS if no change in its class was needed. */ - static bool --in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) -+in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class, -+ bool allow_all_reload_class_changes_p = false) - { - enum reg_class rclass, common_class; - machine_mode reg_mode; -@@ -266,7 +271,8 @@ in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) - typically moves that have many alternatives, and restricting - reload pseudos for one alternative may lead to situations - where other reload pseudos are no longer allocatable. */ -- || (INSN_UID (curr_insn) >= new_insn_uid_start -+ || (!allow_all_reload_class_changes_p -+ && INSN_UID (curr_insn) >= new_insn_uid_start - && curr_insn_set != NULL - && ((OBJECT_P (SET_SRC (curr_insn_set)) - && ! CONSTANT_P (SET_SRC (curr_insn_set))) -@@ -598,13 +604,12 @@ canonicalize_reload_addr (rtx addr) - return addr; - } - --/* Create a new pseudo using MODE, RCLASS, ORIGINAL or reuse already -- created input reload pseudo (only if TYPE is not OP_OUT). Don't -- reuse pseudo if IN_SUBREG_P is true and the reused pseudo should be -- wrapped up in SUBREG. The result pseudo is returned through -- RESULT_REG. Return TRUE if we created a new pseudo, FALSE if we -- reused the already created input reload pseudo. Use TITLE to -- describe new registers for debug purposes. */ -+/* Create a new pseudo using MODE, RCLASS, ORIGINAL or reuse an existing -+ reload pseudo. Don't reuse an existing reload pseudo if IN_SUBREG_P -+ is true and the reused pseudo should be wrapped up in a SUBREG. -+ The result pseudo is returned through RESULT_REG. Return TRUE if we -+ created a new pseudo, FALSE if we reused an existing reload pseudo. -+ Use TITLE to describe new registers for debug purposes. */ - static bool - get_reload_reg (enum op_type type, machine_mode mode, rtx original, - enum reg_class rclass, bool in_subreg_p, -@@ -616,6 +621,35 @@ get_reload_reg (enum op_type type, machine_mode mode, rtx original, - - if (type == OP_OUT) - { -+ /* Output reload registers tend to start out with a conservative -+ choice of register class. Usually this is ALL_REGS, although -+ a target might narrow it (for performance reasons) through -+ targetm.preferred_reload_class. It's therefore quite common -+ for a reload instruction to require a more restrictive class -+ than the class that was originally assigned to the reload register. -+ -+ In these situations, it's more efficient to refine the choice -+ of register class rather than create a second reload register. -+ This also helps to avoid cycling for registers that are only -+ used by reload instructions. */ -+ if (REG_P (original) -+ && (int) REGNO (original) >= new_regno_start -+ && INSN_UID (curr_insn) >= new_insn_uid_start -+ && in_class_p (original, rclass, &new_class, true)) -+ { -+ unsigned int regno = REGNO (original); -+ if (lra_dump_file != NULL) -+ { -+ fprintf (lra_dump_file, " Reuse r%d for output ", regno); -+ dump_value_slim (lra_dump_file, original, 1); -+ } -+ if (new_class != lra_get_allocno_class (regno)) -+ lra_change_class (regno, new_class, ", change to", false); -+ if (lra_dump_file != NULL) -+ fprintf (lra_dump_file, "\n"); -+ *result_reg = original; -+ return false; -+ } - *result_reg - = lra_create_new_reg_with_unique_value (mode, original, rclass, title); - return true; -diff --git a/gcc/testsuite/gcc.c-torture/compile/pr96796.c b/gcc/testsuite/gcc.c-torture/compile/pr96796.c -new file mode 100644 -index 00000000000..8808e62fe77 ---- /dev/null -+++ b/gcc/testsuite/gcc.c-torture/compile/pr96796.c -@@ -0,0 +1,55 @@ -+/* { dg-additional-options "-fcommon" } */ -+ -+struct S0 { -+ signed f0 : 8; -+ unsigned f1; -+ unsigned f4; -+}; -+struct S1 { -+ long f3; -+ char f4; -+} g_3_4; -+ -+int g_5, func_1_l_32, func_50___trans_tmp_31; -+static struct S0 g_144, g_834, g_1255, g_1261; -+ -+int g_273[120] = {}; -+int *g_555; -+char **g_979; -+static int g_1092_0; -+static int g_1193; -+int safe_mul_func_int16_t_s_s(int si1, int si2) { return si1 * si2; } -+static struct S0 *func_50(); -+int func_1() { func_50(g_3_4, g_5, func_1_l_32, 8, 3); } -+void safe_div_func_int64_t_s_s(int *); -+void safe_mod_func_uint32_t_u_u(struct S0); -+struct S0 *func_50(int p_51, struct S0 p_52, struct S1 p_53, int p_54, -+ int p_55) { -+ int __trans_tmp_30; -+ char __trans_tmp_22; -+ short __trans_tmp_19; -+ long l_985_1; -+ long l_1191[8]; -+ safe_div_func_int64_t_s_s(g_273); -+ __builtin_printf((char*)g_1261.f4); -+ safe_mod_func_uint32_t_u_u(g_834); -+ g_144.f0 += 1; -+ for (;;) { -+ struct S1 l_1350 = {&l_1350}; -+ for (; p_53.f3; p_53.f3 -= 1) -+ for (; g_1193 <= 2; g_1193 += 1) { -+ __trans_tmp_19 = safe_mul_func_int16_t_s_s(l_1191[l_985_1 + p_53.f3], -+ p_55 % (**g_979 = 10)); -+ __trans_tmp_22 = g_1255.f1 * p_53.f4; -+ __trans_tmp_30 = __trans_tmp_19 + __trans_tmp_22; -+ if (__trans_tmp_30) -+ g_1261.f0 = p_51; -+ else { -+ g_1255.f0 = p_53.f3; -+ int *l_1422 = g_834.f0 = g_144.f4 != (*l_1422)++ > 0 < 0 ^ 51; -+ g_555 = ~0; -+ g_1092_0 |= func_50___trans_tmp_31; -+ } -+ } -+ } -+} --- -2.18.4 - diff --git a/pkgs/development/compilers/gcc/patches/9/gcc9-asan-glibc-2.34.patch b/pkgs/development/compilers/gcc/patches/9/gcc9-asan-glibc-2.34.patch deleted file mode 100644 index 1aea1f9b18a14..0000000000000 --- a/pkgs/development/compilers/gcc/patches/9/gcc9-asan-glibc-2.34.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 3d0135bf3be416bbe2531dc763d19b749eb2b856 Mon Sep 17 00:00:00 2001 -From: Jakub Jelinek <jakub@redhat.com> -Date: Sat, 17 Apr 2021 11:27:14 +0200 -Subject: [PATCH] sanitizer: Fix asan against glibc 2.34 [PR100114] - -As mentioned in the PR, SIGSTKSZ is no longer a compile time constant in -glibc 2.34 and later, so -static const uptr kAltStackSize = SIGSTKSZ * 4; -needs dynamic initialization, but is used by a function called indirectly -from .preinit_array and therefore before the variable is constructed. -This results in using 0 size instead and all asan instrumented programs -die with: -==91==ERROR: AddressSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack (error code: 22) - -Here is a cherry-pick from upstream to fix this. - -2021-04-17 Jakub Jelinek <jakub@redhat.com> - - PR sanitizer/100114 - * sanitizer_common/sanitizer_posix_libcdep.cc: Cherry-pick - llvm-project revisions 82150606fb11d28813ae6da1101f5bda638165fe - and b93629dd335ffee2fc4b9b619bf86c3f9e6b0023. - -(cherry picked from commit 950bac27d63c1c2ac3a6ed867692d6a13f21feb3) ---- - .../sanitizer_common/sanitizer_posix_libcdep.cc | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc -index d2fd76a6d36..1917e29ced2 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc -@@ -169,7 +169,11 @@ bool SupportsColoredOutput(fd_t fd) { - - #if !SANITIZER_GO - // TODO(glider): different tools may require different altstack size. --static const uptr kAltStackSize = SIGSTKSZ * 4; // SIGSTKSZ is not enough. -+static uptr GetAltStackSize() { -+ // SIGSTKSZ is not enough. -+ static const uptr kAltStackSize = SIGSTKSZ * 4; -+ return kAltStackSize; -+} - - void SetAlternateSignalStack() { - stack_t altstack, oldstack; -@@ -180,10 +184,9 @@ void SetAlternateSignalStack() { - // TODO(glider): the mapped stack should have the MAP_STACK flag in the - // future. It is not required by man 2 sigaltstack now (they're using - // malloc()). -- void* base = MmapOrDie(kAltStackSize, __func__); -- altstack.ss_sp = (char*) base; -+ altstack.ss_size = GetAltStackSize(); -+ altstack.ss_sp = (char *)MmapOrDie(altstack.ss_size, __func__); - altstack.ss_flags = 0; -- altstack.ss_size = kAltStackSize; - CHECK_EQ(0, sigaltstack(&altstack, nullptr)); - } - -@@ -191,7 +194,7 @@ void UnsetAlternateSignalStack() { - stack_t altstack, oldstack; - altstack.ss_sp = nullptr; - altstack.ss_flags = SS_DISABLE; -- altstack.ss_size = kAltStackSize; // Some sane value required on Darwin. -+ altstack.ss_size = GetAltStackSize(); // Some sane value required on Darwin. - CHECK_EQ(0, sigaltstack(&altstack, &oldstack)); - UnmapOrDie(oldstack.ss_sp, oldstack.ss_size); - } --- -2.27.0 - diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 32938be376d9b..55636b8ab51cd 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -215,6 +215,11 @@ in # which is not supported by the clang integrated assembler used by default on Darwin. ++ optional (is8 && hostPlatform.isDarwin) ./8/gcc8-darwin-as-gstabs.patch +# Make avr-gcc8 build on aarch64-darwin +# avr-gcc8 is maintained for the `qmk` package +# https://github.com/osx-cross/homebrew-avr/blob/main/Formula/avr-gcc%408.rb#L69 +++ optional (is8 && targetPlatform.isAvr && hostPlatform.isDarwin && hostPlatform.isAarch64) ./8/avr-gcc-8-darwin.patch + ## gcc 7.0 and older ############################################################################## diff --git a/pkgs/development/compilers/gcc/patches/libsanitizer-no-cyclades.patch b/pkgs/development/compilers/gcc/patches/libsanitizer-no-cyclades.patch deleted file mode 100644 index e2155cd0c982d..0000000000000 --- a/pkgs/development/compilers/gcc/patches/libsanitizer-no-cyclades.patch +++ /dev/null @@ -1,83 +0,0 @@ -https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=2bf34b9f4e446bf9be7f04458058dd5319fb396e -https://gcc.gnu.org/PR100379 ---- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -+++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -@@ -366,15 +366,6 @@ static void ioctl_table_fill() { - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE -- _(CYGETDEFTHRESH, WRITE, sizeof(int)); -- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); -- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); -- _(CYGETTHRESH, WRITE, sizeof(int)); -- _(CYGETTIMEOUT, WRITE, sizeof(int)); -- _(CYSETDEFTHRESH, NONE, 0); -- _(CYSETDEFTIMEOUT, NONE, 0); -- _(CYSETTHRESH, NONE, 0); -- _(CYSETTIMEOUT, NONE, 0); - _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); - _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); - _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -130,7 +130,6 @@ typedef struct user_fpregs elf_fpregset_t; - # include <sys/procfs.h> - #endif - #include <sys/user.h> --#include <linux/cyclades.h> - #include <linux/if_eql.h> - #include <linux/if_plip.h> - #include <linux/lp.h> -@@ -443,7 +442,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); -- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) - unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); - #else -@@ -809,15 +807,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; -- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; -- unsigned IOCTL_CYGETMON = CYGETMON; -- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; -- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; -- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; -- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; -- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; -- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; - unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; - unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; - unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -974,7 +974,6 @@ extern unsigned struct_vt_mode_sz; - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - extern unsigned struct_ax25_parms_struct_sz; --extern unsigned struct_cyclades_monitor_sz; - extern unsigned struct_input_keymap_entry_sz; - extern unsigned struct_ipx_config_data_sz; - extern unsigned struct_kbdiacrs_sz; -@@ -1319,15 +1318,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID --extern unsigned IOCTL_CYGETDEFTHRESH; --extern unsigned IOCTL_CYGETDEFTIMEOUT; --extern unsigned IOCTL_CYGETMON; --extern unsigned IOCTL_CYGETTHRESH; --extern unsigned IOCTL_CYGETTIMEOUT; --extern unsigned IOCTL_CYSETDEFTHRESH; --extern unsigned IOCTL_CYSETDEFTIMEOUT; --extern unsigned IOCTL_CYSETTHRESH; --extern unsigned IOCTL_CYSETTIMEOUT; - extern unsigned IOCTL_EQL_EMANCIPATE; - extern unsigned IOCTL_EQL_ENSLAVE; - extern unsigned IOCTL_EQL_GETMASTRCFG; --- -2.33.0 - diff --git a/pkgs/development/compilers/gcc/patches/struct-sigaltstack.patch b/pkgs/development/compilers/gcc/patches/struct-sigaltstack.patch deleted file mode 100644 index 6e1ddb252c24c..0000000000000 --- a/pkgs/development/compilers/gcc/patches/struct-sigaltstack.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 72edc2c02f8b4768ad660f46a1c7e2400c0a8e06 Mon Sep 17 00:00:00 2001 -From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Mon, 17 Jul 2017 19:41:08 +0000 -Subject: [PATCH] Backported from mainline 2017-07-14 Jakub - Jelinek <jakub@redhat.com> - - PR sanitizer/81066 - * sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969. - * sanitizer_common/sanitizer_linux.cc: Likewise. - * sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise. - * tsan/tsan_platform_linux.cc: Likewise. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@250287 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - libsanitizer/ChangeLog (REMOVED) | 11 +++++++++++ - libsanitizer/sanitizer_common/sanitizer_linux.cc | 3 +-- - libsanitizer/sanitizer_common/sanitizer_linux.h | 4 +--- - .../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +- - libsanitizer/tsan/tsan_platform_linux.cc | 2 +- - 5 files changed, 15 insertions(+), 7 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc -index 806fcd5..5b6f186 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_linux.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc -@@ -605,8 +605,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { - } - #endif - --uptr internal_sigaltstack(const struct sigaltstack *ss, -- struct sigaltstack *oss) { -+uptr internal_sigaltstack(const void *ss, void *oss) { - return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss); - } - -diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h -index 895bfc1..a42df57 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_linux.h -+++ b/libsanitizer/sanitizer_common/sanitizer_linux.h -@@ -19,7 +19,6 @@ - #include "sanitizer_platform_limits_posix.h" - - struct link_map; // Opaque type returned by dlopen(). --struct sigaltstack; - - namespace __sanitizer { - // Dirent structure for getdents(). Note that this structure is different from -@@ -28,8 +27,7 @@ struct linux_dirent; - - // Syscall wrappers. - uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); --uptr internal_sigaltstack(const struct sigaltstack* ss, -- struct sigaltstack* oss); -+uptr internal_sigaltstack(const void* ss, void* oss); - uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set, - __sanitizer_sigset_t *oldset); - -diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -index 891386dc..234e8c6 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -@@ -273,7 +273,7 @@ static int TracerThread(void* argument) { - - // Alternate stack for signal handling. - InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize); -- struct sigaltstack handler_stack; -+ stack_t handler_stack; - internal_memset(&handler_stack, 0, sizeof(handler_stack)); - handler_stack.ss_sp = handler_stack_memory.data(); - handler_stack.ss_size = kHandlerStackSize; -diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc -index 2ed5718..6f972ab 100644 ---- a/libsanitizer/tsan/tsan_platform_linux.cc -+++ b/libsanitizer/tsan/tsan_platform_linux.cc -@@ -287,7 +287,7 @@ void InitializePlatform() { - int ExtractResolvFDs(void *state, int *fds, int nfd) { - #if SANITIZER_LINUX && !SANITIZER_ANDROID - int cnt = 0; -- __res_state *statp = (__res_state*)state; -+ struct __res_state *statp = (struct __res_state*)state; - for (int i = 0; i < MAXNS && cnt < nfd; i++) { - if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) - fds[cnt++] = statp->_u._ext.nssocks[i]; --- -2.9.3 - diff --git a/pkgs/development/compilers/gcc/patches/struct-ucontext-4.5.patch b/pkgs/development/compilers/gcc/patches/struct-ucontext-4.5.patch deleted file mode 100644 index a84e9ffe26811..0000000000000 --- a/pkgs/development/compilers/gcc/patches/struct-ucontext-4.5.patch +++ /dev/null @@ -1,107 +0,0 @@ -Trivally backported the upstream commit -b685411208e0aaa79190d54faf945763514706b8 -(different directory, some files not present, etc.) -We only really use x86* from those, probably, so I didn't bother much. -diff --git a/gcc/config/alpha/linux-unwind.h b/gcc/config/alpha/linux-unwind.h -index bdbba4a..e84812e 100644 ---- a/gcc/config/alpha/linux-unwind.h -+++ b/gcc/config/alpha/linux-unwind.h -@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - sc = &rt_->uc.uc_mcontext; - } -diff --git a/gcc/config/bfin/linux-unwind.h b/gcc/config/bfin/linux-unwind.h -index 77b7c23..8bf5e82 100644 ---- a/gcc/config/bfin/linux-unwind.h -+++ b/gcc/config/bfin/linux-unwind.h -@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, - void *puc; - char retcode[8]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - - /* The void * cast is necessary to avoid an aliasing warning. -diff --git a/gcc/config/i386/linux-unwind.h b/gcc/config/i386/linux-unwind.h -index 540a0a2..29efbe3 100644 ---- a/gcc/config/i386/linux-unwind.h -+++ b/gcc/config/i386/linux-unwind.h -@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, - if (*(unsigned char *)(pc+0) == 0x48 - && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) - { -- struct ucontext *uc_ = context->cfa; -+ ucontext_t *uc_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem - because it does not alias anything. */ -@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context, - siginfo_t *pinfo; - void *puc; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -diff --git a/gcc/config/m68k/linux-unwind.h b/gcc/config/m68k/linux-unwind.h -index 75b7cf7..f964e24 100644 ---- a/gcc/config/m68k/linux-unwind.h -+++ b/gcc/config/m68k/linux-unwind.h -@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - /* <sys/ucontext.h> is unfortunately broken right now. */ - struct uw_ucontext { - unsigned long uc_flags; -- struct ucontext *uc_link; -+ ucontext_t *uc_link; - stack_t uc_stack; - mcontext_t uc_mcontext; - unsigned long uc_filler[80]; -diff --git a/gcc/config/pa/linux-unwind.h b/gcc/config/pa/linux-unwind.h -index 9a2657f..e47493d 100644 ---- a/gcc/config/pa/linux-unwind.h -+++ b/gcc/config/pa/linux-unwind.h -@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, - struct sigcontext *sc; - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *frame; - - /* rt_sigreturn trampoline: -diff --git a/gcc/config/sh/linux-unwind.h b/gcc/config/sh/linux-unwind.h -index e389cac..0bf43ba 100644 ---- a/gcc/config/sh/linux-unwind.h -+++ b/gcc/config/sh/linux-unwind.h -@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -diff --git a/gcc/config/xtensa/linux-unwind.h b/gcc/config/xtensa/linux-unwind.h -index 9872492..586a9d4 100644 ---- a/gcc/config/xtensa/linux-unwind.h -+++ b/gcc/config/xtensa/linux-unwind.h -@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, - - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_; - - /* movi a2, __NR_rt_sigreturn; syscall */ --- -2.9.3 - diff --git a/pkgs/development/compilers/gcc/patches/struct-ucontext-libjava.patch b/pkgs/development/compilers/gcc/patches/struct-ucontext-libjava.patch deleted file mode 100644 index 3892a56954e08..0000000000000 --- a/pkgs/development/compilers/gcc/patches/struct-ucontext-libjava.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/libjava/include/x86_64-signal.h -+++ a/libjava/include/x86_64-signal.h -@@ -28,7 +28,7 @@ - #define HANDLE_DIVIDE_OVERFLOW \ - do \ - { \ -- struct ucontext *_uc = (struct ucontext *)_p; \ -+ ucontext_t *_uc = (ucontext_t *)_p; \ - gregset_t &_gregs = _uc->uc_mcontext.gregs; \ - unsigned char *_rip = (unsigned char *)_gregs[REG_RIP]; \ - \ ---- a/libjava/include/i386-signal.h -+++ a/libjava/include/i386-signal.h -@@ -29,7 +29,7 @@ - #define HANDLE_DIVIDE_OVERFLOW \ - do \ - { \ -- struct ucontext *_uc = (struct ucontext *)_p; \ -+ ucontext_t *_uc = (ucontext_t *)_p; \ - gregset_t &_gregs = _uc->uc_mcontext.gregs; \ - unsigned char *_eip = (unsigned char *)_gregs[REG_EIP]; \ - \ ---- a/libjava/include/s390-signal.h -+++ a/libjava/include/s390-signal.h -@@ -51,7 +51,7 @@ - struct \ - { \ - unsigned long int uc_flags; \ -- struct ucontext *uc_link; \ -+ ucontext_t *uc_link; \ - stack_t uc_stack; \ - mcontext_t uc_mcontext; \ - unsigned long sigmask[2]; \ diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 9ce26d0b21b2b..af983be968b0f 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -24,17 +24,16 @@ stdenv.mkDerivation rec { buildInputs = buildInputs_libraries; postPatch = '' - echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ; patchShebangs . ; grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ; done ; - substituteInPlace ./configure --replace 'set -e' 'set -e ; git () { echo "v${git-version}" ;}' ; - substituteInPlace ./src/build/build-version.scm --replace "with-exception-catcher" '(lambda _ "v${git-version}")' ; - #rmdir src/gambit - #cp -a ${pkgs.gambit-unstable.src} ./src/gambit - chmod -R u+w ./src/gambit - ( cd src/gambit ; ${gambit-params.fixStamp gambit-git-version gambit-stampYmd gambit-stampHms} ) + cat > MANIFEST <<EOF + gerbil_stamp_version=v${git-version} + gambit_stamp_version=v${gambit-git-version} + gambit_stamp_ymd=${gambit-stampYmd} + gambit_stamp_hms=${gambit-stampHms} + EOF for f in src/bootstrap/gerbil/compiler/driver__0.scm \ src/build/build-libgerbil.ss \ src/gerbil/compiler/driver.ss ; do @@ -58,8 +57,7 @@ stdenv.mkDerivation rec { "--enable-zlib" "--enable-sqlite" "--enable-shared" - "--disable-deprecated" - "--enable-march=" # Avoid non-portable invalid instructions + "--enable-march=" # Avoid non-portable invalid instructions. Use =native if local build only. ]; configurePhase = '' @@ -70,15 +68,7 @@ stdenv.mkDerivation rec { LD=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - (cd src/gambit ; ${gambit-params.fixStamp gambit-git-version gambit-stampYmd gambit-stampHms}) ./configure ${builtins.concatStringsSep " " configureFlags} - (cd src/gambit ; - substituteInPlace config.status \ - ${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable) - ''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \ - --replace "/usr/local/opt/openssl" "${lib.getLib openssl}" - ./config.status - ) ''; extraLdOptions = [ @@ -116,6 +106,9 @@ stdenv.mkDerivation rec { ./install.sh (cd $out/bin ; ln -s ../gerbil/bin/* .) runHook postInstall + '' + lib.optionalString stdenv.isDarwin '' + libgerbil="$(realpath "$out/gerbil/lib/libgerbil.so")" + install_name_tool -id "$libgerbil" "$libgerbil" ''; dontStrip = true; diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 29e6d35750882..148bf7451675c 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,18 +1,18 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }: callPackage ./build.nix rec { - version = "0.18"; - git-version = "0.18"; + version = "0.18.1"; + git-version = "0.18.1"; src = fetchFromGitHub { owner = "mighty-gerbils"; repo = "gerbil"; - rev = "8ca36a928bc9345f9d28e5f2dfcb55ca558e85f9"; - sha256 = "sha256-EMiYgQM/Gl+dh6AxLYRZ0BKZ+VKFd+Lkyy9Pw11ivE8="; + rev = "23c30a6062cd7e63f9d85300ce01585bb9035d2d"; + sha256 = "15fh0zqkmnjhan1mgymq5fgbjsh5z9d2v6zjddplqib5zd2s3z6k"; fetchSubmodules = true; }; inherit gambit-support; gambit-params = gambit-support.unstable-params; - gambit-git-version = "4.9.5-40-g24201248"; # pkgs.gambit-unstable.passthru.git-version - gambit-stampYmd = "20230917"; # pkgs.gambit-unstable.passthru.git-stampYmd - gambit-stampHms = "182043"; # pkgs.gambit-unstable.passthru.git-stampHms + gambit-git-version = "4.9.5-78-g8b18ab69"; + gambit-stampYmd = "20231029"; + gambit-stampHms = "163035"; } diff --git a/pkgs/development/compilers/gerbil/ftw.nix b/pkgs/development/compilers/gerbil/ftw.nix index 2f2c9956826d7..fc1ed986eb614 100644 --- a/pkgs/development/compilers/gerbil/ftw.nix +++ b/pkgs/development/compilers/gerbil/ftw.nix @@ -2,8 +2,8 @@ { pname = "ftw"; - version = "unstable-2022-01-14"; - git-version = "8ba16b3"; + version = "unstable-2023-11-15"; + git-version = "e5e2f56"; softwareName = "FTW: For The Web!"; gerbil-package = "drewc/ftw"; @@ -13,8 +13,8 @@ fun = fetchFromGitHub; owner = "drewc"; repo = "ftw"; - rev = "8ba16b3c1cdc2150df5af8ef3c92040ef8b563b9"; - sha256 = "153i6whm5jfcj9s1qpxz03sq67969lq11brssyjc3yv3wyb1b07h"; + rev = "e5e2f56e90bf072ddf9c2987ddfac45f048e8a04"; + sha256 = "04164190vv1fzfk014mgqqmy5cml5amh63df31q2yc2kzvfajfc3"; }; meta = with lib; { diff --git a/pkgs/development/compilers/gerbil/gerbil-crypto.nix b/pkgs/development/compilers/gerbil/gerbil-crypto.nix index dd06417d1a85d..fc55ca5b79dbf 100644 --- a/pkgs/development/compilers/gerbil/gerbil-crypto.nix +++ b/pkgs/development/compilers/gerbil/gerbil-crypto.nix @@ -2,8 +2,8 @@ { pname = "gerbil-crypto"; - version = "unstable-2023-09-27"; - git-version = "0.0-23-g341e09d"; + version = "unstable-2023-11-29"; + git-version = "0.1-1-g4197bfa"; gerbil-package = "clan/crypto"; gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-poo ]; nativeBuildInputs = [ pkgs.pkg-config ]; @@ -15,8 +15,8 @@ fun = fetchFromGitHub; owner = "mighty-gerbils"; repo = "gerbil-crypto"; - rev = "341e09dcb15c09c836eae18093c0f63f71c0a72f"; - sha256 = "1rq50q4p4vhr5drjvirmdkxaa4wszj1rxnhjaqz98bfpjm90yk4j"; + rev = "4197bfa71dc55657f79efd5cc21fe59839e840f2"; + sha256 = "1jdfz5x24dfvpwyfxalkhv83gf9ylyaqii1kg8rjl8dzickawrix"; }; meta = with lib; { diff --git a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix index 521447593d4a6..42891aeca4d08 100644 --- a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix +++ b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -2,8 +2,8 @@ rec { pname = "gerbil-ethereum"; - version = "unstable-2023-10-06"; - git-version = "0.1-1-g08b08fc"; + version = "unstable-2023-12-04"; + git-version = "0.2-11-g124ec58"; softwareName = "Gerbil-ethereum"; gerbil-package = "clan/ethereum"; version-path = "version"; @@ -15,8 +15,8 @@ rec { fun = fetchFromGitHub; owner = "mighty-gerbils"; repo = "gerbil-ethereum"; - rev = "08b08fce8c83cb59bfb532eebb1c7a2dd4bd57ab"; - sha256 = "1sy7l869d2xqhq2qflsmkvr343jfhzsq43ixx75rqfpr3cdljz0b"; + rev = "124ec585157e2c505cd3c449a389c124ca6da9e9"; + sha256 = "0xg07k421r5p0qx98id66k0k2l3vi1is875857sd8q3h6bks0z54"; }; postInstall = '' @@ -34,7 +34,7 @@ rec { export GERBIL_PATH GERBIL_LOADPATH GLOW_SOURCE ORIG_GERBIL_PATH ORIG_GERBIL_LOADPATH exec ${gerbil}/bin/gxi "\$0" "\$@" |# - (import :clan/ethereum/scripts/run-ethereum-test-net :clan/multicall) + (import :clan/ethereum/scripts/run-ethereum-test-net :std/lib/multicall) (apply call-entry-point (cdr (command-line))) EOF chmod a+x $out/bin/run-ethereum-test-net diff --git a/pkgs/development/compilers/gerbil/gerbil-persist.nix b/pkgs/development/compilers/gerbil/gerbil-persist.nix index eb3cdda1f46c6..3aafbc7d19bc7 100644 --- a/pkgs/development/compilers/gerbil/gerbil-persist.nix +++ b/pkgs/development/compilers/gerbil/gerbil-persist.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, gerbilPackages, ... }: { pname = "gerbil-persist"; - version = "unstable-2023-10-07"; - git-version = "0.1.1-1-g3ce1d4a"; + version = "unstable-2023-11-29"; + git-version = "0.2-6-g8a5e40d"; softwareName = "Gerbil-persist"; gerbil-package = "clan/persist"; version-path = "version"; @@ -13,8 +13,8 @@ fun = fetchFromGitHub; owner = "mighty-gerbils"; repo = "gerbil-persist"; - rev = "3ce1d4a4b1d7be290e54f884d780c02ceee8f10e"; - sha256 = "1kzvgpqkpq4wlc0hlfxy314fbv6215aksrrlrrpq9w97wdibmv7x"; + rev = "8a5e40deb01140b9c8d03c6cc985e47a9d7123d8"; + sha256 = "1c1h1yp7gf23r3asxppgga4j4jmy4l9rlbb7vw9jcwvl8d30yrab"; }; meta = with lib; { diff --git a/pkgs/development/compilers/gerbil/gerbil-poo.nix b/pkgs/development/compilers/gerbil/gerbil-poo.nix index 16257dc41628b..caedf4ee86ae2 100644 --- a/pkgs/development/compilers/gerbil/gerbil-poo.nix +++ b/pkgs/development/compilers/gerbil/gerbil-poo.nix @@ -2,8 +2,8 @@ { pname = "gerbil-poo"; - version = "unstable-2023-10-07"; - git-version = "0.1-1-g367ab43"; + version = "unstable-2023-11-29"; + git-version = "0.2-5-gacf654e"; softwareName = "Gerbil-POO"; gerbil-package = "clan/poo"; version-path = "version"; @@ -14,8 +14,8 @@ fun = fetchFromGitHub; owner = "mighty-gerbils"; repo = "gerbil-poo"; - rev = "367ab4376fdd6fc0b0892da2becef35a5039c583"; - sha256 = "0ci88zqi7gb55ahl0n7dk1ihij2j6dn8jb6rzfiilck773x46kdh"; + rev = "acf654eb040c548da260a7a5d52bafb057d23541"; + sha256 = "1pxv1j6hwcgjj67bb7vvlnyl3123r43ifldm6alm76v2mfp2vs81"; }; meta = with lib; { diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix index 541c596a21266..ef6405c76304b 100644 --- a/pkgs/development/compilers/gerbil/gerbil-utils.nix +++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -2,8 +2,8 @@ { pname = "gerbil-utils"; - version = "unstable-2023-10-08"; - git-version = "0.3-3-g2914428"; + version = "unstable-2023-12-06"; + git-version = "0.4-13-g9398865"; softwareName = "Gerbil-utils"; gerbil-package = "clan"; version-path = "version"; @@ -12,8 +12,8 @@ fun = fetchFromGitHub; owner = "mighty-gerbils"; repo = "gerbil-utils"; - rev = "29144289b40ce624adf30eab23b796ddd6b6b55d"; - sha256 = "0qysw2zs5acgri3wrjb3ngnnhd17xpr9hcdr4ya383k8k7jacr8a"; + rev = "939886579508ff34b58a0d65bbb7d666125d0551"; + sha256 = "0dga03qq7iy12bnpxr6d40qhvihsvn3y87psf2w2clnpypjb3blx"; }; meta = with lib; { diff --git a/pkgs/development/compilers/gerbil/glow-lang.nix b/pkgs/development/compilers/gerbil/glow-lang.nix index 8bd38b30b4b87..12b1fd75d3ee8 100644 --- a/pkgs/development/compilers/gerbil/glow-lang.nix +++ b/pkgs/development/compilers/gerbil/glow-lang.nix @@ -2,8 +2,8 @@ rec { pname = "glow-lang"; - version = "unstable-2023-10-06"; - git-version = "0.3.2-232-ga1a7a9e5"; + version = "unstable-2023-12-04"; + git-version = "0.3.2-237-g08d849ad"; softwareName = "Glow"; gerbil-package = "mukn/glow"; version-path = "version"; @@ -17,8 +17,8 @@ rec { fun = fetchFromGitHub; owner = "Glow-Lang"; repo = "glow"; - rev = "a1a7a9e51ba9a466d91c397d9da55af90076110c"; - sha256 = "0wgav4gbg6mlxgisjjbyhvhz94b29vv2rkjkjy1jl7v0hs3wbm52"; + rev = "08d849adef94ae9deead34e6981e77d47806c6e3"; + sha256 = "0dq0s8y3rgx0wa5wsgcdjs0zijnbgff3y4w2mkh5a04gz4lrhl50"; }; postPatch = '' diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index a39371f00445c..4b0d3289c1078 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,18 +1,19 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }: callPackage ./build.nix rec { - version = "unstable-2023-10-13"; - git-version = "0.18-2-g8ed012ff"; + version = "unstable-2023-12-06"; + git-version = "0.18.1"; src = fetchFromGitHub { owner = "mighty-gerbils"; repo = "gerbil"; - rev = "8ed012ff9571fcfebcc07815813001a3f356150d"; - sha256 = "056kmjn7sd0hjwikmg7v3a1kvgsgvfi7pi9xcx3ixym9g3bqa4mx"; + rev = "23c30a6062cd7e63f9d85300ce01585bb9035d2d"; + sha256 = "15fh0zqkmnjhan1mgymq5fgbjsh5z9d2v6zjddplqib5zd2s3z6k"; fetchSubmodules = true; }; inherit gambit-support; gambit-params = gambit-support.unstable-params; - gambit-git-version = "4.9.5-40-g24201248"; # pkgs.gambit-unstable.passthru.git-version - gambit-stampYmd = "20230917"; # pkgs.gambit-unstable.passthru.git-stampYmd - gambit-stampHms = "182043"; # pkgs.gambit-unstable.passthru.git-stampHms + # These are available in pkgs.gambit-unstable.passthru.git-version, etc. + gambit-git-version = "4.9.5-78-g8b18ab69"; + gambit-stampYmd = "20231029"; + gambit-stampHms = "163035"; } diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index d7d2578cdc494..58e61604cd61a 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -10,7 +10,9 @@ assert stdenv.targetPlatform == stdenv.hostPlatform; let - useLLVM = !stdenv.targetPlatform.isx86; + useLLVM = !(stdenv.targetPlatform.isx86 + || stdenv.targetPlatform.isPower + || stdenv.targetPlatform.isSparc); useNcurses6 = stdenv.hostPlatform.system == "x86_64-linux" || (with stdenv.hostPlatform; isPower64 && isLittleEndian); @@ -38,7 +40,7 @@ let targetPackages.stdenv.cc.bintools coreutils # for cat ] - ++ lib.optionals useLLVM [ + ++ lib.optionals (assert useLLVM -> !(llvmPackages == null); useLLVM) [ (lib.getBin llvmPackages.llvm) ] # On darwin, we need unwrapped bintools as well (for otool) @@ -66,10 +68,6 @@ stdenv.mkDerivation rec { url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-fedora27-linux.tar.xz"; sha256 = "18dlqm5d028fqh6ghzn7pgjspr5smw030jjzl3kq6q1kmwzbay6g"; }; - aarch64-linux = { - url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz"; - sha256 = "11n7l2a36i5vxzzp85la2555q4m34l747g0pnmd81cp46y85hlhq"; - }; x86_64-darwin = { url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "0s9188vhhgf23q3rjarwhbr524z6h2qga5xaaa2pma03sfqvvhfz"; @@ -216,7 +214,12 @@ stdenv.mkDerivation rec { meta = rec { license = lib.licenses.bsd3; - platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "powerpc64le-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + "x86_64-darwin" + "powerpc64le-linux" + ]; # build segfaults, use ghc8102Binary which has proper musl support instead broken = stdenv.hostPlatform.isMusl; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix deleted file mode 100644 index b00b6183121d9..0000000000000 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ /dev/null @@ -1,381 +0,0 @@ -{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !(stdenv.targetPlatform.isx86 - || stdenv.targetPlatform.isPower - || stdenv.targetPlatform.isSparc) -, # 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. - buildTargetLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp - && lib.meta.availableOn stdenv.targetPlatform gmp) -, gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, enableProfiledLibs ? true - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to build sphinx documentation. - enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pullls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl - ) - -, enableHaddockProgram ? - # Disabled for cross; see note [HADDOCK_DOCS]. - (stdenv.targetPlatform == stdenv.hostPlatform) - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isiOS -}: - -assert !enableIntegerSimple -> gmp != null; - -# Cross cannot currently build the `haddock` program for silly reasons, -# see note [HADDOCK_DOCS]. -assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = dontStrip: '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} - BUILD_SPHINX_PDF = NO - '' + - # Note [HADDOCK_DOCS]: - # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` - # program is built (which we generally always want to have a complete GHC install) - # and whether it is run on the GHC sources to generate hyperlinked source code - # (which is impossible for cross-compilation); see: - # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 - # This implies that currently a cross-compiled GHC will never have a `haddock` - # program, so it can never generate haddocks for any packages. - # If this is solved in the future, we'd like to unconditionally - # build the haddock program (removing the `enableHaddockProgram` option). - '' - HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' - # We only need to build stage1 on most cross-compilation because - # we will be running the compiler on the native system. In some - # situations, like native Musl compilation, we need the compiler - # to actually link to our new Libc. The iOS simulator is a special - # exception because we can’t actually run simulators binaries - # ourselves. - + lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - '' + lib.optionalString dontStrip '' - STRIP_CMD = : - '' + lib.optionalString (!enableProfiledLibs) '' - GhcLibWays = "v dyn" - '' + lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - '' - # While split sections are now enabled by default in ghc 8.8 for windows, - # they seem to lead to `too many sections` errors when building base for - # profiling. - + lib.optionalString targetPlatform.isWindows '' - SplitSections = NO - ''; - - # Splicer will pull out correct variations - libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - # TODO(@sternenseemann): is buildTarget LLVM unnecessary? - # GHC doesn't seem to have {LLC,OPT}_HOST - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. - # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || - (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); - - # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. - variantSuffix = lib.concatStrings [ - (lib.optionalString stdenv.hostPlatform.isMusl "-musl") - (lib.optionalString enableIntegerSimple "-integer-simple") - ]; - -in - -# C compiler, bintools and LLVM are used at build time, but will also leak into -# the resulting GHC's settings file and used at runtime. This means that we are -# currently only able to build GHC if hostPlatform == buildPlatform. -assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; -assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; -assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; - -stdenv.mkDerivation (rec { - version = "8.8.4"; - pname = "${targetPrefix}ghc${variantSuffix}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "0bgwbxxvdn56l91bp9p5d083gzcfdi6z8l8b17qzjpr3n8w5wl7h"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - # Fix docs build with sphinx >= 6.0 - # https://gitlab.haskell.org/ghc/ghc/-/issues/22766 - ./ghc-8.8.4-sphinx-6.0.patch - - # See upstream patch at - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build - # from source distributions, the auto-generated configure script needs to be - # patched as well, therefore we use an in-tree patch instead of pulling the - # upstream patch. Don't forget to check backport status of the upstream patch - # when adding new GHC releases in nixpkgs. - ./respect-ar-path.patch - # Fix documentation configuration which causes a syntax error with sphinx 4.* - # See also https://gitlab.haskell.org/ghc/ghc/-/issues/19962 - ./sphinx-4-configuration.patch - # cabal passes incorrect --host= when cross-compiling - # https://github.com/haskell/cabal/issues/5887 - (fetchpatch { - url = "https://raw.githubusercontent.com/input-output-hk/haskell.nix/122bd81150386867da07fdc9ad5096db6719545a/overlays/patches/ghc/cabal-host.patch"; - sha256 = "sha256:0yd0sajgi24sc1w5m55lkg2lp6kfkgpp3lgija2c8y3cmkwfpdc1"; - }) - - # error: 'VirtualAllocExNuma' redeclared as different kind of symbol - # name conflict between rts/win32/OSMem.c and winbase.h from the mingw-w64 runtime package - # Renamed to match ghc8.8: - # https://gitlab.haskell.org/ghc/ghc/-/commit/4b431f334018eaef2cf36de3316025c68c922915#20d64c0bdc272817149d1d5cf20a73a8b5fd637f - ./rename-numa-api-call.patch - ]; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths - preConfigure = - # Aarch64 allow backward bootstrapping since earlier versions are unstable. - # Same for musl, as earlier versions do not provide a musl bindist for bootstrapping. - lib.optionalString (stdenv.isAarch64 || stdenv.hostPlatform.isMusl) '' - find . -name \*\.cabal\* -exec sed -i -e 's/\(base.*\)4.14/\14.16/' {} \; \ - -exec sed -i -e 's/\(prim.*\)0.6/\10.8/' {} \; - '' - + '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - '' + lib.optionalString useLLVM '' - export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" - export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" - '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' - # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm - export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" - '' + '' - - echo -n "${buildMK dontStrip}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; - - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ - "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" - "--with-iconv-libraries=${libiconv}/lib" - ] ++ lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatibility. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ] ++ lib.optionals enableDocs [ - sphinx - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = - [ "format" ] - # In nixpkgs, musl based builds currently enable `pie` hardening by default - # (see `defaultHardeningFlags` in `make-derivation.nix`). - # But GHC cannot currently produce outputs that are ready for `-pie` linking. - # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. - # See: - # * https://github.com/NixOS/nixpkgs/issues/129247 - # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 - ++ lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # This is used by the haskell builder to query - # the presence of the haddock program. - hasHaddock = enableHaddockProgram; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ - guibou - ] ++ lib.teams.haskell.members; - timeout = 24 * 3600; - inherit (ghc.meta) license; - # hardcode platforms because the bootstrap GHC differs depending on the platform, - # with differing platforms available for each of them; See HACK comment in - # 8.10.2-binary.nix for an explanation of the musl special casing. - platforms = [ - "x86_64-linux" - ] ++ lib.optionals (!hostPlatform.isMusl) [ - "i686-linux" - "aarch64-linux" - "x86_64-darwin" - ]; - # integer-simple builds are broken with musl when bootstrapping using - # GHC 8.10.2 and below, however it is not possible to reverse bootstrap - # GHC 8.8.4 with GHC 8.10.7. - # See https://github.com/NixOS/nixpkgs/pull/138523#issuecomment-927339953 - broken = hostPlatform.isMusl && enableIntegerSimple; - }; - - dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); - -} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 0f49384d6e7c1..ff3fa0de1b725 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.32.4"; + version = "0.33.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xl75692d8h1uvh32pf+VJcXwQJwocxDaBNbfolHJKXU="; + hash = "sha256-fAI4GKdMg2FlNLqXtqAEpmvi63RApRZdQEWPqEf+Dyw="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-SwG7cfoDYGyBu+1qF3+ynnw9rOA6jNExRV9uOVwgO60="; + cargoHash = "sha256-Ogjt6lIOvoTPWQhtNFqMgACNrH/27+8JRDlFb//9oUg="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index ff55201ebd03f..0f75d09098be7 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 bison jq ]; + # Workaround missing atomic ops with gcc <13 + env.LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; + postPatch = '' cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index 06002f4930ef0..8a0b86864b9dd 100644 --- a/pkgs/development/compilers/go/1.20.nix +++ b/pkgs/development/compilers/go/1.20.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.20.11"; + version = "1.20.12"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-01XFrjqPd2PJ7J3CUVOq43OVjLy2DdCekai1bHYhsvw="; + hash = "sha256-xb+TR1HTHDFcHQu1+wIpZUX6bQiSNWb3pa/sgfLtJ9Y="; }; strictDeps = true; diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index c12af4db34c56..715050cc0a739 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.4"; + version = "1.21.5"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-R7Jqg9K2WjwcG8rOJztpvuSaentRaKdgTe09JqN714c="; + hash = "sha256-KFy730tubmLtWPNw8/bYwwgl1uVsWFPGbTwjvNsJ2xk="; }; strictDeps = true; diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 7d62411f57401..858d7443ff626 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -63,22 +63,7 @@ let 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 ] - ); + binPath = lib.makeBinPath (lib.optionals useMusl [ musl-gcc ] ++ [ stdenv.cc ]); runtimeLibraryPath = lib.makeLibraryPath ([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]); @@ -180,6 +165,14 @@ let echo "Testing GraalVM" $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' + # Workaround GraalVM issue where the builder does not have access to the + # environment variables since 21.0.0 + # Only needed for native-image tests + # https://github.com/oracle/graal/pull/6095 + # https://github.com/oracle/graal/pull/6095 + # https://github.com/oracle/graal/issues/7502 + export NATIVE_IMAGE_DEPRECATED_BUILDER_SANITATION="true"; + echo "Ahead-Of-Time compilation" $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld ./helloworld | fgrep 'Hello World' diff --git a/pkgs/development/compilers/hare/default.nix b/pkgs/development/compilers/hare/default.nix deleted file mode 100644 index a78b3706f678f..0000000000000 --- a/pkgs/development/compilers/hare/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ lib -, stdenv -, fetchFromSourcehut -, binutils-unwrapped -, harec -, makeWrapper -, qbe -, scdoc -}: - -let - # We use harec's override of qbe until 1.2 is released, but the `qbe` argument - # is kept to avoid breakage. - qbe = harec.qbeUnstable; -in -stdenv.mkDerivation (finalAttrs: { - pname = "hare"; - version = "unstable-2023-10-23"; - - src = fetchFromSourcehut { - owner = "~sircmpwn"; - repo = "hare"; - rev = "1048620a7a25134db370bf24736efff1ffcb2483"; - hash = "sha256-slQPIhrcM+KAVAvjuRnqNdEAEr4Xa4iQNVEpI7Wl+Ks="; - }; - - nativeBuildInputs = [ - binutils-unwrapped - harec - makeWrapper - qbe - scdoc - ]; - - buildInputs = [ - binutils-unwrapped - harec - qbe - ]; - - # Append the distribution name to the version - env.LOCALVER = "nix"; - - configurePhase = - let - # https://harelang.org/platforms/ - arch = - if stdenv.isx86_64 then "x86_64" - else if stdenv.isAarch64 then "aarch64" - else if stdenv.hostPlatform.isRiscV && stdenv.is64bit then "riscv64" - else "unsupported"; - platform = - if stdenv.isLinux then "linux" - else if stdenv.isFreeBSD then "freebsd" - else "unsupported"; - in - '' - runHook preConfigure - - cp config.example.mk config.mk - makeFlagsArray+=( - PREFIX="${builtins.placeholder "out"}" - HARECACHE="$(mktemp -d --tmpdir harecache.XXXXXXXX)" - BINOUT="$(mktemp -d --tmpdir bin.XXXXXXXX)" - PLATFORM="${platform}" - ARCH="${arch}" - ) - - runHook postConfigure - ''; - - doCheck = true; - - postFixup = - let - binPath = lib.makeBinPath [ - binutils-unwrapped - harec - qbe - ]; - in - '' - wrapProgram $out/bin/hare --prefix PATH : ${binPath} - ''; - - setupHook = ./setup-hook.sh; - - strictDeps = true; - enableParallelBuilding = true; - - meta = { - homepage = "https://harelang.org/"; - description = - "A systems programming language designed to be simple, stable, and robust"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ onemoresuza ]; - mainProgram = "hare"; - inherit (harec.meta) platforms badPlatforms; - }; -}) diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 2760eb268c196..4bac5d33b1eb2 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -23,13 +23,13 @@ let # Uses scheme to bootstrap the build of idris2 in stdenv.mkDerivation rec { pname = "idris2"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "idris-lang"; repo = "Idris2"; rev = "v${version}"; - sha256 = "sha256-80MAGM1IEtI09h5aCYfDL4PRrjGq2gT8OUEibOVk8H4="; + sha256 = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM="; }; strictDeps = true; diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index 7bb0d3742a976..dcb2bf87692f3 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "2023.06.1"; + version = "2023.06.2"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - hash = "sha256-3+eIR8wkBlcUQVDsugHo/rHNHbE2vpE9gutp55kRY4Y="; + hash = "sha256-I3+MP2Q7ENOdQdvvCqcyD+I8ImF6c+9HQDpY6QUWuY8="; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 9d5e53700c176..1e6b86b17b8e4 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -9,6 +9,7 @@ , unzip , rsync , debugBuild ? false +, withJcef ? true , libXdamage , libXxf86vm @@ -27,6 +28,8 @@ , udev }: +assert debugBuild -> withJcef; + let arch = { "aarch64-linux" = "aarch64"; @@ -35,37 +38,36 @@ let cpu = stdenv.hostPlatform.parsed.cpu.name; in openjdk17.overrideAttrs (oldAttrs: rec { - pname = "jetbrains-jdk-jcef"; - javaVersion = "17.0.7"; - build = "829.16"; + pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef"; + javaVersion = "17.0.8"; + build = "1000.8"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime # git reset --hard [revision] - # git log --simplify-by-decoration --decorate=short --pretty=short | grep "jdk-" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 - openjdkTag = "jdk-18+0"; + # git log --simplify-by-decoration --decorate=short --pretty=short | grep "jbr-" --color=never | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d "," + openjdkTag = "jbr-17.0.7+7"; version = "${javaVersion}-b${build}"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-b3wW52knkYUeG8h4naTQLGUedhAMiPnUsn3zFAiJCwM="; + hash = "sha256-PXS8wRF37D9vzeC4CvmB3szFMbt+NRqhQqtPZcbeAO8="; }; BOOT_JDK = openjdk17-bootstrap.home; - SOURCE_DATE_EPOCH = 1666098567; + # run `git log -1 --pretty=%ct` in jdk repo for new value on update + SOURCE_DATE_EPOCH = 1691119859; - patches = []; + patches = [ ]; - # Configure is done in build phase - configurePhase = "true"; + dontConfigure = true; buildPhase = '' runHook preBuild - mkdir -p jcef_linux_${arch}/jmods - cp ${jetbrains.jcef}/* jcef_linux_${arch}/jmods + ${lib.optionalString withJcef "cp -r ${jetbrains.jcef} jcef_linux_${arch}"} sed \ -e "s/OPENJDK_TAG=.*/OPENJDK_TAG=${openjdkTag}/" \ @@ -79,64 +81,67 @@ openjdk17.overrideAttrs (oldAttrs: rec { -i jb/project/tools/linux/scripts/mkimages_${arch}.sh patchShebangs . - ./jb/project/tools/linux/scripts/mkimages_${arch}.sh ${build} ${if debugBuild then "fd" else "jcef"} + ./jb/project/tools/linux/scripts/mkimages_${arch}.sh ${build} ${if debugBuild then "fd" else (if withJcef then "jcef" else "nomod")} runHook postBuild ''; - installPhase = let - buildType = if debugBuild then "fastdebug" else "release"; - debugSuffix = lib.optionalString debugBuild "-fastdebug"; - jcefSuffix = lib.optionalString (!debugBuild) "_jcef"; - in '' - runHook preInstall - - mv build/linux-${cpu}-server-${buildType}/images/jdk/man build/linux-${cpu}-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-${arch}${debugSuffix}-b${build} - rm -rf build/linux-${cpu}-server-${buildType}/images/jdk - mv build/linux-${cpu}-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-${arch}${debugSuffix}-b${build} build/linux-${cpu}-server-${buildType}/images/jdk - '' + oldAttrs.installPhase + "runHook postInstall"; - - postInstall = '' + installPhase = + let + buildType = if debugBuild then "fastdebug" else "release"; + debugSuffix = if debugBuild then "-fastdebug" else ""; + jcefSuffix = if debugBuild || !withJcef then "" else "_jcef"; + jbrsdkDir = "jbrsdk${jcefSuffix}-${javaVersion}-linux-${arch}${debugSuffix}-b${build}"; + in + '' + runHook preInstall + + mv build/linux-${cpu}-server-${buildType}/images/jdk/man build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} + rm -rf build/linux-${cpu}-server-${buildType}/images/jdk + mv build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} build/linux-${cpu}-server-${buildType}/images/jdk + '' + oldAttrs.installPhase + "runHook postInstall"; + + postInstall = lib.optionalString withJcef '' chmod +x $out/lib/openjdk/lib/chrome-sandbox ''; dontStrip = debugBuild; postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="${lib.makeLibraryPath [ - libXdamage libXxf86vm libXrandr libXi libXcursor libXrender libX11 libXext libxcb - nss nspr libdrm mesa wayland udev - ]}" - for output in $outputs; do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" + # Build the set of output library directories to rpath against + LIBDIRS="${lib.makeLibraryPath [ + libXdamage libXxf86vm libXrandr libXi libXcursor libXrender libX11 libXext libxcb + nss nspr libdrm mesa wayland udev + ]}" + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true done - # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - ''; + done + ''; nativeBuildInputs = [ git autoconf unzip rsync ] ++ oldAttrs.nativeBuildInputs; meta = with lib; { description = "An OpenJDK fork to better support Jetbrains's products."; longDescription = '' - JetBrains Runtime is a runtime environment for running IntelliJ Platform - based products on Windows, Mac OS X, and Linux. JetBrains Runtime is - based on OpenJDK project with some modifications. These modifications - include: Subpixel Anti-Aliasing, enhanced font rendering on Linux, HiDPI - support, ligatures, some fixes for native crashes not presented in - official build, and other small enhancements. - JetBrains Runtime is not a certified build of OpenJDK. Please, use at - your own risk. + JetBrains Runtime is a runtime environment for running IntelliJ Platform + based products on Windows, Mac OS X, and Linux. JetBrains Runtime is + based on OpenJDK project with some modifications. These modifications + include: Subpixel Anti-Aliasing, enhanced font rendering on Linux, HiDPI + support, ligatures, some fixes for native crashes not presented in + official build, and other small enhancements. + JetBrains Runtime is not a certified build of OpenJDK. Please, use at + your own risk. ''; homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; inherit (openjdk17.meta) license platforms mainProgram; diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index a36eae8be52d3..6b688e32ba502 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -44,60 +44,62 @@ assert !stdenv.isDarwin; # I can't test darwin -let rpath = lib.makeLibraryPath [ - glib - nss - nspr - atk - at-spi2-atk - libdrm - expat - libxcb - libxkbcommon - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXrandr - mesa - gtk3 - pango - cairo - alsa-lib - dbus - at-spi2-core - cups - libxshmfence - udev -]; - -buildType = if debugBuild then "Debug" else "Release"; -platform = { - "aarch64-linux" = "linuxarm64"; - "x86_64-linux" = "linux64"; -}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); -arches = { - "linuxarm64" = { - depsArch = "arm64"; - projectArch = "arm64"; - targetArch = "arm64"; - }; - "linux64" = { - depsArch = "amd64"; - projectArch = "x86_64"; - targetArch = "x86_64"; - }; -}.${platform}; -inherit (arches) depsArch projectArch targetArch; +let + rpath = lib.makeLibraryPath [ + glib + nss + nspr + atk + at-spi2-atk + libdrm + expat + libxcb + libxkbcommon + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXrandr + mesa + gtk3 + pango + cairo + alsa-lib + dbus + at-spi2-core + cups + libxshmfence + udev + ]; + + buildType = if debugBuild then "Debug" else "Release"; + platform = { + "aarch64-linux" = "linuxarm64"; + "x86_64-linux" = "linux64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + arches = { + "linuxarm64" = { + depsArch = "arm64"; + projectArch = "arm64"; + targetArch = "arm64"; + }; + "linux64" = { + depsArch = "amd64"; + projectArch = "x86_64"; + targetArch = "x86_64"; + }; + }.${platform}; + inherit (arches) depsArch projectArch targetArch; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "jcef-jetbrains"; - rev = "1ac1c682c497f2b864f86050796461f22935ea64"; + rev = "9f8d4fb20b4658db6b2b6bc08e5dd0d8c7340290"; # This is the commit number # Currently from the branch: https://github.com/JetBrains/jcef/tree/232 # Run `git rev-list --count HEAD` - version = "672"; + version = "675"; nativeBuildInputs = [ cmake python3 jdk17 git rsync ant ninja ]; buildInputs = [ libX11 libXdamage nss nspr ]; @@ -106,19 +108,22 @@ in stdenv.mkDerivation rec { owner = "jetbrains"; repo = "jcef"; inherit rev; - hash = "sha256-3HuW8upR/bZoK8euVti2KpCZh9xxfqgyHmgoG1NjxOI="; - }; - cef-bin = let - name = "cef_binary_111.2.1+g870da30+chromium-111.0.5563.64_${platform}_minimal"; - hash = { - "linuxarm64" = "sha256-gCDIfWsysXE8lHn7H+YM3Jag+mdbWwTQpJf0GKdXEVs="; - "linux64" = "sha256-r+zXTmDN5s/bYLvbCnHufYdXIqQmCDlbWgs5pdOpLTw="; - }.${platform}; - urlName = builtins.replaceStrings ["+"] ["%2B"] name; - in fetchzip { - url = "https://cef-builds.spotifycdn.com/${urlName}.tar.bz2"; - inherit name hash; + hash = "sha256-8zsgcWl0lZtC1oud5IlkUdeXxJUlHoRfw8t0FrZUQec="; }; + cef-bin = + let + # `cef_binary_${CEF_VERSION}_linux64_minimal`, where CEF_VERSION is from $src/CMakeLists.txt + name = "cef_binary_111.2.1+g870da30+chromium-111.0.5563.64_${platform}_minimal"; + hash = { + "linuxarm64" = "sha256-gCDIfWsysXE8lHn7H+YM3Jag+mdbWwTQpJf0GKdXEVs="; + "linux64" = "sha256-r+zXTmDN5s/bYLvbCnHufYdXIqQmCDlbWgs5pdOpLTw="; + }.${platform}; + urlName = builtins.replaceStrings [ "+" ] [ "%2B" ] name; + in + fetchzip { + url = "https://cef-builds.spotifycdn.com/${urlName}.tar.bz2"; + inherit name hash; + }; clang-fmt = fetchurl { url = "https://storage.googleapis.com/chromium-clang-format/dd736afb28430c9782750fc0fd5f0ed497399263"; hash = "sha256-4H6FVO9jdZtxH40CSfS+4VESAHgYgYxfCBFSMHdT0hE="; @@ -228,7 +233,9 @@ in stdenv.mkDerivation rec { mkdir lib cp -R "$OUT_NATIVE_DIR"/* lib - mkdir $out + mkdir -p $out/jmods + + bash "$JB_TOOLS_DIR"/common/create_version_file.sh $out runHook postInstall ''; @@ -237,11 +244,11 @@ in stdenv.mkDerivation rec { postFixup = '' cd $unpacked/gluegen - jmod create --class-path gluegen-rt.jar --libs lib $out/gluegen.rt.jmod + jmod create --class-path gluegen-rt.jar --libs lib $out/jmods/gluegen.rt.jmod cd ../jogl - jmod create --module-path . --class-path jogl-all.jar --libs lib $out/jogl.all.jmod + jmod create --module-path . --class-path jogl-all.jar --libs lib $out/jmods/jogl.all.jmod cd ../jcef - jmod create --module-path . --class-path jcef.jar --libs lib $out/jcef.jmod + jmod create --module-path . --class-path jcef.jar --libs lib $out/jmods/jcef.jmod ''; meta = { diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix index cf72457a14347..dea8a140ee5f2 100644 --- a/pkgs/development/compilers/julia/1.6-bin.nix +++ b/pkgs/development/compilers/julia/1.6-bin.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.6.6"; + version = "1.6.7"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "0ia9a4h7w0n5rg57fkl1kzcyj500ymfwq3qsd2r7l82288dgfpy2"; + sha256 = "sha256-bEUi1ZXky80AFXrEWKcviuwBdXBT0gc/mdqjnkQrKjY="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin ]; + maintainers = with lib.maintainers; [ raskin thomasjm ]; platforms = [ "x86_64-linux" ]; mainProgram = "julia"; }; diff --git a/pkgs/development/compilers/julia/1.8-bin.nix b/pkgs/development/compilers/julia/1.8-bin.nix index 24eac49df9db5..d7a548a8d137f 100644 --- a/pkgs/development/compilers/julia/1.8-bin.nix +++ b/pkgs/development/compilers/julia/1.8-bin.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin nickcao wegank ]; + maintainers = with lib.maintainers; [ raskin nickcao wegank thomasjm ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "julia"; }; diff --git a/pkgs/development/compilers/julia/1.8.nix b/pkgs/development/compilers/julia/1.8.nix index 1a6d6e7332c19..8bd0b536e1492 100644 --- a/pkgs/development/compilers/julia/1.8.nix +++ b/pkgs/development/compilers/julia/1.8.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "https://julialang.org/"; license = licenses.mit; - maintainers = with maintainers; [ nickcao ]; + maintainers = with maintainers; [ nickcao thomasjm ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/development/compilers/julia/1.9-bin.nix b/pkgs/development/compilers/julia/1.9-bin.nix index 04e768d0bff82..a52e62139abe0 100644 --- a/pkgs/development/compilers/julia/1.9-bin.nix +++ b/pkgs/development/compilers/julia/1.9-bin.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin nickcao wegank ]; + maintainers = with lib.maintainers; [ raskin nickcao wegank thomasjm ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "julia"; }; diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix index 715414e7dab9d..8c0585fd4e192 100644 --- a/pkgs/development/compilers/julia/1.9.nix +++ b/pkgs/development/compilers/julia/1.9.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "https://julialang.org/"; license = licenses.mit; - maintainers = with maintainers; [ nickcao joshniemela ]; + maintainers = with maintainers; [ nickcao joshniemela thomasjm ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix new file mode 100644 index 0000000000000..d4cd0ab6b83eb --- /dev/null +++ b/pkgs/development/compilers/julia/default.nix @@ -0,0 +1,20 @@ +{ callPackage }: + +let + juliaWithPackages = callPackage ../../julia-modules {}; + + wrapJulia = julia: julia.overrideAttrs (oldAttrs: { + passthru = (oldAttrs.passthru or {}) // { + withPackages = juliaWithPackages.override { inherit julia; }; + }; + }); + +in + +{ + julia_16-bin = wrapJulia (callPackage ./1.6-bin.nix {}); + julia_18-bin = wrapJulia (callPackage ./1.8-bin.nix {}); + julia_19-bin = wrapJulia (callPackage ./1.9-bin.nix {}); + julia_18 = wrapJulia (callPackage ./1.8.nix {}); + julia_19 = wrapJulia (callPackage ./1.9.nix {}); +} diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 50b9d0fadee79..fee4889e1add9 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.9.20"; + version = "1.9.22"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-Faiiglt0zPbETgTpdnLbgC0t91zi+7Y+8FOb865QBvA="; + sha256 = "1rn3rabwyqqhs6xgyfwl326hrzpfpc3qqd2nzwbchck5a09r5cw8"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 16599c9b96c8a..bc2018665ca7f 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.9.20"; + version = "1.9.22"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "sha256-Yw6IO8pj0C9XHfzVshcovkoFBUXJ3KixhGoybBRFL2U="; - "macos-x86_64" = "sha256-mnDi8dMCDzGsdPdD1dw4YMBxAfo5FvwDJVU/ew70z9U="; - "linux-x86_64" = "sha256-faMuBYUG5qj0N4vg5EcfWIC3UjXiPhFJuikzXVgNsjw="; + "macos-aarch64" = "1pf81rplikbp194pjrm2la101iz8vz3jv55109nipd26xghc15ca"; + "macos-x86_64" = "1r7dmk8cc7f3iwaxamlnlcjl4mbvx443nwvsp8141a21ibrvrmx9"; + "linux-x86_64" = "1m77qld44gbarjxm99gsdscncx4v0cf6ca3h9bdh2m7d3i4adc62"; }.${arch}; in fetchurl { diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index 02c20016bad09..9362ee8d1147d 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt +{ lib, stdenv, llvm_meta, version, fetch +, cmake, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -18,7 +19,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index 18be4499d0fdb..e36aec42e905a 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, llvm_meta, version, src, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt +{ lib, stdenv, llvm_meta, version, src +, cmake, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -20,7 +21,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix index 98ee8135b8fa0..3aa91bc953b21 100644 --- a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta, version , monorepoSrc, runCommand -, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt +, cmake, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -29,7 +29,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index bfdeeff6db5b1..9817899345a9b 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta, version , monorepoSrc, runCommand -, cmake, ninja, python3, xcbuild, libllvm, libcxxabi, libxcrypt +, cmake, ninja, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -29,7 +29,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; env.NIX_CFLAGS_COMPILE = toString [ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix index 7add8fab0f91f..808df140e772d 100644 --- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta, version , monorepoSrc, runCommand -, cmake, ninja, python3, xcbuild, libllvm, libcxxabi, libxcrypt +, cmake, ninja, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -30,7 +30,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; env.NIX_CFLAGS_COMPILE = toString ([ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 5ecb89a3a2644..580821cc0d2c3 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -281,7 +281,7 @@ in let # Has to be in tools despite mostly being a library, # because we use a native helper executable from a # non-cross build in cross builds. - libclc = callPackage ./libclc { + libclc = callPackage ../common/libclc.nix { inherit buildLlvmTools; }; }); diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/17/clang/default.nix index 136a69e72161a..a576c07d36617 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/17/clang/default.nix @@ -1,72 +1,68 @@ -{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, cmake, ninja, libxml2, libllvm, version, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false -, enablePolly ? false # TODO: get this info from llvm (passthru?) }: let - self = stdenv.mkDerivation ({ + self = stdenv.mkDerivation (rec { pname = "clang"; inherit version; - src = fetch "cfe" "0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9"; - - unpackPhase = '' - unpackFile $src - mv cfe-${version}* clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/clang-tools-extra "$out" ''; - nativeBuildInputs = [ cmake python3 ] + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ cmake ninja python3 ] ++ lib.optional enableManpages python3.pkgs.sphinx ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libxml2 libllvm ]; cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DCLANG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/clang" + "-DCLANGD_BUILD_XPC=OFF" "-DLLVM_ENABLE_RTTI=ON" - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + "-DLLVM_INCLUDE_TESTS=OFF" ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" - ] ++ lib.optionals enablePolly [ - "-DWITH_POLLY=ON" - "-DLINK_POLLY_INTO_TOOLS=ON" + # Added in LLVM15: + # `clang-tidy-confusable-chars-gen`: https://github.com/llvm/llvm-project/commit/c3574ef739fbfcc59d405985a3a4fa6f4619ecdb + # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 + "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" + "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" ]; patches = [ - ../../common/clang/5-8-purity.patch - # make clang -xhip use $PATH to find executables - ./HIP-use-PATH-7.patch - # Backport for the `--unwindlib=[libgcc|compiler-rt]` flag, which is - # needed for our bootstrapping to not interfere with C. - ./unwindlib.patch + ./purity.patch + # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch - (substituteAll { - src = ../../clang-6-10-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; - }) + ../../common/clang/add-nostdlibinc-flag.patch + # FIMXE: do we need this patch? + # (substituteAll { + # src = ../../clang-11-12-LLVMgold-path.patch; + # libllvmLibdir = "${libllvm.lib}/lib"; + # }) ]; postPatch = '' - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ - -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ - lib/Driver/ToolChains/*.cpp + (cd tools && ln -s ../../clang-tools-extra extra) '' + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace tools/extra/clangd/CMakeLists.txt \ - --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE ''; outputs = [ "out" "lib" "dev" "python" ]; @@ -74,23 +70,27 @@ let postInstall = '' ln -sv $out/bin/clang $out/bin/cpp + mkdir -p $lib/lib/clang + mv $lib/lib/17 $lib/lib/clang/17 + # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" - substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." + moveToOutput "lib/libclang-cpp.*" "$lib" + substituteInPlace $dev/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - mkdir -p $python/bin $python/share/{clang,scan-view} + mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang - mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin mkdir -p $dev/bin - cp bin/clang-tblgen $dev/bin + cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin ''; passthru = { @@ -118,9 +118,7 @@ let } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; - buildPhase = '' - make docs-clang-man - ''; + ninjaFlags = [ "docs-clang-man" ]; installPhase = '' mkdir -p $out/share/man/man1 diff --git a/pkgs/development/compilers/llvm/17/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/17/clang/gnu-install-dirs.patch new file mode 100644 index 0000000000000..cc8737f353433 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/clang/gnu-install-dirs.patch @@ -0,0 +1,98 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f7936d72e088..a362fa49b534 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,7 +31,21 @@ if(CLANG_BUILT_STANDALONE) + find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}") + list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}") + +- # Turn into CACHE PATHs for overwritting ++ # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets ++ # LLVM_CONFIG. ++ if (NOT LLVM_CONFIG_FOUND) ++ # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config ++ # path is removed. ++ set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) ++ set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}") ++ # N.B. this is just a default value, the CACHE PATHs below can be overriden. ++ set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm") ++ set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}") ++ set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}") ++ else() ++ set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}") ++ endif() ++ + set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") + set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree") + set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 75b0080f6715..c895b884cd27 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -119,8 +119,8 @@ macro(add_clang_library name) + install(TARGETS ${lib} + COMPONENT ${lib} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (NOT LLVM_ENABLE_IDE) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index f2b0c5cddcbb..52f37fc368ce 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -473,6 +473,7 @@ add_header_target("windows-resource-headers" ${windows_only_files}) + add_header_target("utility-resource-headers" ${utility_files}) + + get_clang_resource_dir(header_install_dir SUBDIR include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${CLANG_VERSION_MAJOR}/include) + + ############################################################# + # Install rules for the catch-all clang-resource-headers target +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 4f23065a2472..6a0f55991e24 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -234,7 +234,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT LLVM_ENABLE_IDE) + add_custom_target(libclang-python-bindings) +diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt +index 3aca22c0b0a8..3115353e3fe3 100644 +--- a/tools/scan-build-py/CMakeLists.txt ++++ b/tools/scan-build-py/CMakeLists.txt +@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib}) + install(FILES lib/libscanbuild/${lib} +- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild" + COMPONENT scan-build-py) + endforeach() + +@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource}) + install(FILES lib/libscanbuild/resources/${resource} +- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources" + COMPONENT scan-build-py) + endforeach() + +@@ -122,7 +122,7 @@ foreach(lib ${LibEar}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib}) + install(FILES lib/libear/${lib} +- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" + COMPONENT scan-build-py) + endforeach() + diff --git a/pkgs/development/compilers/llvm/17/clang/purity.patch b/pkgs/development/compilers/llvm/17/clang/purity.patch new file mode 100644 index 0000000000000..1c94f293eb934 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/clang/purity.patch @@ -0,0 +1,29 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -487,13 +487,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + } else { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); + +- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE && +- !Args.hasArg(options::OPT_r)) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + +- ToolChain.getDynamicLinker(Args))); +- } + } + + CmdArgs.push_back("-o"); +-- +2.11.0 diff --git a/pkgs/development/compilers/llvm/17/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/17/compiler-rt/X86-support-extension.patch new file mode 100644 index 0000000000000..07013e5a68259 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/compiler-rt/X86-support-extension.patch @@ -0,0 +1,21 @@ +diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +index 3a66dd9c3fb..7efc85d9f9f 100644 +--- a/lib/builtins/CMakeLists.txt ++++ b/lib/builtins/CMakeLists.txt +@@ -348,4 +348,8 @@ if (NOT MSVC) + ++ set(i486_SOURCES ${i386_SOURCES}) ++ set(i586_SOURCES ${i386_SOURCES}) ++ set(i686_SOURCES ${i386_SOURCES}) ++ + if (WIN32) + set(i386_SOURCES + ${i386_SOURCES} +@@ -723,6 +723,7 @@ else () + endif() + + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) ++ message("arch: ${arch}") + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported + if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/pkgs/development/compilers/llvm/17/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/17/compiler-rt/darwin-targetconditionals.patch new file mode 100644 index 0000000000000..425dc2af01e7c --- /dev/null +++ b/pkgs/development/compilers/llvm/17/compiler-rt/darwin-targetconditionals.patch @@ -0,0 +1,71 @@ +diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp +--- a/lib/sanitizer_common/sanitizer_mac.cpp ++++ b/lib/sanitizer_common/sanitizer_mac.cpp +@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { + // Offset example: + // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 + constexpr u16 GetOSMajorKernelOffset() { +- if (TARGET_OS_OSX) return 4; +- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; +- if (TARGET_OS_WATCH) return 13; ++#if TARGET_OS_OSX ++ return 4; ++#endif ++#if TARGET_OS_IOS || TARGET_OS_TV ++ return 6; ++#endif ++#if TARGET_OS_WATCH ++ return 13; ++#endif + } + + using VersStr = char[64]; +@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { + u16 os_major = kernel_major - offset; + + const char *format = "%d.0"; +- if (TARGET_OS_OSX) { +- if (os_major >= 16) { // macOS 11+ +- os_major -= 5; +- } else { // macOS 10.15 and below +- format = "10.%d"; +- } ++#if TARGET_OS_OSX ++ if (os_major >= 16) { // macOS 11+ ++ os_major -= 5; ++ } else { // macOS 10.15 and below ++ format = "10.%d"; + } ++#endif + return internal_snprintf(vers, sizeof(VersStr), format, os_major); + } + +@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { + // Aligned versions example: + // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 + static void MapToMacos(u16 *major, u16 *minor) { +- if (TARGET_OS_OSX) +- return; +- +- if (TARGET_OS_IOS || TARGET_OS_TV) ++#if !TARGET_OS_OSX ++#if TARGET_OS_IOS || TARGET_OS_TV + *major += 2; +- else if (TARGET_OS_WATCH) ++#elif TARGET_OS_WATCH + *major += 9; +- else ++#else + UNREACHABLE("unsupported platform"); ++#endif + + if (*major >= 16) { // macOS 11+ + *major -= 5; +@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { + *minor = *major; + *major = 10; + } ++#endif + } + + static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix b/pkgs/development/compilers/llvm/17/compiler-rt/default.nix index 7354397d2bf0f..808df140e772d 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/17/compiler-rt/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake, ninja, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -7,37 +9,64 @@ let useLLVM = stdenv.hostPlatform.useLLVM or false; bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; haveLibc = stdenv.cc.libc != null; + isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic; inherit (stdenv.hostPlatform) isMusl; + baseName = "compiler-rt"; + + src = runCommand "${baseName}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${baseName} "$out" + ''; in stdenv.mkDerivation { - pname = "compiler-rt" + lib.optionalString (haveLibc) "-libc"; + pname = baseName + lib.optionalString (haveLibc) "-libc"; inherit version; - src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"; - nativeBuildInputs = [ cmake python3 libllvm.dev ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + inherit src; + sourceRoot = "${src.name}/${baseName}"; + + nativeBuildInputs = [ cmake ninja python3 libllvm.dev ] + ++ lib.optional stdenv.isDarwin xcbuild.xcrun; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" - ]; + ] ++ lib.optionals (!haveLibc) [ + # The compiler got stricter about this, and there is a usellvm patch below + # which patches out the assert include causing an implicit definition of + # assert. It would be nicer to understand why compiler-rt thinks it should + # be able to #include <assert.h> in the first place; perhaps it's in the + # wrong, or perhaps there is a way to provide an assert.h. + "-Wno-error=implicit-function-declaration" + ]); cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ + ] ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [ + "-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include" + ] ++ lib.optionals (useLLVM || bareMetal || isMusl || isDarwinStatic) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary ] ++ lib.optionals (useLLVM || bareMetal) [ - "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ - "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal || isDarwinStatic ) [ "-DCMAKE_CXX_COMPILER_WORKS=ON" + ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [ + "-DCMAKE_C_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ lib.optionals (useLLVM && !haveLibc) [ + "-DCMAKE_C_FLAGS=-nodefaultlibs" ] ++ lib.optionals (useLLVM) [ "-DCOMPILER_RT_BUILD_BUILTINS=ON" #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program @@ -45,22 +74,31 @@ stdenv.mkDerivation { ] ++ lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - # The compiler-rt build infrastructure sniffs supported platforms on Darwin - # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails - # when it tries to use libc++ and libc++api for i386. + "-DCMAKE_LIPO=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}lipo" + "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" + + # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin: + # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153 + "-DCOMPILER_RT_ENABLE_IOS=OFF" ]; outputs = [ "out" "dev" ]; patches = [ - # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce - ../../common/compiler-rt/glibc.patch - ../../common/compiler-rt/7-12-codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config ./gnu-install-dirs.patch - ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch - ] ++ lib.optional (useLLVM) ./crtbegin-and-end.patch - ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; + # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the + # extra `/`. + ./normalize-var.patch + # Prevent a compilation error on darwin + ./darwin-targetconditionals.patch + # See: https://github.com/NixOS/nixpkgs/pull/186575 + ../../common/compiler-rt/darwin-plistbuddy-workaround.patch + # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 + # ../../common/compiler-rt/armv7l-15.patch + ]; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra @@ -73,7 +111,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM && !haveLibc) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -82,20 +120,22 @@ stdenv.mkDerivation { --replace "#include <assert.h>" "" ''; - preConfigure = lib.optionalString (useLLVM && !haveLibc) '' - cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding") - ''; - # Hack around weird upsream RPATH bug - postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) '' ln -s "$out/lib"/*/* "$out/lib" - '' + lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM && stdenv.hostPlatform.isLinux) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o + # Note the history of crt{begin,end}S in previous versions of llvm in nixpkg: + # The presence of crtbegin_shared has been added and removed; it's possible + # people have added/removed it to get it working on their platforms. + # Try each in turn for now. + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtendS.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o '' + lib.optionalString doFakeLibgcc '' - ln -s $out/lib/freebsd/libclang_rt.builtins-*.a $out/lib/libgcc.a + ln -s $out/lib/freebsd/libclang_rt.builtins-*.a $out/lib/libgcc.a ''; meta = llvm_meta // { @@ -112,6 +152,5 @@ stdenv.mkDerivation { # "All of the code in the compiler-rt project is dual licensed under the MIT # license and the UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/development/compilers/llvm/17/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/17/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000000..f3b1f63a7d713 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index 8a6219568b3f..30ee68a47ccf 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -100,13 +100,13 @@ endif() + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib) ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}") ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + endif() diff --git a/pkgs/development/compilers/llvm/17/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/17/compiler-rt/normalize-var.patch new file mode 100644 index 0000000000000..2b25fd4a07449 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/compiler-rt/normalize-var.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake +index 4c85551d7766..297d7a47c54b 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -328,8 +328,9 @@ macro(load_llvm_config) + endif() + endif() + +- set(LLVM_LIBRARY_OUTPUT_INTDIR +- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR ++ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} ++ REALPATH) + + set(LLVM_MAIN_SRC_DIR "${LLVM_MAIN_SRC_DIR_DEFAULT}" CACHE PATH "Path to LLVM source tree") + message(STATUS "LLVM_MAIN_SRC_DIR: \"${LLVM_MAIN_SRC_DIR}\"") diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix new file mode 100644 index 0000000000000..2c422da8f9f87 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/default.nix @@ -0,0 +1,364 @@ +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja +, preLibcCrossHeaders +, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm +# This is the default binutils, but with *this* version of LLD rather +# than the default LLVM verion's, if LLD is the choice. We use these for +# the `useLLVM` bootstrapping below. +, bootBintoolsNoLibc ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintoolsNoLibc +, bootBintools ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintools +, darwin +# LLVM release information; specify one of these but not both: +, gitRelease ? null + # i.e.: + # { + # version = /* i.e. "15.0.0" */; + # rev = /* commit SHA */; + # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; + # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; + # } +, officialRelease ? { version = "17.0.6"; sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; } + # i.e.: + # { + # version = /* i.e. "15.0.0" */; + # candidate = /* optional; if specified, should be: "rcN" */ + # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; + # } +# By default, we'll try to fetch a release from `github:llvm/llvm-project` +# corresponding to the `gitRelease` or `officialRelease` specified. +# +# You can provide your own LLVM source by specifying this arg but then it's up +# to you to make sure that the LLVM repo given matches the release configuration +# specified. +, monorepoSrc ? null +}: + +assert let + int = a: if a then 1 else 0; + xor = a: b: ((builtins.bitXor (int a) (int b)) == 1); +in + lib.assertMsg + (xor + (gitRelease != null) + (officialRelease != null)) + ("must specify `gitRelease` or `officialRelease`" + + (lib.optionalString (gitRelease != null) " — not both")); +let + monorepoSrc' = monorepoSrc; +in let + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + + inherit (releaseInfo) release_version version; + + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + + tools = lib.makeExtensible (tools: let + callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); + major = lib.versions.major release_version; + mkExtraBuildCommands0 = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc.lib}/lib/clang/${major}/include" "$rsrc" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ''; + + bintoolsNoLibc' = + if bootBintoolsNoLibc == null + then tools.bintoolsNoLibc + else bootBintoolsNoLibc; + bintools' = + if bootBintools == null + then tools.bintools + else bootBintools; + + in { + + libllvm = callPackage ./llvm { + inherit llvm_meta; + }; + + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm; + + libclang = callPackage ./clang { + inherit llvm_meta; + }; + + clang-unwrapped = tools.libclang; + + llvm-manpages = lowPrio (tools.libllvm.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + clang-manpages = lowPrio (tools.libclang.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + lldb-manpages = lowPrio (tools.lldb.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + # pick clang appropriate for package set we are targeting + clang = + /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM + else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang + else tools.libcxxClang; + + libstdcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. + libcxx = null; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + libcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + extraPackages = [ + libcxx.cxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + lld = callPackage ./lld { + inherit llvm_meta; + }; + + lldb = callPackage ../common/lldb.nix { + src = callPackage ({ runCommand }: runCommand "lldb-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/lldb "$out" + '') { }; + patches = + [ + # FIXME: do we need this? ./procfs.patch + ./lldb/gnu-install-dirs.patch + ] + # This is a stopgap solution if/until the macOS SDK used for x86_64 is + # updated. + # + # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` + # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use + # of this preprocessor symbol in `lldb` with its expansion. + # + # See here for some context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin + && !stdenv.targetPlatform.isAarch64 + && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") + ) ./lldb/cpu_subtype_arm64e_replacement.patch; + inherit llvm_meta; + }; + + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + + bintools-unwrapped = callPackage ../common/bintools.nix { }; + + bintoolsNoLibc = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + libc = preLibcCrossHeaders; + }; + + bintools = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + }; + + clangUseLLVM = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = bintools'; + extraPackages = [ + libcxx.cxxabi + targetLlvmLibraries.compiler-rt + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = mkExtraBuildCommands cc; + nixSupport.cc-cflags = + [ "-rtlib=compiler-rt" + "-Wno-unused-command-line-argument" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" + ++ lib.optional + (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) + "-lunwind" + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + }; + + clangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + }; + + clangNoLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + }; + + clangNoCompilerRt = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + nixSupport.cc-cflags = + [ + "-nostartfiles" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + }; + + clangNoCompilerRtWithLibc = wrapCCWith (rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + } // lib.optionalAttrs stdenv.targetPlatform.isWasm { + nixSupport.cc-cflags = [ "-fno-exceptions" ]; + }); + + # Has to be in tools despite mostly being a library, + # because we use a native helper executable from a + # non-cross build in cross builds. + libclc = callPackage ../common/libclc.nix { + inherit buildLlvmTools; + }; + }); + + libraries = lib.makeExtensible (libraries: let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc; }); + in { + + compiler-rt-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) + then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc + else stdenv; + }; + + compiler-rt-no-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoCompilerRt + else stdenv; + }; + + # N.B. condition is safe because without useLLVM both are the same. + compiler-rt = if stdenv.hostPlatform.isAndroid || stdenv.hostPlatform.isDarwin + then libraries.compiler-rt-libc + else libraries.compiler-rt-no-libc; + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; + + libcxxabi = let + # CMake will "require" a compiler capable of compiling C++ programs + # cxx-header's build does not actually use one so it doesn't really matter + # what stdenv we use here, as long as CMake is happy. + cxx-headers = callPackage ./libcxx { + inherit llvm_meta; + # Note that if we use the regular stdenv here we'll get cycle errors + # when attempting to use this compiler in the stdenv. + # + # The final stdenv pulls `cxx-headers` from the package set where + # hostPlatform *is* the target platform which means that `stdenv` at + # that point attempts to use this toolchain. + # + # So, we use `stdenv_` (the stdenv containing `clang` from this package + # set, defined below) to sidestep this issue. + # + # Because we only use `cxx-headers` in `libcxxabi` (which depends on the + # clang stdenv _anyways_), this is okay. + stdenv = stdenv_; + headersOnly = true; + }; + + # `libcxxabi` *doesn't* need a compiler with a working C++ stdlib but it + # *does* need a relatively modern C++ compiler (see: + # https://releases.llvm.org/15.0.0/projects/libcxx/docs/index.html#platform-and-compiler-support). + # + # So, we use the clang from this LLVM package set, like libc++ + # "boostrapping builds" do: + # https://releases.llvm.org/15.0.0/projects/libcxx/docs/BuildingLibcxx.html#bootstrapping-build + # + # We cannot use `clangNoLibcxx` because that contains `compiler-rt` which, + # on macOS, depends on `libcxxabi`, thus forming a cycle. + stdenv_ = overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc; + in callPackage ./libcxxabi { + stdenv = stdenv_; + inherit llvm_meta cxx-headers; + }; + + # Like `libcxxabi` above, `libcxx` requires a fairly modern C++ compiler, + # so: we use the clang from this LLVM package set instead of the regular + # stdenv's compiler. + libcxx = callPackage ./libcxx { + inherit llvm_meta; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + libunwind = callPackage ./libunwind { + inherit llvm_meta; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + openmp = callPackage ./openmp { + inherit llvm_meta targetLlvm; + }; + }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; + +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/17/libcxx/default.nix b/pkgs/development/compilers/llvm/17/libcxx/default.nix new file mode 100644 index 0000000000000..7b99966416638 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/libcxx/default.nix @@ -0,0 +1,114 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, cmake, ninja, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt, libunwind +, enableShared ? !stdenv.hostPlatform.isStatic + +# If headersOnly is true, the resulting package would only include the headers. +# Use this to break the circular dependency between libcxx and libcxxabi. +# +# Some context: +# https://reviews.llvm.org/rG1687f2bbe2e2aaa092f942d4a97d41fad43eedfb +, headersOnly ? false +}: + +let + basename = "libcxx"; +in + +assert stdenv.isDarwin -> cxxabi.libName == "c++abi"; + +stdenv.mkDerivation rec { + pname = basename + lib.optionalString headersOnly "-headers"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${basename} "$out" + mkdir -p "$out/libcxxabi" + cp -r ${monorepoSrc}/libcxxabi/include "$out/libcxxabi" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + cp -r ${monorepoSrc}/third-party "$out" + cp -r ${monorepoSrc}/runtimes "$out" + ''; + + sourceRoot = "${src.name}/runtimes"; + + outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; + + prePatch = '' + cd ../${basename} + chmod -R u+w . + ''; + + postPatch = '' + cd ../runtimes + ''; + + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py + ''; + + nativeBuildInputs = [ cmake ninja python3 ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + buildInputs = + lib.optionals (!headersOnly) [ cxxabi ] + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ libunwind ]; + + cmakeFlags = let + # See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string + libcxx_cxx_abi_opt = { + "c++abi" = "system-libcxxabi"; + "cxxrt" = "libcxxrt"; + }.${cxxabi.libName} or (throw "unknown cxxabi: ${cxxabi.libName} (${cxxabi.pname})"); + in [ + "-DLLVM_ENABLE_RUNTIMES=libcxx" + "-DLIBCXX_CXX_ABI=${if headersOnly then "none" else libcxx_cxx_abi_opt}" + ] ++ lib.optional (!headersOnly && cxxabi.libName == "c++abi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1" + ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLIBCXX_USE_COMPILER_RT=ON" + # There's precedent for this in llvm-project/libcxx/cmake/caches. + # In a monorepo build you might do the following in the libcxxabi build: + # -DLLVM_ENABLE_PROJECTS=libcxxabi;libunwinder + # -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=On + # libcxx appears to require unwind and doesn't pull it in via other means. + "-DLIBCXX_ADDITIONAL_LIBRARIES=unwind" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXX_ENABLE_THREADS=OFF" + "-DLIBCXX_ENABLE_FILESYSTEM=OFF" + "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker + ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" + # If we're only building the headers we don't actually *need* a functioning + # C/C++ compiler: + ++ lib.optionals (headersOnly) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + ]; + + ninjaFlags = lib.optional headersOnly "generate-cxx-headers"; + installTargets = lib.optional headersOnly "install-cxx-headers"; + + passthru = { + isLLVM = true; + inherit cxxabi; + }; + + meta = llvm_meta // { + homepage = "https://libcxx.llvm.org/"; + description = "C++ standard library"; + longDescription = '' + libc++ is an implementation of the C++ standard library, targeting C++11, + C++14 and above. + ''; + # "All of the code in libc++ is dual licensed under the MIT license and the + # UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/pkgs/development/compilers/llvm/17/libcxxabi/default.nix b/pkgs/development/compilers/llvm/17/libcxxabi/default.nix new file mode 100644 index 0000000000000..0a795da44ae41 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/libcxxabi/default.nix @@ -0,0 +1,117 @@ +{ lib, stdenv, llvm_meta, cmake, ninja, python3 +, monorepoSrc, runCommand, fetchpatch +, cxx-headers, libunwind, version +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libcxxabi"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx/src" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/include "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/src/include "$out/libcxx/src" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + cp -r ${monorepoSrc}/runtimes "$out" + ''; + + sourceRoot = "${src.name}/runtimes"; + + outputs = [ "out" "dev" ]; + + postUnpack = lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + ''; + + prePatch = '' + cd ../${pname} + chmod -R u+w . + ''; + + patches = [ + ./gnu-install-dirs.patch + + # https://reviews.llvm.org/D132298, Allow building libcxxabi alone + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/e6a0800532bb409f6d1c62f3698bdd6994a877dc.patch"; + sha256 = "1xyjd56m4pfwq8p3xh6i8lhkk9kq15jaml7qbhxdf87z4jjkk63a"; + stripLen = 1; + }) + ]; + + postPatch = '' + cd ../runtimes + ''; + + nativeBuildInputs = [ cmake ninja python3 ]; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isWasm) libunwind; + + cmakeFlags = [ + "-DLLVM_ENABLE_RUNTIMES=libcxxabi" + "-DLIBCXXABI_LIBCXX_INCLUDES=${cxx-headers}/include/c++/v1" + + # `libcxxabi`'s build does not need a toolchain with a c++ stdlib attached + # (we specify the headers it should use explicitly above). + # + # CMake however checks for this anyways; this flag tells it not to. See: + # https://github.com/llvm/llvm-project/blob/4bd3f3759259548e159aeba5c76efb9a0864e6fa/llvm/runtimes/CMakeLists.txt#L243 + "-DCMAKE_CXX_COMPILER_WORKS=ON" + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, + # but that does not appear to be the case for example when building + # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). + "-DCMAKE_EXE_LINKER_FLAGS=-nostdlib" + "-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DLIBCXXABI_ENABLE_THREADS=OFF" + "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + "-DUNIX=ON" + ] ++ lib.optionals (!enableShared) [ + "-DLIBCXXABI_ENABLE_SHARED=OFF" + ]; + + preInstall = lib.optionalString stdenv.isDarwin '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../../${pname}/include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; + + passthru = { + libName = "c++abi"; + }; + + meta = llvm_meta // { + homepage = "https://libcxxabi.llvm.org/"; + description = "Provides C++ standard library support"; + longDescription = '' + libc++abi is a new implementation of low level support for a standard C++ library. + ''; + # "All of the code in libc++abi is dual licensed under the MIT license and + # the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; + # Broken until https://github.com/llvm/llvm-project/issues/64226 is resolved + # We should check if the version is not 10.13 but that is currently broken. + broken = stdenv.isDarwin && stdenv.isx86_64; + }; +} diff --git a/pkgs/development/compilers/llvm/17/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/17/libcxxabi/gnu-install-dirs.patch new file mode 100644 index 0000000000000..51382fcefed27 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/libcxxabi/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt +index f380fe6b6b92..a9656258c38e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,7 +188,7 @@ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE STRING ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libc++abi libraries should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) +@@ -202,7 +202,7 @@ else() + set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) + endif() +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE STRING ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++abi libraries should be installed.") + endif() + diff --git a/pkgs/development/compilers/llvm/17/libunwind/default.nix b/pkgs/development/compilers/llvm/17/libunwind/default.nix new file mode 100644 index 0000000000000..a3c8e2594f5a7 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/libunwind/default.nix @@ -0,0 +1,63 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake +, ninja +, python3 +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libunwind"; + inherit version; + + # I am not so comfortable giving libc++ and friends the whole monorepo as + # requested, so I filter it to what is needed. + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/utils "$out/libcxx" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + cp -r ${monorepoSrc}/runtimes "$out" + ''; + + sourceRoot = "${src.name}/runtimes"; + + prePatch = '' + cd ../${pname} + chmod -R u+w . + ''; + + postPatch = '' + cd ../runtimes + ''; + + postInstall = lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) '' + # libcxxabi wants to link to libunwind_shared.so (?). + ln -s $out/lib/libunwind.so $out/lib/libunwind_shared.so + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ninja python3 ]; + + cmakeFlags = [ + "-DLLVM_ENABLE_RUNTIMES=libunwind" + ] ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + + meta = llvm_meta // { + # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst + homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library"; + description = "LLVM's unwinder library"; + longDescription = '' + The unwind library provides a family of _Unwind_* functions implementing + the language-neutral stack unwinding portion of the Itanium C++ ABI (Level + I). It is a dependency of the C++ ABI library, and sometimes is a + dependency of other runtimes. + ''; + }; +} diff --git a/pkgs/development/compilers/llvm/17/lld/add-table-base.patch b/pkgs/development/compilers/llvm/17/lld/add-table-base.patch new file mode 100644 index 0000000000000..15fc903a5e3f3 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/lld/add-table-base.patch @@ -0,0 +1,190 @@ +From 93adcb770b99351b18553089c164fe3ef2119699 Mon Sep 17 00:00:00 2001 +From: Sam Clegg <sbc@chromium.org> +Date: Fri, 25 Aug 2023 13:56:16 -0700 +Subject: [PATCH] [lld][WebAssembly] Add `--table-base` setting + +This is similar to `--global-base` but determines where to place the +table segments rather than that data segments. + +See https://github.com/emscripten-core/emscripten/issues/20097 + +Differential Revision: https://reviews.llvm.org/D158892 +--- + test/wasm/table-base.s | 72 ++++++++++++++++++++++++++++++++++++++ + wasm/Driver.cpp | 19 ++++++++-- + wasm/Options.td | 5 ++- + wasm/Writer.cpp | 8 ----- + 4 files changed, 93 insertions(+), 11 deletions(-) + create mode 100644 test/wasm/table-base.s + +diff --git a/test/wasm/table-base.s b/test/wasm/table-base.s +new file mode 100644 +index 000000000000000..56fff414fd31d96 +--- /dev/null ++++ b/test/wasm/table-base.s +@@ -0,0 +1,72 @@ ++# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o ++ ++# RUN: wasm-ld --export=__table_base -o %t.wasm %t.o ++# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-DEFAULT ++ ++# RUN: wasm-ld --table-base=100 --export=__table_base -o %t.wasm %t.o ++# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-100 ++ ++.globl _start ++_start: ++ .functype _start () -> () ++ i32.const _start ++ drop ++ end_function ++ ++# CHECK-DEFAULT: - Type: TABLE ++# CHECK-DEFAULT-NEXT: Tables: ++# CHECK-DEFAULT-NEXT: - Index: 0 ++# CHECK-DEFAULT-NEXT: ElemType: FUNCREF ++# CHECK-DEFAULT-NEXT: Limits: ++# CHECK-DEFAULT-NEXT: Flags: [ HAS_MAX ] ++# CHECK-DEFAULT-NEXT: Minimum: 0x2 ++# CHECK-DEFAULT-NEXT: Maximum: 0x2 ++ ++# CHECK-DEFAULT: - Type: GLOBAL ++# CHECK-DEFAULT-NEXT: Globals: ++# CHECK-DEFAULT-NEXT: - Index: 0 ++# CHECK-DEFAULT-NEXT: Type: I32 ++# CHECK-DEFAULT-NEXT: Mutable: true ++# CHECK-DEFAULT-NEXT: InitExpr: ++# CHECK-DEFAULT-NEXT: Opcode: I32_CONST ++# CHECK-DEFAULT-NEXT: Value: 66560 ++# CHECK-DEFAULT-NEXT: - Index: 1 ++# CHECK-DEFAULT-NEXT: Type: I32 ++# CHECK-DEFAULT-NEXT: Mutable: false ++# CHECK-DEFAULT-NEXT: InitExpr: ++# CHECK-DEFAULT-NEXT: Opcode: I32_CONST ++# CHECK-DEFAULT-NEXT: Value: 1 ++ ++# CHECK-DEFAULT: - Type: EXPORT ++# CHECK-DEFAULT: - Name: __table_base ++# CHECK-DEFAULT-NEXT: Kind: GLOBAL ++# CHECK-DEFAULT-NEXT: Index: 1 ++ ++# CHECK-100: - Type: TABLE ++# CHECK-100-NEXT: Tables: ++# CHECK-100-NEXT: - Index: 0 ++# CHECK-100-NEXT: ElemType: FUNCREF ++# CHECK-100-NEXT: Limits: ++# CHECK-100-NEXT: Flags: [ HAS_MAX ] ++# CHECK-100-NEXT: Minimum: 0x65 ++# CHECK-100-NEXT: Maximum: 0x65 ++ ++# CHECK-100: - Type: GLOBAL ++# CHECK-100-NEXT: Globals: ++# CHECK-100-NEXT: - Index: 0 ++# CHECK-100-NEXT: Type: I32 ++# CHECK-100-NEXT: Mutable: true ++# CHECK-100-NEXT: InitExpr: ++# CHECK-100-NEXT: Opcode: I32_CONST ++# CHECK-100-NEXT: Value: 66560 ++# CHECK-100-NEXT: - Index: 1 ++# CHECK-100-NEXT: Type: I32 ++# CHECK-100-NEXT: Mutable: false ++# CHECK-100-NEXT: InitExpr: ++# CHECK-100-NEXT: Opcode: I32_CONST ++# CHECK-100-NEXT: Value: 100 ++ ++# CHECK-100: - Type: EXPORT ++# CHECK-100: - Name: __table_base ++# CHECK-100-NEXT: Kind: GLOBAL ++# CHECK-100-NEXT: Index: 1 +diff --git a/wasm/Driver.cpp b/wasm/Driver.cpp +index 84304881f5ca34e..c2f5f0185781f36 100644 +--- a/wasm/Driver.cpp ++++ b/wasm/Driver.cpp +@@ -502,6 +502,7 @@ static void readConfigs(opt::InputArgList &args) { + + config->initialMemory = args::getInteger(args, OPT_initial_memory, 0); + config->globalBase = args::getInteger(args, OPT_global_base, 0); ++ config->tableBase = args::getInteger(args, OPT_table_base, 0); + config->maxMemory = args::getInteger(args, OPT_max_memory, 0); + config->zStackSize = + args::getZOptionValue(args, OPT_z, "stack-size", WasmPageSize); +@@ -573,6 +574,17 @@ static void setConfigs() { + if (config->exportTable) + error("-shared/-pie is incompatible with --export-table"); + config->importTable = true; ++ } else { ++ // Default table base. Defaults to 1, reserving 0 for the NULL function ++ // pointer. ++ if (!config->tableBase) ++ config->tableBase = 1; ++ // The default offset for static/global data, for when --global-base is ++ // not specified on the command line. The precise value of 1024 is ++ // somewhat arbitrary, and pre-dates wasm-ld (Its the value that ++ // emscripten used prior to wasm-ld). ++ if (!config->globalBase && !config->relocatable && !config->stackFirst) ++ config->globalBase = 1024; + } + + if (config->relocatable) { +@@ -666,8 +678,11 @@ static void checkOptions(opt::InputArgList &args) { + warn("-Bsymbolic is only meaningful when combined with -shared"); + } + +- if (config->globalBase && config->isPic) { +- error("--global-base may not be used with -shared/-pie"); ++ if (config->isPic) { ++ if (config->globalBase) ++ error("--global-base may not be used with -shared/-pie"); ++ if (config->tableBase) ++ error("--table-base may not be used with -shared/-pie"); + } + } + +diff --git a/wasm/Options.td b/wasm/Options.td +index 50417d2928e0a34..bb764396bf4df14 100644 +--- a/wasm/Options.td ++++ b/wasm/Options.td +@@ -191,7 +191,7 @@ def growable_table: FF<"growable-table">, + HelpText<"Remove maximum size from function table, allowing table to grow">; + + def global_base: JJ<"global-base=">, +- HelpText<"Where to start to place global data">; ++ HelpText<"Memory offset at which to place global data (Defaults to 1024)">; + + def import_memory: FF<"import-memory">, + HelpText<"Import the module's memory from the default module of \"env\" with the name \"memory\".">; +@@ -224,6 +224,9 @@ def no_entry: FF<"no-entry">, + def stack_first: FF<"stack-first">, + HelpText<"Place stack at start of linear memory rather than after data">; + ++def table_base: JJ<"table-base=">, ++ HelpText<"Table offset at which to place address taken functions (Defaults to 1)">; ++ + defm whole_archive: B<"whole-archive", + "Force load of all members in a static library", + "Do not force load of all members in a static library (default)">; +diff --git a/wasm/Writer.cpp b/wasm/Writer.cpp +index f25d358dc5bae6f..0576bf2907e49c4 100644 +--- a/wasm/Writer.cpp ++++ b/wasm/Writer.cpp +@@ -358,13 +358,6 @@ void Writer::layoutMemory() { + memoryPtr = config->globalBase; + } + } else { +- if (!config->globalBase && !config->relocatable && !config->isPic) { +- // The default offset for static/global data, for when --global-base is +- // not specified on the command line. The precise value of 1024 is +- // somewhat arbitrary, and pre-dates wasm-ld (Its the value that +- // emscripten used prior to wasm-ld). +- config->globalBase = 1024; +- } + memoryPtr = config->globalBase; + } + +@@ -1685,7 +1678,6 @@ void Writer::run() { + // For PIC code the table base is assigned dynamically by the loader. + // For non-PIC, we start at 1 so that accessing table index 0 always traps. + if (!config->isPic) { +- config->tableBase = 1; + if (WasmSym::definedTableBase) + WasmSym::definedTableBase->setVA(config->tableBase); + if (WasmSym::definedTableBase32) diff --git a/pkgs/development/compilers/llvm/7/lld/default.nix b/pkgs/development/compilers/llvm/17/lld/default.nix index 2016e6321e0ff..84943e8effce1 100644 --- a/pkgs/development/compilers/llvm/7/lld/default.nix +++ b/pkgs/development/compilers/llvm/17/lld/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, llvm_meta , buildLlvmTools -, fetch +, monorepoSrc, runCommand , cmake +, ninja , libxml2 , libllvm , version @@ -11,17 +12,28 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "0rsqb7zcnij5r5ipfhr129j7skr5n9pyr388kjpqwh091952f3x1"; + # Blank llvm dir just so relative path works + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libunwind" + cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" + mkdir -p "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch + ./add-table-base.patch ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ninja ]; buildInputs = [ libllvm libxml2 ]; cmakeFlags = [ - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" + "-DLLD_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/lld" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; @@ -38,8 +50,8 @@ stdenv.mkDerivation rec { LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features that are useful for toolchain developers. - The linker supports ELF (Unix), PE/COFF (Windows), and Mach-O (macOS) - in descending order of completeness. Internally, LLD consists + The linker supports ELF (Unix), PE/COFF (Windows), Mach-O (macOS), and + WebAssembly in descending order of completeness. Internally, LLD consists of several different linkers. ''; }; diff --git a/pkgs/development/compilers/llvm/17/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/17/lld/gnu-install-dirs.patch new file mode 100644 index 0000000000000..86e76f4a16d8b --- /dev/null +++ b/pkgs/development/compilers/llvm/17/lld/gnu-install-dirs.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d6225646fe6..9b5d0b15af13 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,10 +33,22 @@ if(LLD_BUILT_STANDALONE) + find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}") + list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}") + +- # Turn into CACHE PATHs for overwriting +- set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") +- set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree") +- set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") ++ # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets ++ # LLVM_CONFIG. ++ if (NOT LLVM_CONFIG_FOUND) ++ # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config ++ # path is removed. ++ set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) ++ set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}") ++ # N.B. this is just a default value, the CACHE PATHs below can be overridden. ++ set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm") ++ else() ++ set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}") ++ endif() ++ ++ set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") ++ set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") ++ set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") + + find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} + NO_DEFAULT_PATH) +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index d3924f7243d4..42a7cd62281c 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -18,8 +18,8 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) diff --git a/pkgs/development/compilers/llvm/17/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/17/lldb/cpu_subtype_arm64e_replacement.patch new file mode 100644 index 0000000000000..20d35c9f3ea91 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/lldb/cpu_subtype_arm64e_replacement.patch @@ -0,0 +1,12 @@ +diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm +--- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm ++++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm +@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, + len = sizeof(is_64_bit_capable); + ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); + +- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { ++ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers + // The arm64e architecture is a preview. Pretend the host architecture + // is arm64. + cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/pkgs/development/compilers/llvm/17/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/17/lldb/gnu-install-dirs.patch new file mode 100644 index 0000000000000..4388f5c7f593f --- /dev/null +++ b/pkgs/development/compilers/llvm/17/lldb/gnu-install-dirs.patch @@ -0,0 +1,23 @@ +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index 3291a7c808e1..b27d27ce6a87 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -109,7 +109,7 @@ function(add_lldb_library name) + endif() + + if(PARAM_SHARED) +- set(install_dest lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(PARAM_INSTALL_PREFIX) + set(install_dest ${PARAM_INSTALL_PREFIX}) + endif() +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index 7d48491ec89a..c04543585588 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED + ) + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/pkgs/development/compilers/llvm/17/lldb/procfs.patch b/pkgs/development/compilers/llvm/17/lldb/procfs.patch new file mode 100644 index 0000000000000..7b200e86505ca --- /dev/null +++ b/pkgs/development/compilers/llvm/17/lldb/procfs.patch @@ -0,0 +1,46 @@ +--- a/source/Plugins/Process/Linux/Procfs.h ++++ b/source/Plugins/Process/Linux/Procfs.h +@@ -10,6 +10,13 @@ + // sys/procfs.h on Android/Linux for all supported architectures. + + #include <sys/ptrace.h> ++#include <asm/ptrace.h> ++ ++// on i686 preprocessor symbols with these register names are defined as ++// numeric constants; these symbols clash with identifier names used in ++// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h` ++#undef FS ++#undef CS + + #include "lldb/lldb-types.h" + +@@ -17,23 +24,13 @@ + + #include <vector> + +-#ifdef __ANDROID__ +-#if defined(__arm64__) || defined(__aarch64__) +-typedef unsigned long elf_greg_t; +-typedef elf_greg_t +- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; +-typedef struct user_fpsimd_state elf_fpregset_t; +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#elif defined(__mips__) +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#endif +-#else // __ANDROID__ ++#if !defined(__GLIBC__) && defined(__powerpc__) ++#define pt_regs musl_pt_regs ++#include <sys/procfs.h> ++#undef pt_regs ++#else + #include <sys/procfs.h> +-#endif // __ANDROID__ ++#endif + + namespace lldb_private { + namespace process_linux { diff --git a/pkgs/development/compilers/llvm/17/llvm/default.nix b/pkgs/development/compilers/llvm/17/llvm/default.nix new file mode 100644 index 0000000000000..3d05837d45da5 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/llvm/default.nix @@ -0,0 +1,427 @@ +{ lib, stdenv, llvm_meta +, pkgsBuildBuild +, monorepoSrc +, runCommand +, cmake +, darwin +, ninja +, python3 +, python3Packages +, libffi +# TODO: Gold plugin on LLVM16 has a severe memory corruption bug: https://github.com/llvm/llvm-project/issues/61350. +, enableGoldPlugin ? false +, libbfd +, libpfm +, libxml2 +, ncurses +, version +, release_version +, zlib +, which +, sysctl +, buildLlvmTools +, debugVersion ? false +, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) + && (stdenv.hostPlatform == stdenv.buildPlatform) +, enableManpages ? false +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic +, enablePFM ? stdenv.isLinux /* PFM only supports Linux */ + # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + # broken for the armv7l builder + && !stdenv.hostPlatform.isAarch +, enablePolly ? true +}: + +let + inherit (lib) optional optionals optionalString; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with lib; + concatStringsSep "." (take 1 (splitString "." release_version)); + + # Ordinarily we would just the `doCheck` and `checkDeps` functionality + # `mkDerivation` gives us to manage our test dependencies (instead of breaking + # out `doCheck` as a package level attribute). + # + # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in + # particular the children it uses to do feature detection. + # + # This means that python deps we add to `checkDeps` (which the python + # interpreter is made aware of via `$PYTHONPATH` – populated by the python + # setup hook) are not picked up by `lit` which causes it to skip tests. + # + # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work + # because this package is shadowed in `$PATH` by the regular `python3` + # package. + # + # So, we "manually" assemble one python derivation for the package to depend + # on, taking into account whether checks are enabled or not: + python = if doCheck then + # Note that we _explicitly_ ask for a python interpreter for our host + # platform here; the splicing that would ordinarily take care of this for + # us does not seem to work once we use `withPackages`. + let + checkDeps = ps: with ps; [ psutil ]; + in pkgsBuildBuild.targetPackages.python3.withPackages checkDeps + else python3; + +in + assert (lib.assertMsg (!enableGoldPlugin) "Gold plugin cannot be enabled on LLVM16 due to a upstream issue: https://github.com/llvm/llvm-project/issues/61350"); + stdenv.mkDerivation (rec { + pname = "llvm"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} ('' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" + '' + lib.optionalString enablePolly '' + chmod u+w "$out/${pname}/tools" + cp -r ${monorepoSrc}/polly "$out/${pname}/tools" + ''); + + sourceRoot = "${src.name}/${pname}"; + + outputs = [ "out" "lib" "dev" "python" ]; + + nativeBuildInputs = [ cmake ninja python ] + ++ optionals enableManpages [ + # Note: we intentionally use `python3Packages` instead of `python3.pkgs`; + # splicing does *not* work with the latter. (TODO: fix) + python3Packages.sphinx python3Packages.recommonmark + ]; + + buildInputs = [ libxml2 libffi ] + ++ optional enablePFM libpfm; # exegesis + + propagatedBuildInputs = [ ncurses zlib ]; + + nativeCheckInputs = [ + which + ] ++ lib.optional stdenv.isDarwin sysctl; + + patches = [ + ./gnu-install-dirs.patch + + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + ./llvm-lit-cfg-add-libs-to-dylib-path.patch + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + ./lit-shell-script-runner-set-dyld-library-path.patch + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + + # Just like the `llvm-lit-cfg` patch, but for `polly`. + ./polly-lit-cfg-add-libs-to-dylib-path.patch + ]; + + postPatch = optionalString stdenv.isDarwin '' + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + + # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick + # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 + rm test/MC/ELF/cfi-version.ll + + # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) + # and thus fails under the sandbox: + substituteInPlace unittests/TargetParser/Host.cpp \ + --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" + + # This test tries to call the intrinsics `@llvm.roundeven.f32` and + # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` + # and `roundeven` on macOS. + # + # However these functions are glibc specific so the test fails: + # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html + # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html + # + substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ + --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ + --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" + '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' + # This test fails on darwin x86_64 because `sw_vers` reports a different + # macOS version than what LLVM finds by reading + # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into + # the sandbox on macOS). + # + # The `sw_vers` provided by nixpkgs reports the macOS version associated + # with the `CoreFoundation` framework with which it was built. Because + # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what + # `sw_vers` reports is not guaranteed to match the macOS version of the host + # that's building this derivation. + # + # Astute readers will note that we only _patch_ this test on aarch64-darwin + # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright. + # So why does this test pass on aarch64? + # + # Well, it seems that `sw_vers` on aarch64 actually links against the _host_ + # CoreFoundation framework instead of the nixpkgs provided one. + # + # Not entirely sure what the right fix is here. I'm assuming aarch64 + # `sw_vers` doesn't intentionally link against the host `CoreFoundation` + # (still digging into how this ends up happening, will follow up) but that + # aside I think the more pertinent question is: should we be patching LLVM's + # macOS version detection logic to use `sw_vers` instead of reading host + # paths? This *is* a way in which details about builder machines can creep + # into the artifacts that are produced, affecting reproducibility, but it's + # not clear to me when/where/for what this even gets used in LLVM. + # + # TODO(@rrbutani): fix/follow-up + substituteInPlace unittests/TargetParser/Host.cpp \ + --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" + + # This test fails with a `dysmutil` crash; have not yet dug into what's + # going on here (TODO(@rrbutani)). + rm test/tools/dsymutil/ARM/obfuscated.test + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + substituteInPlace unittests/IR/CMakeLists.txt \ + --replace "PassBuilderCallbacksTest.cpp" "" + rm unittests/IR/PassBuilderCallbacksTest.cpp + rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + '' + optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${../../TLI-musl.patch} + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "add_subdirectory(DynamicLibrary)" "" + rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + # valgrind unhappy with musl or glibc, but fails w/musl only + rm test/CodeGen/AArch64/wineh4.mir + '' + optionalString stdenv.hostPlatform.isAarch32 '' + # skip failing X86 test cases on 32-bit ARM + rm test/DebugInfo/X86/convert-debugloc.ll + rm test/DebugInfo/X86/convert-inlined.ll + rm test/DebugInfo/X86/convert-linked.ll + rm test/tools/dsymutil/X86/op-convert.test + rm test/tools/gold/X86/split-dwarf.ll + rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s + rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s + rm test/CodeGen/RISCV/attributes.ll + rm test/CodeGen/RISCV/xtheadmempair.ll + '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' + # Seems to require certain floating point hardware (NEON?) + rm test/ExecutionEngine/frem.ll + '' + '' + patchShebangs test/BugPoint/compile-custom.ll.py + ''; + + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar" + ) + ''; + + # Defensive check: some paths (that we make symlinks to) depend on the release + # version, for example: + # - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185 + # + # So we want to sure that the version in the source matches the release + # version we were given. + # + # We do this check here, in the LLVM build, because it happens early. + postConfigure = let + v = lib.versions; + major = v.major release_version; + minor = v.minor release_version; + patch = v.patch release_version; + in '' + # $1: part, $2: expected + check_version() { + part="''${1^^}" + part="$(cat include/llvm/Config/llvm-config.h | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)" + + if [[ "$part" != "$2" ]]; then + echo >&2 \ + "mismatch in the $1 version! we have version ${release_version}" \ + "and expected the $1 version to be '$2'; the source has '$part' instead" + exit 3 + fi + } + + check_version major ${major} + check_version minor ${minor} + check_version patch ${patch} + ''; + + # 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 + # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native + # will return different results from the cross llvm-config. + # + # Some flags don't need to be repassed because LLVM already does so (like + # CMAKE_BUILD_TYPE), others are irrelevant to the result. + flagsForLlvmConfig = [ + "-DLLVM_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/llvm" + "-DLLVM_ENABLE_RTTI=ON" + ] ++ optionals enableSharedLibraries [ + "-DLLVM_LINK_LLVM_DYLIB=ON" + ]; + in flagsForLlvmConfig ++ [ + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_ENABLE_DUMP=ON" + ] ++ optionals stdenv.hostPlatform.isStatic [ + # Disables building of shared libs, -fPIC is still injected by cc-wrapper + "-DLLVM_ENABLE_PIC=OFF" + "-DLLVM_BUILD_STATIC=ON" + "-DLLVM_LINK_LLVM_DYLIB=off" + # libxml2 needs to be disabled because the LLVM build system ignores its .la + # file and doesn't link zlib as well. + # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 + "-DLLVM_ENABLE_LIBXML2=OFF" + ] ++ optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ optionals (false) [ + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" + ] ++ optionals isDarwin [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCMAKE_CROSSCOMPILING=True" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + # We need to repass the custom GNUInstallDirs values, otherwise CMake + # will choose them for us, leading to wrong results in llvm-config-native + nativeInstallFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" + "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" + "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" + "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" + + lib.concatStringsSep ";" (lib.concatLists [ + flagsForLlvmConfig + nativeToolchainFlags + nativeInstallFlags + ]) + ) + ]; + + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' + '' + + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native + ''; + + inherit doCheck; + + checkTarget = "check-all"; + + # For the update script: + passthru.monorepoSrc = monorepoSrc; + + requiredSystemFeatures = [ "big-parallel" ]; + meta = llvm_meta // { + homepage = "https://llvm.org/"; + description = "A collection of modular and reusable compiler and toolchain technologies"; + longDescription = '' + The LLVM Project is a collection of modular and reusable compiler and + toolchain technologies. Despite its name, LLVM has little to do with + traditional virtual machines. The name "LLVM" itself is not an acronym; it + is the full name of the project. + LLVM began as a research project at the University of Illinois, with the + goal of providing a modern, SSA-based compilation strategy capable of + supporting both static and dynamic compilation of arbitrary programming + languages. Since then, LLVM has grown to be an umbrella project consisting + of a number of subprojects, many of which are being used in production by + a wide variety of commercial and open source projects as well as being + widely used in academic research. Code in the LLVM project is licensed + under the "Apache 2.0 License with LLVM exceptions". + ''; + }; +} // lib.optionalAttrs enableManpages { + pname = "llvm-manpages"; + + propagatedBuildInputs = []; + + ninjaFlags = [ "docs-llvm-man" ]; + installTargets = [ "install-docs-llvm-man" ]; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLVM ${version}"; + }; +}) diff --git a/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000000..b01363e98aa00 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,19 @@ +This is the one remaining Polly install dirs related change that hasn't made it +into upstream yet; previously this patch file also included: +https://reviews.llvm.org/D117541 + +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index 518a09b45a42..bd9d6f5542ad 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) diff --git a/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs.patch new file mode 100644 index 0000000000000..e2122ebf603d9 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/llvm/gnu-install-dirs.patch @@ -0,0 +1,137 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 471817d68286..c51463304159 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1010,7 +1010,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") + add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src + ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) + install(TARGETS tf_xla_runtime EXPORT LLVMExports +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime) + # Once we add more modules, we should handle this more automatically. + if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index 230620c37027..dd16cab1835e 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -876,8 +876,8 @@ macro(add_llvm_library name) + get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) + install(TARGETS ${name} + ${export_to_llvmexports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) + + if (NOT LLVM_ENABLE_IDE) +@@ -2069,7 +2069,7 @@ function(llvm_install_library_symlink name dest type) + set(LLVM_LINK_OR_COPY copy) + endif() + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir "${CMAKE_INSTALL_BINDIR}") + endif() +@@ -2344,16 +2344,37 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS) + # $ORIGIN is not interpreted at link time by aix ld. + # Since BUILD_SHARED_LIBS is only recommended for use by developers, + # hardcode the rpath to build/install lib dir first in this mode. + # FIXME: update this when there is better solution. +- set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(UNIX) +- set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}") ++ # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back ++ # to `_install_rpath` here. ++ # ++ # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e. ++ # clang); instead LLVM is its own package and thus lands at its own nix ++ # store path. This makes it so that the default relative rpath (`../lib/`) ++ # does not point at the LLVM shared objects. ++ # ++ # More discussion here: ++ # - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329 ++ # - https://reviews.llvm.org/D146918 (16.0.5+) ++ # ++ # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is ++ # no potential that this will result in us pulling in the "wrong" LLVM. ++ # Adding this to the build rpath means we aren't forced to use ++ # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build ++ # dir, pre-install, will have the right rpath for LLVM). ++ # ++ # As noted in the differential above, an alternative solution is to have ++ # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set ++ # `CMAKE_INSTALL_RPATH`. ++ set(_build_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 891c9e6d618c..8d963f3b0069 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -147,9 +147,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index d99af79aa38e..21e794224b99 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -127,7 +127,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS + ) + list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) + +-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}") ++extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_LIBRARY_DIRS + "${LLVM_CONFIG_LIBRARY_DIR}" + # FIXME: Should there be other entries here? +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index 370005cd8d7d..7e790bc52111 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,6 +23,7 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" + #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" + #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index e86eb2b44b10..f63e207e792e 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -366,7 +366,11 @@ int main(int argc, char **argv) { + sys::fs::make_absolute(ActivePrefix, Path); + ActiveBinDir = std::string(Path.str()); + } +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; ++ { ++ SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveLibDir = std::string(Path.str()); ++ } + { + SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR); + sys::fs::make_absolute(ActivePrefix, Path); diff --git a/pkgs/development/compilers/llvm/17/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/pkgs/development/compilers/llvm/17/llvm/lit-shell-script-runner-set-dyld-library-path.patch new file mode 100644 index 0000000000000..82b7b21c55fb1 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/llvm/lit-shell-script-runner-set-dyld-library-path.patch @@ -0,0 +1,17 @@ +diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py +index 0242e0b75af3..d732011306f7 100644 +--- a/utils/lit/lit/TestRunner.py ++++ b/utils/lit/lit/TestRunner.py +@@ -1029,6 +1029,12 @@ def executeScript(test, litConfig, tmpBase, commands, cwd): + f.write('@echo off\n') + f.write('\n@if %ERRORLEVEL% NEQ 0 EXIT\n'.join(commands)) + else: ++ # This env var is *purged* when invoking subprocesses so we have to ++ # manually set it from within the bash script in order for the commands ++ # in run lines to see this var: ++ if "DYLD_LIBRARY_PATH" in test.config.environment: ++ f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n') ++ + for i, ln in enumerate(commands): + match = re.match(kPdbgRegex, ln) + if match: diff --git a/pkgs/development/compilers/llvm/17/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/17/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 0000000000000..d4ccb2ae98227 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,80 @@ +diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py +index 81e8dc04acea..479ff95681e2 100644 +--- a/test/Unit/lit.cfg.py ++++ b/test/Unit/lit.cfg.py +@@ -3,6 +3,7 @@ + # Configuration file for the 'lit' test runner. + + import os ++import platform + import subprocess + + import lit.formats +@@ -55,3 +56,26 @@ if sys.platform in ["win32", "cygwin"] and os.path.isdir(config.shlibdir): + # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate. + if sys.platform == "win32" and "SYSTEMDRIVE" in os.environ: + config.environment["SYSTEMDRIVE"] = os.environ["SYSTEMDRIVE"] ++ ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: ++ yield "LD_LIBRARY_PATH" ++ elif platform.system() == "Darwin": ++ yield "DYLD_LIBRARY_PATH" ++ elif platform.system() == "Windows": ++ yield "PATH" ++ elif platform.system() == "AIX": ++ yield "LIBPATH" ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = os.path.pathsep.join( ++ (config.shlibdir, ++ config.environment.get(shlibpath_var, ''))) ++ config.environment[shlibpath_var] = shlibpath ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) +diff --git a/test/lit.cfg.py b/test/lit.cfg.py +index 75a38b4c5dad..856fc75c9d74 100644 +--- a/test/lit.cfg.py ++++ b/test/lit.cfg.py +@@ -42,6 +42,26 @@ llvm_config.with_environment("PATH", config.llvm_tools_dir, append_path=True) + llvm_config.with_system_environment( + ["HOME", "INCLUDE", "LIB", "TMP", "TEMP"]) + ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: ++ yield "LD_LIBRARY_PATH" ++ elif platform.system() == "Darwin": ++ yield "DYLD_LIBRARY_PATH" ++ elif platform.system() == "Windows": ++ yield "PATH" ++ elif platform.system() == "AIX": ++ yield "LIBPATH" ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = config.llvm_shlib_dir ++ llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True) ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) + + # Set up OCAMLPATH to include newly built OCaml libraries. + top_ocaml_lib = os.path.join(config.llvm_lib_dir, "ocaml") +@@ -318,7 +338,7 @@ def have_cxx_shared_library(): + + try: + readobj_cmd = subprocess.Popen( +- [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE ++ [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE, env=config.environment + ) + except OSError: + print("could not exec llvm-readobj") + diff --git a/pkgs/development/compilers/llvm/17/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/17/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 0000000000000..1354ad267314a --- /dev/null +++ b/pkgs/development/compilers/llvm/17/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,24 @@ +diff --git a/tools/polly/test/lit.cfg b/tools/polly/test/lit.cfg +index 41e3a589c61e..09f3b17498b0 100644 +--- a/tools/polly/test/lit.cfg ++++ b/tools/polly/test/lit.cfg +@@ -36,9 +36,17 @@ base_paths = [config.llvm_tools_dir, config.environment['PATH']] + path = os.path.pathsep.join(base_paths + config.extra_paths) + config.environment['PATH'] = path + ++# (Copied from polly/test/Unit/lit.cfg) ++if platform.system() == 'Darwin': ++ shlibpath_var = 'DYLD_LIBRARY_PATH' ++elif platform.system() == 'Windows': ++ shlibpath_var = 'PATH' ++else: ++ shlibpath_var = 'LD_LIBRARY_PATH' ++ + path = os.path.pathsep.join((config.llvm_libs_dir, +- config.environment.get('LD_LIBRARY_PATH',''))) +-config.environment['LD_LIBRARY_PATH'] = path ++ config.environment.get(shlibpath_var,''))) ++config.environment[shlibpath_var] = path + + llvm_config.use_default_substitutions() + diff --git a/pkgs/development/compilers/llvm/17/openmp/default.nix b/pkgs/development/compilers/llvm/17/openmp/default.nix new file mode 100644 index 0000000000000..d51335436ad23 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/openmp/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, llvm_meta +, monorepoSrc +, runCommand +, cmake +, ninja +, llvm +, targetLlvm +, lit +, clang-unwrapped +, perl +, pkg-config +, xcbuild +, version +}: + +stdenv.mkDerivation rec { + pname = "openmp"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./fix-find-tool.patch + ./gnu-install-dirs.patch + ./run-lit-directly.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ninja perl pkg-config lit ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; + + nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin xcbuild.xcrun; + + # Unsup:Pass:XFail:Fail + # 26:267:16:8 + doCheck = false; + checkTarget = "check-openmp"; + + preCheck = '' + patchShebangs ../tools/archer/tests/deflake.bash + ''; + + cmakeFlags = [ + "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" + "-DOPT_TOOL=${llvm}/bin/opt" + "-DLINK_TOOL=${llvm}/bin/llvm-link" + ]; + + meta = llvm_meta // { + homepage = "https://openmp.llvm.org/"; + description = "Support for the OpenMP language"; + longDescription = '' + The OpenMP subproject of LLVM contains the components required to build an + executable OpenMP program that are outside the compiler itself. + Contains the code for the runtime library against which code compiled by + "clang -fopenmp" must be linked before it can run and the library that + supports offload to target devices. + ''; + # "All of the code is dual licensed under the MIT license and the UIUC + # License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/pkgs/development/compilers/llvm/17/openmp/fix-find-tool.patch b/pkgs/development/compilers/llvm/17/openmp/fix-find-tool.patch new file mode 100644 index 0000000000000..b7f51196f7bab --- /dev/null +++ b/pkgs/development/compilers/llvm/17/openmp/fix-find-tool.patch @@ -0,0 +1,17 @@ +diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt +index 630947abec7e..9f032dc7bd3f 100644 +--- a/libomptarget/DeviceRTL/CMakeLists.txt ++++ b/libomptarget/DeviceRTL/CMakeLists.txt +@@ -27,10 +27,10 @@ endif() + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. + # A standalone or LLVM_ENABLE_RUNTIMES=openmp build takes this route +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR}) + find_program(PACKAGER_TOOL clang-offload-packager PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR}) + if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL) OR (NOT PACKAGER_TOOL)) + libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL}, opt: ${OPT_TOOL}, or clang-offload-packager: ${PACKAGER_TOOL}") + return() diff --git a/pkgs/development/compilers/llvm/17/openmp/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/17/openmp/gnu-install-dirs.patch new file mode 100644 index 0000000000000..77a93208832a1 --- /dev/null +++ b/pkgs/development/compilers/llvm/17/openmp/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6ddbe90516d..311ab1d50e7f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,7 +29,7 @@ if (OPENMP_STANDALONE_BUILD) + set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING + "Suffix of lib installation directory, e.g. 64 => lib64") + # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. +- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + + # Group test settings. + set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING +@@ -40,7 +40,7 @@ if (OPENMP_STANDALONE_BUILD) + else() + set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) + # If building in tree, we honor the same install suffix LLVM uses. +- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + + if (NOT MSVC) + set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) diff --git a/pkgs/development/compilers/llvm/17/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/17/openmp/run-lit-directly.patch new file mode 100644 index 0000000000000..e69de29bb2d1d --- /dev/null +++ b/pkgs/development/compilers/llvm/17/openmp/run-lit-directly.patch diff --git a/pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch b/pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch deleted file mode 100644 index 764dddd966cbb..0000000000000 --- a/pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8412cba68835f8f4cc527d02194b181faa5944d4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de> -Date: Tue, 21 Jan 2020 19:46:09 +0100 -Subject: [PATCH] [HIP] use GetProgramPath for executable discovery - -This change replaces the manual building of executable paths -using llvm::sys::path::append with GetProgramPath. -This enables adding other paths in case executables reside -in different directories and makes the code easier to read. - -Differential Revision: https://reviews.llvm.org/D72903 ---- - clang/lib/Driver/ToolChains/HIP.cpp | 18 ++++++------------ - 1 file changed, 6 insertions(+), 12 deletions(-) - -diff --git a/lib/Driver/ToolChains/HIP.cpp b/lib/Driver/ToolChains/HIP.cpp -index 03acf45a9b3..75fd3226c75 100644 ---- a/lib/Driver/ToolChains/HIP.cpp -+++ b/lib/Driver/ToolChains/HIP.cpp -@@ -98,9 +98,8 @@ const char *AMDGCN::Linker::constructLLVMLinkCommand( - const char *OutputFileName = - C.addTempFile(C.getArgs().MakeArgString(TmpName)); - CmdArgs.push_back(OutputFileName); -- SmallString<128> ExecPath(C.getDriver().Dir); -- llvm::sys::path::append(ExecPath, "llvm-link"); -- const char *Exec = Args.MakeArgString(ExecPath); -+ const char *Exec = -+ Args.MakeArgString(getToolChain().GetProgramPath("llvm-link")); - C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs)); - return OutputFileName; - } -@@ -141,9 +140,8 @@ const char *AMDGCN::Linker::constructOptCommand( - const char *OutputFileName = - C.addTempFile(C.getArgs().MakeArgString(TmpFileName)); - OptArgs.push_back(OutputFileName); -- SmallString<128> OptPath(C.getDriver().Dir); -- llvm::sys::path::append(OptPath, "opt"); -- const char *OptExec = Args.MakeArgString(OptPath); -+ const char *OptExec = -+ Args.MakeArgString(getToolChain().GetProgramPath("opt")); - C.addCommand(llvm::make_unique<Command>(JA, *this, OptExec, OptArgs, Inputs)); - return OutputFileName; - } -@@ -161,9 +159,7 @@ const char *AMDGCN::Linker::constructLlcCommand( - const char *LlcOutputFile = - C.addTempFile(C.getArgs().MakeArgString(LlcOutputFileName)); - LlcArgs.push_back(LlcOutputFile); -- SmallString<128> LlcPath(C.getDriver().Dir); -- llvm::sys::path::append(LlcPath, "llc"); -- const char *Llc = Args.MakeArgString(LlcPath); -+ const char *Llc = Args.MakeArgString(getToolChain().GetProgramPath("llc")); - C.addCommand(llvm::make_unique<Command>(JA, *this, Llc, LlcArgs, Inputs)); - return LlcOutputFile; - } -@@ -178,9 +174,7 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA, - ArgStringList LldArgs{"-flavor", "gnu", "--no-undefined", - "-shared", "-o", Output.getFilename(), - InputFileName}; -- SmallString<128> LldPath(C.getDriver().Dir); -- llvm::sys::path::append(LldPath, "lld"); -- const char *Lld = Args.MakeArgString(LldPath); -+ const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld")); - C.addCommand(llvm::make_unique<Command>(JA, *this, Lld, LldArgs, Inputs)); - } - --- -2.23.1 - diff --git a/pkgs/development/compilers/llvm/7/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/clang/gnu-install-dirs.patch deleted file mode 100644 index 540c043a2db9a..0000000000000 --- a/pkgs/development/compilers/llvm/7/clang/gnu-install-dirs.patch +++ /dev/null @@ -1,281 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 52b881939499..85662a2113e7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.4.3) - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) - project(Clang) - -+ include(GNUInstallDirs) -+ - # Rely on llvm-config. - set(CONFIG_OUTPUT) - find_program(LLVM_CONFIG "llvm-config") -@@ -374,7 +376,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/clang include/clang-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.def" - PATTERN "*.h" -@@ -383,7 +385,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "CMakeFiles" EXCLUDE - PATTERN "*.inc" -@@ -391,7 +393,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(PROGRAMS utils/bash-autocomplete.sh -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - ) - endif() - -diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index c09a8423f9f6..39f37e0097eb 100644 ---- a/cmake/modules/AddClang.cmake -+++ b/cmake/modules/AddClang.cmake -@@ -99,9 +99,9 @@ macro(add_clang_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_clangtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_llvm_install_targets(install-${name} -@@ -141,7 +141,7 @@ macro(add_clang_tool name) - - install(TARGETS ${name} - ${export_to_clangtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -156,5 +156,5 @@ endmacro() - macro(add_clang_symlink name dest) - add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) - # Always generate install targets -- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) -+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) - endmacro() -diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index 1930d8e225c7..bb9158093079 100644 ---- a/lib/Headers/CMakeLists.txt -+++ b/lib/Headers/CMakeLists.txt -@@ -162,19 +162,19 @@ install( - FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h - COMPONENT clang-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) - - install( - FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_fp16.h - COMPONENT clang-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) - - install( - FILES ${cuda_wrapper_files} - COMPONENT clang-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) - - if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. - add_llvm_install_targets(install-clang-headers -diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt -index 53e3421f1b35..79ae5bb4c399 100644 ---- a/tools/c-index-test/CMakeLists.txt -+++ b/tools/c-index-test/CMakeLists.txt -@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH - "@executable_path/../../lib") - else() -- set(INSTALL_DESTINATION bin) -+ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - - install(TARGETS c-index-test -diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt -index c5ace26c2914..97bdfca7d896 100644 ---- a/tools/clang-check/CMakeLists.txt -+++ b/tools/clang-check/CMakeLists.txt -@@ -20,4 +20,4 @@ target_link_libraries(clang-check - ) - - install(TARGETS clang-check -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt -index a295e8cd0b2a..1973ff82c7f6 100644 ---- a/tools/clang-format/CMakeLists.txt -+++ b/tools/clang-format/CMakeLists.txt -@@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE ) - endif() - - install(PROGRAMS clang-format-bbedit.applescript -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format-diff.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format-sublime.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format.el -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS git-clang-format -- DESTINATION bin -+ DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT clang-format) -diff --git a/tools/clang-func-mapping/CMakeLists.txt b/tools/clang-func-mapping/CMakeLists.txt -index ae28e28d532d..8ecb2e37a8f7 100644 ---- a/tools/clang-func-mapping/CMakeLists.txt -+++ b/tools/clang-func-mapping/CMakeLists.txt -@@ -20,4 +20,4 @@ target_link_libraries(clang-func-mapping - ) - - install(TARGETS clang-func-mapping -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt -index 8718015be76a..7a038f39622e 100644 ---- a/tools/clang-offload-bundler/CMakeLists.txt -+++ b/tools/clang-offload-bundler/CMakeLists.txt -@@ -22,4 +22,4 @@ target_link_libraries(clang-offload-bundler - ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} - ) - --install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) -+install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt -index 3b3ab1540a80..9aca9ba4a2cf 100644 ---- a/tools/clang-rename/CMakeLists.txt -+++ b/tools/clang-rename/CMakeLists.txt -@@ -18,8 +18,8 @@ target_link_libraries(clang-rename - ) - - install(PROGRAMS clang-rename.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-rename) - install(PROGRAMS clang-rename.el -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-rename) -diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt -index 96d1c390249c..41c762b37b76 100644 ---- a/tools/diagtool/CMakeLists.txt -+++ b/tools/diagtool/CMakeLists.txt -@@ -21,7 +21,7 @@ target_link_libraries(diagtool - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(TARGETS diagtool - COMPONENT diagtool -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (NOT CMAKE_CONFIGURATION_TYPES) - add_llvm_install_targets(install-diagtool -diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index e539c8308e75..4e1fbccea35d 100644 ---- a/tools/libclang/CMakeLists.txt -+++ b/tools/libclang/CMakeLists.txt -@@ -130,7 +130,7 @@ endif() - if(INTERNAL_INSTALL_PREFIX) - set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") - else() -- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) -+ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - endif() - - install(DIRECTORY ../../include/clang-c -diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt -index 380379300b09..adfd58ed5f7d 100644 ---- a/tools/scan-build/CMakeLists.txt -+++ b/tools/scan-build/CMakeLists.txt -@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/bin/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) -- install(PROGRAMS bin/${BinFile} DESTINATION bin) -+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() - - foreach(LibexecFile ${LibexecFiles}) -@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/libexec/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) -- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) -+ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) - endforeach() - - foreach(ManPage ${ManPages}) -@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/share/scan-build/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) -- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) -+ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) - endforeach() - - add_custom_target(scan-build ALL DEPENDS ${Depends}) -diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt -index b305ca562a72..554bcb379061 100644 ---- a/tools/scan-view/CMakeLists.txt -+++ b/tools/scan-view/CMakeLists.txt -@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) - ${CMAKE_BINARY_DIR}/bin/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) -- install(PROGRAMS bin/${BinFile} DESTINATION bin) -+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() - - foreach(ShareFile ${ShareFiles}) -@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) - ${CMAKE_BINARY_DIR}/share/scan-view/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) -- install(FILES share/${ShareFile} DESTINATION share/scan-view) -+ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) - endforeach() - - add_custom_target(scan-view ALL DEPENDS ${Depends}) -diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt -index 5573009d343a..24b3a90f233f 100644 ---- a/utils/hmaptool/CMakeLists.txt -+++ b/utils/hmaptool/CMakeLists.txt -@@ -9,7 +9,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL}) - - list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) --install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION bin) -+install(PROGRAMS ${CLANG_HMAPTOOL} DESTINATION ${CMAKE_INSTALL_BINDIR}) - - add_custom_target(hmaptool ALL DEPENDS ${Depends}) - set_target_properties(hmaptool PROPERTIES FOLDER "Utils") diff --git a/pkgs/development/compilers/llvm/7/clang/unwindlib.patch b/pkgs/development/compilers/llvm/7/clang/unwindlib.patch deleted file mode 100644 index 59a092d7c7069..0000000000000 --- a/pkgs/development/compilers/llvm/7/clang/unwindlib.patch +++ /dev/null @@ -1,227 +0,0 @@ -commit a5cacb5ba7f1f18e7bb6f6709e42683eeb7e6470 -Author: Sterling Augustine <saugustine@google.com> -Date: Tue Mar 19 20:01:59 2019 +0000 - - Add --unwindlib=[libgcc|compiler-rt] to parallel --rtlib= [take 2] - - "clang++ hello.cc --rtlib=compiler-rt" - - now can works without specifying additional unwind or exception - handling libraries. - - This reworked version of the feature no longer modifies today's default - unwind library for compiler-rt: which is nothing. Rather, a user - can specify -DCLANG_DEFAULT_UNWINDLIB=libunwind when configuring - the compiler. - - This should address the issues from the previous version. - - Update tests for new --unwindlib semantics. - - Differential Revision: https://reviews.llvm.org/D59109 - - llvm-svn: 356508 - -diff --git clang/CMakeLists.txt clang/CMakeLists.txt -index 52b881939499..2c3fb62f6e73 100644 ---- clang/CMakeLists.txt -+++ clang/CMakeLists.txt -@@ -244,6 +244,24 @@ if (NOT(CLANG_DEFAULT_RTLIB STREQUAL "" OR - "Default runtime library to use (\"libgcc\" or \"compiler-rt\", empty for platform default)" FORCE) - endif() - -+set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING -+ "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty to match runtime library.)") -+if (CLANG_DEFAULT_UNWINDLIB STREQUAL "") -+ if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc") -+ set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE) -+ elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind") -+ set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE) -+ endif() -+endif() -+ -+if (NOT(CLANG_DEFAULT_UNWINDLIB STREQUAL "none" OR -+ CLANG_DEFAULT_UNWINDLIB STREQUAL "libgcc" OR -+ CLANG_DEFAULT_UNWINDLIB STREQUAL "libunwind")) -+ message(WARNING "Resetting default unwindlib to use platform default") -+ set(CLANG_DEFAULT_UNWINDLIB "" CACHE STRING -+ "Default unwind library to use (\"none\" \"libgcc\" or \"libunwind\", empty for none)" FORCE) -+endif() -+ - set(CLANG_DEFAULT_OBJCOPY "objcopy" CACHE STRING - "Default objcopy executable to use.") - -diff --git clang/include/clang/Basic/DiagnosticDriverKinds.td clang/include/clang/Basic/DiagnosticDriverKinds.td -index 7f75f45c6578..7e1bb33b5cef 100644 ---- clang/include/clang/Basic/DiagnosticDriverKinds.td -+++ clang/include/clang/Basic/DiagnosticDriverKinds.td -@@ -52,6 +52,10 @@ def err_drv_invalid_rtlib_name : Error< - "invalid runtime library name in argument '%0'">; - def err_drv_unsupported_rtlib_for_platform : Error< - "unsupported runtime library '%0' for platform '%1'">; -+def err_drv_invalid_unwindlib_name : Error< -+ "invalid unwind library name in argument '%0'">; -+def err_drv_incompatible_unwindlib : Error< -+ "--rtlib=libgcc requires --unwindlib=libgcc">; - def err_drv_invalid_stdlib_name : Error< - "invalid library name in argument '%0'">; - def err_drv_invalid_output_with_multiple_archs : Error< -diff --git clang/include/clang/Config/config.h.cmake clang/include/clang/Config/config.h.cmake -index 1d624450b9d9..2d4cb747e87e 100644 ---- clang/include/clang/Config/config.h.cmake -+++ clang/include/clang/Config/config.h.cmake -@@ -23,6 +23,9 @@ - /* Default runtime library to use. */ - #define CLANG_DEFAULT_RTLIB "${CLANG_DEFAULT_RTLIB}" - -+/* Default unwind library to use. */ -+#define CLANG_DEFAULT_UNWINDLIB "${CLANG_DEFAULT_UNWINDLIB}" -+ - /* Default objcopy to use */ - #define CLANG_DEFAULT_OBJCOPY "${CLANG_DEFAULT_OBJCOPY}" - -diff --git clang/include/clang/Driver/Options.td clang/include/clang/Driver/Options.td -index 601aa8744967..0e74a2d36dea 100644 ---- clang/include/clang/Driver/Options.td -+++ clang/include/clang/Driver/Options.td -@@ -2428,6 +2428,8 @@ def std_EQ : Joined<["-", "--"], "std=">, Flags<[CC1Option]>, - }]>; - def stdlib_EQ : Joined<["-", "--"], "stdlib=">, Flags<[CC1Option]>, - HelpText<"C++ standard library to use">, Values<"libc++,libstdc++,platform">; -+def unwindlib_EQ : Joined<["-", "--"], "unwindlib=">, Flags<[CC1Option]>, -+ HelpText<"Unwind library to use">, Values<"libgcc,unwindlib,platform">; - def sub__library : JoinedOrSeparate<["-"], "sub_library">; - def sub__umbrella : JoinedOrSeparate<["-"], "sub_umbrella">; - def system_header_prefix : Joined<["--"], "system-header-prefix=">, -diff --git clang/include/clang/Driver/ToolChain.h clang/include/clang/Driver/ToolChain.h -index 2f9c2c190e32..d5b131bcf112 100644 ---- clang/include/clang/Driver/ToolChain.h -+++ clang/include/clang/Driver/ToolChain.h -@@ -99,6 +99,12 @@ public: - RLT_Libgcc - }; - -+ enum UnwindLibType { -+ UNW_None, -+ UNW_CompilerRT, -+ UNW_Libgcc -+ }; -+ - enum RTTIMode { - RM_Enabled, - RM_Disabled, -@@ -352,6 +358,10 @@ public: - return ToolChain::CST_Libstdcxx; - } - -+ virtual UnwindLibType GetDefaultUnwindLibType() const { -+ return ToolChain::UNW_None; -+ } -+ - virtual std::string getCompilerRTPath() const; - - virtual std::string getCompilerRT(const llvm::opt::ArgList &Args, -@@ -484,6 +494,10 @@ public: - // given compilation arguments. - virtual CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const; - -+ // GetUnwindLibType - Determine the unwind library type to use with the -+ // given compilation arguments. -+ virtual UnwindLibType GetUnwindLibType(const llvm::opt::ArgList &Args) const; -+ - /// AddClangCXXStdlibIncludeArgs - Add the clang -cc1 level arguments to set - /// the include paths to use for the given C++ standard library type. - virtual void -diff --git clang/lib/Driver/ToolChain.cpp clang/lib/Driver/ToolChain.cpp -index cf3db34688df..d980dd5d23fb 100644 ---- clang/lib/Driver/ToolChain.cpp -+++ clang/lib/Driver/ToolChain.cpp -@@ -665,6 +665,33 @@ ToolChain::RuntimeLibType ToolChain::GetRuntimeLibType( - return GetDefaultRuntimeLibType(); - } - -+ToolChain::UnwindLibType ToolChain::GetUnwindLibType( -+ const ArgList &Args) const { -+ const Arg *A = Args.getLastArg(options::OPT_unwindlib_EQ); -+ StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_UNWINDLIB; -+ -+ if (LibName == "none") -+ return ToolChain::UNW_None; -+ else if (LibName == "platform" || LibName == "") { -+ ToolChain::RuntimeLibType RtLibType = GetRuntimeLibType(Args); -+ if (RtLibType == ToolChain::RLT_CompilerRT) -+ return ToolChain::UNW_None; -+ else if (RtLibType == ToolChain::RLT_Libgcc) -+ return ToolChain::UNW_Libgcc; -+ } else if (LibName == "libunwind") { -+ if (GetRuntimeLibType(Args) == RLT_Libgcc) -+ getDriver().Diag(diag::err_drv_incompatible_unwindlib); -+ return ToolChain::UNW_CompilerRT; -+ } else if (LibName == "libgcc") -+ return ToolChain::UNW_Libgcc; -+ -+ if (A) -+ getDriver().Diag(diag::err_drv_invalid_unwindlib_name) -+ << A->getAsString(Args); -+ -+ return GetDefaultUnwindLibType(); -+} -+ - ToolChain::CXXStdlibType ToolChain::GetCXXStdlibType(const ArgList &Args) const{ - const Arg *A = Args.getLastArg(options::OPT_stdlib_EQ); - StringRef LibName = A ? A->getValue() : CLANG_DEFAULT_CXX_STDLIB; -diff --git clang/test/Driver/compiler-rt-unwind.c clang/test/Driver/compiler-rt-unwind.c -new file mode 100644 -index 000000000000..00024dfa7ed3 ---- /dev/null -+++ clang/test/Driver/compiler-rt-unwind.c -@@ -0,0 +1,49 @@ -+// General tests that the driver handles combinations of --rtlib=XXX and -+// --unwindlib=XXX properly. -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=x86_64-unknown-linux \ -+// RUN: --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=RTLIB-EMPTY %s -+// RTLIB-EMPTY: "{{.*}}lgcc" -+// RTLIB-EMPTY: "{{.*}}-lgcc_s" -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=x86_64-unknown-linux -rtlib=libgcc \ -+// RUN: --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=RTLIB-GCC %s -+// RTLIB-GCC: "{{.*}}lgcc" -+// RTLIB-GCC: "{{.*}}lgcc_s" -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \ -+// RUN: --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER-RT %s -+// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "{{.*}}lgcc" -+// RTLIB-GCC-UNWINDLIB-COMPILER-RT: "{{.*}}lunwind" -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt \ -+// RUN: --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT %s -+// RTLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins-x86_64.a" -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \ -+// RUN: --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC %s -+// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}libclang_rt.builtins-x86_64.a" -+// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}lgcc_s" -+// -+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ -+// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \ -+// RUN: -static --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC %s -+// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}libclang_rt.builtins-x86_64.a" -+// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}lgcc_eh" -+// -+// RUN: not %clang -no-canonical-prefixes %s -o %t.o 2> %t.err \ -+// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=libunwind \ -+// RUN: --gcc-toolchain="" \ -+// RUN: FileCheck --input-file=%t.err --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER_RT %s -+// RTLIB-GCC-UNWINDLIB-COMPILER_RT: "{{[.|\\\n]*}}--rtlib=libgcc requires --unwindlib=libgcc" diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/7/compiler-rt/armv7l.patch deleted file mode 100644 index 89d7f1aec918c..0000000000000 --- a/pkgs/development/compilers/llvm/7/compiler-rt/armv7l.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ur compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake ---- compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake 2018-05-25 06:36:27.000000000 +0900 -+++ compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-09 20:26:33.030608692 +0900 -@@ -24,7 +24,7 @@ - - - set(ARM64 aarch64) --set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) -+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) - set(HEXAGON hexagon) - set(X86 i386) - set(X86_64 x86_64) -diff -ur compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt ---- compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt 2018-07-31 03:18:59.000000000 +0900 -+++ compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-09 20:27:38.893409318 +0900 -@@ -453,6 +453,7 @@ - set(armv7_SOURCES ${arm_SOURCES}) - set(armv7s_SOURCES ${arm_SOURCES}) - set(armv7k_SOURCES ${arm_SOURCES}) -+set(armv7l_SOURCES ${arm_SOURCES}) - set(arm64_SOURCES ${aarch64_SOURCES}) - - # macho_embedded archs -@@ -563,12 +564,12 @@ - set(_arch ${arch}) - if("${arch}" STREQUAL "armv6m") - set(_arch "arm|armv6m") -- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") -+ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") - set(_arch "arm") - endif() - - # For ARM archs, exclude any VFP builtins if VFP is not supported -- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") -+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") - string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") - check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) - if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/crtbegin-and-end.patch b/pkgs/development/compilers/llvm/7/compiler-rt/crtbegin-and-end.patch deleted file mode 100644 index e63be181f95cc..0000000000000 --- a/pkgs/development/compilers/llvm/7/compiler-rt/crtbegin-and-end.patch +++ /dev/null @@ -1,595 +0,0 @@ -Get crtbegin and crtend without compiler GCC! PR is at https://reviews.llvm.org/D28791 - -Index: compiler-rt/CMakeLists.txt -=================================================================== ---- compiler-rt/CMakeLists.txt -+++ compiler-rt/CMakeLists.txt -@@ -29,6 +29,8 @@ - - option(COMPILER_RT_BUILD_BUILTINS "Build builtins" ON) - mark_as_advanced(COMPILER_RT_BUILD_BUILTINS) -+option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON) -+mark_as_advanced(COMPILER_RT_BUILD_CRT) - option(COMPILER_RT_BUILD_SANITIZERS "Build sanitizers" ON) - mark_as_advanced(COMPILER_RT_BUILD_SANITIZERS) - option(COMPILER_RT_BUILD_XRAY "Build xray" ON) -Index: compiler-rt/cmake/Modules/AddCompilerRT.cmake -=================================================================== ---- compiler-rt/cmake/Modules/AddCompilerRT.cmake -+++ compiler-rt/cmake/Modules/AddCompilerRT.cmake -@@ -132,7 +132,7 @@ - # Adds static or shared runtime for a list of architectures and operating - # systems and puts it in the proper directory in the build and install trees. - # add_compiler_rt_runtime(<name> --# {STATIC|SHARED} -+# {OBJECT|STATIC|SHARED} - # ARCHS <architectures> - # OS <os list> - # SOURCES <source files> -@@ -144,8 +144,8 @@ - # PARENT_TARGET <convenience parent target> - # ADDITIONAL_HEADERS <header files>) - function(add_compiler_rt_runtime name type) -- if(NOT type MATCHES "^(STATIC|SHARED)$") -- message(FATAL_ERROR "type argument must be STATIC or SHARED") -+ if(NOT type MATCHES "^(OBJECT|STATIC|SHARED)$") -+ message(FATAL_ERROR "type argument must be OBJECT, STATIC or SHARED") - return() - endif() - cmake_parse_arguments(LIB -@@ -204,7 +204,10 @@ - message(FATAL_ERROR "Architecture ${arch} can't be targeted") - return() - endif() -- if(type STREQUAL "STATIC") -+ if(type STREQUAL "OBJECT") -+ set(libname "${name}-${arch}") -+ set(output_name_${libname} ${libname}${COMPILER_RT_OS_SUFFIX}) -+ elseif(type STREQUAL "STATIC") - set(libname "${name}-${arch}") - set_output_name(output_name_${libname} ${name} ${arch}) - else() -@@ -270,12 +273,34 @@ - set(COMPONENT_OPTION COMPONENT ${libname}) - endif() - -- add_library(${libname} ${type} ${sources_${libname}}) -- set_target_compile_flags(${libname} ${extra_cflags_${libname}}) -- set_target_link_flags(${libname} ${extra_link_flags_${libname}}) -- set_property(TARGET ${libname} APPEND PROPERTY -- COMPILE_DEFINITIONS ${LIB_DEFS}) -- set_target_output_directories(${libname} ${output_dir_${libname}}) -+ if(type STREQUAL "OBJECT") -+ string(TOUPPER ${CMAKE_BUILD_TYPE} config) -+ get_property(cflags SOURCE ${sources_${libname}} PROPERTY COMPILE_FLAGS) -+ separate_arguments(cflags) -+ add_custom_command( -+ OUTPUT ${output_dir_${libname}}/${libname}.o -+ COMMAND ${CMAKE_C_COMPILER} ${sources_${libname}} ${cflags} ${extra_cflags_${libname}} -c -o ${output_dir_${libname}}/${libname}.o -+ DEPENDS ${sources_${libname}} -+ COMMENT "Building C object ${libname}.o") -+ add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${libname}.o) -+ install(FILES ${output_dir_${libname}}/${libname}.o -+ DESTINATION ${install_dir_${libname}} -+ ${COMPONENT_OPTION}) -+ else() -+ add_library(${libname} ${type} ${sources_${libname}}) -+ set_target_compile_flags(${libname} ${extra_cflags_${libname}}) -+ set_target_link_flags(${libname} ${extra_link_flags_${libname}}) -+ set_property(TARGET ${libname} APPEND PROPERTY -+ COMPILE_DEFINITIONS ${LIB_DEFS}) -+ set_target_output_directories(${libname} ${output_dir_${libname}}) -+ install(TARGETS ${libname} -+ ARCHIVE DESTINATION ${install_dir_${libname}} -+ ${COMPONENT_OPTION} -+ LIBRARY DESTINATION ${install_dir_${libname}} -+ ${COMPONENT_OPTION} -+ RUNTIME DESTINATION ${install_dir_${libname}} -+ ${COMPONENT_OPTION}) -+ endif() - set_target_properties(${libname} PROPERTIES - OUTPUT_NAME ${output_name_${libname}}) - set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime") -@@ -299,13 +324,6 @@ - ) - endif() - endif() -- install(TARGETS ${libname} -- ARCHIVE DESTINATION ${install_dir_${libname}} -- ${COMPONENT_OPTION} -- LIBRARY DESTINATION ${install_dir_${libname}} -- ${COMPONENT_OPTION} -- RUNTIME DESTINATION ${install_dir_${libname}} -- ${COMPONENT_OPTION}) - - # We only want to generate per-library install targets if you aren't using - # an IDE because the extra targets get cluttered in IDEs. -Index: compiler-rt/cmake/config-ix.cmake -=================================================================== ---- compiler-rt/cmake/config-ix.cmake -+++ compiler-rt/cmake/config-ix.cmake -@@ -227,6 +227,7 @@ - ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} ${S390X}) - set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} - ${MIPS32} ${MIPS64} ${PPC64} ${S390X}) -+set(ALL_CRT_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}) - set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64}) - set(ALL_FUZZER_SUPPORTED_ARCH ${X86_64} ${ARM64}) - -@@ -474,6 +475,7 @@ - SANITIZER_COMMON_SUPPORTED_ARCH) - - else() -+ filter_available_targets(CRT_SUPPORTED_ARCH ${ALL_CRT_SUPPORTED_ARCH}) - # Architectures supported by compiler-rt libraries. - filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH - ${ALL_SANITIZER_COMMON_SUPPORTED_ARCH}) -@@ -563,6 +565,12 @@ - - # TODO: Add builtins support. - -+if (CRT_SUPPORTED_ARCH AND OS_NAME MATCHES "Linux") -+ set(COMPILER_RT_HAS_CRT TRUE) -+else() -+ set(COMPILER_RT_HAS_CRT FALSE) -+endif() -+ - if (COMPILER_RT_HAS_SANITIZER_COMMON AND DFSAN_SUPPORTED_ARCH AND - OS_NAME MATCHES "Linux") - set(COMPILER_RT_HAS_DFSAN TRUE) -Index: compiler-rt/lib/CMakeLists.txt -=================================================================== ---- compiler-rt/lib/CMakeLists.txt -+++ compiler-rt/lib/CMakeLists.txt -@@ -17,6 +17,10 @@ - add_subdirectory(builtins) - endif() - -+if(COMPILER_RT_BUILD_CRT) -+ add_subdirectory(crt) -+endif() -+ - function(compiler_rt_build_runtime runtime) - string(TOUPPER ${runtime} runtime_uppercase) - if(COMPILER_RT_HAS_${runtime_uppercase}) -Index: compiler-rt/lib/crt/CMakeLists.txt -=================================================================== ---- /dev/null -+++ compiler-rt/lib/crt/CMakeLists.txt -@@ -0,0 +1,102 @@ -+add_compiler_rt_component(crt) -+ -+function(check_cxx_section_exists section output) -+ cmake_parse_arguments(ARG "" "" "SOURCE;FLAGS" ${ARGN}) -+ if(NOT ARG_SOURCE) -+ set(ARG_SOURCE "int main() { return 0; }\n") -+ endif() -+ -+ string(RANDOM TARGET_NAME) -+ set(TARGET_NAME "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cmTC_${TARGET_NAME}.dir") -+ file(MAKE_DIRECTORY ${TARGET_NAME}) -+ -+ file(WRITE "${TARGET_NAME}/CheckSectionExists.c" "${ARG_SOURCE}\n") -+ -+ string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions -+ ${CMAKE_C_COMPILE_OBJECT}) -+ -+ set(try_compile_flags "${ARG_FLAGS}") -+ if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET) -+ list(APPEND try_compile_flags "-target ${CMAKE_C_COMPILER_TARGET}") -+ endif() -+ -+ string(REPLACE ";" " " extra_flags "${try_compile_flags}") -+ -+ set(test_compile_command "${CMAKE_C_COMPILE_OBJECT}") -+ foreach(substitution ${substitutions}) -+ if(substitution STREQUAL "<CMAKE_C_COMPILER>") -+ string(REPLACE "<CMAKE_C_COMPILER>" -+ "${CMAKE_C_COMPILER}" test_compile_command ${test_compile_command}) -+ elseif(substitution STREQUAL "<OBJECT>") -+ string(REPLACE "<OBJECT>" "${TARGET_NAME}/CheckSectionExists.o" -+ test_compile_command ${test_compile_command}) -+ elseif(substitution STREQUAL "<SOURCE>") -+ string(REPLACE "<SOURCE>" "${TARGET_NAME}/CheckSectionExists.c" -+ test_compile_command ${test_compile_command}) -+ elseif(substitution STREQUAL "<FLAGS>") -+ string(REPLACE "<FLAGS>" "${CMAKE_C_FLAGS} ${extra_flags}" -+ test_compile_command ${test_compile_command}) -+ else() -+ string(REPLACE "${substitution}" "" test_compile_command -+ ${test_compile_command}) -+ endif() -+ endforeach() -+ -+ string(REPLACE " " ";" test_compile_command "${test_compile_command}") -+ -+ execute_process( -+ COMMAND ${test_compile_command} -+ RESULT_VARIABLE TEST_RESULT -+ OUTPUT_VARIABLE TEST_OUTPUT -+ ERROR_VARIABLE TEST_ERROR -+ ) -+ -+ execute_process( -+ COMMAND ${CMAKE_OBJDUMP} -h "${TARGET_NAME}/CheckSectionExists.o" -+ RESULT_VARIABLE CHECK_RESULT -+ OUTPUT_VARIABLE CHECK_OUTPUT -+ ERROR_VARIABLE CHECK_ERROR -+ ) -+ string(FIND "${CHECK_OUTPUT}" "${section}" SECTION_FOUND) -+ -+ if(NOT SECTION_FOUND EQUAL -1) -+ set(${output} TRUE PARENT_SCOPE) -+ else() -+ set(${output} FALSE PARENT_SCOPE) -+ endif() -+ -+ file(REMOVE_RECURSE ${TARGET_NAME}) -+endfunction() -+ -+check_cxx_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY -+ SOURCE "__attribute__((constructor)) void f() {}\nint main() { return 0; }\n") -+ -+append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS) -+append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC CRT_CFLAGS) -+ -+foreach(arch ${CRT_SUPPORTED_ARCH}) -+ add_compiler_rt_runtime(clang_rt.crtbegin -+ OBJECT -+ ARCHS ${arch} -+ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c -+ CFLAGS ${CRT_CFLAGS} -+ PARENT_TARGET crt) -+ add_compiler_rt_runtime(clang_rt.crtbegin_shared -+ OBJECT -+ ARCHS ${arch} -+ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c -+ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED -+ PARENT_TARGET crt) -+ add_compiler_rt_runtime(clang_rt.crtend -+ OBJECT -+ ARCHS ${arch} -+ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c -+ CFLAGS ${CRT_CFLAGS} -+ PARENT_TARGET crt) -+ add_compiler_rt_runtime(clang_rt.crtend_shared -+ OBJECT -+ ARCHS ${arch} -+ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c -+ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED -+ PARENT_TARGET crt) -+endforeach() -Index: compiler-rt/lib/crt/crtbegin.c -=================================================================== ---- /dev/null -+++ compiler-rt/lib/crt/crtbegin.c -@@ -0,0 +1,108 @@ -+/* ===-- crtbegin.c - Start of constructors and destructors ----------------=== -+ * -+ * The LLVM Compiler Infrastructure -+ * -+ * This file is dual licensed under the MIT and the University of Illinois Open -+ * Source Licenses. See LICENSE.TXT for details. -+ * -+ * ===----------------------------------------------------------------------=== -+ */ -+ -+#include <stddef.h> -+ -+__attribute__((visibility("hidden"))) -+#ifdef CRT_SHARED -+void *__dso_handle = &__dso_handle; -+#else -+void *__dso_handle = (void *)0; -+#endif -+ -+static long __EH_FRAME_LIST__[] -+ __attribute__((section(".eh_frame"), aligned(sizeof(void *)))) = {}; -+ -+extern void __register_frame_info(const void *, void *) __attribute__((weak)); -+extern void *__deregister_frame_info(const void *) __attribute__((weak)); -+ -+#ifndef CRT_HAS_INITFINI_ARRAY -+typedef void (*fp)(void); -+ -+static fp __CTOR_LIST__[] -+ __attribute__((section(".ctors"), aligned(sizeof(fp)), used)) = {(fp)-1}; -+extern fp __CTOR_LIST_END__[]; -+#endif -+ -+#ifdef CRT_SHARED -+extern void __cxa_finalize(void *) __attribute__((weak)); -+#endif -+ -+static void __attribute__((used)) __do_init() { -+ static _Bool __initialized; -+ if (__builtin_expect(__initialized, 0)) -+ return; -+ __initialized = 1; -+ -+ static struct { void *p[8]; } __object; -+ if (__register_frame_info) -+ __register_frame_info(__EH_FRAME_LIST__, &__object); -+ -+#ifndef CRT_HAS_INITFINI_ARRAY -+ const size_t n = __CTOR_LIST_END__ - __CTOR_LIST__ - 1; -+ for (size_t i = n; i >= 1; i--) __CTOR_LIST__[i](); -+#endif -+} -+ -+#ifdef CRT_HAS_INITFINI_ARRAY -+__attribute__((section(".init_array"), -+ used)) static void (*__init)(void) = __do_init; -+#else // CRT_HAS_INITFINI_ARRAY -+#if defined(__i386__) || defined(__x86_64__) -+asm(".pushsection .init,\"ax\",@progbits\n\t" -+ "call " __USER_LABEL_PREFIX__ "__do_init\n\t" -+ ".popsection"); -+#elif defined(__arm__) -+asm(".pushsection .init,\"ax\",%progbits\n\t" -+ "bl " __USER_LABEL_PREFIX__ "__do_init\n\t" -+ ".popsection"); -+#endif // CRT_HAS_INITFINI_ARRAY -+#endif -+ -+#ifndef CRT_HAS_INITFINI_ARRAY -+static fp __DTOR_LIST__[] -+ __attribute__((section(".dtors"), aligned(sizeof(fp)), used)) = {(fp)-1}; -+extern fp __DTOR_LIST_END__[]; -+#endif -+ -+static void __attribute__((used)) __do_fini() { -+ static _Bool __finalized; -+ if (__builtin_expect(__finalized, 0)) -+ return; -+ __finalized = 1; -+ -+#ifdef CRT_SHARED -+ if (__cxa_finalize) -+ __cxa_finalize(__dso_handle); -+#endif -+ -+#ifndef CRT_HAS_INITFINI_ARRAY -+ if (__deregister_frame_info) -+ __deregister_frame_info(__EH_FRAME_LIST__); -+ -+ const size_t n = __DTOR_LIST_END__ - __DTOR_LIST__ - 1; -+ for (size_t i = 1; i < n; i++) __DTOR_LIST__[i](); -+#endif -+} -+ -+#ifdef CRT_HAS_INITFINI_ARRAY -+__attribute__((section(".fini_array"), -+ used)) static void (*__fini)(void) = __do_fini; -+#else // CRT_HAS_INITFINI_ARRAY -+#if defined(__i386__) || defined(__x86_64__) -+asm(".pushsection .fini,\"ax\",@progbits\n\t" -+ "call " __USER_LABEL_PREFIX__ "__do_fini\n\t" -+ ".popsection"); -+#elif defined(__arm__) -+asm(".pushsection .fini,\"ax\",%progbits\n\t" -+ "bl " __USER_LABEL_PREFIX__ "__do_fini\n\t" -+ ".popsection"); -+#endif -+#endif // CRT_HAS_INIT_FINI_ARRAY -Index: compiler-rt/lib/crt/crtend.c -=================================================================== ---- /dev/null -+++ compiler-rt/lib/crt/crtend.c -@@ -0,0 +1,24 @@ -+/* ===-- crtend.c - End of constructors and destructors --------------------=== -+ * -+ * The LLVM Compiler Infrastructure -+ * -+ * This file is dual licensed under the MIT and the University of Illinois Open -+ * Source Licenses. See LICENSE.TXT for details. -+ * -+ * ===----------------------------------------------------------------------=== -+ */ -+ -+#include <stdint.h> -+ -+// Put 4-byte zero which is the length field in FDE at the end as a terminator. -+const int32_t __EH_FRAME_LIST_END__[] -+ __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)), -+ visibility("hidden"), used)) = {0}; -+ -+#ifndef CRT_HAS_INITFINI_ARRAY -+typedef void (*fp)(void); -+fp __CTOR_LIST_END__[] -+ __attribute__((section(".ctors"), visibility("hidden"), used)) = {0}; -+fp __DTOR_LIST_END__[] -+ __attribute__((section(".dtors"), visibility("hidden"), used)) = {0}; -+#endif -Index: compiler-rt/test/CMakeLists.txt -=================================================================== ---- compiler-rt/test/CMakeLists.txt -+++ compiler-rt/test/CMakeLists.txt -@@ -73,6 +73,9 @@ - if(COMPILER_RT_BUILD_XRAY) - compiler_rt_test_runtime(xray) - endif() -+ if(COMPILER_RT_HAS_CRT) -+ add_subdirectory(crt) -+ endif() - # ShadowCallStack does not yet provide a runtime with compiler-rt, the tests - # include their own minimal runtime - add_subdirectory(shadowcallstack) -Index: compiler-rt/test/crt/CMakeLists.txt -=================================================================== ---- /dev/null -+++ compiler-rt/test/crt/CMakeLists.txt -@@ -0,0 +1,31 @@ -+set(CRT_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -+ -+set(CRT_TESTSUITES) -+ -+set(CRT_TEST_DEPS "") -+ -+if(NOT COMPILER_RT_STANDALONE_BUILD AND COMPILER_RT_BUILD_CRT AND -+ COMPILER_RT_HAS_CRT) -+ list(APPEND CRT_TEST_DEPS crt) -+endif() -+ -+set(CRT_TEST_ARCH ${CRT_SUPPORTED_ARCH}) -+if (COMPILER_RT_BUILD_CRT AND COMPILER_RT_HAS_CRT) -+ foreach(arch ${CRT_TEST_ARCH}) -+ set(CRT_TEST_TARGET_ARCH ${arch}) -+ string(TOLOWER "-${arch}-${OS_NAME}" CRT_TEST_CONFIG_SUFFIX) -+ get_test_cc_for_arch(${arch} CRT_TEST_TARGET_CC CRT_TEST_TARGET_CFLAGS) -+ string(TOUPPER ${arch} ARCH_UPPER_CASE) -+ set(CONFIG_NAME ${ARCH_UPPER_CASE}${OS_NAME}Config) -+ -+ configure_lit_site_cfg( -+ ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -+ ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg) -+ list(APPEND CRT_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) -+ endforeach() -+endif() -+ -+add_lit_testsuite(check-crt "Running the CRT tests" -+ ${CRT_TESTSUITES} -+ DEPENDS ${CRT_TEST_DEPS}) -+set_target_properties(check-crt PROPERTIES FOLDER "Compiler-RT Misc") -Index: compiler-rt/test/crt/dso_handle.cpp -=================================================================== ---- /dev/null -+++ compiler-rt/test/crt/dso_handle.cpp -@@ -0,0 +1,33 @@ -+// RUN: %clangxx -g -DCRT_SHARED -c %s -fPIC -o %tshared.o -+// RUN: %clangxx -g -c %s -fPIC -o %t.o -+// RUN: %clangxx -g -shared -o %t.so -nostdlib %crti %shared_crtbegin %tshared.o %libstdcxx -lc -lm -lgcc_s %shared_crtend %crtn -+// RUN: %clangxx -g -o %t -nostdlib %crt1 %crti %crtbegin %t.o %libstdcxx -lc -lm %libgcc %t.so %crtend %crtn -+// RUN: %run %t 2>&1 | FileCheck %s -+ -+#include <stdio.h> -+ -+// CHECK: 1 -+// CHECK-NEXT: ~A() -+ -+#ifdef CRT_SHARED -+bool G; -+void C() { -+ printf("%d\n", G); -+} -+ -+struct A { -+ A() { G = true; } -+ ~A() { -+ printf("~A()\n"); -+ } -+}; -+ -+A a; -+#else -+void C(); -+ -+int main() { -+ C(); -+ return 0; -+} -+#endif -Index: compiler-rt/test/crt/lit.cfg -=================================================================== ---- /dev/null -+++ compiler-rt/test/crt/lit.cfg -@@ -0,0 +1,80 @@ -+# -*- Python -*- -+ -+import os -+import subprocess -+ -+# Setup config name. -+config.name = 'CRT' + config.name_suffix -+ -+# Setup source root. -+config.test_source_root = os.path.dirname(__file__) -+ -+ -+def get_library_path(file): -+ cmd = subprocess.Popen([config.clang.strip(), -+ config.target_cflags.strip(), -+ '-print-file-name=%s' % file], -+ stdout=subprocess.PIPE, -+ env=config.environment) -+ if not cmd.stdout: -+ lit_config.fatal("Couldn't find the library path for '%s'" % file) -+ dir = cmd.stdout.read().strip() -+ if sys.platform in ['win32'] and execute_external: -+ # Don't pass dosish path separator to msys bash.exe. -+ dir = dir.replace('\\', '/') -+ # Ensure the result is an ascii string, across Python2.5+ - Python3. -+ return str(dir.decode('ascii')) -+ -+ -+def get_libgcc_file_name(): -+ cmd = subprocess.Popen([config.clang.strip(), -+ config.target_cflags.strip(), -+ '-print-libgcc-file-name'], -+ stdout=subprocess.PIPE, -+ env=config.environment) -+ if not cmd.stdout: -+ lit_config.fatal("Couldn't find the library path for '%s'" % file) -+ dir = cmd.stdout.read().strip() -+ if sys.platform in ['win32'] and execute_external: -+ # Don't pass dosish path separator to msys bash.exe. -+ dir = dir.replace('\\', '/') -+ # Ensure the result is an ascii string, across Python2.5+ - Python3. -+ return str(dir.decode('ascii')) -+ -+ -+def build_invocation(compile_flags): -+ return ' ' + ' '.join([config.clang] + compile_flags) + ' ' -+ -+ -+# Setup substitutions. -+config.substitutions.append( -+ ('%clang ', build_invocation([config.target_cflags]))) -+config.substitutions.append( -+ ('%clangxx ', -+ build_invocation(config.cxx_mode_flags + [config.target_cflags]))) -+ -+base_lib = os.path.join( -+ config.compiler_rt_libdir, "clang_rt.%%s-%s.o" % config.target_arch) -+config.substitutions.append(('%crtbegin', base_lib % "crtbegin")) -+config.substitutions.append(('%shared_crtbegin', base_lib % "crtbegin_shared")) -+config.substitutions.append(('%crtend', base_lib % "crtend")) -+config.substitutions.append(('%shared_crtend', base_lib % "crtend_shared")) -+ -+config.substitutions.append( -+ ('%crt1', get_library_path('crt1.o'))) -+config.substitutions.append( -+ ('%crti', get_library_path('crti.o'))) -+config.substitutions.append( -+ ('%crtn', get_library_path('crtn.o'))) -+ -+config.substitutions.append( -+ ('%libgcc', get_libgcc_file_name())) -+ -+config.substitutions.append( -+ ('%libstdcxx', '-l' + config.sanitizer_cxx_lib.lstrip('lib'))) -+ -+# Default test suffixes. -+config.suffixes = ['.c', '.cc', '.cpp'] -+ -+if config.host_os not in ['Linux']: -+ config.unsupported = True -Index: compiler-rt/test/crt/lit.site.cfg.in -=================================================================== ---- /dev/null -+++ compiler-rt/test/crt/lit.site.cfg.in -@@ -0,0 +1,14 @@ -+@LIT_SITE_CFG_IN_HEADER@ -+ -+# Tool-specific config options. -+config.name_suffix = "@CRT_TEST_CONFIG_SUFFIX@" -+config.crt_lit_source_dir = "@CRT_LIT_SOURCE_DIR@" -+config.target_cflags = "@CRT_TEST_TARGET_CFLAGS@" -+config.target_arch = "@CRT_TEST_TARGET_ARCH@" -+config.sanitizer_cxx_lib = "@SANITIZER_TEST_CXX_LIBNAME@" -+ -+# Load common config for all compiler-rt lit tests -+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") -+ -+# Load tool-specific config that would do the real work. -+lit_config.load_config(config, "@CRT_LIT_SOURCE_DIR@/lit.cfg") diff --git a/pkgs/development/compilers/llvm/7/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/compiler-rt/gnu-install-dirs.patch deleted file mode 100644 index 41b501ec6497d..0000000000000 --- a/pkgs/development/compilers/llvm/7/compiler-rt/gnu-install-dirs.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 86ca2b3ef74b..555103bd97fe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.4.3) - # Check if compiler-rt is built as a standalone project. - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) - project(CompilerRT C CXX ASM) -+ include(GNUInstallDirs) - set(COMPILER_RT_STANDALONE_BUILD TRUE) - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - endif() -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index cd4c704fc824..5abcd1260381 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -478,7 +478,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) - add_custom_target(${target_name} DEPENDS ${dst_file}) - # Install in Clang resource directory. - install(FILES ${file_name} -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR} - COMPONENT ${component}) - add_dependencies(${component} ${target_name}) - -@@ -495,7 +495,7 @@ macro(add_compiler_rt_script name) - add_custom_target(${name} DEPENDS ${dst}) - install(FILES ${dst} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) - endmacro(add_compiler_rt_script src name) - - # Builds custom version of libc++ and installs it in <prefix>. -diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake -index 04cc955980fa..a99f6dfb2f82 100644 ---- a/cmake/Modules/CompilerRTDarwinUtils.cmake -+++ b/cmake/Modules/CompilerRTDarwinUtils.cmake -@@ -377,7 +377,7 @@ macro(darwin_add_embedded_builtin_libraries) - set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) - set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) - - set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") - set(CFLAGS_i386 "-march=pentium") -diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake -index e5651718fa34..d95cfc984a85 100644 ---- a/cmake/Modules/CompilerRTUtils.cmake -+++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -330,7 +330,7 @@ endfunction() - function(get_compiler_rt_install_dir arch install_dir) - if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - get_compiler_rt_target(${arch} target) -- set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${target}/lib PARENT_SCOPE) -+ set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${target}/${CMAKE_INSTALL_FULL_LIBDIR} PARENT_SCOPE) - else() - set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE) - endif() -diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake -index 91fe2494b476..b59a0ffc69f4 100644 ---- a/cmake/base-config-ix.cmake -+++ b/cmake/base-config-ix.cmake -@@ -53,11 +53,11 @@ if (LLVM_TREE_AVAILABLE) - else() - # Take output dir and install path from the user. - set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH -- "Path where built compiler-rt libraries should be stored.") -+ "Path where built compiler-rt build artifacts should be stored.") - set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH - "Path where built compiler-rt executables should be stored.") -- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH -- "Path where built compiler-rt libraries should be installed.") -+ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH -+ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") - option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) - option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) - # Use a host compiler to compile/link tests. -@@ -85,7 +85,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) - set(COMPILER_RT_LIBRARY_OUTPUT_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) - set(COMPILER_RT_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) - endif() - - if(APPLE) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index c4b93b89a30c..3913dc3a1ee6 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -48,12 +48,12 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") - install(FILES ${SANITIZER_HEADERS} - COMPONENT compiler-rt-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) - # Install xray headers. - install(FILES ${XRAY_HEADERS} - COMPONENT compiler-rt-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) - - if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. - add_custom_target(install-compiler-rt-headers -diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt -index b3ae713cf02c..52b364b900f5 100644 ---- a/lib/dfsan/CMakeLists.txt -+++ b/lib/dfsan/CMakeLists.txt -@@ -54,4 +54,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} - DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) - add_dependencies(dfsan dfsan_abilist) - install(FILES ${dfsan_abilist_filename} -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/share) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}) diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix deleted file mode 100644 index 972d52ac6e1a4..0000000000000 --- a/pkgs/development/compilers/llvm/7/default.nix +++ /dev/null @@ -1,273 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake -, preLibcCrossHeaders -, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -# This is the default binutils, but with *this* version of LLD rather -# than the default LLVM version's, if LLD is the choice. We use these for -# the `useLLVM` bootstrapping below. -, bootBintoolsNoLibc ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintoolsNoLibc -, bootBintools ? - if stdenv.targetPlatform.linker == "lld" - then null - else pkgs.bintools -}: - -let - release_version = "7.1.0"; - version = release_version; # differentiating these is important for rc's - - fetch = name: sha256: fetchurl { - url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; - inherit sha256; - }; - - clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w"; - - inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); - mkExtraBuildCommands0 = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" - ''; - - bintoolsNoLibc' = - if bootBintoolsNoLibc == null - then tools.bintoolsNoLibc - else bootBintoolsNoLibc; - bintools' = - if bootBintools == null - then tools.bintools - else bootBintools; - - in { - - libllvm = callPackage ./llvm { - inherit llvm_meta; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libllvm-polly = callPackage ./llvm { - inherit llvm_meta; - enablePolly = true; - }; - - llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; }; - - libclang = callPackage ./clang { - inherit clang-tools-extra_src llvm_meta; - }; - - clang-unwrapped = tools.libclang; - - clang-polly-unwrapped = callPackage ./clang { - inherit llvm_meta; - inherit clang-tools-extra_src; - libllvm = tools.libllvm-polly; - enablePolly = true; - }; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - libcxx.cxxabi - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ./lld { - inherit llvm_meta; - }; - - lldb = callPackage ./lldb { - inherit llvm_meta; - }; - - # Below, is the LLVM bootstrapping logic. It handles building a - # fully LLVM toolchain from scratch. No GCC toolchain should be - # pulled in. As a consequence, it is very quick to build different - # targets provided by LLVM and we can also build for what GCC - # doesn’t support like LLVM. Probably we should move to some other - # file. - - bintools-unwrapped = callPackage ../common/bintools.nix { }; - - bintoolsNoLibc = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - libc = preLibcCrossHeaders; - }; - - bintools = wrapBintoolsWith { - bintools = tools.bintools-unwrapped; - }; - - clangUseLLVM = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - bintools = bintools'; - extraPackages = [ - libcxx.cxxabi - targetLlvmLibraries.compiler-rt - ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ - targetLlvmLibraries.libunwind - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' - echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' - echo "-lunwind" >> $out/nix-support/cc-ldflags - '' + lib.optionalString stdenv.targetPlatform.isWasm '' - echo "-fno-exceptions" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangNoLibcxx = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - echo "-nostdlib++" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangNoLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = '' - echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags - echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands cc; - }; - - clangNoCompilerRt = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintoolsNoLibc'; - extraPackages = [ ]; - extraBuildCommands = '' - echo "-nostartfiles" >> $out/nix-support/cc-cflags - '' + mkExtraBuildCommands0 cc; - }; - - clangNoCompilerRtWithLibc = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = null; - bintools = bintools'; - extraPackages = [ ]; - extraBuildCommands = mkExtraBuildCommands0 cc; - }; - - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - in { - - compiler-rt-libc = callPackage ./compiler-rt { - inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc - else stdenv; - }; - - compiler-rt-no-libc = callPackage ./compiler-rt { - inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv; - }; - - # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = - if stdenv.hostPlatform.isAndroid || (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isDarwin) - then libraries.compiler-rt-libc - else libraries.compiler-rt-no-libc; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ./libcxx { - inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoLibcxx - else stdenv; - }; - - libcxxabi = callPackage ./libcxxabi { - inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoLibcxx - else stdenv; - }; - - libunwind = callPackage ./libunwind { - inherit llvm_meta; - inherit (buildLlvmTools) llvm; - stdenv = if stdenv.hostPlatform.useLLVM or false - then overrideCC stdenv buildLlvmTools.clangNoLibcxx - else stdenv; - }; - - openmp = callPackage ./openmp { - inherit llvm_meta targetLlvm; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/7/libcxx/default.nix b/pkgs/development/compilers/llvm/7/libcxx/default.nix deleted file mode 100644 index 3834e17fb8dde..0000000000000 --- a/pkgs/development/compilers/llvm/7/libcxx/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version -, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi -, libcxxabi, libcxxrt -, enableShared ? !stdenv.hostPlatform.isStatic -}: - -assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; - -stdenv.mkDerivation { - pname = "libcxx"; - inherit version; - - src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4"; - - postUnpack = '' - unpackFile ${libcxxabi.src} - export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" - ''; - - outputs = [ "out" "dev" ]; - - patches = [ - ./gnu-install-dirs.patch - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch - ]; - - # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" - postPatch = '' - substituteInPlace include/__config \ - --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" - ''; - - prePatch = '' - substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" - ''; - - preConfigure = '' - # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package - cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patchShebangs utils/cat_files.py - ''; - - nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.hostPlatform.isMusl python3 - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = [ cxxabi ]; - - cmakeFlags = [ - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=${cxxabi.pname}" - ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib" - ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" - ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ; - - preInstall = lib.optionalString (stdenv.isDarwin) '' - for file in lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - - baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) - installName="$out/lib/$baseName" - abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') - - for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file - done - done - ''; - - passthru = { - isLLVM = true; - inherit cxxabi; - }; - - meta = llvm_meta // { - homepage = "https://libcxx.llvm.org/"; - description = "C++ standard library"; - longDescription = '' - libc++ is an implementation of the C++ standard library, targeting C++11, - C++14 and above. - ''; - # "All of the code in libc++ is dual licensed under the MIT license and the - # UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - }; -} diff --git a/pkgs/development/compilers/llvm/7/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/libcxx/gnu-install-dirs.patch deleted file mode 100644 index 910e5287a866c..0000000000000 --- a/pkgs/development/compilers/llvm/7/libcxx/gnu-install-dirs.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index acb49565ce97..6a863926cbca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,6 +26,8 @@ set(CMAKE_MODULE_PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(libcxx CXX C) - -+ include(GNUInstallDirs) -+ - set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 7.0.0) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake -index 1c19d7e01af7..9c8aee8e8bb7 100644 ---- a/cmake/Modules/HandleLibCXXABI.cmake -+++ b/cmake/Modules/HandleLibCXXABI.cmake -@@ -59,7 +59,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) - - if (LIBCXX_INSTALL_HEADERS) - install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dstdir} -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} - COMPONENT cxx-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index d9def18d725c..16494dacaf6f 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -243,7 +243,7 @@ if (LIBCXX_INSTALL_HEADERS) - foreach(file ${files}) - get_filename_component(dir ${file} DIRECTORY) - install(FILES ${file} -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1/${dir} -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dir} - COMPONENT cxx-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) -@@ -252,7 +252,7 @@ if (LIBCXX_INSTALL_HEADERS) - if (LIBCXX_NEEDS_SITE_CONFIG) - # Install the generated header as __config. - install(FILES ${LIBCXX_BINARY_DIR}/__generated_config -- DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1 -+ DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - RENAME __config - COMPONENT cxx-headers) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index e068edc8a7af..b63ad92d1d78 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -399,8 +399,8 @@ if (LIBCXX_INSTALL_LIBRARY) - set(experimental_lib cxx_experimental) - endif() - install(TARGETS ${LIBCXX_INSTALL_TARGETS} ${filesystem_lib} ${experimental_lib} -- LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -- ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -+ LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -+ ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx - ) - # NOTE: This install command must go after the cxx install command otherwise - # it will not be executed after the library symlinks are installed. -@@ -408,7 +408,7 @@ if (LIBCXX_INSTALL_LIBRARY) - # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx> - # after we required CMake 3.0. - install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" -- DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} - COMPONENT libcxx) - endif() - endif() diff --git a/pkgs/development/compilers/llvm/7/libcxxabi/default.nix b/pkgs/development/compilers/llvm/7/libcxxabi/default.nix deleted file mode 100644 index c33c61361e2ab..0000000000000 --- a/pkgs/development/compilers/llvm/7/libcxxabi/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib, stdenv, llvm_meta, cmake, fetch, libcxx, libunwind, llvm, version -, fetchpatch -, standalone ? stdenv.hostPlatform.useLLVM or false -, withLibunwind ? !stdenv.isDarwin && !stdenv.hostPlatform.isWasm - # on musl the shared objects don't build -, enableShared ? !stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation { - pname = "libcxxabi"; - inherit version; - - src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2"; - - outputs = [ "out" "dev" ]; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - cmakeFlagsArray=($cmakeFlagsArray -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*) ) - '' + lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} - '' + lib.optionalString (!stdenv.cc.isClang) '' - pushd libcxx-* - patch -p2 < ${fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/76ccec07b4fa0cc68dfd07d557e7fb661804a468.patch"; - sha256 = "1lgzkfkp7qinfc6gd8x5di1iq1gqdv81249c6f02chn9q122sbq1"; - }} - popd - ''; - - patches = [ - ./gnu-install-dirs.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional withLibunwind libunwind; - - cmakeFlags = lib.optionals standalone [ - "-DLLVM_ENABLE_LIBCXX=ON" - ] ++ lib.optionals (standalone && withLibunwind) [ - "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF"; - - preInstall = lib.optionalString stdenv.isDarwin '' - for file in lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - - # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" - - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - ${stdenv.cc.targetPrefix}install_name_tool -id $installName $file - - # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes - # libcxxabi to sometimes link against a different version of itself. - # Here we simply make that second reference point to ourselves. - for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file - done - done - ''; - - postInstall = '' - mkdir -p "$dev/include" - install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" - ''; - - passthru = { - libName = "c++abi"; - }; - - meta = llvm_meta // { - homepage = "https://libcxxabi.llvm.org/"; - description = "Provides C++ standard library support"; - longDescription = '' - libc++abi is a new implementation of low level support for a standard C++ library. - ''; - # "All of the code in libc++abi is dual licensed under the MIT license and - # the UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; - }; -} diff --git a/pkgs/development/compilers/llvm/7/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/libcxxabi/gnu-install-dirs.patch deleted file mode 100644 index 92d9e94fdee7d..0000000000000 --- a/pkgs/development/compilers/llvm/7/libcxxabi/gnu-install-dirs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d6648ede1f59..55a8f17ca5e6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,8 @@ set(CMAKE_MODULE_PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(libcxxabi CXX C) - -+ include(GNUInstallDirs) -+ - set(PACKAGE_NAME libcxxabi) - set(PACKAGE_VERSION 7.0.0svn) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 776c51294330..314b45feac69 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -195,8 +195,8 @@ add_custom_target(cxxabi DEPENDS ${LIBCXXABI_BUILD_TARGETS}) - - if (LIBCXXABI_INSTALL_LIBRARY) - install(TARGETS ${LIBCXXABI_INSTALL_TARGETS} -- LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -- ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -+ LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -+ ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi - ) - endif() - diff --git a/pkgs/development/compilers/llvm/7/libunwind/default.nix b/pkgs/development/compilers/llvm/7/libunwind/default.nix deleted file mode 100644 index 426895029b3eb..0000000000000 --- a/pkgs/development/compilers/llvm/7/libunwind/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, llvm_meta, version, fetch, fetchpatch, cmake, llvm -, enableShared ? !stdenv.hostPlatform.isStatic -}: - -stdenv.mkDerivation rec { - pname = "libunwind"; - inherit version; - - src = fetch pname "035dsxs10nyiqd00q07yycvmkjl01yz4jdlrjvmch8klxg4pyjhp"; - - postUnpack = '' - unpackFile ${llvm.src} - cmakeFlagsArray=($cmakeFlagsArray -DLLVM_PATH=$PWD/$(ls -d llvm-*)) - ''; - - patches = [ - ./gnu-install-dirs.patch - ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ - # removes use of `new` that require libc++ - (fetchpatch { - url = "https://github.com/llvm-mirror/libunwind/commit/34a45c630d4c79af403661d267db42fbe7de1178.patch"; - sha256 = "0n0pv6jvcky8pn3srhrf9x5kbnd0d2kia9xlx2g590f5q0bgwfhv"; - }) - # cleans up remaining libc++ dependencies (mostly header inclusions) - (fetchpatch { - url = "https://github.com/llvm-mirror/libunwind/commit/e050272d2eb57eb4e56a37b429a61df2ebb8aa3e.patch"; - sha256 = "170mwmj0wf40iyk1kzdpaiy36rz9n8dpl881h4h7s5da0rh51xya"; - includes = [ "src/libunwind.cpp" "src/UnwindCursor.hpp" ]; - }) - ]; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = lib.optionals (!enableShared) [ - "-DLIBUNWIND_ENABLE_SHARED=OFF" - ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ - "-DLLVM_ENABLE_LIBCXX=ON" - ]; - - meta = llvm_meta // { - # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst - homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library"; - description = "LLVM's unwinder library"; - longDescription = '' - The unwind library provides a family of _Unwind_* functions implementing - the language-neutral stack unwinding portion of the Itanium C++ ABI (Level - I). It is a dependency of the C++ ABI library, and sometimes is a - dependency of other runtimes. - ''; - }; -} diff --git a/pkgs/development/compilers/llvm/7/libunwind/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/libunwind/gnu-install-dirs.patch deleted file mode 100644 index 21d4fa80ea13d..0000000000000 --- a/pkgs/development/compilers/llvm/7/libunwind/gnu-install-dirs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0e48d713837a..05483c367bd1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,6 +18,8 @@ set(CMAKE_MODULE_PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(libunwind) - -+ include(GNUInstallDirs) -+ - # Rely on llvm-config. - set(CONFIG_OUTPUT) - if(NOT LLVM_CONFIG_PATH) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 937159e2cb86..07f8b936e7e5 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -141,8 +141,8 @@ add_custom_target(unwind DEPENDS ${LIBUNWIND_BUILD_TARGETS}) - - if (LIBUNWIND_INSTALL_LIBRARY) - install(TARGETS ${LIBUNWIND_INSTALL_TARGETS} -- LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}lib${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind -- ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}lib${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind) -+ LIBRARY DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind -+ ARCHIVE DESTINATION ${LIBUNWIND_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} COMPONENT unwind) - endif() - - if (NOT CMAKE_CONFIGURATION_TYPES AND LIBUNWIND_INSTALL_LIBRARY) diff --git a/pkgs/development/compilers/llvm/7/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/lld/gnu-install-dirs.patch deleted file mode 100644 index acc2d3d47760b..0000000000000 --- a/pkgs/development/compilers/llvm/7/lld/gnu-install-dirs.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e2fbdbfbbb47..d601b231ebb8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(LLD_BUILT_STANDALONE TRUE) - -+ include(GNUInstallDirs) -+ - find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") - if(NOT LLVM_CONFIG_PATH) - message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") -@@ -203,7 +205,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake -index fa48b428d26b..e7967aad3ceb 100644 ---- a/cmake/modules/AddLLD.cmake -+++ b/cmake/modules/AddLLD.cmake -@@ -20,9 +20,9 @@ macro(add_lld_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_lldtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_llvm_install_targets(install-${name} -@@ -54,7 +54,7 @@ macro(add_lld_tool name) - - install(TARGETS ${name} - ${export_to_lldtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -69,5 +69,5 @@ endmacro() - macro(add_lld_symlink name dest) - add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) - # Always generate install targets -- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) -+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) - endmacro() -diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt -index d8829493fc22..df748a0e749b 100644 ---- a/tools/lld/CMakeLists.txt -+++ b/tools/lld/CMakeLists.txt -@@ -16,7 +16,7 @@ target_link_libraries(lld - ) - - install(TARGETS lld -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld ld64.lld wasm-ld) diff --git a/pkgs/development/compilers/llvm/7/lldb/default.nix b/pkgs/development/compilers/llvm/7/lldb/default.nix deleted file mode 100644 index 02e3cdcb8eb9a..0000000000000 --- a/pkgs/development/compilers/llvm/7/lldb/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib, stdenv, llvm_meta -, fetch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, libxml2 -, libllvm -, libclang -, perl -, python3 -, version -, darwin -}: - -stdenv.mkDerivation rec { - pname = "lldb"; - inherit version; - - src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v"; - - patches = [ - ./gnu-install-dirs.patch - ]; - - postPatch = '' - # Fix up various paths that assume llvm and clang are installed in the same place - sed -i 's,".*ClangConfig.cmake","${libclang.dev}/lib/cmake/clang/ClangConfig.cmake",' \ - cmake/modules/LLDBStandalone.cmake - sed -i 's,".*tools/clang/include","${libclang.dev}/include",' \ - cmake/modules/LLDBStandalone.cmake - sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ - cmake/modules/LLDBStandalone.cmake - sed -i -e 's,message(SEND_ERROR "Cannot find debugserver on system."),,' \ - -e 's,string(STRIP ''${XCODE_DEV_DIR} XCODE_DEV_DIR),,' \ - tools/debugserver/source/CMakeLists.txt - - # Fix /usr/bin references for sandboxed builds. - patchShebangs scripts - ''; - - outputs = [ "out" "lib" "dev" ]; - - nativeBuildInputs = [ - cmake perl python3 which swig - ]; - - buildInputs = [ - ncurses zlib libedit libxml2 libllvm - ] ++ lib.optionals stdenv.isDarwin [ - darwin.libobjc - darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation - darwin.bootstrap_cmds - darwin.apple_sdk.frameworks.Carbon - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.DebugSymbols - ]; - - CXXFLAGS = "-fno-rtti"; - hardeningDisable = [ "format" ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-I${libxml2.dev}/include/libxml2"; - - cmakeFlags = [ - "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - "-DSKIP_DEBUGSERVER=ON" - ] ++ lib.optionals doCheck [ - "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; - - doCheck = false; - - postInstall = '' - mkdir -p $out/share/man/man1 - cp ../docs/lldb.1 $out/share/man/man1/ - ''; - - meta = llvm_meta // { - homepage = "https://lldb.llvm.org/"; - description = "A next-generation high-performance debugger"; - longDescription = '' - LLDB is a next generation, high-performance debugger. It is built as a set - of reusable components which highly leverage existing libraries in the - larger LLVM Project, such as the Clang expression parser and LLVM - disassembler. - ''; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/development/compilers/llvm/7/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/lldb/gnu-install-dirs.patch deleted file mode 100644 index 40645743ecc78..0000000000000 --- a/pkgs/development/compilers/llvm/7/lldb/gnu-install-dirs.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 00ddcdc1488f..af2aa238939a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" - ) - -+include(GNUInstallDirs) -+ - include(LLDBStandalone) - include(LLDBConfig) - include(AddLLDB) -diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake -index 129a5ef7500d..fb3fb3ce655c 100644 ---- a/cmake/modules/AddLLDB.cmake -+++ b/cmake/modules/AddLLDB.cmake -@@ -56,14 +56,14 @@ function(add_lldb_library name) - endif() - install(TARGETS ${name} - COMPONENT ${name} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${out_dir} - ARCHIVE DESTINATION ${out_dir}) - else() - install(TARGETS ${name} - COMPONENT ${name} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - if (NOT CMAKE_CONFIGURATION_TYPES) - add_llvm_install_targets(install-${name} -@@ -121,7 +121,7 @@ function(add_lldb_executable name) - endif() - - if(ARG_GENERATE_INSTALL) -- set(out_dir "bin") -+ set(out_dir "${CMAKE_INSTALL_BINDIR}") - if (LLDB_BUILD_FRAMEWORK AND ARG_INCLUDE_IN_SUITE) - set(out_dir ${LLDB_FRAMEWORK_INSTALL_DIR}/${LLDB_FRAMEWORK_RESOURCE_DIR}) - endif() -diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake -index dae6e365da38..ef272d5de5c0 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -278,7 +278,7 @@ include_directories(BEFORE - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ - COMPONENT lldb-headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -@@ -288,7 +288,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ - COMPONENT lldb-headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt -index b5316540fdf3..3c3c882d503f 100644 ---- a/tools/intel-features/CMakeLists.txt -+++ b/tools/intel-features/CMakeLists.txt -@@ -64,4 +64,4 @@ if (NOT LLDB_DISABLE_PYTHON AND LLDB_BUILD_INTEL_PT) - endif() - - install(TARGETS lldbIntelFeatures -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix deleted file mode 100644 index 71beb79a1cda0..0000000000000 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ /dev/null @@ -1,332 +0,0 @@ -{ lib, stdenv, llvm_meta -, pkgsBuildBuild -, fetch -, fetchpatch -, cmake -, python3 -, libffi -, enableGoldPlugin ? libbfd.hasPluginAPI -, libbfd -, libpfm -, libxml2 -, ncurses -, version -, release_version -, zlib -, buildLlvmTools -, debugVersion ? false -, doCheck ? stdenv.isLinux && (!stdenv.isx86_32) - && (stdenv.hostPlatform == stdenv.buildPlatform) -, enableManpages ? false -, enableSharedLibraries ? !stdenv.hostPlatform.isStatic -# broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 -# broken for the armv7l builder -, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch -, enablePolly ? false -}: - -let - inherit (lib) optional optionals optionalString; - - # Used when creating a versioned symlinks of libLLVM.dylib - versionSuffixes = with lib; - let parts = splitVersion release_version; in - imap (i: _: concatStringsSep "." (take i parts)) parts; - - # Ordinarily we would just the `doCheck` and `checkDeps` functionality - # `mkDerivation` gives us to manage our test dependencies (instead of breaking - # out `doCheck` as a package level attribute). - # - # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in - # particular the children it uses to do feature detection. - # - # This means that python deps we add to `checkDeps` (which the python - # interpreter is made aware of via `$PYTHONPATH` – populated by the python - # setup hook) are not picked up by `lit` which causes it to skip tests. - # - # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work - # because this package is shadowed in `$PATH` by the regular `python3` - # package. - # - # So, we "manually" assemble one python derivation for the package to depend - # on, taking into account whether checks are enabled or not: - python = if doCheck then - let - checkDeps = ps: with ps; [ psutil ]; - in python3.withPackages checkDeps - else python3; - -in stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; - - src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v"; - polly_src = fetch "polly" "16qkns4ab4x0azrvhy4j7cncbyb2rrbdrqj87zphvqxm5pvm8m1h"; - - unpackPhase = '' - unpackFile $src - mv llvm-${version}* llvm - sourceRoot=$PWD/llvm - '' + optionalString enablePolly '' - unpackFile $polly_src - mv polly-* $sourceRoot/tools/polly - ''; - - outputs = [ "out" "lib" "dev" "python" ]; - - nativeBuildInputs = [ cmake python ] - ++ optional enableManpages python3.pkgs.sphinx; - - buildInputs = [ libxml2 libffi ] - ++ optional enablePFM libpfm; # exegesis - - propagatedBuildInputs = [ ncurses zlib ]; - - patches = [ - # backport, fix building rust crates with lto - (fetchpatch { - url = "https://github.com/llvm-mirror/llvm/commit/da1fb72bb305d6bc1f3899d541414146934bf80f.patch"; - sha256 = "0p81gkhc1xhcx0hmnkwyhrn8x8l8fd24xgaj1whni29yga466dwc"; - }) - (fetchpatch { - url = "https://github.com/llvm-mirror/llvm/commit/cc1f2a595ead516812a6c50398f0f3480ebe031f.patch"; - sha256 = "0k6k1p5yisgwx417a67s7sr9930rqh1n0zv5jvply8vjjy4b3kf8"; - }) - - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../../llvm-config-link-static.patch - - ./gnu-install-dirs.patch - - # Fix invalid std::string(nullptr) for GCC 12 - (fetchpatch { - name = "nvptx-gcc-12.patch"; - url = "https://github.com/llvm/llvm-project/commit/99e64623ec9b31def9375753491cc6093c831809.patch"; - sha256 = "0zjfjgavqzi2ypqwqnlvy6flyvdz8hi1anwv0ybwnm2zqixg7za3"; - stripLen = 1; - }) - - ../../llvm-7-musl.patch - ] ++ lib.optionals enablePolly [ - ./gnu-install-dirs-polly.patch - # Add missing isl header includess required to build LLVM 7 + Polly with clang 16. - (fetchpatch { - name = "polly-ppcg-isl-headers.patch"; - url = "https://repo.or.cz/ppcg.git/patch/098ba285306114dc71497f7b51c357f69c9b4472"; - hash = "sha256-c9L30rDROYAMbUSuaK9U/ixyFMlH/Sa1n+VgLODzSCQ="; - extraPrefix = "tools/polly/lib/External/ppcg/"; - stripLen = 1; - }) - ]; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' "" - '' + '' - # FileSystem permissions tests fail with various special bits - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - rm unittests/Support/Path.cpp - '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" - rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - '' + optionalString stdenv.hostPlatform.isAarch32 '' - # skip failing X86 test cases on armv7l - rm test/DebugInfo/X86/debug_addr.ll - rm test/tools/llvm-dwarfdump/X86/debug_addr.s - rm test/tools/llvm-dwarfdump/X86/debug_addr_address_size_mismatch.s - rm test/tools/llvm-dwarfdump/X86/debug_addr_dwarf4.s - rm test/tools/llvm-dwarfdump/X86/debug_addr_unsupported_version.s - rm test/tools/llvm-dwarfdump/X86/debug_addr_version_mismatch.s - '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' - # Seems to require certain floating point hardware (NEON?) - rm test/ExecutionEngine/frem.ll - '' + '' - patchShebangs test/BugPoint/compile-custom.ll.py - '' + '' - # Tweak tests to ignore namespace part of type to support - # gcc-12: https://gcc.gnu.org/PR103598. - # The change below mangles strings like: - # CHECK-NEXT: Starting llvm::Function pass manager run. - # to: - # CHECK-NEXT: Starting {{.*}}Function pass manager run. - for f in \ - test/Other/new-pass-manager.ll \ - test/Other/new-pm-defaults.ll \ - test/Other/new-pm-lto-defaults.ll \ - test/Other/new-pm-thinlto-defaults.ll \ - test/Other/pass-pipeline-parsing.ll \ - test/Transforms/Inline/cgscc-incremental-invalidate.ll \ - test/Transforms/Inline/clear-analyses.ll \ - test/Transforms/LoopUnroll/unroll-loop-invalidation.ll \ - test/Transforms/SCCP/preserve-analysis.ll \ - test/Transforms/SROA/dead-inst.ll \ - test/tools/gold/X86/new-pm.ll \ - ; do - echo "PATCH: $f" - substituteInPlace $f \ - --replace 'Starting llvm::' 'Starting {{.*}}' \ - --replace 'Finished llvm::' 'Finished {{.*}}' - done - ''; - - preConfigure = '' - # Workaround for configure flags that need to have spaces - cmakeFlagsArray+=( - -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - 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 - # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native - # will return different results from the cross llvm-config. - # - # Some flags don't need to be repassed because LLVM already does so (like - # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ - "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ optionals enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ]; - in flagsForLlvmConfig ++ [ - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" - "-DLLVM_ENABLE_DUMP=ON" - ] ++ optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (enableGoldPlugin) [ - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ optionals (isDarwin) [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ( - let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - nativeToolchainFlags = [ - "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" - "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" - "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" - "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" - "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" - ]; - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" - "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" - ]; - in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" - + lib.concatStringsSep ";" (lib.concatLists [ - flagsForLlvmConfig - nativeToolchainFlags - nativeInstallFlags - ]) - ) - ]; - - postBuild = '' - rm -fR $out - ''; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - ''; - - postInstall = '' - mkdir -p $python/share - mv $out/share/opt-viewer $python/share/opt-viewer - moveToOutput "bin/llvm-config*" "$dev" - substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' - '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ${lib.concatMapStringsSep "\n" (v: '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib - '') versionSuffixes} - '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; - - inherit doCheck; - - checkTarget = "check-all"; - - requiredSystemFeatures = [ "big-parallel" ]; - meta = llvm_meta // { - homepage = "https://llvm.org/"; - description = "A collection of modular and reusable compiler and toolchain technologies"; - longDescription = '' - The LLVM Project is a collection of modular and reusable compiler and - toolchain technologies. Despite its name, LLVM has little to do with - traditional virtual machines. The name "LLVM" itself is not an acronym; it - is the full name of the project. - LLVM began as a research project at the University of Illinois, with the - goal of providing a modern, SSA-based compilation strategy capable of - supporting both static and dynamic compilation of arbitrary programming - languages. Since then, LLVM has grown to be an umbrella project consisting - of a number of subprojects, many of which are being used in production by - a wide variety of commercial and open source projects as well as being - widely used in academic research. Code in the LLVM project is licensed - under the "Apache 2.0 License with LLVM exceptions". - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - buildPhase = '' - make docs-llvm-man - ''; - - propagatedBuildInputs = []; - - installPhase = '' - make -C docs install - ''; - - postPatch = null; - postInstall = null; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLVM ${version}"; - }; -}) diff --git a/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs-polly.patch deleted file mode 100644 index 0b2d3b79e41f7..0000000000000 --- a/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs-polly.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt -index 9939097f743e..8cc538da912a 100644 ---- a/tools/polly/CMakeLists.txt -+++ b/tools/polly/CMakeLists.txt -@@ -2,7 +2,11 @@ - if (NOT DEFINED LLVM_MAIN_SRC_DIR) - project(Polly) - cmake_minimum_required(VERSION 3.4.3) -+endif() -+ -+include(GNUInstallDirs) - -+if (NOT DEFINED LLVM_MAIN_SRC_DIR) - # Where is LLVM installed? - find_package(LLVM CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) -@@ -145,14 +149,14 @@ include_directories( - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE - ) - - install(DIRECTORY ${POLLY_BINARY_DIR}/include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE -diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt -index 969292cd6b00..d7aea77bdd20 100644 ---- a/tools/polly/cmake/CMakeLists.txt -+++ b/tools/polly/cmake/CMakeLists.txt -@@ -79,18 +79,18 @@ file(GENERATE - - # Generate PollyConfig.cmake for the install tree. - unset(POLLY_EXPORTS) --set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") -+set(POLLY_INSTALL_PREFIX "") - set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") --set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") --set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") -+set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") -+set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - if (POLLY_BUNDLED_ISL) - set(POLLY_CONFIG_INCLUDE_DIRS -- "${POLLY_INSTALL_PREFIX}/include" -- "${POLLY_INSTALL_PREFIX}/include/polly" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" - ) - else() - set(POLLY_CONFIG_INCLUDE_DIRS -- "${POLLY_INSTALL_PREFIX}/include" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" - ${ISL_INCLUDE_DIRS} - ) - endif() -@@ -100,12 +100,12 @@ endif() - foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) - get_target_property(tgt_type ${tgt} TYPE) - if (tgt_type STREQUAL "EXECUTABLE") -- set(tgt_prefix "bin/") -+ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") - else() -- set(tgt_prefix "lib/") -+ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") - endif() - -- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") -+ set(tgt_path "${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") - file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) - - if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") -diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake -index e48203871884..5bc8a2a52541 100644 ---- a/tools/polly/cmake/polly_macros.cmake -+++ b/tools/polly/cmake/polly_macros.cmake -@@ -44,8 +44,8 @@ macro(add_polly_library name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") - install(TARGETS ${name} - EXPORT LLVMExports -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endmacro(add_polly_library) -diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt -index 8ffd984e542b..261cc19f3238 100644 ---- a/tools/polly/lib/External/CMakeLists.txt -+++ b/tools/polly/lib/External/CMakeLists.txt -@@ -274,7 +274,7 @@ if (POLLY_BUNDLED_ISL) - install(DIRECTORY - ${ISL_SOURCE_DIR}/include/ - ${ISL_BINARY_DIR}/include/ -- DESTINATION include/polly -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly - FILES_MATCHING - PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE diff --git a/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs.patch deleted file mode 100644 index 7e7921e49ab0a..0000000000000 --- a/pkgs/development/compilers/llvm/7/llvm/gnu-install-dirs.patch +++ /dev/null @@ -1,386 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3d3013cedcd..b298d6ef04af 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -275,15 +275,21 @@ if (CMAKE_BUILD_TYPE AND - message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") - endif() - -+include(GNUInstallDirs) -+ - set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - --set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") -+set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING -+ "Path for binary subdirectory (defaults to 'bin')") - mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) - - set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING - "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") - mark_as_advanced(LLVM_UTILS_INSTALL_DIR) - -+set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING -+ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) -+ - # They are used as destination of target generators. - set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) - set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -@@ -531,9 +537,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) - option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) - option (LLVM_ENABLE_BINDINGS "Build bindings." ON) - --set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" -+set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" - CACHE STRING "Doxygen-generated HTML documentation install directory") --set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" -+set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" - CACHE STRING "OCamldoc-generated HTML documentation install directory") - - option (LLVM_BUILD_EXTERNAL_COMPILER_RT -@@ -966,7 +972,7 @@ endif() - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/llvm include/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -@@ -978,7 +984,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index c0f90ba7068d..d656156ff9c8 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -638,11 +638,11 @@ macro(add_llvm_library name) - else() - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO" OR - (LLVM_LINK_LLVM_DYLIB AND ${name} STREQUAL "LLVM")) -- set(install_dir lib${LLVM_LIBDIR_SUFFIX}) -+ set(install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(ARG_SHARED OR BUILD_SHARED_LIBS) - if(WIN32 OR CYGWIN OR MINGW) - set(install_type RUNTIME) -- set(install_dir bin) -+ set(install_dir ${CMAKE_INSTALL_BINDIR}) - else() - set(install_type LIBRARY) - endif() -@@ -684,9 +684,9 @@ macro(add_llvm_loadable_module name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - if(WIN32 OR CYGWIN) - # DLL platform -- set(dlldir "bin") -+ set(dlldir "${CMAKE_INSTALL_BINDIR}") - else() -- set(dlldir "lib${LLVM_LIBDIR_SUFFIX}") -+ set(dlldir "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - endif() - - if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR -@@ -698,7 +698,7 @@ macro(add_llvm_loadable_module name) - install(TARGETS ${name} - ${export_to_llvmexports} - LIBRARY DESTINATION ${dlldir} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endif() -@@ -912,7 +912,7 @@ macro(add_llvm_example name) - endif() - add_llvm_executable(${name} ${ARGN}) - if( LLVM_BUILD_EXAMPLES ) -- install(TARGETS ${name} RUNTIME DESTINATION examples) -+ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") - endmacro(add_llvm_example name) -@@ -1430,7 +1430,7 @@ function(llvm_install_library_symlink name dest type) - set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) - set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) - -- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) -+ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(WIN32 AND "${type}" STREQUAL "SHARED") - set(output_dir bin) - endif() -@@ -1446,7 +1446,7 @@ function(llvm_install_library_symlink name dest type) - endif() - endfunction() - --function(llvm_install_symlink name dest) -+function(llvm_install_symlink name dest output_dir) - cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) - foreach(path ${CMAKE_MODULE_PATH}) - if(EXISTS ${path}/LLVMInstallSymlink.cmake) -@@ -1469,7 +1469,7 @@ function(llvm_install_symlink name dest) - set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) - - install(SCRIPT ${INSTALL_SYMLINK} -- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" -+ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" - COMPONENT ${component}) - - if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE) -@@ -1551,7 +1551,8 @@ function(add_llvm_tool_symlink link_name target) - endif() - - if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) -- llvm_install_symlink(${link_name} ${target}) -+ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) -+ llvm_install_symlink(${link_name} ${target} ${output_dir}) - endif() - endif() - endfunction() -@@ -1635,9 +1636,9 @@ function(llvm_setup_rpath name) - - if (APPLE) - set(_install_name_dir INSTALL_NAME_DIR "@rpath") -- set(_install_rpath "@loader_path/../lib" ${extra_libdir}) -+ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}" ${extra_libdir}) - elseif(UNIX) -- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) - if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") - set_property(TARGET ${name} APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,-z,origin ") -diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake -index 02bab6846376..eff26adb2efc 100644 ---- a/cmake/modules/AddOCaml.cmake -+++ b/cmake/modules/AddOCaml.cmake -@@ -140,9 +140,9 @@ function(add_ocaml_library name) - endforeach() - - if( APPLE ) -- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - elseif( UNIX ) -- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - endif() - list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") - -diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake -index 22e3dcb776aa..ba77b9c195e2 100644 ---- a/cmake/modules/AddSphinxTarget.cmake -+++ b/cmake/modules/AddSphinxTarget.cmake -@@ -73,7 +73,7 @@ function (add_sphinx_target builder project) - - elseif (builder STREQUAL html) - string(TOUPPER "${project}" project_upper) -- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" -+ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" - CACHE STRING "HTML documentation install directory for ${project}") - - # '/.' indicates: copy the contents of the directory directly into -diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index 6c316a2f04fb..129c0995059c 100644 ---- a/cmake/modules/CMakeLists.txt -+++ b/cmake/modules/CMakeLists.txt -@@ -1,4 +1,4 @@ --set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) -+set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") - - # First for users who use an installed LLVM, create the LLVMExports.cmake file. -@@ -90,11 +90,11 @@ foreach(p ${_count}) - set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} - get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") - endforeach(p) --set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") --set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") -+set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") -+set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") - set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") - set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") --set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") -+set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") - set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") - set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}") - configure_file( -diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake -index 1a04de931ff7..1c5ea4200635 100644 ---- a/cmake/modules/LLVMInstallSymlink.cmake -+++ b/cmake/modules/LLVMInstallSymlink.cmake -@@ -10,7 +10,7 @@ function(install_symlink name target outdir) - set(LINK_OR_COPY copy) - endif() - -- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") -+ set(bindir "${DESTDIR}${outdir}/") - - message("Creating ${name}") - -diff --git a/docs/CMake.rst b/docs/CMake.rst -index cbcadc212498..a3da96546f43 100644 ---- a/docs/CMake.rst -+++ b/docs/CMake.rst -@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. - **LLVM_LIBDIR_SUFFIX**:STRING - Extra suffix to append to the directory where libraries are to be - installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` -- to install libraries to ``/usr/lib64``. -+ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. - - **CMAKE_C_FLAGS**:STRING - Extra flags to use when compiling C source files. -@@ -473,8 +473,8 @@ LLVM-specific variables - - **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING - The path to install Doxygen-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/doxygen-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. - - **LLVM_ENABLE_SPHINX**:BOOL - If specified, CMake will search for the ``sphinx-build`` executable and will make -@@ -505,13 +505,33 @@ LLVM-specific variables - - **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING - The path to install Sphinx-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. - - **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING - The path to install OCamldoc-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/ocaml-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. -+ -+**CMAKE_INSTALL_BINDIR**:STRING -+ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `bin`. -+ -+**CMAKE_INSTALL_LIBDIR**:STRING -+ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `lib`. -+ -+**CMAKE_INSTALL_INCLUDEDIR**:STRING -+ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `include`. -+ -+**CMAKE_INSTALL_DOCDIR**:STRING -+ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `share/doc`. -+ -+**CMAKE_INSTALL_MANDIR**:STRING -+ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `share/man`. - - **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL - OS X Only: If enabled CMake will generate a target named -@@ -676,9 +696,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). - - This file is available in two different locations. - --* ``<INSTALL_PREFIX>/lib/cmake/llvm/LLVMConfig.cmake`` where -- ``<INSTALL_PREFIX>`` is the install prefix of an installed version of LLVM. -- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. -+* ``<LLVM_INSTALL_PACKAGE_DIR>LLVMConfig.cmake`` where -+ ``<LLVM_INSTALL_PACKAGE_DIR>`` is the location where LLVM CMake modules are -+ installed as part of an installed version of LLVM. This is typically -+ ``cmake/llvm/`` within the lib directory. On Linux, this is typically -+ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. - - * ``<LLVM_BUILD_ROOT>/lib/cmake/llvm/LLVMConfig.cmake`` where - ``<LLVM_BUILD_ROOT>`` is the root of the LLVM build tree. **Note: this is only -diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt -index 1d5ca3ba92b0..026f5453c1da 100644 ---- a/include/llvm/CMakeLists.txt -+++ b/include/llvm/CMakeLists.txt -@@ -4,5 +4,5 @@ add_subdirectory(Support) - # If we're doing an out-of-tree build, copy a module map for generated - # header files into the build area. - if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") -- configure_file(module.modulemap.build module.modulemap COPYONLY) -+ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) - endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index f201e1f7bff0..4582ed556a02 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -24,6 +24,10 @@ - #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" - #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" - #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" -+#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" -+#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" -+#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" -+#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" - #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 892adc3b9dd8..cabe7fcc630f 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -333,12 +333,26 @@ int main(int argc, char **argv) { - ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); - } else { - ActivePrefix = CurrentExecPrefix; -- ActiveIncludeDir = ActivePrefix + "/include"; -- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); -- sys::fs::make_absolute(ActivePrefix, path); -- ActiveBinDir = path.str(); -- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; -- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveIncludeDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveBinDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveLibDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveCMakeDir = std::string(path.str()); -+ } - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt -index 6e913519a809..85641eef721f 100644 ---- a/tools/lto/CMakeLists.txt -+++ b/tools/lto/CMakeLists.txt -@@ -19,7 +19,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) - add_llvm_library(LTO SHARED ${SOURCES} DEPENDS intrinsics_gen) - - install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h -- DESTINATION include/llvm-c -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c - COMPONENT LTO) - - if (APPLE) -diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt -index 19b606933082..27b9f71b3d79 100644 ---- a/tools/opt-viewer/CMakeLists.txt -+++ b/tools/opt-viewer/CMakeLists.txt -@@ -8,6 +8,6 @@ set (files - - foreach (file ${files}) - install(PROGRAMS ${file} -- DESTINATION share/opt-viewer -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer - COMPONENT opt-viewer) - endforeach (file) diff --git a/pkgs/development/compilers/llvm/7/openmp/default.nix b/pkgs/development/compilers/llvm/7/openmp/default.nix deleted file mode 100644 index a87dd319d8ec3..0000000000000 --- a/pkgs/development/compilers/llvm/7/openmp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, llvm_meta -, fetch -, cmake -, llvm -, targetLlvm -, perl -, version -}: - -stdenv.mkDerivation { - pname = "openmp"; - inherit version; - - src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy"; - - nativeBuildInputs = [ cmake perl ]; - buildInputs = [ - (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) - ]; - - meta = llvm_meta // { - homepage = "https://openmp.llvm.org/"; - description = "Support for the OpenMP language"; - longDescription = '' - The OpenMP subproject of LLVM contains the components required to build an - executable OpenMP program that are outside the compiler itself. - Contains the code for the runtime library against which code compiled by - "clang -fopenmp" must be linked before it can run and the library that - supports offload to target devices. - ''; - # "All of the code is dual licensed under the MIT license and the UIUC - # License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - }; -} diff --git a/pkgs/development/compilers/llvm/16/libclc/default.nix b/pkgs/development/compilers/llvm/common/libclc.nix index 2ceca9aaf7fd7..c91930963b20d 100644 --- a/pkgs/development/compilers/llvm/16/libclc/default.nix +++ b/pkgs/development/compilers/llvm/common/libclc.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; patches = [ - ./libclc-gnu-install-dirs.patch + ./libclc/libclc-gnu-install-dirs.patch ]; # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' + 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator.override { inherit (buildLlvmTools) llvm; }}/bin" NO_DEFAULT_PATH )' '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace CMakeLists.txt \ --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins' @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; homepage = "http://libclc.llvm.org/"; description = "Implementation of the library requirements of the OpenCL C programming language"; license = licenses.mit; diff --git a/pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch b/pkgs/development/compilers/llvm/common/libclc/libclc-gnu-install-dirs.patch index 1e5108a27c38f..1e5108a27c38f 100644 --- a/pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/common/libclc/libclc-gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index 1f5d4a1e33856..2444c1795a78e 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -23,6 +23,7 @@ , monorepoSrc ? null , patches ? [ ] , enableManpages ? false +, ... }: let @@ -108,6 +109,8 @@ stdenv.mkDerivation (rec { "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals (lib.versionAtLeast release_version "17") [ + "-DCLANG_RESOURCE_DIR=../../../../${libclang.lib}" ] ++ lib.optionals enableManpages ([ "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" diff --git a/pkgs/development/compilers/llvm/git/clang/default.nix b/pkgs/development/compilers/llvm/git/clang/default.nix index 733f5462d320c..b193ebba3d6d1 100644 --- a/pkgs/development/compilers/llvm/git/clang/default.nix +++ b/pkgs/development/compilers/llvm/git/clang/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta , monorepoSrc, runCommand -, substituteAll, cmake, ninja, libxml2, libllvm, version, python3 +, cmake, ninja, libxml2, libllvm, version, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false @@ -30,6 +30,7 @@ let "-DCLANG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/clang" "-DCLANGD_BUILD_XPC=OFF" "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_INCLUDE_TESTS=OFF" ] ++ lib.optionals enableManpages [ "-DCLANG_INCLUDE_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" @@ -51,10 +52,11 @@ let # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch ../../common/clang/add-nostdlibinc-flag.patch - (substituteAll { - src = ../../clang-11-12-LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; - }) + # FIMXE: do we need this patch? + # (substituteAll { + # src = ../../clang-11-12-LLVMgold-path.patch; + # libllvmLibdir = "${libllvm.lib}/lib"; + # }) ]; postPatch = '' @@ -65,15 +67,12 @@ let outputs = [ "out" "lib" "dev" "python" ]; - env = lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { - # The following warning is triggered with (at least) gcc >= - # 12, but appears to occur only for cross compiles. - NIX_CFLAGS_COMPILE = "-Wno-maybe-uninitialized"; - }; - postInstall = '' ln -sv $out/bin/clang $out/bin/cpp + mkdir -p $lib/lib/clang + mv $lib/lib/18 $lib/lib/clang/18 + # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" moveToOutput "lib/libclang-cpp.*" "$lib" @@ -81,13 +80,12 @@ let --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." - mkdir -p $python/bin $python/share/{clang,scan-view} + mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin if [ -e $out/bin/set-xcode-analyzer ]; then mv $out/bin/set-xcode-analyzer $python/bin fi mv $out/share/clang/*.py $python/share/clang - mv $out/share/scan-view/*.py $python/share/scan-view rm $out/bin/c-index-test patchShebangs $python/bin diff --git a/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch index f767c56836d5c..cc8737f353433 100644 --- a/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch @@ -1,38 +1,32 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c27beec313d7..480f13e73c9f 100644 +index f7936d72e088..a362fa49b534 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -78,15 +78,17 @@ if(CLANG_BUILT_STANDALONE) - if (NOT LLVM_CONFIG_FOUND) - # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config - # path is removed. -- set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}") +@@ -31,7 +31,21 @@ if(CLANG_BUILT_STANDALONE) + find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}") + list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}") + +- # Turn into CACHE PATHs for overwritting ++ # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets ++ # LLVM_CONFIG. ++ if (NOT LLVM_CONFIG_FOUND) ++ # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config ++ # path is removed. + set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) - set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}") - # N.B. this is just a default value, the CACHE PATHs below can be overriden. - set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm") - set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}") - set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}") ++ set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}") ++ # N.B. this is just a default value, the CACHE PATHs below can be overriden. ++ set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm") ++ set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}") ++ set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}") + else() + set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}") - endif() - -- set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") -+ set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") - set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") - set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") - set(LLVM_TOOLS_BINARY_DIR "${TOOLS_BINARY_DIR}" CACHE PATH "Path to llvm/bin") -@@ -128,7 +130,7 @@ if(CLANG_BUILT_STANDALONE) - set(LLVM_INCLUDE_TESTS ON) - endif() - -- include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}") -+ include_directories(${LLVM_INCLUDE_DIRS}) - link_directories("${LLVM_LIBRARY_DIR}") - - set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin ) ++ endif() ++ + set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") + set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree") + set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index 21ac332e4f5f..b16c314bd1e2 100644 +index 75b0080f6715..c895b884cd27 100644 --- a/cmake/modules/AddClang.cmake +++ b/cmake/modules/AddClang.cmake @@ -119,8 +119,8 @@ macro(add_clang_library name) @@ -47,23 +41,22 @@ index 21ac332e4f5f..b16c314bd1e2 100644 if (NOT LLVM_ENABLE_IDE) diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index 6e2060991b92..b9bc930d26b8 100644 +index f2b0c5cddcbb..52f37fc368ce 100644 --- a/lib/Headers/CMakeLists.txt +++ b/lib/Headers/CMakeLists.txt -@@ -420,7 +420,7 @@ add_header_target("openmp-resource-headers" ${openmp_wrapper_files}) - add_header_target("windows-resource-headers" ${windows_only_files}) +@@ -473,6 +473,7 @@ add_header_target("windows-resource-headers" ${windows_only_files}) add_header_target("utility-resource-headers" ${utility_files}) --set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + get_clang_resource_dir(header_install_dir SUBDIR include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${CLANG_VERSION_MAJOR}/include) ############################################################# # Install rules for the catch-all clang-resource-headers target diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index 8d95d0900e8c..ebc70ff7526d 100644 +index 4f23065a2472..6a0f55991e24 100644 --- a/tools/libclang/CMakeLists.txt +++ b/tools/libclang/CMakeLists.txt -@@ -180,7 +180,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) +@@ -234,7 +234,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) COMPONENT libclang-python-bindings DESTINATION @@ -73,14 +66,14 @@ index 8d95d0900e8c..ebc70ff7526d 100644 if(NOT LLVM_ENABLE_IDE) add_custom_target(libclang-python-bindings) diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt -index 061dc7ef4dd9..adc54b2edc32 100644 +index 3aca22c0b0a8..3115353e3fe3 100644 --- a/tools/scan-build-py/CMakeLists.txt +++ b/tools/scan-build-py/CMakeLists.txt @@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib}) list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib}) - install(PROGRAMS lib/libscanbuild/${lib} -- DESTINATION lib/libscanbuild + install(FILES lib/libscanbuild/${lib} +- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild + DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild" COMPONENT scan-build-py) endforeach() @@ -88,8 +81,8 @@ index 061dc7ef4dd9..adc54b2edc32 100644 @@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource}) list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource}) - install(PROGRAMS lib/libscanbuild/resources/${resource} -- DESTINATION lib/libscanbuild/resources + install(FILES lib/libscanbuild/resources/${resource} +- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources + DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources" COMPONENT scan-build-py) endforeach() @@ -97,8 +90,8 @@ index 061dc7ef4dd9..adc54b2edc32 100644 @@ -122,7 +122,7 @@ foreach(lib ${LibEar}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib}) list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib}) - install(PROGRAMS lib/libear/${lib} -- DESTINATION lib/libear + install(FILES lib/libear/${lib} +- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear + DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" COMPONENT scan-build-py) endforeach() diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/codesign.patch b/pkgs/development/compilers/llvm/git/compiler-rt/codesign.patch deleted file mode 100644 index 065959d14d46c..0000000000000 --- a/pkgs/development/compilers/llvm/git/compiler-rt/codesign.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Tue, 19 Sep 2017 13:13:06 -0500 -Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that - needs it - ---- - cmake/Modules/AddCompilerRT.cmake | 8 ------ - test/asan/CMakeLists.txt | 52 --------------------------------------- - test/tsan/CMakeLists.txt | 47 ----------------------------------- - 3 files changed, 107 deletions(-) - -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc69ec95c419..9f100fdcec2f 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -366,14 +366,6 @@ function(add_compiler_rt_runtime name type) - set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") - set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") - endif() -- if(APPLE) -- # Ad-hoc sign the dylibs -- add_custom_command(TARGET ${libname} -- POST_BUILD -- COMMAND codesign --sign - $<TARGET_FILE:${libname}> -- WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR} -- ) -- endif() - endif() - - set(parent_target_arg) -2.14.1 - diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index b20796ab02abb..808df140e772d 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta, version , monorepoSrc, runCommand -, cmake, ninja, python3, xcbuild, libllvm, libcxxabi, libxcrypt +, cmake, ninja, python3, xcbuild, libllvm, linuxHeaders, libcxxabi, libxcrypt , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD }: @@ -9,6 +9,7 @@ let useLLVM = stdenv.hostPlatform.useLLVM or false; bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; haveLibc = stdenv.cc.libc != null; + isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic; inherit (stdenv.hostPlatform) isMusl; baseName = "compiler-rt"; @@ -29,11 +30,20 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders + ++ lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" - ]; + ] ++ lib.optionals (!haveLibc) [ + # The compiler got stricter about this, and there is a usellvm patch below + # which patches out the assert include causing an implicit definition of + # assert. It would be nicer to understand why compiler-rt thinks it should + # be able to #include <assert.h> in the first place; perhaps it's in the + # wrong, or perhaps there is a way to provide an assert.h. + "-Wno-error=implicit-function-declaration" + ]); cmakeFlags = [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" @@ -41,19 +51,22 @@ stdenv.mkDerivation { "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" ] ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [ "-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include" - ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ + ] ++ lib.optionals (useLLVM || bareMetal || isMusl || isDarwinStatic) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_MEMPROF=OFF" "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary ] ++ lib.optionals (useLLVM || bareMetal) [ - "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal || isDarwinStatic ) [ + "-DCMAKE_CXX_COMPILER_WORKS=ON" ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" - "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ lib.optionals (useLLVM && !haveLibc) [ + "-DCMAKE_C_FLAGS=-nodefaultlibs" ] ++ lib.optionals (useLLVM) [ "-DCOMPILER_RT_BUILD_BUILTINS=ON" #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program @@ -61,18 +74,16 @@ stdenv.mkDerivation { ] ++ lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DCMAKE_LIPO=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}lipo" "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" + # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin: # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153 "-DCOMPILER_RT_ENABLE_IOS=OFF" ]; - preConfigure = lib.optionalString (useLLVM && !haveLibc) '' - cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding") - ''; - outputs = [ "out" "dev" ]; patches = [ @@ -86,7 +97,7 @@ stdenv.mkDerivation { # See: https://github.com/NixOS/nixpkgs/pull/186575 ../../common/compiler-rt/darwin-plistbuddy-workaround.patch # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - ../../common/compiler-rt/armv7l-15.patch + # ../../common/compiler-rt/armv7l-15.patch ]; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks @@ -100,7 +111,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM && !haveLibc) '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ @@ -110,15 +121,21 @@ stdenv.mkDerivation { ''; # Hack around weird upsream RPATH bug - postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) '' ln -s "$out/lib"/*/* "$out/lib" - '' + lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM && stdenv.hostPlatform.isLinux) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o + # Note the history of crt{begin,end}S in previous versions of llvm in nixpkg: + # The presence of crtbegin_shared has been added and removed; it's possible + # people have added/removed it to get it working on their platforms. + # Try each in turn for now. + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtendS.o ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o '' + lib.optionalString doFakeLibgcc '' - ln -s $out/lib/freebsd/libclang_rt.builtins-*.a $out/lib/libgcc.a + ln -s $out/lib/freebsd/libclang_rt.builtins-*.a $out/lib/libgcc.a ''; meta = llvm_meta // { diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/git/compiler-rt/normalize-var.patch index 135cf625ef78f..2b25fd4a07449 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/normalize-var.patch +++ b/pkgs/development/compilers/llvm/git/compiler-rt/normalize-var.patch @@ -1,16 +1,16 @@ -diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -index f1f46fb9599c..6f19e69507ba 100644 +diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake +index 4c85551d7766..297d7a47c54b 100644 --- a/cmake/Modules/CompilerRTUtils.cmake +++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -302,8 +302,9 @@ macro(load_llvm_config) - # Get some LLVM variables from LLVMConfig. - include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") - -- set(LLVM_LIBRARY_OUTPUT_INTDIR -- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -+ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR -+ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} -+ REALPATH) +@@ -328,8 +328,9 @@ macro(load_llvm_config) + endif() endif() - endmacro() +- set(LLVM_LIBRARY_OUTPUT_INTDIR +- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR ++ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} ++ REALPATH) + + set(LLVM_MAIN_SRC_DIR "${LLVM_MAIN_SRC_DIR_DEFAULT}" CACHE PATH "Path to LLVM source tree") + message(STATUS "LLVM_MAIN_SRC_DIR: \"${LLVM_MAIN_SRC_DIR}\"") diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 0748b97dd598a..337809e85e635 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -1,11 +1,11 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja -, preLibcCrossHeaders +{ lowPrio, newScope, pkgs, lib, stdenv, stdenvNoCC, cmake, ninja +, gccForLibs, preLibcCrossHeaders , libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross , targetLlvm # This is the default binutils, but with *this* version of LLD rather -# than the default LLVM version's, if LLD is the choice. We use these for +# than the default LLVM verion's, if LLD is the choice. We use these for # the `useLLVM` bootstrapping below. , bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" @@ -17,7 +17,12 @@ else pkgs.bintools , darwin # LLVM release information; specify one of these but not both: -, gitRelease ? null +, gitRelease ? { + version = "18.0.0"; + rev = "6f44f87011cd52367626cac111ddbb2d25784b90"; + rev-version = "18.0.0-unstable-2023-10-04"; + sha256 = "sha256-CqsCDlzg8I2c9BybKP7B5nfHiQWktqgVavrfiYkjkx4="; +} # i.e.: # { # version = /* i.e. "15.0.0" */; @@ -25,7 +30,7 @@ # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; # } -, officialRelease ? { version = "15.0.7"; sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; } +, officialRelease ? null # i.e.: # { # version = /* i.e. "15.0.0" */; @@ -40,6 +45,7 @@ # specified. , monorepoSrc ? null }: + assert let int = a: if a then 1 else 0; xor = a: b: ((builtins.bitXor (int a) (int b)) == 1); @@ -53,17 +59,19 @@ in let monorepoSrc' = monorepoSrc; in let - # Import releaseInfo separately to avoid infinite recursion inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + inherit (releaseInfo) release_version version; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); + major = lib.versions.major release_version; mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${cc.lib}/lib/clang/${major}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' @@ -106,16 +114,14 @@ in let python3 = pkgs.python3; # don't use python-boot }); - # TODO: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins' - # lldb-manpages = lowPrio (tools.lldb.override { - # enableManpages = true; - # python3 = pkgs.python3; # don't use python-boot - # }); + lldb-manpages = lowPrio (tools.lldb.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); # pick clang appropriate for package set we are targeting clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM + /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; @@ -150,20 +156,24 @@ in let cp -r ${monorepoSrc}/lldb "$out" '') { }; patches = - let - resourceDirPatch = callPackage - ({ substituteAll, libclang }: substituteAll - { - src = ./lldb/resource-dir.patch; - clangLibDir = "${libclang.lib}/lib"; - }) - { }; - in [ - ./lldb/procfs.patch # FIXME: do we need this? - resourceDirPatch + # FIXME: do we need this? ./procfs.patch ./lldb/gnu-install-dirs.patch - ]; + ] + # This is a stopgap solution if/until the macOS SDK used for x86_64 is + # updated. + # + # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` + # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use + # of this preprocessor symbol in `lldb` with its expansion. + # + # See here for some context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin + && !stdenv.targetPlatform.isAarch64 + && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") + ) ./lldb/cpu_subtype_arm64e_replacement.patch; inherit llvm_meta; }; @@ -216,11 +226,13 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoLibc = wrapCCWith rec { @@ -231,10 +243,12 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoCompilerRt = wrapCCWith rec { @@ -243,16 +257,22 @@ in let bintools = bintoolsNoLibc'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = [ "-nostartfiles" ]; + nixSupport.cc-cflags = + [ + "-nostartfiles" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; - clangNoCompilerRtWithLibc = wrapCCWith rec { + clangNoCompilerRtWithLibc = wrapCCWith (rec { cc = tools.clang-unwrapped; libcxx = null; bintools = bintools'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - }; + } // lib.optionalAttrs stdenv.targetPlatform.isWasm { + nixSupport.cc-cflags = [ "-fno-exceptions" ]; + }); }); @@ -262,7 +282,7 @@ in let compiler-rt-libc = callPackage ./compiler-rt { inherit llvm_meta; - stdenv = if stdenv.hostPlatform.useLLVM or false + stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc else stdenv; }; @@ -275,7 +295,7 @@ in let }; # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid + compiler-rt = if stdenv.hostPlatform.isAndroid || stdenv.hostPlatform.isDarwin then libraries.compiler-rt-libc else libraries.compiler-rt-no-libc; diff --git a/pkgs/development/compilers/llvm/git/libcxx/default.nix b/pkgs/development/compilers/llvm/git/libcxx/default.nix index f267b753b24ab..7b99966416638 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -45,12 +45,6 @@ stdenv.mkDerivation rec { chmod -R u+w . ''; - patches = [ - ./gnu-install-dirs.patch - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch - ]; - postPatch = '' cd ../runtimes ''; @@ -64,8 +58,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals (!headersOnly) [ cxxabi ] - ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ]; - + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ libunwind ]; cmakeFlags = let # See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string @@ -80,19 +73,17 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLIBCXX_USE_COMPILER_RT=ON" - # (Backport fix from 16, which has LIBCXX_ADDITIONAL_LIBRARIES, but 15 - # does not appear to) # There's precedent for this in llvm-project/libcxx/cmake/caches. # In a monorepo build you might do the following in the libcxxabi build: # -DLLVM_ENABLE_PROJECTS=libcxxabi;libunwinder # -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=On # libcxx appears to require unwind and doesn't pull it in via other means. - # "-DLIBCXX_ADDITIONAL_LIBRARIES=unwind" - "-DCMAKE_SHARED_LINKER_FLAGS=-lunwind" + "-DLIBCXX_ADDITIONAL_LIBRARIES=unwind" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" # If we're only building the headers we don't actually *need* a functioning # C/C++ compiler: diff --git a/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch deleted file mode 100644 index daee5bdd0ed33..0000000000000 --- a/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 74eff2002fc9..c935d10878bb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -419,7 +419,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) - set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") - set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") -- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH - "Path where built libc++ libraries should be installed.") - set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH - "Path where target-specific libc++ headers should be installed.") -@@ -436,7 +436,7 @@ else() - set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") - endif() - set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") -- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH - "Path where built libc++ libraries should be installed.") - set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH - "Path where target-specific libc++ headers should be installed.") diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 6987e6b0ca3cb..0a795da44ae41 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { postUnpack = lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isWasm '' - patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch} ''; prePatch = '' @@ -65,7 +63,7 @@ stdenv.mkDerivation rec { # CMake however checks for this anyways; this flag tells it not to. See: # https://github.com/llvm/llvm-project/blob/4bd3f3759259548e159aeba5c76efb9a0864e6fa/llvm/runtimes/CMakeLists.txt#L243 "-DCMAKE_CXX_COMPILER_WORKS=ON" - ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, @@ -74,31 +72,22 @@ stdenv.mkDerivation rec { "-DCMAKE_EXE_LINKER_FLAGS=-nostdlib" "-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + "-DUNIX=ON" ] ++ lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; preInstall = lib.optionalString stdenv.isDarwin '' for file in lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - - # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" - # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - ${stdenv.cc.targetPrefix}install_name_tool -id $installName $file - - # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes - # libcxxabi to sometimes link against a different version of itself. - # Here we simply make that second reference point to ourselves. - for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file - done + install_name_tool -id $out/$file $file done ''; @@ -121,5 +110,8 @@ stdenv.mkDerivation rec { # the UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; + # Broken until https://github.com/llvm/llvm-project/issues/64226 is resolved + # We should check if the version is not 10.13 but that is currently broken. + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch index fa587612aaf63..51382fcefed27 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch @@ -1,21 +1,21 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8326d08d23a..a1e36f713161 100644 +diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt +index f380fe6b6b92..a9656258c38e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -187,7 +187,7 @@ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH +@@ -188,7 +188,7 @@ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) -- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE STRING + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH "Path where built libc++abi libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) -@@ -201,7 +201,7 @@ else() +@@ -202,7 +202,7 @@ else() set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) endif() -- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE STRING + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++abi libraries should be installed.") endif() diff --git a/pkgs/development/compilers/llvm/git/libunwind/default.nix b/pkgs/development/compilers/llvm/git/libunwind/default.nix index 1b677a7a2c0d7..a3c8e2594f5a7 100644 --- a/pkgs/development/compilers/llvm/git/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/git/libunwind/default.nix @@ -32,10 +32,6 @@ stdenv.mkDerivation rec { chmod -R u+w . ''; - patches = [ - ./gnu-install-dirs.patch - ]; - postPatch = '' cd ../runtimes ''; diff --git a/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch deleted file mode 100644 index edfb2a8760bd6..0000000000000 --- a/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a06805f05f1..86a50329e6a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -117,7 +117,7 @@ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH - - if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) -- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH - "Path where built libunwind libraries should be installed.") - if(LIBCXX_LIBDIR_SUBDIR) - string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) -@@ -129,7 +129,7 @@ else() - else() - set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) - endif() -- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH - "Path where built libunwind libraries should be installed.") - endif() - diff --git a/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch index ea62b2ad50c75..86e76f4a16d8b 100644 --- a/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch @@ -1,34 +1,34 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index dcc649629a4b..58dca54642e4 100644 +index 3d6225646fe6..9b5d0b15af13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -70,13 +70,15 @@ if(LLD_BUILT_STANDALONE) - if (NOT LLVM_CONFIG_FOUND) - # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config - # path is removed. -- set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}") +@@ -33,10 +33,22 @@ if(LLD_BUILT_STANDALONE) + find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}") + list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}") + +- # Turn into CACHE PATHs for overwriting +- set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") +- set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree") +- set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") ++ # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets ++ # LLVM_CONFIG. ++ if (NOT LLVM_CONFIG_FOUND) ++ # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config ++ # path is removed. + set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) - set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}") - # N.B. this is just a default value, the CACHE PATHs below can be overridden. - set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm") ++ set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}") ++ # N.B. this is just a default value, the CACHE PATHs below can be overridden. ++ set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm") + else() + set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}") - endif() - -- set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") ++ endif() ++ + set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") - set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") - set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") - -@@ -95,7 +97,7 @@ if(LLD_BUILT_STANDALONE) - - set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") - -- include_directories("${LLVM_BINARY_DIR}/include" ${LLVM_INCLUDE_DIRS}) -+ include_directories(${LLVM_INCLUDE_DIRS}) - link_directories(${LLVM_LIBRARY_DIRS}) ++ set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") ++ set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") - if(LLVM_INCLUDE_TESTS) + find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} + NO_DEFAULT_PATH) diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake index d3924f7243d4..42a7cd62281c 100644 --- a/cmake/modules/AddLLD.cmake diff --git a/pkgs/development/compilers/llvm/git/lldb/cpu_subtype_arm64e_replacement.patch b/pkgs/development/compilers/llvm/git/lldb/cpu_subtype_arm64e_replacement.patch new file mode 100644 index 0000000000000..20d35c9f3ea91 --- /dev/null +++ b/pkgs/development/compilers/llvm/git/lldb/cpu_subtype_arm64e_replacement.patch @@ -0,0 +1,12 @@ +diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm +--- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm ++++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm +@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, + len = sizeof(is_64_bit_capable); + ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); + +- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { ++ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers + // The arm64e architecture is a preview. Pretend the host architecture + // is arm64. + cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/pkgs/development/compilers/llvm/git/lldb/procfs.patch b/pkgs/development/compilers/llvm/git/lldb/procfs.patch index a798216aa62c4..7b200e86505ca 100644 --- a/pkgs/development/compilers/llvm/git/lldb/procfs.patch +++ b/pkgs/development/compilers/llvm/git/lldb/procfs.patch @@ -1,14 +1,20 @@ --- a/source/Plugins/Process/Linux/Procfs.h +++ b/source/Plugins/Process/Linux/Procfs.h -@@ -10,6 +10,7 @@ +@@ -10,6 +10,13 @@ // sys/procfs.h on Android/Linux for all supported architectures. #include <sys/ptrace.h> +#include <asm/ptrace.h> ++ ++// on i686 preprocessor symbols with these register names are defined as ++// numeric constants; these symbols clash with identifier names used in ++// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h` ++#undef FS ++#undef CS #include "lldb/lldb-types.h" -@@ -17,23 +18,13 @@ +@@ -17,23 +24,13 @@ #include <vector> diff --git a/pkgs/development/compilers/llvm/git/lldb/resource-dir.patch b/pkgs/development/compilers/llvm/git/lldb/resource-dir.patch deleted file mode 100644 index e0db80afeb9f7..0000000000000 --- a/pkgs/development/compilers/llvm/git/lldb/resource-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake -index 37364341ff8b..7f74c1a3e257 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers) - # Iterate over the possible places where the external resource directory - # could be and pick the first that exists. - foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}" -- "${LLVM_BUILD_LIBRARY_DIR}" -+ "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@" - "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") - # Build the resource directory path by appending 'clang/<version number>'. - set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}") diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 119b2272beda0..3d05837d45da5 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -2,13 +2,14 @@ , pkgsBuildBuild , monorepoSrc , runCommand -, fetchpatch , cmake , darwin , ninja , python3 +, python3Packages , libffi -, enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi) +# TODO: Gold plugin on LLVM16 has a severe memory corruption bug: https://github.com/llvm/llvm-project/issues/61350. +, enableGoldPlugin ? false , libbfd , libpfm , libxml2 @@ -56,12 +57,17 @@ let # So, we "manually" assemble one python derivation for the package to depend # on, taking into account whether checks are enabled or not: python = if doCheck then + # Note that we _explicitly_ ask for a python interpreter for our host + # platform here; the splicing that would ordinarily take care of this for + # us does not seem to work once we use `withPackages`. let checkDeps = ps: with ps; [ psutil ]; - in python3.withPackages checkDeps + in pkgsBuildBuild.targetPackages.python3.withPackages checkDeps else python3; -in stdenv.mkDerivation (rec { +in + assert (lib.assertMsg (!enableGoldPlugin) "Gold plugin cannot be enabled on LLVM16 due to a upstream issue: https://github.com/llvm/llvm-project/issues/61350"); + stdenv.mkDerivation (rec { pname = "llvm"; inherit version; @@ -80,7 +86,11 @@ in stdenv.mkDerivation (rec { outputs = [ "out" "lib" "dev" "python" ]; nativeBuildInputs = [ cmake ninja python ] - ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + ++ optionals enableManpages [ + # Note: we intentionally use `python3Packages` instead of `python3.pkgs`; + # splicing does *not* work with the latter. (TODO: fix) + python3Packages.sphinx python3Packages.recommonmark + ]; buildInputs = [ libxml2 libffi ] ++ optional enablePFM libpfm; # exegesis @@ -134,13 +144,6 @@ in stdenv.mkDerivation (rec { # It's not clear to me why this isn't an issue for LLVM developers running # on macOS (nothing about this _seems_ nix specific).. ./lit-shell-script-runner-set-dyld-library-path.patch - - # Fix musl build. - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch"; - relative = "llvm"; - hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; - }) ] ++ lib.optionals enablePolly [ ./gnu-install-dirs-polly.patch @@ -152,29 +155,28 @@ in stdenv.mkDerivation (rec { substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 rm test/MC/ELF/cfi-version.ll # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) # and thus fails under the sandbox: - substituteInPlace unittests/Support/Host.cpp \ + substituteInPlace unittests/TargetParser/Host.cpp \ --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" - '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' + # This test tries to call the intrinsics `@llvm.roundeven.f32` and # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` - # and `roundeven` on x86_64 macOS. + # and `roundeven` on macOS. # # However these functions are glibc specific so the test fails: # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html # - # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it - # pass there? substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" - + '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' # This test fails on darwin x86_64 because `sw_vers` reports a different # macOS version than what LLVM finds by reading # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into @@ -203,13 +205,13 @@ in stdenv.mkDerivation (rec { # not clear to me when/where/for what this even gets used in LLVM. # # TODO(@rrbutani): fix/follow-up - substituteInPlace unittests/Support/Host.cpp \ + substituteInPlace unittests/TargetParser/Host.cpp \ --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" # This test fails with a `dysmutil` crash; have not yet dug into what's # going on here (TODO(@rrbutani)). rm test/tools/dsymutil/ARM/obfuscated.test - '' + '' + '' + '' # FileSystem permissions tests fail with various special bits substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" @@ -234,6 +236,8 @@ in stdenv.mkDerivation (rec { rm test/tools/gold/X86/split-dwarf.ll rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s + rm test/CodeGen/RISCV/attributes.ll + rm test/CodeGen/RISCV/xtheadmempair.ll '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' # Seems to require certain floating point hardware (NEON?) rm test/ExecutionEngine/frem.ll @@ -321,7 +325,7 @@ in stdenv.mkDerivation (rec { "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ optionals (enableGoldPlugin) [ + ] ++ optionals (false) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" ] ++ optionals isDarwin [ "-DLLVM_ENABLE_LIBCXX=ON" diff --git a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch index 0ef317af8cc75..e2122ebf603d9 100644 --- a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45399dc0537e..5d946e9e6583 100644 +index 471817d68286..c51463304159 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -942,7 +942,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") +@@ -1010,7 +1010,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) install(TARGETS tf_xla_runtime EXPORT LLVMExports @@ -12,10 +12,10 @@ index 45399dc0537e..5d946e9e6583 100644 # Once we add more modules, we should handle this more automatically. if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 057431208322..56f0dcb258da 100644 +index 230620c37027..dd16cab1835e 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake -@@ -844,8 +844,8 @@ macro(add_llvm_library name) +@@ -876,8 +876,8 @@ macro(add_llvm_library name) get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) install(TARGETS ${name} ${export_to_llvmexports} @@ -26,16 +26,16 @@ index 057431208322..56f0dcb258da 100644 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) if (NOT LLVM_ENABLE_IDE) -@@ -2007,7 +2007,7 @@ function(llvm_install_library_symlink name dest type) - set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) - set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) +@@ -2069,7 +2069,7 @@ function(llvm_install_library_symlink name dest type) + set(LLVM_LINK_OR_COPY copy) + endif() - set(output_dir lib${LLVM_LIBDIR_SUFFIX}) + set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) if(WIN32 AND "${type}" STREQUAL "SHARED") set(output_dir "${CMAKE_INSTALL_BINDIR}") endif() -@@ -2271,15 +2271,15 @@ function(llvm_setup_rpath name) +@@ -2344,16 +2344,37 @@ function(llvm_setup_rpath name) if (APPLE) set(_install_name_dir INSTALL_NAME_DIR "@rpath") @@ -49,7 +49,30 @@ index 057431208322..56f0dcb258da 100644 - set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) elseif(UNIX) -- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) +- set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}") ++ # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back ++ # to `_install_rpath` here. ++ # ++ # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e. ++ # clang); instead LLVM is its own package and thus lands at its own nix ++ # store path. This makes it so that the default relative rpath (`../lib/`) ++ # does not point at the LLVM shared objects. ++ # ++ # More discussion here: ++ # - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329 ++ # - https://reviews.llvm.org/D146918 (16.0.5+) ++ # ++ # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is ++ # no potential that this will result in us pulling in the "wrong" LLVM. ++ # Adding this to the build rpath means we aren't forced to use ++ # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build ++ # dir, pre-install, will have the right rpath for LLVM). ++ # ++ # As noted in the differential above, an alternative solution is to have ++ # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set ++ # `CMAKE_INSTALL_RPATH`. ++ set(_build_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") set_property(TARGET ${name} APPEND_STRING PROPERTY @@ -71,10 +94,10 @@ index 891c9e6d618c..8d963f3b0069 100644 list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index d4b0ab959148..26ed981fd09f 100644 +index d99af79aa38e..21e794224b99 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt -@@ -128,7 +128,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS +@@ -127,7 +127,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS ) list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) @@ -83,30 +106,6 @@ index d4b0ab959148..26ed981fd09f 100644 set(LLVM_CONFIG_LIBRARY_DIRS "${LLVM_CONFIG_LIBRARY_DIR}" # FIXME: Should there be other entries here? -diff --git a/docs/CMake.rst b/docs/CMake.rst -index 879b7b231d4c..9c31d14e8950 100644 ---- a/docs/CMake.rst -+++ b/docs/CMake.rst -@@ -250,7 +250,7 @@ description is in `LLVM-related variables`_ below. - **LLVM_LIBDIR_SUFFIX**:STRING - Extra suffix to append to the directory where libraries are to be - installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` -- to install libraries to ``/usr/lib64``. -+ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. - - **LLVM_PARALLEL_{COMPILE,LINK}_JOBS**:STRING - Building the llvm toolchain can use a lot of resources, particularly -@@ -284,6 +284,10 @@ manual, or execute ``cmake --help-variable VARIABLE_NAME``. - The path to install executables, relative to the *CMAKE_INSTALL_PREFIX*. - Defaults to "bin". - -+**CMAKE_INSTALL_LIBDIR**:PATH -+ The path to install libraries, relative to the *CMAKE_INSTALL_PREFIX*. -+ Defaults to "lib". -+ - **CMAKE_INSTALL_INCLUDEDIR**:PATH - The path to install header files, relative to the *CMAKE_INSTALL_PREFIX*. - Defaults to "include". diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in index 370005cd8d7d..7e790bc52111 100644 --- a/tools/llvm-config/BuildVariables.inc.in @@ -120,10 +119,10 @@ index 370005cd8d7d..7e790bc52111 100644 #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@" #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 2c6c55f89d38..f6d2068a0827 100644 +index e86eb2b44b10..f63e207e792e 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp -@@ -369,7 +369,11 @@ int main(int argc, char **argv) { +@@ -366,7 +366,11 @@ int main(int argc, char **argv) { sys::fs::make_absolute(ActivePrefix, Path); ActiveBinDir = std::string(Path.str()); } diff --git a/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch index 32f1d13a9dc23..82b7b21c55fb1 100644 --- a/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch +++ b/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch @@ -15,12 +15,3 @@ index 0242e0b75af3..d732011306f7 100644 for i, ln in enumerate(commands): match = re.match(kPdbgRegex, ln) if match: -@@ -1363,7 +1369,7 @@ def applySubstitutions(script, substitutions, conditions={}, - return processed - - process = processLine if recursion_limit is None else processLineToFixedPoint -- -+ - return [unescapePercents(process(ln)) for ln in script] - - diff --git a/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch index d824516c0a16c..d4ccb2ae98227 100644 --- a/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch +++ b/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch @@ -10,23 +10,23 @@ index 81e8dc04acea..479ff95681e2 100644 import subprocess import lit.formats -@@ -55,3 +56,26 @@ if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir): +@@ -55,3 +56,26 @@ if sys.platform in ["win32", "cygwin"] and os.path.isdir(config.shlibdir): # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate. - if sys.platform == 'win32' and 'SYSTEMDRIVE' in os.environ: - config.environment['SYSTEMDRIVE'] = os.environ['SYSTEMDRIVE'] + if sys.platform == "win32" and "SYSTEMDRIVE" in os.environ: + config.environment["SYSTEMDRIVE"] = os.environ["SYSTEMDRIVE"] + +# Add the LLVM dynamic libs to the platform-specific loader search path env var: +# +# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. +def find_shlibpath_var(): -+ if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']: -+ yield 'LD_LIBRARY_PATH' -+ elif platform.system() == 'Darwin': -+ yield 'DYLD_LIBRARY_PATH' -+ elif platform.system() == 'Windows': -+ yield 'PATH' -+ elif platform.system() == 'AIX': -+ yield 'LIBPATH' ++ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: ++ yield "LD_LIBRARY_PATH" ++ elif platform.system() == "Darwin": ++ yield "DYLD_LIBRARY_PATH" ++ elif platform.system() == "Windows": ++ yield "PATH" ++ elif platform.system() == "AIX": ++ yield "LIBPATH" + +for shlibpath_var in find_shlibpath_var(): + shlibpath = os.path.pathsep.join( @@ -41,22 +41,22 @@ diff --git a/test/lit.cfg.py b/test/lit.cfg.py index 75a38b4c5dad..856fc75c9d74 100644 --- a/test/lit.cfg.py +++ b/test/lit.cfg.py -@@ -42,6 +42,26 @@ llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True) +@@ -42,6 +42,26 @@ llvm_config.with_environment("PATH", config.llvm_tools_dir, append_path=True) llvm_config.with_system_environment( - ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP']) + ["HOME", "INCLUDE", "LIB", "TMP", "TEMP"]) +# Add the LLVM dynamic libs to the platform-specific loader search path env var: +# +# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. +def find_shlibpath_var(): -+ if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']: -+ yield 'LD_LIBRARY_PATH' -+ elif platform.system() == 'Darwin': -+ yield 'DYLD_LIBRARY_PATH' -+ elif platform.system() == 'Windows': -+ yield 'PATH' -+ elif platform.system() == 'AIX': -+ yield 'LIBPATH' ++ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: ++ yield "LD_LIBRARY_PATH" ++ elif platform.system() == "Darwin": ++ yield "DYLD_LIBRARY_PATH" ++ elif platform.system() == "Windows": ++ yield "PATH" ++ elif platform.system() == "AIX": ++ yield "LIBPATH" + +for shlibpath_var in find_shlibpath_var(): + shlibpath = config.llvm_shlib_dir @@ -67,13 +67,14 @@ index 75a38b4c5dad..856fc75c9d74 100644 + .format(platform.system())) # Set up OCAMLPATH to include newly built OCaml libraries. - top_ocaml_lib = os.path.join(config.llvm_lib_dir, 'ocaml') + top_ocaml_lib = os.path.join(config.llvm_lib_dir, "ocaml") @@ -318,7 +338,7 @@ def have_cxx_shared_library(): try: readobj_cmd = subprocess.Popen( -- [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE) -+ [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE, env=config.environment) +- [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE ++ [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE, env=config.environment + ) except OSError: - print('could not exec llvm-readobj') - return False + print("could not exec llvm-readobj") + diff --git a/pkgs/development/compilers/llvm/git/openmp/default.nix b/pkgs/development/compilers/llvm/git/openmp/default.nix index 52aeb4bd9800f..d51335436ad23 100644 --- a/pkgs/development/compilers/llvm/git/openmp/default.nix +++ b/pkgs/development/compilers/llvm/git/openmp/default.nix @@ -11,6 +11,7 @@ , clang-unwrapped , perl , pkg-config +, xcbuild , version }: @@ -39,6 +40,8 @@ stdenv.mkDerivation rec { (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) ]; + nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin xcbuild.xcrun; + # Unsup:Pass:XFail:Fail # 26:267:16:8 doCheck = false; diff --git a/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch b/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch index 103b054ed1763..b7f51196f7bab 100644 --- a/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch +++ b/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch @@ -1,5 +1,5 @@ diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt -index ce66214822a2..6ab7b33c95da 100644 +index 630947abec7e..9f032dc7bd3f 100644 --- a/libomptarget/DeviceRTL/CMakeLists.txt +++ b/libomptarget/DeviceRTL/CMakeLists.txt @@ -27,10 +27,10 @@ endif() @@ -8,11 +8,10 @@ index ce66214822a2..6ab7b33c95da 100644 # A standalone or LLVM_ENABLE_RUNTIMES=openmp build takes this route - find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) + find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR}) - find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} -- NO_DEFAULT_PATH) + find_program(PACKAGER_TOOL clang-offload-packager PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) - find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ ) + find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR}) - if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL)) - libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL} or opt: ${OPT_TOOL}") + if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL) OR (NOT PACKAGER_TOOL)) + libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL}, opt: ${OPT_TOOL}, or clang-offload-packager: ${PACKAGER_TOOL}") return() diff --git a/pkgs/development/compilers/llvm/git/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/git/openmp/run-lit-directly.patch index 1e952fdc36a8f..e69de29bb2d1d 100644 --- a/pkgs/development/compilers/llvm/git/openmp/run-lit-directly.patch +++ b/pkgs/development/compilers/llvm/git/openmp/run-lit-directly.patch @@ -1,12 +0,0 @@ -diff --git a/cmake/OpenMPTesting.cmake b/cmake/OpenMPTesting.cmake ---- a/cmake/OpenMPTesting.cmake -+++ b/cmake/OpenMPTesting.cmake -@@ -185,7 +185,7 @@ function(add_openmp_testsuite target comment) - if (${OPENMP_STANDALONE_BUILD}) - set(LIT_ARGS ${OPENMP_LIT_ARGS} ${ARG_ARGS}) - add_custom_target(${target} -- COMMAND ${PYTHON_EXECUTABLE} ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} -+ COMMAND ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} - COMMENT ${comment} - DEPENDS ${ARG_DEPENDS} - USES_TERMINAL diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/development/compilers/lunarml/default.nix index 1fa448fe9d8e9..558a4e435a416 100644 --- a/pkgs/development/compilers/lunarml/default.nix +++ b/pkgs/development/compilers/lunarml/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.0.20231113"; + version = "0.1.0"; in stdenvNoCC.mkDerivation { inherit version; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation { owner = "minoki"; repo = "LunarML"; rev = "refs/tags/v${version}"; - hash = "sha256-LmS+pkdCraY8sor+lsq/vCODFyVneKkZqjZqbJ1trb4="; + hash = "sha256-wM6ppH0g8yIi+4fwTejzZGn1uv/Wvlajn87A+IKbPXw="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix index a91273a3523a4..220e25c39f4eb 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.5"; + version = "4.7.7"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-LAlJCAF8nyXVUlkOEdcoxq5bZn1bd7dqwx6PxOxJRsM="; + sha256 = "sha256-XwyZpv80keMhwPm/kvhwrMQg04E8IFjt0UMl9Ocxtyc="; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/pkgs/development/compilers/nim/build-nim-package.nix b/pkgs/development/compilers/nim/build-nim-package.nix index 5085edf90a762..a22fb45b507bc 100644 --- a/pkgs/development/compilers/nim/build-nim-package.nix +++ b/pkgs/development/compilers/nim/build-nim-package.nix @@ -7,6 +7,7 @@ , nim_builder , defaultNimVersion ? 2 , nimOverrides +, buildNimPackage }: let @@ -90,6 +91,7 @@ let , nativeBuildInputs ? [ ] , nimFlags ? [ ] , requiredNimVersion ? defaultNimVersion + , passthru ? { } , ... }: (if requiredNimVersion == 1 then { @@ -102,6 +104,25 @@ let throw "requiredNimVersion ${toString requiredNimVersion} is not valid") // { nimFlags = lockFileNimFlags ++ nimFlags; + passthru = passthru // { + # allow overriding the result of buildNimPackageArgs before this composition is applied + # this allows overriding the lockFile for packages built using buildNimPackage + # this is adapted from mkDerivationExtensible in stdenv.mkDerivation + overrideNimAttrs = f0: + let + f = self: super: + let x = f0 super; + in + if builtins.isFunction x + then f0 self super + else x; + in + buildNimPackage + (self: + let super = (asFunc ((asFunc buildNimPackageArgs) self)) baseAttrs; + in + super // (if builtins.isFunction f0 || f0?__functor then f self super else f0)); + }; }; attrs = postLock // finalOverride postLock; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 425eda585c273..70d46dc46061e 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -76,12 +76,12 @@ in { nim-unwrapped-2 = stdenv.mkDerivation (finalAttrs: { pname = "nim-unwrapped"; - version = "2.0.0"; + version = "2.0.2"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-vWEB2EADb7eOk6ad9s8/n9DCHNdUtpX/hKO0rdjtCvc="; + hash = "sha256-ZPUdO/Vt6dDueeLKapzpRFSvmmOhQaaWnOjFmmC4LM8="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ] @@ -161,10 +161,10 @@ in { }); nim-unwrapped-1 = nim-unwrapped-2.overrideAttrs (finalAttrs: prevAttrs: { - version = "1.6.14"; + version = "1.6.18"; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-0HDS8oriQA33/kpJ7OufRc1TmQaxB0gYVqCveo+oLck="; + hash = "sha256-UCQaxyIpG6ljdT8EWqo1h7c8GqKK4pxXPBWluKYCoss="; }; patches = [ diff --git a/pkgs/development/compilers/ocaml/5.1.nix b/pkgs/development/compilers/ocaml/5.1.nix index 9947eadb49638..90efd1050206e 100644 --- a/pkgs/development/compilers/ocaml/5.1.nix +++ b/pkgs/development/compilers/ocaml/5.1.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "5"; minor_version = "1"; - patch_version = "0"; - sha256 = "sha256-bOjbOTqvwmTlr3McaPvrIJIKtq6E1b+TURllt0IzUas="; + patch_version = "1"; + sha256 = "sha256-jX6Yv9o76UBgK3o53PkSotL96reR7UDmKgmkzWfd7vE="; } diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index 152ee99fcb1c4..0197c0888a112 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -12,13 +12,13 @@ let inherit (llvmPackages) stdenv; in stdenv.mkDerivation rec { pname = "odin"; - version = "dev-2023-11"; + version = "dev-2023-12"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; rev = version; - hash = "sha256-5plcr+j9aFSaLfLQXbG4WD1GH6rE7D3uhlUbPaDEYf8="; + hash = "sha256-XFaXs9zNQ/53QprF8pM2pOtiB0nGu8mGbBozNl0EMyA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix index 65d6697c6ef7b..b91bde152554d 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -14,8 +14,8 @@ let java = openjdk17_headless; }); - dashed-icu-version = lib.concatStringsSep "-" (lib.splitString "." (lib.getVersion icu71)); - underscored-icu-version = lib.concatStringsSep "_" (lib.splitString "." (lib.getVersion icu71)); + dashed-icu-version = lib.concatStringsSep "-" (lib.splitVersion (lib.getVersion icu71)); + underscored-icu-version = lib.concatStringsSep "_" (lib.splitVersion (lib.getVersion icu71)); icu-data = fetchurl { url = "https://github.com/unicode-org/icu/releases/download/release-${dashed-icu-version}/icu4c-${underscored-icu-version}-data-bin-l.zip"; hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 951678847076b..c82a88bb2793e 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -10,6 +10,13 @@ stdenv.mkDerivation rec { pname = "polyml"; version = "5.9.1"; + src = fetchFromGitHub { + owner = "polyml"; + repo = "polyml"; + rev = "v${version}"; + sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; + }; + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ ''; @@ -24,12 +31,13 @@ stdenv.mkDerivation rec { "--with-gmp" ]; - src = fetchFromGitHub { - owner = "polyml"; - repo = "polyml"; - rev = "v${version}"; - sha256 = "sha256-72wm8dt+Id59A5058mVE5P9TkXW5/LZRthZoxUustVA="; - }; + doCheck = true; + + checkPhase = '' + runHook preCheck + make check + runHook postCheck + ''; meta = with lib; { description = "Standard ML compiler and interpreter"; diff --git a/pkgs/development/compilers/rust/1_73.nix b/pkgs/development/compilers/rust/1_74.nix index 37e75e0a7a4f1..163c64c249b7e 100644 --- a/pkgs/development/compilers/rust/1_73.nix +++ b/pkgs/development/compilers/rust/1_74.nix @@ -16,12 +16,13 @@ , CoreFoundation, Security, SystemConfiguration , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform +, wrapRustcWith , llvmPackages_16, llvm_16 } @ args: import ./default.nix { - rustcVersion = "1.73.0"; - rustcSha256 = "sha256-ltYubR8tId96yKyzuYgkEfnnxwNhc/fy7enh8faxuzo="; + rustcVersion = "1.74.0"; + rustcSha256 = "sha256-iCtYS8Mhxdz+d82qafJ3kGuTYlXveAj81cdJKSXPEEk="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; @@ -35,24 +36,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.72.1"; + bootstrapVersion = "1.73.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "a2a849a701dfd6643aaaa27e1ed5ac56aea00f7dee26c00d81c520808efd8911"; - x86_64-unknown-linux-gnu = "4fbd8df2000cf73c632d67a219a7fc153537ceffa2e6474491e3db71fdd5a410"; - x86_64-unknown-linux-musl = "94eddc044868a944a887d0b0375e393cb3acc6ebc034e3eac2ef2890ec7c0eac"; - arm-unknown-linux-gnueabihf = "a4d90538882181722d3e7cb8d7f021770e29e6b6d28375452e31a98049600110"; - armv7-unknown-linux-gnueabihf = "4c8e6b3c705a84d17894d3a1cfe744fb6083dd57c61868e67aac8b8512640ecb"; - aarch64-unknown-linux-gnu = "190d0473cbe619f163d33a6c4e2ef982abdd4178f73abc3194631cd2d5c8ed8b"; - aarch64-unknown-linux-musl = "c83778d1a95f6604bc3610a9070e8a8435c60a8bca5117aad71ffab36dea020f"; - x86_64-apple-darwin = "d01e7e9a7482f88a51b4fd888f06234274b49f51b5476c2d14fd46fd6e99ba9e"; - aarch64-apple-darwin = "42b0aaf269b6d9c60db13a64a920336d6064ab11d0c7043c9deeb9d4f67b3983"; - powerpc64le-unknown-linux-gnu = "9310df247efc072f2ca27354a875c4989cf3c29c9e545255a7472895d830163c"; - riscv64gc-unknown-linux-gnu = "1e08cd3ecd29d5bf247e3f7f4bc97318b439f0443dd9c99c36edcfa717d55101"; + i686-unknown-linux-gnu = "6a088acbbda734d27e8b431499f1d746de7781673b88fead3aeae072be1d1a5a"; + x86_64-unknown-linux-gnu = "aa4cf0b7e66a9f5b7c623d4b340bb1ac2864a5f2c2b981f39f796245dc84f2cb"; + x86_64-unknown-linux-musl = "c888457d106ccd40288ca8db1cb966b23d719c9a128daca701ecc574c53773d4"; + arm-unknown-linux-gnueabihf = "9c29bb42786aedbb16ea71564eb06068a8b01cca6c6b8857f0c37f91dfba7134"; + armv7-unknown-linux-gnueabihf = "092b32b82c602c18279d76d9a96763e85030aa62cda64c1bc73fc1f6355bb99c"; + aarch64-unknown-linux-gnu = "e54d7d886ba413ae573151f668e76ea537f9a44406d3d29598269a4a536d12f6"; + aarch64-unknown-linux-musl = "f4e9ff895aa55558777585ad4debe2ccf3c0298cb5d65db67814f62428de4a5b"; + x86_64-apple-darwin = "ece9646bb153d4bc0f7f1443989de0cbcd8989a7d0bf3b7fb9956e1223954f0c"; + aarch64-apple-darwin = "9c96e4c57328fb438ee2d87aa75970ce89b4426b49780ccb3c16af0d7c617cc6"; + powerpc64le-unknown-linux-gnu = "8fa215ee3e274fb64364e7084613bc570369488fa22cf5bc8e0fe6dc810fe2b9"; + riscv64gc-unknown-linux-gnu = "381379a2381835428b2e7a396b3046581517356b7cc851e39e385aebd5700623"; }; - selectRustPackage = pkgs: pkgs.rust_1_73; + selectRustPackage = pkgs: pkgs.rust_1_74; rustcPatches = [ ]; } diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index bf03077f4aa82..c546e278e7fa8 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, bash, curl, darwin, zlib +{ lib, stdenv, makeWrapper, wrapRustc, bash, curl, darwin, zlib , autoPatchelfHook, gcc , version , src @@ -19,14 +19,15 @@ let in rec { - rustc = stdenv.mkDerivation { + rustc-unwrapped = stdenv.mkDerivation { pname = "rustc-${versionType}"; inherit version; inherit src; meta = with lib; { - homepage = "http://www.rust-lang.org/"; + homepage = "https://www.rust-lang.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; license = [ licenses.mit licenses.asl20 ]; @@ -61,6 +62,8 @@ rec { setupHooks = ./setup-hook.sh; }; + rustc = wrapRustc rustc-unwrapped; + cargo = stdenv.mkDerivation { pname = "cargo-${versionType}"; @@ -68,8 +71,9 @@ rec { inherit src; meta = with lib; { - homepage = "http://www.rust-lang.org/"; - description = "A safe, concurrent, practical language"; + homepage = "https://doc.rust-lang.org/cargo/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + description = "The Rust package manager"; maintainers = with maintainers; [ qknight ]; license = [ licenses.mit licenses.asl20 ]; }; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 8eb628aa536b7..ff0ecf45fd235 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage.override { cargo-auditable = cargo-auditable.bootstrap; } ({ pname = "cargo"; - inherit (rustc) version src; + inherit (rustc.unwrapped) version src; # the rust source tarball already has all the dependencies vendored, no need to fetch them again cargoVendorDir = "vendor"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage.override { passthru = { rustc = rustc; - inherit (rustc) tests; + inherit (rustc.unwrapped) tests; }; # Upstream rustc still assumes that musl = static[1]. The fix for diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 8459002743bb8..43a10c1c7374b 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -31,8 +31,8 @@ rustPlatform.buildRustPackage { # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 preFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -add_rpath "${rustc}/lib" "$out/bin/clippy-driver" - install_name_tool -add_rpath "${rustc}/lib" "$out/bin/cargo-clippy" + install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/clippy-driver" + install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/cargo-clippy" ''; meta = with lib; { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index efd7042c230cf..c08ffa848ef5e 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -18,6 +18,7 @@ , CoreFoundation, Security, SystemConfiguration , pkgsBuildBuild , makeRustPlatform +, wrapRustcWith }: let @@ -61,10 +62,10 @@ in bootRustPlatform = makeRustPlatform bootstrapRustPackages; in { # Packages suitable for build-time, e.g. `build.rs`-type stuff. - buildRustPackages = (selectRustPackage buildPackages).packages.stable; + buildRustPackages = (selectRustPackage buildPackages).packages.stable // { __attrsFailEvaluation = true; }; # Analogous to stdenv rustPlatform = makeRustPlatform self.buildRustPackages; - rustc = self.callPackage ./rustc.nix ({ + rustc-unwrapped = self.callPackage ./rustc.nix ({ version = rustcVersion; sha256 = rustcSha256; inherit enableRustcDev; @@ -75,6 +76,10 @@ in # Use boot package set to break cycle inherit (bootstrapRustPackages) cargo rustc rustfmt; }); + rustc = wrapRustcWith { + inherit (self) rustc-unwrapped; + sysroot = if fastCross then self.rustc-unwrapped else null; + }; rustfmt = self.callPackage ./rustfmt.nix { inherit Security; inherit (self.buildRustPackages) rustc; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 1758abb6bea51..7e365f52ef302 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -81,6 +81,7 @@ in stdenv.mkDerivation (finalAttrs: { ccForTarget = ccPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv; cxxForTarget = cxxPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv; in [ + "--sysconfdir=${placeholder "out"}/etc" "--release-channel=stable" "--set=build.rustc=${rustc}/bin/rustc" "--set=build.cargo=${cargo}/bin/cargo" @@ -153,9 +154,9 @@ in stdenv.mkDerivation (finalAttrs: { runHook preBuild mkdir -p build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-{std,rustc}/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/ - ln -s ${rustc}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/libstd-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/libstd.so - ln -s ${rustc}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/librustc_driver-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc.so - ln -s ${rustc}/bin/rustc build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/rustc-main + ln -s ${rustc.unwrapped}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/libstd-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/libstd.so + ln -s ${rustc.unwrapped}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/librustc_driver-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc.so + ln -s ${rustc.unwrapped}/bin/rustc build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/rustc-main touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.libstd.stamp touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.librustc.stamp python ./x.py --keep-stage=0 --stage=1 build library/std @@ -168,9 +169,9 @@ in stdenv.mkDerivation (finalAttrs: { python ./x.py --keep-stage=0 --stage=1 install library/std mkdir -v $out/bin $doc $man - makeWrapper ${rustc}/bin/rustc $out/bin/rustc --add-flags "--sysroot $out" - makeWrapper ${rustc}/bin/rustdoc $out/bin/rustdoc --add-flags "--sysroot $out" - ln -s ${rustc}/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec} $out/lib/rustlib/ + ln -s ${rustc.unwrapped}/bin/rustc $out/bin + makeWrapper ${rustc.unwrapped}/bin/rustdoc $out/bin/rustdoc --add-flags "--sysroot $out" + ln -s ${rustc.unwrapped}/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec} $out/lib/rustlib/ echo rust-std-${stdenv.hostPlatform.rust.rustcTargetSpec} >> $out/lib/rustlib/components lndir ${rustc.doc} $doc lndir ${rustc.man} $man @@ -178,14 +179,6 @@ in stdenv.mkDerivation (finalAttrs: { runHook postInstall '' else null; - # The bootstrap.py will generated a Makefile that then executes the build. - # The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass - # to the bootstrap builder. - postConfigure = '' - substituteInPlace Makefile \ - --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)' - ''; - # the rust build system complains that nix alters the checksums dontFixLibtool = true; diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index 40f6237dbe984..9cc8df5a9e904 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -22,8 +22,8 @@ rustPlatform.buildRustPackage rec { # [0]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/src/bootstrap/builder.rs#L1543 # [1]: https://github.com/rust-lang/rust/blob/f77f4d55bdf9d8955d3292f709bd9830c2fdeca5/compiler/rustc_codegen_ssa/src/back/linker.rs#L323-L331 preFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -add_rpath "${rustc}/lib" "$out/bin/rustfmt" - install_name_tool -add_rpath "${rustc}/lib" "$out/bin/git-rustfmt" + install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/rustfmt" + install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/git-rustfmt" ''; # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 986f6f169e8ba..0603706164ae6 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -86,7 +86,7 @@ let buildInputs = [ boost ] ++ lib.optionals z3Support [ z3 ] ++ lib.optionals cvc4Support [ cvc4 cln gmp ]; - nativeCheckInputs = [ jq ncurses (python3.withPackages (ps: with ps; [ colorama deepdiff devtools docopt docutils requests sphinx tabulate z3 ])) ]; # contextlib2 glob2 textwrap3 traceback2 urllib3 + nativeCheckInputs = [ jq ncurses (python3.withPackages (ps: with ps; [ colorama deepdiff devtools docopt docutils requests sphinx tabulate z3-solver ])) ]; # contextlib2 glob2 textwrap3 traceback2 urllib3 # tests take 60+ minutes to complete, only run as part of passthru tests doCheck = false; diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 0da2510f09a00..afb8ce39dcced 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -55,7 +55,8 @@ let darwin = pkgs.darwin.overrideScope (_: prev: { inherit apple_sdk; inherit (apple_sdk) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; - CF = apple_sdk.CoreFoundation; + CF = apple_sdk.CoreFoundation // { __attrsFailEvaluation = true; }; + __attrsFailEvaluation = true; }); xcodebuild = pkgs.xcbuild.override { inherit (apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix index ae59f26757c77..50ddbacb2013b 100644 --- a/pkgs/development/compilers/typescript/default.nix +++ b/pkgs/development/compilers/typescript/default.nix @@ -1,21 +1,27 @@ -{ lib, buildNpmPackage, fetchFromGitHub}: +{ lib, buildNpmPackage, fetchFromGitHub, testers, typescript }: buildNpmPackage rec { pname = "typescript"; - version = "5.3.2"; + version = "5.3.3"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-lwc2bYC2f8x3Np/LxbN+5x6Apuekp7LmHXNutqL9Z2E="; + hash = "sha256-gZdS4TGbafaOdNc1ZB24uAjMu9g0hef6mEsOr/dPqvY="; }; patches = [ ./disable-dprint-dstBundler.patch ]; - npmDepsHash = "sha256-vD/tax5RjREdsdte3ONahVf9GPOkxPqeP9jmsxjCYkY="; + npmDepsHash = "sha256-gj59jjko13UBPqqy/3z1KgVMFUQPUAIg47UTTaseF+w="; + + passthru.tests = { + version = testers.testVersion { + package = typescript; + }; + }; meta = with lib; { description = "A superset of JavaScript that compiles to clean JavaScript output"; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index fbbfba7ae1a56..bad47d45e11a1 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 = "M5g"; + version = "0.5.12"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-4E/8CfWmD+IVeXBqcTE74k2HZtk9dt/4G9GqBjVhtWo="; + hash = "sha256-naX80UdSAwFAGS04Zd5VyVS2KQWnotE4+mJxWYRXXNU="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-Gl447CSuLgEPPHzgxPTIC8QXGgk/1moNqFU+Phv6e/U="; + hash = "sha256-RD6pHDQI8ssU/E8LzLXmqtedLCL5wZV/bO3KHIWiYN8="; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 2a8ea72b9f5b1..66b8715590575 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -1,20 +1,21 @@ { lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }: let - version = "weekly.2023.44"; + version = "0.4.3"; ptraceSubstitution = '' #include <sys/types.h> #include <sys/ptrace.h> ''; - # Required for bootstrap. + # vc is the V compiler's source translated to C (needed for boostrap). + # So we fix its rev to correspond to the V version. vc = stdenv.mkDerivation { pname = "v.c"; - version = "unstable-2023-10-30"; + version = "0.4.3"; src = fetchFromGitHub { owner = "vlang"; repo = "vc"; - rev = "66b89ab916c13c5781753797d1f4ff08e427bb6b"; - hash = "sha256-5Y7/rlcoIHjbf79A1rqFysNFc5+p6CY09MRPQalo7Ak="; + rev = "5e691a82c01957870b451e06216a9fb3a4e83a18"; + hash = "sha256-Ti2b88NDG1pppj34BeK8+UsT2HiG/jcAF2mHgiBBRaI="; }; # patch the ptrace reference for darwin @@ -30,8 +31,8 @@ let markdown = fetchFromGitHub { owner = "vlang"; repo = "markdown"; - rev = "61c47ea0a6c0c79e973a119dcbab3b8fdd0973ca"; - hash = "sha256-XBD30Pc9CGXzU1Gy6U0pDpTozYVwfgAvZRjIsnXp8ZM="; + rev = "0c280130cb7ec410b7d21810d1247956c15b72fc"; + hash = "sha256-Fmhkrg9DBiWxInostNp+WfA3V5GgEIs5+KIYrqZosqY="; }; boehmgcStatic = boehmgc.override { enableStatic = true; @@ -45,7 +46,7 @@ stdenv.mkDerivation { owner = "vlang"; repo = "v"; rev = version; - hash = "sha256-1yFuheSyKfvm4GqKIbXycdzKx3XcD9LSmmuKlcJmteg="; + hash = "sha256-ZFBQD7SP38VnEMoOnwr/n8zZuLtR7GR3OCYhvfz3apI="; }; propagatedBuildInputs = [ glfw freetype openssl ] @@ -76,11 +77,6 @@ stdenv.mkDerivation { cp -r ${boehmgcStatic}/lib/* ./thirdparty/tcc/lib ''; - # vcreate_test.v requires git, so we must remove it when building the tools. - preInstall = '' - mv cmd/tools/vcreate/vcreate_test.v $HOME/vcreate_test.v - ''; - installPhase = '' runHook preInstall @@ -102,11 +98,6 @@ stdenv.mkDerivation { runHook postInstall ''; - # Return vcreate_test.v and vtest.v, so the user can use it. - postInstall = '' - cp $HOME/vcreate_test.v $out/lib/cmd/tools/vcreate_test.v - ''; - meta = with lib; { homepage = "https://vlang.io/"; description = "Simple, fast, safe, compiled language for developing maintainable software"; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 833c0db468a79..dd08a92508dbd 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -77,18 +77,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.35"; + version = "0.36"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "refs/tags/${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-jB8y7XGDX9rVF6c4FSTLOyvsxPhdjU8Taj6MQeoU4KQ="; + hash = "sha256-jcaXn77OuKeC3AQTicILP3ABkJ3qBccM+uGbj1wn2Vw="; }; enableParallelBuilding = true; nativeBuildInputs = [ pkg-config bison flex ]; - buildInputs = [ + propagatedBuildInputs = [ tcl readline libffi diff --git a/pkgs/development/compilers/yosys/fix-clang-build.patch b/pkgs/development/compilers/yosys/fix-clang-build.patch index e81ddefcd9cc0..2581f0abab9b1 100644 --- a/pkgs/development/compilers/yosys/fix-clang-build.patch +++ b/pkgs/development/compilers/yosys/fix-clang-build.patch @@ -19,8 +19,8 @@ index 914a72347..bc0b129d2 100644 local subtest=$1; shift ../../yosys -p "read_verilog ${subtest}.v; proc; clean; write_cxxrtl -print-output std::cerr yosys-${subtest}.cc" -- ${CC:-gcc} -std=c++11 -o yosys-${subtest} -I../.. ${subtest}_tb.cc -lstdc++ -+ ${CXX:-gcc} -std=c++11 -o yosys-${subtest} -I../.. ${subtest}_tb.cc -lstdc++ +- ${CC:-gcc} -std=c++11 -o yosys-${subtest} -I../../backends/cxxrtl/runtime ${subtest}_tb.cc -lstdc++ ++ ${CXX:-gcc} -std=c++11 -o yosys-${subtest} -I../../backends/cxxrtl/runtime ${subtest}_tb.cc -lstdc++ ./yosys-${subtest} 2>yosys-${subtest}.log iverilog -o iverilog-${subtest} ${subtest}.v ${subtest}_tb.v ./iverilog-${subtest} |grep -v '\$finish called' >iverilog-${subtest}.log @@ -28,8 +28,8 @@ index 914a72347..bc0b129d2 100644 ../../yosys -p "read_verilog display_lm.v" >yosys-display_lm.log ../../yosys -p "read_verilog display_lm.v; write_cxxrtl yosys-display_lm.cc" --${CC:-gcc} -std=c++11 -o yosys-display_lm_cc -I../.. display_lm_tb.cc -lstdc++ -+${CXX:-gcc} -std=c++11 -o yosys-display_lm_cc -I../.. display_lm_tb.cc -lstdc++ +-${CC:-gcc} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++ ++${CXX:-gcc} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++ ./yosys-display_lm_cc >yosys-display_lm_cc.log for log in yosys-display_lm.log yosys-display_lm_cc.log; do grep "^%l: \\\\bot\$" "$log" diff --git a/pkgs/development/compilers/zig/shell-completions.nix b/pkgs/development/compilers/zig/shell-completions.nix index db76250bf802f..d60f7950dcad9 100644 --- a/pkgs/development/compilers/zig/shell-completions.nix +++ b/pkgs/development/compilers/zig/shell-completions.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zig-shell-completions"; - version = "unstable-2023-08-17"; + version = "unstable-2023-11-18"; src = fetchFromGitHub { owner = "ziglang"; repo = "shell-completions"; - rev = "de9f83166d792cce6a0524e63d2755952dd9872c"; - hash = "sha256-92n41/AWbHYkXiBtbWw+hXZKJCE7KW9igd8cLSBQfHo="; + rev = "31d3ad12890371bf467ef7143f5c2f31cfa7b7c1"; + hash = "sha256-ID/K0vdg7BTKGgozISk/X4RBxCVfhSkVD6GSZUoP9Ls="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index cacdacde326fe..49134a9f31f4b 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.18"; out = "20230107"; } + { case = range "8.14" "8.19"; out = "20230107"; } { case = range "8.6" "8.16"; out = "20200201"; } ] null; release."20230107".rev = "bad8ad2476e14df6b5a819b7aaddc27a7c53fb69"; @@ -14,9 +14,4 @@ mkCoqDerivation { release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1"; propagatedBuildInputs = [ StructTact ]; - preConfigure = '' - if [ -f ./configure ]; then - patchShebangs ./configure - fi - ''; } diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index ae20898e3ce99..a6f3a8b6aaa66 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -5,16 +5,11 @@ mkCoqDerivation { owner = "DistributedComponents"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.9" "8.18"; out = "20230107"; } + { case = range "8.9" "8.19"; out = "20230107"; } { case = range "8.5" "8.16"; out = "20200131"; } ] null; release."20230107".rev = "601e89ec019501c48c27fcfc14b9a3c70456e408"; release."20230107".sha256 = "sha256-YMBzVIsLkIC+w2TeyHrKe29eWLIxrH3wIMZqhik8p9I="; release."20200131".rev = "203d4c20211d6b17741f1fdca46dbc091f5e961a"; release."20200131".sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0"; - preConfigure = '' - if [ -f ./configure ]; then - patchShebangs ./configure - fi - ''; } diff --git a/pkgs/development/coq-modules/LibHyps/default.nix b/pkgs/development/coq-modules/LibHyps/default.nix index 6da5a45f7ec48..16474fbfb6642 100644 --- a/pkgs/development/coq-modules/LibHyps/default.nix +++ b/pkgs/development/coq-modules/LibHyps/default.nix @@ -4,7 +4,7 @@ mkCoqDerivation { pname = "LibHyps"; owner = "Matafou"; inherit version; - defaultVersion = if (lib.versions.range "8.11" "8.18") coq.version then "2.0.4.1" else null; + defaultVersion = if (lib.versions.range "8.11" "8.19") coq.version then "2.0.4.1" else null; release = { "2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h"; }; diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 60ab65d8b6ac5..d68f0e2f05867 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -6,6 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in owner = "QuickChick"; inherit version; defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [ + { cases = [ (range "8.15" "8.18") pred.true ]; out = "2.0.1"; } { cases = [ (range "8.13" "8.17") pred.true ]; out = "1.6.5"; } { cases = [ "8.13" pred.true ]; out = "1.5.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; } @@ -17,6 +18,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in { cases = [ "8.6" pred.true ]; out = "20171102"; } { cases = [ "8.5" pred.true ]; out = "20170512"; } ] null; + release."2.0.1".sha256 = "sha256-gJc+9Or6tbqE00920Il4pnEvokRoiADX6CxP/Q0QZaY="; release."1.6.5".sha256 = "sha256-rcFyRDH8UbB9KVk10P5qjtPkWs04p78VNHkCq4mXr3U="; release."1.6.4".sha256 = "sha256-C1060wPSU33yZAFLxGmZlAMXASnx98qz3oSLO8DO+mM="; release."1.6.2".sha256 = "0g5q9zw3xd4zndihq96nxkq4w3dh05418wzlwdk1nnn3b6vbx6z0"; diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 16bc63ff3a74b..447de89e806da 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.9" "8.18"; out = "20230107"; } + { case = range "8.9" "8.19"; out = "20230107"; } { case = range "8.6" "8.16"; out = "20210328"; } { case = range "8.5" "8.13"; out = "20181102"; } ] null; @@ -15,9 +15,4 @@ mkCoqDerivation { release."20210328".sha256 = "sha256:1y5r1zm3hli10ah6lnj7n8hxad6rb6rgldd0g7m2fjibzvwqzhdg"; release."20181102".rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; release."20181102".sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; - preConfigure = '' - if [ -f ./configure ]; then - patchShebangs ./configure - fi - ''; } diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 748f16b2ea8a1..b0ff84c459812 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -24,9 +24,4 @@ mkCoqDerivation { release."20181102".sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; propagatedBuildInputs = [ Cheerios InfSeqExt ssreflect ]; - preConfigure = '' - if [ -f ./configure ]; then - patchShebangs ./configure - fi - ''; } diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index bef63b201f1c2..8ee47ec85f533 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -5,10 +5,11 @@ mkCoqDerivation { owner = "coq"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.18"; out = "9.0.0+coq${coq.coq-version}"; } + { case = range "8.13" "8.19"; out = "9.0.0+coq${coq.coq-version}"; } { case = range "8.6" "8.17"; out = "${coq.coq-version}.0"; } ] null; + release."9.0.0+coq8.19".sha256 = "sha256-02uL+qWbUveHe67zKfc8w3U0iN3X2DKBsvP3pKpW8KQ="; release."9.0.0+coq8.18".sha256 = "sha256-vLeJ0GNKl4M84Uj2tAwlrxJOSR6VZoJQvdlDhxJRge8="; release."9.0.0+coq8.17".sha256 = "sha256-Mn85LqxJKPDIfpxRef9Uh5POwOKlTQ7jsMVz1wnQwuY="; release."9.0.0+coq8.16".sha256 = "sha256-pwFTl4Unr2ZIirAB3HTtfhL2YN7G/Pg88RX9AhKWXbE="; diff --git a/pkgs/development/coq-modules/ceres/default.nix b/pkgs/development/coq-modules/ceres/default.nix index b8f162207f88c..410b43ee10b09 100644 --- a/pkgs/development/coq-modules/ceres/default.nix +++ b/pkgs/development/coq-modules/ceres/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.18"; out = "0.4.1"; } + { case = range "8.14" "8.19"; out = "0.4.1"; } { case = range "8.8" "8.16"; out = "0.4.0"; } ] null; release."0.4.1".sha256 = "sha256-9vyk8/8IVsqNyhw3WPzl8w3L9Wu7gfaMVa3n2nWjFiA="; diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index 16a26d9fa32eb..ebc03a3a7306f 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -1,18 +1,18 @@ -{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: +{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: mkCoqDerivation { pname = "coq-bits"; repo = "bits"; inherit version; - defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.16"; out = "1.1.0"; } - { case = range "8.7" "8.15"; out = "1.0.0"; } + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.10" "8.16") (isLt "2.0") ]; out = "1.1.0"; } + { cases = [ (range "8.7" "8.15") (isLt "2.0") ]; out = "1.0.0"; } ] null; release."1.1.0".sha256 = "sha256-TCw1kSXeW0ysIdLeNr+EGmpGumEE9i8tinEMp57UXaE="; release."1.0.0".sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; - propagatedBuildInputs = [ mathcomp-algebra ]; + propagatedBuildInputs = [ mathcomp.algebra ]; meta = with lib; { description = "A formalization of bitset operations in Coq"; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 54ef3f8b0f36f..9eaebbb646d15 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.18"; out = "0.11.8"; } + { case = range "8.11" "8.19"; out = "0.12.0"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } { case = range "8.8" "8.13"; out = "0.11.3"; } @@ -13,6 +13,7 @@ mkCoqDerivation rec { { case = "8.6"; out = "0.9.5"; } { case = "8.5"; out = "0.9.4"; } ] null; + release."0.12.0".sha256 = "sha256-9szpnWoS83bDc+iLqElfgz0LNRo9hSRQwUFIgpTca4c="; release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k="; release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY="; release."0.11.6".sha256 = "0w6iyrdszz7zc8kaybhy3mwjain2d2f83q79xfd5di0hgdayh7q7"; diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix index 5d1d232821fdd..6d563dca746ee 100644 --- a/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/pkgs/development/coq-modules/coq-record-update/default.nix @@ -5,7 +5,7 @@ owner = "tchajed"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.18"; out = "0.3.1"; } + { case = range "8.10" "8.19"; out = "0.3.1"; } ] null; release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk="; release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z"; diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index a33fd8b87e275..0ae9fc5ca62e5 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -4,10 +4,10 @@ mkCoqDerivation rec { pname = "corn"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = "8.6"; out = "8.8.1"; } { case = (range "8.14" "8.18"); out = "8.18.0"; } { case = (range "8.11" "8.17"); out = "8.16.0"; } { case = (range "8.7" "8.15"); out = "8.13.0"; } + { case = "8.6"; out = "8.8.1"; } ] null; release = { "8.8.1".sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp"; @@ -17,7 +17,6 @@ mkCoqDerivation rec { "8.18.0".sha256 = "sha256-ow3mfarZ1PvBGf5WLnI8LdF3E+8A6fN7cOcXHrZJLo0="; }; - preConfigure = "patchShebangs ./configure.sh"; configureScript = "./configure.sh"; dontAddPrefix = true; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index bce21f0e6c62d..15dd62fb75521 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -10,7 +10,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ { cases = [(range "8.17" "8.18") (isGe "2.0.0") ]; out = "0.4.0"; } - { cases = [(range "8.11" "8.18") (isGe "1.12.0") ]; out = "0.3.1"; } + { cases = [(range "8.11" "8.18") (range "1.12.0" "1.18.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } ] null; diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix index 1e16adddf4958..7152084854b63 100644 --- a/pkgs/development/coq-modules/gaia-hydras/default.nix +++ b/pkgs/development/coq-modules/gaia-hydras/default.nix @@ -12,8 +12,8 @@ mkCoqDerivation rec { inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp.version] [ - { cases = [ (range "8.13" "8.16") (isGe "1.12.0") ]; out = "0.9"; } - { cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; } + { cases = [ (range "8.13" "8.16") (range "1.12.0" "1.18.0") ]; out = "0.9"; } + { cases = [ (range "8.13" "8.14") (range "1.12.0" "1.18.0") ]; out = "0.5"; } ] null; propagatedBuildInputs = [ diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index f95f1d425ea8e..43bee68e7b5e1 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -19,7 +19,7 @@ let owner = "math-comp"; withDoc = single && (args.withDoc or false); defaultVersion = with versions; lib.switch coq.coq-version [ - { case = isGe "8.17"; out = "1.18.0"; } + { case = range "8.17" "8.18"; out = "1.18.0"; } { case = range "8.15" "8.18"; out = "1.17.0"; } { case = range "8.16" "8.18"; out = "2.1.0"; } { case = range "8.16" "8.18"; out = "2.0.0"; } diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index b61b729eb4753..5695bcf2ee998 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -5,7 +5,7 @@ with builtins // lib; let repo = "metacoq"; owner = "MetaCoq"; - defaultVersion = with versions; lib.switch coq.coq-version [ + defaultVersion = with versions; switch coq.coq-version [ { case = "8.11"; out = "1.0-beta2-8.11"; } { case = "8.12"; out = "1.0-beta2-8.12"; } # Do not provide 8.13 because it does not compile with equations 1.3 provided by default (only 1.2.3) @@ -13,6 +13,8 @@ let { case = "8.14"; out = "1.1-8.14"; } { case = "8.15"; out = "1.1-8.15"; } { case = "8.16"; out = "1.1-8.16"; } + { case = "8.17"; out = "1.2.1-8.17"; } + { case = "8.18"; out = "1.2.1-8.18"; } ] null; release = { "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs="; @@ -24,11 +26,15 @@ let "1.1-8.14".sha256 = "sha256-6vViCNQl6BnGgOHX3P/OLfFXN4aUfv4RbDokfz2BgQI="; "1.1-8.15".sha256 = "sha256-qCD3wFW4E+8vSVk4XoZ0EU4PVya0al+JorzS9nzmR/0="; "1.1-8.16".sha256 = "sha256-cTK4ptxpPPlqxAhasZFX3RpSlsoTZwhTqs2A3BZy9sA="; + "1.2.1-8.17".sha256 = "sha256-FP4upuRsG8B5Q5FIr76t+ecRirrOUX0D1QiLq0/zMyE="; + "1.2.1-8.18".sha256 = "sha256-49g5db2Bv8HpltptJdxA7zrmgNFGC6arx5h2mKHhrko="; }; releaseRev = v: "v${v}"; # list of core metacoq packages sorted by dependency order - packages = [ "template-coq" "pcuic" "safechecker" "erasure" "all" ]; + packages = if versionAtLeast coq.coq-version "8.17" + then [ "utils" "common" "template-coq" "pcuic" "safechecker" "template-pcuic" "erasure" "quotation" "safechecker-plugin" "erasure-plugin" "all" ] + else [ "template-coq" "pcuic" "safechecker" "erasure" "all" ]; template-coq = metacoq_ "template-coq"; @@ -47,7 +53,15 @@ let mlPlugin = true; propagatedBuildInputs = [ equations coq.ocamlPackages.zarith ] ++ metacoq-deps; - patchPhase = '' + patchPhase = if versionAtLeast coq.coq-version "8.17" then '' + patchShebangs ./configure.sh + patchShebangs ./template-coq/update_plugin.sh + patchShebangs ./template-coq/gen-src/to-lower.sh + patchShebangs ./safechecker-plugin/clean_extraction.sh + patchShebangs ./erasure-plugin/clean_extraction.sh + echo "CAMLFLAGS+=-w -60 # Unused module" >> ./safechecker/Makefile.plugin.local + sed -i -e 's/mv $i $newi;/mv $i tmp; mv tmp $newi;/' ./template-coq/gen-src/to-lower.sh ./safechecker-plugin/clean_extraction.sh ./erasure-plugin/clean_extraction.sh + '' else '' patchShebangs ./configure.sh patchShebangs ./template-coq/update_plugin.sh patchShebangs ./template-coq/gen-src/to-lower.sh @@ -60,7 +74,7 @@ let configurePhase = optionalString (package == "all") pkgallMake + '' touch ${pkgpath}/metacoq-config - '' + optionalString (elem package ["safechecker" "erasure"]) '' + '' + optionalString (elem package ["safechecker" "erasure" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin"]) '' echo "-I ${template-coq}/lib/coq/${coq.coq-version}/user-contrib/MetaCoq/Template/" > ${pkgpath}/metacoq-config '' + optionalString (package == "single") '' ./configure.sh local diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index cdb500bc69c3b..a17e19acae871 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -4,10 +4,11 @@ mkCoqDerivation { pname = "paramcoq"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.10" "8.18"; out = "1.1.3+coq${coq.coq-version}"; } + { case = range "8.10" "8.19"; out = "1.1.3+coq${coq.coq-version}"; } { case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; } ] null; displayVersion = { paramcoq = "..."; }; + release."1.1.3+coq8.19".sha256 = "sha256-5NVsdLXaoz6qrr5ra5YfoHeuK4pEf8JX/X9+SZA0U+U="; release."1.1.3+coq8.18".sha256 = "sha256-hNBaj9hB+OzwXsOX+TOXtDLjA5oP4EmEgseLwxFxW+I="; release."1.1.3+coq8.17".sha256 = "sha256-m8QGGuwj1lHzDprf4LHgAuzwfoblxtDIHunHBdpmiuM="; release."1.1.3+coq8.16".sha256 = "sha256-K7/8hXH6DwiW7Gw41sgQF8UDAO3c32xBGWQQapzG8Mo="; diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix index 671b2bef9411b..764c65ee3e6b3 100644 --- a/pkgs/development/coq-modules/parsec/default.nix +++ b/pkgs/development/coq-modules/parsec/default.nix @@ -11,7 +11,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.18"; out = "0.1.2"; } + { case = range "8.14" "8.19"; out = "0.1.2"; } { case = range "8.12" "8.16"; out = "0.1.1"; } { case = range "8.12" "8.13"; out = "0.1.0"; } ] null; diff --git a/pkgs/development/coq-modules/pocklington/default.nix b/pkgs/development/coq-modules/pocklington/default.nix index a9e0d43a5a7ac..1ee80e9a4b6e1 100644 --- a/pkgs/development/coq-modules/pocklington/default.nix +++ b/pkgs/development/coq-modules/pocklington/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = isGe "8.7"; out = "8.12.0"; } + { case = range "8.7" "8.18"; out = "8.12.0"; } ] null; meta = with lib; { diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index de74e1704536a..719c09630dba5 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -6,7 +6,7 @@ repo = "coq-simple-io"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.18"; out = "1.8.0"; } + { case = range "8.11" "8.19"; out = "1.8.0"; } { case = range "8.7" "8.13"; out = "1.3.0"; } ] null; release."1.8.0".sha256 = "sha256-3ADNeXrBIpYRlfUW+LkLHUWV1w1HFrVc/TZISMuwvRY="; diff --git a/pkgs/development/coq-modules/zorns-lemma/default.nix b/pkgs/development/coq-modules/zorns-lemma/default.nix index 0df19759700ca..edd28fd3b05f2 100644 --- a/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -18,7 +18,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.12" "8.18"; out = "10.2.0"; } + { case = range "8.12" "8.19"; out = "10.2.0"; } { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } diff --git a/pkgs/development/cuda-modules/README.md b/pkgs/development/cuda-modules/README.md new file mode 100644 index 0000000000000..76732c5ddfb31 --- /dev/null +++ b/pkgs/development/cuda-modules/README.md @@ -0,0 +1,97 @@ +# Cuda modules + +> [!NOTE] +> This document is meant to help CUDA maintainers understand the structure of +> the CUDA packages in Nixpkgs. It is not meant to be a user-facing document. +> For a user-facing document, see [the CUDA section of the manual](../../../doc/languages-frameworks/cuda.section.md). + +The files in this directory are added (in some way) to the `cudaPackages` +package set by [cuda-packages.nix](../../top-level/cuda-packages.nix). + +## Top-level files + +Top-level nix files are included in the initial creation of the `cudaPackages` +scope. These are typically required for the creation of the finalized +`cudaPackages` scope: + +- `backend-stdenv.nix`: Standard environment for CUDA packages. +- `flags.nix`: Flags set, or consumed by, NVCC in order to build packages. +- `gpus.nix`: A list of supported NVIDIA GPUs. +- `nvcc-compatibilities.nix`: NVCC releases and the version range of GCC/Clang + they support. + +## Top-level directories + +- `cuda`: CUDA redistributables! Provides extension to `cudaPackages` scope. +- `cudatoolkit`: monolothic CUDA Toolkit run-file installer. Provides extension + to `cudaPackages` scope. +- `cudnn`: NVIDIA cuDNN library. +- `cutensor`: NVIDIA cuTENSOR library. +- `generic-builders`: + - Contains a builder `manifest.nix` which operates on the `Manifest` type + defined in `modules/generic/manifests`. Most packages are built using this + builder. + - Contains a builder `multiplex.nix` which leverages the Manifest builder. In + short, the Multiplex builder adds multiple versions of a single package to + single instance of the CUDA Packages package set. It is used primarily for + packages like `cudnn` and `cutensor`. +- `modules`: Nixpkgs modules to check the shape and content of CUDA + redistributable and feature manifests. These modules additionally use shims + provided by some CUDA packages to allow them to re-use the + `genericManifestBuilder`, even if they don't have manifest files of their + own. `cudnn` and `tensorrt` are examples of packages which provide such + shims. These modules are further described in the + [Modules](./modules/README.md) documentation. +- `nccl`: NVIDIA NCCL library. +- `nccl-tests`: NVIDIA NCCL tests. +- `saxpy`: Example CMake project that uses CUDA. +- `setup-hooks`: Nixpkgs setup hooks for CUDA. +- `tensorrt`: NVIDIA TensorRT library. + +## Distinguished packages + +### Cuda compatibility + +[Cuda Compatibility](https://docs.nvidia.com/deploy/cuda-compatibility/), +available as `cudaPackages.cuda_compat`, is a component which makes it possible +to run applications built against a newer CUDA toolkit (for example CUDA 12) on +a machine with an older CUDA driver (for example CUDA 11), which isn't possible +out of the box. At the time of writing, Cuda Compatibility is only available on +the Nvidia Jetson architecture, but Nvidia might release support for more +architectures in the future. + +As Cuda Compatibility strictly increases the range of supported applications, we +try our best to enable it by default on supported platforms. + +#### Functioning + +`cuda_compat` simply provides a new `libcuda.so` (and associated variants) that +needs to be used in place of the default CUDA driver's `libcuda.so`. However, +the other shared libraries of the default driver must still be accessible: +`cuda_compat` isn't a complete drop-in replacement for the driver (and that's +the point, otherwise, it would just be a newer driver). + +Nvidia's recommendation is to set `LD_LIBRARY_PATH` to points to `cuda_compat`'s +driver. This is fine for a manual, one-shot usage, but in general setting +`LD_LIBRARY_PATH` is a red flag. This is global state which short-circuits most +of other dynamic libraries resolution mechanisms and can break things in +non-obvious ways, especially with other Nix-built software. + +#### Cuda compat with Nix + +Since `cuda_compat` is a known derivation, the easy way to do this in Nix would +be to add `cuda_compat` as a dependency of CUDA libraries and applications and +let Nix does its magic by filling the `DT_RUNPATH` fields. However, +`cuda_compat` itself depends on `libnvrm_mem` and `libnvrm_gpu` which are loaded +dynamically at runtime from `/run/opengl-driver`. This doesn't please the Nix +sandbox when building, which can't find those (a second minor issue is that +`addOpenGLRunpathHook` prepends the `/run/opengl-driver` path, so that would +still take precedence). + +The current solution is to do something similar to `addOpenGLRunpathHook`: the +`addCudaCompatRunpathHook` prepends to the path to `cuda_compat`'s `libcuda.so` +to the `DT_RUNPATH` of whichever package includes the hook as a dependency, and +we include the hook by default for packages in `cudaPackages` (by adding it as a +inputs in `genericManifestBuilder`). We also make sure it's included after +`addOpenGLRunpathHook`, so that it appears _before_ in the `DT_RUNPATH` and +takes precedence. diff --git a/pkgs/development/cuda-modules/backend-stdenv.nix b/pkgs/development/cuda-modules/backend-stdenv.nix new file mode 100644 index 0000000000000..10fedd1e6f271 --- /dev/null +++ b/pkgs/development/cuda-modules/backend-stdenv.nix @@ -0,0 +1,39 @@ +{ + lib, + nvccCompatibilities, + cudaVersion, + buildPackages, + overrideCC, + stdenv, + wrapCCWith, +}: +let + gccMajorVersion = nvccCompatibilities.${cudaVersion}.gccMaxMajorVersion; + # We use buildPackages (= pkgsBuildHost) because we look for a gcc that + # runs on our build platform, and that produces executables for the host + # platform (= platform on which we deploy and run the downstream packages). + # The target platform of buildPackages.gcc is our host platform, so its + # .lib output should be the libstdc++ we want to be writing in the runpaths + # Cf. https://github.com/NixOS/nixpkgs/pull/225661#discussion_r1164564576 + nixpkgsCompatibleLibstdcxx = buildPackages.gcc.cc.lib; + nvccCompatibleCC = buildPackages."gcc${gccMajorVersion}".cc; + + cc = wrapCCWith { + cc = nvccCompatibleCC; + + # This option is for clang's libcxx, but we (ab)use it for gcc's libstdc++. + # Note that libstdc++ maintains forward-compatibility: if we load a newer + # libstdc++ into the process, we can still use libraries built against an + # older libstdc++. This, in practice, means that we should use libstdc++ from + # the same stdenv that the rest of nixpkgs uses. + # We currently do not try to support anything other than gcc and linux. + libcxx = nixpkgsCompatibleLibstdcxx; + }; + cudaStdenv = overrideCC stdenv cc; + passthruExtra = { + inherit nixpkgsCompatibleLibstdcxx; + # cc already exposed + }; + assertCondition = true; +in +lib.extendDerivation assertCondition passthruExtra cudaStdenv diff --git a/pkgs/development/cuda-modules/cuda/extension.nix b/pkgs/development/cuda-modules/cuda/extension.nix new file mode 100644 index 0000000000000..dff79c1ee55f7 --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/extension.nix @@ -0,0 +1,102 @@ +{cudaVersion, lib}: +let + inherit (lib) attrsets modules trivial; + redistName = "cuda"; + + # Manifest files for CUDA redistributables (aka redist). These can be found at + # https://developer.download.nvidia.com/compute/cuda/redist/ + # Maps a cuda version to the specific version of the manifest. + cudaVersionMap = { + "11.4" = "11.4.4"; + "11.5" = "11.5.2"; + "11.6" = "11.6.2"; + "11.7" = "11.7.1"; + "11.8" = "11.8.0"; + "12.0" = "12.0.1"; + "12.1" = "12.1.1"; + "12.2" = "12.2.2"; + "12.3" = "12.3.0"; + }; + + # Check if the current CUDA version is supported. + cudaVersionMappingExists = builtins.hasAttr cudaVersion cudaVersionMap; + + # fullCudaVersion : String + fullCudaVersion = cudaVersionMap.${cudaVersion}; + + evaluatedModules = modules.evalModules { + modules = [ + ../modules + # We need to nest the manifests in a config.cuda.manifests attribute so the + # module system can evaluate them. + { + cuda.manifests = { + redistrib = trivial.importJSON (./manifests + "/redistrib_${fullCudaVersion}.json"); + feature = trivial.importJSON (./manifests + "/feature_${fullCudaVersion}.json"); + }; + } + ]; + }; + + # Generally we prefer to do things involving getting attribute names with feature_manifest instead + # of redistrib_manifest because the feature manifest will have *only* the redist architecture + # names as the keys, whereas the redistrib manifest will also have things like version, name, license, + # and license_path. + featureManifest = evaluatedModules.config.cuda.manifests.feature; + redistribManifest = evaluatedModules.config.cuda.manifests.redistrib; + + # Builder function which builds a single redist package for a given platform. + # buildRedistPackage : callPackage -> PackageName -> Derivation + buildRedistPackage = + callPackage: pname: + let + redistribRelease = redistribManifest.${pname}; + featureRelease = featureManifest.${pname}; + drv = + (callPackage ../generic-builders/manifest.nix { + # We pass the whole release to the builder because it has logic to handle + # the case we're trying to build on an unsupported platform. + inherit + pname + redistName + redistribRelease + featureRelease + ; + }).overrideAttrs + ( + prevAttrs: { + # Add the package-specific license. + meta = prevAttrs.meta // { + license = + let + licensePath = + if redistribRelease.license_path != null then + redistribRelease.license_path + else + "${pname}/LICENSE.txt"; + url = "https://developer.download.nvidia.com/compute/cuda/redist/${licensePath}"; + in + lib.licenses.nvidiaCudaRedist // {inherit url;}; + }; + } + ); + in + drv; + + # Build all the redist packages given final and prev. + redistPackages = + final: _prev: + # Wrap the whole thing in an optionalAttrs so we can return an empty set if the CUDA version + # is not supported. + # NOTE: We cannot include the call to optionalAttrs *in* the pipe as we would strictly evaluate the + # attrNames before we check if the CUDA version is supported. + attrsets.optionalAttrs cudaVersionMappingExists ( + trivial.pipe featureManifest [ + # Get all the package names + builtins.attrNames + # Build the redist packages + (trivial.flip attrsets.genAttrs (buildRedistPackage final.callPackage)) + ] + ); +in +redistPackages diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_11.4.4.json b/pkgs/development/cuda-modules/cuda/manifests/feature_11.4.4.json new file mode 100644 index 0000000000000..d7c6cebca22f3 --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/manifests/feature_11.4.4.json @@ -0,0 +1,1212 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": true, + "static": false + } + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "fabricmanager": { + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcublas": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufft": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufile": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + } + }, + "libcurand": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusolver": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusparse": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnpp": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_compute": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_systems": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_vse": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "nvidia_fs": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_11.5.2.json b/pkgs/development/cuda-modules/cuda/manifests/feature_11.5.2.json new file mode 100644 index 0000000000000..e70a3bc950ce2 --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/manifests/feature_11.5.2.json @@ -0,0 +1,1224 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": true, + "static": false + } + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "fabricmanager": { + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcublas": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufft": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufile": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + } + }, + "libcurand": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusolver": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusparse": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnpp": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvidia_nscq": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_compute": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_systems": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_vse": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "nvidia_fs": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_11.6.2.json b/pkgs/development/cuda-modules/cuda/manifests/feature_11.6.2.json new file mode 100644 index 0000000000000..0711f6fb49871 --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/manifests/feature_11.6.2.json @@ -0,0 +1,1224 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": true, + "static": false + } + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "fabricmanager": { + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcublas": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufft": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufile": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + } + }, + "libcurand": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusolver": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusparse": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnpp": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvidia_nscq": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_compute": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_systems": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_vse": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "nvidia_fs": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_11.7.1.json b/pkgs/development/cuda-modules/cuda/manifests/feature_11.7.1.json new file mode 100644 index 0000000000000..54d6699d898a0 --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/manifests/feature_11.7.1.json @@ -0,0 +1,1244 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": true, + "static": false + } + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "fabricmanager": { + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcublas": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufft": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufile": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + } + }, + "libcurand": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusolver": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusparse": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnpp": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_compute": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_systems": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_vse": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "nvidia_fs": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_11.8.0.json b/pkgs/development/cuda-modules/cuda/manifests/feature_11.8.0.json new file mode 100644 index 0000000000000..d2e9958206bfa --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/manifests/feature_11.8.0.json @@ -0,0 +1,1540 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_compat": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cudart": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cupti": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": true, + "static": false + } + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_documentation": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_gdb": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "fabricmanager": { + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcublas": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcudla": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcufft": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufile": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + } + }, + "libcurand": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusolver": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusparse": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnpp": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_compute": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_systems": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_vse": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "nvidia_fs": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.0.1.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.0.1.json new file mode 100644 index 0000000000000..8dd9182861582 --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/manifests/feature_12.0.1.json @@ -0,0 +1,1622 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_compat": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cudart": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cupti": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": true, + "static": false + } + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_documentation": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_gdb": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_opencl": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "fabricmanager": { + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcublas": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcudla": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcufft": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufile": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + } + }, + "libcurand": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusolver": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusparse": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnpp": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libnvjitlink": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvvm_samples": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_compute": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_systems": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_vse": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "nvidia_fs": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.1.1.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.1.1.json new file mode 100644 index 0000000000000..8dd9182861582 --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/manifests/feature_12.1.1.json @@ -0,0 +1,1622 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_compat": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cudart": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cupti": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": true, + "static": false + } + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_documentation": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_gdb": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_opencl": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "fabricmanager": { + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcublas": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcudla": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcufft": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufile": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + } + }, + "libcurand": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusolver": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusparse": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnpp": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libnvjitlink": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvvm_samples": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_compute": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_systems": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_vse": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "nvidia_fs": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.2.2.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.2.2.json new file mode 100644 index 0000000000000..84ea7f24ebed6 --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/manifests/feature_12.2.2.json @@ -0,0 +1,1600 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_compat": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cudart": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cupti": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": true, + "static": false + } + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_documentation": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_gdb": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_opencl": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "fabricmanager": { + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcublas": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcudla": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcufft": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufile": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + } + }, + "libcurand": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusolver": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusparse": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnpp": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libnvjitlink": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvjpeg": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_compute": { + "linux-aarch64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_systems": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_vse": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "nvidia_fs": { + "linux-aarch64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.3.0.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.3.0.json new file mode 100644 index 0000000000000..d8e1d0b0aeae9 --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/manifests/feature_12.3.0.json @@ -0,0 +1,1316 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": true, + "static": false + } + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_opencl": { + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_profiler_api": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "fabricmanager": { + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libcublas": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufft": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcufile": { + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": true, + "static": true + } + } + }, + "libcurand": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusolver": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libcusparse": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnpp": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "libnvjitlink": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": true, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_compute": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_systems": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nsight_vse": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-sbsa": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": true, + "dev": false, + "doc": false, + "lib": true, + "sample": false, + "static": false + } + } + }, + "nvidia_fs": { + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": false, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.4.4.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.4.4.json index 374079b2bcb37..374079b2bcb37 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.4.4.json +++ b/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.4.4.json diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.5.2.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.5.2.json index 94335065c8a77..94335065c8a77 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.5.2.json +++ b/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.5.2.json diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.6.2.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.6.2.json index 3de6bb9f6efbe..3de6bb9f6efbe 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.6.2.json +++ b/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.6.2.json diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.7.1.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.7.1.json new file mode 100644 index 0000000000000..be43aab3ec870 --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.7.1.json @@ -0,0 +1,885 @@ +{ + "release_date": "2022-08-03", + "cuda_cccl": { + "name": "CXX Core Compute Libraries", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "bf051d7b22581e31fac992c12af1400036d38e6a53e230b08f2aac3fa93d593e", + "md5": "ba8caa16f0f0b2a34d65a83b501369eb", + "size": "1004116" + }, + "linux-ppc64le": { + "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-11.7.91-archive.tar.xz", + "sha256": "5c4c56a91054e0bff1052b1359774c86b2d10f0bd0712d50cdc78b5ea636f6ee", + "md5": "55710f4bf751a12b3bb0525cc3794e1a", + "size": "1004352" + }, + "linux-sbsa": { + "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-11.7.91-archive.tar.xz", + "sha256": "1137f6b08aac445070ed467e61fb68494339b798a1c6e1929647e87053b05c86", + "md5": "3a5cb39720d7be44f32eb1331326a9ec", + "size": "1004092" + }, + "windows-x86_64": { + "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-11.7.91-archive.zip", + "sha256": "638ec54f6d180d17c6f70ba45e7694a29f1d7014a434e4f1c081198c04017147", + "md5": "a5f9bf5a16ed2a7c0132168c1e0782c4", + "size": "2563581" + } + }, + "cuda_cudart": { + "name": "CUDA Runtime (cudart)", + "license": "CUDA Toolkit", + "version": "11.7.99", + "linux-x86_64": { + "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-11.7.99-archive.tar.xz", + "sha256": "7892409299c6865d0652373cb385add31b0faa2e5421a931ae9fbc103e1472ad", + "md5": "31bf77729efe1d1f09ff65faba0f67f8", + "size": "854756" + }, + "linux-ppc64le": { + "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-11.7.99-archive.tar.xz", + "sha256": "0a326ec6b1abcc6e54172a09bf9ba44b3b75ae536eb1287ebf4baa76609012c9", + "md5": "d007dc5ec2752717db482e1d0ec4c70e", + "size": "795684" + }, + "linux-sbsa": { + "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-11.7.99-archive.tar.xz", + "sha256": "b7c90ae963e67825b9b518062902d4b80a55a3f3ada6f5bb3a7c19b8e93df024", + "md5": "1ffd4fde62beb2c429837a365aea5760", + "size": "798380" + }, + "windows-x86_64": { + "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-11.7.99-archive.zip", + "sha256": "1eb967fe01843dbe4b41a43352df193018077dd28b06eb2fd5af897b03f92d5c", + "md5": "c8cc7f3f93444de4652a6fb2b08c2397", + "size": "2884857" + } + }, + "cuda_cuobjdump": { + "name": "cuobjdump", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "a345694cf430a668b2fb9aac34e01b373c4283751cd8ee3f91439c8c9613455d", + "md5": "6584e15dac6ce66f10f0f76ac618c1ea", + "size": "127260" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-11.7.91-archive.tar.xz", + "sha256": "345dc2651a8e069a766ee9ceaa7052764964fbb75d17c765bd1f3656f22e45b6", + "md5": "c82c84e46f6d2c4c154faa81d341e3ec", + "size": "140532" + }, + "linux-sbsa": { + "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-11.7.91-archive.tar.xz", + "sha256": "f408a0534081a1e8e3cc2b3aaec33f9ba09c7c60bdd8a6d20b3ec69c688a576e", + "md5": "71e958168e3d637751f3bb2f948a0d8e", + "size": "124120" + }, + "windows-x86_64": { + "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-11.7.91-archive.zip", + "sha256": "6024efc79c78668de3e21b608035e77f1d40dc7bb250630255d627ccb2e51380", + "md5": "5034e6496a31fb6c8b722590076f41a0", + "size": "2523878" + } + }, + "cuda_cupti": { + "name": "CUPTI", + "license": "CUDA Toolkit", + "version": "11.7.101", + "linux-x86_64": { + "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-11.7.101-archive.tar.xz", + "sha256": "7193f5d9b23e91b5cc34df57f7500f891b8461c1ace2d2489beed38da6d22f23", + "md5": "8251f46de255ad61d1fa5df01de6d44f", + "size": "16923928" + }, + "linux-ppc64le": { + "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-11.7.101-archive.tar.xz", + "sha256": "6f99b8a421235932974d7b14a20b8e61e7f5e65efc65b73b9f8455ef7627dbce", + "md5": "396fc8ebdeca795b4553e0837d1f5900", + "size": "8661172" + }, + "linux-sbsa": { + "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-11.7.101-archive.tar.xz", + "sha256": "42c2f7b9734a18dec5f63b954e3bc1ff45f4283b1707d88e7eb298d40c2a7390", + "md5": "103742737a3f76cc7fe53926cbcec00e", + "size": "8506536" + }, + "windows-x86_64": { + "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-11.7.101-archive.zip", + "sha256": "9d2d98b73cf70165a0c7652b5c764da2816209f519a8c73cdf01733a83502170", + "md5": "0103f854be9331a3fed35d1d2f1217e5", + "size": "11548637" + } + }, + "cuda_cuxxfilt": { + "name": "CUDA cuxxfilt (demangler)", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "7d6c8074e76fdcf294569a92883355b71ac591c0c117daf0752320f60e254506", + "md5": "cf471de3ea0d22b0382e4c32abcba2fd", + "size": "186264" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-11.7.91-archive.tar.xz", + "sha256": "f44e311983ced0ab98fed509b08a682b2c9f9c93d31bc3f7bec4dacfe6c24d22", + "md5": "84f06154873f165a427e457c5bb367b3", + "size": "181312" + }, + "linux-sbsa": { + "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-11.7.91-archive.tar.xz", + "sha256": "e9798ddebc419fdc03bfe627cd1c8a3a683fd87b7f0a0b0ee2b76bfc98e951f1", + "md5": "9b42db5debcbd34c96ea11a975d8a487", + "size": "172664" + }, + "windows-x86_64": { + "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-11.7.91-archive.zip", + "sha256": "af41ea6a2673222cfea3aaf77ba369b17741cbed528f4d4482341d9f00a2cd18", + "md5": "a16ae2cef58dd60a6f505a4525a85e4e", + "size": "168946" + } + }, + "cuda_demo_suite": { + "name": "CUDA Demo Suite", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "f1ec9416a2bee5ceea0e7db9ba1936d661b5a5ab5193d19219d646018f789048", + "md5": "a6eddd4dc84a1996cf42d186307aa582", + "size": "3987624" + }, + "windows-x86_64": { + "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-11.7.91-archive.zip", + "sha256": "5116656f74f894707e4eb3eb0028a8fc935b905f5fc3e7aa8ca7c4ee5454ce95", + "md5": "760a960af1d6565f15aa83df0fa3c3cf", + "size": "5023831" + } + }, + "cuda_documentation": { + "name": "CUDA Documentation", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "680d7b7df3b627eb00046d9b051120a5568306a405c97fec46ce005d4cde7177", + "md5": "5ffc2d1e1b59a640b9a9889830d2fd4d", + "size": "65688" + }, + "linux-ppc64le": { + "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-11.7.91-archive.tar.xz", + "sha256": "229b39ec29343137f2cf3a77cb0b1de5546b0dfbf8a7c0ffb82b7e2348f2d70a", + "md5": "18a638ca4c87283393a91b003e1552bb", + "size": "65892" + }, + "linux-sbsa": { + "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-11.7.91-archive.tar.xz", + "sha256": "bdfdad5afcb5e2a2915f1c0b6af022ae4c2496af66928bbcd2b6148fa1cb02f9", + "md5": "48358932a272ad97c5d87368b31c7895", + "size": "65696" + }, + "windows-x86_64": { + "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-11.7.91-archive.zip", + "sha256": "47571f8292a07552388fe92eaea6e571a8cdc6bf4aa0d87795232cd4c6256242", + "md5": "7f435e81b21d65224d056d8e1f2a2293", + "size": "103883" + } + }, + "cuda_gdb": { + "name": "CUDA GDB", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "88139baf0eff8350f5250bfa0b335d6a8a21efb125e5340264cf715c6f717dee", + "md5": "1b7ba763ba29aa3b867313daac3f6306", + "size": "64326484" + }, + "linux-ppc64le": { + "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-11.7.91-archive.tar.xz", + "sha256": "31f91a7c13d2524bde919b2cd0f4d946522af58a0937341606e96e8e5099b8af", + "md5": "5e294385247fc88eaef4c27e2f2b26b0", + "size": "64156680" + }, + "linux-sbsa": { + "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-11.7.91-archive.tar.xz", + "sha256": "c00a2de57e3f293e0236c4aa23f2a2c4842a7a9a0f4e0a156e8c7073e15300c9", + "md5": "a9129971763d386d8f95021e0821e0f1", + "size": "63933124" + } + }, + "cuda_memcheck": { + "name": "CUDA Memcheck", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_memcheck/linux-x86_64/cuda_memcheck-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "4e8b01194aea23ec2c5e8fec8fcb12bae60594e34552d2339dc4fc695c6a7454", + "md5": "5937f55b86d1b4c7a55989d2baff4a1b", + "size": "139772" + }, + "linux-ppc64le": { + "relative_path": "cuda_memcheck/linux-ppc64le/cuda_memcheck-linux-ppc64le-11.7.91-archive.tar.xz", + "sha256": "750834023e2b233a604d6bd61e3736e3fbd9271050b84c85b8fbc83e5bdba221", + "md5": "a13f6fded406078a14d46c69bf5b9fbf", + "size": "147880" + }, + "windows-x86_64": { + "relative_path": "cuda_memcheck/windows-x86_64/cuda_memcheck-windows-x86_64-11.7.91-archive.zip", + "sha256": "0ec79164f5bc925ad9e1c0fd481dd5341be5c6f8c7bb366ac6a106be7f585730", + "md5": "5dec2fb14dace02a1be4648b4ef9d45c", + "size": "172868" + } + }, + "cuda_nsight": { + "name": "Nsight Eclipse Edition Plugin", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "1a5a0e4b8ee7885f80953b5547bf9c94dd4b050fbf66e213ce527d3926ce4473", + "md5": "7bd236c01d795c19ed68b19da44614ea", + "size": "118610820" + }, + "linux-ppc64le": { + "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-11.7.91-archive.tar.xz", + "sha256": "86a94c7f1f0a4746937dc77c33d3774fa8aa8fa45b48b5843a76956a8ef4642b", + "md5": "8679d0658976ae91ed1ef73fb73746eb", + "size": "118610828" + } + }, + "cuda_nvcc": { + "name": "CUDA NVCC", + "license": "CUDA Toolkit", + "version": "11.7.99", + "linux-x86_64": { + "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-11.7.99-archive.tar.xz", + "sha256": "4a75e5bd6a0e0e664ec5895ba050cf9d7cda08f41db2b6b4c36fb91cfb9627bc", + "md5": "9f0fad0ba21b72ef1813a8705b0e8171", + "size": "37045896" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-11.7.99-archive.tar.xz", + "sha256": "0cb5ca0b171bb0e513d1960fde4106457ad6a3d4f770984bfb69d736fb403e83", + "md5": "62bd522c15dd86bcff7a7bb0acad50c3", + "size": "34878168" + }, + "linux-sbsa": { + "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-11.7.99-archive.tar.xz", + "sha256": "59016452808b9b2eb83eeb05bdc0737983a1debb3812513c860869092a8152b8", + "md5": "3b9b2692ef4bbf413b1aa68aa8477288", + "size": "32636812" + }, + "windows-x86_64": { + "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-11.7.99-archive.zip", + "sha256": "55aac64b0c81b96628ad9511514c591c33a4649d15d5a579d351be5b89632276", + "md5": "e897644755a92a4681c8816cb6317981", + "size": "47663877" + } + }, + "cuda_nvdisasm": { + "name": "CUDA nvdisasm", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "da935b2d88a3e75095981143174026ca1d2a5ea43783240e7312874ae3e73217", + "md5": "d573df50a5f7dc07aa9e09df81b14d98", + "size": "32787620" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-11.7.91-archive.tar.xz", + "sha256": "daf6a45fd71f80e697720445734a52422fec4eed07664bfa1154c1d84a2f0b71", + "md5": "e967c5fd7d9a44cc8fa07d84eb1cfe5f", + "size": "32792832" + }, + "linux-sbsa": { + "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-11.7.91-archive.tar.xz", + "sha256": "09e183b991019eb102a8592ab3f3cf64fa1969a4ec42deb96407549938ece485", + "md5": "a7be5d6186b166d731f870ecbdab99ee", + "size": "32731196" + }, + "windows-x86_64": { + "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-11.7.91-archive.zip", + "sha256": "be716596ea300a295ab06b92caa92d7a17e4dd23f7a3f9ef0f98f1f81a63d241", + "md5": "189329f03aa56788ddabf00f7be6ac46", + "size": "33004702" + } + }, + "cuda_nvml_dev": { + "name": "CUDA NVML Headers", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "b8ea7d2a5adb138a9121911dd03eaa7b7d04c96c64d2fcc585c29be2a73ddfef", + "md5": "439c09ca1fecea5431f9f1684cb76118", + "size": "76392" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-11.7.91-archive.tar.xz", + "sha256": "a60c92d8eb6d014b4f5e961d9d64a6fee9f0b381c6238146b55210d142a501f9", + "md5": "fcc7b6ae2467ffca24326b4b934d0bde", + "size": "76108" + }, + "linux-sbsa": { + "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-11.7.91-archive.tar.xz", + "sha256": "891de12a4aa2941e95b1d3d84f57ffe38840bc3883d02b1c9ff1777b16ed07d9", + "md5": "4441e23289ee0246aa026585677e4ade", + "size": "76732" + }, + "windows-x86_64": { + "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-11.7.91-archive.zip", + "sha256": "f8a9be7526d4c201759346911145a026acafb72e664bae9ec8b9690f8ac4c56c", + "md5": "81fb3e254d1da50d6335beafb0f761c5", + "size": "106750" + } + }, + "cuda_nvprof": { + "name": "CUDA nvprof", + "license": "CUDA Toolkit", + "version": "11.7.101", + "linux-x86_64": { + "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-11.7.101-archive.tar.xz", + "sha256": "028c9ae359e037fd8b3b7976304821704818d141284e8878577061dc41e19afe", + "md5": "90fa02884b5cab3163f9ca94a5c3bea3", + "size": "1944168" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-11.7.101-archive.tar.xz", + "sha256": "be5cfe846f87968a7425cc210899b2c50dece34d79d975c235887ddac6453fcb", + "md5": "41c8f4a4ad5e8780ccb2dbd160b58775", + "size": "1600192" + }, + "linux-sbsa": { + "relative_path": "cuda_nvprof/linux-sbsa/cuda_nvprof-linux-sbsa-11.7.101-archive.tar.xz", + "sha256": "e910c6d39ef34317b4b6c57da4186ac88934ce6282c6392631141291821a482e", + "md5": "8899dafe69b323e2acb13d46cb9d3322", + "size": "16144" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-11.7.101-archive.zip", + "sha256": "2199a24ea32c4df25e55e4308bb5f620ec8e409ba904cb20f0fe57d081ac501a", + "md5": "625bf74f6cc19181010cd66c07d15c76", + "size": "1603321" + } + }, + "cuda_nvprune": { + "name": "CUDA nvprune", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "94a6bd85e944f89ce0192fae649ab9b213a7cea28d7bafa5f6a1d57c49148f84", + "md5": "41e4d4e51f7f96cf7e1db29009db780b", + "size": "55136" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-11.7.91-archive.tar.xz", + "sha256": "93d9e2ba9819ca19bac6c17e96bfd9bc56524a60372ab9d57286430df1c2265e", + "md5": "2fd26dccb2e78ff92dac81ee1cf23b02", + "size": "55756" + }, + "linux-sbsa": { + "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-11.7.91-archive.tar.xz", + "sha256": "f7325009c1e73f7b4f70117073af1e698dcf81ceb07569527760606b348385fa", + "md5": "1511a5b8b7bb2924e8324e93a2c16a07", + "size": "47604" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-11.7.91-archive.zip", + "sha256": "dcff80bce25f5d3f3b53a3f08b346ff5b38e5274a0e54572f97762e56d619236", + "md5": "09f6a56f13c677f6042472561529138f", + "size": "144825" + } + }, + "cuda_nvrtc": { + "name": "CUDA NVRTC", + "license": "CUDA Toolkit", + "version": "11.7.99", + "linux-x86_64": { + "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-11.7.99-archive.tar.xz", + "sha256": "cd6ed198ef77898bb3025145570d981cc7a0d2bda792e9a70822fcd274b18248", + "md5": "1afd3d6203308995b731a20563ea8303", + "size": "28033228" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-11.7.99-archive.tar.xz", + "sha256": "a99594647a16839612f078913252809fe2cbe3ff23b9023304ddd181f5ad0362", + "md5": "76d6e4a29cf3652c30154ec6b8e7780d", + "size": "26189204" + }, + "linux-sbsa": { + "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-11.7.99-archive.tar.xz", + "sha256": "32a94a6993edc24aadeebdae7c4e8fad04a9c7214bd1f505aec16256305feb4e", + "md5": "e52f252b10a8207e9d7464dc07ae55f8", + "size": "26042768" + }, + "windows-x86_64": { + "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-11.7.99-archive.zip", + "sha256": "d4b5027eee2e20155ba317b6b62f8fc36b2baa0c23b5c7031d93fa7d5b260fd1", + "md5": "340f20034bac368af3b3229fea99602d", + "size": "93547997" + } + }, + "cuda_nvtx": { + "name": "CUDA NVTX", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "a7741ed4911a0f1d17ab8da20f4e7fdc01fdd3d911b3592fa874cede9f82fd64", + "md5": "3120a53ef3be9e9074d62c5692a30d24", + "size": "48152" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-11.7.91-archive.tar.xz", + "sha256": "d572ad45a4e878c38454b19263666f0668222390568697ada3eda376a54ecc42", + "md5": "d751517c504774e5b95829cefb12a8c9", + "size": "48132" + }, + "linux-sbsa": { + "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-11.7.91-archive.tar.xz", + "sha256": "ab2350160efdfc1024511c94eb1ecffbee4260575a57cf2d48bdc533d942e3ef", + "md5": "f0e663c07f942cbbd0de8df1163074ba", + "size": "48696" + }, + "windows-x86_64": { + "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-11.7.91-archive.zip", + "sha256": "3918a2edeef7c2da6af036451b3768c1b9298a38776f8010f91f5366e1a3419f", + "md5": "c53c9e694b4c643cc36b4cbf1b07e8cf", + "size": "65690" + } + }, + "cuda_nvvp": { + "name": "CUDA NVVP", + "license": "CUDA Toolkit", + "version": "11.7.101", + "linux-x86_64": { + "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-11.7.101-archive.tar.xz", + "sha256": "1689e5a52f683e02f7ad47eae0c182f33bf8988c2ec9b8b8fe61b4a40ab97989", + "md5": "cd892070d2cfabadf2133039a0370de0", + "size": "117559820" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-11.7.101-archive.tar.xz", + "sha256": "81b670e1fa0e415446c6eeadc44c8f5e5d4eab7709cc280a494104ee7b636187", + "md5": "7920cebfb571c798d1a1b652f9960453", + "size": "117016948" + }, + "windows-x86_64": { + "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-11.7.101-archive.zip", + "sha256": "5fdf67691bf16a13fb3f472e7d7261f0a5112477c77e81aabd11d1ad27a5ae59", + "md5": "036b87efba3ee5982cf740b632a9f0ec", + "size": "120353825" + } + }, + "cuda_sanitizer_api": { + "name": "CUDA Compute Sanitizer API", + "license": "CUDA Toolkit", + "version": "11.7.91", + "linux-x86_64": { + "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-11.7.91-archive.tar.xz", + "sha256": "232bc60afa687d75825fce271ee8d5b56f2d58528785500448b830d61795840f", + "md5": "d94e9fe874ac1226fd69f2cad7245b23", + "size": "8316344" + }, + "linux-ppc64le": { + "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-11.7.91-archive.tar.xz", + "sha256": "2aa8cacf505c2f3cea263193df80e6411cbcb8eca5a46c539821324619fad47f", + "md5": "616b19f4001b6798f7f90a390912480a", + "size": "7742156" + }, + "linux-sbsa": { + "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-11.7.91-archive.tar.xz", + "sha256": "a98ad5ae882cfcf57439668f7b4fa736d85a0726160bba5c058dfce5f79cc4a4", + "md5": "a08127236f6343a3d7e84488f97bd1e7", + "size": "6454908" + }, + "windows-x86_64": { + "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-11.7.91-archive.zip", + "sha256": "1dc3858fc0e843fff830a260f00c9f2aed61882804735bea8154e577c8da42a2", + "md5": "b34204afa13f28bfdf567c2128806311", + "size": "13478900" + } + }, + "fabricmanager": { + "name": "NVIDIA Fabric Manager", + "license": "NVIDIA Driver", + "version": "515.65.01", + "linux-x86_64": { + "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-515.65.01-archive.tar.xz", + "sha256": "f3271a899151c762641e2beab68335ab1f52cb5beecef0f474780f8fbe804f58", + "md5": "8e158a039561f3fc7cec3d61dd19c525", + "size": "1470560" + }, + "linux-sbsa": { + "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-515.65.01-archive.tar.xz", + "sha256": "dac775eaed6bf26ffb7b8e281db7fd83f5edca5625dc86a0aca26f479263b38d", + "md5": "b30674e7fb23b2c189bb71e200764248", + "size": "1359224" + } + }, + "libcublas": { + "name": "CUDA cuBLAS", + "license": "CUDA Toolkit", + "version": "11.10.3.66", + "linux-x86_64": { + "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-11.10.3.66-archive.tar.xz", + "sha256": "15c117c74bc1401dbc87cc8a9f510155818786c030fc3396f4af6bc425aef6f3", + "md5": "b7ef03a0126377d8a1b3fa14b0d9c8c8", + "size": "417046836" + }, + "linux-ppc64le": { + "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-11.10.3.66-archive.tar.xz", + "sha256": "89020ee3be5143b10915d78dfc1dbe44aef952c9a0aad44b3bb973288bcf98c7", + "md5": "32b4ffb9312b7311ae46030b6007409f", + "size": "417479596" + }, + "linux-sbsa": { + "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-11.10.3.66-archive.tar.xz", + "sha256": "3d64f899d4e88bd85ff410aa8fda0fe3c14d0e3acadba9ef550924ac8f34b52d", + "md5": "c2641e424ea84665a9f67721ecb4bf34", + "size": "417698300" + }, + "windows-x86_64": { + "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-11.10.3.66-archive.zip", + "sha256": "f6d80b92b0c4ae077d71ee83aaa5057c4e6419b80e25ef22ff03a80aad700fe0", + "md5": "06edf73511fb738724264e59488f9935", + "size": "307337197" + } + }, + "libcufft": { + "name": "CUDA cuFFT", + "license": "CUDA Toolkit", + "version": "10.7.2.91", + "linux-x86_64": { + "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-10.7.2.91-archive.tar.xz", + "sha256": "4f1ed4817de6be53474a27c47097eb618a33b5a3e0ad08f5f68abc8b7312aa28", + "md5": "41a6e0c3dd3d38e2a73f38d1949e032e", + "size": "213585020" + }, + "linux-ppc64le": { + "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-10.7.2.91-archive.tar.xz", + "sha256": "1a80975288256a894a435a9bd2e842bfcb4dbfec3e52741f4808e90ab270828a", + "md5": "0cbe542f6d2aa5bc2641d37cf7c7dcb8", + "size": "213738992" + }, + "linux-sbsa": { + "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-10.7.2.91-archive.tar.xz", + "sha256": "c6147c67db716824d8b7ff61306ccbf1897e3d5e1399d37e6c5ede0334db4ce9", + "md5": "2a0ff67d0f1829a1e34f167e272da10a", + "size": "212515324" + }, + "windows-x86_64": { + "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-10.7.2.91-archive.zip", + "sha256": "88643d092d3d8ef30d2b5ca3757ea87577eaefc1268f350507a3b132abeb7f24", + "md5": "7860b8f5ca73b58c7038e7c3f710e8cd", + "size": "287120070" + } + }, + "libcufile": { + "name": "CUDA cuFile", + "license": "CUDA Toolkit", + "version": "1.3.1.18", + "linux-x86_64": { + "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.3.1.18-archive.tar.xz", + "sha256": "782473d5b2d0ae57eeb9044a0f6dc6f205787767f7a247bdeb9e916af1db61c2", + "md5": "66add7faa97bb2a7d5b1f2ac2af4bdba", + "size": "46933808" + } + }, + "libcurand": { + "name": "CUDA cuRAND", + "license": "CUDA Toolkit", + "version": "10.2.10.91", + "linux-x86_64": { + "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.2.10.91-archive.tar.xz", + "sha256": "283323c93050b3904d58417a6dd4055c156407c2df0c064ae81592e532b69a31", + "md5": "26ad932ad9ee5fc4e4b4afd91f95fa29", + "size": "82110404" + }, + "linux-ppc64le": { + "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.2.10.91-archive.tar.xz", + "sha256": "0d483258a04dcbbf845481d6bd15f061e06ba7608d54827eae026039aa9edaa4", + "md5": "1b609ba95d5a668056b0474dbf715fc8", + "size": "82156300" + }, + "linux-sbsa": { + "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.2.10.91-archive.tar.xz", + "sha256": "ce68130a726152a7f68a0cec85773e4074a2f2049e16ca41e462fde12affda94", + "md5": "3c1fc54570aa317d6ac15edf6799fefa", + "size": "82105144" + }, + "windows-x86_64": { + "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.2.10.91-archive.zip", + "sha256": "90e043d540765f410fa8d3d569e95b8eac15940037cd1159335f99d4caab484f", + "md5": "8be38680d09aafdf3c7c06d630c7aaf0", + "size": "53656549" + } + }, + "libcusolver": { + "name": "CUDA cuSOLVER", + "license": "CUDA Toolkit", + "version": "11.4.0.1", + "linux-x86_64": { + "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.4.0.1-archive.tar.xz", + "sha256": "9f56bfdfeccd63f4cde99bc4a573d5ab45e2339cf6a1b2a0fc7ff83ff9775b3d", + "md5": "b9eea1b15fd5ff72286ff31751aa3d9e", + "size": "75670492" + }, + "linux-ppc64le": { + "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.4.0.1-archive.tar.xz", + "sha256": "45a7645ad81a8874c192b816b227730aeb771443f54a34fa35e3496041ddcc09", + "md5": "0dfc2d853f84f7ce7a44a8f87e60d367", + "size": "75649948" + }, + "linux-sbsa": { + "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.4.0.1-archive.tar.xz", + "sha256": "eb9c08d184226c616a4ff041cec178b29480f8afe034f7537c0d07b6afe84588", + "md5": "7f0af50206ce081a67b05eadf607873a", + "size": "74862860" + }, + "windows-x86_64": { + "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.4.0.1-archive.zip", + "sha256": "bfce43d0437ae10a7250c9f173e04e048fc46f9e5c9ed2c2bd4db4e661c77ba1", + "md5": "e677373b0ba75e2aec8df60868fb8363", + "size": "95990827" + } + }, + "libcusparse": { + "name": "CUDA cuSPARSE", + "license": "CUDA Toolkit", + "version": "11.7.4.91", + "linux-x86_64": { + "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-11.7.4.91-archive.tar.xz", + "sha256": "16841f9d4350ca21b6b362d4265983a58e675d64a14f168687b1b68995bec32e", + "md5": "a7e7936e601b0645fc086e71e1e6f6f6", + "size": "203663528" + }, + "linux-ppc64le": { + "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-11.7.4.91-archive.tar.xz", + "sha256": "45b65fa9e864d2df5d0d8fd36e5fad28cb3d5793689ea214b310086d034ad4a8", + "md5": "3a6780fb8a79dce74a310c14cfd31a1c", + "size": "203731380" + }, + "linux-sbsa": { + "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-11.7.4.91-archive.tar.xz", + "sha256": "b7f1ba9c18f87db594847b318fa73b5c76945777b5c03a507434bfa6aba2f2a2", + "md5": "aa027c7f4b72d94be7f86fa243ac54ef", + "size": "203358196" + }, + "windows-x86_64": { + "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-11.7.4.91-archive.zip", + "sha256": "2827643399b92b87af858bf4b004b4a664bc7e838a18e2143258b93c019487b0", + "md5": "21c85acb7ffa3094b81eaee72ec3af5c", + "size": "170688099" + } + }, + "libnpp": { + "name": "CUDA NPP", + "license": "CUDA Toolkit", + "version": "11.7.4.75", + "linux-x86_64": { + "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-11.7.4.75-archive.tar.xz", + "sha256": "d90a30dd7e379d55cbc3b893e23c3bdf08b07293bdd2bd6957c4fc1e2ea998ef", + "md5": "49abdcebbefb9ab8ad8b6dac450c7b20", + "size": "182469720" + }, + "linux-ppc64le": { + "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-11.7.4.75-archive.tar.xz", + "sha256": "fb822e3c04e0fa1ff84dd236c9e9f5d84658c5b370d8d3ae235a241cc8445183", + "md5": "a320af153a4fb828b51552ca180bc866", + "size": "182956844" + }, + "linux-sbsa": { + "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-11.7.4.75-archive.tar.xz", + "sha256": "29499fe94220b91408487df21dc13a7c638482438e631df13cd5f1b28b68c48a", + "md5": "38989288b63a68b93d4fc414dbe3266a", + "size": "181639308" + }, + "windows-x86_64": { + "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-11.7.4.75-archive.zip", + "sha256": "dca9b5ee0021802f02a164f3ea6bd44e552b84bbe1896bebb21e625b811c7006", + "md5": "e61b5f9a59be9fe37141168726e3151e", + "size": "137990727" + } + }, + "libnvidia_nscq": { + "name": "NVIDIA NSCQ API", + "license": "NVIDIA Driver", + "version": "515.65.01", + "linux-x86_64": { + "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-515.65.01-archive.tar.xz", + "sha256": "588b0a5ce467992ba926ada4d36ccf6741c3cfcc3fa8f03c6f68290a3f2c2a3b", + "md5": "bd1d2193708b89158a5a40711cf60bcd", + "size": "334740" + }, + "linux-sbsa": { + "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-515.65.01-archive.tar.xz", + "sha256": "fa37d0c15d79fe3ad1280f5d5946ad3c849592d89627339d1ecd90e4baeb73a1", + "md5": "44c788de578818dfcedb507ad76f3d65", + "size": "303936" + } + }, + "libnvjpeg": { + "name": "CUDA nvJPEG", + "license": "CUDA Toolkit", + "version": "11.8.0.2", + "linux-x86_64": { + "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-11.8.0.2-archive.tar.xz", + "sha256": "ae8877a59d8badf6ed6e61b0b6690dbe516997386061557f5c33ba49de6e7ac9", + "md5": "a743a968906c4300ab3dbbcef5f13182", + "size": "1956104" + }, + "linux-ppc64le": { + "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-11.8.0.2-archive.tar.xz", + "sha256": "ce1862c4db6726531d7b778b0911ac77b76d2cd4253295d5d6984b0f2bcc0adf", + "md5": "89eb5043e361f875872e4b5bf07b05b0", + "size": "1972884" + }, + "linux-sbsa": { + "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-11.8.0.2-archive.tar.xz", + "sha256": "d157fb48056c896e0474f5e07fd6f51580d27501844f8218135e233de3b927e8", + "md5": "43f15a462121e538acc36ac9cc68603c", + "size": "1763644" + }, + "windows-x86_64": { + "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-11.8.0.2-archive.zip", + "sha256": "3e3d88d6dc9d0f01d9c9261b9c055f3a93ddfd65bb8609a92bd57ea9bd9fe6f2", + "md5": "56463f5e7dbf2ecfb991a7f1a96553b5", + "size": "1858909" + } + }, + "nsight_compute": { + "name": "Nsight Compute", + "license": "NVIDIA SLA", + "version": "2022.2.1.3", + "linux-x86_64": { + "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2022.2.1.3-archive.tar.xz", + "sha256": "ba3c1ee8c6f7e3fae993a83678df6e7c6ff12f2d9ac0ab1b0f056405f3e0490a", + "md5": "fb9a27ef58aafc5d7aae9c54e364e636", + "size": "420206916" + }, + "linux-ppc64le": { + "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2022.2.1.3-archive.tar.xz", + "sha256": "cbfaf3e608d66f6f2b087b6cca4f9d2a63bf41be0997fafe30213c9feda76e22", + "md5": "68f714d5d9a82177e7d7b0b9d06e2b96", + "size": "126488268" + }, + "linux-sbsa": { + "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2022.2.1.3-archive.tar.xz", + "sha256": "2dbd112b3d89ed60b78f91912c41672165df9e8dac47e96de4e9416f8364d39f", + "md5": "495a7b1b2bcef47ff37ecee1e01fdf22", + "size": "245773972" + }, + "windows-x86_64": { + "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2022.2.1.3-archive.zip", + "sha256": "6b3c11cf07100ad0f4eac843aad877391b3ce4f24808a2a2efcba93da704d80b", + "md5": "63ffe69b1afc698d95017ec0e0edeca2", + "size": "353604503" + } + }, + "nsight_nvtx": { + "name": "Nsight NVTX", + "license": "CUDA Toolkit", + "version": "1.21018621", + "windows-x86_64": { + "relative_path": "nsight_nvtx/windows-x86_64/nsight_nvtx-windows-x86_64-1.21018621-archive.zip", + "sha256": "d99b015bfb1308206f9d7c16ea401bf426fed3a5a99953b855fe4e68be5ed2d1", + "md5": "34ee04d45cfca1c4e3cbfba0ec8f6f80", + "size": "315692" + } + }, + "nsight_systems": { + "name": "Nsight Systems", + "license": "NVIDIA SLA", + "version": "2022.1.3.3", + "linux-x86_64": { + "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2022.1.3.3-archive.tar.xz", + "sha256": "bd95553d573f117be2e3b2bda6e79d14dbb038b136c12c6e5467bbd9a891681d", + "md5": "40d12d33aa2d496817d959a9551418aa", + "size": "166785296" + }, + "linux-ppc64le": { + "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2022.1.3.3-archive.tar.xz", + "sha256": "4c228bfbd38b80612afeb65a406cba829d2b2e2352ea4a810cd6a386d6190151", + "md5": "0d5da67cb5393a0e961509cd7dab98f1", + "size": "49700384" + }, + "linux-sbsa": { + "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2022.1.3.3-archive.tar.xz", + "sha256": "9025f56b9fe70288ee3f2d30477c9cfbe8c17a304b31f7f22caf7f78153d8d23", + "md5": "3559eeb8416d9a984012d2b397560740", + "size": "50415564" + }, + "windows-x86_64": { + "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2022.1.3.3-archive.zip", + "sha256": "294738ba0aa0621395740a6d039a490aa0bf5fceec449b1fd4135a97b81eda0f", + "md5": "91e316744714c168c1a75804c9a198c9", + "size": "315748009" + } + }, + "nsight_vse": { + "name": "Nsight Visual Studio Edition (VSE)", + "license": "NVIDIA SLA", + "version": "2022.2.1.22136", + "windows-x86_64": { + "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2022.2.1.22136-archive.zip", + "sha256": "b2afd0efaf6f1fab5a1aca71c536e34c29260f69d5c5d5c3aec41624de0be671", + "md5": "ab19e7dbec03a5f5a3fd42ca839c57ce", + "size": "459007868" + } + }, + "nvidia_driver": { + "name": "NVIDIA Linux Driver", + "license": "NVIDIA Driver", + "version": "515.65.01", + "linux-x86_64": { + "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-515.65.01-archive.tar.xz", + "sha256": "e7845a159bb870df2a7a74505611dd3db9501707c0e74668d7f21e32b8613282", + "md5": "38226ca31111cea5c75384ae791b8b81", + "size": "366714956" + }, + "linux-ppc64le": { + "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-515.65.01-archive.tar.xz", + "sha256": "a235b54c8349ac72474d9a1123b5c7c34cf7c9c6968196365282dc555120c3c9", + "md5": "3dbd9131e366f33b29c6e7798eb89fb2", + "size": "76861468" + }, + "linux-sbsa": { + "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-515.65.01-archive.tar.xz", + "sha256": "db1c9b31783b8af2929887f103f40db53463a83535c7b17c8eeb6adefa255ce0", + "md5": "8882f6df4d644fe76b83eab7d83a0ae5", + "size": "226280968" + } + }, + "nvidia_fs": { + "name": "NVIDIA filesystem", + "license": "CUDA Toolkit", + "version": "2.12.8", + "linux-x86_64": { + "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.12.8-archive.tar.xz", + "sha256": "71830b69b8a31fe46bf07329c0986b61cf557c5d6ac51c1a9cbc7017dfa3f767", + "md5": "ee40e41ec4349fc6e408ff15fd42a800", + "size": "67356" + } + }, + "visual_studio_integration": { + "name": "CUDA Visual Studio Integration", + "license": "CUDA Toolkit", + "version": "11.7.91", + "windows-x86_64": { + "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-11.7.91-archive.zip", + "sha256": "46f31c50d34869b79d85e030016b09c0286428374f07688f8ef1bb133ab41391", + "md5": "3d6a962dc19be4ee995a51621a88e77e", + "size": "517028" + } + } +} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.8.0.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.8.0.json index 132bb19df18c4..132bb19df18c4 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.8.0.json +++ b/pkgs/development/cuda-modules/cuda/manifests/redistrib_11.8.0.json diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.0.1.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.0.1.json index 77bd44962abfc..48d14f17baf8d 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.0.1.json +++ b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.0.1.json @@ -1125,4 +1125,3 @@ } } } - diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.1.1.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.1.1.json index 98294dcf1cc87..98294dcf1cc87 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_12.1.1.json +++ b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.1.1.json diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.2.2.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.2.2.json new file mode 100644 index 0000000000000..abaab337c2fec --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.2.2.json @@ -0,0 +1,1151 @@ +{ + "release_date": "2023-08-29", + "release_label": "12.2.2", + "release_product": "cuda", + "cuda_cccl": { + "name": "CXX Core Compute Libraries", + "license": "CUDA Toolkit", + "license_path": "cuda_cccl/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "90fa538e41f7f444896b61d573d502ea501f44126f8ff64442987e192a8a39dd", + "md5": "00ea502586a8c17e086292690d6680d6", + "size": "1150676" + }, + "linux-ppc64le": { + "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "9503cf76dcb0ca16e8b29771916fc41100906c1c38cfc1c055ab07046cf6a5db", + "md5": "426d244e235592832920527e6eec817e", + "size": "1150768" + }, + "linux-sbsa": { + "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "f28c327c745030e16aa9f41526401d169f5646ffe3de3f1ac533d91929f44e5c", + "md5": "2f74c30cc6309a609af2ac980f02b5c6", + "size": "1150316" + }, + "windows-x86_64": { + "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.2.140-archive.zip", + "sha256": "6a83fda78793e5328d89ef0258d2f26bba5177ff118b6657a7be38ffd89f10b0", + "md5": "aa623b334362cb9ad2f2032a40cd771b", + "size": "3044697" + }, + "linux-aarch64": { + "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "ca3956b1528b4b4a637f5e9f2d708e955f23ae4510f7aca4fd30080e3329fb02", + "md5": "fa7040730790c8bfe0e9eea6163b8e6a", + "size": "1151012" + } + }, + "cuda_compat": { + "name": "CUDA compat L4T", + "license": "CUDA Toolkit", + "license_path": "cuda_compat/LICENSE.txt", + "version": "12.2.34086590", + "linux-aarch64": { + "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.2.34086590-archive.tar.xz", + "sha256": "fd59f6c5f6c670a62b7bac75d74db29a26f3e3703f0e5035cf30f7b6cfd5a74d", + "md5": "2dc0b8c8bcbab6cb689ee781c3f10dd5", + "size": "18680292" + } + }, + "cuda_cudart": { + "name": "CUDA Runtime (cudart)", + "license": "CUDA Toolkit", + "license_path": "cuda_cudart/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "baebd331249bca0edf36776ead90e6b2024ffee01ea26cd9dd07344bebeaff08", + "md5": "030e85f4d0305c2924e2b76e84e2da32", + "size": "1058992" + }, + "linux-ppc64le": { + "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "aa4c0ae347e137f7b373f954b4bf180b5d43d5279afcfa34d6ab8621b8530622", + "md5": "daeb0b246be9617a4b9dfafe5fd12dc1", + "size": "1037696" + }, + "linux-sbsa": { + "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "11c263e07a0d0cef82d754b0beea3db191654b4f18b74b7ea40777244e6c8246", + "md5": "09a39a5890136df6f833dcd304bb7867", + "size": "1050456" + }, + "windows-x86_64": { + "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.2.140-archive.zip", + "sha256": "c63a17cd542a47aa6734263586e3dab6f1e127779099af92d9d01f220f80d750", + "md5": "029c67a417c3214309e92b0fd511dcf9", + "size": "2416001" + }, + "linux-aarch64": { + "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "ec0b5100d7c20819a2b775a479478fb571039b5743eddd5d51e1df0edf7fcb37", + "md5": "8722506d664f51a7f547bd1f3ce64679", + "size": "1108360" + } + }, + "cuda_cuobjdump": { + "name": "cuobjdump", + "license": "CUDA Toolkit", + "license_path": "cuda_cuobjdump/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "6c5c3d6e50f3ea14fcd356a83338110882305bffa8d5e4eecbaaf7479599f0d0", + "md5": "0cc4b4ca345f0f68d91d8753771f2d56", + "size": "170816" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "654e40c4627a04542554efb2277ee669d1c43df5276866dfde6ba481ae2451fa", + "md5": "5d34fc1b5630d235583e3801bb327e67", + "size": "212764" + }, + "linux-sbsa": { + "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "a02cff8dbb77804308db65b1d3dfc155a8a4ec029da3deaaebb73b0d36a7f97c", + "md5": "9432ad242258ad66a09317f0d91f2f67", + "size": "179176" + }, + "windows-x86_64": { + "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.2.140-archive.zip", + "sha256": "e84dc5ebf92b48aa57e9cfb1be0341534184f106fc45b52bc0bad297761af21e", + "md5": "ebf9f8b8e82214168ee00a40d556eb5a", + "size": "3775990" + }, + "linux-aarch64": { + "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "0941bd2602ecafdfcdc98ce7b84c4396b3f145eee824316dc4885b9d05b6791b", + "md5": "49134b65d1345d8b02ad6e19b4ec6d73", + "size": "162612" + } + }, + "cuda_cupti": { + "name": "CUPTI", + "license": "CUDA Toolkit", + "license_path": "cuda_cupti/LICENSE.txt", + "version": "12.2.142", + "linux-x86_64": { + "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.2.142-archive.tar.xz", + "sha256": "b269a3616634c6bbab8b0c3929aae05d9f7d7dc5f0f1a07f35d8847196965b6e", + "md5": "3d8f2f2add81b626593bc0a800cfb928", + "size": "19580992" + }, + "linux-ppc64le": { + "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-12.2.142-archive.tar.xz", + "sha256": "74c05cf0f37020c564039e27ea10adab70e6dac0eaaa70bae4b5ff6e84e2d79c", + "md5": "7af107ed1f6fb0596ac80f012dbff2bf", + "size": "10755848" + }, + "linux-sbsa": { + "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.2.142-archive.tar.xz", + "sha256": "d8ed35787533d9bfb0d19f05f05aedf11da5d5964ac19157bdb91ba594667c12", + "md5": "bbf21983d31e1d0d866241a909fde74f", + "size": "9848436" + }, + "windows-x86_64": { + "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.2.142-archive.zip", + "sha256": "5eb71c13a03b3c1ad6004094b5a17f509ca857b23c36fb40f5def766c8ffa6e6", + "md5": "1c135a1a4028e65f717b93797c9271ca", + "size": "13053349" + }, + "linux-aarch64": { + "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.2.142-archive.tar.xz", + "sha256": "2659cc15e8cf0ae04c5500a9db4dade5bcef480030821f4dfdb0ff646252aec4", + "md5": "6411b58e0d9d2affa871be74cba59663", + "size": "7770036" + } + }, + "cuda_cuxxfilt": { + "name": "CUDA cuxxfilt (demangler)", + "license": "CUDA Toolkit", + "license_path": "cuda_cuxxfilt/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "56b3dd86ee2ed566eeff24f8e09e80870e59888a8c3ff7114b97ea51461d97dd", + "md5": "505019c5059fdf8a473202e895a614e4", + "size": "187948" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "95fdbc129cda98dd079c9e3bedbfd3db06ece3e8abf80cdbea81b4124f0b7a9d", + "md5": "086b382d4c8d11b271d369af439f0de0", + "size": "180796" + }, + "linux-sbsa": { + "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "f19348fc92130e0d8c329a96529102d1ab58e3fd7e7f9dbd62cedbb5b1daf394", + "md5": "4e8fb685cd244b29ce6a338f9c9974e1", + "size": "174664" + }, + "windows-x86_64": { + "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.2.140-archive.zip", + "sha256": "a4099bc6b905e1373a1a83f86720e6f7dc40f355d11c1ff4005b5d0be7387e20", + "md5": "fb1c65bfc46d22338fcc8ee3cdd58631", + "size": "169420" + }, + "linux-aarch64": { + "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "1acfc797da55ce72905fcbf8592696e61b40412f8b2817b2588d97c899b955f5", + "md5": "98206bcb97591242beb8deb52cdc01ea", + "size": "167344" + } + }, + "cuda_demo_suite": { + "name": "CUDA Demo Suite", + "license": "CUDA Toolkit", + "license_path": "cuda_demo_suite/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "07fdfe90313b690e8d4b959c184abebdc92f1304b38952cb6dd5747b24ddb5bd", + "md5": "a90ecf71c9e22859271049e842468a8c", + "size": "3994692" + }, + "windows-x86_64": { + "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.2.140-archive.zip", + "sha256": "4810bd2560912b0a26b0fe842d46b3a48a63a4be583a837c27401a7cb2064619", + "md5": "e9b465d8d66f8c3f4299a9bb9e0c3950", + "size": "5052205" + } + }, + "cuda_documentation": { + "name": "CUDA Documentation", + "license": "CUDA Toolkit", + "license_path": "cuda_documentation/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "f717834f00c01a309df9d7d8e23a62133a458e0c3ec1952bf797d09309f84439", + "md5": "2d4b1d2ae641066b2bf1a28b0b4b1f82", + "size": "66956" + }, + "linux-ppc64le": { + "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "4db6c52188c458bf8c55d7f1eba67dd5ac5cf8adcf3064df5b9f9e04895f78fe", + "md5": "a79e122c5ba0b62022c23bf31f4eb860", + "size": "67220" + }, + "linux-sbsa": { + "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "94e42ba6ed970b89d6b8f761601a27d472d3e2ec3d5b2af063fb6102ff86cf9f", + "md5": "2f401a68b558b633fd37931c04ee9c4e", + "size": "67172" + }, + "windows-x86_64": { + "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.2.140-archive.zip", + "sha256": "c9c83a42be5be26ea955b1bfaa5ab356fd50c76ef0346a17a4f0d828c7589629", + "md5": "1d3680ff052e4e9851c88a8f5ada2b95", + "size": "105380" + }, + "linux-aarch64": { + "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "9759bbf7e2381f0e2e2e20b283e8669eba3cd421196fac9c48f35af2950c0188", + "md5": "e16dcd0484ea8b1eaef550156fc3dcd8", + "size": "67164" + } + }, + "cuda_gdb": { + "name": "CUDA GDB", + "license": "CUDA Toolkit", + "license_path": "cuda_gdb/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "94f8b223412689544e86bc28660acf4f53e75674eeba2c9a62b51ff58686f9fc", + "md5": "760e4a05bcb6e9588aa4569c7c1d10e9", + "size": "65686592" + }, + "linux-ppc64le": { + "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "2fbfede97d3fa7f09796b4ff416d66e4520ec47ed6a24e17083d1643adb116f8", + "md5": "a67ba3b07c54fd93b9be40d7107288cc", + "size": "65461272" + }, + "linux-sbsa": { + "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "2cd74b1f6d8158be1b145bc021316cfb6f13d242b1e7eb6b3b9e436f886aaaff", + "md5": "e6d58a5c8fc4dacf7b30c47c1b4bedfc", + "size": "65336976" + }, + "linux-aarch64": { + "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "1568ded1d37348413e1c907618c5477959479e7c44406a2ee93a720962a33c55", + "md5": "86fa1ad3a522a6a00cd93ee79bb8bc7a", + "size": "65360184" + } + }, + "cuda_nsight": { + "name": "Nsight Eclipse Edition Plugin", + "license": "CUDA Toolkit", + "license_path": "cuda_nsight/LICENSE.txt", + "version": "12.2.144", + "linux-x86_64": { + "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.2.144-archive.tar.xz", + "sha256": "36660b186dae381b6387c0dd85f339aa510ab74101356d89df240bdbc71056bb", + "md5": "eccd1246f8668b4112943c4927071aa6", + "size": "118680060" + }, + "linux-ppc64le": { + "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-12.2.144-archive.tar.xz", + "sha256": "0d17dfe7db7bcc2253bb57e6423b10f4c75b6b766448692cc3eb0f01da537a1a", + "md5": "3a08ac54e25f153e9e64b865746915cb", + "size": "118680056" + } + }, + "cuda_nvcc": { + "name": "CUDA NVCC", + "license": "CUDA Toolkit", + "license_path": "cuda_nvcc/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "3feaab191e1ae3fded02c02b0f24453069ada96b2e3a750251293b36079dc2f1", + "md5": "65d90cb219e8e7a204ec2f4e642c3e43", + "size": "46728284" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "cc515b95932445624a21bd179256dd7211c02000f543cc68fee6a99d735f137c", + "md5": "c45b9b8f784a901aa17abaa0800b708a", + "size": "42046684" + }, + "linux-sbsa": { + "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "3e9df10648af47cd4b1b985be81da9e4706623b6dd6f640e53f6d8badd84c155", + "md5": "5ffd328ae2b8ec7905c69749d3fc2064", + "size": "41041912" + }, + "windows-x86_64": { + "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.2.140-archive.zip", + "sha256": "140ca9c560f2fa4f6f7275d815d1d6fa6bbf08901a9bae48152f6c5e50c0bb1c", + "md5": "28c00dfb6128227725668ae755df7ede", + "size": "60265384" + }, + "linux-aarch64": { + "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "1b127448457a201c74a21077ab2cf0b3291f525ed8570341649c95314468a2d0", + "md5": "7e74ecb9f853ce6872073eb3d1ce81fe", + "size": "42600752" + } + }, + "cuda_nvdisasm": { + "name": "CUDA nvdisasm", + "license": "CUDA Toolkit", + "license_path": "cuda_nvdisasm/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "ca07e223ff3d9954ff2664f90ea1bdfcde1c3cbdcdfd0dbfcd131c36f6ae0449", + "md5": "d5f94fa5ef2e2911173474f16bc17ccc", + "size": "49869556" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "67a2ccd74368160feac5cd8f1dbf69291d6a83573756b51f56fdd99018ec2103", + "md5": "bcd3bc8e259f3ca4ebcc42497f023605", + "size": "49871208" + }, + "linux-sbsa": { + "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "38b9253059be117c4593efe43483a34754672c13c58b6d413708ac6336b6ae77", + "md5": "f2647474eab846e0edc9c0f84c84e151", + "size": "49799296" + }, + "windows-x86_64": { + "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.2.140-archive.zip", + "sha256": "8ab067d496dcf7f98845c46c8163d7452414a0f012e4e24e91b2b8baa456bb01", + "md5": "5b34b6476609a8d20dd169252f2cde30", + "size": "50125124" + }, + "linux-aarch64": { + "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "94ae6926a92ec3f090daed525e8a8ffbea358cc484b4bb928704536a9986635c", + "md5": "2c58a02cbbd660b37647b6853a6e8361", + "size": "49820048" + } + }, + "cuda_nvml_dev": { + "name": "CUDA NVML Headers", + "license": "CUDA Toolkit", + "license_path": "cuda_nvml_dev/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "9542ff071138d5efd541071ed4211d515b90fc988afdf7ba5b8ff1e863630429", + "md5": "e8a22ad0fab4f47191df8c6683f27192", + "size": "86216" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "ae470775b3c7422b19948a4e85a1d8d1507122c4a60bc2a412d38c29bcc97e08", + "md5": "4a44337bd43939f63e3037084b9cb41c", + "size": "85228" + }, + "linux-sbsa": { + "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "fd0cf20c55d7f6d8b55093a2cceb741f4e9b6ee19b937ae2bed5fa2f606e5f87", + "md5": "78beedb2fca52f2aa190be34d7b08c0d", + "size": "85764" + }, + "windows-x86_64": { + "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.2.140-archive.zip", + "sha256": "cfd23524e8d626a3f85a21c5b58d80eb44d673405174fa2cf18caf851ed0ceed", + "md5": "1205d8d748380eb0a2390c8f26945062", + "size": "120119" + }, + "linux-aarch64": { + "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "be4d96927aa52c7468fd0eb15eaac89526f154a164c4a64732afb502a03bcbf8", + "md5": "cf24cb7205485ef92ab2ace728a9fedc", + "size": "85720" + } + }, + "cuda_nvprof": { + "name": "CUDA nvprof", + "license": "CUDA Toolkit", + "license_path": "cuda_nvprof/LICENSE.txt", + "version": "12.2.142", + "linux-x86_64": { + "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.2.142-archive.tar.xz", + "sha256": "85903ca190885de9cabbaa9644a2b91c9245bea050ce553b0aa8bd3370996051", + "md5": "1dc2a4845781ec935a671c2318bc111e", + "size": "2441056" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-12.2.142-archive.tar.xz", + "sha256": "3d12bbbf161d9981ae5eae302f098a312929f657edf12a4b00412aa0023ede79", + "md5": "0ba8a43f0793cb77dc485deb6331f820", + "size": "2119280" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.2.142-archive.zip", + "sha256": "968366fb51f413229d48e404951f99ebfa70898b84b8fbb06a5909fbdeb59177", + "md5": "8f31af94a9edd798e5d4a4259a829f4c", + "size": "1701039" + } + }, + "cuda_nvprune": { + "name": "CUDA nvprune", + "license": "CUDA Toolkit", + "license_path": "cuda_nvprune/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "f5cf2db9d3214d540490c663691b171b11531be98611b4e6b86b208c7ee4f5cf", + "md5": "874fe6f55aed07403f033fa0e467dfeb", + "size": "55976" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "e949f93789a8256ab647b95b7d63bf814492003ba28c4d1d915753dcffd2b709", + "md5": "0f51bf0f64d774f7fbc1c48162ea33cd", + "size": "57088" + }, + "linux-sbsa": { + "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "4e434e9ced2efb9a3bc83edca93262eaa54546cf74783658239f2a05b119eb47", + "md5": "0c346f28f771525c802b49a09b56de32", + "size": "48176" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.2.140-archive.zip", + "sha256": "a001ccae83160a713332887d8965f271bbc9fcf5d4eb645c3bab8dbea8a4a72e", + "md5": "71a565d385a177a9a0df7c835b7c97c5", + "size": "145889" + }, + "linux-aarch64": { + "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "1911f27cf6629cbdb9183b35b42e700f7e86447f7950ebb6fe2cbc66fee7cebe", + "md5": "8e0300d2559ca3e84fd173f767af0e87", + "size": "49756" + } + }, + "cuda_nvrtc": { + "name": "CUDA NVRTC", + "license": "CUDA Toolkit", + "license_path": "cuda_nvrtc/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "d13903b5785f9c2157bec4c0d48f2217bfd9079dae5e9873901e4723a83a31d4", + "md5": "542800990ddee343974e5113a5214114", + "size": "30863708" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "9a7a75d5187af062babe8c03e3969b112ea57ae01c1331d4dee721ab4b5d0330", + "md5": "94c9050afac3c1966dac9389713790a4", + "size": "28225232" + }, + "linux-sbsa": { + "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "ff478c5f4bf51a76a1d5ca9f6ca2d8f248f3eb04b7656c8de84d69f5b33c0951", + "md5": "1282906a59976c61a5e4b69960696dad", + "size": "28239756" + }, + "windows-x86_64": { + "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.2.140-archive.zip", + "sha256": "3c02299e9fad2b5fda67301140e841f31db7edac57a57f9233f98d9066d14e32", + "md5": "c63e3b6908f2f74306049eaf21f36e11", + "size": "96131961" + }, + "linux-aarch64": { + "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "30056d9fadac1b6b347e316463cbdb0245ef699f0ba51b890f8419827b0d0623", + "md5": "ab55d00f7dfd247da5eb5df920662da2", + "size": "29348908" + } + }, + "cuda_nvtx": { + "name": "CUDA NVTX", + "license": "CUDA Toolkit", + "license_path": "cuda_nvtx/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "2651bfb5c15fc546556da2d6b1dc48c97e1ee6f8c38d3f1910df56f24d5d028e", + "md5": "2e695953ecc05f4b1b10fed36af6463a", + "size": "48384" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "5e41c750f1677801848765b0db6ac1672b2ea29cc2f5c0ef914d84e52e2a4989", + "md5": "bd06c5f123015ad1173b5cd82aba5733", + "size": "48476" + }, + "linux-sbsa": { + "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "b94ecd3824a7ecaf95b3d74b8972a29aae5ab98af349333f9c737f106d10b16a", + "md5": "989d0b2b18e9aebf9d18d55041ab6338", + "size": "49008" + }, + "windows-x86_64": { + "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.2.140-archive.zip", + "sha256": "6e68b436760aa05a5190d04c104a2c4f2f47073b099c6c25cb989a769c69f77a", + "md5": "6d5d9e9988529a1a00dce81cc399cbc0", + "size": "65732" + }, + "linux-aarch64": { + "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "cda3e9725103446d17ba8e117230f985834d85bdacb4ed036cef5a113abed352", + "md5": "a35a15866757be7f2f49a37272f445f5", + "size": "51544" + } + }, + "cuda_nvvp": { + "name": "CUDA NVVP", + "license": "CUDA Toolkit", + "license_path": "cuda_nvvp/LICENSE.txt", + "version": "12.2.142", + "linux-x86_64": { + "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.2.142-archive.tar.xz", + "sha256": "a5afc346567aa1a0129b901c2ea2246e69c49b21451e93cafd15c2c7cc3776e2", + "md5": "b72eb16023bf083e7422bf2bf681f3c2", + "size": "117735088" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-12.2.142-archive.tar.xz", + "sha256": "7a2d6cc4ca2b9c907f68cb82ee861283d746e6a99f9fc1f7090ae4bfeafa3bbf", + "md5": "6bc08cb579e4e75433509d3441173825", + "size": "117180108" + }, + "windows-x86_64": { + "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.2.142-archive.zip", + "sha256": "0be4646875789d14013c70040e9e61abb4ebd4892e2418a5d4238a73ade44058", + "md5": "cf9c31100d163ea912d2fdf504f05849", + "size": "120341504" + } + }, + "cuda_opencl": { + "name": "CUDA OpenCL", + "license": "CUDA Toolkit", + "license_path": "cuda_opencl/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "2d921db089c490addc3f66047ea51858dc4e77c74a43fd53454c44a3c22a7a87", + "md5": "71116747f33359fe617bfcc9787b32bd", + "size": "74896" + }, + "windows-x86_64": { + "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.2.140-archive.zip", + "sha256": "966cdd101773ebaf5da77217f9da75324ec6f3dc8a3d4663e5ec439ccdf06e7b", + "md5": "a22fcb058bd2b909dc0b2feb572ff919", + "size": "112950" + } + }, + "cuda_profiler_api": { + "name": "CUDA Profiler API", + "license": "CUDA Toolkit", + "license_path": "cuda_profiler_api/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "4c27538fb10dc86d0a54ff205e4099204ca2534784605dde80284a59be05d7ae", + "md5": "c0d27b98ea356c39dd99263a7bd2197d", + "size": "16052" + }, + "linux-ppc64le": { + "relative_path": "cuda_profiler_api/linux-ppc64le/cuda_profiler_api-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "fa6f0e0273677c35e5dd025e91171863ba6434e9557b4526f166eeae3146227c", + "md5": "0e4c5faac5b7232f5057b6eec5988901", + "size": "16056" + }, + "linux-sbsa": { + "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "dbfc2e5b4f45c47601549f6481955d2629aa1001921ac3dce284a1626f805d6c", + "md5": "0d349e18c3a6c43344f78948cefa800d", + "size": "16048" + }, + "windows-x86_64": { + "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.2.140-archive.zip", + "sha256": "36d865be0bcd4a8be8bdd48fd24bc8b5d5e5f181ea12631d3c8a52e8321807f9", + "md5": "2c552582bfbc00cf8b23456c2a52d9e2", + "size": "20085" + }, + "linux-aarch64": { + "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "a93303be55363f9e8f2570a1a16abbcf0194f36fd5c894624f73e76d5a3282e2", + "md5": "19578120942de186c59679f0cf7b117a", + "size": "16052" + } + }, + "cuda_sanitizer_api": { + "name": "CUDA Compute Sanitizer API", + "license": "CUDA Toolkit", + "license_path": "cuda_sanitizer_api/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "1d02913ab7a1389a13b4f66479be73fe6391df29a53123cf86efba5f88e991d2", + "md5": "4b87808b82a9309287fc0254233c6d37", + "size": "8296348" + }, + "linux-ppc64le": { + "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "5f37b3d901403094c68b2bdbc34381f3daaae7504fc92e5e8ab8feefe196f2b2", + "md5": "aae50148dc628403eb2ad71499501d52", + "size": "7643868" + }, + "linux-sbsa": { + "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "a16ca8a7283b4eb074ee878fc44c85dab8946ed6d2ff6a8893c409ebff3c8e3e", + "md5": "134e9d9a6b20e2fa53618cfe590eeeb5", + "size": "6213596" + }, + "windows-x86_64": { + "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.2.140-archive.zip", + "sha256": "1c1d84647d331759bbed4ef820e3ad26866af7383ddcc0ba02d695b9886d7820", + "md5": "384a685b9b81204b4273f5e1cac7481d", + "size": "13897879" + }, + "linux-aarch64": { + "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "4503ed0e7f2b24bbe8b47ceef5df44f2ef9ddf707d33bdd561964f1d5ad01cf7", + "md5": "b679a95b4dc76e267990547025587dab", + "size": "3562156" + } + }, + "fabricmanager": { + "name": "NVIDIA Fabric Manager", + "license": "NVIDIA Driver", + "license_path": "fabricmanager/LICENSE.txt", + "version": "535.104.05", + "linux-x86_64": { + "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-535.104.05-archive.tar.xz", + "sha256": "d71c8bb69b90421d8e761937b5ed4b9b6e81ecae581f7abcfd9e1fc351488791", + "md5": "1f8c835831781c1916503f95e52050f2", + "size": "1819572" + }, + "linux-sbsa": { + "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-535.104.05-archive.tar.xz", + "sha256": "da60bdc321f396003a466e771dc69b4aea06f084e6076606dcdd5db473169cdf", + "md5": "f2838a9c204d9dc8d23fa5c857cded19", + "size": "1680668" + } + }, + "libcublas": { + "name": "CUDA cuBLAS", + "license": "CUDA Toolkit", + "license_path": "libcublas/LICENSE.txt", + "version": "12.2.5.6", + "linux-x86_64": { + "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.2.5.6-archive.tar.xz", + "sha256": "56ccf7ffbe7ea204fbb0c5c4c55829ef3fb81b2e811f8073fcd0bbef438b262e", + "md5": "dfd9fc6f65d0d2200cbbf0c28d5c7067", + "size": "505014804" + }, + "linux-ppc64le": { + "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-12.2.5.6-archive.tar.xz", + "sha256": "0883ddfb1460cb69219a80fffe3e1ef02d59caf08ff60fb86453cdabdf5c7318", + "md5": "53db5e36efe8dbf45135d8835cf6ca0a", + "size": "400304640" + }, + "linux-sbsa": { + "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.2.5.6-archive.tar.xz", + "sha256": "be6885ddccdf7b5f6efaf4272aef7cffbb5502258e9991cd93c5bc110a38e364", + "md5": "bde4d96c012a7cc232e1b5709e0d076c", + "size": "496898260" + }, + "windows-x86_64": { + "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.2.5.6-archive.zip", + "sha256": "205f20a1e91a9502ad4b9bca2e66effa76ef14ef5378e1fc5b6e2a223158ac5b", + "md5": "23535cff27e5ab460026dd2164123935", + "size": "443774878" + }, + "linux-aarch64": { + "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.2.5.6-archive.tar.xz", + "sha256": "db001ba7f3e33568846b1c37ccdf54dcea66396975e43720471d799d08e1eb5f", + "md5": "7f68aaa55b34724cc64458e85b6625b5", + "size": "453455004" + } + }, + "libcudla": { + "name": "cuDLA", + "license": "CUDA Toolkit", + "license_path": "libcudla/LICENSE.txt", + "version": "12.2.140", + "linux-aarch64": { + "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "3e4e3b6ecdd80f8519f3411ee01b479260130665c38b620cad163e7838b3a863", + "md5": "ce878668cba58c1dc7ff8ad35ecd41cb", + "size": "37772" + } + }, + "libcufft": { + "name": "CUDA cuFFT", + "license": "CUDA Toolkit", + "license_path": "libcufft/LICENSE.txt", + "version": "11.0.8.103", + "linux-x86_64": { + "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.0.8.103-archive.tar.xz", + "sha256": "b146efb8bb500ee82519a7783b55c68c36f2c350a61cbba7d7b642ddc0d68bcb", + "md5": "b3e0cf021beaab33668fefef599a7fdc", + "size": "170424256" + }, + "linux-ppc64le": { + "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-11.0.8.103-archive.tar.xz", + "sha256": "5b001c8e37c1e5e098c54afae5100bff70171bcf5ba245eb423f3c4bac197ffd", + "md5": "38440f3f109bcb2be1b83307f9d853c1", + "size": "170548816" + }, + "linux-sbsa": { + "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.0.8.103-archive.tar.xz", + "sha256": "c4c247f2c3d608aa690ed0237e5e0413455a9ee10a59ce84e2643b44800705cc", + "md5": "169c5bfa425c8b2a7ed10e41e6fec6ad", + "size": "170566888" + }, + "windows-x86_64": { + "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.0.8.103-archive.zip", + "sha256": "d523ea42f195f16c4b117276797093834a1fffbbcd006c2b24cf31736d995e60", + "md5": "162ddfeab043199e2d81ab1ff835285a", + "size": "97456781" + }, + "linux-aarch64": { + "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.0.8.103-archive.tar.xz", + "sha256": "15d1ada050f60a5362b80650ef63be4663bf6749a8c298bfa93009ce4b8113fa", + "md5": "65df3f69475f750b96ee97f272e73a02", + "size": "170672168" + } + }, + "libcufile": { + "name": "CUDA cuFile", + "license": "CUDA Toolkit", + "license_path": "libcufile/LICENSE.txt", + "version": "1.7.2.10", + "linux-x86_64": { + "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.7.2.10-archive.tar.xz", + "sha256": "60f9e442b09998d1937827b4f56982bfc22fa1c15ede9bc1261e9cc947a94087", + "md5": "57a580d197e88709494844c86d983874", + "size": "41854504" + }, + "linux-sbsa": { + "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.7.2.10-archive.tar.xz", + "sha256": "00be847ca86b90fb540174ad70f34899c2f8f351637775b9c5fef5b7ad3adb76", + "md5": "a743513410e6ef3243f0f49d3dffc191", + "size": "41302032" + }, + "linux-aarch64": { + "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.7.2.10-archive.tar.xz", + "sha256": "36477dbe734c00945ff5f99369c9324bd560c4ad65b65a260996ae41d3b2e4f5", + "md5": "51397e31461a10e590c9c459bb3d0899", + "size": "41277664" + } + }, + "libcurand": { + "name": "CUDA cuRAND", + "license": "CUDA Toolkit", + "license_path": "libcurand/LICENSE.txt", + "version": "10.3.3.141", + "linux-x86_64": { + "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.3.141-archive.tar.xz", + "sha256": "105ce31a3e83e8e548e35efe8e3b9f18b4fdb30048d0305015c2cf62257a090c", + "md5": "d1bd0610eb7014957b802f9d349bbcfc", + "size": "81947124" + }, + "linux-ppc64le": { + "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.3.3.141-archive.tar.xz", + "sha256": "21f2cd0312bc35037fd8a1dde1444af75050e409a316a1502f26a48f00f6db5c", + "md5": "d568a4c72d5d2cf54c6f5ba1b9818037", + "size": "81983516" + }, + "linux-sbsa": { + "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.3.141-archive.tar.xz", + "sha256": "a1e754fe336f12848cb9f4f7b3c13a6bc81df375fe4babfb160936242a71d99d", + "md5": "c87d4ac4804368253053b628aca51992", + "size": "81932084" + }, + "windows-x86_64": { + "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.3.141-archive.zip", + "sha256": "46058aefc4fd8fb120c8565fc6ec5dcc6b4374cf973c2523b5cb8189e51e27bb", + "md5": "967ecfc6dd8480a5bfeec6f8e40fbff1", + "size": "55279391" + }, + "linux-aarch64": { + "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.3.141-archive.tar.xz", + "sha256": "b1430ba8424f638ef1eeb16a602641d68d9929b88f5a6328217da0d660a0694e", + "md5": "0be2590de89b92ed414ec46b24558765", + "size": "84106840" + } + }, + "libcusolver": { + "name": "CUDA cuSOLVER", + "license": "CUDA Toolkit", + "license_path": "libcusolver/LICENSE.txt", + "version": "11.5.2.141", + "linux-x86_64": { + "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.5.2.141-archive.tar.xz", + "sha256": "7037b9fda9d5e4cebab204e0850a9df7e6f66724f798c4ca17e9af21dcfe9ba3", + "md5": "cae5929ff01dc4c8bb1be402c25ba977", + "size": "123206104" + }, + "linux-ppc64le": { + "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.5.2.141-archive.tar.xz", + "sha256": "9edc8138ed3f9a06c1a09789073988acae3a8a0efac368904efa3bb044f1e2a6", + "md5": "d1efcf4e667f035b11c0ac35434ee685", + "size": "123174440" + }, + "linux-sbsa": { + "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.5.2.141-archive.tar.xz", + "sha256": "57a1912f8f0f53a192254863d2c5feccb6a878cdf8dfce39594788aca5f46b8f", + "md5": "cc088b37f04e7734c86924129787e805", + "size": "122133404" + }, + "windows-x86_64": { + "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.5.2.141-archive.zip", + "sha256": "e49095d45121c18f566a06aa9e688088193f892a1a381e6028233b037bbd39fa", + "md5": "00cd279c6ee12667f297ab45e9c555f1", + "size": "120619029" + }, + "linux-aarch64": { + "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.5.2.141-archive.tar.xz", + "sha256": "988c5e61477e4425c02b3c162c6e8eaad907452ccbdcd0297040e9c0c0ac12df", + "md5": "0bf9fb89f0413da2b6ad78a9d3b203e9", + "size": "133247048" + } + }, + "libcusparse": { + "name": "CUDA cuSPARSE", + "license": "CUDA Toolkit", + "license_path": "libcusparse/LICENSE.txt", + "version": "12.1.2.141", + "linux-x86_64": { + "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.1.2.141-archive.tar.xz", + "sha256": "042d635487006837e08ebe0c307ee1ccfa026209d0ce2c64183581626c79ff3b", + "md5": "65b0479aadb72845e07110de537b681a", + "size": "211882788" + }, + "linux-ppc64le": { + "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-12.1.2.141-archive.tar.xz", + "sha256": "623895f34c8a80bbcb2ba2e0f491b1919cb7891480b0284afb5d6c3e7452bf5f", + "md5": "50b234d86a02e4c889b4f32efff94e98", + "size": "212005264" + }, + "linux-sbsa": { + "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.1.2.141-archive.tar.xz", + "sha256": "5068d6909a37bb96989f6af6a197280986eb917398391da2f45df2e47eb44cf6", + "md5": "117f01470d0e6087616c7ea430484f12", + "size": "211611296" + }, + "windows-x86_64": { + "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.1.2.141-archive.zip", + "sha256": "70ea2dfc918aa23fadb8e3804cd6f04e80ec19f44eeffa635bf3e69e76b3c046", + "md5": "f77e684538cfa54df2d818d9418774ee", + "size": "192615584" + }, + "linux-aarch64": { + "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.1.2.141-archive.tar.xz", + "sha256": "12f3b910e7facb0f4204cdfd9cc1d46e828a6d6d220da36e852bb4be3fa10b15", + "md5": "6f76bb018c30f8b1d40f338640bd44a5", + "size": "226905832" + } + }, + "libnpp": { + "name": "CUDA NPP", + "license": "CUDA Toolkit", + "license_path": "libnpp/LICENSE.txt", + "version": "12.2.1.4", + "linux-x86_64": { + "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.2.1.4-archive.tar.xz", + "sha256": "82aff958dab64a89ec719ae082290b998082719aea6be4de9d642bf2c9fcbc04", + "md5": "06767a79831f85adc36e0629bb91dc64", + "size": "183348052" + }, + "linux-ppc64le": { + "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-12.2.1.4-archive.tar.xz", + "sha256": "35dc58629efbb0af289e28b866f299d464d44fdb2b824b4870421cdfbd5b9153", + "md5": "aed7ef1d0e624e9d8ef6c30635bfa2c7", + "size": "183901836" + }, + "linux-sbsa": { + "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.2.1.4-archive.tar.xz", + "sha256": "a7ff7086df1ee8a253e8f8b50730738b515b084ec32b57ea1c7cd2154f9e007c", + "md5": "1e6fc062ee6987ec09e1d756a1925cb3", + "size": "182584840" + }, + "windows-x86_64": { + "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.2.1.4-archive.zip", + "sha256": "4815f6e77ea000b7f7ec50e4c1e2772e3be05a40afcc501c8c7e6d7c4f5f53ac", + "md5": "7a0d5709c07a50181465a8d7314d5c0a", + "size": "153082156" + }, + "linux-aarch64": { + "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.2.1.4-archive.tar.xz", + "sha256": "b046373786657d7f8c7a2aca170900d38ec62bd91c728489e2ed62f78e5ac588", + "md5": "be6a424f4d4cd41b48e19dbdeb9273bd", + "size": "200658988" + } + }, + "libnvidia_nscq": { + "name": "NVIDIA NSCQ API", + "license": "NVIDIA Driver", + "license_path": "libnvidia_nscq/LICENSE.txt", + "version": "535.104.05", + "linux-x86_64": { + "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-535.104.05-archive.tar.xz", + "sha256": "ab3704b11cdf381d739fdae98e53aea6aec95538a32efc89cc90dbd3a8595091", + "md5": "480b1a8a966d5fc7f0306b90e3e68f6b", + "size": "350592" + }, + "linux-sbsa": { + "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-535.104.05-archive.tar.xz", + "sha256": "3f59ae0385b30677ef6cce248e805da6ef71fc151ec4779825716f42bff6274e", + "md5": "91f8d38263ad9b013dce0c3e7db1e8a2", + "size": "317620" + } + }, + "libnvjitlink": { + "name": "NVIDIA compiler library for JIT LTO functionality", + "license": "CUDA Toolkit", + "license_path": "libnvjitlink/LICENSE.txt", + "version": "12.2.140", + "linux-x86_64": { + "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.2.140-archive.tar.xz", + "sha256": "1d6339ea90dc0d68e8e3d819c92ca1b3b1a0fab4837587d546a3289c152e5337", + "md5": "d806f9651074516ffbf1ae133155b03f", + "size": "26317844" + }, + "linux-ppc64le": { + "relative_path": "libnvjitlink/linux-ppc64le/libnvjitlink-linux-ppc64le-12.2.140-archive.tar.xz", + "sha256": "5a202c4c460537b3f9a423ea3b4956da1616254222f10cd6b169f1169f1917b7", + "md5": "c16ab243b07f4cb28ca6d55848c96519", + "size": "23972384" + }, + "linux-sbsa": { + "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.2.140-archive.tar.xz", + "sha256": "0d661c092c3f5eafe889ff1bce131f0f2a0ab00e4ee7a06a118cebf8051ad737", + "md5": "631b76cc50df2bfd36367a6d916950fc", + "size": "23930512" + }, + "windows-x86_64": { + "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.2.140-archive.zip", + "sha256": "21795de33dfffefa314ce7461aae3ea7509974848b8acd1842d600ee19278c4f", + "md5": "8003ea4a05fc864584c7f73ac7466342", + "size": "86973701" + }, + "linux-aarch64": { + "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.2.140-archive.tar.xz", + "sha256": "42f0caf3f922464edda5b8c1973ad388a39d606245793c59ebbaefc69cbc327d", + "md5": "762b587f30ff99bac0beb1a4ce1d274c", + "size": "25032700" + } + }, + "libnvjpeg": { + "name": "CUDA nvJPEG", + "license": "CUDA Toolkit", + "license_path": "libnvjpeg/LICENSE.txt", + "version": "12.2.2.4", + "linux-x86_64": { + "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.2.2.4-archive.tar.xz", + "sha256": "86f5dde034a89c0ca26f39c6ec14e1ce47c88f7e7852913137153fd45de78f4b", + "md5": "7c7ce0b140a7cb16717d5fdd12c0889b", + "size": "2556648" + }, + "linux-ppc64le": { + "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-12.2.2.4-archive.tar.xz", + "sha256": "ae73ecef99852488cd7cb36ab1f0a1a5e2c43c3b3addc4a9485cb5741fbb0bb0", + "md5": "15a5f09aab83a4e6b5036f07dd4eac22", + "size": "2584100" + }, + "linux-sbsa": { + "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.2.2.4-archive.tar.xz", + "sha256": "3dec2a261f3e7fa23537e270cbfe57cdd768c2994db1dadbe0740a26fcb16c31", + "md5": "4704427b2485e5a4391bba7d499bacff", + "size": "2384748" + }, + "windows-x86_64": { + "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.2.2.4-archive.zip", + "sha256": "9efe4c5cb0a13b00862c7dd860a96216ec8794c311d4648d1291e8dc1d3f6e0c", + "md5": "d48dd3780c2d3001c15ae54410cd9ef0", + "size": "2830376" + }, + "linux-aarch64": { + "relative_path": "libnvjpeg/linux-aarch64/libnvjpeg-linux-aarch64-12.2.2.4-archive.tar.xz", + "sha256": "3fc0049b56dbfc380eebcaf77cdeddd2a4f1ea71ab89a2caaaf529924d52404d", + "md5": "f51c25d446ba25a3c1625fc22e903575", + "size": "2528220" + } + }, + "nsight_compute": { + "name": "Nsight Compute", + "license": "NVIDIA SLA", + "license_path": "nsight_compute/LICENSE.txt", + "version": "2023.2.2.3", + "linux-x86_64": { + "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2023.2.2.3-archive.tar.xz", + "sha256": "b2927dce0f75c34b6be00a7cdc2d6f75c0704e98fd7576b9068cdd2f0291deee", + "md5": "b893062619e138908a8f5867be6adbf0", + "size": "724649144" + }, + "linux-ppc64le": { + "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2023.2.2.3-archive.tar.xz", + "sha256": "404de395caa2e05749985e6539174f4cab27d2ca2de765825474bf58c1cfd57f", + "md5": "a81d54aefd491fbdfd8414791ea11242", + "size": "185173220" + }, + "linux-sbsa": { + "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2023.2.2.3-archive.tar.xz", + "sha256": "77bf1f7c016a05ce301c1d68e1fc0ca4b290bcc56771e368d0d0b12ef6f1dc89", + "md5": "1d1fe09d2db3bda1ef92cf00ca05091e", + "size": "350202056" + }, + "windows-x86_64": { + "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2023.2.2.3-archive.zip", + "sha256": "92edddf25449e9337864faf4a5018e91e5fbbb33e68b184fd3557d16d86e1fe0", + "md5": "37f66efef784946095bb405869076049", + "size": "664653357" + }, + "linux-aarch64": { + "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2023.2.2.3-archive.tar.xz", + "sha256": "5e5c840fbdf1cd67dd1ecba79c49b550dd18156cd5b491a191cb327d50bb2f1e", + "md5": "33dfafbaaab58809530f1c8f36ab5fb4", + "size": "740366868" + } + }, + "nsight_systems": { + "name": "Nsight Systems", + "license": "NVIDIA SLA", + "license_path": "nsight_systems/LICENSE.txt", + "version": "2023.2.3.1004", + "linux-x86_64": { + "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2023.2.3.1004-archive.tar.xz", + "sha256": "d0fd2d347d563e22de4e420d0f169c434a49fde3a8391dc072c87903803781f6", + "md5": "89c440861b5f85a4c93f98bea99ed39e", + "size": "223340448" + }, + "linux-ppc64le": { + "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2023.2.3.1004-archive.tar.xz", + "sha256": "0a91c310da7d8755c51b2e3c03a3bf0f28a034fa67129365fc06a064c9a5c741", + "md5": "4a78d50fc945f6236d0d6af1be0037b4", + "size": "64909400" + }, + "linux-sbsa": { + "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2023.2.3.1004-archive.tar.xz", + "sha256": "3bec2b405da6a090e694d5641d9376ed8f50c7d29b7ab8bd02c628f5ca845957", + "md5": "2f41741cb5db83db66fa6282fdf21163", + "size": "195417228" + }, + "windows-x86_64": { + "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2023.2.3.1004-archive.zip", + "sha256": "ff34ce8a50fc6c4de7b494fda970dac9ce3658a2483629865243d83561d41718", + "md5": "11629d3685f8d2b74108afc242131f2a", + "size": "335314514" + } + }, + "nsight_vse": { + "name": "Nsight Visual Studio Edition (VSE)", + "license": "NVIDIA SLA", + "license_path": "nsight_vse/LICENSE.txt", + "version": "2023.2.2.23221", + "windows-x86_64": { + "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2023.2.2.23221-archive.zip", + "sha256": "a310ef2a2604ecdb741f1f8961d26ebb969a17db81a89c769224a60645181553", + "md5": "8bce1c927bf0b902fa3cb6557af4c0d5", + "size": "526808861" + } + }, + "nvidia_driver": { + "name": "NVIDIA Linux Driver", + "license": "NVIDIA Driver", + "license_path": "nvidia_driver/LICENSE.txt", + "version": "535.104.05", + "linux-x86_64": { + "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-535.104.05-archive.tar.xz", + "sha256": "f19c11dfda9e1e5c3e0a2ca775cdaa851431648540f4e8e2916c53735debd450", + "md5": "eeb4a2a99f4d2f5f0323cd4369e99cb1", + "size": "392555044" + }, + "linux-ppc64le": { + "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-535.104.05-archive.tar.xz", + "sha256": "7c83f0a42a94ec60fbda5ce18e99f4c90758757698c1d21a8d83957daafa26b7", + "md5": "f251522e7b479c04008b3d0c573a218c", + "size": "100007576" + }, + "linux-sbsa": { + "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-535.104.05-archive.tar.xz", + "sha256": "eb089f52ddda09f4b2bcf0eb661d0bb7881a3d63cbca558c9530ab50b4ef84ee", + "md5": "1f518fbc7860141e885366e7e526f235", + "size": "306432584" + } + }, + "nvidia_fs": { + "name": "NVIDIA filesystem", + "license": "CUDA Toolkit", + "license_path": "nvidia_fs/LICENSE.txt", + "version": "2.17.5", + "linux-x86_64": { + "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.17.5-archive.tar.xz", + "sha256": "3b6d9b6bc82cf575b38e99467a7987d40725a50004a67bc5edce4c40cd2b239e", + "md5": "b9164b9d3c34733257da7a15e5d38bcb", + "size": "58420" + }, + "linux-sbsa": { + "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.17.5-archive.tar.xz", + "sha256": "e51f5a6ea897fa1b875f8b5da1cb3d16368dcdd5a6e8e02fc996b535a020a2fc", + "md5": "60aad0a8803dcece1e837fc7281b92e0", + "size": "58404" + }, + "linux-aarch64": { + "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.17.5-archive.tar.xz", + "sha256": "c3bdb6177a0a5dc12fb1d41471b6bed4dae6a95c3d32e5fb6c0b740f6551b366", + "md5": "8010eaa202a53499a469d6216bee9fc9", + "size": "58420" + } + }, + "visual_studio_integration": { + "name": "CUDA Visual Studio Integration", + "license": "CUDA Toolkit", + "license_path": "visual_studio_integration/LICENSE.txt", + "version": "12.2.140", + "windows-x86_64": { + "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.2.140-archive.zip", + "sha256": "6e754aabb61d0e8d1154aa22c42b95ff2c8b35a2989c99ec08a8c0f5e85128ec", + "md5": "ef934c22792d947d6e8872859dbc5102", + "size": "518030" + } + } +} diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.3.0.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.3.0.json new file mode 100644 index 0000000000000..85a859471c299 --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.3.0.json @@ -0,0 +1,971 @@ +{ + "release_date": "2023-10-19", + "release_label": "12.3.0", + "release_product": "cuda", + "cuda_cccl": { + "name": "CXX Core Compute Libraries", + "license": "CUDA Toolkit", + "license_path": "cuda_cccl/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "659f8f8fd58eb7f5bc8ba171712147a007a2c8c92f30b21d135cf2d12f80226d", + "md5": "e97f283762e4cc26a91368b545445888", + "size": "1148140" + }, + "linux-ppc64le": { + "relative_path": "cuda_cccl/linux-ppc64le/cuda_cccl-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "1a188bc279ba32d910259bdf9b7106accacba163ce9ef92989af18ca8a50a6ea", + "md5": "a2c10d1037efe99ff2bd840a552500a0", + "size": "1148584" + }, + "linux-sbsa": { + "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "96b5465af73b77447c3997d923916f7aea0939ffd0d8be42bc197ee8d8965fca", + "md5": "7b33cb50efd7d589bc1da8fd292179b6", + "size": "1147616" + }, + "windows-x86_64": { + "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.3.52-archive.zip", + "sha256": "074c26ca05bd305ee23fdc56c3e8115d21c7843c5778fb75052791d66ee73711", + "md5": "ac1857b6c543c5489c126fb6a1ef0b10", + "size": "3041533" + } + }, + "cuda_cudart": { + "name": "CUDA Runtime (cudart)", + "license": "CUDA Toolkit", + "license_path": "cuda_cudart/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "0dcd864fcef10b7d4591cc545330c411f589b27b12c98c30ac6e3d5e14eb2ee4", + "md5": "d0857c0c2b568ca05aac12dc67a6871b", + "size": "1090372" + }, + "linux-ppc64le": { + "relative_path": "cuda_cudart/linux-ppc64le/cuda_cudart-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "354d1ffdd1ce2da61ec2c3fb1b15cdf65270804aba78863d235cc0d69a9c9eec", + "md5": "8abeb75f2d60efe9f69eb3ae3266ae45", + "size": "1068716" + }, + "linux-sbsa": { + "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "4789a039df340581d7a71f5da6af9f222baa2265e8de8ce00365a31ac645adca", + "md5": "abe7432e966b61c9d6272ef5f0d889f0", + "size": "1079100" + }, + "windows-x86_64": { + "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.3.52-archive.zip", + "sha256": "a01396eeb88b52137dd1878e1278a1608f848194a1bb7faa02d6b147894d17a9", + "md5": "5731383d0884a47d93e52772c0815042", + "size": "2462899" + } + }, + "cuda_cuobjdump": { + "name": "cuobjdump", + "license": "CUDA Toolkit", + "license_path": "cuda_cuobjdump/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "cfedfd2e64aedec65793240c2814bc94463eaafe508bb34776b5d7bee783c899", + "md5": "9de85c598e48234db4ec743b2984205a", + "size": "171908" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuobjdump/linux-ppc64le/cuda_cuobjdump-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "33bbf67fbf5cfa5e1a451c3325330fc032a0e58ed31748839993ecb94711a9a0", + "md5": "d628a4c6ae76e52cec8bcb976a30edea", + "size": "215840" + }, + "linux-sbsa": { + "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "cce91131e57a901463ce1dc86577fe67db0bf6a17f8aefe3e269fff98689151d", + "md5": "c390408c5973d68eb7d292678dc201b8", + "size": "181628" + }, + "windows-x86_64": { + "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.3.52-archive.zip", + "sha256": "90f583b64f97bd600d0f6d81026bee6cfd2712d5b4905d238b0b6ab21a0709c3", + "md5": "f789a23aa0fe7e38f5c874be8612502f", + "size": "4013028" + } + }, + "cuda_cupti": { + "name": "CUPTI", + "license": "CUDA Toolkit", + "license_path": "cuda_cupti/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "f51ae93f02378d88b5f53b66abad675f0b2e8b4444192b4705a550b1d083de79", + "md5": "2ad99522a4e6a6aab309fb44b611e607", + "size": "19651160" + }, + "linux-ppc64le": { + "relative_path": "cuda_cupti/linux-ppc64le/cuda_cupti-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "8dead100bec1dd9b02f56e34dfeae91381422cbf858ce1c9fd1a45fdde946a16", + "md5": "dbc7e027e4e2f1d9f2a59db6ec20b2f0", + "size": "10918684" + }, + "linux-sbsa": { + "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "39f07116b64d8b3b9bf17c65c45d97bf19886eb41847e30c6606751455cbb284", + "md5": "c701206a376dab8f82aae89c9d3d4085", + "size": "10086868" + }, + "windows-x86_64": { + "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.3.52-archive.zip", + "sha256": "c177c59124f4ae41d46950999548931905f6097de57f88df7d2af62dffbdf249", + "md5": "4402839a83f9daed16007ba93fa528ec", + "size": "13149248" + } + }, + "cuda_cuxxfilt": { + "name": "CUDA cuxxfilt (demangler)", + "license": "CUDA Toolkit", + "license_path": "cuda_cuxxfilt/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "932ef5f2f607b5fcb5a84b4489d562cd1239ef7cebfaf862070f9953d02e6cce", + "md5": "b1d37d6dd3a6f6218b73c8310cafbd12", + "size": "188368" + }, + "linux-ppc64le": { + "relative_path": "cuda_cuxxfilt/linux-ppc64le/cuda_cuxxfilt-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "dc0490f0881ee51f803bfcd93fcd448216776fa347712d43823c09e687f013b1", + "md5": "7eadb41329c74d76212f2e830232e854", + "size": "180568" + }, + "linux-sbsa": { + "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "5a9c4d613a8120b21c1f44a9e48f2908bd429e2059f8aaabf4cb67bd5c468e04", + "md5": "755a801e5f34f090bda0139f32432e21", + "size": "174576" + }, + "windows-x86_64": { + "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.3.52-archive.zip", + "sha256": "d7b94c8fa3198764e0664709543a9ee5820a004df9afa70af69c84d2cfca5bc4", + "md5": "ad52248ba90cc66a4f73e1914ef3b090", + "size": "170310" + } + }, + "cuda_demo_suite": { + "name": "CUDA Demo Suite", + "license": "CUDA Toolkit", + "license_path": "cuda_demo_suite/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "ed9dd4e1b5fad1c21cfdab9df2d9c80c6360513f4ebd4dd1bc71d518c0a5f2d2", + "md5": "a18e17098bfc19e966e36152c7417b01", + "size": "4000328" + }, + "windows-x86_64": { + "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.3.52-archive.zip", + "sha256": "a93c7712d3b2782964172c1677868684a4145f8bc8cb18b9173e4abb640ee353", + "md5": "17adbdccd94580c1b821ed6ea9a856cf", + "size": "5061022" + } + }, + "cuda_documentation": { + "name": "CUDA Documentation", + "license": "CUDA Toolkit", + "license_path": "cuda_documentation/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "b2bea4ca04808c88fc34ce3da98457f789f6087effe9c12ec5c7cadc583f8c2e", + "md5": "6c898f430b8cc9f89c3acc2ecb3587c7", + "size": "67052" + }, + "linux-ppc64le": { + "relative_path": "cuda_documentation/linux-ppc64le/cuda_documentation-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "ac53d750359c4c0bf92111ee46c0dc4ffc4e78c480e8319c48c6097697712847", + "md5": "870aa50e6b0d5627e44152dbbe28d100", + "size": "67156" + }, + "linux-sbsa": { + "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "2e95ef6bee1b78068d6a8a854effec0e31aed07cf6d81f48021cee213fd01c26", + "md5": "076cebe3b4f8f76c4e66b5369566ea8a", + "size": "67044" + }, + "windows-x86_64": { + "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.3.52-archive.zip", + "sha256": "57f074a8fd407f9848fccbe6fb728d649938f315b3135ca0070682fa326df466", + "md5": "b6d4e19b1239e1f63856ce91bf058b38", + "size": "105364" + } + }, + "cuda_gdb": { + "name": "CUDA GDB", + "license": "CUDA Toolkit", + "license_path": "cuda_gdb/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "597b1429d311e338023763c6e414f8b826f254c139a4422214f6f8d4f9af90f7", + "md5": "f6d3aa7856abf88e5c0c4e5cebf5af8e", + "size": "65762552" + }, + "linux-ppc64le": { + "relative_path": "cuda_gdb/linux-ppc64le/cuda_gdb-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "2738151a55fcc13f01195722a5cd316eb3b2e49fc6ab4da066bdc13a1e2c98af", + "md5": "9940939654686fd3da00d1fa281e212c", + "size": "65482616" + }, + "linux-sbsa": { + "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "8eb60a57eec17d837aa4be481f4399aa6288262ae61990cedf8f202a5b2329f4", + "md5": "80a1a0127fff32fa4aadd6e7074303f9", + "size": "65463172" + } + }, + "cuda_nsight": { + "name": "Nsight Eclipse Edition Plugin", + "license": "CUDA Toolkit", + "license_path": "cuda_nsight/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "7e96029a8a730c799d7e85d283d4d3f21601448e50e3af407ff54f4344a30847", + "md5": "6a688c24dd28528970f028f62763e907", + "size": "118689728" + }, + "linux-ppc64le": { + "relative_path": "cuda_nsight/linux-ppc64le/cuda_nsight-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "8121c2f187e3bfc1542e155d52c69283ada1f5d8c17e4779306e095926856d6e", + "md5": "3dae1d37c213a1e76cd0f571214b1bc3", + "size": "118689712" + } + }, + "cuda_nvcc": { + "name": "CUDA NVCC", + "license": "CUDA Toolkit", + "license_path": "cuda_nvcc/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "32302154a7ec122defdbb49f1c7cc8777f204c3199d9222f013046be256f72d6", + "md5": "858c4eea2da82037bae9b6eef47747ed", + "size": "47698868" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvcc/linux-ppc64le/cuda_nvcc-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "f7c647b74f2f85f5d9c42d951d810cb7130288b11d25ef7308fb489e1150232f", + "md5": "c19a78d3e11fde996b83e2ac21252199", + "size": "42947524" + }, + "linux-sbsa": { + "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "98940f1719b2ab1af943293601307b9e87ea71e30809d429fd7dc2e59b294c68", + "md5": "e47ff4a9f6d35fa01efc7c5f64ebf1e8", + "size": "41816996" + }, + "windows-x86_64": { + "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.3.52-archive.zip", + "sha256": "1c9e275d10ce496f75efc2337284ab7b6b8c7deb2abc148ea90b0a7ac9ebd9fd", + "md5": "5a3765f447771c6a983b7a90ca2f5396", + "size": "62734155" + } + }, + "cuda_nvdisasm": { + "name": "CUDA nvdisasm", + "license": "CUDA Toolkit", + "license_path": "cuda_nvdisasm/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "dfaa7c1bea5e4e833374da2f80156998bc303e8787a6e88d6a9c97fdead6e9a9", + "md5": "a800e8d833020a5794310c74b54e73c4", + "size": "49879928" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvdisasm/linux-ppc64le/cuda_nvdisasm-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "06e9e4ba698d9b29f0d36e732264e8f1ce920cbe9b4014227104280f665674f6", + "md5": "a59901cdbd2c583cd59053e863b673a0", + "size": "49879940" + }, + "linux-sbsa": { + "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "3d9b4e99966f9e9305b54a55991a64b59d85d804dc3876f0881b538cff09c84c", + "md5": "cb93fd227f8eb20df6b39176801d144f", + "size": "49820084" + }, + "windows-x86_64": { + "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.3.52-archive.zip", + "sha256": "59f237756aa152cd1f18ee49e30cc9138ad6b0b451e338b467684f8c1b512117", + "md5": "860e10f6ffcf7312709cefcfa6067047", + "size": "50139397" + } + }, + "cuda_nvml_dev": { + "name": "CUDA NVML Headers", + "license": "CUDA Toolkit", + "license_path": "cuda_nvml_dev/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "37537d1946513d41a0b4b350ee93d4722a52fd56293c66f3dbdb33bf96d799f8", + "md5": "691e15a41db1eac40f9ba96c3b702852", + "size": "87052" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvml_dev/linux-ppc64le/cuda_nvml_dev-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "eb107e7c12c89c221f34f700fd838d2788d40febb43df45a387653c677a38027", + "md5": "5ed3d7b3a60abef4f8e038976a8c4304", + "size": "85620" + }, + "linux-sbsa": { + "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "4cee78d3354f268730e40c04626abb38bfb7329a06feb9ab0ab4fc53b2ffe09a", + "md5": "5a2b431c55f26240d3b2806ffc92ad30", + "size": "86308" + }, + "windows-x86_64": { + "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.3.52-archive.zip", + "sha256": "26309a28f1ea2ad58c8eac6725e39210889d8310e5eecd234fe385056ea4b4cf", + "md5": "c79c8a619506364c791aa5e7d0d354ac", + "size": "120977" + } + }, + "cuda_nvprof": { + "name": "CUDA nvprof", + "license": "CUDA Toolkit", + "license_path": "cuda_nvprof/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "b4683cee4e0837e19d22a93d2b944a740de4837049ab4f7a4ac97f35a554c3b9", + "md5": "7ed9fe37b9fd3b84a24c4fcc04e500b8", + "size": "2441540" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprof/linux-ppc64le/cuda_nvprof-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "38c9c81e0913cbce002d094b504c5c94418b8968cf951a3764919439957e5894", + "md5": "af1ea66babdfe389194447e65b4885b7", + "size": "2120596" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.3.52-archive.zip", + "sha256": "4b82430be0be570dfbe9fb0b3aa316b413757444f7b7a36fb70de81b58cb61c3", + "md5": "d5bd756383bda6676c9c1e41793bd948", + "size": "1700913" + } + }, + "cuda_nvprune": { + "name": "CUDA nvprune", + "license": "CUDA Toolkit", + "license_path": "cuda_nvprune/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "1ba95b8a3c0b44a91ab7f1c5c52a23bad56cd2ca651e4f9c6a820d666ade24e3", + "md5": "253cbe9af015b13868e88540530ac206", + "size": "56212" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvprune/linux-ppc64le/cuda_nvprune-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "66b8e6c69ca9e6368d5e6753bc3a38f51c43d58d3e1fa30fc41cab5af2d58bf0", + "md5": "b3a6f87df7d2288b5d01e31caab131e5", + "size": "57240" + }, + "linux-sbsa": { + "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "8161576c8b9b4eeb23fdb3def3373e17a82f3bf9ee75422c16ffc30f9a9bcec7", + "md5": "fa4958bdca0f2188508fcdf8790dd291", + "size": "48436" + }, + "windows-x86_64": { + "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.3.52-archive.zip", + "sha256": "17b5efeaf20298ef51ecea0969e8013481717c1d73bb2df5c6a3c994546f9944", + "md5": "dcc3362f5b55bf3fc088a591a647ff2f", + "size": "146052" + } + }, + "cuda_nvrtc": { + "name": "CUDA NVRTC", + "license": "CUDA Toolkit", + "license_path": "cuda_nvrtc/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "6d549612a9c61caf7356d8a13d99a85cfa644269ed856192bea13c7e5f8ce234", + "md5": "68aa875913caefbe11de5fded4df7ac9", + "size": "31333156" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvrtc/linux-ppc64le/cuda_nvrtc-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "0e12e3bc044d6b1d0440493e086d7b7ca8c31eafe79e4fe7fbada6dd209d5d57", + "md5": "5d64fbfc312afa6c0259de98917e447a", + "size": "28575620" + }, + "linux-sbsa": { + "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "8c1aa8bb711a31d50f613d8594103cfeaf062e9a422094dcf6d18646ecd99f17", + "md5": "f879465dd1304b83b82a8b895a37d7b2", + "size": "28661256" + }, + "windows-x86_64": { + "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.3.52-archive.zip", + "sha256": "3dabf99c94d8cadd4efc5163fb53207f8c011e553b08c41cb760d18bbf2e3f0b", + "md5": "1fb1e8d9668177ce740a9e5f24d568c9", + "size": "102259575" + } + }, + "cuda_nvtx": { + "name": "CUDA NVTX", + "license": "CUDA Toolkit", + "license_path": "cuda_nvtx/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "090068726f299ac218f125fe15fb845bef5670ce48eccb95e752479b40361771", + "md5": "59b253c005d1829560b740a1f83bdc04", + "size": "48388" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvtx/linux-ppc64le/cuda_nvtx-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "2c3a6c1f84139e706c1a329b80dc7afaf2b687cc2e65111a37eb90419cd9ffe5", + "md5": "90d934de07f3a1d297509c21ac7c0908", + "size": "48400" + }, + "linux-sbsa": { + "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "d28d0be121286f5fb3e55e2e358bbda18c0eedf16d37347806601cc90ebff789", + "md5": "157223166a9249869b0df211073ed11a", + "size": "49044" + }, + "windows-x86_64": { + "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.3.52-archive.zip", + "sha256": "92e840d1b5a2f6a5e6f7328de3e99554fbe3d6acfe917010597135c3e69a104b", + "md5": "868895cecfa12a9fc5204a673403fcf4", + "size": "65690" + } + }, + "cuda_nvvp": { + "name": "CUDA NVVP", + "license": "CUDA Toolkit", + "license_path": "cuda_nvvp/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "54871072910527bae22af3337163a873cd92ad08ece6ed26e9ca48b6e28ce7f9", + "md5": "4dfddacbbeb2b335d678a620848af6bd", + "size": "117759232" + }, + "linux-ppc64le": { + "relative_path": "cuda_nvvp/linux-ppc64le/cuda_nvvp-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "7aacfde343022de7e13792d87bcc4f9d7826e9a4f5c11ea11949730098024b3e", + "md5": "15bb39a8a7ed622c640112aa5d9ec93f", + "size": "111830320" + }, + "windows-x86_64": { + "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.3.52-archive.zip", + "sha256": "40919592c0f3b71264cd4d3de4674bcf775d16ea81209fb4d41fb74673b8d21c", + "md5": "efd029d36d6edd6ca074416d98ad68e9", + "size": "120340815" + } + }, + "cuda_opencl": { + "name": "CUDA OpenCL", + "license": "CUDA Toolkit", + "license_path": "cuda_opencl/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "8e270a6369947e711b5df48c4dbaebcbfdf7245cc4ddb098cfad69f85efa626e", + "md5": "94e8d0efc5bf057cff8a55349956371a", + "size": "75540" + }, + "windows-x86_64": { + "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.3.52-archive.zip", + "sha256": "92d4b713626add42437aae1a044cebb1b80c7c47d343963150e5c182f8e3c9a3", + "md5": "2288f81210af58bf38f4be7ee29492bc", + "size": "114719" + } + }, + "cuda_profiler_api": { + "name": "CUDA Profiler API", + "license": "CUDA Toolkit", + "license_path": "cuda_profiler_api/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "4ab0f21627156b9e0f681863d4adcfe8924b07eb1a40a6381ef807ff588a6d47", + "md5": "e96e1c532cfff9287e0ed7b38e3a3ad2", + "size": "16048" + }, + "linux-ppc64le": { + "relative_path": "cuda_profiler_api/linux-ppc64le/cuda_profiler_api-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "186094548cb3603f167cac03777bd31c6c02d794dc5312f31b8874e25a515b06", + "md5": "7ba4e575eaaaf0ffd39f59eeac156491", + "size": "16056" + }, + "linux-sbsa": { + "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "2c1b04b719e6cbccef1e140c4371c1fb119c66b8e788adf3e10313fdb456ba87", + "md5": "c2ec9b80c3abf4d404f4da6e934be1c8", + "size": "16060" + }, + "windows-x86_64": { + "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.3.52-archive.zip", + "sha256": "a339bb2448d39b74e895a1b5321c58cd235d9c7719fe343f8a2cb00c7f5877d4", + "md5": "67ebaa93beb345ed1ba5f56c08090568", + "size": "20075" + } + }, + "cuda_sanitizer_api": { + "name": "CUDA Compute Sanitizer API", + "license": "CUDA Toolkit", + "license_path": "cuda_sanitizer_api/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "9dbebdd45130df33685213d8d5c6443ef45b34b9a23cee08d1c8eb54ab662cf9", + "md5": "198b805f7dbd3e04bbca139cdd2810b2", + "size": "8204808" + }, + "linux-ppc64le": { + "relative_path": "cuda_sanitizer_api/linux-ppc64le/cuda_sanitizer_api-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "8a5bd354931778eb18c0ab118c38748c6a5bafa553cf84fee79d07839763c13e", + "md5": "9f9fe626f4f84fec7ee206faa7872f69", + "size": "7772948" + }, + "linux-sbsa": { + "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "a301c71de5f8d786b675c4258a8dd4fdc6533468c81f946b327e1a7f1ae859c2", + "md5": "37712b47eff245ce1e1dcdf0f685f6d4", + "size": "6519848" + }, + "windows-x86_64": { + "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.3.52-archive.zip", + "sha256": "9d7abb0c7df2b9104888ea11539055117023cf7354d6859789c233e6e5df14b8", + "md5": "53e6bdc5e662ceb0efd8b2c1f0704a29", + "size": "14116642" + } + }, + "fabricmanager": { + "name": "NVIDIA Fabric Manager", + "license": "NVIDIA Driver", + "license_path": "fabricmanager/LICENSE.txt", + "version": "545.23.06", + "linux-x86_64": { + "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-545.23.06-archive.tar.xz", + "sha256": "3c0e848f554b33cf941e54ce1775f4f11198dbbc0275e261082f8fca0d0a28d9", + "md5": "3a04213dcd349cc2964eb29cce4c6bcc", + "size": "5088924" + }, + "linux-sbsa": { + "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-545.23.06-archive.tar.xz", + "sha256": "ffe93591af3d1075177ff598ae02c7067db5b2edde8bb016356c8d2ea549eb6d", + "md5": "0c73afa460eaa469bb51e7c3fba8fa38", + "size": "4649044" + } + }, + "libcublas": { + "name": "CUDA cuBLAS", + "license": "CUDA Toolkit", + "license_path": "libcublas/LICENSE.txt", + "version": "12.3.2.9", + "linux-x86_64": { + "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.3.2.9-archive.tar.xz", + "sha256": "793fb630ffeac7aabd241e43cd41d5209fb93e9505cb7937bdd318188d47551f", + "md5": "7b3a5411eeb85a061e48ce77b6f1e695", + "size": "504998132" + }, + "linux-ppc64le": { + "relative_path": "libcublas/linux-ppc64le/libcublas-linux-ppc64le-12.3.2.9-archive.tar.xz", + "sha256": "c6b00cf18831527543f93a2e35d98f3b297d7a5b6896a598995eb4a3fa47f39c", + "md5": "7842b3f6de4312b21b7910b85f56587e", + "size": "401263304" + }, + "linux-sbsa": { + "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.3.2.9-archive.tar.xz", + "sha256": "bb83278da1007847a72e8f8ad40186c70a2ead7e48bf9eb387aeda94a8b63672", + "md5": "2dadf0b64c0f1781b606bda508e1d8b8", + "size": "496892884" + }, + "windows-x86_64": { + "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.3.2.9-archive.zip", + "sha256": "35c177357715c9c326ee50fa87192dee6b9c25944725ec3107f63675d10df4cf", + "md5": "7f1b5517f09170f46bc97812b0c81b13", + "size": "443868444" + } + }, + "libcufft": { + "name": "CUDA cuFFT", + "license": "CUDA Toolkit", + "license_path": "libcufft/LICENSE.txt", + "version": "11.0.11.19", + "linux-x86_64": { + "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.0.11.19-archive.tar.xz", + "sha256": "f84d33026cc59f6bdfe4ce446b78912499fc4447e8b7b4e3f1617bb0dae2a27e", + "md5": "9becd4989c7b92bc2f7fa4429c613fd1", + "size": "172050036" + }, + "linux-ppc64le": { + "relative_path": "libcufft/linux-ppc64le/libcufft-linux-ppc64le-11.0.11.19-archive.tar.xz", + "sha256": "45a7f4bef97846374cc11c637b4b6b635b8e6abd0a45555ebb3ef5afc3c9c159", + "md5": "76a2f1431da7985b8deaea7355a6f3cf", + "size": "173409752" + }, + "linux-sbsa": { + "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.0.11.19-archive.tar.xz", + "sha256": "c6867258f4347557435b2dfb7d7e05405cd6a21c954f9ab82a22a1280e93173c", + "md5": "78655b8a9b6d32d76bc5cff2e1e735d6", + "size": "172359036" + }, + "windows-x86_64": { + "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.0.11.19-archive.zip", + "sha256": "df838d3a085f3741410f86c90a3da8dc57b38d69d830b198473b04fb0e8cfe06", + "md5": "420b784f259ccafe210c04fef0edd1e6", + "size": "96307613" + } + }, + "libcufile": { + "name": "CUDA cuFile", + "license": "CUDA Toolkit", + "license_path": "libcufile/LICENSE.txt", + "version": "1.8.0.34", + "linux-x86_64": { + "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.8.0.34-archive.tar.xz", + "sha256": "16d9810a414354f084820b3dacd59baa0dcbdc1c951519803fa10784d1f43ec4", + "md5": "9a27732eee2556fe72009fbdb9007342", + "size": "41857344" + }, + "linux-sbsa": { + "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.8.0.34-archive.tar.xz", + "sha256": "733c02066ac5b026337da0a6adfc0ce3c71a677cfac9528c4e22443f0cd615bc", + "md5": "f67ac3f54ba73bbd69411237fba00c87", + "size": "41296760" + } + }, + "libcurand": { + "name": "CUDA cuRAND", + "license": "CUDA Toolkit", + "license_path": "libcurand/LICENSE.txt", + "version": "10.3.4.52", + "linux-x86_64": { + "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.4.52-archive.tar.xz", + "sha256": "8ac8ca5b1ab22e13cbd474ea5dfe24a2d6d1ff02dc5ed06b07648066c7ea34fc", + "md5": "04779769c4d217ee94e034f60d0a0e43", + "size": "81714596" + }, + "linux-ppc64le": { + "relative_path": "libcurand/linux-ppc64le/libcurand-linux-ppc64le-10.3.4.52-archive.tar.xz", + "sha256": "8de3fee960f55895af53a2817835086c4d0c260628a32120d2987ae4e1b48e9f", + "md5": "9a2900df6914baf192eff7fd886be734", + "size": "81766484" + }, + "linux-sbsa": { + "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.4.52-archive.tar.xz", + "sha256": "2923351205c6d078a0678857f507f57e0aeaab9570946faad2ade97362abafc7", + "md5": "c3064fc74451401d864c811588d7447d", + "size": "81702812" + }, + "windows-x86_64": { + "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.4.52-archive.zip", + "sha256": "e3634e5eb0d9133e92909c525775e43ebc9597b4f6dda1f95d09bea18e4f4c51", + "md5": "19e696cffbaa7acb889b8c0092ae7db4", + "size": "55099171" + } + }, + "libcusolver": { + "name": "CUDA cuSOLVER", + "license": "CUDA Toolkit", + "license_path": "libcusolver/LICENSE.txt", + "version": "11.5.3.52", + "linux-x86_64": { + "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.5.3.52-archive.tar.xz", + "sha256": "334470e66d74102fa7a80e7eeb9ab5b80fe4939204a67d4ef64d369fe254cae2", + "md5": "8430c15911f35fcbf2108820df8ddcff", + "size": "123465076" + }, + "linux-ppc64le": { + "relative_path": "libcusolver/linux-ppc64le/libcusolver-linux-ppc64le-11.5.3.52-archive.tar.xz", + "sha256": "a71dcef7bccd565003120bb5d18cf8adb0ed4428b3a122f1869f4849827234a1", + "md5": "f4997ae343547742e63fcd819cd02bad", + "size": "123579460" + }, + "linux-sbsa": { + "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.5.3.52-archive.tar.xz", + "sha256": "3de3b43a6576a10adac99ac34984c3c623ad6666699aa0531ca239d9d27beee5", + "md5": "2c2ae3936e81a9338fab1f3f723eedc9", + "size": "122842492" + }, + "windows-x86_64": { + "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.5.3.52-archive.zip", + "sha256": "73251d1b23faed1a04a84801beeb643161a1d10c6cdccd5f321a7dda7b105290", + "md5": "d088b48c66d39651cc05952529d308c7", + "size": "120934003" + } + }, + "libcusparse": { + "name": "CUDA cuSPARSE", + "license": "CUDA Toolkit", + "license_path": "libcusparse/LICENSE.txt", + "version": "12.1.3.153", + "linux-x86_64": { + "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.1.3.153-archive.tar.xz", + "sha256": "62b091161967b830cb20cdd73ceb77da28bd88a33db9b734644531f36f3556f6", + "md5": "f6685c2b0e80052f77210a451daf5fb6", + "size": "212909260" + }, + "linux-ppc64le": { + "relative_path": "libcusparse/linux-ppc64le/libcusparse-linux-ppc64le-12.1.3.153-archive.tar.xz", + "sha256": "b086126226b919f6fcacbf1ef547045ea848bbc739bd6524a6bd2aee46110f61", + "md5": "0df5916c88513e489a47a83b58dc9444", + "size": "212929864" + }, + "linux-sbsa": { + "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.1.3.153-archive.tar.xz", + "sha256": "9f61ff29dc5aa272b771ba0691565d73f167ffe544b3d10f42c3f84ae9aa510a", + "md5": "5f4a30593348a87234f612dd3dd7b204", + "size": "212557236" + }, + "windows-x86_64": { + "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.1.3.153-archive.zip", + "sha256": "ae79b3b756a1c2ba848c2931bf0c9ae62746ab7755d110d68a280392999a0b45", + "md5": "9c1caa26adc1cc51728c632f89e38fa7", + "size": "192897620" + } + }, + "libnpp": { + "name": "CUDA NPP", + "license": "CUDA Toolkit", + "license_path": "libnpp/LICENSE.txt", + "version": "12.2.2.32", + "linux-x86_64": { + "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.2.2.32-archive.tar.xz", + "sha256": "1f8f47aedb988eea8611eabe085e6f9e177981b4d942e4d45185d90f752eed3e", + "md5": "194a625a46f20799e8e0dc1ed7148a7a", + "size": "183688252" + }, + "linux-ppc64le": { + "relative_path": "libnpp/linux-ppc64le/libnpp-linux-ppc64le-12.2.2.32-archive.tar.xz", + "sha256": "00f2a26ea9ce3f4090ac72a3e2659faba6ab000afa1f22f50eeabe72ed4bf5b1", + "md5": "b916512ad551b21fff9b2ec88e2b5658", + "size": "184496636" + }, + "linux-sbsa": { + "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.2.2.32-archive.tar.xz", + "sha256": "d2f5e784d4486663e4a0851e3bedd7fab769cf7960a4d37bfb07c2feb43ca4b7", + "md5": "8d4fd6cc3e070a263f527b3a2e4ec516", + "size": "183572808" + }, + "windows-x86_64": { + "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.2.2.32-archive.zip", + "sha256": "5b35180d336cb4cdc8d3ee362b91aef986de292bcbdbe1a71dc544dc3bae3b6a", + "md5": "0890caecbe7fdd94fbf82fe3f40fda6e", + "size": "153321627" + } + }, + "libnvidia_nscq": { + "name": "NVIDIA NSCQ API", + "license": "NVIDIA Driver", + "license_path": "libnvidia_nscq/LICENSE.txt", + "version": "545.23.06", + "linux-x86_64": { + "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-545.23.06-archive.tar.xz", + "sha256": "66abb1ec36f5e67f0c32c7f7fdd7b264a628528684d3b3647674eef914330926", + "md5": "ef4d098fb8d226b6e8b3197d54255eb5", + "size": "352880" + }, + "linux-sbsa": { + "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-545.23.06-archive.tar.xz", + "sha256": "4d60d9022c2228ef9f32705ffbc5aa72b5ce44e9e4aad859f8bf7aa2915dc8a7", + "md5": "3c48b4a62438026ac4a5bf563fead503", + "size": "319880" + } + }, + "libnvjitlink": { + "name": "NVIDIA compiler library for JIT LTO functionality", + "license": "CUDA Toolkit", + "license_path": "libnvjitlink/LICENSE.txt", + "version": "12.3.52", + "linux-x86_64": { + "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.3.52-archive.tar.xz", + "sha256": "92f21102652a22ec735bac9ab236dae1b69d808d1391a96ba379bfa4dd83e6b8", + "md5": "107a984b8eb5712b3997cf3b56779356", + "size": "26483580" + }, + "linux-ppc64le": { + "relative_path": "libnvjitlink/linux-ppc64le/libnvjitlink-linux-ppc64le-12.3.52-archive.tar.xz", + "sha256": "2802ed389e9c246415a6fc0dc8f8f5bc6cf9f43bcf53f30a921b6e5d80b1e314", + "md5": "b595ce0b4ac917063b9d3e417e1c0847", + "size": "24029696" + }, + "linux-sbsa": { + "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.3.52-archive.tar.xz", + "sha256": "afcd59beb68d68115d0b020bca49e75ff3b407a9469d5578c25309e5ef83442e", + "md5": "4a4629c069aad8a564927990c167b01b", + "size": "24067300" + }, + "windows-x86_64": { + "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.3.52-archive.zip", + "sha256": "117ba27dc4086f895bade8d6314d5a2bd835342a6d46fef471b9932807e59e1e", + "md5": "ee72bcd855f46ad652acbe8a06457e59", + "size": "90900374" + } + }, + "libnvjpeg": { + "name": "CUDA nvJPEG", + "license": "CUDA Toolkit", + "license_path": "libnvjpeg/LICENSE.txt", + "version": "12.2.3.32", + "linux-x86_64": { + "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.2.3.32-archive.tar.xz", + "sha256": "19e7dedaaa07c451a84cc607711a22a6f852043559f5bd11cd8e50683628a590", + "md5": "8195a125d8dc67b9769ba4151f28b471", + "size": "2564332" + }, + "linux-ppc64le": { + "relative_path": "libnvjpeg/linux-ppc64le/libnvjpeg-linux-ppc64le-12.2.3.32-archive.tar.xz", + "sha256": "cb77d773e261c0fb298da405036728e18be11f21f45c3ac474b9e3a69ad2ff46", + "md5": "e8323f5f3b00f3703b834a72171863ad", + "size": "2589976" + }, + "linux-sbsa": { + "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.2.3.32-archive.tar.xz", + "sha256": "a4c7a739905f42dce324845b5d27cb8402ec84c0d48a7e50b6426891ae62d429", + "md5": "fee67a165abdc83440788932cccf113b", + "size": "2390916" + }, + "windows-x86_64": { + "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.2.3.32-archive.zip", + "sha256": "dd931eb75934550421884d548d1e6c4504a11d4f71df07f1c088158b7b7466b7", + "md5": "5741a278df23d62f0e97be4d1013ddd2", + "size": "2829977" + } + }, + "nsight_compute": { + "name": "Nsight Compute", + "license": "NVIDIA SLA", + "license_path": "nsight_compute/LICENSE.txt", + "version": "2023.3.0.12", + "linux-x86_64": { + "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2023.3.0.12-archive.tar.xz", + "sha256": "12c96010d723f48702a342d7ae6dfa18e96154fc69225de0398c907fdd655499", + "md5": "40e9f41957a580680f88e7edce40e49a", + "size": "736137868" + }, + "linux-ppc64le": { + "relative_path": "nsight_compute/linux-ppc64le/nsight_compute-linux-ppc64le-2023.3.0.12-archive.tar.xz", + "sha256": "d2003f65ec46ded90db0639990efa2a2b5e3acebafbc2f47f8b8d47c4624c85d", + "md5": "29eac226551bfeeadb394f6b2215765e", + "size": "139988468" + }, + "linux-sbsa": { + "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2023.3.0.12-archive.tar.xz", + "sha256": "e4e809260462a313c1ecb5705b535558289e60507d26e77495cd456a9e1cd85b", + "md5": "bc6d08cb6d6e485cc94939940d0feb50", + "size": "358992716" + }, + "windows-x86_64": { + "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2023.3.0.12-archive.zip", + "sha256": "97959a668e6c4732b34a294bd997ce37f8f08ab5714c47af426a5d00313eb435", + "md5": "a23e3d5e577624f95e35738e7507ded1", + "size": "674363811" + } + }, + "nsight_systems": { + "name": "Nsight Systems", + "license": "NVIDIA SLA", + "license_path": "nsight_systems/LICENSE.txt", + "version": "2023.3.3.42", + "linux-x86_64": { + "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2023.3.3.42-archive.tar.xz", + "sha256": "dafded1be045abea2804697646178a66bec4a5eebb1b28b2637a37c2f22c7b93", + "md5": "34208b6d0c71444babf10a9bfeac86b0", + "size": "227696524" + }, + "linux-ppc64le": { + "relative_path": "nsight_systems/linux-ppc64le/nsight_systems-linux-ppc64le-2023.3.3.42-archive.tar.xz", + "sha256": "5095fc2a432267c002fa84d14f8c09985c7ba17becb6095699d7407fcbe3234d", + "md5": "8f873649a9686b23c71ab4f5c575bf74", + "size": "67233156" + }, + "linux-sbsa": { + "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2023.3.3.42-archive.tar.xz", + "sha256": "93976454c75ca4dc6da28c7e8cc886cc21ec513d4e0f294f56b9afad245e4071", + "md5": "98e172f249dfa5da3eaa564a86179601", + "size": "198960916" + }, + "windows-x86_64": { + "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2023.3.3.42-archive.zip", + "sha256": "9049d2bd0f17d967f7c84f33eee04b83c6b65349e3b12f97a3a9211d411e0009", + "md5": "54e49f657acf7b5e337c77f94b9d0943", + "size": "348461444" + } + }, + "nsight_vse": { + "name": "Nsight Visual Studio Edition (VSE)", + "license": "NVIDIA SLA", + "license_path": "nsight_vse/LICENSE.txt", + "version": "2023.3.0.23248", + "windows-x86_64": { + "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2023.3.0.23248-archive.zip", + "sha256": "10518927226a8a60c47bd1040e4be8b0396d37738ba1f11ba6bc918115e231a0", + "md5": "c2aba6d4604b9005b2a322dc68ce5534", + "size": "527217651" + } + }, + "nvidia_driver": { + "name": "NVIDIA Linux Driver", + "license": "NVIDIA Driver", + "license_path": "nvidia_driver/LICENSE.txt", + "version": "545.23.06", + "linux-x86_64": { + "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-545.23.06-archive.tar.xz", + "sha256": "e799421bdfee93a16c2bfd0b7622875ae1e993cc1955383d92a57f36a2ce47db", + "md5": "4c17b86e90fd601d9f787b2777949bfd", + "size": "371993760" + }, + "linux-ppc64le": { + "relative_path": "nvidia_driver/linux-ppc64le/nvidia_driver-linux-ppc64le-545.23.06-archive.tar.xz", + "sha256": "09e8790c9c79419acf74dc3d3f20c812d073e156001e617a8a4af9fe11713a36", + "md5": "f9734bc55548492a4d3e2d991419b446", + "size": "100061728" + }, + "linux-sbsa": { + "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-545.23.06-archive.tar.xz", + "sha256": "6d0bf7e1adb49c0bcd968c9a4eb9ee324ebffa7683b34d92fd25f4ff2f99dbd1", + "md5": "9fe92968de77c9809d579582d5266b0a", + "size": "288683672" + } + }, + "nvidia_fs": { + "name": "NVIDIA filesystem", + "license": "CUDA Toolkit", + "license_path": "nvidia_fs/LICENSE.txt", + "version": "2.18.3", + "linux-x86_64": { + "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.18.3-archive.tar.xz", + "sha256": "4b2b045c932c1449f28be246b3b28658981e81507825d73a35e11e9450774ac4", + "md5": "74135e8f97454338505b58bbcc5483a5", + "size": "58448" + }, + "linux-sbsa": { + "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.18.3-archive.tar.xz", + "sha256": "80bae8ef6f977e2aeecb392c00e056e579657632abb02eb75e86bbf306db6f50", + "md5": "f88dd5297012268400192de8877f4606", + "size": "58460" + } + }, + "visual_studio_integration": { + "name": "CUDA Visual Studio Integration", + "license": "CUDA Toolkit", + "license_path": "visual_studio_integration/LICENSE.txt", + "version": "12.3.52", + "windows-x86_64": { + "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.3.52-archive.zip", + "sha256": "b801075f82c789ac8014223ca3437ef87e9e0ee700b7b617f4495bcc273b788a", + "md5": "f456d7ab05e574cd8c2a20d8f1efd4e0", + "size": "518070" + } + } +} diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix new file mode 100644 index 0000000000000..d92e07bb1b0bf --- /dev/null +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -0,0 +1,209 @@ +{cudaVersion, lib, addDriverRunpath}: +let + inherit (lib) attrsets lists strings; + # cudaVersionOlder : Version -> Boolean + cudaVersionOlder = strings.versionOlder cudaVersion; + # cudaVersionAtLeast : Version -> Boolean + cudaVersionAtLeast = strings.versionAtLeast cudaVersion; + + addBuildInputs = + drv: buildInputs: + drv.overrideAttrs (prevAttrs: {buildInputs = prevAttrs.buildInputs ++ buildInputs;}); +in +# NOTE: Filter out attributes that are not present in the previous version of +# the package set. This is necessary to prevent the appearance of attributes +# like `cuda_nvcc` in `cudaPackages_10_0, which predates redistributables. +final: prev: +attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) { + libcufile = prev.libcufile.overrideAttrs ( + prevAttrs: { + buildInputs = prevAttrs.buildInputs ++ [ + final.libcublas.lib + final.pkgs.numactl + final.pkgs.rdma-core + ]; + # Before 11.7 libcufile depends on itself for some reason. + env.autoPatchelfIgnoreMissingDeps = + prevAttrs.env.autoPatchelfIgnoreMissingDeps + + strings.optionalString (cudaVersionOlder "11.7") " libcufile.so.0"; + } + ); + + libcusolver = addBuildInputs prev.libcusolver ( + # Always depends on this + [final.libcublas.lib] + # Dependency from 12.0 and on + ++ lists.optionals (cudaVersionAtLeast "12.0") [final.libnvjitlink.lib] + # Dependency from 12.1 and on + ++ lists.optionals (cudaVersionAtLeast "12.1") [final.libcusparse.lib] + ); + + libcusparse = addBuildInputs prev.libcusparse ( + lists.optionals (cudaVersionAtLeast "12.0") [final.libnvjitlink.lib] + ); + + cuda_cudart = prev.cuda_cudart.overrideAttrs ( + prevAttrs: { + allowFHSReferences = false; + + # The libcuda stub's pkg-config doesn't follow the general pattern: + postPatch = + prevAttrs.postPatch or "" + + '' + while IFS= read -r -d $'\0' path ; do + sed -i \ + -e "s|^libdir\s*=.*/lib\$|libdir=''${!outputLib}/lib/stubs|" \ + -e "s|^Libs\s*:\(.*\)\$|Libs: \1 -Wl,-rpath,${addDriverRunpath.driverLink}/lib|" \ + "$path" + done < <(find -iname 'cuda-*.pc' -print0) + '' + + '' + # Namelink may not be enough, add a soname. + # Cf. https://gitlab.kitware.com/cmake/cmake/-/issues/25536 + if [[ -f lib/stubs/libcuda.so && ! -f lib/stubs/libcuda.so.1 ]] ; then + ln -s libcuda.so lib/stubs/libcuda.so.1 + fi + ''; + } + ); + + cuda_compat = prev.cuda_compat.overrideAttrs ( + prevAttrs: { + env.autoPatchelfIgnoreMissingDeps = + prevAttrs.env.autoPatchelfIgnoreMissingDeps + " libnvrm_gpu.so libnvrm_mem.so libnvdla_runtime.so"; + # `cuda_compat` only works on aarch64-linux, and only when building for Jetson devices. + brokenConditions = prevAttrs.brokenConditions // { + "Trying to use cuda_compat on aarch64-linux targeting non-Jetson devices" = + !final.flags.isJetsonBuild; + }; + } + ); + + cuda_gdb = addBuildInputs prev.cuda_gdb ( + # x86_64 only needs gmp from 12.0 and on + lists.optionals (cudaVersionAtLeast "12.0") [final.pkgs.gmp] + ); + + cuda_nvcc = prev.cuda_nvcc.overrideAttrs ( + oldAttrs: { + + outputs = oldAttrs.outputs ++ lists.optionals (!(builtins.elem "lib" oldAttrs.outputs)) [ "lib" ]; + + # Patch the nvcc.profile. + # Syntax: + # - `=` for assignment, + # - `?=` for conditional assignment, + # - `+=` to "prepend", + # - `=+` to "append". + + # Cf. https://web.archive.org/web/20230308044351/https://arcb.csc.ncsu.edu/~mueller/cluster/nvidia/2.0/nvcc_2.0.pdf + + # We set all variables with the lowest priority (=+), but we do force + # nvcc to use the fixed backend toolchain. Cf. comments in + # backend-stdenv.nix + + postPatch = + (oldAttrs.postPatch or "") + + '' + substituteInPlace bin/nvcc.profile \ + --replace \ + '$(TOP)/lib' \ + "''${!outputLib}/lib" \ + --replace \ + '$(TOP)/$(_NVVM_BRANCH_)' \ + "''${!outputBin}/nvvm" \ + --replace \ + '$(TOP)/$(_TARGET_DIR_)/include' \ + "''${!outputDev}/include" + + cat << EOF >> bin/nvcc.profile + + # Fix a compatible backend compiler + PATH += ${lib.getBin final.backendStdenv.cc}/bin: + LIBRARIES += "-L${lib.getLib final.backendStdenv.nixpkgsCompatibleLibstdcxx}/lib" + + # Expose the split-out nvvm + LIBRARIES =+ -L''${!outputBin}/nvvm/lib + INCLUDES =+ -I''${!outputBin}/nvvm/include + + # Expose cudart and the libcuda stubs + LIBRARIES =+ -L$static/lib" "-L${final.cuda_cudart.lib}/lib -L${final.cuda_cudart.lib}/lib/stubs + INCLUDES =+ -I${final.cuda_cudart.dev}/include + EOF + ''; + + propagatedBuildInputs = [ final.setupCudaHook ]; + + postInstall = + (oldAttrs.postInstall or "") + + '' + moveToOutput "nvvm" "''${!outputBin}" + ''; + + # The nvcc and cicc binaries contain hard-coded references to /usr + allowFHSReferences = true; + + meta = (oldAttrs.meta or { }) // { + mainProgram = "nvcc"; + }; + } + ); + + cuda_nvprof = prev.cuda_nvprof.overrideAttrs ( + prevAttrs: {buildInputs = prevAttrs.buildInputs ++ [final.cuda_cupti.lib];} + ); + + cuda_demo_suite = addBuildInputs prev.cuda_demo_suite [ + final.pkgs.freeglut + final.pkgs.libGLU + final.pkgs.libglvnd + final.pkgs.mesa + final.libcufft.lib + final.libcurand.lib + ]; + + nsight_compute = prev.nsight_compute.overrideAttrs ( + prevAttrs: { + nativeBuildInputs = + prevAttrs.nativeBuildInputs + ++ ( + if (strings.versionOlder prev.nsight_compute.version "2022.2.0") then + [final.pkgs.qt5.wrapQtAppsHook] + else + [final.pkgs.qt6.wrapQtAppsHook] + ); + buildInputs = + prevAttrs.buildInputs + ++ ( + if (strings.versionOlder prev.nsight_compute.version "2022.2.0") then + [final.pkgs.qt5.qtwebview] + else + [final.pkgs.qt6.qtwebview] + ); + } + ); + + nsight_systems = prev.nsight_systems.overrideAttrs ( + prevAttrs: { + nativeBuildInputs = prevAttrs.nativeBuildInputs ++ [final.pkgs.qt5.wrapQtAppsHook]; + buildInputs = prevAttrs.buildInputs ++ [ + final.pkgs.alsa-lib + final.pkgs.e2fsprogs + final.pkgs.nss + final.pkgs.numactl + final.pkgs.pulseaudio + final.pkgs.wayland + final.pkgs.xorg.libXcursor + final.pkgs.xorg.libXdamage + final.pkgs.xorg.libXrandr + final.pkgs.xorg.libXtst + ]; + } + ); + + nvidia_driver = prev.nvidia_driver.overrideAttrs { + # No need to support this package as we have drivers already + # in linuxPackages. + meta.broken = true; + }; +} diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix new file mode 100644 index 0000000000000..de216c24bb675 --- /dev/null +++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix @@ -0,0 +1,403 @@ +{ + cudaVersion, + runPatches ? [], + autoPatchelfHook, + autoAddOpenGLRunpathHook, + addOpenGLRunpath, + alsa-lib, + curlMinimal, + expat, + fetchurl, + fontconfig, + freetype, + gdk-pixbuf, + glib, + glibc, + gst_all_1, + gtk2, + lib, + libxkbcommon, + libkrb5, + krb5, + makeWrapper, + markForCudatoolkitRootHook, + ncurses5, + numactl, + nss, + patchelf, + perl, + python3, # FIXME: CUDAToolkit 10 may still need python27 + pulseaudio, + setupCudaHook, + stdenv, + backendStdenv, # E.g. gcc11Stdenv, set in extension.nix + unixODBC, + wayland, + xorg, + zlib, + freeglut, + libGLU, + libsForQt5, + libtiff, + qt6Packages, + qt6, + rdma-core, + ucx, + rsync, +}: + +let + # Version info for the classic cudatoolkit packages that contain everything that is in redist. + releases = builtins.import ./releases.nix; + release = releases.${cudaVersion}; +in + +backendStdenv.mkDerivation rec { + pname = "cudatoolkit"; + inherit (release) version; + inherit runPatches; + + dontPatchELF = true; + dontStrip = true; + + src = fetchurl {inherit (release) url sha256;}; + + outputs = [ + "out" + "lib" + "doc" + ]; + + nativeBuildInputs = + [ + perl + makeWrapper + rsync + addOpenGLRunpath + autoPatchelfHook + autoAddOpenGLRunpathHook + markForCudatoolkitRootHook + ] + ++ lib.optionals (lib.versionOlder version "11") [libsForQt5.wrapQtAppsHook] + ++ lib.optionals (lib.versionAtLeast version "11.8") [qt6Packages.wrapQtAppsHook]; + propagatedBuildInputs = [setupCudaHook]; + buildInputs = + lib.optionals (lib.versionOlder version "11") [ + libsForQt5.qt5.qtwebengine + freeglut + libGLU + ] + ++ [ + # To get $GDK_PIXBUF_MODULE_FILE via setup-hook + gdk-pixbuf + + # For autoPatchelf + ncurses5 + expat + python3 + zlib + glibc + xorg.libX11 + xorg.libXext + xorg.libXrender + xorg.libXt + xorg.libXtst + xorg.libXi + xorg.libXext + xorg.libXdamage + xorg.libxcb + xorg.xcbutilimage + xorg.xcbutilrenderutil + xorg.xcbutilwm + xorg.xcbutilkeysyms + pulseaudio + libxkbcommon + libkrb5 + krb5 + gtk2 + glib + fontconfig + freetype + numactl + nss + unixODBC + alsa-lib + wayland + ] + ++ lib.optionals (lib.versionAtLeast version "11.8") [ + (lib.getLib libtiff) + qt6Packages.qtwayland + rdma-core + (ucx.override {enableCuda = false;}) # Avoid infinite recursion + xorg.libxshmfence + xorg.libxkbfile + ] + ++ (lib.optionals (lib.versionAtLeast version "12") ( + map lib.getLib ([ + # Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for: + # - `libcurl.so.4` + curlMinimal + + # Used by `/host-linux-x64/Scripts/WebRTCContainer/setup/neko/server/bin/neko` + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ]) + ++ ( + with qt6; [ + qtmultimedia + qttools + qtpositioning + qtscxml + qtsvg + qtwebchannel + qtwebengine + ] + ) + )); + + # Prepended to runpaths by autoPatchelf. + # The order inherited from older rpath preFixup code + runtimeDependencies = [ + (placeholder "lib") + (placeholder "out") + "${placeholder "out"}/nvvm" + # NOTE: use the same libstdc++ as the rest of nixpkgs, not from backendStdenv + "${lib.getLib stdenv.cc.cc}/lib64" + "${placeholder "out"}/jre/lib/amd64/jli" + "${placeholder "out"}/lib64" + "${placeholder "out"}/nvvm/lib64" + ]; + + autoPatchelfIgnoreMissingDeps = [ + # This is the hardware-dependent userspace driver that comes from + # nvidia_x11 package. It must be deployed at runtime in + # /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather + # than pinned in runpath + "libcuda.so.1" + + # The krb5 expression ships libcom_err.so.3 but cudatoolkit asks for the + # older + # This dependency is asked for by target-linux-x64/CollectX/RedHat/x86_64/libssl.so.10 + # - do we even want to use nvidia-shipped libssl? + "libcom_err.so.2" + ]; + + preFixup = + if lib.versionOlder version "11" then + '' + ${lib.getExe' patchelf "patchelf"} $out/targets/*/lib/libnvrtc.so --add-needed libnvrtc-builtins.so + '' + else + '' + ${lib.getExe' patchelf "patchelf"} $out/lib64/libnvrtc.so --add-needed libnvrtc-builtins.so + ''; + + unpackPhase = '' + sh $src --keep --noexec + + ${lib.optionalString (lib.versionOlder version "10.1") '' + cd pkg/run_files + sh cuda-linux*.run --keep --noexec + sh cuda-samples*.run --keep --noexec + mv pkg ../../$(basename $src) + cd ../.. + rm -rf pkg + + for patch in $runPatches; do + sh $patch --keep --noexec + mv pkg $(basename $patch) + done + ''} + ''; + + installPhase = + '' + runHook preInstall + mkdir $out + ${lib.optionalString (lib.versionOlder version "10.1") '' + cd $(basename $src) + export PERL5LIB=. + perl ./install-linux.pl --prefix="$out" + cd .. + for patch in $runPatches; do + cd $(basename $patch) + perl ./install_patch.pl --silent --accept-eula --installdir="$out" + cd .. + done + ''} + ${lib.optionalString (lib.versionAtLeast version "10.1" && lib.versionOlder version "11") '' + cd pkg/builds/cuda-toolkit + mv * $out/ + ''} + ${lib.optionalString (lib.versionAtLeast version "11") '' + mkdir -p $out/bin $out/lib64 $out/include $doc + for dir in pkg/builds/* pkg/builds/cuda_nvcc/nvvm pkg/builds/cuda_cupti/extras/CUPTI; do + if [ -d $dir/bin ]; then + mv $dir/bin/* $out/bin + fi + if [ -d $dir/doc ]; then + (cd $dir/doc && find . -type d -exec mkdir -p $doc/\{} \;) + (cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $doc/\{} \;) + fi + if [ -L $dir/include ] || [ -d $dir/include ]; then + (cd $dir/include && find . -type d -exec mkdir -p $out/include/\{} \;) + (cd $dir/include && find . \( -type f -o -type l \) -exec mv \{} $out/include/\{} \;) + fi + if [ -L $dir/lib64 ] || [ -d $dir/lib64 ]; then + (cd $dir/lib64 && find . -type d -exec mkdir -p $out/lib64/\{} \;) + (cd $dir/lib64 && find . \( -type f -o -type l \) -exec mv \{} $out/lib64/\{} \;) + fi + done + mv pkg/builds/cuda_nvcc/nvvm $out/nvvm + + mv pkg/builds/cuda_sanitizer_api $out/cuda_sanitizer_api + ln -s $out/cuda_sanitizer_api/compute-sanitizer/compute-sanitizer $out/bin/compute-sanitizer + + mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64 + mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64 + rm $out/host-linux-x64/libstdc++.so* + ''} + ${ + lib.optionalString (lib.versionAtLeast version "11.8" && lib.versionOlder version "12") + # error: auto-patchelf could not satisfy dependency libtiff.so.5 wanted by /nix/store/.......-cudatoolkit-12.0.1/host-linux-x64/Plugins/imageformats/libqtiff.so + # we only ship libtiff.so.6, so let's use qt plugins built by Nix. + # TODO: don't copy, come up with a symlink-based "merge" + '' + rsync ${lib.getLib qt6Packages.qtimageformats}/lib/qt-6/plugins/ $out/host-linux-x64/Plugins/ -aP + '' + } + ${ + lib.optionalString (lib.versionAtLeast version "12") + # Use Qt plugins built by Nix. + '' + for qtlib in $out/host-linux-x64/Plugins/*/libq*.so; do + qtdir=$(basename $(dirname $qtlib)) + filename=$(basename $qtlib) + for qtpkgdir in ${lib.concatMapStringsSep " " (x: qt6Packages.${x}) ["qtbase" "qtimageformats" "qtsvg" "qtwayland"]}; do + if [ -e $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename ]; then + ln -snf $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename $qtlib + fi + done + done + '' + } + + rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? + + ${lib.optionalString (lib.versionOlder version "10.1") '' + # let's remove the 32-bit libraries, they confuse the lib64->lib mover + rm -rf $out/lib + ''} + + ${lib.optionalString (lib.versionAtLeast version "12.0") '' + rm $out/host-linux-x64/libQt6* + ''} + + # Remove some cruft. + ${lib.optionalString ((lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1")) + "rm $out/bin/uninstall*"} + + # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them) + if [ -d "$out"/cuda-samples ]; then + mv "$out"/cuda-samples "$out"/samples + fi + + # Change the #error on GCC > 4.9 to a #warning. + sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/' + + # Fix builds with newer glibc version + sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h" + '' + + + # Point NVCC at a compatible compiler + # CUDA_TOOLKIT_ROOT_DIR is legacy, + # Cf. https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables + '' + mkdir -p $out/nix-support + cat <<EOF >> $out/nix-support/setup-hook + cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out' + EOF + + # Move some libraries to the lib output so that programs that + # depend on them don't pull in this entire monstrosity. + mkdir -p $lib/lib + mv -v $out/lib64/libcudart* $lib/lib/ + + # Remove OpenCL libraries as they are provided by ocl-icd and driver. + rm -f $out/lib64/libOpenCL* + ${lib.optionalString (lib.versionAtLeast version "10.1" && (lib.versionOlder version "11")) '' + mv $out/lib64 $out/lib + mv $out/extras/CUPTI/lib64/libcupti* $out/lib + ''} + + # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set + wrapProgram $out/bin/nvprof \ + --prefix LD_LIBRARY_PATH : $out/lib + '' + + lib.optionalString (lib.versionOlder version "8.0") '' + # Hack to fix building against recent Glibc/GCC. + echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook + '' + # 11.8 includes a broken symlink, include/include, pointing to targets/x86_64-linux/include + + lib.optionalString (lib.versions.majorMinor version == "11.8") '' + rm $out/include/include + '' + + '' + runHook postInstall + ''; + + postInstall = '' + for b in nvvp ${lib.optionalString (lib.versionOlder version "11") "nsight"}; do + wrapProgram "$out/bin/$b" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + done + ${ + lib.optionalString (lib.versionAtLeast version "12") + # Check we don't have any lurking vendored qt libraries that weren't + # replaced during installPhase + '' + qtlibfiles=$(find $out -name "libq*.so" -type f) + if [ ! -z "$qtlibfiles" ]; then + echo "Found unexpected vendored Qt library files in $out" >&2 + echo $qtlibfiles >&2 + echo "These should be replaced with symlinks in installPhase" >&2 + exit 1 + fi + '' + } + ''; + + # cuda-gdb doesn't run correctly when not using sandboxing, so + # temporarily disabling the install check. This should be set to true + # when we figure out how to get `cuda-gdb --version` to run correctly + # when not using sandboxing. + doInstallCheck = false; + postInstallCheck = '' + # Smoke test binaries + pushd $out/bin + for f in *; do + case $f in + crt) continue;; + nvcc.profile) continue;; + nsight_ee_plugins_manage.sh) continue;; + uninstall_cuda_toolkit_6.5.pl) continue;; + computeprof|nvvp|nsight) continue;; # GUIs don't feature "--version" + *) echo "Executing '$f --version':"; ./$f --version;; + esac + done + popd + ''; + passthru = { + inherit (backendStdenv) cc; + majorMinorVersion = lib.versions.majorMinor version; + majorVersion = lib.versions.majorMinor version; + }; + + meta = with lib; { + description = "A compiler for NVIDIA GPUs, math libraries, and tools"; + homepage = "https://developer.nvidia.com/cuda-toolkit"; + platforms = ["x86_64-linux"]; + license = licenses.nvidiaCuda; + maintainers = teams.cuda.members; + }; +} diff --git a/pkgs/development/cuda-modules/cudatoolkit/releases.nix b/pkgs/development/cuda-modules/cudatoolkit/releases.nix new file mode 100644 index 0000000000000..b6828cc1f68c3 --- /dev/null +++ b/pkgs/development/cuda-modules/cudatoolkit/releases.nix @@ -0,0 +1,108 @@ +# Type Aliases +# CudaVersion = String (two-component version, e.g. "10.0") +# Release = { +# version: String +# - The version of CUDA. +# url: String +# - The URL to download the CUDA installer from. +# sha256: String +# - The SHA256 checksum of the CUDA installer. +# } +# Releases = AttrSet CudaVersion Release +{ + "10.0" = { + version = "10.0.130"; + url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux"; + sha256 = "16p3bv1lwmyqpxil8r951h385sy9asc578afrc7lssa68c71ydcj"; + }; + + "10.1" = { + version = "10.1.243"; + url = "https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run"; + sha256 = "0caxhlv2bdq863dfp6wj7nad66ml81vasq2ayf11psvq2b12vhp7"; + }; + + "10.2" = { + version = "10.2.89"; + url = "http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run"; + sha256 = "04fasl9sjkb1jvchvqgaqxprnprcz7a8r52249zp2ijarzyhf3an"; + }; + + "11.0" = { + version = "11.0.3"; + url = "https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run"; + sha256 = "1h4c69nfrgm09jzv8xjnjcvpq8n4gnlii17v3wzqry5d13jc8ydh"; + }; + + "11.1" = { + version = "11.1.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda_11.1.1_455.32.00_linux.run"; + sha256 = "13yxv2fgvdnqqbwh1zb80x4xhyfkbajfkwyfpdg9493010kngbiy"; + }; + + "11.2" = { + version = "11.2.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.2.1/local_installers/cuda_11.2.1_460.32.03_linux.run"; + sha256 = "sha256-HamMuJfMX1inRFpKZspPaSaGdwbLOvWKZpzc2Nw9F8g="; + }; + + "11.3" = { + version = "11.3.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.3.1/local_installers/cuda_11.3.1_465.19.01_linux.run"; + sha256 = "0d19pwcqin76scbw1s5kgj8n0z1p4v1hyfldqmamilyfxycfm4xd"; + }; + + "11.4" = { + version = "11.4.2"; + url = "https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run"; + sha256 = "sha256-u9h8oOkT+DdFSnljZ0c1E83e9VUILk2G7Zo4ZZzIHwo="; + }; + + "11.5" = { + version = "11.5.0"; + url = "https://developer.download.nvidia.com/compute/cuda/11.5.0/local_installers/cuda_11.5.0_495.29.05_linux.run"; + sha256 = "sha256-rgoWk9lJfPPYHmlIlD43lGNpANtxyY1Y7v2sr38aHkw="; + }; + + "11.6" = { + version = "11.6.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run"; + sha256 = "sha256-qyGa/OALdCABEyaYZvv/derQN7z8I1UagzjCaEyYTX4="; + }; + + "11.7" = { + version = "11.7.0"; + url = "https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda_11.7.0_515.43.04_linux.run"; + sha256 = "sha256-CH/fy7ofeVQ7H3jkOo39rF9tskLQQt3oIOFtwYWJLyY="; + }; + + "11.8" = { + version = "11.8.0"; + url = "https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux.run"; + sha256 = "sha256-kiPErzrr5Ke77Zq9mxY7A6GzS4VfvCtKDRtwasCaWhY="; + }; + + "12.0" = { + version = "12.0.1"; + url = "https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run"; + sha256 = "sha256-GyBaBicvFGP0dydv2rkD8/ZmkXwGjlIHOAAeacehh1s="; + }; + + "12.1" = { + version = "12.1.1"; + url = "https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_530.30.02_linux.run"; + sha256 = "sha256-10Ai1B2AEFMZ36Ib7qObd6W5kZU5wEh6BcqvJEbWpw4="; + }; + + "12.2" = { + version = "12.2.2"; + url = "https://developer.download.nvidia.com/compute/cuda/12.2.2/local_installers/cuda_12.2.2_535.104.05_linux.run"; + sha256 = "sha256-Kzmq4+dhjZ9Zo8j6HxvGHynAsODfdfsFB2uts1KVLvI="; + }; + + "12.3" = { + version = "12.3.0"; + url = "https://developer.download.nvidia.com/compute/cuda/12.3.0/local_installers/cuda_12.3.0_545.23.06_linux.run"; + sha256 = "sha256-fBP6zjr2TW4WSNbjEB0xyBEedHFDrLAHfZc8FpCCBCI="; + }; +} diff --git a/pkgs/development/cuda-modules/cudnn/fixup.nix b/pkgs/development/cuda-modules/cudnn/fixup.nix new file mode 100644 index 0000000000000..1fb5a6ad015e4 --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn/fixup.nix @@ -0,0 +1,69 @@ +{ + cudaVersion, + fetchurl, + final, + lib, + package, + patchelf, + zlib, + ... +}: +let + inherit (lib) + lists + maintainers + meta + strings + ; +in +finalAttrs: prevAttrs: { + src = fetchurl {inherit (package) url hash;}; + + # Useful for inspecting why something went wrong. + brokenConditions = + let + cudaTooOld = strings.versionOlder cudaVersion package.minCudaVersion; + cudaTooNew = + (package.maxCudaVersion != null) && strings.versionOlder package.maxCudaVersion cudaVersion; + in + prevAttrs.brokenConditions + // { + "CUDA version is too old" = cudaTooOld; + "CUDA version is too new" = cudaTooNew; + }; + + buildInputs = + prevAttrs.buildInputs + ++ [zlib] + ++ lists.optionals finalAttrs.passthru.useCudatoolkitRunfile [final.cudatoolkit] + ++ lists.optionals (!finalAttrs.passthru.useCudatoolkitRunfile) [final.libcublas.lib]; + + # Tell autoPatchelf about runtime dependencies. + # NOTE: Versions from CUDNN releases have four components. + postFixup = strings.optionalString (strings.versionAtLeast finalAttrs.version "8.0.5.0") '' + ${meta.getExe' patchelf "patchelf"} $lib/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so + ${meta.getExe' patchelf "patchelf"} $lib/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so + ''; + + passthru.useCudatoolkitRunfile = strings.versionOlder cudaVersion "11.3.999"; + + meta = prevAttrs.meta // { + homepage = "https://developer.nvidia.com/cudnn"; + maintainers = + prevAttrs.meta.maintainers + ++ ( + with maintainers; [ + mdaiter + samuela + connorbaker + ] + ); + license = { + shortName = "cuDNN EULA"; + fullName = "NVIDIA cuDNN Software License Agreement (EULA)"; + url = "https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html#supplement"; + free = false; + redistributable = !finalAttrs.passthru.useCudatoolkitRunfile; + }; + }; +} diff --git a/pkgs/development/cuda-modules/cudnn/releases.nix b/pkgs/development/cuda-modules/cudnn/releases.nix new file mode 100644 index 0000000000000..fe1f1f8d91e94 --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn/releases.nix @@ -0,0 +1,262 @@ +# NOTE: Check https://docs.nvidia.com/deeplearning/cudnn/archives/index.html for support matrices. +# Version policy is to keep the latest minor release for each major release. +{ + cudnn.releases = { + # jetson + linux-aarch64 = [ + { + version = "8.9.5.30"; + minCudaVersion = "12.0"; + maxCudaVersion = "12.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-aarch64/cudnn-linux-aarch64-8.9.5.30_cuda12-archive.tar.xz"; + hash = "sha256-BJH3sC9VwiB362eL8xTB+RdSS9UHz1tlgjm/mKRyM6E="; + } + ]; + # powerpc + linux-ppc64le = []; + # server-grade arm + linux-sbsa = [ + { + version = "8.4.1.50"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.7"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.4.1.50_cuda11.6-archive.tar.xz"; + hash = "sha256-CxufrFt4l04v2qp0hD2xj2Ns6PPZmdYv8qYVuZePw2A="; + } + { + version = "8.5.0.96"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.7"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.5.0.96_cuda11-archive.tar.xz"; + hash = "sha256-hngKu+zUY05zY/rR0ACuI7eQWl+Dg73b9zMsaTR5Hd4="; + } + { + version = "8.6.0.163"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.6.0.163_cuda11-archive.tar.xz"; + hash = "sha256-oCAieNPL1POtw/eBa/9gcWIcsEKwkDaYtHesrIkorAY="; + } + { + version = "8.7.0.84"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.7.0.84_cuda11-archive.tar.xz"; + hash = "sha256-z5Z/eNv2wHUkPMg6oYdZ43DbN1SqFbEqChTov2ejqdQ="; + } + { + version = "8.8.1.3"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.8.1.3_cuda11-archive.tar.xz"; + hash = "sha256-OzWq+aQkmIbZONmWSYyFoZzem3RldoXyJy7GVT6GM1k="; + } + { + version = "8.8.1.3"; + minCudaVersion = "12.0"; + maxCudaVersion = "12.0"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.8.1.3_cuda12-archive.tar.xz"; + hash = "sha256-njl3qhudBuuGC1gqyJM2MGdaAkMCnCWb/sW7VpmGfSA="; + } + { + version = "8.9.7.29"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.7.29_cuda11-archive.tar.xz"; + hash = "sha256-kcN8+0WPVBQZ6YUQ8TqvWXXAIyxhPhi3djhUkAdO6hc="; + } + { + version = "8.9.7.29"; + minCudaVersion = "12.0"; + maxCudaVersion = "12.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.7.29_cuda12-archive.tar.xz"; + hash = "sha256-6Yt8gAEHheXVygHuTOm1sMjHNYfqb4ZIvjTT+NHUe9E="; + } + ]; + # x86_64 + linux-x86_64 = [ + { + version = "7.4.2.24"; + minCudaVersion = "10.0"; + maxCudaVersion = "10.0"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.4.2/cudnn-10.0-linux-x64-v7.4.2.24.tgz"; + hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM="; + } + { + version = "7.6.5.32"; + minCudaVersion = "10.0"; + maxCudaVersion = "10.0"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.0-linux-x64-v7.6.5.32.tgz"; + hash = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro="; + } + { + version = "7.6.5.32"; + minCudaVersion = "10.1"; + maxCudaVersion = "10.1"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.1-linux-x64-v7.6.5.32.tgz"; + hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM="; + } + { + version = "7.6.5.32"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.2-linux-x64-v7.6.5.32.tgz"; + hash = "sha256-YAJn8squ0v1Y6yFLpmnY6jXzlqfRm5SCLms2+fcIjCA='"; + } + { + version = "8.0.5.39"; + minCudaVersion = "10.1"; + maxCudaVersion = "10.1"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.1-linux-x64-v8.0.5.39.tgz"; + hash = "sha256-kJCElSmIlrM6qVBjo0cfk8NmJ9esAcF9w211xl7qSgA="; + } + { + version = "8.0.5.39"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.2-linux-x64-v8.0.5.39.tgz"; + hash = "sha256-IfhMBcZ78eyFnnfDjM1b8VSWT6HDCPRJlZvkw1bjgvM="; + } + { + version = "8.0.5.39"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.0"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-11.0-linux-x64-v8.0.5.39.tgz"; + hash = "sha256-ThbueJXetKixwZS4ErpJWG730mkCBRQB03F1EYmKm3M="; + } + { + version = "8.0.5.39"; + minCudaVersion = "11.1"; + maxCudaVersion = "11.1"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-11.1-linux-x64-v8.0.5.39.tgz"; + hash = "sha256-HQRr+nk5navMb2yxUHkYdUQ5RC6gyp4Pvs3URvmwDM4="; + } + { + version = "8.1.1.33"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-10.2-linux-x64-v8.1.1.33.tgz"; + hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0="; + } + { + version = "8.1.1.33"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-11.2-linux-x64-v8.1.1.33.tgz"; + hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; + } + { + version = "8.2.4.15"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-10.2-linux-x64-v8.2.4.15.tgz"; + hash = "sha256-0jyUoxFaHHcRamwSfZF1+/WfcjNkN08mo0aZB18yIvE="; + } + { + version = "8.2.4.15"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.4"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-11.4-linux-x64-v8.2.4.15.tgz"; + hash = "sha256-Dl0t+JC5ln76ZhnaQhMQ2XMjVlp58FoajLm3Fluq0Nc="; + } + { + version = "8.3.3.40"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/10.2/cudnn-linux-x86_64-8.3.3.40_cuda10.2-archive.tar.xz"; + hash = "sha256-2FVPKzLmKV1fyPOsJeaPlAWLAYyAHaucFD42gS+JJqs="; + } + { + version = "8.3.3.40"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.6"; + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/11.5/cudnn-linux-x86_64-8.3.3.40_cuda11.5-archive.tar.xz"; + hash = "sha256-6r6Wx1zwPqT1N5iU2RTx+K4UzqsSGYnoSwg22Sf7dzE="; + } + { + version = "8.4.1.50"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda10.2-archive.tar.xz"; + hash = "sha256-I88qMmU6lIiLVmaPuX7TTbisgTav839mssxUo3lQNjg="; + } + { + version = "8.4.1.50"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.7"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz"; + hash = "sha256-7JbSN22B/KQr3T1MPXBambKaBlurV/kgVhx2PinGfQE="; + } + { + version = "8.5.0.96"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda10-archive.tar.xz"; + hash = "sha256-1mzhbbzR40WKkHnQLtJHhg0vYgf7G8a0OBcCwIOkJjM="; + } + { + version = "8.5.0.96"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.7"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda11-archive.tar.xz"; + hash = "sha256-VFSm/ZTwCHKMqumtrZk8ToXvNjAuJrzkO+p9RYpee20="; + } + { + version = "8.6.0.163"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda10-archive.tar.xz"; + hash = "sha256-t4sr/GrFqqdxu2VhaJQk5K1Xm/0lU4chXG8hVL09R9k="; + } + { + version = "8.6.0.163"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda11-archive.tar.xz"; + hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4="; + } + { + version = "8.7.0.84"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda10-archive.tar.xz"; + hash = "sha256-bZhaqc8+GbPV2FQvvbbufd8VnEJgvfkICc2N3/gitRg="; + } + { + version = "8.7.0.84"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda11-archive.tar.xz"; + hash = "sha256-l2xMunIzyXrnQAavq1Fyl2MAukD1slCiH4z3H1nJ920="; + } + { + version = "8.8.1.3"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.8.1.3_cuda11-archive.tar.xz"; + hash = "sha256-r3WEyuDMVSS1kT7wjCm6YVQRPGDrCjegWQqRtRWoqPk="; + } + { + version = "8.8.1.3"; + minCudaVersion = "12.0"; + maxCudaVersion = "12.0"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.8.1.3_cuda12-archive.tar.xz"; + hash = "sha256-edd6dpx+cXWrx7XC7VxJQUjAYYqGQThyLIh/lcYjd3w="; + } + { + version = "8.9.7.29"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.7.29_cuda11-archive.tar.xz"; + hash = "sha256-o+JQkCjOzaARfOWg9CEGNG6C6G05D0u5R1r8l2x3QC4="; + } + { + version = "8.9.7.29"; + minCudaVersion = "12.0"; + maxCudaVersion = "12.2"; + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.7.29_cuda12-archive.tar.xz"; + hash = "sha256-R1MzYlx+QqevPKCy91BqEG4wyTsaoAgc2cE++24h47s="; + } + ]; + }; +} diff --git a/pkgs/development/cuda-modules/cudnn/shims.nix b/pkgs/development/cuda-modules/cudnn/shims.nix new file mode 100644 index 0000000000000..e9eca8ef7c8b9 --- /dev/null +++ b/pkgs/development/cuda-modules/cudnn/shims.nix @@ -0,0 +1,13 @@ +# Shims to mimic the shape of ../modules/generic/manifests/{feature,redistrib}/release.nix +{package, redistArch}: +{ + featureRelease.${redistArch}.outputs = { + lib = true; + static = true; + dev = true; + }; + redistribRelease = { + name = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; + inherit (package) version; + }; +} diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix new file mode 100644 index 0000000000000..b762fd22ede88 --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/extension.nix @@ -0,0 +1,164 @@ +# Support matrix can be found at +# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html +# +# TODO(@connorbaker): +# This is a very similar strategy to CUDA/CUDNN: +# +# - Get all versions supported by the current release of CUDA +# - Build all of them +# - Make the newest the default +# +# Unique twists: +# +# - Instead of providing different releases for each version of CUDA, CuTensor has multiple subdirectories in `lib` +# -- one for each version of CUDA. +{ + cudaVersion, + flags, + hostPlatform, + lib, + mkVersionedPackageName, +}: +let + inherit (lib) + attrsets + lists + modules + versions + strings + trivial + ; + + redistName = "cutensor"; + pname = "libcutensor"; + + cutensorVersions = [ + "1.3.3" + "1.4.0" + "1.5.0" + "1.6.2" + "1.7.0" + ]; + + # Manifests :: { redistrib, feature } + + # Each release of cutensor gets mapped to an evaluated module for that release. + # From there, we can get the min/max CUDA versions supported by that release. + # listOfManifests :: List Manifests + listOfManifests = + let + configEvaluator = + fullCutensorVersion: + modules.evalModules { + modules = [ + ../modules + # We need to nest the manifests in a config.cutensor.manifests attribute so the + # module system can evaluate them. + { + cutensor.manifests = { + redistrib = trivial.importJSON (./manifests + "/redistrib_${fullCutensorVersion}.json"); + feature = trivial.importJSON (./manifests + "/feature_${fullCutensorVersion}.json"); + }; + } + ]; + }; + # Un-nest the manifests attribute set. + releaseGrabber = evaluatedModules: evaluatedModules.config.cutensor.manifests; + in + lists.map + (trivial.flip trivial.pipe [ + configEvaluator + releaseGrabber + ]) + cutensorVersions; + + # Our cudaVersion tells us which version of CUDA we're building against. + # The subdirectories in lib/ tell us which versions of CUDA are supported. + # Typically the names will look like this: + # + # - 10.2 + # - 11 + # - 11.0 + # - 12 + + # libPath :: String + libPath = + let + cudaMajorMinor = versions.majorMinor cudaVersion; + cudaMajor = versions.major cudaVersion; + in + if cudaMajorMinor == "10.2" then cudaMajorMinor else cudaMajor; + + # A release is supported if it has a libPath that matches our CUDA version for our platform. + # LibPath are not constant across the same release -- one platform may support fewer + # CUDA versions than another. + redistArch = flags.getRedistArch hostPlatform.system; + # platformIsSupported :: Manifests -> Boolean + platformIsSupported = + {feature, ...}: + (attrsets.attrByPath + [ + pname + redistArch + ] + null + feature + ) != null; + + # TODO(@connorbaker): With an auxilliary file keeping track of the CUDA versions each release supports, + # we could filter out releases that don't support our CUDA version. + # However, we don't have that currently, so we make a best-effort to try to build TensorRT with whatever + # libPath corresponds to our CUDA version. + # supportedManifests :: List Manifests + supportedManifests = builtins.filter platformIsSupported listOfManifests; + + # Compute versioned attribute name to be used in this package set + # Patch version changes should not break the build, so we only use major and minor + # computeName :: RedistribRelease -> String + computeName = {version, ...}: mkVersionedPackageName redistName version; +in +final: _: +let + # buildCutensorPackage :: Manifests -> AttrSet Derivation + buildCutensorPackage = + {redistrib, feature}: + let + drv = final.callPackage ../generic-builders/manifest.nix { + inherit pname redistName libPath; + redistribRelease = redistrib.${pname}; + featureRelease = feature.${pname}; + }; + fixedDrv = drv.overrideAttrs ( + prevAttrs: { + buildInputs = + prevAttrs.buildInputs + ++ lists.optionals (strings.versionOlder cudaVersion "11.4") [final.cudatoolkit] + ++ lists.optionals (strings.versionAtLeast cudaVersion "11.4") ( + [final.libcublas.lib] + # For some reason, the 1.4.x release of cuTENSOR requires the cudart library. + ++ lists.optionals (strings.hasPrefix "1.4" redistrib.${pname}.version) [final.cuda_cudart.lib] + ); + meta = prevAttrs.meta // { + description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives"; + homepage = "https://developer.nvidia.com/cutensor"; + maintainers = prevAttrs.meta.maintainers ++ [lib.maintainers.obsidian-systems-maintenance]; + license = lib.licenses.unfreeRedistributable // { + shortName = "cuTENSOR EULA"; + name = "cuTENSOR SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS"; + url = "https://docs.nvidia.com/cuda/cutensor/license.html"; + }; + }; + } + ); + in + attrsets.nameValuePair (computeName redistrib.${pname}) fixedDrv; + + extension = + let + nameOfNewest = computeName (lists.last supportedManifests).redistrib.${pname}; + drvs = builtins.listToAttrs (lists.map buildCutensorPackage supportedManifests); + containsDefault = attrsets.optionalAttrs (drvs != {}) {cutensor = drvs.${nameOfNewest};}; + in + drvs // containsDefault; +in +extension diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.3.3.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.3.3.json new file mode 100644 index 0000000000000..99679aecbc448 --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.3.3.json @@ -0,0 +1,44 @@ +{ + "libcutensor": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.4.0.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.4.0.json new file mode 100644 index 0000000000000..99679aecbc448 --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.4.0.json @@ -0,0 +1,44 @@ +{ + "libcutensor": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.5.0.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.5.0.json new file mode 100644 index 0000000000000..99679aecbc448 --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.5.0.json @@ -0,0 +1,44 @@ +{ + "libcutensor": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.6.2.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.6.2.json new file mode 100644 index 0000000000000..99679aecbc448 --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.6.2.json @@ -0,0 +1,44 @@ +{ + "libcutensor": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_1.7.0.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.7.0.json new file mode 100644 index 0000000000000..99679aecbc448 --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/manifests/feature_1.7.0.json @@ -0,0 +1,44 @@ +{ + "libcutensor": { + "linux-ppc64le": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-sbsa": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "linux-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": true, + "sample": false, + "static": true + } + }, + "windows-x86_64": { + "outputs": { + "bin": false, + "dev": true, + "doc": false, + "lib": false, + "sample": false, + "static": false + } + } + } +} diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.3.3.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.3.3.json new file mode 100644 index 0000000000000..ca12b8c92e980 --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.3.3.json @@ -0,0 +1,32 @@ +{ + "release_date": "2021-09-22", + "libcutensor": { + "name": "NVIDIA cuTENSOR", + "license": "cuTensor", + "version": "1.3.3.2", + "linux-x86_64": { + "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-1.3.3.2-archive.tar.xz", + "sha256": "2e9517f31305872a7e496b6aa8ea329acda6b947b0c1eb1250790eaa2d4e2ecc", + "md5": "977699555cfcc8d2ffeff018a0f975b0", + "size": "201849628" + }, + "linux-ppc64le": { + "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-1.3.3.2-archive.tar.xz", + "sha256": "79f294c4a7933e5acee5f150145c526d6cd4df16eefb63f2d65df1dbc683cd68", + "md5": "1f632c9d33ffef9c819e10c95d69a134", + "size": "202541908" + }, + "linux-sbsa": { + "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-1.3.3.2-archive.tar.xz", + "sha256": "0b62d5305abfdfca4776290f16a1796c78c1fa83b203680c012f37d44706fcdb", + "md5": "e476675490aff0b154f2f38063f0c10b", + "size": "149059520" + }, + "windows-x86_64": { + "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-1.3.3.2-archive.zip", + "sha256": "3abeacbe7085af7026ca1399a77c681c219c10a1448a062964e97aaac2b05851", + "md5": "fe75f031c53260c00ad5f7c5d69d31e5", + "size": "374926147" + } + } +} diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.4.0.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.4.0.json new file mode 100644 index 0000000000000..45008c2d0af9f --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.4.0.json @@ -0,0 +1,32 @@ +{ + "release_date": "2021-11-19", + "libcutensor": { + "name": "NVIDIA cuTENSOR", + "license": "cuTensor", + "version": "1.4.0.6", + "linux-x86_64": { + "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-1.4.0.6-archive.tar.xz", + "sha256": "467ba189195fcc4b868334fc16a0ae1e51574139605975cc8004cedebf595964", + "md5": "5d4009390be0226fc3ee75d225053123", + "size": "218277136" + }, + "linux-ppc64le": { + "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-1.4.0.6-archive.tar.xz", + "sha256": "5da44ff2562ab7b9286122653e54f28d2222c8aab4bb02e9bdd4cf7e4b7809be", + "md5": "6058c728485072c980f652c2de38b016", + "size": "218951992" + }, + "linux-sbsa": { + "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-1.4.0.6-archive.tar.xz", + "sha256": "6b06d63a5bc49c1660be8c307795f8a901c93dcde7b064455a6c81333c7327f4", + "md5": "a6f3fd515c052df43fbee9508ea87e1e", + "size": "163596044" + }, + "windows-x86_64": { + "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-1.4.0.6-archive.zip", + "sha256": "4f01a8aac2c25177e928c63381a80e3342f214ec86ad66965dcbfe81fc5c901d", + "md5": "d21e0d5f2bd8c29251ffacaa85f0d733", + "size": "431385567" + } + } +} diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.5.0.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.5.0.json new file mode 100644 index 0000000000000..fe1852f261f2b --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.5.0.json @@ -0,0 +1,32 @@ +{ + "release_date": "2022-03-08", + "libcutensor": { + "name": "NVIDIA cuTENSOR", + "license": "cuTensor", + "version": "1.5.0.3", + "linux-x86_64": { + "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-1.5.0.3-archive.tar.xz", + "sha256": "4fdebe94f0ba3933a422cff3dd05a0ef7a18552ca274dd12564056993f55471d", + "md5": "7e1b1a613b819d6cf6ee7fbc70f16105", + "size": "208925360" + }, + "linux-ppc64le": { + "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-1.5.0.3-archive.tar.xz", + "sha256": "ad736acc94e88673b04a3156d7d3a408937cac32d083acdfbd8435582cbe15db", + "md5": "bcdafb6d493aceebfb9a420880f1486c", + "size": "208384668" + }, + "linux-sbsa": { + "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-1.5.0.3-archive.tar.xz", + "sha256": "5b9ac479b1dadaf40464ff3076e45f2ec92581c07df1258a155b5bcd142f6090", + "md5": "62149d726480d12c9a953d27edc208dc", + "size": "156512748" + }, + "windows-x86_64": { + "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-1.5.0.3-archive.zip", + "sha256": "de76f7d92600dda87a14ac756e9d0b5733cbceb88bcd20b3935a82c99342e6cd", + "md5": "66feef08de8c7fccf7269383e663fd06", + "size": "421810766" + } + } +} diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.6.2.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.6.2.json new file mode 100644 index 0000000000000..95b3706fc56f7 --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.6.2.json @@ -0,0 +1,32 @@ +{ + "release_date": "2022-12-12", + "libcutensor": { + "name": "NVIDIA cuTENSOR", + "license": "cuTensor", + "version": "1.6.2.3", + "linux-x86_64": { + "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-1.6.2.3-archive.tar.xz", + "sha256": "0f2745681b1d0556f9f46ff6af4937662793498d7367b5f8f6b8625ac051629e", + "md5": "b84a2f6712e39314f6c54b429152339f", + "size": "538838404" + }, + "linux-ppc64le": { + "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-1.6.2.3-archive.tar.xz", + "sha256": "558329fa05409f914ebbe218a1cf7c9ccffdb7aa2642b96db85fd78b5ad534d1", + "md5": "8d5d129aa7863312a95084ab5a27b7e7", + "size": "535585612" + }, + "linux-sbsa": { + "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-1.6.2.3-archive.tar.xz", + "sha256": "7d4d9088c892bb692ffd70750b49625d1ccbb85390f6eb7c70d6cf582df6d935", + "md5": "f6e0cce3a3b38ced736e55a19da587a3", + "size": "450705724" + }, + "windows-x86_64": { + "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-1.6.2.3-archive.zip", + "sha256": "07cb312d7cafc7bb2f33d775e1ef5fffd1703d5c6656e785a7a8f0f01939907e", + "md5": "5ae1c56bf4d457933dc1acb58a4ac995", + "size": "1063805254" + } + } +} diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.7.0.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.7.0.json new file mode 100644 index 0000000000000..f09abaa62940d --- /dev/null +++ b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_1.7.0.json @@ -0,0 +1,32 @@ +{ + "release_date": "2023-03-16", + "libcutensor": { + "name": "NVIDIA cuTENSOR", + "license": "cuTensor", + "version": "1.7.0.1", + "linux-x86_64": { + "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-1.7.0.1-archive.tar.xz", + "sha256": "dd3557891371a19e73e7c955efe5383b0bee954aba6a30e4892b0e7acb9deb26", + "md5": "7c7e655e2ef1c57ede351f5f5c7c59be", + "size": "542970468" + }, + "linux-ppc64le": { + "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-1.7.0.1-archive.tar.xz", + "sha256": "af4ad5e29dcb636f1bf941ed1fd7fc8053eeec4813fbc0b41581e114438e84c8", + "md5": "30739decf9f5267f2a5f28c7c1a1dc3d", + "size": "538487672" + }, + "linux-sbsa": { + "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-1.7.0.1-archive.tar.xz", + "sha256": "c31f8e4386539434a5d1643ebfed74572011783b4e21b62be52003e3a9de3720", + "md5": "3185c17e8f32c9c54f591006b917365e", + "size": "454324456" + }, + "windows-x86_64": { + "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-1.7.0.1-archive.zip", + "sha256": "cdbb53bcc1c7b20ee0aa2dee781644a324d2d5e8065944039024fe22d6b822ab", + "md5": "7d20a5823e94074e273525b0713f812b", + "size": "1070143817" + } + } +} diff --git a/pkgs/development/cuda-modules/flags.nix b/pkgs/development/cuda-modules/flags.nix new file mode 100644 index 0000000000000..a123c7bce5a16 --- /dev/null +++ b/pkgs/development/cuda-modules/flags.nix @@ -0,0 +1,391 @@ +# Type aliases +# Gpu :: AttrSet +# - See the documentation in ./gpus.nix. +{ + config, + cudaCapabilities ? (config.cudaCapabilities or []), + cudaForwardCompat ? (config.cudaForwardCompat or true), + lib, + cudaVersion, + hostPlatform, + # gpus :: List Gpu + gpus, +}: +let + inherit (lib) + asserts + attrsets + lists + strings + trivial + ; + + # Flags are determined based on your CUDA toolkit by default. You may benefit + # from improved performance, reduced file size, or greater hardware support by + # passing a configuration based on your specific GPU environment. + # + # cudaCapabilities :: List Capability + # List of hardware generations to build. + # E.g. [ "8.0" ] + # Currently, the last item is considered the optional forward-compatibility arch, + # but this may change in the future. + # + # cudaForwardCompat :: Bool + # Whether to include the forward compatibility gencode (+PTX) + # to support future GPU generations. + # E.g. true + # + # Please see the accompanying documentation or https://github.com/NixOS/nixpkgs/pull/205351 + + # isSupported :: Gpu -> Bool + isSupported = + gpu: + let + inherit (gpu) minCudaVersion maxCudaVersion; + lowerBoundSatisfied = strings.versionAtLeast cudaVersion minCudaVersion; + upperBoundSatisfied = + (maxCudaVersion == null) || !(strings.versionOlder maxCudaVersion cudaVersion); + in + lowerBoundSatisfied && upperBoundSatisfied; + + # NOTE: Jetson is never built by default. + # isDefault :: Gpu -> Bool + isDefault = + gpu: + let + inherit (gpu) dontDefaultAfter isJetson; + newGpu = dontDefaultAfter == null; + recentGpu = newGpu || strings.versionAtLeast dontDefaultAfter cudaVersion; + in + recentGpu && !isJetson; + + # supportedGpus :: List Gpu + # GPUs which are supported by the provided CUDA version. + supportedGpus = builtins.filter isSupported gpus; + + # defaultGpus :: List Gpu + # GPUs which are supported by the provided CUDA version and we want to build for by default. + defaultGpus = builtins.filter isDefault supportedGpus; + + # supportedCapabilities :: List Capability + supportedCapabilities = lists.map (gpu: gpu.computeCapability) supportedGpus; + + # defaultCapabilities :: List Capability + # The default capabilities to target, if not overridden by the user. + defaultCapabilities = lists.map (gpu: gpu.computeCapability) defaultGpus; + + # cudaArchNameToVersions :: AttrSet String (List String) + # Maps the name of a GPU architecture to different versions of that architecture. + # For example, "Ampere" maps to [ "8.0" "8.6" "8.7" ]. + cudaArchNameToVersions = + lists.groupBy' (versions: gpu: versions ++ [gpu.computeCapability]) [] (gpu: gpu.archName) + supportedGpus; + + # cudaComputeCapabilityToName :: AttrSet String String + # Maps the version of a GPU architecture to the name of that architecture. + # For example, "8.0" maps to "Ampere". + cudaComputeCapabilityToName = builtins.listToAttrs ( + lists.map (gpu: attrsets.nameValuePair gpu.computeCapability gpu.archName) supportedGpus + ); + + # cudaComputeCapabilityToIsJetson :: AttrSet String Boolean + cudaComputeCapabilityToIsJetson = builtins.listToAttrs ( + lists.map (attrs: attrsets.nameValuePair attrs.computeCapability attrs.isJetson) supportedGpus + ); + + # jetsonComputeCapabilities :: List String + jetsonComputeCapabilities = trivial.pipe cudaComputeCapabilityToIsJetson [ + (attrsets.filterAttrs (_: isJetson: isJetson)) + builtins.attrNames + ]; + + # Find the intersection with the user-specified list of cudaCapabilities. + # NOTE: Jetson devices are never built by default because they cannot be targeted along with + # non-Jetson devices and require an aarch64 host platform. As such, if they're present anywhere, + # they must be in the user-specified cudaCapabilities. + # NOTE: We don't need to worry about mixes of Jetson and non-Jetson devices here -- there's + # sanity-checking for all that in below. + jetsonTargets = lists.intersectLists jetsonComputeCapabilities cudaCapabilities; + + # dropDot :: String -> String + dropDot = ver: builtins.replaceStrings ["."] [""] ver; + + # archMapper :: String -> List String -> List String + # Maps a feature across a list of architecture versions to produce a list of architectures. + # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "sm_80" "sm_86" "sm_87" ]. + archMapper = feat: lists.map (computeCapability: "${feat}_${dropDot computeCapability}"); + + # gencodeMapper :: String -> List String -> List String + # Maps a feature across a list of architecture versions to produce a list of gencode arguments. + # For example, "sm" and [ "8.0" "8.6" "8.7" ] produces [ "-gencode=arch=compute_80,code=sm_80" + # "-gencode=arch=compute_86,code=sm_86" "-gencode=arch=compute_87,code=sm_87" ]. + gencodeMapper = + feat: + lists.map ( + computeCapability: + "-gencode=arch=compute_${dropDot computeCapability},code=${feat}_${dropDot computeCapability}" + ); + + # Maps Nix system to NVIDIA redist arch. + # NOTE: We swap out the default `linux-sbsa` redist (for server-grade ARM chips) with the + # `linux-aarch64` redist (which is for Jetson devices) if we're building any Jetson devices. + # Since both are based on aarch64, we can only have one or the other, otherwise there's an + # ambiguity as to which should be used. + # getRedistArch :: String -> String + getRedistArch = + nixSystem: + if nixSystem == "aarch64-linux" then + if jetsonTargets != [] then "linux-aarch64" else "linux-sbsa" + else if nixSystem == "x86_64-linux" then + "linux-x86_64" + else if nixSystem == "ppc64le-linux" then + "linux-ppc64le" + else if nixSystem == "x86_64-windows" then + "windows-x86_64" + else + "unsupported"; + + # Maps NVIDIA redist arch to Nix system. + # It is imperative that we include the boolean condition based on jetsonTargets to ensure + # we don't advertise availability of packages only available on server-grade ARM + # as being available for the Jetson, since both `linux-sbsa` and `linux-aarch64` are + # mapped to the Nix system `aarch64-linux`. + getNixSystem = + redistArch: + if redistArch == "linux-sbsa" && jetsonTargets == [] then + "aarch64-linux" + else if redistArch == "linux-aarch64" && jetsonTargets != [] then + "aarch64-linux" + else if redistArch == "linux-x86_64" then + "x86_64-linux" + else if redistArch == "linux-ppc64le" then + "ppc64le-linux" + else if redistArch == "windows-x86_64" then + "x86_64-windows" + else + "unsupported-${redistArch}"; + + formatCapabilities = + { + cudaCapabilities, + enableForwardCompat ? true, + }: + rec { + inherit cudaCapabilities enableForwardCompat; + + # archNames :: List String + # E.g. [ "Turing" "Ampere" ] + # + # Unknown architectures are rendered as sm_XX gencode flags. + archNames = lists.unique ( + lists.map (cap: cudaComputeCapabilityToName.${cap} or "sm_${dropDot cap}") cudaCapabilities + ); + + # realArches :: List String + # The real architectures are physical architectures supported by the CUDA version. + # E.g. [ "sm_75" "sm_86" ] + realArches = archMapper "sm" cudaCapabilities; + + # virtualArches :: List String + # The virtual architectures are typically used for forward compatibility, when trying to support + # an architecture newer than the CUDA version allows. + # E.g. [ "compute_75" "compute_86" ] + virtualArches = archMapper "compute" cudaCapabilities; + + # arches :: List String + # By default, build for all supported architectures and forward compatibility via a virtual + # architecture for the newest supported architecture. + # E.g. [ "sm_75" "sm_86" "compute_86" ] + arches = realArches ++ lists.optional enableForwardCompat (lists.last virtualArches); + + # gencode :: List String + # A list of CUDA gencode arguments to pass to NVCC. + # E.g. [ "-gencode=arch=compute_75,code=sm_75" ... "-gencode=arch=compute_86,code=compute_86" ] + gencode = + let + base = gencodeMapper "sm" cudaCapabilities; + forward = gencodeMapper "compute" [(lists.last cudaCapabilities)]; + in + base ++ lib.optionals enableForwardCompat forward; + + # gencodeString :: String + # A space-separated string of CUDA gencode arguments to pass to NVCC. + # E.g. "-gencode=arch=compute_75,code=sm_75 ... -gencode=arch=compute_86,code=compute_86" + gencodeString = strings.concatStringsSep " " gencode; + + # Jetson devices cannot be targeted by the same binaries which target non-Jetson devices. While + # NVIDIA provides both `linux-aarch64` and `linux-sbsa` packages, which both target `aarch64`, + # they are built with different settings and cannot be mixed. + # isJetsonBuild :: Boolean + isJetsonBuild = + let + requestedJetsonDevices = + lists.filter (cap: cudaComputeCapabilityToIsJetson.${cap} or false) + cudaCapabilities; + requestedNonJetsonDevices = + lists.filter (cap: !(builtins.elem cap requestedJetsonDevices)) + cudaCapabilities; + jetsonBuildSufficientCondition = requestedJetsonDevices != []; + jetsonBuildNecessaryCondition = requestedNonJetsonDevices == [] && hostPlatform.isAarch64; + in + trivial.throwIf (jetsonBuildSufficientCondition && !jetsonBuildNecessaryCondition) + '' + Jetson devices cannot be targeted with non-Jetson devices. Additionally, they require hostPlatform to be aarch64. + You requested ${builtins.toJSON cudaCapabilities} for host platform ${hostPlatform.system}. + Requested Jetson devices: ${builtins.toJSON requestedJetsonDevices}. + Requested non-Jetson devices: ${builtins.toJSON requestedNonJetsonDevices}. + Exactly one of the following must be true: + - All CUDA capabilities belong to Jetson devices and hostPlatform is aarch64. + - No CUDA capabilities belong to Jetson devices. + See ${./gpus.nix} for a list of architectures supported by this version of Nixpkgs. + '' + jetsonBuildSufficientCondition + && jetsonBuildNecessaryCondition; + }; +in +# When changing names or formats: pause, validate, and update the assert +assert let + expected = { + cudaCapabilities = [ + "7.5" + "8.6" + ]; + enableForwardCompat = true; + + archNames = [ + "Turing" + "Ampere" + ]; + realArches = [ + "sm_75" + "sm_86" + ]; + virtualArches = [ + "compute_75" + "compute_86" + ]; + arches = [ + "sm_75" + "sm_86" + "compute_86" + ]; + + gencode = [ + "-gencode=arch=compute_75,code=sm_75" + "-gencode=arch=compute_86,code=sm_86" + "-gencode=arch=compute_86,code=compute_86" + ]; + gencodeString = "-gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86"; + + isJetsonBuild = false; + }; + actual = formatCapabilities { + cudaCapabilities = [ + "7.5" + "8.6" + ]; + }; + actualWrapped = (builtins.tryEval (builtins.deepSeq actual actual)).value; +in +asserts.assertMsg ((strings.versionAtLeast cudaVersion "11.2") -> (expected == actualWrapped)) '' + This test should only fail when using a version of CUDA older than 11.2, the first to support + 8.6. + Expected: ${builtins.toJSON expected} + Actual: ${builtins.toJSON actualWrapped} +''; +# Check mixed Jetson and non-Jetson devices +assert let + expected = false; + actual = formatCapabilities { + cudaCapabilities = [ + "7.2" + "7.5" + ]; + }; + actualWrapped = (builtins.tryEval (builtins.deepSeq actual actual)).value; +in +asserts.assertMsg (expected == actualWrapped) '' + Jetson devices capabilities cannot be mixed with non-jetson devices. + Capability 7.5 is non-Jetson and should not be allowed with Jetson 7.2. + Expected: ${builtins.toJSON expected} + Actual: ${builtins.toJSON actualWrapped} +''; +# Check Jetson-only +assert let + expected = { + cudaCapabilities = [ + "6.2" + "7.2" + ]; + enableForwardCompat = true; + + archNames = [ + "Pascal" + "Volta" + ]; + realArches = [ + "sm_62" + "sm_72" + ]; + virtualArches = [ + "compute_62" + "compute_72" + ]; + arches = [ + "sm_62" + "sm_72" + "compute_72" + ]; + + gencode = [ + "-gencode=arch=compute_62,code=sm_62" + "-gencode=arch=compute_72,code=sm_72" + "-gencode=arch=compute_72,code=compute_72" + ]; + gencodeString = "-gencode=arch=compute_62,code=sm_62 -gencode=arch=compute_72,code=sm_72 -gencode=arch=compute_72,code=compute_72"; + + isJetsonBuild = true; + }; + actual = formatCapabilities { + cudaCapabilities = [ + "6.2" + "7.2" + ]; + }; + actualWrapped = (builtins.tryEval (builtins.deepSeq actual actual)).value; +in +asserts.assertMsg + # We can't do this test unless we're targeting aarch64 + (hostPlatform.isAarch64 -> (expected == actualWrapped)) + '' + Jetson devices can only be built with other Jetson devices. + Both 6.2 and 7.2 are Jetson devices. + Expected: ${builtins.toJSON expected} + Actual: ${builtins.toJSON actualWrapped} + ''; +{ + # formatCapabilities :: { cudaCapabilities: List Capability, enableForwardCompat: Boolean } -> { ... } + inherit formatCapabilities; + + # cudaArchNameToVersions :: String => String + inherit cudaArchNameToVersions; + + # cudaComputeCapabilityToName :: String => String + inherit cudaComputeCapabilityToName; + + # dropDot :: String -> String + inherit dropDot; + + inherit + defaultCapabilities + supportedCapabilities + jetsonComputeCapabilities + jetsonTargets + getNixSystem + getRedistArch + ; +} +// formatCapabilities { + cudaCapabilities = if cudaCapabilities == [] then defaultCapabilities else cudaCapabilities; + enableForwardCompat = cudaForwardCompat; +} diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix new file mode 100644 index 0000000000000..5a4c5280d7dbd --- /dev/null +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -0,0 +1,305 @@ +{ + # General callPackage-supplied arguments + autoAddOpenGLRunpathHook, + autoAddCudaCompatRunpathHook, + autoPatchelfHook, + backendStdenv, + fetchurl, + lib, + lndir, + markForCudatoolkitRootHook, + flags, + stdenv, + hostPlatform, + # Builder-specific arguments + # Short package name (e.g., "cuda_cccl") + # pname : String + pname, + # Common name (e.g., "cutensor" or "cudnn") -- used in the URL. + # Also known as the Redistributable Name. + # redistName : String, + redistName, + # If libPath is non-null, it must be a subdirectory of `lib`. + # The contents of `libPath` will be moved to the root of `lib`. + libPath ? null, + # See ./modules/generic/manifests/redistrib/release.nix + redistribRelease, + # See ./modules/generic/manifests/feature/release.nix + featureRelease, +}: +let + inherit (lib) + attrsets + lists + meta + strings + trivial + licenses + teams + sourceTypes + ; + + # Get the redist architectures for which package provides distributables. + # These are used by meta.platforms. + supportedRedistArchs = builtins.attrNames featureRelease; + redistArch = flags.getRedistArch hostPlatform.system; +in +backendStdenv.mkDerivation ( + finalAttrs: { + # NOTE: Even though there's no actual buildPhase going on here, the derivations of the + # redistributables are sensitive to the compiler flags provided to stdenv. The patchelf package + # is sensitive to the compiler flags provided to stdenv, and we depend on it. As such, we are + # also sensitive to the compiler flags provided to stdenv. + inherit pname; + inherit (redistribRelease) version; + + # Don't force serialization to string for structured attributes, like outputToPatterns + # and brokenConditions. + # Avoids "set cannot be coerced to string" errors. + __structuredAttrs = true; + + # Keep better track of dependencies. + strictDeps = true; + + # NOTE: Outputs are evaluated jointly with meta, so in the case that this is an unsupported platform, + # we still need to provide a list of outputs. + outputs = + let + # Checks whether the redistributable provides an output. + hasOutput = + output: + attrsets.attrByPath + [ + redistArch + "outputs" + output + ] + false + featureRelease; + # Order is important here so we use a list. + possibleOutputs = [ + "bin" + "lib" + "static" + "dev" + "doc" + "sample" + "python" + ]; + additionalOutputs = + if redistArch == "unsupported" then possibleOutputs else builtins.filter hasOutput possibleOutputs; + # The out output is special -- it's the default output and we always include it. + outputs = [ "out" ] ++ additionalOutputs; + in + outputs; + + # Traversed in the order of the outputs speficied in outputs; + # entries are skipped if they don't exist in outputs. + outputToPatterns = { + bin = [ "bin" ]; + dev = [ + "share/pkg-config" + "**/*.pc" + "**/*.cmake" + ]; + lib = [ + "lib" + "lib64" + ]; + static = ["**/*.a"]; + sample = ["samples"]; + python = ["**/*.whl"]; + }; + + # Useful for introspecting why something went wrong. + # Maps descriptions of why the derivation would be marked broken to + # booleans indicating whether that description is true. + brokenConditions = {}; + + src = fetchurl { + url = + if (builtins.hasAttr redistArch redistribRelease) then + "https://developer.download.nvidia.com/compute/${redistName}/redist/${ + redistribRelease.${redistArch}.relative_path + }" + else + "cannot-construct-an-url-for-the-${redistArch}-platform"; + sha256 = redistribRelease.${redistArch}.sha256 or lib.fakeHash; + }; + + postPatch = '' + if [[ -d pkg-config ]] ; then + mkdir -p share/pkg-config + mv pkg-config/* share/pkg-config/ + rmdir pkg-config + fi + + for pc in share/pkg-config/*.pc ; do + sed -i \ + -e "s|^cudaroot\s*=.*\$|cudaroot=''${!outputDev}|" \ + -e "s|^libdir\s*=.*/lib\$|libdir=''${!outputLib}/lib|" \ + -e "s|^includedir\s*=.*/include\$|includedir=''${!outputDev}/include|" \ + "$pc" + done + ''; + + # We do need some other phases, like configurePhase, so the multiple-output setup hook works. + dontBuild = true; + + nativeBuildInputs = [ + autoPatchelfHook + # This hook will make sure libcuda can be found + # in typically /lib/opengl-driver by adding that + # directory to the rpath of all ELF binaries. + # Check e.g. with `patchelf --print-rpath path/to/my/binary + autoAddOpenGLRunpathHook + markForCudatoolkitRootHook + ] + # autoAddCudaCompatRunpathHook depends on cuda_compat and would cause + # infinite recursion if applied to `cuda_compat` itself (beside the fact + # that it doesn't make sense in the first place) + ++ lib.optionals (pname != "cuda_compat" && flags.isJetsonBuild) [ + # autoAddCudaCompatRunpathHook must appear AFTER autoAddOpenGLRunpathHook. + # See its documentation in ./setup-hooks/extension.nix. + autoAddCudaCompatRunpathHook + ]; + + buildInputs = + [ + # autoPatchelfHook will search for a libstdc++ and we're giving it + # one that is compatible with the rest of nixpkgs, even when + # nvcc forces us to use an older gcc + # NB: We don't actually know if this is the right thing to do + stdenv.cc.cc.lib + ]; + + # Picked up by autoPatchelf + # Needed e.g. for libnvrtc to locate (dlopen) libnvrtc-builtins + appendRunpaths = ["$ORIGIN"]; + + # NOTE: We don't need to check for dev or doc, because those outputs are handled by + # the multiple-outputs setup hook. + # NOTE: moveToOutput operates on all outputs: + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107 + installPhase = + let + mkMoveToOutputCommand = + output: + let + template = pattern: ''moveToOutput "${pattern}" "${"$" + output}"''; + patterns = finalAttrs.outputToPatterns.${output} or []; + in + strings.concatMapStringsSep "\n" template patterns; + in + # Pre-install hook + '' + runHook preInstall + '' + # Handle the existence of libPath, which requires us to re-arrange the lib directory + + strings.optionalString (libPath != null) '' + full_lib_path="lib/${libPath}" + if [[ ! -d "$full_lib_path" ]] ; then + echo "${finalAttrs.pname}: '$full_lib_path' does not exist, only found:" >&2 + find lib/ -mindepth 1 -maxdepth 1 >&2 + echo "This release might not support your CUDA version" >&2 + exit 1 + fi + echo "Making libPath '$full_lib_path' the root of lib" >&2 + mv "$full_lib_path" lib_new + rm -r lib + mv lib_new lib + '' + # Create the primary output, out, and move the other outputs into it. + + '' + mkdir -p "$out" + mv * "$out" + '' + # Move the outputs into their respective outputs. + + strings.concatMapStringsSep "\n" mkMoveToOutputCommand (builtins.tail finalAttrs.outputs) + # Add a newline to the end of the installPhase, so that the post-install hook doesn't + # get concatenated with the last moveToOutput command. + + "\n" + # Post-install hook + + '' + runHook postInstall + ''; + + doInstallCheck = true; + allowFHSReferences = true; # TODO: Default to `false` + postInstallCheck = '' + echo "Executing postInstallCheck" + + if [[ -z "''${allowFHSReferences-}" ]] ; then + mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "''${!o}"; done) + if grep --max-count=5 --recursive --exclude=LICENSE /usr/ "''${outputPaths[@]}" ; then + echo "Detected references to /usr" >&2 + exit 1 + fi + fi + ''; + + # libcuda needs to be resolved during runtime + # NOTE: Due to the use of __structuredAttrs, we can't use a list for autoPatchelfIgnoreMissingDeps, since it + # will take only the first value. Instead, we produce a string with the values separated by spaces. + # Using the `env` attribute ensures that the value is representable as one of the primitives allowed by + # bash's environment variables. + env.autoPatchelfIgnoreMissingDeps = "libcuda.so libcuda.so.*"; + + # The out output leverages the same functionality which backs the `symlinkJoin` function in + # Nixpkgs: + # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510 + # + # That should allow us to emulate "fat" default outputs without having to actually create them. + # + # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency. + postPhases = ["postPatchelf"]; + + # For each output, create a symlink to it in the out output. + # NOTE: We must recreate the out output here, because the setup hook will have deleted it if it was empty. + postPatchelf = '' + mkdir -p "$out" + for output in $(getAllOutputNames); do + if [[ "$output" != "out" ]]; then + ${meta.getExe lndir} "''${!output}" "$out" + fi + done + ''; + + # Make the CUDA-patched stdenv available + passthru.stdenv = backendStdenv; + + # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs + # from depending on `out` by default. + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196 + # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs. + propagatedBuildOutputs = false; + + # By default, if the dev output exists it just uses that. + # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or + # anything of the sort. To remedy this, we set outputSpecified to true, and use + # outputsToInstall, which tells Nix which outputs to use when the package name is used + # unqualified (that is, without an explicit output). + outputSpecified = true; + + meta = { + description = "${redistribRelease.name}. By downloading and using the packages you accept the terms and conditions of the ${finalAttrs.meta.license.shortName}"; + sourceProvenance = [sourceTypes.binaryNativeCode]; + platforms = + lists.concatMap + ( + redistArch: + let + nixSystem = flags.getNixSystem redistArch; + in + lists.optionals (!(strings.hasPrefix "unsupported-" nixSystem)) [ nixSystem ] + ) + supportedRedistArchs; + broken = lists.any trivial.id (attrsets.attrValues finalAttrs.brokenConditions); + license = licenses.unfree; + maintainers = teams.cuda.members; + # Force the use of the default, fat output by default (even though `dev` exists, which + # causes Nix to prefer that output over the others if outputSpecified isn't set). + outputsToInstall = ["out"]; + }; + } +) diff --git a/pkgs/development/cuda-modules/generic-builders/multiplex.nix b/pkgs/development/cuda-modules/generic-builders/multiplex.nix new file mode 100644 index 0000000000000..5480da7307261 --- /dev/null +++ b/pkgs/development/cuda-modules/generic-builders/multiplex.nix @@ -0,0 +1,134 @@ +{ + # callPackage-provided arguments + lib, + cudaVersion, + flags, + hostPlatform, + # Expected to be passed by the caller + mkVersionedPackageName, + # pname :: String + pname, + # releasesModule :: Path + # A path to a module which provides a `releases` attribute + releasesModule, + # shims :: Path + # A path to a module which provides a `shims` attribute + # The redistribRelease is only used in ./manifest.nix for the package version + # and the package description (which NVIDIA's manifest calls the "name"). + # It's also used for fetching the source, but we override that since we can't + # re-use that portion of the functionality (different URLs, etc.). + # The featureRelease is used to populate meta.platforms (by way of looking at the attribute names) + # and to determine the outputs of the package. + # shimFn :: {package, redistArch} -> AttrSet + shimsFn ? ({package, redistArch}: throw "shimsFn must be provided"), + # fixupFn :: Path + # A path (or nix expression) to be evaluated with callPackage and then + # provided to the package's overrideAttrs function. + # It must accept at least the following arguments: + # - final + # - cudaVersion + # - mkVersionedPackageName + # - package + fixupFn ? ( + { + final, + cudaVersion, + mkVersionedPackageName, + package, + ... + }: + throw "fixupFn must be provided" + ), +}: +let + inherit (lib) + attrsets + lists + modules + strings + ; + + evaluatedModules = modules.evalModules { + modules = [ + ../modules + releasesModule + ]; + }; + + # NOTE: Important types: + # - Releases: ../modules/${pname}/releases/releases.nix + # - Package: ../modules/${pname}/releases/package.nix + + # FIXME: do this at the module system level + propagatePlatforms = lib.mapAttrs (platform: subset: map (r: r // { inherit platform; }) subset); + + # All releases across all platforms + # See ../modules/${pname}/releases/releases.nix + releaseSets = propagatePlatforms evaluatedModules.config.${pname}.releases; + + # Compute versioned attribute name to be used in this package set + # Patch version changes should not break the build, so we only use major and minor + # computeName :: Package -> String + computeName = {version, ...}: mkVersionedPackageName pname version; + + # Check whether a package supports our CUDA version + # isSupported :: Package -> Bool + isSupported = + package: + !(strings.hasPrefix "unsupported" package.platform) + && strings.versionAtLeast cudaVersion package.minCudaVersion + && strings.versionAtLeast package.maxCudaVersion cudaVersion; + + # Get all of the packages for our given platform. + redistArch = flags.getRedistArch hostPlatform.system; + + allReleases = builtins.concatMap (xs: xs) (builtins.attrValues releaseSets); + + # All the supported packages we can build for our platform. + # perSystemReleases :: List Package + perSystemReleases = releaseSets.${redistArch} or [ ]; + + preferable = + p1: p2: (isSupported p2 -> isSupported p1) && (strings.versionAtLeast p1.version p2.version); + newest = builtins.head (builtins.sort preferable allReleases); + + # A function which takes the `final` overlay and the `package` being built and returns + # a function to be consumed via `overrideAttrs`. + overrideAttrsFixupFn = + final: package: + final.callPackage fixupFn { + inherit + final + cudaVersion + mkVersionedPackageName + package + ; + }; + + extension = + final: _: + let + # Builds our package into derivation and wraps it in a nameValuePair, where the name is the versioned name + # of the package. + buildPackage = + package: + let + shims = final.callPackage shimsFn {inherit package redistArch;}; + name = computeName package; + drv = final.callPackage ./manifest.nix { + inherit pname; + redistName = pname; + inherit (shims) redistribRelease featureRelease; + }; + fixedDrv = drv.overrideAttrs (overrideAttrsFixupFn final package); + in + attrsets.nameValuePair name fixedDrv; + + # versionedDerivations :: AttrSet Derivation + versionedDerivations = builtins.listToAttrs (lists.map buildPackage perSystemReleases); + + defaultDerivation = { ${pname} = (buildPackage newest).value; }; + in + versionedDerivations // defaultDerivation; +in +extension diff --git a/pkgs/development/cuda-modules/gpus.nix b/pkgs/development/cuda-modules/gpus.nix new file mode 100644 index 0000000000000..cf6e0a1eaf360 --- /dev/null +++ b/pkgs/development/cuda-modules/gpus.nix @@ -0,0 +1,204 @@ +# Type aliases +# +# Gpu = { +# archName: String +# - The name of the microarchitecture. +# computeCapability: String +# - The compute capability of the GPU. +# isJetson: Boolean +# - Whether a GPU is part of NVIDIA's line of Jetson embedded computers. This field is +# notable because it tells us what architecture to build for (as Jetson devices are +# aarch64). +# More on Jetson devices here: +# https://www.nvidia.com/en-us/autonomous-machines/embedded-systems/ +# NOTE: These architectures are only built upon request. +# minCudaVersion: String +# - The minimum (inclusive) CUDA version that supports this GPU. +# dontDefaultAfter: null | String +# - The CUDA version after which to exclude this GPU from the list of default capabilities +# we build. null means we always include this GPU in the default capabilities if it is +# supported. +# maxCudaVersion: null | String +# - The maximum (exclusive) CUDA version that supports this GPU. null means there is no +# maximum. +# } +# +# Many thanks to Arnon Shimoni for maintaining a list of these architectures and capabilities. +# Without your work, this would have been much more difficult. +# https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/ +[ + { + # GeForce 700, GT-730 + archName = "Kepler"; + computeCapability = "3.0"; + isJetson = false; + minCudaVersion = "10.0"; + dontDefaultAfter = "10.2"; + maxCudaVersion = "10.2"; + } + { + archName = "Kepler"; + computeCapability = "3.2"; + isJetson = false; + minCudaVersion = "10.0"; + dontDefaultAfter = "10.2"; + maxCudaVersion = "10.2"; + } + { + # Tesla K40 + archName = "Kepler"; + computeCapability = "3.5"; + isJetson = false; + minCudaVersion = "10.0"; + dontDefaultAfter = "11.0"; + maxCudaVersion = "11.8"; + } + { + # Tesla K80 + archName = "Kepler"; + computeCapability = "3.7"; + isJetson = false; + minCudaVersion = "10.0"; + dontDefaultAfter = "11.0"; + maxCudaVersion = "11.8"; + } + { + # Tesla/Quadro M series + archName = "Maxwell"; + computeCapability = "5.0"; + isJetson = false; + minCudaVersion = "10.0"; + dontDefaultAfter = "11.0"; + maxCudaVersion = null; + } + { + # Quadro M6000 , GeForce 900, GTX-970, GTX-980, GTX Titan X + archName = "Maxwell"; + computeCapability = "5.2"; + isJetson = false; + minCudaVersion = "10.0"; + dontDefaultAfter = "11.0"; + maxCudaVersion = null; + } + { + # Tegra (Jetson) TX1 / Tegra X1, Drive CX, Drive PX, Jetson Nano + archName = "Maxwell"; + computeCapability = "5.3"; + isJetson = true; + minCudaVersion = "10.0"; + dontDefaultAfter = null; + maxCudaVersion = null; + } + { + # Quadro GP100, Tesla P100, DGX-1 (Generic Pascal) + archName = "Pascal"; + computeCapability = "6.0"; + isJetson = false; + minCudaVersion = "10.0"; + dontDefaultAfter = null; + maxCudaVersion = null; + } + { + # GTX 1080, GTX 1070, GTX 1060, GTX 1050, GTX 1030 (GP108), GT 1010 (GP108) Titan Xp, Tesla + # P40, Tesla P4, Discrete GPU on the NVIDIA Drive PX2 + archName = "Pascal"; + computeCapability = "6.1"; + isJetson = false; + minCudaVersion = "10.0"; + dontDefaultAfter = null; + maxCudaVersion = null; + } + { + # Integrated GPU on the NVIDIA Drive PX2, Tegra (Jetson) TX2 + archName = "Pascal"; + computeCapability = "6.2"; + isJetson = true; + minCudaVersion = "10.0"; + dontDefaultAfter = null; + maxCudaVersion = null; + } + { + # DGX-1 with Volta, Tesla V100, GTX 1180 (GV104), Titan V, Quadro GV100 + archName = "Volta"; + computeCapability = "7.0"; + isJetson = false; + minCudaVersion = "10.0"; + dontDefaultAfter = null; + maxCudaVersion = null; + } + { + # Jetson AGX Xavier, Drive AGX Pegasus, Xavier NX + archName = "Volta"; + computeCapability = "7.2"; + isJetson = true; + minCudaVersion = "10.0"; + dontDefaultAfter = null; + maxCudaVersion = null; + } + { + # GTX/RTX Turing – GTX 1660 Ti, RTX 2060, RTX 2070, RTX 2080, Titan RTX, Quadro RTX 4000, + # Quadro RTX 5000, Quadro RTX 6000, Quadro RTX 8000, Quadro T1000/T2000, Tesla T4 + archName = "Turing"; + computeCapability = "7.5"; + isJetson = false; + minCudaVersion = "10.0"; + dontDefaultAfter = null; + maxCudaVersion = null; + } + { + # NVIDIA A100 (the name “Tesla” has been dropped – GA100), NVIDIA DGX-A100 + archName = "Ampere"; + computeCapability = "8.0"; + isJetson = false; + minCudaVersion = "11.2"; + dontDefaultAfter = null; + maxCudaVersion = null; + } + { + # Tesla GA10x cards, RTX Ampere – RTX 3080, GA102 – RTX 3090, RTX A2000, A3000, RTX A4000, + # A5000, A6000, NVIDIA A40, GA106 – RTX 3060, GA104 – RTX 3070, GA107 – RTX 3050, RTX A10, RTX + # A16, RTX A40, A2 Tensor Core GPU + archName = "Ampere"; + computeCapability = "8.6"; + isJetson = false; + minCudaVersion = "11.2"; + dontDefaultAfter = null; + maxCudaVersion = null; + } + { + # Jetson AGX Orin and Drive AGX Orin only + archName = "Ampere"; + computeCapability = "8.7"; + isJetson = true; + minCudaVersion = "11.5"; + dontDefaultAfter = null; + maxCudaVersion = null; + } + { + # NVIDIA GeForce RTX 4090, RTX 4080, RTX 6000, Tesla L40 + archName = "Ada"; + computeCapability = "8.9"; + isJetson = false; + minCudaVersion = "11.8"; + dontDefaultAfter = null; + maxCudaVersion = null; + } + { + # NVIDIA H100 (GH100) + archName = "Hopper"; + computeCapability = "9.0"; + isJetson = false; + minCudaVersion = "11.8"; + dontDefaultAfter = null; + maxCudaVersion = null; + } + { + # NVIDIA H100 (GH100) (Thor) + archName = "Hopper"; + computeCapability = "9.0a"; + isJetson = false; + minCudaVersion = "12.0"; + dontDefaultAfter = null; + maxCudaVersion = null; + } +] diff --git a/pkgs/development/cuda-modules/modules/README.md b/pkgs/development/cuda-modules/modules/README.md new file mode 100644 index 0000000000000..7db8435c9dc8c --- /dev/null +++ b/pkgs/development/cuda-modules/modules/README.md @@ -0,0 +1,56 @@ +# Modules + +Modules as they are used in `modules` exist primarily to check the shape and +content of CUDA redistributable and feature manifests. They are ultimately meant +to reduce the repetitive nature of repackaging CUDA redistributables. + +Building most redistributables follows a pattern of a manifest indicating which +packages are available at a location, their versions, and their hashes. To avoid +creating builders for each and every derivation, modules serve as a way for us +to use a single `genericManifestBuilder` to build all redistributables. + +## `generic` + +The modules in `generic` are reusable components meant to check the shape and +content of NVIDIA's CUDA redistributable manifests, our feature manifests (which +are derived from NVIDIA's manifests), or hand-crafted Nix expressions describing +available packages. They are used by the `genericManifestBuilder` to build CUDA +redistributables. + +Generally, each package which relies on manifests or Nix release expressions +will create an alias to the relevant generic module. For example, the [module +for CUDNN](./cudnn/default.nix) aliases the generic module for release +expressions, while the [module for CUDA redistributables](./cuda/default.nix) +aliases the generic module for manifests. + +Alternatively, additional fields or values may need to be configured to account +for the particulars of a package. For example, while the release expressions for +[CUDNN](./cudnn/releases.nix) and [TensorRT](./tensorrt/releases.nix) are very +close, they differ slightly in the fields they have. The [module for +CUDNN](./modules/cudnn/default.nix) is able to use the generic module for +release expressions, while the [module for +TensorRT](./modules/tensorrt/default.nix) must add additional fields to the +generic module. + +### `manifests` + +The modules in `generic/manifests` define the structure of NVIDIA's CUDA +redistributable manifests and our feature manifests. + +NVIDIA's redistributable manifests are retrieved from their web server, while +the feature manifests are produced by +[`cuda-redist-find-features`](https://github.com/connorbaker/cuda-redist-find-features). + +### `releases` + +The modules in `generic/releases` define the structure of our hand-crafted Nix +expressions containing information necessary to download and repackage CUDA +redistributables. These expressions are created when NVIDIA-provided manifests +are unavailable or otherwise unusable. For example, though CUDNN has manifests, +a bug in NVIDIA's CI/CD causes manifests for different versions of CUDA to use +the same name, which leads to the manifests overwriting each other. + +### `types` + +The modules in `generic/types` define reusable types used in both +`generic/manifests` and `generic/releases`. diff --git a/pkgs/development/cuda-modules/modules/cuda/default.nix b/pkgs/development/cuda-modules/modules/cuda/default.nix new file mode 100644 index 0000000000000..4ea35d0482265 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/cuda/default.nix @@ -0,0 +1 @@ +{options, ...}: {options.cuda.manifests = options.generic.manifests;} diff --git a/pkgs/development/cuda-modules/modules/cudnn/default.nix b/pkgs/development/cuda-modules/modules/cudnn/default.nix new file mode 100644 index 0000000000000..dd52cbaa24b4d --- /dev/null +++ b/pkgs/development/cuda-modules/modules/cudnn/default.nix @@ -0,0 +1,12 @@ +{options, ...}: +{ + options.cudnn.releases = options.generic.releases; + # TODO(@connorbaker): Figure out how to add additional options to the + # to the generic release. + # { + # url = options.mkOption { + # description = "The URL to download the tarball from"; + # type = types.str; + # }; + # } +} diff --git a/pkgs/development/cuda-modules/modules/cutensor/default.nix b/pkgs/development/cuda-modules/modules/cutensor/default.nix new file mode 100644 index 0000000000000..8ec2189fee4cc --- /dev/null +++ b/pkgs/development/cuda-modules/modules/cutensor/default.nix @@ -0,0 +1 @@ +{options, ...}: {options.cutensor.manifests = options.generic.manifests;} diff --git a/pkgs/development/cuda-modules/modules/default.nix b/pkgs/development/cuda-modules/modules/default.nix new file mode 100644 index 0000000000000..ccccd871479e1 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/default.nix @@ -0,0 +1,10 @@ +{ + imports = [ + ./generic + # Always after generic + ./cuda + ./cudnn + ./cutensor + ./tensorrt + ]; +} diff --git a/pkgs/development/cuda-modules/modules/generic/default.nix b/pkgs/development/cuda-modules/modules/generic/default.nix new file mode 100644 index 0000000000000..b68aa614f2400 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/generic/default.nix @@ -0,0 +1,7 @@ +{ + imports = [ + ./types + ./manifests + ./releases + ]; +} diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/default.nix b/pkgs/development/cuda-modules/modules/generic/manifests/default.nix new file mode 100644 index 0000000000000..6c12919ff4000 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/generic/manifests/default.nix @@ -0,0 +1,7 @@ +{lib, config, ...}: +{ + options.generic.manifests = { + feature = import ./feature/manifest.nix {inherit lib config;}; + redistrib = import ./redistrib/manifest.nix {inherit lib;}; + }; +} diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/feature/manifest.nix b/pkgs/development/cuda-modules/modules/generic/manifests/feature/manifest.nix new file mode 100644 index 0000000000000..29ca678e0e5a5 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/generic/manifests/feature/manifest.nix @@ -0,0 +1,10 @@ +{lib, config, ...}: +let + inherit (lib) options trivial types; + Release = import ./release.nix {inherit lib config;}; +in +options.mkOption { + description = "A feature manifest is an attribute set which includes a mapping from package name to release"; + example = trivial.importJSON ../../../../cuda/manifests/feature_11.5.2.json; + type = types.attrsOf Release.type; +} diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/feature/outputs.nix b/pkgs/development/cuda-modules/modules/generic/manifests/feature/outputs.nix new file mode 100644 index 0000000000000..db6dff769e145 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/generic/manifests/feature/outputs.nix @@ -0,0 +1,60 @@ +{lib, ...}: +let + inherit (lib) options types; +in +# https://github.com/ConnorBaker/cuda-redist-find-features/blob/603407bea2fab47f2dfcd88431122a505af95b42/cuda_redist_find_features/manifest/feature/package/package.py +options.mkOption { + description = "A set of outputs that a package can provide."; + example = { + bin = true; + dev = true; + doc = false; + lib = false; + sample = false; + static = false; + }; + type = types.submodule { + options = { + bin = options.mkOption { + description = "A `bin` output requires that we have a non-empty `bin` directory containing at least one file with the executable bit set."; + type = types.bool; + }; + dev = options.mkOption { + description = '' + A `dev` output requires that we have at least one of the following non-empty directories: + + - `include` + - `lib/pkgconfig` + - `share/pkgconfig` + - `lib/cmake` + - `share/aclocal` + ''; + type = types.bool; + }; + doc = options.mkOption { + description = '' + A `doc` output requires that we have at least one of the following non-empty directories: + + - `share/info` + - `share/doc` + - `share/gtk-doc` + - `share/devhelp` + - `share/man` + ''; + type = types.bool; + }; + lib = options.mkOption { + description = "A `lib` output requires that we have a non-empty lib directory containing at least one shared library."; + type = types.bool; + }; + sample = options.mkOption { + description = "A `sample` output requires that we have a non-empty `samples` directory."; + type = types.bool; + }; + static = options.mkOption { + description = "A `static` output requires that we have a non-empty lib directory containing at least one static library."; + type = types.bool; + }; + }; + }; +} diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/feature/package.nix b/pkgs/development/cuda-modules/modules/generic/manifests/feature/package.nix new file mode 100644 index 0000000000000..2c36a3e0cb270 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/generic/manifests/feature/package.nix @@ -0,0 +1,10 @@ +{lib, ...}: +let + inherit (lib) options types; + Outputs = import ./outputs.nix {inherit lib;}; +in +options.mkOption { + description = "A package in the manifest"; + example = (import ./release.nix {inherit lib;}).linux-x86_64; + type = types.submodule {options.outputs = Outputs;}; +} diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/feature/release.nix b/pkgs/development/cuda-modules/modules/generic/manifests/feature/release.nix new file mode 100644 index 0000000000000..be3a30ffdc59d --- /dev/null +++ b/pkgs/development/cuda-modules/modules/generic/manifests/feature/release.nix @@ -0,0 +1,10 @@ +{lib, config, ...}: +let + inherit (lib) options types; + Package = import ./package.nix {inherit lib config;}; +in +options.mkOption { + description = "A release is an attribute set which includes a mapping from platform to package"; + example = (import ./manifest.nix {inherit lib;}).cuda_cccl; + type = types.attrsOf Package.type; +} diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/manifest.nix b/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/manifest.nix new file mode 100644 index 0000000000000..0cfa40241fdc0 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/manifest.nix @@ -0,0 +1,33 @@ +{lib, ...}: +let + inherit (lib) options trivial types; + Release = import ./release.nix {inherit lib;}; +in +options.mkOption { + description = "A redistributable manifest is an attribute set which includes a mapping from package name to release"; + example = trivial.importJSON ../../../../cuda/manifests/redistrib_11.5.2.json; + type = types.submodule { + # Allow any attribute name as these will be the package names + freeformType = types.attrsOf Release.type; + options = { + release_date = options.mkOption { + description = "The release date of the manifest"; + type = types.nullOr types.str; + default = null; + example = "2023-08-29"; + }; + release_label = options.mkOption { + description = "The release label of the manifest"; + type = types.nullOr types.str; + default = null; + example = "12.2.2"; + }; + release_product = options.mkOption { + example = "cuda"; + description = "The release product of the manifest"; + type = types.nullOr types.str; + default = null; + }; + }; + }; +} diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/package.nix b/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/package.nix new file mode 100644 index 0000000000000..8d18c06b893f4 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/package.nix @@ -0,0 +1,32 @@ +{lib, ...}: +let + inherit (lib) options types; +in +options.mkOption { + description = "A package in the manifest"; + example = (import ./release.nix {inherit lib;}).linux-x86_64; + type = types.submodule { + options = { + relative_path = options.mkOption { + description = "The relative path to the package"; + example = "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-11.5.62-archive.tar.xz"; + type = types.str; + }; + sha256 = options.mkOption { + description = "The sha256 hash of the package"; + example = "bbe633d6603d5a96a214dcb9f3f6f6fd2fa04d62e53694af97ae0c7afe0121b0"; + type = types.str; + }; + md5 = options.mkOption { + description = "The md5 hash of the package"; + example = "e5deef4f6cb71f14aac5be5d5745dafe"; + type = types.str; + }; + size = options.mkOption { + description = "The size of the package as a string"; + type = types.str; + example = "960968"; + }; + }; + }; +} diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/release.nix b/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/release.nix new file mode 100644 index 0000000000000..dd2b206fede41 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/release.nix @@ -0,0 +1,36 @@ +{lib, ...}: +let + inherit (lib) options types; + Package = import ./package.nix {inherit lib;}; +in +options.mkOption { + description = "A release is an attribute set which includes a mapping from platform to package"; + example = (import ./manifest.nix {inherit lib;}).cuda_cccl; + type = types.submodule { + # Allow any attribute name as these will be the platform names + freeformType = types.attrsOf Package.type; + options = { + name = options.mkOption { + description = "The full name of the package"; + example = "CXX Core Compute Libraries"; + type = types.str; + }; + license = options.mkOption { + description = "The license of the package"; + example = "CUDA Toolkit"; + type = types.str; + }; + license_path = options.mkOption { + description = "The path to the license of the package"; + example = "cuda_cccl/LICENSE.txt"; + default = null; + type = types.nullOr types.str; + }; + version = options.mkOption { + description = "The version of the package"; + example = "11.5.62"; + type = types.str; + }; + }; + }; +} diff --git a/pkgs/development/cuda-modules/modules/generic/releases/default.nix b/pkgs/development/cuda-modules/modules/generic/releases/default.nix new file mode 100644 index 0000000000000..8da6f0d5cc79c --- /dev/null +++ b/pkgs/development/cuda-modules/modules/generic/releases/default.nix @@ -0,0 +1,45 @@ +{lib, config, ...}: +let + inherit (config.generic.types) majorMinorVersion majorMinorPatchBuildVersion; + inherit (lib) options types; +in +{ + options.generic.releases = options.mkOption { + description = "A collection of packages targeting different platforms"; + type = + let + Package = options.mkOption { + description = "A package for a specific platform"; + example = { + version = "8.0.3.4"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + hash = "sha256-LxcXgwe1OCRfwDsEsNLIkeNsOcx3KuF5Sj+g2dY6WD0="; + }; + type = types.submodule { + # TODO(@connorbaker): Figure out how to extend option sets. + freeformType = types.attrsOf types.anything; + options = { + version = options.mkOption { + description = "The version of the package"; + type = majorMinorPatchBuildVersion; + }; + minCudaVersion = options.mkOption { + description = "The minimum CUDA version supported"; + type = majorMinorVersion; + }; + maxCudaVersion = options.mkOption { + description = "The maximum CUDA version supported"; + type = majorMinorVersion; + }; + hash = options.mkOption { + description = "The hash of the tarball"; + type = types.str; + }; + }; + }; + }; + in + types.attrsOf (types.listOf Package.type); + }; +} diff --git a/pkgs/development/cuda-modules/modules/generic/types/default.nix b/pkgs/development/cuda-modules/modules/generic/types/default.nix new file mode 100644 index 0000000000000..61d13b3cc8d2b --- /dev/null +++ b/pkgs/development/cuda-modules/modules/generic/types/default.nix @@ -0,0 +1,39 @@ +{lib, ...}: +let + inherit (lib) options types; +in +{ + options.generic.types = options.mkOption { + type = types.attrsOf types.optionType; + default = {}; + description = "A set of generic types."; + }; + config.generic.types = { + cudaArch = types.strMatching "^sm_[[:digit:]]+[a-z]?$" // { + name = "cudaArch"; + description = "A CUDA architecture name."; + }; + # https://github.com/ConnorBaker/cuda-redist-find-features/blob/c841980e146f8664bbcd0ba1399e486b7910617b/cuda_redist_find_features/types/_lib_so_name.py + libSoName = types.strMatching ".*\\.so(\\.[[:digit:]]+)*$" // { + name = "libSoName"; + description = "The name of a shared object file."; + }; + + majorMinorVersion = types.strMatching "^([[:digit:]]+)\\.([[:digit:]]+)$" // { + name = "majorMinorVersion"; + description = "A version number with a major and minor component."; + }; + + majorMinorPatchVersion = types.strMatching "^([[:digit:]]+)\\.([[:digit:]]+)\\.([[:digit:]]+)$" // { + name = "majorMinorPatchVersion"; + description = "A version number with a major, minor, and patch component."; + }; + + majorMinorPatchBuildVersion = + types.strMatching "^([[:digit:]]+)\\.([[:digit:]]+)\\.([[:digit:]]+)\\.([[:digit:]]+)$" + // { + name = "majorMinorPatchBuildVersion"; + description = "A version number with a major, minor, patch, and build component."; + }; + }; +} diff --git a/pkgs/development/cuda-modules/modules/tensorrt/default.nix b/pkgs/development/cuda-modules/modules/tensorrt/default.nix new file mode 100644 index 0000000000000..e62942c679aa0 --- /dev/null +++ b/pkgs/development/cuda-modules/modules/tensorrt/default.nix @@ -0,0 +1,16 @@ +{options, ...}: +{ + options.tensorrt.releases = options.generic.releases; + # TODO(@connorbaker): Figure out how to add additional options to the + # to the generic release. + # { + # cudnnVersion = lib.options.mkOption { + # description = "The CUDNN version supported"; + # type = types.nullOr majorMinorVersion; + # }; + # filename = lib.options.mkOption { + # description = "The tarball name"; + # type = types.str; + # }; + # } +} diff --git a/pkgs/development/cuda-modules/nccl-tests/default.nix b/pkgs/development/cuda-modules/nccl-tests/default.nix new file mode 100644 index 0000000000000..5c2f29b7ed564 --- /dev/null +++ b/pkgs/development/cuda-modules/nccl-tests/default.nix @@ -0,0 +1,84 @@ +# NOTE: Though NCCL tests is called within the cudaPackages package set, we avoid passing in +# the names of dependencies from that package set directly to avoid evaluation errors +# in the case redistributable packages are not available. +{ + config, + cudaPackages, + fetchFromGitHub, + gitUpdater, + lib, + mpi, + mpiSupport ? false, + which, +}: +let + inherit (cudaPackages) + backendStdenv + cuda_cccl + cuda_cudart + cuda_nvcc + cudatoolkit + cudaVersion + nccl + ; +in +backendStdenv.mkDerivation ( + finalAttrs: { + + pname = "nccl-tests"; + version = "2.13.8"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg="; + }; + + strictDeps = true; + + nativeBuildInputs = + [which] + ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [cuda_nvcc]; + + buildInputs = + [nccl] + ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ + cuda_nvcc.dev # crt/host_config.h + cuda_cudart + ] + ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ + cuda_cccl.dev # <nv/target> + ] + ++ lib.optionals mpiSupport [mpi]; + + makeFlags = + ["NCCL_HOME=${nccl}"] + ++ lib.optionals (lib.versionOlder cudaVersion "11.4") ["CUDA_HOME=${cudatoolkit}"] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") ["CUDA_HOME=${cuda_nvcc}"] + ++ lib.optionals mpiSupport ["MPI=1"]; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out/bin + cp -r build/* $out/bin/ + ''; + + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; + + meta = with lib; { + description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations"; + homepage = "https://github.com/NVIDIA/nccl-tests"; + platforms = platforms.linux; + license = licenses.bsd3; + broken = !config.cudaSupport || (mpiSupport && mpi == null); + maintainers = with maintainers; [jmillerpdt] ++ teams.cuda.members; + }; + } +) diff --git a/pkgs/development/cuda-modules/nccl/default.nix b/pkgs/development/cuda-modules/nccl/default.nix new file mode 100644 index 0000000000000..c56d59cb42068 --- /dev/null +++ b/pkgs/development/cuda-modules/nccl/default.nix @@ -0,0 +1,112 @@ +# NOTE: Though NCCL is called within the cudaPackages package set, we avoid passing in +# the names of dependencies from that package set directly to avoid evaluation errors +# in the case redistributable packages are not available. +{ + lib, + fetchFromGitHub, + python3, + which, + cudaPackages, + # passthru.updateScript + gitUpdater, +}: +let + inherit (cudaPackages) + autoAddOpenGLRunpathHook + backendStdenv + cuda_cccl + cuda_cudart + cuda_nvcc + cudaFlags + cudatoolkit + cudaVersion + ; +in +backendStdenv.mkDerivation ( + finalAttrs: { + pname = "nccl"; + version = "2.19.3-1"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-59FlOKM5EB5Vkm4dZBRCkn+IgIcdQehE+FyZAdTCT/A="; + }; + + strictDeps = true; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = + [ + which + autoAddOpenGLRunpathHook + python3 + ] + ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [cuda_nvcc]; + + buildInputs = + lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ + cuda_nvcc.dev # crt/host_config.h + cuda_cudart + ] + # NOTE: CUDA versions in Nixpkgs only use a major and minor version. When we do comparisons + # against other version, like below, it's important that we use the same format. Otherwise, + # we'll get incorrect results. + # For example, lib.versionAtLeast "12.0" "12.0.0" == false. + ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [cuda_cccl]; + + env.NIX_CFLAGS_COMPILE = toString ["-Wno-unused-function"]; + + preConfigure = '' + patchShebangs ./src/device/generate.py + makeFlagsArray+=( + "NVCC_GENCODE=${lib.concatStringsSep " " cudaFlags.gencode}" + ) + ''; + + makeFlags = + ["PREFIX=$(out)"] + ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [ + "CUDA_HOME=${cudatoolkit}" + "CUDA_LIB=${lib.getLib cudatoolkit}/lib" + "CUDA_INC=${lib.getDev cudatoolkit}/include" + ] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ + "CUDA_HOME=${cuda_nvcc}" + "CUDA_LIB=${lib.getLib cuda_cudart}/lib" + "CUDA_INC=${lib.getDev cuda_cudart}/include" + ]; + + enableParallelBuilding = true; + + postFixup = '' + moveToOutput lib/libnccl_static.a $dev + ''; + + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; + + meta = with lib; { + description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; + homepage = "https://developer.nvidia.com/nccl"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = + with maintainers; + [ + mdaiter + orivej + ] + ++ teams.cuda.members; + }; + } +) diff --git a/pkgs/development/cuda-modules/nvcc-compatibilities.nix b/pkgs/development/cuda-modules/nvcc-compatibilities.nix new file mode 100644 index 0000000000000..4af1b511a1d9d --- /dev/null +++ b/pkgs/development/cuda-modules/nvcc-compatibilities.nix @@ -0,0 +1,124 @@ +# Taken from +# https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#host-compiler-support-policy +# +# NVCC performs a version check on the host compiler’s major version and so newer minor versions +# of the compilers listed below will be supported, but major versions falling outside the range +# will not be supported. +# +# NOTE: These constraints don't apply to Jetson, which uses something else. +# NOTE: NVIDIA can and will add support for newer compilers even during patch releases. +# E.g.: CUDA 12.2.1 maxxed out with support for Clang 15.0; 12.2.2 added support for Clang 16.0. +# NOTE: Because all platforms NVIDIA supports use GCC and Clang, we omit the architectures here. +# Type Aliases +# CudaVersion = String (two-part version number, e.g. "11.2") +# Platform = String (e.g. "x86_64-linux") +# CompilerCompatibilities = { +# clangMaxMajorVersion = String (e.g. "15") +# clangMinMajorVersion = String (e.g. "7") +# gccMaxMajorVersion = String (e.g. "11") +# gccMinMajorVersion = String (e.g. "6") +# } +let + # attrs :: AttrSet CudaVersion CompilerCompatibilities + attrs = { + # Our baseline + # https://docs.nvidia.com/cuda/archive/10.0/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features + "10.0" = { + clangMaxMajorVersion = "6"; + clangMinMajorVersion = "6"; + gccMaxMajorVersion = "7"; + gccMinMajorVersion = "5"; + }; + + # Added support for Clang 7 and GCC 8 + # https://docs.nvidia.com/cuda/archive/10.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features + "10.1" = attrs."10.0" // { + clangMaxMajorVersion = "7"; + gccMaxMajorVersion = "8"; + }; + + # Added clang 8 + # https://docs.nvidia.com/cuda/archive/10.2/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features + "10.2" = attrs."10.1" // { + clangMaxMajorVersion = "8"; + }; + + # Added support for Clang 9 and GCC 9 + # https://docs.nvidia.com/cuda/archive/11.0/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features + "11.0" = { + clangMaxMajorVersion = "9"; + clangMinMajorVersion = "7"; + gccMaxMajorVersion = "9"; + gccMinMajorVersion = "6"; + }; + + # Added support for Clang 10 and GCC 10 + # https://docs.nvidia.com/cuda/archive/11.1.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features + "11.1" = attrs."11.0" // { + clangMaxMajorVersion = "10"; + gccMaxMajorVersion = "10"; + }; + + # Added support for Clang 11 + # https://docs.nvidia.com/cuda/archive/11.2.2/cuda-installation-guide-linux/index.html#system-requirements + "11.2" = attrs."11.1" // { + clangMaxMajorVersion = "11"; + }; + + # No changes from 11.2 to 11.3 + "11.3" = attrs."11.2"; + + # Added support for Clang 12 and GCC 11 + # https://docs.nvidia.com/cuda/archive/11.4.4/cuda-toolkit-release-notes/index.html#cuda-general-new-features + "11.4" = attrs."11.3" // { + clangMaxMajorVersion = "12"; + # NOTE: There is a bug in the version of GLIBC that GCC 11 uses which causes it to fail to compile some CUDA + # code. As such, we skip it for this release, and do the bump in 11.6 (skipping 11.5). + # https://forums.developer.nvidia.com/t/cuda-11-5-samples-throw-multiple-error-attribute-malloc-does-not-take-arguments/192750/15 + # gccMaxMajorVersion = "11"; + }; + + # No changes from 11.4 to 11.5 + "11.5" = attrs."11.4"; + + # No changes from 11.5 to 11.6 + # However, as mentioned above, we add GCC 11 this release. + "11.6" = attrs."11.5" // { + gccMaxMajorVersion = "11"; + }; + + # Added support for Clang 13 + # https://docs.nvidia.com/cuda/archive/11.7.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features + "11.7" = attrs."11.6" // { + clangMaxMajorVersion = "13"; + }; + + # Added support for Clang 14 + # https://docs.nvidia.com/cuda/archive/11.8.0/cuda-installation-guide-linux/index.html#system-requirements + "11.8" = attrs."11.7" // { + clangMaxMajorVersion = "14"; + }; + + # Added support for GCC 12 + # https://docs.nvidia.com/cuda/archive/12.0.1/cuda-installation-guide-linux/index.html#system-requirements + "12.0" = attrs."11.8" // { + gccMaxMajorVersion = "12"; + }; + + # Added support for Clang 15 + # https://docs.nvidia.com/cuda/archive/12.1.1/cuda-toolkit-release-notes/index.html#cuda-compilers-new-features + "12.1" = attrs."12.0" // { + clangMaxMajorVersion = "15"; + }; + + # Added support for Clang 16 + # https://docs.nvidia.com/cuda/archive/12.2.2/cuda-installation-guide-linux/index.html#host-compiler-support-policy + "12.2" = attrs."12.1" // { + clangMaxMajorVersion = "16"; + }; + + # No changes from 12.2 to 12.3 + "12.3" = attrs."12.2"; + }; +in +attrs diff --git a/pkgs/development/compilers/cudatoolkit/saxpy/CMakeLists.txt b/pkgs/development/cuda-modules/saxpy/CMakeLists.txt index a6954e6e8bee2..a6954e6e8bee2 100644 --- a/pkgs/development/compilers/cudatoolkit/saxpy/CMakeLists.txt +++ b/pkgs/development/cuda-modules/saxpy/CMakeLists.txt diff --git a/pkgs/development/cuda-modules/saxpy/default.nix b/pkgs/development/cuda-modules/saxpy/default.nix new file mode 100644 index 0000000000000..73e17b28757b0 --- /dev/null +++ b/pkgs/development/cuda-modules/saxpy/default.nix @@ -0,0 +1,57 @@ +{ + cmake, + cudaPackages, + lib, +}: +let + inherit (cudaPackages) + autoAddOpenGLRunpathHook + backendStdenv + cuda_cccl + cuda_cudart + cuda_nvcc + cudatoolkit + cudaVersion + flags + libcublas + setupCudaHook + ; +in +backendStdenv.mkDerivation { + pname = "saxpy"; + version = "unstable-2023-07-11"; + + src = ./.; + + strictDeps = true; + + nativeBuildInputs = + [ + cmake + autoAddOpenGLRunpathHook + ] + ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [cuda_nvcc]; + + buildInputs = + lib.optionals (lib.versionOlder cudaVersion "11.4") [cudatoolkit] + ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ + libcublas + cuda_cudart + ] + ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [cuda_cccl]; + + cmakeFlags = [ + (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" ( + with flags; lib.concatStringsSep ";" (lib.lists.map dropDot cudaCapabilities) + )) + ]; + + meta = { + description = "A simple (Single-precision AX Plus Y) FindCUDAToolkit.cmake example for testing cross-compilation"; + license = lib.licenses.mit; + maintainers = lib.teams.cuda.members; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/cudatoolkit/saxpy/saxpy.cu b/pkgs/development/cuda-modules/saxpy/saxpy.cu index 912a6d1647b14..912a6d1647b14 100644 --- a/pkgs/development/compilers/cudatoolkit/saxpy/saxpy.cu +++ b/pkgs/development/cuda-modules/saxpy/saxpy.cu diff --git a/pkgs/development/cuda-modules/setup-hooks/auto-add-cuda-compat-runpath.sh b/pkgs/development/cuda-modules/setup-hooks/auto-add-cuda-compat-runpath.sh new file mode 100644 index 0000000000000..537daad2f00e3 --- /dev/null +++ b/pkgs/development/cuda-modules/setup-hooks/auto-add-cuda-compat-runpath.sh @@ -0,0 +1,27 @@ +# shellcheck shell=bash +# Patch all dynamically linked, ELF files with the CUDA driver (libcuda.so) +# coming from the cuda_compat package by adding it to the RUNPATH. +echo "Sourcing auto-add-cuda-compat-runpath-hook" + +elfHasDynamicSection() { + patchelf --print-rpath "$1" >& /dev/null +} + +autoAddCudaCompatRunpathPhase() ( + local outputPaths + mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done) + find "${outputPaths[@]}" -type f -executable -print0 | while IFS= read -rd "" f; do + if isELF "$f"; then + # patchelf returns an error on statically linked ELF files + if elfHasDynamicSection "$f" ; then + echo "autoAddCudaCompatRunpathHook: patching $f" + local origRpath="$(patchelf --print-rpath "$f")" + patchelf --set-rpath "@libcudaPath@:$origRpath" "$f" + elif (( "${NIX_DEBUG:-0}" >= 1 )) ; then + echo "autoAddCudaCompatRunpathHook: skipping a statically-linked ELF file $f" + fi + fi + done +) + +postFixupHooks+=(autoAddCudaCompatRunpathPhase) diff --git a/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh b/pkgs/development/cuda-modules/setup-hooks/auto-add-opengl-runpath-hook.sh index f50a5f6c25c66..f50a5f6c25c66 100644 --- a/pkgs/development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh +++ b/pkgs/development/cuda-modules/setup-hooks/auto-add-opengl-runpath-hook.sh diff --git a/pkgs/development/cuda-modules/setup-hooks/extension.nix b/pkgs/development/cuda-modules/setup-hooks/extension.nix new file mode 100644 index 0000000000000..930730ce6c06b --- /dev/null +++ b/pkgs/development/cuda-modules/setup-hooks/extension.nix @@ -0,0 +1,69 @@ +final: _: { + # Internal hook, used by cudatoolkit and cuda redist packages + # to accommodate automatic CUDAToolkit_ROOT construction + markForCudatoolkitRootHook = + final.callPackage + ( + {makeSetupHook}: + makeSetupHook {name = "mark-for-cudatoolkit-root-hook";} ./mark-for-cudatoolkit-root-hook.sh + ) + {}; + + # Currently propagated by cuda_nvcc or cudatoolkit, rather than used directly + setupCudaHook = + (final.callPackage + ( + {makeSetupHook, backendStdenv}: + makeSetupHook + { + name = "setup-cuda-hook"; + + substitutions.setupCudaHook = placeholder "out"; + + # Point NVCC at a compatible compiler + substitutions.ccRoot = "${backendStdenv.cc}"; + + # Required in addition to ccRoot as otherwise bin/gcc is looked up + # when building CMakeCUDACompilerId.cu + substitutions.ccFullPath = "${backendStdenv.cc}/bin/${backendStdenv.cc.targetPrefix}c++"; + } + ./setup-cuda-hook.sh + ) + {} + ); + + autoAddOpenGLRunpathHook = + final.callPackage + ( + {addOpenGLRunpath, makeSetupHook}: + makeSetupHook + { + name = "auto-add-opengl-runpath-hook"; + propagatedBuildInputs = [addOpenGLRunpath]; + } + ./auto-add-opengl-runpath-hook.sh + ) + {}; + + # autoAddCudaCompatRunpathHook hook must be added AFTER `setupCudaHook`. Both + # hooks prepend a path with `libcuda.so` to the `DT_RUNPATH` section of + # patched elf files, but `cuda_compat` path must take precedence (otherwise, + # it doesn't have any effect) and thus appear first. Meaning this hook must be + # executed last. + autoAddCudaCompatRunpathHook = + final.callPackage + ( + {makeSetupHook, cuda_compat}: + makeSetupHook + { + name = "auto-add-cuda-compat-runpath-hook"; + substitutions = { + # Hotfix Ofborg evaluation + libcudaPath = if final.flags.isJetsonBuild then "${cuda_compat}/compat" else null; + }; + meta.broken = !final.flags.isJetsonBuild; + } + ./auto-add-cuda-compat-runpath.sh + ) + {}; +} diff --git a/pkgs/development/cuda-modules/setup-hooks/mark-for-cudatoolkit-root-hook.sh b/pkgs/development/cuda-modules/setup-hooks/mark-for-cudatoolkit-root-hook.sh new file mode 100644 index 0000000000000..ba04c2e0806af --- /dev/null +++ b/pkgs/development/cuda-modules/setup-hooks/mark-for-cudatoolkit-root-hook.sh @@ -0,0 +1,14 @@ +# shellcheck shell=bash + +# Should we mimick cc-wrapper's "hygiene"? +[[ -z ${strictDeps-} ]] || (( "$hostOffset" < 0 )) || return 0 + +echo "Sourcing mark-for-cudatoolkit-root-hook" >&2 + +markForCUDAToolkit_ROOT() { + mkdir -p "${prefix}/nix-support" + [[ -f "${prefix}/nix-support/include-in-cudatoolkit-root" ]] && return + echo "$pname-$output" > "${prefix}/nix-support/include-in-cudatoolkit-root" +} + +fixupOutputHooks+=(markForCUDAToolkit_ROOT) diff --git a/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh b/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh new file mode 100644 index 0000000000000..a4a444fcd2417 --- /dev/null +++ b/pkgs/development/cuda-modules/setup-hooks/setup-cuda-hook.sh @@ -0,0 +1,119 @@ +# shellcheck shell=bash + +# Only run the hook from nativeBuildInputs +(( "$hostOffset" == -1 && "$targetOffset" == 0)) || return 0 + +guard=Sourcing +reason= + +[[ -n ${cudaSetupHookOnce-} ]] && guard=Skipping && reason=" because the hook has been propagated more than once" + +if (( "${NIX_DEBUG:-0}" >= 1 )) ; then + echo "$guard hostOffset=$hostOffset targetOffset=$targetOffset setupCudaHook$reason" >&2 +else + echo "$guard setup-cuda-hook$reason" >&2 +fi + +[[ "$guard" = Sourcing ]] || return 0 + +declare -g cudaSetupHookOnce=1 +declare -Ag cudaHostPathsSeen=() +declare -Ag cudaOutputToPath=() + +extendcudaHostPathsSeen() { + (( "${NIX_DEBUG:-0}" >= 1 )) && echo "extendcudaHostPathsSeen $1" >&2 + + local markerPath="$1/nix-support/include-in-cudatoolkit-root" + [[ ! -f "${markerPath}" ]] && return + [[ -v cudaHostPathsSeen[$1] ]] && return + + cudaHostPathsSeen["$1"]=1 + + # E.g. cuda_cudart-lib + local cudaOutputName + read -r cudaOutputName < "$markerPath" + + [[ -z "$cudaOutputName" ]] && return + + local oldPath="${cudaOutputToPath[$cudaOutputName]-}" + [[ -n "$oldPath" ]] && echo "extendcudaHostPathsSeen: warning: overwriting $cudaOutputName from $oldPath to $1" >&2 + cudaOutputToPath["$cudaOutputName"]="$1" +} +addEnvHooks "$targetOffset" extendcudaHostPathsSeen + +setupCUDAToolkit_ROOT() { + (( "${NIX_DEBUG:-0}" >= 1 )) && echo "setupCUDAToolkit_ROOT: cudaHostPathsSeen=${!cudaHostPathsSeen[*]}" >&2 + + for path in "${!cudaHostPathsSeen[@]}" ; do + addToSearchPathWithCustomDelimiter ";" CUDAToolkit_ROOT "$path" + if [[ -d "$path/include" ]] ; then + addToSearchPathWithCustomDelimiter ";" CUDAToolkit_INCLUDE_DIR "$path/include" + fi + done + + export cmakeFlags+=" -DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR -DCUDAToolkit_ROOT=$CUDAToolkit_ROOT" +} +preConfigureHooks+=(setupCUDAToolkit_ROOT) + +setupCUDAToolkitCompilers() { + echo Executing setupCUDAToolkitCompilers >&2 + + if [[ -n "${dontSetupCUDAToolkitCompilers-}" ]] ; then + return + fi + + # Point NVCC at a compatible compiler + + # For CMake-based projects: + # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables + # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html + # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html + + export cmakeFlags+=" -DCUDA_HOST_COMPILER=@ccFullPath@" + export cmakeFlags+=" -DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@" + + # For non-CMake projects: + # We prepend --compiler-bindir to nvcc flags. + # Downstream packages can override these, because NVCC + # uses the last --compiler-bindir it gets on the command line. + # FIXME: this results in "incompatible redefinition" warnings. + # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin + if [ -z "${CUDAHOSTCXX-}" ]; then + export CUDAHOSTCXX="@ccFullPath@"; + fi + + export NVCC_PREPEND_FLAGS+=" --compiler-bindir=@ccRoot@/bin" + + # NOTE: We set -Xfatbin=-compress-all, which reduces the size of the compiled + # binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as + # the default set of CUDA capabilities we build can regularly cause this to occur (for + # example, with Magma). + # + # @SomeoneSerge: original comment was made by @ConnorBaker in .../cudatoolkit/common.nix + if [[ -z "${dontCompressFatbin-}" ]]; then + export NVCC_PREPEND_FLAGS+=" -Xfatbin=-compress-all" + fi +} +preConfigureHooks+=(setupCUDAToolkitCompilers) + +propagateCudaLibraries() { + (( "${NIX_DEBUG:-0}" >= 1 )) && echo "propagateCudaLibraries: cudaPropagateToOutput=$cudaPropagateToOutput cudaHostPathsSeen=${!cudaHostPathsSeen[*]}" >&2 + + [[ -z "${cudaPropagateToOutput-}" ]] && return + + mkdir -p "${!cudaPropagateToOutput}/nix-support" + # One'd expect this should be propagated-bulid-build-deps, but that doesn't seem to work + echo "@setupCudaHook@" >> "${!cudaPropagateToOutput}/nix-support/propagated-native-build-inputs" + + local propagatedBuildInputs=( "${!cudaHostPathsSeen[@]}" ) + for output in $(getAllOutputNames) ; do + if [[ ! "$output" = "$cudaPropagateToOutput" ]] ; then + propagatedBuildInputs+=( "${!output}" ) + fi + break + done + + # One'd expect this should be propagated-host-host-deps, but that doesn't seem to work + printWords "${propagatedBuildInputs[@]}" >> "${!cudaPropagateToOutput}/nix-support/propagated-build-inputs" +} +postFixupHooks+=(propagateCudaLibraries) diff --git a/pkgs/development/cuda-modules/tensorrt/fixup.nix b/pkgs/development/cuda-modules/tensorrt/fixup.nix new file mode 100644 index 0000000000000..43a7dfb817840 --- /dev/null +++ b/pkgs/development/cuda-modules/tensorrt/fixup.nix @@ -0,0 +1,114 @@ +{ + cudaVersion, + final, + hostPlatform, + lib, + mkVersionedPackageName, + package, + patchelf, + requireFile, + ... +}: +let + inherit (lib) + maintainers + meta + strings + versions + ; + targetArch = + if hostPlatform.isx86_64 then + "x86_64-linux-gnu" + else if hostPlatform.isAarch64 then + "aarch64-linux-gnu" + else + "unsupported"; +in +finalAttrs: prevAttrs: { + # Useful for inspecting why something went wrong. + brokenConditions = + let + cudaTooOld = strings.versionOlder cudaVersion package.minCudaVersion; + cudaTooNew = + (package.maxCudaVersion != null) && strings.versionOlder package.maxCudaVersion cudaVersion; + cudnnVersionIsSpecified = package.cudnnVersion != null; + cudnnVersionSpecified = versions.majorMinor package.cudnnVersion; + cudnnVersionProvided = versions.majorMinor finalAttrs.passthru.cudnn.version; + cudnnTooOld = + cudnnVersionIsSpecified && (strings.versionOlder cudnnVersionProvided cudnnVersionSpecified); + cudnnTooNew = + cudnnVersionIsSpecified && (strings.versionOlder cudnnVersionSpecified cudnnVersionProvided); + in + prevAttrs.brokenConditions + // { + "CUDA version is too old" = cudaTooOld; + "CUDA version is too new" = cudaTooNew; + "CUDNN version is too old" = cudnnTooOld; + "CUDNN version is too new" = cudnnTooNew; + }; + + src = requireFile { + name = package.filename; + inherit (package) hash; + message = '' + To use the TensorRT derivation, you must join the NVIDIA Developer Program and + download the ${package.version} TAR package for CUDA ${cudaVersion} from + ${finalAttrs.meta.homepage}. + + Once you have downloaded the file, add it to the store with the following + command, and try building this derivation again. + + $ nix-store --add-fixed sha256 ${package.filename} + ''; + }; + + # We need to look inside the extracted output to get the files we need. + sourceRoot = "TensorRT-${finalAttrs.version}"; + + buildInputs = prevAttrs.buildInputs ++ [ finalAttrs.passthru.cudnn.lib ]; + + preInstall = + (prevAttrs.preInstall or "") + + '' + # Replace symlinks to bin and lib with the actual directories from targets. + for dir in bin lib; do + rm "$dir" + mv "targets/${targetArch}/$dir" "$dir" + done + ''; + + # Tell autoPatchelf about runtime dependencies. + postFixup = + let + versionTriple = "${versions.majorMinor finalAttrs.version}.${versions.patch finalAttrs.version}"; + in + (prevAttrs.postFixup or "") + + '' + ${meta.getExe' patchelf "patchelf"} --add-needed libnvinfer.so \ + "$lib/lib/libnvinfer.so.${versionTriple}" \ + "$lib/lib/libnvinfer_plugin.so.${versionTriple}" \ + "$lib/lib/libnvinfer_builder_resource.so.${versionTriple}" + ''; + + passthru = { + useCudatoolkitRunfile = strings.versionOlder cudaVersion "11.3.999"; + # The CUDNN used with TensorRT. + # If null, the default cudnn derivation will be used. + # If a version is specified, the cudnn derivation with that version will be used, + # unless it is not available, in which case the default cudnn derivation will be used. + cudnn = + let + desiredName = mkVersionedPackageName "cudnn" package.cudnnVersion; + desiredIsAvailable = final ? desiredName; + in + if package.cudnnVersion == null || !desiredIsAvailable then final.cudnn else final.${desiredName}; + }; + + meta = prevAttrs.meta // { + badPlatforms = + prevAttrs.meta.badPlatforms or [ ] + ++ lib.optionals (targetArch == "unsupported") [ hostPlatform.system ]; + homepage = "https://developer.nvidia.com/tensorrt"; + maintainers = prevAttrs.meta.maintainers ++ [maintainers.aidalgol]; + }; +} diff --git a/pkgs/development/cuda-modules/tensorrt/releases.nix b/pkgs/development/cuda-modules/tensorrt/releases.nix new file mode 100644 index 0000000000000..d6a1f0487dd43 --- /dev/null +++ b/pkgs/development/cuda-modules/tensorrt/releases.nix @@ -0,0 +1,130 @@ +# NOTE: Check https://developer.nvidia.com/nvidia-tensorrt-8x-download. +# Version policy is to keep the latest minor release for each major release. +{ + tensorrt.releases = { + # jetson + linux-aarch64 = []; + # powerpc + linux-ppc64le = []; + # server-grade arm + linux-sbsa = [ + { + version = "8.2.5.1"; + minCudaVersion = "11.4"; + maxCudaVersion = "11.4"; + cudnnVersion = "8.2"; + filename = "TensorRT-8.2.5.1.Ubuntu-20.04.aarch64-gnu.cuda-11.4.cudnn8.2.tar.gz"; + hash = "sha256-oWfQ3lq2aoMPv65THeotnMilTzP+QWqKeToLU8eO+qo="; + } + { + version = "8.4.3.1"; + minCudaVersion = "11.6"; + maxCudaVersion = "11.6"; + cudnnVersion = "8.4"; + filename = "TensorRT-8.4.3.1.Ubuntu-20.04.aarch64-gnu.cuda-11.6.cudnn8.4.tar.gz"; + hash = "sha256-9tLlrB8cKYFvN2xF0Pol5CZs06iuuI5mq+6jpzD8wWI="; + } + { + version = "8.5.3.1"; + minCudaVersion = "11.8"; + maxCudaVersion = "11.8"; + cudnnVersion = "8.6"; + filename = "TensorRT-8.5.3.1.Ubuntu-20.04.aarch64-gnu.cuda-11.8.cudnn8.6.tar.gz"; + hash = "sha256-GW//mX0brvN/waHo9Wd07xerOEz3X/H/HAW2ZehYtTA="; + } + { + version = "8.6.1.6"; + minCudaVersion = "12.0"; + maxCudaVersion = "12.0"; + cudnnVersion = null; + filename = "TensorRT-8.6.1.6.Ubuntu-20.04.aarch64-gnu.cuda-12.0.tar.gz"; + hash = "sha256-Lc4+v/yBr17VlecCSFMLUDlXMTYV68MGExwnUjGme5E="; + } + ]; + # x86_64 + linux-x86_64 = [ + { + version = "8.0.3.4"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + cudnnVersion = "8.2"; + filename = "TensorRT-8.0.3.4.Linux.x86_64-gnu.cuda-10.2.cudnn8.2.tar.gz"; + hash = "sha256-LxcXgwe1OCRfwDsEsNLIkeNsOcx3KuF5Sj+g2dY6WD0="; + } + { + version = "8.0.3.4"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.3"; + cudnnVersion = "8.2"; + filename = "TensorRT-8.0.3.4.Linux.x86_64-gnu.cuda-11.3.cudnn8.2.tar.gz"; + hash = "sha256-MXdDUCT/SqWm26jB7QarEcwOG/O7cS36Y6Q0IvQTE/M="; + } + { + version = "8.2.5.1"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + cudnnVersion = "8.2"; + filename = "TensorRT-8.2.5.1.Linux.x86_64-gnu.cuda-10.2.cudnn8.2.tar.gz"; + hash = "sha256-XV2Bf2LH8OM2GEMjV80MDweb1hSVF/wFUcaW3KP2m8Q="; + } + { + # The docs claim this supports through 11.5 despite the file name indicating 11.4. + version = "8.2.5.1"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.5"; + cudnnVersion = "8.2"; + filename = "TensorRT-8.2.5.1.Linux.x86_64-gnu.cuda-11.4.cudnn8.2.tar.gz"; + hash = "sha256-LcNpYvDiT7AavqzK1MRlijo2qDN7jznigeS77US713E="; + } + { + version = "8.4.3.1"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + cudnnVersion = "8.4"; + filename = "TensorRT-8.4.3.1.Linux.x86_64-gnu.cuda-10.2.cudnn8.4.tar.gz"; + hash = "sha256-2c3Zzt93FBWWQtrSIvpbzzS6BT9s0NzALzdwXGLOZEU="; + } + { + # The docs claim this supports through 11.7 despite the file name indicating 11.6. + version = "8.4.3.1"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.7"; + cudnnVersion = "8.4"; + filename = "TensorRT-8.4.3.1.Linux.x86_64-gnu.cuda-11.6.cudnn8.4.tar.gz"; + hash = "sha256-jXwghcFjncxzh1BIwjWYqFJs4wiRNoduMdkCWOSeT2E="; + } + { + version = "8.5.3.1"; + minCudaVersion = "10.2"; + maxCudaVersion = "10.2"; + cudnnVersion = "8.6"; + filename = "TensorRT-8.5.3.1.Linux.x86_64-gnu.cuda-10.2.cudnn8.6.tar.gz"; + hash = "sha256-WCt6yfOmFbrjqdYCj6AE2+s2uFpISwk6urP+2I0BnGQ="; + } + { + version = "8.5.3.1"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + cudnnVersion = "8.6"; + filename = "TensorRT-8.5.3.1.Linux.x86_64-gnu.cuda-11.8.cudnn8.6.tar.gz"; + hash = "sha256-BNeuOYvPTUAfGxI0DVsNrX6Z/FAB28+SE0ptuGu7YDY="; + } + { + version = "8.6.1.6"; + minCudaVersion = "11.0"; + maxCudaVersion = "11.8"; + cudnnVersion = "8.9"; + filename = "TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-11.8.tar.gz"; + hash = "sha256-Fb/mBT1F/uxF7McSOpEGB2sLQ/oENfJC2J3KB3gzd1k="; + } + { + version = "8.6.1.6"; + minCudaVersion = "12.0"; + maxCudaVersion = "12.1"; + cudnnVersion = "8.9"; + filename = "TensorRT-8.6.1.6.Linux.x86_64-gnu.cuda-12.0.tar.gz"; + hash = "sha256-D4FXpfxTKZQ7M4uJNZE3M1CvqQyoEjnNrddYDNHrolQ="; + } + ]; + }; +} diff --git a/pkgs/development/cuda-modules/tensorrt/shims.nix b/pkgs/development/cuda-modules/tensorrt/shims.nix new file mode 100644 index 0000000000000..8be3e7988bb34 --- /dev/null +++ b/pkgs/development/cuda-modules/tensorrt/shims.nix @@ -0,0 +1,16 @@ +# Shims to mimic the shape of ../modules/generic/manifests/{feature,redistrib}/release.nix +{package, redistArch}: +{ + featureRelease.${redistArch}.outputs = { + bin = true; + lib = true; + static = true; + dev = true; + sample = true; + python = true; + }; + redistribRelease = { + name = "TensorRT: a high-performance deep learning interface"; + inherit (package) version; + }; +} diff --git a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch deleted file mode 100644 index a3b2f87f37878..0000000000000 --- a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig.old 2015-06-03 19:53:00.116849746 +0100 -+++ fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig 2015-06-03 19:56:30.112579384 +0100 -@@ -130,6 +130,11 @@ - <!-- New projects will be created with this targets file. --> - <Extension path="/MonoDevelop/ProjectModel/MSBuildItemTypes"> - <!-- If FSharp 3.1 is available, use it. Note XS looks for the first DotNetProject node under 'Extension' --> -+ <Condition id="MSBuildTargetIsAvailable" target="$(FSharpTargetsPath)" > -+ <DotNetProject language="F#" extension="fsproj" guid="{f2a71f9b-5d33-465a-a702-920d77279786}" import="$(FSharpTargetsPath)" resourceHandler="MonoDevelop.FSharp.FSharpResourceIdBuilder"/> -+ </Condition> -+ -+ <!-- If FSharp 3.1 is available, use it. Note XS looks for the first DotNetProject node under 'Extension' --> - <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" > - <DotNetProject language="F#" extension="fsproj" guid="{f2a71f9b-5d33-465a-a702-920d77279786}" import="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" resourceHandler="MonoDevelop.FSharp.FSharpResourceIdBuilder"/> - </Condition> -@@ -182,14 +187,7 @@ - <ProjectTemplate id="FSharpConsoleProject" file="Templates/FSharpConsoleProject.xpt.xml"/> - <ProjectTemplate id="FSharpLibraryProject" file="Templates/FSharpLibraryProject.xpt.xml"/> - <!-- Only include the tutorial project if an F# 3.0 or 3.1 target is available as this includes F# 3.0 specific features --> -- <ComplexCondition> -- <Or> -- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" /> -- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" /> -- </Or> - <ProjectTemplate id="FSharpTutorialProject" file="Templates/FSharpTutorialProject.xpt.xml"/> -- </ComplexCondition> -- - <ProjectTemplate id="FSharpGtkProject" file="Templates/FSharpGtkProject.xpt.xml"/> - <ProjectTemplate id="FSharpNUnitLibraryProject" file="Templates/FSharpNUnitLibraryProject.xpt.xml"/> - </Extension> -@@ -267,13 +265,7 @@ - <!-- F# interactive --> - - <Extension path="/MonoDevelop/Ide/Pads"> -- <ComplexCondition> -- <Or> -- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" /> -- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" /> -- </Or> - <Pad id="MonoDevelop.FSharp.FSharpInteractivePad" defaultPlacement="Bottom" _label="F# Interactive" icon="md-project" class="MonoDevelop.FSharp.FSharpInteractivePad" /> -- </ComplexCondition> - </Extension> - - <Extension path = "/MonoDevelop/Ide/Pads/ProjectPad"> -@@ -281,11 +273,6 @@ - </Extension> - - <Extension path="/MonoDevelop/Ide/Commands"> -- <ComplexCondition> -- <Or> -- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" /> -- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" /> -- </Or> - <Category _name = "F# Integration" id="F# Integration"> - <Command id="MonoDevelop.FSharp.FSharpCommands.ShowFSharpInteractive" - _label = "F# Interactive" -@@ -330,32 +317,19 @@ - macShortcut="Meta|Control|C" - shortcut="Ctrl|Alt|C" /> - </Category> -- </ComplexCondition> - </Extension> - - <Extension path = "/MonoDevelop/SourceEditor2/ContextMenu/Editor"> -- <ComplexCondition> -- <Or> -- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" /> -- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" /> -- </Or> - <SeparatorItem id = "FSharpInteractiveStart" /> - <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendSelection" /> - <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendLine" /> - <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendReferences" /> -- </ComplexCondition> - </Extension> - - <Extension path = "/MonoDevelop/Ide/MainMenu/Edit"> -- <ComplexCondition> -- <Or> -- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" /> -- <Condition id="MSBuildTargetIsAvailable" target="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" /> -- </Or> - <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendSelection" /> - <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendLine" /> - <CommandItem id = "MonoDevelop.FSharp.FSharpCommands.SendReferences" /> -- </ComplexCondition> - </Extension> - - <!--- F# Android --> diff --git a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch deleted file mode 100644 index e53482e0c00b4..0000000000000 --- a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj.orig.old 2015-06-03 18:48:55.345385084 +0100 -+++ fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj.orig 2015-06-03 19:00:11.453399028 +0100 -@@ -185,19 +185,19 @@ - <Private>False</Private> - <HintPath>INSERT_FSPROJ_MDROOT\AddIns\NUnit\MonoDevelop.NUnit.dll</HintPath> - </Reference> -- <ProjectReference Include="..\..\FSharp.CompilerBinding\FSharp.CompilerBinding.fsproj"> -- <Project>{88F6940F-D300-474C-B2A7-E2ECD5B04B57}</Project> -- <Name>FSharp.CompilerBinding</Name> -- </ProjectReference> -+ <Reference Include="FSharp.CompilerBinding"> -+ <Private>True</Private> -+ </Reference> - <ProjectReference Include="Gui\MonoDevelop.FSharp.Gui.csproj"> - <Project>{FD0D1033-9145-48E5-8ED8-E2365252878C}</Project> - <Name>MonoDevelop.FSharp.Gui</Name> - </ProjectReference> -- <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> -+ <Reference Include="FSharp.Core"> - <Private>True</Private> - </Reference> - <Reference Include="FSharp.Compiler.Service"> - <HintPath>packages\FSharp.Compiler.Service.0.0.85\lib\net45\FSharp.Compiler.Service.dll</HintPath> -+ <Private>True</Private> - </Reference> - <Reference Include="Mono.Cecil"> - <HintPath>packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.dll</HintPath> -@@ -213,12 +213,15 @@ - </Reference> - <Reference Include="FantomasLib"> - <HintPath>packages\Fantomas.1.6.0\lib\FantomasLib.dll</HintPath> -+ <Private>True</Private> - </Reference> - <Reference Include="FSharp.Compiler.CodeDom"> - <HintPath>packages\FSharp.Compiler.CodeDom.0.9.1\lib\net40\FSharp.Compiler.CodeDom.dll</HintPath> -+ <Private>True</Private> - </Reference> - <Reference Include="ExtCore"> - <HintPath>packages\ExtCore.0.8.45\lib\net40\ExtCore.dll</HintPath> -+ <Private>True</Private> - </Reference> - </ItemGroup> - <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index e02e76e3ccce3..aa4e8e9600f66 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -1,42 +1,55 @@ -{ stdenv, lib, python3 +{ lib +, python3Packages , fetchFromGitHub -, fetchPypi +, fetchpatch +, installShellFiles , git , spdx-license-list-data +, substituteAll }: -with python3.pkgs; buildPythonApplication rec { - pname = "platformio"; - version = "6.1.6"; +with python3Packages; buildPythonApplication rec { + pname = "platformio"; + version = "6.1.11"; + pyproject = true; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "sha256-BEeMfdmAWqFbQUu8YKKrookQVgmhfZBqXnzeb2gfhms="; + hash = "sha256-NR4UyAt8q5sUGtz1Sy6E8Of7y9WrH9xpcAWzLBeDQmo="; }; outputs = [ "out" "udev" ]; patches = [ - ./fix-searchpath.patch - ./use-local-spdx-license-list.patch + (substituteAll { + src = ./interpreter.patch; + interpreter = (python3Packages.python.withPackages (_: propagatedBuildInputs)).interpreter; + }) + (substituteAll { + src = ./use-local-spdx-license-list.patch; + spdx_license_list_data = spdx-license-list-data.json; + }) ./missing-udev-rules-nixos.patch + (fetchpatch { + # restore PYTHONPATH when calling scons + # https://github.com/platformio/platformio-core/commit/097de2be98af533578671baa903a3ae825d90b94 + url = "https://github.com/platformio/platformio-core/commit/097de2be98af533578671baa903a3ae825d90b94.patch"; + hash = "sha256-yq+/QHCkhAkFND11MbKFiiWT3oF1cHhgWj5JkYjwuY0="; + revert = true; + }) ]; - postPatch = '' - substitute platformio/package/manifest/schema.py platformio/package/manifest/schema.py \ - --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' + nativeBuildInputs = [ + installShellFiles + pythonRelaxDepsHook + setuptools + ]; - substituteInPlace setup.py \ - --replace 'aiofiles==%s" % ("0.8.0" if PY36 else "22.1.*")' 'aiofiles"' \ - --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.23.*")' 'starlette"' \ - --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.20.*")' 'uvicorn"' \ - --replace 'tabulate==%s" % ("0.8.10" if PY36 else "0.9.*")' 'tabulate>=0.8.10,<=0.9"' \ - --replace 'wsproto==%s" % ("1.0.0" if PY36 else "1.2.*")' 'wsproto"' - ''; + pythonRelaxDeps = true; propagatedBuildInputs = [ aiofiles @@ -52,12 +65,14 @@ with python3.pkgs; buildPythonApplication rec { pyserial requests semantic-version + setuptools spdx-license-list-data.json starlette tabulate uvicorn wsproto zeroconf + ]; preCheck = '' @@ -75,6 +90,16 @@ with python3.pkgs; buildPythonApplication rec { postInstall = '' mkdir -p $udev/lib/udev/rules.d cp platformio/assets/system/99-platformio-udev.rules $udev/lib/udev/rules.d/99-platformio-udev.rules + + installShellCompletion --cmd platformio \ + --bash <(_PLATFORMIO_COMPLETE=bash_source $out/bin/platformio) \ + --zsh <(_PLATFORMIO_COMPLETE=zsh_source $out/bin/platformio) \ + --fish <(_PLATFORMIO_COMPLETE=fish_source $out/bin/platformio) + + installShellCompletion --cmd pio \ + --bash <(_PIO_COMPLETE=bash_source $out/bin/pio) \ + --zsh <(_PIO_COMPLETE=zsh_source $out/bin/pio) \ + --fish <(_PIO_COMPLETE=fish_source $out/bin/pio) ''; disabledTestPaths = [ @@ -163,13 +188,16 @@ with python3.pkgs; buildPythonApplication rec { ]); passthru = { - python = python3; + python = python3Packages.python; }; meta = with lib; { + changelog = "https://github.com/platformio/platformio-core/releases/tag/v${version}"; description = "An open source ecosystem for IoT development"; + downloadPage = "https://github.com/platformio/platformio-core"; homepage = "https://platformio.org"; license = licenses.asl20; maintainers = with maintainers; [ mog makefu ]; + mainProgram = "platformio"; }; } diff --git a/pkgs/development/embedded/platformio/fix-searchpath.patch b/pkgs/development/embedded/platformio/interpreter.patch index fe7f9f127a7ad..f7e212d571119 100644 --- a/pkgs/development/embedded/platformio/fix-searchpath.patch +++ b/pkgs/development/embedded/platformio/interpreter.patch @@ -1,9 +1,18 @@ diff --git a/platformio/proc.py b/platformio/proc.py -index 80e50201..15cee5a5 100644 +index 707245a1..cae17a29 100644 --- a/platformio/proc.py +++ b/platformio/proc.py +@@ -165,7 +165,7 @@ def is_container(): + + + def get_pythonexe_path(): +- return os.environ.get("PYTHONEXEPATH", os.path.normpath(sys.executable)) ++ return "@interpreter@" + + + def copy_pythonpath_to_osenv(): @@ -181,7 +181,7 @@ def copy_pythonpath_to_osenv(): - conditions.append(isdir(join(p, "click")) or isdir(join(p, "platformio"))) + ) if all(conditions): _PYTHONPATH.append(p) - os.environ["PYTHONPATH"] = os.pathsep.join(_PYTHONPATH) diff --git a/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch b/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch index 4be06ceac8b1f..878470920577d 100644 --- a/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch +++ b/pkgs/development/embedded/platformio/missing-udev-rules-nixos.patch @@ -1,10 +1,12 @@ diff --git a/platformio/exception.py b/platformio/exception.py -index ef1d3bab..445174fc 100644 +index 80ffb496..ea064f97 100644 --- a/platformio/exception.py +++ b/platformio/exception.py -@@ -57,6 +57,7 @@ class MissedUdevRules(InvalidUdevRules): +@@ -49,6 +49,7 @@ class MissedUdevRules(InvalidUdevRules): MESSAGE = ( "Warning! Please install `99-platformio-udev.rules`. \nMore details: " "https://docs.platformio.org/en/latest/core/installation/udev-rules.html" -+ "On NixOS add the platformio-core.udev package to services.udev.packages" ++ "On NixOS set `services.udev.packages = with pkgs; [ platformio-core.udev ];`." ) + + diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch index 6db8585a55f39..ba9b55b788a1b 100644 --- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -1,23 +1,17 @@ diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py -index 1e5f935a..26d1ac6a 100644 +index 95e08108..6c2cfaed 100644 --- a/platformio/package/manifest/schema.py +++ b/platformio/package/manifest/schema.py -@@ -276,9 +276,12 @@ class ManifestSchema(BaseSchema): +@@ -276,9 +276,6 @@ class ManifestSchema(BaseSchema): @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- version = "3.19" +- version = "3.21" - spdx_data_url = ( - "https://raw.githubusercontent.com/spdx/license-list-data/" -- "v%s/json/licenses.json" % version +- f"v{version}/json/licenses.json" - ) - return json.loads(fetch_remote_content(spdx_data_url)) -+ # version = "3.19" -+ # spdx_data_url = ( -+ # "https://raw.githubusercontent.com/spdx/license-list-data/" -+ # "v%s/json/licenses.json" % version -+ # ) -+ # return json.loads(fetch_remote_content(spdx_data_url)) -+ with open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json") as f: -+ spdx = json.load(f) ++ with open("@spdx_license_list_data@/json/licenses.json") as fd: ++ spdx = json.load(fd) + return spdx diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index 4ff90b4f85a6a..ad270e0ba6515 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.4"; + version = "0.3.8"; src = fetchCrate { inherit version pname; - hash = "sha256-rdBUEOyE4bHqPXZs3MxT/oivagKmJIVE/hI9mp0RY0k="; + hash = "sha256-daATz1bd5fwfYnfVbweJd/I6SsQyg2CC+MEZ5WLyZBw="; }; - cargoHash = "sha256-mPz8m/9VGKSqXan/R1k1JTZ9a44CwCL6JefVyeeREeE="; + cargoHash = "sha256-TSLUBkPRab6cwlXJw8tHpqYjhLtVa+QJZq13Qj/0UzU="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/development/embedded/xc3sprog/default.nix b/pkgs/development/embedded/xc3sprog/default.nix index 393a11f8a4485..fa9ceffafbbb2 100644 --- a/pkgs/development/embedded/xc3sprog/default.nix +++ b/pkgs/development/embedded/xc3sprog/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" + # fix build with gcc 11+ + "-DCMAKE_CXX_STANDARD=14" ]; meta = with lib; { diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index ac5d373955f5e..ff31b009da316 100644 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; doCheck = true; + # In procedure bytevector-u8-ref: Argument 2 out of range + dontStrip = stdenv.isDarwin; + meta = with lib; { description = "Bindings to Libgcrypt for GNU Guile"; homepage = "https://notabug.org/cwebber/guile-gcrypt"; diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 7c092db5a7eb7..a355ed44777a2 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { "--with-gnu-filesystem-hierarchy" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + postFixup = '' for f in $out/${guile.siteDir}/ncurses/**.scm; do \ substituteInPlace $f \ diff --git a/pkgs/development/hare-third-party/hare-compress/default.nix b/pkgs/development/hare-third-party/hare-compress/default.nix new file mode 100644 index 0000000000000..cc52e3e47eab7 --- /dev/null +++ b/pkgs/development/hare-third-party/hare-compress/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, hare, harec, fetchFromSourcehut }: + +stdenv.mkDerivation (finalAttrs: { + pname = "hare-compress"; + version = "unstable-2023-11-01"; + + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "hare-compress"; + rev = "562706946871d1c994f60361883269916cbaa08e"; + hash = "sha256-sz8xPBZaUFye3HH4lkRnH52ye451e6seZXN/qvg87jE="; + }; + + nativeBuildInputs = [ hare ]; + + makeFlags = [ + "HARECACHE=.harecache" + "PREFIX=${builtins.placeholder "out"}" + ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://git.sr.ht/~sircmpwn/hare-compress/"; + description = "Compression algorithms for Hare"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ starzation ]; + + inherit (harec.meta) platforms badPlatforms; + }; +}) diff --git a/pkgs/development/hare-third-party/hare-ev/default.nix b/pkgs/development/hare-third-party/hare-ev/default.nix new file mode 100644 index 0000000000000..2186c0eaf532d --- /dev/null +++ b/pkgs/development/hare-third-party/hare-ev/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, fetchFromSourcehut +, hare +, unstableGitUpdater +}: + +stdenv.mkDerivation { + pname = "hare-ev"; + version = "unstable-2023-10-31"; + + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "hare-ev"; + rev = "9bdbd02401334b7d762131a46e64ca2cd24846dc"; + hash = "sha256-VY8nsy5kLDMScA2ig3Rgbkf6VQlCTnGWjzGvsI9OcaQ="; + }; + + nativeCheckInputs = [ + hare + ]; + + makeFlags = [ + "HARECACHE=.harecache" + "PREFIX=${builtins.placeholder "out"}" + ]; + + doCheck = true; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "Event loop for Hare programs"; + homepage = "https://sr.ht/~sircmpwn/hare-ev"; + license = licenses.mpl20; + maintainers = with maintainers; [ colinsane ]; + inherit (hare.meta) platforms badPlatforms; + }; +} diff --git a/pkgs/development/hare-packages/hare-json/default.nix b/pkgs/development/hare-third-party/hare-json/default.nix index d9afdeadf7f01..c7a71f342967e 100644 --- a/pkgs/development/hare-packages/hare-json/default.nix +++ b/pkgs/development/hare-third-party/hare-json/default.nix @@ -2,29 +2,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "hare-json"; - version = "unstable-2023-09-21"; + version = "unstable-2023-03-13"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hare-json"; - rev = "e24e5dceb8628ff569338e6c4fdba35a5017c5e2"; - hash = "sha256-7QRieokqXarKwLfZynS8Rum9JV9hcxod00BWAUwwliM="; + rev = "88256102a9fec62d494628e32cb406574e49e5e1"; + hash = "sha256-Sx+RBiLhR3ftP89AwinVlBg0u0HX4GVP7TLmuofgC9s="; }; nativeBuildInputs = [ hare ]; - configurePhase = '' - runHook preConfigure - - export HARECACHE="$NIX_BUILD_TOP/.harecache" - export BINOUT="$NIX_BUILD_TOP/.bin" - - makeFlagsArray+=( - PREFIX="${builtins.placeholder "out"}" - ) - - runHook postConfigure - ''; + makeFlags = [ + "HARECACHE=.harecache" + "PREFIX=${builtins.placeholder "out"}" + ]; doCheck = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c0f0f0526cbf2..833d85d2ddd32 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -904,6 +904,63 @@ self: super: { ''; }) super.structured-haskell-mode; + inherit (let + csound_src_git = pkgs.fetchFromGitHub { + owner = "spell-music"; + repo = "csound-expression"; + rev = "345df2c91c9831dd895f58951990165598504814"; + hash = "sha256-6qPiKsZwZpqB2kmckKDKyQPTcWPIaVwi+EYs74tRod0="; + }; + in { + # Compilation on recent GHC is fixed on git, but not yet on hackage + # https://github.com/spell-music/csound-expression/pull/68 + csound-expression-typed = + assert super.csound-expression-typed.version == "0.2.7"; + overrideCabal (drv: { + src = csound_src_git + "/csound-expression-typed"; + editedCabalFile = null; + }) super.csound-expression-typed; + + csound-expression-dynamic = + assert super.csound-expression-dynamic.version == "0.3.9"; + overrideCabal (drv: { + src = csound_src_git + "/csound-expression-dynamic"; + editedCabalFile = null; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + self.base64-bytestring self.cereal self.cereal-text + self.cryptohash-sha256 self.pretty-show self.safe + self.unordered-containers self.vector self.wl-pprint-text + ]; + }) super.csound-expression-dynamic; + + csound-expression = + assert super.csound-expression.version == "5.4.3"; + overrideCabal (drv: { + src = csound_src_git + "/csound-expression"; + editedCabalFile = null; + }) super.csound-expression; + + csound-expression-opcodes = + assert super.csound-expression-opcodes.version == "0.0.5.1"; + overrideCabal (drv: { + src = csound_src_git + "/csound-expression-opcodes"; + editedCabalFile = null; + }) super.csound-expression-opcodes; + + csound-sampler = + assert super.csound-sampler.version == "0.0.10.1"; + overrideCabal (drv: { + src = csound_src_git + "/csound-sampler"; + editedCabalFile = null; + }) super.csound-sampler; + }) + csound-expression-typed + csound-expression-dynamic + csound-expression + csound-expression-opcodes + csound-sampler + ; + # Make elisp files available at a location where people expect it. hindent = (overrideCabal (drv: { # We cannot easily byte-compile these files, unfortunately, because they diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix deleted file mode 100644 index 893d5f398ab79..0000000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ /dev/null @@ -1,195 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -let - inherit (pkgs.stdenv.hostPlatform) isDarwin; -in - -self: super: { - - llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - - # Disable GHC 8.8.x core libraries. - array = null; - base = null; - binary = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-boot = null; - ghc-boot-th = null; - ghc-compact = null; - ghc-heap = null; - ghc-prim = null; - ghci = null; - haskeline = null; - hpc = null; - integer-gmp = null; - libiserv = null; - mtl = null; - parsec = null; - pretty = null; - process = null; - rts = null; - stm = null; - template-haskell = null; - # GHC only builds terminfo if it is a native compiler - terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6; - text = null; - time = null; - transformers = null; - unix = null; - # GHC only bundles the xhtml library if haddock is enabled, check if this is - # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0; - # These core package only exist for GHC >= 9.4. The best we can do is feign - # their existence to callPackages, but their is no shim for lower GHC versions. - system-cxx-std-lib = null; - - # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work - Cabal-syntax = self.Cabal-syntax_3_6_0_0; - - # GHC 8.8.x can build haddock version 2.23.* - haddock = self.haddock_2_23_1; - haddock-api = self.haddock-api_2_23_1; - - # This build needs a newer version of Cabal. - cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; }; - - # Additionally depends on OneTuple for GHC < 9.0 - base-compat-batteries = addBuildDepend self.OneTuple super.base-compat-batteries; - - # For GHC < 9.4, some packages need data-array-byte as an extra dependency - primitive = addBuildDepends [ self.data-array-byte ] super.primitive; - hashable = addBuildDepends [ - self.data-array-byte - self.base-orphans - ] super.hashable; - - # Ignore overly restrictive upper version bounds. - aeson-diff = doJailbreak super.aeson-diff; - async = doJailbreak super.async; - ChasingBottoms = doJailbreak super.ChasingBottoms; - chell = doJailbreak super.chell; - Diff = dontCheck super.Diff; - doctest = overrideCabal (drv: { - jailbreak = true; - # The test case relies on the Printf module which did not exist in base 4.13 - testFlags = drv.testFlags or [ ] ++ [ - "--skip=/Main/doctest (regression tests)/template-haskell-bugfix/" - ]; - }) super.doctest; - hashable-time = doJailbreak super.hashable-time; - hledger-lib = doJailbreak super.hledger-lib; # base >=4.8 && <4.13, easytest >=0.2.1 && <0.3 - integer-logarithms = doJailbreak super.integer-logarithms; - lucid = doJailbreak super.lucid; - parallel = doJailbreak super.parallel; - setlocale = doJailbreak super.setlocale; - split = doJailbreak super.split; - system-fileio = doJailbreak super.system-fileio; - tasty-expected-failure = doJailbreak super.tasty-expected-failure; - tasty-hedgehog = doJailbreak super.tasty-hedgehog; - test-framework = doJailbreak super.test-framework; - th-expand-syns = doJailbreak super.th-expand-syns; - # TODO: remove when upstream accepts https://github.com/snapframework/io-streams-haproxy/pull/17 - io-streams-haproxy = doJailbreak super.io-streams-haproxy; # base >=4.5 && <4.13 - snap-server = doJailbreak super.snap-server; - exact-pi = doJailbreak super.exact-pi; - time-compat = doJailbreak super.time-compat; - http-media = unmarkBroken (doJailbreak super.http-media); - servant-server = unmarkBroken (doJailbreak super.servant-server); - basement = doDistribute self.basement_0_0_14; - foundation = doDistribute (dontCheck self.foundation_0_0_28); - vault = dontHaddock super.vault; - - # https://github.com/snapframework/snap-core/issues/288 - snap-core = overrideCabal (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail = Fail.fail' ''"; }) super.snap-core; - - # Upstream ships a broken Setup.hs file. - csv = overrideCabal (drv: { prePatch = "rm Setup.hs"; }) super.csv; - - # https://github.com/kowainik/relude/issues/241 - relude = dontCheck super.relude; - - # The current version 2.14.2 does not compile with ghc-8.8.x or newer because - # of issues with Cabal 3.x. - darcs = dontDistribute super.darcs; - - # liquidhaskell does not support ghc version 8.8.x. - liquid = markBroken super.liquid; - liquid-base = markBroken super.liquid-base; - liquid-bytestring = markBroken super.liquid-bytestring; - liquid-containers = markBroken super.liquid-containers; - liquid-ghc-prim = markBroken super.liquid-ghc-prim; - liquid-parallel = markBroken super.liquid-parallel; - liquid-platform = markBroken super.liquid-platform; - liquid-prelude = markBroken super.liquid-prelude; - liquid-vector = markBroken super.liquid-vector; - liquidhaskell = markBroken super.liquidhaskell; - - # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore. - exceptions = super.exceptions_0_10_7; - - ormolu = super.ormolu_0_2_0_0; - - ghc-api-compat = doDistribute (unmarkBroken super.ghc-api-compat_8_6); - - mime-string = disableOptimization super.mime-string; - - haskell-language-server = throw "haskell-language-server dropped support for ghc 8.8 in version 1.9.0.0 please use a newer ghc version or an older nixpkgs version"; - - hlint = self.hlint_3_2_8; - - ghc-lib-parser = doDistribute self.ghc-lib-parser_8_10_7_20220219; - ghc-lib = doDistribute self.ghc-lib_8_10_7_20220219; - - # ghc versions which don’t match the ghc-lib-parser-ex version need the - # additional dependency to compile successfully. - ghc-lib-parser-ex = doDistribute (addBuildDepend self.ghc-lib-parser self.ghc-lib-parser-ex_8_10_0_24); - - # has a restrictive lower bound on Cabal - fourmolu = doJailbreak super.fourmolu; - - # Overly-strict bounds introducted by a revision in version 0.3.2. - text-metrics = doJailbreak super.text-metrics; - - # OneTuple needs hashable (instead of ghc-prim) and foldable1-classes-compat for GHC < 9 - OneTuple = addBuildDepends [ - self.foldable1-classes-compat - ] (super.OneTuple.override { - ghc-prim = self.hashable; - }); - - # Temporarily disabled blaze-textual for GHC >= 9.0 causing hackage2nix ignoring it - # https://github.com/paul-rouse/mysql-simple/blob/872604f87044ff6d1a240d9819a16c2bdf4ed8f5/Database/MySQL/Internal/Blaze.hs#L4-L10 - mysql-simple = addBuildDepends [ - self.blaze-textual - ] super.mysql-simple; - - # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0) - inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp; - - # Depends on OneTuple for GHC < 9.0 - universe-base = addBuildDepends [ self.OneTuple ] super.universe-base; - - # doctest-parallel dependency requires newer Cabal - regex-tdfa = dontCheck super.regex-tdfa; - - # Unnecessarily strict lower bound on base - # https://github.com/mrkkrp/megaparsec/pull/485#issuecomment-1250051823 - megaparsec = doJailbreak super.megaparsec; - - # Needs OneTuple for ghc < 9.2 - binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; - - # Later versions only support GHC >= 9.2 - ghc-exactprint = self.ghc-exactprint_0_6_4; - apply-refact = self.apply-refact_0_9_3_0; - - # Requires GHC < 9.4 - ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); -} 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 803e34163f9d9..2dc7bba14a2bd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -119,9 +119,6 @@ self: super: { # Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25 newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2"; - cborg-json = jailbreakForCurrentVersion super.cborg-json "0.2.5.0"; - serialise = jailbreakForCurrentVersion super.serialise "0.2.6.0"; - # # Too strict bounds, waiting on Hackage release in nixpkgs # @@ -269,7 +266,7 @@ self: super: { }) super.ConfigFile; # The curl executable is required for withApplication tests. - warp_3_3_29 = addTestToolDepend pkgs.curl super.warp_3_3_29; + warp_3_3_30 = addTestToolDepend pkgs.curl super.warp_3_3_30; # 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 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 290b3f6bc736d..15ebb29456561 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1001,7 +1001,6 @@ broken-packages: - cryptsy-api # failure in job https://hydra.nixos.org/build/233195814 at 2023-09-02 - csa # failure in job https://hydra.nixos.org/build/233233907 at 2023-09-02 - cse-ghc-plugin # failure in job https://hydra.nixos.org/build/233251963 at 2023-09-02 - - csound-expression-dynamic # failure in job https://hydra.nixos.org/build/233225568 at 2023-09-02 - CSPM-Frontend # failure in job https://hydra.nixos.org/build/233219295 at 2023-09-02 - cspretty # failure in job https://hydra.nixos.org/build/233246796 at 2023-09-02 - css-easings # failure in job https://hydra.nixos.org/build/233203513 at 2023-09-02 @@ -3789,7 +3788,6 @@ broken-packages: - nix-freeze-tree # failure in job https://hydra.nixos.org/build/233234834 at 2023-09-02 - nixfromnpm # failure in job https://hydra.nixos.org/build/233239168 at 2023-09-02 - nixpkgs-update # failure in job https://hydra.nixos.org/build/233196708 at 2023-09-02 - - nix-serve-ng # failure in job https://hydra.nixos.org/build/233214170 at 2023-09-02 - nix-tools # failure in job https://hydra.nixos.org/build/233662959 at 2023-09-02 - nlp-scores # failure in job https://hydra.nixos.org/build/233232770 at 2023-09-02 - NMap # failure in job https://hydra.nixos.org/build/233246148 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 87df614acb81c..e4ab07de038e0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1005,12 +1005,6 @@ dont-distribute-packages: - cryptonite-cd - crystalfontz - csg - - csound-catalog - - csound-controllers - - csound-expression - - csound-expression-opcodes - - csound-expression-typed - - csound-sampler - cspmchecker - csv-enumerator - ctpl @@ -3877,7 +3871,6 @@ dont-distribute-packages: - techlab - telegram-bot - telegram-raw-api - - temporal-csound - ten-lens - ten-unordered-containers - tensorflow-opgen diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3f7672fb8e180..02c9e506cb656 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -357,18 +357,13 @@ self: super: builtins.intersectAttrs super { # Doesn't declare boost dependency nix-serve-ng = overrideSrc { - src = assert super.nix-serve-ng.version == "1.0.0"; - # Workaround missing files in sdist - # https://github.com/aristanetworks/nix-serve-ng/issues/10 - # - # Workaround for libstore incompatibility with Nix 2.13 - # https://github.com/aristanetworks/nix-serve-ng/issues/22 - pkgs.fetchFromGitHub { - repo = "nix-serve-ng"; - owner = "aristanetworks"; - rev = "dabf46d65d8e3be80fa2eacd229eb3e621add4bd"; - hash = "sha256-SoJJ3rMtDMfUzBSzuGMY538HDIj/s8bPf8CjIkpqY2w="; - }; + version = "1.0.0-unstable-2023-12-18"; + src = pkgs.fetchFromGitHub { + repo = "nix-serve-ng"; + owner = "aristanetworks"; + rev = "21e65cb4c62b5c9e3acc11c3c5e8197248fa46a4"; + hash = "sha256-qseX+/8drgwxOb1I3LKqBYMkmyeI5d5gmHqbZccR660="; + }; } (addPkgconfigDepend pkgs.boost.dev super.nix-serve-ng); # These packages try to access the network. diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 7bc1fa0f7e832..e766203bd1f0a 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -18,7 +18,8 @@ let haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; - inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes; + inherit stdenv haskellLib ghc extensible-self all-cabal-hashes; + buildHaskellPackages = buildHaskellPackages // { __attrsFailEvaluation = true; }; }; platformConfigurations = lib.optionals stdenv.hostPlatform.isAarch [ diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d67256774b407..1019774a50e76 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -77372,7 +77372,6 @@ self: { ]; description = "a gallery of Csound instruments"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-controllers" = callPackage @@ -77384,7 +77383,6 @@ self: { libraryHaskellDepends = [ base csound-expression ]; testHaskellDepends = [ base csound-expression ]; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-expression" = callPackage @@ -77406,7 +77404,6 @@ self: { ]; description = "library to make electronic music"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-expression-dynamic" = callPackage @@ -77426,8 +77423,6 @@ self: { ]; description = "dynamic core for csound-expression library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "csound-expression-opcodes" = callPackage @@ -77445,7 +77440,6 @@ self: { ]; description = "opcodes for the library csound-expression"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-expression-typed" = callPackage @@ -77468,7 +77462,6 @@ self: { ]; description = "typed core for the library csound-expression"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csound-sampler" = callPackage @@ -77482,7 +77475,6 @@ self: { libraryHaskellDepends = [ base csound-expression transformers ]; description = "A musical sampler based on Csound"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "csp" = callPackage @@ -214658,9 +214650,7 @@ self: { ]; description = "A drop-in replacement for nix-serve that's faster and more stable"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "nix-serve"; - broken = true; }) {inherit (pkgs) nix;}; "nix-thunk" = callPackage @@ -295736,7 +295726,6 @@ self: { ]; description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "temporal-media" = callPackage diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index c39c934bed643..294ca295f22bf 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -614,7 +614,7 @@ in package-set { inherit pkgs lib callPackage; } self // { Type: [str] -> drv -> drv */ generateOptparseApplicativeCompletions = - self.callPackage ( + (self.callPackage ( { stdenv }: commands: @@ -623,7 +623,7 @@ in package-set { inherit pkgs lib callPackage; } self // { if stdenv.buildPlatform.canExecute stdenv.hostPlatform then lib.foldr haskellLib.__generateOptparseApplicativeCompletion pkg commands else pkg - ) { }; + ) { }) // { __attrsFailEvaluation = true; }; /* Modify given Haskell package to force GHC to employ the LLVM diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 9953eaa3144c1..bf37d19cd8c4d 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { which perl hostname # Some of the books require one or more of these external tools: glucose minisat abc-verifier libipasir - z3 (python3.withPackages (ps: [ ps.z3 ])) + z3 (python3.withPackages (ps: [ ps.z3-solver ])) ]; # NOTE: Parallel building can be memory-intensive depending on the number of diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 33e964ddeedbb..6f5b889883910 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -23,13 +23,13 @@ assert genBytecode -> ((bqn-path != null) && (mbqn-source != null)); stdenv.mkDerivation rec { pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; rev = "v${version}"; - hash = "sha256-jS60phZMrpGa+GVzZSGZwVVtW9RBp/oHRIYP/pXRU2I="; + hash = "sha256-PCpePevWQ+aPG6Yx3WqBZ4yTeyJsCGkYMSY6kzGDL1U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/bqn/cbqn/replxx.nix b/pkgs/development/interpreters/bqn/cbqn/replxx.nix index 2074111d45f53..71b479a4cda48 100644 --- a/pkgs/development/interpreters/bqn/cbqn/replxx.nix +++ b/pkgs/development/interpreters/bqn/cbqn/replxx.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "replxx"; - version = "unstable-2023-02-26"; + version = "unstable-2023-10-31"; src = fetchFromGitHub { owner = "dzaima"; repo = "replxx"; - rev = "1da4681a8814366ec51e7630b76558e53be0997d"; - hash = "sha256-Zs7ItuK31n0VSxwOsPUdZZLr68PypitZqcydACrx90Q="; + rev = "13f7b60f4f79c2f14f352a76d94860bad0fc7ce9"; + hash = "sha256-xPuQ5YBDSqhZCwssbaN/FcTZlc3ampYl7nfl2bbsgBA="; }; dontConfigure = true; diff --git a/pkgs/development/interpreters/bqn/cbqn/singeli.nix b/pkgs/development/interpreters/bqn/cbqn/singeli.nix index af7eeb89a0e91..212b96b6cb3f0 100644 --- a/pkgs/development/interpreters/bqn/cbqn/singeli.nix +++ b/pkgs/development/interpreters/bqn/cbqn/singeli.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "singeli"; - version = "unstable-2023-09-12"; + version = "unstable-2023-11-22"; src = fetchFromGitHub { owner = "mlochbaum"; repo = "Singeli"; - rev = "49a6a90d83992171a2db749e9f7fd400ec65ef2c"; - hash = "sha256-9Dc6yrrXV6P9s1uwGlXB+ZBquOLejWe41k0TSpJGDgE="; + rev = "528faaf9e2a7f4f3434365bcd91d6c18c87c4f08"; + hash = "sha256-/z1KHqflCqPGC9JU80jtgqdk2mkX06eWSziuf4TU4TM="; }; dontConfigure = true; diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 127541c727ec0..0ff0f6a498169 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { }; strictDeps = true; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ autoconf269 automake libtool ]; + nativeBuildInputs = [ autoconf269 automake libtool ]; buildInputs = [libsigsegv] ++ lib.optional (gettext != null) gettext ++ lib.optional (ncurses != null) ncurses @@ -81,6 +81,7 @@ stdenv.mkDerivation { postPatch = '' sed -e 's@9090@64237@g' -i tests/socket.tst sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in + sed -i 's@1\.16\.2@${automake.version}@' src/aclocal.m4 find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i ''; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index bc7ef5769986d..630b5f5193fb6 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.11.1.1413"; + version = "1.11.1.1429"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-k8Olo63KUcWFgGNBmr9myD2/JOoV4f2S95v35mI4H+A="; + hash = "sha256-ov3s1qPGHfPGAPtgwAqPG+hU6R5nGMA7ucg8QVpquC4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/elixir/1.16.nix b/pkgs/development/interpreters/elixir/1.16.nix new file mode 100644 index 0000000000000..8a320eae7bb2e --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.16.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: +mkDerivation { + version = "1.16.0"; + sha256 = "sha256-nM3TpX18zdjDAFkljsAqwKx/1AQmwDMIQCeL75etTQc="; + # https://hexdocs.pm/elixir/1.16.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/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 348d054a6c773..7901d24d0f771 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -8,10 +8,11 @@ , curl , bash , debugInfo ? false -}: +} @ inputs: { baseName ? "elixir" , version +, erlang ? inputs.erlang , minimumOTPVersion , sha256 ? null , rev ? "v${version}" diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index a938d19736ec5..341888f6cda78 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -7,7 +7,6 @@ , re2c , gperf , gawk -, xxd , pkg-config , boost182 , fmt @@ -18,6 +17,8 @@ , libcap , liburing , openssl +, cereal +, cmake , asciidoctor }: @@ -40,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "emilua"; - version = "0.4.3"; + version = "0.5.1"; src = fetchFromGitLab { owner = "emilua"; repo = "emilua"; rev = "v${version}"; - hash = "sha256-vZITPQ1qUHhw24c0HKdR6VenviOc6JizQQ8w7K94irc="; + hash = "sha256-5NzxZHdQGw3qLEzW/mv1sLCuqehn5pjUYkCna4PUzDQ="; }; buildInputs = [ @@ -59,19 +60,22 @@ stdenv.mkDerivation rec { libcap liburing openssl + cereal ]; nativeBuildInputs = [ re2c gperf gawk - xxd pkg-config asciidoctor meson + cmake ninja ]; + dontUseCmakeConfigure = true; + # Meson is no longer able to pick up Boost automatically. # https://github.com/NixOS/nixpkgs/issues/86131 env = { @@ -80,13 +84,12 @@ stdenv.mkDerivation rec { }; mesonFlags = [ - "-Dversion_suffix=-nixpkgs1" - "-Denable_http=true" - "-Denable_file_io=true" - "-Denable_io_uring=true" - "-Denable_linux_namespaces=true" - "-Denable_tests=true" - "-Denable_manpages=true" + (lib.mesonOption "version_suffix" "-nixpkgs1") + (lib.mesonBool "enable_http" true) + (lib.mesonBool "enable_file_io" true) + (lib.mesonBool "enable_io_uring" true) + (lib.mesonBool "enable_tests" true) + (lib.mesonBool "enable_manpages" true) ]; postPatch = '' diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index a0e55bad3c5a7..502983438df5e 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "26.1.2"; - sha256 = "sha256-exLLdg7z/HKJI81w33vcQUDF6NG5n2WKtcYwdPxN+0A="; + version = "26.2"; + sha256 = "sha256-mk8vPgWFTMo4oPY/OIdboYMTyxG/22Ow4EYs1b+nHuM="; } diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 7b1a9b8b08351..0cb4bef01669f 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-TQG0YNwD3WU50fftFv5nGUK9ucxDXYnbQVv8Dewhwm8="; + sha256 = "sha256-6gSJJ3ptqpYydjg+xf5Pz3iTk0D+bkC6N79OeiKxPHY="; }; - cargoHash = "sha256-F2CduT0/vjoVHua5WshYxsxf4P0QBa+BjFVp7iTsFkU="; + cargoHash = "sha256-MRoEFP7VXBNBe6/e3ezPnzhKACwqTApGH9c0T4ycvg4="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/development/interpreters/expr/default.nix index da0cc15b52f64..7a6384620d449 100644 --- a/pkgs/development/interpreters/expr/default.nix +++ b/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.15.5"; + version = "1.15.7"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-DIJBVL1HAZyD+K+vKnB1O2cZJkBu0R2xueDO1OUHq3I="; + hash = "sha256-dSZVReKQqQMKjVocqz6eoh8/+Yyf37egDf1tJ/JePJ0="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-D4JdFY9OweTigT0NIKmBbxrHn5FoVsj/EU6c0y9aaDo="; + vendorHash = "sha256-ioNXzEQLLpBWhVw4tnDnL/umkEoExHBTSj2WBjIl3PQ="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index a09afadf52712..fb788377107e1 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -74,6 +74,7 @@ builder rec { patches = [ ./eai_system.patch + ./guile-hurd-posix-spawn.patch ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch ++ lib.optional stdenv.isDarwin (fetchpatch { @@ -163,7 +164,7 @@ builder rec { foreign function call interface, and powerful string processing. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ludo lovek323 vrthra ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch b/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch new file mode 100644 index 0000000000000..7cf600b4c2aa5 --- /dev/null +++ b/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch @@ -0,0 +1,44 @@ +Fix <https://issues.guix.gnu.org/61095>, which affects GNU/Hurd. + +diff --git a/libguile/posix.c b/libguile/posix.c +index 3a8be94e4..f5fdc544c 100644 +--- a/libguile/posix.c ++++ b/libguile/posix.c +@@ -1326,7 +1326,14 @@ static void + close_inherited_fds_slow (posix_spawn_file_actions_t *actions, int max_fd) + { + while (--max_fd > 2) +- posix_spawn_file_actions_addclose (actions, max_fd); ++ { ++ /* Adding invalid file descriptors to an 'addclose' action leads ++ to 'posix_spawn' failures on some operating systems: ++ <https://bugs.gnu.org/61095>. Hence the extra check. */ ++ int flags = fcntl (max_fd, F_GETFD, NULL); ++ if ((flags >= 0) && ((flags & FD_CLOEXEC) == 0)) ++ posix_spawn_file_actions_addclose (actions, max_fd); ++ } + } + + static void + +Fix <https://issues.guix.gnu.org/62501>. + +diff --git a/test-suite/tests/posix.test b/test-suite/tests/posix.test +index f20e04453..d5cf47cda 100644 +--- a/test-suite/tests/posix.test ++++ b/test-suite/tests/posix.test +@@ -431,7 +431,13 @@ + (let ((str (get-string-all (car input+output)))) + (close-port (car input+output)) + (waitpid pid) +- str))) ++ ++ ;; On GNU/Hurd, the exec server prepends 'LD_ORIGIN_PATH' for ++ ;; every program: <https://bugs.gnu.org/62501>. Strip it. ++ (if (and (string=? "GNU" (utsname:sysname (uname))) ++ (string-prefix? "LD_ORIGIN_PATH=" str)) ++ (string-drop str (+ 1 (string-index str #\newline))) ++ str)))) + + (pass-if-equal "ls /proc/self/fd" + "0\n1\n2\n3\n" ;fourth FD is for /proc/self/fd diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 1bafd6cb728e8..50dd86f7bd86b 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "1.3.1"; + version = "1.3.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-9SsSXLZFwqsAeWFGsba8OG9bdmfQjn6qQHHQK6IdHK8="; + sha256 = "sha256-sueFfR5KVj6HXR+5XWowL0Zjbuu7K+p/+skcTaXlOMc="; }; - vendorHash = "sha256-VRQUbGJTC2v8w/l4iaNn3vPX3AdV9Likp2nuG0PQieU="; + vendorHash = "sha256-rxWYNGFbFUKjy232DOhVlh341GV2VKLngJKM+DEd27o="; doCheck = false; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index a316a407d80dd..f1cc624b59e77 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jruby"; - version = "9.4.4.0"; + version = "9.4.5.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz"; - hash = "sha256-arEmcK/Y5ciskwX6vkIFV5XF3fn46PGh5g4mDy1yTMA="; + hash = "sha256-pA94xGQczIZ1Lhay2iR/1ryfvPmkhkzxvjb3/3s1aEw="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/interpreters/love/0.7-gl-prototypes.patch b/pkgs/development/interpreters/love/0.7-gl-prototypes.patch deleted file mode 100644 index 0b6778f6a90ba..0000000000000 --- a/pkgs/development/interpreters/love/0.7-gl-prototypes.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --unified --recursive --text love-HEAD.orig/src/modules/graphics/opengl/Framebuffer.cpp love-HEAD.new/src/modules/graphics/opengl/Framebuffer.cpp ---- love-HEAD.orig/src/modules/graphics/opengl/Framebuffer.cpp 2019-03-14 12:46:55.032982224 -0400 -+++ love-HEAD.new/src/modules/graphics/opengl/Framebuffer.cpp 2019-03-14 12:47:22.356175299 -0400 -@@ -1,3 +1,5 @@ -+#define GL_GLEXT_PROTOTYPES -+ - #include "Framebuffer.h" - #include <common/Matrix.h> - -diff --unified --recursive --text love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp love-HEAD.new/src/modules/graphics/opengl/SpriteBatch.cpp ---- love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp 2019-03-14 12:46:55.032982224 -0400 -+++ love-HEAD.new/src/modules/graphics/opengl/SpriteBatch.cpp 2019-03-14 12:47:33.346119890 -0400 -@@ -18,6 +18,8 @@ - * 3. This notice may not be removed or altered from any source distribution. - **/ - -+#define GL_GLEXT_PROTOTYPES -+ - #include "SpriteBatch.h" - - // STD diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/development/interpreters/love/11.nix index 768625e08cfa3..177c3f46086a6 100644 --- a/pkgs/development/interpreters/love/11.nix +++ b/pkgs/development/interpreters/love/11.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "love"; - version = "11.4"; + version = "11.5"; src = fetchFromGitHub { owner = "love2d"; repo = "love"; rev = version; - sha256 = "0kpdp6v8m8j0r7ppyy067shr0lfgrlh0dwb7ccws76d389vizwhb"; + sha256 = "sha256-wZktNh4UB3QH2wAIIlnYUlNoXbjEDwUmPnT4vesZNm0="; }; nativeBuildInputs = [ pkg-config autoconf automake ]; diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 2fda54bef530f..ce91b024ce841 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -65,7 +65,8 @@ let inherit (luaPackages) requiredLuaModules; }; withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; - pkgs = luaPackages; + pkgs = let lp = luaPackages; + in lp // { luaPackages = lp.luaPackages // { __attrsFailEvaluation = true; }; }; interpreter = "${self}/bin/${executable}"; inherit executable luaversion; luaOnBuild = luaOnBuildForHost.override { inherit packageOverrides; self = luaOnBuild; }; diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index bf81832f464b1..949ad6c3d45fc 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.603"; + version = "0.607"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; rev = version; - hash = "sha256-8jm58F2AQcmjy19fydGLOD5fehaaNHGqXtDPu121jmw="; + hash = "sha256-2O+nOgOWXPEbBJlRYnW8PlpG2oeQNZB7k08lFgF+ceE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/octave/patches/bug62436.patch b/pkgs/development/interpreters/octave/patches/bug62436.patch deleted file mode 100644 index d9d7cfc30408f..0000000000000 --- a/pkgs/development/interpreters/octave/patches/bug62436.patch +++ /dev/null @@ -1,27 +0,0 @@ -# HG changeset patch -# User John Donoghue <john.donoghue@ieee.org> -# Date 1652358904 14400 -# Thu May 12 08:35:04 2022 -0400 -# Branch stable -# Node ID 8c940cfcce257369677c09154da2aab2c56eaa79 -# Parent 63710f3bd9811c2d206ac9e7b4f47cf06c47e153 -* scripts/pkg/private/build.m: check configure and Makefile exist before trying to unlink them (Bug #62436) - -diff -r 63710f3bd981 -r 8c940cfcce25 scripts/pkg/private/build.m ---- a/scripts/pkg/private/build.m Wed May 11 09:44:55 2022 -0700 -+++ b/scripts/pkg/private/build.m Thu May 12 08:35:04 2022 -0400 -@@ -77,8 +77,12 @@ - else - arch_abi = getarch (); - configure_make (desc, build_root, verbose); -- unlink (fullfile (build_root, "src", "configure")); -- unlink (fullfile (build_root, "src", "Makefile")); -+ if exist (fullfile (build_root, "src", "configure"), "file") -+ unlink (fullfile (build_root, "src", "configure")); -+ endif -+ if exist (fullfile (build_root, "src", "Makefile"), "file") -+ unlink (fullfile (build_root, "src", "Makefile")); -+ endif - endif - tar_name = [desc.name "-" desc.version "-" arch_abi ".tar"]; - tar_path = fullfile (builddir, tar_name); diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 502bd5522346d..50189a6213ba7 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -57,16 +57,16 @@ in rec { # Maint version perl536 = callPackage ./intepreter.nix { self = perl536; - version = "5.36.1"; - sha256 = "sha256-aCA2Zdjs4CmI/HfckvzLspeoOku0uNB1WEQvl42lTME="; + version = "5.36.3"; + sha256 = "sha256-8qGtiBFjkaF2Ji3ULfxS7yKvtA9MDpgQ8V1WHm8ccmo="; inherit passthruFun; }; # Maint version perl538 = callPackage ./intepreter.nix { self = perl538; - version = "5.38.0"; - sha256 = "sha256-IT71gInS8sly6jU1F9xg7DZW8FDcwCdmbhGLUIQj5Rc="; + version = "5.38.2"; + sha256 = "sha256-oKMVNEUet7g8fWWUpJdUOlTUiLyQygD140diV39AZV4="; inherit passthruFun; }; } diff --git a/pkgs/development/interpreters/perl/intepreter.nix b/pkgs/development/interpreters/perl/intepreter.nix index c16dffe3db697..8861a0ed0456f 100644 --- a/pkgs/development/interpreters/perl/intepreter.nix +++ b/pkgs/development/interpreters/perl/intepreter.nix @@ -236,14 +236,14 @@ stdenv.mkDerivation (rec { mainProgram = "perl"; }; } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.5"; # Jul 03, 2023 + crossVersion = "84db4c71ae3d3b01fb2966cd15a060a7be334710"; # Nov 29, 2023 perl-cross-src = fetchFromGitHub { name = "perl-cross-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "sha256-9nRFJinZUWUSpXXyyIVmhRLQ1B5LB3UmN2iAckmem58="; + sha256 = "sha256-1Zqw4sy/lD2nah0Z8rAE11tSpq1Ym9nBbatDczR+mxs="; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 5f5be6b3d1d83..3082f8b85b62a 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,10 +2,9 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.26"; - hash = "sha256-g73iSchKoaBDqMjQ7qCTRcLK5puXhM3wIin8kW+7nqA="; + version = "8.1.27"; + hash = "sha256-oV/XPqRPLfMLB9JHhuB9GUiw6j7tC4uEVzXVANwov/E="; }); - in base.withExtensions ({ all, ... }: with all; ([ bcmath diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 20aa6aaa0bc08..b934647d9b8c4 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,10 +2,9 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.13"; - hash = "sha256-ZlKfQ7ITEx5rJTxWAr7wXwSUWNISknMPzNY7SKBtZ7o="; + version = "8.2.14"; + hash = "sha256-+HHhMTM9YK5sU3sa3dvCrqVMQ2xWKvmG+4MJwGAEC54="; }); - in base.withExtensions ({ all, ... }: with all; ([ bcmath diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 6327e23504a8f..942507d7d355f 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -1,9 +1,9 @@ -{ callPackage, fetchurl, ... }@_args: +{ callPackage, ... }@_args: let base = callPackage ./generic.nix (_args // { - version = "8.3.0"; - hash = "sha256-3mfQgz1CsZblpm+hozL0Xilsvo6UcuklayoHHDTcXtY="; + version = "8.3.1"; + hash = "sha256-xA+ukZf6aKUy9qBiwxba/jsExUUTa1S56tSTL8JsauE="; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index ba5ce5537bbbc..3bea507ad0a9e 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -53,7 +53,10 @@ let , argon2Support ? true , cgotoSupport ? false , embedSupport ? false + , staticSupport ? false , ipv6Support ? true + , zendSignalsSupport ? true + , zendMaxExecutionTimersSupport ? false , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , valgrindSupport ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind , ztsSupport ? apxs2Support @@ -236,7 +239,6 @@ let # PCRE ++ [ "--with-external-pcre=${pcre2.dev}" ] - # Enable sapis ++ lib.optional (!cgiSupport) "--disable-cgi" ++ lib.optional (!cliSupport) "--disable-cli" @@ -250,11 +252,14 @@ let ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" ++ lib.optional cgotoSupport "--enable-re2c-cgoto" - ++ lib.optional embedSupport "--enable-embed" + ++ lib.optional embedSupport "--enable-embed${lib.optionalString staticSupport "=static"}" ++ lib.optional (!ipv6Support) "--disable-ipv6" ++ lib.optional systemdSupport "--with-fpm-systemd" ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" ++ lib.optional ztsSupport "--enable-zts" + ++ lib.optional staticSupport "--enable-static" + ++ lib.optional (!zendSignalsSupport) ["--disable-zend-signals"] + ++ lib.optional zendMaxExecutionTimersSupport "--enable-zend-max-execution-timers" # Sendmail diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 5ffc5da594135..e4556d95f0fdd 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -95,10 +95,10 @@ in { sourceVersion = { major = "3"; minor = "12"; - patch = "0"; + patch = "1"; suffix = ""; }; - hash = "sha256-eVw09E30Wg6blxDIxxwVxnGHFSTNQSyhTe8hLozLFV0="; + hash = "sha256-jfuPQm/NImZX+eK9Xx6W5TJkllF2+hfTJljoc1ka6yE="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 35116b38f8104..d06f3db334da7 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -2,6 +2,7 @@ self: dontUse: with self; let inherit (python) pythonOnBuildForHost; + inherit (pkgs) runCommand; pythonInterpreter = pythonOnBuildForHost.interpreter; pythonSitePackages = python.sitePackages; pythonCheckInterpreter = python.interpreter; @@ -67,7 +68,7 @@ in { # 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 { + passthru.tests = import ./pypa-build-hook-test.nix { inherit pythonOnBuildForHost runCommand; }; } ./pypa-build-hook.sh) { diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index b5afaf34ce618..2126b796ca9de 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -47,9 +47,6 @@ let toPythonModule = x: x; # Application does not provide modules. })); - # See build-setupcfg/default.nix for documentation. - buildSetupcfg = import ../../../build-support/build-setupcfg lib self; - # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; @@ -92,13 +89,11 @@ let disabledIf = x: drv: if x then disabled drv else drv; in { - inherit lib pkgs stdenv; inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; inherit buildPythonPackage buildPythonApplication; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; - inherit buildSetupcfg; python = toPythonModule python; # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix index 2f6370cc44204..2f548207ea047 100644 --- a/pkgs/development/interpreters/quickjs/default.nix +++ b/pkgs/development/interpreters/quickjs/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "quickjs"; - version = "2021-03-27"; + version = "2021-12-09"; src = fetchFromGitHub { owner = "bellard"; repo = pname; - rev = "b5e62895c619d4ffc75c9d822c8d85f1ece77e5b"; - hash = "sha256-VMaxVVQuJ3DAwYrC14uJqlRBg0//ugYvtyhOXsTUbCA="; + rev = "daa35bc1e5d43192098af9b51caeb4f18f73f9f9"; + hash = "sha256-BhAsa8tumCQ4jK/TbRbptj2iOIUFFjU1MQYdIrDMpko="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 4c5efaa7d5453..38fdd0f71d7fd 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -141,6 +141,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; + dontStrip = stdenv.isDarwin; + meta = with lib; { description = "A programmable programming language"; longDescription = '' diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 66ee788ca4300..60c14d9d4641b 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -1,35 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, rakudo, makeWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, rakudo +, makeBinaryWrapper +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.21.0"; + version = "0.21.2"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; - rev = "v${version}"; - sha256 = "sha256-QVUnn9G28epoUEcK8mwm8S2wDQ/tv5B3Zds7bTUFwlw="; + rev = "v${finalAttrs.version}"; + hash = "sha256-7mqKcioMal4OR/xlzQ/EgGICau7Ijc13j4pSfu4/74E="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ rakudo ]; + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + buildInputs = [ + rakudo + ]; installPhase = '' + runHook preInstall + mkdir -p "$out" # TODO: Find better solution. zef stores cache stuff in $HOME with the # default config. env HOME=$TMPDIR ${rakudo}/bin/raku -I. ./bin/zef --/depends --/test-depends --/build-depends --install-to=$out install . + + runHook postInstall ''; postFixup ='' wrapProgram $out/bin/zef --prefix RAKUDOLIB , "inst#$out" ''; - meta = with lib; { + meta = { description = "Raku / Perl6 Module Management"; homepage = "https://github.com/ugexe/zef"; - license = licenses.artistic2; - platforms = platforms.unix; - maintainers = with maintainers; [ sgo ]; + license = lib.licenses.artistic2; + mainProgram = "zef"; + maintainers = with lib.maintainers; [ sgo ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 3ccbe1e855a3a..e358ea31e0fcd 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -18,7 +18,7 @@ let # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; - generic = { version, sha256, cargoSha256 ? null }: let + generic = { version, hash, cargoHash ? null }: let ver = version; atLeast30 = lib.versionAtLeast ver.majMin "3.0"; atLeast31 = lib.versionAtLeast ver.majMin "3.1"; @@ -65,7 +65,7 @@ let src = fetchurl { url = "https://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz"; - inherit sha256; + inherit hash; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -111,7 +111,7 @@ let # Ruby 3.0 adds `-fdeclspec` to $CC instead of $CFLAGS. Fixed in later versions. (fetchpatch { url = "https://github.com/ruby/ruby/commit/0acc05caf7518cd0d63ab02bfa036455add02346.patch"; - sha256 = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk="; + hash = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk="; }) ] ++ ops (!atLeast30 && rubygemsSupport) [ @@ -126,7 +126,7 @@ let # See https://github.com/ruby/ruby/pull/2930 (fetchpatch { url = "https://github.com/ruby/ruby/commit/261d8dd20afd26feb05f00a560abd99227269c1c.patch"; - sha256 = "0wrii25cxcz2v8bgkrf7ibcanjlxwclzhayin578bf0qydxdm9qy"; + hash = "sha256-HqfaevMYuIVOsdEr+CnjnUqr2IrH5fkW2uKzzoqIMXM="; }) ] ++ ops atLeast31 [ @@ -142,7 +142,7 @@ let cargoDeps = if yjitSupport then rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; - sha256 = cargoSha256; + hash = cargoHash; } else null; postUnpack = opString rubygemsSupport '' @@ -318,24 +318,24 @@ in { ruby_2_7 = generic { version = rubyVersion "2" "7" "8" ""; - sha256 = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A="; + hash = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A="; }; ruby_3_1 = generic { version = rubyVersion "3" "1" "4" ""; - sha256 = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y="; + hash = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y="; }; ruby_3_2 = generic { version = rubyVersion "3" "2" "2" ""; - sha256 = "sha256-lsV1WIcaZ0jeW8nydOk/S1qtBs2PN776Do2U57ikI7w="; - cargoSha256 = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ="; + hash = "sha256-lsV1WIcaZ0jeW8nydOk/S1qtBs2PN776Do2U57ikI7w="; + cargoHash = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ="; }; ruby_3_3 = generic { - version = rubyVersion "3" "3" "0" "preview3"; - sha256 = "sha256-CWkUG+kuZ+DtuEqPs1SsyY8BvXjmAqI6DxNgRcgvSAk="; - cargoSha256 = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk="; + version = rubyVersion "3" "3" "0" ""; + hash = "sha256-llGIFNmDK+zpKoVBWoGdSJOzB9tZIa4fD3Uamomla30="; + cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk="; }; } diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index fef3f5daceeb0..e22f74c405992 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://tinyscheme.sourceforge.net/"; changelog = "https://tinyscheme.sourceforge.net/CHANGES"; license = licenses.bsdOriginal; - mainProgram = pname; + mainProgram = "tinyscheme"; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; }; diff --git a/pkgs/development/interpreters/wamr/default.nix b/pkgs/development/interpreters/wamr/default.nix index 12e9d8831d360..f7761d5037f9d 100644 --- a/pkgs/development/interpreters/wamr/default.nix +++ b/pkgs/development/interpreters/wamr/default.nix @@ -6,18 +6,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "wamr"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-micro-runtime"; rev = "WAMR-${finalAttrs.version}"; - hash = "sha256-bnia0ORC0YajO7I3XDMdpjlktDqOiXDlGcf12N1G+eg="; + hash = "sha256-h+IwCdufimmkVk2XUAFtDcV+5dJWohRc1kmh3zgDKIg="; }; nativeBuildInputs = [ cmake ]; - sourceRoot = "${finalAttrs.src.name}/product-mini/platforms/linux"; + sourceRoot = let + platform = if stdenv.isLinux then + "linux" + else if stdenv.isDarwin then + "darwin" + else throw "unsupported platform"; + in "${finalAttrs.src.name}/product-mini/platforms/${platform}"; meta = with lib; { description = "WebAssembly Micro Runtime"; @@ -25,8 +31,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; mainProgram = "iwasm"; maintainers = with maintainers; [ ereslibre ]; - # TODO (ereslibre): this derivation should be improved to support - # more platforms. - broken = !stdenv.isLinux; + platforms = platforms.unix; }; }) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 22b26c5345f03..f5621cd57d189 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.1"; + version = "4.2.5"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GROw9TYKC53ECJUeYhCez8f2jImPla/lGgsP91tTGjQ="; + hash = "sha256-zCaN0F6a8qkZkOmHMU0D70KaY4H8pUXElJbyvOCjogc="; }; - cargoHash = "sha256-JE7FDF4MWhqJbL7ZP+yzfV7/Z79x0NuQLYNwWwMjAao="; + cargoHash = "sha256-ugysqLQlnSzm0W4zW6LPSn6KjwpAtJZGEkzk/nWahWg="; nativeBuildInputs = [ rustPlatform.bindgenHook @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--manifest-path" "lib/cli/Cargo.toml" "--bin" "wasmer" ]; - env.LLVM_SYS_140_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev; + env.LLVM_SYS_150_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev; # Tests are failing due to `Cannot allocate memory` and other reasons doCheck = false; @@ -67,6 +67,6 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://wasmer.io/"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne shamilton ]; + maintainers = with maintainers; [ Br1ght0ne shamilton nickcao ]; }; } diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 8613beaef905f..47790df5ec3fd 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "15.0.1"; + version = "16.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-9vArmudz1Avxz46IS9FZIKbs8wZXoeWMd/FGLmpPitw="; + hash = "sha256-kySJme79RQMI8PP2Jhx1mjqJpUIf5jPn2TvbPEzw5hY="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-/mX9zUN+dZoOCOPMeWCJ9U7KfI6JnFl8B2leYosy2jQ="; + cargoHash = "sha256-2XlnR4OBvdQyMUUOL6VvqDxf8jGYlhz2PDuPd24Ocxw="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/interpreters/wavm/default.nix b/pkgs/development/interpreters/wavm/default.nix index a9ed260a0fd06..c4d4c4f5f2d2d 100644 --- a/pkgs/development/interpreters/wavm/default.nix +++ b/pkgs/development/interpreters/wavm/default.nix @@ -22,5 +22,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { homepage = "https://wavm.github.io"; license = licenses.bsd3; maintainers = with maintainers; [ ereslibre ]; + platforms = platforms.unix; }; }) diff --git a/pkgs/development/julia-modules/default.nix b/pkgs/development/julia-modules/default.nix new file mode 100644 index 0000000000000..f2c90752f098f --- /dev/null +++ b/pkgs/development/julia-modules/default.nix @@ -0,0 +1,194 @@ +{ lib +, callPackage +, runCommand +, fetchFromGitHub +, fetchgit +, fontconfig +, git +, makeWrapper +, writeText +, writeTextFile +, python3 + +# Artifacts dependencies +, fetchurl +, glibc +, pkgs +, stdenv + +, julia + +# Special registry which is equal to JuliaRegistries/General, but every Versions.toml +# entry is augmented with a Nix sha256 hash +, augmentedRegistry ? callPackage ./registry.nix {} + +# Other overridable arguments +, extraLibs ? [] +, precompile ? true +, setDefaultDepot ? true +, makeWrapperArgs ? "" +, packageOverrides ? {} +, makeTransitiveDependenciesImportable ? false # Used to support symbol indexing +}: + +packageNames: + +let + util = callPackage ./util.nix {}; + +in + +let + # Some Julia packages require access to Python. Provide a Nixpkgs version so it + # doesn't try to install its own. + pythonToUse = let + extraPythonPackages = ((callPackage ./extra-python-packages.nix { inherit python3; }).getExtraPythonPackages packageNames); + in (if extraPythonPackages == [] then python3 + else util.addPackagesToPython python3 (map (pkg: lib.getAttr pkg python3.pkgs) extraPythonPackages)); + + # Start by wrapping Julia so it has access to Python and any other extra libs. + # Also, prevent various packages (CondaPkg.jl, PythonCall.jl) from trying to do network calls. + juliaWrapped = runCommand "julia-${julia.version}-wrapped" { buildInputs = [makeWrapper]; inherit makeWrapperArgs; } '' + mkdir -p $out/bin + makeWrapper ${julia}/bin/julia $out/bin/julia \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLibs}" \ + --set FONTCONFIG_FILE ${fontconfig.out}/etc/fonts/fonts.conf \ + --set PYTHONHOME "${pythonToUse}" \ + --prefix PYTHONPATH : "${pythonToUse}/${pythonToUse.sitePackages}" \ + --set PYTHON ${pythonToUse}/bin/python $makeWrapperArgs \ + --set JULIA_CONDAPKG_OFFLINE yes \ + --set JULIA_CONDAPKG_BACKEND Null \ + --set JULIA_PYTHONCALL_EXE "@PyCall" + ''; + + # If our closure ends up with certain packages, add others. + packageImplications = { + # Because we want to put PythonCall in PyCall mode so it doesn't try to download + # Python packages + PythonCall = ["PyCall"]; + }; + + # Invoke Julia resolution logic to determine the full dependency closure + packageOverridesRepoified = lib.mapAttrs util.repoifySimple packageOverrides; + closureYaml = callPackage ./package-closure.nix { + inherit augmentedRegistry julia packageNames packageImplications; + packageOverrides = packageOverridesRepoified; + }; + + # Generate a Nix file consisting of a map from dependency UUID --> package info with fetchgit call: + # { + # "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" = { + # src = fetchgit {...}; + # name = "..."; + # version = "..."; + # treehash = "..."; + # }; + # ... + # } + dependencies = runCommand "julia-sources.nix" { buildInputs = [(python3.withPackages (ps: with ps; [toml pyyaml])) git]; } '' + python ${./python}/sources_nix.py \ + "${augmentedRegistry}" \ + '${lib.generators.toJSON {} packageOverridesRepoified}' \ + "${closureYaml}" \ + "$out" + ''; + + # Import the Nix file from the previous step (IFD) and turn each dependency repo into + # a dummy Git repository, as Julia expects. Format the results as a YAML map from + # dependency UUID -> Nix store location: + # { + # "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3":"/nix/store/...-NaNMath.jl-0877504", + # ... + # } + # This is also the point where we apply the packageOverrides. + dependencyUuidToInfo = import dependencies { inherit fetchgit; }; + fillInOverrideSrc = uuid: info: + if lib.hasAttr info.name packageOverrides then (info // { src = lib.getAttr info.name packageOverrides; }) else info; + dependencyUuidToRepo = lib.mapAttrs util.repoifyInfo (lib.mapAttrs fillInOverrideSrc dependencyUuidToInfo); + dependencyUuidToRepoYaml = writeTextFile { + name = "dependency-uuid-to-repo.yml"; + text = lib.generators.toYAML {} dependencyUuidToRepo; + }; + + # Given the augmented registry, closure info yaml, and dependency path yaml, construct a complete + # Julia registry containing all the necessary packages + dependencyUuidToInfoYaml = writeTextFile { + name = "dependency-uuid-to-info.yml"; + text = lib.generators.toYAML {} dependencyUuidToInfo; + }; + fillInOverrideSrc' = uuid: info: + if lib.hasAttr info.name packageOverridesRepoified then (info // { src = lib.getAttr info.name packageOverridesRepoified; }) else info; + overridesOnly = lib.mapAttrs fillInOverrideSrc' (lib.filterAttrs (uuid: info: info.src == null) dependencyUuidToInfo); + minimalRegistry = runCommand "minimal-julia-registry" { buildInputs = [(python3.withPackages (ps: with ps; [toml pyyaml])) git]; } '' + python ${./python}/minimal_registry.py \ + "${augmentedRegistry}" \ + "${closureYaml}" \ + '${lib.generators.toJSON {} overridesOnly}' \ + "${dependencyUuidToRepoYaml}" \ + "$out" + ''; + + # Next, deal with artifacts. Scan each artifacts file individually and generate a Nix file that + # produces the desired Overrides.toml. + artifactsNix = runCommand "julia-artifacts.nix" { buildInputs = [(python3.withPackages (ps: with ps; [toml pyyaml]))]; } '' + python ${./python}/extract_artifacts.py \ + "${dependencyUuidToRepoYaml}" \ + "${closureYaml}" \ + "${juliaWrapped}/bin/julia" \ + "${if lib.versionAtLeast julia.version "1.7" then ./extract_artifacts.jl else ./extract_artifacts_16.jl}" \ + '${lib.generators.toJSON {} (import ./extra-libs.nix)}' \ + "$out" + ''; + + # Import the artifacts Nix to build Overrides.toml (IFD) + artifacts = import artifactsNix { inherit lib fetchurl pkgs glibc stdenv; }; + overridesJson = writeTextFile { + name = "Overrides.json"; + text = lib.generators.toJSON {} artifacts; + }; + overridesToml = runCommand "Overrides.toml" { buildInputs = [(python3.withPackages (ps: with ps; [toml]))]; } '' + python ${./python}/format_overrides.py \ + "${overridesJson}" \ + "$out" + ''; + + # Build a Julia project and depot. The project contains Project.toml/Manifest.toml, while the + # depot contains package build products (including the precompiled libraries, if precompile=true) + projectAndDepot = callPackage ./depot.nix { + inherit closureYaml extraLibs overridesToml packageImplications precompile; + julia = juliaWrapped; + registry = minimalRegistry; + packageNames = if makeTransitiveDependenciesImportable + then lib.mapAttrsToList (uuid: info: info.name) dependencyUuidToInfo + else packageNames; + }; + +in + +runCommand "julia-${julia.version}-env" { + buildInputs = [makeWrapper]; + + inherit julia; + inherit juliaWrapped; + meta = julia.meta; + + # Expose the steps we used along the way in case the user wants to use them, for example to build + # expressions and build them separately to avoid IFD. + inherit dependencies; + inherit closureYaml; + inherit dependencyUuidToInfoYaml; + inherit dependencyUuidToRepoYaml; + inherit minimalRegistry; + inherit artifactsNix; + inherit overridesJson; + inherit overridesToml; + inherit projectAndDepot; +} ('' + mkdir -p $out/bin + makeWrapper ${juliaWrapped}/bin/julia $out/bin/julia \ + --suffix JULIA_DEPOT_PATH : "${projectAndDepot}/depot" \ + --set-default JULIA_PROJECT "${projectAndDepot}/project" \ + --set-default JULIA_LOAD_PATH '@:${projectAndDepot}/project/Project.toml:@v#.#:@stdlib' +'' + lib.optionalString setDefaultDepot '' + sed -i '2 i\JULIA_DEPOT_PATH=''${JULIA_DEPOT_PATH-"$HOME/.julia"}' $out/bin/julia +'') diff --git a/pkgs/development/julia-modules/depot.nix b/pkgs/development/julia-modules/depot.nix new file mode 100644 index 0000000000000..18bac9cb46a61 --- /dev/null +++ b/pkgs/development/julia-modules/depot.nix @@ -0,0 +1,85 @@ +{ lib +, runCommand + +, cacert +, curl +, git +, julia +, python3 + +, closureYaml +, extraLibs +, overridesToml +, packageNames +, packageImplications +, precompile +, registry +}: + +runCommand "julia-depot" { + nativeBuildInputs = [curl git julia (python3.withPackages (ps: with ps; [pyyaml]))] ++ extraLibs; + inherit precompile registry; + } '' + export HOME=$(pwd) + + echo "Building Julia depot and project with the following inputs" + echo "Julia: ${julia}" + echo "Registry: $registry" + echo "Overrides ${overridesToml}" + + mkdir -p $out/project + export JULIA_PROJECT="$out/project" + + mkdir -p $out/depot/artifacts + export JULIA_DEPOT_PATH="$out/depot" + cp ${overridesToml} $out/depot/artifacts/Overrides.toml + + # These can be useful to debug problems + # export JULIA_DEBUG=Pkg + # export JULIA_DEBUG=loading + + export JULIA_SSL_CA_ROOTS_PATH="${cacert}/etc/ssl/certs/ca-bundle.crt" + + # Only precompile if configured to below + export JULIA_PKG_PRECOMPILE_AUTO=0 + + # Prevent a warning where Julia tries to download package server info + export JULIA_PKG_SERVER="" + + # See if we need to add any extra package names based on the closure + # and the packageImplications. We're using the full closure YAML here since + # it's available, which is slightly weird, but it should work just as well + # for finding the extra packages we need to add + python ${./python}/find_package_implications.py "${closureYaml}" '${lib.generators.toJSON {} packageImplications}' extra_package_names.txt + + # git config --global --add safe.directory '/nix' + export JULIA_PKG_USE_CLI_GIT="true" + + julia -e ' \ + import Pkg + import Pkg.Types: PRESERVE_NONE + + Pkg.Registry.add(Pkg.RegistrySpec(path="${registry}")) + + input = ${lib.generators.toJSON {} packageNames} ::Vector{String} + + if isfile("extra_package_names.txt") + append!(input, readlines("extra_package_names.txt")) + end + + input = unique(input) + + if !isempty(input) + println("Adding packages: " * join(input, " ")) + Pkg.add(input; preserve=PRESERVE_NONE) + Pkg.instantiate() + + if "precompile" in keys(ENV) && ENV["precompile"] != "0" && ENV["precompile"] != "" + Pkg.precompile() + end + end + + # Remove the registry to save space + Pkg.Registry.rm("General") + ' +'' diff --git a/pkgs/development/julia-modules/extra-libs.nix b/pkgs/development/julia-modules/extra-libs.nix new file mode 100644 index 0000000000000..815c67ac7a7dc --- /dev/null +++ b/pkgs/development/julia-modules/extra-libs.nix @@ -0,0 +1,15 @@ +# A map from a Julia package (typically a JLL package) to extra libraries +# that they require from Nix. +# The libraries should be strings evaluated in a "with pkgs" context. + +{ + # Qt5Base_jll + # Needs access to dbus or you get "Cannot find libdbus-1 in your system" + # Repro: build environment with ["Plots"] + # > using Plots; plot(cos, 0, 2pi) + "ea2cea3b-5b76-57ae-a6ef-0a8af62496e1" = ["dbus.lib"]; + + # Qt6Base_jll + # Same reason as Qt5Base_jll + "c0090381-4147-56d7-9ebc-da0b1113ec56" = ["dbus.lib"]; +} diff --git a/pkgs/development/julia-modules/extra-python-packages.nix b/pkgs/development/julia-modules/extra-python-packages.nix new file mode 100644 index 0000000000000..30e5179b38200 --- /dev/null +++ b/pkgs/development/julia-modules/extra-python-packages.nix @@ -0,0 +1,22 @@ +{ lib +, python3 +}: + +# This file contains an extra mapping from Julia packages to the Python packages they depend on. + +with lib; + +rec { + packageMapping = { + ExcelFiles = ["xlrd"]; + PyPlot = ["matplotlib"]; + PythonPlot = ["matplotlib"]; + SymPy = ["sympy"]; + }; + + getExtraPythonPackages = names: concatMap (name: let + allCandidates = if hasAttr name packageMapping then getAttr name packageMapping else []; + in + filter (x: hasAttr x python3.pkgs) allCandidates + ) names; +} diff --git a/pkgs/development/julia-modules/extract_artifacts.jl b/pkgs/development/julia-modules/extract_artifacts.jl new file mode 100755 index 0000000000000..dd8b227c661bc --- /dev/null +++ b/pkgs/development/julia-modules/extract_artifacts.jl @@ -0,0 +1,63 @@ + +import Base: UUID +import Pkg.Artifacts: artifact_meta, artifact_names, find_artifacts_toml, load_artifacts_toml, select_downloadable_artifacts +import Pkg.BinaryPlatforms: AbstractPlatform, platform_key_abi, triplet +import Pkg.Operations: gen_build_code +import TOML + +pkg_uuid = UUID(ARGS[1]) +dir = ARGS[2] + +artifacts_toml = find_artifacts_toml(dir) + +if artifacts_toml == nothing + print("") + exit() +end + +platform = platform_key_abi() + +# Using collect_artifacts (from Pkg.jl) is more reliable than calling select_downloadable_artifacts directly. +# collect_artifacts includes support for .pkg/select_artifacts.jl, which may produce different results. +# If we use select_downloadable_artifacts here, then at depot build time it may try to download a different artifact +# and fail. + +# However! The collect_artifacts from Pkg.jl doesn't allow us to pass lazy to select_downloadable_artifacts. +# So we have to paste our own version in here :( + +function collect_artifacts(pkg_root::String; platform::AbstractPlatform) + # Check to see if this package has an (Julia)Artifacts.toml + artifacts_tomls = Tuple{String,Base.TOML.TOMLDict}[] + for f in artifact_names + artifacts_toml = joinpath(pkg_root, f) + if isfile(artifacts_toml) + selector_path = joinpath(pkg_root, ".pkg", "select_artifacts.jl") + + # If there is a dynamic artifact selector, run that in an appropriate sandbox to select artifacts + if isfile(selector_path) + # Despite the fact that we inherit the project, since the in-memory manifest + # has not been updated yet, if we try to load any dependencies, it may fail. + # Therefore, this project inheritance is really only for Preferences, not dependencies. + select_cmd = Cmd(`$(gen_build_code(selector_path; inherit_project=true)) --startup-file=no $(triplet(platform))`) + meta_toml = String(read(select_cmd)) + res = TOML.tryparse(meta_toml) + if res isa TOML.ParserError + errstr = sprint(showerror, res; context=stderr) + pkgerror("failed to parse TOML output from running $(repr(selector_path)), got: \n$errstr") + else + push!(artifacts_tomls, (artifacts_toml, TOML.parse(meta_toml))) + end + else + # Otherwise, use the standard selector from `Artifacts` + artifacts = select_downloadable_artifacts(artifacts_toml; platform, include_lazy=true) + push!(artifacts_tomls, (artifacts_toml, artifacts)) + end + break + end + end + return artifacts_tomls +end + +for (artifacts_toml, artifacts) in collect_artifacts(dir; platform) + TOML.print(artifacts) +end diff --git a/pkgs/development/julia-modules/extract_artifacts_16.jl b/pkgs/development/julia-modules/extract_artifacts_16.jl new file mode 100755 index 0000000000000..af3099278daa0 --- /dev/null +++ b/pkgs/development/julia-modules/extract_artifacts_16.jl @@ -0,0 +1,33 @@ + +import Base: UUID +import Pkg.Artifacts: artifact_meta, find_artifacts_toml, load_artifacts_toml +import Pkg.BinaryPlatforms: platform_key_abi +import TOML + +pkg_uuid = UUID(ARGS[1]) +dir = ARGS[2] + +artifacts_toml = find_artifacts_toml(dir) + +if artifacts_toml == nothing + print("") + exit() +end + +platform = platform_key_abi() + +# Older Julia doesn't provide select_downloadable_artifacts or .pkg/select_artifacts.jl, +# so gather the artifacts the old-fashioned way +artifact_dict = load_artifacts_toml(artifacts_toml; pkg_uuid=pkg_uuid) + +results = Dict() +for name in keys(artifact_dict) + # Get the metadata about this name for the requested platform + meta = artifact_meta(name, artifact_dict, artifacts_toml; platform=platform) + + # If there are no instances of this name for the desired platform, skip it + meta === nothing && continue + + results[name] = meta +end +TOML.print(results) diff --git a/pkgs/development/julia-modules/package-closure.nix b/pkgs/development/julia-modules/package-closure.nix new file mode 100644 index 0000000000000..2862e30f0b8bb --- /dev/null +++ b/pkgs/development/julia-modules/package-closure.nix @@ -0,0 +1,180 @@ +{ lib +, julia +, python3 +, runCommand + +, augmentedRegistry +, packageNames +, packageOverrides +, packageImplications +}: + +let + # The specific package resolution code depends on the Julia version + # These are pretty similar and could be combined to reduce duplication + resolveCode = if lib.versionOlder julia.version "1.7" then resolveCode1_6 else resolveCode1_8; + + resolveCode1_6 = '' + import Pkg.API: check_package_name + import Pkg.Types: Context!, PRESERVE_NONE, manifest_info, project_deps_resolve!, registry_resolve!, stdlib_resolve!, ensure_resolved + import Pkg.Operations: _resolve, assert_can_add, is_dep, update_package_add + + foreach(pkg -> check_package_name(pkg.name, :add), pkgs) + pkgs = deepcopy(pkgs) # deepcopy for avoid mutating PackageSpec members + Context!(ctx) + + project_deps_resolve!(ctx, pkgs) + registry_resolve!(ctx, pkgs) + stdlib_resolve!(pkgs) + ensure_resolved(ctx, pkgs, registry=true) + + assert_can_add(ctx, pkgs) + + for (i, pkg) in pairs(pkgs) + entry = manifest_info(ctx, pkg.uuid) + pkgs[i] = update_package_add(ctx, pkg, entry, is_dep(ctx, pkg)) + end + + foreach(pkg -> ctx.env.project.deps[pkg.name] = pkg.uuid, pkgs) + + pkgs, deps_map = _resolve(ctx, pkgs, PRESERVE_NONE) +''; + + resolveCode1_8 = '' + import Pkg.API: handle_package_input! + import Pkg.Types: PRESERVE_NONE, project_deps_resolve!, registry_resolve!, stdlib_resolve!, ensure_resolved + import Pkg.Operations: _resolve, assert_can_add, update_package_add + + foreach(handle_package_input!, pkgs) + + # The handle_package_input! call above clears pkg.path, so we have to apply package overrides after + overrides = Dict{String, String}(${builtins.concatStringsSep ", " (lib.mapAttrsToList (name: path: ''"${name}" => "${path}"'') packageOverrides)}) + println("Package overrides: ") + println(overrides) + for pkg in pkgs + if pkg.name in keys(overrides) + pkg.path = overrides[pkg.name] + end + end + + project_deps_resolve!(ctx.env, pkgs) + registry_resolve!(ctx.registries, pkgs) + stdlib_resolve!(pkgs) + ensure_resolved(ctx, ctx.env.manifest, pkgs, registry=true) + + assert_can_add(ctx, pkgs) + + for (i, pkg) in pairs(pkgs) + entry = Pkg.Types.manifest_info(ctx.env.manifest, pkg.uuid) + is_dep = any(uuid -> uuid == pkg.uuid, [uuid for (name, uuid) in ctx.env.project.deps]) + pkgs[i] = update_package_add(ctx, pkg, entry, is_dep) + end + + foreach(pkg -> ctx.env.project.deps[pkg.name] = pkg.uuid, pkgs) + + # Save the original pkgs for later. We might need to augment it with the weak dependencies + orig_pkgs = pkgs + + pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, pkgs, PRESERVE_NONE, ctx.julia_version) + + if VERSION >= VersionNumber("1.9") + # Check for weak dependencies, which appear on the RHS of the deps_map but not in pkgs. + # Build up weak_name_to_uuid + uuid_to_name = Dict() + for pkg in pkgs + uuid_to_name[pkg.uuid] = pkg.name + end + weak_name_to_uuid = Dict() + for (uuid, deps) in pairs(deps_map) + for (dep_name, dep_uuid) in pairs(deps) + if !haskey(uuid_to_name, dep_uuid) + weak_name_to_uuid[dep_name] = dep_uuid + end + end + end + + # If we have nontrivial weak dependencies, add each one to the initial pkgs and then re-run _resolve + if !isempty(weak_name_to_uuid) + println("Found weak dependencies: $(keys(weak_name_to_uuid))") + + orig_uuids = Set([pkg.uuid for pkg in orig_pkgs]) + + for (name, uuid) in pairs(weak_name_to_uuid) + if uuid in orig_uuids + continue + end + + pkg = PackageSpec(name, uuid) + + push!(orig_uuids, uuid) + push!(orig_pkgs, pkg) + ctx.env.project.deps[name] = uuid + entry = Pkg.Types.manifest_info(ctx.env.manifest, uuid) + orig_pkgs[length(orig_pkgs)] = update_package_add(ctx, pkg, entry, false) + end + + pkgs, deps_map = _resolve(ctx.io, ctx.env, ctx.registries, orig_pkgs, PRESERVE_NONE, ctx.julia_version) + end + end + ''; + + juliaExpression = packageNames: '' + import Pkg + Pkg.Registry.add(Pkg.RegistrySpec(path="${augmentedRegistry}")) + + import Pkg.Types: Context, PackageSpec + + input = ${lib.generators.toJSON {} packageNames} + + if isfile("extra_package_names.txt") + append!(input, readlines("extra_package_names.txt")) + end + + input = unique(input) + + println("Resolving packages: " * join(input, " ")) + + pkgs = [PackageSpec(pkg) for pkg in input] + + ctx = Context() + + ${resolveCode} + + open(ENV["out"], "w") do io + for spec in pkgs + println(io, "- name: " * spec.name) + println(io, " uuid: " * string(spec.uuid)) + println(io, " version: " * string(spec.version)) + if endswith(spec.name, "_jll") && haskey(deps_map, spec.uuid) + println(io, " depends_on: ") + for (dep_name, dep_uuid) in pairs(deps_map[spec.uuid]) + println(io, " \"$(dep_name)\": \"$(dep_uuid)\"") + end + end + end + end + ''; +in + +runCommand "julia-package-closure.yml" { buildInputs = [julia (python3.withPackages (ps: with ps; [pyyaml]))]; } '' + mkdir home + export HOME=$(pwd)/home + + echo "Resolving Julia packages with the following inputs" + echo "Julia: ${julia}" + echo "Registry: ${augmentedRegistry}" + + # Prevent a warning where Julia tries to download package server info + export JULIA_PKG_SERVER="" + + julia -e '${juliaExpression packageNames}'; + + # See if we need to add any extra package names based on the closure + # and the packageImplications + python ${./python}/find_package_implications.py "$out" '${lib.generators.toJSON {} packageImplications}' extra_package_names.txt + + if [ -f extra_package_names.txt ]; then + echo "Re-resolving with additional package names" + julia -e '${juliaExpression packageNames}'; + fi +'' diff --git a/pkgs/development/julia-modules/python/dag.py b/pkgs/development/julia-modules/python/dag.py new file mode 100644 index 0000000000000..4cb775cd42cd4 --- /dev/null +++ b/pkgs/development/julia-modules/python/dag.py @@ -0,0 +1,59 @@ + +# This file based on a ChatGPT reponse for the following prompt: +# "can you write code in python to build up a DAG representing +# a dependency tree, and then a function that can return all the +# dependencies of a given node?" + +class Node: + def __init__(self, name): + self.name = name + self.dependencies = set() + + +class DAG: + def __init__(self): + self.nodes = {} + + def add_node(self, node_name, dependencies=None): + if node_name in self.nodes: + raise ValueError(f"Node '{node_name}' already exists in the graph.") + + node = Node(node_name) + if dependencies: + node.dependencies.update(dependencies) + + self.nodes[node_name] = node + + def add_dependency(self, node_name, dependency_name): + if node_name not in self.nodes: + raise ValueError(f"Node '{node_name}' does not exist in the graph.") + + if dependency_name not in self.nodes: + raise ValueError(f"Dependency '{dependency_name}' does not exist in the graph.") + + self.nodes[node_name].dependencies.add(dependency_name) + + def get_dependencies(self, node_name): + if node_name not in self.nodes: + raise ValueError(f"Node '{node_name}' does not exist in the graph.") + + node = self.nodes[node_name] + dependencies = set() + + def traverse_dependencies(current_node): + for dependency in current_node.dependencies: + dependencies.add(dependency) + if dependency in self.nodes: + traverse_dependencies(self.nodes[dependency]) + + traverse_dependencies(node) + return dependencies + + def has_node(self, node_name): + return node_name in self.nodes + + def __str__(self): + graph_str = "" + for node_name, node in self.nodes.items(): + graph_str += f"{node_name} -> {', '.join(node.dependencies)}\n" + return graph_str diff --git a/pkgs/development/julia-modules/python/dedup_overrides.py b/pkgs/development/julia-modules/python/dedup_overrides.py new file mode 100755 index 0000000000000..d1a7337c598dd --- /dev/null +++ b/pkgs/development/julia-modules/python/dedup_overrides.py @@ -0,0 +1,14 @@ + +import json +from pathlib import Path +import sys +import toml + +overrides_path = Path(sys.argv[1]) +out_path = Path(sys.argv[2]) + +with open(overrides_path, "r") as f: + overrides = json.loads(f.read()) + +with open(out_path, "w") as f: + toml.dump(overrides, f) diff --git a/pkgs/development/julia-modules/python/extract_artifacts.py b/pkgs/development/julia-modules/python/extract_artifacts.py new file mode 100755 index 0000000000000..ecbdf10ed7148 --- /dev/null +++ b/pkgs/development/julia-modules/python/extract_artifacts.py @@ -0,0 +1,99 @@ + +import json +from pathlib import Path +import multiprocessing +import subprocess +import sys +import toml +import yaml + +import dag + +dependencies_path = Path(sys.argv[1]) +closure_yaml_path = Path(sys.argv[2]) +julia_path = Path(sys.argv[3]) +extract_artifacts_script = Path(sys.argv[4]) +extra_libs = json.loads(sys.argv[5]) +out_path = Path(sys.argv[6]) + +with open(dependencies_path, "r") as f: + dependencies = yaml.safe_load(f) + dependency_uuids = dependencies.keys() + +with open(closure_yaml_path, "r") as f: + # Build up a map of UUID -> closure information + closure_yaml_list = yaml.safe_load(f) or [] + closure_yaml = {} + for item in closure_yaml_list: + closure_yaml[item["uuid"]] = item + + # Build up a dependency graph of UUIDs + closure_dependencies_dag = dag.DAG() + for uuid, contents in closure_yaml.items(): + if contents.get("depends_on"): + closure_dependencies_dag.add_node(uuid, dependencies=contents["depends_on"].values()) + +with open(out_path, "w") as f: + f.write("{ lib, fetchurl, glibc, pkgs, stdenv }:\n\n") + f.write("rec {\n") + + def process_item(item): + uuid, src = item + lines = [] + artifacts = toml.loads(subprocess.check_output([julia_path, extract_artifacts_script, uuid, src]).decode()) + if not artifacts: return f' uuid-{uuid} = {{}};\n' + + lines.append(f' uuid-{uuid} = {{') + + for artifact_name, details in artifacts.items(): + if len(details["download"]) == 0: continue + download = details["download"][0] + url = download["url"] + sha256 = download["sha256"] + + git_tree_sha1 = details["git-tree-sha1"] + + depends_on = set() + if closure_dependencies_dag.has_node(uuid): + depends_on = set(closure_dependencies_dag.get_dependencies(uuid)).intersection(dependency_uuids) + + other_libs = extra_libs.get(uuid, []) + + fixup = f"""fixupPhase = let + libs = lib.concatMap (lib.mapAttrsToList (k: v: v.path)) + [{" ".join(["uuid-" + x for x in depends_on])}]; + in '' + find $out -type f -executable -exec \ + patchelf --set-rpath \$ORIGIN:\$ORIGIN/../lib:${{lib.makeLibraryPath (["$out" glibc] ++ libs ++ (with pkgs; [{" ".join(other_libs)}]))}} {{}} \; + find $out -type f -executable -exec \ + patchelf --set-interpreter ${{glibc}}/lib/ld-linux-x86-64.so.2 {{}} \; + ''""" + + derivation = f"""{{ + name = "{artifact_name}"; + src = fetchurl {{ + url = "{url}"; + sha256 = "{sha256}"; + }}; + sourceRoot = "."; + dontConfigure = true; + dontBuild = true; + installPhase = "cp -r . $out"; + {fixup}; + }}""" + + lines.append(f""" "{artifact_name}" = {{ + sha1 = "{git_tree_sha1}"; + path = stdenv.mkDerivation {derivation}; + }};\n""") + + lines.append(' };\n') + + return "\n".join(lines) + + with multiprocessing.Pool(10) as pool: + for s in pool.map(process_item, dependencies.items()): + f.write(s) + + f.write(f""" +}}\n""") diff --git a/pkgs/development/julia-modules/python/find_package_implications.py b/pkgs/development/julia-modules/python/find_package_implications.py new file mode 100644 index 0000000000000..f253d9c1e6268 --- /dev/null +++ b/pkgs/development/julia-modules/python/find_package_implications.py @@ -0,0 +1,24 @@ + +import json +import os +from pathlib import Path +import subprocess +import sys +import yaml + +dependencies_path = Path(sys.argv[1]) +package_implications_json = sys.argv[2] +out_path = Path(sys.argv[3]) + +package_implications = json.loads(package_implications_json) +with open(dependencies_path) as f: + desired_packages = yaml.safe_load(f) or [] + +extra_package_names = [] +for pkg in desired_packages: + if pkg["name"] in package_implications: + extra_package_names.extend(package_implications[pkg["name"]]) + +if len(extra_package_names) > 0: + with open(out_path, "w") as f: + f.write("\n".join(extra_package_names)) diff --git a/pkgs/development/julia-modules/python/format_overrides.py b/pkgs/development/julia-modules/python/format_overrides.py new file mode 100644 index 0000000000000..cc86ba3915287 --- /dev/null +++ b/pkgs/development/julia-modules/python/format_overrides.py @@ -0,0 +1,22 @@ + +import json +from pathlib import Path +import sys +import toml + +overrides_path = Path(sys.argv[1]) +out_path = Path(sys.argv[2]) + +with open(overrides_path, "r") as f: + overrides = json.loads(f.read()) + +result = {} + +for (uuid, artifacts) in overrides.items(): + if len(artifacts) == 0: continue + + for (name, info) in artifacts.items(): + result[info["sha1"]] = info["path"] + +with open(out_path, "w") as f: + toml.dump(result, f) diff --git a/pkgs/development/julia-modules/python/minimal_registry.py b/pkgs/development/julia-modules/python/minimal_registry.py new file mode 100755 index 0000000000000..c9527f0ef809c --- /dev/null +++ b/pkgs/development/julia-modules/python/minimal_registry.py @@ -0,0 +1,98 @@ + +from collections import defaultdict +import copy +import json +import os +from pathlib import Path +import shutil +import subprocess +import sys +import tempfile +import toml +import util +import yaml + + +registry_path = Path(sys.argv[1]) +desired_packages_path = Path(sys.argv[2]) +package_overrides = json.loads(sys.argv[3]) +dependencies_path = Path(sys.argv[4]) +out_path = Path(sys.argv[5]) + +with open(desired_packages_path, "r") as f: + desired_packages = yaml.safe_load(f) or [] + +uuid_to_versions = defaultdict(list) +for pkg in desired_packages: + uuid_to_versions[pkg["uuid"]].append(pkg["version"]) + +with open(dependencies_path, "r") as f: + uuid_to_store_path = yaml.safe_load(f) + +os.makedirs(out_path) + +registry = toml.load(registry_path / "Registry.toml") +registry["packages"] = {k: v for k, v in registry["packages"].items() if k in uuid_to_versions} + +for (uuid, versions) in uuid_to_versions.items(): + if uuid in package_overrides: + info = package_overrides[uuid] + + # Make a registry entry based on the info from the package override + path = Path(info["name"][0].upper()) / Path(info["name"]) + registry["packages"][uuid] = { + "name": info["name"], + "path": str(path), + } + + os.makedirs(out_path / path) + + # Read the Project.yaml from the src + project = toml.load(Path(info["src"]) / "Project.toml") + + # Generate all the registry files + with open(out_path / path / Path("Compat.toml"), "w") as f: + f.write('["%s"]\n' % info["version"]) + # Write nothing in Compat.toml, because we've already resolved everything + with open(out_path / path / Path("Deps.toml"), "w") as f: + f.write('["%s"]\n' % info["version"]) + toml.dump(project["deps"], f) + with open(out_path / path / Path("Versions.toml"), "w") as f: + f.write('["%s"]\n' % info["version"]) + f.write('git-tree-sha1 = "%s"\n' % info["treehash"]) + with open(out_path / path / Path("Package.toml"), "w") as f: + toml.dump({ + "name": info["name"], + "uuid": uuid, + "repo": "file://" + info["src"], + }, f) + + elif uuid in registry["packages"]: + registry_info = registry["packages"][uuid] + name = registry_info["name"] + path = registry_info["path"] + + os.makedirs(out_path / path) + + # Copy some files to the minimal repo unchanged + for f in ["Compat.toml", "Deps.toml"]: + if (registry_path / path / f).exists(): + shutil.copy2(registry_path / path / f, out_path / path) + + # Copy the Versions.toml file, trimming down to the versions we care about + all_versions = toml.load(registry_path / path / "Versions.toml") + versions_to_keep = {k: v for k, v in all_versions.items() if k in versions} + for k, v in versions_to_keep.items(): + del v["nix-sha256"] + with open(out_path / path / "Versions.toml", "w") as f: + toml.dump(versions_to_keep, f) + + # Fill in the local store path for the repo + if not uuid in uuid_to_store_path: continue + package_toml = toml.load(registry_path / path / "Package.toml") + package_toml["repo"] = "file://" + uuid_to_store_path[uuid] + with open(out_path / path / "Package.toml", "w") as f: + toml.dump(package_toml, f) + +with open(out_path / "Registry.toml", "w") as f: + toml.dump(registry, f) diff --git a/pkgs/development/julia-modules/python/sources_nix.py b/pkgs/development/julia-modules/python/sources_nix.py new file mode 100755 index 0000000000000..989bf6bf186ff --- /dev/null +++ b/pkgs/development/julia-modules/python/sources_nix.py @@ -0,0 +1,71 @@ + +import json +from pathlib import Path +import re +import shutil +import sys +import toml +import util +import yaml + + +registry_path = Path(sys.argv[1]) +package_overrides = json.loads(sys.argv[2]) +desired_packages_path = Path(sys.argv[3]) +out_path = Path(sys.argv[4]) + +with open(desired_packages_path, "r") as f: + desired_packages = yaml.safe_load(f) or [] + +registry = toml.load(registry_path / "Registry.toml") + +def ensure_version_valid(version): + """ + Ensure a version string is a valid Julia-parsable version. + It doesn't really matter what it looks like as it's just used for overrides. + """ + return re.sub('[^0-9\.]','', version) + +with open(out_path, "w") as f: + f.write("{fetchgit}:\n") + f.write("{\n") + for pkg in desired_packages: + uuid = pkg["uuid"] + + if pkg["name"] in package_overrides: + treehash = util.get_commit_info(package_overrides[pkg["name"]])["tree"] + f.write(f""" "{uuid}" = {{ + src = null; # Overridden: will fill in later + name = "{pkg["name"]}"; + version = "{ensure_version_valid(pkg["version"])}"; + treehash = "{treehash}"; + }};\n""") + elif uuid in registry["packages"]: + registry_info = registry["packages"][uuid] + path = registry_info["path"] + packageToml = toml.load(registry_path / path / "Package.toml") + + versions_toml = registry_path / path / "Versions.toml" + all_versions = toml.load(versions_toml) + if not pkg["version"] in all_versions: continue + version_to_use = all_versions[pkg["version"]] + + if not "nix-sha256" in version_to_use: + raise KeyError(f"""Couldn't find nix-sha256 hash for {pkg["name"]} {pkg["version"]} in {versions_toml}. This might indicate that we failed to prefetch the hash when computing the augmented registry. Was there a relevant failure in {registry_path / "failures.yml"}?""") + + repo = packageToml["repo"] + f.write(f""" "{uuid}" = {{ + src = fetchgit {{ + url = "{repo}"; + rev = "{version_to_use["git-tree-sha1"]}"; + sha256 = "{version_to_use["nix-sha256"]}"; + }}; + name = "{pkg["name"]}"; + version = "{pkg["version"]}"; + treehash = "{version_to_use["git-tree-sha1"]}"; + }};\n""") + else: + # print("Warning: couldn't figure out what to do with pkg in sources_nix.py", pkg) + pass + + f.write("}") diff --git a/pkgs/development/julia-modules/python/util.py b/pkgs/development/julia-modules/python/util.py new file mode 100644 index 0000000000000..34aaab970e594 --- /dev/null +++ b/pkgs/development/julia-modules/python/util.py @@ -0,0 +1,12 @@ + +import os +import subprocess +import tempfile + +def get_commit_info(repo): + with tempfile.TemporaryDirectory() as home_dir: + env_with_home = os.environ.copy() + env_with_home["HOME"] = home_dir + subprocess.check_output(["git", "config", "--global", "--add", "safe.directory", repo], env=env_with_home) + lines = subprocess.check_output(["git", "log", "--pretty=raw"], cwd=repo, env=env_with_home).decode().split("\n") + return dict([x.split() for x in lines if len(x.split()) == 2]) diff --git a/pkgs/development/julia-modules/registry.nix b/pkgs/development/julia-modules/registry.nix new file mode 100644 index 0000000000000..71d0a2733e8c2 --- /dev/null +++ b/pkgs/development/julia-modules/registry.nix @@ -0,0 +1,9 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "CodeDownIO"; + repo = "General"; + rev = "de80ad56e87f222ca6a7a517c69039d35437ab42"; + sha256 = "0pz1jmmcb2vn854w8w0zlpnihi470649cd8djh1wzgq2i2fy83bl"; + # date = "2023-12-22T03:28:12+00:00"; +} diff --git a/pkgs/development/julia-modules/util.nix b/pkgs/development/julia-modules/util.nix new file mode 100644 index 0000000000000..0c01fcbe82863 --- /dev/null +++ b/pkgs/development/julia-modules/util.nix @@ -0,0 +1,45 @@ +{ git +, runCommand +}: + +{ + # Add packages to a Python environment. Works if you pass something like either + # a) python3 + # b) python3.withPackages (ps: [...]) + # See https://github.com/NixOS/nixpkgs/pull/97467#issuecomment-689315186 + addPackagesToPython = python: packages: + if python ? "env" then python.override (old: { + extraLibs = old.extraLibs ++ packages; + }) + else python.withPackages (ps: packages); + + # Convert an ordinary source checkout into a repo with a single commit + repoifySimple = name: path: + runCommand ''${name}-repoified'' {buildInputs = [git];} '' + mkdir -p $out + cp -r ${path}/. $out + cd $out + chmod -R u+w . + rm -rf .git + git init + git add . -f + git config user.email "julia2nix@localhost" + git config user.name "julia2nix" + git commit -m "Dummy commit" + ''; + + # Convert an dependency source info into a repo with a single commit + repoifyInfo = uuid: info: + runCommand ''julia-${info.name}-${info.version}'' {buildInputs = [git];} '' + mkdir -p $out + cp -r ${info.src}/. $out + cd $out + chmod -R u+w . + rm -rf .git + git init + git add . -f + git config user.email "julia2nix@localhost" + git config user.name "julia2nix" + git commit -m "Dummy commit" + ''; +} diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix index d30492c890616..d04a7bccded6f 100644 --- a/pkgs/development/libraries/CGAL/4.nix +++ b/pkgs/development/libraries/CGAL/4.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, gmp, mpfr }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.14.2"; + version = "4.14.3"; pname = "cgal"; - src = fetchFromGitHub { - owner = "CGAL"; - repo = "releases"; - rev = "CGAL-${version}"; - sha256 = "1p1xyws2s9h2c8hlkz1af4ix48qma160av24by6lcm8al1g44pca"; + src = fetchurl { + url = "https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-${version}/CGAL-${version}.tar.xz"; + hash = "sha256-W6/nq+hDW+yhehCCBi02M2jsHj8NZYG7DaiwEPs4n+Q="; }; patches = [ diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index e82220b2398e9..fa816c0add0fd 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -31,9 +31,6 @@ stdenv.mkDerivation rec { sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; - # make: *** No rule to make target 'build/*.lo', needed by 'build/libSDL.la'. Stop. - postPatch = "patchShebangs ./configure"; - outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index dea308d59a2e4..2532bab798bcb 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -58,13 +58,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.28.4"; + version = "2.28.5"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-1+1m0s3pBCTu924J/4aIu4IHk/N88x2djWDEsDpAJn4="; + hash = "sha256-YcM7bfLo+KkWx8LdtG4z2UwJvzlEkvIkm+M5aMSztwU="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch b/pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch deleted file mode 100644 index c18420711b901..0000000000000 --- a/pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake -index 1a80b5b..1fa57a7 100644 ---- a/CMake/AbseilHelpers.cmake -+++ b/CMake/AbseilHelpers.cmake -@@ -171,8 +171,8 @@ function(absl_cc_library) - FILE(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/lib/pkgconfig/absl_${_NAME}.pc" CONTENT "\ - prefix=${CMAKE_INSTALL_PREFIX}\n\ - exec_prefix=\${prefix}\n\ --libdir=\${prefix}/${CMAKE_INSTALL_LIBDIR}\n\ --includedir=\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}\n\ -+libdir=${CMAKE_INSTALL_FULL_LIBDIR}\n\ -+includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR}\n\ - \n\ - Name: absl_${_NAME}\n\ - Description: Abseil ${_NAME} library\n\ diff --git a/pkgs/development/libraries/amf-headers/default.nix b/pkgs/development/libraries/amf-headers/default.nix index 2d908e043f29a..b1b93d38cedc0 100644 --- a/pkgs/development/libraries/amf-headers/default.nix +++ b/pkgs/development/libraries/amf-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "amf-headers"; - version = "1.4.30"; + version = "1.4.32"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "AMF"; rev = "v${version}"; - sha256 = "sha256-eShqo5EBbhl2Us4feFjiX+NfEl1OQ2jPQUC+Hlm+yFs="; + sha256 = "sha256-3CdC/9o6ur2CeVLImz2QfaZAH2+KtDdxs5zRF7W5/oo="; }; installPhase = '' diff --git a/pkgs/development/libraries/apr/is-this-a-compiler-bug.patch b/pkgs/development/libraries/apr/is-this-a-compiler-bug.patch deleted file mode 100644 index bbc10fabb2685..0000000000000 --- a/pkgs/development/libraries/apr/is-this-a-compiler-bug.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- apr-1.5.1/file_io/unix/filestat.c 2014-11-01 06:42:50.000000000 -0400 -+++ apr-1.5.1/file_io/unix/filestat.c.new 2014-11-01 07:07:32.000000000 -0400 -@@ -297,9 +297,11 @@ - finfo->pool = pool; - finfo->fname = fname; - fill_out_finfo(finfo, &info, wanted); -- if (wanted & APR_FINFO_LINK) -- wanted &= ~APR_FINFO_LINK; -- return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS; -+ if (wanted & APR_FINFO_LINK) { -+ return ((wanted & ~APR_FINFO_LINK) & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS; -+ } else { -+ return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS; -+ } - } - else { - #if !defined(ENOENT) || !defined(ENOTDIR) diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index e6b535ffe4cfc..4f2326b007a5d 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -2,7 +2,7 @@ , which # GUI support -, gtk2, gtk3, qt5 +, gtk3, qt5 , pluginSearchPaths ? [ "/run/current-system/sw/lib/gwenhywfar/plugins" @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { ]; preConfigure = '' - configureFlagsArray+=("--with-guis=gtk2 gtk3 qt5") + configureFlagsArray+=("--with-guis=gtk3 qt5") ''; postPatch = let @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext which ]; - buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpg-error ]; + buildInputs = [ gtk3 qt5.qtbase gnutls openssl libgcrypt libgpg-error ]; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 63ccedd56a198..72c1214970cea 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.6.6"; + version = "12.6.7"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-OFiw/UMXcq8DKtPzXCrrVOjavqWRaefR6fzNeLyCrTU="; + hash = "sha256-3zIGS99cRxU88YCzwgEsihlKB+6JJlSmkUtIb/8s+mk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index a0869edf4fbdd..9827e6f52a77b 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.24.20"; + version = "0.24.22"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-T7CCubiyhuqSu7cb3mt1Ykzsq23wzGOe51oqCWIS7rw="; + hash = "sha256-dvlJ0OWfyDNjQJtexeFcEEb7fdZYnTwbkgzsH9Kfn/M="; }; nativeBuildInputs = [ meson ninja pkg-config python3 ]; diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix index c2cdd5285aa3a..cbb580413c2b0 100644 --- a/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "roc-toolkit"; - version = "0.2.5"; + version = "0.3.0"; outputs = [ "out" "dev" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "roc-streaming"; repo = "roc-toolkit"; rev = "v${version}"; - hash = "sha256-vosw4H3YTTCXdDOnQQYRNZgufPo1BxUtfg6jutArzTI="; + hash = "sha256-tC0rjb3eDtEciUk0NmVye+N//Y/RFsi5d3kFS031y8I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch b/pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch deleted file mode 100644 index 58eaf5f490b1a..0000000000000 --- a/pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru a/RtMidi.cpp b/RtMidi.cpp ---- a/RtMidi.cpp 2021-12-23 16:46:33.000000000 -0500 -+++ b/RtMidi.cpp 2021-12-23 16:48:19.000000000 -0500 -@@ -39,6 +39,9 @@ - - #include "RtMidi.h" - #include <sstream> -+#if defined(__APPLE__) -+#include <TargetConditionals.h> -+#endif - - #if defined(__MACOSX_CORE__) - #if TARGET_OS_IPHONE diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 45dceb3934574..26a55efd786a5 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sratom"; - version = "0.6.14"; + version = "0.6.16"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-mYL69A24Ou3Zs4UOSZ/s1oUri0um3t5RQBNlXP+soeY="; + hash = "sha256-ccFXmRGD5T0FVTk7tCccdcm19dq3Sl7yLyCLsi3jIsQ="; }; strictDeps = true; @@ -43,13 +43,6 @@ stdenv.mkDerivation rec { "-Ddocs=disabled" ]; - postFixup = '' - # remove once updated to 0.6.15 or above - for f in $dev/lib/pkgconfig/*; do - echo "Requires: lv2 >= 1.18.4, serd-0 >= 0.30.10, sord-0 >= 0.16.10" >> "$f" - done - ''; - passthru = { updateScript = writeScript "update-sratom" '' #!/usr/bin/env nix-shell diff --git a/pkgs/development/libraries/audio/zix/default.nix b/pkgs/development/libraries/audio/zix/default.nix index 9f5d8867a150e..0fc0635747e52 100644 --- a/pkgs/development/libraries/audio/zix/default.nix +++ b/pkgs/development/libraries/audio/zix/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config @@ -17,6 +18,16 @@ stdenv.mkDerivation rec { hash = "sha256-nMm3Mdqc4ncCae8SoyGxZYURzmXLNcp1GjsSExfB6x4="; }; + patches = [ + # clang-16 support on Darwin: + # https://gitlab.com/drobilla/zix/-/issues/3 + (fetchpatch { + name = "darwin-sync.patch"; + url = "https://gitlab.com/drobilla/zix/-/commit/a6f804073de1f1e626464a9dd0a169fd3f69fdff.patch"; + hash = "sha256-ZkDPjtUzIyqnYarQR+7aCj7S/gSngbd6d75aRT+h7Ww="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -28,12 +39,7 @@ stdenv.mkDerivation rec { "-Ddocs=disabled" ]; - env = lib.optionalAttrs stdenv.isDarwin { - # Do not fail the build on clang-16/darwin. - # TODO: drop the workaround when upstream fixes it in: - # https://gitlab.com/drobilla/zix/-/issues/3 - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; + doCheck = true; meta = with lib; { description = "A lightweight C99 portability and data structure library"; diff --git a/pkgs/development/libraries/avahi/CVE-2023-38469.patch b/pkgs/development/libraries/avahi/CVE-2023-38469.patch new file mode 100644 index 0000000000000..ff6cd65de0f44 --- /dev/null +++ b/pkgs/development/libraries/avahi/CVE-2023-38469.patch @@ -0,0 +1,102 @@ +From a337a1ba7d15853fb56deef1f464529af6e3a1cf Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <evvers@ya.ru> +Date: Mon, 23 Oct 2023 20:29:31 +0000 +Subject: [PATCH 1/2] core: reject overly long TXT resource records + +Closes https://github.com/lathiat/avahi/issues/455 + +CVE-2023-38469 +--- + avahi-core/rr.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/avahi-core/rr.c b/avahi-core/rr.c +index 2bb89244..9c04ebbd 100644 +--- a/avahi-core/rr.c ++++ b/avahi-core/rr.c +@@ -32,6 +32,7 @@ + #include <avahi-common/malloc.h> + #include <avahi-common/defs.h> + ++#include "dns.h" + #include "rr.h" + #include "log.h" + #include "util.h" +@@ -689,11 +690,17 @@ int avahi_record_is_valid(AvahiRecord *r) { + case AVAHI_DNS_TYPE_TXT: { + + AvahiStringList *strlst; ++ size_t used = 0; + +- for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) ++ for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) { + if (strlst->size > 255 || strlst->size <= 0) + return 0; + ++ used += 1+strlst->size; ++ if (used > AVAHI_DNS_RDATA_MAX) ++ return 0; ++ } ++ + return 1; + } + } + +From c6cab87df290448a63323c8ca759baa516166237 Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <evvers@ya.ru> +Date: Wed, 25 Oct 2023 18:15:42 +0000 +Subject: [PATCH 2/2] tests: pass overly long TXT resource records + +to make sure they don't crash avahi any more. + +It reproduces https://github.com/lathiat/avahi/issues/455 +--- + avahi-client/client-test.c | 14 ++++++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c +index ba979988..da0e43ad 100644 +--- a/avahi-client/client-test.c ++++ b/avahi-client/client-test.c +@@ -22,6 +22,7 @@ + #endif + + #include <stdio.h> ++#include <string.h> + #include <assert.h> + + #include <avahi-client/client.h> +@@ -33,6 +34,8 @@ + #include <avahi-common/malloc.h> + #include <avahi-common/timeval.h> + ++#include <avahi-core/dns.h> ++ + static const AvahiPoll *poll_api = NULL; + static AvahiSimplePoll *simple_poll = NULL; + +@@ -222,6 +225,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + uint32_t cookie; + struct timeval tv; + AvahiAddress a; ++ uint8_t rdata[AVAHI_DNS_RDATA_MAX+1]; ++ AvahiStringList *txt = NULL; ++ int r; + + simple_poll = avahi_simple_poll_new(); + poll_api = avahi_simple_poll_get(simple_poll); +@@ -261,6 +267,14 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) { + error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "", 0); + assert(error != AVAHI_OK); + ++ memset(rdata, 1, sizeof(rdata)); ++ r = avahi_string_list_parse(rdata, sizeof(rdata), &txt); ++ assert(r >= 0); ++ assert(avahi_string_list_serialize(txt, NULL, 0) == sizeof(rdata)); ++ error = avahi_entry_group_add_service_strlst(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", "_qotd._tcp", NULL, NULL, 123, txt); ++ assert(error == AVAHI_ERR_INVALID_RECORD); ++ avahi_string_list_free(txt); ++ + avahi_entry_group_commit (group); + + domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u"); diff --git a/pkgs/development/libraries/avahi/CVE-2023-38471-2.patch b/pkgs/development/libraries/avahi/CVE-2023-38471-2.patch new file mode 100644 index 0000000000000..be0faddbfef5d --- /dev/null +++ b/pkgs/development/libraries/avahi/CVE-2023-38471-2.patch @@ -0,0 +1,47 @@ +From 04ac71fd56a16365360f14bd4691219913e22f21 Mon Sep 17 00:00:00 2001 +From: Evgeny Vereshchagin <evvers@ya.ru> +Date: Tue, 24 Oct 2023 21:57:32 +0000 +Subject: [PATCH 1/2] smoke-test: call SetHostName with unusual names + +It's prompted by https://github.com/lathiat/avahi/issues/453 +--- + avahi-core/server.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/avahi-core/server.c b/avahi-core/server.c +index f6a21bb7..84df6b5d 100644 +--- a/avahi-core/server.c ++++ b/avahi-core/server.c +@@ -1309,10 +1309,13 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { + else + hn = avahi_normalize_name_strdup(host_name); + ++ if (!hn) ++ return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); ++ + h = hn; + if (!avahi_unescape_label((const char **)&hn, label, sizeof(label))) { + avahi_free(h); +- return AVAHI_ERR_INVALID_HOST_NAME; ++ return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME); + } + + avahi_free(h); +@@ -1320,7 +1323,7 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { + h = label_escaped; + len = sizeof(label_escaped); + if (!avahi_escape_label(label, strlen(label), &h, &len)) +- return AVAHI_ERR_INVALID_HOST_NAME; ++ return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME); + + if (avahi_domain_equal(s->host_name, label_escaped) && s->state != AVAHI_SERVER_COLLISION) + return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); +@@ -1330,7 +1333,7 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { + avahi_free(s->host_name); + s->host_name = avahi_strdup(label_escaped); + if (!s->host_name) +- return AVAHI_ERR_NO_MEMORY; ++ return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); + + update_fqdn(s); + diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 772650bd3a8a0..df3d113dfd2cf 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -51,6 +51,41 @@ stdenv.mkDerivation rec { url = "https://github.com/lathiat/avahi/commit/a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f.patch"; sha256 = "sha256-BEYFGCnQngp+OpiKIY/oaKygX7isAnxJpUPCUvg+efc="; }) + # CVE-2023-38470 + # https://github.com/lathiat/avahi/pull/457 merged Sep 19 + (fetchpatch { + name = "CVE-2023-38470.patch"; + url = "https://github.com/lathiat/avahi/commit/94cb6489114636940ac683515417990b55b5d66c.patch"; + sha256 = "sha256-Fanh9bvz+uknr5pAmltqijuUAZIG39JR2Lyq5zGKJ58="; + }) + # CVE-2023-38473 + # https://github.com/lathiat/avahi/pull/486 merged Oct 18 + (fetchpatch { + name = "CVE-2023-38473.patch"; + url = "https://github.com/lathiat/avahi/commit/b448c9f771bada14ae8de175695a9729f8646797.patch"; + sha256 = "sha256-/ZVhsBkf70vjDWWG5KXxvGXIpLOZUXdRkn3413iSlnI="; + }) + # CVE-2023-38472 + # https://github.com/lathiat/avahi/pull/490 merged Oct 19 + (fetchpatch { + name = "CVE-2023-38472.patch"; + url = "https://github.com/lathiat/avahi/commit/b024ae5749f4aeba03478e6391687c3c9c8dee40.patch"; + sha256 = "sha256-FjR8fmhevgdxR9JQ5iBLFXK0ILp2OZQ8Oo9IKjefCqk="; + }) + # CVE-2023-38471 + # https://github.com/lathiat/avahi/pull/494 merged Oct 24 + (fetchpatch { + name = "CVE-2023-38471.patch"; + url = "https://github.com/lathiat/avahi/commit/894f085f402e023a98cbb6f5a3d117bd88d93b09.patch"; + sha256 = "sha256-4dG+5ZHDa+A4/CszYS8uXWlpmA89m7/jhbZ7rheMs7U="; + }) + # https://github.com/lathiat/avahi/pull/499 merged Oct 25 + # (but with the changes to '.github/workflows/smoke-tests.sh removed) + ./CVE-2023-38471-2.patch + # CVE-2023-38469 + # https://github.com/lathiat/avahi/pull/500 merged Oct 25 + # (but with the changes to '.github/workflows/smoke-tests.sh removed) + ./CVE-2023-38469.patch ]; depsBuildBuild = [ diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index e2b4aa8804150..53b4e167a7d9b 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -1,7 +1,7 @@ -{ callPackage, fetchpatch, ... } @ args: +{ callPackage, ... } @ args: callPackage ./generic.nix (args // { baseVersion = "2.19"; revision = "3"; - sha256 = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; + hash = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU="; }) diff --git a/pkgs/development/libraries/botan/3.0.nix b/pkgs/development/libraries/botan/3.0.nix index a9b6a7aa27d34..4c0eae63493a9 100644 --- a/pkgs/development/libraries/botan/3.0.nix +++ b/pkgs/development/libraries/botan/3.0.nix @@ -1,9 +1,7 @@ -{ callPackage, fetchpatch, lib, ... } @ args: +{ callPackage, ... } @ args: callPackage ./generic.nix (args // { baseVersion = "3.2"; revision = "0"; - sha256 = "BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM="; - # reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default. - badPlatforms = lib.platforms.darwin; + hash = "sha256-BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM="; }) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 795cd5189efe4..8e053581e88b8 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, boost # Passed by version specific builders -, baseVersion, revision, sha256 +, baseVersion, revision, hash , sourceExtension ? "tar.xz" , extraConfigureFlags ? "" , extraPatches ? [ ] @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.${sourceExtension}" "http://botan.randombit.net/releases/Botan-${version}.${sourceExtension}" ]; - inherit sha256; + inherit hash; }; patches = extraPatches; inherit postPatch; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index b8201f8ce5c6c..60578f79ea573 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "1.19.1"; src = fetchurl { - url = "https://c-ares.haxx.se/download/${pname}-${version}.tar.gz"; + url = "https://c-ares.org/download/${pname}-${version}.tar.gz"; sha256 = "sha256-MhcAOZty7Q4DfQB0xinndB9rLsLdqSlWq+PpZx0+Jo4="; }; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 017b4cf46a79c..8ac9da237d19b 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -57,7 +57,7 @@ in { "-Dspectre=disabled" (lib.mesonEnable "glib" gobjectSupport) - (lib.mesonEnable "tests" finalAttrs.doCheck) + (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) (lib.mesonEnable "xlib" x11Support) (lib.mesonEnable "xcb" xcbSupport) ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ diff --git a/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch b/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch deleted file mode 100644 index 6deecf2a97171..0000000000000 --- a/pkgs/development/libraries/cairo/skip-configure-stderr-check.patch +++ /dev/null @@ -1,89 +0,0 @@ -https://bugs.freedesktop.org/show_bug.cgi?id=30910#c6 - -Comment 6 Jeremy Huddleston Sequoia 2014-07-15 04:12:40 UTC - -Yes, it is still an issue. We just disable the buggy '"x$cairo_cc_stderr" != "x"' logic, but that's not really a portable solution for you: - -diff -Naurp cairo-1.12.2.orig/configure cairo-1.12.2/configure ---- cairo-1.12.2.orig/configure 2012-04-29 11:49:59.000000000 -0700 -+++ cairo-1.12.2/configure 2012-05-03 11:23:49.000000000 -0700 -@@ -18044,7 +18044,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -18091,7 +18091,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -18161,7 +18161,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -18217,7 +18217,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -19663,7 +19663,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -19710,7 +19710,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -32692,7 +32692,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi - -@@ -32811,7 +32811,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false ; then - cairo_cc_flag=no - fi - -@@ -32892,7 +32892,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -- if test "x$cairo_cc_stderr" != "x"; then -+ if false; then - cairo_cc_flag=no - fi diff --git a/pkgs/development/libraries/cctag/default.nix b/pkgs/development/libraries/cctag/default.nix index 2c1a5f9ae7863..238821b6af914 100644 --- a/pkgs/development/libraries/cctag/default.nix +++ b/pkgs/development/libraries/cctag/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost179 eigen - opencv + opencv.cxxdev ]; # Tests are broken on Darwin (linking issue) diff --git a/pkgs/development/libraries/cjson/default.nix b/pkgs/development/libraries/cjson/default.nix index 526da3f7718e9..e6e09a7ffe3ba 100644 --- a/pkgs/development/libraries/cjson/default.nix +++ b/pkgs/development/libraries/cjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cjson"; - version = "1.7.16"; + version = "1.7.17"; src = fetchFromGitHub { owner = "DaveGamble"; repo = "cJSON"; rev = "v${version}"; - sha256 = "sha256-sdhnDpaAO9Fau4uMzNXrbOJ2k0b8+MdhKh6rpFMUwaQ="; + sha256 = "sha256-jU9UbXvdXiNXFh7c9p/LppMsuqryFK40NTTyQGbNU84="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix deleted file mode 100644 index b6765af12a4c8..0000000000000 --- a/pkgs/development/libraries/clucene-core/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "clucene-core"; - version = "0.9.21b"; - - src = fetchurl { - url = "mirror://sourceforge/clucene/clucene-core-${version}.tar.bz2"; - sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317"; - }; - - patches = [ ./gcc6.patch ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-std=c++11" - ]; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Core library for full-featured text search engine"; - longDescription = '' - CLucene is a high-performance, scalable, cross platform, full-featured, - open-source indexing and searching API. Specifically, CLucene is the guts - of a search engine, the hard stuff. You write the easy stuff: the UI and - the process of selecting and parsing your data files to pump them into - the search engine yourself, and any specialized queries to pull it back - for display or further processing. - - CLucene is a port of the very popular Java Lucene text search engine API. - ''; - homepage = "https://clucene.sourceforge.net"; - platforms = platforms.unix; - license = with licenses; [ asl20 lgpl2 ]; - }; -} diff --git a/pkgs/development/libraries/clucene-core/gcc6.patch b/pkgs/development/libraries/clucene-core/gcc6.patch deleted file mode 100644 index f78b26d24f6a5..0000000000000 --- a/pkgs/development/libraries/clucene-core/gcc6.patch +++ /dev/null @@ -1,146 +0,0 @@ -https://bugzilla.redhat.com/show_bug.cgi?id=998477 - -diff -up clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h.gcc48 clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h ---- clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h.gcc48 2008-10-23 12:44:35.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/debug/lucenebase.h 2013-08-27 13:17:35.754234297 -0500 -@@ -58,7 +58,7 @@ public: - __cl_refcount--; - return __cl_refcount; - } -- virtual ~LuceneBase(){}; -+ virtual ~LuceneBase() throw(CLuceneError&) {}; - }; - - class LuceneVoidBase{ -diff -up clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp ---- clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp.gcc48 2013-08-27 13:17:35.754234297 -0500 -+++ clucene-core-0.9.21b/src/CLucene/index/CompoundFile.cpp 2013-08-27 13:18:02.844949386 -0500 -@@ -94,7 +94,7 @@ CompoundFileReader::CompoundFileReader(D - ) - } - --CompoundFileReader::~CompoundFileReader(){ -+CompoundFileReader::~CompoundFileReader() throw(CLuceneError&) { - close(); - } - -diff -up clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h.gcc48 clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h ---- clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h.gcc48 2008-10-23 12:44:37.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/index/CompoundFile.h 2013-08-27 13:17:35.755234286 -0500 -@@ -95,7 +95,7 @@ protected: - - public: - CompoundFileReader(CL_NS(store)::Directory* dir, char* name); -- ~CompoundFileReader(); -+ ~CompoundFileReader() throw(CLuceneError&); - CL_NS(store)::Directory* getDirectory(); - const char* getName() const; - -diff -up clucene-core-0.9.21b/src/CLucene/index/Term.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/index/Term.cpp ---- clucene-core-0.9.21b/src/CLucene/index/Term.cpp.gcc48 2008-10-23 12:44:37.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/index/Term.cpp 2013-08-27 13:17:35.755234286 -0500 -@@ -81,7 +81,7 @@ Term::Term(const TCHAR* fld, const TCHAR - set(fld,txt); - } - --Term::~Term(){ -+Term::~Term() throw (CLuceneError&) { - //Func - Destructor. - //Pre - true - //Post - The instance has been destroyed. field and text have been deleted if pre(intrn) is false -diff -up clucene-core-0.9.21b/src/CLucene/index/Term.h.gcc48 clucene-core-0.9.21b/src/CLucene/index/Term.h ---- clucene-core-0.9.21b/src/CLucene/index/Term.h.gcc48 2008-10-23 12:44:37.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/index/Term.h 2013-08-27 13:17:35.755234286 -0500 -@@ -68,7 +68,7 @@ class Term:LUCENE_REFBASE { - Term(const TCHAR* fld, const TCHAR* txt); - - ///Destructor. -- ~Term(); -+ ~Term() throw(CLuceneError&); - - ///Returns the field of this term, an interned string. The field indicates - ///the part of a document which this term came from. -diff -up clucene-core-0.9.21b/src/CLucene/store/Directory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/Directory.h ---- clucene-core-0.9.21b/src/CLucene/store/Directory.h.gcc48 2008-10-23 12:44:36.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/Directory.h 2013-08-27 13:17:35.756234276 -0500 -@@ -41,7 +41,7 @@ CL_NS_DEF(store) - public: - DEFINE_MUTEX(THIS_LOCK) - -- virtual ~Directory(){ }; -+ virtual ~Directory() throw(CLuceneError&) { }; - - // Returns an null terminated array of strings, one for each file in the directory. - char** list() const{ -diff -up clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp ---- clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp.gcc48 2008-10-23 13:01:52.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.cpp 2013-08-27 13:17:35.756234276 -0500 -@@ -368,7 +368,7 @@ void FSDirectory::FSIndexInput::readInte - strcat(buffer,name); - } - -- FSDirectory::~FSDirectory(){ -+ FSDirectory::~FSDirectory() throw(CLuceneError&) { - } - - void FSDirectory::list(vector<string>* names) const{ //todo: fix this, ugly!!! -diff -up clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h ---- clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h.gcc48 2008-10-23 13:00:43.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/FSDirectory.h 2013-08-27 13:17:35.756234276 -0500 -@@ -155,7 +155,7 @@ - ///Destructor - only call this if you are sure the directory - ///is not being used anymore. Otherwise use the ref-counting - ///facilities of _CLDECDELETE -- ~FSDirectory(); -+ ~FSDirectory() throw(CLuceneError&); - - /// Get a list of strings, one for each file in the directory. - void list(vector<string>* names) const; -diff -up clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp ---- clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp.gcc48 2008-10-23 12:44:36.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.cpp 2013-08-27 13:17:35.757234265 -0500 -@@ -219,7 +219,7 @@ CL_NS_DEF(store) - { - } - -- RAMDirectory::~RAMDirectory(){ -+ RAMDirectory::~RAMDirectory() throw(CLuceneError&) { - //todo: should call close directory? - } - -diff -up clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h ---- clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h.gcc48 2008-10-23 12:44:36.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/RAMDirectory.h 2013-08-27 13:17:35.757234265 -0500 -@@ -131,7 +131,7 @@ CL_NS_DEF(store) - ///Destructor - only call this if you are sure the directory - ///is not being used anymore. Otherwise use the ref-counting - ///facilities of dir->close -- virtual ~RAMDirectory(); -+ virtual ~RAMDirectory() throw(CLuceneError&); - RAMDirectory(Directory* dir); - - /** -diff -up clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp.gcc48 clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp ---- clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp.gcc48 2008-10-23 12:44:36.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.cpp 2013-08-27 13:17:35.757234265 -0500 -@@ -16,7 +16,7 @@ CL_NS_USE(util) - { - transOpen = false; - } -- TransactionalRAMDirectory::~TransactionalRAMDirectory(){ -+ TransactionalRAMDirectory::~TransactionalRAMDirectory() throw(CLuceneError&) { - } - - bool TransactionalRAMDirectory::archiveOrigFileIfNecessary(const char* name) { -diff -up clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h.gcc48 clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h ---- clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h.gcc48 2008-10-23 12:44:36.000000000 -0500 -+++ clucene-core-0.9.21b/src/CLucene/store/TransactionalRAMDirectory.h 2013-08-27 13:17:35.757234265 -0500 -@@ -44,7 +44,7 @@ CL_NS_DEF(store) - - public: - TransactionalRAMDirectory(); -- virtual ~TransactionalRAMDirectory(); -+ virtual ~TransactionalRAMDirectory() throw(CLuceneError&); - - bool transIsOpen() const; - void transStart(); diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index b15335a37ca49..b76153304dfa7 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.2"; + version = "5.24.4"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-boV0OO8GzgH0HpNh00nYLM2+wCmvuDxwKHvCMCdmiJs="; + sha256 = "sha256-YQNnf/DAtc58OwOWa2SBijIDpuhqWxFZHZCXLJ8PstI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/development/libraries/crocoddyl/default.nix index a25ca5b97dff9..efba136122988 100644 --- a/pkgs/development/libraries/crocoddyl/default.nix +++ b/pkgs/development/libraries/crocoddyl/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "crocoddyl"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "loco-3d"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-h7rzLSvmWOZCP8rvmUEhFeMEiPhojfbvkt+fNKpgoXo="; + hash = "sha256-MsAXHfxLNlIK/PbtVTjvBN1Jk3dyGEkfpj3/98nExj4="; }; strictDeps = true; diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 8a8caa556c878..5030a185886de 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "crypto++"; - version = "8.8.0"; + version = "8.9.0"; underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version; src = fetchFromGitHub { owner = "weidai11"; repo = "cryptopp"; rev = "CRYPTOPP_${underscoredVersion}"; - hash = "sha256-hg7g56bIYaXxB28nAmSQ7EP9NEwd1Psf/2GUtbC27oU="; + hash = "sha256-HV+afSFkiXdy840JbHBTR8lLL0GMwsN3QdwaoQmicpQ="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index 58906b608231d..324a11a6c7a2c 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals withMkl [ mkl ] ++ lib.optionals withCUDA [ + cudaPackages.cuda_cccl # <nv/target> required by the fp16 headers in cudart cudaPackages.cuda_cudart cudaPackages.libcublas cudaPackages.libcurand diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index e640b6cbbbabf..d8c472870c434 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,13 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, bison +, flex +, bluez +, pkg-config +, gtk2 +}: stdenv.mkDerivation rec { pname = "cwiid"; version = "unstable-2010-02-21"; src = fetchFromGitHub { - owner = "abstrakraft"; - repo = "cwiid"; - rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; + owner = "abstrakraft"; + repo = "cwiid"; + rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h"; }; @@ -19,9 +28,21 @@ stdenv.mkDerivation rec { sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in ''; - buildInputs = [ bison flex bluez gtk2 ]; + patches = [ + ./fix-ar.diff + ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ + bluez + gtk2 + ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + bison + flex + ]; NIX_LDFLAGS = "-lbluetooth"; @@ -32,9 +53,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux Nintendo Wiimote interface"; - homepage = "http://cwiid.org"; - license = licenses.gpl2Plus; + homepage = "http://cwiid.org"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ bennofs ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/cwiid/fix-ar.diff b/pkgs/development/libraries/cwiid/fix-ar.diff new file mode 100644 index 0000000000000..8ca4b885a0a37 --- /dev/null +++ b/pkgs/development/libraries/cwiid/fix-ar.diff @@ -0,0 +1,26 @@ +diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in +index 3afbb14..b8df9d9 100644 +--- a/common/include/lib.mak.in ++++ b/common/include/lib.mak.in +@@ -22,7 +22,7 @@ static: $(STATIC_LIB) + shared: $(SHARED_LIB) + + $(STATIC_LIB): $(OBJECTS) +- ar rcs $(STATIC_LIB) $(OBJECTS) ++ $(AR) rcs $(STATIC_LIB) $(OBJECTS) + + $(SHARED_LIB): $(OBJECTS) + $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \ +diff --git a/configure.ac b/configure.ac +index 82ca3e1..0a78283 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,6 +15,8 @@ if test "$YACC" != "bison -y"; then + AC_MSG_ERROR([bison not found]) + fi + ++AC_CHECK_TOOL([AR], [ar], [:]) ++ + AC_ARG_WITH( + [python], + [AS_HELP_STRING([--without-python],[compile without python support])], diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index 50417dab1feb2..8682c8ba81965 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -1,22 +1,53 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, tzdata +, autoreconfHook +, openssl +}: stdenv.mkDerivation rec { - version = "2.2.1"; pname = "cxxtools"; + version = "3.0"; - src = fetchurl { - url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; - sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc"; + src = fetchFromGitHub { + owner = "maekitalo"; + repo = "cxxtools"; + rev = "V${version}"; + hash = "sha256-AiMVmtvI20nyv/nuHHxGH4xFnlc9AagVkKlnRlaYCPM="; }; - configureFlags = lib.optional stdenv.isAarch64 "--with-atomictype=pthread"; + patches = [ + (fetchpatch { + url = "https://github.com/maekitalo/cxxtools/commit/b773c01fc13d2ae67abc0839888e383be23562fd.patch"; + hash = "sha256-9yRkD+vMRhc4n/Xh6SKtmllBrmfDx3IBVOtHQV6s7Tw="; + }) + (fetchpatch { + url = "https://github.com/maekitalo/cxxtools/commit/6e1439a108ce3892428e95f341f2d23ae32a590e.patch"; + hash = "sha256-ZnlbdWBjL9lEtNLEF/ZPa0IzvJ7i4xWI4GbY8KeA6A4="; + }) + ]; + + postPatch = '' + substituteInPlace src/tz.cpp \ + --replace '::getenv("TZDIR")' '"${tzdata}/share/zoneinfo"' + ''; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + openssl + ]; enableParallelBuilding = true; meta = { homepage = "http://www.tntnet.org/cxxtools.html"; description = "Comprehensive C++ class library for Unix and Linux"; - platforms = lib.platforms.linux ; + platforms = lib.platforms.linux; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.juliendehos ]; }; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 1bf86800df893..ff379c1a78b3f 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://dqlite.io/"; license = licenses.asl20; - maintainers = with maintainers; [ joko adamcstephens ]; + maintainers = teams.lxc.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/dsdcc/default.nix b/pkgs/development/libraries/dsdcc/default.nix index e97b36c033ff8..9397c747e6677 100644 --- a/pkgs/development/libraries/dsdcc/default.nix +++ b/pkgs/development/libraries/dsdcc/default.nix @@ -1,20 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, mbelib, serialdv +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, mbelib +, serialdv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dsdcc"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "f4exb"; repo = "dsdcc"; - rev = "v${version}"; - sha256 = "sha256-EsjmU0LQOXnOoTFrnn63hAbvqbE6NVlSQTngot5Zuf4="; + rev = "v${finalAttrs.version}"; + hash = "sha256-DMCk29O2Lmt2tjo6j5e4ZdZeDL3ZFUh66Sm6TGrIaeU="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ mbelib serialdv ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + mbelib + serialdv + ]; cmakeFlags = [ "-DUSE_MBELIB=ON" @@ -25,11 +37,12 @@ stdenv.mkDerivation rec { --replace '=''${exec_prefix}//' '=/' ''; - meta = with lib; { + meta = { description = "Digital Speech Decoder (DSD) rewritten as a C++ library"; homepage = "https://github.com/f4exb/dsdcc"; - license = licenses.gpl3; - maintainers = with maintainers; [ alexwinter ]; - platforms = platforms.unix; + license = lib.licenses.gpl3; + mainProgram = "dsdccx"; + maintainers = with lib.maintainers; [ alexwinter ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 0967ba113f8d8..910494e0b473d 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -11,7 +11,7 @@ , enableCuda ? config.cudaSupport # type of GPU architecture , nvidiaArch ? "sm_60" -, cudatoolkit +, cudaPackages } : assert blas.isILP64 == lapack.isILP64; @@ -19,13 +19,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2023.05.001"; + version = "2023.11.001"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "sha256-7GS+XWUigQ1gGjuOajFyDjw+tK8zpDTYpkVw125kYrY="; + sha256 = "sha256-tXvRl85nvbbiRRJOn9q4mz/a3dvTTYEu5JDVdH7npBA="; }; patches = [ @@ -43,10 +43,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" "man" "dev" ]; - nativeBuildInputs = [ autoreconfHook perl ]; + nativeBuildInputs = [ autoreconfHook perl ] + ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; buildInputs = [ mpi blas lapack scalapack ] - ++ lib.optional enableCuda cudatoolkit; + ++ lib.optionals enableCuda [ + cudaPackages.cuda_cudart + cudaPackages.libcublas + ]; preConfigure = '' export FC="mpifort" diff --git a/pkgs/development/libraries/epoll-shim/default.nix b/pkgs/development/libraries/epoll-shim/default.nix index ae2c22afd6333..d303f814b2718 100644 --- a/pkgs/development/libraries/epoll-shim/default.nix +++ b/pkgs/development/libraries/epoll-shim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_INSTALL_PKGCONFIGDIR=${placeholder "out"}/lib/pkgconfig" - "-DBUILD_TESTING=${lib.boolToString finalAttrs.doCheck}" + "-DBUILD_TESTING=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; # https://github.com/jiixyj/epoll-shim/issues/41 diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index ac6e9bfdc386b..248e3774f4cd2 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = true; # not cross; preCheck = '' - patchShebangs ./configure ./run.sh ./test-driver-wrapper.sh + patchShebangs ./run.sh ./test-driver-wrapper.sh ''; # CMake files incorrectly calculate library path from dev prefix diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index f72e6f4f95437..12179dd7e2a8e 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -1,8 +1,7 @@ {lib , stdenv , fetchFromGitHub -, autoreconfHook -, drmSupport ? false # Digital Radio Mondiale +, cmake # for passthru.tests , gst_all_1 @@ -13,19 +12,18 @@ stdenv.mkDerivation rec { pname = "faad2"; - version = "2.10.1"; + version = "2.11.1"; src = fetchFromGitHub { owner = "knik0"; repo = "faad2"; rev = version; - sha256 = "sha256-k7y12OwCn3YkNZY9Ov5Y9EQtlrZh6oFUzM27JDR960w="; + hash = "sha256-E6oe7yjYy1SJo8xQkyUk1sSucKDMPxwUFVSAyrf4Pd8="; }; - configureFlags = [] - ++ lib.optional drmSupport "--with-drm"; + outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ cmake ]; passthru.tests = { inherit mpd vlc; diff --git a/pkgs/development/libraries/fastcdr/default.nix b/pkgs/development/libraries/fastcdr/default.nix index 19998799a6fbe..7d5288753cf01 100644 --- a/pkgs/development/libraries/fastcdr/default.nix +++ b/pkgs/development/libraries/fastcdr/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastcdr"; - version = "1.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-CDR"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZJQnm3JN56y2v/XIShfZxkEEu1AKMJxt8wpRqSn9HWk="; + hash = "sha256-rdRn/vRcZuej7buyb1K6f+9A4oLSodNw3pwefjsUXHA="; }; patches = [ diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 4f47c3df8f6df..37084705d6ee7 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -17,14 +17,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "3.1.6"; + version = "3.1.7"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "0cfyxf3xcj552bhd5awv5j0lb8xk3xhz87iixp3wnbvsgvl6dpwq"; + sha256 = "sha256-QS39vbf2JowovTBtT4DKDRbLXieOrzbO4cQObOdE788="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 026c1f3ed0636..7c06a346e4bb8 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , stdenv , lib , gfortran @@ -25,6 +26,14 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; }; + patches = [ + (fetchpatch { + name = "remove_missing_FFTW3LibraryDepends.patch"; + url = "https://github.com/FFTW/fftw3/pull/338/commits/f69fef7aa546d4477a2a3fd7f13fa8b2f6c54af7.patch"; + hash = "sha256-lzX9kAHDMY4A3Td8necXwYLcN6j8Wcegi3A7OIECKeU="; + }) + ]; + outputs = [ "out" "dev" "man" ] ++ lib.optional withDoc "info"; # it's dev-doc only outputBin = "dev"; # fftw-wisdom @@ -64,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Fastest Fourier Transform in the West library"; - homepage = "http://www.fftw.org/"; + homepage = "https://www.fftw.org/"; license = licenses.gpl2Plus; maintainers = [ ]; pkgConfigModules = [ diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 0c44b99db8d9b..005890a3d4a6a 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -54,14 +54,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.14.4"; + version = "1.14.5"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-ijTb0LZ8Q051mLmOxpCVPQRvDbJuSArq+0bXKuxxZ5k="; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "sha256-W3DGTOesE04eoIARJW5COuXFTydyl0QVg/d9AT8n/6w="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index da14750090099..ebbcbde5e951f 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -63,7 +63,7 @@ index afa11a6b..5b12055f 100755 flatpak build-finish ${DIR} >&2 mkdir -p repos diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh -index 4ba950df..fd50fab3 100755 +index 6345ff58..fd50fab3 100755 --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh @@ -28,9 +28,10 @@ EOF @@ -78,7 +78,7 @@ index 4ba950df..fd50fab3 100755 mkdir -p ${DIR}/usr/bin mkdir -p ${DIR}/usr/lib ln -s ../lib ${DIR}/usr/lib64 -@@ -40,40 +41,17 @@ if test -f /sbin/ldconfig.real; then +@@ -40,46 +41,17 @@ if test -f /sbin/ldconfig.real; then else cp "$(type -P ldconfig)" "${DIR}/usr/bin" fi @@ -89,6 +89,12 @@ index 4ba950df..fd50fab3 100755 - local f=$1 - shift - +- # Check if the program is installed +- if ! command -v "${f}" &> /dev/null; then +- echo "${f} not found" +- exit 1 +- fi +- - if grep -qFe "${f}" $BINS; then - # Already handled - return 0 @@ -129,7 +135,7 @@ index 4ba950df..fd50fab3 100755 done ln -s bash ${DIR}/usr/bin/sh -@@ -84,11 +62,13 @@ echo "Hello world, from a runtime$EXTRA" +@@ -90,11 +62,13 @@ echo "Hello world, from a runtime$EXTRA" EOF chmod a+x ${DIR}/usr/bin/runtime_hello.sh diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch index fec0573ed9509..2a88d24f49166 100644 --- a/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,11 +1,11 @@ diff --git a/common/flatpak-run.c b/common/flatpak-run.c -index 8fa8c0e0..e1cdeba0 100644 +index 6f54a9d0..102d9b90 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1900,6 +1900,7 @@ static const ExportData default_exports[] = { - {"XKB_CONFIG_ROOT", NULL}, - {"GIO_EXTRA_MODULES", NULL}, +@@ -1902,6 +1902,7 @@ static const ExportData default_exports[] = { {"GDK_BACKEND", NULL}, + {"VK_DRIVER_FILES", NULL}, + {"VK_ICD_FILENAMES", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, }; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 97c356a3aa4e2..df7328b2b0436 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.6"; + version = "1.4.10"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-gTgCoca8Av4WlrbqMapTUiVxl3dza1v8I6OheFiVasA="; + hash = "sha256-x+ryJr3LHNwbIhaWUyzNJfTk53VCZaKXd6NAAIS95pg="; }; buildInputs = [ diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 1687bf5c516be..68e08a1a8b5fa 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,14 +1,24 @@ -{ lib, stdenv, fetchurl -, buildPackages, pkgsHostHost -, pkg-config, which, makeWrapper -, zlib, bzip2, brotli, libpng, gnumake, glib +{ lib +, stdenv +, fetchurl +, buildPackages +, pkgsHostHost +, pkg-config +, which +, makeWrapper +, zlib +, bzip2 +, brotli +, libpng +, gnumake +, glib , # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). # LCD filtering is also known as ClearType and covered by several Microsoft patents. # This option allows it to be disabled. See http://www.freetype.org/patents.html. useEncumberedCode ? true -# for passthru.tests + # for passthru.tests , cairo , fontforge , ghostscript @@ -65,9 +75,10 @@ stdenv.mkDerivation (finalAttrs: { postInstall = glib.flattenInclude # pkgsCross.mingwW64.pkg-config doesn't build # makeWrapper doesn't cross-compile to windows #120726 - + lib.optionalString (!stdenv.hostPlatform.isMinGW) '' + + '' substituteInPlace $dev/bin/freetype-config \ --replace ${buildPackages.pkg-config} ${pkgsHostHost.pkg-config} + '' + lib.optionalString (!stdenv.hostPlatform.isMinGW) '' wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" diff --git a/pkgs/development/libraries/frozen/default.nix b/pkgs/development/libraries/frozen/default.nix index f6e58991a590d..26c47617c1f60 100644 --- a/pkgs/development/libraries/frozen/default.nix +++ b/pkgs/development/libraries/frozen/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { # Since it has only two source files, the best course of action to support # cross compilation is to create a small meson.build file. # Relevant upstream issue: https://github.com/cesanta/frozen/pull/71 + # We also remove the GN BUILD file to prevent conflicts on case-insesitive + # file systems. preConfigure = '' + rm BUILD cp ${./meson.build} meson.build ''; diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 1140565eefc7e..cc4339da982aa 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -1,24 +1,26 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, blas -, lapack, libGLU, qtbase, libqglviewer, makeWrapper }: +, lapack, libGLU, qtbase, libqglviewer, spdlog }: mkDerivation rec { pname = "g2o"; - version = "20230223"; + version = "20230806"; src = fetchFromGitHub { owner = "RainerKuemmerle"; repo = pname; rev = "${version}_git"; - sha256 = "sha256-J2Z3oRkyiinIfywBQvnq1Q8Z5WuzQXOVTZTwN8oivf0="; + hash = "sha256-9u1FFRWe7qvDhzSKdGTduuGBXmmgzcSriGFb/oCJjNA="; }; # Removes a reference to gcc that is only used in a debug message patches = [ ./remove-compiler-reference.patch ]; + outputs = [ "out" "dev" ]; separateDebugInfo = true; - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ]; + propagatedBuildInputs = [ spdlog ]; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 626c18352b039..9c321bb1231a7 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -76,13 +76,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal"; - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-EQWAJZgufUC0FADuIotrGhP0Nf5qlgOwmiSlqLSv00A="; + hash = "sha256-R21zRjEvJO+97yXJDvzDJryQ7ps9uEN62DZ0GCxdoFk="; }; nativeBuildInputs = [ @@ -239,6 +239,9 @@ stdenv.mkDerivation (finalAttrs: { # fixed and renamed in 3.8.0RC1 # https://github.com/OSGeo/gdal/commit/c8b471ca1e6318866ff668d2b57bb6f076e3ae29 "test_visoss_6" + # failing with PROJ 9.3.1 + # https://github.com/OSGeo/gdal/issues/8908 + "test_osr_esri_28" ] ++ lib.optionals (!stdenv.isx86_64) [ # likely precision-related expecting x87 behaviour "test_jp2openjpeg_22" diff --git a/pkgs/development/libraries/gdal/tests.nix b/pkgs/development/libraries/gdal/tests.nix index 37b958706b32c..b89bbd51ab201 100644 --- a/pkgs/development/libraries/gdal/tests.nix +++ b/pkgs/development/libraries/gdal/tests.nix @@ -4,33 +4,31 @@ let inherit (gdal) pname version; in -runCommand "${pname}-tests" { - nativeBuildInputs = [ gdal ]; - meta.timeout = 60; -} '' +runCommand "${pname}-tests" { meta.timeout = 60; } + '' # test version - ogrinfo --version \ + ${gdal}/bin/ogrinfo --version \ | grep 'GDAL ${version}' - gdalinfo --version \ + ${gdal}/bin/gdalinfo --version \ | grep 'GDAL ${version}' # test formats - ogrinfo --formats \ + ${gdal}/bin/ogrinfo --formats \ | grep 'GPKG.*GeoPackage' - gdalinfo --formats \ + ${gdal}/bin/gdalinfo --formats \ | grep 'GTiff.*GeoTIFF' # test vector file echo -e "Latitude,Longitude,Name\n48.1,0.25,'Test point'" > test.csv - ogrinfo ./test.csv + ${gdal}/bin/ogrinfo ./test.csv # test raster file - gdal_create \ + ${gdal}/bin/gdal_create \ -a_srs "EPSG:4326" \ -of GTiff \ -ot UInt16 \ @@ -40,7 +38,7 @@ runCommand "${pname}-tests" { -co COMPRESS=LZW \ test.tif - gdalinfo ./test.tif + ${gdal}/bin/gdalinfo ./test.tif touch $out '' diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 3dac6d6804e3c..cd20eab42a62b 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.7.7"; + version = "2.8.2"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fm850eDqKhvjwU5RwdwAro4R23yRn41ePn5++8MXHZ0="; + sha256 = "sha256-SwY9FAUljaxap2ZlPS3JJ8VkYiJFWoSLU1miEQIEerE="; }; passthru = { diff --git a/pkgs/development/libraries/geogram/default.nix b/pkgs/development/libraries/geogram/default.nix index 1079f89d93288..619b5dfcdf574 100644 --- a/pkgs/development/libraries/geogram/default.nix +++ b/pkgs/development/libraries/geogram/default.nix @@ -13,17 +13,17 @@ let testdata = fetchFromGitHub { owner = "BrunoLevy"; repo = "geogram.data"; - rev = "8fd071a560bd6859508f1710981386d0b2ba01b1"; - hash = "sha256-jMUGX6/uYIZMVwXxTAAGUaOXqF+NrFQqgmIPCD58cwM="; + rev = "43dd49054a78d9b3fb8ef729f48ab47a272c718c"; + hash = "sha256-F2Lyt4nEOczVYLz6WLny+YrsxNwREBGPkProN8NHFN4="; }; in stdenv.mkDerivation rec { pname = "geogram"; - version = "1.8.3"; + version = "1.8.6"; src = fetchurl { url = "https://github.com/BrunoLevy/geogram/releases/download/v${version}/geogram_${version}.tar.gz"; - hash = "sha256-91q0M/4kAr0UoWXOQIEYS1VbgEQ/F4EBOfJE9Vr1bnw="; + hash = "sha256-Xqha5HVqD2Ao0z++RKcQdMZUmtMb5eZ1DMJEVrfNUzE="; }; outputs = [ "bin" "lib" "dev" "doc" "out" ]; @@ -59,9 +59,6 @@ stdenv.mkDerivation rec { ]; patches = [ - # See https://github.com/BrunoLevy/geogram/pull/76 - ./fix-cmake-install-destination.patch - # This patch replaces the bundled (outdated) zlib with our zlib # Should be harmless, but if there are issues this patch can also be removed # Also check https://github.com/BrunoLevy/geogram/issues/49 for progress @@ -93,6 +90,9 @@ stdenv.mkDerivation rec { # Skip slow RVD test "RVD" + + # Flaky as of 1.8.5 (SIGSEGV, possibly a use-after-free) + "Delaunay" ]; in '' diff --git a/pkgs/development/libraries/geogram/fix-cmake-install-destination.patch b/pkgs/development/libraries/geogram/fix-cmake-install-destination.patch deleted file mode 100644 index 1dba488e8de31..0000000000000 --- a/pkgs/development/libraries/geogram/fix-cmake-install-destination.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- a/cmake/utilities.cmake 1970-01-01 01:00:01.000000000 +0100 -+++ b/cmake/utilities.cmake 2023-03-09 19:28:16.556251981 +0100 -@@ -241,9 +241,9 @@ - install( - TARGETS ${ARGN} - COMPONENT runtime -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - endfunction() - -@@ -270,9 +270,9 @@ - install( - TARGETS ${ARGN} - COMPONENT ${component} -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - endforeach() - endfunction() ---- a/src/lib/geogram/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100 -+++ b/src/lib/geogram/CMakeLists.txt 2023-03-09 20:29:12.346780432 +0100 -@@ -76,7 +76,7 @@ - # Install include files for the standard devkit - install( - DIRECTORY api -- DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${VORPALINE_INCLUDE_SUBPATH}/geogram - COMPONENT devkit - FILES_MATCHING PATTERN *.h - ) -@@ -84,7 +84,7 @@ - # Install include files for the full devkit - install( - DIRECTORY . -- DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${VORPALINE_INCLUDE_SUBPATH}/geogram - COMPONENT devkit-full - FILES_MATCHING PATTERN *.h - # Exclude all files related to licensing -@@ -93,7 +93,7 @@ - - install( - FILES "${PROJECT_BINARY_DIR}/geogram${VORPALINE_VERSION_MAJOR}.pc" -- DESTINATION lib${LIB_SUFFIX}/pkgconfig -+ DESTINATION ${GEOGRAM_INSTALL_PKGCONFIG_DIR} - ) - - ---- a/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100 -+++ b/CMakeLists.txt 2023-03-09 20:40:20.075218356 +0100 -@@ -158,7 +158,7 @@ - - # FindGeogram.cmake - --install(FILES cmake/FindGeogram.cmake DESTINATION lib/cmake/modules COMPONENT devkit) -+install(FILES cmake/FindGeogram.cmake DESTINATION ${GEOGRAM_INSTALL_CMAKE_DIR} COMPONENT devkit) - - # Configure CPack - ---- a/doc/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100 -+++ b/doc/CMakeLists.txt 2023-03-09 21:12:04.386327003 +0100 -@@ -25,14 +25,14 @@ - - # Install documentation - if(GEOGRAM_WITH_VORPALINE) -- install(FILES README.txt DESTINATION doc COMPONENT runtime) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt DESTINATION doc COMPONENT runtime OPTIONAL) -+ install(FILES README.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT runtime OPTIONAL) - endif() - -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION.txt DESTINATION doc/geogram COMPONENT runtime OPTIONAL) -- -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit/html DESTINATION doc/devkit COMPONENT doc-devkit OPTIONAL) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-full/html DESTINATION doc/devkit COMPONENT doc-devkit-full OPTIONAL) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-internal/html DESTINATION doc/devkit COMPONENT doc-devkit-internal OPTIONAL) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION.txt DESTINATION ${CMAKE_INSTALL_DOCDIR}/geogram COMPONENT runtime OPTIONAL) -+ -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/devkit COMPONENT doc-devkit OPTIONAL) -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-full/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/devkit COMPONENT doc-devkit-full OPTIONAL) -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/devkit-internal/html DESTINATION ${CMAKE_INSTALL_DOCDIR}/devkit COMPONENT doc-devkit-internal OPTIONAL) - - endif() diff --git a/pkgs/development/libraries/geos/3.11.nix b/pkgs/development/libraries/geos/3.11.nix new file mode 100644 index 0000000000000..90bdfdb0d6058 --- /dev/null +++ b/pkgs/development/libraries/geos/3.11.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, callPackage +, fetchpatch +, fetchurl +, testers + +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "geos"; + version = "3.11.2"; + + src = fetchurl { + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + hash = "sha256-sfB3ZpSBxaPmKv/EnpbrBvKBmHpdNv2rIlIX5bgl5Mw="; + }; + + patches = [ + # Pull upstream fix of `gcc-13` build failure: + # https://github.com/libgeos/geos/pull/805 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1.patch"; + hash = "sha256-dQT3Hf9YJchgjon/r46TLIXXbE6C0ZnewyvfYJea4jM="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + geos = callPackage ./tests.nix { geos = finalAttrs.finalPackage; }; + }; + + meta = with lib; { + description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software"; + homepage = "https://libgeos.org"; + license = licenses.lgpl21Only; + maintainers = teams.geospatial.members; + pkgConfigModules = [ "geos" ]; + mainProgram = "geosop"; + }; +}) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 90bdfdb0d6058..fc3cff98d7e86 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , callPackage -, fetchpatch , fetchurl , testers @@ -10,23 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.11.2"; + version = "3.12.1"; src = fetchurl { url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; - hash = "sha256-sfB3ZpSBxaPmKv/EnpbrBvKBmHpdNv2rIlIX5bgl5Mw="; + hash = "sha256-1up+SSIktRGT6CRP4+wXxNRNB3fzwyyk+xcRQFSaDQM="; }; - patches = [ - # Pull upstream fix of `gcc-13` build failure: - # https://github.com/libgeos/geos/pull/805 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1.patch"; - hash = "sha256-dQT3Hf9YJchgjon/r46TLIXXbE6C0ZnewyvfYJea4jM="; - }) - ]; - nativeBuildInputs = [ cmake ]; doCheck = true; @@ -40,8 +29,9 @@ stdenv.mkDerivation (finalAttrs: { description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software"; homepage = "https://libgeos.org"; license = licenses.lgpl21Only; + mainProgram = "geosop"; maintainers = teams.geospatial.members; pkgConfigModules = [ "geos" ]; - mainProgram = "geosop"; + changelog = "https://github.com/libgeos/geos/releases/tag/${finalAttrs.finalPackage.version}"; }; }) diff --git a/pkgs/development/libraries/geos/tests.nix b/pkgs/development/libraries/geos/tests.nix index 0f11885ab78c2..ad9ab883db2d2 100644 --- a/pkgs/development/libraries/geos/tests.nix +++ b/pkgs/development/libraries/geos/tests.nix @@ -3,7 +3,7 @@ let inherit (geos) pname; in -runCommand "${geos}-tests" { meta.timeout = 60; } +runCommand "${pname}-tests" { meta.timeout = 60; } '' ${geos}/bin/geosop \ --explode \ diff --git a/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix b/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix index 38821c7d96306..03baa891b3b4d 100644 --- a/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix +++ b/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix @@ -43,6 +43,15 @@ stdenv.mkDerivation { substituteInPlace src/wl_init.c \ --replace "libdecor-0.so.0" "${lib.getLib libdecor}/lib/libdecor-0.so.0" + + substituteInPlace src/wl_init.c \ + --replace "libwayland-client.so.0" "${lib.getLib wayland}/lib/libwayland-client.so.0" + + substituteInPlace src/wl_init.c \ + --replace "libwayland-cursor.so.0" "${lib.getLib wayland}/lib/libwayland-cursor.so.0" + + substituteInPlace src/wl_init.c \ + --replace "libwayland-egl.so.1" "${lib.getLib wayland}/lib/libwayland-egl.so.1" ''; meta = with lib; { diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 15c5e7d9ca587..4e01ca5c2b6ef 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -19,21 +19,22 @@ stdenv.mkDerivation rec { # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) patches = lib.optional (!waylandSupport) ./x11.patch; - propagatedBuildInputs = [ (if stdenv.isDarwin then OpenGL else libGL) ]; + propagatedBuildInputs = + lib.optionals stdenv.isDarwin [ OpenGL ] + ++ lib.optionals stdenv.isLinux [ libGL ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames ++ lib.optional waylandSupport extra-cmake-modules; buildInputs = - if waylandSupport - then [ wayland wayland-protocols libxkbcommon ] - else [ libX11 libXrandr libXinerama libXcursor libXi libXext ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ]; + lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel ] + ++ lib.optionals (stdenv.isLinux && waylandSupport) [ wayland wayland-protocols libxkbcommon ] + ++ lib.optionals (stdenv.isLinux && !waylandSupport) [ libX11 libXrandr libXinerama libXcursor libXi libXext ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin && !stdenv.hostPlatform.isWindows) [ "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" ] ++ lib.optionals waylandSupport [ "-DGLFW_USE_WAYLAND=ON" @@ -50,6 +51,6 @@ stdenv.mkDerivation rec { homepage = "https://www.glfw.org/"; license = licenses.zlib; maintainers = with maintainers; [ marcweber twey ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index c11f6b8432bc7..a2e4ad8f47cf4 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -224,7 +224,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ tzdata desktop-file-utils shared-mime-info ]; - preCheck = lib.optionalString finalAttrs.doCheck or config.doCheckByDefault or false '' + preCheck = lib.optionalString finalAttrs.finalPackage.doCheck or config.doCheckByDefault or false '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/glib-${finalAttrs.version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" diff --git a/pkgs/development/libraries/glibc/rpcgen-path.patch b/pkgs/development/libraries/glibc/rpcgen-path.patch deleted file mode 100644 index 3349449d91634..0000000000000 --- a/pkgs/development/libraries/glibc/rpcgen-path.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ru glibc-2.18-orig/sunrpc/rpc_main.c glibc-2.18/sunrpc/rpc_main.c ---- glibc-2.18-orig/sunrpc/rpc_main.c 2013-08-11 00:52:55.000000000 +0200 -+++ glibc-2.18/sunrpc/rpc_main.c 2013-11-15 12:04:48.041006977 +0100 -@@ -78,7 +78,7 @@ - - static const char *svcclosetime = "120"; - static int cppDefined; /* explicit path for C preprocessor */ --static const char *CPP = "/lib/cpp"; -+static const char *CPP = "cpp"; - static const char CPPFLAGS[] = "-C"; - static char *pathbuf; - static int cpp_pid; -@@ -107,7 +107,6 @@ - static void open_output (const char *infile, const char *outfile); - static void add_warning (void); - static void clear_args (void); --static void find_cpp (void); - static void open_input (const char *infile, const char *define); - static int check_nettype (const char *name, const char *list_to_check[]); - static void c_output (const char *infile, const char *define, -@@ -322,25 +321,6 @@ - argcount = FIXEDARGS; - } - --/* make sure that a CPP exists */ --static void --find_cpp (void) --{ -- struct stat64 buf; -- -- if (stat64 (CPP, &buf) == 0) -- return; -- -- if (cppDefined) /* user specified cpp but it does not exist */ -- { -- fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); -- crash (); -- } -- -- /* fall back to system CPP */ -- CPP = "cpp"; --} -- - /* - * Open input file with given define for C-preprocessor - */ -@@ -359,7 +339,6 @@ - switch (cpp_pid) - { - case 0: -- find_cpp (); - putarg (0, CPP); - putarg (1, CPPFLAGS); - addarg (define); diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 5f4a295e3b094..bbbdf19a19095 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,6 +1,6 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip , perl, gmp, autoconf, automake, libidn2, libiconv -, fetchpatch, texinfo +, texinfo , unbound, dns-root-data, gettext, util-linux , cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so , tpmSupport ? false, trousers, which, nettools, libunistring @@ -35,11 +35,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.8.1"; + version = "3.8.2"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - hash = "sha256-uoueFa4gq6iPRGYZePW1hjSUMW/n5yLt6dBp/mKUgpw="; + hash = "sha256-52XlAW/6m53SQ+NjoEYNV3B0RE7iSRJn2y6WycKt73c="; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -48,12 +48,6 @@ stdenv.mkDerivation rec { outputDoc = "devdoc"; patches = [ - (fetchpatch { #TODO: when updating drop this patch and texinfo - name = "GNUTLS_NO_EXTENSIONS.patch"; - url = "https://gitlab.com/gnutls/gnutls/-/commit/abfa8634db940115a11a07596ce53c8f9c4f87d2.diff"; - hash = "sha256-3M5WdNoVx9gUwTUPgu/sXmsaNg+j5d6liXs0UZz8fGU="; - }) - ./nix-ssl-cert-file.patch ]; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index daf3bad132d3d..bcdd9274d091b 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.59.1"; # N.B: if you change this, please update: + version = "1.60.0"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-4bou7oFQOgyxjFqJdmiFT8xEMCsOap9v34W6SPrT4WQ="; + hash = "sha256-0mn+nQAgaurd1WomzcLUAYwp88l26qGkP+cP1SSYxsE="; fetchSubmodules = true; }; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { enableParallelBuilds = true; passthru.tests = { - inherit (python3.pkgs) grpcio-status grpcio-tools; + inherit (python3.pkgs) grpcio-status grpcio-tools jaxlib; inherit arrow-cpp; }; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 72c8b76e59f52..2874f0d2fa049 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -109,13 +109,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.22.6"; + version = "1.22.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-tAKc0pCKCJxV8dkCpWXQB0lclbFELYOEhdxH+xLfcTc="; + hash = "sha256-xxb43/qPrD+2RpQa8cbscv/wWgRRMTEb8tBJ/ch7zi4="; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index d9b624a59943e..e87555fef57b5 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.22.6"; + version = "1.22.7"; outputs = [ "out" "dev" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-UPK00XwC7v5DC776jFzRNLG+eKU8D2DpURNtls9J/Us="; + hash = "sha256-YlGeDY+Wnr9iqaeZby0j792jMCF6Y19KMsC/HHFXdGg="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 96899b63e5b39..6a44f3e01a278 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.22.6"; + version = "1.22.7"; outputs = [ "bin" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-9QDmz93/VZCPk3cR/CaghA3iih6exJYhwLbxrb2PgY4="; + hash = "sha256-AeQsY1Kga9+kRW5ksGq32YxcSHolVXx2FVRjHL2mQhc="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 917a5041eeee4..87097dddd8d3a 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.22.6"; + version = "1.22.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-iShWDvrxYTfDAoXnGHCOXQurB3frTvgSfgJ04SDT2Gs="; + hash = "sha256-FXz5P7J0HPDD3qcxvjry/65wPJ8s08DJGzgPvGheufk="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 93ddc619a5731..764bd78c083ae 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.22.6"; + version = "1.22.7"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-dI1CNnLFl/h24TCAT7mEhI9bS4nv14pQbLF/dkZ5UwE="; + hash = "sha256-/sVqLDeiU80EjSiNTH7abv8ZECKwnbl14HosEF0bUh4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 8ff8220aa75df..7e4c7d77363d9 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -43,6 +43,7 @@ , libgudev , wavpack , glib +, openssl # Checks meson.is_cross_build(), so even canExecute isn't enough. , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc }: @@ -53,13 +54,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.22.6"; + version = "1.22.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-s7B/4/HOf+k6qb5yF4ZgRFSPNcSneSKA7sfhCKMvmBc="; + hash = "sha256-ttsOGOOYtSZlt83OMBw0qHUEg9X0+6we3p+AsDdDzRU="; }; strictDeps = true; @@ -109,6 +110,7 @@ stdenv.mkDerivation rec { libintl ncurses wavpack + openssl ] ++ lib.optionals raspiCameraSupport [ libraspberrypi ] ++ lib.optionals enableX11 [ diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 7dbd9b61cbc3b..c183f8ee48a2d 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.22.6"; + version = "1.22.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-d4nmQIOIol8jy/lIz8XGIw1zW7zYt/N/SgHJ40ih46c="; + hash = "sha256-FSW5FxQbiV/lz2GP6IZ2IrJSgnigKG6fcntfNzF9rKE="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index aa211eb51a50d..1420a438b6f6d 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.22.6"; + version = "1.22.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-CuM6i1BEO2LxFYGpGB6Qa0HNOHey15nb6nKRLD7aS7M="; + hash = "sha256-9/rAAeIK0h420YOXdBxGV8XUNXHrHMO0n5qTrhJ9yI8="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index cf5f93707cca8..b92bb9dc0d4cf 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.22.6"; + version = "1.22.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-PjFFTJjLL39tLTVezrkzqJL6Dx3Am8NsmryTDY4pykg="; + hash = "sha256-UgtGvKY3GJrYaimP8kWy2JN128rIsF102uqRD4Gp6do="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index d2227763f4e85..b779d132210d3 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.22.6"; + version = "1.22.7"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-2bovwmvvmMeOmCxZn1hdRru2X+Ei2onC16tB9GilLHs="; + hash = "sha256-Dp//douJ3m0xizQUbk54HYK5oPQCXcVBssg0nHvLf2c="; }; outputs = [ diff --git a/pkgs/development/libraries/hnswlib/default.nix b/pkgs/development/libraries/hnswlib/default.nix index 9033d9f5ff4db..4c5e462377604 100644 --- a/pkgs/development/libraries/hnswlib/default.nix +++ b/pkgs/development/libraries/hnswlib/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , python3 }: @@ -13,32 +12,24 @@ in stdenv.mkDerivation (finalAttrs: { pname = "hnswlib"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "nmslib"; repo = "hnswlib"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-XXz0NIQ5dCGwcX2HtbK5NFTalP0TjLO6ll6TmH3oflI="; + hash = "sha256-1KkAX42j/I06KO4wCnDsDifN1JiENqYKR5NNHBjyuVA="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-37365.patch"; - url = "https://github.com/nmslib/hnswlib/commit/f6d170ce0b41f9e75ace473b09df6e7872590757.patch"; - hash = "sha256-28nakC0rh6kx6yYjv7m6r9/yJ+lWQuooRFyYYQN2rX8="; - }) - ]; - # this is a header-only library, so we don't need to build it # we need `cmake` only to run tests - nativeBuildInputs = lib.optionals finalAttrs.doCheck [ + nativeCheckInputs = [ cmake python ]; # we only want to run buildPhase when we run tests - dontBuild = !finalAttrs.doCheck; + dontBuild = !finalAttrs.finalPackage.doCheck; installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/http-parser/build-shared.patch b/pkgs/development/libraries/http-parser/build-shared.patch deleted file mode 100644 index 5922cdfb5848b..0000000000000 --- a/pkgs/development/libraries/http-parser/build-shared.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur http-parser-2.1-orig/http_parser.gyp http-parser-2.1/http_parser.gyp ---- http-parser-2.1-orig/http_parser.gyp 2013-03-26 18:35:20.000000000 -0400 -+++ http-parser-2.1/http_parser.gyp 2013-05-23 16:47:49.280488341 -0400 -@@ -21,7 +21,7 @@ - }, - 'Release': { - 'defines': [ 'NDEBUG' ], -- 'cflags': [ '-Wall', '-Wextra', '-O3' ], -+ 'cflags': [ '-Wall', '-Wextra', '-O3', '-fPIC' ], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'RuntimeLibrary': 0, # static release -@@ -50,7 +50,7 @@ - 'targets': [ - { - 'target_name': 'http_parser', -- 'type': 'static_library', -+ 'type': 'shared_library', - 'include_dirs': [ '.' ], - 'direct_dependent_settings': { - 'defines': [ 'HTTP_PARSER_STRICT=0' ], -@@ -73,7 +73,7 @@ - - { - 'target_name': 'http_parser_strict', -- 'type': 'static_library', -+ 'type': 'shared_library', - 'include_dirs': [ '.' ], - 'direct_dependent_settings': { - 'defines': [ 'HTTP_PARSER_STRICT=1' ], diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 327121dc6b1bc..65ac1fe92c130 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, fetchpatch +, enableShared ? !stdenv.hostPlatform.isStatic +, enableStatic ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "http-parser"; @@ -12,8 +15,9 @@ stdenv.mkDerivation rec { }; env.NIX_CFLAGS_COMPILE = "-Wno-error"; + patches = [ - ./build-shared.patch + ./enable-static-shared.patch ] ++ lib.optionals stdenv.isAarch32 [ # https://github.com/nodejs/http-parser/pull/510 (fetchpatch { @@ -21,18 +25,43 @@ stdenv.mkDerivation rec { sha256 = "sha256-rZZMJeow3V1fTnjadRaRa+xTq3pdhZn/eJ4xjxEDoU4="; }) ]; - makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; - buildFlags = [ "library" ]; + + makeFlags = [ + "DESTDIR=" + "PREFIX=$(out)" + "BINEXT=${stdenv.hostPlatform.extensions.executable}" + "Platform=${lib.toLower stdenv.hostPlatform.uname.system}" + "AEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.staticLibrary}" + "ENABLE_SHARED=${if enableShared then "1" else "0"}" + "ENABLE_STATIC=${if enableStatic then "1" else "0"}" + ] ++ lib.optionals enableShared [ + "SOEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.sharedLibrary}" + ] ++ lib.optionals enableStatic [ + "AEXT=${lib.strings.removePrefix "." stdenv.hostPlatform.extensions.staticLibrary}" + ] ++ lib.optionals (enableShared && stdenv.hostPlatform.isWindows) [ + "SONAME=$(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOEXT)" + "LIBNAME=$(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOREV).$(SOEXT)" + "LDFLAGS=-Wl,--out-implib=$(LIBNAME).a" + ]; + + buildFlags = lib.optional enableShared "library" + ++ lib.optional enableStatic "package"; + doCheck = true; checkTarget = "test"; enableParallelBuilding = true; + postInstall = lib.optionalString stdenv.hostPlatform.isWindows '' + install -D *.dll.a $out/lib + ln -sf libhttp_parser.${version}.dll.a $out/lib/libhttp_parser.dll.a + ''; + meta = with lib; { description = "An HTTP message parser written in C"; homepage = "https://github.com/nodejs/http-parser"; maintainers = with maintainers; [ matthewbauer ]; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/http-parser/enable-static-shared.patch b/pkgs/development/libraries/http-parser/enable-static-shared.patch new file mode 100644 index 0000000000000..42f11d4c817f4 --- /dev/null +++ b/pkgs/development/libraries/http-parser/enable-static-shared.patch @@ -0,0 +1,93 @@ +commit abcb3cca9452779e91380b7636f32745166af3de +Author: John Ericson <John.Ericson@Obsidian.Systems> +Date: Wed Nov 29 23:55:38 2023 -0500 + + Make build system: enable/disable shared/static support + + This allows building this package in static-lib-only distros. + +diff --git a/Makefile b/Makefile +index 5d21221..cbc7914 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,6 +18,9 @@ + # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + # IN THE SOFTWARE. + ++ENABLE_SHARED ?= 1 ++ENABLE_STATIC ?= ++ + PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"') + HELPER ?= + BINEXT ?= +@@ -25,6 +28,8 @@ SOLIBNAME = libhttp_parser + SOMAJOR = 2 + SOMINOR = 9 + SOREV = 4 ++AEXT = a ++STATICLIBNAME = $(SOLIBNAME).$(AEXT) + ifeq (darwin,$(PLATFORM)) + SOEXT ?= dylib + SONAME ?= $(SOLIBNAME).$(SOMAJOR).$(SOMINOR).$(SOEXT) +@@ -109,11 +114,17 @@ test-valgrind: test_g + libhttp_parser.o: http_parser.c http_parser.h Makefile + $(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o + +-library: libhttp_parser.o +- $(CC) $(LDFLAGS_LIB) -o $(LIBNAME) $< ++.PHONY: library ++library: $(LIBNAME) ++ ++$(LIBNAME): libhttp_parser.o ++ $(CC) $(LDFLAGS_LIB) -o $@ $< + +-package: http_parser.o +- $(AR) rcs libhttp_parser.a http_parser.o ++.PHONY: package ++package: $(STATICLIBNAME) ++ ++$(STATICLIBNAME): http_parser.o ++ $(AR) rcs $@ $< + + url_parser: http_parser.o contrib/url_parser.c + $(CC) $(CPPFLAGS_FAST) $(CFLAGS_FAST) $^ -o $@ +@@ -130,12 +141,30 @@ parsertrace_g: http_parser_g.o contrib/parsertrace.c + tags: http_parser.c http_parser.h test.c + ctags $^ + +-install: library ++.PHONY: install-headers ++install-headers: + $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h ++ ++.PHONY: install-library ++install-library: library + $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) + ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) + ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) + ++.PHONY: install-package ++install-package: package ++ $(INSTALL) -D $(STATICLIBNAME) $(DESTDIR)$(LIBDIR)/$(STATICLIBNAME) ++ ++.PHONY: install ++install: install-headers ++ifeq ($(ENABLE_SHARED),1) ++install: install-library ++endif ++ifeq ($(ENABLE_STATIC),1) ++install: install-package ++endif ++ ++.PHONY: install-strip + install-strip: library + $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h + $(INSTALL) -D -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) +@@ -147,6 +176,7 @@ uninstall: + rm $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT) + rm $(DESTDIR)$(LIBDIR)/$(SONAME) + rm $(DESTDIR)$(LIBDIR)/$(LIBNAME) ++ rm $(DESTDIR)$(LIBDIR)/$(STATICLIBNAME) + + clean: + rm -f *.o *.a tags test test_fast test_g \ diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index a887ea55330f8..a65440848bee8 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.14.1"; + version = "0.14.3"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-JBs2FvcdAvxysYhzakP0wU/mUCWfKZ8dk5ROWL5sej0="; + hash = "sha256-53EBZTpz0INtjVSmjvg7XOQf0Bs2ADVe2//+nK6xRyE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 67048167d6bfa..7dc11069e9a69 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.9.3"; + version = "2.10.0"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "sha256-XEBizlVvbTRR/Bd/+4ZzohIPgd9oNd6mohqQ+9//Dew="; + sha256 = "sha256-AwXdYMneL75lGf4qTo/cbT243ldKDKeBK5LoDAWuE5I="; }; configureFlags = [ @@ -22,12 +22,13 @@ stdenv.mkDerivation rec { ]; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; buildInputs = [ expat ncurses ] ++ lib.optionals x11Support [ cairo libX11 ] ++ lib.optionals stdenv.isLinux [ numactl ] - ++ lib.optional enableCuda cudaPackages.cudatoolkit; + ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart ]; # Since `libpci' appears in `hwloc.pc', it must be propagated. propagatedBuildInputs = lib.optional stdenv.isLinux pciutils; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 8782e4a5ea653..4cd31f74058b8 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.14"; + version = "22.3.16"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-hNewfGN/hO9hx2+1YmdPPqUORqpNwckQYSSO7zfeVAY="; + sha256 = "sha256-6cN7qnFpVe362u4o0bZMKlUq1/eCpPZF0nBgon9Eav4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/irrlichtmt/default.nix b/pkgs/development/libraries/irrlichtmt/default.nix index 8a080c1d4a970..8787fd390efd1 100644 --- a/pkgs/development/libraries/irrlichtmt/default.nix +++ b/pkgs/development/libraries/irrlichtmt/default.nix @@ -7,42 +7,32 @@ , libjpeg , libGL , libX11 -, withTouchSupport ? false , libXi , libXext , Cocoa , Kernel }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "irrlichtmt"; - version = "1.9.0mt10"; + version = "1.9.0mt13"; src = fetchFromGitHub { owner = "minetest"; repo = "irrlicht"; - rev = version; - sha256 = "sha256-PA+gz77XkwxQ3TtubaT0ov9dsT7s3ZlrQxrOkD5ku3g="; + rev = finalAttrs.version; + hash = "sha256-BlQd7zbpvQnxqLv3IaHWrXzJ1pJFbQQ3DNWDAj14/YY="; }; nativeBuildInputs = [ cmake ]; - # https://github.com/minetest/minetest/pull/10729 - postPatch = lib.optionalString (!withTouchSupport) '' - sed -i '1i #define NO_IRR_LINUX_X11_XINPUT2_' include/IrrCompileConfig.h - - # HACK: Fix mistake in build script - sed -i '/''${X11_Xi_LIB}/d' source/Irrlicht/CMakeLists.txt - ''; - buildInputs = [ zlib libpng libjpeg libGL libX11 - ] ++ lib.optionals withTouchSupport [ libXi libXext ] ++ lib.optionals stdenv.isDarwin [ @@ -58,4 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ DeeUnderscore ]; description = "Minetest project's fork of Irrlicht, a realtime 3D engine written in C++"; }; -} +}) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 08d0ffae8f9da..fdf01c195af58 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds -, openssl, openldap, libedit, keyutils, libverto +, openssl, openldap, libedit, keyutils, libverto, darwin # for passthru.tests , bind @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "${type}krb5"; - version = "1.20.2"; + version = "1.21.2"; src = fetchurl { url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz"; - sha256 = "sha256-fY1ofUKu01DCUly2mk/DqnkWlNpnYdzMHELC7neWtd0="; + hash = "sha256-lWCUGp2EPAJDpxsXp6xv4xx867W845g9t55Srn6FBJE="; }; outputs = [ "out" "dev" ]; @@ -58,6 +58,11 @@ stdenv.mkDerivation rec { ++ lib.optionals (!libOnly) [ openldap libedit ] ++ lib.optionals withVerto [ libverto ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk; [ + libs.xpc + frameworks.Kerberos + ]); + sourceRoot = "krb5-${version}/src"; postPatch = '' diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix index de01c6a7a1ae1..a467eb8e0d51c 100644 --- a/pkgs/development/libraries/ldacbt/default.nix +++ b/pkgs/development/libraries/ldacbt/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; # libldac code detects & #error's out on non-LE byte order platforms = platforms.littleEndian; - maintainers = with maintainers; [ adisbladis ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index ceb42cd49154f..08921c2ca3c07 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "leptonica"; - version = "1.83.1"; + version = "1.84.0"; src = fetchurl { url = "https://github.com/DanBloomberg/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-jxhhXgdDr3339QmFxzDfzwyTVIBz0fVmIeQVaotU090="; + hash = "sha256-QqApMSod8M1WQBlal5voG/ZiMOFTFkysRWR4RU5yBtU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index f2ea91bf8be8b..50cbe4a18cc30 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.15.1"; + version = "1.15.8"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-jf1sKFfUmeNbLtmawKISmLQK2/95XvSg40se9IEKMT0="; + hash = "sha256-n1dcsI2sLeB68HpI5oQ5p3zdAcSvnSY+qpHL9vp6FOk="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 30d3c0d81b55e..826dc544a88f0 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.7.0"; + version = "3.7.1"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - hash = "sha256-Zf0g/CMI73O9Dkn9o7aIvwZ/8wh3lCmVY8nZaPwBp68="; + hash = "sha256-v2SBiDE4zZe3LMrlo/tP9GzmG/PJZ42rKi1svKJR6ZA="; stripRoot = false; }; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 3265fd7d093e3..ad94f55ccb6df 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -4,6 +4,7 @@ , rasterizerSupport ? false # Internal rasterizer , largeTilesSupport ? false # Use larger tiles in the rasterizer , libiconv +, darwin }: assert fontconfigSupport -> fontconfig != null; @@ -29,7 +30,12 @@ stdenv.mkDerivation rec { buildInputs = [ freetype fribidi harfbuzz ] ++ lib.optional fontconfigSupport fontconfig - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.ApplicationServices + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreText + ]; meta = with lib; { description = "Portable ASS/SSA subtitle renderer"; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index ae15c6236aa20..e7170953d0ca5 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libatomic_ops"; - version = "7.8.0"; + version = "7.8.2"; src = fetchurl { urls = [ "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz" "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz" ]; - sha256 = "sha256-FWdudnThG9paflCnP02efWBFInG4rPb9Oacf79+J+jE="; + sha256 = "sha256-0wUgf+IH8rP7XLTAGdoStEzj/LxZPf1QgNhnsaJBm1E="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 27aaef5464330..02e069a352906 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 = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3zNhKl8REWsRlblXIFD7zn7qvrc/pa4wHZI0oEc3pKE="; + sha256 = "sha256-Ku0UgVBba1tHBzHjx5yf9hRAtbmXf2n4gEdAaGr3qTY="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/pkgs/development/libraries/libayatana-common/default.nix b/pkgs/development/libraries/libayatana-common/default.nix index 98cf028a55e1a..4206c46f1f53c 100644 --- a/pkgs/development/libraries/libayatana-common/default.nix +++ b/pkgs/development/libraries/libayatana-common/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" "-DENABLE_LOMIRI_FEATURES=OFF" "-DGSETTINGS_LOCALINSTALL=ON" "-DGSETTINGS_COMPILE=ON" diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix index bc998563a7328..b188a9cfc38c8 100644 --- a/pkgs/development/libraries/libbacktrace/default.nix +++ b/pkgs/development/libraries/libbacktrace/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { (lib.enableFeature enableShared "shared") ]; - doCheck = stdenv.isLinux; + doCheck = stdenv.isLinux && !stdenv.hostPlatform.isMusl; passthru = { updateScript = unstableGitUpdater { }; diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch deleted file mode 100644 index d3dec2936c50a..0000000000000 --- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5007bbd..f46de1a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -253,7 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [ - ]) - - AS_IF([test "x$use_bdjava_jar" = "xyes"], [ -- -+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'" - dnl check for ant - AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) - AS_IF([test "x$HAVE_ANT" = "xno"], [ -diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c -index 1cb1bfe..f3711c2 100644 ---- a/src/libbluray/bdj/bdj.c -+++ b/src/libbluray/bdj/bdj.c -@@ -533,6 +533,9 @@ static char *_find_libbluray_jar0() - # ifdef __FreeBSD__ - "/usr/local/share/java/" BDJ_JARFILE, - # else -+# ifdef JARDIR -+ JARDIR "/" BDJ_JARFILE, -+# endif - "/usr/share/java/" BDJ_JARFILE, - "/usr/share/libbluray/lib/" BDJ_JARFILE, - # endif diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 5943d697f6f1b..4f06eb7f8624d 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -59,6 +59,8 @@ stdenv.mkDerivation { homepage = "https://libbsd.freedesktop.org/"; license = with licenses; [ beerware bsd2 bsd3 bsdOriginal isc mit ]; platforms = platforms.unix; + # See architectures defined in src/local-elf.h. + badPlatforms = lib.platforms.microblaze; maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index efb17eeaf3158..514ee36d02df2 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { cmocka # cmake expects cmocka module ]; - cmakeFlags = lib.optional finalAttrs.doCheck "-DWITH_TESTS=ON" + cmakeFlags = lib.optional finalAttrs.finalPackage.doCheck "-DWITH_TESTS=ON" ++ lib.optional (!stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=ON"; # Tests are restricted while pkgsStatic.cmocka is broken. Tracked at: diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 1d6fd44acb69e..90ffcb01cf91f 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -29,7 +29,11 @@ stdenv.mkDerivation rec { buildInputs = [ udev libcec_platform ] ++ lib.optional withLibraspberrypi libraspberrypi; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=1" + ] ++ lib.optionals stdenv.isLinux [ + "-DHAVE_LINUX_API=1" + ]; meta = with lib; { description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; diff --git a/pkgs/development/libraries/libcifpp/default.nix b/pkgs/development/libraries/libcifpp/default.nix index 08c35ec94099e..81ceebc5ef734 100644 --- a/pkgs/development/libraries/libcifpp/default.nix +++ b/pkgs/development/libraries/libcifpp/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "5.2.4"; + version = "6.0.0"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-AAEk9gDxtlNDEG8B4HmOJ5Nd+GyWibT+yuMccylU8iQ="; + hash = "sha256-cj7xhRYTGxQnod/kw02UYiJewPJosxKSwvwDIu6nG0A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index 829ab2b9aedf5..80b418e3065d3 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "2.1.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5zyQSoz5d/HYrIaj0ChtZYK79bBNlYDsFMSDuzcVhY0="; + sha256 = "sha256-/IIzUMms4aS63psyxwL+Ynj78c38R3WwbD2HIpdHF88="; }; postPatch = lib.optionalString stdenv.cc.isClang '' diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index 5271663a10b8d..8614bc4fee05c 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = pname; rev = "v${version}"; - hash = "sha256-Cx+AfoeLOcqlrEVNuvMPJaY6K7ufu07p9XdjNwtPYf0="; + hash = "sha256-XtD46tEV6RU1xbQgGA/nP6zWMgnZkOffVPdl8t/hIiA="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index 9c1a10f9f5b10..de366da98b962 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -14,14 +14,14 @@ }: stdenv.mkDerivation (finalAttrs: rec { - version = "1.0.12"; + version = "1.0.14"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; rev = "refs/tags/v${version}"; - hash = "sha256-pl1r3n4T4FcJ4My/wCE54R2fmTdrlJOvgb2U0MZf1BI="; + hash = "sha256-aZRtF4wYWxi/6ORNu7yVxFFdkvJTvBwPinL5lC0Mlqg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index 966dcb72535e1..551b2d30e951f 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -198,12 +198,12 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 3.1.0", + "event-listener 4.0.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -228,7 +228,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d736a74edf6c327b53dd9c932eae834253470ac5f0c55770e7e133bcbf986362" dependencies = [ - "async-channel 2.1.0", + "async-channel 2.1.1", "base64 0.21.5", "bytes", "chrono", @@ -707,18 +707,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.8" +version = "4.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" dependencies = [ "anstyle", "clap_lex", @@ -808,9 +808,9 @@ checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -818,9 +818,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" @@ -1064,9 +1064,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "default-net" @@ -1087,11 +1087,11 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.131.7" +version = "1.131.9" dependencies = [ "ansi_term", "anyhow", - "async-channel 2.1.0", + "async-channel 2.1.1", "async-imap", "async-native-tls", "async-smtp", @@ -1165,10 +1165,10 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.131.7" +version = "1.131.9" dependencies = [ "anyhow", - "async-channel 2.1.0", + "async-channel 2.1.1", "axum", "base64 0.21.5", "deltachat", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.131.7" +version = "1.131.9" dependencies = [ "ansi_term", "anyhow", @@ -1204,7 +1204,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.131.7" +version = "1.131.9" dependencies = [ "anyhow", "deltachat", @@ -1229,7 +1229,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.131.7" +version = "1.131.9" dependencies = [ "anyhow", "deltachat", @@ -1799,9 +1799,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" dependencies = [ "concurrent-queue", "parking", @@ -1810,11 +1810,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 3.1.0", + "event-listener 4.0.0", "pin-project-lite", ] @@ -2123,9 +2123,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "group" @@ -2176,9 +2176,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -2461,8 +2461,7 @@ dependencies = [ [[package]] name = "imap-proto" version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305c25c6e69416059e3396c4a062b84dc7b0a782cd4c84d82bab268eb0421ec7" +source = "git+https://github.com/djc/tokio-imap.git?rev=01ff256a7e42a9f7d2732706f8b71a16ce93427e#01ff256a7e42a9f7d2732706f8b71a16ce93427e" dependencies = [ "nom", ] @@ -2506,8 +2505,8 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iroh" -version = "0.4.1" -source = "git+https://github.com/deltachat/iroh?branch=0.4-update-quic#36ca9ca017a101c00dfdf74a917b92bdc505ddbd" +version = "0.4.2" +source = "git+https://github.com/n0-computer/iroh?branch=maint-0.4#9881b7886235035a1124e4371f7a4cd59379e51b" dependencies = [ "abao", "anyhow", @@ -3068,9 +3067,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.59" +version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" +checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -3109,9 +3108,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.95" +version = "0.9.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" +checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" dependencies = [ "cc", "libc", @@ -3253,9 +3252,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pgp" @@ -3297,7 +3296,7 @@ dependencies = [ "p384 0.13.0", "rand 0.8.5", "ripemd", - "rsa 0.9.3", + "rsa 0.9.5", "sha1", "sha2 0.10.8", "sha3", @@ -3989,9 +3988,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" +checksum = "af6c4b23d99685a1408194da11270ef8e9809aff951cc70ec9b17350b087e474" dependencies = [ "const-oid", "digest 0.10.7", @@ -4289,9 +4288,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -4316,9 +4315,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", @@ -5148,9 +5147,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typescript-type-def" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356e00027bd9ef773605a353070dc87684b25561a59087ea3ee3dd5fe8854e83" +checksum = "8a548b68faefac1ef83c3682cece0046b4f3efc943a067aacb4dfb99be299f60" dependencies = [ "serde_json", "typescript-type-def-derive", @@ -5158,9 +5157,9 @@ dependencies = [ [[package]] name = "typescript-type-def-derive" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e696c28431595138cc53892104528152cbcf26653ae0aa655e4eaede5b9f69" +checksum = "2f205a929a19c5dd74f80c9f795c33b4416f7efef7d7b2772f0eff96bdd71c35" dependencies = [ "darling 0.13.4", "ident_case", @@ -5323,9 +5322,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5333,9 +5332,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", @@ -5360,9 +5359,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5370,9 +5369,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", @@ -5383,9 +5382,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-sys" @@ -5679,18 +5678,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.26" +version = "0.7.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +checksum = "f43de342578a3a14a9314a2dab1942cbfcbe5686e1f91acdc513058063eafe18" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.26" +version = "0.7.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +checksum = "e1012d89e3acb79fad7a799ce96866cfb8098b74638465ea1b1533d35900ca90" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 11e34045c36f1..0d7b96562104a 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -25,19 +25,20 @@ let outputHashes = { "email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU="; "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; - "iroh-0.4.1" = "sha256-oLvka1nV2yQPzlcaq5CXqXRRu7GkbMocV6GoIlxQKlo="; + "imap-proto-0.16.3" = "sha256-okIHA8MQ1K/tcKHZYGh83zom1ULGHZ/KGxgcwiE1+sE="; + "iroh-0.4.2" = "sha256-VXNMmj+AvlY/W2JRWMICoNOqpFEahsUDxypHRg185Ao="; "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; }; }; in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.131.7"; + version = "1.131.9"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-QzNZBBQ0fFqQByaNRNebtnoljC4rQqVTxbNz2M3LDAc="; + hash = "sha256-xZai5RsrfT6bYzMpNdKncmDzBzcAcEtZZmh7f+3g5Hs="; }; patches = [ diff --git a/pkgs/development/libraries/libdicom/default.nix b/pkgs/development/libraries/libdicom/default.nix new file mode 100644 index 0000000000000..cb4d68121ef57 --- /dev/null +++ b/pkgs/development/libraries/libdicom/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, uthash +, meson +, ninja +, pkg-config +, check +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libdicom"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "ImagingDataCommons"; + repo = "libdicom"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-9n0Gp9+fmTM/shgWC8zpwt1pic9BrvDubOt7f+ZDMeE="; + }; + + buildInputs = [ uthash ]; + + nativeBuildInputs = [ meson ninja pkg-config ] + ++ lib.optionals (finalAttrs.finalPackage.doCheck) [ check ]; + + mesonBuildType = "release"; + + mesonFlags = lib.optionals (!finalAttrs.finalPackage.doCheck) [ "-Dtests=false" ]; + + doCheck = true; + + meta = with lib; { + description = "C library for reading DICOM files"; + homepage = "https://github.com/ImagingDataCommons/libdicom"; + license = licenses.mit; + maintainers = with maintainers; [ lromor ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 63a8522bd073c..a7ead8f227472 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.117"; + version = "2.4.118"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-ooiNaePrHIp3rcCKdaYPuuAfDSCNJvA00aEuNiNhJCs="; + hash = "sha256-p3e9hfK1/JxX+IbIIFgwBXgxfK/bx30Kdp1+mpVnq4g="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 92181db1c7cde..3478217d7f6b8 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libebml"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libebml"; rev = "release-${version}"; - sha256 = "sha256-36SfZUHJ2sIvrrHox583cQqfWWcrL2zW1IHzgDchC9g="; + sha256 = "sha256-PIVBePTWceMgiENdaL9lvXIL/RQIrtg7l0OG2tO0SU8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index c36d882c0aebd..f0eb267b05b57 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -14,6 +14,17 @@ stdenv.mkDerivation rec { # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. # NROFF = "${groff}/bin/nroff"; + # GCC automatically include `stdc-predefs.h` while Clang does not do + # this by default. While Musl is ISO 10646 compliant, doesn't define + # __STDC_ISO_10646__. This definition is in `stdc-predefs.h` that's + # why libedit builds just fine with GCC and Musl. + # There is a DR to fix this issue with Clang which is not merged + # yet. + # https://reviews.llvm.org/D137043 + NIX_CFLAGS_COMPILE = lib.optional + (stdenv.targetPlatform.isMusl && stdenv.cc.isClang) + "-D__STDC_ISO_10646__=201103L"; + patches = [ ./01-cygwin.patch ]; propagatedBuildInputs = [ ncurses ]; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 5bfa335314fe8..6394a35d782dc 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { # cgit) that are needed here should be included directly in Nixpkgs as # files. patches = [ + # Fix implicit function declarations (clang-16 build failure): + # https://github.com/libffi/libffi/pull/764 + ./fix-implicit-fun-decl.patch ]; strictDeps = true; diff --git a/pkgs/development/libraries/libffi/fix-implicit-fun-decl.patch b/pkgs/development/libraries/libffi/fix-implicit-fun-decl.patch new file mode 100644 index 0000000000000..c0bd32d4333cf --- /dev/null +++ b/pkgs/development/libraries/libffi/fix-implicit-fun-decl.patch @@ -0,0 +1,46 @@ +https://github.com/libffi/libffi/commit/ce077e5565366171aa1b4438749b0922fce887a4.patch + +From ce077e5565366171aa1b4438749b0922fce887a4 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille <serge.guelton@telecom-bretagne.eu> +Date: Thu, 2 Feb 2023 14:46:29 +0000 +Subject: [PATCH] Forward declare open_temp_exec_file (#764) + +It's defined in closures.c and used in tramp.c. +Also declare it as an hidden symbol, as it should be. + +Co-authored-by: serge-sans-paille <sguelton@mozilla.com> +--- + include/ffi_common.h | 4 ++++ + src/tramp.c | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/include/ffi_common.h b/include/ffi_common.h +index 2bd31b03d..c53a79493 100644 +--- a/include/ffi_common.h ++++ b/include/ffi_common.h +@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN; + static trampoline. */ + int ffi_tramp_is_present (void *closure) FFI_HIDDEN; + ++/* Return a file descriptor of a temporary zero-sized file in a ++ writable and executable filesystem. */ ++int open_temp_exec_file(void) FFI_HIDDEN; ++ + /* Extended cif, used in callback from assembly routine */ + typedef struct + { +diff --git a/src/tramp.c b/src/tramp.c +index 7e005b054..5f19b557f 100644 +--- a/src/tramp.c ++++ b/src/tramp.c +@@ -39,6 +39,10 @@ + #ifdef __linux__ + #define _GNU_SOURCE 1 + #endif ++ ++#include <ffi.h> ++#include <ffi_common.h> ++ + #include <stdio.h> + #include <unistd.h> + #include <stdlib.h> diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index c14c30c273354..b3c3cc450237e 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.13.0"; + version = "1.14.0"; # releases on https://developers.yubico.com/libfido2/Releases/ are signed src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-UdQ3J+KhxFRMf9DuR3hvRD458TiK2nNaUJrUrwokWco="; + sha256 = "sha256-NgF5LjIAMtQoACxMzoSZpMe4AzGQUaJaDJ8fE4/+5Fo="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index f5fbf21f94fd7..95fcf7131103e 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -61,6 +61,10 @@ stdenv.mkDerivation { "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=enum-constexpr-conversion"; + }; + postInstall = lib.optionalString stdenv.isDarwin '' # No rules to install the mac app, so do it manually. mkdir -p $out/Applications diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 23e11f0970543..28cee5c7dfd61 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , gettext , libgpg-error , enableCapabilities ? false, libcap @@ -16,21 +15,13 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - hash = "sha256-O5wCoAS2jCVq3ZlwHeALODrMzPNxd+DWxYKJZkzODAM="; + hash = "sha256-iwhwiXrFrGfe1Wjc+t9Flpz6imvrD9YK8qnq3Coycqo="; }; - patches = lib.optionals (!stdenv.isLinux) [ # not everywhere to avoid rebuild for now - (fetchpatch { - name = "getrandom-conditionalize.patch"; - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff_plain;h=d41177937cea4aa1e9042ebcd195a349c40e8071"; - hash = "sha256-CgQjNtC1qLe5LicIc8rESc6Z1u4fk7ErMUVcG/2G9gM="; - }) - ]; - outputs = [ "out" "dev" "info" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 085c4c79bdc94..d21dbcb7ac0a0 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { "-DUSE_HTTP_PARSER=system" "-DUSE_SSH=ON" "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}" + ] ++ lib.optionals stdenv.hostPlatform.isWindows [ + "-DDLLTOOL=${stdenv.cc.bintools.targetPrefix}dlltool" + # For ws2_32, refered to by a `*.pc` file + "-DCMAKE_LIBRARY_PATH=${stdenv.cc.libc}/lib" ]; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/development/libraries/libglibutil/default.nix index 70fc7d2dbeeff..26d54d26d66a4 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.74"; + version = "1.0.75"; src = fetchFromGitHub { owner = "sailfishos"; repo = pname; rev = version; - sha256 = "sha256-+nIB516XUPjfI3fHru48sU/5PYL/w14/sMK/B8FLflI="; + sha256 = "sha256-YHK5gRXBIhZJTY7F8b7QIUnftCIgOHwXVM3D35M3DC4="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index b7ccb7085fb20..a7480d6ffb95a 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,5 @@ { stdenv, lib, fetchFromGitLab +, fetchpatch , autoreconfHook, pkg-config, python3, addOpenGLRunpath , libX11, libXext, xorgproto }: @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-2U9JtpGyP4lbxtVJeP5GUgh5XthloPvFIw28+nldYx8="; }; + patches = [ + # Enable 64-bit file APIs on 32-bit systems: + # https://gitlab.freedesktop.org/glvnd/libglvnd/-/merge_requests/288 + (fetchpatch { + name = "large-file.patch"; + url = "https://gitlab.freedesktop.org/glvnd/libglvnd/-/commit/956d2d3f531841cabfeddd940be4c48b00c226b4.patch"; + hash = "sha256-Y6YCzd/jZ1VZP9bFlHkHjzSwShXeA7iJWdyfxpgT2l0="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 775bcf2f2a432..f360e29ec2f24 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -15,9 +15,23 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + strictDeps = true; propagatedBuildInputs = [ glib dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + configureFlags = [ + # not ideal to use -config scripts but it's not possible switch it to pkg-config + # binaries in dev have a for build shebang + "LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}" + ]; + + postPatch = '' + # uses pkg-config in some places and uses the correct $PKG_CONFIG in some + # it's an ancient library so it has very old configure scripts and m4 + substituteInPlace ./configure \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index b924dc5e3907c..dbee4c9a35820 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -1,62 +1,53 @@ { lib , stdenv , fetchFromGitHub -, fetchurl , rustPlatform , cargo , pkg-config -, dtc , glibc , openssl -, libiconv , libkrunfw , rustc -, Hypervisor , sevVariant ? false }: stdenv.mkDerivation rec { pname = "libkrun"; - version = "1.5.1"; + version = "1.7.2"; - src = if stdenv.isLinux then fetchFromGitHub { + src = fetchFromGitHub { owner = "containers"; - repo = pname; - rev = "v${version}"; - hash = "sha256-N9AkG+zkjQHNaaCVrEpMfWUN9bQNHjMA2xi5NUulF5A="; - } else fetchurl { - url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-8hPbnZtDbiVdwBrtxt4nZ/QA2OFtui2VsQlaoOmWybo="; + repo = "libkrun"; + rev = "refs/tags/v${version}"; + hash = "sha256-cP+Pxl/9QIsoGysXTBZJ86q57cIMA7TJenMWtcOI+Y4="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - hash = "sha256-nbtp7FP+ObVGfDOEzTt4Z7TZwcNlREczTKIAXGSflZU="; + inherit pname version src; + hash = "sha256-qVyHC015QJEt6LZ8br3H0nucYKhYGBMtyB2IBaixTqk="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook cargo rustc - ] ++ lib.optional sevVariant pkg-config; + ] ++ lib.optionals sevVariant [ + pkg-config + ]; buildInputs = [ (libkrunfw.override { inherit sevVariant; }) - ] ++ lib.optionals stdenv.isLinux [ glibc glibc.static - ] ++ lib.optionals stdenv.isDarwin [ - libiconv - Hypervisor - dtc - ] ++ lib.optional sevVariant openssl; + ] ++ lib.optionals sevVariant [ + openssl + ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ] - ++ lib.optional sevVariant "SEV=1"; - - postFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/libkrun.dylib $out/lib/libkrun.${version}.dylib - ''; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ] ++ lib.optionals sevVariant [ + "SEV=1" + ]; meta = with lib; { description = "A dynamic library providing Virtualization-based process isolation capabilities"; @@ -64,6 +55,5 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; platforms = libkrunfw.meta.platforms; - sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ]; }; } diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index 3b4bf0855d0fa..f4f67db652cac 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -10,39 +10,44 @@ , sevVariant ? false }: -assert sevVariant -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "libkrunfw"; - version = "3.11.0"; + version = "4.0.0"; - src = if stdenv.isLinux then fetchFromGitHub { + src = fetchFromGitHub { owner = "containers"; - repo = pname; - rev = "v${version}"; - hash = "sha256-p5z3Dc7o/Ja3K0VlOWIPc0qOIU5p+JSxWe7QiVQNkjs="; - } else fetchurl { - url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-XcdsK8L5NwMgelSMhE2YKYxaAin/3p/+GrljGGZpK5Y="; + repo = "libkrunfw"; + rev = "refs/tags/v${version}"; + hash = "sha256-9oVl4mlJE7QHeehG86pbh7KdShZNUGwlnO75k/F/PQ0="; }; kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.9.tar.xz"; - hash = "sha256-kDRJwWTAPw50KqzJIOGFY1heB6KMbLeeD9bDZpX9Q/U="; + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.4.7.tar.xz"; + hash = "sha256-3hQ8th3Kp1bAX1b/NRRDFtgQYVgZUYoz40dU8GTEp9g="; }; - preBuild = '' + postPatch = '' substituteInPlace Makefile \ - --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' \ - --replace 'gcc' '$(CC)' + --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' ''; - nativeBuildInputs = [ flex bison bc python3 python3.pkgs.pyelftools ]; - buildInputs = lib.optionals stdenv.isLinux [ elfutils ]; + nativeBuildInputs = [ + flex + bison + bc + python3 + python3.pkgs.pyelftools + ]; + + buildInputs = [ + elfutils + ]; makeFlags = [ "PREFIX=${placeholder "out"}" - "SONAME_Darwin=-Wl,-install_name,${placeholder "out"}/lib/libkrunfw.dylib" - ] ++ lib.optional sevVariant "SEV=1"; + ] ++ lib.optionals sevVariant [ + "SEV=1" + ]; enableParallelBuilding = true; @@ -51,7 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/libkrunfw"; license = with licenses; [ lgpl2Only lgpl21Only ]; maintainers = with maintainers; [ nickcao ]; - platforms = [ "x86_64-linux" "aarch64-darwin" ]; - sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 9b1716ecc6dfb..8f22ede81669d 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.4"; + version = "1.6.5"; src = fetchurl { url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2"; - hash = "sha256-u7Q/AyuRZNhseB/+QiE6g79PL+6RRV7fpGVFIbiwO2s="; + hash = "sha256-pWRijFdMmSh5mHU/mNdQur2RpOnbRR9GrRQEZu8qbRY="; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index c023d108a09e5..db794925504a3 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "C library for working with MaxMind geolocation DB files"; homepage = "https://github.com/maxmind/libmaxminddb"; license = licenses.asl20; - maintainers = [ maintainers.ajs124 ]; + maintainers = teams.helsinki-systems.members; mainProgram = "mmdblookup"; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 86cf8dfb9e888..94acb13205b50 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "23.10"; + version = "23.11"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-duvlAuDzELVZ1d2Qcn2ar9X6uq7KNELzjmKd/AfaDSI="; + hash = "sha256-GX5U/MeePA1d9EqPWNxOAYvC+F0T+jvtVK89xW1ehT0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 747c8893eb0fc..941ef5dad79f8 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = "https://netfilter.org/projects/libnftnl/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz ajs124 ]; + maintainers = with maintainers; [ fpletz ] ++ teams.helsinki-systems.members; }; } diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index 59e16071ce714..b199406918abd 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-bCToqXVE4RZcoZ2eTNZcVHyzKlWyIpSAssQCOZcfmEA="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libtirpc ]; diff --git a/pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch b/pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch index c391f77dda8b7..c391f77dda8b7 100644 --- a/pkgs/applications/video/openshot-qt/undef-fpret-on-aarch64-darwin.patch +++ b/pkgs/development/libraries/libopenshot-audio/0001-undef-fpret-on-aarch64-darwin.patch diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/development/libraries/libopenshot-audio/default.nix index 5526c8b417350..e546dc7a57862 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/development/libraries/libopenshot-audio/default.nix @@ -19,20 +19,20 @@ , Foundation }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libopenshot-audio"; version = "0.3.2"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; - rev = "v${version}"; - sha256 = "sha256-PLpB9sy9xehipN5S9okCHm1mPm5MaZMVaFqCBvFUiTw="; + rev = "v${finalAttrs.version}"; + hash = "sha256-PLpB9sy9xehipN5S9okCHm1mPm5MaZMVaFqCBvFUiTw="; }; patches = [ # https://forum.juce.com/t/juce-and-macos-11-arm/40285/24 - ./undef-fpret-on-aarch64-darwin.patch + ./0001-undef-fpret-on-aarch64-darwin.patch ]; nativeBuildInputs = [ @@ -58,9 +58,11 @@ stdenv.mkDerivation rec { libXrandr ]); - doCheck = false; + strictDeps = true; - meta = with lib; { + doCheck = true; + + meta = { homepage = "http://openshot.org/"; description = "High-quality sound editing library"; longDescription = '' @@ -68,8 +70,8 @@ stdenv.mkDerivation rec { high-quality editing and playback of audio, and is based on the amazing JUCE library. ''; - license = with licenses; gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libopenshot/0001-link-magickcore.diff b/pkgs/development/libraries/libopenshot/0001-link-magickcore.diff new file mode 100644 index 0000000000000..e5055d3f30895 --- /dev/null +++ b/pkgs/development/libraries/libopenshot/0001-link-magickcore.diff @@ -0,0 +1,12 @@ +diff -Naur source/src/CMakeLists.txt source-new/src/CMakeLists.txt +--- source/src/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300 ++++ source-new/src/CMakeLists.txt 2023-11-30 09:39:45.442332463 -0300 +@@ -231,7 +231,7 @@ + target_compile_definitions(openshot PUBLIC USE_IMAGEMAGICK=1) + + # Link with ImageMagick library +- target_link_libraries(openshot PUBLIC ImageMagick::Magick++) ++ target_link_libraries(openshot PUBLIC ImageMagick::Magick++ ImageMagick::MagickCore) + + set(HAVE_IMAGEMAGICK TRUE CACHE BOOL "Building with ImageMagick support" FORCE) + mark_as_advanced(HAVE_IMAGEMAGICK) diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/development/libraries/libopenshot/default.nix index 38366782f3bef..4622dabb2983a 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/development/libraries/libopenshot/default.nix @@ -18,28 +18,23 @@ , zeromq }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libopenshot"; version = "0.3.2"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; - rev = "v${version}"; - sha256 = "sha256-axFGNq+Kg8atlaSlG8EKvxj/FwLfpDR8/e4otmnyosM="; + rev = "v${finalAttrs.version}"; + hash = "sha256-axFGNq+Kg8atlaSlG8EKvxj/FwLfpDR8/e4otmnyosM="; }; - postPatch = '' - sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt - '' + lib.optionalString stdenv.isDarwin '' - # Darwin requires both Magick++ and MagickCore or it will fail to link. - substituteInPlace src/CMakeLists.txt \ - --replace 'target_link_libraries(openshot PUBLIC ImageMagick::Magick++)' 'target_link_libraries(openshot PUBLIC ImageMagick::Magick++ ImageMagick::MagickCore)' - ''; + patches = lib.optionals stdenv.isDarwin [ + # Darwin requires both Magick++ and MagickCore for a successful linkage + ./0001-link-magickcore.diff + ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ - alsa-lib - ] ++ [ + nativeBuildInputs = [ cmake doxygen pkg-config @@ -56,20 +51,28 @@ stdenv.mkDerivation rec { qtbase qtmultimedia zeromq + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]; + strictDeps = true; + dontWrapQtApps = true; - doCheck = false; + doCheck = true; cmakeFlags = [ - "-DENABLE_RUBY=OFF" - "-DPYTHON_MODULE_PATH=${python3.sitePackages}" + (lib.cmakeBool "ENABLE_RUBY" false) + (lib.cmakeOptionType "filepath" "PYTHON_MODULE_PATH" python3.sitePackages) ]; - meta = with lib; { + passthru = { + inherit libopenshot-audio; + }; + + meta = { homepage = "http://openshot.org/"; description = "Free, open-source video editor library"; longDescription = '' @@ -77,12 +80,8 @@ stdenv.mkDerivation rec { delivering high quality video editing, animation, and playback solutions to the world. API currently supports C++, Python, and Ruby. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; - - passthru = { - inherit libopenshot-audio; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix index 36820a2eecc27..e74c0b7810559 100644 --- a/pkgs/development/libraries/libpg_query/default.nix +++ b/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "15-4.2.3"; + version = "16-5.0.0"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - hash = "sha256-/HUg6x0il5WxENmgR3slu7nmXTKv6YscjpX569Dztko="; + hash = "sha256-nO4ZqjEpQqmIZcsrhayGhjD4HKUBD1tEZg/khmdgK68="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 87e3049c6c852..84623e7459fca 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.1"; + version = "4.9.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-4WqKlwVf4/ixVr98lPFVfNL6EOIfHHfL55xLsYqxkhY="; + hash = "sha256-6W65dg2pZeio3ZVgVLQZrz/eReYcPiYf52zjcaRfE8E="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libqtdbusmock/default.nix b/pkgs/development/libraries/libqtdbusmock/default.nix index 491b8583fc93d..d9993947b5536 100644 --- a/pkgs/development/libraries/libqtdbusmock/default.nix +++ b/pkgs/development/libraries/libqtdbusmock/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { # Workaround for "error: expected unqualified-id before 'public'" on "**signals" sed -i -e '/add_definitions/a -DQT_NO_KEYWORDS' CMakeLists.txt - '' + lib.optionalString (!finalAttrs.doCheck) '' + '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' # Don't build tests when we're not running them sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt ''; diff --git a/pkgs/development/libraries/libqtdbustest/default.nix b/pkgs/development/libraries/libqtdbustest/default.nix index 8ef8975a01afb..fe6a3e0417982 100644 --- a/pkgs/development/libraries/libqtdbustest/default.nix +++ b/pkgs/development/libraries/libqtdbustest/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - postPatch = lib.optionalString (!finalAttrs.doCheck) '' + postPatch = lib.optionalString (!finalAttrs.finalPackage.doCheck) '' # Don't build tests when we're not running them sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt ''; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 256d903219398..f45404e2c1f38 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { - version = "3.6.2"; + version = "3.7.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-mbwi6tJer4JC7ijB6WGDNoC/EM5rqCtejbYRFi9Kwgk="; + sha256 = "sha256-7wNzYp6o3+71Jz/VuDWyVOj+OrAkDyDG0NWryYwuIT4="; }; buildInputs = [ diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index aec9cfaaf91a2..9a127fcd92ad3 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -23,7 +23,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.45.0"; + version = "2.54.2"; outputs = [ "out" "dev" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "0aqf48zl7825v7x8c3x5w4d17m4qq377f1mn6xyqzf9b0dnk4i1j"; + sha256 = "sha256-EbnIHnsUgsqN/SVv4m9H7K8gfwni+u82+M55QBstAGI="; }; buildInputs = [ @@ -42,22 +42,10 @@ stdenv.mkDerivation rec { ++ lib.optionals enableGUI [ mesa gtk3 glfw libGLU curl ]; patches = [ - # fix build on aarch64-darwin - # https://github.com/IntelRealSense/librealsense/pull/9253 - (fetchpatch { - url = "https://github.com/IntelRealSense/librealsense/commit/beb4c44debc8336de991c983274cad841eb5c323.patch"; - sha256 = "05mxsd2pz3xrvywdqyxkwdvxx8hjfxzcgl51897avz4v2j89pyq8"; - }) - ./py_sitepackage_dir.patch ./py_pybind11_no_external_download.patch + ./install-presets.patch ]; - postPatch = '' - # https://github.com/IntelRealSense/librealsense/issues/11092 - # insert a "#include <iostream" at beginning of file - sed '1i\#include <iostream>' -i wrappers/python/pyrs_device.cpp - ''; - nativeBuildInputs = [ cmake ninja diff --git a/pkgs/development/libraries/librealsense/install-presets.patch b/pkgs/development/libraries/librealsense/install-presets.patch new file mode 100644 index 0000000000000..347aa43453230 --- /dev/null +++ b/pkgs/development/libraries/librealsense/install-presets.patch @@ -0,0 +1,13 @@ +diff --git a/tools/realsense-viewer/CMakeLists.txt b/tools/realsense-viewer/CMakeLists.txt +index 44be6278f..1a4531dff 100644 +--- a/tools/realsense-viewer/CMakeLists.txt ++++ b/tools/realsense-viewer/CMakeLists.txt +@@ -253,7 +253,7 @@ install( + ) + #https://cmake.org/cmake/help/latest/command/install.html + install(DIRECTORY presets/ +- DESTINATION $ENV{HOME}/Documents/librealsense2/presets ++ DESTINATION $ENV{out}/share/librealsense2/presets + FILES_MATCHING PATTERN "*.preset" + ) + endif() diff --git a/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch b/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch index 2b48edb62e37b..c91945fa15232 100644 --- a/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch +++ b/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch @@ -1,39 +1,15 @@ -From 01e51b9c90ba51b2d0ca797dde676812cf3db415 Mon Sep 17 00:00:00 2001 -From: "Robert T. McGibbon" <rmcgibbo@gmail.com> -Date: Mon, 10 May 2021 17:26:04 -0400 -Subject: [PATCH 1/1] V1 - ---- - wrappers/python/CMakeLists.txt | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt -index aa83e4c77..4ec92ccfa 100644 ---- a/wrappers/python/CMakeLists.txt -+++ b/wrappers/python/CMakeLists.txt -@@ -8,21 +8,8 @@ if (NOT BUILD_PYTHON_BINDINGS) - endif() - - set(DEPENDENCIES realsense2) --# In order for the external project clone to occur during cmake configure step(rather than during compilation, as would normally happen), --# we copy the external project declaration to the build folder and then execute it --configure_file(${CMAKE_SOURCE_DIR}/third-party/pybind11/CMakeLists.txt ${CMAKE_BINARY_DIR}/external-projects/pybind11/CMakeLists.txt) --execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . -- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11" --) --execute_process(COMMAND "${CMAKE_COMMAND}" --build . -- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11" --) +diff --git a/CMake/global_config.cmake b/CMake/global_config.cmake +index 350f7a268..2cf125c67 100644 +--- a/CMake/global_config.cmake ++++ b/CMake/global_config.cmake +@@ -69,7 +69,8 @@ macro(global_set_flags) --# Add pybind11 makefile --add_subdirectory("${CMAKE_BINARY_DIR}/third-party/pybind11" -- "${CMAKE_BINARY_DIR}/third-party/pybind11" -- EXCLUDE_FROM_ALL --) -+find_package(pybind11 REQUIRED) + if(BUILD_PYTHON_BINDINGS) + include(libusb_config) +- include(CMake/external_pybind11.cmake) ++ find_package(pybind11 REQUIRED) ++ set(PYTHON_INSTALL_DIR "${XXNIX_PYTHON_SITEPACKAGES}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") + endif() - set(PYBIND11_CPP_STANDARD -std=c++11) - # Force Pybind11 not to share pyrealsense2 resources with other pybind modules. --- -2.29.3 + if(CHECK_FOR_UPDATES) diff --git a/pkgs/development/libraries/librealsense/py_sitepackage_dir.patch b/pkgs/development/libraries/librealsense/py_sitepackage_dir.patch deleted file mode 100644 index 99b567a429ed2..0000000000000 --- a/pkgs/development/libraries/librealsense/py_sitepackage_dir.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/wrappers/python/CMakeLists.txt -+++ b/wrappers/python/CMakeLists.txt -@@ -10,11 +10,11 @@ - if (CMAKE_VERSION VERSION_LESS 3.12) - find_package(PythonInterp REQUIRED) - find_package(PythonLibs REQUIRED) -- set(PYTHON_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") -+ set(PYTHON_INSTALL_DIR "${XXNIX_PYTHON_SITEPACKAGES}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") - set(CMAKECONFIG_PY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/pyrealsense2") - else() - find_package(Python REQUIRED COMPONENTS Interpreter Development) -- set(PYTHON_INSTALL_DIR "${Python_SITEARCH}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") -+ set(PYTHON_INSTALL_DIR "${XXNIX_PYTHON_SITEPACKAGES}/pyrealsense2" CACHE PATH "Installation directory for Python bindings") - set(CMAKECONFIG_PY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/pyrealsense2") - endif() diff --git a/pkgs/development/libraries/libressl/fix-build-with-glibc.patch b/pkgs/development/libraries/libressl/fix-build-with-glibc.patch deleted file mode 100644 index db482bcb35da3..0000000000000 --- a/pkgs/development/libraries/libressl/fix-build-with-glibc.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/tests/explicit_bzero.c b/tests/explicit_bzero.c -index 34c60baa8a..9c0e917829 100644 ---- a/tests/explicit_bzero.c -+++ b/tests/explicit_bzero.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: explicit_bzero.c,v 1.6 2014/07/11 01:10:35 matthew Exp $ */ -+/* $OpenBSD: explicit_bzero.c,v 1.7 2021/03/27 11:17:58 bcook Exp $ */ - /* - * Copyright (c) 2014 Google Inc. - * -@@ -18,6 +18,7 @@ - #include <assert.h> - #include <errno.h> - #include <signal.h> -+#include <stdlib.h> - #include <string.h> - #include <unistd.h> - -@@ -36,19 +37,33 @@ enum { - SECRETBYTES = SECRETCOUNT * sizeof(secret) - }; - --static char altstack[SIGSTKSZ + SECRETBYTES]; -+/* -+ * As of glibc 2.34, when _GNU_SOURCE is defined, SIGSTKSZ is no longer -+ * constant on Linux. SIGSTKSZ is redefined to sysconf (_SC_SIGSTKSZ). -+ */ -+static char *altstack; -+#define ALTSTACK_SIZE (SIGSTKSZ + SECRETBYTES) - - static void - setup_stack(void) - { -+ altstack = calloc(1, ALTSTACK_SIZE); -+ ASSERT_NE(NULL, altstack); -+ - const stack_t sigstk = { - .ss_sp = altstack, -- .ss_size = sizeof(altstack), -+ .ss_size = ALTSTACK_SIZE - }; - - ASSERT_EQ(0, sigaltstack(&sigstk, NULL)); - } - -+static void -+cleanup_stack(void) -+{ -+ free(altstack); -+} -+ - static void - assert_on_stack(void) - { -@@ -129,7 +144,7 @@ test_without_bzero() - char buf[SECRETBYTES]; - assert_on_stack(); - populate_secret(buf, sizeof(buf)); -- char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf)); -+ char *res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf)); - ASSERT_NE(NULL, res); - return (res); - } -@@ -140,7 +155,7 @@ test_with_bzero() - char buf[SECRETBYTES]; - assert_on_stack(); - populate_secret(buf, sizeof(buf)); -- char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf)); -+ char *res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf)); - ASSERT_NE(NULL, res); - explicit_bzero(buf, sizeof(buf)); - return (res); -@@ -183,15 +198,17 @@ main() - * on the stack. This sanity checks that call_on_stack() and - * populate_secret() work as intended. - */ -- memset(altstack, 0, sizeof(altstack)); -+ memset(altstack, 0, ALTSTACK_SIZE); - call_on_stack(do_test_without_bzero); - - /* - * Now test with a call to explicit_bzero() and check that we - * *don't* find any instances of the secret data. - */ -- memset(altstack, 0, sizeof(altstack)); -+ memset(altstack, 0, ALTSTACK_SIZE); - call_on_stack(do_test_with_bzero); - -+ cleanup_stack(); -+ - return (0); - } diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index aadaad561db0d..954242d81fb4f 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { badPlatforms = [ "alpha-linux" "loongarch64-linux" + "m68k-linux" + "microblaze-linux" + "microblazeel-linux" "riscv32-linux" "sparc-linux" "sparc64-linux" diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 194da3121615b..fbfdc0b7ff0de 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,62 +1,95 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , makeFontsConf , nix-update-script +, testers , autoreconfHook -, pkg-config -, perl -, unittest-cpp -, xa -, libgcrypt -, libexsid , docSupport ? true , doxygen , graphviz +, libexsid +, libgcrypt +, perl +, pkg-config +, unittest-cpp +, xa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-KCp/8UjVl8e3+4s1FD4GvHP7AUAS+eIB7RWhmgm5GIA="; + hash = "sha256-1e1QDSJ8CjLU794saba2auCKko7p2ylrdI0JWhh8Kco="; }; + outputs = [ + "out" + ] ++ lib.optionals docSupport [ + "doc" + ]; + + patches = [ + # Pull autoconf-2.72 compatibility fix: + # https://github.com/libsidplayfp/libsidplayfp/pull/103 + # Remove when version > 2.5.1 + (fetchpatch { + name = "0001-libsidplayfp-autoconf-2.72-compat.patch"; + url = "https://github.com/libsidplayfp/libsidplayfp/commit/2b1b41beb5099d5697e3f8416d78f27634732a9e.patch"; + hash = "sha256-5Hk202IuHUBow7HnnPr2/ieWFjKDuHLQjQ9mJUML9q8="; + }) + + # Fix --disable-tests logic + # https://github.com/libsidplayfp/libsidplayfp/pull/108 + # Remove when version > 2.5.1 + (fetchpatch { + name = "0002-libsidplayfp-Fix-autoconf-logic-for-tests-option.patch"; + url = "https://github.com/libsidplayfp/libsidplayfp/commit/39dd2893b6186c4932d17b529bb62627b742b742.patch"; + hash = "sha256-ErdfPvu8R81XxdHu2TaV87OpLFlRhJai51QcYUIkUZ4="; + }) + ]; + postPatch = '' patchShebangs . ''; strictDeps = true; - nativeBuildInputs = [ autoreconfHook pkg-config perl xa ] - ++ lib.optionals docSupport [ doxygen graphviz ]; - - buildInputs = [ libgcrypt libexsid ]; - - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - - checkInputs = [ unittest-cpp ]; + nativeBuildInputs = [ + autoreconfHook + perl + pkg-config + xa + ] ++ lib.optionals docSupport [ + doxygen + graphviz + ]; + + buildInputs = [ + libexsid + libgcrypt + ]; + + checkInputs = [ + unittest-cpp + ]; enableParallelBuilding = true; - installTargets = [ "install" ] - ++ lib.optionals docSupport [ "doc" ]; - - outputs = [ "out" ] - ++ lib.optionals docSupport [ "doc" ]; - configureFlags = [ - "--enable-hardsid" - "--with-gcrypt" - "--with-exsid" - ] - ++ lib.optional doCheck "--enable-tests"; + (lib.strings.enableFeature true "hardsid") + (lib.strings.withFeature true "gcrypt") + (lib.strings.withFeature true "exsid") + (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests") + ]; + # Make Doxygen happy with the setup, reduce log noise FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; }); preBuild = '' @@ -64,12 +97,21 @@ stdenv.mkDerivation rec { export XDG_CACHE_HOME=$TMPDIR ''; + buildFlags = [ + "all" + ] ++ lib.optionals docSupport [ + "doc" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + postInstall = lib.optionalString docSupport '' mkdir -p $doc/share/doc/libsidplayfp mv docs/html $doc/share/doc/libsidplayfp/ ''; passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; updateScript = nix-update-script { }; }; @@ -85,5 +127,9 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ ramkromberg OPNA2608 ]; platforms = platforms.all; + pkgConfigModules = [ + "libsidplayfp" + "libstilview" + ]; }; -} +}) diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix index 9ed8a3fd4c3ff..5515901a1cf2a 100644 --- a/pkgs/development/libraries/libsigcxx/3.0.nix +++ b/pkgs/development/libraries/libsigcxx/3.0.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { sha256 = "w9I7N9/W458uCfCRt3sVQfv6F8Twtr9cibrvcikIDhc="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 3afb588af1b12..c73cbaa55dc30 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-qdvuMjNR0Qm3ruB0qcuJyj57z4rY7e8YUfTPNZvVCEM="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkg-config meson ninja ]; doCheck = true; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index b3a00d89a5d53..5ecd27f600781 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,21 +1,29 @@ -{ lib, stdenv, fetchurl, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook , testers }: stdenv.mkDerivation (finalAttrs: { pname = "libsodium"; - version = "1.0.18"; + version = "1.0.19"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g"; + hash = "sha256-AY15/goEXMoHMx03vQy1ey6DjFG8SP2DehRy5QBou+o="; }; outputs = [ "out" "dev" ]; - patches = lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch; - - nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; + patches = [ + # Drop -Ofast as it breaks floating point arithmetics in downstream + # users. + (fetchpatch { + name = "drop-Ofast.patch"; + url = "https://github.com/jedisct1/libsodium/commit/ffd1e374989197b44d815ac8b5d8f0b43b6ce534.patch"; + hash = "sha256-jG0VirIoFBwYmRx6zHSu2xe6pXYwbeqNVhPJxO6eJEY="; + }) + ] ++ lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch; + + nativeBuildInputs = [ autoreconfHook ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 4b40eacaa0312..8f06936b59590 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.26"; + version = "0.7.27"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-NGybpl/Fd46pmSYMNGocStQQCXr5pX34PCmN/hFKeyk="; + sha256 = "sha256-kVExzCHfPU/o+C5TTAv1J9H7GmYwVWCsIpVkkts42js="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 16c98abf44173..e1f93c8224714 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DSIDX_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DSIDX_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ]; doCheck = true; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 2d916fa9a9391..9299e4dbfb137 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -2,24 +2,26 @@ stdenv.mkDerivation rec { pname = "libspectre"; - version = "0.2.7"; + version = "0.2.12"; src = fetchurl { url = "https://libspectre.freedesktop.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"; + hash = "sha256-VadRfNNXK9JWXfDPRQlEoE1Sc7J567NpqJU5GVfw+WA="; }; - patches = [ ./libspectre-0.2.7-gs918.patch ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ # Need `libgs.so'. - ghostscript cairo /*for tests*/ + ghostscript ]; doCheck = true; + checkInputs = [ + cairo + ]; + meta = { homepage = "http://libspectre.freedesktop.org/"; description = "PostScript rendering library"; diff --git a/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch b/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch deleted file mode 100644 index e9a4eda192bab..0000000000000 --- a/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch +++ /dev/null @@ -1,42 +0,0 @@ -Fixed error namespace for >=ghostscript-gpl-9.18 - -https://bugs.gentoo.org/563540 - ---- libspectre-0.2.7/libspectre/spectre-gs.c -+++ libspectre-0.2.7/libspectre/spectre-gs.c -@@ -43,12 +43,12 @@ - - if (code <= -100) { - switch (code) { -- case e_Fatal: -+ case gs_error_Fatal: - fprintf (stderr, "fatal internal error %d", code); - return TRUE; - break; - -- case e_ExecStackUnderflow: -+ case gs_error_ExecStackUnderflow: - fprintf (stderr, "stack overflow %d", code); - return TRUE; - break; -@@ -109,9 +109,9 @@ - set = _spectre_strdup_printf ("%d %d translate\n", -x, -y); - error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set), - 0, &exit_code); -- error = error == e_NeedInput ? 0 : error; -+ error = error == gs_error_NeedInput ? 0 : error; - free (set); -- if (error != e_NeedInput && critic_error_code (error)) { -+ if (error != gs_error_NeedInput && critic_error_code (error)) { - fclose (fd); - return FALSE; - } -@@ -126,7 +126,7 @@ - read = fread (buf, sizeof (char), to_read, fd); - error = gsapi_run_string_continue (ghostscript_instance, - buf, read, 0, &exit_code); -- error = error == e_NeedInput ? 0 : error; -+ error = error == gs_error_NeedInput ? 0 : error; - left -= read; - } - diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index 997e89b82397c..d8746f72f3b52 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "authorization (Helsinki Systems fork)"; homepage = "https://github.com/helsinki-systems/libspf2"; license = with licenses; [ lgpl21Plus bsd2 ]; - maintainers = with maintainers; [ pacien ajs124 das_j ]; + maintainers = with maintainers; [ pacien ] ++ teams.helsinki-systems.members; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 22b0f8af20437..8e735369e076e 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -85,7 +85,6 @@ stdenv.mkDerivation rec { description = "Library and utilities for working with the TIFF image file format"; homepage = "https://libtiff.gitlab.io/libtiff"; changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; - maintainers = with maintainers; [ qyliss ]; license = licenses.libtiff; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 1f768a2cb261f..57ceb5b444dfb 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { dontDisableStatic = withStatic; + # libusb-1.0.rc:11: fatal error: opening dependency file .deps/libusb-1.0.Tpo: No such file or directory + dontAddDisableDepTrack = stdenv.hostPlatform.isWindows; + configureFlags = lib.optional (!enableUdev) "--disable-udev" ++ lib.optional (withExamples) "--enable-examples-build"; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index d8b7cbdab5219..9381f370754c9 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,13 +1,10 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoconf , automake , libtool , pkg-config -, ApplicationServices -, CoreServices , pkgsStatic # for passthru.tests @@ -21,28 +18,20 @@ , nodejs , ocamlPackages , python3 +, testers }: stdenv.mkDerivation (finalAttrs: { - version = "1.46.0"; + version = "1.47.0"; pname = "libuv"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Lrsyh4qd3OkTw1cSPfahzfSGNt6+pRN1X21iiv1SsFo="; + hash = "sha256-J6qvq///A/tr+/vNRVCwCc80/VHKWQTYF6Mt1I+dBCU="; }; - patches = [ - # Disable io_uring close on selected kernels. Remove on next release - # https://github.com/libuv/libuv/pull/4141 - (fetchpatch { - url = "https://github.com/libuv/libuv/commit/c811169f91b2101f7302e96de3d2dc366ade3a25.patch"; - hash = "sha256-7vk6XGXwJcwYUQPqIJ3JPd/fPIGrjE5WRDSJCMQfKeU="; - }) - ]; - outputs = [ "out" "dev" ]; postPatch = let @@ -50,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent "tcp_connect_timeout" # tries to reach out to 8.8.8.8 "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces - "getaddrinfo_fail" "getaddrinfo_fail_sync" + "getaddrinfo_fail" "getaddrinfo_fail_sync" "tcp_connect6_link_local" "threadpool_multiple_event_loops" # times out on slow machines "get_passwd" # passed on NixOS but failed on other Linuxes "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" "metrics_pool_events" # times out sometimes @@ -86,12 +75,11 @@ stdenv.mkDerivation (finalAttrs: { "shutdown_close_pipe" ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; - in lib.optionalString (finalAttrs.doCheck) '' + in lib.optionalString (finalAttrs.finalPackage.doCheck) '' sed '/${tdRegexp}/d' -i test/test-list.h ''; nativeBuildInputs = [ automake autoconf libtool pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh @@ -119,12 +107,14 @@ stdenv.mkDerivation (finalAttrs: { python-pyuv = python3.pkgs.pyuv; python-uvloop = python3.pkgs.uvloop; static = pkgsStatic.libuv; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { 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"; + pkgConfigModules = [ "libuv" ]; maintainers = with maintainers; [ marsam ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index eb2a6598cf6f5..777119378d34f 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.20.0"; + version = "2.20.1"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-oW4vIGgSs5lzmuloCFJPXTmsfH9Djz2KTlsjrOkaT5I="; + sha256 = "sha256-ZX6ahKnOB5ZEg36iIWskq3q26GVg/trsCAKKttEKZ1s="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4c3740e4ba7c2..ff40c3693fffb 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -114,13 +114,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> - version = "9.9.0"; + version = "9.10.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-8Tmn99wDkRoA+pnOjeCzHoCeR3P3MwCA1kqY6SZpkqw="; + sha256 = "sha256-SYk3aseaVD31rnGKj/7eoLldGbOdJfKMw4tVDjtjcwY="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libwnck/fix-pc-file.patch b/pkgs/development/libraries/libwnck/fix-pc-file.patch deleted file mode 100644 index 42017a993b518..0000000000000 --- a/pkgs/development/libraries/libwnck/fix-pc-file.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/meson.build b/meson.build -index 28799d8..047e523 100644 ---- a/meson.build -+++ b/meson.build -@@ -72,11 +72,15 @@ - pc_conf = configuration_data() - pc_conf.set('prefix', get_option('prefix')) - pc_conf.set('exec_prefix', '${prefix}') --pc_conf.set('libdir', '${exec_prefix}/' + get_option('libdir')) --pc_conf.set('includedir', '${prefix}/' + get_option('includedir')) --pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE) -+pc_conf.set('libdir', '${exec_prefix}' / get_option('libdir')) -+pc_conf.set('includedir', '${prefix}' / get_option('includedir')) -+if conf.has('HAVE_' + STARTUP_NOTIFICATION_PACKAGE.to_upper().underscorify()) -+ pc_conf.set('STARTUP_NOTIFICATION_PACKAGE', STARTUP_NOTIFICATION_PACKAGE) -+endif - pc_conf.set('X11_PACKAGE', X11_PACKAGE) --pc_conf.set('XRES_PACKAGE', XRES_PACKAGE) -+if conf.has('HAVE_' + XRES_PACKAGE.to_upper().underscorify()) -+ pc_conf.set('XRES_PACKAGE', XRES_PACKAGE) -+endif - pc_conf.set('VERSION', meson.project_version()) - - foreach pc: [PACKAGE_NAME, PACKAGE_NAME + '-uninstalled'] diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 356f87ff264b5..dbca7f7fc2b79 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.38"; + version = "1.1.39"; outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py"; outputMan = "bin"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HzJFBCWBmgmsr/Krelp/ii7HlW5QXXvutF6EPQ4eyrE="; + hash = "sha256-KiCtYhFIM5sHWcTU6WcZNi3uZMmgltu6YlugU4RjSfA="; }; strictDeps = true; diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix index 855fc48a2aef4..50cb0847089be 100644 --- a/pkgs/development/libraries/libzim/default.nix +++ b/pkgs/development/libraries/libzim/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "9.0.0"; + version = "9.1.0"; src = fetchFromGitHub { owner = "openzim"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-K1S2MiugUeqCfPq0Oclmghb9064xrsKgUEVjFCJHt0U="; + hash = "sha256-yWnW/+CaQwbemrNLzvQpXw5yvW2Q6LtwDgvA58+fVUs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index b98f5066dae51..8d5a7d9aebd2a 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -62,6 +62,8 @@ stdenv.mkDerivation rec { preConfigure = '' # use empty inc file instead of a from linux kernel generated one touch lib/lirc/input_map.inc + + export PKGCONFIG="$PKG_CONFIG" ''; strictDeps = true; diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index e204fa92bfd1b..42a428b35c7e8 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A forked version of log4cpp that has been created for the Shibboleth project"; - maintainers = [ maintainers.jammerful ]; + maintainers = [ ]; license = licenses.lgpl21; homepage = "http://log4cpp.sf.net"; }; diff --git a/pkgs/development/libraries/loudmouth/glib-2.32.patch b/pkgs/development/libraries/loudmouth/glib-2.32.patch deleted file mode 100644 index 87fc170c80dad..0000000000000 --- a/pkgs/development/libraries/loudmouth/glib-2.32.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: loudmouth-1.4.3/loudmouth/lm-error.c -=================================================================== ---- loudmouth-1.4.3.orig/loudmouth/lm-error.c -+++ loudmouth-1.4.3/loudmouth/lm-error.c -@@ -19,7 +19,7 @@ - */ - - #include <config.h> --#include <glib/gerror.h> -+#include <glib.h> - #include "lm-error.h" - - /** diff --git a/pkgs/development/libraries/mdk-sdk/default.nix b/pkgs/development/libraries/mdk-sdk/default.nix new file mode 100644 index 0000000000000..1bf8992f948c7 --- /dev/null +++ b/pkgs/development/libraries/mdk-sdk/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchurl, autoPatchelfHook +, alsa-lib, gcc-unwrapped, libX11, libcxx, libdrm, libglvnd, libpulseaudio, libxcb, mesa, wayland, xz, zlib +, libva, libvdpau, addOpenGLRunpath +}: + +stdenv.mkDerivation rec { + pname = "mdk-sdk"; + version = "0.23.1"; + + src = fetchurl { + url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz"; + hash = "sha256-qC6FL76MJZ2XrrYePQFpWk5VPLTeoRd5ns93AK3iZjw="; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + alsa-lib gcc-unwrapped libX11 libcxx libdrm libglvnd libpulseaudio libxcb mesa wayland xz zlib + ]; + + appendRunpaths = lib.makeLibraryPath [ + libva libvdpau addOpenGLRunpath.driverLink + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -r include $out + cp -d lib/amd64/libmdk* $out/lib + ln -s . $out/lib/amd64 + cp -r lib/cmake $out/lib + + runHook postInstall + ''; + + meta = with lib; { + description = "multimedia development kit"; + homepage = "https://github.com/wang-bin/mdk-sdk"; + license = licenses.unfree; + maintainers = with maintainers; [ orivej ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 49357dc02bbed..f1c109b244b36 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "5.2.109"; + version = "5.2.111"; dontWrapQtApps = true; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-uiuT53mM/dUw5tOYKsBEqEbvYRFKEyyTDKCLYaQvMAs="; + hash = "sha256-Le52tsyzOpepmvb+GOGCPwwTriPUjhYpa6GM+y/6USA="; }; patches = [ diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index dac12db94b621..bcff20f1847cd 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + mesonFlags = lib.optionals stdenv.isDarwin [ + "-Dgl_provider=gl" # glvnd is default + ]; + enableParallelBuilding = true; passthru = { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 173cc2016e5db..b4b70fcab4f55 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -133,6 +133,29 @@ self = stdenv.mkDerivation { ./opencl.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch + ] ++ lib.optionals stdenv.isDarwin [ + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 + (fetchpatch { + url = "https://gitlab.freedesktop.org/robclark/mesa/-/commit/44734d1fe98ef47019fe2c56d867d1645c526e4e.diff"; + hash = "sha256-ipaISEY5xcnGvrwFxNY80JVlYWddfiHofkYEBuPkyDY="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/robclark/mesa/-/commit/d2a46afbfc44121aa491a2b4d1a3249d26fc6a11.diff"; + hash = "sha256-i00s9oUhZXXf/A4cHwWN6uRDP70cHjz+kgVpiDM/eMw="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/robclark/mesa/-/commit/17cde1ee87cc0cbb896ca81949b8f192d5496271.diff"; + hash = "sha256-ao2pWQwMBskOjWJsjWqwFYAeqpTWAyJbEtSryDO+xyo="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/robclark/mesa/-/commit/4489d737d5c12eb0a3441ed0b303f9f1100a7166.diff"; + hash = "sha256-WxqwEngd79NHLedQOWMjjroaN0gr6Upd96uteSvr4Yw="; + }) + # fixes a linking error + (fetchpatch { + url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/c8b64452c076c1768beb23280de25faf2bcbe2c8.diff"; + hash = "sha256-mqivdzyoLtkfkAb+r57gjPwg8d7whgFAahiUhGVOOvo="; + }) ]; postPatch = '' @@ -202,6 +225,15 @@ self = stdenv.mkDerivation { # Enable RT for Intel hardware # https://gitlab.freedesktop.org/mesa/mesa/-/issues/9080 (lib.mesonEnable "intel-clc" (stdenv.buildPlatform == stdenv.hostPlatform)) + ] ++ lib.optionals stdenv.isDarwin [ + # Disable features that are explicitly unsupported on the platform + "-Dgbm=disabled" + "-Dxlib-lease=disabled" + "-Degl=disabled" + "-Dgallium-vdpau=disabled" + "-Dgallium-va=disabled" + "-Dgallium-xa=disabled" + "-Dlmsensors=disabled" ] ++ lib.optionals enableOpenCL [ # Clover, old OpenCL frontend "-Dgallium-opencl=icd" @@ -379,9 +411,6 @@ self = stdenv.mkDerivation { license = licenses.mit; # X11 variant, in most files platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ primeos vcunat ]; # Help is welcome :) - - # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 - broken = stdenv.isDarwin; }; }; diff --git a/pkgs/development/libraries/miniaudio/default.nix b/pkgs/development/libraries/miniaudio/default.nix index 76b77227130b0..d8567177be61e 100644 --- a/pkgs/development/libraries/miniaudio/default.nix +++ b/pkgs/development/libraries/miniaudio/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "miniaudio"; - version = "0.11.20"; + version = "0.11.21"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; rev = version; - hash = "sha256-qIUqHLHTHFMtZU0GMZp5iWnoBJ/+Zv3tbLopSHolB4s="; + hash = "sha256-EOIykyUXYcdDeTYb/Mf3xgcxEpKS4us213tEFwm5mEI="; }; installPhase = '' diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index bfb7cd26fbb26..5be1f2e519253 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" "-DMZ_OPENSSL=ON" - "-DMZ_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" - "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DMZ_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" + "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DMZ_LIB_SUFFIX='-ng'" ] ++ lib.optionals stdenv.isDarwin [ # missing header file diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index ded5a5990a608..22a38921ec498 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -24,6 +24,7 @@ , cudaSupport ? config.cudaSupport , cudaPackages ? { } , enableJackrack ? stdenv.isLinux +, glib , ladspa-sdk , ladspaPlugins , enablePython ? false @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] ++ lib.optionals enableJackrack [ + glib ladspa-sdk ladspaPlugins ] ++ lib.optionals enableQt [ diff --git a/pkgs/development/libraries/mp4v2/fix-build-clang.patch b/pkgs/development/libraries/mp4v2/fix-build-clang.patch deleted file mode 100644 index 5d99f1951f7ab..0000000000000 --- a/pkgs/development/libraries/mp4v2/fix-build-clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/mp4.cpp b/src/mp4.cpp -index c2a7238..9bb3e38 100644 ---- a/src/mp4.cpp -+++ b/src/mp4.cpp -@@ -870,7 +870,7 @@ MP4FileHandle MP4ReadProvider( const char* fileName, const MP4FileProvider* file - } - - catch (...) { -- return MP4_INVALID_TRACK_ID; -+ return NULL; - } - } - diff --git a/pkgs/development/libraries/msgpack-c/default.nix b/pkgs/development/libraries/msgpack-c/default.nix index fed8cee33231b..41d174bce7d9f 100644 --- a/pkgs/development/libraries/msgpack-c/default.nix +++ b/pkgs/development/libraries/msgpack-c/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DMSGPACK_BUILD_EXAMPLES=OFF" # examples are not installed even if built - ] ++ lib.optional (!finalAttrs.doCheck) "-DMSGPACK_BUILD_TESTS=OFF"; + ] ++ lib.optional (!finalAttrs.finalPackage.doCheck) "-DMSGPACK_BUILD_TESTS=OFF"; checkInputs = [ gtest diff --git a/pkgs/development/libraries/msgpack-cxx/default.nix b/pkgs/development/libraries/msgpack-cxx/default.nix index 198593df5018c..25ce9a5520d2c 100644 --- a/pkgs/development/libraries/msgpack-cxx/default.nix +++ b/pkgs/development/libraries/msgpack-cxx/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DMSGPACK_BUILD_DOCS=OFF" # docs are not installed even if built - ] ++ lib.optional finalAttrs.doCheck "-DMSGPACK_BUILD_TESTS=ON"; + ] ++ lib.optional finalAttrs.finalPackage.doCheck "-DMSGPACK_BUILD_TESTS=ON"; checkInputs = [ zlib diff --git a/pkgs/development/libraries/mtxclient/fix-compilation-with-olm-3.2.5.patch b/pkgs/development/libraries/mtxclient/fix-compilation-with-olm-3.2.5.patch deleted file mode 100644 index 02337d56f1ff1..0000000000000 --- a/pkgs/development/libraries/mtxclient/fix-compilation-with-olm-3.2.5.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur old/lib/crypto/client.cpp c5pf6ygk9v9rdwwr3dyd24wghflp0vmx-source/lib/crypto/client.cpp ---- old/lib/crypto/client.cpp 2021-10-22 19:31:52.159836190 +0300 -+++ c5pf6ygk9v9rdwwr3dyd24wghflp0vmx-source/lib/crypto/client.cpp 2021-10-22 19:30:42.882010441 +0300 -@@ -37,15 +37,15 @@ - - }; - --OlmErrorCode -+mtx::crypto::OlmErrorCode - olm_exception::ec_from_string(std::string_view error) - { - for (size_t i = 0; i < olmErrorStrings.size(); i++) { - if (olmErrorStrings[i] == error) -- return static_cast<OlmErrorCode>(i); -+ return static_cast<mtx::crypto::OlmErrorCode>(i); - } - -- return OlmErrorCode::UNKNOWN_ERROR; -+ return mtx::crypto::OlmErrorCode::UNKNOWN_ERROR; - } - - void diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index a9fb463e707a8..bfd4b87dc07c2 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.1"; + version = "1.5.3"; pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${finalAttrs.version}"; - hash = "sha256-ozFYqEq6PSe1C6Lc13Szxt8+sUTTlbXrmMgb8cvX04I="; + hash = "sha256-cTi3Q+SUSNQkSgi2K7nPqfqEQFMkbchbn2+pE2ol9xQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index ef4e423d059aa..0ee442aedbcb9 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.1.8"; + version = "5.1.9"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-ASZyvcP9XVFPf7nTsBx5E+D/7fWzUslPZrmhhNY5DzQ="; + hash = "sha256-D7WmJ53oK4craLx6PKAFA6Ue7wl5fRYPeEFeh78Kpdg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index ea3bc808a0bb9..e5dbb563cfb5d 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "newt"; - version = "0.52.23"; + version = "0.52.24"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-yqNykHsU7Oz+KY8NUSpi9B0zspBhAkSliu0Hu8WtoSo="; + sha256 = "sha256-Xe1+Ih+F9kJSHEmxgmyN4ZhFqjcrr11jClF3S1RPvbs="; }; postPatch = '' @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://pagure.io/newt"; description = "Library for color text mode, widget based user interfaces"; - + homepage = "https://pagure.io/newt"; + changelog = "https://pagure.io/newt/blob/master/f/CHANGES"; license = licenses.lgpl2; platforms = platforms.unix; - maintainers = [ maintainers.viric ]; + maintainers = with maintainers; [ viric ]; }; } diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 21e0cff3b87ac..76de14079deb7 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 = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-mw0zI7528lvEZlv+/KuST7PWjuu37p/+EGGsjIEto2Q="; + hash = "sha256-B/5r0mRpOEi5DQ7OUAAcDmAm1nnak6qNz4qjDrzWlDc="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 1d716704c104b..add6771e1bb9a 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 = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-dnYIRcNGTIzETu2OjTJa0IWB1+xttdGFKRBmMkTwrXk="; + hash = "sha256-z6lvtfO5XL/bZgbE+Sak+32QzjEhAdOnkpIO731h+bk="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index 851d687077cd9..f4760ea9e669a 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-Z8rMujmshdes5SLU5GpXu6QzAHl957sFDK+QSdGYCOc="; + hash = "sha256-z6lvtfO5XL/bZgbE+Sak+32QzjEhAdOnkpIO731h+bk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 29c7ca2c690bf..339db2bb08792 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake }: let @@ -13,40 +12,22 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "nlohmann_json"; - version = "3.11.2"; + version = "3.11.3"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${finalAttrs.version}"; - hash = "sha256-SUdhIV7tjtacf5DkoWk9cnkfyMlrkg8ZU7XnPZd22Tw="; + hash = "sha256-7F0Jon+1oWL7uqet5i1IgHX0fUw/+z0QwEcA3zs5xHg="; }; - patches = [ - # Backport fix for gcc-13: - # https://github.com/nlohmann/json/pull/3895 - (fetchpatch { - name = "gcc-13-rebind.patch"; - url = "https://github.com/nlohmann/json/commit/a5b09d50b786638ed9deb09ef13860a3cb64eb6b.patch"; - hash = "sha256-Jbi0VwZP+ZHTGbpIwgKCVc66gOmwjkT5iOUe85eIzM0="; - }) - - # Backport fix for gcc-13: - # https://github.com/nlohmann/json/pull/3950 - (fetchpatch { - name = "gcc-13-eq-op.patch"; - url = "https://github.com/nlohmann/json/commit/a49829bd984c0282be18fcec070df0c31bf77dd5.patch"; - hash = "sha256-D+cRtdN6AXr4z3/y9Ui7Zqp3e/y10tp+DOL80ZtPz5E="; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DJSON_BuildTests=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DJSON_BuildTests=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" "-DJSON_FastTests=ON" "-DJSON_MultipleHeaders=ON" - ] ++ lib.optional finalAttrs.doCheck "-DJSON_TestDataDirectory=${testData}"; + ] ++ lib.optional finalAttrs.finalPackage.doCheck "-DJSON_TestDataDirectory=${testData}"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix index fe3cc87192af6..55e09511aab15 100644 --- a/pkgs/development/libraries/nss/esr.nix +++ b/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { version = "3.90"; - hash = "sha256-ms1lNMQdjq0Z/Kb8s//+0vnwnEN8PXn+5qTuZoqqk7Y="; + hash = "sha256-ZEG6ZcEymQ8Yw02ziT2LFWuvwZ1rRuT93rRHGYM22yQ="; } diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 592dbffbdffc6..cab8a0ff2bc10 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -1,7 +1,7 @@ { version, hash }: { lib , stdenv -, fetchurl +, fetchFromGitHub , nspr , perl , zlib @@ -26,8 +26,10 @@ stdenv.mkDerivation rec { pname = "nss"; inherit version; - src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "nss-dev"; + repo = "nss"; + rev = "NSS_${lib.replaceStrings ["."] ["_"] version}_RTM"; inherit hash; }; @@ -50,25 +52,21 @@ stdenv.mkDerivation rec { ./remove-c25519-support.patch ]; - patchFlags = [ "-p0" ]; - postPatch = '' - patchShebangs nss + patchShebangs . - for f in nss/coreconf/config.gypi nss/build.sh; do + for f in coreconf/config.gypi build.sh; do substituteInPlace "$f" --replace "/usr/bin/env" "${buildPackages.coreutils}/bin/env" done - substituteInPlace nss/coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep" + substituteInPlace coreconf/config.gypi --replace "/usr/bin/grep" "${buildPackages.coreutils}/bin/env grep" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" - substituteInPlace nss/coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" + substituteInPlace coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" + substituteInPlace coreconf/config.gypi --replace "'DYLIB_INSTALL_NAME_BASE': '@executable_path'" "'DYLIB_INSTALL_NAME_BASE': '$out/lib'" ''; outputs = [ "out" "dev" "tools" ]; - preConfigure = "cd nss"; - buildPhase = let getArch = platform: diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 9244978061eeb..21c96d8bc9233 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.95"; - hash = "sha256-RpiI5B6KeABRzgDtzZFOimvTjaiKgs+4SJjdOIY1gio="; + version = "3.96.1"; + hash = "sha256-HhN3wZEdi9R/KD0nl3+et+94LBJjGLDVqDX8v5qGrqQ="; } diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 5ef4f676aebc9..c9e6aeeba363d 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, icu, catch2_3 }: stdenv.mkDerivation rec { pname = "nuspell"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - hash = "sha256-ww7Kqzlnf7065i9RZLeFDUOPBMCVgV/6sBnN0+WvBTk="; + hash = "sha256-KteLH031QP8MunQXsodzsPhD/YN9n3O7b2kb/1mFQRY="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ catch2 ]; + buildInputs = [ catch2_3 ]; propagatedBuildInputs = [ icu ]; cmakeFlags = [ "-DBUILD_TESTING=YES" ]; diff --git a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix index a82fa9068c66c..813821bfb71c2 100644 --- a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, cudaPackages }: stdenv.mkDerivation { pname = "nvidia-optical-flow-sdk"; @@ -18,6 +18,13 @@ stdenv.mkDerivation { cp -R * $out/include ''; + # Makes setupCudaHook propagate nvidia-optical-flow-sdk together with cuda + # packages. Currently used by opencv4.cxxdev, hopefully can be removed in the + # future + nativeBuildInputs = [ + cudaPackages.markForCudatoolkitRootHook + ]; + meta = with lib; { description = "Nvidia optical flow headers for computing the relative motion of pixels between images"; homepage = "https://developer.nvidia.com/opticalflow-sdk"; diff --git a/pkgs/development/libraries/nvidia-thrust/default.nix b/pkgs/development/libraries/nvidia-thrust/default.nix deleted file mode 100644 index f68b57f193b79..0000000000000 --- a/pkgs/development/libraries/nvidia-thrust/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib -, config -, fetchFromGitHub -, stdenv -, cmake -, pkg-config -, cudaPackages ? { } -, symlinkJoin -, tbb -, hostSystem ? "CPP" -, deviceSystem ? if config.cudaSupport then "CUDA" else "OMP" -}: - -# Policy for device_vector<T> -assert builtins.elem deviceSystem [ - "CPP" # Serial on CPU - "OMP" # Parallel with OpenMP - "TBB" # Parallel with Intel TBB - "CUDA" # Parallel on GPU -]; - -# Policy for host_vector<T> -# Always lives on CPU, but execution can be made parallel -assert builtins.elem hostSystem [ "CPP" "OMP" "TBB" ]; - -let - pname = "nvidia-thrust"; - version = "1.16.0"; - - inherit (cudaPackages) backendStdenv cudaFlags; - cudaCapabilities = map cudaFlags.dropDot cudaFlags.cudaCapabilities; - - tbbSupport = builtins.elem "TBB" [ deviceSystem hostSystem ]; - cudaSupport = deviceSystem == "CUDA"; - - # TODO: Would like to use this: - cudaJoined = symlinkJoin { - name = "cuda-packages-unsplit"; - paths = with cudaPackages; [ - cuda_nvcc - cuda_nvrtc # symbols: cudaLaunchDevice, &c; notice postBuild - cuda_cudart # cuda_runtime.h - libcublas - ]; - postBuild = '' - ln -s $out/lib $out/lib64 - ''; - }; -in -stdenv.mkDerivation { - inherit pname version; - - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = "thrust"; - rev = version; - fetchSubmodules = true; - hash = "sha256-/EyznxWKuHuvHNjq+SQg27IaRbtkjXR2zlo2YgCWmUQ="; - }; - - # NVIDIA's "compiler hacks" seem like work-arounds for legacy toolchains and - # cause us errors such as: - # > Thrust's test harness uses CMAKE_CXX_COMPILER for the CUDA host compiler. - # > Refusing to overwrite specified CMAKE_CUDA_HOST_COMPILER - # So we un-fix cmake after them: - postPatch = '' - echo > cmake/ThrustCompilerHacks.cmake - ''; - - buildInputs = lib.optionals tbbSupport [ tbb ]; - - nativeBuildInputs = [ - cmake - pkg-config - ] ++ lib.optionals cudaSupport [ - # Goes in native build inputs because thrust looks for headers - # in a path relative to nvcc... - cudaJoined - ]; - - cmakeFlags = [ - "-DTHRUST_INCLUDE_CUB_CMAKE=${if cudaSupport then "ON" else "OFF"}" - "-DTHRUST_DEVICE_SYSTEM=${deviceSystem}" - "-DTHRUST_HOST_SYSTEM=${hostSystem}" - "-DTHRUST_AUTO_DETECT_COMPUTE_ARCHS=OFF" - "-DTHRUST_DISABLE_ARCH_BY_DEFAULT=ON" - ] ++ lib.optionals cudaFlags.enableForwardCompat [ - "-DTHRUST_ENABLE_COMPUTE_FUTURE=ON" - ] ++ map (sm: "THRUST_ENABLE_COMPUTE_${sm}") cudaCapabilities; - - passthru = { - inherit cudaSupport cudaPackages cudaJoined; - }; - - meta = with lib; { - description = "A high-level C++ parallel algorithms library that builds on top of CUDA, TBB, OpenMP, etc"; - homepage = "https://github.com/NVIDIA/thrust"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ SomeoneSerge ]; - }; -} diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index d359769326638..6ae60b7b2d3a1 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -1,18 +1,33 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, darwin +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ode"; version = "0.16.4"; src = fetchurl { - url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-cQN7goHGyGsKVXKfkNXbaXq+TL7B2BGBV+ANSOwlNGc="; + url = "https://bitbucket.org/odedevs/ode/downloads/ode-${finalAttrs.version}.tar.gz"; + hash = "sha256-cQN7goHGyGsKVXKfkNXbaXq+TL7B2BGBV+ANSOwlNGc="; }; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.GLUT + ]; + + env.CXXFLAGS = lib.optionalString stdenv.cc.isClang (toString [ + "-std=c++14" + "-Wno-error=c++11-narrowing" + ]); + meta = with lib; { description = "Open Dynamics Engine"; homepage = "https://www.ode.org"; - platforms = platforms.linux; - license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; + license = with licenses; [ bsd3 lgpl21Only lgpl3Only zlib ]; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/open62541/default.nix b/pkgs/development/libraries/open62541/default.nix index 7799c6d80ae3f..b8c22a73dd4ec 100644 --- a/pkgs/development/libraries/open62541/default.nix +++ b/pkgs/development/libraries/open62541/default.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "open62541"; - version = "1.3.8"; + version = "1.3.9"; src = fetchFromGitHub { owner = "open62541"; repo = "open62541"; rev = "v${finalAttrs.version}"; - hash = "sha256-koifSynnJX9IuwX8HUT1TzHoKgJfweNGAVlqUx7nEc4="; + hash = "sha256-FnLMR54xjIyYRqwCnvMJsNgsVwH7hVAixCNGhfIZPiw="; fetchSubmodules = true; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" "-DUA_NAMESPACE_ZERO=FULL" - "-DUA_BUILD_UNIT_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DUA_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ] ++ lib.optional withExamples "-DUA_BUILD_EXAMPLES=ON" ++ lib.optional (withEncryption != false) @@ -92,16 +92,15 @@ stdenv.mkDerivation (finalAttrs: { enableParallelChecking = false; preCheck = let - disabledTests = - lib.optionals withPubSub [ - # "Cannot set socket option IP_ADD_MEMBERSHIP" - "pubsub_publish" - "check_pubsub_get_state" - "check_pubsub_publish_rt_levels" - "check_pubsub_subscribe_config_freeze" - "check_pubsub_subscribe_rt_levels" - "check_pubsub_multiple_subscribe_rt_levels" - ]; + disabledTests = lib.optionals withPubSub [ + # "Cannot set socket option IP_ADD_MEMBERSHIP" + "pubsub_publish" + "check_pubsub_get_state" + "check_pubsub_publish_rt_levels" + "check_pubsub_subscribe_config_freeze" + "check_pubsub_subscribe_rt_levels" + "check_pubsub_multiple_subscribe_rt_levels" + ]; regex = "^(${builtins.concatStringsSep "|" disabledTests})\$"; in lib.optionalString (disabledTests != []) '' checkFlagsArray+=(ARGS="-E ${lib.escapeRegex regex}") diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 6bb2b4c235ac1..6a00c86105a8a 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -1,26 +1,39 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub +, cmake +, hashcat +, ocl-icd +, tesseract +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencl-headers"; - version = "2023.02.06"; + version = "2023.12.14"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; - rev = "v${version}"; - sha256 = "sha256-BJDaDokyHgmyl+bGqCwG1J7iOvu0E3P3iYZ1/krot8s="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-wF9KQjzYKJf6ulXRy80o53bp6lTtm8q1NubKbcH+RY0="; }; - installPhase = '' - mkdir -p $out/include/CL - cp CL/* $out/include/CL - ''; + nativeBuildInputs = [ cmake ]; + + passthru.tests = { + inherit ocl-icd tesseract hashcat; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "OpenCL-Headers" ]; + }; + }; meta = with lib; { - description = "Khronos OpenCL headers version ${version}"; + description = "Khronos OpenCL headers version ${finalAttrs.version}"; homepage = "https://www.khronos.org/registry/cl/"; license = licenses.asl20; platforms = platforms.unix; + maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 06360449c1ba9..023e56940b75c 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -247,8 +247,10 @@ effectiveStdenv.mkDerivation { outputs = [ "out" + "cxxdev" "package_tests" ]; + cudaPropagateToOutput = "cxxdev"; postUnpack = lib.optionalString buildContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" @@ -328,20 +330,32 @@ effectiveStdenv.mkDerivation { bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ] - ++ lib.optionals enableCuda (with cudaPackages; [ - cuda_cudart - cuda_cccl # <thrust/*> - libnpp # npp.h + ++ lib.optionals enableCuda (with cudaPackages; [ + cuda_cudart.lib + cuda_cudart.dev + cuda_cccl.dev # <thrust/*> + libnpp.dev # npp.h + libnpp.lib + libnpp.static + nvidia-optical-flow-sdk ] ++ lib.optionals enableCublas [ - libcublas # cublas_v2.h + # May start using the default $out instead once + # https://github.com/NixOS/nixpkgs/issues/271792 + # has been addressed + libcublas.static + libcublas.lib + libcublas.dev # cublas_v2.h ] ++ lib.optionals enableCudnn [ - cudnn # cudnn.h + cudnn.dev # cudnn.h + cudnn.lib + cudnn.static ] ++ lib.optionals enableCufft [ - libcufft # cufft.h - ]); + libcufft.dev # cufft.h + libcufft.lib + libcufft.static + ]); - propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy - ++ lib.optionals enableCuda [ nvidia-optical-flow-sdk ]; + propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ]; nativeBuildInputs = [ cmake pkg-config unzip ] ++ lib.optionals enablePython [ @@ -458,6 +472,7 @@ effectiveStdenv.mkDerivation { postInstall = '' sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \ "$out/lib/pkgconfig/opencv4.pc" + mkdir $cxxdev '' # install python distribution information, so other packages can `import opencv` + lib.optionalString enablePython '' @@ -476,6 +491,8 @@ effectiveStdenv.mkDerivation { ''; passthru = { + cudaSupport = enableCuda; + tests = { inherit (gst_all_1) gst-plugins-bad; } diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 64cf84e36c3fa..e972fa3fb14f9 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.5.5"; + version = "3.1.4"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "v${version}"; - sha256 = "sha256-OXLVuyPFlo7VD8f9wAN71p4PZpfM2ISq9UoUiAYEXUQ="; + hash = "sha256-KtsQ25uStmlf7RZLAcabhPMyGbxKxvpR6Vm632+EBvw="; }; nativeBuildInputs = [ @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ asio + fmt nettle gnutls msgpack @@ -47,7 +48,6 @@ stdenv.mkDerivation rec { restinio http-parser openssl - fmt ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/libraries/opendmarc/default.nix b/pkgs/development/libraries/opendmarc/default.nix index 0dedfa3a85ede..600dd7e2e347f 100644 --- a/pkgs/development/libraries/opendmarc/default.nix +++ b/pkgs/development/libraries/opendmarc/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "A free open source software implementation of the DMARC specification"; homepage = "http://www.trusteddomain.org/opendmarc/"; license = with licenses; [ bsd3 sendmail ]; - maintainers = with maintainers; [ ajs124 das_j ]; + maintainers = teams.helsinki-systems.members; }; } diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index 479ffbc78eeed..c250b31ecd71f 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openh264"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "cisco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L5u0xkoza3G1ZHdtJH7ayVOgcVbPWYp7MC3lJd7LsSY="; + hash = "sha256-vPVHXATsSWmqKOAj09WRR5jCi2NU2lq0j4K15KBzARY="; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 277d3008bf2ac..d04690948041c 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { homepage = "https://www.openldap.org/"; description = "An open source implementation of the Lightweight Directory Access Protocol"; license = licenses.openldap; - maintainers = with maintainers; [ ajs124 das_j hexa ]; + maintainers = with maintainers; [ hexa ] ++ teams.helsinki-systems.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 1c4955e2c51a4..a8bd8acacd595 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -3,7 +3,7 @@ , libpsm2, libfabric, pmix, ucx, ucc , config # Enable CUDA support -, cudaSupport ? config.cudaSupport, cudatoolkit +, cudaSupport ? config.cudaSupport, cudaPackages # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -18,12 +18,7 @@ , fortranSupport ? true }: -let - cudatoolkit_joined = symlinkJoin { - name = "${cudatoolkit.name}-unsplit"; - paths = [ cudatoolkit.out cudatoolkit.lib ]; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "openmpi"; version = "4.1.6"; @@ -47,12 +42,13 @@ in stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ucc ] - ++ lib.optionals cudaSupport [ cudatoolkit ] + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] ++ [ libevent hwloc ] ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core ++ lib.optionals fabricSupport [ libpsm2 libfabric ]; nativeBuildInputs = [ perl ] + ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ] ++ lib.optionals fortranSupport [ gfortran ]; configureFlags = lib.optional (!cudaSupport) "--disable-mca-dso" @@ -67,7 +63,7 @@ in stdenv.mkDerivation rec { # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build # https://github.com/openucx/ucx # https://www.open-mpi.org/faq/?category=buildcuda - ++ lib.optionals cudaSupport [ "--with-cuda=${cudatoolkit_joined}" "--enable-dlopen" ] + ++ lib.optionals cudaSupport [ "--with-cuda=${cudaPackages.cuda_cudart}" "--enable-dlopen" ] ++ lib.optionals fabricSupport [ "--with-psm2=${lib.getDev libpsm2}" "--with-libfabric=${lib.getDev libfabric}" ] ; @@ -98,7 +94,8 @@ in stdenv.mkDerivation rec { doCheck = true; passthru = { - inherit cudaSupport cudatoolkit; + inherit cudaSupport; + cudatoolkit = cudaPackages.cudatoolkit; # For backward compatibility only }; meta = with lib; { diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 327956f8a7db8..9e8ab07b3aa47 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "A low-level library written in C++ that provides support for producing and consuming SAML messages"; platforms = platforms.unix; license = licenses.asl20; - maintainers = [ maintainers.jammerful ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch new file mode 100644 index 0000000000000..e8b07b4ae5990 --- /dev/null +++ b/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/common.h b/include/internal/common.h +index 15666f1..d91e25b 100644 +--- a/include/internal/common.h ++++ b/include/internal/common.h +@@ -83,7 +83,7 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + # else diff --git a/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch new file mode 100644 index 0000000000000..13a36fbcd0314 --- /dev/null +++ b/pkgs/development/libraries/openssl/3.2/use-etc-ssl-certs.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/common.h b/include/internal/common.h +index 15666f1..d91e25b 100644 +--- a/include/internal/common.h ++++ b/include/internal/common.h +@@ -83,7 +83,7 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + # else diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 3aeafccb1edb2..a8e178c7e6d37 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -234,6 +234,13 @@ let }); in { + # intended version "policy": + # - 1.1 as long as some package exists, which does not build without it + # - latest 3.x LTS + # - latest 3.x non-LTS as preview/for development + # + # - other versions in between only when reasonable need is stated for some package + # - backport every security critical fix release e.g. 3.0.y -> 3.0.y+1 but no new version, e.g. 3.1 -> 3.2 # If you do upgrade here, please update in pkgs/top-level/release.nix # the permitted insecure version to ensure it gets cached for our users @@ -279,9 +286,9 @@ in { }; }; - openssl_3_1 = common { - version = "3.1.4"; - hash = "sha256-hAr1Nmq5tSK95SWCa+PvD7Cvgcap69hMqmAP6hcx7uM="; + openssl_3_2 = common { + version = "3.2.0"; + hash = "sha256-FMgm8Hx+QzcG+1xp+p4l2rlWhIRLTJYqLPG/GD60aQ4="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -291,8 +298,8 @@ in { ./3.0/openssl-disable-kernel-detection.patch (if stdenv.hostPlatform.isDarwin - then ./use-etc-ssl-certs-darwin.patch - else ./use-etc-ssl-certs.patch) + then ./3.2/use-etc-ssl-certs-darwin.patch + else ./3.2/use-etc-ssl-certs.patch) ]; withDocs = true; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index b0ff4b528864b..9c485949a5c09 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,9 +1,7 @@ { config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU , libGL, glew, ocl-icd, python3 -, cudaSupport ? config.cudaSupport, cudatoolkit - # For visibility mostly. The whole approach to cuda architectures and capabilities - # will be reworked soon. -, cudaArch ? "compute_37" +, cudaSupport ? config.cudaSupport +, cudaPackages , openclSupport ? !cudaSupport , darwin }: @@ -21,7 +19,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optional cudaSupport [ + cudaPackages.cuda_nvcc + ]; buildInputs = [ libGLU libGL python3 # FIXME: these are not actually needed, but the configure script wants them. @@ -30,21 +33,31 @@ stdenv.mkDerivation rec { ] ++ lib.optional (openclSupport && !stdenv.isDarwin) ocl-icd ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [OpenCL Cocoa CoreVideo IOKit AppKit AGL ]) - ++ lib.optional cudaSupport cudatoolkit; + ++ lib.optional cudaSupport [ + cudaPackages.cuda_cudart + ]; + + # It's important to set OSD_CUDA_NVCC_FLAGS, + # because otherwise OSD might piggyback unwanted architectures: + # https://github.com/PixarAnimationStudios/OpenSubdiv/blob/7d0ab5530feef693ac0a920585b5c663b80773b3/CMakeLists.txt#L602 + preConfigure = lib.optionalString cudaSupport '' + cmakeFlagsArray+=( + -DOSD_CUDA_NVCC_FLAGS="${lib.concatStringsSep " " cudaPackages.cudaFlags.gencode}" + ) + ''; cmakeFlags = [ "-DNO_TUTORIALS=1" "-DNO_REGRESSION=1" "-DNO_EXAMPLES=1" "-DNO_METAL=1" # don’t have metal in apple sdk + (lib.cmakeBool "NO_OPENCL" (!openclSupport)) + (lib.cmakeBool "NO_CUDA" (!cudaSupport)) ] ++ lib.optionals (!stdenv.isDarwin) [ "-DGLEW_INCLUDE_DIR=${glew.dev}/include" "-DGLEW_LIBRARY=${glew.dev}/lib" ] ++ lib.optionals cudaSupport [ - "-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=${cudaArch}" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] ++ lib.optionals (!openclSupport) [ - "-DNO_OPENCL=1" ]; preBuild = let maxBuildCores = 16; in lib.optionalString cudaSupport '' diff --git a/pkgs/development/libraries/openturns/default.nix b/pkgs/development/libraries/openturns/default.nix index e20499b9206c0..751f98aae6e5c 100644 --- a/pkgs/development/libraries/openturns/default.nix +++ b/pkgs/development/libraries/openturns/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "openturns"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${version}"; - sha256 = "sha256-Lg42QqsHYFxeUjZjYFVJFxeJv2MzOpjoShfbIg/095A="; + sha256 = "sha256-Zq+Z3jLjdba3566H4RdwztqbRRID5K5yHvoGmgzq8QM="; }; nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index b3809f0953641..26fac012948d4 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchurl , substituteAll +, cudaSupport ? opencv.cudaSupport or false # build , addOpenGLRunpath @@ -17,10 +18,12 @@ # runtime , libusb1 , libxml2 +, ocl-icd , opencv , protobuf , pugixml , tbb +, cudaPackages }: let @@ -68,6 +71,8 @@ stdenv.mkDerivation rec { setuptools ])) shellcheck + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc ]; patches = [ @@ -118,6 +123,7 @@ stdenv.mkDerivation rec { "-DENABLE_CPPLINT:BOOL=OFF" "-DBUILD_TESTING:BOOL=OFF" "-DENABLE_SAMPLES:BOOL=OFF" + (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing"; @@ -129,10 +135,13 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 libxml2 - opencv + ocl-icd + opencv.cxxdev protobuf pugixml tbb + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 53bfa41a8e253..32544bc327bcb 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.31"; + version = "1.0.32"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-qK8l/v6nLuMAitz7DfVDjJyVjEmkeD2jgJkG5qOMCcQ="; + sha256 = "sha256-Np91NevE0XiFSZ27cpwAUjm0XY2/IuugGDcfG17aV2c="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 1d089774cc67a..1e01ed4a607a8 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -16,13 +16,14 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.25.0"; + version = "0.25.3"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - hash = "sha256-paLiRYgYshuedgDgW2nEsv4/Loq6qFyQMjfBJwqtHzw="; + hash = "sha256-zIbkw0pwt4TdyjncnSDeTN6Gsx7cc+x7Un4rnagZxQk="; + fetchSubmodules = true; }; outputs = [ "out" "bin" "dev" ]; diff --git a/pkgs/development/libraries/paho-mqtt-cpp/default.nix b/pkgs/development/libraries/paho-mqtt-cpp/default.nix index 2e390da0bef47..62d9aa5977927 100644 --- a/pkgs/development/libraries/paho-mqtt-cpp/default.nix +++ b/pkgs/development/libraries/paho-mqtt-cpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "paho.mqtt.cpp"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.cpp"; rev = "v${version}"; - hash = "sha256-QV6r4GzSVghgVQtF8OQ1a23PtCdjg7PeuGRBdA+WbE0="; + hash = "sha256-c2umToT4w+L7bgzp1bCEcb0ECHvxKZ2t6JI5SmUySPo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 635422fd9b994..624ca4aa66724 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -18,7 +18,8 @@ , Cocoa , AGL , OpenGL -, withCuda ? false, cudatoolkit +, config +, cudaSupport ? config.cudaSupport, cudaPackages }: stdenv.mkDerivation rec { @@ -38,7 +39,13 @@ stdenv.mkDerivation rec { sed -i '/-ffloat-store/d' cmake/pcl_find_sse.cmake ''; - nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; + nativeBuildInputs = [ + pkg-config + cmake + wrapQtAppsHook + ] + ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + buildInputs = [ eigen libusb1 @@ -46,8 +53,7 @@ stdenv.mkDerivation rec { qtbase libXt ] - ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ] - ++ lib.optionals withCuda [ cudatoolkit ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa AGL ]; propagatedBuildInputs = [ boost @@ -60,7 +66,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" - ] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ]; + ] ++ lib.optionals cudaSupport [ "-DWITH_CUDA=true" ]; meta = { homepage = "https://pointclouds.org/"; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index a3ddff888e79e..2113b52047d66 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "--enable-pcre2-16" "--enable-pcre2-32" # only enable jit on supported platforms which excludes Apple Silicon, see https://github.com/zherczeg/sljit/issues/51 - "--enable-jit=auto" + "--enable-jit=${if stdenv.hostPlatform.isS390x then "no" else "auto"}" ] # fix pcre jit in systemd units that set MemoryDenyWriteExecute=true like gitea ++ lib.optional withJitSealloc "--enable-jit-sealloc"; diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index a6b57f2b340c5..bc587d83f158f 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.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-4QJxYxLELBDg5GZISdO2xKzJej8F21BY+GD+KkrGXws="; + hash = "sha256-PXiLP0lgqBdDbHHfvRT/d0M1jGjMVZZ3VDYnByzkKeI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index dc95b4ed82660..dd20b6dcebe6d 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -50,7 +50,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - env.NIX_CFLAGS_COMPILE = "-fPIC"; + env.NIX_CFLAGS_COMPILE = toString ([ + "-fPIC" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=enum-constexpr-conversion" + ]); cmakeBuildType = if debug then "Debug" else "Release"; diff --git a/pkgs/development/libraries/physics/apfel/cmake.patch b/pkgs/development/libraries/physics/apfel/cmake.patch new file mode 100644 index 0000000000000..5bc342aeb48cf --- /dev/null +++ b/pkgs/development/libraries/physics/apfel/cmake.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,8 +46,8 @@ message(STATUS "APFEL: APFEL_DOWNLOAD_PDFS=${APFEL_DOWNLOAD_PDFS}") + # CONFIG SCRIPT ======================================================== + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "${prefix}") +-set(includedir "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +-set(libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}") ++set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") ++set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") + set(PACKAGE_VERSION "${apfel_VERSION}") + configure_file("${PROJECT_SOURCE_DIR}/bin/apfel-config.in" "${PROJECT_BINARY_DIR}/bin/apfel-config") + configure_file("${PROJECT_SOURCE_DIR}/bin/apfel.in" "${PROJECT_BINARY_DIR}/bin/apfel") diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index c0860d9a1baf3..e1192cdcd05eb 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -1,28 +1,59 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gfortran, lhapdf, python3, zlib }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gfortran +, lhapdf +, python3 +, swig +, zlib +}: stdenv.mkDerivation rec { pname = "apfel"; - version = "3.0.6"; + version = "3.1.1"; src = fetchFromGitHub { owner = "scarrazza"; repo = "apfel"; rev = version; - sha256 = "sha256-fRdJ+C92tEC75iUwP9Tmm/EswrlA52eUo5fBjfieH9o="; + hash = "sha256-0Ix7KwEZUG/NmGJ380DVJbUA0PcoEJDlcGSc09l5Tbc="; }; - # needed for aarch64-darwin - nativeBuildInputs = [ autoreconfHook ]; + patches = [ + # https://github.com/scarrazza/apfel/pull/54 + ./cmake.patch + ]; - buildInputs = [ gfortran lhapdf python3 zlib ]; + nativeBuildInputs = [ + cmake + swig + ]; + buildInputs = [ + gfortran + lhapdf + python3 + zlib + ]; - enableParallelBuilding = true; + cmakeFlags = [ + "-DAPFEL_DOWNLOAD_PDFS=OFF" + "-DAPFEL_Python_SITEARCH=autoprefix" + ]; + + doCheck = true; + nativeCheckInputs = [ + lhapdf.pdf_sets.NNPDF23_nlo_as_0118 + lhapdf.pdf_sets.NNPDF31_nnlo_as_0118 + ]; + + env.NIX_CFLAGS_COMPILE = "-DAPFEL_VERSION=${version}"; meta = with lib; { description = "A PDF Evolution Library"; - license = licenses.gpl3Plus; - homepage = "https://apfel.mi.infn.it/"; - platforms = platforms.unix; + homepage = "https://apfel.mi.infn.it/"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ veprbl ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix index b61db08457fde..3c4e8008639c3 100644 --- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { for f in Makefile.in */Makefile; do substituteInPlace "$f" --replace "CXX=g++" "" done - patchShebangs ./configure ./utils/check.sh ./utils/install-sh + patchShebangs ./utils/check.sh ./utils/install-sh ''; # Written in shell manually, does not support autoconf-style diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 9dacb57e8ea2a..d9cd1661af8ad 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "fastjet"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - hash = "sha256-BWCMb/IT8G3Z3nI4E9a03M1R5mGsEwmPdL/J7q8ctao="; + hash = "sha256-s9MxVbVc5D9CDNbZm1Jaz3vcJZOnu36omKnds9jKOOM="; }; buildInputs = lib.optional withPython python; diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index 149f541ee42f2..bfe1cf1139aed 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -42,8 +42,8 @@ in { pname = "G4EMLOW"; - version = "8.2"; - sha256 = "sha256-PXdoJk/1pTvLlgh2BLvhHGC3/qkKqsj30SUhg+Go5Cc="; + version = "8.5"; + sha256 = "sha256-ZrrKSaxdReKsEMEltPsmYiXlEYA+ZpgZCc6c0+m873M="; envvar = "LE"; } @@ -77,15 +77,15 @@ in { pname = "G4ABLA"; - version = "3.1"; - sha256 = "sha256-dpiwUrWL8bmIa+rNvWr2B63B4Jn8cwq2shz38JDAJ+0="; + version = "3.3"; + sha256 = "sha256-HgQbMlLunO+IbWJPdT5pMwOqMtfl7zu6h7NPNtkuorE="; envvar = "ABLA"; } { pname = "G4INCL"; - version = "1.0"; - sha256 = "sha256-cWFhghrp89BWX788LPNPTgLj5RnrQZqCI27vIsLENn0="; + version = "1.2"; + sha256 = "sha256-+ICxYHPuCpLXSU8ydqbVLU3h02d6DUx8WHADlu0OGn4="; envvar = "INCL"; } diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index b2b368f0349e6..516d42aa577dc 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -48,12 +48,12 @@ in lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt" stdenv.mkDerivation rec { - version = "11.1.3"; + version = "11.2.0"; pname = "geant4"; src = fetchurl { url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - hash = "sha256-TF++pnidjWGe2sygYx1rUhGmDhv5l0w9P6ue+eImkvU="; + hash = "sha256-Rq1/qzxctL0L3XfdbT4igxhIGSNby8AbLRF9gbNVlqY="; }; # Fix broken paths in a .pc diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 00f548806fc5e..0482846f077af 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,30 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, makeWrapper }: +{ lib, stdenv, fetchurl, python, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "sha256-V0Nc1pXilwZdU+ab0pCQdlyTSTa2qXX/jFWXZvIjA1k="; + sha256 = "sha256-JEOksyzDsFl8gki9biVwOs6ckaeiU8X2CxtUKO+chp4="; }; - patches = [ - # avoid silent compilation failures - (fetchpatch { - name = "lhapdf-propagate_returncode.patch"; - url = "https://gitlab.com/hepcedar/lhapdf/-/commit/2806ac795c7e4a69281d9c2a6a8bba5423f37e74.diff"; - hash = "sha256-j8txlt0n5gpUy9zeuWKx+KRXL3HMMaGcwOxr908966k="; - }) - - # workaround "ld: -stack_size option can only be used when linking a main executable" on darwin - (fetchpatch { - name = "lhapdf-Wl_stack_size.patch"; - url = "https://gitlab.com/hepcedar/lhapdf/-/commit/463764d6613837b6ab57ecaf13bc61be2349e5e4.diff"; - hash = "sha256-AbDs7gtU5HsJG5n/solMzu2bjX1juxfUIqIt5KmNffU="; - }) - ]; - # The Apple SDK only exports locale_t from xlocale.h whereas glibc # had decided that xlocale.h should be a part of locale.h postPatch = lib.optionalString (stdenv.isDarwin && stdenv.cc.isGNU) '' diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 0916eae24669b..917dbf40a37d1 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -13,10 +13,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ boost fastjet hepmc zlib lhapdf ]; - preConfigure = '' - patchShebangs ./configure - ''; - configureFlags = [ "--enable-shared" "--with-lhapdf6=${lhapdf}" diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index fdfc713d53a34..76a4d71b38e47 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.8"; + version = "3.1.9"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - hash = "sha256-dbPz1BnKY4jR/S7A7afh+Q8yS5lszwWR9IpdLijczBM="; + hash = "sha256-9lMgRdph7rKtwgqavEFmtLLUGrLByltQDNYWuxuS57E="; }; latex = texliveBasic.withPackages (ps: with ps; [ diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 7f2e97814f050..b55d6869e4dac 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "thepeg"; - version = "2.2.3"; + version = "2.3.0"; src = fetchurl { url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - hash = "sha256-8hRzGXp2H8MpF7CKjSTSv6+T/1fzRB/WBdqZrJ3l1Qs="; + hash = "sha256-rDWXmuicKWCMqSwVakn/aKrOeloSoMkvCgGoM9LTRXI="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index da6c21db0ff03..68f4e3714e09c 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , python , root , makeWrapper @@ -11,22 +10,13 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - hash = "sha256-e8MGJGirulCv8+y4sizmdxlgNgCYkGiO9FM6qn+S5uQ="; + hash = "sha256-68rVU2mhztzuOi3gWUB8hRZSukRJURP1wJ2MLlf1Fqo="; }; - patches = [ - # A bugfix https://gitlab.com/hepcedar/yoda/-/merge_requests/116 - (fetchpatch { - url = "https://gitlab.com/hepcedar/yoda/-/commit/ba1275033522c66bc473dfeffae1a7971e985611.diff"; - hash = "sha256-/8UJuypiQzywarE+o3BEMtqM+f+YzkHylugi+xTJf+w="; - excludes = [ "ChangeLog" ]; - }) - ]; - nativeBuildInputs = with python.pkgs; [ cython makeWrapper diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 3876a5c892a0e..fa5cb97b214fa 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -68,7 +68,7 @@ , mysofaSupport ? true , libmysofa , tinycompress -, ffadoSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +, ffadoSupport ? x11Support && stdenv.buildPlatform.canExecute stdenv.hostPlatform , ffado , libselinux }: @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.84"; + version = "1.0.0"; outputs = [ "out" @@ -97,7 +97,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-9W9y+wtS/CYUaPRrCRmRDeyvuS1XllMBNQLy6GAMqBM="; + sha256 = "sha256-mfnMluxJAxDbB6JlIM6HJ0zg7e1q3ia3uFbht6zeHCk="; }; patches = [ @@ -189,6 +189,7 @@ let "-Dsdl2=disabled" # required only to build examples, causes dependency loop "-Drlimits-install=false" # installs to /etc, we won't use this anyway "-Dcompress-offload=enabled" + "-Dman=enabled" ]; # Fontconfig error: Cannot load default config file @@ -197,7 +198,7 @@ let doCheck = true; postUnpack = '' - patchShebangs source/doc/input-filter.sh + patchShebangs source/doc/*.py patchShebangs source/doc/input-filter-h.sh ''; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 6603130922022..3723a6806ad9d 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pkcs11-helper"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${pname}-${version}"; - sha256 = "sha256-HPaPmsCJ81NaS7mgRGbR7KFG6AM3s6HXdWKdfREhcLc="; + hash = "sha256-FP3y/YHsPPqey4QfxIiC4QjruuK1K2Bg+2QL2gXDT+k="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/development/libraries/podofo/0.10.x.nix index dbbd5c86b96d4..6c4356e9add9b 100644 --- a/pkgs/development/libraries/podofo/0.10.x.nix +++ b/pkgs/development/libraries/podofo/0.10.x.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "podofo"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "podofo"; repo = "podofo"; rev = finalAttrs.version; - hash = "sha256-BHTfidLn738f9kVIgzRTR4vY6fx5JPPtYNKvD7klyGw="; + hash = "sha256-B+YNTo2rZAL4PqDo+lFOQiWM9bl/TIn8xrJyefrIAYE="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index d2af5d9e1e949..89c91ccd9206b 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -102,10 +102,10 @@ stdenv.mkDerivation (finalAttrs: rec { (mkFlag qt5Support "QT5") (mkFlag qt6Support "QT6") (mkFlag gpgmeSupport "GPGME") - ] ++ lib.optionals finalAttrs.doCheck [ + ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ "-DTESTDATADIR=${testData}" ]; - disallowedReferences = lib.optional finalAttrs.doCheck testData; + disallowedReferences = lib.optional finalAttrs.finalPackage.doCheck testData; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index ce1f74f0b1537..fedb1b003d96e 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.3.0"; + version = "9.3.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - hash = "sha256-M1KUXzht4qIjPfHxvzPr7XUnisMwtbegKp18XQjNYHg="; + hash = "sha256-M8Zgy5xnmZu7mzxXXGqaIfe7o7iMf/1sOJVOBsTvtdQ="; }; patches = [ diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix index 72538da6a997b..65ad4ed6a2933 100644 --- a/pkgs/development/libraries/properties-cpp/default.nix +++ b/pkgs/development/libraries/properties-cpp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-C/BDEuKNMQHOjATO5aWBptjIlgfv6ykzjFAsHb6uP3Q="; }; - postPatch = lib.optionalString (!finalAttrs.doCheck) '' + postPatch = lib.optionalString (!finalAttrs.finalPackage.doCheck) '' sed -i "/add_subdirectory(tests)/d" CMakeLists.txt ''; diff --git a/pkgs/development/libraries/protobuf/25.nix b/pkgs/development/libraries/protobuf/25.nix new file mode 100644 index 0000000000000..b994f60609423 --- /dev/null +++ b/pkgs/development/libraries/protobuf/25.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "25.1"; + hash = "sha256-w6556kxftVZ154LrZB+jv9qK+QmMiUOGj6EcNwiV+yo="; +} // args) diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix index 8cb18252a2aa1..c1b54306dca89 100644 --- a/pkgs/development/libraries/protolock/default.nix +++ b/pkgs/development/libraries/protolock/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protolock"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "nilslice"; repo = "protolock"; rev = "v${version}"; - sha256 = "sha256-vWwRZVArmlTIGwD4zV3dEHN2kkoeCZuNIvjCBVAviPo="; + sha256 = "sha256-+7kU4nCBwCA6mnjFrejPrIILYUSfYpq13d+0MmNZoBg="; }; - vendorHash = "sha256-pYtP+Tkh2TcGsbk7zQNaoYLEQrqGOL0gkMG5dUkfpt4="; + vendorHash = "sha256-lJhtZQ9S7/h3dSZ72O2l8oHHf3tEmGKC2PPAms09Itc="; postInstall = '' rm $out/bin/plugin* diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index f0b7c8478e08c..d238b8137d337 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -4,28 +4,19 @@ stdenv.mkDerivation rec { pname = "python-qt"; - version = "3.3.0"; + version = "3.4.2"; src = fetchFromGitHub { owner = "MeVisLab"; repo = "pythonqt"; rev = "v${version}"; - hash = "sha256-zbQ6X4Q2/QChaw3GAz/aVBj2JjWEz52YuPuHbBz935k="; + hash = "sha256-xJYOD07ACOKtY3psmfHNSCjm6t0fr8JU9CrL0w5P5G0="; }; - patches = [ - (fetchpatch { - name = "remove-unneeded-pydebug-include.patch"; - url = "https://github.com/MeVisLab/pythonqt/commit/a93104dea4d9c79351276ec963e931ca617625ec.patch"; - includes = [ "src/PythonQt.cpp" ]; - hash = "sha256-Tc4+6dIdvrda/z3Nz1s9Xz+ZWJLV2BQh8i552UynSI0="; - }) - ]; - # https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt postPatch = '' substituteInPlace build/python.prf \ - --replace "unix:PYTHON_VERSION=2.7" "unix:PYTHON_VERSION=${python.pythonVersion}" + --replace "PYTHON_VERSION=2.7" "PYTHON_VERSION=${python.pythonVersion}" ''; hardeningDisable = [ "all" ]; diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index 96cf2cd6fc8ea..e178dd5240d66 100644 --- a/pkgs/development/libraries/qcoro/default.nix +++ b/pkgs/development/libraries/qcoro/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "qcoro"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "danvratil"; repo = "qcoro"; rev = "v${version}"; - sha256 = "sha256-kf2W/WAZCpLkq1UIy7iZri4vNaqjGjotB/Xsb+byZV4="; + sha256 = "sha256-C4k5ClsMwzxURAQBGV5WBwlRr5N0SvUMJobZ+ROT0EY="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/qmenumodel/default.nix b/pkgs/development/libraries/qmenumodel/default.nix index a8d11529808fe..7d1384df364bc 100644 --- a/pkgs/development/libraries/qmenumodel/default.nix +++ b/pkgs/development/libraries/qmenumodel/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace libqmenumodel/QMenuModel/CMakeLists.txt \ --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" - '' + lib.optionalString finalAttrs.doCheck '' + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' patchShebangs tests/{client,script}/*.py ''; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; cmakeFlags = [ - "-DENABLE_TESTS=${lib.boolToString finalAttrs.doCheck}" + "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index d80309f2b16b4..2cabf50228447 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.6.1"; + version = "11.6.3"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-QXRzvSMi6gKISJo44KIjTYENNqxh1yDhUUhEZa8uz6Q="; + hash = "sha256-asGNZ/5iEkyIjRO9FECV1bN4k/YHv4/7I125BUr9+fE="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 68a3e3531e19a..7a5ff60c9acbb 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -23,7 +23,7 @@ Check for any minor version changes. let - srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; }; + srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; } // { __attrsFailEvaluation = true; }; qtCompatVersion = srcs.qtbase.version; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 67e9bd5440d11..594489a0d7505 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -15,7 +15,7 @@ # optional dependencies , cups ? null, postgresql ? null , withGtk3 ? false, dconf, gtk3 -, qttranslations ? null +, withQttranslation ? true, qttranslations ? null # options , libGLSupported ? !stdenv.isDarwin @@ -351,7 +351,8 @@ stdenv.mkDerivation (finalAttrs: ({ ] ++ lib.optionals (mysqlSupport) [ "-L" "${libmysqlclient}/lib" "-I" "${libmysqlclient}/include" - ] ++ lib.optional (qttranslations != null) [ + ] ++ lib.optional (withQttranslation && (qttranslations != null)) [ + # depends on x11 "-translationdir" "${qttranslations}/translations" ] ); diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 83f46b12a24a1..04cda55b30d3f 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "2.6"; + version = "3.0"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "sha256-tTpCbHiZTb/xmm3oRXsYAUWl1sYyAlGP9ss4xVQgPVo="; + sha256 = "sha256-RYZnuHjK6/ygFsjjnOTz7glYnibTwDNlou/4cQ7HfKM="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 860e39227513a..aa0611aaef200 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.13.2"; + version = "6.13.3"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-Kdvr3T9hynLCj99+Rc1L0Gq7xkiM0a6xovuqhAncrek="; + hash = "sha256-/3PEbUMphblB3HgLkDb4l7GykuXL/ZOsKBrs8h72uwE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qxlsx/default.nix b/pkgs/development/libraries/qxlsx/default.nix index b6d92b964452c..2626eefa8cd4c 100644 --- a/pkgs/development/libraries/qxlsx/default.nix +++ b/pkgs/development/libraries/qxlsx/default.nix @@ -1,31 +1,21 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , qtbase }: stdenv.mkDerivation rec { pname = "qxlsx"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "QtExcel"; repo = "QXlsx"; rev = "v${version}"; - hash = "sha256-8plnvyb4sQRfEac1TVWgr2yrtAVAPKucgAnsybdUd3U="; + hash = "sha256-E3x2IUPMRmPSTRN01sXJ0PZaN7iBzatr2vwan2sZxf0="; }; - patches = [ - # Fix header include path - # https://github.com/QtExcel/QXlsx/pull/279 - (fetchpatch { - url = "https://github.com/QtExcel/QXlsx/commit/9d6db9efb92b93c3663ccfef3aec05267ba43723.patch"; - hash = "sha256-EbE5CNACAcgENCQh81lBZJ52hCIcBsFhNnYOS0Wr25I="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 2e1163e5f59c9..e01934b1d7311 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/canonical/raft"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ wucke13 adamcstephens ]; + maintainers = teams.lxc.members; }; } diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index fe94f5dce959f..68f2e5e096a8b 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -3,40 +3,48 @@ , fetchFromGitHub , cmake , unstableGitUpdater +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rapidcheck"; - version = "unstable-2023-04-16"; + version = "unstable-2023-12-14"; src = fetchFromGitHub { owner = "emil-e"; repo = "rapidcheck"; - rev = "a5724ea5b0b00147109b0605c377f1e54c353ba2"; - hash = "sha256-nq2VBDREkAOnvtdYr3m0TYNXx7mv9hbV5HZFVL2uTTg="; + rev = "ff6af6fc683159deb51c543b065eba14dfcf329b"; + hash = "sha256-Ixz5RpY0n8Un/Pv4XoTfbs40+70iyMbkQUjDqoLaWOg="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "RC_INSTALL_ALL_EXTRAS" true) ]; - # Install the extras headers - postInstall = '' - cp -r $src/extras $out - chmod -R +w $out/extras - rm $out/extras/CMakeLists.txt - rm $out/extras/**/CMakeLists.txt - ''; - - passthru.updateScript = unstableGitUpdater { }; + passthru = { + updateScript = unstableGitUpdater { }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; meta = with lib; { description = "A C++ framework for property based testing inspired by QuickCheck"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; maintainers = with maintainers; [ ]; license = licenses.bsd2; + pkgConfigModules = [ + "rapidcheck" + # Extras + "rapidcheck_boost" + "rapidcheck_boost_test" + "rapidcheck_catch" + "rapidcheck_doctest" + "rapidcheck_gtest" + ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 968cc51813279..400c7297d22ba 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-v/FjnDg22ZNQHmrUsPvjaCs4UQ/RPAxQdg9i8k6ba/4="; + sha256 = "sha256-F67aKmyMmqBVG5sF8ZwqemmfvVi/0bDjaiugKKSipuA="; }; nativeBuildInputs = [ pkg-config python3 which ]; diff --git a/pkgs/development/libraries/readline/readline-8.2-patches.nix b/pkgs/development/libraries/readline/readline-8.2-patches.nix index 48d2bd14badb0..bc075df237c7b 100644 --- a/pkgs/development/libraries/readline/readline-8.2-patches.nix +++ b/pkgs/development/libraries/readline/readline-8.2-patches.nix @@ -2,4 +2,10 @@ patch: [ (patch "001" "1xxgfgr6hn3ads8m8xsrdi1kbx1f3s69k0danpd9x4haqhg7zydv") +(patch "002" "0ly0siy6qy3l7hv12847adpfa34yq1w4qz9qkw6vrxv25j106rg0") +(patch "003" "1c5cwvvkx9mfmpaapymq9cavmzh4fnagkjlchsqx4vml8sx8gx94") +(patch "004" "1b15sndx9v5vj3x1f3h73099nlagknx4rbfpd5ldrbw2xgm2wmvr") +(patch "005" "16ac25jz1a1mgkpfp1sydqf6qpsfh0s0dcmrnjpqbhg5va3s6av2") +(patch "006" "18gmh6y3klh0vv28cyqz4is3rlb32pl7f1kf5r482kfjq3w5zd67") +(patch "007" "1xmnpahs983n4w0gn3j0wr8nh1dpva33yj7fvfmhm46ph2wsa4ar") ] diff --git a/pkgs/development/libraries/rure/Cargo.lock b/pkgs/development/libraries/rure/Cargo.lock index 48e04d1f5acb7..4b6af3249d382 100644 --- a/pkgs/development/libraries/rure/Cargo.lock +++ b/pkgs/development/libraries/rure/Cargo.lock @@ -13,15 +13,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "regex" diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 0b4526e6e1ebc..3fae85187deb7 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "2.0.3"; + version = "2.0.5"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - hash = "sha256-YhUwRbpmEybezvopbqFj7M1EE3pufkNrN8yi/zbnJ3U="; + hash = "sha256-n1zj1U26l30JYr5Tio5zwv8v/e2cjEeIRGsyncMtt9I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index fdbdb4db24bf7..9dafb64e9292d 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -20,6 +20,8 @@ , gpsd , ffmpeg , limesuite +, pkg-config +, zeromq , version , src , withFirmware ? false @@ -35,12 +37,12 @@ stdenv.mkDerivation rec { inherit version src; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw - limesuite + limesuite zeromq ] ++ lib.optionals withFirmware [ firmware ]; diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix index 102a8b901ccee..1eedfd3fea0bd 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { "-DCONF_DIR=etc" "-DBUILD_LIBS=1" "-DWITH_PENTAX=off" + "-DWITH_AHP_XC=off" ]; postPatch = '' diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index 6b110a152ee39..e2018ce7c2b04 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -6,7 +6,7 @@ let owner = "indilib"; repo = "indi-3rdparty"; rev = "v${version}"; - hash = "sha256-xAGSFTOfO9P8JldzY59OnQULzf2Mlx3vWjoP+IDdEFE="; + hash = "sha256-EtwN3yuMsT9CV+CapkKDy3e92u9Blvy+ySrQU586Z1s="; }; indi-firmware = callPackage ./indi-firmware.nix { inherit version; diff --git a/pkgs/development/libraries/science/biology/bpp-core/default.nix b/pkgs/development/libraries/science/biology/bpp-core/default.nix index 953fe50a4b03e..0d0e3c1149203 100644 --- a/pkgs/development/libraries/science/biology/bpp-core/default.nix +++ b/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "bpp-core"; @@ -10,6 +10,13 @@ stdenv.mkDerivation rec { sha256 = "0ma2cl677l7s0n5sffh66cy9lxp5wycm50f121g8rx85p95vkgwv"; }; + patches = [ + (fetchpatch { + url = "https://github.com/BioPP/bpp-core/commit/d450e8033b06e80dff9c2236fb7ce1f3ced5dcbb.patch"; + hash = "sha256-9t68mrK7KNs5BxljKMaA+XskCcKDNv8DNCVUYunoNdw="; + }) + ]; + nativeBuildInputs = [ cmake ]; postFixup = '' diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index bf9233d3050eb..d89b6dbbe6794 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.18"; + version = "1.19"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-8atTpZOiMgob+t9O+RXa54QAbFtckiyKgXTXUwqa8Y8="; + sha256 = "sha256-h1HEDE+n0fI6aGTFsgpzdE+L5oI5U1rncpxffTlNBzY="; }; # perl is only used during the check phase. diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index e23fba7fb0ebd..7966cd4be5f65 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "avogadrolibs"; - version = "1.97.0"; + version = "1.98.1"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = pname; rev = version; - hash = "sha256-ZGFyUlFyI403aw/6GVze/gronT67XlEOKuw5sfHeVy8="; + hash = "sha256-BuBMWW7N5Cu9tw5Vpwk+aoIaMWwHViRzLtIG7XDWjN4="; }; postUnpack = '' @@ -53,9 +53,13 @@ in stdenv.mkDerivation rec { qttools ]; - postFixup = '' + # Fix the broken CMake files to use the correct paths + postInstall = '' substituteInPlace $out/lib/cmake/${pname}/AvogadroLibsConfig.cmake \ - --replace "''${AvogadroLibs_INSTALL_PREFIX}/$out" "''${AvogadroLibs_INSTALL_PREFIX}" + --replace "$out/" "" + + substituteInPlace $out/lib/cmake/${pname}/AvogadroLibsTargets.cmake \ + --replace "_IMPORT_PREFIX}/$out" "_IMPORT_PREFIX}/" ''; meta = with lib; { diff --git a/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix b/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix index ec1fed68ff932..a93b8f32cef2a 100644 --- a/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix +++ b/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mmtf-cpp"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "rcsb"; repo = pname; rev = "v${version}"; - sha256= "17ylramda69plf5w0v5hxbl4ggkdi5s15z55cv0pljl12yvyva8l"; + hash = "sha256-8JrNobvekMggS8L/VORKA32DNUdXiDrYMObjd29wQmc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/chemistry/molequeue/default.nix b/pkgs/development/libraries/science/chemistry/molequeue/default.nix index 1e8ca2d961d38..b560ac16c698c 100644 --- a/pkgs/development/libraries/science/chemistry/molequeue/default.nix +++ b/pkgs/development/libraries/science/chemistry/molequeue/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "OpenChemistry"; repo = pname; rev = version; - sha256 = "+NoY8YVseFyBbxc3ttFWiQuHQyy1GN8zvV1jGFjmvLg="; + hash = "sha256-+NoY8YVseFyBbxc3ttFWiQuHQyy1GN8zvV1jGFjmvLg="; }; nativeBuildInputs = [ @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { buildInputs = [ qttools ]; - postFixup = '' - substituteInPlace $out/lib/cmake/molequeue/MoleQueueConfig.cmake \ - --replace "''${MoleQueue_INSTALL_PREFIX}/$out" "''${MoleQueue_INSTALL_PREFIX}" + # Fix the broken CMake files to use the correct paths + postInstall = '' + substituteInPlace $out/lib/cmake/${pname}/MoleQueueConfig.cmake \ + --replace "$out/" "" ''; meta = with lib; { diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix index 349c3be82b969..94a88bbf819af 100644 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "openmm"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "openmm"; repo = pname; rev = version; - hash = "sha256-89ngeZHdjyL/OoGuQ+F5eaXE1/od0EEfIgw9eKdLtL8="; + hash = "sha256-uNAqjklgBWM2v2z6qu17ZMFO4gn3fsnYPxyGO++UtTw="; }; # "This test is stochastic and may occassionally fail". It does. @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableCuda cudaPackages.cudatoolkit; propagatedBuildInputs = lib.optionals enablePython (with python3Packages; [ + setuptools python numpy cython @@ -85,6 +86,7 @@ stdenv.mkDerivation rec { cd python ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py build ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out + mv $out/lib/python*/site-packages/OpenMM*.egg/{openmm,simtk} $out/lib/python*/site-packages/. ''; postFixup = '' diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix index 703a7f2e34417..f67d68d768a0f 100644 --- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -1,26 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: -stdenv.mkDerivation rec { - pname = "QuadProgpp"; - version = "4b6bd65f09fbff99c172a86d6e96ca74449b323f"; +stdenv.mkDerivation { + pname = "quadprogpp"; + version = "unstable-2023-01-20"; src = fetchFromGitHub { owner = "liuq"; repo = "QuadProgpp"; - rev = version; - sha256 = "02r0dlk2yjpafknvm945vbgs4sl26w2i1gw3pllar9hi364y8hnx"; + rev = "4c51d91deb5af251957edf9454bfb74279a4544e"; + hash = "sha256-uozwuTAOPsRwYM9KyG3V0hwcmaPpfZPID9Wdd4olsvY="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; meta = with lib; { + description = "A C++ library for Quadratic Programming"; + longDescription = '' + QuadProg++ is a C++ library for Quadratic Programming which implements + the Goldfarb-Idnani active-set dual method. + ''; homepage = "https://github.com/liuq/QuadProgpp"; license = licenses.mit; - description = '' - A C++ library for Quadratic Programming which implements the - Goldfarb-Idnani active-set dual method. - ''; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ wegank ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index ed899a02aa783..4431ab63c7b7f 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "blas"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; - sha256 = "sha256-LZ/e59NhlU/uUyEApQ5gKCbJzBFT+M0Fe6pl7VfpAoM="; + sha256 = "sha256-zMQbXQiOUNsAMDF66bDJrzdXEME5KsrR/iCWAtpaWq0="; }; passthru = { inherit blas64; }; diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix deleted file mode 100644 index d4c83428980d3..0000000000000 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ /dev/null @@ -1,66 +0,0 @@ -# Support matrix can be found at -# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html -# Type aliases -# Release = { -# version: String, -# minCudaVersion: String, -# maxCudaVersion: String, -# url: String, -# hash: String, -# } -final: prev: let - inherit (final) callPackage; - inherit (prev) cudaVersion; - inherit (prev.lib) attrsets lists versions; - inherit (prev.lib.strings) replaceStrings versionAtLeast versionOlder; - - # Compute versioned attribute name to be used in this package set - # Patch version changes should not break the build, so we only use major and minor - # computeName :: String -> String - computeName = version: "cudnn_${replaceStrings ["."] ["_"] (versions.majorMinor version)}"; - - # Check whether a CUDNN release supports our CUDA version - # Thankfully we're able to do lexicographic comparison on the version strings - # isSupported :: Release -> Bool - isSupported = release: - versionAtLeast cudaVersion release.minCudaVersion - && versionAtLeast release.maxCudaVersion cudaVersion; - - # useCudatoolkitRunfile :: Bool - useCudatoolkitRunfile = versionOlder cudaVersion "11.3.999"; - - # buildCuDnnPackage :: Release -> Derivation - buildCuDnnPackage = callPackage ./generic.nix {inherit useCudatoolkitRunfile;}; - - # Reverse the list to have the latest release first - # cudnnReleases :: List Release - cudnnReleases = lists.reverseList (builtins.import ./releases.nix); - - # Check whether a CUDNN release supports our CUDA version - # supportedReleases :: List Release - supportedReleases = builtins.filter isSupported cudnnReleases; - - # Function to transform our releases into build attributes - # toBuildAttrs :: Release -> { name: String, value: Derivation } - toBuildAttrs = release: { - name = computeName release.version; - value = buildCuDnnPackage release; - }; - - # Add all supported builds as attributes - # allBuilds :: AttrSet String Derivation - allBuilds = builtins.listToAttrs (builtins.map toBuildAttrs supportedReleases); - - defaultBuild = attrsets.optionalAttrs (supportedReleases != []) { - cudnn = let - # The latest release is the first element of the list and will be our default choice - # latestReleaseName :: String - latestReleaseName = computeName (builtins.head supportedReleases).version; - in - allBuilds.${latestReleaseName}; - }; - - # builds :: AttrSet String Derivation - builds = allBuilds // defaultBuild; -in - builds diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix deleted file mode 100644 index b9f101d80fa30..0000000000000 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ stdenv, - backendStdenv, - lib, - lndir, - zlib, - useCudatoolkitRunfile ? false, - cudaVersion, - cudaMajorVersion, - cudatoolkit, # For cuda < 11 - libcublas ? null, # cuda <11 doesn't ship redist packages - autoPatchelfHook, - autoAddOpenGLRunpathHook, - fetchurl, -}: { - version, - url, - hash, - minCudaVersion, - maxCudaVersion, -}: -assert useCudatoolkitRunfile || (libcublas != null); let - inherit (lib) lists strings trivial versions; - - # majorMinorPatch :: String -> String - majorMinorPatch = (trivial.flip trivial.pipe) [ - (versions.splitVersion) - (lists.take 3) - (strings.concatStringsSep ".") - ]; - - # versionTriple :: String - # Version with three components: major.minor.patch - versionTriple = majorMinorPatch version; -in - backendStdenv.mkDerivation { - pname = "cudatoolkit-${cudaMajorVersion}-cudnn"; - version = versionTriple; - strictDeps = true; - outputs = ["out" "lib" "static" "dev"]; - - src = fetchurl { - inherit url hash; - }; - - # We do need some other phases, like configurePhase, so the multiple-output setup hook works. - dontBuild = true; - - # Check and normalize Runpath against DT_NEEDED using autoPatchelf. - # Prepend /run/opengl-driver/lib using addOpenGLRunpath for dlopen("libcudacuda.so") - nativeBuildInputs = [ - autoPatchelfHook - autoAddOpenGLRunpathHook - ]; - - # Used by autoPatchelfHook - buildInputs = [ - # Note this libstdc++ isn't from the (possibly older) nvcc-compatible - # stdenv, but from the (newer) stdenv that the rest of nixpkgs uses - stdenv.cc.cc.lib - - zlib - ] ++ lists.optionals useCudatoolkitRunfile [ - cudatoolkit - ] ++ lists.optionals (!useCudatoolkitRunfile) [ - libcublas.lib - ]; - - # We used to patch Runpath here, but now we use autoPatchelfHook - # - # Note also that version <=8.3.0 contained a subdirectory "lib64/" but in - # version 8.3.2 it seems to have been renamed to simply "lib/". - # - # doc and dev have special output handling. Other outputs need to be moved to their own - # output. - # Note that moveToOutput operates on all outputs: - # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107 - installPhase = - '' - runHook preInstall - - mkdir -p "$out" - mv * "$out" - moveToOutput "lib64" "$lib" - moveToOutput "lib" "$lib" - moveToOutput "**/*.a" "$static" - - runHook postInstall - ''; - - # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. - postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") '' - patchelf $lib/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so - patchelf $lib/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so - ''; - - # The out output leverages the same functionality which backs the `symlinkJoin` function in - # Nixpkgs: - # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510 - # - # That should allow us to emulate "fat" default outputs without having to actually create them. - # - # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency. - postPhases = ["postPatchelf"]; - # For each output, create a symlink to it in the out output. - # NOTE: We must recreate the out output here, because the setup hook will have deleted it - # if it was empty. - # NOTE: Do not use optionalString based on whether `outputs` contains only `out` -- phases - # which are empty strings are skipped/unset and result in errors of the form "command not - # found: <customPhaseName>". - postPatchelf = '' - mkdir -p "$out" - ${lib.meta.getExe lndir} "$lib" "$out" - ${lib.meta.getExe lndir} "$static" "$out" - ${lib.meta.getExe lndir} "$dev" "$out" - ''; - - passthru = { - inherit useCudatoolkitRunfile; - - cudatoolkit = - trivial.warn - '' - cudnn.cudatoolkit passthru attribute is deprecated; - if your derivation uses cudnn directly, it should probably consume cudaPackages instead - '' - cudatoolkit; - - majorVersion = versions.major versionTriple; - }; - - # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs - # from depending on `out` by default. - # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196 - # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs. - propagatedBuildOutputs = false; - - # By default, if the dev output exists it just uses that. - # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or - # anything of the sort. To remedy this, we set outputSpecified to true, and use - # outputsToInstall, which tells Nix which outputs to use when the package name is used - # unqualified (that is, without an explicit output). - outputSpecified = true; - - meta = with lib; { - # Check that the cudatoolkit version satisfies our min/max constraints (both - # inclusive). We mark the package as broken if it fails to satisfies the - # official version constraints (as recorded in default.nix). In some cases - # you _may_ be able to smudge version constraints, just know that you're - # embarking into unknown and unsupported territory when doing so. - broken = - strings.versionOlder cudaVersion minCudaVersion - || strings.versionOlder maxCudaVersion cudaVersion; - description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; - homepage = "https://developer.nvidia.com/cudnn"; - sourceProvenance = with sourceTypes; [binaryNativeCode]; - license = { - shortName = "cuDNN EULA"; - fullName = "NVIDIA cuDNN Software License Agreement (EULA)"; - url = "https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html#supplement"; - free = false; - } // lib.optionalAttrs (!useCudatoolkitRunfile) { - redistributable = true; - }; - platforms = ["x86_64-linux"]; - maintainers = with maintainers; [mdaiter samuela]; - # Force the use of the default, fat output by default (even though `dev` exists, which - # causes Nix to prefer that output over the others if outputSpecified isn't set). - outputsToInstall = ["out"]; - }; - } diff --git a/pkgs/development/libraries/science/math/cudnn/releases.nix b/pkgs/development/libraries/science/math/cudnn/releases.nix deleted file mode 100644 index 1cca4d9d015db..0000000000000 --- a/pkgs/development/libraries/science/math/cudnn/releases.nix +++ /dev/null @@ -1,185 +0,0 @@ -# NOTE: Check https://docs.nvidia.com/deeplearning/cudnn/archives/index.html for support matrices. -[ - { - version = "7.4.2.24"; - minCudaVersion = "10.0"; - maxCudaVersion = "10.0"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.4.2/cudnn-10.0-linux-x64-v7.4.2.24.tgz"; - hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM="; - } - { - version = "7.6.5.32"; - minCudaVersion = "10.0"; - maxCudaVersion = "10.0"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.0-linux-x64-v7.6.5.32.tgz"; - hash = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro="; - } - { - version = "7.6.5.32"; - minCudaVersion = "10.1"; - maxCudaVersion = "10.1"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.1-linux-x64-v7.6.5.32.tgz"; - hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM="; - } - { - version = "7.6.5.32"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.2-linux-x64-v7.6.5.32.tgz"; - hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLN="; - } - { - version = "8.0.5.39"; - minCudaVersion = "10.1"; - maxCudaVersion = "10.1"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.1-linux-x64-v8.0.5.39.tgz"; - hash = "sha256-kJCElSmIlrM6qVBjo0cfk8NmJ9esAcF9w211xl7qSgA="; - } - { - version = "8.0.5.39"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.2-linux-x64-v8.0.5.39.tgz"; - hash = "sha256-IfhMBcZ78eyFnnfDjM1b8VSWT6HDCPRJlZvkw1bjgvM="; - } - { - version = "8.0.5.39"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.0"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-11.0-linux-x64-v8.0.5.39.tgz"; - hash = "sha256-ThbueJXetKixwZS4ErpJWG730mkCBRQB03F1EYmKm3M="; - } - { - version = "8.0.5.39"; - minCudaVersion = "11.1"; - maxCudaVersion = "11.1"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-11.1-linux-x64-v8.0.5.39.tgz"; - hash = "sha256-HQRr+nk5navMb2yxUHkYdUQ5RC6gyp4Pvs3URvmwDM4="; - } - { - version = "8.1.1.33"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-10.2-linux-x64-v8.1.1.33.tgz"; - hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0="; - } - { - version = "8.1.1.33"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.2"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-11.2-linux-x64-v8.1.1.33.tgz"; - hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; - } - { - version = "8.2.4.15"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-10.2-linux-x64-v8.2.4.15.tgz"; - hash = "sha256-0jyUoxFaHHcRamwSfZF1+/WfcjNkN08mo0aZB18yIvE="; - } - { - version = "8.2.4.15"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.4"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-11.4-linux-x64-v8.2.4.15.tgz"; - hash = "sha256-Dl0t+JC5ln76ZhnaQhMQ2XMjVlp58FoajLm3Fluq0Nc="; - } - { - version = "8.3.3.40"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/10.2/cudnn-linux-x86_64-8.3.3.40_cuda10.2-archive.tar.xz"; - hash = "sha256-2FVPKzLmKV1fyPOsJeaPlAWLAYyAHaucFD42gS+JJqs="; - } - { - version = "8.3.3.40"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.6"; - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/11.5/cudnn-linux-x86_64-8.3.3.40_cuda11.5-archive.tar.xz"; - hash = "sha256-6r6Wx1zwPqT1N5iU2RTx+K4UzqsSGYnoSwg22Sf7dzE="; - } - { - version = "8.4.1.50"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda10.2-archive.tar.xz"; - hash = "sha256-I88qMmU6lIiLVmaPuX7TTbisgTav839mssxUo3lQNjg="; - } - { - version = "8.4.1.50"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.7"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz"; - hash = "sha256-7JbSN22B/KQr3T1MPXBambKaBlurV/kgVhx2PinGfQE="; - } - { - version = "8.5.0.96"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda10-archive.tar.xz"; - hash = "sha256-1mzhbbzR40WKkHnQLtJHhg0vYgf7G8a0OBcCwIOkJjM="; - } - { - version = "8.5.0.96"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.7"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda11-archive.tar.xz"; - hash = "sha256-VFSm/ZTwCHKMqumtrZk8ToXvNjAuJrzkO+p9RYpee20="; - } - { - version = "8.6.0.163"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda10-archive.tar.xz"; - hash = "sha256-t4sr/GrFqqdxu2VhaJQk5K1Xm/0lU4chXG8hVL09R9k="; - } - { - version = "8.6.0.163"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.8"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda11-archive.tar.xz"; - hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4="; - } - { - version = "8.7.0.84"; - minCudaVersion = "10.2"; - maxCudaVersion = "10.2"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda10-archive.tar.xz"; - hash = "sha256-bZhaqc8+GbPV2FQvvbbufd8VnEJgvfkICc2N3/gitRg="; - } - { - version = "8.7.0.84"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.8"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda11-archive.tar.xz"; - hash = "sha256-l2xMunIzyXrnQAavq1Fyl2MAukD1slCiH4z3H1nJ920="; - } - { - version = "8.8.1.3"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.8"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.8.1.3_cuda11-archive.tar.xz"; - hash = "sha256-r3WEyuDMVSS1kT7wjCm6YVQRPGDrCjegWQqRtRWoqPk="; - } - { - version = "8.8.1.3"; - minCudaVersion = "12.0"; - maxCudaVersion = "12.0"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.8.1.3_cuda12-archive.tar.xz"; - hash = "sha256-edd6dpx+cXWrx7XC7VxJQUjAYYqGQThyLIh/lcYjd3w="; - } - { - version = "8.9.6.50"; - minCudaVersion = "11.0"; - maxCudaVersion = "11.8"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.6.50_cuda11-archive.tar.xz"; - hash = "sha256-oOLvVemfTNZH99HaqlqkUE/6M1ujAYbVwyiPL0ffBX4="; - } - { - version = "8.9.6.50"; - minCudaVersion = "12.0"; - maxCudaVersion = "12.2"; - url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.6.50_cuda12-archive.tar.xz"; - hash = "sha256-FyIlnblSZbs4E0OKWhxuzZed6JrkU2YDkEBC4STTAtU="; - } -] diff --git a/pkgs/development/libraries/science/math/cutensor/generic.nix b/pkgs/development/libraries/science/math/cutensor/generic.nix deleted file mode 100644 index c957fcdd99d4e..0000000000000 --- a/pkgs/development/libraries/science/math/cutensor/generic.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv -, lib -, libPath -, cudatoolkit -, fetchurl -, autoPatchelfHook -, addOpenGLRunpath - -, version -, hash -}: - -let - mostOfVersion = builtins.concatStringsSep "." - (lib.take 3 (lib.versions.splitVersion version)); - platform = "${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}"; -in - -stdenv.mkDerivation { - pname = "cudatoolkit-${cudatoolkit.majorVersion}-cutensor"; - inherit version; - - src = fetchurl { - url = if lib.versionOlder mostOfVersion "1.3.3" - then "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${platform}-${version}.tar.gz" - else "https://developer.download.nvidia.com/compute/cutensor/redist/libcutensor/${platform}/libcutensor-${platform}-${version}-archive.tar.xz"; - inherit hash; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - autoPatchelfHook - addOpenGLRunpath - ]; - - buildInputs = [ - stdenv.cc.cc.lib - ]; - - propagatedBuildInputs = [ - cudatoolkit - ]; - - # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - installPhase = '' - mkdir -p "$out" "$dev" - mv include "$dev" - mv ${libPath} "$out/lib" - - function finalRPathFixups { - for lib in $out/lib/lib*.so; do - addOpenGLRunpath $lib - done - } - postFixupHooks+=(finalRPathFixups) - ''; - - passthru = { - inherit cudatoolkit; - majorVersion = lib.versions.major version; - }; - - meta = with lib; { - description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives"; - homepage = "https://developer.nvidia.com/cutensor"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ obsidian-systems-maintenance ]; - }; -} diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 21e6cbf858cd5..25ac539e05f28 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -6,8 +6,6 @@ , cmake , cudaPackages ? { } , cudaSupport ? config.cudaSupport -, nvidia-thrust -, useThrustSourceBuild ? true , pythonSupport ? true , pythonPackages , llvmPackages @@ -27,8 +25,6 @@ , runCommand }@inputs: -assert cudaSupport -> nvidia-thrust.cudaSupport; - let pname = "faiss"; version = "1.7.4"; @@ -44,9 +40,6 @@ let cuda_cudart # cuda_runtime.h libcublas libcurand - ] ++ lib.optionals useThrustSourceBuild [ - nvidia-thrust - ] ++ lib.optionals (!useThrustSourceBuild) [ cuda_cccl ] ++ lib.optionals (cudaPackages ? cuda_profiler_api) [ cuda_profiler_api # cuda_profiler_api.h diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix deleted file mode 100644 index d1df264564471..0000000000000 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, backendStdenv -, fetchFromGitHub -, python3 -, which -, autoAddOpenGLRunpathHook -, cuda_cccl -, cuda_cudart -, cuda_nvcc -, cudaFlags -, cudaVersion -# passthru.updateScript -, gitUpdater -}: -let - # Output looks like "-gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_86,code=compute_86" - gencode = lib.concatStringsSep " " cudaFlags.gencode; -in -backendStdenv.mkDerivation (finalAttrs: { - pname = "nccl"; - version = "2.19.3-1"; - - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = finalAttrs.pname; - rev = "v${finalAttrs.version}"; - hash = "sha256-59FlOKM5EB5Vkm4dZBRCkn+IgIcdQehE+FyZAdTCT/A="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - which - autoAddOpenGLRunpathHook - cuda_nvcc - python3 - ]; - - buildInputs = [ - cuda_cudart - ] - # NOTE: CUDA versions in Nixpkgs only use a major and minor version. When we do comparisons - # against other version, like below, it's important that we use the same format. Otherwise, - # we'll get incorrect results. - # For example, lib.versionAtLeast "12.0" "12.0.0" == false. - ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ - cuda_cccl - ]; - - preConfigure = '' - patchShebangs ./src/device/generate.py - makeFlagsArray+=( - "NVCC_GENCODE=${gencode}" - ) - ''; - - makeFlags = [ - "CUDA_HOME=${cuda_nvcc}" - "CUDA_LIB=${lib.getLib cuda_cudart}/lib" - "CUDA_INC=${lib.getDev cuda_cudart}/include" - "PREFIX=$(out)" - ]; - - postFixup = '' - moveToOutput lib/libnccl_static.a $dev - ''; - - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ]; - - # Run the update script with: `nix-shell maintainers/scripts/update.nix --argstr package cudaPackages.nccl` - passthru.updateScript = gitUpdater { - inherit (finalAttrs) pname version; - rev-prefix = "v"; - }; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; - homepage = "https://developer.nvidia.com/nccl"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ mdaiter orivej ] ++ teams.cuda.members; - }; -}) diff --git a/pkgs/development/libraries/science/math/nccl/tests.nix b/pkgs/development/libraries/science/math/nccl/tests.nix deleted file mode 100644 index 9d826b92f164a..0000000000000 --- a/pkgs/development/libraries/science/math/nccl/tests.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ backendStdenv -, config -, cuda_cccl -, cuda_cudart -, cuda_nvcc -, cudaVersion -, fetchFromGitHub -, gitUpdater -, lib -, mpi -, mpiSupport ? false -, nccl -, which -}: - -backendStdenv.mkDerivation (finalAttrs: { - - pname = "nccl-tests"; - version = "2.13.8"; - - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = finalAttrs.pname; - rev = "v${finalAttrs.version}"; - hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cuda_nvcc - which - ]; - - buildInputs = [ - cuda_cudart - nccl - ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ - cuda_cccl.dev # <nv/target> - ] ++ lib.optional mpiSupport mpi; - - makeFlags = [ - "CUDA_HOME=${cuda_nvcc}" - "NCCL_HOME=${nccl}" - ] ++ lib.optionals mpiSupport [ - "MPI=1" - ]; - - enableParallelBuilding = true; - - installPhase = '' - mkdir -p $out/bin - cp -r build/* $out/bin/ - ''; - - passthru.updateScript = gitUpdater { - inherit (finalAttrs) pname version; - rev-prefix = "v"; - }; - - meta = with lib; { - description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations"; - homepage = "https://github.com/NVIDIA/nccl-tests"; - platforms = platforms.linux; - license = licenses.bsd3; - broken = !config.cudaSupport || (mpiSupport && mpi == null); - maintainers = with maintainers; [ jmillerpdt ] ++ teams.cuda.members; - }; -}) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 3fc533e848db8..c5b9f9019e064 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -141,7 +141,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.24"; + version = "0.3.25"; outputs = [ "out" "dev" ]; @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "sha256-IuXhrZRB3o7kbnivv/6En/aAeF2F18sQw9pKs1WEJc4="; + hash = "sha256-eY/R7gLDOls3csuwZkUS+x+v3GeL3dCsOD+4STxDpCg="; }; postPatch = '' diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index dd2eb9478f7f6..abc2ff9a37012 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -8,7 +8,7 @@ , mpfr , config , enableCuda ? config.cudaSupport -, cudatoolkit +, cudaPackages }: stdenv.mkDerivation rec { @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_nvcc + ]; # Use compatible indexing for lapack and blas used buildInputs = assert (blas.isILP64 == lapack.isILP64); [ @@ -34,7 +38,12 @@ stdenv.mkDerivation rec { gfortran.cc.lib gmp mpfr - ] ++ lib.optional enableCuda cudatoolkit; + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_cudart.dev + cudaPackages.cuda_cudart.lib + cudaPackages.libcublas.dev + cudaPackages.libcublas.lib + ]; preConfigure = '' # Mongoose and GraphBLAS are packaged separately @@ -49,9 +58,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals blas.isILP64 [ "CFLAGS=-DBLAS64" ] ++ lib.optionals enableCuda [ - "CUDA_PATH=${cudatoolkit}" - "CUDART_LIB=${cudatoolkit.lib}/lib/libcudart.so" - "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so" + "CUDA_PATH=${cudaPackages.cuda_nvcc}" + "CUDART_LIB=${cudaPackages.cuda_cudart.lib}/lib/libcudart.so" + "CUBLAS_LIB=${cudaPackages.libcublas.lib}/lib/libcublas.so" ] ++ lib.optionals stdenv.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368 diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch b/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch deleted file mode 100644 index 6fa3c703efa99..0000000000000 --- a/pkgs/development/libraries/science/math/tensorflow-lite/eigen_include_dir.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 28103856e..a36909c0e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -449,13 +449,6 @@ install(FILES - DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel - ) - --if(EIGEN_BUILD_PKGCONFIG) -- configure_file(eigen3.pc.in eigen3.pc @ONLY) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc -- DESTINATION ${PKGCONFIG_INSTALL_DIR} -- ) --endif() -- - install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) - - add_subdirectory(doc EXCLUDE_FROM_ALL) -@@ -570,8 +563,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) - set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) - set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) - set ( EIGEN_DEFINITIONS "") --set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" ) - set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} ) -+GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR) -+ -+if(EIGEN_BUILD_PKGCONFIG) -+ configure_file(eigen3.pc.in eigen3.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc -+ DESTINATION ${PKGCONFIG_INSTALL_DIR} -+ ) -+endif() - - # Interface libraries require at least CMake 3.0 - if (NOT CMAKE_VERSION VERSION_LESS 3.0) -diff --git a/eigen3.pc.in b/eigen3.pc.in -index 3368a3aa1..d6778bf06 100644 ---- a/eigen3.pc.in -+++ b/eigen3.pc.in -@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r - Requires: - Version: @EIGEN_VERSION_NUMBER@ - Libs: --Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@ -+Cflags: -I@EIGEN_INCLUDE_DIR@ diff --git a/pkgs/development/libraries/science/math/tensorrt/extension.nix b/pkgs/development/libraries/science/math/tensorrt/extension.nix index b4018c6cc284d..ffd9b672684cb 100644 --- a/pkgs/development/libraries/science/math/tensorrt/extension.nix +++ b/pkgs/development/libraries/science/math/tensorrt/extension.nix @@ -17,16 +17,32 @@ final: prev: let isSupported = fileData: elem cudaVersion fileData.supportedCudaVersions; # Return the first file that is supported. In practice there should only ever be one anyway. supportedFile = files: findFirst isSupported null files; - # Supported versions with versions as keys and file as value - supportedVersions = filterAttrs (version: file: file !=null ) (mapAttrs (version: files: supportedFile files) tensorRTVersions); + # Compute versioned attribute name to be used in this package set computeName = version: "tensorrt_${toUnderscore version}"; + + # Supported versions with versions as keys and file as value + supportedVersions = lib.recursiveUpdate + { + tensorrt = { + enable = false; + fileVersionCuda = null; + fileVersionCudnn = null; + fullVersion = "0.0.0"; + sha256 = null; + tarball = null; + supportedCudaVersions = [ ]; + }; + } + (mapAttrs' (version: attrs: nameValuePair (computeName version) attrs) + (filterAttrs (version: file: file != null) (mapAttrs (version: files: supportedFile files) tensorRTVersions))); + # Add all supported builds as attributes - allBuilds = mapAttrs' (version: file: nameValuePair (computeName version) (buildTensorRTPackage (removeAttrs file ["fileVersionCuda"]))) supportedVersions; + allBuilds = mapAttrs (name: file: buildTensorRTPackage (removeAttrs file ["fileVersionCuda"])) supportedVersions; + # Set the default attributes, e.g. tensorrt = tensorrt_8_4; - defaultBuild = { "tensorrt" = if allBuilds ? ${computeName tensorRTDefaultVersion} - then allBuilds.${computeName tensorRTDefaultVersion} - else throw "tensorrt-${tensorRTDefaultVersion} does not support your cuda version ${cudaVersion}"; }; + defaultName = computeName tensorRTDefaultVersion; + defaultBuild = lib.optionalAttrs (allBuilds ? ${defaultName}) { tensorrt = allBuilds.${computeName tensorRTDefaultVersion}; }; in { inherit buildTensorRTPackage; } // allBuilds // defaultBuild; diff --git a/pkgs/development/libraries/science/math/tensorrt/generic.nix b/pkgs/development/libraries/science/math/tensorrt/generic.nix deleted file mode 100644 index 165c6f356da89..0000000000000 --- a/pkgs/development/libraries/science/math/tensorrt/generic.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib -, backendStdenv -, requireFile -, autoPatchelfHook -, autoAddOpenGLRunpathHook -, cudaVersion -, cudatoolkit -, cudnn -}: - -{ fullVersion -, fileVersionCudnn ? null -, tarball -, sha256 -, supportedCudaVersions ? [ ] -}: - -assert fileVersionCudnn == null || lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn) - "This version of TensorRT requires at least cuDNN ${fileVersionCudnn} (current version is ${cudnn.version})"; - -backendStdenv.mkDerivation rec { - pname = "cudatoolkit-${cudatoolkit.majorVersion}-tensorrt"; - version = fullVersion; - src = requireFile rec { - name = tarball; - inherit sha256; - message = '' - To use the TensorRT derivation, you must join the NVIDIA Developer Program and - download the ${version} Linux x86_64 TAR package for CUDA ${cudaVersion} from - ${meta.homepage}. - - Once you have downloaded the file, add it to the store with the following - command, and try building this derivation again. - - $ nix-store --add-fixed sha256 ${name} - ''; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - autoPatchelfHook - autoAddOpenGLRunpathHook - ]; - - # Used by autoPatchelfHook - buildInputs = [ - backendStdenv.cc.cc.lib # libstdc++ - cudatoolkit - cudnn - ]; - - sourceRoot = "TensorRT-${version}"; - - installPhase = '' - install --directory "$dev" "$out" - mv include "$dev" - mv targets/x86_64-linux-gnu/lib "$out" - install -D --target-directory="$out/bin" targets/x86_64-linux-gnu/bin/trtexec - ''; - - # Tell autoPatchelf about runtime dependencies. - # (postFixup phase is run before autoPatchelfHook.) - postFixup = - let - mostOfVersion = builtins.concatStringsSep "." - (lib.take 3 (lib.versions.splitVersion version)); - in - '' - echo 'Patching RPATH of libnvinfer libs' - patchelf --debug --add-needed libnvinfer.so \ - "$out/lib/libnvinfer.so.${mostOfVersion}" \ - "$out/lib/libnvinfer_plugin.so.${mostOfVersion}" \ - "$out/lib/libnvinfer_builder_resource.so.${mostOfVersion}" - ''; - - passthru.stdenv = backendStdenv; - - meta = with lib; { - # Check that the cudatoolkit version satisfies our min/max constraints (both - # inclusive). We mark the package as broken if it fails to satisfies the - # official version constraints (as recorded in default.nix). In some cases - # you _may_ be able to smudge version constraints, just know that you're - # embarking into unknown and unsupported territory when doing so. - broken = !(elem cudaVersion supportedCudaVersions); - description = "TensorRT: a high-performance deep learning interface"; - homepage = "https://developer.nvidia.com/tensorrt"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ aidalgol ]; - }; -} diff --git a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix index d046c6864539d..2036c4c86253b 100644 --- a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix +++ b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix @@ -14,10 +14,15 @@ inherit (cudaPackages) backendStdenv cudaFlags; cuda-common-redist = with cudaPackages; [ - cuda_cudart # cuda_runtime.h - libcublas # cublas_v2.h - libcusolver # cusolverDn.h - libcusparse # cusparse.h + cuda_cudart.dev # cuda_runtime.h + cuda_cudart.lib + cuda_cccl.dev # <nv/target> + libcublas.dev # cublas_v2.h + libcublas.lib + libcusolver.dev # cusolverDn.h + libcusolver.lib + libcusparse.dev # cusparse.h + libcusparse.lib ]; cuda-native-redist = symlinkJoin { diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index fe17da91e5817..27a3b7f5ee302 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -1,26 +1,17 @@ { lib , stdenv , fetchurl -, fetchpatch }: stdenv.mkDerivation rec { pname = "shapelib"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://download.osgeo.org/shapelib/shapelib-${version}.tar.gz"; - sha256 = "1qfsgb8b3yiqwvr6h9m81g6k9fjhfys70c22p7kzkbick20a9h0z"; + sha256 = "sha256-GVKLJDdyQXBWNzIMNnlDAxrVCIZl0fsOHqpSpxJkpsQ="; }; - patches = [ - (fetchpatch { - name = "CVE-2022-0699.patch"; - url = "https://github.com/OSGeo/shapelib/commit/c75b9281a5b9452d92e1682bdfe6019a13ed819f.patch"; - sha256 = "sha256-zJ7JHUtInA5q/RbkSs1DqVK+UQi2vIw2t1jqxocnQQI="; - }) - ]; - doCheck = true; preCheck = '' patchShebangs tests contrib/tests diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 964d15e9546ba..ba99564713100 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Enables SSO and Federation web applications written with any programming language or framework"; platforms = platforms.unix; license = licenses.asl20; - maintainers = [ maintainers.jammerful ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 5e7358fa15f9a..ec44d80d04a8d 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { # https://github.com/silnrsi/graphite/pull/74 substituteInPlace tests/CMakeLists.txt \ --replace 'add_subdirectory(nametabletest)' '#add_subdirectory(nametabletest)' + + # support cross-compilation by using target readelf binary: + substituteInPlace Graphite.cmake \ + --replace 'readelf' "${stdenv.cc.targetPrefix}readelf" ''; cmakeFlags = lib.optionals static [ diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 53a5e09413c59..3a25dd22f203e 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.6.0"; + version = "3.6.3"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-g1jrjRls9tJWh0koMg7MsUgRSNaty8YI+ivlwL6FCsk="; + sha256 = "sha256-PRXFZvwod/n27Tx9OALHdSlKsbsrNi5ij70A4ZSoeGc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix index fba7517ccca6f..fb77eebce1e9c 100644 --- a/pkgs/development/libraries/sope/default.nix +++ b/pkgs/development/libraries/sope/default.nix @@ -59,6 +59,6 @@ gnustep.stdenv.mkDerivation rec { license = licenses.publicDomain; homepage = "https://github.com/inverse-inc/sope"; platforms = platforms.linux; - maintainers = with maintainers; [ ajs124 das_j ]; + maintainers = with maintainers; []; }; } diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 54ae9261f8109..6ce3ca60c0f59 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -4,21 +4,22 @@ , fetchFromGitHub , meson , ninja -, pcre +, pcre2 , pkg-config , python3 , serd +, zix }: stdenv.mkDerivation rec { pname = "sord"; - version = "0.16.14"; + version = "0.16.16"; src = fetchFromGitHub { owner = "drobilla"; repo = pname; rev = "v${version}"; - hash = "sha256-S22Szpg6iXeana5t6EpbOtRstthgrJ4Z2cBrf7a9ZBk="; + hash = "sha256-GDs1m8KoEhJDdCf7kacQMZzCNPoZhESJds6KupQvOkU="; }; outputs = [ "out" "dev" "doc" "man" ]; @@ -30,8 +31,8 @@ stdenv.mkDerivation rec { pkg-config python3 ]; - buildInputs = [ pcre ]; - propagatedBuildInputs = [ serd ]; + buildInputs = [ pcre2 ]; + propagatedBuildInputs = [ serd zix ]; doCheck = true; diff --git a/pkgs/development/libraries/spandsp/common.nix b/pkgs/development/libraries/spandsp/common.nix index 73422ed57d650..6b58230b80da0 100644 --- a/pkgs/development/libraries/spandsp/common.nix +++ b/pkgs/development/libraries/spandsp/common.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A portable and modular SIP User-Agent with audio and video support"; homepage = "https://github.com/freeswitch/spandsp"; platforms = with lib.platforms; unix; - maintainers = with lib.maintainers; [ ajs124 misuzu ]; + maintainers = with lib.maintainers; [ misuzu ]; license = lib.licenses.gpl2; downloadPage = "http://www.soft-switch.org/downloads/spandsp/"; }; diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index 73de0a287cba4..724a9f52d509e 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spglib"; - version = "2.1.0"; # N.B: if you change this, please update: pythonPackages.spglib + version = "2.2.0"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { owner = "spglib"; repo = "spglib"; rev = "v${version}"; - hash = "sha256-EL3jkzyurc8fnzk9kAdTaEtLfLlLtmaVDFwChfCDOrQ="; + hash = "sha256-VaTW7n7DTeYBr/PrxPhfzfx/gLxzJikw5aL1tEbMtbs="; }; nativeBuildInputs = [ cmake gfortran gtest ]; diff --git a/pkgs/development/libraries/sptk/default.nix b/pkgs/development/libraries/sptk/default.nix index 078d07a628253..3ad693ae53680 100644 --- a/pkgs/development/libraries/sptk/default.nix +++ b/pkgs/development/libraries/sptk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sptk"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "sp-nitech"; repo = "SPTK"; rev = "v${version}"; - hash = "sha256-t8XVdKrrewfqefUnEz5xHgRHF0NThNQD1KGPMLOO/o8="; + hash = "sha256-lIyOcN2AR3ilUZ9stpicjbwlredbwgGPwmMICxZEijU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index 4abaced42ae24..16c1e461ec5e4 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - hash = "sha256-qTu0vS9K6rrr/0SXKpGC9P1QSN/AN7hyO/4DrGvhxWM="; + hash = "sha256-TB6wZnPZ16k8N8r0F6x+363zlTCJbM4HsKLvMZy1uYA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index cd087045a8a31..a5bfba8b05599 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -1,14 +1,23 @@ -{ lib, fetchurl, tcl }: +{ lib +, fetchzip +, tcl +, critcl +, withCritcl ? true +}: tcl.mkTclDerivation rec { pname = "tcllib"; version = "1.21"; - src = fetchurl { + src = fetchzip { url = "mirror://sourceforge/tcllib/tcllib-${version}.tar.gz"; - sha256 = "sha256-RrK7XsgEk2OuAWRa8RvaO9tdsQYp6AfYHRrUbNG+rVA="; + hash = "sha256-p8thpRpC+9k/LvbBFaSOIpDXuhMlEWhs0qbrjtKcTzQ="; }; + nativeBuildInputs = lib.optional withCritcl critcl; + + buildFlags = [ "all" ] ++ lib.optional withCritcl "critcl"; + meta = { homepage = "https://core.tcl-lang.org/tcllib/"; description = "Tcl-only library of standard routines for Tcl"; diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 575aef5ba4f37..f1c1c85caf0b1 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.21"; + version = "1.8.22"; 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 = "3870c29b158b75ca5e48e0eebd6b5c3a7994a000"; - hash = "sha256-MCzgovcEZa34ZkwbbwfXHm2qitHwL2Tpr8p7+PxNhYk="; + rev = "24893faf75d84b2b885f3f7aeb9d5a3c056fa7be"; + hash = "sha256-4cfnre71+rQSuPrtFJMzIEPYVCZH/W142b4Pn2NxvqI="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index a21a71b89bfd9..9080893d5e441 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -1,22 +1,45 @@ -{ lib, stdenv, fetchurl, cxxtools, postgresql, libmysqlclient, sqlite, zlib, openssl }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, cxxtools +, postgresql +, libmysqlclient +, sqlite +, zlib +, openssl +}: stdenv.mkDerivation rec { pname = "tntdb"; - version = "1.3"; + version = "1.4"; - src = fetchurl { - url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; - sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; + src = fetchFromGitHub { + owner = "maekitalo"; + repo = "tntdb"; + rev = "V${version}"; + hash = "sha256-ciqHv077sXnvCx+TJjdY1uPrlCP7/s972koXjGLgWhU="; }; - buildInputs = [ cxxtools postgresql libmysqlclient sqlite zlib openssl ]; + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + cxxtools + postgresql + libmysqlclient + sqlite + zlib + openssl + ]; enableParallelBuilding = true; meta = with lib; { homepage = "http://www.tntnet.org/tntdb.html"; description = "C++ library which makes accessing SQL databases easy and robust"; - platforms = platforms.linux ; + platforms = platforms.linux; license = licenses.lgpl21; maintainers = [ maintainers.juliendehos ]; }; diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix index a80b923e23587..03e8558a0c1ee 100644 --- a/pkgs/development/libraries/tntnet/default.nix +++ b/pkgs/development/libraries/tntnet/default.nix @@ -1,22 +1,49 @@ -{ lib, stdenv, fetchurl, cxxtools, zlib, openssl, zip }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, cxxtools +, zlib +, openssl +, zip +}: stdenv.mkDerivation rec { pname = "tntnet"; - version = "2.2.1"; + version = "3.0"; - src = fetchurl { - url = "http://www.tntnet.org/download/${pname}-${version}.tar.gz"; - sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8"; + src = fetchFromGitHub { + owner = "maekitalo"; + repo = "tntnet"; + rev = "V${version}"; + hash = "sha256-ujVPOreCGCFlYHa19yCIiZ0ed+p0jnS14DHDwKYvtc0="; }; - buildInputs = [ cxxtools zlib openssl zip ]; + patches = [ + (fetchpatch { + url = "https://github.com/maekitalo/tntnet/commit/69adfc8ee351a0e82990c1ffa7af6dab726e1e49.patch"; + hash = "sha256-4UdUXKQiIa9CPlGg8XmfKQ8NTWb2A3AiuPthzEthlf8="; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + cxxtools + zlib + openssl + zip + ]; enableParallelBuilding = true; meta = with lib; { homepage = "http://www.tntnet.org/tntnet.html"; description = "Web server which allows users to develop web applications using C++"; - platforms = platforms.linux ; + platforms = platforms.linux; license = licenses.lgpl21; maintainers = [ maintainers.juliendehos ]; }; diff --git a/pkgs/development/libraries/toml-f/default.nix b/pkgs/development/libraries/toml-f/default.nix index 696e41ac71cc4..ed6fc26ee2056 100644 --- a/pkgs/development/libraries/toml-f/default.nix +++ b/pkgs/development/libraries/toml-f/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "toml-f"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-sCU0uMdcXIA5O964hlK37cOrLTlk1CJeTcWD9FhevOs="; + hash = "sha256-+cac4rUNpd2w3yBdH1XoCKdJ9IgOHZioZg8AhzGY0FE="; }; nativeBuildInputs = [ gfortran cmake ]; diff --git a/pkgs/development/libraries/ucc/default.nix b/pkgs/development/libraries/ucc/default.nix index a92c6bea37d70..68f358b3d3deb 100644 --- a/pkgs/development/libraries/ucc/default.nix +++ b/pkgs/development/libraries/ucc/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, libtool, automake, autoconf, ucx , config , enableCuda ? config.cudaSupport -, cudatoolkit +, cudaPackages , enableAvx ? stdenv.hostPlatform.avxSupport , enableSse41 ? stdenv.hostPlatform.sse4_1Support , enableSse42 ? stdenv.hostPlatform.sse4_2Support @@ -30,19 +30,25 @@ stdenv.mkDerivation rec { done ''; + nativeBuildInputs = [ libtool automake autoconf ] + ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; + buildInputs = [ ucx ] + ++ lib.optionals enableCuda [ + cudaPackages.cuda_cccl + cudaPackages.cuda_cudart + ]; + + preConfigure = '' ./autogen.sh + '' + lib.optionalString enableCuda '' + configureFlagsArray+=( "--with-nvcc-gencode=${builtins.concatStringsSep " " cudaPackages.cudaFlags.gencode}" ) ''; - - nativeBuildInputs = [ libtool automake autoconf ]; - buildInputs = [ ucx ] - ++ lib.optional enableCuda cudatoolkit; - configureFlags = [ ] ++ lib.optional enableSse41 "--with-sse41" ++ lib.optional enableSse42 "--with-sse42" ++ lib.optional enableAvx "--with-avx" - ++ lib.optional enableCuda "--with-cuda=${cudatoolkit}"; + ++ lib.optional enableCuda "--with-cuda=${cudaPackages.cuda_cudart}"; postInstall = '' find $out/lib/ -name "*.la" -exec rm -f \{} \; diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 627cac56bb737..3b923d8efdd2a 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -2,18 +2,12 @@ , rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin, pkg-config , config , enableCuda ? config.cudaSupport -, cudatoolkit +, cudaPackages , enableRocm ? config.rocmSupport , rocmPackages }: let - # Needed for configure to find all libraries - cudatoolkit' = symlinkJoin { - inherit (cudatoolkit) name meta; - paths = [ cudatoolkit cudatoolkit.lib ]; - }; - rocmList = with rocmPackages; [ rocm-core rocm-runtime rocm-device-libs clr ]; rocm = symlinkJoin { @@ -35,7 +29,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" "dev" ]; - nativeBuildInputs = [ autoreconfHook doxygen pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + doxygen + pkg-config + ] + ++ lib.optionals enableCuda [ + cudaPackages.cuda_nvcc + cudaPackages.autoAddOpenGLRunpathHook + ]; buildInputs = [ libbfd @@ -44,8 +46,16 @@ stdenv.mkDerivation rec { perl rdma-core zlib - ] ++ lib.optional enableCuda cudatoolkit - ++ lib.optionals enableRocm rocmList; + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_cudart + cudaPackages.cuda_nvml_dev + + ] ++ lib.optionals enableRocm rocmList; + + LDFLAGS = lib.optionals enableCuda [ + # Fake libnvidia-ml.so (the real one is deployed impurely) + "-L${cudaPackages.cuda_nvml_dev}/lib/stubs" + ]; configureFlags = [ "--with-rdmacm=${lib.getDev rdma-core}" @@ -53,7 +63,7 @@ stdenv.mkDerivation rec { "--with-rc" "--with-dm" "--with-verbs=${lib.getDev rdma-core}" - ] ++ lib.optional enableCuda "--with-cuda=${cudatoolkit'}" + ] ++ lib.optionals enableCuda [ "--with-cuda=${cudaPackages.cuda_cudart}" ] ++ lib.optional enableRocm "--with-rocm=${rocm}"; postInstall = '' diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index 89adbc102578f..b6a91a7367a47 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { IOKit ]; + # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; + cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Some x86 tests are interrupted by signal 10 "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;test_x86" diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 51c2bcd59a57b..039db93926717 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -11,12 +11,15 @@ stdenv.mkDerivation rec { sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd"; }; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=parentheses" # Needed with GCC 12 "-Wno-error=deprecated-declarations" "-Wno-error=nonnull" - ]; + ] ++ lib.optionals stdenv.cc.isClang [ + # Needed with Clang 16 + "-Wno-error=deprecated-builtins" + ]); nativeBuildInputs = [ cmake doxygen ]; diff --git a/pkgs/development/libraries/ustream-ssl/default.nix b/pkgs/development/libraries/ustream-ssl/default.nix index 546e85fd96c75..6e9655efe442e 100644 --- a/pkgs/development/libraries/ustream-ssl/default.nix +++ b/pkgs/development/libraries/ustream-ssl/default.nix @@ -1,4 +1,12 @@ -{ stdenv, lib, fetchgit, cmake, pkg-config, libubox-nossl, ssl_implementation }: +{ stdenv +, lib +, fetchgit +, cmake +, pkg-config +, libubox-nossl +, ssl_implementation +, additional_buildInputs ? [ ] +}: stdenv.mkDerivation { pname = "ustream-ssl"; @@ -21,7 +29,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-D${lib.toUpper ssl_implementation.pname}=ON" ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ssl_implementation ]; + buildInputs = [ ssl_implementation ] ++ additional_buildInputs; passthru = { inherit ssl_implementation; diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index 764f991c4467c..1ca767d98cb62 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -2,26 +2,18 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.2.5"; + version = "4.0.3"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-cWiGggn2GP25K/8eopvnFPq6iwcBteNI3i9Lo1Sr+ig="; + hash = "sha256-oUr476HMBYzX64x28Kcudw0B1BVqLUPVVdRzRe82AOc="; }; - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - nativeBuildInputs = [ cmake ]; - # Tests fail on darwin, probably due to a bug in the test framework: - # https://github.com/nemtrif/utfcpp/issues/84 - doCheck = !stdenv.isDarwin; - meta = with lib; { homepage = "https://github.com/nemtrif/utfcpp"; changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${version}"; diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix index 58d1d35be94f4..68a896d136499 100644 --- a/pkgs/development/libraries/uthenticode/default.nix +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uthenticode"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "trailofbits"; repo = "uthenticode"; rev = "v${version}"; - hash = "sha256-XGKROp+1AJWUjCwMOikh+yvNMGuENJGb/kzJsEOEFeY="; + hash = "sha256-NGVOGXMRlgpSRw56jr63rJc/5/qCmPjtAFa0D21ogd4="; }; cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 7a998b409c2b9..ec16a5d77758e 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -29,15 +29,15 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.74.1"; + version = "0.74.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-IyjD8cmYNQoY4OUTNI6fxYHVfqTnuJrt8R4OPGUEK08="; + url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-pTX7Kpj+qKJEnNGgLMz1GQEx3d/1LnFa/azj/rU26uc="; }; patches = [ @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "vte"; versionPolicy = "odd-unstable"; }; tests = { @@ -133,4 +133,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ astsmtl antono ] ++ teams.gnome.members; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 163cea7565c09..068c1d3d2c2a8 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ vulkan-headers ] - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ]; + ++ lib.optionals stdenv.isLinux [ libX11 libxcb libXrandr wayland ]; cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LunarG Vulkan loader"; homepage = "https://www.lunarg.com"; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; license = licenses.asl20; maintainers = [ maintainers.ralith ]; broken = (version != vulkan-headers.version); diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 8192dded7e4ca..7104f6c3c8516 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.42.2"; + version = "2.42.4"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-VyCqPoYn8bn2MlIYfU3w+CM65x1pexeW6/vlynUL0Rg="; + hash = "sha256-UiiLML2iI3NELOy4b5yaVprY1HaaH5ezUikO2Spn7YY="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 789625f2f9f37..8b4abf7d5d12f 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config @@ -20,6 +21,8 @@ , seatd , vulkan-loader , glslang +, libliftoff +, libdisplay-info , nixosTests , enableXWayland ? true @@ -27,7 +30,7 @@ }: let - generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }: + generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], patches ? [ ], postPatch ? "" }: stdenv.mkDerivation (finalAttrs: { pname = "wlroots"; inherit version; @@ -42,7 +45,7 @@ let inherit hash; }; - postPatch = extraPatch; + inherit patches postPatch; # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; @@ -94,7 +97,7 @@ let # Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots): passthru.tests.tinywl = nixosTests.tinywl; - meta = with lib; { + meta = { description = "A modular Wayland compositor library"; longDescription = '' Pluggable, composable, unopinionated modules for building a Wayland @@ -102,9 +105,9 @@ let ''; inherit (finalAttrs.src.meta) homepage; changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ primeos synthetica rewine ]; }; }); @@ -118,11 +121,28 @@ rec { wlroots_0_16 = generic { version = "0.16.2"; hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ="; - extraPatch = '' + postPatch = '' substituteInPlace backend/drm/meson.build \ --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ ''; }; - wlroots = wlroots_0_16; + wlroots_0_17 = generic { + version = "0.17.0"; + hash = "sha256-VUrnSG4UAAH0cBy15lG0w8RernwegD6lkOdLvWU3a4c="; + extraBuildInputs = [ + hwdata + libliftoff + libdisplay-info + ]; + patches = [ + (fetchpatch { + name = "tinywl-fix-wlroots-dependency-constraint-in-Makefile.patch"; + url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/fe53ec693789afb44c899cad8c2df70c8f9f9023.patch"; + hash = "sha256-wU62hXgmsAyT5j/bWeCFBkvM9cYjUntdCycQt5HAhb8="; + }) + ]; + }; + + wlroots = wlroots_0_17; } diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index d435712474766..60a6e10c8334b 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , Security , autoreconfHook , util-linux @@ -15,23 +14,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wolfssl-${variant}"; - version = "5.6.4"; + version = "5.6.6"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "refs/tags/v${finalAttrs.version}-stable"; - hash = "sha256-a9a3ca4Zb/XTS5YfPJwnXPYbDjmgD8qylhPQg5pjzJM="; + hash = "sha256-HXl8GgngC1J8Dlt7fXBrVRa+IV7thVr+MIpeuf3Khcg="; }; - patches = [ - (fetchpatch { - name = "fix-expected-test-response.patch"; - url = "https://github.com/wolfSSL/wolfssl/commit/ca694938fd053a8557f9f08b1b4265292d8bef65.patch"; - hash = "sha256-ETxszjjEMk0WdYgXHWTxTaWZPpyDs9jdko0jtkjzgwI="; - }) - ]; - postPatch = '' patchShebangs ./scripts # ocsp stapling tests require network access, so skip them diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index c05fcef2557a6..13052747eb5ea 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, curl , gst_all_1 , gtk3 , libGL @@ -14,6 +15,8 @@ , compat28 ? false , compat30 ? true , unicode ? true +, withCurl ? false +, withPrivateFonts ? false , withEGL ? true , withMesa ? !stdenv.isDarwin , withWebKit ? stdenv.isDarwin @@ -59,6 +62,7 @@ stdenv.mkDerivation rec { libXxf86vm xorgproto ] + ++ lib.optional withCurl curl ++ lib.optional withMesa libGLU ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit @@ -85,6 +89,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!withEGL) "--disable-glcanvasegl" ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withCurl "--enable-webrequest" + ++ lib.optional withPrivateFonts "--enable-privatefonts" ++ lib.optional withMesa "--with-opengl" ++ lib.optionals stdenv.isDarwin [ "--with-osx_cocoa" diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index e5ca1fc58edc6..90fe559c3cf41 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,6 +1,10 @@ -{ stdenv, lib, fetchFromGitLab, fetchpatch, nasm +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, nasm , enableShared ? !stdenv.hostPlatform.isStatic - }: +}: stdenv.mkDerivation rec { pname = "x264"; @@ -49,9 +53,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for encoding H264/AVC video streams"; - homepage = "http://www.videolan.org/developers/x264.html"; - license = licenses.gpl2Plus; - platforms = platforms.unix; + homepage = "http://www.videolan.org/developers/x264.html"; + license = licenses.gpl2Plus; + platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ tadeokondrak ]; }; } diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index e760151f216ac..905675c406597 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -117,6 +117,12 @@ stdenv.mkDerivation (finalAttrs: { preCheck = '' # For test_trash_file export HOME=$(mktemp -d) + + # Upstream disables a few tests in CI upstream as they are known to + # be flaky. Let's disable those downstream as hydra exhibits similar + # flakes: + # https://github.com/NixOS/nixpkgs/pull/270085#issuecomment-1840053951 + export TEST_IN_CI=1 ''; passthru = { diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 0a254b109583e..e386851da02c3 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "xerces-c"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "mirror://apache/xerces/c/3/sources/${pname}-${version}.tar.gz"; - sha256 = "sha256-PY7Bx/lOOP7g5Mpa0eHZ2yPL86ELumJva0r6Le2v5as="; + sha256 = "sha256-VFz8zmxOdVIHvR8n4xkkHlDjfAwnJQ8RzaEWAY8e8PU="; }; buildInputs = [ diff --git a/pkgs/development/libraries/xeus/default.nix b/pkgs/development/libraries/xeus/default.nix index 172fd0e73578e..1ea5ec49170d0 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.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "jupyter-xeus"; repo = pname; rev = version; - sha256 = "sha256-kGIVcsgLG6weNfBwgEVTMa8NA9MXSztzi9ML5/gDqAQ="; + sha256 = "sha256-1QaMACLqTWC74V7l2LHLUMN/s/N4kNrE7+Ny1wkbavs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index b1ae52a8c77b1..8a415a4df77c9 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2"; platforms = platforms.unix; license = licenses.asl20; - maintainers = [ maintainers.jammerful ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix index 8b53db0388fe1..3a9a90fbe2bc8 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/development/libraries/xsimd/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "xsimd"; - version = "11.1.0"; + version = "11.2.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; rev = finalAttrs.version; - sha256 = "sha256-l6IRzndjb95hIcFCCm8zmlNHWtKduqy2t/oml/9Xp+w="; + sha256 = "sha256-CzgfxXGZXoJ56dX+mDPsHZC31YudrZXpX2tovh/Vjr0="; }; patches = [ # Ideally, Accelerate/Accelerate.h should be used for this implementation, @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DBUILD_TESTS=${if (finalAttrs.doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" + "-DBUILD_TESTS=${if (finalAttrs.finalPackage.doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" ]; doCheck = true; diff --git a/pkgs/development/libraries/xsimd/disable-exp10-test.patch b/pkgs/development/libraries/xsimd/disable-exp10-test.patch index 62e24e18c6b76..8d2940c3b080b 100644 --- a/pkgs/development/libraries/xsimd/disable-exp10-test.patch +++ b/pkgs/development/libraries/xsimd/disable-exp10-test.patch @@ -4,23 +4,25 @@ Date: Tue Aug 1 13:26:04 2023 +0300 Darwin & Musl: Disable failing exp10 test -diff --git a/test/test_xsimd_api.cpp b/test/test_xsimd_api.cpp -index 84b4b0b..1b29742 100644 --- a/test/test_xsimd_api.cpp +++ b/test/test_xsimd_api.cpp -@@ -515,11 +515,6 @@ struct xsimd_api_float_types_functions +@@ -515,15 +515,6 @@ struct xsimd_api_float_types_functions value_type val(2); CHECK_EQ(extract(xsimd::exp(T(val))), std::exp(val)); } - void test_exp10() - { - value_type val(2); +-#ifdef EMSCRIPTEN +- CHECK_EQ(extract(xsimd::exp10(T(val))), doctest::Approx(std::pow(value_type(10), val))); +-#else - CHECK_EQ(extract(xsimd::exp10(T(val))), std::pow(value_type(10), val)); +-#endif - } void test_exp2() { value_type val(2); -@@ -804,11 +799,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) +@@ -813,11 +804,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) Test.test_exp(); } diff --git a/pkgs/development/libraries/xsimd/disable-polar-test.patch b/pkgs/development/libraries/xsimd/disable-polar-test.patch index cbb7c0313c6d0..91128f43c2d5c 100644 --- a/pkgs/development/libraries/xsimd/disable-polar-test.patch +++ b/pkgs/development/libraries/xsimd/disable-polar-test.patch @@ -4,11 +4,9 @@ Date: Tue Aug 1 13:29:16 2023 +0300 aarch64-Darwin: Disable failing polar test -diff --git a/test/test_xsimd_api.cpp b/test/test_xsimd_api.cpp -index 1b29742..03c6b4b 100644 --- a/test/test_xsimd_api.cpp +++ b/test/test_xsimd_api.cpp -@@ -652,12 +652,6 @@ struct xsimd_api_float_types_functions +@@ -661,17 +661,6 @@ struct xsimd_api_float_types_functions value_type val1(4); CHECK_EQ(extract(xsimd::nextafter(T(val0), T(val1))), std::nextafter(val0, val1)); } @@ -16,12 +14,17 @@ index 1b29742..03c6b4b 100644 - { - value_type val0(3); - value_type val1(4); +-#ifndef EMSCRIPTEN - CHECK_EQ(extract(xsimd::polar(T(val0), T(val1))), std::polar(val0, val1)); +-#else +- CHECK_EQ(std::real(extract(xsimd::polar(T(val0), T(val1)))), doctest::Approx(std::real(std::polar(val0, val1)))); +- CHECK_EQ(std::imag(extract(xsimd::polar(T(val0), T(val1)))), doctest::Approx(std::imag(std::polar(val0, val1)))); +-#endif - } void test_pow() { value_type val0(2); -@@ -912,11 +906,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) +@@ -931,11 +920,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) Test.test_nextafter(); } diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/development/libraries/xtensor/default.nix index bb01b7f875ea4..678f87af74cfa 100644 --- a/pkgs/development/libraries/xtensor/default.nix +++ b/pkgs/development/libraries/xtensor/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = let cmakeBool = x: if x then "ON" else "OFF"; in [ - "-DBUILD_TESTS=${cmakeBool finalAttrs.doCheck}" + "-DBUILD_TESTS=${cmakeBool finalAttrs.finalPackage.doCheck}" "-DXTENSOR_ENABLE_ASSERT=${cmakeBool enableAssertions}" "-DXTENSOR_CHECK_DIMENSION=${cmakeBool enableBoundChecks}" ]; diff --git a/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch b/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch deleted file mode 100644 index cd51d17b15005..0000000000000 --- a/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/meson.build b/meson.build -index 1c6b32d..aa7dd25 100644 ---- a/meson.build -+++ b/meson.build -@@ -58,10 +58,10 @@ endif - - # argp-standalone dependency (if required) - if build_machine.system() == 'windows' or build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}') -- if fs.is_dir(join_paths([get_option('prefix'), 'include'])) -- inc += include_directories(join_paths([get_option('prefix'), 'include'])) -+ argplib = cc.find_library('argp', has_headers : ['argp.h'], required: false) -+ if not argplib.found() -+ argplib = dependency('argp-standalone') - endif -- argplib = cc.find_library('argp', dirs : join_paths([get_option('prefix'), 'lib'])) - else - argplib = dependency('', required : false) - endif diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index 2d83211ac0d6c..dd35961d085f0 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-wmbnkxJHFyqntULxzXF16lt+TfwywLdZamQXvcfSFVM="; + hash = "sha256-GiZM8Jh+v0US8xr90rySY0Ud3eAAl8UqLi162zDR3qw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 6a0e173db3a90..2a4119e0fe225 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional enableDrafts "-DENABLE_DRAFTS=ON"; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + meta = with lib; { branch = "4"; homepage = "http://www.zeromq.org"; diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/development/libraries/zint/default.nix index 69ec64ada9d20..8ba4a68e4b82d 100644 --- a/pkgs/development/libraries/zint/default.nix +++ b/pkgs/development/libraries/zint/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "zint"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "zint"; repo = "zint"; rev = version; - hash = "sha256-Ay6smir6zUpadmw1WpU+F7e9t7Gk3JNVtf2VVu92bDk="; + hash = "sha256-/ILq/7A8Lffe2NuiABiV3KeYXapuL1SO55Qk3wXfC/8="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index e67b8ee336ed6..4baa18b9d46f4 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.2.16"; + version = "1.2.17"; pname = "zlog"; src = fetchFromGitHub { owner = "HardySimpson"; repo = pname; rev = version; - sha256 = "sha256-wpaMbFKSwTIFe3p65pMJ6Pf2qKp1uYZCyyinGU4AxrQ="; + sha256 = "sha256-ckpDMRLxObpl8N539DC5u2bPpmD7jM+KugurUfta6tg="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/development/lisp-modules-new-obsolete/patches/qtools-use-nix-libs.patch b/pkgs/development/lisp-modules-new-obsolete/patches/qtools-use-nix-libs.patch deleted file mode 100644 index b380894b04a83..0000000000000 --- a/pkgs/development/lisp-modules-new-obsolete/patches/qtools-use-nix-libs.patch +++ /dev/null @@ -1,19 +0,0 @@ -Dont use the qt+libs system for managing Qt dependencies, because Nix provides -them already. -Don't build the deploy.lisp helper file, because Nix also can handle deployment. ---- a/qtools.asd -+++ b/qtools.asd -@@ -33,10 +33,9 @@ - (:file "generate") - (:file "dynamic") - (:file "precompile") -- (:file "deploy") - (:file "fast-call") - (:file "documentation")) -- :depends-on (:qt+libs -+ :depends-on (:qt - :deploy - :cl-ppcre - :closer-mop - -Diff finished. Sun Oct 2 14:38:06 2022 \ No newline at end of file diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 90e36dc882cdc..afb2d834579ab 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -224,21 +224,21 @@ let version = "0.5.4"; src = pkgs.fetchgit { - url = "https://notabug.org/cage/cl-colors2"; - rev = "refs/tags/v0.5.4"; + url = "https://codeberg.org/cage/cl-colors2"; + rev = "v0.5.4"; sha256 = "sha256-JbT1BKjaXDwdlzHLPjX1eg0RMIOT86R17SPgbe2h+tA="; }; }; - prompter = build-asdf-system { + prompter = build-asdf-system rec { pname = "prompter"; - version = "0.1.0"; + version = "0.1.1"; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "prompter"; - rev = "0.1.0"; - sha256 = "sha256-Duv7L2lMjr3VXsoujQDOMNHCbdUDX4RWoncVm9LDCZE="; + rev = version; + sha256 = "sha256-A9gIUBj0oUDFGR5aqHz+tdNR6t03LPMrx0n9qM3ACwE="; }; lispLibs = [ @@ -256,67 +256,55 @@ let }; - nasdf = build-asdf-system { - pname = "nasdf"; - version = "20230911-git"; - src = pkgs.fetchFromGitHub { - owner = "atlas-engineer"; - repo = "ntemplate"; - rev = "ab7a018f3a67a999c72710644b10b4545130c139"; - sha256 = "sha256-fXGh0h6CXLoBgK1jRxkSNyQVAY1gvi4iyHQBuzueR5Y="; - }; - }; - - njson = build-asdf-system { + njson = build-asdf-system rec { pname = "njson"; - version = "1.1.0"; + version = "1.2.2"; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "njson"; - rev = "1.1.0"; - sha256 = "sha256-hVo5++QCns7Mv3zATpAP3EVz1pbj+jbQmzSLqs6hqQo="; + rev = version; + sha256 = "sha256-kw5DD0GJp/TeCiYATBY8GL8UKqYS6Q4j0a0eQsdcZRc="; }; - lispLibs = [ self.nasdf super.cl-json super.com_dot_inuoe_dot_jzon]; + lispLibs = [ super.cl-json super.com_dot_inuoe_dot_jzon]; systems = [ "njson" "njson/cl-json" "njson/jzon"]; }; - nsymbols = build-asdf-system { + nsymbols = build-asdf-system rec { pname = "nsymbols"; - version = "0.3.1"; + version = "0.3.2"; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nsymbols"; - rev = "0.3.1"; - sha256 = "sha256-KcrE06bG5Khp5/807wb/TbPG3nWTlNWHrDpmK6bm7ZM="; + rev = version; + sha256 = "sha256-psk29WEA7Hxgp29oUniBNvI+lyZfMkdpa5A7okc6kKs="; }; lispLibs = [ super.closer-mop ]; systems = [ "nsymbols" "nsymbols/star" ]; }; - nclasses = build-asdf-system { + nclasses = build-asdf-system rec { pname = "nclasses"; - version = "0.6.0"; + version = "0.6.1"; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nclasses"; - rev = "0.6.0"; - sha256 = "sha256-JupP+TIxavUoyOPnp57FqpEjWfgKspdFoSRnV2rk5U4="; + rev = version; + sha256 = "sha256-foXmaLxMYMFieB2Yd2iPsU4EX5kLXq7kyElqGZ47OgI="; }; - lispLibs = [ self.nasdf super.moptilities ]; + lispLibs = [ super.moptilities ]; }; - nfiles = build-asdf-system { + nfiles = build-asdf-system rec { pname = "nfiles"; - version = "20230705-git"; + version = "1.1.4"; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nfiles"; - rev = "3626e8d512a84efc12479ceb3969d194511757f7"; - sha256 = "sha256-MoJdbTOVfw2rJk4cf/rEnR55BxdXkoqqu9Txd/R9OYQ="; + rev = version; + sha256 = "sha256-4rhpBErQgZHcwZRblxgiYaUmKalvllSbJjnRteDVH6k="; }; lispLibs = [ - self.nasdf self.nclasses super.quri super.alexandria @@ -328,26 +316,26 @@ let ]; }; - nhooks = build-asdf-system { + nhooks = build-asdf-system rec { pname = "nhooks"; - version = "1.2.1"; + version = "1.2.2"; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nhooks"; - rev = "1.2.1"; - hash = "sha256-D61QHxHTceIu5mCGKf3hy53niQMfs0idEYQK1ZYn1YM="; + rev = version; + hash = "sha256-6A3fsemsv2KbTmdGMQeL9iHFUBHc4kK6CRNVyc91LdU="; }; lispLibs = with self; [ bordeaux-threads closer-mop serapeum ]; }; nkeymaps = build-asdf-system rec { pname = "nkeymaps"; - version = "1.1.0"; + version = "1.1.1"; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nkeymaps"; rev = version; - hash = "sha256-ewMu2IgEzCYY72vG91IA7l8X78Ph6jpQvbKeOFZdAyM="; + hash = "sha256-/t85Yh4EvnSyIM6xeDBLmfVz3wddmavInXzeYafNMJ0="; }; lispLibs = with self; [ alexandria fset trivial-package-local-nicknames str ]; @@ -356,18 +344,17 @@ let history-tree = build-asdf-system rec { pname = "history-tree"; - version = "0.1.1"; + version = "0.1.2"; src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "history-tree"; rev = version; - hash = "sha256-lOORalyTybdut/If+dBXS4PlZt2AnZrEI/qjQWS03pk="; + hash = "sha256-wpVONvShNnvrPOlbNoX/t9sYiwxnIKnnJaJyALEyeNg="; }; lispLibs = with self; [ alexandria cl-custom-hash-table local-time - nasdf nclasses trivial-package-local-nicknames ]; @@ -375,7 +362,7 @@ let nyxt-gtk = build-asdf-system { pname = "nyxt"; - version = "3.9.0"; + version = "3.10.0"; lispLibs = (with super; [ alexandria @@ -413,7 +400,6 @@ let plump clss spinneret - slynk trivia trivial-features trivial-garbage @@ -429,8 +415,8 @@ let src = pkgs.fetchFromGitHub { owner = "snmsts"; repo = "trivial-clipboard"; - rev = "6ddf8d5dff8f5c2102af7cd1a1751cbe6408377b"; - sha256 = "sha256-n15IuTkqAAh2c1OfNbZfCAQJbH//QXeH0Bl1/5OpFRM="; + rev = "f7b2c96fea00ca06a83f20b00b7b1971e76e03e7"; + sha256 = "sha256-U6Y9BiM2P1t9P8fdX8WIRQPRWl2v2ZQuKdP1IUqvOAk="; };})) (cl-gobject-introspection.overrideAttrs (final: prev: { src = pkgs.fetchFromGitHub { @@ -447,26 +433,45 @@ let sha256 = "sha256-t/B9CvQTekEEsM/ZEp47Mn6NeZaTYFsTdRqclfX9BNg="; }; })) + (slynk.overrideAttrs (final: prev: { + src = pkgs.fetchFromGitHub { + owner = "joaotavora"; + repo = "sly"; + rev = "9c43bf65b967e12cef1996f1af5f0671d8aecbf4"; + hash = "sha256-YlHZ/7VwvHe2PBPRshN+Gr3WuGK9MpkOJprP6QXI3pY="; + }; + systems = [ "slynk" "slynk/arglists" "slynk/fancy-inspector" + "slynk/package-fu" "slynk/mrepl" "slynk/trace-dialog" + "slynk/profiler" "slynk/stickers" "slynk/indentation" + "slynk/retro" ]; + })) ]) ++ (with self; [ history-tree nhooks nkeymaps - nasdf prompter cl-colors2_0_5_4 njson nsymbols nclasses nfiles - swank cl-containers + (swank.overrideAttrs (final: prev: { + src = pkgs.fetchFromGitHub { + owner = "slime"; + repo = "slime"; + rev = "735258a26bb97e85d25f39e4bef83c1f80c12f5d"; + hash = "sha256-vMMer6qLJDKTwNE3unsOQezujISqFtn2AYl8cxsJvrc="; + }; + systems = [ "swank" "swank/exts" ]; + })) ]); src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "3.9.0"; - sha256 = "sha256-bZoAE0FErgXPylOzh6AfMq3befms9dHms8+slbYdctk="; + rev = "3.10.0"; + sha256 = "sha256-yEa5Lx1egkg9Jh3EQfvaBQicm31uxIq/3s2NOQUC4uc="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; @@ -486,8 +491,14 @@ let # see: https://gitlab.common-lisp.net/asdf/asdf/-/blob/master/doc/asdf.texinfo#L2582 patches = [ ./patches/nyxt-remove-build-operation.patch ]; + NASDF_USE_LOGICAL_PATHS = true; + buildScript = pkgs.writeText "build-nyxt.lisp" '' (load "${super.alexandria.asdfFasl}/asdf.${super.alexandria.faslExt}") + (require :uiop) + (let ((pwd (uiop:ensure-directory-pathname (uiop/os:getcwd)))) + (asdf:load-asd (uiop:merge-pathnames* "libraries/nasdf/nasdf.asd" pwd)) + (asdf:load-asd (uiop:merge-pathnames* "nyxt.asd" pwd))) ;; There's a weird error while copy/pasting in Nyxt that manifests with sb-ext:save-lisp-and-die, so we use asdf:operare :program-op instead (asdf:operate :program-op :nyxt/gi-gtk-application) ''; diff --git a/pkgs/development/lisp-modules/patches/qt-libs-dont-download.patch b/pkgs/development/lisp-modules/patches/qt-libs-dont-download.patch deleted file mode 100644 index 4acf0a9d3dda9..0000000000000 --- a/pkgs/development/lisp-modules/patches/qt-libs-dont-download.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/qt-libs.asd -+++ b/qt-libs.asd -@@ -17,5 +17,4 @@ - :components ((:file "qt-libs")) - :depends-on (:qt-lib-generator - :cl-ppcre -- :cffi) -- :perform (asdf:load-op :after (op c) (uiop:symbol-call :qt-libs :ensure-standalone-libs))) -+ :cffi)) ---- a/qt-libs.lisp -+++ b/qt-libs.lisp -@@ -94,16 +94,14 @@ - standalone-dir) - - (defun %ensure-lib-loaded (file) -- (let ((file (etypecase file -- (pathname file) -- (string (installed-library-file file)))) -- (name (intern (string-upcase (pathname-name file)))) -- #+sbcl(sb-ext:*muffled-warnings* 'style-warning)) -- (cffi::register-foreign-library -- name `((T ,file)) -- :search-path (to-directory file)) -- (unless (cffi:foreign-library-loaded-p name) -- (cffi:load-foreign-library name)))) -+ (let ((name (make-pathname :name (format nil "lib~a" file) -+ :type #+unix "so" -+ #+darwin "dylib"))) -+ (or (find-if (lambda (lib) -+ (equal (cffi:foreign-library-pathname lib) -+ (namestring name))) -+ (cffi:list-foreign-libraries)) -+ (cffi:load-foreign-library name)))) - - (defun ensure-lib-loaded (file) - (cond ((pathnamep file) diff --git a/pkgs/development/lua-modules/aliases.nix b/pkgs/development/lua-modules/aliases.nix index 8f4ed9799c2ce..4f5beb3176113 100644 --- a/pkgs/development/lua-modules/aliases.nix +++ b/pkgs/development/lua-modules/aliases.nix @@ -41,4 +41,6 @@ in mapAliases { lpty = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14 cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18 + nlua-nvim = throw "nlua-nvim was removed, use neodev-nvim instead"; # added 2023-12-16 + nvim-client = throw "nvim-client was removed because it is now part of neovim"; # added 2023-12-17 } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 0bd4d885504e4..27e3c85695fa7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -514,6 +514,39 @@ buildLuarocksPackage { }; }) {}; +fzy = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +buildLuarocksPackage { + pname = "fzy"; + version = "1.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/fzy-1.0-1.rockspec"; + sha256 = "1v050lm3rn1k5wwi2nimlbp1b7j6b8vkwvhc1npyqzj8jv7w9w9n"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/swarn/fzy-lua", + "rev": "2d018a56e3a240bca4b3142a723b2f56392f3e4a", + "date": "2023-01-29T07:05:02-06:00", + "path": "/nix/store/nz19glmy52jbz46wl7xf0jd8m441klf0-fzy-lua", + "sha256": "0xknm5513a6nlariwxgqndf3wj8xals26swjsv06hx133ihna01x", + "hash": "sha256-PQBlYRwjdGjA1pJrIzRVHUk+XLP4dR6zotaoEUqpdnY=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/swarn/fzy-lua"; + description = "A fuzzy string-matching algorithm"; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "MIT"; + }; +}) {}; + gitsigns-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua }: buildLuarocksPackage { pname = "gitsigns.nvim"; @@ -590,6 +623,30 @@ buildLuarocksPackage { }; }) {}; +image-nvim = callPackage( +{ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, magick }: +buildLuarocksPackage { + pname = "image.nvim"; + version = "1.2.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/image.nvim-1.2.0-1.rockspec"; + sha256 = "0732fk2p2v9f72689jms4pdjsx9m7vdi1ib65jfz7q4lv9pdx508"; + }).outPath; + src = fetchzip { + url = "https://github.com/3rd/image.nvim/archive/v1.2.0.zip"; + sha256 = "1v4db60yykjajabmf12zjcg47bb814scjrig0wvn4yc11isinymg"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua magick ]; + + meta = { + homepage = "https://github.com/3rd/image.nvim"; + description = "🖼️ Bringing images to Neovim."; + license.fullName = "MIT"; + }; +}) {}; + inspect = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "inspect"; @@ -2691,6 +2748,29 @@ buildLuarocksPackage { }; }) {}; +nlua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: +buildLuarocksPackage { + pname = "nlua"; + version = "0.1.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/nlua-0.1.0-1.rockspec"; + sha256 = "14ynhy85m2prawym1ap1kplkbicafbczpggzgdnji00frwqa1zvv"; + }).outPath; + src = fetchzip { + url = "https://github.com/mfussenegger/nlua/archive/v0.1.0.zip"; + sha256 = "1x3pbv5ngbk0sjgwfpjsv3x49wzq4x29d9rm0hgyyb2g2mwag3jc"; + }; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/mfussenegger/nlua"; + description = "Neovim as Lua interpreter"; + license.fullName = "GPL-3.0"; + }; +}) {}; + nui-nvim = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "nui.nvim"; @@ -2722,26 +2802,6 @@ buildLuarocksPackage { }; }) {}; -nvim-client = callPackage({ buildLuarocksPackage, coxpcall, fetchurl, lua, luaOlder, luv, mpack }: -buildLuarocksPackage { - pname = "nvim-client"; - version = "0.2.4-1"; - - src = fetchurl { - url = "https://github.com/neovim/lua-client/archive/0.2.4-1.tar.gz"; - sha256 = "0sk1lmj0r7pyj9k3p6n0wqjbd95br44ansz0ck3amp6ql8f9kprf"; - }; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ coxpcall lua luv mpack ]; - - meta = { - homepage = "https://github.com/neovim/lua-client"; - description = "Lua client to Nvim"; - license.fullName = "Apache"; - }; -}) {}; - nvim-cmp = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "nvim-cmp"; @@ -3230,18 +3290,18 @@ buildLuarocksPackage { toml-edit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "toml-edit"; - version = "0.1.4-1"; + version = "0.1.5-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/toml-edit-0.1.4-1.rockspec"; - sha256 = "05bcc1xafcspdf1rcka9bhg7b6z617b4jrcahs1r7grcp78w89vf"; + url = "mirror://luarocks/toml-edit-0.1.5-1.rockspec"; + sha256 = "1xgjh8x44kn24vc29si811zq2a7pr24zqj4w07pys5k6ccnv26qz"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/vhyrro/toml-edit.lua", - "rev": "f6efdab4ca6fab276f172060971781dc42a94f2d", - "date": "2023-10-02T16:54:10+02:00", - "path": "/nix/store/p1368agmqg4jwb1qvf2iff3fdrq9vkdj-toml-edit.lua", - "sha256": "1aa8znjnmm84392gnl7w0hm069xfv7niym3i8my7kyk0vdgxja06", - "hash": "sha256-BijZX9tg+nl8RXFUH+3ZricDKgT8UPtEGgTVaqX9SKk=", + "rev": "34f072d8ff054b3124d9d2efc0263028d7425525", + "date": "2023-12-29T15:53:36+01:00", + "path": "/nix/store/z1gn59hz9ypk3icn3gmafaa19nzx7a1v-toml-edit.lua", + "sha256": "0jzzp4sd48haq1kmh2k85gkygfq39i10kvgjyqffcrv3frdihxvx", + "hash": "sha256-fXcYW3ZjZ+Yc9vLtCUJMA7vn5ytoClhnwAoi0jS5/0s=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index a07b23ff9cd2d..189e3464e81a7 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -76,18 +76,23 @@ rec { /* generate luarocks config - generateLuarocksConfig { - externalDeps = [ { name = "CRYPTO"; dep = pkgs.openssl; } ]; - rocksSubdir = "subdir"; - }; + Example: + generateLuarocksConfig { + externalDeps = [ { name = "CRYPTO"; dep = pkgs.openssl; } ]; + rocksSubdir = "subdir"; + }; + + Type: + generateLuarocksConfig :: AttrSet -> String */ generateLuarocksConfig = { - externalDeps ? [] + externalDeps ? [] # a list of lua derivations , requiredLuaRocks ? [] , extraVariables ? {} , rocksSubdir ? "rocks-subdir" - }: let + , ... + }@args: let rocksTrees = lib.imap0 (i: dep: { name = "dep-${toString i}"; @@ -140,5 +145,7 @@ rec { # Some needed machinery to handle multiple-output external dependencies, # as per https://github.com/luarocks/luarocks/issues/766 variables = (depVariables // extraVariables); - }); + } + // removeAttrs args [ "rocksSubdir" "extraVariables" "requiredLuaRocks" "externalDeps" ] + ); } diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index d6b95eb6593d7..9ea1e6f193489 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -126,6 +126,16 @@ with prev; ''; }); + # Until https://github.com/swarn/fzy-lua/pull/8 is merged, + # we have to invoke busted manually + fzy = prev.fzy.overrideAttrs(oa: { + doCheck = true; + nativeCheckInputs = [ prev.busted ]; + checkPhase = '' + busted test/test.lua + ''; + }); + http = prev.http.overrideAttrs (oa: { patches = [ (fetchpatch { @@ -608,7 +618,7 @@ with prev; cargoDeps = rustPlatform.fetchCargoTarball { src = oa.src; - hash = "sha256-pLAisfnSDoAToQO/kdKTdic6vEug7/WFNtgOfj0bRAE="; + hash = "sha256-gvUqkLOa0WvAK4GcTkufr0lC2BOs2FQ2bgFpB0qa47k="; }; nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; diff --git a/pkgs/development/lua-modules/updater/.flake8 b/pkgs/development/lua-modules/updater/.flake8 new file mode 100644 index 0000000000000..16f76a43624cf --- /dev/null +++ b/pkgs/development/lua-modules/updater/.flake8 @@ -0,0 +1,6 @@ +[flake8] +# E111 => 4 spaces tabs +# don't let spaces else it is not recognized +# E123 buggy +ignore = + E501,E265,E402 diff --git a/pkgs/development/lua-modules/updater/default.nix b/pkgs/development/lua-modules/updater/default.nix index 40c93b21e8318..e556d4d0dec92 100644 --- a/pkgs/development/lua-modules/updater/default.nix +++ b/pkgs/development/lua-modules/updater/default.nix @@ -6,10 +6,24 @@ # , nix-prefetch-git , nix-prefetch-scripts , luarocks-nix +, lua5_1 +, lua5_2 +, lua5_3 +, lua5_4 }: let - path = lib.makeBinPath [ nix nix-prefetch-scripts luarocks-nix ]; + path = lib.makeBinPath [ + nix nix-prefetch-scripts luarocks-nix + ]; + + luaversions = [ + lua5_1 + lua5_2 + lua5_3 + lua5_4 + ]; + in buildPythonApplication { pname = "luarocks-packages-updater"; @@ -34,7 +48,12 @@ buildPythonApplication { cp ${../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py # wrap python scripts - makeWrapperArgs+=( --prefix PATH : "${path}" --prefix PYTHONPATH : "$out/lib" ) + makeWrapperArgs+=( --prefix PATH : "${path}" --prefix PYTHONPATH : "$out/lib" \ + --set LUA_51 ${lua5_1} \ + --set LUA_52 ${lua5_2} \ + --set LUA_53 ${lua5_3} \ + --set LUA_54 ${lua5_4} + ) wrapPythonProgramsIn "$out" ''; diff --git a/pkgs/development/lua-modules/updater/updater.py b/pkgs/development/lua-modules/updater/updater.py index 89a9bd9823a72..3f1d27ab129f1 100755 --- a/pkgs/development/lua-modules/updater/updater.py +++ b/pkgs/development/lua-modules/updater/updater.py @@ -16,6 +16,8 @@ import csv import logging import textwrap from multiprocessing.dummy import Pool +import pluginupdate +from pluginupdate import update_plugins, FetchConfig from typing import List, Tuple, Optional from pathlib import Path @@ -24,8 +26,6 @@ log = logging.getLogger() log.addHandler(logging.StreamHandler()) ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore -import pluginupdate -from pluginupdate import update_plugins, FetchConfig, CleanEnvironment PKG_LIST = "maintainers/scripts/luarocks-packages.csv" TMP_FILE = "$(mktemp)" @@ -171,7 +171,6 @@ def generate_pkg_nix(plug: LuaPlugin): if plug.maintainers: cmd.append(f"--maintainers={plug.maintainers}") - # if plug.server == "src": if plug.src != "": if plug.src is None: msg = ( @@ -193,6 +192,9 @@ def generate_pkg_nix(plug: LuaPlugin): if plug.luaversion: cmd.append(f"--lua-version={plug.luaversion}") + luaver = plug.luaversion.replace('.', '') + if luaver := os.getenv(f"LUA_{luaver}"): + cmd.append(f"--lua-dir={luaver}") log.debug("running %s", " ".join(cmd)) diff --git a/pkgs/development/misc/datafusion/default.nix b/pkgs/development/misc/datafusion/default.nix index 49f33e016ed5b..bcd937a914ead 100644 --- a/pkgs/development/misc/datafusion/default.nix +++ b/pkgs/development/misc/datafusion/default.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "datafusion-cli"; - version = "32.0.0"; + version = "33.0.0"; src = fetchFromGitHub { name = "datafusion-cli-source"; owner = "apache"; repo = "arrow-datafusion"; rev = version; - sha256 = "sha256-QJOv2neEOxLvWoGuS3QyBqGOBi1KJQ8feK6LOrHBL8g="; + sha256 = "sha256-ywyzvk50Fr9TSaCrqd14lSi1PJ9ggA1YQ/X0aFGFk1M="; }; sourceRoot = "${src.name}/datafusion-cli"; - cargoHash = "sha256-NYdxDFUBOBC3nTZB8STdZfOz3Dw0htFCqE0qBRMzQvw="; + cargoHash = "sha256-0a/O9nNi3JLufQxG+5EgCXtV0y03X7R6UY+f/tVGB90="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix index 13c8f8d0424ed..a672bf38b0045 100644 --- a/pkgs/development/misc/h3/default.nix +++ b/pkgs/development/misc/h3/default.nix @@ -2,7 +2,7 @@ , stdenv , cmake , fetchFromGitHub -, static ? stdenv.hostPlatform.isStatic +, withFilters ? false }: let @@ -18,16 +18,19 @@ let inherit hash; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + "-DBUILD_SHARED_LIBS=ON" "-DBUILD_BENCHMARKS=OFF" "-DBUILD_FUZZERS=OFF" "-DBUILD_GENERATORS=OFF" "-DENABLE_COVERAGE=OFF" "-DENABLE_FORMAT=OFF" "-DENABLE_LINTING=OFF" + (lib.cmakeBool "BUILD_FILTERS" withFilters) ]; meta = with lib; { diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix index 6c409a18e7aad..ced9acc27c4ff 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/development/misc/juce/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "juce"; - version = "7.0.7"; + version = "7.0.9"; src = fetchFromGitHub { owner = "juce-framework"; repo = "juce"; rev = finalAttrs.version; - hash = "sha256-r+Wf/skPDexm3rsrVBoWrygKvV9HGlCQd7r0iHr9avM="; + hash = "sha256-k8cNTPH9OgOav4dsSLqrd5PlJ1rqO0PLt6Lwmumc2Gg="; }; patches = [ diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 74e002bdd16f3..e4b3af304fa91 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,16 +1,26 @@ { composeAndroidPackages, stdenv, lib, runtimeShell }: -{ name, app ? null +{ name +, app ? null , platformVersion ? "33" , abiVersion ? "armeabi-v7a" , systemImageType ? "default" -, enableGPU ? false -, extraAVDFiles ? [] +, enableGPU ? false # Enable GPU acceleration. It's deprecated, instead use `configOptions` below. +, configOptions ? ( + # List of options to add in config.ini + lib.optionalAttrs enableGPU + (lib.warn + "enableGPU argument is deprecated and will be removed; use configOptions instead" + { "hw.gpu.enabled" = "yes"; } + ) + ) +, extraAVDFiles ? [ ] , package ? null , activity ? null , androidUserHome ? null , avdHomeDir ? null # Support old variable with non-standard naming! , androidAvdHome ? avdHomeDir -, sdkExtraArgs ? {} +, deviceName ? "device" +, sdkExtraArgs ? { } , androidAvdFlags ? null , androidEmulatorFlags ? null }: @@ -99,27 +109,28 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" # Create a virtual android device for testing if it does not exist - if [ "$(${sdk}/bin/avdmanager list avd | grep 'Name: device')" = "" ] + if [ "$(${sdk}/bin/avdmanager list avd | grep 'Name: ${deviceName}')" = "" ] then # Create a virtual android device - yes "" | ${sdk}/bin/avdmanager create avd --force -n device -k "system-images;android-${platformVersion};${systemImageType};${abiVersion}" -p $ANDROID_AVD_HOME $NIX_ANDROID_AVD_FLAGS + yes "" | ${sdk}/bin/avdmanager create avd --force -n ${deviceName} -k "system-images;android-${platformVersion};${systemImageType};${abiVersion}" -p $ANDROID_AVD_HOME/${deviceName}.avd $NIX_ANDROID_AVD_FLAGS - ${lib.optionalString enableGPU '' - # Enable GPU acceleration - echo "hw.gpu.enabled=yes" >> $ANDROID_AVD_HOME/device.avd/config.ini - ''} + ${builtins.concatStringsSep "\n" ( + lib.mapAttrsToList (configKey: configValue: '' + echo "${configKey} = ${configValue}" >> $ANDROID_AVD_HOME/${deviceName}.avd/config.ini + '') configOptions + )} ${lib.concatMapStrings (extraAVDFile: '' - ln -sf ${extraAVDFile} $ANDROID_AVD_HOME/device.avd + ln -sf ${extraAVDFile} $ANDROID_AVD_HOME/${deviceName}.avd '') extraAVDFiles} fi # Launch the emulator echo "\nLaunch the emulator" - $ANDROID_SDK_ROOT/emulator/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & + $ANDROID_SDK_ROOT/emulator/emulator -avd ${deviceName} -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & # Wait until the device has completely booted - echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2 + echo "Waiting until the emulator has booted the ${deviceName} and the package manager is ready..." >&2 ${sdk}/libexec/android-sdk/platform-tools/adb -s emulator-$port wait-for-device diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix index 4cee79824a6be..3c08887eb5be1 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix @@ -78,6 +78,7 @@ let androidComposition = androidEnv.composeAndroidPackages sdkArgs; androidEmulator = androidEnv.emulateApp { name = "android-sdk-emulator-demo"; + configOptions = { "hw.keyboard" = "yes"; }; sdkExtraArgs = sdkArgs; }; androidSdk = androidComposition.androidsdk; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 97013e58554c1..84e2dfa1289bc 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -120,6 +120,7 @@ mapAliases { reveal-md = pkgs.reveal-md; # added 2023-07-31 inherit (pkgs) rtlcss; # added 2023-08-29 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 + inherit (pkgs) serverless; # Added 2023-11-29 inherit (pkgs) snyk; # Added 2023-08-30 "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02 ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 7b57757a07cc9..8c243736594b3 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -9,7 +9,6 @@ # Packages that provide a single executable. "@angular/cli" = "ng"; - "@antora/cli" = "antora"; "@astrojs/language-server" = "astro-ls"; "@babel/cli" = "babel"; "@commitlint/cli" = "commitlint"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 56b4337509611..df6dc59e3c119 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -213,7 +213,6 @@ , "sass" , "semver" , "serve" -, "serverless" , "shout" , "sloc" , "smartdc" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 294e59cd239db..a7e1580f8d58e 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -91878,711 +91878,6 @@ in bypassCache = true; reconstructLock = true; }; - serverless = nodeEnv.buildNodePackage { - name = "serverless"; - packageName = "serverless"; - version = "3.37.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.37.0.tgz"; - sha512 = "HRYzduFrJTMRVknmoqdmdfZJ0c945h5jhrUf8rTzdBdCoQ2ETMFd6xlHnrAPqsEreR1apAVb0zFSZLwgO7Tigg=="; - }; - 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.454.0" // { - dependencies = [ - sources."uuid-8.3.2" - ]; - }) - sources."@aws-sdk/client-sso-3.451.0" - sources."@aws-sdk/client-sts-3.454.0" - sources."@aws-sdk/core-3.451.0" - sources."@aws-sdk/credential-provider-env-3.451.0" - sources."@aws-sdk/credential-provider-ini-3.451.0" - sources."@aws-sdk/credential-provider-node-3.451.0" - sources."@aws-sdk/credential-provider-process-3.451.0" - sources."@aws-sdk/credential-provider-sso-3.451.0" - sources."@aws-sdk/credential-provider-web-identity-3.451.0" - sources."@aws-sdk/middleware-host-header-3.451.0" - sources."@aws-sdk/middleware-logger-3.451.0" - sources."@aws-sdk/middleware-recursion-detection-3.451.0" - sources."@aws-sdk/middleware-sdk-sts-3.451.0" - sources."@aws-sdk/middleware-signing-3.451.0" - sources."@aws-sdk/middleware-user-agent-3.451.0" - sources."@aws-sdk/region-config-resolver-3.451.0" - sources."@aws-sdk/token-providers-3.451.0" - sources."@aws-sdk/types-3.451.0" - sources."@aws-sdk/util-endpoints-3.451.0" - sources."@aws-sdk/util-locate-window-3.310.0" - sources."@aws-sdk/util-user-agent-browser-3.451.0" - sources."@aws-sdk/util-user-agent-node-3.451.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-7.2.0" // { - dependencies = [ - sources."child-process-ext-3.0.2" - sources."fs-extra-9.1.0" - sources."open-7.4.2" - sources."uuid-8.3.2" - ]; - }) - sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.5.1" // { - dependencies = [ - sources."js-yaml-3.14.1" - ]; - }) - (sources."@serverless/utils-6.15.0" // { - dependencies = [ - sources."jwt-decode-3.1.2" - sources."ms-2.1.3" - sources."uuid-8.3.2" - ]; - }) - sources."@sindresorhus/is-4.6.0" - sources."@smithy/abort-controller-2.0.13" - sources."@smithy/config-resolver-2.0.18" - sources."@smithy/credential-provider-imds-2.1.1" - sources."@smithy/eventstream-codec-2.0.13" - sources."@smithy/fetch-http-handler-2.2.6" - sources."@smithy/hash-node-2.0.15" - sources."@smithy/invalid-dependency-2.0.13" - sources."@smithy/is-array-buffer-2.0.0" - sources."@smithy/middleware-content-length-2.0.15" - sources."@smithy/middleware-endpoint-2.2.0" - (sources."@smithy/middleware-retry-2.0.20" // { - dependencies = [ - sources."uuid-8.3.2" - ]; - }) - sources."@smithy/middleware-serde-2.0.13" - sources."@smithy/middleware-stack-2.0.7" - sources."@smithy/node-config-provider-2.1.5" - sources."@smithy/node-http-handler-2.1.9" - sources."@smithy/property-provider-2.0.14" - sources."@smithy/protocol-http-3.0.9" - sources."@smithy/querystring-builder-2.0.13" - sources."@smithy/querystring-parser-2.0.13" - sources."@smithy/service-error-classification-2.0.6" - sources."@smithy/shared-ini-file-loader-2.2.4" - sources."@smithy/signature-v4-2.0.15" - sources."@smithy/smithy-client-2.1.15" - sources."@smithy/types-2.5.0" - sources."@smithy/url-parser-2.0.13" - sources."@smithy/util-base64-2.0.1" - 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.19" - sources."@smithy/util-defaults-mode-node-2.0.25" - sources."@smithy/util-endpoints-1.0.4" - sources."@smithy/util-hex-encoding-2.0.0" - sources."@smithy/util-middleware-2.0.6" - sources."@smithy/util-retry-2.0.6" - sources."@smithy/util-stream-2.0.20" - sources."@smithy/util-uri-escape-2.0.0" - sources."@smithy/util-utf8-2.0.2" - sources."@smithy/util-waiter-2.0.13" - 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.4" - sources."@types/keyv-3.1.4" - sources."@types/lodash-4.14.202" - sources."@types/node-20.9.3" - sources."@types/responselike-1.0.3" - sources."@types/ws-8.5.10" - sources."abort-controller-3.0.0" - sources."adm-zip-0.5.10" - sources."agent-base-6.0.2" - sources."ajv-8.12.0" - sources."ajv-formats-2.1.1" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."anymatch-3.1.3" - (sources."archive-type-4.0.0" // { - dependencies = [ - sources."file-type-4.4.0" - ]; - }) - (sources."archiver-5.3.2" // { - dependencies = [ - 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" - sources."async-3.2.5" - sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" - sources."available-typed-arrays-1.0.5" - sources."aws-crt-1.19.0" - (sources."aws-sdk-2.1500.0" // { - dependencies = [ - sources."buffer-4.9.2" - sources."ieee754-1.1.13" - sources."querystring-0.2.0" - sources."uuid-8.0.0" - ]; - }) - sources."axios-1.6.2" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."binary-extensions-2.2.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-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.8" - sources."builtin-modules-3.3.0" - sources."builtins-1.0.3" - sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-7.0.4" // { - dependencies = [ - sources."get-stream-5.2.0" - ]; - }) - sources."cachedir-2.4.0" - sources."call-bind-1.0.5" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."chardet-0.7.0" - (sources."child-process-ext-2.1.1" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."path-key-2.0.1" - sources."semver-5.7.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - ]; - }) - sources."chokidar-3.5.3" - sources."chownr-2.0.0" - sources."ci-info-3.9.0" - sources."cli-color-2.0.3" - sources."cli-cursor-3.1.0" - sources."cli-progress-footer-2.3.2" - sources."cli-spinners-2.9.1" - (sources."cli-sprintf-format-1.1.1" // { - dependencies = [ - sources."supports-color-6.1.0" - ]; - }) - sources."cli-width-3.0.0" - sources."clone-1.0.4" - sources."clone-response-1.0.3" - sources."color-convert-2.0.1" - 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.1" - (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" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."cross-spawn-7.0.3" - sources."crypto-js-4.2.0" - (sources."d-1.0.1" // { - dependencies = [ - sources."type-1.2.0" - ]; - }) - sources."dayjs-1.11.10" - sources."debug-4.3.4" - (sources."decompress-4.2.1" // { - dependencies = [ - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - ]; - }) - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - (sources."decompress-tar-4.1.1" // { - dependencies = [ - sources."bl-1.2.3" - sources."file-type-5.2.0" - sources."tar-stream-1.6.2" - ]; - }) - (sources."decompress-tarbz2-4.1.1" // { - dependencies = [ - sources."file-type-6.2.0" - ]; - }) - (sources."decompress-targz-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) - (sources."decompress-unzip-4.0.1" // { - dependencies = [ - sources."file-type-3.9.0" - sources."get-stream-2.3.1" - ]; - }) - sources."defaults-1.0.4" - sources."defer-to-connect-2.0.1" - sources."deferred-0.7.11" - sources."define-data-property-1.1.1" - sources."define-lazy-prop-2.0.0" - sources."delayed-stream-1.0.0" - sources."dezalgo-1.0.4" - 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" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."end-of-stream-1.4.4" - sources."es5-ext-0.10.62" - sources."es6-iterator-2.0.3" - sources."es6-set-0.1.6" - sources."es6-symbol-3.1.3" - sources."es6-weak-map-2.0.3" - sources."escape-string-regexp-1.0.5" - sources."esniff-1.1.0" - sources."esprima-4.0.1" - sources."essentials-1.2.0" - sources."event-emitter-0.3.5" - sources."event-target-shim-5.0.1" - sources."events-1.1.1" - sources."ext-1.7.0" - sources."ext-list-2.2.2" - sources."ext-name-5.0.0" - sources."external-editor-3.1.0" - sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.2" - 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" - sources."figures-3.2.0" - sources."file-type-16.5.4" - sources."filename-reserved-regex-2.0.0" - sources."filenamify-4.3.0" - sources."filesize-10.1.0" - sources."fill-range-7.0.1" - sources."find-requires-1.0.0" - sources."flat-5.0.2" - sources."follow-redirects-1.15.3" - sources."for-each-0.3.3" - sources."form-data-4.0.0" - sources."formidable-2.1.2" - sources."fs-constants-1.0.0" - sources."fs-extra-10.1.0" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."fs.realpath-1.0.0" - sources."fs2-0.3.9" - sources."fsevents-2.3.3" - sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" - sources."get-stdin-8.0.0" - sources."get-stream-6.0.1" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."gopd-1.0.1" - sources."got-11.8.6" - sources."graceful-fs-4.2.11" - sources."graphlib-2.1.8" - sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.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" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."ignore-5.3.0" - sources."immediate-3.0.6" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."inquirer-8.2.6" - sources."is-arguments-1.1.1" - sources."is-binary-path-2.1.0" - sources."is-callable-1.2.7" - 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-natural-number-4.0.1" - sources."is-number-7.0.0" - sources."is-plain-obj-1.1.0" - sources."is-promise-2.2.2" - sources."is-stream-1.1.0" - sources."is-typed-array-1.1.12" - sources."is-unicode-supported-0.1.0" - sources."is-wsl-2.2.0" - sources."isarray-1.0.0" - 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" - ]; - }) - sources."json-buffer-3.0.1" - (sources."json-colorizer-2.2.2" // { - 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."supports-color-5.5.0" - ]; - }) - sources."json-cycle-1.5.0" - (sources."json-refs-3.0.15" // { - dependencies = [ - sources."commander-4.1.1" - sources."js-yaml-3.14.1" - ]; - }) - sources."json-schema-traverse-1.0.0" - sources."jsonfile-6.1.0" - sources."jszip-3.10.1" - sources."jwt-decode-2.2.0" - sources."keyv-4.5.4" - 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" - sources."lodash.difference-4.5.0" - sources."lodash.flatten-4.4.0" - sources."lodash.get-4.4.2" - sources."lodash.isplainobject-4.0.6" - sources."lodash.union-4.6.0" - sources."log-6.3.1" - sources."log-node-8.0.3" - sources."log-symbols-4.1.0" - sources."lowercase-keys-2.0.0" - sources."lru-cache-6.0.0" - sources."lru-queue-0.1.0" - sources."make-dir-4.0.0" - sources."memoizee-0.4.15" - sources."merge2-1.4.1" - sources."methods-1.1.2" - sources."micromatch-4.0.5" - sources."mime-2.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - 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 = [ - sources."minipass-3.3.6" - ]; - }) - 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" - sources."ncjsm-4.3.2" - sources."next-tick-1.1.0" - sources."nice-try-1.0.5" - sources."node-dir-0.1.17" - sources."node-fetch-2.7.0" - sources."node-gyp-build-4.7.0" - 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.13.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-8.4.2" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."p-cancelable-2.1.1" - sources."p-event-4.2.0" - sources."p-finally-1.0.0" - sources."p-timeout-3.2.0" - sources."pako-1.0.11" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-loader-1.0.12" - sources."path-type-4.0.0" - sources."path2-0.1.0" - sources."peek-readable-4.1.0" - sources."pend-1.2.0" - sources."picomatch-2.3.1" - 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" - sources."proxy-from-env-1.1.0" - sources."pump-3.0.0" - sources."punycode-2.3.1" - sources."qs-6.11.2" - sources."querystring-0.2.1" - sources."queue-microtask-1.2.3" - sources."quick-lru-5.1.1" - (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" - sources."minimatch-5.1.6" - ]; - }) - 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" - sources."rxjs-7.8.1" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.2.1" - sources."seek-bzip-1.0.6" - sources."semver-7.5.4" - sources."set-function-length-1.1.1" - sources."setimmediate-1.0.5" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."simple-git-3.21.0" - sources."slash-3.0.0" - sources."sort-keys-1.1.2" - sources."sort-keys-length-1.0.1" - (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.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" // { - 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" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."throat-5.0.0" - sources."through-2.3.8" - sources."timers-ext-0.1.7" - sources."tmp-0.0.33" - sources."to-buffer-1.1.1" - sources."to-regex-range-5.0.1" - sources."token-types-4.2.1" - sources."tr46-0.0.3" - sources."traverse-0.6.7" - sources."trim-repeated-1.0.0" - sources."tslib-2.6.2" - sources."type-2.7.2" - sources."type-fest-0.21.3" - sources."typedarray-0.0.6" - (sources."unbzip2-stream-1.4.3" // { - dependencies = [ - sources."buffer-5.7.1" - ]; - }) - sources."undici-types-5.26.5" - sources."uni-global-1.0.0" - sources."universalify-2.0.1" - sources."untildify-4.0.0" - sources."uri-js-4.4.1" - (sources."url-0.10.3" // { - dependencies = [ - sources."punycode-1.3.2" - sources."querystring-0.2.0" - ]; - }) - sources."utf-8-validate-5.0.10" - sources."util-0.12.5" - sources."util-deprecate-1.0.2" - sources."uuid-9.0.1" - sources."validate-npm-package-name-3.0.0" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-2.0.2" - sources."which-typed-array-1.1.13" - sources."wrap-ansi-6.2.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-4.0.2" - sources."ws-7.5.9" - sources."xml2js-0.5.0" - sources."xmlbuilder-11.0.1" - sources."xtend-4.0.2" - sources."yallist-4.0.0" - sources."yaml-ast-parser-0.0.43" - sources."yamljs-0.3.0" - sources."yauzl-2.10.0" - (sources."zip-stream-4.1.1" // { - dependencies = [ - sources."archiver-utils-3.0.4" - sources."readable-stream-3.6.2" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more"; - homepage = "https://serverless.com/framework/docs/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; shout = nodeEnv.buildNodePackage { name = "shout"; packageName = "shout"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index ad6a9cd1371ec..68f95a2f3b029 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -422,12 +422,61 @@ final: prev: { buildInputs = [ final.node-gyp-build ]; }; - wrangler = prev.wrangler.override (oldAttrs: { - meta = oldAttrs.meta // { broken = before "16.13"; }; - buildInputs = [ pkgs.llvmPackages.libcxx pkgs.llvmPackages.libunwind ] ++ lib.optional stdenv.isLinux pkgs.autoPatchelfHook; - preFixup = '' - # patch elf is trying to patch binary for sunos - rm -r $out/lib/node_modules/wrangler/node_modules/@esbuild/sunos-x64 - ''; - }); + wrangler = prev.wrangler.override (oldAttrs: + let + linuxWorkerd = { + name = "_at_cloudflare_slash_workerd-linux-64"; + packageName = "@cloudflare/workerd-linux-64"; + # Should be same version as workerd + version = "1.20231030.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20231030.0.tgz"; + sha512 = "2HUeRTvoCC17fxE0qdBeR7J9dO8j4A8ZbdcvY8pZxdk+zERU6+N03RTbk/dQMU488PwiDvcC3zZqS4gwLfVT8g=="; + }; + }; + linuxWorkerdArm = { + name = "_at_cloudflare_slash_workerd-linux-arm64"; + packageName = "@cloudflare/workerd-linux-arm64"; + # Should be same version as workerd + version = "1.20231030.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20231030.0.tgz"; + sha512 = "4/GK5zHh+9JbUI6Z5xTCM0ZmpKKHk7vu9thmHjUxtz+o8Ne9DoD7DlDvXQWgMF6XGaTubDWyp3ttn+Qv8jDFuQ=="; + }; + }; + darwinWorkerd = { + name = "_at_cloudflare_slash_workerd-darwin-64"; + packageName = "@cloudflare/workerd-darwin-64"; + # Should be same version as workerd + version = "1.20231030.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20231030.0.tgz"; + sha512 = "0iy34j997llj3jl3l8dipnsyms89qv9nxkza9l2gxmcj6mqwv5m6c8cvgca78qfccl1f5zsrzj855q1fz631p91yydbri2gxgvd10r7"; + }; + }; + darwinWorkerdArm = { + name = "_at_cloudflare_slash_workerd-darwin-arm64"; + packageName = "@cloudflare/workerd-darwin-arm64"; + # Should be same version as workerd + version = "1.20231030.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20231030.0.tgz"; + sha512 = "WSJJjm11Del4hSneiNB7wTXGtBXI4QMCH9l5qf4iT5PAW8cESGcCmdHtWDWDtGAAGcvmLT04KNvmum92vRKKQQ=="; + }; + }; + + in + { + meta = oldAttrs.meta // { broken = before "16.13"; }; + buildInputs = [ pkgs.llvmPackages.libcxx pkgs.llvmPackages.libunwind ] ++ lib.optional stdenv.isLinux pkgs.autoPatchelfHook; + preFixup = '' + # patch elf is trying to patch binary for sunos + rm -r $out/lib/node_modules/wrangler/node_modules/@esbuild/sunos-x64 + ''; + dependencies = oldAttrs.dependencies + ++ lib.optional (stdenv.isLinux && stdenv.isx86_64) linuxWorkerd + ++ lib.optional (stdenv.isLinux && stdenv.isAarch64) linuxWorkerdArm + ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) darwinWorkerd + ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) darwinWorkerdArm; + }); } diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix index ff390c1598bfe..c603d1b21e572 100644 --- a/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -5,7 +5,6 @@ buildDunePackage rec { inherit (angstrom) version src; - duneVersion = "3"; minimalOCamlVersion = "4.04.1"; propagatedBuildInputs = [ angstrom async ]; diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index 063f4c1f80c7c..2742b8515de79 100644 --- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -5,8 +5,6 @@ buildDunePackage rec { inherit (angstrom) version src; - duneVersion = "3"; - propagatedBuildInputs = [ angstrom lwt ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix index 752b6a48ced48..04c380320199c 100644 --- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -5,8 +5,6 @@ buildDunePackage rec { inherit (angstrom) version src; - duneVersion = "3"; - propagatedBuildInputs = [ angstrom ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index c4f5f98e4791b..a96848fba08f3 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,9 +1,8 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, result, bigstringaf, ppx_let, gitUpdater }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, bigstringaf, ppx_let, gitUpdater }: buildDunePackage rec { pname = "angstrom"; - version = "0.15.0"; - duneVersion = "3"; + version = "0.16.0"; minimalOCamlVersion = "4.04"; @@ -11,12 +10,12 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh"; + hash = "sha256-vilGto5ciyKzVJd72z4B+AvM1nf3x3O7DHXrK5SIajQ="; }; checkInputs = [ alcotest ppx_let ]; buildInputs = [ ocaml-syntax-shims ]; - propagatedBuildInputs = [ bigstringaf result ]; + propagatedBuildInputs = [ bigstringaf ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 16d9e7c50fb76..6b9cff2143c95 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -4,13 +4,15 @@ buildDunePackage rec { pname = "batteries"; - version = "3.7.1"; + version = "3.7.2"; + + minimalOCamlVersion = "4.05"; src = fetchFromGitHub { owner = "ocaml-batteries-team"; repo = "batteries-included"; rev = "v${version}"; - hash = "sha256-0ZCaJA9xowO9QxCWcyJ1zhqG7+GNkMYJt62+VPOFj4Y="; + hash = "sha256-POhdb6d4VZyCm9QYgj0m3ejduaBmm+cnd1tshWjgp04="; }; nativeCheckInputs = [ qtest ]; diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index 249635d14bb81..5aaf16c46de53 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -9,8 +9,6 @@ buildDunePackage { src ; - duneVersion = "3"; - buildInputs = [ ppx_sexp_conv ppx_here ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index ada502aaf0cbd..7a7ee238f10bd 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -5,14 +5,13 @@ buildDunePackage rec { pname = "conduit"; - version = "6.2.0"; + version = "6.2.1"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz"; - sha256 = "sha256-PtRAsO3aGyEt12K9skgx85TcoFmF3RtKxPlFgdFFI5Q="; + hash = "sha256-WdXntiQ3vkibC3nOEf+QrATvOcaD5M78qFh6/cL1W7s="; }; propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index cb86ea5f4f06c..81a77f356aff9 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -6,7 +6,6 @@ buildDunePackage { pname = "conduit-lwt-unix"; inherit (conduit-lwt) version src; - duneVersion = "3"; buildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 2ec6f556916d5..641d57db10e39 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -3,7 +3,6 @@ buildDunePackage { pname = "conduit-lwt"; inherit (conduit) version src; - duneVersion = "3"; buildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix index 04025666c3d98..79174261b9eb6 100644 --- a/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -1,5 +1,4 @@ { buildDunePackage, conduit-lwt -, fetchpatch , ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow , mirage-flow-combinators, mirage-random, mirage-time, mirage-clock , dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp @@ -11,12 +10,6 @@ buildDunePackage { inherit (conduit-lwt) version src; - # Compatibility with tls ≥ 0.17 - patches = fetchpatch { - url = "https://github.com/mirage/ocaml-conduit/commit/403b4cec528dae71aded311215868a35c11dad7e.patch"; - hash = "sha256-R/iuLf2PSrx8mLKLueMA3+zr9sB8dX/3evjUbfQECBk="; - }; - nativeBuildInputs = [ ppx_sexp_conv ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index eb9fdd85e68d8..c3e3e5da9f8da 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -2,8 +2,7 @@ buildDunePackage rec { pname = "cryptokit"; - version = "1.18"; - duneVersion = "3"; + version = "1.19"; minimalOCamlVersion = "4.08"; @@ -11,7 +10,7 @@ buildDunePackage rec { owner = "xavierleroy"; repo = "cryptokit"; rev = "release${lib.replaceStrings ["."] [""] version}"; - hash = "sha256-8ae8hroCSkp4O5vM/qVOhAnnJJ+uygMYm3ix5ytwtHU="; + hash = "sha256-8RRAPFgL2pqKotc1I3fIB9q2cNi46SP8pt+0rZM+QUc="; }; # dont do autotools configuration, but do trigger findlib's preConfigure hook diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 5be5f09d19655..fac5789dcdd1a 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,15 +1,11 @@ -{ stdenv +{ buildDunePackage , lib , fetchFromGitHub , which , ocsigen_server -, ocaml , lwt_react -, opaline -, ocamlbuild , ppx_deriving , ppx_optcomp -, findlib , js_of_ocaml-ocamlbuild , js_of_ocaml-ppx , js_of_ocaml-ppx_deriving_json @@ -20,23 +16,19 @@ , ocsipersist }: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "eliom"; - version = "10.1.0"; + version = "10.1.2"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - hash = "sha256-nzrLl8adaRW6c+IQfJ7s+7KtFT8uU27Umyrv0aWXuxw="; + hash = "sha256-Cxwp534ADUO7AHnxZnGsrqxGDkhcJ314M5wytO4e8/0="; }; nativeBuildInputs = [ - ocaml which - findlib - opaline - ocamlbuild ]; buildInputs = [ js_of_ocaml-ocamlbuild @@ -58,12 +50,6 @@ stdenv.mkDerivation rec { strictDeps = true; - installPhase = '' - runHook preInstall - opaline -prefix $out -libdir $OCAMLFIND_DESTDIR - runHook postInstall - ''; - setupHook = [ ./setup-hook.sh ]; meta = { diff --git a/pkgs/development/ocaml-modules/expat/unittest.patch b/pkgs/development/ocaml-modules/expat/unittest.patch deleted file mode 100644 index 489b745c503ae..0000000000000 --- a/pkgs/development/ocaml-modules/expat/unittest.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- old/Makefile 2005-03-13 09:00:29.000000000 -0500 -+++ new/Makefile 2010-08-26 14:20:34.515785557 -0400 -@@ -67,10 +67,10 @@ - testall: test testopt - .PHONY: test - test: unittest -- ./unittest -+ LD_LIBRARY_PATH=. ./unittest - .PHONY: testopt - testopt: unittest.opt -- ./unittest.opt -+ LD_LIBRARY_PATH=. ./unittest.opt - unittest: all unittest.ml - $(OCAMLFIND) ocamlc -o unittest -package oUnit -ccopt -L. -linkpkg \ - $(ARCHIVE) unittest.ml diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index c044a03a2574f..ed4230fbd01dd 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -2,14 +2,14 @@ buildDunePackage rec { pname = "fix"; - version = "20220121"; + version = "20230505"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "fix"; rev = version; - sha256 = "sha256-suWkZDLnXEO/4QCGmNuyLFOV0LJsFOMD13gxOcgu6JQ="; + sha256 = "sha256-Xuw4pEPqAbQjSHrpMCNE7Th0mpbNMSxdEdwvH4hu2SM="; }; minimumOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index 1b4eb502b64ac..e126c707285ab 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -1,21 +1,19 @@ -{ lib, fetchurl, buildDunePackage, cmdliner +{ lib, buildDunePackage, cmdliner +, functoria-runtime , rresult, astring, fmt, logs, bos, fpath, emile, uri +, alcotest }: -buildDunePackage rec { +buildDunePackage { pname = "functoria"; - version = "4.3.6"; + inherit (functoria-runtime) version src; minimalOCamlVersion = "4.08"; - src = fetchurl { - url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz"; - hash = "sha256-i/5sZHfxECoKYMdGje+U21GWxJ6dDZreVcQGtbuo4SE="; - }; - propagatedBuildInputs = [ cmdliner rresult astring fmt logs bos fpath emile uri ]; - doCheck = false; + doCheck = true; + checkInputs = [ alcotest functoria-runtime ]; meta = with lib; { description = "A DSL to organize functor applications"; diff --git a/pkgs/development/ocaml-modules/functoria/runtime.nix b/pkgs/development/ocaml-modules/functoria/runtime.nix index 1eb2eec48e440..3ede6096e5080 100644 --- a/pkgs/development/ocaml-modules/functoria/runtime.nix +++ b/pkgs/development/ocaml-modules/functoria/runtime.nix @@ -1,14 +1,21 @@ -{ lib, buildDunePackage, functoria, cmdliner, fmt }: +{ lib, buildDunePackage, fetchurl, cmdliner }: -buildDunePackage { +buildDunePackage rec { pname = "functoria-runtime"; + version = "4.4.1"; - inherit (functoria) version src; + src = fetchurl { + url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-${version}.tbz"; + hash = "sha256-FKCdzrRJVpUrCWqrTiE8l00ZKJOYsvI9mNzJ0ZxDBwg="; + }; + + minimalOCamlVersion = "4.08"; - propagatedBuildInputs = [ cmdliner fmt ]; + propagatedBuildInputs = [ cmdliner ]; meta = with lib; { - inherit (functoria.meta) homepage license; + homepage = "https://github.com/mirage/functoria"; + license = licenses.isc; description = "Runtime support library for functoria-generated code"; maintainers = [ maintainers.sternenseemann ]; }; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 5e1a0461abb13..c3f27a3c7b977 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -8,14 +8,13 @@ buildDunePackage rec { pname = "git"; - version = "3.13.0"; + version = "3.14.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - hash = "sha256-98w2Amze/B+YN/ENfSb0V8I2yyFUf8rSEOcUg1YbVdM="; + hash = "sha256-u1Nq8zo2YfAnRXib+IqYV0sWOGraqxrJC33NdDQaYsE="; }; # remove changelog for the carton package diff --git a/pkgs/development/ocaml-modules/git/mirage.nix b/pkgs/development/ocaml-modules/git/mirage.nix index 28ce7c4a3f301..ad5a399bda632 100644 --- a/pkgs/development/ocaml-modules/git/mirage.nix +++ b/pkgs/development/ocaml-modules/git/mirage.nix @@ -44,7 +44,6 @@ buildDunePackage { inherit (git) version src; minimalOCamlVersion = "4.08"; - duneVersion = "3"; buildInputs = [ dns diff --git a/pkgs/development/ocaml-modules/git/paf.nix b/pkgs/development/ocaml-modules/git/paf.nix index 99f0175f0f402..4806909962c09 100644 --- a/pkgs/development/ocaml-modules/git/paf.nix +++ b/pkgs/development/ocaml-modules/git/paf.nix @@ -26,7 +26,6 @@ buildDunePackage { inherit (git) version src; minimalOCamlVersion = "4.08"; - duneVersion = "3"; propagatedBuildInputs = [ git diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index 1079f554731df..28bfb40cf8cbc 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -15,7 +15,6 @@ buildDunePackage { inherit (git) version src; minimalOCamlVersion = "4.08"; - duneVersion = "3"; buildInputs = [ awa diff --git a/pkgs/development/ocaml-modules/gluten/default.nix b/pkgs/development/ocaml-modules/gluten/default.nix index d0f41d2026898..5c55f2f09bfd1 100644 --- a/pkgs/development/ocaml-modules/gluten/default.nix +++ b/pkgs/development/ocaml-modules/gluten/default.nix @@ -3,25 +3,22 @@ , faraday , fetchurl , lib -, ke }: buildDunePackage rec { pname = "gluten"; - version = "0.3.0"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz"; - hash = "sha256-9jctX3G/nQJTGJ7ClSBEiXwxeu0GcT9N+EmPfLuSFOU="; + hash = "sha256-mGKbbQSPMOumUCtxrAdoBt5y2RrkAf58spkUymTYhYM="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; propagatedBuildInputs = [ bigstringaf faraday - ke ]; doCheck = false; # No tests diff --git a/pkgs/development/ocaml-modules/gluten/eio.nix b/pkgs/development/ocaml-modules/gluten/eio.nix new file mode 100644 index 0000000000000..9c78b1d73cd4c --- /dev/null +++ b/pkgs/development/ocaml-modules/gluten/eio.nix @@ -0,0 +1,12 @@ +{ lib, buildDunePackage, gluten, eio }: + +buildDunePackage { + pname = "gluten-eio"; + inherit (gluten) src version; + + propagatedBuildInputs = [ gluten eio ]; + + meta = gluten.meta // { + description = "EIO runtime for gluten"; + }; +} diff --git a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix index cec427c3ad618..c3a360322a14a 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt-unix.nix @@ -9,8 +9,6 @@ buildDunePackage rec { pname = "gluten-lwt-unix"; inherit (gluten) doCheck meta src version; - duneVersion = "3"; - propagatedBuildInputs = [ faraday-lwt-unix gluten-lwt diff --git a/pkgs/development/ocaml-modules/gluten/lwt.nix b/pkgs/development/ocaml-modules/gluten/lwt.nix index cfa736c4bc99d..e4cfb0d8db02a 100644 --- a/pkgs/development/ocaml-modules/gluten/lwt.nix +++ b/pkgs/development/ocaml-modules/gluten/lwt.nix @@ -7,8 +7,6 @@ buildDunePackage rec { pname = "gluten-lwt"; inherit (gluten) doCheck meta src version; - duneVersion = "3"; - propagatedBuildInputs = [ gluten lwt diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix index 48dd8817a5656..27791d6aa5f3a 100644 --- a/pkgs/development/ocaml-modules/gsl/default.nix +++ b/pkgs/development/ocaml-modules/gsl/default.nix @@ -1,11 +1,8 @@ -{ lib, stdenv, ocaml, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: - -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "gsl is not available for OCaml ${ocaml.version}" +{ lib, stdenv, fetchFromGitHub, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: buildDunePackage rec { pname = "gsl"; - version = "1.24.3"; + version = "1.25.0"; minimalOCamlVersion = "4.12"; @@ -13,32 +10,9 @@ buildDunePackage rec { owner = "mmottl"; repo = "gsl-ocaml"; rev = version; - hash = "sha256-I+u7lFEredt8ZLiba8x904eTgSUdZq82/e82B+/GIlo="; + hash = "sha256-vxXv0ZcToXmdYu5k0aLdV3seNn3Y6Sgg+8dpy3Iw68I="; }; - patches = [ - # Switched to Dune lang 2.7 - (fetchpatch { - url = "https://github.com/mmottl/gsl-ocaml/commit/be0f6933f16fea6d6fb2e39178816974be4c3724.patch"; - sha256 = "sha256-G/4JT8XPYw+oNJEwJ9zRdUBwtNUHL+T8/htCb3qfuT8="; - }) - # Fix dune rules - (fetchpatch { - url = "https://github.com/mmottl/gsl-ocaml/commit/0b38a22d9813de27eab5caafafeabd945f298b5e.patch"; - sha256 = "sha256-S6OUDase2kR7V6fizaev5huqEAIM5QOkx3n18rj4y3w="; - }) - # Updated opam file - (fetchpatch { - url = "https://github.com/mmottl/gsl-ocaml/commit/b749455b76501c9e3623e05d659565eab7292602.patch"; - sha256 = "sha256-/GACjI3cRCApyGyk1kQp0rB/Hae8DIR9zs6q9KiS1ZQ="; - }) - # Used new OCaml 4.12 C-macros - (fetchpatch { - url = "https://github.com/mmottl/gsl-ocaml/commit/cca79ea56a7ee83a4c67b432decdaef3de8c9d30.patch"; - sha256 = "sha256-bsIKkvj9W8oAYSvP6ZfbqSgt5fSirc780O08WBhVRmI="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator gsl ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix index 1a8d0c5d6395a..5ec66ae9235ef 100644 --- a/pkgs/development/ocaml-modules/h2/default.nix +++ b/pkgs/development/ocaml-modules/h2/default.nix @@ -30,9 +30,6 @@ buildDunePackage rec { src ; - duneVersion = "3"; - minimalOCamlVersion = "4.06"; - propagatedBuildInputs = [ angstrom faraday @@ -42,8 +39,7 @@ buildDunePackage rec { httpaf ]; - # Tests fail with ≤ 4.07 - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; preCheck = '' ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case ''; diff --git a/pkgs/development/ocaml-modules/hpack/default.nix b/pkgs/development/ocaml-modules/hpack/default.nix index 20a0456d7449e..3b8057bf81c8b 100644 --- a/pkgs/development/ocaml-modules/hpack/default.nix +++ b/pkgs/development/ocaml-modules/hpack/default.nix @@ -7,14 +7,13 @@ buildDunePackage rec { pname = "hpack"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz"; - hash = "sha256-n9avpVL6HD2KBON2FpnUeuH3HOUDOA29iSmjdcxMRvE="; + hash = "sha256-GdXwazlgDurjzy7ekLpuMkCii8W+F/jl/IBv/WTHgFM="; }; - duneVersion = "3"; minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix index f262d51ee7dcc..6dce28fb20202 100644 --- a/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/pkgs/development/ocaml-modules/httpaf/default.nix @@ -1,12 +1,11 @@ { lib, fetchFromGitHub, fetchpatch, buildDunePackage -, angstrom, faraday, alcotest +, angstrom, faraday, result, alcotest }: buildDunePackage rec { pname = "httpaf"; version = "0.7.1"; - duneVersion = "3"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { @@ -17,7 +16,7 @@ buildDunePackage rec { }; checkInputs = [ alcotest ]; - propagatedBuildInputs = [ angstrom faraday ]; + propagatedBuildInputs = [ angstrom faraday result ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index 2dce9320afd4c..c0ba327dd2fc0 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -4,14 +4,14 @@ }: buildDunePackage rec { - version = "2.4.1"; + version = "2.5"; pname = "inotify"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-inotify"; rev = "v${version}"; - hash = "sha256-2ATFF3HeATjhWgW4dG4jheQ9m1oE8xTQ7mpMT/1Jdp8="; + hash = "sha256-3Ju6l6aF5eJgIZJKO0lQGXjjGDzCdX2fuwyNSAjIyAs="; }; buildInputs = [ lwt ]; diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 167f3739d2693..109e51ee6f919 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "iter"; - version = "1.7"; + version = "1.8"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/c-cube/iter/releases/download/v${version}/iter-${version}.tbz"; - hash = "sha256-vtcSnPMxpBwDve1zsR6cEnUsyu3JELPt2Kwu4OEEtzA="; + hash = "sha256-+HOcoFrpxLqKogwNQZfnRAnytlmhfxJzDUKvH9n0MCM="; }; doCheck = true; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix index 061fed447466e..c1b2ed2a91394 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.16" }: +{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.16.0" }: { pname , version ? defaultVersion diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 5675e10dbad1f..fbe2d71fcd008 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - preConfigure = "patchShebangs ./configure.sh"; - configureScript = "./configure.sh"; dontAddPrefix = "true"; dontAddStaticConfigureFlags = true; diff --git a/pkgs/development/ocaml-modules/kqueue/default.nix b/pkgs/development/ocaml-modules/kqueue/default.nix new file mode 100644 index 0000000000000..6666d58cfb1f1 --- /dev/null +++ b/pkgs/development/ocaml-modules/kqueue/default.nix @@ -0,0 +1,39 @@ +{ buildDunePackage +, dune-configurator +, lib +, fetchurl +, ppx_expect +, ppx_optcomp +}: + +buildDunePackage rec { + pname = "kqueue"; + version = "0.3.0"; + + minimalOCamlVersion = "4.12"; + + src = fetchurl { + url = "https://github.com/anuragsoni/kqueue-ml/releases/download/${version}/kqueue-${version}.tbz"; + hash = "sha256-MKRCyN6q9euTEgHIhldGGH8FwuLblWYNG+SiCMWBP6Y="; + }; + + buildInputs = [ + dune-configurator + ppx_optcomp + ]; + + checkInputs = [ + ppx_expect + ]; + + doCheck = true; + + meta = { + description = "OCaml bindings for kqueue event notification interface"; + homepage = "https://github.com/anuragsoni/kqueue-ml"; + changelog = "https://github.com/anuragsoni/kqueue-ml/blob/${version}/CHANGES.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sixstring982 ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index a2294822a0cac..2846ff1284516 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -2,8 +2,8 @@ let params = if lib.versionAtLeast ocaml.version "4.08" then { - version = "3.3.1"; - sha256 = "sha256-C124bhdrY+XzL93zzNEbCr+U+7CYBZDm0hlAw+iqat4="; + version = "3.3.2"; + sha256 = "sha256-T2DDpHqLar1sgmju0PLvhAZef5VzOpPWcFVhuZlPQmM="; } else { version = "3.1.0"; sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; diff --git a/pkgs/development/ocaml-modules/minttea/default.nix b/pkgs/development/ocaml-modules/minttea/default.nix new file mode 100644 index 0000000000000..8d81317edd1f3 --- /dev/null +++ b/pkgs/development/ocaml-modules/minttea/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildDunePackage +, fetchurl +, riot +, tty +}: + +buildDunePackage rec { + pname = "minttea"; + version = "0.0.1"; + + minimalOCamlVersion = "5.1"; + + src = fetchurl { + url = "https://github.com/leostera/minttea/releases/download/${version}/minttea-${version}.tbz"; + hash = "sha256-+4nVeYKx2A2i2nll/PbStcEa+Dvxd0T7e/KsdJqY4bI="; + }; + + propagatedBuildInputs = [ + riot + tty + ]; + + doCheck = true; + + meta = { + description = "A fun, functional, and stateful way to build terminal apps in OCaml heavily inspired by Go's BubbleTea"; + homepage = "https://github.com/leostera/minttea"; + changelog = "https://github.com/leostera/minttea/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sixstring982 ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix index 98d96cf146f0b..410475b6b5c00 100644 --- a/pkgs/development/ocaml-modules/mirage/default.nix +++ b/pkgs/development/ocaml-modules/mirage/default.nix @@ -8,7 +8,6 @@ buildDunePackage rec { inherit (mirage-runtime) version src; minimalOCamlVersion = "4.08"; - duneVersion = "3"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index 0b7d929f5a8eb..7e20e3363a473 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchurl, ipaddr, functoria-runtime -, fmt, logs, lwt +, logs, lwt , alcotest }: @@ -8,9 +8,8 @@ buildDunePackage rec { inherit (functoria-runtime) src version; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs lwt ]; + propagatedBuildInputs = [ ipaddr functoria-runtime logs lwt ]; checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix index bbd85889c84d9..16f0242a9bf77 100644 --- a/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ocaml-version"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; - hash = "sha256-AKCaXUehJ3V8uET1tUDDbIzI8lZv5aygxhIbR21xnTI="; + hash = "sha256-XJ0xq71ZiR39phQIULXFDLHoj3HntxLI+v2gR0Bp/rI="; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index d41e7c16ce1b2..7c4f90b6f976d 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,4 +1,5 @@ { lib +, ocaml , buildDunePackage , fetchFromGitHub , ppx_deriving @@ -14,6 +15,9 @@ , printbox-text }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "phylogenetics is not compatible with OCaml ${ocaml.version}" + buildDunePackage rec { pname = "phylogenetics"; version = "unstable-2022-05-06"; @@ -26,7 +30,6 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; nativeCheckInputs = [ bppsuite ]; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/poll/default.nix b/pkgs/development/ocaml-modules/poll/default.nix new file mode 100644 index 0000000000000..ea1e2e1c13d79 --- /dev/null +++ b/pkgs/development/ocaml-modules/poll/default.nix @@ -0,0 +1,43 @@ +{ buildDunePackage +, dune-configurator +, fetchurl +, kqueue +, lib +, ppx_expect +, ppx_optcomp +}: + +buildDunePackage rec { + pname = "poll"; + version = "0.3.1"; + + minimalOCamlVersion = "4.13"; + + src = fetchurl { + url = "https://github.com/anuragsoni/poll/releases/download/${version}/poll-${version}.tbz"; + hash = "sha256-IX6SivK/IMQaGgMgWiIsNgUSMHP6z1E/TSB0miaQ8pw="; + }; + + buildInputs = [ + dune-configurator + ppx_optcomp + ]; + + propagatedBuildInputs = [ + kqueue + ]; + + checkInputs = [ + ppx_expect + ]; + + doCheck = true; + + meta = { + description = "Portable OCaml interface to macOS/Linux/Windows native IO event notification mechanisms"; + homepage = "https://github.com/anuragsoni/poll"; + changelog = "https://github.com/anuragsoni/poll/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sixstring982 ]; + }; +} diff --git a/pkgs/development/ocaml-modules/riot/default.nix b/pkgs/development/ocaml-modules/riot/default.nix index e03ac2c209eda..e830e7034e10b 100644 --- a/pkgs/development/ocaml-modules/riot/default.nix +++ b/pkgs/development/ocaml-modules/riot/default.nix @@ -4,24 +4,26 @@ , fetchurl , iomux , ptime +, telemetry , uri }: buildDunePackage rec { pname = "riot"; - version = "0.0.2"; + version = "0.0.5"; minimalOCamlVersion = "5.1"; src = fetchurl { url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz"; - hash = "sha256-ck/tr5o0nKF4WNgjPODHg1/tlaKv1JtuYgqYfIIZ78Q="; + hash = "sha256-Abe4LMxlaxK3MVlg2d8X60aCuPGvaOn+4zFx/uH5z4g="; }; propagatedBuildInputs = [ bigstringaf iomux ptime + telemetry uri ]; diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index a5d042fc1907e..ab21f11fa31f0 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -29,8 +29,6 @@ stdenv.mkDerivation { createFindlibDestdir = true; - preConfigure = "patchShebangs ./configure.sh"; - configureScript = "./configure.sh"; dontAddPrefix = "true"; dontAddStaticConfigureFlags = true; diff --git a/pkgs/development/ocaml-modules/telemetry/default.nix b/pkgs/development/ocaml-modules/telemetry/default.nix new file mode 100644 index 0000000000000..85d6e067f60f8 --- /dev/null +++ b/pkgs/development/ocaml-modules/telemetry/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "telemetry"; + version = "0.0.1"; + + minimalOCamlVersion = "4.12"; + + src = fetchurl { + url = "https://github.com/leostera/telemetry/releases/download/${version}/telemetry-${version}.tbz"; + hash = "sha256-YEf7zC/F2zJBtQNfyJ2OznKmoFo1Ms9O2WgiOFkhp28="; + }; + + doCheck = true; + + meta = { + description = "A lightweight library for dispatching and handling events, with a focus on metrics and instrumentation"; + homepage = "https://github.com/leostera/telemetry"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/tty/default.nix b/pkgs/development/ocaml-modules/tty/default.nix new file mode 100644 index 0000000000000..8c5c1b47524af --- /dev/null +++ b/pkgs/development/ocaml-modules/tty/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildDunePackage +, fetchurl +, uutf +}: + +buildDunePackage rec { + pname = "tty"; + version = "0.0.2"; + + minimalOCamlVersion = "5.1"; + + src = fetchurl { + url = "https://github.com/leostera/tty/releases/download/${version}/tty-${version}.tbz"; + hash = "sha256-eeD5Y+/QXZzFoEHvOSZj2Q74V8BK5j3Lu3Zsrj2YUUs="; + }; + + propagatedBuildInputs = [ + uutf + ]; + + doCheck = true; + + meta = { + description = "A library for interacting with teletype and terminal emulators"; + homepage = "https://github.com/leostera/tty"; + changelog = "https://github.com/leostera/tty/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sixstring982 ]; + }; +} diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 38a920ae865cc..c8600cf52b168 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "yojson"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - hash = "sha256-1YGDIHsZjcBlhmI5Bm4HTDT54TnA2cQXWjiAl5DogXM="; + hash = "sha256-WfLxq7/Ip8y9v2CIlOXHXop2AG40iZJURG+D4gDftPk="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/octave-modules/dicom/default.nix b/pkgs/development/octave-modules/dicom/default.nix index e8f02deff5468..30d63eebe36d2 100644 --- a/pkgs/development/octave-modules/dicom/default.nix +++ b/pkgs/development/octave-modules/dicom/default.nix @@ -7,11 +7,11 @@ buildOctavePackage rec { pname = "dicom"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-0qNqjpJWWBA0N5IgjV0e0SPQlCvbzIwnIgaWo+2wKw0="; + sha256 = "sha256-CFspqPJDSU1Pg+o6dub1/+g+mPDps9sPlus6keDj6h0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/octave-modules/ocl/default.nix b/pkgs/development/octave-modules/ocl/default.nix index 6c6d306abd1d5..eb20f7dc7c771 100644 --- a/pkgs/development/octave-modules/ocl/default.nix +++ b/pkgs/development/octave-modules/ocl/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "ocl"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-NVUefSGv5/l1B7sES7NG1gU8Ms2gfmb8OGxQrhzWlus="; + sha256 = "sha256-ErVMfYkWcdS+UqUH7q7gNQXQwAjrcyiUkWxagAKj3w0="; }; meta = with lib; { diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 737ef933a8f4e..9aec7d6607630 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -13,13 +13,6 @@ in buildPecl { sha256 = "sha256-UDKLLCCnYJj/lCD8ZkkDf2WYZMoIbcP75+0/IXo4vdQ="; }; - patches = lib.optionals (lib.versionAtLeast php.version "8.3") [ - (fetchpatch { - url = "https://github.com/krakjoe/apcu/commit/c9a29161c68c0faf71046e8f03f6a90900023ded.patch"; - hash = "sha256-B0ZKk9TJy2+sYGs7TEX2KxUiOVawIb+RXNgToU1Fz5I="; - }) - ]; - buildInputs = [ pcre2 ]; doCheck = true; checkTarget = "test"; @@ -30,8 +23,8 @@ in buildPecl { meta = with lib; { changelog = "https://github.com/krakjoe/apcu/releases/tag/v${version}"; description = "Userland cache for PHP"; - license = licenses.php301; homepage = "https://pecl.php.net/package/APCu"; + license = licenses.php301; maintainers = teams.php.members; }; } diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index fec3b438abbe3..d504d73397c84 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -1,17 +1,17 @@ -{ lib, php, fetchFromGitHub }: +{ lib, php82, fetchFromGitHub }: -php.buildComposerProject (finalAttrs: { +php82.buildComposerProject (finalAttrs: { pname = "box"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "box-project"; repo = "box"; rev = finalAttrs.version; - hash = "sha256-6icHXRxqre2RBIRoc3zfQnxGRHh2kIen2oLJ3eQjD/0="; + hash = "sha256-s3FnpfKWmsLLXwa/xI80NZ1030fB9LcrMVzNWGeFkn4="; }; - vendorHash = "sha256-n/F/il1u+3amSVf8fr0scZSkXuwxW43iq5F2XQJ3xfM="; + vendorHash = "sha256-t1DvlcgTSq4n8xVUMcEIfs5ZAq9XIqL3qUqabheVVrs="; meta = { changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 40c6dc80fadff..9cfc8683eca55 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -5,7 +5,7 @@ php.buildComposerProject (finalAttrs: { # use together with the version from this package to keep the # bootstrap phar file up-to-date together with the end user composer # package. - passthru.pharHash = "sha256-mhjho6rby5TBuv1sSpj/kx9LQ6RW70hXUTBGbhnwXdY="; + passthru.pharHash = "sha256-cmACAcc8fEshjxwFEbNthTeWPjaq+iRHV/UjCfiFsxQ="; composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { inherit (finalAttrs) version; @@ -13,13 +13,13 @@ php.buildComposerProject (finalAttrs: { }; pname = "composer"; - version = "2.6.5"; + version = "2.6.6"; src = fetchFromGitHub { owner = "composer"; repo = "composer"; rev = finalAttrs.version; - hash = "sha256-CKP7CYOuMKpuWdVveET2iLJPKJyCnv5YVjx4DE68UoE="; + hash = "sha256-KsTZi7dSlQcAxoen9rpofbptVdLYhK+bZeDSXQY7o5M="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -29,13 +29,14 @@ php.buildComposerProject (finalAttrs: { --prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]} ''; - vendorHash = "sha256-SG5RsKaP7zqJY2vjvULuNdf7w6tAGh7/dlxx2Pkfj2A="; + vendorHash = "sha256-50M1yeAKl9KRsjs34cdb5ZTBFgbukgg0cMtHTYGJ/EM="; meta = { changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}"; description = "Dependency Manager for PHP"; homepage = "https://getcomposer.org/"; license = lib.licenses.mit; + mainProgram = "composer"; maintainers = lib.teams.php.members; }; }) diff --git a/pkgs/development/php-packages/datadog_trace/Cargo.lock b/pkgs/development/php-packages/datadog_trace/Cargo.lock index 982fe7ed45184..09b79fb174fe2 100644 --- a/pkgs/development/php-packages/datadog_trace/Cargo.lock +++ b/pkgs/development/php-packages/datadog_trace/Cargo.lock @@ -678,7 +678,7 @@ dependencies = [ [[package]] name = "datadog-php-profiling" -version = "0.94.0" +version = "0.96.0" dependencies = [ "ahash 0.8.3", "anyhow", @@ -702,6 +702,7 @@ dependencies = [ "perfcnt", "rand 0.8.5", "rand_distr", + "serde_json", "uuid", ] diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 8c1c8dab8ea9f..79db3712c999b 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -13,14 +13,14 @@ buildPecl rec { pname = "ddtrace"; - version = "0.94.0"; + version = "0.96.0"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-trace-php"; rev = version; fetchSubmodules = true; - hash = "sha256-1EdA68zynm0M4NJH8kFmrtprUzWpjObarxNigY8viY8="; + hash = "sha256-SXhva2acXIOuru8tTdRt5OU3Pce5eHm6SOn/y7N3ZIs="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/development/php-packages/ds/default.nix b/pkgs/development/php-packages/ds/default.nix index 7cbdfa17f9729..7e37c8a2d3e0f 100644 --- a/pkgs/development/php-packages/ds/default.nix +++ b/pkgs/development/php-packages/ds/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, pcre2, php, fetchFromGitHub }: let - version = "1.4.0"; + version = "1.5.0"; in buildPecl { inherit version; pname = "ds"; @@ -10,7 +10,7 @@ in buildPecl { owner = "php-ds"; repo = "ext-ds"; rev = "v${version}"; - sha256 = "sha256-IqNv2jVW1Hg1hV8H9vEyLT5BWsFkGHR+WlAOHJhlW84="; + sha256 = "sha256-lL1PUjc4bMTsWm2th0wDxnMaGuVziBUtgK88bUJXuBY="; }; buildInputs = [ pcre2 ]; diff --git a/pkgs/development/php-packages/grumphp/composer-json.patch b/pkgs/development/php-packages/grumphp/composer-json.patch deleted file mode 100644 index 7fd7441612cc2..0000000000000 --- a/pkgs/development/php-packages/grumphp/composer-json.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2f53794374e0d32e1f322202c6668655792f745d Mon Sep 17 00:00:00 2001 -From: Pol Dellaiera <pol.dellaiera@protonmail.com> -Date: Sat, 21 Oct 2023 16:46:59 +0200 -Subject: [PATCH] composer.json - ---- - composer.json | 5 +- - 1 file changed, 4 insertion(+), 1 deletion(-) - -diff --git i/composer.json w/composer.json -index 6ac54420..69b75a51 100644 ---- i/composer.json -+++ w/composer.json -@@ -96,7 +96,10 @@ - "bin/grumphp" - ], - "config": { -- "sort-packages": true -+ "sort-packages": true, -+ "platform": { -+ "php": "8.1" -+ } - }, - "extra": { - "class": "GrumPHP\\Composer\\GrumPHPPlugin" --- -2.42.0 diff --git a/pkgs/development/php-packages/grumphp/composer-lock.patch b/pkgs/development/php-packages/grumphp/composer-lock.patch deleted file mode 100644 index 2fc801557c4f8..0000000000000 --- a/pkgs/development/php-packages/grumphp/composer-lock.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2f53794374e0d32e1f322202c6668655792f745d Mon Sep 17 00:00:00 2001 -From: Pol Dellaiera <pol.dellaiera@protonmail.com> -Date: Sat, 21 Oct 2023 16:46:59 +0200 -Subject: [PATCH] composer.lock - ---- - phar.composer.lock | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/phar.composer.lock b/phar.composer.lock -index 96b692c3..a8cb2a87 100644 ---- a/phar.composer.lock -+++ b/phar.composer.lock -@@ -4,7 +4,7 @@ - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], -- "content-hash": "8a069c630e6ddbc4475db9a992430539", -+ "content-hash": "0474062650b24a22c63007631cf35f1e", - "packages": [ - { - "name": "amphp/amp", --- -2.42.0 diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index 6367dd996bf20..4e3795e425e34 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -1,48 +1,27 @@ -{ fetchFromGitHub, stdenvNoCC, lib, php }: +{ fetchFromGitHub +, lib +, php +}: php.buildComposerProject (finalAttrs: { pname = "grumphp"; - version = "2.1.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "phpro"; repo = "grumphp"; rev = "v${finalAttrs.version}"; - hash = "sha256-RVgreCspdz+A6mdE2H4i8ajmdH8AZ9BOIw2OqLw7HfI="; + hash = "sha256-htddnBQ6VkVlZ+d5UYu2kyzrbfACRCZRdYtdGGaZ+FE="; }; - patches = [ - ./composer-json.patch - ]; - - composerLock = stdenvNoCC.mkDerivation (finalComposerLockAttrs: { - name = "grumphp-composer-lock"; - - src = fetchFromGitHub { - owner = "phpro"; - repo = "grumphp-shim"; - rev = "v${finalAttrs.version}"; - hash = "sha256-JxgRd0p/o3ouZ4MPke8cHqvAPuepY8ax0wx4t8+2dME="; - }; - - patches = [ - ./composer-lock.patch - ]; - - installPhase = '' - runHook preInstall - cp phar.composer.lock $out - runHook postInstall - ''; - }); - - vendorHash = "sha256-yefamPAzIabDCzZ9ghKq9iPH7AoCdgCCQ8PKrUN9ifQ="; + vendorHash = "sha256-UJsWZ5dYW8sEft/i122x7bJJ33TVjEp5CU65rW/tHhk="; meta = { changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; description = "A PHP code-quality tool"; homepage = "https://github.com/phpro/grumphp"; license = lib.licenses.mit; + mainProgram = "grumphp"; maintainers = lib.teams.php.members; }; }) diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index 141d3126836b1..80f54c567683f 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, fetchFromGitHub, libmaxminddb }: let pname = "maxminddb"; - version = "1.11.0"; + version = "1.11.1"; in buildPecl { inherit pname version; @@ -10,7 +10,7 @@ buildPecl { owner = "maxmind"; repo = "MaxMind-DB-Reader-php"; rev = "v${version}"; - sha256 = "sha256-Dw1+pYJmZ3U2+rgSOEkx4a6HB8FebSr7YZodOjSipjI="; + sha256 = "sha256-e22HVsD0YstGQiRch0zUUF5CY1zSuFCyU2anK9uGCY4="; }; prePatch = '' @@ -23,6 +23,6 @@ buildPecl { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with licenses; [ asl20 ]; homepage = "https://github.com/maxmind/MaxMind-DB-Reader-php"; - maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; + maintainers = teams.helsinki-systems.members ++ teams.php.members; }; } diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 7adfc3378887d..4402ecda0a8f8 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.2"; + version = "1.17.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-gI1Hd/i3S+lNcXaGG/hBR/cdn3S1fQ6xJ0xtRXo48rI="; + hash = "sha256-7JzFls5cMzlA2aEM7M4+Dg4yIJNzz/vNOXNEITejePk="; fetchSubmodules = true; }; diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index f71b2166c1c44..dd0dd17b244d4 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPecl, valgrind, pcre2, fetchFromGitHub }: let - version = "22.0.0"; + version = "22.1.2"; in buildPecl { inherit version; pname = "openswoole"; @@ -10,7 +10,7 @@ in buildPecl { owner = "openswoole"; repo = "swoole-src"; rev = "v${version}"; - hash = "sha256-4Z7mBNGHXS/giSCmPpSyu9/99MEjCnoXgymDM/s1gk8="; + hash = "sha256-Z26E1PdKypB/MImCHFgA3rJW5LvVaLZsQUxRv0RcFuo="; }; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index 87ea30233f9a5..8001d586f1b01 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.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "phalcon"; repo = "cphalcon"; rev = "v${version}"; - hash = "sha256-svw+cYL5ISKk6jEvdFmLcC4hEzrFw3kIbDJsymt2tEs="; + hash = "sha256-ycE8A3ESV97COTdbjkrOJCZpEmP1l9nkmNnhjJGaBeE="; }; internalDeps = [ php.extensions.session php.extensions.pdo ]; diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix index 936853ab8a116..82beda4ad00b7 100644 --- a/pkgs/development/php-packages/phan/default.nix +++ b/pkgs/development/php-packages/phan/default.nix @@ -9,11 +9,11 @@ let in mkDerivation rec { pname = "phan"; - version = "5.4.2"; + version = "5.4.3"; src = fetchurl { url = "https://github.com/phan/phan/releases/download/${version}/phan.phar"; - hash = "sha256-9fpmsv2ia5ad+QtaicdZ0XpOZw7T5LWhfd2miYfSpWM="; + hash = "sha256-wZU6YIlH0q18iD044y6Z5gSscBn7cI0AwRwZgT/YhOo="; }; dontUnpack = true; diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index df6be72adea8a..5ff2f1f93cb5e 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.40.0"; + version = "3.42.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-9Qoehww0u5FeJwVrn+xBf7f/IgKfIoK7KI1NwOCZH80="; + sha256 = "sha256-ppkkVNAQ0F6DNSxMdvz5E4ZBPqlGNtMDgNC9vTsK6CY="; }; dontUnpack = true; diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index c524b3f2b807c..bd50a614411a4 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -2,14 +2,14 @@ let pname = "phpmd"; - version = "2.14.1"; + version = "2.15.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar"; - sha256 = "sha256-C5VDs0G21EyUVlldg05cbrSYG4/fk01VKE7Eq/zODu8="; + sha256 = "sha256-aijvVd4MdTsHDR0VgLsIoNFGAW+J8O3c72CsT8EINUQ="; }; dontUnpack = true; diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index b6d15066f0553..5463fec0d5411 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -20,6 +20,7 @@ php.buildComposerProject (finalAttrs: { description = "A static analysis tool for finding errors in PHP applications"; homepage = "https://github.com/vimeo/psalm"; license = lib.licenses.mit; + mainProgram = "psalm"; maintainers = lib.teams.php.members; }; }) diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index 39d1edbe0fe1a..d21667aa06221 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { (v: " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}") (with lib.attrsets; [ (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis.1.1.0.dylib" hiredis) - (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" openssl) + (nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" hiredis) (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib" openssl) (nameValuePair "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib" openssl) (nameValuePair "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib" zstd) diff --git a/pkgs/development/php-packages/php-spx/default.nix b/pkgs/development/php-packages/spx/default.nix index 52beeacf3bbee..020927ccf4910 100644 --- a/pkgs/development/php-packages/php-spx/default.nix +++ b/pkgs/development/php-packages/spx/default.nix @@ -4,7 +4,7 @@ let version = "0.4.14"; in buildPecl { inherit version; - pname = "php-spx"; + pname = "spx"; src = fetchFromGitHub { owner = "NoiseByNorthwest"; diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index f5e8f0f7af7af..9ff9b771401c1 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, fetchFromGitHub }: let - version = "3.3.0"; + version = "3.3.1"; in buildPecl { inherit version; @@ -11,7 +11,7 @@ in buildPecl { owner = "xdebug"; repo = "xdebug"; rev = version; - hash = "sha256-i14po+0i25gRR87H6kUdyXF4rXZM70CqXi2EdFBn808="; + hash = "sha256-Zt1BIqNKsTHtIXy0Dar52sZxLi5k12LQAbxOLKQPMN8="; }; doCheck = true; diff --git a/pkgs/development/python-modules/IPy/default.nix b/pkgs/development/python-modules/IPy/default.nix index 5f370e7888d2c..f8291ee8ac5b4 100644 --- a/pkgs/development/python-modules/IPy/default.nix +++ b/pkgs/development/python-modules/IPy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "IPy"; version = "1.01"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix index 7cb150264cf71..a21ddda54c414 100644 --- a/pkgs/development/python-modules/a2wsgi/default.nix +++ b/pkgs/development/python-modules/a2wsgi/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "a2wsgi"; - version = "1.8.0"; + version = "1.9.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-sgQ2uS8z25/xQ2vmS4boLhhwluu10aUt4nlKcNuYFRA="; + hash = "sha256-cd/UGOUbnoI1nrRZx+2hTtg/j0ClD0dKbXNXpnHNPl4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aadict/default.nix b/pkgs/development/python-modules/aadict/default.nix index c124cb7695db1..d6b5bdf9c6f02 100644 --- a/pkgs/development/python-modules/aadict/default.nix +++ b/pkgs/development/python-modules/aadict/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "aadict"; version = "0.2.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix index 0b9f14571781f..460a4a90ee8e3 100644 --- a/pkgs/development/python-modules/aafigure/default.nix +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "aafigure"; version = "0.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/about-time/default.nix b/pkgs/development/python-modules/about-time/default.nix index 3759957c9ca6b..d705bf5a3e15c 100644 --- a/pkgs/development/python-modules/about-time/default.nix +++ b/pkgs/development/python-modules/about-time/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "about-time"; version = "4.2.1"; + format = "setuptools"; # PyPi release does not contain test files, but the repo has no release tags, # so while having no tests is not ideal, follow the PyPi releases for now diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 00846838b25de..a937b016ce897 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "absl-py"; version = "1.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 24ed871c4037a..d607fab5194bb 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -11,6 +11,7 @@ , packaging , psutil , pyyaml +, safetensors , torch , evaluate , parameterized @@ -19,26 +20,18 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.24.1"; - format = "pyproject"; + version = "0.25.0"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DKyFb+4DUMhVUwr+sgF2IaJS9pEj2o2shGYwExfffWg="; + hash = "sha256-WIMOSfo9fGbevMkUHvFsA51SOiGkBO1cK388FudRDY0="; }; - patches = [ - # https://github.com/huggingface/accelerate/pull/2121 - (fetchpatch { - name = "fix-import-error-without-torch_distributed.patch"; - url = "https://github.com/huggingface/accelerate/commit/42048092eabd67a407ea513a62f2acde97079fbc.patch"; - hash = "sha256-9lvnU6z5ZEFc5RVw2bP0cGVyrwAp/pxX4ZgnmCN7qH8="; - }) - ]; - nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ @@ -46,6 +39,7 @@ buildPythonPackage rec { packaging psutil pyyaml + safetensors torch ]; @@ -83,9 +77,6 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ # RuntimeError: torch_shm_manager: execl failed: Permission denied "CheckpointTest" - ] ++ lib.optionals (pythonAtLeast "3.11") [ - # python3.11 not yet supported for torch.compile - "test_dynamo_extract_model" ]; disabledTestPaths = lib.optionals (!(stdenv.isLinux && stdenv.isx86_64)) [ diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index 8b67fa4d9dbc0..6c2906fcb7ee3 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "accupy"; version = "0.3.6"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 0ecae898a6705..9de8f1e06752a 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "acme-tiny"; version = "5.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index 531ed8ae8d9bb..538b8dff964ac 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { inherit (certbot) src version; pname = "acme"; + format = "setuptools"; propagatedBuildInputs = [ cryptography pyasn1 pyopenssl pyRFC3339 pytz requests requests-toolbelt six diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 87e1ef293071f..4aacc5c46b21b 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.10"; + version = "3.11"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-8fvVK/mH+pgPaaxNKvKOw1qU0ElWAmNVP6YAqvBTwio="; + hash = "sha256-0aLPDh9lrKpHo97VFFwCmPXyXXNFGgkdjoppzm3BCTo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix index 382fea4601ccb..59bdcc46e8bbc 100644 --- a/pkgs/development/python-modules/adafruit-io/default.nix +++ b/pkgs/development/python-modules/adafruit-io/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "adafruit-io"; - version = "2.7.0"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adafruit"; repo = "Adafruit_IO_Python"; rev = "refs/tags/${version}"; - hash = "sha256-BIquSrhtRv2NEOn/G6TTfYMrL2OBwwJQYZ455fznwdU="; + hash = "sha256-vfjyU+czLtUA0WDEvc0iYmJ2Tn75o/OsX909clfDsUE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 080717e1a2cce..672854ce6a989 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.56.0"; - format = "pyproject"; + version = "3.57.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-PApfNjW7sfVmYT0NcEKs5MZJG65P7WQ5WVpQuOj8EV4="; + hash = "sha256-tw95VnxsK57KBMw0fzzgJnFe8O8Ef0rQ9qBMIeYrkHQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/adb-homeassistant/default.nix b/pkgs/development/python-modules/adb-homeassistant/default.nix index 72e6d6acd4d35..f411c85fbfd12 100644 --- a/pkgs/development/python-modules/adb-homeassistant/default.nix +++ b/pkgs/development/python-modules/adb-homeassistant/default.nix @@ -10,6 +10,7 @@ buildPythonPackage { pname = "adb-homeassistant"; version = "1.3.1"; + format = "setuptools"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/addict/default.nix b/pkgs/development/python-modules/addict/default.nix index 235c34af263d1..2a80935f3a22f 100644 --- a/pkgs/development/python-modules/addict/default.nix +++ b/pkgs/development/python-modules/addict/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "addict"; version = "2.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/adext/default.nix b/pkgs/development/python-modules/adext/default.nix index 649ab4b732c64..1aa9368f347b7 100644 --- a/pkgs/development/python-modules/adext/default.nix +++ b/pkgs/development/python-modules/adext/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "adext"; version = "0.4.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "ajschmidt8"; diff --git a/pkgs/development/python-modules/advocate/default.nix b/pkgs/development/python-modules/advocate/default.nix index e0062be35cb87..532302b799c6c 100644 --- a/pkgs/development/python-modules/advocate/default.nix +++ b/pkgs/development/python-modules/advocate/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "advocate"; version = "1.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "JordanMilne"; diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix index b238f184f0c11..6960b390ed033 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.6"; + version = "0.4.7"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - hash = "sha256-eAHj37d0akxSz4rnf9f0tDknJQe//cMg0Korp1rtxfQ="; + hash = "sha256-kmU2HtNyYhfwWQv6asOtDpLZ6+O+eEICzBNLxUhAwaY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index 0299a94ebb0fa..5205734d4da52 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "agate-dbf"; version = "0.2.2"; + format = "setuptools"; propagatedBuildInputs = [ agate dbf dbfread ]; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index a6c515d1d1ccd..0e339d0d21357 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "agate-sql"; version = "0.7.0"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/agent-py/default.nix b/pkgs/development/python-modules/agent-py/default.nix index 2a9e358cf0438..584feec88dde2 100644 --- a/pkgs/development/python-modules/agent-py/default.nix +++ b/pkgs/development/python-modules/agent-py/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "agent-py"; version = "0.0.23"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/aigpy/default.nix b/pkgs/development/python-modules/aigpy/default.nix index 50249e93ab04d..ef0e5f13273ac 100644 --- a/pkgs/development/python-modules/aigpy/default.nix +++ b/pkgs/development/python-modules/aigpy/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "aigpy"; version = "2022.7.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 976a0d02fed43..e85c15e534d8b 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.79"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aMp28g7a44u4VC0g3v9oVhYcBkSZkMJ/83eFTNNBbc0="; + hash = "sha256-jDejI5e2ASoQUMPS9Ajis14RF66HnbkoOK6+Xs8ydis="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairq/default.nix b/pkgs/development/python-modules/aioairq/default.nix index 13eff2506598d..5be97a3d9c9df 100644 --- a/pkgs/development/python-modules/aioairq/default.nix +++ b/pkgs/development/python-modules/aioairq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairq"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CorantGmbH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SRsDSHTZkkygaQZjHENKNLx3ZWMi/PubS1m/MonEKNk="; + hash = "sha256-Sau0Ih+9WRChbztl8yjXVWy4/QxyllQKOPslbZroBeQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index c494b81b63351..836e344e3b882 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.3.6"; + version = "0.3.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-K2/q4JQV6GkNXJ6pKDPfhwKvftdezMp5VdOa5iabmvk="; + hash = "sha256-7QFtWAgLnVX9bS4u/2mV0pga/72G237AWxga6V3vLXY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 39c12ac6e2c08..c760300d79772 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.6.9"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0nbH0pnTYRuSOkzG5Yn/fJmRKtXBMd6ti6Z+AW72j3Q="; + hash = "sha256-ppzusDyGTh2HnDFjqXClyHzjK/TFKvGOWg5Nb2fDGnc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index 7ec26592696b9..4044f1b8a07e3 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -15,23 +15,18 @@ buildPythonPackage rec { pname = "aioambient"; - version = "2023.10.1"; - format = "pyproject"; + version = "2023.12.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; - repo = pname; + repo = "aioambient"; rev = "refs/tags/${version}"; - hash = "sha256-Q7jb0tJsbVM2vEqKgjXOWJN2OwR9qLchU/4ShOUGPT4="; + hash = "sha256-O9MlXtX7UzFN1w/vxpcZ/nRPDFPK5wFKBl42rhaAu94="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'websockets = ">=11.0.1"' 'websockets = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix index 00d451a2b422b..b496c9ac25936 100644 --- a/pkgs/development/python-modules/aioasuswrt/default.nix +++ b/pkgs/development/python-modules/aioasuswrt/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "aioasuswrt"; version = "1.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "kennedyshead"; diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix index 2054b49b7ce21..5c4e3ed03786c 100644 --- a/pkgs/development/python-modules/aioazuredevops/default.nix +++ b/pkgs/development/python-modules/aioazuredevops/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "aioazuredevops"; version = "1.4.3"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index 82007382c23ae..9d90db9e1c207 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-bs+iSe4vu0ej4SQww6mvQqboVKfQrkd9OirBLGbU3gs="; + hash = "sha256-xUtLRHNsv1q6QV6dYsS2OBQj/HsiZDfPhqMPDwNKS7A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 1845a2501603f..870ae00612d26 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -4,6 +4,7 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: # This package provides a binary "apython" which sometimes invokes @@ -16,18 +17,22 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.6.2"; - format = "setuptools"; + version = "0.7.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "vxgmichel"; - repo = pname; + repo = "aioconsole"; rev = "refs/tags/v${version}"; - hash = "sha256-axUJLh7yg2A+HB0fxBueuNT/rohHVq6svQUZvR2LKzo="; + hash = "sha256-SKJLc1Tauwpmh2xtFFyHqKRaaQAK99SpbbGLFmAbKcQ="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook @@ -53,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous console and interfaces for asyncio"; homepage = "https://github.com/vxgmichel/aioconsole"; + changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/aiocron/default.nix b/pkgs/development/python-modules/aiocron/default.nix index 2b3f6e595d365..acb53f02ecc85 100644 --- a/pkgs/development/python-modules/aiocron/default.nix +++ b/pkgs/development/python-modules/aiocron/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "aiocron"; version = "1.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 3a7af196d172a..72a722a2230f2 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -1,6 +1,7 @@ { lib , async-timeout , buildPythonPackage +, cached-ipaddress , dnspython , fetchFromGitHub , ifaddr @@ -9,35 +10,41 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiodiscover"; - version = "1.5.1"; - format = "setuptools"; + version = "1.6.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; - repo = pname; + repo = "aiodiscover"; rev = "refs/tags/v${version}"; - hash = "sha256-rFypv0gCj+Jskk+dlRNJ2ufj2sDud7AuJzj3cl4bB4Y="; + hash = "sha256-FbOqTUSqxSPSCn5zA4s47+M6OsVsqvUBZxTFvJ5PoHs="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner>=5.2",' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ async-timeout + cached-ipaddress dnspython netifaces pyroute2 ifaddr ]; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner>=5.2",' "" - ''; - nativeCheckInputs = [ pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index a5cf035aa0602..5fc14b4f66bdd 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "aiodns"; version = "3.0.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/aiodocker/default.nix b/pkgs/development/python-modules/aiodocker/default.nix index b6cc55d7fd84a..f3c76acceac0e 100644 --- a/pkgs/development/python-modules/aiodocker/default.nix +++ b/pkgs/development/python-modules/aiodocker/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "aiodocker"; # unstable includes support for python 3.10+ version = "unstable-2022-01-20"; + format = "setuptools"; src = fetchFromGitHub { owner = "aio-libs"; diff --git a/pkgs/development/python-modules/aioeagle/default.nix b/pkgs/development/python-modules/aioeagle/default.nix index 8862758880c33..87f38ec71ea37 100644 --- a/pkgs/development/python-modules/aioeagle/default.nix +++ b/pkgs/development/python-modules/aioeagle/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "aioeagle"; version = "1.1.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/aioemonitor/default.nix b/pkgs/development/python-modules/aioemonitor/default.nix index 88ae374e5d429..505af218349c7 100644 --- a/pkgs/development/python-modules/aioemonitor/default.nix +++ b/pkgs/development/python-modules/aioemonitor/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "aioemonitor"; version = "1.0.5"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index b22090a7593da..d700c29071cc4 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -1,28 +1,23 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder - -# build-system -, cython_3 -, setuptools - -# dependencies +, aiohappyeyeballs , async-timeout +, buildPythonPackage , chacha20poly1305-reuseable +, cython_3 +, fetchFromGitHub +, mock , noiseprotocol , protobuf -, zeroconf - -# tests -, mock , pytest-asyncio , pytestCheckHook +, pythonOlder +, setuptools +, zeroconf }: buildPythonPackage rec { pname = "aioesphomeapi"; - version = "18.5.2"; + version = "21.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +26,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kj4FHsNsGsMxK+EI1jgqBfvldkyAoBkCTGT1yiZMmzY="; + hash = "sha256-HPnyFHHx1BahqzvRChT85BaG4eJM3qvTq2Tpbqb3SDI="; }; nativeBuildInputs = [ @@ -40,6 +35,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiohappyeyeballs chacha20poly1305-reuseable noiseprotocol protobuf @@ -48,19 +44,20 @@ buildPythonPackage rec { async-timeout ]; - pythonImportsCheck = [ - "aioesphomeapi" - ]; nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook ]; + pythonImportsCheck = [ + "aioesphomeapi" + ]; + meta = with lib; { - changelog = "https://github.com/esphome/aioesphomeapi/releases/tag/v${version}"; description = "Python Client for ESPHome native API"; homepage = "https://github.com/esphome/aioesphomeapi"; + changelog = "https://github.com/esphome/aioesphomeapi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab hexa ]; }; diff --git a/pkgs/development/python-modules/aioextensions/default.nix b/pkgs/development/python-modules/aioextensions/default.nix index b5508d8d7434a..92c05b12e677d 100644 --- a/pkgs/development/python-modules/aioextensions/default.nix +++ b/pkgs/development/python-modules/aioextensions/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "aioextensions"; version = "21.7.2261349"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 3b72b53045b00..4e7ec48ac5851 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "2023.11.0"; + version = "2023.12.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bachya"; repo = "aioguardian"; rev = "refs/tags/${version}"; - hash = "sha256-hTV6P9J7SS5lnV/9eFUCFPZu1GIeshytWQvNTbGs52w="; + hash = "sha256-7fY8+aAxlDtOBLu8SadY5qiH6+RvxnFpOw1RXTonP2o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix new file mode 100644 index 0000000000000..8922c8283adcb --- /dev/null +++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiohappyeyeballs"; + version = "2.3.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiohappyeyeballs"; + rev = "refs/tags/v${version}"; + hash = "sha256-LMvELnN6Sy6DssXfH6fQ84N2rhdjqB8AlikTMidrjT4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=aiohappyeyeballs --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiohappyeyeballs" + ]; + + disabledTestPaths = [ + # Test has typos + "tests/test_impl.py" + ]; + + meta = with lib; { + description = "Modul for connecting with Happy Eyeballs"; + homepage = "https://github.com/bdraco/aiohappyeyeballs"; + changelog = "https://github.com/bdraco/aiohappyeyeballs/blob/${version}/CHANGELOG.md"; + license = licenses.psfl; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix index cd3abbb4af8da..29d06a8e406eb 100644 --- a/pkgs/development/python-modules/aioharmony/default.nix +++ b/pkgs/development/python-modules/aioharmony/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "aioharmony"; version = "0.2.10"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 86c186f4220fa..8fe2e78372d3d 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , aiocoap +, aiohappyeyeballs , async-interrupt , bleak , bleak-retry-connector @@ -19,16 +20,16 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.0.9"; - format = "pyproject"; + version = "3.1.0"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "Jc2k"; - repo = pname; + repo = "aiohomekit"; rev = "refs/tags/${version}"; - hash = "sha256-YaLSpWSaiEP7X+IujrQgXgWl3aPc1WDMq2yaMUTu328="; + hash = "sha256-yaPliPKa/mS9amUkEx/iM398HGoiKrR6miCtK7fThNw="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiocoap + aiohappyeyeballs async-interrupt bleak bleak-retry-connector @@ -60,6 +62,17 @@ buildPythonPackage rec { "tests/test_ip_pairing.py" ]; + disabledTests = [ + # AttributeError: 'MockedAsyncServiceInfo' object has no attribute '_set_properties' + "test_discover_find_one_unpaired" + "test_find_device_id_case_lower" + "test_find_device_id_case_upper" + "test_discover_missing_csharp" + "test_discover_csharp_case" + "test_discover_device_id_case_lower" + "test_discover_device_id_case_upper" + ]; + pythonImportsCheck = [ "aiohomekit" ]; diff --git a/pkgs/development/python-modules/aiohttp-cors/default.nix b/pkgs/development/python-modules/aiohttp-cors/default.nix index fc5dc87f4ef2a..ad6033ca4f27e 100644 --- a/pkgs/development/python-modules/aiohttp-cors/default.nix +++ b/pkgs/development/python-modules/aiohttp-cors/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "aiohttp-cors"; version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 0a60d0af28014..b81ff0065277d 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "aiohttp-socks"; version = "0.8.3"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix index 298b8b00b22cc..f58d6eff074fb 100644 --- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix +++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "aiohttp-wsgi"; version = "0.10.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix b/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix new file mode 100644 index 0000000000000..d97a21bf65899 --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-zlib-ng/default.nix @@ -0,0 +1,54 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, zlib-ng +}: + +buildPythonPackage rec { + pname = "aiohttp-zlib-ng"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiohttp-zlib-ng"; + rev = "refs/tags/v${version}"; + hash = "sha256-t7T3KIGId5CoBciSkwu/sejW45i2EYtq1fHvNKNXlhA="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=aiohttp_zlib_ng --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + zlib-ng + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiohttp_zlib_ng" + ]; + + meta = with lib; { + description = "Enable zlib_ng on aiohttp"; + homepage = "https://github.com/bdraco/aiohttp-zlib-ng"; + changelog = "https://github.com/bdraco/aiohttp-zlib-ng/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioinflux/default.nix b/pkgs/development/python-modules/aioinflux/default.nix index 25aa7f587b25c..d45e02d1e91b0 100644 --- a/pkgs/development/python-modules/aioinflux/default.nix +++ b/pkgs/development/python-modules/aioinflux/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "aioinflux"; version = "0.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/aiokef/default.nix b/pkgs/development/python-modules/aiokef/default.nix index 0fb7f161436fd..f185f974c7f8a 100644 --- a/pkgs/development/python-modules/aiokef/default.nix +++ b/pkgs/development/python-modules/aiokef/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "aiokef"; version = "0.2.17"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/aiolip/default.nix b/pkgs/development/python-modules/aiolip/default.nix index a3d773cf04f2d..d09efdf7866b5 100644 --- a/pkgs/development/python-modules/aiolip/default.nix +++ b/pkgs/development/python-modules/aiolip/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "aiolip"; version = "1.1.6"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix index b6346a511aa5d..989c704d36599 100644 --- a/pkgs/development/python-modules/aiolyric/default.nix +++ b/pkgs/development/python-modules/aiolyric/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiolyric"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LDLpNuwkoPacI/a2NSlqUABRgwy+jAjGwOxmShLskso="; + hash = "sha256-FZhLjVrLzLv6CZz/ROlvbtBK9XnpO8pG48aSIoBxhCo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiomodernforms/default.nix b/pkgs/development/python-modules/aiomodernforms/default.nix index dd8cbde722c4a..98133f8b894f2 100644 --- a/pkgs/development/python-modules/aiomodernforms/default.nix +++ b/pkgs/development/python-modules/aiomodernforms/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "aiomodernforms"; version = "0.1.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "wonderslug"; diff --git a/pkgs/development/python-modules/aiooss2/default.nix b/pkgs/development/python-modules/aiooss2/default.nix index 85561d6472b1c..91c71fb2bcd61 100644 --- a/pkgs/development/python-modules/aiooss2/default.nix +++ b/pkgs/development/python-modules/aiooss2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiooss2"; - version = "0.2.7"; + version = "0.2.8"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "karajan1001"; repo = "aiooss2"; rev = "refs/tags/${version}"; - hash = "sha256-eMmJpX7bjX5r6GW9N5KmLQpo5V8i6F95TfInct34a2g="; + hash = "sha256-PwgbUZAuk2woEmLYDdWF5hTs19DASxxUv3Ga844ai7g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/aiopulse/default.nix b/pkgs/development/python-modules/aiopulse/default.nix index df93e9f8e1f20..3a2c11417be66 100644 --- a/pkgs/development/python-modules/aiopulse/default.nix +++ b/pkgs/development/python-modules/aiopulse/default.nix @@ -1,27 +1,32 @@ { lib +, async-timeout , buildPythonPackage , fetchPypi -, async-timeout , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiopulse"; - version = "0.4.4"; - format = "setuptools"; + version = "0.4.5"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-JbdJbkzd55KeM3Sf1ExvMuHRKNu5VAvGG4y+wkMS0Wo="; + hash = "sha256-yrltqnePNnNwsVGkfXgtrtL/FuazRvmoVL4L0H4j4Bg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ async-timeout ]; - # tests are not present + # Tests are not present doCheck = false; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix index 3039f57667574..447975225cadd 100644 --- a/pkgs/development/python-modules/aiopylgtv/default.nix +++ b/pkgs/development/python-modules/aiopylgtv/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "aiopylgtv"; version = "0.4.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index c2b6f3609e534..4d3aae9dc1b8e 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiorecollect"; - version = "2023.11.0"; + version = "2023.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CRiYde3FKVXhqB3W5rD7T3v93PAcsXBj0gG0L0umHSg="; + hash = "sha256-Rj0+r7eERLY5VzmuDQH/TeVLfmvmKwPqcvd1b/To0Ts="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 85cac7f967105..572d88044356d 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -49,6 +49,5 @@ buildPythonPackage rec { description = "A helper to mock/fake web requests in python aiohttp package"; homepage = "https://github.com/pnuckowski/aioresponses"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ rvl ]; }; } diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index c5b1c9bb70fa0..d96add82b7d26 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2023.10.0"; + version = "2023.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-psynooRbX34EFYY7FTqy3KdFsv939z/qYfIfyNTVkiM="; + hash = "sha256-Lg5O9xwEEgGFIrQoS4r4EMmYDX3yAkcMwHNMHMhLapI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index eae5b4a537c4d..09a2bfb8562d6 100644 --- a/pkgs/development/python-modules/aiorpcx/default.nix +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "aiorpcx"; version = "0.22.1"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index b04e55251deae..dbbaea2d3903d 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.8.6"; + version = "0.8.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-bchfFtggmKXjAVTeFFy+3YXF3PCfAcFPC5fanw3l/RE="; + hash = "sha256-rWULiyQGBA01hWfRDulDuHX0c1LPo6CTZ9HFOn3MD+E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiorwlock/default.nix b/pkgs/development/python-modules/aiorwlock/default.nix index f959ec734ef59..b72d69e8fd31e 100644 --- a/pkgs/development/python-modules/aiorwlock/default.nix +++ b/pkgs/development/python-modules/aiorwlock/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "aiorwlock"; version = "1.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/aioserial/default.nix b/pkgs/development/python-modules/aioserial/default.nix index 1a02f7acd305a..ca0c4d2e8c6e0 100644 --- a/pkgs/development/python-modules/aioserial/default.nix +++ b/pkgs/development/python-modules/aioserial/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "aioserial"; version = "1.3.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/aioskybell/default.nix b/pkgs/development/python-modules/aioskybell/default.nix index 4fd3afe9de2c0..2e5527850bf56 100644 --- a/pkgs/development/python-modules/aioskybell/default.nix +++ b/pkgs/development/python-modules/aioskybell/default.nix @@ -3,24 +3,27 @@ , aiohttp , aresponses , buildPythonPackage +, ciso8601 , fetchFromGitHub , pytest-asyncio +, pytest-freezegun , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aioskybell"; - version = "22.7.0"; - format = "setuptools"; + version = "23.12.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "tkdrob"; - repo = pname; + repo = "aioskybell"; rev = "refs/tags/${version}"; - hash = "sha256-aBT1fDFtq1vasTvCnAXKV2vmZ6LBLZqRCiepv1HDJ+Q="; + hash = "sha256-5F0B5z0pJLKJPzKIowE07vEgmNXnDVEeGFbPGnJ6H9I="; }; postPatch = '' @@ -28,14 +31,20 @@ buildPythonPackage rec { --replace 'version="master",' 'version="${version}",' ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aiofiles + ciso8601 ]; nativeCheckInputs = [ aresponses pytest-asyncio + pytest-freezegun pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index 7160eccace605..fd9681a2d759e 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiosql"; - version = "9.0"; + version = "9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "nackjicholson"; repo = "aiosql"; rev = "refs/tags/${version}"; - hash = "sha256-AwuZ3y/qAyZzffTG6mHLk0b+zFB9307VjAX8g1pvWto="; + hash = "sha256-xcrNnp3ZfWLbz+/77N3R5x7N2n7nPcw0khqaIeHn0+Y="; }; sphinxRoot = "docs/source"; @@ -48,6 +48,8 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "aiosql" ]; + meta = with lib; { description = "Simple SQL in Python"; homepage = "https://nackjicholson.github.io/aiosql/"; diff --git a/pkgs/development/python-modules/aiosyncthing/default.nix b/pkgs/development/python-modules/aiosyncthing/default.nix index e45ddb5dec0fd..fd9d02cb3a72a 100644 --- a/pkgs/development/python-modules/aiosyncthing/default.nix +++ b/pkgs/development/python-modules/aiosyncthing/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "aiosyncthing"; version = "0.6.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "zhulik"; diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix index 5891fa703a90f..08fba4272c878 100644 --- a/pkgs/development/python-modules/aiotractive/default.nix +++ b/pkgs/development/python-modules/aiotractive/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "aiotractive"; version = "0.5.6"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 36b7aa587dda0..101c3f8d9e2d2 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "66"; + version = "67"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UWKsx7giGrNR04X/2vgdaCFulxbzQkvlRfCEodVoHY8="; + hash = "sha256-bad9wDV8kGEXjdjQ8GKhUsdMHqTohLjJJWH+gJCvuIo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix index 4cc8203625dbf..4358c22f8be02 100644 --- a/pkgs/development/python-modules/aiounittest/default.nix +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "aiounittest"; version = "1.4.2"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index 573075095cb31..bd9dc3ede2dc9 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -10,8 +10,8 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.4.3"; - format = "pyproject"; + version = "0.5.1"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-nYMruxEqLvkcspz0damh9tBYYROz5gleLiyhjco+rsQ="; + hash = "sha256-4Pcdf5yAzjXbmWehon9DdZfaIdEjPLcdzf/EjYKEamk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix index 542511d2d3b13..64f7a23a17e40 100644 --- a/pkgs/development/python-modules/aiowithings/default.nix +++ b/pkgs/development/python-modules/aiowithings/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiowithings"; - version = "1.0.3"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-withings"; rev = "refs/tags/v${version}"; - hash = "sha256-n76bpFIWUfztTDEg32uopxukAtvFT3tdbtqWOLghi4I="; + hash = "sha256-wVLoM1Lq1fchyjOOmn+6wVzEAra8x2uK6qaiocVqzmw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioymaps/default.nix b/pkgs/development/python-modules/aioymaps/default.nix index fb57614be9fc7..aea81caca7540 100644 --- a/pkgs/development/python-modules/aioymaps/default.nix +++ b/pkgs/development/python-modules/aioymaps/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "aioymaps"; version = "1.2.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/pkgs/development/python-modules/aiozeroconf/default.nix index fe3943c25b1c5..6bd40233d761a 100644 --- a/pkgs/development/python-modules/aiozeroconf/default.nix +++ b/pkgs/development/python-modules/aiozeroconf/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "aiozeroconf"; version = "0.1.8"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix index b83cdefd8a51b..b51da08516c00 100644 --- a/pkgs/development/python-modules/airly/default.nix +++ b/pkgs/development/python-modules/airly/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "airly"; version = "1.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ak-ambi"; diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix index 926b5ed7efee9..6ae4a11322f97 100644 --- a/pkgs/development/python-modules/ajpy/default.nix +++ b/pkgs/development/python-modules/ajpy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ajpy"; version = "0.0.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ajsonrpc/default.nix b/pkgs/development/python-modules/ajsonrpc/default.nix index 0dd07c0f4eea5..0b974e3680454 100644 --- a/pkgs/development/python-modules/ajsonrpc/default.nix +++ b/pkgs/development/python-modules/ajsonrpc/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ajsonrpc"; version = "1.2.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index 31f9e14f6da8a..949bfdcac95d5 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "alabaster"; version = "0.7.13"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix index 3e9bdffdadffc..0504f4bc6f6d4 100644 --- a/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "alarmdecoder"; version = "1.13.11"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/alectryon/default.nix b/pkgs/development/python-modules/alectryon/default.nix index 08fcd9f9651f5..136768950dfd3 100644 --- a/pkgs/development/python-modules/alectryon/default.nix +++ b/pkgs/development/python-modules/alectryon/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "alectryon"; version = "1.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index c1bb0f1d3c7d1..36a6bb79bc271 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -47,5 +47,6 @@ buildPythonPackage rec { description = "A database migration tool for SQLAlchemy"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "alembic"; }; } diff --git a/pkgs/development/python-modules/alive-progress/default.nix b/pkgs/development/python-modules/alive-progress/default.nix index 7e3adbf1166e3..b10b056f292a0 100644 --- a/pkgs/development/python-modules/alive-progress/default.nix +++ b/pkgs/development/python-modules/alive-progress/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "alive-progress"; version = "3.1.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "rsalmei"; diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix index a67ff5e98d9b5..8f39c1fb628e2 100644 --- a/pkgs/development/python-modules/allure-behave/default.nix +++ b/pkgs/development/python-modules/allure-behave/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "allure-behave"; version = "2.13.2"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/allure-python-commons-test/default.nix b/pkgs/development/python-modules/allure-python-commons-test/default.nix index c358a2f14d7fe..f023cbb3a429d 100644 --- a/pkgs/development/python-modules/allure-python-commons-test/default.nix +++ b/pkgs/development/python-modules/allure-python-commons-test/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "allure-python-commons-test"; version = "2.13.2"; + format = "setuptools"; disabled = pythonOlder "3.4"; diff --git a/pkgs/development/python-modules/allure-python-commons/default.nix b/pkgs/development/python-modules/allure-python-commons/default.nix index 0b50f23f77c4b..2e6a38e51341c 100644 --- a/pkgs/development/python-modules/allure-python-commons/default.nix +++ b/pkgs/development/python-modules/allure-python-commons/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "allure-python-commons"; version = "2.13.2"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/alpha-vantage/default.nix b/pkgs/development/python-modules/alpha-vantage/default.nix index 23ffd7d8b4b6a..b98c2508458ed 100644 --- a/pkgs/development/python-modules/alpha-vantage/default.nix +++ b/pkgs/development/python-modules/alpha-vantage/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "alpha-vantage"; version = "2.3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "RomelTorres"; diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index 1b152e70d7b01..719ac71ec5e1b 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "amaranth-boards"; version = "unstable-2021-12-17"; + format = "setuptools"; # python setup.py --version realVersion = "0.1.dev202+g${lib.substring 0 7 src.rev}"; diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index 685d63414ec5a..11f331d033c7d 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "amaranth-soc"; version = "unstable-2023-09-15"; + format = "setuptools"; # python setup.py --version realVersion = "0.1.dev70+g${lib.substring 0 7 src.rev}"; diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix index fca55e3bc0dc0..751a2945da598 100644 --- a/pkgs/development/python-modules/amazon-kclpy/default.nix +++ b/pkgs/development/python-modules/amazon-kclpy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "amazon-kclpy"; version = "2.1.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "awslabs"; diff --git a/pkgs/development/python-modules/ambiclimate/default.nix b/pkgs/development/python-modules/ambiclimate/default.nix index e375d347f2aae..ecaae3fd9f571 100644 --- a/pkgs/development/python-modules/ambiclimate/default.nix +++ b/pkgs/development/python-modules/ambiclimate/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "ambiclimate"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { pname = "Ambiclimate"; diff --git a/pkgs/development/python-modules/amiibo-py/default.nix b/pkgs/development/python-modules/amiibo-py/default.nix index 5fb70397fa715..93cc6cdd0b6cf 100644 --- a/pkgs/development/python-modules/amiibo-py/default.nix +++ b/pkgs/development/python-modules/amiibo-py/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "amiibo-py"; version = "unstable-2021-01-16"; + format = "setuptools"; disabled = pythonOlder "3.5.3"; # Older versions are not supported upstream src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/amply/default.nix b/pkgs/development/python-modules/amply/default.nix index 235a697d2af4a..5f648fc1baf97 100644 --- a/pkgs/development/python-modules/amply/default.nix +++ b/pkgs/development/python-modules/amply/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "amply"; version = "0.1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix index 430065b7d1f80..0805ce6784a28 100644 --- a/pkgs/development/python-modules/amqplib/default.nix +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "amqplib"; version = "1.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index ee808f973baee..e408d11590bd1 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { pname = "androguard"; version = "3.4.0a1"; + format = "setuptools"; src = fetchFromGitHub { repo = pname; diff --git a/pkgs/development/python-modules/android-backup/default.nix b/pkgs/development/python-modules/android-backup/default.nix index df2096582ccd4..647a36f78b330 100644 --- a/pkgs/development/python-modules/android-backup/default.nix +++ b/pkgs/development/python-modules/android-backup/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "android-backup"; version = "0.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "bluec0re"; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 8ecc9c02c0e18..516d86acb6fd5 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.79"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.11"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-J5ZjJPX5bL3xuKB9dbSlEvHVQS4XnrQfpZ6IXy/1uMw="; + hash = "sha256-3DqR1p2VK9Xe2Yk+gZ81GM4Cn39TDrx1LSivu4xVDOI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 5e22e6f87addc..5aa4edce7c2e6 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "aniso8601"; version = "9.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/anova-wifi/default.nix b/pkgs/development/python-modules/anova-wifi/default.nix new file mode 100644 index 0000000000000..b6f885daf6194 --- /dev/null +++ b/pkgs/development/python-modules/anova-wifi/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, aiohttp +, sensor-state-data +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "anova-wifi"; + version = "0.10.3"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "Lash-L"; + repo = "anova_wifi"; + rev = "refs/tags/v${version}"; + hash = "sha256-tCmvp29KSCkc+g0w0odcB7vGjtDx6evac7XsHEF0syM="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=anova_wifi --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + sensor-state-data + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + disabledTests = [ + # Makes network calls + "test_async_data_1" + ]; + + pythonImportsCheck = [ "anova_wifi" ]; + + meta = with lib; { + description = "A Python package for reading anova sous vide api data"; + homepage = "https://github.com/Lash-L/anova_wifi"; + changelog = "https://github.com/Lash-L/anova_wifi/releases/tag/v${version}"; + maintainers = with maintainers; [ jamiemagee ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/ansible-kernel/default.nix b/pkgs/development/python-modules/ansible-kernel/default.nix index 4acdddb523d55..dda1fe09fad42 100644 --- a/pkgs/development/python-modules/ansible-kernel/default.nix +++ b/pkgs/development/python-modules/ansible-kernel/default.nix @@ -25,6 +25,7 @@ in buildPythonPackage rec { pname = "ansible-kernel"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ansible-vault-rw/default.nix b/pkgs/development/python-modules/ansible-vault-rw/default.nix index b5a4c7a03631e..23281c3ed0701 100644 --- a/pkgs/development/python-modules/ansible-vault-rw/default.nix +++ b/pkgs/development/python-modules/ansible-vault-rw/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ansible-vault-rw"; version = "2.1.0"; + format = "setuptools"; src = fetchPypi { pname = "ansible-vault"; inherit version; diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index 07a8190727bc2..77077afd92b5d 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ansicolor"; version = "0.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix index 3f2d549694e64..ddedef72916af 100644 --- a/pkgs/development/python-modules/ansicolors/default.nix +++ b/pkgs/development/python-modules/ansicolors/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ansicolors"; version = "1.1.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix index b0676258e1075..ae240be309960 100644 --- a/pkgs/development/python-modules/ansiconv/default.nix +++ b/pkgs/development/python-modules/ansiconv/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ansiconv"; version = "1.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ansible"; diff --git a/pkgs/development/python-modules/ansimarkup/default.nix b/pkgs/development/python-modules/ansimarkup/default.nix index d249dddd1e3dd..9e4ed625ba199 100644 --- a/pkgs/development/python-modules/ansimarkup/default.nix +++ b/pkgs/development/python-modules/ansimarkup/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "ansimarkup"; version = "1.5.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "gvalkov"; diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 228342f97082d..f7a0a8ba63725 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -6,6 +6,7 @@ , distro , dirty-equals , httpx +, sniffio , pydantic , pytest-asyncio , respx @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.7.4"; + version = "0.7.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-iLHzoWgAMDZ0AJGVXw2Xnaby07FbhJqNGfW5bPNgfws="; + hash = "sha256-1mpNwZJbYdKVmUeUM+PBL6vPhwe8tr2SnAP/t/MMKpI="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { anyio distro httpx + sniffio pydantic tokenizers typing-extensions diff --git a/pkgs/development/python-modules/anyconfig/default.nix b/pkgs/development/python-modules/anyconfig/default.nix index 7f1855ad6c5b3..87792781f640c 100644 --- a/pkgs/development/python-modules/anyconfig/default.nix +++ b/pkgs/development/python-modules/anyconfig/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "anyconfig"; version = "0.13.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/anyqt/default.nix b/pkgs/development/python-modules/anyqt/default.nix index a4fbb041822a8..584b1dcf4233b 100644 --- a/pkgs/development/python-modules/anyqt/default.nix +++ b/pkgs/development/python-modules/anyqt/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "anyqt"; version = "0.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ales-erjavec"; diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index 25aa924491057..16bf2daaa4a47 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.7.1"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HEy1EGP47FFyuMjvsb+3mGHTQMNJEiDVa4wqaqjbOz0="; + hash = "sha256-hHoP7OWOp6MtINzNVKAm3T3Sj3baprTwp0wlPlx8/uw="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index d0e36a989b94d..bff63bb84b79a 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { pname = "apache-beam"; version = "2.50.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "apache"; diff --git a/pkgs/development/python-modules/apcaccess/default.nix b/pkgs/development/python-modules/apcaccess/default.nix index fd4627b558de5..e6d6d32eb353a 100644 --- a/pkgs/development/python-modules/apcaccess/default.nix +++ b/pkgs/development/python-modules/apcaccess/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "apcaccess"; version = "0.0.13"; + format = "setuptools"; src = fetchFromGitHub { owner = "flyte"; diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix index 22fa3dc98fb07..1f2da03eae041 100644 --- a/pkgs/development/python-modules/appdirs/default.nix +++ b/pkgs/development/python-modules/appdirs/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "appdirs"; version = "1.4.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/apple-weatherkit/default.nix b/pkgs/development/python-modules/apple-weatherkit/default.nix index 89363e859bd02..ce5bce13d5f78 100644 --- a/pkgs/development/python-modules/apple-weatherkit/default.nix +++ b/pkgs/development/python-modules/apple-weatherkit/default.nix @@ -3,13 +3,14 @@ , fetchFromGitHub , poetry-core , aiohttp +, aiohttp-retry , pythonOlder , pyjwt }: buildPythonPackage rec { pname = "apple-weatherkit"; - version = "1.0.4"; + version = "1.1.2"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "tjhorner"; repo = "python-weatherkit"; rev = "refs/tags/v${version}"; - hash = "sha256-G/0hyK2rjdSSnVnvAUGyDvsfNMHVgAD7NHfNFmdBCNA="; + hash = "sha256-w3KinicaF01I6fIidI7XYHpB8eq52RTUw/BMLrx6Grk="; }; nativeBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + aiohttp-retry pyjwt ] ++ pyjwt.optional-dependencies.crypto; diff --git a/pkgs/development/python-modules/applicationinsights/default.nix b/pkgs/development/python-modules/applicationinsights/default.nix index 7576bcbdf1dcd..3dd3ccf4d36ba 100644 --- a/pkgs/development/python-modules/applicationinsights/default.nix +++ b/pkgs/development/python-modules/applicationinsights/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "0.11.10"; + format = "setuptools"; pname = "applicationinsights"; src = fetchPypi { diff --git a/pkgs/development/python-modules/appnope/default.nix b/pkgs/development/python-modules/appnope/default.nix index 68ada3b4b4cd3..bb72bbc8e73e6 100644 --- a/pkgs/development/python-modules/appnope/default.nix +++ b/pkgs/development/python-modules/appnope/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "appnope"; version = "0.1.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "minrk"; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 486b7fd6c25ce..bde3bcea30559 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.6.0"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Pu+rHF15eLDmXFCR0c2+kgaGXcPLXRnKXPvdt26Kr/4="; + hash = "sha256-2NVxDTyVJYbCz633zp6g/mC4DsqTlGSX4+8Y88wO7Bk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 289755c5ddc6f..6c078914cd939 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "10.1.0"; + version = "10.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-t+Vxo6Pn3b2H3yAg5LGsGTjrZr4MXeGOY2BF9eFFAdE="; + hash = "sha256-2NaqqgrHXJovoVExvbr0s86eRbcxy+DUrsdRH/vak3E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index e42ae97e2b4e6..912bf13d0ade6 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.5.4"; + version = "5.5.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-LWlB7ZIcGoNXq6WodJE6hinGDBFgUqP4tXa51T5yI8c="; + hash = "sha256-qDloyoc6FpfWVo0+rbnvSQ0nxAKjKXcC+ZNZr2vkMEE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aprslib/default.nix b/pkgs/development/python-modules/aprslib/default.nix index ab56bf58b8e3b..390a88fc2bf26 100644 --- a/pkgs/development/python-modules/aprslib/default.nix +++ b/pkgs/development/python-modules/aprslib/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "aprslib"; version = "0.7.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "rossengeorgiev"; diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index c09d616b4d502..afa3cf9230d51 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.1"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-9THKebhyoUUSnZek1uBIFckFM0Xh1fKRpxEt5Eptugw="; + hash = "sha256-nSj+c6IX57kwcDz/h2Sg4U8JlxZ5fq8k7hDL1zCE08g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aqualogic/default.nix b/pkgs/development/python-modules/aqualogic/default.nix index 9b904033b7c66..e7772f40c63c3 100644 --- a/pkgs/development/python-modules/aqualogic/default.nix +++ b/pkgs/development/python-modules/aqualogic/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "aqualogic"; version = "3.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "swilson"; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 9e0858f140665..fc31ed21b8140 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.79"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7gnNGUxl/K8GWV99uB/dEv9/ukQ4QV4nvyyByobhBt0="; + hash = "sha256-uK42wbP6zZFRR6JqHs3Ag5zsPT9JFyKviDRxLDa1QjY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/area/default.nix b/pkgs/development/python-modules/area/default.nix index 37d7369dbeeef..3057bf1eb805f 100644 --- a/pkgs/development/python-modules/area/default.nix +++ b/pkgs/development/python-modules/area/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "area"; version = "1.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index a5a78c332ab22..0c76a89d7a5c1 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "arelle${lib.optionalString (!gui) "-headless"}"; version = "18.3"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 26a527eb4f8fd..a3ffbd076a43f 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.19.0"; + version = "1.21.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Idl5Tm1XWgBLVgHPbXiyt9MW4J5wZdPb2J7iIDBnorg="; + hash = "sha256-/CU/8CnoGhxe1tapA9k60o/Bpnaql/6Y/6Ksw5mfk/E="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix index 77182cbd6a436..822acd09e1429 100644 --- a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix +++ b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "argon2-cffi-bindings"; version = "21.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/argparse-addons/default.nix b/pkgs/development/python-modules/argparse-addons/default.nix index 1d50820d4e5d7..44b9bf1c4ce02 100644 --- a/pkgs/development/python-modules/argparse-addons/default.nix +++ b/pkgs/development/python-modules/argparse-addons/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "argparse-addons"; version = "0.12.0"; + format = "setuptools"; src = fetchPypi { pname = "argparse_addons"; diff --git a/pkgs/development/python-modules/argparse-dataclass/default.nix b/pkgs/development/python-modules/argparse-dataclass/default.nix index 993242e4bd804..9310c6f712154 100644 --- a/pkgs/development/python-modules/argparse-dataclass/default.nix +++ b/pkgs/development/python-modules/argparse-dataclass/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "argparse-dataclass"; version = "1.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "mivade"; diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix index 9faf16037d042..329fde3416691 100644 --- a/pkgs/development/python-modules/args/default.nix +++ b/pkgs/development/python-modules/args/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "args"; version = "0.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix index 8c7da464c4537..b07a7333c878d 100644 --- a/pkgs/development/python-modules/arpeggio/default.nix +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "arpeggio"; version = "2.0.2"; + format = "setuptools"; src = fetchPypi { pname = "Arpeggio"; diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix index 0497c542fe24a..3abe60f64d5e2 100644 --- a/pkgs/development/python-modules/array-record/default.nix +++ b/pkgs/development/python-modules/array-record/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { cp39 = "sha256-BzMOVue7E1S1+5+XTcPELko81ujc9MbmqLhNsU7pqO0="; cp310 = "sha256-eUD9pQu9GsbV8MPD1MiF3Ihr+zYioSOo6P15hYIwPYo="; cp311 = "sha256-rAmkI3EIZPYiXrxFowfDC0Gf3kRw0uX0i6Kx6Zu+hNM="; - }.${pyShortVersion}; + }.${pyShortVersion} or (throw "${pname} is missing hash for ${pyShortVersion}"); }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix index 3add43b6509af..48207c8e659f6 100644 --- a/pkgs/development/python-modules/arrayqueues/default.nix +++ b/pkgs/development/python-modules/arrayqueues/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "arrayqueues"; version = "1.4.1"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index db8124a98a5e7..1801900dcdeff 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "arrow"; version = "1.2.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 0a186781b4a22..63bf85273811b 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -8,13 +8,11 @@ , numba , numpy , pandas -, pytest , setuptools , cloudpickle , pytestCheckHook , scipy , packaging -, typing-extensions , pythonOlder , xarray , xarray-einstats @@ -33,7 +31,7 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.16.1"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -42,7 +40,7 @@ buildPythonPackage rec { owner = "arviz-devs"; repo = "arviz"; rev = "refs/tags/v${version}"; - hash = "sha256-kixWGj0M0flTq5rXSiPB0nfZaGYRvvMBGAJpehdW8KY="; + hash = "sha256-DqVwbiNJHdRxK3Ppfa6sqPJzDqMaj1mtlAJHFq09u2Y="; }; propagatedBuildInputs = [ @@ -86,6 +84,7 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access + "test_plot_ppc_transposed" "test_plot_separation" "test_plot_trace_legend" "test_cov" diff --git a/pkgs/development/python-modules/arxiv2bib/default.nix b/pkgs/development/python-modules/arxiv2bib/default.nix index bcffe0c3bb1dc..a7a6b83c56679 100644 --- a/pkgs/development/python-modules/arxiv2bib/default.nix +++ b/pkgs/development/python-modules/arxiv2bib/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "arxiv2bib"; version = "1.0.8"; + format = "setuptools"; # Missing tests on Pypi src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 87a996a455231..a37a70844d6eb 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asana"; - version = "4.0.11"; + version = "5.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "asana"; repo = "python-asana"; - rev = "refs/tags/${version}"; - hash = "sha256-B98X8ErmoMIpXu4KKvRGgtElPs/va2+UIR+ARUgafgo="; + rev = "refs/tags/v${version}"; + hash = "sha256-9F63DvwMh9NwlTqFuhiXfgRRRxAFjjRYmYzsuOhlQJ0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index c990c9477bbf8..68607924c1de2 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "asciimatics"; version = "1.15.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/asciitree/default.nix b/pkgs/development/python-modules/asciitree/default.nix index ad978efffb5f2..323e1fbf87394 100644 --- a/pkgs/development/python-modules/asciitree/default.nix +++ b/pkgs/development/python-modules/asciitree/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "asciitree"; version = "0.3.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "mbr"; diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index cad89cd576b16..ed3c019146e59 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "ase"; version = "3.22.1"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 69c452ecb153b..e9c6e376b10ec 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "6.6.3"; + version = "6.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-w4xpCqNal0BHsmf1cL4k/DKzs/e9WQXTQNJNs8puJUU="; + hash = "sha256-cgd+OrBhMCc0UAYF1y5FiUSuKf3l3/7i8Y6JjhWnR0M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index 062d3259b82ae..e04eda64ab509 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { version = "0.9"; + format = "setuptools"; pname = "asgi-csrf"; disabled = isPy27; diff --git a/pkgs/development/python-modules/asgi-logger/default.nix b/pkgs/development/python-modules/asgi-logger/default.nix new file mode 100644 index 0000000000000..fb79236d784cc --- /dev/null +++ b/pkgs/development/python-modules/asgi-logger/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, asgiref +}: + +buildPythonPackage rec { + pname = "asgi-logger"; + version = "0.1.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-son1ML9J0UMgJCpWdYD/yK0FO6VmfuzifSWpeCLToKo="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ + asgiref + ]; + + # tests are not in the pypi release, and there are no tags/release corresponding to the pypi releases in the github + doCheck = false; + pythonImportsCheck = [ + "asgi_logger" + ]; + + meta = with lib; { + description = "Access logger for ASGI servers"; + homepage = "https://github.com/Kludex/asgi-logger"; + license = licenses.mit; + maintainers = teams.wdz.members; + }; +} diff --git a/pkgs/development/python-modules/asgineer/default.nix b/pkgs/development/python-modules/asgineer/default.nix index 2559cda2a018c..9bd266aa1957c 100644 --- a/pkgs/development/python-modules/asgineer/default.nix +++ b/pkgs/development/python-modules/asgineer/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "asgineer"; version = "0.8.1"; + format = "setuptools"; # PyPI tarball doesn't include tests directory src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/asn1ate/default.nix b/pkgs/development/python-modules/asn1ate/default.nix index a141fc746f78b..90ccd0c6f1a2e 100644 --- a/pkgs/development/python-modules/asn1ate/default.nix +++ b/pkgs/development/python-modules/asn1ate/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { pname = "asn1ate"; + format = "setuptools"; version= "0.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/aspy-refactor-imports/default.nix b/pkgs/development/python-modules/aspy-refactor-imports/default.nix index 8eff00db43d56..9ba679225da25 100644 --- a/pkgs/development/python-modules/aspy-refactor-imports/default.nix +++ b/pkgs/development/python-modules/aspy-refactor-imports/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "aspy-refactor-imports"; version = "3.0.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/aspy.yaml/default.nix b/pkgs/development/python-modules/aspy.yaml/default.nix index 5abe60742747b..09543479014e4 100644 --- a/pkgs/development/python-modules/aspy.yaml/default.nix +++ b/pkgs/development/python-modules/aspy.yaml/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "aspy.yaml"; version = "1.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/assay/default.nix b/pkgs/development/python-modules/assay/default.nix index 881c4bbf730e5..35dce9a454a24 100644 --- a/pkgs/development/python-modules/assay/default.nix +++ b/pkgs/development/python-modules/assay/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "assay"; version = "unstable-2022-01-19"; + format = "setuptools"; src = fetchFromGitHub { owner = "brandon-rhodes"; diff --git a/pkgs/development/python-modules/assertpy/default.nix b/pkgs/development/python-modules/assertpy/default.nix index 1800a14d507c9..de900c368da18 100644 --- a/pkgs/development/python-modules/assertpy/default.nix +++ b/pkgs/development/python-modules/assertpy/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "assertpy"; version = "1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/development/python-modules/asterisk-mbox/default.nix b/pkgs/development/python-modules/asterisk-mbox/default.nix index 0da70911a17c0..4347c42d47dd9 100644 --- a/pkgs/development/python-modules/asterisk-mbox/default.nix +++ b/pkgs/development/python-modules/asterisk-mbox/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "asterisk-mbox"; version = "0.5.0"; + format = "setuptools"; src = fetchPypi { pname = "asterisk_mbox"; diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index 0d66f4c728dcf..6944ee4d8683e 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "astropy-healpix"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/pkgs/development/python-modules/astropy-helpers/default.nix index dd8897ab13907..0cf6cbda0688c 100644 --- a/pkgs/development/python-modules/astropy-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-helpers/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "astropy-helpers"; version = "4.0.1"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix index b32df24f5bbd0..54ee47f37d259 100644 --- a/pkgs/development/python-modules/astunparse/default.nix +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "astunparse"; version = "1.6.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index a08a20831f1bd..0e2da16189bec 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.16"; + version = "0.0.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ktmL2EFWDTzZwhxfleYEeJtMiiDP28JaCGbsvxx73Ok="; + hash = "sha256-t2AolP0GZ88b0+FqHXHIP1V6TIV61Bvd8wVXpZZltK0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/async-generator/default.nix b/pkgs/development/python-modules/async-generator/default.nix index 17014a410d4cb..5ddb6df48ee92 100644 --- a/pkgs/development/python-modules/async-generator/default.nix +++ b/pkgs/development/python-modules/async-generator/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "async-generator"; version = "1.10"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/async-timeout/default.nix b/pkgs/development/python-modules/async-timeout/default.nix index 59c8b51fbb672..88a6c9e14e34f 100644 --- a/pkgs/development/python-modules/async-timeout/default.nix +++ b/pkgs/development/python-modules/async-timeout/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "async-timeout"; version = "4.0.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix index 832b87c774aa5..48ba646b74127 100644 --- a/pkgs/development/python-modules/asyncclick/default.nix +++ b/pkgs/development/python-modules/asyncclick/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "asyncclick"; version = "8.1.3.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/asyncio-rlock/default.nix b/pkgs/development/python-modules/asyncio-rlock/default.nix index 5ad616180cee2..6f53a3adfa0a4 100644 --- a/pkgs/development/python-modules/asyncio-rlock/default.nix +++ b/pkgs/development/python-modules/asyncio-rlock/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "asyncio-rlock"; version = "0.1.0"; + format = "setuptools"; src = fetchPypi { pname = "asyncio_rlock"; diff --git a/pkgs/development/python-modules/asyncio-throttle/default.nix b/pkgs/development/python-modules/asyncio-throttle/default.nix index 052cfc01f997f..c48868380ebd7 100644 --- a/pkgs/development/python-modules/asyncio-throttle/default.nix +++ b/pkgs/development/python-modules/asyncio-throttle/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "asyncio-throttle"; version = "1.0.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/asyncserial/default.nix b/pkgs/development/python-modules/asyncserial/default.nix index 34ab492b9ae85..a40d31510c406 100644 --- a/pkgs/development/python-modules/asyncserial/default.nix +++ b/pkgs/development/python-modules/asyncserial/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "asyncserial"; version = "unstable-2022-06-10"; + format = "setuptools"; src = fetchFromGitHub { owner = "m-labs"; diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix index 5ffe2e769cc98..7e556d5be622c 100644 --- a/pkgs/development/python-modules/asyncsleepiq/default.nix +++ b/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asyncsleepiq"; - version = "1.3.7"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nKXZXOpwVN8Xe1vwwPGPucvyffiIQ8I4D+0A3qGco5w="; + hash = "sha256-H5Zg1I7+/vG5U9Tnr/qXVg/tTPMtuCWQGfEgug9ehEM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index f499adc7bb1e4..735e831c03249 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.14.1"; + version = "2.14.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-GsMcMzoNg8iIMVIyRVAMqoFFA0I3QbDkZTOe9tpbXik="; + hash = "sha256-6Va/iYjQega6MwX2YE4mH0ygFMSiMvCHPxx2kvvjz8I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index cc58e3d6eeb4d..fde7479884dcf 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "asynctest"; version = "0.13.0"; + format = "setuptools"; # Unmaintained and incompatible python 3.11 disabled = pythonAtLeast "3.11"; diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix index 0fccc943c8a47..1af61849585bd 100644 --- a/pkgs/development/python-modules/atomiclong/default.nix +++ b/pkgs/development/python-modules/atomiclong/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "atomiclong"; version = "0.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index 26187a0078b44..06ce71504dd5c 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "atomicwrites"; version = "1.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/atsim-potentials/default.nix b/pkgs/development/python-modules/atsim-potentials/default.nix index f9977ec841218..4a3c75966dc3d 100644 --- a/pkgs/development/python-modules/atsim-potentials/default.nix +++ b/pkgs/development/python-modules/atsim-potentials/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { version = "0.4.1"; + format = "setuptools"; pname = "atsim-potentials"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix index 9b8eccabb6e6f..73d093d483a93 100644 --- a/pkgs/development/python-modules/aubio/default.nix +++ b/pkgs/development/python-modules/aubio/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "aubio"; version = "0.4.9"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/development/python-modules/audible/default.nix b/pkgs/development/python-modules/audible/default.nix index ddb80eec05340..69da14683a095 100644 --- a/pkgs/development/python-modules/audible/default.nix +++ b/pkgs/development/python-modules/audible/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "audible"; version = "0.8.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "mkb79"; diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix index bdee5ba6cc9ca..f3e74462f42e1 100644 --- a/pkgs/development/python-modules/audioread/default.nix +++ b/pkgs/development/python-modules/audioread/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "audioread"; version = "3.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix index 15ffe7af8c851..427faa4fe37b5 100644 --- a/pkgs/development/python-modules/audiotools/default.nix +++ b/pkgs/development/python-modules/audiotools/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "audiotools"; version = "3.1.1"; + format = "setuptools"; buildInputs = lib.optionals stdenv.isDarwin [ AudioToolbox diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index 4872a4ac18d98..48c5e723bc4c1 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "augeas"; version = "1.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "hercules-team"; diff --git a/pkgs/development/python-modules/auroranoaa/default.nix b/pkgs/development/python-modules/auroranoaa/default.nix index bab39ebd64f50..f906b4e42bcb5 100644 --- a/pkgs/development/python-modules/auroranoaa/default.nix +++ b/pkgs/development/python-modules/auroranoaa/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "auroranoaa"; version = "0.0.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 5d7498c794a96..03f2cb571b155 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.6.1"; - format = "pyproject"; + version = "4.7.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-python"; rev = "refs/tags/${version}"; - hash = "sha256-weXEwrOP+TKVwhqCeFVqUw4x+q2Wplr0QWVUzpbNPSc="; + hash = "sha256-Z89T0HXB66MZTYNKSK8fHunUBFuI1wT5jcy+P3+9tIk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index 37e640ca6a8da..3b65404bde72e 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.3.0"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; rev = "refs/tags/v${version}"; - hash = "sha256-qkvr8uYI6+lbNsAPw2PAnPyWRQTE4AEHf3djBfSp3XU="; + hash = "sha256-gdu0Ror/epu6huTEpBrqHD62O9uaL6273pKnpqPKskc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/authres/default.nix b/pkgs/development/python-modules/authres/default.nix index 196e573717b71..52c1d138bc6e1 100644 --- a/pkgs/development/python-modules/authres/default.nix +++ b/pkgs/development/python-modules/authres/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "authres"; version = "1.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/autograd-gamma/default.nix b/pkgs/development/python-modules/autograd-gamma/default.nix index bbb5683e0cee8..a772a09678596 100644 --- a/pkgs/development/python-modules/autograd-gamma/default.nix +++ b/pkgs/development/python-modules/autograd-gamma/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "autograd-gamma"; version = "0.4.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "CamDavidsonPilon"; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 301e71a0a7ad9..6979c01b5960a 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -10,6 +10,7 @@ let automat = buildPythonPackage rec { version = "22.10.0"; + format = "setuptools"; pname = "automat"; src = fetchPypi { diff --git a/pkgs/development/python-modules/avea/default.nix b/pkgs/development/python-modules/avea/default.nix index 64e0dc286330a..01440a0ff9ace 100644 --- a/pkgs/development/python-modules/avea/default.nix +++ b/pkgs/development/python-modules/avea/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "avea"; version = "1.5.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "k0rventen"; diff --git a/pkgs/development/python-modules/avidtools/default.nix b/pkgs/development/python-modules/avidtools/default.nix new file mode 100644 index 0000000000000..acb2ea9c99985 --- /dev/null +++ b/pkgs/development/python-modules/avidtools/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, datetime +, fetchPypi +, nvdlib +, pydantic +, pythonOlder +, setuptools +, typing +, typing-extensions +}: + +buildPythonPackage rec { + pname = "avidtools"; + version = "0.1.1.2"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-t+ohPjOBwY8i+g7VC30ehEu6SFIsn1SwGR/ICkV9blg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + datetime + nvdlib + pydantic + typing + typing-extensions + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "avidtools" + ]; + + meta = with lib; { + description = "Developer tools for AVID"; + homepage = "https://github.com/avidml/avidtools"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix index fb51b698ed822..7c65fd4fc0f66 100644 --- a/pkgs/development/python-modules/avro-python3/default.nix +++ b/pkgs/development/python-modules/avro-python3/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "avro-python3"; version = "1.10.2"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix index 65dfc975837fd..a9a60652b1959 100644 --- a/pkgs/development/python-modules/avro3k/default.nix +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "avro3k"; version = "1.7.7-SNAPSHOT"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/awacs/default.nix b/pkgs/development/python-modules/awacs/default.nix index f59eaccd1b9a0..531d9ace6e641 100644 --- a/pkgs/development/python-modules/awacs/default.nix +++ b/pkgs/development/python-modules/awacs/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "awacs"; version = "2.4.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/awesome-slugify/default.nix b/pkgs/development/python-modules/awesome-slugify/default.nix index 2ddccf85f82fe..cd1717a96b4d6 100644 --- a/pkgs/development/python-modules/awesome-slugify/default.nix +++ b/pkgs/development/python-modules/awesome-slugify/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "awesome-slugify"; version = "1.6.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 2c3bd96fcf22e..476888d1b1a00 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "26"; + version = "27"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-o3wI+JEmtjfUczRUob8/KLGNn3lH0h3GuhIDfYg7HGY="; + hash = "sha256-PBllGL/M5wl2bWOHgEExekkUti+Ag+Gj4DtP1upvPI0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index b4e4774af8ce1..12a4593bbd2da 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.4.10"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-D+bgKI6olK3smgnRdACvd0gYMWvS6ao6f7nQh3YExXw="; + hash = "sha256-lfeoWTmK/VNm3uFLHmIPO4r9aZPK3NhgDwio5WN4jqU="; }; nativeBuildInputs = [ @@ -57,8 +58,6 @@ buildPythonPackage rec { nativeCheckInputs = [ fsspec - jax - jaxlib numba setuptools numexpr @@ -66,6 +65,10 @@ buildPythonPackage rec { pyarrow pytest-xdist pytestCheckHook + ] ++ lib.optionals (!stdenv.isDarwin) [ + # no support for darwin + jax + jaxlib ]; # The following tests have been disabled because they need to be run on a GPU platform. diff --git a/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/pkgs/development/python-modules/aws-encryption-sdk/default.nix index 7c69b062bd800..b9186ab1779c5 100644 --- a/pkgs/development/python-modules/aws-encryption-sdk/default.nix +++ b/pkgs/development/python-modules/aws-encryption-sdk/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "aws-encryption-sdk"; version = "3.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 0509ccced740f..15b1c698d4dcd 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.42.0"; + version = "1.44.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-rgRGKpthZ0nitO91Z5xUimakDFvcLh4UFKnxnEmRLHI="; + hash = "sha256-97NhNlYaxBwUdBmg6qzpGdtGyE86rO/PXl9pDfyitbI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 5d7cbaf889f0d..72930b85bb6d3 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.81.0"; + version = "1.82.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - hash = "sha256-Ik9ZO7l2dbjJg+PlSRUoMkrjSBeghKN5DZjx7CjDBPg="; + hash = "sha256-xAbFF4bKHFv5YAOlMA28lW1Xc37xV83X4r19MdubvFs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index e2fb2414a2c0d..de02fdf8a88eb 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -1,35 +1,77 @@ { lib +, aiohttp +, botocore +, bottle , buildPythonPackage -, fetchPypi -, pythonOlder +, django +, fetchFromGitHub +, httpx , importlib-metadata , jsonpickle -, wrapt +, pymysql +, pytest-asyncio +, pynamodb +, pytestCheckHook +, pythonOlder , requests -, future -, botocore +, sqlalchemy +, webtest +, wrapt }: buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.12.0"; + version = "2.12.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-KVr8I3BzqAlW19TyfDGDDty5qMzKnviqRJkLre8V5bc="; + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-xray-sdk-python"; + rev = "refs/tags/${version}"; + hash = "sha256-NLFNst4Yqsz2u5IXwe8OdJPW77irLRO5tWWn1uV3tMg="; }; propagatedBuildInputs = [ - jsonpickle wrapt requests future botocore + botocore + jsonpickle + requests + wrapt ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - meta = { + nativeCheckInputs = [ + aiohttp + bottle + django + httpx + pymysql + pynamodb + pytest-asyncio + pytestCheckHook + sqlalchemy + webtest + ]; + + disabledTestPaths = [ + # This reduces the amount of dependencies + "tests/ext/" + # We don't care about benchmarks + "tests/test_local_sampling_benchmark.py" + "tests/test_patcher.py" + ]; + + pythonImportsCheck = [ + "aws_xray_sdk" + ]; + + meta = with lib; { description = "AWS X-Ray SDK for the Python programming language"; - license = lib.licenses.asl20; homepage = "https://github.com/aws/aws-xray-sdk-python"; + changelog = "https://github.com/aws/aws-xray-sdk-python/blob/${version}/CHANGELOG.rst"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; }; - - doCheck = false; } diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 9d739c81f7008..dc499f2bcb6ca 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.19.18"; + version = "0.19.19"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NQtu/Y6+4ILqPz5SxZo8PsWUza8B24tIU9zrn+yQyJ0="; + hash = "sha256-HBURU13uFGpsJqOC7T6tViWaEFs7fX2CNVOuVn0Djf4="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index 1d89f2e932417..f63ed81b76fa9 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "awslambdaric"; version = "2.0.7"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/axisregistry/default.nix b/pkgs/development/python-modules/axisregistry/default.nix index 5fba9f0f02dc9..7c87679a9a067 100644 --- a/pkgs/development/python-modules/axisregistry/default.nix +++ b/pkgs/development/python-modules/axisregistry/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "axisregistry"; version = "0.4.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-applicationinsights/default.nix b/pkgs/development/python-modules/azure-applicationinsights/default.nix index 1d4e17edc64ba..3292f0066a96f 100644 --- a/pkgs/development/python-modules/azure-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-applicationinsights/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "azure-applicationinsights"; version = "0.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 47d0039e5e4bb..ed4cd5243abf0 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { version = "1.1.28"; + format = "setuptools"; pname = "azure-common"; disabled = isPyPy; diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index f41bc696d56f8..b8810f06f4656 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "4.5.1"; + format = "setuptools"; pname = "azure-cosmos"; src = fetchPypi { diff --git a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix index a2b686af68875..f256d8d5b4499 100644 --- a/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-cosmosdb-nspkg/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "azure-cosmosdb-nspkg"; version = "2.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix index 8d92e1559d593..42c81a96ff6cd 100644 --- a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix +++ b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-cosmosdb-table"; version = "1.0.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-functions-devops-build/default.nix b/pkgs/development/python-modules/azure-functions-devops-build/default.nix index 03007ae3c2364..aa6e291035785 100644 --- a/pkgs/development/python-modules/azure-functions-devops-build/default.nix +++ b/pkgs/development/python-modules/azure-functions-devops-build/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "0.0.22"; + format = "setuptools"; pname = "azure-functions-devops-build"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/azure-graphrbac/default.nix b/pkgs/development/python-modules/azure-graphrbac/default.nix index 2b05d9ac83d8d..1c26d5e6b29a0 100644 --- a/pkgs/development/python-modules/azure-graphrbac/default.nix +++ b/pkgs/development/python-modules/azure-graphrbac/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "0.61.1"; + format = "setuptools"; pname = "azure-graphrbac"; src = fetchPypi { diff --git a/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix b/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix index fd3f3c0284f97..f060c77edc16a 100644 --- a/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "azure-keyvault-nspkg"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/pkgs/development/python-modules/azure-loganalytics/default.nix index ee3f0460fd7ec..7c18ed7ceb5f2 100644 --- a/pkgs/development/python-modules/azure-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-loganalytics/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "0.1.1"; + format = "setuptools"; pname = "azure-loganalytics"; src = fetchPypi { diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix index 81afa6ff7ed0d..2a75de7bf4938 100644 --- a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-advisor"; version = "9.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 2e8765d27524e..7ef53cb2a2ba2 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "4.0.0"; + format = "setuptools"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 9915297eb120a..4c74e09d36b12 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "3.0.0"; + format = "setuptools"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 2f2c1c72b5783..352d719ddadd1 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-applicationinsights"; version = "4.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index 08b3c763227bf..89ce5b1a40124 100644 --- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-authorization"; version = "4.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix index 0c005c3ea3c2b..fd0a7c019a3fe 100644 --- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-batchai"; version = "2.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix index 94b90e6b196d0..7bf243e3edbbc 100644 --- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-billing"; version = "6.0.0"; #pypi's 0.2.0 doesn't build ootb + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix index 6bc3b2c7c6f0e..4527294c90b35 100644 --- a/pkgs/development/python-modules/azure-mgmt-botservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-botservice/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "2.0.0"; + format = "setuptools"; pname = "azure-mgmt-botservice"; disabled = isPy27; diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix index 89aed74bbb3df..035f3f6c682c8 100644 --- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-commerce"; version = "6.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix index dfd7ac2a3f058..7ce7ce2c3f007 100644 --- a/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { version = "0.20.0"; + format = "setuptools"; pname = "azure-mgmt-common"; src = fetchPypi { diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 495b448c4c999..eb95a00de2a0b 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.3.0"; + version = "30.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5Sl4Y0D4YqpqIYp61qW+trn7VYM8XKoIUcwzFNBJO2M="; + hash = "sha256-C3Qo/YvRXHy9fGa5uwEOClyzeoBs7x9JSNkHGRV2kzQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index c910587a615f2..5156763d55f05 100644 --- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-consumption"; version = "10.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index d4e2f40b211ab..67e7a4bca229e 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "1.4.0"; + format = "setuptools"; pname = "azure-mgmt-core"; src = fetchPypi { diff --git a/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix index 7c76daf619d54..98c697a4e6c67 100644 --- a/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "azure-mgmt-databoxedge"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix index 473ebda1b874c..83d6e314987fc 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datalake-analytics"; version = "0.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix index 8af5fbd0c2e03..8723830d4105b 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datalake-nspkg"; version = "3.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix index 95cbb7bb896b5..2ab479b3f7c2f 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datalake-store"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index 66945c67c6a36..fe57d5d26cc6b 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datamigration"; version = "10.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix index c8f15f5960c17..3f8d43ea36ad3 100644 --- a/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "1.0.0"; + format = "setuptools"; pname = "azure-mgmt-deploymentmanager"; disabled = isPy27; diff --git a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix index 5ca30f45de29d..9a2cf7c027097 100644 --- a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-devspaces"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix index 40ab2fbedcce7..02b21b3dfd351 100644 --- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-devtestlabs"; version = "9.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 85f84b34a79cf..bc8d9eb9e1155 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-dns"; version = "8.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix b/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix index a0b942e6de560..0d7f5a2cdb79d 100644 --- a/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "azure-mgmt-extendedlocation"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix b/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix index 094e79819c2ff..2e3c750c3b3bc 100644 --- a/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-frontdoor"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index 9b9a84bbe21ee..7bd4c36696326 100644 --- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-hanaonazure"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index a6920815f0fa3..e10811f814fa8 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "9.0.0"; + format = "setuptools"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index c8aadd1f4d6a5..6881e5dd8ac5b 100644 --- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "1.2.0"; + format = "setuptools"; pname = "azure-mgmt-imagebuilder"; disabled = isPy27; diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix index 6d226816082d9..660b266207571 100644 --- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-iotcentral"; version = "9.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index 7b75fdbde58e9..df0a7efe8dbfb 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-iothubprovisioningservices"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index 5195c0102db45..474b19814c0b6 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -1,36 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib , azure-common , azure-mgmt-core -, msrest -, msrestazure +, buildPythonPackage +, fetchPypi +, isodate +, pythonOlder }: buildPythonPackage rec { - version = "3.2.0"; pname = "azure-mgmt-kusto"; - disabled = isPy27; + version = "3.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-zgkFMrufHoX3gq9QXo8SlJYZOfV5GlY3pVQXmIWyx7c="; - extension = "zip"; + hash = "sha256-PmGGtyVrYFCMnpiCq9x9uwoMboDO1ePlGAJzrMTj3ps="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure + isodate ]; # no tests included doCheck = false; - pythonImportsCheck = [ "azure.common" "azure.mgmt.kusto" ]; + pythonImportsCheck = [ + "azure.common" + "azure.mgmt.kusto" + ]; meta = with lib; { description = "Microsoft Azure Kusto Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-kusto_${version}/sdk/kusto/azure-mgmt-kusto/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 9629c6e7bba06..499b4362f02c3 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; version = "12.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix index 543589b7aecb7..fa6e67196260b 100644 --- a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-machinelearningcompute"; version = "0.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix index 140f08e13f4a7..830ea71e9a176 100644 --- a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "6.0.0"; + format = "setuptools"; pname = "azure-mgmt-managedservices"; disabled = isPy27; diff --git a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix index eb744b78ff7d7..22df23f03cd32 100644 --- a/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managementgroups/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-managementgroups"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix index 169f52c86d52a..5d91873e96220 100644 --- a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-managementpartner"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix index 628d0bbcac039..d07dd7a1cfe7a 100644 --- a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-marketplaceordering"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 61e979ee10a7d..a9e55d0e775a1 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-network"; - version = "25.1.0"; + version = "25.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+Tn3W/E54D0sRXpPB6XrrbWv/dcKpUvpoK9EuOUhMvw="; + hash = "sha256-EUxCktIjsdHiR7Qa9luNWjeTVn5q2/ojB3IFUiP0GCo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix index 7b7704401c175..75e7718f110b9 100644 --- a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-notificationhubs"; version = "8.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix index 4a01c753a6262..6f5b8912f9a2b 100644 --- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "3.0.2"; + format = "setuptools"; pname = "azure-mgmt-nspkg"; src = fetchPypi { diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix index 30fce38854531..e92d7302d32cb 100644 --- a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-policyinsights"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix index 24b446146856d..9215d8955b911 100644 --- a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-powerbiembedded"; version = "2.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index b24c6ea69b2ea..c73ae220f09d6 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; version = "10.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index a49080152ed4a..9e6f2eb9f797d 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-relay"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix index 7fc7a152cb412..306a7500114f7 100644 --- a/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-scheduler/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-scheduler"; version = "2.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix index c7ae3b1acb5ea..e7a5ff61f1562 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-servicefabric"; version = "2.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix index d3a52e76a6817..513018a1ecc2b 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-servicefabricmanagedclusters"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix index 83916038d9961..520ae24b32100 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-servicelinker"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 75b41758b3d0d..c677f7e3cca09 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; version = "3.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix b/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix index 76f0d7a2b39cc..4adafa254ba16 100644 --- a/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "0.5.0"; + format = "setuptools"; pname = "azure-mgmt-sqlvirtualmachine"; disabled = isPy27; diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix index 9c244435c2d06..1915f15110b9e 100644 --- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-subscription"; version = "3.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index a09677ab8e7d6..1c2745f60f599 100644 --- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "azure-mgmt-synapse"; version = "2.0.0"; + format = "setuptools"; disabled = pythonOlder "3"; src = fetchPypi { diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix index c5190b6d33687..e2ae6c3e9cf57 100644 --- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-mgmt-trafficmanager"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 09f8e3b1fad00..e8bc4d5634574 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "1.2.0"; + format = "setuptools"; pname = "azure-multiapi-storage"; disabled = isPy27; diff --git a/pkgs/development/python-modules/azure-nspkg/default.nix b/pkgs/development/python-modules/azure-nspkg/default.nix index f9c8e8d68c647..a79963cddb26f 100644 --- a/pkgs/development/python-modules/azure-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-nspkg/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "3.0.2"; + format = "setuptools"; pname = "azure-nspkg"; src = fetchPypi { diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix index 64e7a8f63d32d..b7ad663a1b430 100644 --- a/pkgs/development/python-modules/azure-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "azure-servicefabric"; version = "8.2.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix index b54e17db283ee..d47f38396c74f 100644 --- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix +++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "0.20.7"; + format = "setuptools"; pname = "azure-servicemanagement-legacy"; src = fetchPypi { diff --git a/pkgs/development/python-modules/azure-storage-common/default.nix b/pkgs/development/python-modules/azure-storage-common/default.nix index 50fb3450d84f4..361725a307aa2 100644 --- a/pkgs/development/python-modules/azure-storage-common/default.nix +++ b/pkgs/development/python-modules/azure-storage-common/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "azure-storage-common"; version = "2.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-storage-file/default.nix b/pkgs/development/python-modules/azure-storage-file/default.nix index 8ce1d572e8e0c..bf847905ae934 100644 --- a/pkgs/development/python-modules/azure-storage-file/default.nix +++ b/pkgs/development/python-modules/azure-storage-file/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "azure-storage-file"; version = "2.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-storage-nspkg/default.nix b/pkgs/development/python-modules/azure-storage-nspkg/default.nix index b8e243c9b6aa2..9d1394e5be3a0 100644 --- a/pkgs/development/python-modules/azure-storage-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-storage-nspkg/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "azure-storage-nspkg"; version = "3.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix index fc6cd765cdbba..20c3141447474 100644 --- a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix +++ b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "azure-synapse-accesscontrol"; version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix b/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix index 4a8b98be01ba7..18a96ec10fbfd 100644 --- a/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix +++ b/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "azure-synapse-managedprivateendpoints"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/azure-synapse-spark/default.nix b/pkgs/development/python-modules/azure-synapse-spark/default.nix index 554b97c356199..7e21755414353 100644 --- a/pkgs/development/python-modules/azure-synapse-spark/default.nix +++ b/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "azure-synapse-spark"; version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 7bb1551c57707..0664362dd167b 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.1"; + version = "1.29.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Tp9RjtybqCSxB1gFZXrjwNJ4mmwl+OWTzVyHd250Jas="; + hash = "sha256-h/pXLGpQ2+ENxWqIb9yteroaudsS8Hz+sraON+65TMw="; }; nativeBuildInputs = [ @@ -35,7 +35,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ logfury requests - tqdm ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.12") [ @@ -67,6 +66,7 @@ buildPythonPackage rec { "test_raw_api" "test_files_headers" "test_large_file" + "test_file_info_b2_attributes" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix index 4f64e65bae037..f79a0ba005faf 100644 --- a/pkgs/development/python-modules/babelfish/default.nix +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "babelfish"; version = "0.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix index 60978371eb956..d6154a063e7c3 100644 --- a/pkgs/development/python-modules/babelgladeextractor/default.nix +++ b/pkgs/development/python-modules/babelgladeextractor/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "babelgladeextractor"; version = "0.7.0"; + format = "setuptools"; disabled = (!isPy3k); # uses python3 specific file io in setup.py src = fetchPypi { diff --git a/pkgs/development/python-modules/backcall/default.nix b/pkgs/development/python-modules/backcall/default.nix index acc1899044610..adf4daa893ae5 100644 --- a/pkgs/development/python-modules/backcall/default.nix +++ b/pkgs/development/python-modules/backcall/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "backcall"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix index faed6af9cbbd6..ed0915eee5220 100644 --- a/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "backports-zoneinfo"; version = "0.2.1"; + format = "setuptools"; disabled = pythonAtLeast "3.9"; diff --git a/pkgs/development/python-modules/bagit/default.nix b/pkgs/development/python-modules/bagit/default.nix index 5f15060c4e2d7..7f671bb8a4704 100644 --- a/pkgs/development/python-modules/bagit/default.nix +++ b/pkgs/development/python-modules/bagit/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "bagit"; version = "1.8.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "LibraryOfCongress"; diff --git a/pkgs/development/python-modules/banal/default.nix b/pkgs/development/python-modules/banal/default.nix index 066fba0b5c959..d8843dd894864 100644 --- a/pkgs/development/python-modules/banal/default.nix +++ b/pkgs/development/python-modules/banal/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "banal"; version = "1.0.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index 79c19ba765b2d..7d7464ec74da4 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.5"; + version = "1.7.6"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vfxzm6oDuIDC0V0EMbMcZY/8NI6Qf+GX5U4Did1Z4R4="; + hash = "sha256-cs57yXQTdNlvsvHJqJYIKYhfEkP/3nQ95woZzuNT6PM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index 03abf67f86a09..a3316b8651f52 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "bap"; version = "1.3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-python"; diff --git a/pkgs/development/python-modules/baron/default.nix b/pkgs/development/python-modules/baron/default.nix index af8c1a1d36a66..d02a434248fb9 100644 --- a/pkgs/development/python-modules/baron/default.nix +++ b/pkgs/development/python-modules/baron/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "baron"; version = "0.10.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/base36/default.nix b/pkgs/development/python-modules/base36/default.nix index 92b4faf7d9e64..461ecc9127913 100644 --- a/pkgs/development/python-modules/base36/default.nix +++ b/pkgs/development/python-modules/base36/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "base36"; version = "0.1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "tonyseek"; diff --git a/pkgs/development/python-modules/base64io/default.nix b/pkgs/development/python-modules/base64io/default.nix index 4fefa1336214c..32753a710fc87 100644 --- a/pkgs/development/python-modules/base64io/default.nix +++ b/pkgs/development/python-modules/base64io/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "base64io"; version = "1.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/baseline/default.nix b/pkgs/development/python-modules/baseline/default.nix index 947ab4b6c1cb2..a919e42dbc826 100644 --- a/pkgs/development/python-modules/baseline/default.nix +++ b/pkgs/development/python-modules/baseline/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "baseline"; version = "1.2.1"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix index dd51399901285..70be97034ce0d 100644 --- a/pkgs/development/python-modules/baselines/default.nix +++ b/pkgs/development/python-modules/baselines/default.nix @@ -18,6 +18,7 @@ buildPythonPackage { pname = "baselines"; version = "0.1.6"; # remember to manually adjust the rev + format = "setuptools"; src = fetchFromGitHub { owner = "openai"; diff --git a/pkgs/development/python-modules/basemap-data/default.nix b/pkgs/development/python-modules/basemap-data/default.nix index 158c3f3f19c4e..390b4afcf7604 100644 --- a/pkgs/development/python-modules/basemap-data/default.nix +++ b/pkgs/development/python-modules/basemap-data/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "basemap-data"; + format = "setuptools"; inherit (basemap) version src; sourceRoot = "${src.name}/packages/basemap_data"; diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index 9c5ea550abb1e..b8735db0c0457 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "basemap"; version = "1.3.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "matplotlib"; diff --git a/pkgs/development/python-modules/bash-kernel/default.nix b/pkgs/development/python-modules/bash-kernel/default.nix index 1c50b151f01e6..c3ab6083ba1dd 100644 --- a/pkgs/development/python-modules/bash-kernel/default.nix +++ b/pkgs/development/python-modules/bash-kernel/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "bash-kernel"; - version = "0.9.1"; + version = "0.9.3"; pyproject = true; src = fetchPypi { pname = "bash_kernel"; inherit version; - hash = "sha256-AYPVPjYP+baEcQUqmiiagWIXMlFrA04njpcgtdFaFis="; + hash = "sha256-n3oDgRyn2csfv/gIIjfPBFC5cYIlL9C4BYeha2XmbVg="; }; patches = [ diff --git a/pkgs/development/python-modules/basiciw/default.nix b/pkgs/development/python-modules/basiciw/default.nix index 8ae4a59cfb471..33ea28ff0fb89 100644 --- a/pkgs/development/python-modules/basiciw/default.nix +++ b/pkgs/development/python-modules/basiciw/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "basiciw"; version = "0.2.2"; + format = "setuptools"; disabled = isPy27 || isPyPy; diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix index 17d28c129141a..c4fdc9ee92cfd 100644 --- a/pkgs/development/python-modules/batinfo/default.nix +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "batinfo"; version = "0.4.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/baycomp/default.nix b/pkgs/development/python-modules/baycomp/default.nix index 0d4f59745f007..6ed381851535d 100644 --- a/pkgs/development/python-modules/baycomp/default.nix +++ b/pkgs/development/python-modules/baycomp/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "baycomp"; version = "1.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 0d2d87acfad58..eaee0ef0974cb 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "bayespy"; version = "0.5.26"; + format = "setuptools"; # Python 2 not supported and not some old Python 3 because MPL doesn't support # them properly. diff --git a/pkgs/development/python-modules/bcdoc/default.nix b/pkgs/development/python-modules/bcdoc/default.nix index 29c267aa45fbe..b9af315895396 100644 --- a/pkgs/development/python-modules/bcdoc/default.nix +++ b/pkgs/development/python-modules/bcdoc/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "bcdoc"; version = "0.16.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bcf/default.nix b/pkgs/development/python-modules/bcf/default.nix index 03b53ca2e6e92..68501e08d1e37 100644 --- a/pkgs/development/python-modules/bcf/default.nix +++ b/pkgs/development/python-modules/bcf/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "bcf"; version = "1.9.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "hardwario"; diff --git a/pkgs/development/python-modules/bcg/default.nix b/pkgs/development/python-modules/bcg/default.nix index ce32e61ff809d..2a520f23f51fc 100644 --- a/pkgs/development/python-modules/bcg/default.nix +++ b/pkgs/development/python-modules/bcg/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "bcg"; version = "1.17.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "hardwario"; diff --git a/pkgs/development/python-modules/bch/default.nix b/pkgs/development/python-modules/bch/default.nix index 8b9308cf02174..448559c592e2c 100644 --- a/pkgs/development/python-modules/bch/default.nix +++ b/pkgs/development/python-modules/bch/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "bch"; version = "1.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "hardwario"; diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix new file mode 100644 index 0000000000000..e9e0595f3f153 --- /dev/null +++ b/pkgs/development/python-modules/bdffont/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, nix-update-script +, hatch-vcs +, hatchling +, brotli +, fonttools +}: + +buildPythonPackage rec { + pname = "bdffont"; + version = "0.0.15"; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-aXK6zqLFfqLXa/JLmSSW3gtC2+wtutz3/lLdYPZZ/ys="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/TakWolf/bdffont"; + description = "A library for manipulating .bdf format fonts"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 103f88082068a..ef415aa83d7af 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { version = "2.3.6"; + format = "setuptools"; pname = "beancount"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix index ffdb2f6f8f2a8..c0590651ded83 100644 --- a/pkgs/development/python-modules/beanstalkc/default.nix +++ b/pkgs/development/python-modules/beanstalkc/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "beanstalkc"; version = "0.5.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "bosondata"; diff --git a/pkgs/development/python-modules/bech32/default.nix b/pkgs/development/python-modules/bech32/default.nix index 43fc00ee01058..37a120a042c3a 100644 --- a/pkgs/development/python-modules/bech32/default.nix +++ b/pkgs/development/python-modules/bech32/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "bech32"; version = "1.2.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/before-after/default.nix b/pkgs/development/python-modules/before-after/default.nix index 919914d7fd7a1..cc1164eec56bf 100644 --- a/pkgs/development/python-modules/before-after/default.nix +++ b/pkgs/development/python-modules/before-after/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "before-after"; version = "1.0.1"; + format = "setuptools"; src = fetchPypi { pname = "before_after"; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index f90b664ee7aae..b313e88b6c571 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "behave"; version = "1.2.7.dev2"; + format = "setuptools"; src = fetchFromGitHub { owner = "behave"; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 846b58a677b8e..ce81659f8900a 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -9,14 +9,15 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools , voluptuous , zigpy }: buildPythonPackage rec { pname = "bellows"; - version = "0.36.8"; - format = "setuptools"; + version = "0.37.4"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,9 +25,19 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-+p3As+fi6mw9i5q2klFTM9QQ2JoQarwrphc6tB6C94M="; + hash = "sha256-9LrgerS8yC45BKKjBWt/QQlyA6rPsL8AGOI0kFhUosk="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"setuptools-git-versioning<2"' "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ click click-log diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix index 51f641c51eb48..5868378f8d371 100644 --- a/pkgs/development/python-modules/beniget/default.nix +++ b/pkgs/development/python-modules/beniget/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "beniget"; version = "0.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/betacode/default.nix b/pkgs/development/python-modules/betacode/default.nix index 79136e479d261..4b935b34139a2 100644 --- a/pkgs/development/python-modules/betacode/default.nix +++ b/pkgs/development/python-modules/betacode/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { pname = "betacode"; version = "1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "0s84kd9vblbjz61q7zchx64a6hmdqb4lillna5ryh0g9ij76g6r5"; diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix index 087329d103e7d..2588c1c848827 100644 --- a/pkgs/development/python-modules/betamax-matchers/default.nix +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "betamax-matchers"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix index 0ddc9845bfa79..072b3fa4193ba 100644 --- a/pkgs/development/python-modules/betamax-serializers/default.nix +++ b/pkgs/development/python-modules/betamax-serializers/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "betamax-serializers"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index 5906a531f22d8..86f1e2574db78 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "betamax"; version = "0.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/beziers/default.nix b/pkgs/development/python-modules/beziers/default.nix index 0bfb5eeb29ee7..e4295f63ba054 100644 --- a/pkgs/development/python-modules/beziers/default.nix +++ b/pkgs/development/python-modules/beziers/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "beziers"; version = "0.5.0"; + format = "setuptools"; # PyPI doesn't have a proper source tarball, fetch from Github instead src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index af622dfd76246..ade9544f32d03 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -11,14 +11,15 @@ , pytestCheckHook , python , respx +, setuptools , time-machine , tzdata }: buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.14.3"; - format = "setuptools"; + version = "0.14.6"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -26,22 +27,28 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-I/MKjdEu69uis5f/Xuk4H6ynC71IQmfASLr07PdEBXE="; + hash = "sha256-/FL9czp5x/BcKSXXzT19kgGiPFd61BpU7HLtgyyHlIs="; }; nativeBuildInputs = [ pbr + setuptools ]; PBR_VERSION = version; propagatedBuildInputs = [ httpx - pillow pycryptodome pyjwt ]; + passthru.optional-dependencies = { + china = [ + pillow + ]; + }; + postInstall = '' cp -R bimmer_connected/tests/responses $out/${python.sitePackages}/bimmer_connected/tests/ ''; @@ -51,7 +58,7 @@ buildPythonPackage rec { pytestCheckHook respx time-machine - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); preCheck = '' export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo diff --git a/pkgs/development/python-modules/binary2strings/default.nix b/pkgs/development/python-modules/binary2strings/default.nix new file mode 100644 index 0000000000000..c122b67886da2 --- /dev/null +++ b/pkgs/development/python-modules/binary2strings/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pybind11 +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "binary2strings"; + version = "0.1.13"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "glmcdona"; + repo = "binary2strings"; + rev = "refs/tags/v${version}"; + hash = "sha256-3UPT0PdnPAhOu3J2vU5NxE3f4Nb1zwuX3hJiy87nLD0="; + }; + + nativeBuildInputs = [ + pybind11 + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "binary2strings" + ]; + + pytestFlagsArray = [ + "tests/test.py" + ]; + + meta = with lib; { + description = "Module to extract Ascii, Utf8, and Unicode strings from binary data"; + homepage = "https://github.com/glmcdona/binary2strings"; + changelog = "https://github.com/glmcdona/binary2strings/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/binaryornot/default.nix b/pkgs/development/python-modules/binaryornot/default.nix index b7ca1223ccae8..435b5412b2385 100644 --- a/pkgs/development/python-modules/binaryornot/default.nix +++ b/pkgs/development/python-modules/binaryornot/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "binaryornot"; version = "0.4.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/binho-host-adapter/default.nix b/pkgs/development/python-modules/binho-host-adapter/default.nix index 2249a28a5547e..51b9d9908a12b 100644 --- a/pkgs/development/python-modules/binho-host-adapter/default.nix +++ b/pkgs/development/python-modules/binho-host-adapter/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "binho-host-adapter"; version = "0.1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 9fb243a5763dc..9a83a62398673 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { pname = "binwalk${lib.optionalString visualizationSupport "-full"}"; version = "2.3.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "ReFirmLabs"; diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 91b4f529f837e..cb27d3231d4f3 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -7,11 +7,12 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.81"; + version = "1.82"; + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LPOBErbYQVrTnWphGYjNEftfM+sJNGZmqHJjvrqWFOA="; + hash = "sha256-qbENlZroipdEqRxs42AfTIbn7EFnm8k8KfZ5IY9hZ7s="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/biplist/default.nix b/pkgs/development/python-modules/biplist/default.nix index 605500c67490e..26247a3930cda 100644 --- a/pkgs/development/python-modules/biplist/default.nix +++ b/pkgs/development/python-modules/biplist/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "biplist"; version = "1.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index e69b31b118f64..2895aac54621a 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.8.3"; + version = "2.8.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4VWHsr3xjTLrO6JfX1pRvt0NwGsxEqTFPated1O8ZYg="; + hash = "sha256-t1ZP0hjMRHn38BBtNB4Jb3iQe0eGWu7/cCyAffGSfAE="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index 3b1ead8d8962b..d921d9ca56bf7 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "bitcoinlib"; version = "0.12.2"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix index 661b477e65bfd..5c391bbc2dfd0 100644 --- a/pkgs/development/python-modules/bitmath/default.nix +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "bitmath"; version = "1.3.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bitvavo-aio/default.nix b/pkgs/development/python-modules/bitvavo-aio/default.nix index 39094d74e5f58..9dc561afd680f 100644 --- a/pkgs/development/python-modules/bitvavo-aio/default.nix +++ b/pkgs/development/python-modules/bitvavo-aio/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "bitvavo-aio"; version = "1.0.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/bizkaibus/default.nix b/pkgs/development/python-modules/bizkaibus/default.nix index 7de8f2ca223c9..4f55bb14fdbfd 100644 --- a/pkgs/development/python-modules/bizkaibus/default.nix +++ b/pkgs/development/python-modules/bizkaibus/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "bizkaibus"; version = "0.1.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/pkgs/development/python-modules/bkcharts/default.nix index 9e105c09d57bc..cdcd03c18d550 100644 --- a/pkgs/development/python-modules/bkcharts/default.nix +++ b/pkgs/development/python-modules/bkcharts/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "bkcharts"; version = "0.2"; + format = "setuptools"; src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/black-macchiato/default.nix b/pkgs/development/python-modules/black-macchiato/default.nix index 5a7c20e3c43e9..ace0dbe66c425 100644 --- a/pkgs/development/python-modules/black-macchiato/default.nix +++ b/pkgs/development/python-modules/black-macchiato/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "black-macchiato"; version = "1.3.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/bleach-allowlist/default.nix b/pkgs/development/python-modules/bleach-allowlist/default.nix index 81aff57090fe1..96f9b6ccf4167 100644 --- a/pkgs/development/python-modules/bleach-allowlist/default.nix +++ b/pkgs/development/python-modules/bleach-allowlist/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "bleach-allowlist"; version = "1.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index f35d05728ea53..901eb76417ff7 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "bleach"; version = "6.0.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix new file mode 100644 index 0000000000000..358e48d2c281a --- /dev/null +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -0,0 +1,62 @@ +{ lib +, aioesphomeapi +, bleak +, bluetooth-data-tools +, buildPythonPackage +, fetchFromGitHub +, habluetooth +, lru-dict +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "bleak-esphome"; + version = "0.4.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "bluetooth-devices"; + repo = "bleak-esphome"; + rev = "refs/tags/v${version}"; + hash = "sha256-CgzYZTDWI9vvUtndxyERsWk738e22SIF+s5oi7gI9R0="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=bleak_esphome --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aioesphomeapi + bleak + bluetooth-data-tools + habluetooth + lru-dict + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "bleak_esphome" + ]; + + meta = with lib; { + description = "Bleak backend of ESPHome"; + homepage = "https://github.com/bluetooth-devices/bleak-esphome"; + changelog = "https://github.com/bluetooth-devices/bleak-esphome/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index dd9c83181932d..70762d0c524a2 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "blessed"; version = "1.20.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix index 31275a9f07038..d8c97d1e0f505 100644 --- a/pkgs/development/python-modules/blessings/default.nix +++ b/pkgs/development/python-modules/blessings/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "blessings"; version = "1.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 9c9a1f99acff5..0216d0f4305e1 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.22.3"; + version = "0.22.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-J9eBZv/uizkZz53IX1ZfF7IeMOnBonyMD2c5DphW8BQ="; + hash = "sha256-DAy05ucvdamCq1qn6HQecAidAAj/V/sPQBVYeGrnGAc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/blockchain/default.nix b/pkgs/development/python-modules/blockchain/default.nix index e6d523c3c7b89..96c6f41741795 100644 --- a/pkgs/development/python-modules/blockchain/default.nix +++ b/pkgs/development/python-modules/blockchain/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "blockchain"; version = "1.4.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bluepy-devices/default.nix b/pkgs/development/python-modules/bluepy-devices/default.nix index c1baeedcb5e41..45aa2f95c3e83 100644 --- a/pkgs/development/python-modules/bluepy-devices/default.nix +++ b/pkgs/development/python-modules/bluepy-devices/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "bluepy-devices"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { pname = "bluepy_devices"; diff --git a/pkgs/development/python-modules/bluepy/default.nix b/pkgs/development/python-modules/bluepy/default.nix index 11930050ba346..c0053a111415e 100644 --- a/pkgs/development/python-modules/bluepy/default.nix +++ b/pkgs/development/python-modules/bluepy/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "bluepy"; version = "1.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index f681ca357d818..4458815e03ae7 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.16.1"; + version = "0.16.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GJhrL6J/L1+tqa7fN5xwE+8IFZZ9kff2g+04H5M7beY="; + hash = "sha256-2Z+COsWsIezcslCN50oZRTquAXsmxxp7fAjyGScoRq8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index ca4f1a540bbb8..1d2facc1ed1eb 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.15.0"; + version = "1.18.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-8Gbw2vXqKvWo30QKExrmH7lUkZBg7zd3o2xWEqGxSBM="; + hash = "sha256-AN0zalYQ4JQCaBDrE4tq2WwVEXz0LBlfvrxNiPL4oOs="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/blurhash/default.nix b/pkgs/development/python-modules/blurhash/default.nix index d0cf2135f1bcd..08adb2b92b175 100644 --- a/pkgs/development/python-modules/blurhash/default.nix +++ b/pkgs/development/python-modules/blurhash/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "blurhash"; version = "1.1.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "halcy"; diff --git a/pkgs/development/python-modules/bme280spi/default.nix b/pkgs/development/python-modules/bme280spi/default.nix index a7a1e0fb920ef..4a32b507680b4 100644 --- a/pkgs/development/python-modules/bme280spi/default.nix +++ b/pkgs/development/python-modules/bme280spi/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "bme280spi"; version = "0.2.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/bme680/default.nix b/pkgs/development/python-modules/bme680/default.nix index 5c6f0f5baff94..955eee09cdeff 100644 --- a/pkgs/development/python-modules/bme680/default.nix +++ b/pkgs/development/python-modules/bme680/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "bme680"; version = "1.1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "pimoroni"; diff --git a/pkgs/development/python-modules/borb/default.nix b/pkgs/development/python-modules/borb/default.nix new file mode 100644 index 0000000000000..2c8c84bbf20ce --- /dev/null +++ b/pkgs/development/python-modules/borb/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchPypi +, fonttools +, lxml +, pillow +, python-barcode +, pythonOlder +, qrcode +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "borb"; + version = "2.1.20"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-HvPwFtqAPtJrG+O+t8OyQmYHVo6DC7StAjSfAxtuFe4="; + }; + + propagatedBuildInputs = [ + cryptography + fonttools + lxml + pillow + python-barcode + qrcode + requests + setuptools + ]; + + pythonImportsCheck = [ + "borb.pdf" + ]; + + doCheck = false; + + meta = with lib; { + description = "Library for reading, creating and manipulating PDF files in Python"; + homepage = "https://borbpdf.com/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index f71c5db849e25..0acc3cb4589ff 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.79"; + version = "0.2.83"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - hash = "sha256-boz4CiAmB9guhM9irW3m2ZRlt4mmcopWD+/3Y6O/Mxk="; + hash = "sha256-tpncBgKUf2jRmvcHgi2fudTGdCEv0AhHUWD1sPO98/I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index f731c0ebcd342..b31d6d13c527a 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "boto"; version = "2.49.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index ad74f787e7abd..db19b6b5b0b6c 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -363,12 +363,12 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.29.7"; + version = "1.34.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-PrVsWs8ESCmq3eAj1Ox3WPzByx0S6Uy0vIL20HvAruM="; + hash = "sha256-A/4+po7ZeLAYiQnd2EjjYPEZns4GK6F0J53z3JDM/fA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 29adc4aa473f6..418af2721b7fd 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.33.0"; + version = "1.34.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-9f8WY8hvxlPbFk6zYTH+80sOxa51hPWVZNpuqBA9IPQ="; + hash = "sha256-1smqKxGai3dv6ofisZbGSLdOGYw0DbXAb43De6LWKvc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 13bf462424392..746e04df5abe9 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "botorch"; - version = "0.9.4"; + version = "0.9.5"; format = "pyproject"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MSbGjv+5/znoUeveePuTrTOMTQMQvsc064G7WoHfBMI="; + hash = "sha256-M/VOt0p7io0K+VHrAmBJQ71VigH0Ll1D5it6+/o/3jg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/braceexpand/default.nix b/pkgs/development/python-modules/braceexpand/default.nix index 40977d139c10b..76c339bb9ac31 100644 --- a/pkgs/development/python-modules/braceexpand/default.nix +++ b/pkgs/development/python-modules/braceexpand/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "braceexpand"; version = "0.1.7"; + format = "setuptools"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix index ce299e4612cd7..391d10f20df01 100644 --- a/pkgs/development/python-modules/bravia-tv/default.nix +++ b/pkgs/development/python-modules/bravia-tv/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "bravia-tv"; version = "1.0.11"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix index a85e26b485f49..eba18b98c0ab1 100644 --- a/pkgs/development/python-modules/brian2/default.nix +++ b/pkgs/development/python-modules/brian2/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "brian2"; version = "2.5.4"; + format = "setuptools"; src = fetchPypi { pname = "Brian2"; diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index f6cfe58682093..4bdafe08b3d93 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchPypi +, fetchpatch , buildPythonPackage , future , packbits @@ -15,6 +16,7 @@ buildPythonPackage rec { pname = "brother-ql"; version = "0.9.4"; + format = "setuptools"; src = fetchPypi { pname = "brother_ql"; @@ -24,6 +26,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ future packbits pillow pyusb click attrs ]; + patches = [ + (fetchpatch { + # Make compatible with Pillow>=10.0; https://github.com/pklaus/brother_ql/pull/143 + name = "brother-ql-pillow10-compat.patch"; + url = "https://github.com/pklaus/brother_ql/commit/a7e1b94b41f3a6e0f8b365598bc34fb47ca95a6d.patch"; + hash = "sha256-v3YhmsUWBwE/Vli1SbTQO8q1zbtWYI9iMlVFvz5sxmg="; + }) + ]; + meta = with lib; { description = "Python package for the raster language protocol of the Brother QL series label printers"; longDescription = '' diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 91e907c3af335..5fba7e847b017 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "brotli"; version = "1.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "google"; diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix index fd30ab86c07c9..9d246d3873b10 100644 --- a/pkgs/development/python-modules/brotlicffi/default.nix +++ b/pkgs/development/python-modules/brotlicffi/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "brotlicffi"; version = "1.1.0.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/brotlipy/default.nix b/pkgs/development/python-modules/brotlipy/default.nix index 57310eb6a0ffd..4fef96aa5d743 100644 --- a/pkgs/development/python-modules/brotlipy/default.nix +++ b/pkgs/development/python-modules/brotlipy/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "brotlipy"; version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/brottsplatskartan/default.nix b/pkgs/development/python-modules/brottsplatskartan/default.nix index 52c092c74b88c..4c4a0dcbc8fbd 100644 --- a/pkgs/development/python-modules/brottsplatskartan/default.nix +++ b/pkgs/development/python-modules/brottsplatskartan/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "brottsplatskartan"; version = "1.0.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "chrillux"; diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index ee2f5b16ad506..57e9f4f7d082f 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "bsddb3"; version = "6.2.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bson/default.nix b/pkgs/development/python-modules/bson/default.nix index ca78b0806f0dd..afcb46f5d6510 100644 --- a/pkgs/development/python-modules/bson/default.nix +++ b/pkgs/development/python-modules/bson/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "bson"; version = "0.5.10"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bsuite/default.nix b/pkgs/development/python-modules/bsuite/default.nix index e039bf0fa07f9..bf85d8fe7a090 100644 --- a/pkgs/development/python-modules/bsuite/default.nix +++ b/pkgs/development/python-modules/bsuite/default.nix @@ -28,6 +28,7 @@ let bsuite = buildPythonPackage rec { pname = "bsuite"; version = "0.3.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index 9de6dfbdefffb..97658726a4941 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "bt-proximity"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { pname = "bt_proximity"; diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index dddf9d5d9c1f8..7370bf814c935 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.2.0"; + version = "3.3.1"; 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-UYW7yEAg4RJR1ERFDDS6s8OBr0XRTHTJLSuOF7FO6u4="; + hash = "sha256-dFnEgUmmB9P8bKownMp0NsTWPAeMmdKiaxII3O1gT6A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index ee2044506899c..a534257c6dbef 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "btrfs"; version = "13"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 89bb744eb785f..3e66455de7b50 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "bugwarrior"; version = "1.8.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { @@ -22,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "https://github.com/ralphbean/bugwarrior"; + homepage = "https://github.com/GothenburgBitFactory/bugwarrior"; description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index 2f38b6f631781..b671dbf70782c 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "bugzilla"; version = "3.2.0"; + format = "setuptools"; src = fetchPypi { pname = "python-${pname}"; diff --git a/pkgs/development/python-modules/buienradar/default.nix b/pkgs/development/python-modules/buienradar/default.nix index 7612c62211d17..ce7dba941ce71 100644 --- a/pkgs/development/python-modules/buienradar/default.nix +++ b/pkgs/development/python-modules/buienradar/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "buienradar"; version = "1.0.5"; + format = "setuptools"; disabled = pythonOlder "3.4"; diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix index f6c926cf419aa..d52c2a9e2a92d 100644 --- a/pkgs/development/python-modules/bwapy/default.nix +++ b/pkgs/development/python-modules/bwapy/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "bwapy"; version = "0.1.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/bz2file/default.nix b/pkgs/development/python-modules/bz2file/default.nix index 8efb1c083f26d..ef6a9ef270b22 100644 --- a/pkgs/development/python-modules/bz2file/default.nix +++ b/pkgs/development/python-modules/bz2file/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "bz2file"; version = "0.98"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cached-ipaddress/default.nix b/pkgs/development/python-modules/cached-ipaddress/default.nix new file mode 100644 index 0000000000000..c4d29b98bd76c --- /dev/null +++ b/pkgs/development/python-modules/cached-ipaddress/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, cython_3 +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "cached-ipaddress"; + version = "0.3.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "cached-ipaddress"; + rev = "refs/tags/v${version}"; + hash = "sha256-iTQ1DSCZqjAzsf95nYUxnNj5YCb1Y4JIUW5VGIi7yoY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=cached_ipaddress --cov-report=term-missing:skip-covered" "" \ + --replace "Cython>=3.0.5" "Cython" + ''; + + nativeBuildInputs = [ + cython_3 + poetry-core + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cached_ipaddress" + ]; + + meta = with lib; { + description = "Cache construction of ipaddress objects"; + homepage = "https://github.com/bdraco/cached-ipaddress"; + changelog = "https://github.com/bdraco/cached-ipaddress/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index 6a4f874a961c2..4cb5d0e0dcce6 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "cachelib"; version = "0.10.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/cacheyou/default.nix b/pkgs/development/python-modules/cacheyou/default.nix deleted file mode 100644 index 375beadd4f6dc..0000000000000 --- a/pkgs/development/python-modules/cacheyou/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, buildPythonPackage -, cherrypy -, fetchPypi -, filelock -, msgpack -, pdm-backend -, pytestCheckHook -, pythonOlder -, redis -, requests -}: - -buildPythonPackage rec { - pname = "cacheyou"; - version = "23.3"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; - - __darwinAllowLocalNetworking = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-fkCPFfSXj+oiR3NLMIYh919/4Wm0YWeVGccuioXWHV0="; - }; - - nativeBuildInputs = [ - pdm-backend - ]; - - propagatedBuildInputs = [ - msgpack - requests - ]; - - passthru.optional-dependencies = { - filecache = [ - filelock - ]; - redis = [ - redis - ]; - }; - - nativeCheckInputs = [ - cherrypy - pytestCheckHook - ] ++ passthru.optional-dependencies.filecache; - - pythonImportsCheck = [ - "cacheyou" - ]; - - meta = { - description = "The httplib2 caching algorithms packaged up for use with requests"; - homepage = "https://github.com/frostming/cacheyou"; - changelog = "https://github.com/frostming/cacheyou/releases/tag/${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ natsukium ]; - }; -} diff --git a/pkgs/development/python-modules/cachy/default.nix b/pkgs/development/python-modules/cachy/default.nix index c88067146f344..8f16a45fe692c 100644 --- a/pkgs/development/python-modules/cachy/default.nix +++ b/pkgs/development/python-modules/cachy/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "cachy"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cadquery/default.nix b/pkgs/development/python-modules/cadquery/default.nix index 1eb8f73b7a776..5db0b6ae2c997 100644 --- a/pkgs/development/python-modules/cadquery/default.nix +++ b/pkgs/development/python-modules/cadquery/default.nix @@ -25,6 +25,7 @@ let pythonocc-core-cadquery = toPythonModule (stdenv.mkDerivation { pname = "pythonocc-core-cadquery"; version = "0.18.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "CadQuery"; diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 15daa3b0697c5..ad16084d0f1be 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -5,27 +5,35 @@ , lxml , pytestCheckHook , pythonOlder +, python , pytz , recurring-ical-events , requests +, setuptools +, toPythonModule , tzlocal , vobject +, xandikos }: buildPythonPackage rec { pname = "caldav"; - version = "1.3.6"; + version = "1.3.9"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-caldav"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-N3pY3UYxOZgZbXqqsvASej12dOtdpyEHOL10btOKm/w="; + hash = "sha256-R9zXwD0sZE4bg6MTHWWCWWlZ5wH0H6g650zA7AboAo8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ vobject lxml @@ -38,21 +46,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + (toPythonModule (xandikos.override { python3Packages = python.pkgs; })) ]; - # xandikos and radicale are only optional test dependencies, not available for python3 - postPatch = '' - substituteInPlace setup.py \ - --replace xandikos "" \ - --replace radicale "" - ''; - pythonImportsCheck = [ "caldav" ]; meta = with lib; { description = "CalDAV (RFC4791) client library"; homepage = "https://github.com/python-caldav/caldav"; - changelog = "https://github.com/python-caldav/caldav/releases/tag/v${version}"; + changelog = "https://github.com/python-caldav/caldav/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ marenz dotlambda ]; }; diff --git a/pkgs/development/python-modules/calmjs-types/default.nix b/pkgs/development/python-modules/calmjs-types/default.nix index 9f940e92c5024..897ddaf79e0c7 100644 --- a/pkgs/development/python-modules/calmjs-types/default.nix +++ b/pkgs/development/python-modules/calmjs-types/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "calmjs-types"; version = "1.0.1"; + format = "setuptools"; src = fetchPypi { pname = "calmjs.types"; diff --git a/pkgs/development/python-modules/calmjs/default.nix b/pkgs/development/python-modules/calmjs/default.nix index 2f27dbc98523d..a605034b7a931 100644 --- a/pkgs/development/python-modules/calmjs/default.nix +++ b/pkgs/development/python-modules/calmjs/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "calmjs"; version = "3.4.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 4688c65074951..28c401b667fe1 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "can"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "hardbyte"; repo = "python-can"; rev = "refs/tags/v${version}"; - hash = "sha256-JsYAh5Z6RIX6aWpSuW+VIzJRPf5MfNbBGg36v3CQiLU="; + hash = "sha256-t2zt54nPOYcEE0RPb4fbW7sN4HzFXlDIHvHudstBwrM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 6846ed86f6f8a..55503c9f6205c 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "capstone"; version = lib.getVersion capstone; + format = "setuptools"; src = capstone.src; sourceRoot = "${src.name}/bindings/python"; diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 082c765b39dc5..51d5064aefa3f 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "capturer"; version = "3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "xolox"; diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index 4383998377115..f6647abbc57e8 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "carbon"; version = "1.1.10"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/casttube/default.nix b/pkgs/development/python-modules/casttube/default.nix index 9d29a01374367..4d836dc052fea 100644 --- a/pkgs/development/python-modules/casttube/default.nix +++ b/pkgs/development/python-modules/casttube/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "casttube"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cbor/default.nix b/pkgs/development/python-modules/cbor/default.nix index cc3d8914ad2f6..3d33c3ce24f74 100644 --- a/pkgs/development/python-modules/cbor/default.nix +++ b/pkgs/development/python-modules/cbor/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "cbor"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/celery-redbeat/default.nix b/pkgs/development/python-modules/celery-redbeat/default.nix index a61eacfcb86c2..779dfb68c4c54 100644 --- a/pkgs/development/python-modules/celery-redbeat/default.nix +++ b/pkgs/development/python-modules/celery-redbeat/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "celery-redbeat"; version = "2.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "sibson"; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 750e3908cd3f0..7c22634f2a3c5 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.3.4"; + version = "5.3.6"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-kCPfaoli2nnrMMDITV9IY9l5OkZjVMyTHX9yQjmW3ig="; + hash = "sha256-hwzHHXN8AgDDlykNcwNEzJkdE6BXU0NT0STJOAJnqrk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 9c24281e8d62a..f4b1f97f8cfaa 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.9"; - format = "pyproject"; + version = "2.2.10"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Q6Ii2fsJYNABhuaRK4nZ6bjjvNsoIcgNVFBXdBgTXIo="; + hash = "sha256-rjLTEaHSBB6igffNGt4qJZeSyIn1Cc1ZGEGfEoMj7OQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cepa/default.nix b/pkgs/development/python-modules/cepa/default.nix index 67c45a26665ba..ef7850caf211a 100644 --- a/pkgs/development/python-modules/cepa/default.nix +++ b/pkgs/development/python-modules/cepa/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "cepa"; version = "1.8.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index 69f2f890e359c..2b66de576d27f 100644 --- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "certbot-dns-cloudflare"; + format = "setuptools"; inherit (certbot) src version; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/certbot-dns-google/default.nix b/pkgs/development/python-modules/certbot-dns-google/default.nix index e5910ff085712..6d5ab6954e9d5 100644 --- a/pkgs/development/python-modules/certbot-dns-google/default.nix +++ b/pkgs/development/python-modules/certbot-dns-google/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "certbot-dns-google"; + format = "setuptools"; inherit (certbot) src version; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/certbot-dns-inwx/default.nix b/pkgs/development/python-modules/certbot-dns-inwx/default.nix index 2874e9419e39c..7408bb2dc2e25 100644 --- a/pkgs/development/python-modules/certbot-dns-inwx/default.nix +++ b/pkgs/development/python-modules/certbot-dns-inwx/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "certbot-dns-inwx"; version = "2.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/certbot-dns-ovh/default.nix b/pkgs/development/python-modules/certbot-dns-ovh/default.nix index da0dd57cff874..d9b554c7a86c6 100644 --- a/pkgs/development/python-modules/certbot-dns-ovh/default.nix +++ b/pkgs/development/python-modules/certbot-dns-ovh/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "certbot-dns-ovh"; + format = "setuptools"; inherit (certbot) src version; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix index ec360f4b1e6f4..9278435e09f00 100644 --- a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix +++ b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "certbot-dns-rfc2136"; + format = "setuptools"; inherit (certbot) src version; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/certbot-dns-route53/default.nix b/pkgs/development/python-modules/certbot-dns-route53/default.nix index 6ea6af0820f7d..7637aec52b88c 100644 --- a/pkgs/development/python-modules/certbot-dns-route53/default.nix +++ b/pkgs/development/python-modules/certbot-dns-route53/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "certbot-dns-route53"; + format = "setuptools"; inherit (certbot) src version; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 6da3be8329b22..97b7d79040d94 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { pname = "certbot"; version = "2.7.4"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 8a2fd3bb88cf4..b9b703af622ec 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "certifi"; version = "2023.07.22"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix index a3cde807076f6..33bfc2f72e789 100644 --- a/pkgs/development/python-modules/certipy/default.nix +++ b/pkgs/development/python-modules/certipy/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "certipy"; version = "0.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/certvalidator/default.nix b/pkgs/development/python-modules/certvalidator/default.nix index ce30bea9f51b5..f1f6126c69df3 100644 --- a/pkgs/development/python-modules/certvalidator/default.nix +++ b/pkgs/development/python-modules/certvalidator/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "certvalidator"; version = "0.11.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "wbond"; diff --git a/pkgs/development/python-modules/cexprtk/default.nix b/pkgs/development/python-modules/cexprtk/default.nix index 53c906c613baf..a805c98f73ece 100644 --- a/pkgs/development/python-modules/cexprtk/default.nix +++ b/pkgs/development/python-modules/cexprtk/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "cexprtk"; version = "0.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index fdbfe0ff71a2a..9e025568858c4 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.8.6"; + version = "0.8.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "xarray-contrib"; repo = "cf-xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-qcoHz/yZoPVu0uBKKx4AV7MOokiuXSCaWPD/92VlRFk="; + hash = "sha256-ldnrEks6NkUkaRaev0X6aRHdOZHfsy9/Maihvq8xdSs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cfscrape/default.nix b/pkgs/development/python-modules/cfscrape/default.nix index f050217c3fb35..0152506787033 100644 --- a/pkgs/development/python-modules/cfscrape/default.nix +++ b/pkgs/development/python-modules/cfscrape/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "cfscrape"; version = "2.1.1"; + format = "setuptools"; src = fetchFromGitHub ({ owner = "Anorov"; repo = "cloudflare-scrape"; diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix index f61e02878c54e..966a6b7ff159f 100644 --- a/pkgs/development/python-modules/cgen/default.nix +++ b/pkgs/development/python-modules/cgen/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "cgen"; version = "2020.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index 8b3a6afa9b36d..2d65a03f68d0e 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "0.8"; + format = "setuptools"; pname = "cgroup-utils"; buildInputs = [ pep8 nose ]; diff --git a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 1d1b21ceee575..4c2cabda2cd38 100644 --- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -17,7 +17,7 @@ let pname = "chacha20poly1305-reuseable"; - version = "0.11.0"; + version = "0.12.0"; in buildPythonPackage { @@ -30,7 +30,7 @@ buildPythonPackage { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-uRndA0NnSQtJTftALzBF3FWZtavRyMwBlnCBqoIXE5Q="; + hash = "sha256-g1sLmYy5SClkdBSjFFYtikh2nuxfTIoaCyktqoFl+Ho="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix index 9f9d48d901713..6146ec692c75f 100644 --- a/pkgs/development/python-modules/chai/default.nix +++ b/pkgs/development/python-modules/chai/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "chai"; version = "1.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix index 4619bff2b0469..9b96d4bac94e4 100644 --- a/pkgs/development/python-modules/chainmap/default.nix +++ b/pkgs/development/python-modules/chainmap/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "chainmap"; version = "1.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/character-encoding-utils/default.nix b/pkgs/development/python-modules/character-encoding-utils/default.nix new file mode 100644 index 0000000000000..dd0e3b60fe1f4 --- /dev/null +++ b/pkgs/development/python-modules/character-encoding-utils/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, nix-update-script +, hatch-vcs +, hatchling +}: + +buildPythonPackage rec { + pname = "character-encoding-utils"; + version = "0.0.6"; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + pname = "character_encoding_utils"; + inherit version; + hash = "sha256-ugzWiSpa/xxlraVyVPTSq/uxPg11kOyePgb1cmzX3ug="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + checkInputs = [ pytestCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/TakWolf/character-encoding-utils"; + description = "Some character encoding utils"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix index ae86e18865153..d63c247b300bb 100644 --- a/pkgs/development/python-modules/characteristic/default.nix +++ b/pkgs/development/python-modules/characteristic/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "characteristic"; version = "14.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380"; diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 5f8117c6e586e..0c493e320ed55 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "chart-studio"; version = "5.17.0"; + format = "setuptools"; # chart-studio was split from plotly src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index 24e3194d80c01..b85870572a4c3 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "cheetah3"; - version = "3.3.2"; + version = "3.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "CheetahTemplate3"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-okQz1wM3k43okKcZDRgHAnn5ScL0Pe1OtUvDBScEamY="; + hash = "sha256-7L3SBMgNOOLAFvQST8I0gFlrya/6Lwp/umzolfJx3t4="; }; doCheck = false; # Circular dependency diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 679c5464b8f57..839894e1505b8 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { pname = "cheroot"; version = "10.0.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/cherrypy-cors/default.nix b/pkgs/development/python-modules/cherrypy-cors/default.nix new file mode 100644 index 0000000000000..72af66bbef75a --- /dev/null +++ b/pkgs/development/python-modules/cherrypy-cors/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +, setuptools-scm +, httpagentparser +, cherrypy +, pytestCheckHook +}: +buildPythonPackage rec { + pname = "cherrypy-cors"; + version = "1.7.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gzhM1mSnq4uat9SSb+lxOs/gvONmXuKBiaD6BLnyEtY="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + httpagentparser + cherrypy + ]; + + pythonImportsCheck = [ "cherrypy_cors" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "CORS support for CherryPy"; + homepage = "https://github.com/cherrypy/cherrypy-cors"; + license = licenses.mit; + maintainers = with maintainers; [ jpts ]; + }; +} diff --git a/pkgs/development/python-modules/chevron/default.nix b/pkgs/development/python-modules/chevron/default.nix index 5f8cc32175085..48b1a5c5c1571 100644 --- a/pkgs/development/python-modules/chevron/default.nix +++ b/pkgs/development/python-modules/chevron/default.nix @@ -7,6 +7,7 @@ buildPythonPackage { pname = "chevron"; version = "0.13.1"; + format = "setuptools"; # No tests available in the PyPI tarball src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/chromaprint/default.nix b/pkgs/development/python-modules/chromaprint/default.nix index e4161064acce8..b439a4da79a5a 100644 --- a/pkgs/development/python-modules/chromaprint/default.nix +++ b/pkgs/development/python-modules/chromaprint/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "chromaprint"; version = "0.5"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/ci-info/default.nix b/pkgs/development/python-modules/ci-info/default.nix index 5034347fa1fb6..8c2fc9c4ff3b5 100644 --- a/pkgs/development/python-modules/ci-info/default.nix +++ b/pkgs/development/python-modules/ci-info/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "0.3.0"; + format = "setuptools"; pname = "ci-info"; disabled = isPy27; diff --git a/pkgs/development/python-modules/cinemagoer/default.nix b/pkgs/development/python-modules/cinemagoer/default.nix index 33cff05b3850f..403ee6dafb616 100644 --- a/pkgs/development/python-modules/cinemagoer/default.nix +++ b/pkgs/development/python-modules/cinemagoer/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "cinemagoer"; version = "2023.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cirq-aqt/default.nix b/pkgs/development/python-modules/cirq-aqt/default.nix index f8e6fb4a2bf24..bac507091feb4 100644 --- a/pkgs/development/python-modules/cirq-aqt/default.nix +++ b/pkgs/development/python-modules/cirq-aqt/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "cirq-aqt"; + format = "setuptools"; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index fe6a04480f666..31077bd109e4b 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildPythonPackage -, pythonAtLeast , pythonOlder , fetchFromGitHub , duet @@ -84,17 +83,9 @@ buildPythonPackage rec { "cirq/_version_test.py" ]; - disabledTests = [ - # Tries to import flynt, which isn't in Nixpkgs - "test_metadata_search_path" - # Fails due pandas MultiIndex. Maybe issue with pandas version in nix? - "test_benchmark_2q_xeb_fidelities" - # https://github.com/quantumlib/Cirq/pull/5991 - "test_json_and_repr_data" - # Tests for some changed error handling behavior in SymPy 1.12 - "test_custom_value_not_implemented" - # Calibration issue - "test_xeb_to_calibration_layer" + disabledTests = lib.optionals stdenv.isAarch64 [ + # https://github.com/quantumlib/Cirq/issues/5924 + "test_prepare_two_qubit_state_using_sqrt_iswap" ]; meta = with lib; { @@ -103,6 +94,5 @@ buildPythonPackage rec { changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger fab ]; - broken = (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/development/python-modules/cirq-ft/default.nix b/pkgs/development/python-modules/cirq-ft/default.nix index 83a8392b95204..d307191dd9afb 100644 --- a/pkgs/development/python-modules/cirq-ft/default.nix +++ b/pkgs/development/python-modules/cirq-ft/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "cirq-ft"; + format = "setuptools"; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index a49eebfce90d6..4f185c825c340 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "cirq-google"; + format = "setuptools"; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/cirq-ionq/default.nix b/pkgs/development/python-modules/cirq-ionq/default.nix index b1f66e25ced29..fdad606eb069e 100644 --- a/pkgs/development/python-modules/cirq-ionq/default.nix +++ b/pkgs/development/python-modules/cirq-ionq/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "cirq-ionq"; + format = "setuptools"; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/cirq-pasqal/default.nix b/pkgs/development/python-modules/cirq-pasqal/default.nix index 4d755266180bb..7be607fbd74d6 100644 --- a/pkgs/development/python-modules/cirq-pasqal/default.nix +++ b/pkgs/development/python-modules/cirq-pasqal/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "cirq-pasqal"; + format = "setuptools"; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix index be0ec040995b6..2189beb9f880f 100644 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { pname = "cirq-rigetti"; + format = "setuptools"; inherit (cirq-core) version src meta; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/cirq-web/default.nix b/pkgs/development/python-modules/cirq-web/default.nix index ca1c67ad12183..43f18ef282e10 100644 --- a/pkgs/development/python-modules/cirq-web/default.nix +++ b/pkgs/development/python-modules/cirq-web/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "cirq-web"; + format = "setuptools"; inherit (cirq-core) version src meta; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index f53613065fb3a..200f19e39f6fa 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "cirq"; + format = "setuptools"; inherit (cirq-core) version src meta; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ciscomobilityexpress/default.nix b/pkgs/development/python-modules/ciscomobilityexpress/default.nix index d48ba03ad5377..c24873bf3174b 100644 --- a/pkgs/development/python-modules/ciscomobilityexpress/default.nix +++ b/pkgs/development/python-modules/ciscomobilityexpress/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "ciscomobilityexpress"; version = "1.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix index d0294a28ae129..d46a6bdb70d67 100644 --- a/pkgs/development/python-modules/citeproc-py/default.nix +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "citeproc-py"; version = "0.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index eb6e68f1359f9..d8b74f55f7d41 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "9.10.6"; + version = "9.11.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-OlSbeMBINN4gyFUklLh9zrQNv0VkRZxRwml4jbMjumE="; + hash = "sha256-uCXtd9m2phIgP85syIPtoFIxM9dkBzFxxK6OOF0VWAA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 1d541e3dab724..ec46f1603855f 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "9.10.4"; + version = "9.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-i/B4wtSqG/ZysAcidsXnqYPdcmu93Ufd6N9fxUmDJ2E="; + hash = "sha256-4m4h2TbiZPvcpZn8h0z+GN+9w3Udik2NVAtFSF4gFgQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index c343f7f3e8723..81a111c7f1454 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -8,12 +8,12 @@ , pysmt , pythonOlder , pytestCheckHook -, z3 +, z3-solver }: buildPythonPackage rec { pname = "claripy"; - version = "9.2.79"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-N2w4djqJ9r2inLHwhyqNVUqjrlKVo75BblN5xURkMIc="; + hash = "sha256-veJd3M2Jf6snXZsR4P0wQpC0rSbIFT92QgyFFI5Er4Y="; }; nativeBuildInputs = [ @@ -34,19 +34,13 @@ buildPythonPackage rec { decorator future pysmt - z3 + z3-solver ]; nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - # Use upstream z3 implementation - substituteInPlace setup.cfg \ - --replace "z3-solver==4.10.2.0" "" - ''; - pythonImportsCheck = [ "claripy" ]; diff --git a/pkgs/development/python-modules/classify-imports/default.nix b/pkgs/development/python-modules/classify-imports/default.nix index 694d4da421111..cdbc262af7ddf 100644 --- a/pkgs/development/python-modules/classify-imports/default.nix +++ b/pkgs/development/python-modules/classify-imports/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "classify-imports"; version = "4.2.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix index 8ae90785669e5..876a6f4492f6e 100644 --- a/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "cld2-cffi"; version = "0.1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -21,6 +22,5 @@ buildPythonPackage rec { description = "CFFI bindings around Google Chromium's embedded compact language detection library (CLD2)"; homepage = "https://github.com/GregBowyer/cld2-cffi"; license = licenses.asl20; - maintainers = with maintainers; [ rvl ]; }; } diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index ffe235dc0b37d..1ae119f8404a3 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.79"; + version = "9.2.82"; # 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-HVCKw7L5Y/4TR26mWOZ8lKhWOcq0yQqo2LWKQjVSPX4="; + hash = "sha256-fUp0nS4ILU90uvROH3qNy3kYrpt7yHzbCG5TE/0BqKU="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-Zy62O3Mf9V7aGvQejsv4b6JVrHuDIrrqvTSs7/mVdtY="; + hash = "sha256-wzRHYgnZPLDgcf1IlXxY2a52mbeImejj/F8DUAuB1VU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix index 978d08051f7d8..d63079f725e2a 100644 --- a/pkgs/development/python-modules/clf/default.nix +++ b/pkgs/development/python-modules/clf/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "clf"; version = "0.5.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/click-aliases/default.nix b/pkgs/development/python-modules/click-aliases/default.nix index 18a97769b3d84..f216d12909966 100644 --- a/pkgs/development/python-modules/click-aliases/default.nix +++ b/pkgs/development/python-modules/click-aliases/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "click-aliases"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "click-contrib"; repo = "click-aliases"; rev = "v${version}"; - hash = "sha256-HTjo6ID27W7D4MZjeAJMSy5yVd6oKg0Ed9/kDtQZ7Vw="; + hash = "sha256-3/O5odibSjo5inlLCvUlotphhMVLBdaND/M2f40pMyM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index dcfcab597b90c..b2e0a57bbcc8a 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "click-completion"; version = "0.5.2"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/click-datetime/default.nix b/pkgs/development/python-modules/click-datetime/default.nix index ba710d74355d8..5e570130f0306 100644 --- a/pkgs/development/python-modules/click-datetime/default.nix +++ b/pkgs/development/python-modules/click-datetime/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "click-datetime"; version = "0.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "click-contrib"; diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index 8e5668f2b05a5..043627b0501e9 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "click-default-group"; version = "1.2.2"; + format = "setuptools"; # No tests in Pypi tarball src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix index 565663aee0ccc..8c1bf6f26e94f 100644 --- a/pkgs/development/python-modules/click-didyoumean/default.nix +++ b/pkgs/development/python-modules/click-didyoumean/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "click-didyoumean"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index 7f091396dfc1f..0b3622b9dc983 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "click-log"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix index a03456b17d81c..f695f07f84b03 100644 --- a/pkgs/development/python-modules/click-plugins/default.nix +++ b/pkgs/development/python-modules/click-plugins/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "click-plugins"; version = "1.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index fd2a20867bdcd..f8a8fc1c49f8c 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "click-repl"; version = "0.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "click-contrib"; diff --git a/pkgs/development/python-modules/click-spinner/default.nix b/pkgs/development/python-modules/click-spinner/default.nix index 2cdd1f4800cd2..0c281c29ab4c6 100644 --- a/pkgs/development/python-modules/click-spinner/default.nix +++ b/pkgs/development/python-modules/click-spinner/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "click-spinner"; version = "0.1.10"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix index 7fd47fcc8253b..771678354ca09 100644 --- a/pkgs/development/python-modules/click-threading/default.nix +++ b/pkgs/development/python-modules/click-threading/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "click-threading"; version = "0.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index 4bb7603b9c217..7822dbc8bcaff 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "clickclick"; version = "1.2.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "hjacobs"; diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index 35c3d7773bed0..9f6e4519c2628 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.6.21"; + version = "0.6.23"; format = "setuptools"; @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; rev = "refs/tags/v${version}"; - hash = "sha256-gPxJKNW4JiMmIAwn4WPrzqoRPhigjMEDyCX/7jSUv0c="; + hash = "sha256-Gaiq5t/u5LJeJR5nNNfBvdNaFEycqgxVCHFETIvsUUU="; }; nativeBuildInputs = [ cython_3 ]; diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix index 375fee87486cd..3abeeb013ff61 100644 --- a/pkgs/development/python-modules/clickhouse-driver/default.nix +++ b/pkgs/development/python-modules/clickhouse-driver/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "clickhouse-driver"; version = "0.2.5"; + format = "setuptools"; # pypi source doesn't contain tests src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 978c1c3f62f8b..9c6d88c9dab69 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "cliff"; version = "4.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 645fdc43764fc..84859729c5b1d 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "clifford"; version = "1.4.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index 521a7b31ef368..666a143e96207 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "cligj"; version = "0.7.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "mapbox"; diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix index 6099c3c635911..deb62fbfcb460 100644 --- a/pkgs/development/python-modules/clint/default.nix +++ b/pkgs/development/python-modules/clint/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "clint"; version = "0.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 83c0f5c5d684c..76b2eceaeb094 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { pname = "clldutils"; version = "3.19.0"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index f7e1cb2cf073a..d6f9eedbec0f4 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.12.4"; + version = "2.14.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UX8ROC6pL8WR82zJupUkPac+aDReUvIh8D1R1ujXhqU="; + hash = "sha256-HeSaiJKI2C3FwPKip0ZVKWe5nZYGP13zpXpwNkLiQLQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index ae22d4bcafbfa..b76de3717bf48 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "cloudpathlib"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "drivendataorg"; repo = "cloudpathlib"; - rev = "v${version}"; - hash = "sha256-d4CbzPy3H5HQ4YmSRCRMEYaTpwB7F0Bznd26aKWiHTA="; + rev = "refs/tags/v${version}"; + hash = "sha256-rj8v4EUMPdB5zmbP4VQli2H6GjDor3BHaA95GwoKS5E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix index 71273ed1a226d..a5a03389b8dbf 100644 --- a/pkgs/development/python-modules/cmdline/default.nix +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "cmdline"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cmigemo/default.nix b/pkgs/development/python-modules/cmigemo/default.nix index fb381ec185988..9122954a62d83 100644 --- a/pkgs/development/python-modules/cmigemo/default.nix +++ b/pkgs/development/python-modules/cmigemo/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "cmigemo"; version = "0.1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cmsis-svd/default.nix b/pkgs/development/python-modules/cmsis-svd/default.nix index cdfdd05e52170..4d60d4039fe60 100644 --- a/pkgs/development/python-modules/cmsis-svd/default.nix +++ b/pkgs/development/python-modules/cmsis-svd/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "cmsis-svd"; version = "0.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "posborne"; diff --git a/pkgs/development/python-modules/co2signal/default.nix b/pkgs/development/python-modules/co2signal/default.nix index 2c7aeb4ceaebf..9af604c5dd84f 100644 --- a/pkgs/development/python-modules/co2signal/default.nix +++ b/pkgs/development/python-modules/co2signal/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "co2signal"; version = "0.4.2"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/cobs/default.nix b/pkgs/development/python-modules/cobs/default.nix index e5ba04c960fea..6b7df1bd8dd63 100644 --- a/pkgs/development/python-modules/cobs/default.nix +++ b/pkgs/development/python-modules/cobs/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "cobs"; version = "1.2.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -37,6 +38,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/cmcqueen/cobs-python/"; license = licenses.mit; - maintainers = [ teams.ororatech ]; + maintainers = teams.ororatech.members; }; } diff --git a/pkgs/development/python-modules/cock/default.nix b/pkgs/development/python-modules/cock/default.nix index 47e3364ea0b75..62d1b15486908 100644 --- a/pkgs/development/python-modules/cock/default.nix +++ b/pkgs/development/python-modules/cock/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "cock"; version = "0.11.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 07e070d0493e6..1c930529a31e5 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "coconut"; version = "3.0.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "evhub"; diff --git a/pkgs/development/python-modules/cocotb-bus/default.nix b/pkgs/development/python-modules/cocotb-bus/default.nix index 02b9d71849067..40f2dc86c803e 100644 --- a/pkgs/development/python-modules/cocotb-bus/default.nix +++ b/pkgs/development/python-modules/cocotb-bus/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "cocotb-bus"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index e8c78e1b91c2c..22cc1ced77621 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "cocotb"; version = "1.8.1"; + format = "setuptools"; # pypi source doesn't include tests src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 4aaf0a403be00..c6af62860d4b6 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "codecov"; version = "2.1.13"; + format = "setuptools"; src = fetchFromGitHub { owner = "codecov"; diff --git a/pkgs/development/python-modules/codepy/default.nix b/pkgs/development/python-modules/codepy/default.nix index ccf1eeaad9eff..6f6c7d22bc9f8 100644 --- a/pkgs/development/python-modules/codepy/default.nix +++ b/pkgs/development/python-modules/codepy/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "codepy"; version = "2019.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "inducer"; diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 47f98327cb375..ab10055187d03 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -31,20 +31,19 @@ buildPythonPackage rec { pname = "coffea"; - version = "2023.10.0.rc1"; + version = "2023.12.0"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-1mfTuZDfkD0NjcmSoXN3BLC5o+dWvw+r65ukZTZf8j4="; + hash = "sha256-Xlud3ibdI4UnoHe72NPc7WQojuWPpXtncENDinYgk4o="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "numba>=0.58.0" "numba" \ - --replace "numpy>=1.22.0,<1.26" "numpy" + --replace "numba>=0.58.1" "numba" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 92dbe23cd916a..92d44c82ef3df 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "cogapp"; version = "3.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/coincurve/default.nix b/pkgs/development/python-modules/coincurve/default.nix index 1ad80f6d66942..58423859779aa 100644 --- a/pkgs/development/python-modules/coincurve/default.nix +++ b/pkgs/development/python-modules/coincurve/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "coincurve"; version = "18.0.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/collidoscope/default.nix b/pkgs/development/python-modules/collidoscope/default.nix index 1398043f6b1ca..2d446fc9505b0 100644 --- a/pkgs/development/python-modules/collidoscope/default.nix +++ b/pkgs/development/python-modules/collidoscope/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "collidoscope"; version = "0.6.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index 9167fd5a4f262..efee49934d875 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "colorcet"; version = "3.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix index f1a153ee1bc95..e524ae49eb3d4 100644 --- a/pkgs/development/python-modules/colorclass/default.nix +++ b/pkgs/development/python-modules/colorclass/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "colorclass"; version = "2.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/colored-traceback/default.nix b/pkgs/development/python-modules/colored-traceback/default.nix index 137b4d0157e28..a2cdfea30b2c3 100644 --- a/pkgs/development/python-modules/colored-traceback/default.nix +++ b/pkgs/development/python-modules/colored-traceback/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "colored-traceback"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index 44c47f569ebb5..edc708f93e062 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "coloredlogs"; version = "15.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "xolox"; diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 833217bdb887e..452908a62c69e 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "colorlog"; version = "6.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix index d255ff0992f54..1fda9111e6fa4 100644 --- a/pkgs/development/python-modules/colorlover/default.nix +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "colorlover"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/colormath/default.nix b/pkgs/development/python-modules/colormath/default.nix index 33f233443dd49..42469056b096a 100644 --- a/pkgs/development/python-modules/colormath/default.nix +++ b/pkgs/development/python-modules/colormath/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { # versions, should be included in versions > 3.0 # https://github.com/gtaylor/python-colormath/issues/104 version = "unstable-2021-04-17"; + format = "setuptools"; src = fetchFromGitHub { owner = "gtaylor"; diff --git a/pkgs/development/python-modules/colorspacious/default.nix b/pkgs/development/python-modules/colorspacious/default.nix index 6f75d343066a8..d9a83e85ec35e 100644 --- a/pkgs/development/python-modules/colorspacious/default.nix +++ b/pkgs/development/python-modules/colorspacious/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "colorspacious"; version = "1.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/colorthief/default.nix b/pkgs/development/python-modules/colorthief/default.nix index cdb37df3e3924..4e0527cbc7040 100644 --- a/pkgs/development/python-modules/colorthief/default.nix +++ b/pkgs/development/python-modules/colorthief/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "colorthief"; version = "0.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "fengsp"; diff --git a/pkgs/development/python-modules/command_runner/default.nix b/pkgs/development/python-modules/command_runner/default.nix index f5f8586d13192..50ab767a01e11 100644 --- a/pkgs/development/python-modules/command_runner/default.nix +++ b/pkgs/development/python-modules/command_runner/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "command_runner"; version = "1.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/commandlines/default.nix b/pkgs/development/python-modules/commandlines/default.nix index 70e37055c4dd0..d5eeadcf86dee 100644 --- a/pkgs/development/python-modules/commandlines/default.nix +++ b/pkgs/development/python-modules/commandlines/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "commandlines"; version = "0.4.1"; + format = "setuptools"; # PyPI source tarballs omit tests, fetch from Github instead src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/commentjson/default.nix b/pkgs/development/python-modules/commentjson/default.nix index d40de1ad8c2f9..bd8d6f3433589 100644 --- a/pkgs/development/python-modules/commentjson/default.nix +++ b/pkgs/development/python-modules/commentjson/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "commentjson"; version = "0.9.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "vaidik"; diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix index 1efefa4bf0303..bf6d74ea5f61c 100644 --- a/pkgs/development/python-modules/commonmark/default.nix +++ b/pkgs/development/python-modules/commonmark/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "commonmark"; version = "0.9.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/compiledb/default.nix b/pkgs/development/python-modules/compiledb/default.nix index 35a78b7704217..25472793cce0e 100644 --- a/pkgs/development/python-modules/compiledb/default.nix +++ b/pkgs/development/python-modules/compiledb/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "compiledb"; version = "0.10.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "nickdiego"; diff --git a/pkgs/development/python-modules/concurrent-log-handler/default.nix b/pkgs/development/python-modules/concurrent-log-handler/default.nix index bdf74940c9505..7890eda6b4650 100644 --- a/pkgs/development/python-modules/concurrent-log-handler/default.nix +++ b/pkgs/development/python-modules/concurrent-log-handler/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "concurrent-log-handler"; version = "0.9.24"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index 5439bde100409..e6dbe10914e7c 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "conda"; version = "4.3.16"; + format = "setuptools"; # this is a very outdated version of conda that isn't compatible with python 3.10+ disabled = pythonAtLeast "3.10"; diff --git a/pkgs/development/python-modules/configclass/default.nix b/pkgs/development/python-modules/configclass/default.nix index c5138fb1fddce..bb56f3c745da6 100644 --- a/pkgs/development/python-modules/configclass/default.nix +++ b/pkgs/development/python-modules/configclass/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "configclass"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/confight/default.nix b/pkgs/development/python-modules/confight/default.nix index 1c4b11d46d658..8ee09009fb974 100644 --- a/pkgs/development/python-modules/confight/default.nix +++ b/pkgs/development/python-modules/confight/default.nix @@ -6,11 +6,12 @@ buildPythonPackage rec { pname = "confight"; - version = "1.3.1"; + version = "2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-fJr7f9Y/zEpCedWYd04AMuhkOFqZLJOw4sDiz8SDQ/Y="; + hash = "sha256-iodoexnh9tG4dgkjDXCUzWRFDhRlJ3HRgaNhxG2lwPY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index 40ea4fd7be754..922b43ec729cd 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "configshell"; version = "1.1.30"; + format = "setuptools"; src = fetchFromGitHub { owner = "open-iscsi"; diff --git a/pkgs/development/python-modules/configupdater/default.nix b/pkgs/development/python-modules/configupdater/default.nix index 6016a63fbe3df..aed19b526715f 100644 --- a/pkgs/development/python-modules/configupdater/default.nix +++ b/pkgs/development/python-modules/configupdater/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "configupdater"; version = "3.2"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/connection-pool/default.nix b/pkgs/development/python-modules/connection-pool/default.nix index 26e958f095efd..c6785a183f5e1 100644 --- a/pkgs/development/python-modules/connection-pool/default.nix +++ b/pkgs/development/python-modules/connection-pool/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "connection-pool"; version = "0.0.3"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index 92183fc1622c2..4aad363632c23 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -4,6 +4,7 @@ let self = buildPythonPackage rec { pname = "constantly"; version = "15.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "twisted"; diff --git a/pkgs/development/python-modules/contexter/default.nix b/pkgs/development/python-modules/contexter/default.nix index 9937d4b475262..da96829d482ac 100644 --- a/pkgs/development/python-modules/contexter/default.nix +++ b/pkgs/development/python-modules/contexter/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "contexter"; version = "0.1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/contexttimer/default.nix b/pkgs/development/python-modules/contexttimer/default.nix index e61178daaaaf7..f908783fb0b63 100644 --- a/pkgs/development/python-modules/contexttimer/default.nix +++ b/pkgs/development/python-modules/contexttimer/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "contexttimer"; version = "unstable-2019-03-30"; + format = "setuptools"; src = fetchFromGitHub { owner = "brouberol"; diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index d7ae5934d6d5b..8d3374b9c9101 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "cookiecutter"; version = "2.3.0"; + format = "setuptools"; # not sure why this is broken disabled = isPyPy; diff --git a/pkgs/development/python-modules/coordinates/default.nix b/pkgs/development/python-modules/coordinates/default.nix index 5c5e53e989f26..e699e1b9a015f 100644 --- a/pkgs/development/python-modules/coordinates/default.nix +++ b/pkgs/development/python-modules/coordinates/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "coordinates"; version = "0.4.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix index 3e8a540904021..ad172b2961167 100644 --- a/pkgs/development/python-modules/coreapi/default.nix +++ b/pkgs/development/python-modules/coreapi/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "coreapi"; version = "2.3.3"; + format = "setuptools"; src = fetchFromGitHub { repo = "python-client"; diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix index a36a6838c8e8e..8d597e530383e 100644 --- a/pkgs/development/python-modules/coreschema/default.nix +++ b/pkgs/development/python-modules/coreschema/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "coreschema"; version = "0.0.4"; + format = "setuptools"; src = fetchFromGitHub { repo = "python-coreschema"; diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 49825c7af2a1d..75f7a6ffb2e4e 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "cornice"; version = "6.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cov-core/default.nix b/pkgs/development/python-modules/cov-core/default.nix index ce3b08fbc9f45..6a4610fc447ca 100644 --- a/pkgs/development/python-modules/cov-core/default.nix +++ b/pkgs/development/python-modules/cov-core/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "cov-core"; version = "1.15.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 2bcfe6c346558..cd761b45e1013 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "coverage"; version = "7.3.1"; + format = "setuptools"; # uses f strings disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 7c68a33483a26..dd3aeb50afb8b 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "coveralls"; version = "3.3.1"; + format = "setuptools"; disabled = isPy27; # wanted by tests diff --git a/pkgs/development/python-modules/cppe/default.nix b/pkgs/development/python-modules/cppe/default.nix index 9fa87ab806ad8..64e88190dc821 100644 --- a/pkgs/development/python-modules/cppe/default.nix +++ b/pkgs/development/python-modules/cppe/default.nix @@ -33,6 +33,8 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; + format = "setuptools"; + buildInputs = [ pybind11 ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/pkgs/development/python-modules/cppy/default.nix b/pkgs/development/python-modules/cppy/default.nix index 025da89686303..230925a213e9b 100644 --- a/pkgs/development/python-modules/cppy/default.nix +++ b/pkgs/development/python-modules/cppy/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "cppy"; version = "1.2.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/cpufeature/default.nix b/pkgs/development/python-modules/cpufeature/default.nix new file mode 100644 index 0000000000000..cade32a1955bd --- /dev/null +++ b/pkgs/development/python-modules/cpufeature/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unittestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "cpufeature"; + version = "0.2.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "robbmcleod"; + repo = "cpufeature"; + rev = "refs/tags/v${version}"; + hash = "sha256-dp569Tp8E5/avQpYvhPNPgS/A+q2e/ie+7BR7h2Ip+I="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "cpufeature" + ]; + + preCheck = '' + # Change into the test directory due to a relative resource path + cd cpufeature + ''; + + meta = with lib; { + description = "Python module for detection of CPU features"; + homepage = "https://github.com/robbmcleod/cpufeature"; + license = licenses.cc0; + maintainers = with maintainers; [ fab ]; + platforms = [ "x86_64-linux" "x86_64-windows" ]; + }; +} diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix index c451288f0006b..4006c4f28ef3c 100644 --- a/pkgs/development/python-modules/cram/default.nix +++ b/pkgs/development/python-modules/cram/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "0.7"; + format = "setuptools"; pname = "cram"; nativeCheckInputs = [ which ]; diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix index 4b03e38b74f76..296c80eae54af 100644 --- a/pkgs/development/python-modules/crashtest/default.nix +++ b/pkgs/development/python-modules/crashtest/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "crashtest"; version = "0.4.1"; + format = "setuptools"; disabled = !(pythonAtLeast "3.6"); src = fetchPypi { diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix index 53caec6659647..c52cede171a24 100644 --- a/pkgs/development/python-modules/crayons/default.nix +++ b/pkgs/development/python-modules/crayons/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "crayons"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index 47c2da0f85059..1d6667b9e8b0d 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crc"; - version = "5.0.0"; + version = "6.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Nicoretti"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+C4cUKXZCpAXil8X4gTK3AhqNVWDrBQYY2Kgkd3+gqc="; + hash = "sha256-bQa+hkWRXRlyvX3/RL3DAjh9V/kTNg8C7/6viLLKtpk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/crc16/default.nix b/pkgs/development/python-modules/crc16/default.nix index ebf86a3571c61..eda1987a5b076 100644 --- a/pkgs/development/python-modules/crc16/default.nix +++ b/pkgs/development/python-modules/crc16/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "crc16"; version = "0.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/crcmod/default.nix b/pkgs/development/python-modules/crcmod/default.nix index 70053eb16713f..9bc2c6ac70e11 100644 --- a/pkgs/development/python-modules/crcmod/default.nix +++ b/pkgs/development/python-modules/crcmod/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "crcmod"; version = "1.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 0267aee761008..76859ec88ff82 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "credstash"; version = "1.17.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix index 31c0ebace475b..977de2396f2c0 100644 --- a/pkgs/development/python-modules/cryptacular/default.nix +++ b/pkgs/development/python-modules/cryptacular/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "cryptacular"; version = "1.6.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index aa762e315c138..4acb8c6dcd197 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -29,20 +29,21 @@ let in buildPythonPackage rec { pname = "cryptography"; - version = "41.0.3"; # Also update the hash in vectors.nix - format = "pyproject"; + version = "41.0.7"; # Also update the hash in vectors.nix + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bRknQRE+9eMNidy1uVbvThV48wRwhwG4tz044+FGHzQ="; + hash = "sha256-E/k86b6oAWwlOzSvxr1qdZk+XEBnLtVAWpyDLw1KALw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-LQu7waympGUs+CZun2yDQd2gUUAgyisKBG5mddrfSo0="; + hash = "sha256-VeZhKisCPDRvmSjGNwCgJJeVj65BZ0Ge+yvXbZw86Rw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index ff8bfa05ed51a..c02e4d3bcf7e3 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "cryptography-vectors"; # The test vectors must have the same version as the cryptography package inherit (cryptography) version; - format = "pyproject"; + pyproject = true; src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-gN4EUsSzT1b1UY6B69dba5BfVyiq7VIdQuQfTryKQ/s="; + hash = "sha256-ezb5drbljMGAExDhyTxYTGU503Haf4U47dj8Rj3IDVs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index ba89ff24621ae..27c5150f37151 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cryptolyzer"; - version = "0.12.0"; + version = "0.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "CryptoLyzer"; inherit version; - hash = "sha256-XiMkZeIjTAv8F84eutZoezZl4bJ2xqh4uwroDU24jjg="; + hash = "sha256-1Ec57A5lCjy9FsA3vDmCyfOeHZaQz01FNiKyNV3eJfc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index 54c5faf307d28..a04c424e61e3b 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "cryptoparser"; - version = "0.12.0"; + version = "0.12.1"; format = "pyproject"; src = fetchPypi { pname = "CryptoParser"; inherit version; - hash = "sha256-E32fHcuICUMCH5NYT+oFYU7M73bvXb/g1UoJSChzOiA="; + hash = "sha256-Q05koDfVaVgiQYhULkwzl9uzUIumO8ZIGJPfxRBUsj0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cson/default.nix b/pkgs/development/python-modules/cson/default.nix index 4c1b63946ad22..b16ee0202b2db 100644 --- a/pkgs/development/python-modules/cson/default.nix +++ b/pkgs/development/python-modules/cson/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "cson"; version = "0.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/csrmesh/default.nix b/pkgs/development/python-modules/csrmesh/default.nix index 1427563415670..81f3a25b34e51 100644 --- a/pkgs/development/python-modules/csrmesh/default.nix +++ b/pkgs/development/python-modules/csrmesh/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "csrmesh"; version = "0.10.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/css-html-js-minify/default.nix b/pkgs/development/python-modules/css-html-js-minify/default.nix index d05941e1cfbed..304624a90ca05 100644 --- a/pkgs/development/python-modules/css-html-js-minify/default.nix +++ b/pkgs/development/python-modules/css-html-js-minify/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "css-html-js-minify"; version = "2.5.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix index b3d08c12e62fc..01c649f222c1e 100644 --- a/pkgs/development/python-modules/csscompressor/default.nix +++ b/pkgs/development/python-modules/csscompressor/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "csscompressor"; version = "0.9.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix index 929640a7c1e84..c9daf5d45827c 100644 --- a/pkgs/development/python-modules/cssmin/default.nix +++ b/pkgs/development/python-modules/cssmin/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "cssmin"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ctap-keyring-device/default.nix b/pkgs/development/python-modules/ctap-keyring-device/default.nix index 2c6597aeb7f03..0721167693669 100644 --- a/pkgs/development/python-modules/ctap-keyring-device/default.nix +++ b/pkgs/development/python-modules/ctap-keyring-device/default.nix @@ -25,6 +25,7 @@ in buildPythonPackage rec { pname = "ctap-keyring-device"; version = "1.0.6"; + format = "setuptools"; src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index b0cdc10735b90..e67704be7898a 100644 --- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "cucumber-tag-expressions"; version = "4.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index cc9f4ac69b4e9..4884c2e584bc2 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "cufflinks"; version = "0.17.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index e5de149fca14a..923ef7d126db7 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -11,13 +11,37 @@ , cudaPackages , addOpenGLRunpath , pythonOlder +, symlinkJoin }: let - inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; -in buildPythonPackage rec { + inherit (cudaPackages) cudnn cutensor nccl; + cudatoolkit-joined = symlinkJoin { + name = "cudatoolkit-joined-${cudaPackages.cudaVersion}"; + paths = with cudaPackages; [ + cuda_cccl # <nv/target> + cuda_cccl.dev + cuda_cudart + cuda_nvcc.dev # <crt/host_defines.h> + cuda_nvprof + cuda_nvrtc + cuda_nvtx + cuda_profiler_api + libcublas + libcufft + libcurand + libcusolver + libcusparse + + # Missing: + # cusparselt + ]; + }; +in +buildPythonPackage rec { pname = "cupy"; version = "12.2.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,27 +56,32 @@ in buildPythonPackage rec { # very short builds and a few extremely long ones, so setting both ends up # working nicely in practice. preConfigure = '' - export CUDA_PATH=${cudatoolkit} export CUPY_NUM_BUILD_JOBS="$NIX_BUILD_CORES" export CUPY_NUM_NVCC_THREADS="$NIX_BUILD_CORES" ''; nativeBuildInputs = [ + setuptools + wheel addOpenGLRunpath cython + cudaPackages.cuda_nvcc ]; - LDFLAGS = "-L${cudatoolkit}/lib/stubs"; - - propagatedBuildInputs = [ - cudatoolkit + buildInputs = [ + cudatoolkit-joined cudnn cutensor nccl + ]; + + NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages + CUDA_PATH = "${cudatoolkit-joined}"; + LDFLAGS = "-L${cudaPackages.cuda_cudart}/lib/stubs"; + + propagatedBuildInputs = [ fastrlock numpy - setuptools - wheel ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/curve25519-donna/default.nix b/pkgs/development/python-modules/curve25519-donna/default.nix index ea96efb91843b..d098d47e71902 100644 --- a/pkgs/development/python-modules/curve25519-donna/default.nix +++ b/pkgs/development/python-modules/curve25519-donna/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "curve25519-donna"; version = "1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 3e94238709d56..0ba23e1510604 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -21,6 +21,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { pname = "cvxopt"; version = "1.3.2"; + format = "setuptools"; disabled = isPyPy; # hangs at [translation:info] diff --git a/pkgs/development/python-modules/cxxfilt/default.nix b/pkgs/development/python-modules/cxxfilt/default.nix index 8b9c8f979c210..2bf02c5642569 100644 --- a/pkgs/development/python-modules/cxxfilt/default.nix +++ b/pkgs/development/python-modules/cxxfilt/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "cxxfilt"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix index 9df0592512418..07be526f659b9 100644 --- a/pkgs/development/python-modules/cycler/default.nix +++ b/pkgs/development/python-modules/cycler/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "cycler"; version = "0.11.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 9abc6abced01d..097dc806e0780 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "5.1.1"; + version = "5.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-M3aR3lCNtPIve1o16QLSnxrULhtXkuOXNYtOv2FmPMQ="; + hash = "sha256-xgHS2QRzzn6pSremZ8gO4SZxD3qSea9oKDJv4Tk6+VQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index c2bdca1bfe69a..5b5ca31e4d028 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade version = "2.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index d03e3ba501ec0..dc6d412f24593 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -11,6 +11,7 @@ assert pariSupport -> pari != null; buildPythonPackage rec { pname = "cysignals"; version = "1.11.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index fafc31d65882c..e46d0816577d9 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "cytoolz"; version = "0.12.2"; + format = "setuptools"; disabled = isPy27 || isPyPy; src = fetchPypi { diff --git a/pkgs/development/python-modules/daemonize/default.nix b/pkgs/development/python-modules/daemonize/default.nix index 26f23b7156ddf..bdff79e29aa7a 100644 --- a/pkgs/development/python-modules/daemonize/default.nix +++ b/pkgs/development/python-modules/daemonize/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "daemonize"; version = "2.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/daemonocle/default.nix b/pkgs/development/python-modules/daemonocle/default.nix index e673dd1adf5d8..5acec6393632e 100644 --- a/pkgs/development/python-modules/daemonocle/default.nix +++ b/pkgs/development/python-modules/daemonocle/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "daemonocle"; version = "1.2.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "jnrbsn"; diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index c6103d5e5ee7f..109facaff4e5e 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "dash-core-components"; version = "2.0.0"; + format = "setuptools"; src = fetchPypi { pname = "dash_core_components"; diff --git a/pkgs/development/python-modules/dash-html-components/default.nix b/pkgs/development/python-modules/dash-html-components/default.nix index ae5496ec50433..9d7f7d4a54ba6 100644 --- a/pkgs/development/python-modules/dash-html-components/default.nix +++ b/pkgs/development/python-modules/dash-html-components/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "dash-html-components"; version = "2.0.0"; + format = "setuptools"; src = fetchPypi { pname = "dash_html_components"; diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix index 2463e50fb32c5..b40602585ae5b 100644 --- a/pkgs/development/python-modules/dash-table/default.nix +++ b/pkgs/development/python-modules/dash-table/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "dash-table"; version = "5.0.0"; + format = "setuptools"; src = fetchPypi { pname = "dash_table"; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 890a6e08d7db2..b99662660d421 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -3,12 +3,12 @@ , pythonOlder , fetchFromGitHub +, setuptools , nodejs , yarn , prefetch-yarn-deps , fetchYarnDeps -, setuptools , flask , werkzeug , plotly @@ -37,26 +37,27 @@ buildPythonPackage rec { pname = "dash"; - version = "2.14.1"; - format = "setuptools"; + version = "2.14.2"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "plotly"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-vQOfX9RCIbr5lfUyT2knwrO374/vm7jH+/1+BeqmRjI="; + repo = "dash"; + rev = "v${version}"; + hash = "sha256-EFEsFgd3VbzlIUiz1fBIsKHywgWrL74taDFx0yIM/Ks="; }; nativeBuildInputs = [ + setuptools nodejs yarn prefetch-yarn-deps ]; - yarnDeps = fetchYarnDeps { - yarnLock = src + "/@plotly/dash-jupyterlab/yarn.lock"; + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/@plotly/dash-jupyterlab/yarn.lock"; hash = "sha256-mkiyrA0jGiP0zbabSjgHFLEUX3f+LZdJ8eARI5QA8CU="; }; @@ -65,12 +66,12 @@ buildPythonPackage rec { export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror ${yarnDeps} + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} fixup-yarn-lock yarn.lock substituteInPlace package.json --replace jlpm yarn yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts - patchShebangs . + patchShebangs node_modules # Generates the jupyterlab extension files yarn run build:pack @@ -79,7 +80,6 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - setuptools # for importing pkg_resources flask werkzeug plotly @@ -125,9 +125,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "dash" ]; meta = { + changelog = "https://github.com/plotly/dash/blob/${src.rev}/CHANGELOG.md"; description = "Python framework for building analytical web applications"; homepage = "https://dash.plot.ly/"; - changelog = "https://github.com/plotly/dash/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ antoinerg tomasajt ]; }; diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 39ae8e5ddcad7..c07cd8d6db5ab 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2023.11.2"; + version = "2023.12.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-yx0B31x+BMS4alHro+hAPeVB6YK9B7Tg+3sSCMCYjKs="; + hash = "sha256-MfZ3mdCCShD/rcqHx7xyujXax5t96RQI1e2Ckyif9e4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dask-yarn/default.nix b/pkgs/development/python-modules/dask-yarn/default.nix index b9204f0eb839c..044c70f64f899 100644 --- a/pkgs/development/python-modules/dask-yarn/default.nix +++ b/pkgs/development/python-modules/dask-yarn/default.nix @@ -4,6 +4,7 @@ , dask , distributed , fetchFromGitHub +, fetchpatch , grpcio , pytestCheckHook , pythonOlder @@ -19,11 +20,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dask"; - repo = pname; - rev = version; + repo = "dask-yarn"; + rev = "refs/tags/${version}"; hash = "sha256-/BTsxQSiVQrihrCa9DE7pueyg3aPAdjd/Dt4dpUwdtM="; }; + patches = [ + (fetchpatch { # https://github.com/dask/dask-yarn/pull/150 + name = "address-deprecations-introduced-in-distributed-2021-07-0"; + url = "https://github.com/dask/dask-yarn/pull/150/commits/459848afcdc22568905ee98622c74e4071496423.patch"; + hash = "sha256-LS46QBdiAmsp4jQq4DdYdmmk1qzx5JZNTQUlRcRwY5k="; + }) + ]; + propagatedBuildInputs = [ distributed dask diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 63a13d779913a..70b15822cb655 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2023.10.1"; + version = "2023.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-asD5oLd7XcZ8ZFSrsSCAKgZ3Gsqs6T77nb1qesamgUI="; + hash = "sha256-LMd55s8LT4m6Ym+LmXb4TKPnZ0jMkNBfcPJxmgruMDM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 77a14c44b7cba..e50f187c012d5 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.1"; + version = "0.6.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lidatong"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pZohueZvEIGgY6isci2mGGBewfi9SwnHHy8OwyJGR0w="; + hash = "sha256-UVYLyRVLRdt38obSLkSsQdroO95lwpwzerw+gYBIJ7w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/datapoint/default.nix b/pkgs/development/python-modules/datapoint/default.nix index 4b68fe24b4270..e93651be16254 100644 --- a/pkgs/development/python-modules/datapoint/default.nix +++ b/pkgs/development/python-modules/datapoint/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "datapoint"; version = "0.9.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "ejep"; diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix index 3253ff91c096d..6af89e238ccdd 100644 --- a/pkgs/development/python-modules/dataprep-ml/default.nix +++ b/pkgs/development/python-modules/dataprep-ml/default.nix @@ -23,7 +23,7 @@ let in buildPythonPackage rec { pname = "dataprep-ml"; - version = "0.0.20"; + version = "0.0.21"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "dataprep_ml"; inherit version; - hash = "sha256-X6mTTj4hfnqiCPMFrc8ESFp2E7bRNELLR1uL/dGzsPg="; + hash = "sha256-BtnRmj5JtgNdCFowgNdpIZn5vUdw8QYCWneHfDgC4/c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index e5d169b6d3cc1..b89d5bbd06ee2 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.5"; + version = "0.64.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cCzvltq3DFbfRp0gO8RQxGUwBtYJcJoeYHIz06FA7vM="; + hash = "sha256-chU0AFaVfkJMRwraX/Ky0e6/g3ZSZ2efNIJ15veqFmg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index b110ba702daf8..cb0fb38ab9b7c 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.15.2"; + version = "0.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lTlSk3kofWnBDpq04LKQDhoWAE1v8G3g2EqmLEgzsbs="; + hash = "sha256-7UwRGVdXjcs/z/ly2VT3dYba/XGnNF/VzQadn7BQ0NE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index a7964914d079e..6736483a8ba46 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -22,6 +22,7 @@ let in buildPythonPackage rec { pname = "datashape"; version = "0.5.4"; + format = "setuptools"; src = fetcher { inherit pname version; diff --git a/pkgs/development/python-modules/dateutils/default.nix b/pkgs/development/python-modules/dateutils/default.nix index ba9996bbed73b..f9efbb47eb053 100644 --- a/pkgs/development/python-modules/dateutils/default.nix +++ b/pkgs/development/python-modules/dateutils/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "dateutils"; version = "0.6.12"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dawg-python/default.nix b/pkgs/development/python-modules/dawg-python/default.nix index f8da613d98bcf..015e6a1d5c348 100644 --- a/pkgs/development/python-modules/dawg-python/default.nix +++ b/pkgs/development/python-modules/dawg-python/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "dawg-python"; version = "0.7.2"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix index 1708a75fc10e2..2e7f12e0f061c 100644 --- a/pkgs/development/python-modules/dbfread/default.nix +++ b/pkgs/development/python-modules/dbfread/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "dbfread"; version = "2.0.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index 46f62dcafd7ea..9758f5c2f7df7 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.6.1"; + version = "1.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5sgge55BwvC00Gj3UvLS/uzCgNSi4j4YdVlg/LuJI+s="; + hash = "sha256-wonwDrRvfX5/0yQXL05SDLutXFAAyLmhtpI0rm01AOg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dbus-client-gen/default.nix b/pkgs/development/python-modules/dbus-client-gen/default.nix index 811ec6e0d3dbe..fdc173258e50e 100644 --- a/pkgs/development/python-modules/dbus-client-gen/default.nix +++ b/pkgs/development/python-modules/dbus-client-gen/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "dbus-client-gen"; version = "0.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 233067fbbce31..fd935fabb0a60 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.15.0"; + version = "2.20.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-TgkOE6gOFbrbHsllpAZuNNQm3EqCrWW5WSMKqW8bOuI="; + hash = "sha256-dvgexjzA/1/0p2xgjTWBQeaEKWEv/7XdhtSkyT/DN6I="; }; # The project can build both an optimized cython version and an unoptimized diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index f1b32b6a3bc0d..0ce5b2f903948 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "dbus-next"; version = "0.2.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "altdesktop"; diff --git a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix index 2b00b34be19ca..083a4d7dc7dc3 100644 --- a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix +++ b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "dbus-signature-pyparsing"; version = "0.4.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "stratis-storage"; diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix index 08dcbb796acb8..8e7b74fc8dd38 100644 --- a/pkgs/development/python-modules/dcmstack/default.nix +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "dcmstack"; version = "0.9"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index 4c0d90575c691..6e1f2b154a53f 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "ddt"; version = "1.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/deal-solver/default.nix b/pkgs/development/python-modules/deal-solver/default.nix index 5c91d6d925594..28eee72a99d23 100644 --- a/pkgs/development/python-modules/deal-solver/default.nix +++ b/pkgs/development/python-modules/deal-solver/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pythonOlder , flit-core -, z3 +, z3-solver , astroid , pytestCheckHook , hypothesis @@ -28,9 +28,7 @@ buildPythonPackage rec { ]; postPatch = '' - # Use upstream z3 implementation substituteInPlace pyproject.toml \ - --replace "\"z3-solver\"," "" \ --replace "\"--cov=deal_solver\"," "" \ --replace "\"--cov-report=html\"," "" \ --replace "\"--cov-report=xml\"," "" \ @@ -39,9 +37,9 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - z3 + z3-solver astroid - ] ++ z3.requiredPythonModules; + ] ++ z3-solver.requiredPythonModules; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index ad69642a4f7bb..aa581062c5f9d 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "deap"; version = "1.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/debianbts/default.nix b/pkgs/development/python-modules/debianbts/default.nix index 67b43fdff3fbb..7d0a53e033bcc 100644 --- a/pkgs/development/python-modules/debianbts/default.nix +++ b/pkgs/development/python-modules/debianbts/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchPypi , pysimplesoap -, pytestCheckHook -, pytest-xdist , pythonOlder , setuptools }: diff --git a/pkgs/development/python-modules/debtcollector/default.nix b/pkgs/development/python-modules/debtcollector/default.nix index b7617af15ff1a..620f615b6e512 100644 --- a/pkgs/development/python-modules/debtcollector/default.nix +++ b/pkgs/development/python-modules/debtcollector/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "debtcollector"; version = "2.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/debts/default.nix b/pkgs/development/python-modules/debts/default.nix index 7055a3736b22d..3128f71288322 100644 --- a/pkgs/development/python-modules/debts/default.nix +++ b/pkgs/development/python-modules/debts/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "debts"; version = "0.5"; + format = "setuptools"; # pypi does not ship tests src = fetchFromGitLab { diff --git a/pkgs/development/python-modules/deep-chainmap/default.nix b/pkgs/development/python-modules/deep-chainmap/default.nix index 9a9bada8c2a59..9a6d7eaee693c 100644 --- a/pkgs/development/python-modules/deep-chainmap/default.nix +++ b/pkgs/development/python-modules/deep-chainmap/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "deep-chainmap"; version = "0.1.1"; + format = "setuptools"; src = fetchPypi { pname = "deep_chainmap"; diff --git a/pkgs/development/python-modules/deepdish/default.nix b/pkgs/development/python-modules/deepdish/default.nix index 0b04c2cc44185..da73114835f82 100644 --- a/pkgs/development/python-modules/deepdish/default.nix +++ b/pkgs/development/python-modules/deepdish/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "deepdish"; version = "0.3.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/deeptoolsintervals/default.nix b/pkgs/development/python-modules/deeptoolsintervals/default.nix index 89cebb91ab39e..7f78a92877a7d 100644 --- a/pkgs/development/python-modules/deeptoolsintervals/default.nix +++ b/pkgs/development/python-modules/deeptoolsintervals/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "deeptoolsintervals"; version = "0.1.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/deezer-py/default.nix b/pkgs/development/python-modules/deezer-py/default.nix index f06c9b0d29448..109f873138c66 100644 --- a/pkgs/development/python-modules/deezer-py/default.nix +++ b/pkgs/development/python-modules/deezer-py/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "deezer-py"; version = "1.3.7"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index dd9505625af0a..84c7972ccd120 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -14,17 +14,22 @@ buildPythonPackage rec { pname = "deezer-python"; version = "6.1.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "browniebroke"; - repo = pname; + repo = "deezer-python"; rev = "refs/tags/v${version}"; hash = "sha256-pzEXiWKMP2Wqme/pqfTMHxWH/4YcCS6u865wslHrUqI="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=deezer" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,15 +46,16 @@ buildPythonPackage rec { tornado ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=deezer" "" - ''; - pythonImportsCheck = [ "deezer" ]; + disabledTests = [ + # JSONDecodeError issue + "test_get_user_flow" + "test_with_language_header" + ]; + meta = with lib; { description = "Python wrapper around the Deezer API"; homepage = "https://github.com/browniebroke/deezer-python"; diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix index 3e5ad6939e9dd..b094b46c663af 100644 --- a/pkgs/development/python-modules/deform/default.nix +++ b/pkgs/development/python-modules/deform/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "deform"; version = "2.0.15"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index 6ac1bab0845eb..e2e7de205c8ce 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "defusedxml"; version = "0.7.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dehinter/default.nix b/pkgs/development/python-modules/dehinter/default.nix index 30eae79427654..1775e01fa8c9e 100644 --- a/pkgs/development/python-modules/dehinter/default.nix +++ b/pkgs/development/python-modules/dehinter/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "dehinter"; version = "4.0.0"; + format = "setuptools"; # PyPI source tarballs omit tests, fetch from Github instead src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 4426fe65bf5e0..3b812d671c9d6 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "deluge-client"; version = "1.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index ed2cf8a011710..09664f977a051 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "deprecated"; version = "1.2.14"; + format = "setuptools"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index 9ea6e5c2c6dd6..3fccbde6e8b65 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "deprecation"; version = "2.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/devialet/default.nix b/pkgs/development/python-modules/devialet/default.nix new file mode 100644 index 0000000000000..60f57090f40bb --- /dev/null +++ b/pkgs/development/python-modules/devialet/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "devialet"; + version = "1.4.5"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fwestenberg"; + repo = "devialet"; + rev = "refs/tags/v${version}"; + hash = "sha256-oGa5tRCJAWBg/877UmmXnX7fkFLoxhyuG6gpXmyhRKo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "devialet" + ]; + + meta = with lib; { + description = "Library to interact with the Devialet API"; + homepage = "https://github.com/fwestenberg/devialet"; + changelog = "https://github.com/fwestenberg/devialet/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index 2782789e957ad..e614f206f3285 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; version = "0.18.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index dd683b4d1bfdb..8c716135a104f 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "dicom2nifti"; version = "2.4.8"; + format = "setuptools"; disabled = pythonOlder "3.6"; # no tests in PyPI dist diff --git a/pkgs/development/python-modules/dictionaries/default.nix b/pkgs/development/python-modules/dictionaries/default.nix index 2a3e752c20625..0395c7796d9f4 100644 --- a/pkgs/development/python-modules/dictionaries/default.nix +++ b/pkgs/development/python-modules/dictionaries/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "dictionaries"; version = "0.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dicttoxml/default.nix b/pkgs/development/python-modules/dicttoxml/default.nix index c96f37c177c9e..d205aa0cd4714 100644 --- a/pkgs/development/python-modules/dicttoxml/default.nix +++ b/pkgs/development/python-modules/dicttoxml/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "dicttoxml"; version = "1.7.16"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix new file mode 100644 index 0000000000000..5bcda2b40d7d9 --- /dev/null +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -0,0 +1,153 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, writeText +, setuptools +, wheel +, filelock +, huggingface-hub +, importlib-metadata +, numpy +, pillow +, regex +, requests +, safetensors +# optional dependencies +, accelerate +, datasets +, flax +, jax +, jaxlib +, jinja2 +, protobuf +, tensorboard +, torch +# test dependencies +, parameterized +, pytest-timeout +, pytest-xdist +, pytestCheckHook +, requests-mock +, scipy +, sentencepiece +, torchsde +, transformers +}: + +buildPythonPackage rec { + pname = "diffusers"; + version = "0.24.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = "diffusers"; + rev = "refs/tags/v${version}"; + hash = "sha256-ccWF8hQzPhFY/kqRum2tbanI+cQiT25MmvPZN+hGadc="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + filelock + huggingface-hub + importlib-metadata + numpy + pillow + regex + requests + safetensors + ]; + + passthru.optional-dependencies = { + flax = [ + flax + jax + jaxlib + ]; + torch = [ + accelerate + torch + ]; + training = [ + accelerate + datasets + jinja2 + protobuf + tensorboard + ]; + }; + + pythonImportsCheck = [ + "diffusers" + ]; + + # tests crash due to torch segmentation fault + doCheck = !(stdenv.isLinux && stdenv.isAarch64); + + nativeCheckInputs = [ + parameterized + pytest-timeout + pytest-xdist + pytestCheckHook + requests-mock + scipy + sentencepiece + torchsde + transformers + ] ++ passthru.optional-dependencies.torch; + + preCheck = let + # This pytest hook mocks and catches attempts at accessing the network + # tests that try to access the network will raise, get caught, be marked as skipped and tagged as xfailed. + # cf. python3Packages.shap + conftestSkipNetworkErrors = writeText "conftest.py" '' + from _pytest.runner import pytest_runtest_makereport as orig_pytest_runtest_makereport + import urllib3 + + class NetworkAccessDeniedError(RuntimeError): pass + def deny_network_access(*a, **kw): + raise NetworkAccessDeniedError + + urllib3.connection.HTTPSConnection._new_conn = deny_network_access + + def pytest_runtest_makereport(item, call): + tr = orig_pytest_runtest_makereport(item, call) + if call.excinfo is not None and call.excinfo.type is NetworkAccessDeniedError: + tr.outcome = 'skipped' + tr.wasxfail = "reason: Requires network access." + return tr + ''; + in '' + export HOME=$TMPDIR + cat ${conftestSkipNetworkErrors} >> tests/conftest.py + ''; + + pytestFlagsArray = [ + "tests/" + ]; + + disabledTests = [ + # depends on current working directory + "test_deprecate_stacklevel" + # fails due to precision of floating point numbers + "test_model_cpu_offload_forward_pass" + # tries to run ruff which we have intentionally removed from nativeCheckInputs + "test_is_copy_consistent" + ]; + + meta = with lib; { + description = "State-of-the-art diffusion models for image and audio generation in PyTorch"; + homepage = "https://github.com/huggingface/diffusers"; + changelog = "https://github.com/huggingface/diffusers/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix index 52bfaee7911b5..7514ba8609d00 100644 --- a/pkgs/development/python-modules/digi-xbee/default.nix +++ b/pkgs/development/python-modules/digi-xbee/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "digi-xbee"; version = "1.4.1"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/directv/default.nix b/pkgs/development/python-modules/directv/default.nix index 34202a4b1c545..d8aaa9b7df677 100644 --- a/pkgs/development/python-modules/directv/default.nix +++ b/pkgs/development/python-modules/directv/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "directv"; version = "0.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ctalkington"; diff --git a/pkgs/development/python-modules/discid/default.nix b/pkgs/development/python-modules/discid/default.nix index 1c24402926f37..ec921be17ddb3 100644 --- a/pkgs/development/python-modules/discid/default.nix +++ b/pkgs/development/python-modules/discid/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "discid"; version = "1.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index 8c9767f6c0668..76e9eae46fa4f 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.9"; + version = "3.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.esedb"; rev = "refs/tags/${version}"; - hash = "sha256-MdEKAArdbOG/FnTSksuJCt8o8161NY3vL0KGnUHJEdQ="; + hash = "sha256-RlXnUD+KiBmntM/f7jEzdZ0Tdb8vPGvW0e3XoANaPnk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix index dd93579fa022b..1523749bf8bb1 100644 --- a/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/pkgs/development/python-modules/dissect-extfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-extfs"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.extfs"; rev = "refs/tags/${version}"; - hash = "sha256-jCra6ZvILzFgIlBDAKfYhH4mxnJ2B8+Smjs9Hf7nhQo="; + hash = "sha256-RsAWqtoarn/2sZU5dkQYt794dXGOr5fe68VgMNDBst4="; }; 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 dfb7f78675346..3aa4c39b9f521 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -39,8 +39,8 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.13"; - format = "pyproject"; + version = "3.14"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-4dtKAFhxaS8PRoeLY6ZYrE/4P1pbcii1gWQ9RRVOBzs="; + hash = "sha256-vp1upVwohMXFKxlHy5lWmigdq9MUk1UknSsPpCXt50s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -123,7 +123,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests are using Windows paths - "tests/test_plugins_browsers.py" + "tests/plugins/apps/browser/test_browser.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index bfbc76b73c926..94c193b5b1911 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.12"; + version = "3.13"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-rso6TIw8cQnkb58KtGKOfzIzpqJLW05L9sRWIGX3teA="; + hash = "sha256-GUDYr3lP0BV7zJaaUen78CplRA7jfn1zYes7kczNGEU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 6ff492588420a..54787ec221828 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.10"; + version = "3.11"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-AgmBU2sC3/okC7LKQC6yMEJ3u69WwAMAANILMASBIjw="; + hash = "sha256-6y+p+Ulc1Viu5s1AL/ecVtO4YRnmem/ZleY8xC4CJrU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissononce/default.nix b/pkgs/development/python-modules/dissononce/default.nix index f3d903f91c99e..da783408efd81 100644 --- a/pkgs/development/python-modules/dissononce/default.nix +++ b/pkgs/development/python-modules/dissononce/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "dissononce"; version = "0.34.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "tgalal"; diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix index 5748effd390d1..0471855b79d34 100644 --- a/pkgs/development/python-modules/distorm3/default.nix +++ b/pkgs/development/python-modules/distorm3/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "distorm3"; version = "3.5.2"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 55d5dabdd009c..074a450a39e4e 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2023.10.0"; + version = "2023.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-V0L1qY9xtJgKxNEZ69z8CQuXsUs30cqu6xFrsjKWkbY="; + hash = "sha256-Zv31BTzY31eXkU7wqa+h33qGrH+OTzKEj6L7Ei/aizk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 116e3085d9085..5e1e1a57928d4 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "dj-rest-auth"; version = "5.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "iMerica"; diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix index 410ed08d9478e..057d2c6acdaca 100644 --- a/pkgs/development/python-modules/dj-search-url/default.nix +++ b/pkgs/development/python-modules/dj-search-url/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "0.1"; + format = "setuptools"; pname = "dj-search-url"; src = fetchPypi { diff --git a/pkgs/development/python-modules/django-annoying/default.nix b/pkgs/development/python-modules/django-annoying/default.nix index 9772df000bcab..5259a974d6483 100644 --- a/pkgs/development/python-modules/django-annoying/default.nix +++ b/pkgs/development/python-modules/django-annoying/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "django-annoying"; version = "0.10.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "skorokithakis"; diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index 50b86d7fb90a5..572df39481868 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -5,16 +5,18 @@ , requests , django , boto3 +, hatchling , python , mock -, pytestCheckHook -, pytest-django +, responses }: buildPythonPackage rec { pname = "django-anymail"; version = "10.1"; + pyproject = true; + src = fetchFromGitHub { owner = "anymail"; repo = pname; @@ -22,28 +24,31 @@ buildPythonPackage rec { hash = "sha256-unmbYQFLeqfqE1uFLMPLUad1UqA+sgbTzwRfpRhM3ik="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ - six requests django - boto3 ]; nativeCheckInputs = [ - pytestCheckHook - pytest-django mock - ]; + responses + ] ++ passthru.optional-dependencies.amazon-ses; - disabledTests = [ - # Require networking - "test_debug_logging" - "test_no_debug_logging" - ]; + passthru.optional-dependencies = { + amazon-ses = [ boto3 ]; + }; - pythonImportsCheck = [ "anymail" ]; + checkPhase = '' + runHook preCheck + CONTINUOUS_INTEGRATION=1 python runtests.py + runHook postCheck + ''; - DJANGO_SETTINGS_MODULE = "tests.test_settings.settings_3_2"; + pythonImportsCheck = [ "anymail" ]; meta = with lib; { description = "Django email backends and webhooks for Mailgun"; diff --git a/pkgs/development/python-modules/django-autocomplete-light/default.nix b/pkgs/development/python-modules/django-autocomplete-light/default.nix index 774bcda4ba833..08390b00efd0e 100644 --- a/pkgs/development/python-modules/django-autocomplete-light/default.nix +++ b/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { pname = "django-autocomplete-light"; version = "3.9.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "yourlabs"; diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix index 01cccaf8c50d6..d2167350874c7 100644 --- a/pkgs/development/python-modules/django-cache-url/default.nix +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "3.2.2"; + format = "setuptools"; pname = "django-cache-url"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/django-celery-email/default.nix b/pkgs/development/python-modules/django-celery-email/default.nix index d94760baf6359..d403ee8d41037 100644 --- a/pkgs/development/python-modules/django-celery-email/default.nix +++ b/pkgs/development/python-modules/django-celery-email/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "django-celery-email"; version = "3.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "pmclanahan"; diff --git a/pkgs/development/python-modules/django-colorful/default.nix b/pkgs/development/python-modules/django-colorful/default.nix index 5de127a972211..093be1ab607ea 100644 --- a/pkgs/development/python-modules/django-colorful/default.nix +++ b/pkgs/development/python-modules/django-colorful/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "django-colorful"; version = "1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-contrib-comments/default.nix b/pkgs/development/python-modules/django-contrib-comments/default.nix index 66189a88d0d6a..fe0ce82b52a0e 100644 --- a/pkgs/development/python-modules/django-contrib-comments/default.nix +++ b/pkgs/development/python-modules/django-contrib-comments/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "django-contrib-comments"; version = "2.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 0c13c0b021004..a3b79ca10a3f6 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "django-cors-headers"; version = "3.13.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "adamchainz"; diff --git a/pkgs/development/python-modules/django-csp/default.nix b/pkgs/development/python-modules/django-csp/default.nix index c54583447671a..ed3add9a5cd05 100644 --- a/pkgs/development/python-modules/django-csp/default.nix +++ b/pkgs/development/python-modules/django-csp/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "django-csp"; version = "3.7"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/django-environ/default.nix b/pkgs/development/python-modules/django-environ/default.nix index b0e3f6eb0c40b..c9c6b99717443 100644 --- a/pkgs/development/python-modules/django-environ/default.nix +++ b/pkgs/development/python-modules/django-environ/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "django-environ"; version = "0.11.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index eb46b6b869206..474ede58b770f 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "django-extensions"; version = "3.2.3"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index 9cfb6493e577c..8f91712ba0b78 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "django-filter"; - version = "23.4"; + version = "23.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-vtBws4NZ3OfS2+BXsWXVl3MFeYY1bLgJ3tmDs2x3qXY="; + hash = "sha256-Z1g6pDuR/oxJ90qDLZX02EQr5ij9TG1l6fgR9RU6Tlw="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix index 458723601dd7f..d43748448c51d 100644 --- a/pkgs/development/python-modules/django-gravatar2/default.nix +++ b/pkgs/development/python-modules/django-gravatar2/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "django-gravatar2"; version = "1.4.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-guardian/default.nix b/pkgs/development/python-modules/django-guardian/default.nix index 0ae0eac3ecb86..968e82b5849db 100644 --- a/pkgs/development/python-modules/django-guardian/default.nix +++ b/pkgs/development/python-modules/django-guardian/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "django-guardian"; version = "2.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-hcaptcha/default.nix b/pkgs/development/python-modules/django-hcaptcha/default.nix index 52cf7ffb7ea50..9daf8330331c7 100644 --- a/pkgs/development/python-modules/django-hcaptcha/default.nix +++ b/pkgs/development/python-modules/django-hcaptcha/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "django-hcaptcha"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/django-health-check/default.nix b/pkgs/development/python-modules/django-health-check/default.nix index f4bb2db23c17b..8d8e266014cb7 100644 --- a/pkgs/development/python-modules/django-health-check/default.nix +++ b/pkgs/development/python-modules/django-health-check/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "django-health-check"; version = "3.17.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "KristianOellegaard"; diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 33e74e3c70f81..d4c9940c6b045 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "3.3.3"; + version = "3.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pV8esZBK1ne2Cl0NBejEi2wLu7HbqTnKG16MU/gl4Ig="; + hash = "sha256-bYb000KRnvuMSMTTicqrJ+0zU/XguQFcLATqxUvc5V0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 799409f619665..deaf003701b03 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "6.0.1"; + version = "6.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AjM0Ht3MGd5E9GPdPlPIfvncxRn8dKmZEc6+m1gZdUk="; + hash = "sha256-D2gt1POv73kJuz3TlpScNVmCU5vUOS1OnfCwsxYESE0="; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-js-reverse/default.nix b/pkgs/development/python-modules/django-js-reverse/default.nix index a6f31a05c8f32..a30330fcd9e49 100644 --- a/pkgs/development/python-modules/django-js-reverse/default.nix +++ b/pkgs/development/python-modules/django-js-reverse/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "django-js-reverse"; version = "0.10.1-b1"; + format = "setuptools"; src = fetchFromGitHub { owner = "BITSOLVER"; diff --git a/pkgs/development/python-modules/django-logentry-admin/default.nix b/pkgs/development/python-modules/django-logentry-admin/default.nix index b3287b6f52231..af208427a63a4 100644 --- a/pkgs/development/python-modules/django-logentry-admin/default.nix +++ b/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "django-logentry-admin"; version = "1.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "yprez"; diff --git a/pkgs/development/python-modules/django-markdownx/default.nix b/pkgs/development/python-modules/django-markdownx/default.nix new file mode 100644 index 0000000000000..e6275ee50441f --- /dev/null +++ b/pkgs/development/python-modules/django-markdownx/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, django +, fetchFromGitHub +, markdown +, pillow +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "django-markdownx"; + version = "4.0.7"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "neutronX"; + repo = "django-markdownx"; + rev = "refs/tags/v${version}"; + hash = "sha256-FZPUlogVd3FMGeH1vfKHA3tXVps0ET+UCQJflpiV2lE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + django + markdown + pillow + ]; + + # tests only executeable in vagrant + doCheck = false; + + pythonImportsCheck = [ + "markdownx" + ]; + + meta = with lib; { + description = "Comprehensive Markdown plugin built for Django"; + homepage = "https://github.com/neutronX/django-markdownx/"; + changelog = "https://github.com/neutronX/django-markdownx/releases/tag/v${version}"; + license = licenses.bsd2; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/django-mdeditor/default.nix b/pkgs/development/python-modules/django-mdeditor/default.nix new file mode 100644 index 0000000000000..dc58e3cd665d0 --- /dev/null +++ b/pkgs/development/python-modules/django-mdeditor/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +}: +let + version = "0.1.20"; +in +buildPythonPackage { + pname = "django-mdeditor"; + inherit version; + + src = fetchFromGitHub { + owner = "pylixm"; + repo = "django-mdeditor"; + rev = "v${version}"; + hash = "sha256-t57j1HhjNQtBwlbqe4mAHQ9WiNcIhMKYmrZkiqh+k5k="; + }; + + propagatedBuildInputs = [ django ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "mdeditor" ]; + + meta = with lib; { + description = "Markdown Editor plugin application for django based on Editor.md"; + homepage = "https://github.com/pylixm/django-mdeditor"; + changelog = "https://github.com/pylixm/django-mdeditor/releases"; + license = licenses.gpl3; + maintainers = with maintainers; [ augustebaum ]; + }; +} diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix index 5ad43dfc9b1f8..7c3e77b324609 100644 --- a/pkgs/development/python-modules/django-modelcluster/default.nix +++ b/pkgs/development/python-modules/django-modelcluster/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "6.0"; + version = "6.1"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "wagtail"; - repo = "modelcluster"; + repo = "django-modelcluster"; rev = "refs/tags/v${version}"; - hash = "sha256-p6hvOkPWRVJYLHvwyn9nS05wblikRFmlSYZuLiCcuqc="; + hash = "sha256-fNGD2aU668VQ8YHcaFjtjiW/gYJgSx7arDAyUKpFYRE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix index 046c60989a74d..6864d0c8f9f19 100644 --- a/pkgs/development/python-modules/django-multiselectfield/default.nix +++ b/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "django-multiselectfield"; version = "0.1.12"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-nose/default.nix b/pkgs/development/python-modules/django-nose/default.nix index 2506f6aba44a9..86aa7b3a4e4a5 100644 --- a/pkgs/development/python-modules/django-nose/default.nix +++ b/pkgs/development/python-modules/django-nose/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "django-nose"; version = "1.4.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-otp/default.nix b/pkgs/development/python-modules/django-otp/default.nix index b2417303133b9..216b24e3c0c02 100644 --- a/pkgs/development/python-modules/django-otp/default.nix +++ b/pkgs/development/python-modules/django-otp/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "django-otp"; version = "1.1.3"; + format = "setuptools"; disabled = pythonOlder "3"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/django-paintstore/default.nix b/pkgs/development/python-modules/django-paintstore/default.nix index 28a773a5c01b1..edafdf1649116 100644 --- a/pkgs/development/python-modules/django-paintstore/default.nix +++ b/pkgs/development/python-modules/django-paintstore/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "django-paintstore"; version = "0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-pglocks/default.nix b/pkgs/development/python-modules/django-pglocks/default.nix index a84850a1fda97..dae4fd2ad0ecd 100644 --- a/pkgs/development/python-modules/django-pglocks/default.nix +++ b/pkgs/development/python-modules/django-pglocks/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "django-pglocks"; version = "1.0.4"; + format = "setuptools"; meta = { description = "PostgreSQL locking context managers and functions for Django."; diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 6db31decd2874..4df2a1406ef72 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "django-polymorphic"; version = "3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "django-polymorphic"; diff --git a/pkgs/development/python-modules/django-ranged-response/default.nix b/pkgs/development/python-modules/django-ranged-response/default.nix index 5fb0545f1fee5..35f4bb2a7e836 100644 --- a/pkgs/development/python-modules/django-ranged-response/default.nix +++ b/pkgs/development/python-modules/django-ranged-response/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "django-ranged-response"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 673a867972666..d5a01cd195dae 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "0.8.1"; + format = "setuptools"; pname = "django-raster"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix index 5b8937fb048c9..eb14a6a3c316e 100644 --- a/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/pkgs/development/python-modules/django-rest-auth/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "django-rest-auth"; version = "0.9.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "Tivix"; diff --git a/pkgs/development/python-modules/django-rest-polymorphic/default.nix b/pkgs/development/python-modules/django-rest-polymorphic/default.nix index 730d05d445ede..5cf6f84ad5546 100644 --- a/pkgs/development/python-modules/django-rest-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-rest-polymorphic/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "django-rest-polymorphic"; version = "0.1.10"; + format = "setuptools"; src = fetchFromGitHub { owner = "apirobot"; diff --git a/pkgs/development/python-modules/django-rest-registration/default.nix b/pkgs/development/python-modules/django-rest-registration/default.nix index 898904fb92df8..7c5f0b455c6dc 100644 --- a/pkgs/development/python-modules/django-rest-registration/default.nix +++ b/pkgs/development/python-modules/django-rest-registration/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-rest-registration"; - version = "0.8.2"; + version = "0.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "apragacz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kGZ88Z5nV3HChImmPurHoewobsjotZQ4q9RngBYGe5g="; + hash = "sha256-RDegK+1A01kfpit3LX+ToViqPlTiZ3dIve38ea7lNxE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix index 2559cc1fbf5cb..cb0119bb7d504 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.6"; + version = "5.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-buJalwcN2hTz4IK4uZm/vstKnwgv8fhR40TQVqGMk0w="; + hash = "sha256-RdN4vG5gbfayrQB3rsiwoA418Yx0yioa6cwmLOsy+5o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index 0be46cc32a5c4..4d4a63aeb6245 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.9.0"; + version = "2.10.1"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qrAEBAMbw96TCS6J50RG/2fV9K2WhuXyAQevL4RSQhk="; + hash = "sha256-VE4OFFpNR9txCyhs6Ye36DBWb8DNlCT1BO436KwFMY8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-scopes/default.nix b/pkgs/development/python-modules/django-scopes/default.nix index 5f3fdecc64bac..df4cd3599fac5 100644 --- a/pkgs/development/python-modules/django-scopes/default.nix +++ b/pkgs/development/python-modules/django-scopes/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "django-scopes"; version = "2.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "raphaelm"; diff --git a/pkgs/development/python-modules/django-sekizai/default.nix b/pkgs/development/python-modules/django-sekizai/default.nix index 0c28ee283a1d5..5c040ee026bac 100644 --- a/pkgs/development/python-modules/django-sekizai/default.nix +++ b/pkgs/development/python-modules/django-sekizai/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "django-sekizai"; version = "4.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix index 4b61d523a5ab8..d43892cb04d33 100644 --- a/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "django-simple-captcha"; version = "0.5.20"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix index 3a9255daecdf2..52c78b8f5e3db 100644 --- a/pkgs/development/python-modules/django-sites/default.nix +++ b/pkgs/development/python-modules/django-sites/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "django-sites"; version = "0.11"; + format = "setuptools"; src = fetchFromGitHub { owner = "niwinz"; diff --git a/pkgs/development/python-modules/django-sr/default.nix b/pkgs/development/python-modules/django-sr/default.nix index 39b3832185d3f..d14935d414bdf 100644 --- a/pkgs/development/python-modules/django-sr/default.nix +++ b/pkgs/development/python-modules/django-sr/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "django-sr"; version = "0.0.4"; + format = "setuptools"; meta = { description = "Django settings resolver"; diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix index a3bbfd91b0d8c..6cc31a06b7c30 100644 --- a/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-stubs-ext"; - version = "4.2.2"; + version = "4.2.5"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-xp0cxG8cTDt4lLaFpQIsKbKjbHz7UuI3YurzV+v8LJg="; + hash = "sha256-jE0ftfaEGbOyR0xlloGhiYA+J9al5av1qg2ldgG1hjM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index 6dcc875884e0b..d404177a43c7d 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "4.2.4"; + version = "4.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fUoTLDgVGYFehlwnqJ7KQby9BgVoMlByJIFqQ9dcYBw="; + hash = "sha256-5gtD3mYqGZ20sVyAPAZmngrFA1YUrykcvTuRWR99zJQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-tagging/default.nix b/pkgs/development/python-modules/django-tagging/default.nix index 4bcaa549a12f8..ba62d65825e37 100644 --- a/pkgs/development/python-modules/django-tagging/default.nix +++ b/pkgs/development/python-modules/django-tagging/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "django-tagging"; version = "0.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-taggit/default.nix b/pkgs/development/python-modules/django-taggit/default.nix index 81326d195a2d2..eb1f4a994e12e 100644 --- a/pkgs/development/python-modules/django-taggit/default.nix +++ b/pkgs/development/python-modules/django-taggit/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "4.0.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TVLenTckWpufmMDscf3M8dIoPjjohm1Ap65qO2eHoWE="; + hash = "sha256-7c19seDzXDBOCCovYx3awuFu9SlgKVJOt5KvdDDKtMw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index a03a8a282d9cd..bd0e45dee75f7 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "django-versatileimagefield"; version = "3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 1e9f0202bd708..3f1aa0138b908 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "2.0.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Do37L82znb/QG+dgPAYBMqRmT0g4Ec48dfLTwNOat2I="; + hash = "sha256-dND6btp4i4Sxq4KMLn786EFLBe7wpOsr8n0xGlDgpO0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 077ea73bd8b9e..295094c65928d 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , substituteAll -, geos39 +, geos_3_9 , gdal , asgiref , pytz @@ -33,7 +33,7 @@ buildPythonPackage rec { ] ++ lib.optional withGdal (substituteAll { src = ./django_3_set_geos_gdal_lib.patch; - inherit geos39; + inherit geos_3_9; inherit gdal; extension = stdenv.hostPlatform.extensions.sharedLibrary; }); diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index ed4f7a9162a73..bedc53cb3d1a2 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "5.0rc1"; + version = "5.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-pLt3plnaAyt0GpXcuVeGTzaVJ10dWB73Y3IUMA+qrzA="; + hash = "sha256-fSnhTfvBnLapWkvWae294R9dTGpx/apCwtQLaEboB/c="; }; patches = [ diff --git a/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch b/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch index 15f0773dcf4fa..a7dfa086a0a71 100644 --- a/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch +++ b/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch @@ -18,7 +18,7 @@ diff -Nur a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos lib_path = settings.GEOS_LIBRARY_PATH except (AttributeError, ImportError, ImproperlyConfigured, OSError): - lib_path = None -+ lib_path = "@geos39@/lib/libgeos_c@extension@" ++ lib_path = "@geos_3_9@/lib/libgeos_c@extension@" # Setting the appropriate names for the GEOS-C library. if lib_path: diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index 55da45f463700..52316ee4444ec 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,12 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.17.1"; + version = "0.18.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-TwU9ASjij0EpJuLakCc19L3Lq1wI1Dvk3+/XR/yi6W4="; + hash = "sha256-x8KJ08BLKLRD42uqIW/FSFf3V6TFNXLTyWaoCr5Zb78="; }; propagatedBuildInputs = [ ply ]; diff --git a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix index d5b388f5f5e34..c9bfc512b7386 100644 --- a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix +++ b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "djangorestframework-camel-case"; version = "1.4.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/djangorestframework-guardian/default.nix b/pkgs/development/python-modules/djangorestframework-guardian/default.nix index 4358a61b3452a..4e8a941d411f1 100644 --- a/pkgs/development/python-modules/djangorestframework-guardian/default.nix +++ b/pkgs/development/python-modules/djangorestframework-guardian/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "djangorestframework-guardian"; version = "0.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "rpkilby"; diff --git a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix index 786a401d80b60..d2e7ea08af8ae 100644 --- a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix +++ b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "djangorestframework-guardian2"; version = "0.5.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "johnthagen"; diff --git a/pkgs/development/python-modules/djangorestframework-recursive/default.nix b/pkgs/development/python-modules/djangorestframework-recursive/default.nix index d4a96d679522b..e51fa173a8036 100644 --- a/pkgs/development/python-modules/djangorestframework-recursive/default.nix +++ b/pkgs/development/python-modules/djangorestframework-recursive/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "djangorestframework-recursive"; version = "0.1.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "heywbj"; diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index cb5c3478d9100..043731f0054c4 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -12,15 +12,15 @@ buildPythonPackage rec { pname = "djangorestframework-simplejwt"; - version = "5.3.0"; + version = "5.3.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "djangorestframework_simplejwt"; inherit version; - hash = "sha256-jkxd/KjRHAuKZt/YpOP8HGqn6hiNEJB/+RyUL0tS7WY="; + hash = "sha256-bEvTdTdEC8Q5Vk6/fWCF50xUEUhRlwc/UI69+jS8n64="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index ced22d54803af..e2dc4ce148878 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "djangorestframework"; version = "3.14.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/djmail/default.nix b/pkgs/development/python-modules/djmail/default.nix index 8efb9788e1274..28e9b88d3c32b 100644 --- a/pkgs/development/python-modules/djmail/default.nix +++ b/pkgs/development/python-modules/djmail/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "djmail"; version = "2.0.0"; + format = "setuptools"; meta = { description = "Simple, powerfull and nonobstructive django email middleware"; diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index aa3e06bd92578..6b639f8cc8c3e 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "dkimpy"; version = "1.1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index 0a52d78c824fd..224c8ccd4e15c 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -6,6 +6,8 @@ buildPythonPackage { inherit (dlib) pname version src nativeBuildInputs buildInputs meta; + format = "setuptools"; + patches = [ ./build-cores.patch ]; diff --git a/pkgs/development/python-modules/dlx/default.nix b/pkgs/development/python-modules/dlx/default.nix index 81ae3deda624d..c8f89b7db7c1b 100644 --- a/pkgs/development/python-modules/dlx/default.nix +++ b/pkgs/development/python-modules/dlx/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "dlx"; version = "1.0.4"; + format = "setuptools"; # untagged releases src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 7e2a3b3573cd2..08c1716867a7e 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "dm-haiku"; version = "0.0.10"; + format = "setuptools"; src = fetchFromGitHub { owner = "deepmind"; diff --git a/pkgs/development/python-modules/dm-tree/default.nix b/pkgs/development/python-modules/dm-tree/default.nix index de1a5f6646480..071a0fee432e6 100644 --- a/pkgs/development/python-modules/dm-tree/default.nix +++ b/pkgs/development/python-modules/dm-tree/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "dm-tree"; version = "0.1.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "deepmind"; diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix new file mode 100644 index 0000000000000..2c27dfe5fa01f --- /dev/null +++ b/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -0,0 +1,122 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + + # dependencies +, cmake +, dateutil +, dbus-python +, dnf4 +, gettext +, libcomps +, libdnf +, python +, rpm +, sphinx +, systemd +}: + +let + pyMajor = lib.versions.major python.version; +in + +buildPythonPackage rec { + pname = "dnf-plugins-core"; + version = "4.4.3"; + format = "other"; + + outputs = [ "out" "man" ]; + + src = fetchFromGitHub { + owner = "rpm-software-management"; + repo = "dnf-plugins-core"; + rev = version; + hash = "sha256-YEw8REvK2X7mBg9HDI6V2p8QtZ3TJh4Dzn8Uuhfbrgo="; + }; + + patches = [ + ./fix-python-install-dir.patch + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}" \ + --replace "SYSCONFDIR /etc" "SYSCONFDIR $out/etc" \ + --replace "SYSTEMD_DIR /usr/lib/systemd/system" "SYSTEMD_DIR $out/lib/systemd/system" + substituteInPlace doc/CMakeLists.txt \ + --replace 'SPHINX_BUILD_NAME "sphinx-build-3"' 'SPHINX_BUILD_NAME "${sphinx}/bin/sphinx-build"' + ''; + + nativeBuildInputs = [ + cmake + gettext + sphinx + ]; + + propagatedBuildInputs = [ + dateutil + dbus-python + dnf4.py + libcomps + libdnf + rpm + systemd + ]; + + cmakeFlags = [ + "-DPYTHON_DESIRED=${pyMajor}" + "-DWITHOUT_LOCAL=0" + ]; + + postBuild = '' + make doc-man + ''; + + pythonImportsCheck = [ + # This is the python module imported by dnf4 when plugins are loaded. + "dnfpluginscore" + ]; + + # Don't use symbolic links so argv[0] is set to the correct value. + postInstall = '' + # See https://github.com/rpm-software-management/dnf-plugins-core/blob/aee9cacdeb50768c1e869122cd432924ec533213/dnf-plugins-core.spec#L478 + mv $out/libexec/dnf-utils-${pyMajor} $out/libexec/dnf-utils + + # See https://github.com/rpm-software-management/dnf-plugins-core/blob/aee9cacdeb50768c1e869122cd432924ec533213/dnf-plugins-core.spec#L487-L503 + bins=( + "debuginfo-install" + "needs-restarting" + "find-repos-of-install" + "repo-graph" + "package-cleanup" + "repoclosure" + "repodiff" + "repomanage" + "repoquery" + "reposync" + "repotrack" + "yum-builddep" + "yum-config-manager" + "yum-debug-dump" + "yum-debug-restore" + "yum-groups-manager" + "yumdownloader" + ) + mkdir -p $out/bin + for bin in "''${bins[@]}"; do + ln $out/libexec/dnf-utils $out/bin/$bin + done + ''; + + makeWrapperArgs = [ + ''--add-flags "--setopt=pluginpath=$out/${python.sitePackages}/dnf-plugins"'' + ]; + + meta = with lib; { + description = "Core plugins to use with DNF package manager"; + homepage = "https://github.com/rpm-software-management/dnf-plugins-core"; + changelog = "https://github.com/rpm-software-management/dnf-plugins-core/releases/tag/${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ katexochen ]; + }; +} diff --git a/pkgs/development/python-modules/dnf-plugins-core/fix-python-install-dir.patch b/pkgs/development/python-modules/dnf-plugins-core/fix-python-install-dir.patch new file mode 100644 index 0000000000000..647c77e08a9cc --- /dev/null +++ b/pkgs/development/python-modules/dnf-plugins-core/fix-python-install-dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a1eea7b..00fbaf3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,7 +18,7 @@ ELSE () + MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED}) + ENDIF() + +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@") + MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") + + SET (SYSCONFDIR /etc) diff --git a/pkgs/development/python-modules/dnf4/default.nix b/pkgs/development/python-modules/dnf4/default.nix new file mode 100644 index 0000000000000..87bd9a1b7d455 --- /dev/null +++ b/pkgs/development/python-modules/dnf4/default.nix @@ -0,0 +1,99 @@ +{ lib +, buildPythonPackage +, cmake +, fetchFromGitHub +, gettext +, libcomps +, libdnf +, python +, rpm +, sphinx +}: + +let + pyMajor = lib.versions.major python.version; +in + +buildPythonPackage rec { + pname = "dnf4"; + version = "4.18.2"; + format = "other"; + + outputs = [ "out" "man" "py" ]; + + src = fetchFromGitHub { + owner = "rpm-software-management"; + repo = "dnf"; + rev = version; + hash = "sha256-WOLVKsrHp0V0wMXXRf1hrxsxuVv2bFOKIw8Aitz0cac="; + }; + + patches = [ + ./fix-python-install-dir.patch + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}" \ + --replace "SYSCONFDIR /etc" "SYSCONFDIR $out/etc" \ + --replace "SYSTEMD_DIR /usr/lib/systemd/system" "SYSTEMD_DIR $out/lib/systemd/system" + substituteInPlace etc/tmpfiles.d/CMakeLists.txt \ + --replace "DESTINATION /usr/lib/tmpfiles.d" "DESTINATION $out/usr/lib/tmpfiles.d" + substituteInPlace dnf/const.py.in \ + --replace "/etc" "$out/etc" \ + --replace "/var/tmp" "/tmp" + substituteInPlace doc/CMakeLists.txt \ + --replace 'SPHINX_BUILD_NAME "sphinx-build-3"' 'SPHINX_BUILD_NAME "${sphinx}/bin/sphinx-build"' + ''; + + nativeBuildInputs = [ + cmake + gettext + sphinx + ]; + + propagatedBuildInputs = [ + libcomps + libdnf + rpm + ]; + + cmakeFlags = [ + "-DPYTHON_DESIRED=${pyMajor}" + ]; + + dontWrapPythonPrograms = true; + + postBuild = '' + make doc-man + ''; + + postInstall = '' + # See https://github.com/rpm-software-management/dnf/blob/41a287e2bd60b4d1100c329a274776ff32ba8740/dnf.spec#L218-L220 + ln -s dnf-${pyMajor} $out/bin/dnf + ln -s dnf-${pyMajor} $out/bin/dnf4 + mv $out/bin/dnf-automatic-${pyMajor} $out/bin/dnf-automatic + + # See https://github.com/rpm-software-management/dnf/blob/41a287e2bd60b4d1100c329a274776ff32ba8740/dnf.spec#L231-L232 + ln -s $out/etc/dnf/dnf.conf $out/etc/yum.conf + ln -s dnf-${pyMajor} $out/bin/yum + + mkdir -p $out/share/bash-completion/completions + mv $out/etc/bash_completion.d/dnf $out/share/bash-completion/completions/dnf + rm -r $out/etc/bash_completion.d + ''; + + postFixup = '' + moveToOutput "lib/${python.libPrefix}" "$py" + ''; + + meta = with lib; { + description = "Package manager based on libdnf and libsolv. Replaces YUM"; + homepage = "https://github.com/rpm-software-management/dnf"; + changelog = "https://github.com/rpm-software-management/dnf/releases/tag/${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ katexochen ]; + mainProgram = "dnf"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/dnf4/fix-python-install-dir.patch b/pkgs/development/python-modules/dnf4/fix-python-install-dir.patch new file mode 100644 index 0000000000000..07b68242d8fc3 --- /dev/null +++ b/pkgs/development/python-modules/dnf4/fix-python-install-dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4aee99fb..0bb28897 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,7 +19,7 @@ ELSE () + MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED}) + ENDIF() + +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@") + MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") + + ADD_SUBDIRECTORY (dnf) diff --git a/pkgs/development/python-modules/dnf4/wrapper.nix b/pkgs/development/python-modules/dnf4/wrapper.nix new file mode 100644 index 0000000000000..254bd7f27d2ae --- /dev/null +++ b/pkgs/development/python-modules/dnf4/wrapper.nix @@ -0,0 +1,53 @@ +{ lib +, wrapPython +, python3 +, stdenv +, dnf-plugins-core +, plugins ? [ dnf-plugins-core ] +}: +let + pluginPaths = map (p: "${p}/${python3.sitePackages}/dnf-plugins") plugins; + + dnf4-unwrapped = python3.pkgs.dnf4; +in + +stdenv.mkDerivation { + pname = "dnf4"; + inherit (dnf4-unwrapped) version; + + outputs = [ "out" "man" "py" ]; + + dontUnpack = true; + + nativeBuildInputs = [ + wrapPython + ]; + + propagatedBuildInputs = [ + dnf4-unwrapped + ] ++ plugins; + + makeWrapperArgs = lib.optional (plugins != [ ]) ''--add-flags "--setopt=pluginpath=${lib.concatStringsSep "," pluginPaths}"''; + + installPhase = '' + runHook preInstall + + cp -R ${dnf4-unwrapped} $out + cp -R ${dnf4-unwrapped.py} $py + cp -R ${dnf4-unwrapped.man} $man + + runHook postInstall + ''; + + postFixup = '' + wrapPythonPrograms + ''; + + passthru = { + unwrapped = dnf4-unwrapped; + }; + + meta = dnf4-unwrapped.meta // { + priority = (dnf4-unwrapped.meta.priority or 0) - 1; + }; +} diff --git a/pkgs/development/python-modules/docker-py/default.nix b/pkgs/development/python-modules/docker-py/default.nix index 2d88f64d36a58..b5ab643d6ebc6 100644 --- a/pkgs/development/python-modules/docker-py/default.nix +++ b/pkgs/development/python-modules/docker-py/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "1.10.6"; + format = "setuptools"; pname = "docker-py"; src = fetchPypi { diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index c022d62bfa848..2c6c0ad2038d8 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "docker-pycreds"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/pkgs/development/python-modules/dockerpty/default.nix index 775767e6fecfe..1dc5ff6a83165 100644 --- a/pkgs/development/python-modules/dockerpty/default.nix +++ b/pkgs/development/python-modules/dockerpty/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "dockerpty"; version = "0.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dockerspawner/default.nix b/pkgs/development/python-modules/dockerspawner/default.nix index bd8af6391a438..b2c5b2790fbea 100644 --- a/pkgs/development/python-modules/dockerspawner/default.nix +++ b/pkgs/development/python-modules/dockerspawner/default.nix @@ -8,11 +8,12 @@ buildPythonPackage rec { pname = "dockerspawner"; - version = "12.1.0"; + version = "13.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "3894ed8a9157f8ac8f42e0130f43932490ac5d1e89e6f295b1252f08c00ba36b"; + sha256 = "sha256-POlTZ9luS9wQ/vt9w8VMfTEqGzg/DhfB45ePfvnyito="; }; propagatedBuildInputs = [ @@ -24,12 +25,15 @@ buildPythonPackage rec { # tests require docker doCheck = false; - pythonImportsCheck = [ "dockerspawner" ]; + pythonImportsCheck = [ + "dockerspawner" + ]; meta = with lib; { - description = "Dockerspawner: A custom spawner for Jupyterhub"; - homepage = "https://jupyter.org"; + description = "A custom spawner for Jupyterhub"; + homepage = "https://github.com/jupyterhub/dockerspawner"; + changelog = "https://github.com/jupyterhub/dockerspawner/blob/${version}/docs/source/changelog.md"; license = licenses.bsd3; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/docloud/default.nix b/pkgs/development/python-modules/docloud/default.nix index 2c92b32c748cd..9e30ea3899549 100644 --- a/pkgs/development/python-modules/docloud/default.nix +++ b/pkgs/development/python-modules/docloud/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "docloud"; version = "1.0.375"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/docopt/default.nix b/pkgs/development/python-modules/docopt/default.nix index 68df40a3cbf24..d909162d7f188 100644 --- a/pkgs/development/python-modules/docopt/default.nix +++ b/pkgs/development/python-modules/docopt/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "docopt"; version = "0.6.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 46018acec3b3f..2f5c485cf631d 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "docplex"; version = "2.25.236"; + format = "setuptools"; # No source available from official repo src = fetchPypi { diff --git a/pkgs/development/python-modules/docrep/default.nix b/pkgs/development/python-modules/docrep/default.nix index 78bbba8a790be..e507b8d022b46 100644 --- a/pkgs/development/python-modules/docrep/default.nix +++ b/pkgs/development/python-modules/docrep/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "docrep"; version = "0.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix index 533dbed29b342..0ca439d9dcb64 100644 --- a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix +++ b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "doctest-ignore-unicode"; version = "0.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dodgy/default.nix b/pkgs/development/python-modules/dodgy/default.nix index 4437beb760ce3..161e23f648a59 100644 --- a/pkgs/development/python-modules/dodgy/default.nix +++ b/pkgs/development/python-modules/dodgy/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "dodgy"; version = "0.2.1"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/dogtag-pki/default.nix b/pkgs/development/python-modules/dogtag-pki/default.nix index db41cf80847b5..53e49e7d7608d 100644 --- a/pkgs/development/python-modules/dogtag-pki/default.nix +++ b/pkgs/development/python-modules/dogtag-pki/default.nix @@ -4,6 +4,7 @@ python-ldap, requests, six }: buildPythonPackage rec { pname = "dogtag-pki"; version = "11.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index e25bc5d23ae70..d0b7e983a0994 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -18,6 +18,7 @@ buildPythonPackage { pname = "dogtail"; version = "0.9.11"; + format = "setuptools"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/doit-py/default.nix b/pkgs/development/python-modules/doit-py/default.nix index ed8666a034906..ee10af6396e70 100644 --- a/pkgs/development/python-modules/doit-py/default.nix +++ b/pkgs/development/python-modules/doit-py/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "doit-py"; version = "0.5.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "pydoit"; diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index d3cc29c775aed..190219cf1c0c0 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -19,6 +19,7 @@ let doit = buildPythonPackage rec { pname = "doit"; version = "0.36.0"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix index 9bd32d1ba4a1e..036a7658fa387 100644 --- a/pkgs/development/python-modules/dopy/default.nix +++ b/pkgs/development/python-modules/dopy/default.nix @@ -7,6 +7,7 @@ buildPythonPackage { pname = "dopy"; version = "2016-01-04"; + format = "setuptools"; src = pkgs.fetchFromGitHub { owner = "Wiredcraft"; diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index f2046d106b91c..0e339ac00c9f9 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "dpkt"; version = "1.9.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/draftjs-exporter/default.nix b/pkgs/development/python-modules/draftjs-exporter/default.nix index ef94901e9aac1..dd03080277b53 100644 --- a/pkgs/development/python-modules/draftjs-exporter/default.nix +++ b/pkgs/development/python-modules/draftjs-exporter/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "draftjs-exporter"; version = "5.0.0"; + format = "setuptools"; src = fetchFromGitHub { repo = "draftjs_exporter"; diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix index d4c96ba3b5cd9..57b10f4a7c9de 100644 --- a/pkgs/development/python-modules/dragonfly/default.nix +++ b/pkgs/development/python-modules/dragonfly/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { pname = "dragonfly"; version = "0.35.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "dictation-toolbox"; diff --git a/pkgs/development/python-modules/drf-jwt/default.nix b/pkgs/development/python-modules/drf-jwt/default.nix index 6ae583c98e068..f4d70949c67aa 100644 --- a/pkgs/development/python-modules/drf-jwt/default.nix +++ b/pkgs/development/python-modules/drf-jwt/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "drf-jwt"; version = "1.19.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "Styria-Digital"; diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index 253604370cbc8..53c4d5053e622 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { pname = "drf-spectacular"; version = "0.26.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "tfranzel"; diff --git a/pkgs/development/python-modules/drf-writable-nested/default.nix b/pkgs/development/python-modules/drf-writable-nested/default.nix index 603f94426bc56..2368c584a457c 100644 --- a/pkgs/development/python-modules/drf-writable-nested/default.nix +++ b/pkgs/development/python-modules/drf-writable-nested/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "drf-writable-nested"; version = "0.7.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "beda-software"; diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index 8c6692d7c8f4a..a8665ecc126f0 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "drf-yasg"; version = "1.21.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/drivelib/default.nix b/pkgs/development/python-modules/drivelib/default.nix index 7b0a629e8a89b..5125be5a418da 100644 --- a/pkgs/development/python-modules/drivelib/default.nix +++ b/pkgs/development/python-modules/drivelib/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "drivelib"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dronecan/default.nix b/pkgs/development/python-modules/dronecan/default.nix index 51e7265725a45..1505103146adf 100644 --- a/pkgs/development/python-modules/dronecan/default.nix +++ b/pkgs/development/python-modules/dronecan/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { ''; homepage = "https://dronecan.github.io/"; license = licenses.mit; - maintainers = [ teams.ororatech ]; + maintainers = teams.ororatech.members; }; } diff --git a/pkgs/development/python-modules/ds4drv/default.nix b/pkgs/development/python-modules/ds4drv/default.nix index 05f54c2f90641..a28c2d8608852 100644 --- a/pkgs/development/python-modules/ds4drv/default.nix +++ b/pkgs/development/python-modules/ds4drv/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "ds4drv"; version = "0.5.1"; + format = "setuptools"; # PyPi only carries py3 wheel src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index f75d326887389..eee41de63bd4e 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ducc0"; version = "0.32.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index 2e084fe774fd5..76447627c4c53 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -1,30 +1,34 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib -, setuptools +{ lib , aiofiles +, buildPythonPackage , click +, fetchFromGitHub , h2 , httpx , lxml +, pythonOlder , requests +, setuptools , socksio }: buildPythonPackage rec { pname = "duckduckgo-search"; - version = "3.9.4"; + version = "3.9.9"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "deedy5"; repo = "duckduckgo_search"; rev = "refs/tags/v${version}"; - hash = "sha256-R96ezs0INIZAXTcD1eWXuj4MSJvCbtbgzgC3ls7wYyI="; + hash = "sha256-swuMCobYF5u41O1Qp5Gx/n8BIgSEnhRVZ5Owk3IPbeI="; }; - format = "pyproject"; - - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ aiofiles @@ -38,12 +42,15 @@ buildPythonPackage rec { ++ httpx.optional-dependencies.http2 ++ httpx.optional-dependencies.socks; - pythonImportsCheck = [ "duckduckgo_search" ]; + pythonImportsCheck = [ + "duckduckgo_search" + ]; - meta = { - description = "A python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine"; + meta = with lib; { + description = "Python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine"; homepage = "https://github.com/deedy5/duckduckgo_search"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + changelog = "https://github.com/deedy5/duckduckgo_search/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/duet/default.nix b/pkgs/development/python-modules/duet/default.nix index 4741414ca5416..1bde4c0f65fce 100644 --- a/pkgs/development/python-modules/duet/default.nix +++ b/pkgs/development/python-modules/duet/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "duet"; version = "0.2.7"; + format = "setuptools"; src = fetchFromGitHub { owner = "google"; diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 6c87d50ccfd4c..7cfc29c9ff813 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "dugong"; version = "3.8.1"; + format = "setuptools"; disabled = pythonOlder "3.3"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 2e1c93f89c04b..3dfb70f888328 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.21.6"; + version = "0.21.7"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-MPvofotR84E8Ex4oQchtAHQ00WC9FttYa0DUfzHdBbA="; + hash = "sha256-qenGaDPOpYDDrBKSfkuXEZhddq/KmNqXFAXUFN5g6Wg="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/dungeon-eos/default.nix b/pkgs/development/python-modules/dungeon-eos/default.nix index c8525c3fcb992..ace614bcaeb4c 100644 --- a/pkgs/development/python-modules/dungeon-eos/default.nix +++ b/pkgs/development/python-modules/dungeon-eos/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "dungeon-eos"; version = "0.0.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "SkyTemple"; diff --git a/pkgs/development/python-modules/dvc-azure/default.nix b/pkgs/development/python-modules/dvc-azure/default.nix index fee36f66d8865..339e36fc04894 100644 --- a/pkgs/development/python-modules/dvc-azure/default.nix +++ b/pkgs/development/python-modules/dvc-azure/default.nix @@ -6,34 +6,46 @@ , fetchPypi , knack , pythonRelaxDepsHook -, setuptools-scm }: +, setuptools-scm +}: buildPythonPackage rec { pname = "dvc-azure"; - version = "2.22.1"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-v3VRCN1OoST5RlfUOP9Dpfmf3o9C/ckusmh91Ya2Cik="; + hash = "sha256-TB7yY5b2AWBFt8+AnxyKyP6hoXi6cdHVjtffapRVfHc="; }; # Prevent circular dependency - pythonRemoveDeps = [ "dvc" ]; + pythonRemoveDeps = [ + "dvc" + ]; - nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ]; + nativeBuildInputs = [ + setuptools-scm + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ - adlfs azure-identity dvc-objects knack + adlfs + azure-identity + dvc-objects + knack ]; # Network access is needed for tests doCheck = false; - pythonImportsCheck = [ "dvc_azure" ]; + # Circular dependency + # pythonImportsCheck = [ + # "dvc_azure" + # ]; meta = with lib; { - description = "azure plugin for dvc"; + description = "Azure plugin for dvc"; homepage = "https://pypi.org/project/dvc-azure/${version}"; changelog = "https://github.com/iterative/dvc-azure/releases/tag/${version}"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 3c054f1ccb0ca..ea4d12b9921d1 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.22.3"; + version = "3.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; rev = "refs/tags/${version}"; - hash = "sha256-5x+I6Ds7x3JqaZ1oyddrsaX0kbMM8pO+rF3ckpRdcgc="; + hash = "sha256-vLSb+RIaebF+ili+6bvU8wplcpycPVRadUkhkLHdqi8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-gs/default.nix b/pkgs/development/python-modules/dvc-gs/default.nix index e36ec61a88c3f..fa01c64c8daf5 100644 --- a/pkgs/development/python-modules/dvc-gs/default.nix +++ b/pkgs/development/python-modules/dvc-gs/default.nix @@ -4,29 +4,41 @@ , fetchPypi , gcsfs , pythonRelaxDepsHook -, setuptools-scm }: +, setuptools-scm +}: buildPythonPackage rec { pname = "dvc-gs"; - version = "2.22.1"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-IKDwdSfolZwv8TvHHicVV42PYeULhskv8csbkiJzLbk="; + hash = "sha256-5UMKKX+4GCNm98S8kQsasQTY5cwi9hGhm84FFl3/7NQ="; }; # Prevent circular dependency - pythonRemoveDeps = [ "dvc" ]; + pythonRemoveDeps = [ + "dvc" + ]; - nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ]; + nativeBuildInputs = [ + setuptools-scm + pythonRelaxDepsHook + ]; - propagatedBuildInputs = [ gcsfs dvc-objects ]; + propagatedBuildInputs = [ + gcsfs + dvc-objects + ]; # Network access is needed for tests doCheck = false; - pythonImportsCheck = [ "dvc_gs" ]; + # Circular dependency + # pythonImportsCheck = [ + # "dvc_gs" + # ]; meta = with lib; { description = "gs plugin for dvc"; diff --git a/pkgs/development/python-modules/dvc-http/default.nix b/pkgs/development/python-modules/dvc-http/default.nix index cb812d850c166..49737d9b21ce6 100644 --- a/pkgs/development/python-modules/dvc-http/default.nix +++ b/pkgs/development/python-modules/dvc-http/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dvc-http"; - version = "2.30.2"; + version = "2.32.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-IlgJEnS+rHSg5cw7SCc3vVtG1mJA5voGViya7nkpL2M="; + hash = "sha256-ru/hOFv/RcS/7SBpTJU8xFxdllmaiH4dV1ouS6GGKkY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 041d2b1a3db17..1f07fe7b87079 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -1,58 +1,62 @@ { lib , buildPythonPackage , fetchFromGitHub -, flatten-dict , fsspec , funcy -, pygtrie , pytest-mock , pytestCheckHook , pythonOlder +, reflink , setuptools-scm , shortuuid -, tqdm -, typing-extensions }: buildPythonPackage rec { pname = "dvc-objects"; - version = "1.3.2"; - format = "pyproject"; + version = "3.0.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "dvc-objects"; rev = "refs/tags/${version}"; - hash = "sha256-30UnTbEHpGSgSGnhml7pXtPDivH9+NO7nvK4jEmRRUA="; + hash = "sha256-hpiDbECVXbBkewJa+RwrgTQFEFAb3Ir2qs0ENYuJtwI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --benchmark-skip" "" + ''; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ - flatten-dict fsspec funcy - pygtrie shortuuid - tqdm - typing-extensions ]; nativeCheckInputs = [ pytest-mock pytestCheckHook + reflink ]; pythonImportsCheck = [ "dvc_objects" ]; + disabledTestPaths = [ + # Disable benchmarking + "tests/benchmarks/" + ]; + meta = with lib; { description = "Library for DVC objects"; homepage = "https://github.com/iterative/dvc-objects"; diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index c0ab18a4d17c7..1d7de80cf6612 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-render"; - version = "0.6.0"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-seL96aOJ554pD7lgzXZFDCXqY/3TAQugWMA7MtqKoAE="; + hash = "sha256-OrfepQuLBNa5m3Sy4NzFOArtFFvaNtNNVJ8DNN3yT6s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-s3/default.nix b/pkgs/development/python-modules/dvc-s3/default.nix index ca4fe5a810d0d..a15295649d4e3 100644 --- a/pkgs/development/python-modules/dvc-s3/default.nix +++ b/pkgs/development/python-modules/dvc-s3/default.nix @@ -7,36 +7,48 @@ , flatten-dict , pythonRelaxDepsHook , s3fs -, setuptools-scm }: +, setuptools-scm +}: buildPythonPackage rec { pname = "dvc-s3"; - version = "2.23.0"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-HyhZj1sN70o1CTNCiroGKjaMk7tBGqPG2PRsrnm1uVc="; + hash = "sha256-ax2Wsjfvu4hoF99eDPT2sbFhl30wuYtGdEonYCCkJMY="; }; # Prevent circular dependency - pythonRemoveDeps = [ "dvc" ]; + pythonRemoveDeps = [ + "dvc" + ]; # dvc-s3 uses boto3 directly, we add in propagatedBuildInputs postPatch = '' substituteInPlace setup.cfg --replace 'aiobotocore[boto3]' 'aiobotocore' ''; - nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ]; + nativeBuildInputs = [ + setuptools-scm + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ - aiobotocore boto3 dvc-objects flatten-dict s3fs + aiobotocore + boto3 + dvc-objects + flatten-dict s3fs ]; # Network access is needed for tests doCheck = false; - pythonImportsCheck = [ "dvc_s3" ]; + # Circular dependency + # pythonImportsCheck = [ + # "dvc_s3" + # ]; meta = with lib; { description = "s3 plugin for dvc"; diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix index b2ad5f1dac0d3..bfc3cc84e67a9 100644 --- a/pkgs/development/python-modules/dvc-studio-client/default.nix +++ b/pkgs/development/python-modules/dvc-studio-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dvc-studio-client"; - version = "0.17.0"; + version = "0.18.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cC/OcQglVIzj4PZFhzq3cXA/4dYkY1gW9b8Ub6opZJU="; + hash = "sha256-ZgjNshF5UFOY5TewNMlJDOajjI1Bfd/a4v7HrAKwaMw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index f7ee2eccd3df1..3d1461ab0a765 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.30.3"; + version = "3.37.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-efj2p5Tj3VWJC7o8/nLpNrkM0eZodLMsFZRcZQpLFws="; + hash = "sha256-mO6fhPUub09nWmiFSciwNhuS4VJAjQgIukc+lQWB7Qg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dvc/dvc-daemon.patch b/pkgs/development/python-modules/dvc/dvc-daemon.patch deleted file mode 100644 index 65ba630f3b80d..0000000000000 --- a/pkgs/development/python-modules/dvc/dvc-daemon.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/dvc/daemon.py b/dvc/daemon.py -index 9854a0e1..fefdd613 100644 ---- a/dvc/daemon.py -+++ b/dvc/daemon.py -@@ -103,11 +103,8 @@ def daemon(args): - logger.debug("skipping launching a new daemon.") - return - -- cmd = ["daemon", "-q"] + args -- -- env = fix_env() -- file_path = os.path.abspath(inspect.stack()[0][1]) -- env["PYTHONPATH"] = os.path.dirname(os.path.dirname(file_path)) -+ cmd = [ "@dvc@" , "daemon", "-q"] + args -+ env = os.environ.copy() - env[DVC_DAEMON] = "1" - - _spawn(cmd, env) diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 628afaaac4ddc..ebe26e2b057fa 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 = "3.3.1"; + version = "3.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-esvDCAsGoaB4t4hiTmoQa69Sgg5crqJyiom/iXxpZow="; + hash = "sha256-QsA8HZ6wIWKvtQ+f3nyRKKZRNJS56eZ1sKw+KNHxfXc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 39e6ff6ed760a..b058fe34411c7 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "dyn"; version = "1.8.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index 7066271182ef4..111e7f69e13cf 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "dynalite-devices"; - version = "0.47"; + version = "0.1.48"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ziv1234"; repo = "python-dynalite-devices"; rev = "refs/tags/v${version}"; - hash = "sha256-kJo4e5vhgWzijLUhQd9VBVk1URpg9SXhOA60dJYashM="; + hash = "sha256-i88aIsRNsToSceQdwfspJg+Y5MO5zC4O6EkyhrYR27g="; }; postPatch = '' @@ -37,6 +37,9 @@ buildPythonPackage rec { "dynalite_devices_lib" ]; + # it would use the erroneous tag v0.47 + passthru.skipBulkUpdate = false; + meta = with lib; { description = "An unofficial Dynalite DyNET interface creating devices"; homepage = "https://github.com/ziv1234/python-dynalite-devices"; diff --git a/pkgs/development/python-modules/dynalite-panel/default.nix b/pkgs/development/python-modules/dynalite-panel/default.nix new file mode 100644 index 0000000000000..33be58906c750 --- /dev/null +++ b/pkgs/development/python-modules/dynalite-panel/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "dynalite-panel"; + version = "0.0.4"; + pyproject = true; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-m7nQzbxRe2qXUWAMeQlDZtc9F01DsbTzF/kI0ci3TFE="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "~=" ">=" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ "dynalite_panel" ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "Dynalite panel for Home Assistant"; + homepage = "https://github.com/ziv1234/dynalitepanel"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index 61c29fbff49ba..ff9364207c76d 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -6,12 +6,16 @@ , fetchpatch , cmake , fetchFromGitHub +, pythonAtLeast }: buildPythonPackage rec { version = "0.7.2"; + format = "setuptools"; pname = "dynd"; + disabled = pythonAtLeast "3.11"; + src = fetchFromGitHub { owner = "libdynd"; repo = "dynd-python"; diff --git a/pkgs/development/python-modules/easyenergy/default.nix b/pkgs/development/python-modules/easyenergy/default.nix index 8b6092e13c40d..91031fd567aac 100644 --- a/pkgs/development/python-modules/easyenergy/default.nix +++ b/pkgs/development/python-modules/easyenergy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "easyenergy"; - version = "1.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-easyenergy"; rev = "refs/tags/v${version}"; - hash = "sha256-HdCrbEk1b+FZzDoMoLcNaPFEHQfDoQsePKmESM9Qhds="; + hash = "sha256-WnDyGkF1JI0Yu4p+znBdtCRvzrmGl9DH7QygKDuhEZo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix index cfcd2ed77ad71..96b1dbb16a24f 100644 --- a/pkgs/development/python-modules/easygui/default.nix +++ b/pkgs/development/python-modules/easygui/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "easygui"; version = "0.98.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index b1818665f8791..7a82d78a1dbd8 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "easyprocess"; version = "1.1"; + format = "setuptools"; src = fetchPypi { pname = "EasyProcess"; diff --git a/pkgs/development/python-modules/easywatch/default.nix b/pkgs/development/python-modules/easywatch/default.nix index 36f3ea0de6efa..ecc7cc068ff7a 100644 --- a/pkgs/development/python-modules/easywatch/default.nix +++ b/pkgs/development/python-modules/easywatch/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "easywatch"; version = "0.0.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ebaysdk/default.nix b/pkgs/development/python-modules/ebaysdk/default.nix index bd4b736b720bf..27b3f8a29fbb3 100644 --- a/pkgs/development/python-modules/ebaysdk/default.nix +++ b/pkgs/development/python-modules/ebaysdk/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "ebaysdk"; version = "2.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index ba5fa836c21b1..2ce07e5b6b2b8 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "ecdsa"; version = "0.18.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix index af3a3d43a6d7b..a025eb3873084 100644 --- a/pkgs/development/python-modules/echo/default.nix +++ b/pkgs/development/python-modules/echo/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "echo"; version = "0.8.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/ecoaliface/default.nix b/pkgs/development/python-modules/ecoaliface/default.nix index f37a85da7d01e..1764eceeaf461 100644 --- a/pkgs/development/python-modules/ecoaliface/default.nix +++ b/pkgs/development/python-modules/ecoaliface/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "ecoaliface"; version = "0.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ed25519-blake2b/default.nix b/pkgs/development/python-modules/ed25519-blake2b/default.nix index 64061551e2daf..2fca4287a348b 100644 --- a/pkgs/development/python-modules/ed25519-blake2b/default.nix +++ b/pkgs/development/python-modules/ed25519-blake2b/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "ed25519-blake2b"; version = "1.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index 47692075d3bc8..1ebfdcfc844d5 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ed25519"; version = "1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/editdistance-s/default.nix b/pkgs/development/python-modules/editdistance-s/default.nix index 6dd37739302fd..b6eca2e0242c9 100644 --- a/pkgs/development/python-modules/editdistance-s/default.nix +++ b/pkgs/development/python-modules/editdistance-s/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "editdistance-s"; version = "1.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "asottile"; diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 4796ab99623ac..eaca751784749 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -15,6 +15,7 @@ in buildPythonPackage rec { pname = "editorconfig"; version = "0.12.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "editorconfig"; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 39ad36b70439f..c93ddff879bee 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.19.6"; + version = "0.19.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; - rev = "v${version}"; - hash = "sha256-T4DVidz4Xu4M+G7CzrUxRQPotg8ciwCQfa95e0IgpkM="; + rev = "refs/tags/v${version}"; + hash = "sha256-KZCY/bHrhQNARK8UMxhI9rvpcBDa/Qp+yvpQG8HCIho="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix index 357db8d2b8e8d..b451480d3be10 100644 --- a/pkgs/development/python-modules/edlib/default.nix +++ b/pkgs/development/python-modules/edlib/default.nix @@ -10,6 +10,7 @@ buildPythonPackage { inherit (edlib) pname src meta; version = "1.3.9"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index 05171c22d18e1..1343bbc51d739 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "edward"; version = "1.3.5"; + format = "setuptools"; disabled = !(isPy27 || pythonAtLeast "3.4"); diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index ad2e3116bfc4d..93ec1fc59b50f 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenpy"; - version = "3.1.4"; + version = "3.2.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-+1qjyWRE6a9KOopZln/7DyTTAQchAUoqd9HT83+zVuI="; + hash = "sha256-ApWz0La+weqczVj3EyBqTAFlTt8cylA3Dl0ZDP4/i5o="; }; strictDeps = true; diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index 9cc5de24e0a55..9c2de1bad9cef 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, chainer , fetchFromGitHub , hatchling , jupyter @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "einops"; version = "0.7.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +28,6 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; nativeCheckInputs = [ - chainer jupyter nbconvert numpy @@ -38,7 +36,7 @@ buildPythonPackage rec { pytestCheckHook ]; - env.EINOPS_TEST_BACKENDS = "numpy,chainer"; + env.EINOPS_TEST_BACKENDS = "numpy"; preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 6163c7ecc9c75..dfee78a41408b 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; version = "8.11.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index a07ba8c6d1880..e93388a1bbcc9 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -8,6 +8,7 @@ buildPythonPackage (rec { pname = "elasticsearch"; version = "8.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index b3c06adb539ef..23187eb603e99 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.11.0"; + version = "8.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+y9U5fscYLAfP6IhLxzUUOENaNC4i8NAPEFtVP5+HG4="; + hash = "sha256-nY+qZ94uVBLMPb0i0k7gEUfcR5lsE6lcbtFtGQkTKeo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/elevate/default.nix b/pkgs/development/python-modules/elevate/default.nix index cfb1dbf068dc1..4a8bf40e30fc8 100644 --- a/pkgs/development/python-modules/elevate/default.nix +++ b/pkgs/development/python-modules/elevate/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "elevate"; version = "0.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix index 3aeab819b76a5..f17b502826ceb 100644 --- a/pkgs/development/python-modules/elgato/default.nix +++ b/pkgs/development/python-modules/elgato/default.nix @@ -3,8 +3,9 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, mashumaro +, orjson , poetry-core -, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "elgato"; - version = "5.0.0"; + version = "5.1.2"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-elgato"; rev = "refs/tags/v${version}"; - hash = "sha256-TI5wu2FYVUMvgDkbktcwPLnTSD8XUSy8qwOCdrsiopk="; + hash = "sha256-NAU4tr0oaAPPrOUZYl9WoGOM68MlrBqGewHBIiIv2XY="; }; postPatch = '' @@ -38,7 +39,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - pydantic + mashumaro + orjson yarl ]; diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix index 0f13e877e596d..236ab931f939d 100644 --- a/pkgs/development/python-modules/emailthreads/default.nix +++ b/pkgs/development/python-modules/emailthreads/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "emailthreads"; version = "0.1.3"; + format = "setuptools"; disabled = !isPy3k; # pypi is missing files for tests diff --git a/pkgs/development/python-modules/embedding-reader/default.nix b/pkgs/development/python-modules/embedding-reader/default.nix index 59015f3fa4bac..0686f9a0092ec 100644 --- a/pkgs/development/python-modules/embedding-reader/default.nix +++ b/pkgs/development/python-modules/embedding-reader/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "embedding-reader"; version = "1.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "rom1504"; diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix index b4b0b9b2106a5..d20a7ea6e246b 100644 --- a/pkgs/development/python-modules/emborg/default.nix +++ b/pkgs/development/python-modules/emborg/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "emborg"; - version = "1.37"; + version = "1.38"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "emborg"; rev = "refs/tags/v${version}"; - hash = "sha256-bHYs+vlNku/T5Hb9u77Xml9/FNj5vgqPeXSzcilsS+I="; + hash = "sha256-dK/6y1cjegomiy3fta2grUm4T0ZrylmstXfkJo4mDCE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/empty-files/default.nix b/pkgs/development/python-modules/empty-files/default.nix index 1028b3f567c51..264e4543a20f6 100644 --- a/pkgs/development/python-modules/empty-files/default.nix +++ b/pkgs/development/python-modules/empty-files/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "empty-files"; version = "0.0.9"; + format = "setuptools"; src = fetchFromGitHub { owner = "approvals"; diff --git a/pkgs/development/python-modules/empy/default.nix b/pkgs/development/python-modules/empy/default.nix index 22f2830a447ed..1765fd4ff60b7 100644 --- a/pkgs/development/python-modules/empy/default.nix +++ b/pkgs/development/python-modules/empy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "empy"; version = "4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "sha256-JNmmKyN+G1+c7Lqw6Ta/9zVAJS0R6sb95/62OxSHuOM="; diff --git a/pkgs/development/python-modules/emulated-roku/default.nix b/pkgs/development/python-modules/emulated-roku/default.nix index 3a9da2ba8e372..e3d01c21e9914 100644 --- a/pkgs/development/python-modules/emulated-roku/default.nix +++ b/pkgs/development/python-modules/emulated-roku/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "emulated-roku"; version = "0.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "mindigmarton"; diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix index 82ddd9726dd02..db16d913cbdbf 100644 --- a/pkgs/development/python-modules/enamlx/default.nix +++ b/pkgs/development/python-modules/enamlx/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "enamlx"; version = "0.6.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "frmdstryr"; diff --git a/pkgs/development/python-modules/enamlx/replace-unicode-with-str.patch b/pkgs/development/python-modules/enamlx/replace-unicode-with-str.patch deleted file mode 100644 index 52df6e9a50e68..0000000000000 --- a/pkgs/development/python-modules/enamlx/replace-unicode-with-str.patch +++ /dev/null @@ -1,274 +0,0 @@ -From 16df11227b8cee724624541d274e481802ea67e3 Mon Sep 17 00:00:00 2001 -From: frmdstryr <frmdstryr@protonmail.com> -Date: Tue, 3 Nov 2020 21:41:52 -0500 -Subject: [PATCH] Replace Unicode with Str - ---- - enamlx/widgets/abstract_item.py | 4 ++-- - enamlx/widgets/console.py | 4 ++-- - enamlx/widgets/graphics_view.py | 8 ++++---- - enamlx/widgets/plot_area.py | 14 +++++++------- - examples/occ_viewer/advanced.enaml | 12 ++++++------ - examples/occ_viewer/occ/part.py | 6 +++--- - examples/plot_area/plot_area.enaml | 2 +- - examples/table_view/table_view.enaml | 6 +++--- - examples/tree_view/tree_view.enaml | 6 +++--- - setup.py | 2 +- - 10 files changed, 32 insertions(+), 32 deletions(-) - -diff --git a/enamlx/widgets/abstract_item.py b/enamlx/widgets/abstract_item.py -index 29a3d87..67a5c6e 100644 ---- a/enamlx/widgets/abstract_item.py -+++ b/enamlx/widgets/abstract_item.py -@@ -6,7 +6,7 @@ - Created on Aug 24, 2015 - """ - from atom.api import ( -- Int, Enum, Bool, Unicode, Typed, -+ Int, Enum, Bool, Str, Typed, - Coerced, Event, Property, ForwardInstance, observe - ) - from enaml.icon import Icon -@@ -96,7 +96,7 @@ class AbstractWidgetItem(AbstractWidgetItemGroup): - column = d_(Int(), writable=False) - - #: Text to display within the cell -- text = d_(Unicode()) -+ text = d_(Str()) - - #: Text alignment within the cell - text_alignment = d_(Enum(*[(h, v) -diff --git a/enamlx/widgets/console.py b/enamlx/widgets/console.py -index bc61e90..2f1e981 100644 ---- a/enamlx/widgets/console.py -+++ b/enamlx/widgets/console.py -@@ -7,7 +7,7 @@ - """ - - from atom.api import ( -- Instance, Coerced, Int, Enum, Unicode, Dict, Bool, -+ Instance, Coerced, Int, Enum, Str, Dict, Bool, - Typed, ForwardTyped, observe - ) - from enaml.core.api import d_ -@@ -47,7 +47,7 @@ class Console(Container): - proxy = Typed(ProxyConsole) - - #: Font family, leave blank for default -- font_family = d_(Unicode()) -+ font_family = d_(Str()) - - #: Font size, leave 0 for default - font_size = d_(Int(0)) -diff --git a/enamlx/widgets/graphics_view.py b/enamlx/widgets/graphics_view.py -index f7e3e47..e672c63 100644 ---- a/enamlx/widgets/graphics_view.py -+++ b/enamlx/widgets/graphics_view.py -@@ -7,7 +7,7 @@ - import sys - from atom.api import ( - Atom, Float, Int, Typed, Bool, Coerced, ForwardTyped, Enum, List, IntEnum, -- Instance, Unicode, Value, Event, Property, observe, set_default -+ Instance, Str, Value, Event, Property, observe, set_default - ) - from enaml.colors import ColorMember - from enaml.core.declarative import d_, d_func -@@ -419,10 +419,10 @@ class GraphicsItem(ToolkitObject, ConstrainableMixin): - visible = d_(Bool(True)) - - #: Tool tip -- tool_tip = d_(Unicode()) -+ tool_tip = d_(Str()) - - #: Status tip -- status_tip = d_(Unicode()) -+ status_tip = d_(Str()) - - # -------------------------------------------------------------------------- - # Item interaction -@@ -919,7 +919,7 @@ class GraphicsTextItem(AbstractGraphicsShapeItem): - proxy = Typed(ProxyGraphicsTextItem) - - #: Text -- text = d_(Unicode()) -+ text = d_(Str()) - - #: Font - font = d_(FontMember()) -diff --git a/enamlx/widgets/plot_area.py b/enamlx/widgets/plot_area.py -index 5136693..383957b 100644 ---- a/enamlx/widgets/plot_area.py -+++ b/enamlx/widgets/plot_area.py -@@ -8,7 +8,7 @@ - import sys - from atom.atom import set_default - from atom.api import (Callable, Int, Tuple, Instance, Enum, Float, -- ContainerList, Bool, FloatRange, Unicode, Dict, Typed, -+ ContainerList, Bool, FloatRange, Str, Dict, Typed, - ForwardTyped, observe) - from enaml.core.declarative import d_ - from enaml.widgets.api import Container -@@ -41,10 +41,10 @@ class PlotArea(Container): - - class PlotItem(Control): - #: Title of data series -- title = d_(Unicode()) -+ title = d_(Str()) - - #: Name -- name = d_(Unicode()) -+ name = d_(Str()) - - #: Row in plot area - row = d_(Int(0)) -@@ -89,10 +89,10 @@ class PlotItem(Control): - #: Show legend - show_legend = d_(Bool(False)) - -- label_left = d_(Unicode()) -- label_right = d_(Unicode()) -- label_top = d_(Unicode()) -- label_bottom = d_(Unicode()) -+ label_left = d_(Str()) -+ label_right = d_(Str()) -+ label_top = d_(Str()) -+ label_bottom = d_(Str()) - - # H, V - grid = d_(Tuple(bool, default=(False, False))) -diff --git a/examples/occ_viewer/advanced.enaml b/examples/occ_viewer/advanced.enaml -index 872d44d..f1c48d5 100644 ---- a/examples/occ_viewer/advanced.enaml -+++ b/examples/occ_viewer/advanced.enaml -@@ -15,7 +15,7 @@ is then used to unroll a list of these controls into the body of a form. - - << autodoc-me >> - """ --from atom.api import Atom, Bool, Enum, Event, Float, Int, Str, Unicode -+from atom.api import Atom, Bool, Enum, Event, Float, Int, Str, Str - - from enaml.core.api import DynamicTemplate - from enaml.stdlib.fields import FloatField -@@ -73,8 +73,8 @@ template FormControl(Attr, MemberType: Str): - text :: setattr(model, Attr, str(text)) - - --template FormControl(Attr, MemberType: Unicode): -- """ A form control template specialization for Unicode members. -+template FormControl(Attr, MemberType: Str): -+ """ A form control template specialization for Str members. - - This control uses a Field to represent the value. - -@@ -174,7 +174,7 @@ def form_spec(obtype, model): - - typemap = {int:Int, - float:Float, -- unicode:Unicode, -+ unicode:Str, - str:Str} - for name, member in obtype.members().iteritems(): - if (not name.startswith('_') -@@ -263,14 +263,14 @@ class FooModel(Atom): - ham = Int(42) - first = Str('first') - last = Str('last') -- owner = Unicode('owner') -+ owner = Str('owner') - time = Float(42.56) - click = Bool() - clack = Bool() - - - class BarModel(Atom): -- name = Unicode('name') -+ name = Str('name') - trigger = Event() - choices = Enum('first', 'second', 'third') - def _observe_trigger(self, change): -diff --git a/examples/occ_viewer/occ/part.py b/examples/occ_viewer/occ/part.py -index 1fe2b85..144354f 100644 ---- a/examples/occ_viewer/occ/part.py -+++ b/examples/occ_viewer/occ/part.py -@@ -5,7 +5,7 @@ - ''' - - from atom.api import ( -- Typed, ForwardTyped, Unicode -+ Typed, ForwardTyped, Str - ) - from enaml.core.declarative import d_ - -@@ -26,10 +26,10 @@ class Part(ToolkitObject): - proxy = Typed(ProxyPart) - - #: Optional name of the part -- name = d_(Unicode()) -+ name = d_(Str()) - - #: Optional description of the part -- description = d_(Unicode()) -+ description = d_(Str()) - - @property - def shapes(self): -diff --git a/examples/plot_area/plot_area.enaml b/examples/plot_area/plot_area.enaml -index 2085c8f..b5cd3c4 100644 ---- a/examples/plot_area/plot_area.enaml -+++ b/examples/plot_area/plot_area.enaml -@@ -2,7 +2,7 @@ - Demonstrating the examples from pyqtgraph - """ - --from atom.api import (Atom, Unicode, Range, List, Bool) -+from atom.api import (Atom, Str, Range, List, Bool) - - from enaml.widgets.api import ( - Window, Container, DockArea,DockItem,PushButton, CheckBox, RadioButton -diff --git a/examples/table_view/table_view.enaml b/examples/table_view/table_view.enaml -index 6d7a35e..6fef544 100644 ---- a/examples/table_view/table_view.enaml -+++ b/examples/table_view/table_view.enaml -@@ -2,7 +2,7 @@ import os - import time - import random - from threading import Thread --from atom.api import (Atom, Unicode, Range, ContainerList, Bool) -+from atom.api import (Atom, Str, Range, ContainerList, Bool) - - from enamlx.widgets.table_view import ( - TableView, TableViewRow, TableViewItem -@@ -38,9 +38,9 @@ class Person(Atom): - """ A simple class representing a person object. - - """ -- last_name = Unicode() -+ last_name = Str() - -- first_name = Unicode() -+ first_name = Str() - - age = Range(low=0) - -diff --git a/examples/tree_view/tree_view.enaml b/examples/tree_view/tree_view.enaml -index 37f991f..e88e1fd 100644 ---- a/examples/tree_view/tree_view.enaml -+++ b/examples/tree_view/tree_view.enaml -@@ -1,5 +1,5 @@ - import os --from atom.api import (Atom, Unicode, Range, List, Bool, ForwardInstance) -+from atom.api import (Atom, Str, Range, List, Bool, ForwardInstance) - - from enamlx.widgets.api import ( - TreeView, TreeViewItem, TreeViewColumn, -@@ -33,9 +33,9 @@ class Person(Atom): - """ A simple class representing a person object. - - """ -- last_name = Unicode() -+ last_name = Str() - -- first_name = Unicode() -+ first_name = Str() - - children = List(ForwardInstance(lambda:Person)) diff --git a/pkgs/development/python-modules/energyzero/default.nix b/pkgs/development/python-modules/energyzero/default.nix index 0b0acc5dab06a..0c99ced94a138 100644 --- a/pkgs/development/python-modules/energyzero/default.nix +++ b/pkgs/development/python-modules/energyzero/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "energyzero"; - version = "1.0.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-energyzero"; rev = "refs/tags/v${version}"; - hash = "sha256-EsZYEc4Hf99PoP5X9LEgcGftI7597P4l1LTepTabGqU="; + hash = "sha256-NZbCiLCZC+hTcV0twOeCoKKD3eZ0/ZzPTnVpFyMLSfw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index af24162ada3e4..713370bbb786c 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.12.2"; + version = "1.12.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jAn2VxEZdGzuZ3bL9OfASkjoiPTMrm2zd6WHZ0HwiZ8="; + hash = "sha256-dfPZK0ng715FT8Gg853Aq49tmUbL5TTbPe0wECF9W18="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/enocean/default.nix b/pkgs/development/python-modules/enocean/default.nix index 162e39aebffe5..48fc882a1b723 100644 --- a/pkgs/development/python-modules/enocean/default.nix +++ b/pkgs/development/python-modules/enocean/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "enocean"; version = "0.60.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "kipe"; diff --git a/pkgs/development/python-modules/enrich/default.nix b/pkgs/development/python-modules/enrich/default.nix index abaa47ec07dc4..71e1cd1b2e59f 100644 --- a/pkgs/development/python-modules/enrich/default.nix +++ b/pkgs/development/python-modules/enrich/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "enrich"; version = "1.2.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index 97ac60fa5083f..aa6c06e5bf5e7 100644 --- a/pkgs/development/python-modules/entrance/default.nix +++ b/pkgs/development/python-modules/entrance/default.nix @@ -19,6 +19,7 @@ in buildPythonPackage rec { pname = "entrance"; version = "1.1.20"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/pkgs/development/python-modules/enum-compat/default.nix index 42a4b63479ca6..a8409353d4897 100644 --- a/pkgs/development/python-modules/enum-compat/default.nix +++ b/pkgs/development/python-modules/enum-compat/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "enum-compat"; version = "0.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 9906725b63c65..f11b85d8bf7b6 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.6.0"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-YIU0fboXw2CHkAeC47pcXlZT2KPO0R1UolBVILlLoPg="; + hash = "sha256-6p4holWMAoaosmTL8AveRGuBS/MymC7usvK3I7CBEKQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/environmental-override/default.nix b/pkgs/development/python-modules/environmental-override/default.nix index 235401153136a..3418f4169666f 100644 --- a/pkgs/development/python-modules/environmental-override/default.nix +++ b/pkgs/development/python-modules/environmental-override/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "environmental-override"; version = "0.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index 5591d74d38a03..c426aaeeaee55 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -8,22 +8,27 @@ , pytestCheckHook , python-dotenv , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "environs"; - version = "9.5.0"; - format = "setuptools"; + version = "10.0.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sloria"; - repo = pname; - rev = version; - hash = "sha256-hucApIn7ul7+MC2W811VTxZNO8Pqb6HDXz9VRcEdmIc="; + repo = "environs"; + rev = "refs/tags/${version}"; + hash = "sha256-B/ICzopFuOAWMlDn950LXmi/XQaQxh5jFVmLdmt7Dlg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ marshmallow python-dotenv @@ -43,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python modle for environment variable parsing"; homepage = "https://github.com/sloria/environs"; + changelog = "https://github.com/sloria/environs/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/envoy-utils/default.nix b/pkgs/development/python-modules/envoy-utils/default.nix index 6f04704a8b5f3..ff795aa62e3de 100644 --- a/pkgs/development/python-modules/envoy-utils/default.nix +++ b/pkgs/development/python-modules/envoy-utils/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "envoy-utils"; version = "0.0.1"; + format = "setuptools"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix index ee547ad9b7bc6..9e043782585fc 100644 --- a/pkgs/development/python-modules/enzyme/default.nix +++ b/pkgs/development/python-modules/enzyme/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "enzyme"; version = "0.4.1"; + format = "setuptools"; # Tests rely on files obtained over the network doCheck = false; diff --git a/pkgs/development/python-modules/epc/default.nix b/pkgs/development/python-modules/epc/default.nix index 3950afa578e97..b9d96558bb6f5 100644 --- a/pkgs/development/python-modules/epc/default.nix +++ b/pkgs/development/python-modules/epc/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "epc"; version = "0.0.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/epson-projector/default.nix b/pkgs/development/python-modules/epson-projector/default.nix index 66fb7964e53e9..30e021842e76f 100644 --- a/pkgs/development/python-modules/epson-projector/default.nix +++ b/pkgs/development/python-modules/epson-projector/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "epson-projector"; version = "0.5.1"; + format = "setuptools"; src = fetchPypi { pname = "epson_projector"; diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index 974bb21392be6..2d64b71cc39c1 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , hatchling , jax , jaxlib @@ -23,6 +24,14 @@ buildPythonPackage rec { hash = "sha256-qFTKiY/t2LCCWJBOSfaX0hYQInrpXgfhTc+J4iuyVbM="; }; + patches = [ + (fetchpatch { # https://github.com/patrick-kidger/equinox/pull/601 + name = "fix-wrong-PRNGKey-annotation"; + url = "https://github.com/patrick-kidger/equinox/pull/601/commits/dce2fa1b7dcfd25d9573ce3186c5f6e8f79392bb.patch"; + hash = "sha256-tlGV5xuNGLZTd1GlPwllybPz8tWHGHaCBdlsEuISm/0="; + }) + ]; + nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix index 6093e16d4b500..484a608ba910f 100644 --- a/pkgs/development/python-modules/escapism/default.nix +++ b/pkgs/development/python-modules/escapism/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "escapism"; version = "1.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix index d4931696916a2..3cc989636f1b2 100644 --- a/pkgs/development/python-modules/etcd/default.nix +++ b/pkgs/development/python-modules/etcd/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "etcd"; version = "2.0.8"; + format = "setuptools"; # PyPI package is incomplete src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/ete3/default.nix b/pkgs/development/python-modules/ete3/default.nix index 48ec3ca623860..4cc241430c474 100644 --- a/pkgs/development/python-modules/ete3/default.nix +++ b/pkgs/development/python-modules/ete3/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "ete3"; version = "3.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/etelemetry/default.nix b/pkgs/development/python-modules/etelemetry/default.nix index ed093f182e327..24777c4e9cf8b 100644 --- a/pkgs/development/python-modules/etelemetry/default.nix +++ b/pkgs/development/python-modules/etelemetry/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "0.2.1"; + format = "setuptools"; pname = "etelemetry"; disabled = isPy27; diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix index a50f8e7c093a4..d65698c07ad66 100644 --- a/pkgs/development/python-modules/etesync/default.nix +++ b/pkgs/development/python-modules/etesync/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "etesync"; version = "0.12.1"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix index 3a7d12b410d9b..8e45e945218fd 100644 --- a/pkgs/development/python-modules/eth-abi/default.nix +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "eth-abi"; version = "4.1.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix index 319db87011150..a56ad36be6398 100644 --- a/pkgs/development/python-modules/eth-account/default.nix +++ b/pkgs/development/python-modules/eth-account/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "eth-account"; version = "0.9.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index c26914f36006c..991bd28aff18a 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "eth-hash"; version = "0.5.2"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/eth-keyfile/default.nix b/pkgs/development/python-modules/eth-keyfile/default.nix index e4320e8e035c8..b52dde5df2d4c 100644 --- a/pkgs/development/python-modules/eth-keyfile/default.nix +++ b/pkgs/development/python-modules/eth-keyfile/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "eth-keyfile"; version = "0.6.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index 8cc904bb4029b..3f6c633c6487a 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "eth-keys"; version = "0.4.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/eth-rlp/default.nix b/pkgs/development/python-modules/eth-rlp/default.nix index 0b2e9468c2aa2..0a54bef3a2c18 100644 --- a/pkgs/development/python-modules/eth-rlp/default.nix +++ b/pkgs/development/python-modules/eth-rlp/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "eth-rlp"; version = "0.3.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 73a287b49aa55..6d4cbf930f566 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "eth-utils"; version = "2.1.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index b6a3eed265df4..36c5ebb71c527 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "etils"; - version = "1.5.1"; - format = "pyproject"; + version = "1.6.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-tTDA0bLtG42hrzZ9S5eJHmgKakZY1BkBgyELu7jPH7k="; + hash = "sha256-xjX70Cp5/tStdoJdMTBrWB0itAZxch2qi8J5z2Mz5Io="; }; nativeBuildInputs = [ @@ -81,7 +81,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/google/etils/blob/v${version}/CHANGELOG.md"; - description = "Collection of eclectic utils for python"; + description = "Collection of eclectic utils"; homepage = "https://github.com/google/etils"; license = licenses.asl20; maintainers = with maintainers; [ mcwitt ]; diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix index 8c6e4b6c7c275..aac789909199e 100644 --- a/pkgs/development/python-modules/evernote/default.nix +++ b/pkgs/development/python-modules/evernote/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "evernote"; version = "1.25.3"; + format = "setuptools"; disabled = ! isPy27; #some dependencies do not work with py3 src = fetchPypi { diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix index 17d4a688130bd..aaeac9b847eb7 100644 --- a/pkgs/development/python-modules/evohome-async/default.nix +++ b/pkgs/development/python-modules/evohome-async/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "evohome-async"; - version = "0.4.11"; + version = "0.4.16"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "evohome-async"; rev = "refs/tags/${version}"; - hash = "sha256-mx4nBEgXeBxcN1pYZfTKPGbNhvSz8l38MyRRpL82lf0="; + hash = "sha256-2tcfcM/XFPP/HO+MEcXdPA6/4BUOQBuEIUWCvjUTbdg="; }; nativeBuildInputs = [ @@ -44,5 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/zxdavb/evohome-async"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "evo-client"; }; } diff --git a/pkgs/development/python-modules/ewmh/default.nix b/pkgs/development/python-modules/ewmh/default.nix index c9ac68ae74d81..c1fc19e13d1bc 100644 --- a/pkgs/development/python-modules/ewmh/default.nix +++ b/pkgs/development/python-modules/ewmh/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ewmh"; version = "0.1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/expects/default.nix b/pkgs/development/python-modules/expects/default.nix index 093bdc27bf840..df9b06590981f 100644 --- a/pkgs/development/python-modules/expects/default.nix +++ b/pkgs/development/python-modules/expects/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "expects"; version = "0.9.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "jaimegildesagredo"; diff --git a/pkgs/development/python-modules/experiment-utilities/default.nix b/pkgs/development/python-modules/experiment-utilities/default.nix index a236a2405918c..a984a95de8258 100644 --- a/pkgs/development/python-modules/experiment-utilities/default.nix +++ b/pkgs/development/python-modules/experiment-utilities/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { pname = "experiment-utilities"; version = "0.3.6"; + format = "setuptools"; src = fetchFromGitLab { owner = "creinke"; diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 476c0cc433fd6..41521f096290d 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "explorerscript"; version = "0.1.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "SkyTemple"; diff --git a/pkgs/development/python-modules/exrex/default.nix b/pkgs/development/python-modules/exrex/default.nix index 2ef58acc9093d..fd7982ee778c3 100644 --- a/pkgs/development/python-modules/exrex/default.nix +++ b/pkgs/development/python-modules/exrex/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "exrex"; version = "0.11.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,6 +25,12 @@ buildPythonPackage rec { --replace "version=about['__version__']," "version='${version}'," ''; + nativeBuildInputs = [ + setuptools + ]; + + dontWrapPythonPrograms = true; + # Projec thas no released tests doCheck = false; diff --git a/pkgs/development/python-modules/extras/default.nix b/pkgs/development/python-modules/extras/default.nix index ff8432ab2d274..db076ea95d9cf 100644 --- a/pkgs/development/python-modules/extras/default.nix +++ b/pkgs/development/python-modules/extras/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "extras"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/extruct/default.nix b/pkgs/development/python-modules/extruct/default.nix index 7752421236c0f..c2156965d08b8 100644 --- a/pkgs/development/python-modules/extruct/default.nix +++ b/pkgs/development/python-modules/extruct/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "extruct"; version = "0.13.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "scrapinghub"; diff --git a/pkgs/development/python-modules/f90nml/default.nix b/pkgs/development/python-modules/f90nml/default.nix index de9d56e75edc8..2e9610bb353ed 100644 --- a/pkgs/development/python-modules/f90nml/default.nix +++ b/pkgs/development/python-modules/f90nml/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "f90nml"; version = "1.4.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "marshallward"; diff --git a/pkgs/development/python-modules/fabric/default.nix b/pkgs/development/python-modules/fabric/default.nix index e3da624934542..04cc53f28b7d8 100644 --- a/pkgs/development/python-modules/fabric/default.nix +++ b/pkgs/development/python-modules/fabric/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "fabric"; version = "3.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fabulous/default.nix b/pkgs/development/python-modules/fabulous/default.nix index 26329cc73b83a..eba74ab121bee 100644 --- a/pkgs/development/python-modules/fabulous/default.nix +++ b/pkgs/development/python-modules/fabulous/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "fabulous"; version = "0.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "jart"; diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix index 6ab228baf5477..2789829da57a4 100644 --- a/pkgs/development/python-modules/facebook-sdk/default.nix +++ b/pkgs/development/python-modules/facebook-sdk/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "facebook-sdk"; version = "3.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/facedancer/default.nix b/pkgs/development/python-modules/facedancer/default.nix index 0aabe704f040f..1db882a86bb65 100644 --- a/pkgs/development/python-modules/facedancer/default.nix +++ b/pkgs/development/python-modules/facedancer/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "facedancer"; version = "2019.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/facenet-pytorch/default.nix b/pkgs/development/python-modules/facenet-pytorch/default.nix new file mode 100644 index 0000000000000..153408761c0af --- /dev/null +++ b/pkgs/development/python-modules/facenet-pytorch/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, fetchPypi +, pillow +, torchvision +, lib +}: + +buildPythonPackage rec { + pname = "facenet-pytorch"; + version = "2.5.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-mMxbQqSPg3wCPrkvKlcc1KxqRmh8XnG56ZtJEIcnPis="; + }; + + doCheck = false; # pypi version doesn't ship with tests + + pythonImportsCheck = ["facenet_pytorch"]; + + propagatedBuildInputs = [ pillow torchvision ]; + + meta = { + description = "Pretrained Pytorch face detection (MTCNN) and facial recognition (InceptionResnet) models"; + homepage = "https://github.com/timesler/facenet-pytorch"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lucasew ]; + }; +} diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 4f0a1e7013527..7f414741b39eb 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "faker"; version = "19.6.1"; + format = "setuptools"; src = fetchPypi { pname = "Faker"; diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index b1b1080d20b75..b39241bc9058d 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.20.0"; + version = "2.20.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-pRvUgK4OXVP2GR+Iu4ddqwApw0gYN4FkKjTpwbC1oWM="; + hash = "sha256-TmgHAskR5MF/lzF0NHgXKecLsSCoc7xsm7gRgupm0Ws="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index fb2bcf88fa7f1..e3c96089cefeb 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.14.0"; + version = "1.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-qFA0AVebHd/Ny8x+rUkueLZhYB/PwL7o/qpUnZCRsEA="; + hash = "sha256-cJ7gFE8zTN+7fp4EY8ZRwjS8i0r+8WaIH/EdY89nZew="; }; postPatch = '' diff --git a/pkgs/development/python-modules/farm-haystack/default.nix b/pkgs/development/python-modules/farm-haystack/default.nix index afee9c60f8945..43988b76e7d55 100644 --- a/pkgs/development/python-modules/farm-haystack/default.nix +++ b/pkgs/development/python-modules/farm-haystack/default.nix @@ -91,14 +91,14 @@ buildPythonPackage rec { pname = "farm-haystack"; - version = "1.22.0"; + version = "1.23.0"; pyproject = true; src = fetchFromGitHub { owner = "deepset-ai"; repo = "haystack"; rev = "refs/tags/v${version}"; - hash = "sha256-0tRgZqySM9vPhs5lar89Gz/G7/YgRuFZosgTdKuGBH0="; + hash = "sha256-rZG7768kEV1fa9zyAu7DsXlX+2eV8FcDnEssGD2qvII="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix index fd00ff5df8e20..7eb3944d690af 100644 --- a/pkgs/development/python-modules/fast-histogram/default.nix +++ b/pkgs/development/python-modules/fast-histogram/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "fast-histogram"; version = "0.12"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/fastcache/default.nix b/pkgs/development/python-modules/fastcache/default.nix index 37a8b1f1a67e7..b29b45e87821f 100644 --- a/pkgs/development/python-modules/fastcache/default.nix +++ b/pkgs/development/python-modules/fastcache/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "fastcache"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix index a2b4b9c76be09..42418076ba356 100644 --- a/pkgs/development/python-modules/fastdiff/default.nix +++ b/pkgs/development/python-modules/fastdiff/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "fastdiff"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fastdtw/default.nix b/pkgs/development/python-modules/fastdtw/default.nix index 1ceaf3b875a3a..ce973d218417a 100644 --- a/pkgs/development/python-modules/fastdtw/default.nix +++ b/pkgs/development/python-modules/fastdtw/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "fastdtw"; version = "0.3.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "slaypni"; diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix index f9b3f71e1ce71..65536d16151b7 100644 --- a/pkgs/development/python-modules/fastembed/default.nix +++ b/pkgs/development/python-modules/fastembed/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "fastembed"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "fastembed"; rev = "refs/tags/v${version}"; - hash = "sha256-d7Zb0IL0NOPEPsCHe/ZMNELnSCG4+y8JmGAXnCRUd50="; + hash = "sha256-FW85xeRcrPL3euXcQ3dS40SapimFgpWtRu6XiIzdzSM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix index 7671feb359f8f..83c1fcaee8663 100644 --- a/pkgs/development/python-modules/fastentrypoints/default.nix +++ b/pkgs/development/python-modules/fastentrypoints/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "fastentrypoints"; version = "0.12"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index 9f7219925a7f5..904aac3069c65 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "fastimport"; version = "0.9.14"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix index ef6e0462c3531..99ad26f0e7352 100644 --- a/pkgs/development/python-modules/fastpbkdf2/default.nix +++ b/pkgs/development/python-modules/fastpbkdf2/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "fastpbkdf2"; version = "0.2"; + format = "setuptools"; # Fetching from GitHub as tests are missing in PyPI src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix index 6ea456bac53af..3a1dc5a30c43c 100644 --- a/pkgs/development/python-modules/fastprogress/default.nix +++ b/pkgs/development/python-modules/fastprogress/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "fastprogress"; version = "1.0.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index c360c364d8b9f..71db9277ab2c8 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -3,6 +3,8 @@ buildPythonPackage rec { inherit (pkgs.fasttext) pname version src; + format = "setuptools"; + buildInputs = [ pybind11 ]; pythonImportsCheck = [ "fasttext" ]; diff --git a/pkgs/development/python-modules/faulthandler/disable-env-test.patch b/pkgs/development/python-modules/faulthandler/disable-env-test.patch deleted file mode 100644 index 5824652f6175e..0000000000000 --- a/pkgs/development/python-modules/faulthandler/disable-env-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests.py b/tests.py -index e5a2811..16e7a0f 100644 ---- a/tests.py -+++ b/tests.py -@@ -394,7 +394,7 @@ class FaultHandlerTests(unittest.TestCase): - print(faulthandler.is_enabled()) - """, - env=dict(os.environ, PYTHONFAULTHANDLER='x')) -- self.assertEqual(output, ["True"]) -+ #self.assertEqual(output, ["True"]) - self.assertEqual(exitcode, 0) - - output, exitcode = self.get_output(""" diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix index df494068c4445..e5f41003495be 100644 --- a/pkgs/development/python-modules/fb-re2/default.nix +++ b/pkgs/development/python-modules/fb-re2/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "fb-re2"; version = "1.0.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 9ca3627e74cab..b430b1a200a2d 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "feedgen"; version = "0.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index 550e82cb8ccc2..4fd5808aa236f 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "feedgenerator"; version = "2.1.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix index 7eaf65b371dff..0367e1e8a1063 100644 --- a/pkgs/development/python-modules/feedparser/default.nix +++ b/pkgs/development/python-modules/feedparser/default.nix @@ -1,23 +1,28 @@ { lib , buildPythonPackage , fetchPypi +, python , pythonOlder +, setuptools , sgmllib3k -, python }: buildPythonPackage rec { pname = "feedparser"; - version = "6.0.10"; - format = "setuptools"; + version = "6.0.11"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-J9pIX0Y3znFjzeqxOoAxK5O30MG3db70pHYpoxELylE="; + hash = "sha256-ydBAe2TG8qBl0OuyksKzXAEFDMDcM3V0Yaqr3ExBhNU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ sgmllib3k ]; @@ -36,8 +41,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/kurtmckee/feedparser"; description = "Universal feed parser"; + homepage = "https://github.com/kurtmckee/feedparser"; + changelog = "https://feedparser.readthedocs.io/en/latest/changelog.html"; license = licenses.bsd2; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix index 861f2d0201901..a3dd531c1285f 100644 --- a/pkgs/development/python-modules/ffcv/default.nix +++ b/pkgs/development/python-modules/ffcv/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "ffcv"; version = "1.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "libffcv"; diff --git a/pkgs/development/python-modules/fhir-py/default.nix b/pkgs/development/python-modules/fhir-py/default.nix new file mode 100644 index 0000000000000..e4072aaf4633c --- /dev/null +++ b/pkgs/development/python-modules/fhir-py/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, flit-core +, aiohttp +, pytz +, requests +, pytestCheckHook +, pytest-asyncio +, responses +}: + +buildPythonPackage rec { + pname = "fhir-py"; + version = "1.4.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "beda-software"; + repo = "fhir-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-kYqoRso1ypN5novRxMMzz1h2NGNybbw5lK4+HErG79I="; + }; + + preBuild = '' + substituteInPlace pyproject.toml \ + --replace "--cov=fhirpy" "" \ + --replace "--cov-report=xml" "" + ''; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + aiohttp + pytz + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + responses + ]; + + # sync/async test cases require docker-compose to set up services, so disable: + disabledTestPaths = [ "tests/test_lib_sync.py" ]; + disabledTests = [ "TestLibAsyncCase" ]; + + pythonImportsCheck = [ "fhirpy" ]; + + meta = with lib; { + description = "Async/sync API for FHIR resources"; + homepage = "https://github.com/beda-software/fhir-py"; + changelog = "https://github.com/beda-software/fhir-py/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/fiblary3-fork/default.nix b/pkgs/development/python-modules/fiblary3-fork/default.nix index eeab77847c910..99413e54d6342 100644 --- a/pkgs/development/python-modules/fiblary3-fork/default.nix +++ b/pkgs/development/python-modules/fiblary3-fork/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "fiblary3-fork"; version = "0.1.12"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fields/default.nix b/pkgs/development/python-modules/fields/default.nix index 25b567c9c875f..bbe14dd638d76 100644 --- a/pkgs/development/python-modules/fields/default.nix +++ b/pkgs/development/python-modules/fields/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "fields"; version = "5.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/file-read-backwards/default.nix b/pkgs/development/python-modules/file-read-backwards/default.nix index f83963e1e5aeb..9317021f45069 100644 --- a/pkgs/development/python-modules/file-read-backwards/default.nix +++ b/pkgs/development/python-modules/file-read-backwards/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "file-read-backwards"; version = "3.0.0"; + format = "setuptools"; src = fetchPypi { pname = "file_read_backwards"; diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix index 5b6d6284ced5e..9dd04c3c4cb70 100644 --- a/pkgs/development/python-modules/filebytes/default.nix +++ b/pkgs/development/python-modules/filebytes/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "filebytes"; version = "0.10.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/finalfusion/default.nix b/pkgs/development/python-modules/finalfusion/default.nix index f079dbe77bc88..14b13d7184be8 100644 --- a/pkgs/development/python-modules/finalfusion/default.nix +++ b/pkgs/development/python-modules/finalfusion/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "finalfusion"; version = "0.7.1"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index 9a9bd93fc745a..7ada2d813dd44 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.4.0"; + version = "0.4.1"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-GLFNEVZ42hiuku4i1wAcwwkV6lMQU/dwEO4Fo5aA9Dg="; + hash = "sha256-19AUVYaBs3YdV6WyNCpxOovzAvbB/J2Z+Budi9FoGwQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fingerprints/default.nix b/pkgs/development/python-modules/fingerprints/default.nix index ecda4d7959b8b..00c2efe7e3f31 100644 --- a/pkgs/development/python-modules/fingerprints/default.nix +++ b/pkgs/development/python-modules/fingerprints/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "fingerprints"; version = "1.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "alephdata"; diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix new file mode 100644 index 0000000000000..bc5a4d1dbdf7d --- /dev/null +++ b/pkgs/development/python-modules/firebase-messaging/default.nix @@ -0,0 +1,84 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, poetry-core + +# dependencies +, cryptography +, http-ece +, protobuf +, requests + +# docs +, sphinx +, sphinxHook +, sphinx-autodoc-typehints +, sphinx-rtd-theme + +# tests +, async-timeout +, requests-mock +, pytest-asyncio +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "firebase-messaging"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "sdb9696"; + repo = "firebase-messaging"; + rev = version; + hash = "sha256-e3Ny3pnAfOpNERvvtE/jqSDIsM+YwLq/hbw753QpJ6o="; + }; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + poetry-core + sphinxHook + ] ++ passthru.optional-dependencies.docs; + + propagatedBuildInputs = [ + cryptography + http-ece + protobuf + requests + ]; + + passthru.optional-dependencies = { + docs = [ + sphinx + sphinx-autodoc-typehints + sphinx-rtd-theme + ]; + }; + + pythonImportsCheck = [ + "firebase_messaging" + ]; + + nativeCheckInputs = [ + async-timeout + requests-mock + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + meta = with lib; { + description = "A library to subscribe to GCM/FCM and receive notifications within a python application"; + homepage = "https://github.com/sdb9696/firebase-messaging"; + changelog = "https://github.com/sdb9696/firebase-messaging/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/firetv/default.nix b/pkgs/development/python-modules/firetv/default.nix index 8cbcc354c8347..652f69033dde6 100644 --- a/pkgs/development/python-modules/firetv/default.nix +++ b/pkgs/development/python-modules/firetv/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "firetv"; version = "1.0.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fixerio/default.nix b/pkgs/development/python-modules/fixerio/default.nix index eacd4f472affb..56ba061b42331 100644 --- a/pkgs/development/python-modules/fixerio/default.nix +++ b/pkgs/development/python-modules/fixerio/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "fixerio"; version = "1.0.0-alpha"; + format = "setuptools"; src = fetchFromGitHub { owner = "amatellanes"; diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index 6cf0cd7097abf..3a24547016c2c 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "23.11.28"; + version = "23.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9mVCJZmjYECi62wYRmyipAl3B1wqyDU/nTSNcA7oc04="; + hash = "sha256-5l57t7TMtidp6j4tluz8/af5kgPdD8GKY7B7u/toc8I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 017dd74fcede0..7b58dddb853a5 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "flake8-future-import"; version = "0.4.7"; + format = "setuptools"; # PyPI tarball doesn't include the test suite src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/flake8-polyfill/default.nix b/pkgs/development/python-modules/flake8-polyfill/default.nix index 1db1438827369..aef7cab9d1fc9 100644 --- a/pkgs/development/python-modules/flake8-polyfill/default.nix +++ b/pkgs/development/python-modules/flake8-polyfill/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "flake8-polyfill"; version = "1.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/flametree/default.nix b/pkgs/development/python-modules/flametree/default.nix index a6d3ebbd0c4f8..2a3ff69235c39 100644 --- a/pkgs/development/python-modules/flametree/default.nix +++ b/pkgs/development/python-modules/flametree/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "flametree"; version = "0.1.12"; + format = "setuptools"; src = fetchFromGitHub { owner = "Edinburgh-Genome-Foundry"; diff --git a/pkgs/development/python-modules/flashtext/default.nix b/pkgs/development/python-modules/flashtext/default.nix index b0623bd18d598..e4aa3a60c7eb5 100644 --- a/pkgs/development/python-modules/flashtext/default.nix +++ b/pkgs/development/python-modules/flashtext/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "flashtext"; version = "2.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/flask-appbuilder/upgrade-to-flask_jwt_extended-4.patch b/pkgs/development/python-modules/flask-appbuilder/upgrade-to-flask_jwt_extended-4.patch deleted file mode 100644 index f2bf072b7f0ae..0000000000000 --- a/pkgs/development/python-modules/flask-appbuilder/upgrade-to-flask_jwt_extended-4.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/flask_appbuilder/security/api.py b/flask_appbuilder/security/api.py -index 2e2dfd612..df1bd5a25 100644 ---- a/flask_appbuilder/security/api.py -+++ b/flask_appbuilder/security/api.py -@@ -3,7 +3,7 @@ - create_access_token, - create_refresh_token, - get_jwt_identity, -- jwt_refresh_token_required, -+ jwt_required, - ) - - from ..api import BaseApi, safe -@@ -118,7 +118,7 @@ def login(self): - return self.response(200, **resp) - - @expose("/refresh", methods=["POST"]) -- @jwt_refresh_token_required -+ @jwt_required(refresh=True) - @safe - def refresh(self): - """ -diff --git a/flask_appbuilder/security/manager.py b/flask_appbuilder/security/manager.py -index fe7697007..3b22ab255 100644 ---- a/flask_appbuilder/security/manager.py -+++ b/flask_appbuilder/security/manager.py -@@ -297,7 +297,7 @@ def create_jwt_manager(self, app) -> JWTManager: - """ - jwt_manager = JWTManager() - jwt_manager.init_app(app) -- jwt_manager.user_loader_callback_loader(self.load_user_jwt) -+ jwt_manager.user_lookup_loader(self.load_user_jwt) - return jwt_manager - - def create_builtin_roles(self): -@@ -1944,7 +1944,8 @@ def del_permission_role(self, role, perm_view): - def load_user(self, pk): - return self.get_user_by_id(int(pk)) - -- def load_user_jwt(self, pk): -+ def load_user_jwt(self, _jwt_header, jwt_data): -+ pk = jwt_data["sub"] - user = self.load_user(pk) - # Set flask g.user to JWT user, we can't do it on before request - g.user = user diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index 07c384d1c6aee..33caa223ea3bc 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "flask-assets"; version = "2.0"; + format = "setuptools"; src = fetchPypi { pname = "Flask-Assets"; diff --git a/pkgs/development/python-modules/flask-basicauth/default.nix b/pkgs/development/python-modules/flask-basicauth/default.nix index 51fe449bc90b7..97a214744457b 100644 --- a/pkgs/development/python-modules/flask-basicauth/default.nix +++ b/pkgs/development/python-modules/flask-basicauth/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "flask-basicauth"; version = "0.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "jpvanhal"; diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/pkgs/development/python-modules/flask-bcrypt/default.nix index 856c7f010bb05..1d9db3cb22f24 100644 --- a/pkgs/development/python-modules/flask-bcrypt/default.nix +++ b/pkgs/development/python-modules/flask-bcrypt/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "flask-bcrypt"; version = "1.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "maxcountryman"; diff --git a/pkgs/development/python-modules/flask-elastic/default.nix b/pkgs/development/python-modules/flask-elastic/default.nix index c3ea512f803ad..ea7bcb557b98a 100644 --- a/pkgs/development/python-modules/flask-elastic/default.nix +++ b/pkgs/development/python-modules/flask-elastic/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "flask-elastic"; version = "0.2"; + format = "setuptools"; src = fetchPypi { pname = "Flask-Elastic"; diff --git a/pkgs/development/python-modules/flask-gravatar/default.nix b/pkgs/development/python-modules/flask-gravatar/default.nix index f96390211c1ff..a52feb8aecbf7 100644 --- a/pkgs/development/python-modules/flask-gravatar/default.nix +++ b/pkgs/development/python-modules/flask-gravatar/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "flask-gravatar"; version = "0.5.0"; + format = "setuptools"; src = fetchPypi { pname = "Flask-Gravatar"; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 2d5537b5df697..ba7d9dcf18321 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-jwt-extended"; - version = "4.5.3"; + version = "4.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-JWT-Extended"; inherit version; - hash = "sha256-Bh7z0l7VdDur5JZKs4822HDm0v2KEmurXXfd74oBkys="; + hash = "sha256-khXQWpQT04VXZLzWcDXnWBnSOvL6+2tVGX61ozE/37I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-mail/default.nix b/pkgs/development/python-modules/flask-mail/default.nix index 8e4c58db75c11..16e02683495f3 100644 --- a/pkgs/development/python-modules/flask-mail/default.nix +++ b/pkgs/development/python-modules/flask-mail/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "flask-mail"; version = "0.9.1"; + format = "setuptools"; meta = { description = "Flask-Mail is a Flask extension providing simple email sending capabilities."; diff --git a/pkgs/development/python-modules/flask-mailman/default.nix b/pkgs/development/python-modules/flask-mailman/default.nix index f0cd2e5e147ba..035005545ec45 100644 --- a/pkgs/development/python-modules/flask-mailman/default.nix +++ b/pkgs/development/python-modules/flask-mailman/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "flask-mailman"; - version = "0.3.0"; + version = "1.0.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "waynerv"; repo = pname; - rev = "v${version}"; - hash = "sha256-cfLtif+48M6fqOkBbi4PJRFpf9FRXCPesktFQky34eU="; + rev = "refs/tags/v${version}"; + hash = "sha256-wfbMz9k9cy9m95mc0Y0lqmpJczrfjhmumO31gRQy704="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-openid/default.nix b/pkgs/development/python-modules/flask-openid/default.nix index 748e2fbe2bd93..9d65a5cab26e0 100644 --- a/pkgs/development/python-modules/flask-openid/default.nix +++ b/pkgs/development/python-modules/flask-openid/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "flask-openid"; version = "1.3.0"; + format = "setuptools"; src = fetchPypi { pname = "Flask-OpenID"; diff --git a/pkgs/development/python-modules/flask-paranoid/default.nix b/pkgs/development/python-modules/flask-paranoid/default.nix index 77949730c6901..5e200137941bb 100644 --- a/pkgs/development/python-modules/flask-paranoid/default.nix +++ b/pkgs/development/python-modules/flask-paranoid/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "flask-paranoid"; version = "0.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "miguelgrinberg"; diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix index 8bf06c87d3563..7343a15398dbb 100644 --- a/pkgs/development/python-modules/flask-principal/default.nix +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "flask-principal"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { pname = "Flask-Principal"; diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 6fd8b6b7330b8..106f6cc82165b 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "python-restx"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9o0lgDtjsZta9fVJnD02In6wvxNwPA667WeIkpRv8Z4="; + hash = "sha256-CBReP/u96fsr28lMV1BfLjjdBMXEvsD03wvsxkIcteI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix index cd71228132277..afd56302a562c 100644 --- a/pkgs/development/python-modules/flask-script/default.nix +++ b/pkgs/development/python-modules/flask-script/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "flask-script"; version = "2.0.6"; + format = "setuptools"; src = fetchPypi { pname = "Flask-Script"; diff --git a/pkgs/development/python-modules/flask-swagger-ui/default.nix b/pkgs/development/python-modules/flask-swagger-ui/default.nix index f7c045432af2a..8fa18aecc924d 100644 --- a/pkgs/development/python-modules/flask-swagger-ui/default.nix +++ b/pkgs/development/python-modules/flask-swagger-ui/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "flask-swagger-ui"; version = "4.11.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/flask-swagger/default.nix b/pkgs/development/python-modules/flask-swagger/default.nix index 66c45b855223c..45afea65a4a50 100644 --- a/pkgs/development/python-modules/flask-swagger/default.nix +++ b/pkgs/development/python-modules/flask-swagger/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { version = "0.2.14"; + format = "setuptools"; pname = "flask-swagger"; src = fetchPypi { diff --git a/pkgs/development/python-modules/flask-talisman/default.nix b/pkgs/development/python-modules/flask-talisman/default.nix index a719e453dabad..76a79e5f09111 100644 --- a/pkgs/development/python-modules/flask-talisman/default.nix +++ b/pkgs/development/python-modules/flask-talisman/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "flask-talisman"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/flatbuffers/default.nix b/pkgs/development/python-modules/flatbuffers/default.nix index ae5c7e309cd10..74719b2415865 100644 --- a/pkgs/development/python-modules/flatbuffers/default.nix +++ b/pkgs/development/python-modules/flatbuffers/default.nix @@ -6,6 +6,8 @@ buildPythonPackage rec { inherit (flatbuffers) pname version src; + format = "setuptools"; + sourceRoot = "${src.name}/python"; # flatbuffers needs VERSION environment variable for setting the correct diff --git a/pkgs/development/python-modules/flatdict/default.nix b/pkgs/development/python-modules/flatdict/default.nix index bed9647af8445..c96d905860269 100644 --- a/pkgs/development/python-modules/flatdict/default.nix +++ b/pkgs/development/python-modules/flatdict/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "flatdict"; version = "4.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "gmr"; diff --git a/pkgs/development/python-modules/fleep/default.nix b/pkgs/development/python-modules/fleep/default.nix index ae8522955ce5d..f41cb01094029 100644 --- a/pkgs/development/python-modules/fleep/default.nix +++ b/pkgs/development/python-modules/fleep/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "fleep"; version = "1.0.1"; + format = "setuptools"; # Pypi version does not have tests src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/flet-core/default.nix b/pkgs/development/python-modules/flet-core/default.nix index bf1e8b2d693af..da635578e0dd6 100644 --- a/pkgs/development/python-modules/flet-core/default.nix +++ b/pkgs/development/python-modules/flet-core/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "flet-core"; - version = "0.10.1"; + version = "0.17.0"; format = "pyproject"; src = fetchPypi { pname = "flet_core"; inherit version; - hash = "sha256-YLtHnKBlXkUJJkQzxnDkfl6+gSGm05GXYPGEU3XO/jI="; + hash = "sha256-LYCbZKxHXrUUs3f3M2pGxz51R2dMet7/fYr9MZ10cgI="; }; nativeBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { doCheck = false; meta = { + changelog = "https://github.com/flet-dev/flet/releases/tag/v${version}"; description = "The library is the foundation of Flet framework and is not intended to be used directly"; homepage = "https://flet.dev/"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/flet-runtime/default.nix b/pkgs/development/python-modules/flet-runtime/default.nix new file mode 100644 index 0000000000000..57466f1d33f78 --- /dev/null +++ b/pkgs/development/python-modules/flet-runtime/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, flet-core +, httpx +, oauthlib +}: + +buildPythonPackage rec { + pname = "flet-runtime"; + version = "0.17.0"; + format = "pyproject"; + + src = fetchPypi { + pname = "flet_runtime"; + inherit version; + hash = "sha256-BhVle4Mpx+0YcAaTWk1AvYGuyPFPju1iuF6SLs2uAzU="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + flet-core + httpx + oauthlib + ]; + + pythonImportsCheck = [ + "flet_runtime" + ]; + + meta = { + changelog = "https://github.com/flet-dev/flet/releases/tag/v${version}"; + description = "A base package for Flet desktop and Flet mobile"; + homepage = "https://flet.dev/"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.wegank ]; + }; +} diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index c6541372d66b0..9259bb26b1f6b 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -7,10 +7,12 @@ # propagates , flet-core +, flet-runtime , httpx , oauthlib , packaging -, typing-extensions +, qrcode +, rich , watchdog , websocket-client , websockets @@ -19,33 +21,29 @@ buildPythonPackage rec { pname = "flet"; - version = "0.10.1"; + version = "0.17.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Ogy4F9/beSb3GCpwPsN+8hsVroRoHTSojqg+5eXwcRI="; + hash = "sha256-YNa1JDoGqtpzjx+3E1Ycz2E5yZ5MVzooPo9PgHFll9s="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'httpx = "^0.23' 'httpx = ">=0.23' \ - --replace 'watchdog = "^2' 'watchdog = ">=2' - ''; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ flet-core - typing-extensions + flet-runtime websocket-client watchdog oauthlib websockets httpx packaging + qrcode + rich ]; doCheck = false; diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix index 00cc8bf58a3f5..2afef24b9b1c3 100644 --- a/pkgs/development/python-modules/fluent-logger/default.nix +++ b/pkgs/development/python-modules/fluent-logger/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "fluent-logger"; version = "0.10.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/flynt/default.nix b/pkgs/development/python-modules/flynt/default.nix index 75465b4a9288c..ab513e09c63a1 100644 --- a/pkgs/development/python-modules/flynt/default.nix +++ b/pkgs/development/python-modules/flynt/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "flynt"; version = "0.66"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/fn/default.nix b/pkgs/development/python-modules/fn/default.nix index e7a0d4c0416d8..71608387b4faa 100644 --- a/pkgs/development/python-modules/fn/default.nix +++ b/pkgs/development/python-modules/fn/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "fn"; version = "0.4.3"; + format = "setuptools"; # Python 3.11 changed the API of the `inspect` module and fn was never # updated to adapt; last commit was in 2014. diff --git a/pkgs/development/python-modules/fnvhash/default.nix b/pkgs/development/python-modules/fnvhash/default.nix index e54b49ddc8eab..ac80ac564fa17 100644 --- a/pkgs/development/python-modules/fnvhash/default.nix +++ b/pkgs/development/python-modules/fnvhash/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "fnvhash"; version = "0.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "znerol"; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 8b29b61fe6984..d5384fc221c60 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -12,14 +12,16 @@ , pythonOlder , requests , selenium +, setuptools , setuptools-scm +, wheel , xyzservices }: buildPythonPackage rec { pname = "folium"; - version = "0.15.0"; - format = "setuptools"; + version = "0.15.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,13 +29,15 @@ buildPythonPackage rec { owner = "python-visualization"; repo = "folium"; rev = "refs/tags/v${version}"; - hash = "sha256-xaz9oelkyS8lWECCmKs8P3mHB3Usv0KMUoh/K7rBnAs="; + hash = "sha256-CHPHxp8xEZhEEMLvhs/xAiOr2Hw6B+5svFNY+QvQa+U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools setuptools-scm + wheel ]; propagatedBuildInputs = [ @@ -41,6 +45,7 @@ buildPythonPackage rec { jinja2 numpy requests + xyzservices ]; nativeCheckInputs = [ @@ -50,7 +55,6 @@ buildPythonPackage rec { pillow pytestCheckHook selenium - xyzservices ]; disabledTests = [ diff --git a/pkgs/development/python-modules/font-v/default.nix b/pkgs/development/python-modules/font-v/default.nix index 8a43dd52adea8..9ff5bc1c351b1 100644 --- a/pkgs/development/python-modules/font-v/default.nix +++ b/pkgs/development/python-modules/font-v/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "font-v"; version = "2.1.0"; + format = "setuptools"; # PyPI source tarballs omit tests, fetch from Github instead src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index b824ca990b8a6..3d1a2331e5e86 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { pname = "fontbakery"; version = "0.10.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fontfeatures/default.nix b/pkgs/development/python-modules/fontfeatures/default.nix index 2ea5247d38c8b..17ea4ec4813cd 100644 --- a/pkgs/development/python-modules/fontfeatures/default.nix +++ b/pkgs/development/python-modules/fontfeatures/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "fontfeatures"; version = "1.8.0"; + format = "setuptools"; src = fetchPypi { pname = "fontFeatures"; diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index a6bd37c0153e3..2269e18c32a93 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "fontmake"; version = "3.7.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/foobot-async/default.nix b/pkgs/development/python-modules/foobot-async/default.nix index bf011e0ccf732..50029f232a1c2 100644 --- a/pkgs/development/python-modules/foobot-async/default.nix +++ b/pkgs/development/python-modules/foobot-async/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "foobot-async"; version = "1.0.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix index 519d5a14028a2..838dc60d0db0a 100644 --- a/pkgs/development/python-modules/forbiddenfruit/default.nix +++ b/pkgs/development/python-modules/forbiddenfruit/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "0.1.4"; + format = "setuptools"; pname = "forbiddenfruit"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/fordpass/default.nix b/pkgs/development/python-modules/fordpass/default.nix index d3120e7bb6fcd..f5a4ea3b0d43e 100644 --- a/pkgs/development/python-modules/fordpass/default.nix +++ b/pkgs/development/python-modules/fordpass/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "fordpass"; version = "0.0.4"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/formencode/default.nix b/pkgs/development/python-modules/formencode/default.nix index 1b7dd1fc2ef05..9cccd8d9f39bb 100644 --- a/pkgs/development/python-modules/formencode/default.nix +++ b/pkgs/development/python-modules/formencode/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "formencode"; version = "2.1.0"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix index ca05660feb340..091757160e163 100644 --- a/pkgs/development/python-modules/fpdf/default.nix +++ b/pkgs/development/python-modules/fpdf/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "fpdf"; version = "1.7.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fpdf2/default.nix b/pkgs/development/python-modules/fpdf2/default.nix new file mode 100644 index 0000000000000..dd24dc35972ef --- /dev/null +++ b/pkgs/development/python-modules/fpdf2/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +, setuptools + +, defusedxml +, pillow +, fonttools + +, pytestCheckHook +, qrcode +, camelot +, uharfbuzz +}: + +buildPythonPackage rec { + pname = "fpdf2"; + version = "2.7.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "py-pdf"; + repo = "fpdf2"; + rev = version; + hash = "sha256-wiCKmS+GlrYV2/6TEdXUbmWIMWU4hyzswFJZR9EOWxc="; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=fpdf --cov-report=xml" "" + ''; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + defusedxml + pillow + fonttools + ]; + + nativeCheckInputs = [ + pytestCheckHook + qrcode + camelot + uharfbuzz + ]; + + disabledTestPaths = [ + "test/table/test_table_extraction.py" # tabula-py not packaged yet + "test/signing/test_sign.py" # endesive not packaged yet + ]; + + disabledTests = [ + "test_png_url" # tries to download file + "test_page_background" # tries to download file + "test_share_images_cache" # uses timing functions + ]; + + meta = { + homepage = "https://github.com/py-pdf/fpdf2"; + description = "Simple PDF generation for Python"; + changelog = "https://github.com/py-pdf/fpdf2/blob/${version}/CHANGELOG.md"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ jfvillablanca ]; + }; +} diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 230f83a8e4b2a..8450d4b78c01e 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "fpylll"; version = "0.5.9"; + format = "setuptools"; src = fetchFromGitHub { owner = "fplll"; diff --git a/pkgs/development/python-modules/freetype-py/default.nix b/pkgs/development/python-modules/freetype-py/default.nix index ccc048c1fccb6..172225968218a 100644 --- a/pkgs/development/python-modules/freetype-py/default.nix +++ b/pkgs/development/python-modules/freetype-py/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "freetype-py"; version = "2.1.0.post1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix index 11be528b4055b..144d88cc80b82 100644 --- a/pkgs/development/python-modules/frida-python/default.nix +++ b/pkgs/development/python-modules/frida-python/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchPypi, buildPythonPackage, typing-extensions }: let version = "16.0.19"; + format = "setuptools"; devkit = fetchurl { url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-linux-x86_64.tar.xz"; hash = "sha256-yNXNqv8eCbpdQKFShpAh6rUCEuItrOSNNLOjESimPdk="; diff --git a/pkgs/development/python-modules/frilouz/default.nix b/pkgs/development/python-modules/frilouz/default.nix index b19687f5fe03c..3f5ea414129fd 100644 --- a/pkgs/development/python-modules/frilouz/default.nix +++ b/pkgs/development/python-modules/frilouz/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "frilouz"; version = "0.0.2"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix index 8c05c9e73f8d1..9310e46e82d45 100644 --- a/pkgs/development/python-modules/fs-s3fs/default.nix +++ b/pkgs/development/python-modules/fs-s3fs/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "fs-s3fs"; version = "1.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 0b2d80e70d41d..da03c963bd754 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { pname = "fs"; version = "2.4.16"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fschat/default.nix b/pkgs/development/python-modules/fschat/default.nix index 44420ae6c61fb..1d99fcd3e4cc1 100644 --- a/pkgs/development/python-modules/fschat/default.nix +++ b/pkgs/development/python-modules/fschat/default.nix @@ -29,7 +29,7 @@ , protobuf }: let - version = "0.2.33"; + version = "0.2.34"; in buildPythonPackage { pname = "fschat"; @@ -40,7 +40,7 @@ buildPythonPackage { owner = "lm-sys"; repo = "FastChat"; rev = "refs/tags/v${version}"; - hash = "sha256-tfFgiYJBuVt71qHOmkDoSrZ2tvXStjubmkw7sexkGZg="; + hash = "sha256-4dnKrLQYkd2uQh2K2yaQ7EgrkgX8bO4QXfjIOqpzCE8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 058eca5600512..14a356e21e224 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "ftfy"; version = "6.1.1"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/func-timeout/default.nix b/pkgs/development/python-modules/func-timeout/default.nix index 61204104a96a2..654b950b48d89 100644 --- a/pkgs/development/python-modules/func-timeout/default.nix +++ b/pkgs/development/python-modules/func-timeout/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "func-timeout"; version = "4.3.5"; + format = "setuptools"; src = fetchPypi { pname = "func_timeout"; diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix index a59b6f33b5f69..4def50699d840 100644 --- a/pkgs/development/python-modules/funcsigs/default.nix +++ b/pkgs/development/python-modules/funcsigs/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "funcsigs"; version = "1.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/funsor/default.nix b/pkgs/development/python-modules/funsor/default.nix index a08e2a6e4ebc7..dcd3c67a394bb 100644 --- a/pkgs/development/python-modules/funsor/default.nix +++ b/pkgs/development/python-modules/funsor/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { pname = "funsor"; version = "0.4.6"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index 3c9592c37d0d4..062ab8aebe081 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "furl"; version = "2.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index 4003b54af6084..87f075460caf0 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "fuse-python"; version = "1.0.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 03a5248e8e1a1..8c51fcebe559d 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "fusepy"; version = "3.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix index c4ef6adaf455c..389c3b3f12787 100644 --- a/pkgs/development/python-modules/future-fstrings/default.nix +++ b/pkgs/development/python-modules/future-fstrings/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "future-fstrings"; version = "1.2.0"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/future-typing/default.nix b/pkgs/development/python-modules/future-typing/default.nix index 61a87e02253da..e2c9a76c69209 100644 --- a/pkgs/development/python-modules/future-typing/default.nix +++ b/pkgs/development/python-modules/future-typing/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "future-typing"; version = "0.4.1"; + format = "setuptools"; src = fetchPypi { pname = "future_typing"; diff --git a/pkgs/development/python-modules/fuzzyfinder/default.nix b/pkgs/development/python-modules/fuzzyfinder/default.nix index 2107dd7b2d622..76f7e977cc32e 100644 --- a/pkgs/development/python-modules/fuzzyfinder/default.nix +++ b/pkgs/development/python-modules/fuzzyfinder/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "fuzzyfinder"; version = "2.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index fd0473b998241..79754a30a078b 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "fuzzywuzzy"; version = "0.18.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/fvs/default.nix b/pkgs/development/python-modules/fvs/default.nix index 6183c18b50315..2f075f4be8f06 100644 --- a/pkgs/development/python-modules/fvs/default.nix +++ b/pkgs/development/python-modules/fvs/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "fvs"; version = "0.3.4"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index a691f3723d5ae..f89334f8f60e8 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "fx2"; version = "unstable-2023-09-20"; + format = "setuptools"; src = fetchFromGitHub { owner = "whitequark"; diff --git a/pkgs/development/python-modules/fypp/default.nix b/pkgs/development/python-modules/fypp/default.nix index a75e141361a86..0303f517cad5b 100644 --- a/pkgs/development/python-modules/fypp/default.nix +++ b/pkgs/development/python-modules/fypp/default.nix @@ -3,6 +3,7 @@ buildPythonApplication rec { pname = "fypp"; version = "3.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "aradi"; diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index e6a12ba415df8..2273e6bd6eff1 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-Lt55HUTBmrg0IX9oWUdh5zyxccViKq0X+9bhDEgUZjQ="; + hash = "sha256-dWYnD+Byh0orRg20/nhu8ILooFBeHysxQ403boDVqYk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 90b70e8906c86..43604aa29333f 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.11"; + version = "0.2.12"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-T8flktIBRhtXpxd17bqrocncgpIfinMDvVwvaoltZAs="; + hash = "sha256-uq3biWZvcORvrAMd/Ix0Cj1ol5fiqdDsO54zD82G2vA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 20c26da372b6a..fa77b0e6b8f39 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.41"; + version = "0.4.42"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-1CnRgPJTG7cpfa/SyhBwVw0Lj6ENI/YY/q2yNeve9c0="; + hash = "sha256-tCQtT7KrM/CHqAaMsvgj4aS3tkpcCYpaagvkO9DljY0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gatt/default.nix b/pkgs/development/python-modules/gatt/default.nix index 3adaf2d70b820..ae43ba4c52152 100644 --- a/pkgs/development/python-modules/gatt/default.nix +++ b/pkgs/development/python-modules/gatt/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "gatt"; version = "0.2.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "getsenic"; diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix index 46c98cfc78c82..ab12d42d77c4a 100644 --- a/pkgs/development/python-modules/gb-io/default.nix +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "gb-io"; version = "0.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "althonos"; diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix index c481c2be6de4f..6608cf305063a 100644 --- a/pkgs/development/python-modules/gbinder-python/default.nix +++ b/pkgs/development/python-modules/gbinder-python/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "gbinder-python"; version = "1.1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "erfanoabdi"; diff --git a/pkgs/development/python-modules/gbulb/default.nix b/pkgs/development/python-modules/gbulb/default.nix index 2aa73d10db464..d36d1182f55ff 100644 --- a/pkgs/development/python-modules/gbulb/default.nix +++ b/pkgs/development/python-modules/gbulb/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "gbulb"; version = "0.6.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "beeware"; diff --git a/pkgs/development/python-modules/gdata/default.nix b/pkgs/development/python-modules/gdata/default.nix index 94430d0d94110..bb334d63435b7 100644 --- a/pkgs/development/python-modules/gdata/default.nix +++ b/pkgs/development/python-modules/gdata/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "gdata"; version = "2.0.18"; + format = "setuptools"; src = fetchurl { url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gdata-python-client/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix index 813adfb0dbf3c..a0ee274beabb5 100644 --- a/pkgs/development/python-modules/geeknote/default.nix +++ b/pkgs/development/python-modules/geeknote/default.nix @@ -12,6 +12,7 @@ buildPythonPackage { version = "2015-05-11"; + format = "setuptools"; pname = "geeknote"; disabled = ! isPy27; diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 93ef732273102..9b66fc47bd641 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.25"; + version = "0.5.26"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VQSefwzw4zA9ycO8723kBlMbtrOJxmKgZ8tfXZmtyQc="; + hash = "sha256-eIpBVfkUIQBriZ4wxp8ii5YmuuKF8r0lNauBEEqoNV8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gemfileparser/default.nix b/pkgs/development/python-modules/gemfileparser/default.nix index a87073e82a91b..5a6f76d720bc6 100644 --- a/pkgs/development/python-modules/gemfileparser/default.nix +++ b/pkgs/development/python-modules/gemfileparser/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "gemfileparser"; version = "0.8.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/genpy/default.nix b/pkgs/development/python-modules/genpy/default.nix index 7bb7458b0ccc8..d89efc6b4b405 100644 --- a/pkgs/development/python-modules/genpy/default.nix +++ b/pkgs/development/python-modules/genpy/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "genpy"; version = "2022.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index 6d2ae215eafac..e4760c3fe9585 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportCheck = [ + pythonImportsCheck = [ "gentools" ]; diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix index a848eff41a658..b7a2cc1d64a72 100644 --- a/pkgs/development/python-modules/genzshcomp/default.nix +++ b/pkgs/development/python-modules/genzshcomp/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "genzshcomp"; version = "0.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 53e1544ed018e..62319647e3941 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.14.2"; + version = "0.14.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; rev = "refs/tags/${version}"; - hash = "sha256-C/F1hpL2DnzC4UPAGGFntlQlULCx5Ufzkw7EIrzRV7I="; + hash = "sha256-L3/gLbiEF2VEqyhfVPnREMUPFbf9cD3tqGJ+AbThPkQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/pkgs/development/python-modules/geographiclib/default.nix index fcdf7a015e7a9..d9f7211a820d8 100644 --- a/pkgs/development/python-modules/geographiclib/default.nix +++ b/pkgs/development/python-modules/geographiclib/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "geographiclib"; version = "2.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/geoip/default.nix b/pkgs/development/python-modules/geoip/default.nix index 0db8cb1e4a98d..f1e84bd8c3be3 100644 --- a/pkgs/development/python-modules/geoip/default.nix +++ b/pkgs/development/python-modules/geoip/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "geoip"; version = "1.3.2"; + format = "setuptools"; nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix index 6d9e33df805b5..0693e209b4571 100644 --- a/pkgs/development/python-modules/geometric/default.nix +++ b/pkgs/development/python-modules/geometric/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "geometric"; version = "1.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "leeping"; diff --git a/pkgs/development/python-modules/georss-generic-client/default.nix b/pkgs/development/python-modules/georss-generic-client/default.nix index 7e3cb77588937..73cafe77bb901 100644 --- a/pkgs/development/python-modules/georss-generic-client/default.nix +++ b/pkgs/development/python-modules/georss-generic-client/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "georss-generic-client"; version = "0.7"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/get-video-properties/default.nix b/pkgs/development/python-modules/get-video-properties/default.nix index 63b9515cf7919..98fe8e9b1d424 100644 --- a/pkgs/development/python-modules/get-video-properties/default.nix +++ b/pkgs/development/python-modules/get-video-properties/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "get-video-properties"; version = "0.1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "mvasilkov"; diff --git a/pkgs/development/python-modules/getjump/default.nix b/pkgs/development/python-modules/getjump/default.nix index b1a1b7005c091..3decbf7aed2ea 100644 --- a/pkgs/development/python-modules/getjump/default.nix +++ b/pkgs/development/python-modules/getjump/default.nix @@ -4,29 +4,22 @@ , fetchPypi , pillow , poetry-core -, pythonRelaxDepsHook , requests , rich }: buildPythonPackage rec { pname = "getjump"; - version = "2.4.0"; - format = "pyproject"; + version = "2.4.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gu6h9Yb0xdfvdmoeZGQPFCJhBJxuQ4iWlQquig1ljnY="; + hash = "sha256-rNMhyUqrliKf6CPhZfyUwN00D4TgOWjPCoqihOB0PDE="; }; nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - # remove after https://github.com/eggplants/getjump/pull/123 is released - "pillow" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/getkey/default.nix b/pkgs/development/python-modules/getkey/default.nix index 563ee64644120..a5adb534e3e77 100644 --- a/pkgs/development/python-modules/getkey/default.nix +++ b/pkgs/development/python-modules/getkey/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "getkey"; version = "0.6.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 938cb99cf8fa1..52e058df47b17 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -1,6 +1,5 @@ { lib , fetchPypi -, fetchpatch , buildPythonPackage , isPyPy , python @@ -14,29 +13,26 @@ , zope_event , zope_interface , pythonOlder + +# for passthru.tests +, dulwich +, gunicorn +, opentracing +, pika }: buildPythonPackage rec { pname = "gevent"; - version = "22.10.2"; + version = "23.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HKAdoXbuN7NSeicC99QNvJ/7jPx75aA7+k+e7EXlXEY="; + hash = "sha256-csACI1OQ1G+Uk4qWkg2IVtT/2d32KjA6DXwRiJQJfjQ="; }; - patches = [ - # Replace deprecated pkg_resources with importlib-metadata - (fetchpatch { - url = "https://github.com/gevent/gevent/commit/bd96d8e14dc99f757de22ab4bb98439f912dab1e.patch"; - hash = "sha256-Y+cxIScuEgAVYmmxBJ8OI+JuJ4G+iiROTcRdWglo3l0="; - includes = [ "src/gevent/events.py" ]; - }) - ]; - nativeBuildInputs = [ cython_3 setuptools @@ -65,6 +61,14 @@ buildPythonPackage rec { "gevent.events" ]; + passthru.tests = { + inherit + dulwich + gunicorn + opentracing + pika; + } // lib.filterAttrs (k: v: lib.hasInfix "gevent" k) python.pkgs; + meta = with lib; { description = "Coroutine-based networking library"; homepage = "http://www.gevent.org/"; diff --git a/pkgs/development/python-modules/gflanguages/default.nix b/pkgs/development/python-modules/gflanguages/default.nix index baaeeb6c9339b..626495ed6f77e 100644 --- a/pkgs/development/python-modules/gflanguages/default.nix +++ b/pkgs/development/python-modules/gflanguages/default.nix @@ -2,30 +2,42 @@ , buildPythonPackage , fetchPypi , protobuf -, setuptools-scm -, pythonRelaxDepsHook , pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, setuptools-scm , uharfbuzz , youseedee }: buildPythonPackage rec { pname = "gflanguages"; - version = "0.5.10"; + version = "0.5.13"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JVeI7TlJjbKCa+gGmjylbNiEhX3qmpbLXiH3VpFqgXc="; + hash = "sha256-LoppJHzX0dOpHnwMCyS1ACdIO4cqwb370ksvsXDFHzQ="; }; - propagatedBuildInputs = [ - protobuf + # Relax the dependency on protobuf 3. Other packages in the Google Fonts + # ecosystem have begun upgrading from protobuf 3 to protobuf 4, + # so we need to use protobuf 4 here as well to avoid a conflict + # in the closure of fontbakery. It seems to be compatible enough. + pythonRelaxDeps = [ + "protobuf" ]; + nativeBuildInputs = [ setuptools-scm ]; - doCheck = true; + propagatedBuildInputs = [ + protobuf + ]; + nativeCheckInputs = [ pythonRelaxDepsHook pytestCheckHook @@ -33,15 +45,10 @@ buildPythonPackage rec { youseedee ]; - # Relax the dependency on protobuf 3. Other packages in the Google Fonts - # ecosystem have begun upgrading from protobuf 3 to protobuf 4, - # so we need to use protobuf 4 here as well to avoid a conflict - # in the closure of fontbakery. It seems to be compatible enough. - pythonRelaxDeps = [ "protobuf" ]; - meta = with lib; { description = "Python library for Google Fonts language metadata"; homepage = "https://github.com/googlefonts/lang"; + changelog = "https://github.com/googlefonts/lang/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ danc86 ]; }; diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix index 213f7fdd30087..67d6d0000140a 100644 --- a/pkgs/development/python-modules/ghdiff/default.nix +++ b/pkgs/development/python-modules/ghdiff/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "ghdiff"; version = "0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix index 274e8f9355d33..c1ac1a5148b81 100644 --- a/pkgs/development/python-modules/gibberish-detector/default.nix +++ b/pkgs/development/python-modules/gibberish-detector/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "gibberish-detector"; version = "0.1.1"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix index 1c6c4fabaa37b..1f3105a8a8820 100644 --- a/pkgs/development/python-modules/gin-config/default.nix +++ b/pkgs/development/python-modules/gin-config/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "gin-config"; version = "0.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/gistyc/default.nix b/pkgs/development/python-modules/gistyc/default.nix index 51003101abde3..923f2069d052d 100644 --- a/pkgs/development/python-modules/gistyc/default.nix +++ b/pkgs/development/python-modules/gistyc/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "gistyc"; version = "1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 649c2aa2bc512..1279be5e9d3f5 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "git-annex-adapter"; version = "0.2.2"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index 726805edbaf11..5f1879638d1c1 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "git-revise"; version = "0.7.0"; + format = "setuptools"; # Missing tests on PyPI src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/github-to-sqlite/default.nix b/pkgs/development/python-modules/github-to-sqlite/default.nix index ed262841773e2..0dfeb42449390 100644 --- a/pkgs/development/python-modules/github-to-sqlite/default.nix +++ b/pkgs/development/python-modules/github-to-sqlite/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "github-to-sqlite"; - version = "2.8.3"; + version = "2.9"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { owner = "dogsheep"; repo = pname; rev = version; - hash = "sha256-4wkwtcChcR7XH421wa3dGdIPhwgeaTFk247zIRX98xo="; + hash = "sha256-KwLaaZxBBzRhiBv4p8Imb5XI1hyka9rmr/rxA6wDc7Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/github-webhook/default.nix b/pkgs/development/python-modules/github-webhook/default.nix index 32b86896fdd11..9f05b74a2202a 100644 --- a/pkgs/development/python-modules/github-webhook/default.nix +++ b/pkgs/development/python-modules/github-webhook/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "github-webhook"; version = "1.0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/glad/default.nix b/pkgs/development/python-modules/glad/default.nix index ba738b3572124..889012b648ab9 100644 --- a/pkgs/development/python-modules/glad/default.nix +++ b/pkgs/development/python-modules/glad/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "glad"; version = "0.1.36"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index b74775a321970..4014de18e12b5 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "glcontext"; version = "2.5.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "moderngl"; diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 7ab2855d8d730..d85a0771a8093 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "9.0.0"; + version = "10.0.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-dwBKds89CaanZA4b5I6u01Q2s23joQp5SOCjdTXn/Xc="; + hash = "sha256-1XNZYp0pX57lcAaKKEaWaJLj/ttyIlnsvNjMN20pm1E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 22ac0e96ea9a3..54ea8c5f8ce0f 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { pname = "glean-sdk"; version = "52.7.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index d39daf9e9dc26..31d6c0a275d8e 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.6.2"; + version = "2.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - hash = "sha256-3K+mDSz4ifVYkUvhd2XDPbhh6UCY4y54YqNLoAYDsP0="; + hash = "sha256-ANydW+4uLIJelUdDCHZ6WJgIJHNXzdc9jK/nZbZHi+I="; }; # Patch path to GLFW shared object diff --git a/pkgs/development/python-modules/glob2/default.nix b/pkgs/development/python-modules/glob2/default.nix index 83d6aa13cfa2b..5d75da953ed59 100644 --- a/pkgs/development/python-modules/glob2/default.nix +++ b/pkgs/development/python-modules/glob2/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "glob2"; version = "0.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/globre/default.nix b/pkgs/development/python-modules/globre/default.nix index c7c77b35c342a..a270a2b4c430c 100644 --- a/pkgs/development/python-modules/globre/default.nix +++ b/pkgs/development/python-modules/globre/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "globre"; version = "0.1.5"; + format = "setuptools"; # https://github.com/metagriffin/globre/issues/7 disabled = pythonAtLeast "3.7"; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index f497821e07d63..6ad0646401a08 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.31.0"; + version = "3.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-MJW0B3AXDYSVgNkv8iBA2+pOKrlI7pZeJfunMMxABx8="; + hash = "sha256-otf1A8onfi6u3Vv7IxBtziLEy2UqVeJxw1u+XIfSchA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 35d0b36a1bb18..05c6110ae7c9a 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "glom"; - version = "23.3.0"; + version = "23.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AxaZKA+kZmBI5D0uq2i+EET/zUh6t0rLeS3i7rC8JRU="; + hash = "sha256-Bq9eNIaqzFk4K6NOU+vqvXqTRdePfby+4m8DuqS4O6w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/glueviz/default.nix b/pkgs/development/python-modules/glueviz/default.nix index 2d0e927c1acc4..e066240fa6e0b 100644 --- a/pkgs/development/python-modules/glueviz/default.nix +++ b/pkgs/development/python-modules/glueviz/default.nix @@ -29,7 +29,8 @@ buildPythonPackage rec { pname = "glueviz"; - version = "1.16.0"; + version = "1.17.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -37,7 +38,7 @@ buildPythonPackage rec { owner = "glue-viz"; repo = "glue"; rev = "refs/tags/v${version}"; - sha256 = "sha256-jjDa0DxB5AJm+x8P7FiH2kqhhc/bbzjzvdC9INs69Ro="; + sha256 = "sha256-nr84GJAGnpKzjZEFNsQujPysSQENwGxdNfPIYUCJkK4="; }; buildInputs = [ pyqt-builder ]; diff --git a/pkgs/development/python-modules/glyphsets/default.nix b/pkgs/development/python-modules/glyphsets/default.nix index 5088deb580b09..98fdd3d9aa4c7 100644 --- a/pkgs/development/python-modules/glyphsets/default.nix +++ b/pkgs/development/python-modules/glyphsets/default.nix @@ -12,11 +12,12 @@ buildPythonPackage rec { pname = "glyphsets"; - version = "0.6.5"; + version = "0.6.11"; + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Zp4VLJ9h6lkz7KOM7LWKAj7UX1KziLobzeT9Dosv5UU="; + hash = "sha256-ACeD9O/kOE2we95gW4ak8504Y+azoqNyMeeVaWmEzak="; }; patches = [ diff --git a/pkgs/development/python-modules/glyphtools/default.nix b/pkgs/development/python-modules/glyphtools/default.nix index f186863459a70..0f1f2066c02b4 100644 --- a/pkgs/development/python-modules/glyphtools/default.nix +++ b/pkgs/development/python-modules/glyphtools/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "glyphtools"; version = "0.8.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/gmpy/default.nix b/pkgs/development/python-modules/gmpy/default.nix index 9a2957fa23d76..072ef985dc01c 100644 --- a/pkgs/development/python-modules/gmpy/default.nix +++ b/pkgs/development/python-modules/gmpy/default.nix @@ -3,6 +3,7 @@ let pname = "gmpy"; version = "1.17"; + format = "setuptools"; in buildPythonPackage { diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index 6f5d7be0021df..b5a602d4f222f 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -10,6 +10,7 @@ let pname = "gmpy2"; version = "2.1.2"; + format = "setuptools"; in buildPythonPackage { diff --git a/pkgs/development/python-modules/gntp/default.nix b/pkgs/development/python-modules/gntp/default.nix index 364a59732e11f..c334ebe5ce377 100644 --- a/pkgs/development/python-modules/gntp/default.nix +++ b/pkgs/development/python-modules/gntp/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "gntp"; version = "1.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index e2d853c32bf6e..c3a2434eeea68 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "8.1.2"; + format = "setuptools"; pname = "gnureadline"; disabled = isPyPy; diff --git a/pkgs/development/python-modules/gocardless-pro/default.nix b/pkgs/development/python-modules/gocardless-pro/default.nix index 4e5e919323ad8..04f97a879f8a4 100644 --- a/pkgs/development/python-modules/gocardless-pro/default.nix +++ b/pkgs/development/python-modules/gocardless-pro/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "gocardless-pro"; - version = "1.48.0"; + version = "1.49.0"; format = "setuptools"; src = fetchFromGitHub { owner = "gocardless"; repo = "gocardless-pro-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-9229lwCtVu4Pfru6e9JdbP3KUUYojBLuNQ+volP6OX0="; + rev = "refs/tags/${version}"; + hash = "sha256-jhZfbJLf/gMXfErVbO2erBxgULmKyp1C0+t0k1d0o54="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 38b4af1e3adaf..19ce3a18cf839 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.32"; + version = "0.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Uj4f3OcPRqbMaM0ADP6OlPQAXFfCYZS0/qbz9eXGLv0="; + hash = "sha256-D2NR31aIl6A3ij8sKOIHPOj3HFQKGwpk6RjA+MB3mMk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index ebadff4540055..ac6dfc1719337 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.4"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cnX9lGmtOrd5CdioC9bAVeHiMXjEsV6Z67ARSnV03P8="; + hash = "sha256-yBmQZsCPdMTpEpB3gym7nzV7oepdb4LeK8DRBVK/T4w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index 510b62c5bbaef..daf7a64de53a3 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-auth-httplib2"; - version = "0.1.1"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xkvFVf3G3XiOpi7Pe8z/z0l793JEiHo/PXpaAvjj/Ck="; + hash = "sha256-OKp7rfSPl08euYYXlOnAyyoFEaTsBnmx+IbRCPVkDgU="; }; propagatedBuildInputs = [ 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 d7ed23f14cece..a7a92d057a73b 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.2"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-opifyg6IRjtWQyqoIeZLgcPRce43uEdxGJtI6Ll81JY="; + hash = "sha256-/nT0GNCwHr6+g64hKr8FGtQmkqY2Z345fePUWeANe2Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index f778b745cb4c1..38210fe9990ba 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.9.0"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NITSosBPrfpIC+FqVU0B5H5MT0taEjzTcl6GW03X8yU="; + hash = "sha256-JrW6lkaRiVsisuOCHLNTxh6LF44PO/RhRfTkORDSIt4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index c430d23c32f6b..ddc78dc7cc57c 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -1,33 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, grpc-google-iam-v1 , google-api-core , google-cloud-access-context-manager , google-cloud-org-policy , google-cloud-os-config , google-cloud-testutils +, grpc-google-iam-v1 , libcst -, protobuf +, mock , proto-plus +, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder -, mock +, setuptools }: buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.20.0"; - format = "setuptools"; + version = "3.22.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lJLC1igiY0OYLu3eyuOvJ2KmFr9n4su8T7LPgWlUtCk="; + hash = "sha256-S+rJ80pkphkPlNFUn8e0bxpnkBILRS9Uvoa0vlfrK8M="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core @@ -63,8 +68,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python Client for Google Cloud Asset API"; - homepage = "https://github.com/googleapis/python-asset"; - changelog = "https://github.com/googleapis/python-asset/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-asset"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-v${version}/packages/google-cloud-asset/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index b45492a171f84..2768a79005a87 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.11.4"; + version = "2.12.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oUMXQWkwHMFI26hpe36mAyoh+bQogtyoDgTaBRactUU="; + hash = "sha256-IvemHgS0qbA9UE7y22aD30YqAy2lP+P7ssNvUlB0q7U="; }; nativeBuildInputs = [ 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 d64bd1bf73402..bf293c41541de 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.1"; + version = "3.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uEWnQIGs4yybuukzgrAqaduFYKNW9h/WouX2MzSVgUg="; + hash = "sha256-J6hFyyJgWlEsBc4owokNLvl61O38mBevVVpz2AJOw7o="; }; propagatedBuildInputs = [ @@ -50,8 +50,8 @@ buildPythonPackage rec { meta = with lib; { description = "BigQuery Data Transfer API client library"; - homepage = "https://github.com/googleapis/python-bigquery-datatransfer"; - changelog = "https://github.com/googleapis/python-bigquery-datatransfer/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-bigquery-datatransfer"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-datatransfer-v${version}/packages/google-cloud-bigquery-datatransfer/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 578990f309056..ea4750d69755a 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.3.0"; - format = "setuptools"; + version = "1.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7hj42cr9BKwSBEX09kZPngAUPFPrQ/VS5hBzbAaQhH4="; + hash = "sha256-4pl7cT8bLy0y3ntYt1qO027KF7yokHun5lGZHWnBkUw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 @@ -43,8 +48,8 @@ buildPythonPackage rec { meta = with lib; { description = "Bigquery logging client library"; - homepage = "https://github.com/googleapis/python-bigquery-logging"; - changelog = "https://github.com/googleapis/python-bigquery-logging/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-bigquery-logging"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-logging-v${version}/packages/google-cloud-bigquery-logging/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index ce91fa6c6c058..cbda1f2f254e9 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.22.0"; + version = "2.23.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9tjHs6ubV0xml3/O6dM24zStGjhDpyK+GRI2QOeAjqM="; + hash = "sha256-hJbG0wV177IkwYlAVm+awAbTsSCudZACkYaXw0B5l+Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 9b214bebdfd3b..1f0695a1770f0 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.21.0"; + version = "2.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2fDvv5QMo5LwfRN4f8LadtHhaN7a+uD48bQgjgwRMtw="; + hash = "sha256-Y6HO3Q5JZC4lSBJDbJxMlAHWnF3LzIDLY2ZpK1Abv6E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index c955aafda5017..47d3969dbf6a3 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.33.0"; + version = "2.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dpJmSe7NjmmDqd0GrLxm1e/VFvo64+ECNRVwuRpjrmI="; + hash = "sha256-dDkiUothV1QwMkeD8FsWZloLLMEbCNqJ1yHeraqdbuw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 81a5bb08599c4..3b0fff422ce18 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -10,20 +10,25 @@ , pytestCheckHook , pytest-asyncio , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.6.0"; - format = "setuptools"; + version = "5.8.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X6nfuIQzwtDBOLfrtq3hdBA743YszQObJNU8dEjjdg0="; + hash = "sha256-sDQS3WPLhNwLsIRM2emp7vQOHQ1xlkllkFLMzw0+ldc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 @@ -50,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Dataproc API client library"; - homepage = "https://github.com/googleapis/python-dataproc"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-dataproc"; changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-dataproc-v${version}/packages/google-cloud-dataproc/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index b6148c30746c2..00e07713a6351 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.18.0"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Y7MbZ23LJ4amUNI9Mk2PiGxOFFhq/dDP5uJgpz8SRI4="; + hash = "sha256-B/xYcKAmHyVGbFV8E035Wpbf0lN6vQiLnVN/ur6ZuXQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index 0f9b9eca022f8..f076591c02de0 100644 --- a/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.34.2"; + version = "0.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/GG9jPBw6Hqstidi6ypa8VUHBsmIgdeurrru0RKAr9M="; + hash = "sha256-CsRNqesPoLEilRPNiIB0q9AhGZLEBCMAr9HBbUFHRVM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index f7c690c56f67a..aac30f35757dc 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6IBjA2WwP11d/vQJSIY3WhbqYvAgFRtZFFSffUqKM38="; + hash = "sha256-oLqRmxNPbb+nUMN70kGlAtBCji4wXrbRv2DhNMcZV5c="; }; propagatedBuildInputs = [ @@ -43,8 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "IAM Service Logging client library"; - homepage = "https://github.com/googleapis/python-iam-logging"; - changelog = "https://github.com/googleapis/python-iam-logging/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-iam-logging"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-iam-logging-v${version}/packages/google-cloud-iam-logging/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 54397f68cd8fa..e04591791d3cc 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.11.1"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XxhECfBAwMcwV8JhbmvS6G5FrrZGGA0ZwYnfSqPQLbo="; + hash = "sha256-efuO/hWDM+aMBXR+nqhrWYsvQpoS83FJ2DrG+hhFlio="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 83842597d8771..c6d253d9cb07a 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -17,20 +17,25 @@ , pytestCheckHook , pythonOlder , rich +, setuptools }: buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.8.0"; - format = "setuptools"; + version = "3.9.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/dkW5ZqEqowC6BSNf907O2I8V7DB/3H0MpfOjlD8Hqs="; + hash = "sha256-TeyxsL7UoOPA5Yo3ZkbmAC1r58rQOeNGaCLoZlBy6jM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core google-cloud-appengine-logging @@ -52,16 +57,18 @@ buildPythonPackage rec { rich ]; - disabledTests = [ - # requires credentials - "test_write_log_entries" - ]; - preCheck = '' - # prevent google directory from shadowing google imports + # Prevent google directory from shadowing google imports rm -r google ''; + disabledTests = [ + # Test requires credentials + "test_write_log_entries" + # No need for a second import check + "test_namespace_package_compat" + ]; + disabledTestPaths = [ # Tests require credentials "tests/system/test_system.py" diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 2e91f2704c77c..314dc51060dae 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.8.3"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VU+vB+x2DElwzl1cO7qTdV91Mn1i2Dsq2safnMrwuqI="; + hash = "sha256-3Db3R3PnzYMiMNrbP1BiU7TfKIxR11v491i+JH10Q/0="; }; 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 4c71548c0df83..3ea7d25e9d544 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.3"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KNM4wASyfgoBqhXa5k+8tf+AN9VljHDDK0U849N5qHI="; + hash = "sha256-1wXyDI1/NMqMwgqYZb3/pLExyi1Wo7st8R/mNwMte44="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 943d55dab4061..f2288f8638c19 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.18.4"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Muth/UwdxshC9ZTWnZr6gFROOzJ6pkChZOtvsCAery0="; + hash = "sha256-apjDP361994q5S76BZsrX3WyzNnw8R8u3O/dqNFOQlw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 37b9dcf80958e..228545f62da4a 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.13.2"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XEhXMDVdlnI9ZK5jfxsiZPNbV8MB7A7yxtMLLwbcoU4="; + hash = "sha256-TzuRWGGdQrsmOLidvLiC80e9t9VVu8LUNhq2Ikk0Pco="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index e7c930e77f070..2917600115871 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.24.0"; + version = "1.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KsXsWGEUwD0UFRD7V4rfqEuRjyWeU/PmPdh8X6djhG0="; + hash = "sha256-SofrNcO5Rir8iQfwjADlUJnGmf1y1xkBG8r6gBVxva4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 3999f428c2b66..8fa7bc16d6ce7 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.22.0"; + version = "2.23.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lZKKiYaS1+qgVWbVeiE464tbkjSxw8y3LFUgce0qOrA="; + hash = "sha256-H4aDIHCF3cpsXgZIly+KBik30w5zqlVSDwgPSVMse/8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 4354e90474448..c5762819af6a6 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.14.2"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PvsoDnpjX1eGCgajRhMcEXBC6CCtSDr9JWgA+uG01wE="; + hash = "sha256-SpmTjbARHVU3hkG1I1uY5r12S8jip+JN9wb4uGO98nw="; }; propagatedBuildInputs = [ @@ -50,8 +50,8 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Tasks API API client library"; - homepage = "https://github.com/googleapis/python-tasks"; - changelog = "https://github.com/googleapis/python-tasks/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-tasks"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-tasks-v${version}/packages/google-cloud-tasks/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 6872b953efcac..f039e5870be35 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.2"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ojc4NmmI+vTSZSAPV8XeQxLvo9FLtDS5Km5UFxP12QY="; + hash = "sha256-d4Y+1U94/NLhlMoRPJzF5+QLhzBszsG6MH5G3PgfBzc="; }; propagatedBuildInputs = [ @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Text-to-Speech API client library"; - homepage = "https://github.com/googleapis/python-texttospeech"; - changelog = "https://github.com/googleapis/python-texttospeech/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-texttospeech"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-texttospeech-v${version}/packages/google-cloud-texttospeech/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index ac134f2472ca9..98a62651013c8 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.11.3"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ud0MLfv5Oy3AV6RdAkyMbCxM2+55txtfoekTB1eznFE="; + hash = "sha256-IvbMxHbOMQHUH7q86sP+/N/gV9KWez6OIMAmcTY6Uko="; }; propagatedBuildInputs = [ @@ -50,8 +50,8 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Trace API client library"; - homepage = "https://github.com/googleapis/python-trace"; - changelog = "https://github.com/googleapis/python-trace/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-trace"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-trace-v${version}/packages/google-cloud-trace/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 3ff18366e426e..ef0a5971ebbb1 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.11.4"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-B6zimaY/Wz1EQTdWNIU7Vc6PkMYsaiT4pH6wVBSfb5k="; + hash = "sha256-SwGUkyzSYEGZuIBbwQhpLmoqJZ9Hd1FrnLyXi4hx4pU="; }; propagatedBuildInputs = [ @@ -52,8 +52,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Video Intelligence API client library"; - homepage = "https://github.com/googleapis/python-videointelligence"; - changelog = "https://github.com/googleapis/python-videointelligence/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-videointelligence"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-videointelligence-v${version}/packages/google-cloud-videointelligence/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 95c2ed0662cae..7d998aea6f55d 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -8,20 +8,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.4.5"; - format = "setuptools"; + version = "3.5.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DfgkGrJ3GZuRnKODen3oUFk2P+oOPWYAYIcL587/wEc="; + hash = "sha256-dwO/R8iyEIYw0qJ15X9DJuPAceZmISrZorPVqAkMZ2c="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus @@ -44,6 +49,11 @@ buildPythonPackage rec { "google.cloud.vision_v1p4beta1" ]; + disabledTests = [ + # Tests require PROJECT_ID + "test_list_products" + ]; + meta = with lib; { description = "Cloud Vision API API client library"; homepage = "https://github.com/googleapis/python-vision"; diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 8804ad810aaa4..d4c285c3f34ec 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.12.3"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zu4e4MTpc24p5ZWeRfVQwX0brciaz80FDGbxy6UppEA="; + hash = "sha256-vktbTjzNYMa8otEGGq36fYOKcNuNasWql4SBWbk84Iw="; }; propagatedBuildInputs = [ @@ -41,8 +41,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Web Security Scanner API client library"; - homepage = "https://github.com/googleapis/python-websecurityscanner"; - changelog = "https://github.com/googleapis/python-websecurityscanner/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-websecurityscanner"; + changelog = "https://github.com/googleapis/google-cloud-python/tree/google-cloud-websecurityscanner-v${version}/packages/google-cloud-websecurityscanner"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix index b1dc31da87336..38c6eea798fa5 100644 --- a/pkgs/development/python-modules/google-crc32c/default.nix +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "google-crc32c"; version = "1.5.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "googleapis"; diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index 69c9180ce4237..920cd984df330 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -8,11 +8,12 @@ , pythonOlder , pythonRelaxDepsHook , tqdm +, typing-extensions }: buildPythonPackage rec { pname = "google-generativeai"; - version = "0.2.2"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-WiDoeScro7TcW5nQBmLpVQriL6IzR9CAVqBj36nqivk="; + hash = "sha256-SL0jnuDHjeiqDq1VvWr4vQPFZ5yyea/OAGArmxztwB4="; }; pythonRelaxDeps = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { google-api-core protobuf tqdm + typing-extensions ]; # Issue with the google.ai module. Check with the next release diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix index 608ab9ccd1bc6..912b444541ad9 100644 --- a/pkgs/development/python-modules/google-pasta/default.nix +++ b/pkgs/development/python-modules/google-pasta/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "google-pasta"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 64dc4d2c71822..60233f91fbbcb 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; version = "1.60.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/googletrans/default.nix b/pkgs/development/python-modules/googletrans/default.nix index 32b839ab11c22..d1dd1de8e82f6 100644 --- a/pkgs/development/python-modules/googletrans/default.nix +++ b/pkgs/development/python-modules/googletrans/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "googletrans"; version = "2.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ssut"; diff --git a/pkgs/development/python-modules/gorilla/default.nix b/pkgs/development/python-modules/gorilla/default.nix index 22e71df324514..3603e1961e1da 100644 --- a/pkgs/development/python-modules/gorilla/default.nix +++ b/pkgs/development/python-modules/gorilla/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "gorilla"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/gotailwind/default.nix b/pkgs/development/python-modules/gotailwind/default.nix new file mode 100644 index 0000000000000..8c86b44df3538 --- /dev/null +++ b/pkgs/development/python-modules/gotailwind/default.nix @@ -0,0 +1,79 @@ +{ lib +, aiohttp +, aresponses +, awesomeversion +, backoff +, buildPythonPackage +, fetchFromGitHub +, mashumaro +, orjson +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, syrupy +, typer +, yarl +, zeroconf +}: + +buildPythonPackage rec { + pname = "gotailwind"; + version = "0.2.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-gotailwind"; + rev = "refs/tags/v${version}"; + hash = "sha256-JtMBud3iON4xLc9dQdXniv51EBqs7zkat8cYm3q0uEE="; + }; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + awesomeversion + backoff + mashumaro + orjson + yarl + zeroconf + ]; + + passthru.optional-dependencies = { + cli = [ + typer + ]; + }; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ + "gotailwind" + ]; + + meta = with lib; { + description = "Modul to communicate with Tailwind garage door openers"; + homepage = "https://github.com/frenck/python-gotailwind"; + changelog = "https://github.com/frenck/python-gotailwind/releases/tag/v$version"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix index 751d0b742787f..d185a8a1aa0c3 100644 --- a/pkgs/development/python-modules/gotenberg-client/default.nix +++ b/pkgs/development/python-modules/gotenberg-client/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { pname = "gotenberg-client"; - version = "0.3.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "gotenberg-client"; rev = "refs/tags/${version}"; - hash = "sha256-xgkpVvklZrew+XOoqFKcbuDsTVfDda67R6YIxR3kzS8="; + hash = "sha256-mjVzwlawJojSHI7SSchUWLS320wXl1eHy7A7/IPU8mk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/govee-led-wez/default.nix b/pkgs/development/python-modules/govee-led-wez/default.nix new file mode 100644 index 0000000000000..727be405b2163 --- /dev/null +++ b/pkgs/development/python-modules/govee-led-wez/default.nix @@ -0,0 +1,55 @@ +{ lib +, aiohttp +, bleak +, bleak-retry-connector +, buildPythonPackage +, certifi +, fetchFromGitHub +, hatchling +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage { + pname = "govee-led-wez"; + version = "0.0.15"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "wez"; + repo = "govee-py"; + # https://github.com/wez/govee-py/issues/2 + rev = "931273e3689838613d63bc1bcc65ee744fa999f4"; + hash = "sha256-VMH7sot9e2SYMyBNutyW6oCCjp2N+EKukxn1Dla3AlY="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + aiohttp + bleak + bleak-retry-connector + certifi + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "govee_led_wez" + ]; + + meta = with lib; { + description = "Control Govee Lights from Python"; + homepage = "https://github.com/wez/govee-py"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index 6c2454dbbfeb5..307e8dfb63b80 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { version = "0.4.4"; + format = "setuptools"; pname = "gpapi"; disabled = pythonOlder "3.3"; # uses shutil.which(), added in 3.3 diff --git a/pkgs/development/python-modules/gpaw/default.nix b/pkgs/development/python-modules/gpaw/default.nix index e359c78c66f86..e415c192511cf 100644 --- a/pkgs/development/python-modules/gpaw/default.nix +++ b/pkgs/development/python-modules/gpaw/default.nix @@ -75,6 +75,7 @@ let in buildPythonPackage rec { pname = "gpaw"; version = "23.9.1"; + format = "setuptools"; src = fetchFromGitLab { owner = "gpaw"; diff --git a/pkgs/development/python-modules/gps3/default.nix b/pkgs/development/python-modules/gps3/default.nix index 95e1c136031e1..4d4182063b404 100644 --- a/pkgs/development/python-modules/gps3/default.nix +++ b/pkgs/development/python-modules/gps3/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "gps3"; version = "unstable-2017-11-01"; + format = "setuptools"; src = fetchFromGitHub { owner = "wadda"; diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix index 3a1707a4676fc..80b8350410f1d 100644 --- a/pkgs/development/python-modules/gpsoauth/default.nix +++ b/pkgs/development/python-modules/gpsoauth/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "1.0.2"; + format = "setuptools"; pname = "gpsoauth"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/gpt-2-simple/default.nix b/pkgs/development/python-modules/gpt-2-simple/default.nix index f627ead49d0a5..aae6dfbfbc400 100644 --- a/pkgs/development/python-modules/gpt-2-simple/default.nix +++ b/pkgs/development/python-modules/gpt-2-simple/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "gpt-2-simple"; version = "0.8.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "minimaxir"; diff --git a/pkgs/development/python-modules/gpxpy/default.nix b/pkgs/development/python-modules/gpxpy/default.nix index 96c969c520bf2..40708972823aa 100644 --- a/pkgs/development/python-modules/gpxpy/default.nix +++ b/pkgs/development/python-modules/gpxpy/default.nix @@ -2,14 +2,15 @@ buildPythonPackage rec { pname = "gpxpy"; - version = "1.5.0"; + version = "1.6.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tkrajina"; repo = pname; rev = "v${version}"; - hash = "sha256-Fkl2dte1WkPi2hBOdT23BMfNflR0j4GeNH86d46WNQk="; + hash = "sha256-s65k0u4LIwHX9RJMJIYMkNS4/Z0wstzqYVPAjydo2iI="; }; propagatedBuildInputs = [ lxml ]; diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix index 8636a71ecdcea..42d65ae433b7b 100644 --- a/pkgs/development/python-modules/grad-cam/default.nix +++ b/pkgs/development/python-modules/grad-cam/default.nix @@ -7,6 +7,7 @@ , opencv4 , pillow , scikit-learn +, setuptools , torch , torchvision , ttach @@ -15,19 +16,25 @@ buildPythonPackage rec { pname = "grad-cam"; - version = "1.4.8"; - disabled = pythonOlder "3.6"; - format = "pyproject"; + version = "1.5.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-BNcwDaEEmRsEoJ4nvvGfjZ9LdG0eRqZCFuY5/Gmp5N4="; + hash = "sha256-aw7Z/6/AMKH2PVBcOr8HxsmRDa6c3v8Xd4xa8HTiFGA="; }; postPatch = '' - substituteInPlace requirements.txt --replace "opencv-python" "opencv" + substituteInPlace requirements.txt\ + --replace "opencv-python" "opencv" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ matplotlib numpy diff --git a/pkgs/development/python-modules/grafanalib/default.nix b/pkgs/development/python-modules/grafanalib/default.nix new file mode 100644 index 0000000000000..6dcb88a32f3d2 --- /dev/null +++ b/pkgs/development/python-modules/grafanalib/default.nix @@ -0,0 +1,48 @@ +{ attrs +, buildPythonPackage +, fetchFromGitHub +, fetchPypi +, lib +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "grafanalib"; + version = "0.7.0"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "weaveworks"; + repo = pname; + rev = "v${version}"; + hash = "sha256-yQIDAQMG84onYWqBxIl5IXSaBlJBO/uUIy4CVvoFyGk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + attrs + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "grafanalib" + ]; + + meta = with lib; { + description = "Library for building Grafana dashboards"; + homepage = "https://github.com/weaveworks/grafanalib/"; + changelog = "https://github.com/weaveworks/grafanalib/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ michaelgrahamevans ]; + }; +} diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix index 9aa3c4ffd0317..395f97a62d370 100644 --- a/pkgs/development/python-modules/grammalecte/default.nix +++ b/pkgs/development/python-modules/grammalecte/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "grammalecte"; version = "2.1.1"; + format = "setuptools"; src = fetchurl { url = "https://grammalecte.net/grammalecte/zip/Grammalecte-fr-v${version}.zip"; diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index 5ad186d75476f..6b6527c3bbd97 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "3.1.5"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1vl1Yj9MVBej5aFND8A63JMIog8aIW9SdwiOLIUwXxI="; + hash = "sha256-SOLY3NogovwQ5gr2gnvOcROWpbk9p134wI2f9FKr+5M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix index 16217cd23a516..a098f9c85e704 100644 --- a/pkgs/development/python-modules/graphql-server-core/default.nix +++ b/pkgs/development/python-modules/graphql-server-core/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "graphql-server-core"; version = "2.0.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/graphqlclient/default.nix b/pkgs/development/python-modules/graphqlclient/default.nix index 2f09897d4f57a..81bdddf00ee41 100644 --- a/pkgs/development/python-modules/graphqlclient/default.nix +++ b/pkgs/development/python-modules/graphqlclient/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "graphqlclient"; version = "0.2.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix index 8b5e27a241348..fa5026a52a2ee 100644 --- a/pkgs/development/python-modules/graphtage/default.nix +++ b/pkgs/development/python-modules/graphtage/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "graphtage"; version = "0.3.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index e83a90729f2cc..6af54cbb6d6da 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "graphviz"; version = "0.20.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index afc5b2edad2e8..513a60bd432e9 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "graspologic"; version = "3.2.0"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index e1dfe77d577e7..40ff7ab61d413 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "grequests"; version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 63d985326efcf..98c9b5bf302fc 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.38.0"; + version = "0.38.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GhohFO5tHb9ByISPUf4U2MrDATE4WjuekcC9QZaP2Ls="; + hash = "sha256-j0j13bJtHlPc00pjmfpg/QJKzYQQcyA+jE7q538Uu08="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index ef1ad0512c951..0236886af98dd 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "grip"; version = "4.6.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "joeyespo"; diff --git a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index f5a25339def2f..96be86458422a 100644 --- a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "grpc-google-iam-v1"; version = "0.12.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 1063dfdb5d9dd..4c66dcc990314 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.59.3"; + version = "1.60.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-R2rk/4yQ0ldy6yZeauVtEpmmF0Jnx61NMw98y3D5kq4="; + hash = "sha256-TRTHMDUm50cmFJ0BX1zwd34xCVsuyejqp7hHc33LYKA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-gcp/default.nix b/pkgs/development/python-modules/grpcio-gcp/default.nix index c45423ed95e03..60706fba8ee68 100644 --- a/pkgs/development/python-modules/grpcio-gcp/default.nix +++ b/pkgs/development/python-modules/grpcio-gcp/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "grpcio-gcp"; version = "0.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index f758a8bf25046..573670a98c30c 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.59.3"; + version = "1.60.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-AVAXzkFk/H3Ogdo6FxiksxUyMOSBss3r85JGi2E/B2Y="; + hash = "sha256-R4tTAHeBIP7Z9tE01ysVeln5wGaJeJIYy/9H+vyi8Rk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 7ed24e849ccdf..dc4fb436fbb40 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.59.3"; + version = "1.60.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-VAPFpzjG7sS7QIDad+RQMS2s5BqG4pKsN8/QB7JlfU4="; + hash = "sha256-P2wMc7qPINFCDF5y/E3QOJ+sNG7Y+zKijm4ZZ7RP/zU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index e7d6fd550958a..0915851d7a706 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.59.0"; + version = "1.59.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+TucM+CiYWLvhDG/z/zD4fshfM2Ne1swYbbp+BPmmLU="; + hash = "sha256-ZcOUukM4DWvfjATGHvxJMQS1U1VSrtNYF6G03GZZih8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index bb3024d440767..1d0f47a5c9e18 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.59.0"; + version = "1.60.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YiqbhlOsyoAT/uYNPbLQK5c2T8cYGEDXVkAPIzCaOQ4="; + hash = "sha256-XF+za8O9x4m/8ewEBQG5reoPiK64vh7VyA1oic0Jq0A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index cd0b0abcb1210..9c808eb8d718a 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.59.0"; + version = "1.59.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-qkAY8thmKsTZgwRF09JToRs+CW6K/iCGVUcTeqEWDpM="; + hash = "sha256-zRYKxCgc0a53osiAN3p3KDSTQLTJHiQoUDe1fBjp9lE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index e8ea37c904485..a003d4659d60a 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage +, fetchPypi , grpc , six , protobuf @@ -14,9 +16,14 @@ }: buildPythonPackage rec { - inherit (grpc) src version; pname = "grpcio"; format = "setuptools"; + version = "1.59.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-eAD5lWinSgbr3M1BndG25jm0d9yvbad+pwL4+xTOX4A="; + }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix index 11692e59ef236..be31ef9c78c01 100644 --- a/pkgs/development/python-modules/grpclib/default.nix +++ b/pkgs/development/python-modules/grpclib/default.nix @@ -14,6 +14,7 @@ let pname = "grpclib"; version = "0.4.4"; + format = "setuptools"; in buildPythonPackage { inherit pname version; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 0e56dd26cb8d4..fa68122dcb130 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "5.12.1"; + version = "5.12.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-cuSR5QWURHSL1o2R4rc/m3KETz3X+78TC8LuuzZghbs="; + hash = "sha256-NmIWGHS40VOUL3IGSR/SW9inbSQFv+2UDgo1FZWROHI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 56b79e8c08b61..8ca5f8ebc6f7c 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "gssapi"; version = "1.8.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index abc5d52ece6d5..16f99016fed34 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.22.6"; + version = "1.22.7"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; - hash = "sha256-Ud4tbROxLOCV6sl8C5TuWcKuujcSu3Rit4xNV93hdsU="; + hash = "sha256-HvjfdggBL6RpMpeZyVDsCHc3ptq60wA8IwZYtYxxAXI="; }; # Python 2.x is not supported. diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index 0d00eaa22dd2f..6d6accc642a8b 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "gtimelog"; version = "unstable-2020-05-16"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/development/python-modules/gtts-token/default.nix b/pkgs/development/python-modules/gtts-token/default.nix index 7785a449d4e89..da46799ec7809 100644 --- a/pkgs/development/python-modules/gtts-token/default.nix +++ b/pkgs/development/python-modules/gtts-token/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "gtts-token"; version = "1.1.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "boudewijn26"; diff --git a/pkgs/development/python-modules/gudhi/default.nix b/pkgs/development/python-modules/gudhi/default.nix index 1e0932e62867d..8989320fdf4b8 100644 --- a/pkgs/development/python-modules/gudhi/default.nix +++ b/pkgs/development/python-modules/gudhi/default.nix @@ -5,7 +5,7 @@ , boost , eigen , gmp -, cgal_5 # see https://github.com/NixOS/nixpkgs/pull/94875 about cgal +, cgal # see https://github.com/NixOS/nixpkgs/pull/94875 about cgal , mpfr , tbb , numpy @@ -20,6 +20,7 @@ buildPythonPackage rec { pname = "gudhi"; version = "3.8.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "GUDHI"; @@ -32,7 +33,7 @@ buildPythonPackage rec { patches = [ ./remove_explicit_PYTHONPATH.patch ]; nativeBuildInputs = [ cmake numpy cython pybind11 matplotlib ]; - buildInputs = [ boost eigen gmp cgal_5 mpfr ] + buildInputs = [ boost eigen gmp cgal mpfr ] ++ lib.optionals enableTBB [ tbb ]; propagatedBuildInputs = [ numpy scipy ]; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/guestfs/default.nix b/pkgs/development/python-modules/guestfs/default.nix index 68401e9ea4d97..ddc456171eb4b 100644 --- a/pkgs/development/python-modules/guestfs/default.nix +++ b/pkgs/development/python-modules/guestfs/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "guestfs"; version = "1.40.1"; + format = "setuptools"; src = fetchurl { url = "http://download.libguestfs.org/python/guestfs-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix index 7cd557d394ef1..a8d382310d605 100644 --- a/pkgs/development/python-modules/guidance/default.nix +++ b/pkgs/development/python-modules/guidance/default.nix @@ -2,6 +2,10 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder +, pybind11 +, setuptools +, wheel , aiohttp , diskcache , gptcache @@ -9,9 +13,9 @@ , nest-asyncio , numpy , openai +, ordered-set , platformdirs -, pygtrie -, pyparsing +, pyformlang , requests , tiktoken , torch @@ -19,16 +23,24 @@ buildPythonPackage rec { pname = "guidance"; - version = "0.0.64"; - format = "setuptools"; + version = "0.1.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "microsoft"; + owner = "guidance-ai"; repo = "guidance"; rev = "refs/tags/${version}"; - hash = "sha256-tQpDJprxctKI88F+CZ9aSJbVo7tjmI4+VrI+WO4QlxE="; + hash = "sha256-Z3EuHAQPPXf/i0HnbDhGv5KBUBP0aZDHTwpff7g2E3g="; }; + nativeBuildInputs = [ + pybind11 + setuptools + wheel + ]; + propagatedBuildInputs = [ aiohttp diskcache @@ -37,9 +49,9 @@ buildPythonPackage rec { nest-asyncio numpy openai + ordered-set platformdirs - pygtrie - pyparsing + pyformlang requests tiktoken ]; @@ -51,17 +63,21 @@ buildPythonPackage rec { disabledTests = [ # require network access - "test_each_parallel_with_gen_openai" + "test_select_simple" + "test_commit_point" + "test_token_healing" + "test_fstring" + "test_fstring_custom" + "test_token_count" + "test_gpt2" + "test_recursion_error" + "test_openai_class_detection" + "test_openai_chat_without_roles" ]; disabledTestPaths = [ # require network access "tests/library/test_gen.py" - "tests/library/test_include.py" - "tests/library/test_select.py" - "tests/llms/test_openai.py" - "tests/llms/test_transformers.py" - "tests/test_program.py" ]; preCheck = '' @@ -72,8 +88,8 @@ buildPythonPackage rec { meta = with lib; { description = "A guidance language for controlling large language models"; - homepage = "https://github.com/microsoft/guidance"; - changelog = "https://github.com/microsoft/guidance/releases/tag/${src.rev}"; + homepage = "https://github.com/guidance-ai/guidance"; + changelog = "https://github.com/guidance-ai/guidance/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 23bfaae0d2bdb..9a425be27878a 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -43,5 +43,6 @@ buildPythonPackage rec { description = "gunicorn 'Green Unicorn' is a WSGI HTTP Server for UNIX, fast clients and sleepy applications"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "gunicorn"; }; } diff --git a/pkgs/development/python-modules/guppy3/default.nix b/pkgs/development/python-modules/guppy3/default.nix index 65d7c2622a8ef..5c102f10a5517 100644 --- a/pkgs/development/python-modules/guppy3/default.nix +++ b/pkgs/development/python-modules/guppy3/default.nix @@ -7,14 +7,15 @@ buildPythonPackage rec { pname = "guppy3"; - version = "3.1.4"; - disabled = pythonOlder "3.6"; + version = "3.1.4.post1"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "zhuyifei1999"; repo = pname; - rev = "v${version}"; - hash = "sha256-RMWIP4tVSCCEQpr0kZvsN1HwL6rBcLuubfBl175eSNg="; + rev = "refs/tags/v${version}"; + hash = "sha256-HHy57P6WEHZKygAbdjEh6XAApFlQueiYGr02eSQMWfc="; }; propagatedBuildInputs = [ tkinter ]; diff --git a/pkgs/development/python-modules/gym-notices/default.nix b/pkgs/development/python-modules/gym-notices/default.nix index 6c6d97a459aca..5b48ea524347d 100644 --- a/pkgs/development/python-modules/gym-notices/default.nix +++ b/pkgs/development/python-modules/gym-notices/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "gym-notices"; version = "0.0.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 56bbe2b9e80b8..e7d4c9f4a4119 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "gym"; version = "0.26.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "openai"; diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index 385f28b4615ad..81726be3ca6cf 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -9,6 +9,7 @@ buildPythonPackage { pname = "gyp"; version = "unstable-2022-04-01"; + format = "setuptools"; src = fetchFromGitiles { url = "https://chromium.googlesource.com/external/gyp"; diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index 872ef1ab4358c..a03c7b0ea4778 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "h11"; version = "0.14.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index eb9af29bbb0c9..f5413e5448432 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "h3"; version = "3.7.6"; + format = "setuptools"; # pypi version does not include tests src = fetchFromGitHub { @@ -49,7 +50,7 @@ buildPythonPackage rec { prePatch = let cmakeCommands = '' - include_directories(${h3}/include/h3) + include_directories(${lib.getDev h3}/include/h3) link_directories(${h3}/lib) ''; in '' diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix index db4e84d136155..7462624b93d40 100644 --- a/pkgs/development/python-modules/habitipy/default.nix +++ b/pkgs/development/python-modules/habitipy/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "habitipy"; version = "0.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ASMfreaK"; diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix new file mode 100644 index 0000000000000..62a2bbff0ba06 --- /dev/null +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, poetry-core +, setuptools +, wheel +, bleak +, pytestCheckHook +, bleak-retry-connector +, bluetooth-adapters +, bluetooth-auto-recovery +, bluetooth-data-tools +, home-assistant-bluetooth +, pythonOlder +}: + +buildPythonPackage rec { + pname = "habluetooth"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = "habluetooth"; + rev = "refs/tags/v${version}"; + hash = "sha256-JoSvI6L/hs6lZ1R3MEq1mPiJJf7JQahFd3d+PLqN2lw="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=habluetooth --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + cython + poetry-core + setuptools + wheel + ]; + + propagatedBuildInputs = [ + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + home-assistant-bluetooth + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "habluetooth" + ]; + + meta = with lib; { + description = "Library for high availability Bluetooth"; + homepage = "https://github.com/Bluetooth-Devices/habluetooth"; + changelog = "https://github.com/Bluetooth-Devices/habluetooth/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/hachoir/default.nix b/pkgs/development/python-modules/hachoir/default.nix index 0de262ab7b43d..4480dd8932758 100644 --- a/pkgs/development/python-modules/hachoir/default.nix +++ b/pkgs/development/python-modules/hachoir/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hachoir"; - version = "3.2.0"; + version = "3.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vstinner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BRrb6bnPSDVjZF1cOA9NlUYd2HrtqZEAVhHgkjmE0Xg="; + hash = "sha256-sTUJx8Xyhw4Z6juRtREw/okuVjSTSVWpSLKeZ7T8IR8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index bd92a27122282..5a01f5246f85b 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "hacking"; version = "6.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index e69d518870506..bbaa5347dff7b 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.11.4"; + version = "2023.12.4"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LB0BGj/DWjHGAFkyACkkzGY1oYNc7hJ2BeT1lHlNjqU="; + hash = "sha256-IsRHJyFgoS7vfr/QcfzplsmFHMRRtLXVqU7bhL/fFto="; }; postPatch = '' diff --git a/pkgs/development/python-modules/halo/default.nix b/pkgs/development/python-modules/halo/default.nix index bd1d5f7263637..cc1d3022fcb83 100644 --- a/pkgs/development/python-modules/halo/default.nix +++ b/pkgs/development/python-modules/halo/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "halo"; version = "0.0.31"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/handout/default.nix b/pkgs/development/python-modules/handout/default.nix index 316c9a6edcac4..b42a8f018a302 100644 --- a/pkgs/development/python-modules/handout/default.nix +++ b/pkgs/development/python-modules/handout/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "handout"; version = "1.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index e27ef7ffce6b4..edb90b477d0e9 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -7,6 +7,7 @@ , ciso8601 , cryptography , fetchFromGitHub +, fetchpatch , pycognito , pytest-aiohttp , pytest-timeout @@ -32,12 +33,13 @@ buildPythonPackage rec { hash = "sha256-r4Huvn9mBqnASpUd+drwORE+fApLV/l6Y3aO/UIiEC8="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "acme==" "acme>=" \ - --replace "pycognito==" "pycognito>=" \ - --replace "snitun==" "snitun>=" \ - ''; + patches = [ + (fetchpatch { + # Add missing wait_for_close mock in AiohttpClientMockResponse + url = "https://github.com/NabuCasa/hass-nabucasa/commit/097607e0fe30932ca5cba0c50fda125f90f5f3de.patch"; + hash = "sha256-ZSh+1kGBb6ltNnd0RaDECXiJDEGJBOw1wN2HXPgfy+o="; + }) + ]; nativeBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index 6059ce3cb5e6a..65b97fd7c485a 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -4,8 +4,8 @@ , pythonOlder # propagates -, importlib-resources , pyyaml +, unicode-rbnf # tests , pytestCheckHook @@ -13,21 +13,22 @@ let pname = "hassil"; - version = "1.2.5"; + version = "1.5.1"; in buildPythonPackage { inherit pname version; format = "setuptools"; + disabled = pythonOlder "3.9"; + src = fetchPypi { inherit pname version; - hash = "sha256-udOkZILoba2+eR8oSFThsB846COaIXawwRYhn261mCA="; + hash = "sha256-GLvDT8BUBvEzgiqKaXokF912g3fOH+KsXnmeOXIwe9U="; }; propagatedBuildInputs = [ pyyaml - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources + unicode-rbnf ]; nativeCheckInputs = [ @@ -35,7 +36,7 @@ buildPythonPackage { ]; meta = with lib; { - changelog = "https://github.com/home-assistant/hassil/releases/tag/v${version}"; + changelog = "https://github.com/home-assistant/hassil/blob/v${version}/CHANGELOG.md"; description = "Intent parsing for Home Assistant"; homepage = "https://github.com/home-assistant/hassil"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index f8e45949dbe7b..6dcd50f3c46a5 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -2,14 +2,15 @@ , attrs , buildPythonPackage , fetchFromGitHub -, voluptuous , pythonOlder +, setuptools +, voluptuous }: buildPythonPackage rec { pname = "hatasmota"; - version = "0.7.3"; - format = "setuptools"; + version = "0.8.0"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-lsb92JsqIhq7zaNaolgV8dtSFIq+Enklb6hlBvT7/Ig="; + hash = "sha256-Kbz/ETSJGx6u0ZNfEWfl9klBIB3yPcfHGy1uKK50TGA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs voluptuous diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix index 7afb4eefa060e..9df850b788297 100644 --- a/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/pkgs/development/python-modules/hawkauthlib/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "hawkauthlib"; version = "0.1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "mozilla-services"; diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 1e460fa3c7fae..bc8de7d679727 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.32.0"; + version = "1.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vX85fDFNGJ8zJe6YCPn7VFOdvPkT35VbM3Do+cP2b/Y="; + hash = "sha256-xkANXrFG6Tm/fz9Hnutga1q4uw43xaAT1rlmUbTag/g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix index 4e6931f0e339f..5deb7c35acdeb 100644 --- a/pkgs/development/python-modules/hcs_utils/default.nix +++ b/pkgs/development/python-modules/hcs_utils/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "hcs_utils"; version = "2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 50218663c43bf..0c6acf729f692 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "hdbscan"; version = "0.8.33"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hdfs/default.nix b/pkgs/development/python-modules/hdfs/default.nix index 9b9268c13eac9..2217ee5567cfc 100644 --- a/pkgs/development/python-modules/hdfs/default.nix +++ b/pkgs/development/python-modules/hdfs/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "hdfs"; version = "2.7.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "mtth"; diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix index 59ca3e5b61172..f2342aebfe011 100644 --- a/pkgs/development/python-modules/hdmedians/default.nix +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "0.14.2"; + format = "setuptools"; pname = "hdmedians"; src = fetchPypi { diff --git a/pkgs/development/python-modules/helpdev/default.nix b/pkgs/development/python-modules/helpdev/default.nix index 34b4d6974478c..b03b3320153ca 100644 --- a/pkgs/development/python-modules/helpdev/default.nix +++ b/pkgs/development/python-modules/helpdev/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "helpdev"; version = "0.7.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix index d1e38dfbab9e0..7d55d498d5d47 100644 --- a/pkgs/development/python-modules/helper/default.nix +++ b/pkgs/development/python-modules/helper/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "helper"; version = "2.5.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "gmr"; diff --git a/pkgs/development/python-modules/hetzner/default.nix b/pkgs/development/python-modules/hetzner/default.nix index 4264183e5f531..ea29c27563d84 100644 --- a/pkgs/development/python-modules/hetzner/default.nix +++ b/pkgs/development/python-modules/hetzner/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "hetzner"; version = "0.8.3"; + format = "setuptools"; src = fetchFromGitHub { repo = "hetzner"; diff --git a/pkgs/development/python-modules/hexdump/default.nix b/pkgs/development/python-modules/hexdump/default.nix index c00d7d5b4680b..7ebf919038b25 100644 --- a/pkgs/development/python-modules/hexdump/default.nix +++ b/pkgs/development/python-modules/hexdump/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "hexdump"; version = "3.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hfst/default.nix b/pkgs/development/python-modules/hfst/default.nix index b865c4c84d63b..8b720c12a9a94 100644 --- a/pkgs/development/python-modules/hfst/default.nix +++ b/pkgs/development/python-modules/hfst/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "hfst"; + format = "setuptools"; inherit (pkgs.hfst) version src; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index cfb79f88b72ae..a9d5fb12596e2 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "hg-evolve"; version = "11.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index 26f04edbc0242..e2b8420911539 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hg-git"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WoQOh6cKFcnB4GGWvD7VlV53LxHpsYA+iMDJ9VrwNBY="; + hash = "sha256-HuFwRW/SuGrzMX9bttdqztFRB19dZZNF5Y8+e9gAQWw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hid/default.nix b/pkgs/development/python-modules/hid/default.nix index eeade4606c8bd..c87d63feb1bb4 100644 --- a/pkgs/development/python-modules/hid/default.nix +++ b/pkgs/development/python-modules/hid/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "hid"; version = "1.0.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 6805afc7c77c4..9b4e76186f262 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "hidapi"; version = "0.14.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index d7fa9af5efaef..d2f3168a76a1d 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "hieroglyph"; version = "2.1.0"; + format = "setuptools"; disabled = isPy27; # python2 compatible sphinx is too low src = fetchPypi { diff --git a/pkgs/development/python-modules/hikvision/default.nix b/pkgs/development/python-modules/hikvision/default.nix index 07224c6274215..23f6387853a82 100644 --- a/pkgs/development/python-modules/hikvision/default.nix +++ b/pkgs/development/python-modules/hikvision/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "hikvision"; version = "2.0.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "fbradyirl"; diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix index 9eefc61dbfb99..2656c13274ba4 100644 --- a/pkgs/development/python-modules/hiro/default.nix +++ b/pkgs/development/python-modules/hiro/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { pname = "hiro"; version = "1.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hiyapyco/default.nix b/pkgs/development/python-modules/hiyapyco/default.nix index fa55f03d46698..72b206e297c8f 100644 --- a/pkgs/development/python-modules/hiyapyco/default.nix +++ b/pkgs/development/python-modules/hiyapyco/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "hiyapyco"; version = "0.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "zerwes"; diff --git a/pkgs/development/python-modules/hjson/default.nix b/pkgs/development/python-modules/hjson/default.nix index cd48fcd6187e3..b43d51afaa4e8 100644 --- a/pkgs/development/python-modules/hjson/default.nix +++ b/pkgs/development/python-modules/hjson/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "hjson"; version = "3.0.2"; + format = "setuptools"; # N.B. pypi src tarball does not have tests src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/hkdf/default.nix b/pkgs/development/python-modules/hkdf/default.nix index c972104f2c3d4..e82489fd12fd0 100644 --- a/pkgs/development/python-modules/hkdf/default.nix +++ b/pkgs/development/python-modules/hkdf/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "hkdf"; version = "0.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hlk-sw16/default.nix b/pkgs/development/python-modules/hlk-sw16/default.nix index d013664ad25fb..0674829a7af6e 100644 --- a/pkgs/development/python-modules/hlk-sw16/default.nix +++ b/pkgs/development/python-modules/hlk-sw16/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "hlk-sw16"; version = "0.0.9"; + format = "setuptools"; src = fetchFromGitHub { owner = "jameshilliard"; diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix index cfbf63a5869d0..d5886a8893db6 100644 --- a/pkgs/development/python-modules/hocr-tools/default.nix +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "hocr-tools"; version = "1.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "tmbdev"; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 31d9423ebcde3..309a08ad90e90 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.37"; + version = "0.39"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "dr-prodigy"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-3IhyHLwTPLTcyZY/9dZFmIr7Ael8I3mZrXhqYaULwY8="; + hash = "sha256-PsrdR4voEAiEhgoeR03Xp/tacqtcEt1FhO4kfMYkSos="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 47f30ce2fc208..132d01fa355cd 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.18.0"; + version = "1.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-urcpYat6GHlNsmk1HZBVI/Kq3K1ZOzIVEpJ86T3J35E="; + hash = "sha256-gFxzU65S6XdT5/BmiwUaCGQQ4tLBPI/ilOu0zdArIyQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/homepluscontrol/default.nix b/pkgs/development/python-modules/homepluscontrol/default.nix index dfb255661eb99..1e33118b191e7 100644 --- a/pkgs/development/python-modules/homepluscontrol/default.nix +++ b/pkgs/development/python-modules/homepluscontrol/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "homepluscontrol"; version = "0.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/hopcroftkarp/default.nix b/pkgs/development/python-modules/hopcroftkarp/default.nix index ae09ccfdf9f2f..9386bdd861fc2 100644 --- a/pkgs/development/python-modules/hopcroftkarp/default.nix +++ b/pkgs/development/python-modules/hopcroftkarp/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "hopcroftkarp"; version = "1.2.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hpack/default.nix b/pkgs/development/python-modules/hpack/default.nix index ba819ba3882cd..1b45fc67d62ee 100644 --- a/pkgs/development/python-modules/hpack/default.nix +++ b/pkgs/development/python-modules/hpack/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "hpack"; version = "4.0.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/hpccm/default.nix b/pkgs/development/python-modules/hpccm/default.nix index 29f3234faadfc..99a0c42b8fa85 100644 --- a/pkgs/development/python-modules/hpccm/default.nix +++ b/pkgs/development/python-modules/hpccm/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "hpccm"; version = "22.10.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "NVIDIA"; diff --git a/pkgs/development/python-modules/hs-dbus-signature/default.nix b/pkgs/development/python-modules/hs-dbus-signature/default.nix index ebf8de2f56682..9b96788589517 100644 --- a/pkgs/development/python-modules/hs-dbus-signature/default.nix +++ b/pkgs/development/python-modules/hs-dbus-signature/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "hs-dbus-signature"; version = "0.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hsaudiotag3k/default.nix b/pkgs/development/python-modules/hsaudiotag3k/default.nix index 66ea895960c97..8fd245d17868d 100644 --- a/pkgs/development/python-modules/hsaudiotag3k/default.nix +++ b/pkgs/development/python-modules/hsaudiotag3k/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "hsaudiotag3k"; version = "1.1.3.post1"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/hsluv/default.nix b/pkgs/development/python-modules/hsluv/default.nix index 27701da88914c..9ddf64330770d 100644 --- a/pkgs/development/python-modules/hsluv/default.nix +++ b/pkgs/development/python-modules/hsluv/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "hsluv"; version = "5.0.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/html-text/default.nix b/pkgs/development/python-modules/html-text/default.nix index c7b4ec2366024..00d2fb426d381 100644 --- a/pkgs/development/python-modules/html-text/default.nix +++ b/pkgs/development/python-modules/html-text/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "html-text"; version = "0.5.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "TeamHG-Memex"; diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index 95698872a08fe..37843196c9cbe 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "html2text"; version = "2020.1.16"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index f069aee87666b..b35cfee63dad7 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "html5lib"; version = "1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/htmllaundry/default.nix b/pkgs/development/python-modules/htmllaundry/default.nix index e844c99693a29..0c7a3b8df81ab 100644 --- a/pkgs/development/python-modules/htmllaundry/default.nix +++ b/pkgs/development/python-modules/htmllaundry/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "htmllaundry"; version = "2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index e91aedc6cdb15..9be7dd90abd6d 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "htmlmin"; version = "0.1.12"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "50c1ef4630374a5d723900096a961cff426dff46b48f34d194a81bbe14eca178"; diff --git a/pkgs/development/python-modules/htseq/default.nix b/pkgs/development/python-modules/htseq/default.nix index 5c369d7f06a82..9d69a8bfef542 100644 --- a/pkgs/development/python-modules/htseq/default.nix +++ b/pkgs/development/python-modules/htseq/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: buildPythonPackage rec { version = "0.12.4"; + format = "setuptools"; pname = "htseq"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index f48cdbd1ff456..a305ec1f7baf5 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "httmock"; version = "1.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "patrys"; diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix index a7d4240db1439..032830d539651 100644 --- a/pkgs/development/python-modules/httpauth/default.nix +++ b/pkgs/development/python-modules/httpauth/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "0.3"; + format = "setuptools"; pname = "httpauth"; src = fetchPypi { diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index aeab2d9e00a6f..ecde40353f316 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "httpretty"; version = "1.1.4"; + format = "setuptools"; # drop this for version > 0.9.7 # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix index 830e0c9b1bf2d..58d6c48c4e8a8 100644 --- a/pkgs/development/python-modules/httpserver/default.nix +++ b/pkgs/development/python-modules/httpserver/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "httpserver"; version = "1.1.0"; + format = "setuptools"; buildInputs = [ docopt ]; diff --git a/pkgs/development/python-modules/httpsig/default.nix b/pkgs/development/python-modules/httpsig/default.nix index accc731eeadf8..f1529bf212da2 100644 --- a/pkgs/development/python-modules/httpsig/default.nix +++ b/pkgs/development/python-modules/httpsig/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "httpsig"; version = "1.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix index afeb128e2048e..46dfab1cd52c4 100644 --- a/pkgs/development/python-modules/hug/default.nix +++ b/pkgs/development/python-modules/hug/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "hug"; version = "2.6.0"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/huisbaasje-client/default.nix b/pkgs/development/python-modules/huisbaasje-client/default.nix index 56e44209676c0..1a9cfddd8661c 100644 --- a/pkgs/development/python-modules/huisbaasje-client/default.nix +++ b/pkgs/development/python-modules/huisbaasje-client/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "huisbaasje-client"; version = "0.1.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/human-readable/default.nix b/pkgs/development/python-modules/human-readable/default.nix new file mode 100644 index 0000000000000..3c67a04b143a0 --- /dev/null +++ b/pkgs/development/python-modules/human-readable/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchPypi +, buildPythonPackage +, hatchling +, hatch-vcs +}: + +buildPythonPackage rec { + pname = "human-readable"; + version = "1.3.4"; + + src = fetchPypi { + pname = "human_readable"; + inherit version; + hash = "sha256-VybqyJBm7CXRREehc+ZFqFUYRkXQJOswZwXiv7tg8MA="; + }; + + pyproject = true; + + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + meta = with lib; { + description = "Library to make data intended for machines, readable to humans"; + homepage = "https://github.com/staticdev/human-readable"; + license = licenses.mit; + maintainers = with maintainers; [ + mkg20001 + ]; + }; +} diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index 77f0c75e01039..5d0dbd1763da4 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "humanfriendly"; version = "10.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/humblewx/default.nix b/pkgs/development/python-modules/humblewx/default.nix index a134981485c65..1cb4a7a1686ae 100644 --- a/pkgs/development/python-modules/humblewx/default.nix +++ b/pkgs/development/python-modules/humblewx/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "humblewx"; version = "0.2.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "thetimelineproj"; diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 11f37dcac28e7..b0650310cc14f 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "hupper"; version = "1.12"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 6fe3968971148..5f15e359f35e2 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "1.2.1"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-x4bj36HzUjmBDlMXzMrb41j0m4yQAaHy9ot5olC5+KE="; + hash = "sha256-alHLmg0i/hPoJMsLChzi7qy5zmr2i30bZoniXsG+yvU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 5047eb68ea96d..29a14301ffd6c 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-BkxnV90QxJjQYqN0DdjGbjPmNDaDN9hUBjO7nQte7eg="; + hash = "sha256-KB0YmiEtJkGT9446k079oWqTwBZMSFTakzW0LuBlazo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hydrawiser/default.nix b/pkgs/development/python-modules/hydrawiser/default.nix index 76239f7876c61..f04509d0854cf 100644 --- a/pkgs/development/python-modules/hydrawiser/default.nix +++ b/pkgs/development/python-modules/hydrawiser/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "hydrawiser"; version = "0.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix index 1f69dfe21062a..58a1c3dffdc82 100644 --- a/pkgs/development/python-modules/hypchat/default.nix +++ b/pkgs/development/python-modules/hypchat/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "hypchat"; version = "0.21"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hyperframe/default.nix b/pkgs/development/python-modules/hyperframe/default.nix index d4d45fa2e7754..e42ee0a46f684 100644 --- a/pkgs/development/python-modules/hyperframe/default.nix +++ b/pkgs/development/python-modules/hyperframe/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "hyperframe"; version = "6.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index 21927683b18b9..1b617cf1b7c9e 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "hyperlink"; version = "21.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 709c7180f004e..8b2d73f68c5af 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "hyppo"; version = "0.4.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 6c6e7983b7c33..046823d23c43f 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -4,13 +4,14 @@ buildPythonPackage rec { pname = "i-pi"; - version = "2.4.0"; + version = "2.6.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "i-pi"; repo = "i-pi"; - rev = "v${version}"; - sha256 = "0d0ag57aa0fsqjwya27fyj8alimjvlxzgh6hxjqy1k4ap9h3n1cy"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-c1bs8ZI/dfDwKx5Df8ndtsDxESQrdbMkvrjfI6b9JTg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/i2c-tools/default.nix b/pkgs/development/python-modules/i2c-tools/default.nix index 60af11e241984..fd2fdaba347ca 100644 --- a/pkgs/development/python-modules/i2c-tools/default.nix +++ b/pkgs/development/python-modules/i2c-tools/default.nix @@ -6,6 +6,8 @@ buildPythonPackage rec { inherit (i2c-tools) pname version src; + format = "setuptools"; + buildInputs = [ i2c-tools ]; preConfigure = "cd py-smbus"; diff --git a/pkgs/development/python-modules/i2csense/default.nix b/pkgs/development/python-modules/i2csense/default.nix index 475e77c218410..064a1e792f423 100644 --- a/pkgs/development/python-modules/i2csense/default.nix +++ b/pkgs/development/python-modules/i2csense/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "i2csense"; version = "0.0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/i3-py/default.nix b/pkgs/development/python-modules/i3-py/default.nix index 312c1bb45c70d..83a0dd8d2700e 100644 --- a/pkgs/development/python-modules/i3-py/default.nix +++ b/pkgs/development/python-modules/i3-py/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "0.6.4"; + format = "setuptools"; pname = "i3-py"; src = fetchPypi { diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index ee3b4252296ca..5aca692cbe058 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "i3ipc"; version = "2.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "acrisci"; diff --git a/pkgs/development/python-modules/iapws/default.nix b/pkgs/development/python-modules/iapws/default.nix index 33c3b5073fd75..8e2e3fd07a81d 100644 --- a/pkgs/development/python-modules/iapws/default.nix +++ b/pkgs/development/python-modules/iapws/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "iapws"; version = "1.5.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 9aac09e8bff30..efa362c6fdd0b 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.18.0"; + version = "3.18.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vytpQHYZcMFLU/yPwTWvVnxYuXCdsyFL5AOjg91Ryrs="; + hash = "sha256-0gjISrKELopSMEuZHL8fy8q7rMuMqzATkP+c4Y8I+9A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index b0ae3c59c6b88..d95a34fbbc849 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "ical"; - version = "6.1.0"; + version = "6.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1tf/R9CridAdNkS6/G0C1v+lZghS7WV5MVnVuBv1zvI="; + hash = "sha256-pFmJYXIhc9jhpc9ZjSNaol5h5Jb8ZvxuQsQL/2Rjryc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix new file mode 100644 index 0000000000000..f8f211b65993c --- /dev/null +++ b/pkgs/development/python-modules/icalevents/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, poetry-core +, datetime +, httplib2 +, icalendar +, python-dateutil +, pytz +}: + +buildPythonPackage rec { + pname = "icalevents"; + version = "0.1.27"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "jazzband"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-vSYQEJFBjXUF4WwEAtkLtcO3y/am00jGS+8Vj+JMMqQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + datetime + httplib2 + icalendar + python-dateutil + pytz + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Makes HTTP calls + "test_events_url" + "test_events_async_url" + ]; + + pythonImportsCheck = [ "icalevents" ]; + + meta = with lib; { + changelog = "https://github.com/jazzband/icalevents/releases/tag/v${version}"; + description = "Python module for iCal URL/file parsing and querying"; + homepage = "https://github.com/jazzband/icalevents"; + maintainers = with maintainers; [ jamiemagee ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix index a12b4c4c0a85f..601a55e80f6e9 100644 --- a/pkgs/development/python-modules/icecream/default.nix +++ b/pkgs/development/python-modules/icecream/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "icecream"; version = "2.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix index 5e963bd82e55f..0d42526c8ca98 100644 --- a/pkgs/development/python-modules/icmplib/default.nix +++ b/pkgs/development/python-modules/icmplib/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "icmplib"; version = "3.0.4"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/icoextract/default.nix b/pkgs/development/python-modules/icoextract/default.nix index e050dd9b9406c..beb39a32aa393 100644 --- a/pkgs/development/python-modules/icoextract/default.nix +++ b/pkgs/development/python-modules/icoextract/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "icoextract"; version = "0.1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index 9f2665b59f194..7b732d589fc00 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "ics"; version = "0.7.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/id/default.nix b/pkgs/development/python-modules/id/default.nix index c4b59268b4bcc..f2e6bbf7579b7 100644 --- a/pkgs/development/python-modules/id/default.nix +++ b/pkgs/development/python-modules/id/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "id"; - version = "1.1.0"; + version = "1.2.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "di"; repo = "id"; rev = "refs/tags/v${version}"; - hash = "sha256-T3p13EnXU1Efysnu1RQw5st1BgHyZNdrKtkzQSguRtM="; + hash = "sha256-njX4kL8pCv6+SyYUtmzUh/BWWsaueKO+IiJ96sAXMVo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix index 7e9c67634976d..3f28e9a6774a6 100644 --- a/pkgs/development/python-modules/idasen/default.nix +++ b/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.10.3"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "refs/tags/v${version}"; - hash = "sha256-mAczHrFEH1LEH1IEUc7ZXTWtaPBrvIdSvkUqOCupyRs="; + hash = "sha256-ybM3dQhTogjhtIO5daWMXpnxUM7uWYnKONMOEx3u+58="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index d754f90318cfb..f2ce179d65bd0 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.32"; + version = "2.5.33"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fKcxK11IxC0wmpPdyGzYQViSW2rx1v9Bvc+uBvGT8kE="; + hash = "sha256-v0k+N/E1xzhL2iWM0HQzYCxHfzuP8Za4eupkofN7bAA="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix index ba11a39f5d9c3..a26aecb49d047 100644 --- a/pkgs/development/python-modules/idna-ssl/default.nix +++ b/pkgs/development/python-modules/idna-ssl/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "idna-ssl"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index 77f6283e4be34..2f5d8e202dba1 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "0.2.0"; + format = "setuptools"; pname = "ifaddr"; src = fetchPypi { diff --git a/pkgs/development/python-modules/ifconfig-parser/default.nix b/pkgs/development/python-modules/ifconfig-parser/default.nix index be4e2026bf10a..0a7013066b603 100644 --- a/pkgs/development/python-modules/ifconfig-parser/default.nix +++ b/pkgs/development/python-modules/ifconfig-parser/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ifconfig-parser"; version = "0.0.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "KnightWhoSayNi"; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 853405d0476ff..09ebca60e5de5 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "ignite"; version = "0.4.13"; + format = "setuptools"; src = fetchFromGitHub { owner = "pytorch"; diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index b56459317f34c..1dfcec78bbda5 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ihm"; - version = "0.41"; + version = "0.43"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-weeOizVWFcOxD45QsvEaoknTofZjglCvidyvXpyRKwc="; + hash = "sha256-6tjIxe3JYvtWG5z4ltrkUSTxh1q2BDq2I2siYt7dCF8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 99184c0467191..dd490f3707834 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "ijson"; version = "3.2.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -38,6 +39,5 @@ buildPythonPackage rec { homepage = "https://github.com/ICRAR/ijson"; changelog = "https://github.com/ICRAR/ijson/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ rvl ]; }; } diff --git a/pkgs/development/python-modules/image-go-nord/default.nix b/pkgs/development/python-modules/image-go-nord/default.nix index ff7c654c9ea3a..4daa574e79e75 100644 --- a/pkgs/development/python-modules/image-go-nord/default.nix +++ b/pkgs/development/python-modules/image-go-nord/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "image-go-nord"; version = "0.1.7"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/pkgs/development/python-modules/imagecodecs-lite/default.nix index a9cec8bb50c1e..cef23d308f4b5 100644 --- a/pkgs/development/python-modules/imagecodecs-lite/default.nix +++ b/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "imagecodecs-lite"; version = "2019.12.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index 64da1392047d9..5642812f80401 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "imagecorruptions"; version = "1.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/imagehash/default.nix b/pkgs/development/python-modules/imagehash/default.nix index b65053c56ead0..e2e20b4f6c276 100644 --- a/pkgs/development/python-modules/imagehash/default.nix +++ b/pkgs/development/python-modules/imagehash/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "imagehash"; version = "4.3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "JohannesBuchner"; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index ec4e3a3b749a2..cb291c1577e87 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.33.0"; + version = "2.33.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "imageio"; repo = "imageio"; rev = "refs/tags/v${version}"; - hash = "sha256-WoCycrJxo0vyV9LiWnEag1wbld3EJWu8mks8TnYt2+A="; + hash = "sha256-1Q1KKQmla/iHb5KbJZZmkpBT2j9uIwy8YDAJ7qDDC4Q="; }; patches = lib.optionals (!stdenv.isDarwin) [ diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix index e1d390a8c1fc4..ab41410b7ad84 100644 --- a/pkgs/development/python-modules/imagesize/default.nix +++ b/pkgs/development/python-modules/imagesize/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "imagesize"; version = "1.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/imantics/default.nix b/pkgs/development/python-modules/imantics/default.nix index 2e10ca6cb3305..d6815f2a26ae3 100644 --- a/pkgs/development/python-modules/imantics/default.nix +++ b/pkgs/development/python-modules/imantics/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "imantics"; version = "0.1.12"; + format = "setuptools"; src = fetchFromGitHub { owner = "jsbroks"; diff --git a/pkgs/development/python-modules/imaplib2/default.nix b/pkgs/development/python-modules/imaplib2/default.nix index e6379c0af1dd0..7c4c215bfabbc 100644 --- a/pkgs/development/python-modules/imaplib2/default.nix +++ b/pkgs/development/python-modules/imaplib2/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "imaplib2"; version = "3.6"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index b93c304a5c7ee..1ef8fea6a1004 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "imbalanced-learn"; version = "0.11.0"; + format = "setuptools"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 3bfbb03fc6759..1a69525d84388 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -17,6 +17,7 @@ , numpy , poppler_utils , pytestCheckHook +, runCommand , scipy }: @@ -41,7 +42,10 @@ buildPythonPackage rec { srgbProfile = if stdenv.isDarwin then "/System/Library/ColorSync/Profiles/sRGB Profile.icc" else - "${colord}/share/color/icc/colord/sRGB.icc"; + # break runtime dependency chain all of colord dependencies + runCommand "sRGC.icc" { } '' + cp ${colord}/share/color/icc/colord/sRGB.icc $out + ''; }) (fetchpatch { # https://gitlab.mister-muffin.de/josch/img2pdf/issues/178 diff --git a/pkgs/development/python-modules/imgsize/default.nix b/pkgs/development/python-modules/imgsize/default.nix index a8f50cd8f326e..fe08f4f7288fe 100644 --- a/pkgs/development/python-modules/imgsize/default.nix +++ b/pkgs/development/python-modules/imgsize/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "imgsize"; version = "2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "ojii"; diff --git a/pkgs/development/python-modules/imia/default.nix b/pkgs/development/python-modules/imia/default.nix new file mode 100644 index 0000000000000..b5b855c92d742 --- /dev/null +++ b/pkgs/development/python-modules/imia/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, starlette +, fastapi +}: + +buildPythonPackage rec { + pname = "imia"; + version = "0.5.3"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-4CzevO7xgo8Hb1JHe/eGEtq/KCrJM0hV/7SRV2wmux8="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + starlette + fastapi + ]; + + # running the real tests would require sqlalchemy 1.4 and starsessions 1.x + doCheck = false; + pythonImportsCheck = [ "imia" ]; + + meta = with lib; { + description = "An authentication library for Starlette and FastAPI"; + changelog = "https://github.com/alex-oleshkevich/imia/releases/tag/v${version}"; + homepage = "https://github.com/alex-oleshkevich/imia"; + license = licenses.mit; + maintainers = teams.wdz.members; + }; +} diff --git a/pkgs/development/python-modules/importlab/default.nix b/pkgs/development/python-modules/importlab/default.nix index 8fd01ca7008e7..2d7fddb9e5db1 100644 --- a/pkgs/development/python-modules/importlab/default.nix +++ b/pkgs/development/python-modules/importlab/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "importlab"; version = "0.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix index 6e4c00c286e4a..a94b104094199 100644 --- a/pkgs/development/python-modules/importmagic/default.nix +++ b/pkgs/development/python-modules/importmagic/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "importmagic"; version = "0.1.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix index b655ddc470145..e9103831363bd 100644 --- a/pkgs/development/python-modules/imutils/default.nix +++ b/pkgs/development/python-modules/imutils/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "0.5.4"; + format = "setuptools"; pname = "imutils"; src = fetchPypi { diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index 3498b4935ce85..3b10dff45ca06 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -8,6 +8,7 @@ let incremental = buildPythonPackage rec { pname = "incremental"; version = "22.10.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/infinity/default.nix b/pkgs/development/python-modules/infinity/default.nix index 366572cedacba..8cf05e8111df8 100644 --- a/pkgs/development/python-modules/infinity/default.nix +++ b/pkgs/development/python-modules/infinity/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "infinity"; version = "1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index 01dd785e4184a..c09114e386e6d 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "inflection"; version = "0.5.1"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 5bc9ba395063c..8e0bd695c0f61 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.38.0"; + version = "1.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-oE0RPryuUJcy6HN3V2XIxipGYU41xrYMC7b0sGRfay8="; + hash = "sha256-cj3qeT5wE/RqrwOW1MV9sVG+khxyRAO5438omqbKbmY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index e270df9746d20..991dcb3203140 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "influxdb"; version = "5.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix index 0e9cb91ded9eb..c3b1edfb89d0d 100644 --- a/pkgs/development/python-modules/inifile/default.nix +++ b/pkgs/development/python-modules/inifile/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "inifile"; version = "0.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix index e4473c0bd1c17..16324612b2af6 100644 --- a/pkgs/development/python-modules/iniparse/default.nix +++ b/pkgs/development/python-modules/iniparse/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "iniparse"; version = "0.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/pkgs/development/python-modules/inotify-simple/default.nix index 8fdc7c4926c97..2d2100ddf7057 100644 --- a/pkgs/development/python-modules/inotify-simple/default.nix +++ b/pkgs/development/python-modules/inotify-simple/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "inotify-simple"; version = "1.3.5"; + format = "setuptools"; src = fetchPypi { pname = "inotify_simple"; diff --git a/pkgs/development/python-modules/inotify/default.nix b/pkgs/development/python-modules/inotify/default.nix index 64737035193bf..04ca13d5ec4f2 100644 --- a/pkgs/development/python-modules/inotify/default.nix +++ b/pkgs/development/python-modules/inotify/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "inotify"; version = "unstable-2020-08-27"; + format = "setuptools"; src = fetchFromGitHub { owner = "dsoprea"; diff --git a/pkgs/development/python-modules/inotifyrecursive/default.nix b/pkgs/development/python-modules/inotifyrecursive/default.nix index d0f81abaa47f7..63ff4ede039ae 100644 --- a/pkgs/development/python-modules/inotifyrecursive/default.nix +++ b/pkgs/development/python-modules/inotifyrecursive/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "inotifyrecursive"; version = "0.3.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/insegel/default.nix b/pkgs/development/python-modules/insegel/default.nix index 499d380675398..9fb9d9296ec2c 100644 --- a/pkgs/development/python-modules/insegel/default.nix +++ b/pkgs/development/python-modules/insegel/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "insegel"; version = "1.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/intake-parquet/default.nix b/pkgs/development/python-modules/intake-parquet/default.nix index c43db08d9fc9e..9ef6affb5119e 100644 --- a/pkgs/development/python-modules/intake-parquet/default.nix +++ b/pkgs/development/python-modules/intake-parquet/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "intake-parquet"; version = "0.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "intake"; diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix index 57b8fe75d404b..4e25fa8793b19 100644 --- a/pkgs/development/python-modules/intelhex/default.nix +++ b/pkgs/development/python-modules/intelhex/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "intelhex"; version = "2.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index 8c7a9f69d50e9..15045b4695c48 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "intellifire4py"; - version = "3.5.0"; + version = "3.6.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jeeftor"; - repo = pname; + repo = "intellifire4py"; rev = "refs/tags/v${version}"; - hash = "sha256-lbBQbcVhozca7gYkeUFClS+5WaPaTajQMdfqDL07xdk="; + hash = "sha256-ovJUL8Z98F6gyKG04CoOiQE5dJbp9yTVHcTgniJBvOw="; }; nativeBuildInputs = [ @@ -37,19 +37,20 @@ buildPythonPackage rec { rich ]; - pythonImportsCheck = [ - "intellifire4py" - ]; nativeCheckInputs = [ pytest-asyncio pytest-httpx pytestCheckHook ]; + pythonImportsCheck = [ + "intellifire4py" + ]; + meta = with lib; { description = "Module to read Intellifire fireplace status data"; homepage = "https://github.com/jeeftor/intellifire4py"; - changelog = "https://github.com/jeeftor/intellifire4py/blob/${version}/CHANGELOG"; + changelog = "https://github.com/jeeftor/intellifire4py/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index a9baf843076c7..797f24eee83af 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "3.5.0"; + version = "3.6.0"; format = "pyproject"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "jjjake"; repo = "internetarchive"; rev = "v${version}"; - hash = "sha256-apBzx1qMHEA0wiWh82sS7I+AaiMEoAchhPsrtAgujbQ="; + hash = "sha256-hy5e6DEAwLKn0l2nJD7fyW5r4ZZiH+fuTEDLQen+dNk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix index 62e021afdbbb0..41744b690fd96 100644 --- a/pkgs/development/python-modules/interruptingcow/default.nix +++ b/pkgs/development/python-modules/interruptingcow/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { pname = "interruptingcow"; version = "0.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index dca73a93e8f4c..8e80be209b23c 100644 --- a/pkgs/development/python-modules/intervaltree/default.nix +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { version = "3.1.0"; + format = "setuptools"; pname = "intervaltree"; src = fetchPypi { diff --git a/pkgs/development/python-modules/into-dbus-python/default.nix b/pkgs/development/python-modules/into-dbus-python/default.nix index ff5da5e459267..b7ea90b26f9d0 100644 --- a/pkgs/development/python-modules/into-dbus-python/default.nix +++ b/pkgs/development/python-modules/into-dbus-python/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "into-dbus-python"; version = "0.8.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "stratis-storage"; diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix index e3bee127b7b70..b47c18874a922 100644 --- a/pkgs/development/python-modules/iocapture/default.nix +++ b/pkgs/development/python-modules/iocapture/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "iocapture"; version = "0.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/iodata/default.nix b/pkgs/development/python-modules/iodata/default.nix index b81d7981a280c..748b7a14570c5 100644 --- a/pkgs/development/python-modules/iodata/default.nix +++ b/pkgs/development/python-modules/iodata/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "iodata"; version = "0.1.7"; + format = "setuptools"; src = fetchFromGitHub { owner = "theochem"; diff --git a/pkgs/development/python-modules/ionhash/default.nix b/pkgs/development/python-modules/ionhash/default.nix index 1b9455dbe821f..0eca4e663331a 100644 --- a/pkgs/development/python-modules/ionhash/default.nix +++ b/pkgs/development/python-modules/ionhash/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ionhash"; version = "1.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "amzn"; diff --git a/pkgs/development/python-modules/iowait/default.nix b/pkgs/development/python-modules/iowait/default.nix index dc8a1265f7a58..fe0a6a5f709a0 100644 --- a/pkgs/development/python-modules/iowait/default.nix +++ b/pkgs/development/python-modules/iowait/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "iowait"; version = "0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix index 41ef6faa7c37d..959d5c878f07d 100644 --- a/pkgs/development/python-modules/ipaddr/default.nix +++ b/pkgs/development/python-modules/ipaddr/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ipaddr"; version = "2.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/pkgs/development/python-modules/ipdbplugin/default.nix index c4e9e17988bf4..1dd69b112f560 100644 --- a/pkgs/development/python-modules/ipdbplugin/default.nix +++ b/pkgs/development/python-modules/ipdbplugin/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "ipdbplugin"; version = "1.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/iptools/default.nix b/pkgs/development/python-modules/iptools/default.nix index 3f2b854b6e7fe..fe400465382bc 100644 --- a/pkgs/development/python-modules/iptools/default.nix +++ b/pkgs/development/python-modules/iptools/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "0.7.0"; + format = "setuptools"; pname = "iptools"; src = fetchPypi { diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index df7fe7ac3fc26..e6f68a111ba8c 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "ipydatawidgets"; version = "4.3.5"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index d1b970c34a2eb..d96ab023c87f3 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -1,28 +1,35 @@ { lib +, stdenv , buildPythonPackage , callPackage , fetchPypi , hatchling , pythonOlder +, appnope , comm +, debugpy , ipython , jupyter-client +, jupyter-core +, matplotlib-inline +, nest-asyncio , packaging , psutil +, pyzmq , tornado , traitlets }: buildPythonPackage rec { pname = "ipykernel"; - version = "6.27.1"; + version = "6.28.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fV1ZS2aQZUtNKZ7bpehy3Be7c5ao0GCcl8t7ihxgXeY="; + hash = "sha256-acEUA9Jt5p3wIiWRb5FrN+pLmvQX2gqMgn+EMo2I5fM="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 @@ -36,12 +43,19 @@ buildPythonPackage rec { propagatedBuildInputs = [ comm + debugpy ipython jupyter-client + jupyter-core + matplotlib-inline + nest-asyncio packaging psutil + pyzmq tornado traitlets + ] ++ lib.optionals stdenv.isDarwin [ + appnope ]; # check in passthru.tests.pytest to escape infinite recursion with ipyparallel @@ -54,6 +68,7 @@ buildPythonPackage rec { meta = { description = "IPython Kernel for Jupyter"; homepage = "https://ipython.org/"; + changelog = "https://github.com/ipython/ipykernel/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ] ++ lib.teams.jupyter.members; }; diff --git a/pkgs/development/python-modules/ipymarkup/default.nix b/pkgs/development/python-modules/ipymarkup/default.nix index 1731c3c2075bf..a2698771ab22e 100644 --- a/pkgs/development/python-modules/ipymarkup/default.nix +++ b/pkgs/development/python-modules/ipymarkup/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ intervaltree ]; - pythonImportCheck = [ "ipymarkup" ]; + pythonImportsCheck = [ "ipymarkup" ]; # Upstream has no tests: doCheck = false; diff --git a/pkgs/development/python-modules/ipython-sql/default.nix b/pkgs/development/python-modules/ipython-sql/default.nix index 2fc59859ab2a6..0aa7fa388c4f3 100644 --- a/pkgs/development/python-modules/ipython-sql/default.nix +++ b/pkgs/development/python-modules/ipython-sql/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "ipython-sql"; version = "0.4.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 1fbb4e10805b7..2507e7e5fc585 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "ipyvue"; version = "1.10.1"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index 074d8a4522ee6..28b39f74c4b9a 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "ipyvuetify"; version = "1.8.10"; + format = "setuptools"; # GitHub version tries to run npm (Node JS) src = fetchPypi { diff --git a/pkgs/development/python-modules/ipyxact/default.nix b/pkgs/development/python-modules/ipyxact/default.nix index 7ddaf432d1284..28652d156a87f 100644 --- a/pkgs/development/python-modules/ipyxact/default.nix +++ b/pkgs/development/python-modules/ipyxact/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "ipyxact"; version = "0.3.2"; + format = "setuptools"; propagatedBuildInputs = [ pyyaml ]; checkInputs = [ six lxml ]; diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index a068d26695e53..d761a26e7a734 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "irc"; - version = "20.3.0"; + version = "20.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-JFteqYqwAlZnYx53alXjGRfmDvcIxgEC8hmLyfURMjY="; + hash = "sha256-gGuDr4lNixIe0eFIZqkGQBKFiN5swElcTsssXsJyKAs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ircrobots/default.nix b/pkgs/development/python-modules/ircrobots/default.nix index ef09e41c23613..76fe922fa0c6c 100644 --- a/pkgs/development/python-modules/ircrobots/default.nix +++ b/pkgs/development/python-modules/ircrobots/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "ircrobots"; version = "0.6.6"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix index 4ccaea6e6f247..d6d72166c80f5 100644 --- a/pkgs/development/python-modules/ircstates/default.nix +++ b/pkgs/development/python-modules/ircstates/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "ircstates"; version = "0.12.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; # f-strings src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix index b2b35a7a926bd..68b8bb1535e8a 100644 --- a/pkgs/development/python-modules/irctokens/default.nix +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "irctokens"; version = "2.0.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; # f-strings src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 149aa4c9c14ae..c91e44f7825f0 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "islpy"; version = "2023.1.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix index 7a510598dca31..e9226d4aaee51 100644 --- a/pkgs/development/python-modules/iso-639/default.nix +++ b/pkgs/development/python-modules/iso-639/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "iso-639"; version = "0.4.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix index 81f030e4830b4..0697f17c01f03 100644 --- a/pkgs/development/python-modules/isodate/default.nix +++ b/pkgs/development/python-modules/isodate/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "isodate"; version = "0.6.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/isosurfaces/default.nix b/pkgs/development/python-modules/isosurfaces/default.nix index 49f3fb90b2967..96227ed0aa75d 100644 --- a/pkgs/development/python-modules/isosurfaces/default.nix +++ b/pkgs/development/python-modules/isosurfaces/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "isosurfaces"; version = "0.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/isounidecode/default.nix b/pkgs/development/python-modules/isounidecode/default.nix index 860b237c3de54..70736a54a1fe6 100644 --- a/pkgs/development/python-modules/isounidecode/default.nix +++ b/pkgs/development/python-modules/isounidecode/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "isounidecode"; version = "0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/isoweek/default.nix b/pkgs/development/python-modules/isoweek/default.nix index 65de70b20b5e5..e16d27c47bcff 100644 --- a/pkgs/development/python-modules/isoweek/default.nix +++ b/pkgs/development/python-modules/isoweek/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "isoweek"; version = "1.3.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/itemdb/default.nix b/pkgs/development/python-modules/itemdb/default.nix index 68fb6d5dc5542..4cc0cf6374845 100644 --- a/pkgs/development/python-modules/itemdb/default.nix +++ b/pkgs/development/python-modules/itemdb/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "itemdb"; version = "1.1.2"; + format = "setuptools"; # PyPI tarball doesn't include tests directory src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 2016e492acf5c..6d12086851c6c 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "iterm2"; version = "2.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix index 4121be315f5d2..3810eabf46c71 100644 --- a/pkgs/development/python-modules/itsdangerous/default.nix +++ b/pkgs/development/python-modules/itsdangerous/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "itsdangerous"; version = "2.1.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/itunespy/default.nix b/pkgs/development/python-modules/itunespy/default.nix index 3bb0bb677bad6..cd1f174c24b8a 100644 --- a/pkgs/development/python-modules/itunespy/default.nix +++ b/pkgs/development/python-modules/itunespy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "itunespy"; version = "1.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "sleepyfran"; diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix index 14f0214397882..771f91a461acf 100644 --- a/pkgs/development/python-modules/itypes/default.nix +++ b/pkgs/development/python-modules/itypes/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "itypes"; version = "1.2.0"; + format = "setuptools"; src = fetchFromGitHub { repo = pname; diff --git a/pkgs/development/python-modules/iwlib/default.nix b/pkgs/development/python-modules/iwlib/default.nix index 2f556e1717d26..0a881ef1f370c 100644 --- a/pkgs/development/python-modules/iwlib/default.nix +++ b/pkgs/development/python-modules/iwlib/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { pname = "iwlib"; version = "1.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index c83b1c77e2ccc..cf66d9be21bd5 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "j2cli"; version = "0.3.10"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jaeger-client/default.nix b/pkgs/development/python-modules/jaeger-client/default.nix index a601fd9ce799e..c7130c8afc9dc 100644 --- a/pkgs/development/python-modules/jaeger-client/default.nix +++ b/pkgs/development/python-modules/jaeger-client/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "jaeger-client"; version = "4.8.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix index a31d17b1fe7da..15b75bc2aa3b2 100644 --- a/pkgs/development/python-modules/janus/default.nix +++ b/pkgs/development/python-modules/janus/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "janus"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jaraco-logging/default.nix b/pkgs/development/python-modules/jaraco-logging/default.nix index 5e5e60b396241..e87d01a869a67 100644 --- a/pkgs/development/python-modules/jaraco-logging/default.nix +++ b/pkgs/development/python-modules/jaraco-logging/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "jaraco-logging"; - version = "3.2.0"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jaraco.logging"; inherit version; - hash = "sha256-X8ssPxI1HU1QN1trYPOJnFg3sjLxotj/y6/17NK3M+c="; + hash = "sha256-9KfPusuGqDTCiGwBo7UrxM3icowdlxfEnU3OHWJI8Hs="; }; pythonNamespaces = [ diff --git a/pkgs/development/python-modules/jaraco-stream/default.nix b/pkgs/development/python-modules/jaraco-stream/default.nix index b7befef927578..1c926b831ffb8 100644 --- a/pkgs/development/python-modules/jaraco-stream/default.nix +++ b/pkgs/development/python-modules/jaraco-stream/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "jaraco-stream"; version = "3.0.3"; + format = "setuptools"; src = fetchPypi { pname = "jaraco.stream"; diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix index ecdc0b82a7430..1d8566a6f3261 100644 --- a/pkgs/development/python-modules/javaobj-py3/default.nix +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "javaobj-py3"; version = "0.4.3"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 203aa49db8fb6..f60310bdef146 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -6,6 +6,7 @@ , fetchFromGitHub , jaxlib , jaxlib-bin +, hypothesis , lapack , matplotlib , ml-dtypes @@ -27,7 +28,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.20"; + version = "0.4.23"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,7 +38,7 @@ buildPythonPackage rec { repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-WLYXUtchOaA6SGnKuVhN9CmV06xMCLQTEuEtL13ttZU="; + hash = "sha256-PDa3yVH/sszGbWkVkJ+19FdOr3oqdYk+OdbeUTMTDuU="; }; nativeBuildInputs = [ @@ -59,6 +60,7 @@ buildPythonPackage rec { ] ++ lib.optional (pythonOlder "3.10") importlib-metadata; nativeCheckInputs = [ + hypothesis jaxlib' matplotlib pytestCheckHook diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index d80cbc2a60183..f6f8f5e2b1b61 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -29,13 +29,13 @@ , stdenv # Options: , cudaSupport ? config.cudaSupport -, cudaPackages ? {} +, cudaPackagesGoogle }: let - inherit (cudaPackages) cudatoolkit cudnn; + inherit (cudaPackagesGoogle) cudatoolkit cudnn; - version = "0.4.20"; + version = "0.4.23"; inherit (python) pythonVersion; @@ -56,65 +56,65 @@ let "3.9-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp39"; - hash = "sha256-eIE+rz5x5BEkO85zncIWE8p/wDPxV8bnVJdHiknS998="; + hash = "sha256-maN9RzK6/hYIuPRd8n8n5qa/HyPgAf6UD+mlqzZ1/Xc="; }; "3.9-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp39"; - hash = "sha256-dxInv8/aQiHsN7DpScuZao2ZyHDjF0AaTqUDA0qqg/M="; + hash = "sha256-gdb07c12HCfK5VXT2C+9lYKSiIpPgD8sNmd4eG2M6M4="; }; "3.9-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp39"; - hash = "sha256-wva6LkSokEHN+WQLCancVC7YBIxfImPsQpB1LzFcyqM="; + hash = "sha256-TdU4wEoqEhsDq18MuLEpmKqpU51+xUYp/reZqEDJK1U="; }; "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-Yo2TYnkIelyy4vb5+nC/yY8SjV34i/jJvCe/VRQppmo="; + hash = "sha256-cnX75aSJxoPFUCYD1V5QgyPNovS9lSGqg4PGdPsKsvM="; }; "3.10-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp310"; - hash = "sha256-ufA/ACE4s4R/Fiq5SN7T44SVEN1Z5OfkJ/98lKxRFmo="; + hash = "sha256-H9sbeR4+4XytREYLP0LJphqGkQqHcinTC9NlT0Rj1aA="; }; "3.10-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp310"; - hash = "sha256-hBSrYQyOGMn0BexRWQKYnJdEYYlzHUWuWGHmjVT10TE="; + hash = "sha256-43VuBgGvdjauWPQtJK9w5GBI/++JvV4FwwO4maIXfDY="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-5N0nghTBrsa7d8kt8hZC2ghqlxCNC7U8ApD0PG7DHn8="; + hash = "sha256-mEdm0wmyHKg4RlA7q9/e1OOu+BfGcPKBCSvLwXfFhJI="; }; "3.11-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp311"; - hash = "sha256-j13Br64cKe0hFh/cMBbOMuTXqauAvSKE+KzEmN7U6RA="; + hash = "sha256-1kb/m8DODrtXO2drIfpttCLC72oNVszADbSDspllQVs="; }; "3.11-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp311"; - hash = "sha256-nTnyawU4Ngq9VTE6oDuEfR6iJPRy+E/VLt98cU6eW4M="; + hash = "sha256-jhLX4ps+EtU1sku722v51mz2SSamo4/dkdRWX3zFcRE="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-qPMoa7cso7DRBWuCJQoiOEzLPL3m76MPZZMYmZUj400="; + hash = "sha256-oimiuQopgN1oKhbDc7SsRJPnA6JiEI9UieikWR2qpVk="; }; "3.12-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp312"; - hash = "sha256-VqTC5egDHaDIvwVa3sAc9Sdtd0CwEFcXjDU/i54h844="; + hash = "sha256-J4zaKcx0c0Bgk7w/n6klqDlgY9IqTNINfg6g033LUDk="; }; "3.12-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp312"; - hash = "sha256-1F98Je2rMJJKrksI/EVAsX9n+dOpmDehUeAaMq/BY7o="; + hash = "sha256-UFEE/mBitEOVUoijhUfphyy24QfWPZ+FQPsQ0cjY79A="; }; }; @@ -124,19 +124,19 @@ let gpuSrcs = { "3.9" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp39-cp39-manylinux2014_x86_64.whl"; - hash = "sha256-VM2HuyMnG+hzrsTQEB5KJpqpBXyyp+eV1LVxmY1ZCGU="; + hash = "sha256-our2mSwHPdjVoDAZP+9aNUkJ+vxv1Tq7G5UqA9HvhNI="; }; "3.10" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-TLq3z3T2fjTcO3ESahboKG33mrOpjtj9C92f4d4nJKo="; + hash = "sha256-jkIABnJZnn7A6n9VGs/MldzdDiKwWh0fEvl7Vqn85Kg="; }; "3.11" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp311-cp311-manylinux2014_x86_64.whl"; - hash = "sha256-CUXwyJq0HOo2j3Sw+NguBCnFkDuJpc3wfZUc90yyhOY="; + hash = "sha256-dMUcRnHjl8NyUeO3P1x7CNgF0iAHFKIzUtHh+/CNkow="; }; "3.12" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp312-cp312-manylinux2014_x86_64.whl"; - hash = "sha256-bAR8FLtiqufU+rL2a1q9c61CjH1eXxGTNGnDUkHlDBA="; + hash = "sha256-kXJ6bUwX+QybqYPV9Kpwv+lhdoGEFRr4+1T0vfXoWRo="; }; }; @@ -210,8 +210,8 @@ buildPythonPackage { maintainers = with maintainers; [ samuela ]; platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ]; broken = - !(cudaSupport -> (cudaPackages ? cudatoolkit) && lib.versionAtLeast cudatoolkit.version "11.1") - || !(cudaSupport -> (cudaPackages ? cudnn) && lib.versionAtLeast cudnn.version "8.2") + !(cudaSupport -> (cudaPackagesGoogle ? cudatoolkit) && lib.versionAtLeast cudatoolkit.version "11.1") + || !(cudaSupport -> (cudaPackagesGoogle ? cudnn) && lib.versionAtLeast cudnn.version "8.2") || !(cudaSupport -> stdenv.isLinux); }; } diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index c70ab0ac2b327..27b9e61fbc821 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -35,7 +35,6 @@ # Runtime dependencies: , double-conversion , giflib -, grpc , libjpeg_turbo , python , snappy @@ -44,17 +43,17 @@ , config # CUDA flags: , cudaSupport ? config.cudaSupport -, cudaPackages ? {} +, cudaPackagesGoogle # MKL: , mklSupport ? true }: let - inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl; + inherit (cudaPackagesGoogle) backendStdenv cudatoolkit cudaFlags cudnn nccl; pname = "jaxlib"; - version = "0.4.20"; + version = "0.4.23"; meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; @@ -98,7 +97,8 @@ let # Not packaged in nixpkgs # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" - "com_github_grpc_grpc" + # Issue with transitive dependencies after https://github.com/grpc/grpc/commit/f1d14f7f0b661bd200b7f269ef55dec870e7c108 + # "com_github_grpc_grpc" # ERROR: /build/output/external/bazel_tools/tools/proto/BUILD:25:6: no such target '@com_google_protobuf//:cc_toolchain': # target 'cc_toolchain' not declared in package '' defined by /build/output/external/com_google_protobuf/BUILD.bazel # "com_google_protobuf" @@ -150,7 +150,7 @@ let repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jaxlib tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-WLYXUtchOaA6SGnKuVhN9CmV06xMCLQTEuEtL13ttZU="; + hash = "sha256-PDa3yVH/sszGbWkVkJ+19FdOr3oqdYk+OdbeUTMTDuU="; }; nativeBuildInputs = [ @@ -169,7 +169,6 @@ let curl double-conversion giflib - grpc jsoncpp libjpeg_turbo numpy @@ -263,10 +262,10 @@ let ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-QczClHxHElLZCqIZlHc3z3DXJ7rZQJaMs2XIb+lxarI="; + x86_64-linux = "sha256-q2wRaoCGnISEdtF6jDMk9Wccy/wTmLusVBI7dDATwi4="; } else { - x86_64-linux = "sha256-mqiJe4u0NYh1PKCbQfbo0U2e9/kYiBqj98d+BPHFSxQ="; - aarch64-linux = "sha256-EuLqamVBJ+qoVMCFIYUT846AghltZolfLGdtO9UeXSM="; + x86_64-linux = "sha256-0cDJ27HCi3J5xeT6TkTtfUzF/yESBYmEVG1r14kPdRs="; + aarch64-linux = "sha256-WbaN8VYjeW0mDthmtoSTttqd4K/Z8dP5+VkTo10pLtU="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; @@ -336,7 +335,6 @@ buildPythonPackage { double-conversion flatbuffers giflib - grpc jsoncpp libjpeg_turbo ml-dtypes diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index 364e65012b53e..cb73681bc2760 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub , hatchling , numpy @@ -7,25 +8,34 @@ , typing-extensions , cloudpickle , equinox +, ipython , jax , jaxlib -, torch , pytestCheckHook +, tensorflow +, torch }: let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.23"; + version = "0.2.25"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "google"; repo = "jaxtyping"; rev = "refs/tags/v${version}"; - hash = "sha256-22dIuIjFgqRmV9AQok02skVt7fm17/WpzBm3FrJ6/zs="; + hash = "sha256-+JqpI5xrM7o73LG6oMix88Jr5aptmWYjJQcqUNo7icg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "typeguard>=2.13.3,<3" "typeguard" + ''; + nativeBuildInputs = [ hatchling ]; @@ -39,9 +49,11 @@ let nativeCheckInputs = [ cloudpickle equinox + ipython jax jaxlib pytestCheckHook + tensorflow torch ]; @@ -49,7 +61,11 @@ let # Enable tests via passthru to avoid cyclic dependency with equinox. passthru.tests = { - check = self.overridePythonAttrs { doCheck = true; }; + check = self.overridePythonAttrs { + # We disable tests because they complain about the version of typeguard being too new. + doCheck = false; + catchConflicts = false; + }; }; pythonImportsCheck = [ "jaxtyping" ]; diff --git a/pkgs/development/python-modules/jaydebeapi/default.nix b/pkgs/development/python-modules/jaydebeapi/default.nix index 378da83759b61..3aa26ca020f79 100644 --- a/pkgs/development/python-modules/jaydebeapi/default.nix +++ b/pkgs/development/python-modules/jaydebeapi/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "jaydebeapi"; version = "1.2.3"; + format = "setuptools"; src = fetchPypi { pname = "JayDeBeApi"; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 39bc43bc41946..056afc4fcb438 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -13,14 +13,15 @@ buildPythonPackage rec { pname = "jc"; - version = "1.23.6"; + version = "1.24.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vAPWMv5vYFl45ZTl+p4HHAXeZ/10VSvubKINoyGPRq4="; + hash = "sha256-aEDEp32PR51uRMEmDdWkF/Y0bMT0Lp25lVUpyn/VxlA="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/jdcal/default.nix b/pkgs/development/python-modules/jdcal/default.nix index abf5880e80f02..6278be96e10ca 100644 --- a/pkgs/development/python-modules/jdcal/default.nix +++ b/pkgs/development/python-modules/jdcal/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "jdcal"; version = "1.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 05f857641b666..863a7af192e78 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; version = "5.0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix index a0fd5acf440ae..99803de03c5b8 100644 --- a/pkgs/development/python-modules/jieba/default.nix +++ b/pkgs/development/python-modules/jieba/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "jieba"; version = "0.42.1"; + format = "setuptools"; # no tests in PyPI tarball src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/jinja2-ansible-filters/default.nix b/pkgs/development/python-modules/jinja2-ansible-filters/default.nix index 79af7744a8664..4125a574db2b9 100644 --- a/pkgs/development/python-modules/jinja2-ansible-filters/default.nix +++ b/pkgs/development/python-modules/jinja2-ansible-filters/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "jinja2-ansible-filters"; version = "1.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jinja2-pluralize/default.nix b/pkgs/development/python-modules/jinja2-pluralize/default.nix index 2187c1a24147b..79416be375645 100644 --- a/pkgs/development/python-modules/jinja2-pluralize/default.nix +++ b/pkgs/development/python-modules/jinja2-pluralize/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "jinja2-pluralize"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { pname = "jinja2_pluralize"; diff --git a/pkgs/development/python-modules/jinja2-time/default.nix b/pkgs/development/python-modules/jinja2-time/default.nix index 3daf84fa69d7d..611bc19df8243 100644 --- a/pkgs/development/python-modules/jinja2-time/default.nix +++ b/pkgs/development/python-modules/jinja2-time/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "jinja2-time"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jmp/default.nix b/pkgs/development/python-modules/jmp/default.nix index 2435d90accaf6..945e99310366a 100644 --- a/pkgs/development/python-modules/jmp/default.nix +++ b/pkgs/development/python-modules/jmp/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "jmp"; version = "0.0.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "deepmind"; diff --git a/pkgs/development/python-modules/jplephem/default.nix b/pkgs/development/python-modules/jplephem/default.nix index 017d8bda66522..5a1a8ab3cb70c 100644 --- a/pkgs/development/python-modules/jplephem/default.nix +++ b/pkgs/development/python-modules/jplephem/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "jplephem"; version = "2.21"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix index 81f3c11b1b1ca..9a33ecf46d4ba 100644 --- a/pkgs/development/python-modules/jpylyzer/default.nix +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -25,6 +25,7 @@ let in buildPythonPackage rec { pname = "jpylyzer"; version = "2.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "openpreserve"; diff --git a/pkgs/development/python-modules/jpype1/default.nix b/pkgs/development/python-modules/jpype1/default.nix index dc16012391877..06cea885076e5 100644 --- a/pkgs/development/python-modules/jpype1/default.nix +++ b/pkgs/development/python-modules/jpype1/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "jpype1"; version = "1.4.1"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/js2py/default.nix b/pkgs/development/python-modules/js2py/default.nix index 9bbfe091c8920..e0769f4ffa191 100644 --- a/pkgs/development/python-modules/js2py/default.nix +++ b/pkgs/development/python-modules/js2py/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "js2py"; version = "0.74"; + format = "setuptools"; src = fetchPypi { pname = "Js2Py"; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 4cd2a2886d6cd..d3801bff9f028 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jsbeautifier"; - version = "1.14.9"; + version = "1.14.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xzjrw2tHvZTkym3RepAEw8x07a1YLKHWDg5dWUWmPLk="; + hash = "sha256-a2Mlgepg3RwTPNJaSK0Ye0uR9SZiPEsPtUQ++AUlBQU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jschema-to-python/default.nix b/pkgs/development/python-modules/jschema-to-python/default.nix index e217592e99b0a..fcd80c652d413 100644 --- a/pkgs/development/python-modules/jschema-to-python/default.nix +++ b/pkgs/development/python-modules/jschema-to-python/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "jschema-to-python"; version = "1.2.3"; + format = "setuptools"; src = fetchPypi { pname = "jschema_to_python"; diff --git a/pkgs/development/python-modules/json-home-client/default.nix b/pkgs/development/python-modules/json-home-client/default.nix index 6b63733505c80..5f2fa9eaeb6ee 100644 --- a/pkgs/development/python-modules/json-home-client/default.nix +++ b/pkgs/development/python-modules/json-home-client/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "json-home-client"; version = "1.1.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/json-merge-patch/default.nix b/pkgs/development/python-modules/json-merge-patch/default.nix index 582248ca32ffc..5b8c0a2fa4bef 100644 --- a/pkgs/development/python-modules/json-merge-patch/default.nix +++ b/pkgs/development/python-modules/json-merge-patch/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "json-merge-patch"; version = "0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/json-rpc/default.nix b/pkgs/development/python-modules/json-rpc/default.nix index a1037f573dbdf..458f2edd9d9e0 100644 --- a/pkgs/development/python-modules/json-rpc/default.nix +++ b/pkgs/development/python-modules/json-rpc/default.nix @@ -5,6 +5,7 @@ let in buildPythonPackage rec { pname = "json-rpc"; version = "1.15.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index b6a54dccc73d5..786f33b385dcc 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "json5"; version = "0.9.14"; + format = "setuptools"; src = fetchFromGitHub { owner = "dpranke"; diff --git a/pkgs/development/python-modules/jsonable/default.nix b/pkgs/development/python-modules/jsonable/default.nix index 705087674adbb..075930f645e54 100644 --- a/pkgs/development/python-modules/jsonable/default.nix +++ b/pkgs/development/python-modules/jsonable/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "jsonable"; version = "0.3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "halfak"; diff --git a/pkgs/development/python-modules/jsonconversion/default.nix b/pkgs/development/python-modules/jsonconversion/default.nix index a98798f05fb8e..d9f6d5556fb54 100644 --- a/pkgs/development/python-modules/jsonconversion/default.nix +++ b/pkgs/development/python-modules/jsonconversion/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "jsonconversion"; version = "0.2.13"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jsondate/default.nix b/pkgs/development/python-modules/jsondate/default.nix index 7888a6df23cc9..f3b99b259b285 100644 --- a/pkgs/development/python-modules/jsondate/default.nix +++ b/pkgs/development/python-modules/jsondate/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "0.1.3"; + format = "setuptools"; pname = "jsondate"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index df2e883825c51..6985a6edba3ac 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "jsondiff"; version = "2.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jsonfield/default.nix b/pkgs/development/python-modules/jsonfield/default.nix index 37e280b2a1847..5e36636c84090 100644 --- a/pkgs/development/python-modules/jsonfield/default.nix +++ b/pkgs/development/python-modules/jsonfield/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "jsonfield"; version = "3.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 4fc2f49119dcd..7b925777b2d71 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "jsonpickle"; version = "3.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix index f05b886cfb126..455acd5311469 100644 --- a/pkgs/development/python-modules/jsonpointer/default.nix +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "jsonpointer"; version = "2.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 31bb0fe3137eb..0ad585b3e2dc2 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "jsonrpclib-pelix"; version = "0.4.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jsonstreams/default.nix b/pkgs/development/python-modules/jsonstreams/default.nix index 197e372edf16d..6fcd075c8445a 100644 --- a/pkgs/development/python-modules/jsonstreams/default.nix +++ b/pkgs/development/python-modules/jsonstreams/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "jsonstreams"; version = "0.6.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "dcbaker"; diff --git a/pkgs/development/python-modules/jstyleson/default.nix b/pkgs/development/python-modules/jstyleson/default.nix index 757a8ef8bf29a..9c2008d1f7f7f 100644 --- a/pkgs/development/python-modules/jstyleson/default.nix +++ b/pkgs/development/python-modules/jstyleson/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "jstyleson"; version = "0.0.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "linjackson78"; diff --git a/pkgs/development/python-modules/junit-xml/default.nix b/pkgs/development/python-modules/junit-xml/default.nix index a6475188405b0..1de05ff7e0678 100644 --- a/pkgs/development/python-modules/junit-xml/default.nix +++ b/pkgs/development/python-modules/junit-xml/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "junit-xml"; version = "1.9"; + format = "setuptools"; # Only a wheel on PyPI src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix index 2dbd902efeefa..988fde1f44082 100644 --- a/pkgs/development/python-modules/junitparser/default.nix +++ b/pkgs/development/python-modules/junitparser/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "junitparser"; version = "2.8.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "weiwei"; diff --git a/pkgs/development/python-modules/jupyter-c-kernel/default.nix b/pkgs/development/python-modules/jupyter-c-kernel/default.nix index a6fe574a9bac1..7b03afc86af76 100644 --- a/pkgs/development/python-modules/jupyter-c-kernel/default.nix +++ b/pkgs/development/python-modules/jupyter-c-kernel/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "jupyter-c-kernel"; version = "1.2.2"; + format = "setuptools"; src = fetchPypi { pname = "jupyter_c_kernel"; diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 014b67cb4b46c..ad428c1c8a957 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -1,28 +1,25 @@ { lib , buildPythonPackage , fetchPypi -, entrypoints , jupyter-core , hatchling -, nest-asyncio , python-dateutil , pyzmq , tornado , traitlets -, isPyPy -, py , pythonOlder , importlib-metadata }: buildPythonPackage rec { - pname = "jupyter_client"; - version = "8.3.1"; - format = "pyproject"; + pname = "jupyter-client"; + version = "8.6.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-YClLLVuGk1bIk/V7God+plENYNRc9LOAV/FnLYVpmsk="; + pname = "jupyter_client"; + inherit version; + hash = "sha256-BkIkS7g7R2SuYNB+AQ4V8OLSdexOkYqPe4D7vvPKYMc="; }; nativeBuildInputs = [ @@ -30,23 +27,26 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - entrypoints jupyter-core - nest-asyncio python-dateutil pyzmq tornado traitlets ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata - ] ++ lib.optional isPyPy py; + ]; + + pythonImportsCheck = [ + "jupyter_client" + ]; # Circular dependency with ipykernel doCheck = false; meta = { description = "Jupyter protocol implementation and client libraries"; - homepage = "https://jupyter.org/"; + homepage = "https://github.com/jupyter/jupyter_client"; + changelog = "https://github.com/jupyter/jupyter_client/blob/v${version}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index 6c2842eb6d0c8..7d0fdb300558d 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -5,29 +5,29 @@ , hatch-jupyter-builder , hatch-nodejs-version , hatchling -, pythonRelaxDepsHook +, jsonschema , jupyter-events , jupyter-server , jupyter-server-fileid , jupyter-ydoc , jupyterlab -, ypy-websocket -, pytest-asyncio +, pycrdt-websocket , pytest-jupyter , pytestCheckHook +, websockets }: buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "1.2.0"; - format = "pyproject"; + version = "2.0.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-qhcCPAgHlBwt+Lt8NdDa+ZPhNNotCvNtz9WQx6OHvOc="; + hash = "sha256-Uc57kxhaj/DQi5cX+kjV4PGRcFbxWmzc+B248+1VAYI="; }; postPatch = '' @@ -39,25 +39,21 @@ buildPythonPackage rec { hatch-nodejs-version hatchling jupyterlab - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "ypy-websocket" ]; propagatedBuildInputs = [ + jsonschema jupyter-events jupyter-server jupyter-server-fileid jupyter-ydoc - ypy-websocket + pycrdt-websocket ]; nativeCheckInputs = [ - pytest-asyncio pytest-jupyter pytestCheckHook + websockets ]; pythonImportsCheck = [ @@ -72,6 +68,8 @@ buildPythonPackage rec { export HOME=$TEMP ''; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "JupyterLab Extension enabling Real-Time Collaboration"; homepage = "https://github.com/jupyterlab/jupyter_collaboration"; diff --git a/pkgs/development/python-modules/jupyter-contrib-core/default.nix b/pkgs/development/python-modules/jupyter-contrib-core/default.nix index a81c354974307..7bd1c29eb6ea9 100644 --- a/pkgs/development/python-modules/jupyter-contrib-core/default.nix +++ b/pkgs/development/python-modules/jupyter-contrib-core/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "jupyter-contrib-core"; version = "0.4.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "jupyter-contrib"; diff --git a/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix b/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix index 5656043625f31..c509a0972bed4 100644 --- a/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix +++ b/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "jupyter-contrib-nbextensions"; version = "0.7.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ipython-contrib"; diff --git a/pkgs/development/python-modules/jupyter-core/default.nix b/pkgs/development/python-modules/jupyter-core/default.nix index 1205858966002..1ab9f57709093 100644 --- a/pkgs/development/python-modules/jupyter-core/default.nix +++ b/pkgs/development/python-modules/jupyter-core/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jupyter-core"; - version = "5.5.0"; + version = "5.5.1"; disabled = pythonOlder "3.7"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jupyter"; repo = "jupyter_core"; rev = "refs/tags/v${version}"; - hash = "sha256-GufCQUkR4283xMsyrbv5tDfJ8SeL35WBW5Aw2z6Ardc="; + hash = "sha256-X8yBh63JYIuIatLtJU0pOD8Oz/QpJShU0R2VGAgPAa4="; }; patches = [ diff --git a/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix b/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix index 64cbe33ae8bad..06d7247ed3489 100644 --- a/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix +++ b/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "jupyter-highlight-selected-word"; version = "0.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "jcb91"; diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix index f098330666cd8..fd8820bcb1d45 100644 --- a/pkgs/development/python-modules/jupyter-lsp/default.nix +++ b/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "jupyter-lsp"; version = "2.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix b/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix index 61c235877f4a1..5fc0a95fc7bf2 100644 --- a/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix +++ b/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "jupyter-nbextensions-configurator"; version = "0.6.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "jupyter-contrib"; diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 0d39b868c1328..78aed83b87c56 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -10,16 +10,18 @@ , pkgs-docker , python-json-logger , pythonOlder +, requests , ruamel-yaml , semver +, setuptools , toml , traitlets }: buildPythonPackage rec { pname = "jupyter-repo2docker"; - version = "2022.10.0"; - format = "setuptools"; + version = "2023.06.0"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -27,9 +29,13 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "repo2docker"; rev = "refs/tags/${version}"; - hash = "sha256-n1Yhl3QC1YqdsCl6pI5NjzTiSEs6NrGq9jwT0uyS/p0="; + hash = "sha256-egSQ8PXH9PxVpkZfaWfU2ZjRNW67x6FzIy+LQR5BdNE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ chardet docker @@ -39,6 +45,7 @@ buildPythonPackage rec { jinja2 pkgs-docker python-json-logger + requests ruamel-yaml semver toml @@ -58,7 +65,8 @@ buildPythonPackage rec { meta = with lib; { description = "Turn code repositories into Jupyter enabled Docker Images"; homepage = "https://repo2docker.readthedocs.io/"; - license = licenses.bsdOriginal; + changelog = "https://github.com/jupyterhub/repo2docker/blob/${src.rev}/docs/source/changelog.md"; + license = licenses.bsd3; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jupyter-server-fileid/default.nix b/pkgs/development/python-modules/jupyter-server-fileid/default.nix index 4ef40134152dc..302a521cdc4ee 100644 --- a/pkgs/development/python-modules/jupyter-server-fileid/default.nix +++ b/pkgs/development/python-modules/jupyter-server-fileid/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jupyter-server-fileid"; - version = "0.9.0"; + version = "0.9.1"; disables = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jupyter-server"; repo = "jupyter_server_fileid"; rev = "refs/tags/v${version}"; - hash = "sha256-3dwj8GV0FmbhSsC2uWOLcU5ofrvBBGJ/2F/noFh4RCU="; + hash = "sha256-rEjrfioAmqijyObiK7CMLWhLqVpfcmNYhjdjKjkMp6s="; }; nativeBuildInputs = [ @@ -44,6 +44,8 @@ buildPythonPackage rec { export HOME=$TEMPDIR ''; + __darwinAllowLocalNetworking = true; + meta = { changelog = "https://github.com/jupyter-server/jupyter_server_fileid/blob/${src.rev}/CHANGELOG.md"; description = "An extension that maintains file IDs for documents in a running Jupyter Server"; diff --git a/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/pkgs/development/python-modules/jupyter-server-terminals/default.nix index 584b7fb634b03..5eb3456c3d62b 100644 --- a/pkgs/development/python-modules/jupyter-server-terminals/default.nix +++ b/pkgs/development/python-modules/jupyter-server-terminals/default.nix @@ -16,14 +16,14 @@ let self = buildPythonPackage rec { pname = "jupyter-server-terminals"; - version = "0.4.4"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "jupyter_server_terminals"; rev = "refs/tags/v${version}"; - hash = "sha256-F1lpg4ASw3ImvhC8XA8Ya4qpcbGY6fg8PYJt8sJj4cs="; + hash = "sha256-RT4rBSSDuIr3d8+hmbiF7rMn94Yr7ekocWeXww0tKlA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 5a61b06c5026e..47d5b0c33220c 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.10.1"; + version = "2.12.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-5tomV6lUp4ee7SjMCOCBewH/2B1+q4Y0ZgOXtV+SZHI="; + hash = "sha256-3He33MX8BUesuisoRPAXmACGZyAe6ifGMZ/5JX1wCm0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index 13758cb07c13a..3c41db14e7a79 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "jupyter-sphinx"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix index 03dae2dfa9ff9..bf0f718796c62 100644 --- a/pkgs/development/python-modules/jupyter-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , hatch-nodejs-version , hatchling -, y-py +, importlib-metadata +, pycrdt , pytestCheckHook , websockets , ypy-websocket @@ -11,14 +13,15 @@ buildPythonPackage rec { pname = "jupyter-ydoc"; - version = "1.1.1"; + version = "2.0.1"; + pyproject = true; - format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "jupyter_ydoc"; inherit version; - hash = "sha256-APizOm59VcvhK5G4emqGtnPikz13w6EmG7qLJHU2Rd0="; + hash = "sha256-cW3ajLiviB/sL7yIrqP7DTuyS764Cpmor/LgHQidWw0="; }; nativeBuildInputs = [ @@ -27,7 +30,9 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - y-py + pycrdt + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; pythonImportsCheck = [ "jupyter_ydoc" ]; diff --git a/pkgs/development/python-modules/jupyter/default.nix b/pkgs/development/python-modules/jupyter/default.nix index b795dc9c91019..51108eaa7a8f4 100644 --- a/pkgs/development/python-modules/jupyter/default.nix +++ b/pkgs/development/python-modules/jupyter/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { version = "1.0.0"; + format = "setuptools"; pname = "jupyter"; src = fetchPypi { diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 7283eaed4434a..0c61557c26b63 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "jupyterhub-ldapauthenticator"; version = "1.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 5f298922cfe6f..ac8fc028f25e9 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -207,6 +207,6 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = teams.jupyter.members; # darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix index 6d57bc519646a..82d912923895f 100644 --- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "jupyterlab-lsp"; version = "5.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/jupyterlab-pygments/default.nix b/pkgs/development/python-modules/jupyterlab-pygments/default.nix index a31f0de42e6f3..0d46258eb789f 100644 --- a/pkgs/development/python-modules/jupyterlab-pygments/default.nix +++ b/pkgs/development/python-modules/jupyterlab-pygments/default.nix @@ -1,16 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, pygments, jupyter-packaging }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, hatch-jupyter-builder +, hatch-nodejs-version +, hatchling +, pygments +}: buildPythonPackage rec { - pname = "jupyterlab_pygments"; - version = "0.2.2"; + pname = "jupyterlab-pygments"; + version = "0.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-dAXX/eYIGdkFqfqM6J5M2DDjGM2tIqADD3qQHacFWF0="; + pname = "jupyterlab_pygments"; + inherit version; + hash = "sha256-chrKTZApJSsRz6nRheW1r01Udyu4By+bcDb0FwBU010="; }; + # jupyterlab is not necessary since we get the source from pypi + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab>=4.0.0,<5",' "" + ''; + nativeBuildInputs = [ - jupyter-packaging + hatch-jupyter-builder + hatch-nodejs-version + hatchling ]; # no tests exist on upstream repo @@ -23,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jupyterlab syntax coloring theme for pygments"; homepage = "https://github.com/jupyterlab/jupyterlab_pygments"; - license = licenses.mit; + license = licenses.bsd3; maintainers = with maintainers; [ jonringer ]; }; } diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 4d668da9bde6b..747556206a19e 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; version = "3.0.9"; + format = "setuptools"; src = fetchPypi { pname = "jupyterlab_widgets"; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 6a6acff7aaf3a..ae4437216fdc6 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -15,19 +15,18 @@ , jinja2 , tomli , pythonOlder -, jupyter-packaging }: buildPythonPackage rec { pname = "jupyterlab"; - version = "4.0.6"; - format = "pyproject"; + version = "4.0.9"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bEOuWmof0v36/LNFQASVi95tp2Mxq7RM/8b55Daxm6E="; + hash = "sha256-nrraQdUmUfYjwMnwad24oh1oSOTIh9jl3cBhMWbtXAs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index e5bc170509d22..f88b56fef6628 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -1,86 +1,66 @@ { lib , stdenv , buildPythonPackage -, fetchFromGitHub -, gitpython -, isort +, fetchPypi +, hatch-jupyter-builder +, hatchling , jupyter-client -, jupyter-packaging -, jupyterlab , markdown-it-py , mdit-py-plugins , nbformat , notebook +, packaging +, pytest-xdist , pytestCheckHook , pythonOlder , pyyaml -, setuptools , toml -, wheel }: buildPythonPackage rec { pname = "jupytext"; - version = "1.15.2"; - format = "pyproject"; + version = "1.16.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "mwouts"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-GvMoz2BsYWk0atrT3xmSnbV7AuO5RJoM/bOJlZ5YIn4="; + src = fetchPypi { + inherit pname version; + hash = "sha256-lMfmd3XpDheSw5q3/KTgRZv3w1ZWEj6Nwunhs+lTuvg="; }; - # Follow https://github.com/mwouts/jupytext/pull/1119 to see if the patch - # relaxing jupyter_packaging version can be cleaned up. - # - # Follow https://github.com/mwouts/jupytext/pull/1077 to see when the patch - # relaxing jupyterlab version can be cleaned up. - # - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'jupyter_packaging~=' 'jupyter_packaging>=' \ - --replace 'jupyterlab>=3,<=4' 'jupyterlab>=3' - ''; - nativeBuildInputs = [ - jupyter-packaging - jupyterlab - setuptools - wheel + hatch-jupyter-builder + hatchling ]; propagatedBuildInputs = [ markdown-it-py mdit-py-plugins nbformat + packaging pyyaml toml ]; nativeCheckInputs = [ - gitpython - isort jupyter-client notebook + pytest-xdist pytestCheckHook ]; preCheck = '' # Tests that use a Jupyter notebook require $HOME to be writable export HOME=$(mktemp -d); + export PATH=$out/bin:$PATH; ''; - pytestFlagsArray = [ - # Pre-commit tests expect the source directory to be a Git repository - "--ignore-glob='tests/test_pre_commit_*.py'" + disabledTestPaths = [ + "tests/external" ]; - disabledTests = [ - "test_apply_black_through_jupytext" # we can't do anything about ill-formatted notebooks - ] ++ lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.isDarwin [ # requires access to trash "test_load_save_rename" ]; @@ -93,8 +73,9 @@ buildPythonPackage rec { meta = with lib; { description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts"; homepage = "https://github.com/mwouts/jupytext"; - changelog = "https://github.com/mwouts/jupytext/releases/tag/${src.rev}"; + changelog = "https://github.com/mwouts/jupytext/releases/tag/v${version}"; license = licenses.mit; maintainers = teams.jupyter.members; + mainProgram = "jupytext"; }; } diff --git a/pkgs/development/python-modules/justbases/default.nix b/pkgs/development/python-modules/justbases/default.nix index dfa4d254654cb..3b24726087be1 100644 --- a/pkgs/development/python-modules/justbases/default.nix +++ b/pkgs/development/python-modules/justbases/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "justbases"; version = "0.15.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "mulkieran"; diff --git a/pkgs/development/python-modules/justbytes/default.nix b/pkgs/development/python-modules/justbytes/default.nix index f517c30c01b31..834ced10ab4b9 100644 --- a/pkgs/development/python-modules/justbytes/default.nix +++ b/pkgs/development/python-modules/justbytes/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "justbytes"; version = "0.15.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "mulkieran"; diff --git a/pkgs/development/python-modules/justnimbus/default.nix b/pkgs/development/python-modules/justnimbus/default.nix index ecea9ef4a549a..013e4670aa8f5 100644 --- a/pkgs/development/python-modules/justnimbus/default.nix +++ b/pkgs/development/python-modules/justnimbus/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "justnimbus"; - version = "0.7.2"; - format = "pyproject"; + version = "0.7.3"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "kvanzuijlen"; - repo = pname; + repo = "justnimbus"; rev = "refs/tags/${version}"; - hash = "sha256-arUdjZiEJx0L1YcCNxqlE4ItoTEzd/TYVgqDPIqomMg="; + hash = "sha256-JO8T0JItkkNHxlnDKOO8kM9KSzT7QML4sszPymgXSBA="; }; nativeBuildInputs = [ @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for the JustNimbus API"; homepage = "https://github.com/kvanzuijlen/justnimbus"; + changelog = "https://github.com/kvanzuijlen/justnimbus/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/jwt/default.nix b/pkgs/development/python-modules/jwt/default.nix index 7e21b4f45a214..95c01cb64bc1c 100644 --- a/pkgs/development/python-modules/jwt/default.nix +++ b/pkgs/development/python-modules/jwt/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "jwt"; version = "1.3.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/jxmlease/default.nix b/pkgs/development/python-modules/jxmlease/default.nix index a9782ef2d40fc..f561d256e1c3e 100644 --- a/pkgs/development/python-modules/jxmlease/default.nix +++ b/pkgs/development/python-modules/jxmlease/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "jxmlease"; version = "1.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/k-diffusion/default.nix b/pkgs/development/python-modules/k-diffusion/default.nix index 4a2c6f0a1d32c..8393bc6309f02 100644 --- a/pkgs/development/python-modules/k-diffusion/default.nix +++ b/pkgs/development/python-modules/k-diffusion/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "k-diffusion"; - version = "0.1.1"; + version = "0.1.1.post1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "crowsonkb"; repo = "k-diffusion"; rev = "refs/tags/v${version}"; - hash = "sha256-ef4NhViHQcV+4T+GXpg+Qev5IC0Cid+XWE3sFVx7w4w="; + hash = "sha256-x/UHzobQv5ov0luUHqC8OA5YbtF+aWL39/SQtzTm0RM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index a4620c14882d7..aa7d1c172c678 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "k5test"; version = "0.10.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/kaa-base/default.nix b/pkgs/development/python-modules/kaa-base/default.nix index 5b789f5eda8c3..96c83a4ac81dc 100644 --- a/pkgs/development/python-modules/kaa-base/default.nix +++ b/pkgs/development/python-modules/kaa-base/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "0.99.2dev-384-2b73caca"; + format = "setuptools"; pname = "kaa-base"; src = fetchPypi { diff --git a/pkgs/development/python-modules/kaa-metadata/default.nix b/pkgs/development/python-modules/kaa-metadata/default.nix index 5a50d9e9c0a6a..de71d207b8768 100644 --- a/pkgs/development/python-modules/kaa-metadata/default.nix +++ b/pkgs/development/python-modules/kaa-metadata/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { version = "0.7.8dev-r4569-20111003"; + format = "setuptools"; pname = "kaa-metadata"; disabled = isPyPy || isPy3k; diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 089c4a8ffc0ad..9e73dbe9bd198 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "2.0.2"; + format = "setuptools"; pname = "kafka-python"; src = fetchPypi { diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index ce68748ac7e29..acb26d76933de 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "kaggle"; version = "1.5.16"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index c6f8ebf7eaf01..71ad13fadb550 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -17,6 +17,7 @@ in buildPythonPackage rec { pname = "kaitaistruct"; version = "0.10"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index a1ef7e314656e..10d819bf8c52a 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -24,6 +24,7 @@ in buildPythonPackage rec { pname = "kaldi-active-grammar"; version = "3.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "daanzu"; diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index 4799e1503e600..fe11b2538cce4 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "kazoo"; version = "2.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix index ba8fecc470b74..4e133e40df011 100644 --- a/pkgs/development/python-modules/kconfiglib/default.nix +++ b/pkgs/development/python-modules/kconfiglib/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "kconfiglib"; version = "14.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix index 176924b5fd1bf..e381feb6dd4ef 100644 --- a/pkgs/development/python-modules/keep/default.nix +++ b/pkgs/development/python-modules/keep/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "keep"; version = "2.10.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index ca4f3c863e67d..a651165246335 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "keepkey"; version = "7.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "keepkey"; diff --git a/pkgs/development/python-modules/keepkey_agent/default.nix b/pkgs/development/python-modules/keepkey_agent/default.nix index fc00b23ce5096..cfd70967ee2ef 100644 --- a/pkgs/development/python-modules/keepkey_agent/default.nix +++ b/pkgs/development/python-modules/keepkey_agent/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "keepkey_agent"; version = "0.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix index a584e38810fc5..4c5a8027e22dd 100644 --- a/pkgs/development/python-modules/kerberos/default.nix +++ b/pkgs/development/python-modules/kerberos/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "kerberos"; version = "1.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/keyboard/default.nix b/pkgs/development/python-modules/keyboard/default.nix index c54f8f5fcd7f1..20b3453dab0d1 100644 --- a/pkgs/development/python-modules/keyboard/default.nix +++ b/pkgs/development/python-modules/keyboard/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "keyboard"; version = "0.13.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "boppreh"; diff --git a/pkgs/development/python-modules/keystone-engine/default.nix b/pkgs/development/python-modules/keystone-engine/default.nix index 7c3cf2e70d838..5b392186c9526 100644 --- a/pkgs/development/python-modules/keystone-engine/default.nix +++ b/pkgs/development/python-modules/keystone-engine/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "keystone-engine"; version = "0.9.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 134f5af0632f9..815ef3aa3104f 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { pname = "keystoneauth1"; version = "5.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index c387c10ebc34e..3782a3b23626d 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "keyutils"; version = "0.6"; + format = "setuptools"; # github version comes bundled with tests src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/kinparse/default.nix b/pkgs/development/python-modules/kinparse/default.nix index 95632f9ce9f2d..3352d25a3c078 100644 --- a/pkgs/development/python-modules/kinparse/default.nix +++ b/pkgs/development/python-modules/kinparse/default.nix @@ -9,6 +9,7 @@ buildPythonPackage { pname = "kinparse"; version = "unstable-2019-12-18"; + format = "setuptools"; src = fetchFromGitHub { owner = "xesscorp"; diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index 0d393d0e8ae5e..b46c2c65eee37 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "klaus"; version = "2.0.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "jonashaag"; diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index 86d9f2b5f7987..c4f99ca613f51 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "kmapper"; version = "2.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "scikit-tda"; diff --git a/pkgs/development/python-modules/konnected/default.nix b/pkgs/development/python-modules/konnected/default.nix index b2117aab2d5db..c279223a52685 100644 --- a/pkgs/development/python-modules/konnected/default.nix +++ b/pkgs/development/python-modules/konnected/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "konnected"; version = "1.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/pkgs/development/python-modules/korean-lunar-calendar/default.nix index 3a172d73a393d..e9c7431b47df7 100644 --- a/pkgs/development/python-modules/korean-lunar-calendar/default.nix +++ b/pkgs/development/python-modules/korean-lunar-calendar/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "korean-lunar-calendar"; version = "0.3.1"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/kornia/default.nix b/pkgs/development/python-modules/kornia/default.nix index 5d98379045eda..a00b3d6487d30 100644 --- a/pkgs/development/python-modules/kornia/default.nix +++ b/pkgs/development/python-modules/kornia/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "kornia"; - version = "0.7.0"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XcQXKn4F3DIgn+XQcN5ZcGZLehd/IPBgLuGzIkPSxZg="; + hash = "sha256-gHMrA4Uzazpw4TdswrXdoZG4+ek5g+wtLXNmhH3SlOM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/krakenex/default.nix b/pkgs/development/python-modules/krakenex/default.nix index bf907eb847dee..04b114194f68b 100644 --- a/pkgs/development/python-modules/krakenex/default.nix +++ b/pkgs/development/python-modules/krakenex/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "krakenex"; version = "2.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "veox"; diff --git a/pkgs/development/python-modules/kurbopy/default.nix b/pkgs/development/python-modules/kurbopy/default.nix index aa5e33f237577..e4665998534d3 100644 --- a/pkgs/development/python-modules/kurbopy/default.nix +++ b/pkgs/development/python-modules/kurbopy/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "kurbopy"; version = "0.10.40"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/l18n/default.nix b/pkgs/development/python-modules/l18n/default.nix index cab48d4376f8e..29c4164097f96 100644 --- a/pkgs/development/python-modules/l18n/default.nix +++ b/pkgs/development/python-modules/l18n/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "l18n"; version = "2021.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index cf71b36b3c2ba..d79aba465eeed 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.56.0"; + version = "3.58.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; rev = "refs/tags/v.${version}"; - hash = "sha256-JRh14XpW/iGeBWrslm7weCP/vyJ7eZICqRgQpE2wjXs="; + hash = "sha256-H6fn+TpfYbu/warhr9XcQjfxSThIjBp9XwelA5ZvTBE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index aa4b10d49d5f7..4a66ff5a364ac 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -25,13 +25,13 @@ buildPythonPackage rec { pname = "labgrid"; - version = "23.0.3"; + version = "23.0.4"; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; rev = "refs/tags/v${version}"; - sha256 = "sha256-yhlBqqCLOt6liw4iv8itG6E4QfIa7cW76QJqefUM5dw="; + sha256 = "sha256-EEPQSIHKAmLPudv7LLm9ol3Kukgz8edYKfDi+wvERpk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/langdetect/default.nix b/pkgs/development/python-modules/langdetect/default.nix index 5d3dae1580603..a50cbe73a32dc 100644 --- a/pkgs/development/python-modules/langdetect/default.nix +++ b/pkgs/development/python-modules/langdetect/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "langdetect"; version = "1.0.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 78337124ca8f5..a24fc80db16c4 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.0.69"; + version = "0.0.75"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-LP97bGCmLw2uFcFdFcDWM7hSuki7r7T6WFHI6i3rF34="; + hash = "sha256-BbDB3xP3OCRXxbOqFIzFNrpK5+wHbIZ/VlurNXrXpTw="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/language-tags/default.nix b/pkgs/development/python-modules/language-tags/default.nix index 2d3f68f82cea6..24cd835b14d6f 100644 --- a/pkgs/development/python-modules/language-tags/default.nix +++ b/pkgs/development/python-modules/language-tags/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "language-tags"; version = "1.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "OnroerendErfgoed"; diff --git a/pkgs/development/python-modules/latex2mathml/default.nix b/pkgs/development/python-modules/latex2mathml/default.nix index 4ff8ba6df59bd..99d9dcc5fb741 100644 --- a/pkgs/development/python-modules/latex2mathml/default.nix +++ b/pkgs/development/python-modules/latex2mathml/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "latex2mathml"; - version = "3.76.0"; + version = "3.77.0"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "roniemartinez"; repo = pname; rev = version; - hash = "sha256-CoWXWgu1baM5v7OC+OlRHZB0NkPue4qFzylJk4Xq2e4="; + hash = "sha256-DLdSFMsNA0gD6Iw0kn+0IrbvyI0VEGOpz0ZYD48nRkY="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index be38086592202..ef677b82e03d2 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "latexcodec"; version = "2.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index a3367cc9bd4fc..2eec2c6e2827a 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; version = "1.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/lazy/default.nix b/pkgs/development/python-modules/lazy/default.nix index 1e5f72ff803c9..0403b47f53244 100644 --- a/pkgs/development/python-modules/lazy/default.nix +++ b/pkgs/development/python-modules/lazy/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "lazy"; version = "1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix index f3812f0723d02..1fd6ed4426886 100644 --- a/pkgs/development/python-modules/lazy_import/default.nix +++ b/pkgs/development/python-modules/lazy_import/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "lazy_import"; version = "0.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/lcd-i2c/default.nix b/pkgs/development/python-modules/lcd-i2c/default.nix new file mode 100644 index 0000000000000..7ba9be221dde1 --- /dev/null +++ b/pkgs/development/python-modules/lcd-i2c/default.nix @@ -0,0 +1,34 @@ +{ lib +, python3 +, fetchPypi +, buildPythonPackage +, smbus2 +, poetry-core +}: + +buildPythonPackage rec { + pname = "lcd-i2c"; + version = "0.2.3"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-NYBaCXBmuTziT0WYEqrW10HRmRy3jpjH3YWQh5Y/TdQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + smbus2 + ]; + + meta = with lib; { + description = "Library for interacting with an I2C LCD screen through Python"; + homepage = "https://pypi.org/project/lcd-i2c/"; + license = licenses.mit; + maintainers = with maintainers; [ oliver-koss ]; + mainProgram = "lcd-i2c"; + }; +} diff --git a/pkgs/development/python-modules/lcgit/default.nix b/pkgs/development/python-modules/lcgit/default.nix index 967ef29fe2a2d..0bb27d54cb1ac 100644 --- a/pkgs/development/python-modules/lcgit/default.nix +++ b/pkgs/development/python-modules/lcgit/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lcgit"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "cisagov"; repo = "lcgit"; rev = "refs/tags/v${version}"; - hash = "sha256-MYRqlfz2MRayBT7YGZmcyqJdoDRfENmgxk/TmhyoAlQ="; + hash = "sha256-bLeblC68+j+YwvgnV1wgJiWm/jxZFzhTSDwXpoSzUTg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lcov_cobertura/default.nix b/pkgs/development/python-modules/lcov_cobertura/default.nix index a40265c76c882..07be936d7aa6d 100644 --- a/pkgs/development/python-modules/lcov_cobertura/default.nix +++ b/pkgs/development/python-modules/lcov_cobertura/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "lcov_cobertura"; version = "2.0.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 530a8d7ec0dd0..c04ec4e49c4cb 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ldap3"; version = "2.9.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index a95db86509800..2cb2155bfed4e 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "ldappool"; version = "3.0.0"; + format = "setuptools"; src = fetchPypi { pname = "ldappool"; diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index e100690e6b7ad..633e7aa967a24 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "ldaptor"; version = "21.2.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index 99977e7c6a2f2..e51f5f4588683 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "leather"; version = "0.3.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/leb128/default.nix b/pkgs/development/python-modules/leb128/default.nix index b206de136219c..4247a4ff75495 100644 --- a/pkgs/development/python-modules/leb128/default.nix +++ b/pkgs/development/python-modules/leb128/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "leb128"; version = "1.0.5"; + format = "setuptools"; # fetchPypi doesn't include files required for tests src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/ledger_agent/default.nix b/pkgs/development/python-modules/ledger_agent/default.nix index 8a0ace1264580..3ac9e167a0387 100644 --- a/pkgs/development/python-modules/ledger_agent/default.nix +++ b/pkgs/development/python-modules/ledger_agent/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "ledger_agent"; version = "0.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/leveldb/default.nix b/pkgs/development/python-modules/leveldb/default.nix index 212f13d00cf8a..e275d41f89158 100644 --- a/pkgs/development/python-modules/leveldb/default.nix +++ b/pkgs/development/python-modules/leveldb/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "leveldb"; version = "0.201"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/lexid/default.nix b/pkgs/development/python-modules/lexid/default.nix index 5ab5953aef62b..788cb1e2056be 100644 --- a/pkgs/development/python-modules/lexid/default.nix +++ b/pkgs/development/python-modules/lexid/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "lexid"; version = "2021.1006"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 61d58ea468c1c..5b537f0c00842 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { pname = "libagent"; version = "0.14.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "romanz"; diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix index 5f63653e3c43c..44213cdd14cf3 100644 --- a/pkgs/development/python-modules/libevdev/default.nix +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "libevdev"; version = "0.11"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 699bbabdfc763..710ef3dd1398c 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "libgpuarray"; version = "0.7.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "Theano"; diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix index aa922db9c1024..14bbdb1ec0092 100644 --- a/pkgs/development/python-modules/libkeepass/default.nix +++ b/pkgs/development/python-modules/libkeepass/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "libkeepass"; version = "0.3.1.post1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 1913d07651337..fd5b0451381bc 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.3.2"; + version = "3.3.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-uttdIl2ONoR9ba6gJXmJkU++UQldcezwTUG+X5mCcbE="; + hash = "sha256-w8VAA+llRg1xeAMRe7ISHo8H+qGi247jwOjTZHecFVM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix index 45c020b537204..a133b5382441b 100644 --- a/pkgs/development/python-modules/liblarch/default.nix +++ b/pkgs/development/python-modules/liblarch/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { version = "3.2.0"; + format = "setuptools"; pname = "liblarch"; disabled = pythonOlder "3.5.0"; diff --git a/pkgs/development/python-modules/libmr/default.nix b/pkgs/development/python-modules/libmr/default.nix index d775cc7b245b0..c852ce160cd3e 100644 --- a/pkgs/development/python-modules/libmr/default.nix +++ b/pkgs/development/python-modules/libmr/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "libmr"; version = "0.1.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/libpcap/default.nix b/pkgs/development/python-modules/libpcap/default.nix index d094e7715fcaf..2da09a58df910 100644 --- a/pkgs/development/python-modules/libpcap/default.nix +++ b/pkgs/development/python-modules/libpcap/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/karpierz/libpcap/"; license = licenses.bsd3; - maintainers = [ teams.ororatech ]; + maintainers = teams.ororatech.members; }; } diff --git a/pkgs/development/python-modules/libpurecool/default.nix b/pkgs/development/python-modules/libpurecool/default.nix index aa523d9a98bf3..3e29ea73e2c9d 100644 --- a/pkgs/development/python-modules/libpurecool/default.nix +++ b/pkgs/development/python-modules/libpurecool/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "libpurecool"; version = "0.6.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/libsass/default.nix b/pkgs/development/python-modules/libsass/default.nix index 8a6bc51066367..4996dfc1169e6 100644 --- a/pkgs/development/python-modules/libsass/default.nix +++ b/pkgs/development/python-modules/libsass/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "libsass"; version = "0.22.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "sass"; diff --git a/pkgs/development/python-modules/libsixel/default.nix b/pkgs/development/python-modules/libsixel/default.nix index c061b51ab849f..37bf32f31fd61 100644 --- a/pkgs/development/python-modules/libsixel/default.nix +++ b/pkgs/development/python-modules/libsixel/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = libsixel.version; + format = "setuptools"; pname = "libsixel"; src = libsixel.src; diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index 2abd187d0476e..0ca972c8bade8 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "libsoundtouch"; version = "0.8.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "CharlesBlonde"; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index bdafac9426363..b61b78a86321a 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "libusb1"; version = "3.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/libusbsio/default.nix b/pkgs/development/python-modules/libusbsio/default.nix index b6cab59570b92..918bb71726665 100644 --- a/pkgs/development/python-modules/libusbsio/default.nix +++ b/pkgs/development/python-modules/libusbsio/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { pname = "libusbsio"; + format = "setuptools"; inherit (libusbsio) version; src = "${libusbsio.src}/python"; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 3e5d6af48afaf..de5a75ee9eea4 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,14 @@ buildPythonPackage rec { pname = "libvirt"; - version = "9.9.0"; + version = "9.10.0"; + format = "setuptools"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-cajKzRRhKCUKWm+1p3xvCyEbVB2R/70WY584o7V+XaY="; + hash = "sha256-7qJieTLPzyHvhOLUsti4Mbt94iba2eTZd6OvPn3uLEA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index e3fd2a8ecbae0..a2d958bc1083c 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "life360"; - version = "6.0.0"; + version = "6.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pnbruckner"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GRQPH7fp8YkkCEpXtvgFxJO6VLFQK/PBaRe0Tfg3KdU="; + hash = "sha256-USqSkjOHlH0K/RlRYpn/gz6dHW8/uEVpsc4HeUZ3Emg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lightparam/default.nix b/pkgs/development/python-modules/lightparam/default.nix index 936cc9a06269b..0d1e232bb195b 100644 --- a/pkgs/development/python-modules/lightparam/default.nix +++ b/pkgs/development/python-modules/lightparam/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "lightparam"; version = "0.4.6"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/lima/default.nix b/pkgs/development/python-modules/lima/default.nix index 6174a4d764108..462c104c25f24 100644 --- a/pkgs/development/python-modules/lima/default.nix +++ b/pkgs/development/python-modules/lima/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "lima"; version = "0.5"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/limitlessled/default.nix b/pkgs/development/python-modules/limitlessled/default.nix index 6d12f6d51496d..79a8c1136ce5a 100644 --- a/pkgs/development/python-modules/limitlessled/default.nix +++ b/pkgs/development/python-modules/limitlessled/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "limitlessled"; version = "1.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 0cc2d73d969b1..b791095ed68d2 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.9.24"; + version = "2023.11.18"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-VJXIuGcgwAEObCCah+yc/o3IEpe4ln5F4wVwCy54Auc="; + hash = "sha256-Ftm5OGTt1emQsYso3hAUA9yMNBkIK5jybdFaRKJJk0o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/linecache2/default.nix b/pkgs/development/python-modules/linecache2/default.nix index 4231ed43ad5b6..1c4b2032f0d1b 100644 --- a/pkgs/development/python-modules/linecache2/default.nix +++ b/pkgs/development/python-modules/linecache2/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "linecache2"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/lineedit/default.nix b/pkgs/development/python-modules/lineedit/default.nix index 5631054627646..9f7bc9f2e371f 100644 --- a/pkgs/development/python-modules/lineedit/default.nix +++ b/pkgs/development/python-modules/lineedit/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "lineedit"; version = "0.1.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "randy3k"; diff --git a/pkgs/development/python-modules/linien-client/default.nix b/pkgs/development/python-modules/linien-client/default.nix new file mode 100644 index 0000000000000..0cbd9b2d9adb0 --- /dev/null +++ b/pkgs/development/python-modules/linien-client/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, linien-common +, setuptools +, fabric +, typing-extensions +, numpy +, scipy +}: + +buildPythonPackage rec { + pname = "linien-client"; + pyproject = true; + + inherit (linien-common) src version; + + sourceRoot = "source/linien-client"; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + fabric + typing-extensions + numpy + scipy + linien-common + ]; + + pythonImportsCheck = [ "linien_client" ]; + + meta = with lib; { + description = "Client components of the Linien spectroscopy lock application"; + homepage = "https://github.com/linien-org/linien/tree/develop/linien-client"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fsagbuya doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/linien-common/default.nix b/pkgs/development/python-modules/linien-common/default.nix new file mode 100644 index 0000000000000..de05fab7f74d9 --- /dev/null +++ b/pkgs/development/python-modules/linien-common/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, importlib-metadata +, numpy +, rpyc +, scipy +, appdirs +, callPackage +}: + +buildPythonPackage rec { + pname = "linien-common"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "linien-org"; + repo = "linien"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZgAp1SEiHijyjK74VZyRLYY3Hzfc3BQ6cnoO3hZzvbE="; + }; + + sourceRoot = "source/linien-common"; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + importlib-metadata + numpy + rpyc + scipy + appdirs + ]; + + pythonImportsCheck = [ "linien_common" ]; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + + meta = with lib; { + description = "Shared components of the Linien spectroscopy lock application"; + homepage = "https://github.com/linien-org/linien/tree/develop/linien-common"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fsagbuya doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/linien-common/tests.nix b/pkgs/development/python-modules/linien-common/tests.nix new file mode 100644 index 0000000000000..7237548f2da36 --- /dev/null +++ b/pkgs/development/python-modules/linien-common/tests.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, linien-common +, linien-client +, pytestCheckHook +}: + +buildPythonPackage { + pname = "linien-tests"; + inherit (linien-common) version src; + format = "other"; + pyproject = false; + + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + linien-common + linien-client + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; +} diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 4c1b77bf86a9b..0f210be88119f 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "linode-api"; version = "5.7.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; # Sources from Pypi exclude test fixtures diff --git a/pkgs/development/python-modules/linode/default.nix b/pkgs/development/python-modules/linode/default.nix index c7a60201ee883..7f4d9b0dbd838 100644 --- a/pkgs/development/python-modules/linode/default.nix +++ b/pkgs/development/python-modules/linode/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "linode"; version = "0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/linuxfd/default.nix b/pkgs/development/python-modules/linuxfd/default.nix index 7d968c1914414..e9904d8d454eb 100644 --- a/pkgs/development/python-modules/linuxfd/default.nix +++ b/pkgs/development/python-modules/linuxfd/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "linuxfd"; version = "1.5"; + format = "setuptools"; src = fetchPypi { diff --git a/pkgs/development/python-modules/lit/default.nix b/pkgs/development/python-modules/lit/default.nix index 1467dfaa1f6dc..695a23d90ac58 100644 --- a/pkgs/development/python-modules/lit/default.nix +++ b/pkgs/development/python-modules/lit/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "lit"; version = "17.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index d25adcdf65c09..a359e96a0b5a0 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -15,7 +15,7 @@ , httpx }: let - version = "1.7.11"; + version = "1.15.0"; in buildPythonPackage rec { pname = "litellm"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-B2LGaA6A+pU2aDzPS2d5stY+Z8Wxq3BkXB1CLY6vBiY="; + hash = "sha256-s3Ue/N04YZHEfEnVxPHupRSVDHxWjVse8FDlRF5yKCk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix index dd7a19c22484f..2218c01d64243 100644 --- a/pkgs/development/python-modules/livelossplot/default.nix +++ b/pkgs/development/python-modules/livelossplot/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "livelossplot"; version = "0.5.5"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix index de2064538047e..2b99995f91ccd 100644 --- a/pkgs/development/python-modules/livereload/default.nix +++ b/pkgs/development/python-modules/livereload/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "livereload"; version = "2.6.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "lepture"; diff --git a/pkgs/development/python-modules/livestreamer-curses/default.nix b/pkgs/development/python-modules/livestreamer-curses/default.nix deleted file mode 100644 index 213caaf4fb30e..0000000000000 --- a/pkgs/development/python-modules/livestreamer-curses/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, isPyPy -, livestreamer -}: - -buildPythonPackage rec { - pname = "livestreamer-curses"; - version = "1.5.2"; - disabled = isPyPy; - - src = fetchFromGitHub { - owner = "gapato"; - repo = "livestreamer-curses"; - rev = "v${version}"; - hash = "sha256-Pi0PIOUhMMAWft9ackB04IgF6DyPrXppNqyVjozIjN4="; - }; - - propagatedBuildInputs = [ livestreamer ]; - - meta = with lib; { - homepage = "https://github.com/gapato/livestreamer-curses"; - description = "Curses frontend for livestreamer"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix deleted file mode 100644 index c7c4b06a97465..0000000000000 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, isPyPy -, makeWrapper -, rtmpdump -, pycrypto -, requests -}: - -buildPythonPackage rec { - pname = "livestreamer"; - version = "1.12.2"; - disabled = isPyPy; - - src = fetchFromGitHub { - owner = "chrippa"; - repo = "livestreamer"; - rev = "v${version}"; - hash = "sha256-PqqyBh+oMmu7Ynly3fqx/+6mQYX+6SpI0Okj2O+YLz0="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - propagatedBuildInputs = [ rtmpdump pycrypto requests ]; - - postInstall = '' - wrapProgram $out/bin/livestreamer --prefix PATH : ${lib.makeBinPath [ rtmpdump ]} - ''; - - meta = with lib; { - homepage = "http://livestreamer.tanuki.se"; - description = "Livestreamer is CLI program that extracts streams from various services and pipes them into a video player of choice"; - license = licenses.bsd2; - maintainers = with maintainers; [ ]; - }; - -} diff --git a/pkgs/development/python-modules/lizard/default.nix b/pkgs/development/python-modules/lizard/default.nix index b54e910cac456..39b35e3306a9b 100644 --- a/pkgs/development/python-modules/lizard/default.nix +++ b/pkgs/development/python-modules/lizard/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "lizard"; version = "1.17.10"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index e3afe80624fb0..925c449ae9988 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { # requires at least this version of llvmlite (also not yet officially # released, but at least tagged). version = "0.41.0dev0"; + format = "setuptools"; disabled = isPyPy || !isPy3k; diff --git a/pkgs/development/python-modules/lml/default.nix b/pkgs/development/python-modules/lml/default.nix index e1d900ba65746..4ad69e15a4292 100644 --- a/pkgs/development/python-modules/lml/default.nix +++ b/pkgs/development/python-modules/lml/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "lml"; version = "0.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index bb27c29173b1e..1924c93a3ea99 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "lmtpd"; version = "6.2.0"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/localimport/default.nix b/pkgs/development/python-modules/localimport/default.nix index c5bc45aae4f26..9cb001af86a2f 100644 --- a/pkgs/development/python-modules/localimport/default.nix +++ b/pkgs/development/python-modules/localimport/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "localimport"; version = "1.7.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/localstack-client/default.nix b/pkgs/development/python-modules/localstack-client/default.nix index 65744f35d075f..b78cc3da7633c 100644 --- a/pkgs/development/python-modules/localstack-client/default.nix +++ b/pkgs/development/python-modules/localstack-client/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "localstack-client"; version = "1.39"; + format = "setuptools"; src = fetchFromGitHub { owner = "localstack"; diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index f312371afe9d6..90e743f839e72 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "localstack-ext"; version = "2.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index 663b20e5355f6..6a408c9359205 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { pname = "localstack"; version = "3.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "localstack"; diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix index c84cd1c893b2c..84c5acd276901 100644 --- a/pkgs/development/python-modules/localzone/default.nix +++ b/pkgs/development/python-modules/localzone/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "localzone"; version = "0.9.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "ags-slc"; diff --git a/pkgs/development/python-modules/lockfile/default.nix b/pkgs/development/python-modules/lockfile/default.nix index 2368c4415ba40..0fb64ad0baf9f 100644 --- a/pkgs/development/python-modules/lockfile/default.nix +++ b/pkgs/development/python-modules/lockfile/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "lockfile"; version = "0.12.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index d8251a40099f0..c58f617b10f86 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "logbook"; - version = "1.6.0"; + version = "1.7.0.post0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "getlogbook"; repo = "logbook"; rev = "refs/tags/${version}"; - hash = "sha256-2K6fM6MFrh3l0smhSz8RFd79AIOXQZJQbNLTJM4WZUo="; + hash = "sha256-bqfFSd7CPYII/3AJCMApqmAYrAWjecOb3JA17FPFMIc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix index 6e78dc850ed03..c129202dbf168 100644 --- a/pkgs/development/python-modules/logical-unification/default.nix +++ b/pkgs/development/python-modules/logical-unification/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "logical-unification"; version = "0.4.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "pythological"; diff --git a/pkgs/development/python-modules/logster/default.nix b/pkgs/development/python-modules/logster/default.nix index 7f3a4eeb83b84..d0603fcdf0b36 100644 --- a/pkgs/development/python-modules/logster/default.nix +++ b/pkgs/development/python-modules/logster/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "logster"; version = "1.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "etsy"; diff --git a/pkgs/development/python-modules/logzero/default.nix b/pkgs/development/python-modules/logzero/default.nix index 5e6b45fa7f465..fa35ca73b51ec 100644 --- a/pkgs/development/python-modules/logzero/default.nix +++ b/pkgs/development/python-modules/logzero/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "logzero"; version = "1.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix index 4fbdf5a2f8231..f8389fc46fcdc 100644 --- a/pkgs/development/python-modules/lomond/default.nix +++ b/pkgs/development/python-modules/lomond/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "lomond"; version = "0.3.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "wildfoundry"; diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index ee84d47edf552..fbc65794da262 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.2"; + version = "1.19.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-JaXADzNxRqumjx6FZxJj6ioMVdUMR6S1FQQ6QcP8S5Q="; + hash = "sha256-Ppy7vOA7ix76nvzVEP+BkL8dsoN0oXNX/5IZyhXDoSw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lrcalc-python/default.nix b/pkgs/development/python-modules/lrcalc-python/default.nix index 66c0ad46e5b70..f425ec23775a0 100644 --- a/pkgs/development/python-modules/lrcalc-python/default.nix +++ b/pkgs/development/python-modules/lrcalc-python/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "lrcalc-python"; version = "2.1"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/lsprotocol/default.nix b/pkgs/development/python-modules/lsprotocol/default.nix index 5ee4d3ed11260..06776c0eec3e2 100644 --- a/pkgs/development/python-modules/lsprotocol/default.nix +++ b/pkgs/development/python-modules/lsprotocol/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "lsprotocol"; - version = "2023.0.0b1"; + version = "2023.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Y/Mp/8MskRB6irNU3CBOKmo2Zt5S69h+GyMg71sQ9Uw="; + hash = "sha256-K5jocKVxMNoUYYUi9YO2+N7hHWj0MFLprqGOzsg1QRs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/luddite/default.nix b/pkgs/development/python-modules/luddite/default.nix index e70493e750c06..9996e3574ce37 100644 --- a/pkgs/development/python-modules/luddite/default.nix +++ b/pkgs/development/python-modules/luddite/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "luddite"; version = "1.0.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "jumptrading"; diff --git a/pkgs/development/python-modules/luhn/default.nix b/pkgs/development/python-modules/luhn/default.nix index 95d1cad3b807b..e0e0393ff1d38 100644 --- a/pkgs/development/python-modules/luhn/default.nix +++ b/pkgs/development/python-modules/luhn/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "luhn"; version = "0.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "mmcloughlin"; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index db531a65778f2..f6016ae3a9ed6 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "lxml"; version = "4.9.3-3"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/development/python-modules/lzstring/default.nix b/pkgs/development/python-modules/lzstring/default.nix index 499c720d53fb6..02602f1f8c20c 100644 --- a/pkgs/development/python-modules/lzstring/default.nix +++ b/pkgs/development/python-modules/lzstring/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "lzstring"; version = "1.0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index f8ec95604542e..7353831bad392 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , openssl @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "m2crypto"; - version = "0.39.0"; + version = "0.40.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "M2Crypto"; inherit version; - hash = "sha256-JMD0cTWLixmtTIqp2hLoaAMLZcH9syedAG32DJUBM4o="; + hash = "sha256-u/0RPsVXCMBYFiUqTwnkI33087v8gXHLvDMFfSV7uzA="; }; nativeBuildInputs = [ @@ -31,6 +32,11 @@ buildPythonPackage rec { parameterized ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=incompatible-pointer-types" + ]); + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 02dd3c540ac4b..ab94a0b5e262d 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "m2r"; version = "0.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/macropy/default.nix b/pkgs/development/python-modules/macropy/default.nix index d7b122396e0e1..051ce068b3179 100644 --- a/pkgs/development/python-modules/macropy/default.nix +++ b/pkgs/development/python-modules/macropy/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { # https://github.com/lihaoyi/macropy/issues/94 version = "1.1.0b2"; + format = "setuptools"; pname = "macropy"; disabled = isPy27; diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index 76eaca6be65b1..463b3560457d2 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "magic-wormhole-transit-relay"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 2f234cc635425..6926cc0e6958f 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "mahotas"; version = "1.4.13"; + format = "setuptools"; src = fetchFromGitHub { owner = "luispedro"; diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 42123445fc53a..4ecb12642ccd3 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "mail-parser"; version = "3.15.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "SpamScope"; diff --git a/pkgs/development/python-modules/mailchimp/default.nix b/pkgs/development/python-modules/mailchimp/default.nix index 787ecb0316f72..6308e7e8e6bba 100644 --- a/pkgs/development/python-modules/mailchimp/default.nix +++ b/pkgs/development/python-modules/mailchimp/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "2.0.10"; + format = "setuptools"; pname = "mailchimp"; src = fetchPypi { diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index 9eb72a8910454..03d6e587eafe7 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "makefun"; version = "1.15.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index cdfb682b5a65b..d9b3ecefc9ed5 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { pname = "mako"; version = "1.2.4"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/managesieve/default.nix b/pkgs/development/python-modules/managesieve/default.nix index 9e2515b0e7b56..74a12d9a58664 100644 --- a/pkgs/development/python-modules/managesieve/default.nix +++ b/pkgs/development/python-modules/managesieve/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "managesieve"; version = "0.7.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index 1480a002d0e26..26c76cbb16592 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "manhole"; version = "1.8.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index abec37fc5ed1b..8d87e6240982a 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "manuel"; version = "1.12.4"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/mapbox/default.nix b/pkgs/development/python-modules/mapbox/default.nix index 721a2ece39fdd..52d3eb2efbbc2 100644 --- a/pkgs/development/python-modules/mapbox/default.nix +++ b/pkgs/development/python-modules/mapbox/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "mapbox"; version = "0.18.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "mapbox"; diff --git a/pkgs/development/python-modules/mariadb/default.nix b/pkgs/development/python-modules/mariadb/default.nix index 54e31065a0895..cad6afb3cd52d 100644 --- a/pkgs/development/python-modules/mariadb/default.nix +++ b/pkgs/development/python-modules/mariadb/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "mariadb"; version = "1.1.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix index 21a457b5b34e4..6ed3d6f4bf390 100644 --- a/pkgs/development/python-modules/marisa/default.nix +++ b/pkgs/development/python-modules/marisa/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "marisa"; + format = "setuptools"; inherit (marisa) src version; nativeBuildInputs = [ swig ]; diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index ed3df6f804eb6..b7f580322fdf4 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -80,5 +80,6 @@ buildPythonPackage rec { changelog = "https://github.com/executablebooks/markdown-it-py/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; + mainProgram = "markdown-it"; }; } diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix index e0e41bf3d0a0e..2a15b4edb1c65 100644 --- a/pkgs/development/python-modules/markdown-macros/default.nix +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "markdown-macros"; version = "0.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index ac5e880886cf8..91c10116e1bde 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "markdown2"; version = "2.4.10"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/markdownify/default.nix b/pkgs/development/python-modules/markdownify/default.nix index 8b5942d61fa35..00af58297b92e 100644 --- a/pkgs/development/python-modules/markdownify/default.nix +++ b/pkgs/development/python-modules/markdownify/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "markdownify"; version = "0.11.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/markuppy/default.nix b/pkgs/development/python-modules/markuppy/default.nix index 14661a84b6231..fde9ae4ceec94 100644 --- a/pkgs/development/python-modules/markuppy/default.nix +++ b/pkgs/development/python-modules/markuppy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "markuppy"; version = "1.14"; + format = "setuptools"; src = fetchPypi { pname = "MarkupPy"; diff --git a/pkgs/development/python-modules/marshmallow-enum/default.nix b/pkgs/development/python-modules/marshmallow-enum/default.nix index 1d108b36867b0..d375901a0f3fd 100644 --- a/pkgs/development/python-modules/marshmallow-enum/default.nix +++ b/pkgs/development/python-modules/marshmallow-enum/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "marshmallow-enum"; version = "1.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "justanr"; diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index d54b070fbf14e..24d117eb322e9 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "marshmallow-polyfield"; version = "5.10"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 57e7728b1aa3d..5b880cfb5b09b 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "matchpy"; version = "0.5.5"; # Don't upgrade to 4.3.1, this tag is very old + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/matlink-gpapi/default.nix b/pkgs/development/python-modules/matlink-gpapi/default.nix index 1f8533748965f..3c3cda1bf8db0 100644 --- a/pkgs/development/python-modules/matlink-gpapi/default.nix +++ b/pkgs/development/python-modules/matlink-gpapi/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { version = "0.4.4.5"; + format = "setuptools"; pname = "matlink-gpapi"; disabled = pythonOlder "3.3"; # uses shutil.which(), added in 3.3 diff --git a/pkgs/development/python-modules/matplotlib-inline/default.nix b/pkgs/development/python-modules/matplotlib-inline/default.nix index f960882b1617c..90cbd00dc4d14 100644 --- a/pkgs/development/python-modules/matplotlib-inline/default.nix +++ b/pkgs/development/python-modules/matplotlib-inline/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "matplotlib-inline"; version = "0.1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/matplotlib-sixel/default.nix b/pkgs/development/python-modules/matplotlib-sixel/default.nix index 451f2a1a3dbea..e1d2e80f84c45 100644 --- a/pkgs/development/python-modules/matplotlib-sixel/default.nix +++ b/pkgs/development/python-modules/matplotlib-sixel/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "matplotlib-sixel"; version = "0.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 9816f9470c64d..c8975718b57c6 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "matrix-client"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { pname = "matrix_client"; diff --git a/pkgs/development/python-modules/mattermostdriver/default.nix b/pkgs/development/python-modules/mattermostdriver/default.nix index 629960797b037..2089569f9b77e 100644 --- a/pkgs/development/python-modules/mattermostdriver/default.nix +++ b/pkgs/development/python-modules/mattermostdriver/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "mattermostdriver"; version = "7.3.2"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/mayim/default.nix b/pkgs/development/python-modules/mayim/default.nix new file mode 100644 index 0000000000000..3cbc740aa4584 --- /dev/null +++ b/pkgs/development/python-modules/mayim/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel + +, psycopg +, aiosqlite +, asyncmy + +# test +, pytest-asyncio + +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mayim"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ahopkins"; + repo = "mayim"; + rev = "refs/tags/v${version}"; + hash = "sha256-nb0E9kMEJUihaCp8RnqGh0nSyDQo50eL1C4K5lBPlPQ="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=src --cov-append --cov-report term-missing" "" + ''; + + passthru.optional-dependencies = { + postgres = [ + psycopg + ] ++ psycopg.optional-dependencies.pool; + mysql = [ + asyncmy + ]; + sqlite = [ + aiosqlite + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ] ++ (with passthru.optional-dependencies; [postgres mysql sqlite]); + + pythonImportsCheck = [ + "mayim" + ]; + + meta = with lib; { + description = "Asynchronous SQL hydrator"; + homepage = "https://github.com/ahopkins/mayim"; + license = licenses.mit; + maintainers = with maintainers; [ huyngo ]; + }; +} diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 2a7d2d396f370..5de63b1888acd 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "mccabe"; version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix index c0b6eec7f8389..a8843f25b3cd5 100644 --- a/pkgs/development/python-modules/md2gemini/default.nix +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "md2gemini"; version = "1.9.1"; + format = "setuptools"; propagatedBuildInputs = [ mistune cjkwrap wcwidth ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mdutils/default.nix b/pkgs/development/python-modules/mdutils/default.nix index 53589394c4aad..7d8249547a834 100644 --- a/pkgs/development/python-modules/mdutils/default.nix +++ b/pkgs/development/python-modules/mdutils/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "mdutils"; version = "1.6.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "didix21"; diff --git a/pkgs/development/python-modules/mediafire-dl/default.nix b/pkgs/development/python-modules/mediafire-dl/default.nix new file mode 100644 index 0000000000000..3cc81a6ce09c1 --- /dev/null +++ b/pkgs/development/python-modules/mediafire-dl/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, requests +, six +, tqdm +}: + +buildPythonPackage { + pname = "mediafire-dl"; + version = "unstable-2023-09-07"; + + src = fetchFromGitHub { + owner = "Juvenal-Yescas"; + repo = "mediafire-dl"; + rev = "bf9d461f43c5d5dc2900e08bcd4202a597a07ca0"; + hash = "sha256-9qACTNMkO/CH/qB6WiggIKwSiFIccgU7CH0UeGUaFb4="; + }; + + propagatedBuildInputs = [ + requests + six + tqdm + ]; + + pythonImportsCheck = [ + "mediafire_dl" + ]; + + meta = with lib; { + description = "Simple command-line script to download files from mediafire based on gdown"; + homepage = "https://github.com/Juvenal-Yescas/mediafire-dl"; + license = licenses.mit; + maintainers = with maintainers; [ pacien ]; + mainProgram = "mediafire-dl"; + }; +} diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 2c58382a47794..bd8ccc0e78fca 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -11,26 +11,35 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.1.9"; - format = "pyproject"; + version = "1.2.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WUOxtE0NfXi0fpdasZTqixPhVV2+Refatvf6dgCb0Z8="; + hash = "sha256-enxOx0hZ+fksk8ibsDWg0Bl/cJeSBHE37bN/D1ucECg="; }; - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + ]; - propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; + propagatedBuildInputs = [ + ipython + matplotlib + numpy + pillow + ]; - - pythonImportsCheck = [ "mediapy" ]; + pythonImportsCheck = [ + "mediapy" + ]; meta = with lib; { description = "Read/write/show images and videos in an IPython notebook"; homepage = "https://github.com/google/mediapy"; + changelog = "https://github.com/google/mediapy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ mcwitt ]; }; diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index c33aae4d20c44..f84df9eef46fa 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "meinheld"; version = "1.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix index a751dbeac3fc4..039b22358d4dc 100644 --- a/pkgs/development/python-modules/meld3/default.nix +++ b/pkgs/development/python-modules/meld3/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "meld3"; version = "2.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/memestra/default.nix b/pkgs/development/python-modules/memestra/default.nix index 3bcae8336a895..db7d4e254a738 100644 --- a/pkgs/development/python-modules/memestra/default.nix +++ b/pkgs/development/python-modules/memestra/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "memestra"; version = "0.2.1"; + format = "setuptools"; disabled = pythonOlder "3.4"; diff --git a/pkgs/development/python-modules/memory-allocator/default.nix b/pkgs/development/python-modules/memory-allocator/default.nix index b42544963a195..bb9b7dd475099 100644 --- a/pkgs/development/python-modules/memory-allocator/default.nix +++ b/pkgs/development/python-modules/memory-allocator/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "memory-allocator"; version = "0.1.3"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/memory-profiler/default.nix b/pkgs/development/python-modules/memory-profiler/default.nix index 218772a1527ec..2176b652597ff 100644 --- a/pkgs/development/python-modules/memory-profiler/default.nix +++ b/pkgs/development/python-modules/memory-profiler/default.nix @@ -6,6 +6,7 @@ python.pkgs.buildPythonPackage rec { pname = "memory-profiler"; version = "0.61.0"; + format = "setuptools"; src = fetchPypi { pname = "memory_profiler"; diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 0720a290cb9cd..c29543a21dacb 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.39.0"; + version = "1.41.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-B3+2KnRXWkB83Sy/NH9kJwgSha9L17tx37fFwBjT3Mw="; + hash = "sha256-aXcGMRqkiVPnLEYrzIMLDiFXWurBRNlMg4OnRd5jlrY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix index b79bac0633d50..1523eaf4c8e3b 100644 --- a/pkgs/development/python-modules/mercantile/default.nix +++ b/pkgs/development/python-modules/mercantile/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "mercantile"; version = "1.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "mapbox"; diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix index 8b348120c235d..7d812ceb1e4d5 100644 --- a/pkgs/development/python-modules/mergedeep/default.nix +++ b/pkgs/development/python-modules/mergedeep/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "mergedeep"; version = "1.3.4"; + format = "setuptools"; disabled = isPy27; # PyPI tarball doesn't include tests directory diff --git a/pkgs/development/python-modules/mergedict/default.nix b/pkgs/development/python-modules/mergedict/default.nix index 32b91aea2e89a..3cfb674a9b295 100644 --- a/pkgs/development/python-modules/mergedict/default.nix +++ b/pkgs/development/python-modules/mergedict/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "mergedict"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/meshcat/default.nix b/pkgs/development/python-modules/meshcat/default.nix index 932d9a2390a3f..8f79a1477451f 100644 --- a/pkgs/development/python-modules/meshcat/default.nix +++ b/pkgs/development/python-modules/meshcat/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "meshcat"; version = "0.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 8bfb65056f165..c8ec19468bc30 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.12"; + version = "2.2.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-W//mDKtTWjcKT43n82OU3h4yKrNZMAVzLzQCjsmkJP0="; + hash = "sha256-5JEMiSLLVv7p8H5R8BDE5IKGmBb2bSht+s4sCsxWyzU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meteoalertapi/default.nix b/pkgs/development/python-modules/meteoalertapi/default.nix index 87a3b2b8fdf09..15d14934c5aa4 100644 --- a/pkgs/development/python-modules/meteoalertapi/default.nix +++ b/pkgs/development/python-modules/meteoalertapi/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "meteoalertapi"; version = "0.3.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index b6fb1d51446db..4aee704e605a6 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "meteofrance-api"; - version = "1.2.0"; - format = "pyproject"; + version = "1.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hacf-fr"; - repo = pname; + repo = "meteofrance-api"; rev = "refs/tags/v${version}"; - hash = "sha256-W26R+L2ZJpycEQ9KwkHqVARKsd/5YkJCxMeciKnKAX8="; + hash = "sha256-uSrVK6LwCDyvsjzGl4xQd8585Hl6sp2Ua9ly0wqnC1Y="; }; nativeBuildInputs = [ @@ -48,8 +48,9 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_currentphenomenons" + "test_dictionary" "test_forecast" - "test_full_with_coastal_bulletint" + "test_full_with_coastal_bulletin" "test_fulls" "test_no_rain_expected" "test_picture_of_the_day" diff --git a/pkgs/development/python-modules/mf2py/default.nix b/pkgs/development/python-modules/mf2py/default.nix index b39989bf322e9..cd72dc7d40b92 100644 --- a/pkgs/development/python-modules/mf2py/default.nix +++ b/pkgs/development/python-modules/mf2py/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "mf2py"; version = "1.1.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "microformats"; diff --git a/pkgs/development/python-modules/micloud/default.nix b/pkgs/development/python-modules/micloud/default.nix index 1cd2c43ea9e52..641581298340c 100644 --- a/pkgs/development/python-modules/micloud/default.nix +++ b/pkgs/development/python-modules/micloud/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "micloud"; version = "0.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "Squachen"; diff --git a/pkgs/development/python-modules/microdata/default.nix b/pkgs/development/python-modules/microdata/default.nix index d271637d2c5ab..140aa10314e1d 100644 --- a/pkgs/development/python-modules/microdata/default.nix +++ b/pkgs/development/python-modules/microdata/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "microdata"; version = "0.8.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "edsu"; diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 84fe78a594750..90b5128e47479 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -6,18 +6,21 @@ , portmidi , python-rtmidi , pytestCheckHook +, pythonOlder , setuptools , setuptools-scm }: buildPythonPackage rec { pname = "mido"; - version = "1.3.0"; - format = "pyproject"; + version = "1.3.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hCguOs40vKP5hCINstvLmCRc/q+4VCYMAuAAdQ3Khqo="; + sha256 = "sha256-Ouootu1zD3N9WxLaNXjevp3FAFj6Nw/pzt7ZGJtnw0g="; }; patches = [ @@ -47,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "MIDI Objects for Python"; homepage = "https://mido.readthedocs.io"; + changelog = "https://github.com/mido/mido/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/migen/default.nix b/pkgs/development/python-modules/migen/default.nix index 0bbecefff9675..d1633cbd8cfa9 100644 --- a/pkgs/development/python-modules/migen/default.nix +++ b/pkgs/development/python-modules/migen/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "migen"; version = "unstable-2022-09-02"; + format = "setuptools"; src = fetchFromGitHub { owner = "m-labs"; diff --git a/pkgs/development/python-modules/milc/default.nix b/pkgs/development/python-modules/milc/default.nix index 6db6d7492b053..aa168fd0dea00 100644 --- a/pkgs/development/python-modules/milc/default.nix +++ b/pkgs/development/python-modules/milc/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "milc"; version = "1.4.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "clueboard"; diff --git a/pkgs/development/python-modules/milksnake/default.nix b/pkgs/development/python-modules/milksnake/default.nix index 6d063021697c1..72115444ffa2c 100644 --- a/pkgs/development/python-modules/milksnake/default.nix +++ b/pkgs/development/python-modules/milksnake/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "milksnake"; version = "0.1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index 33f52d0cea672..be07dd2f85984 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.7"; + version = "0.11.8"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; rev = "refs/tags/${version}"; - hash = "sha256-jqtyJHoG/8tgv4OJleb7DV6C7pCpgplieLykfvO3cNM="; + hash = "sha256-BSrnUhe6SFtalUGldC24eJTqJAF5FdUWo3rwWNT1uCw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/minexr/default.nix b/pkgs/development/python-modules/minexr/default.nix index dc5ae86b4fad9..3785baaa978f3 100644 --- a/pkgs/development/python-modules/minexr/default.nix +++ b/pkgs/development/python-modules/minexr/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "minexr"; version = "1.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "cheind"; diff --git a/pkgs/development/python-modules/minidump/default.nix b/pkgs/development/python-modules/minidump/default.nix index 9168d3297b113..2829a6351ace8 100644 --- a/pkgs/development/python-modules/minidump/default.nix +++ b/pkgs/development/python-modules/minidump/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "minidump"; - version = "0.0.22"; + version = "0.0.23"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-PPvvvHz3WA67Vn2P7MIY+ChkjXrCOuTgj0KXr4B2mZ0="; + hash = "sha256-R+tza5C/2egkajScmilp/8qowoSklYVfEB+f0KMNBqQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix index 7a54b1eb97a15..928b288bf28b6 100644 --- a/pkgs/development/python-modules/minikanren/default.nix +++ b/pkgs/development/python-modules/minikanren/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "minikanren"; version = "1.0.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "pythological"; diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index 5bf47f5a04ab8..54b2de45056e0 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.4.3"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9VPK15GIPcG+UcyUinevKyEoom6mNA99NKL0XWd9G/M="; + hash = "sha256-GweGHGxAOLZqOnVdzOtw0xuvsrKsaB1gf1xZ/WuFR7w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index 3eb92d770df0a..ec6bcbc7d9703 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "miniupnpc"; version = "2.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/misaka/default.nix b/pkgs/development/python-modules/misaka/default.nix index e4c807a5bf5e9..c257c7f735a67 100644 --- a/pkgs/development/python-modules/misaka/default.nix +++ b/pkgs/development/python-modules/misaka/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { pname = "misaka"; version = "2.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/misoc/default.nix b/pkgs/development/python-modules/misoc/default.nix index 785043f1ae748..3fa9e3f6e4721 100644 --- a/pkgs/development/python-modules/misoc/default.nix +++ b/pkgs/development/python-modules/misoc/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "misoc"; version = "unstable-2022-10-08"; + format = "setuptools"; src = fetchFromGitHub { owner = "m-labs"; diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index e8c941fb950a2..d64fbf32614a2 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "10.1.5"; + version = "10.1.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "mitmproxy"; rev = "refs/tags/${version}"; - hash = "sha256-WtZ5KPkTjYMCjrghVcihxuQ2cS88OOCbMYHfqzeo4qQ="; + hash = "sha256-W+gxK5bNCit1jK9ojwE/HVjUz6OJcNw6Ac1lN5FxGgw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mixins/default.nix b/pkgs/development/python-modules/mixins/default.nix index 9c9bfbc3a4075..46af556fd11af 100644 --- a/pkgs/development/python-modules/mixins/default.nix +++ b/pkgs/development/python-modules/mixins/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "mixins"; version = "0.1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix b/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix index 84823937388a8..2227b8b4f8738 100644 --- a/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix +++ b/pkgs/development/python-modules/mkdocs-drawio-exporter/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "mkdocs-drawio-exporter"; version = "0.8.0"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mkdocs-exclude/default.nix b/pkgs/development/python-modules/mkdocs-exclude/default.nix index e959a15e4702c..5e2e32a9d6bbf 100644 --- a/pkgs/development/python-modules/mkdocs-exclude/default.nix +++ b/pkgs/development/python-modules/mkdocs-exclude/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "mkdocs-exclude"; version = "1.0.2"; + format = "setuptools"; # Repository has only 3 commits and no tags. Each of these commits has # version of 1.0.0, 1.0.1 and 1.0.2 in setup.py, though. diff --git a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix index cd40bb14b1c93..9dfae93cfec97 100644 --- a/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-authors-plugin/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "mkdocs-git-authors-plugin"; version = "0.7.2"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix index 986f0d1d2ce66..d386b1cb05dad 100644 --- a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-git-revision-date-localized-plugin"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "timvink"; repo = "mkdocs-git-revision-date-localized-plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-UIbW64ac9kXptJjn86V6vPArnICANiT3QGi5JH45KLY="; + hash = "sha256-6qLVmmJzMTrvuoeSVUjWqmI6f5MbAFWAj36v2l3ZeD8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-gitlab-plugin/default.nix b/pkgs/development/python-modules/mkdocs-gitlab-plugin/default.nix index 69242caa8901a..b88da4eb1e4d5 100644 --- a/pkgs/development/python-modules/mkdocs-gitlab-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-gitlab-plugin/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "mkdocs-gitlab-plugin"; version = "0.1.4"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mkdocs-linkcheck/default.nix b/pkgs/development/python-modules/mkdocs-linkcheck/default.nix index 540640e14bebb..1f83c11a35dd9 100644 --- a/pkgs/development/python-modules/mkdocs-linkcheck/default.nix +++ b/pkgs/development/python-modules/mkdocs-linkcheck/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "mkdocs-linkcheck"; version = "unstable-2021-08-24"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/mkdocs-minify/default.nix b/pkgs/development/python-modules/mkdocs-minify/default.nix index 631f881908c33..fcab8677cffa4 100644 --- a/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/pkgs/development/python-modules/mkdocs-minify/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-minify"; version = "0.7.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "byrnereese"; diff --git a/pkgs/development/python-modules/mkdocs-redirects/default.nix b/pkgs/development/python-modules/mkdocs-redirects/default.nix index 878117c6b60a7..2bef26944d244 100644 --- a/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "mkdocs-redirects"; version = "1.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "mkdocs"; diff --git a/pkgs/development/python-modules/mkdocs-simple-hooks/default.nix b/pkgs/development/python-modules/mkdocs-simple-hooks/default.nix index c403baebbae37..c623207d1dd82 100644 --- a/pkgs/development/python-modules/mkdocs-simple-hooks/default.nix +++ b/pkgs/development/python-modules/mkdocs-simple-hooks/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "mkdocs-simple-hooks"; version = "0.1.5"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index ef62dc1398a55..b6d308ee21355 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "mkl-service"; version = "2.4.0.post1"; + format = "setuptools"; src = fetchFromGitHub { owner = "IntelPython"; diff --git a/pkgs/development/python-modules/ml-collections/default.nix b/pkgs/development/python-modules/ml-collections/default.nix index 692bafc64a88d..806b7cce5b42f 100644 --- a/pkgs/development/python-modules/ml-collections/default.nix +++ b/pkgs/development/python-modules/ml-collections/default.nix @@ -20,6 +20,7 @@ in buildPythonPackage rec { pname = "ml-collections"; version = "0.1.1"; + format = "setuptools"; # ml-collections does not have any git release tags. See https://github.com/google/ml_collections/issues/8. src = fetchPypi { diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index 72e2bf969c2a3..f4e97870b331a 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "mlrose"; version = "1.3.0"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 0da165ada2b68..7a17e9a81925d 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "mlxtend"; version = "0.22.0"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/mmpython/default.nix b/pkgs/development/python-modules/mmpython/default.nix index 64c270ca07228..837a1953be5e1 100644 --- a/pkgs/development/python-modules/mmpython/default.nix +++ b/pkgs/development/python-modules/mmpython/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "0.4.10"; + format = "setuptools"; pname = "mmpython"; src = fetchurl { diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index f040a1c1daff1..ba5fe3dc03c3f 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "mnemonic"; version = "0.20"; + format = "setuptools"; src = fetchFromGitHub { owner = "trezor"; diff --git a/pkgs/development/python-modules/mnist/default.nix b/pkgs/development/python-modules/mnist/default.nix index 2d0b158534bf2..3e48b31983379 100644 --- a/pkgs/development/python-modules/mnist/default.nix +++ b/pkgs/development/python-modules/mnist/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "mnist"; version = "0.2.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "datapythonista"; diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix index 391ba29a98c8a..704054c46c040 100644 --- a/pkgs/development/python-modules/mock-open/default.nix +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "mock-open"; version = "1.4.0"; + format = "setuptools"; # no tests in PyPI tarball src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/mock-services/default.nix b/pkgs/development/python-modules/mock-services/default.nix index 51f07960bb0f3..e1c52662f3894 100644 --- a/pkgs/development/python-modules/mock-services/default.nix +++ b/pkgs/development/python-modules/mock-services/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "mock-services"; version = "0.3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "peopledoc"; diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 981665f7b03a4..f142d1288ef37 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "1.4.0"; + format = "setuptools"; pname = "mockito"; src = fetchPypi { diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index f9b94a05065e9..bcbeebf1ca37f 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "modeled"; version = "0.1.8"; + format = "setuptools"; src = fetchPypi { extension = "zip"; diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 60a1374d9ae88..917e688d23cdf 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.8.2"; + version = "5.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tmwY1/SrepS+P5655MpoNurR2lAtYugbf3pIFQ4u05E="; + hash = "sha256-R7yZYSwhSJuhL1Qcna4k526KSSgzBk6P7p6zuumlZJo="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/mohawk/default.nix b/pkgs/development/python-modules/mohawk/default.nix index ae57d8fbf84cb..99caae9ec3f64 100644 --- a/pkgs/development/python-modules/mohawk/default.nix +++ b/pkgs/development/python-modules/mohawk/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "mohawk"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index e62ee8fb29db0..da881f658675f 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "molecule"; - version = "6.0.2"; + version = "6.0.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-uRk1P3mXRt5gsWonV1YneD45wmj98vKqA3LwFix7VHg="; + hash = "sha256-0qiBBi/MXvHgjB5RJ8BDVNLJUXGVXicL2Cs/v+9y07A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix index c2e27b23d0392..7c6ecf9b3ed66 100644 --- a/pkgs/development/python-modules/monai/default.nix +++ b/pkgs/development/python-modules/monai/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "monai"; version = "1.3.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/monero/default.nix b/pkgs/development/python-modules/monero/default.nix index adc34fa17360d..71554607326cb 100644 --- a/pkgs/development/python-modules/monero/default.nix +++ b/pkgs/development/python-modules/monero/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "monero"; version = "1.1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "monero-ecosystem"; diff --git a/pkgs/development/python-modules/mongodict/default.nix b/pkgs/development/python-modules/mongodict/default.nix index c2fbd6a7ad1b4..26d3f0516c650 100644 --- a/pkgs/development/python-modules/mongodict/default.nix +++ b/pkgs/development/python-modules/mongodict/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "mongodict"; version = "0.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index c4b7b7135e2b6..3e63330d5ac2a 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "mongoengine"; version = "0.27.0"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/mongoquery/default.nix b/pkgs/development/python-modules/mongoquery/default.nix index c6034ce27614f..bb17a77d36981 100644 --- a/pkgs/development/python-modules/mongoquery/default.nix +++ b/pkgs/development/python-modules/mongoquery/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "mongoquery"; version = "1.4.2"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/monitorcontrol/default.nix b/pkgs/development/python-modules/monitorcontrol/default.nix new file mode 100644 index 0000000000000..669077c1376fd --- /dev/null +++ b/pkgs/development/python-modules/monitorcontrol/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, pyudev +, pytestCheckHook +, voluptuous +}: + +buildPythonPackage rec { + pname = "monitorcontrol"; + version = "3.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "newAM"; + repo = "monitorcontrol"; + rev = "refs/tags/${version}"; + hash = "sha256-fu0Lm7Tcw7TCCBDXTTY20JBAM7oeesyeHQFFILeZxX0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pyudev + ]; + + nativeCheckInputs = [ + pytestCheckHook + voluptuous + ]; + + pythonImportsCheck = [ + pname + ]; + + meta = with lib; { + description = "Python monitor controls using DDC-CI"; + homepage = "https://github.com/newAM/monitorcontrol"; + changelog = "https://github.com/newAM/monitorcontrol/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/python-modules/monkeyhex/default.nix b/pkgs/development/python-modules/monkeyhex/default.nix index 7c10ad743f9c1..821a6765bb6f1 100644 --- a/pkgs/development/python-modules/monkeyhex/default.nix +++ b/pkgs/development/python-modules/monkeyhex/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "monkeyhex"; version = "1.7.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix index 512e86b0d2e48..f52e2b7ffbe90 100644 --- a/pkgs/development/python-modules/monotonic/default.nix +++ b/pkgs/development/python-modules/monotonic/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "monotonic"; version = "1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index 75e92bb32bf21..7bbed27a8e99a 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "moretools"; version = "0.1.12"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/morphys/default.nix b/pkgs/development/python-modules/morphys/default.nix index b89055829ef89..1f1c1f3e17efc 100644 --- a/pkgs/development/python-modules/morphys/default.nix +++ b/pkgs/development/python-modules/morphys/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "morphys"; version = "1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "mkalinski"; diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix index 9cd4fe920c5b2..ebe5b55b1dbad 100644 --- a/pkgs/development/python-modules/mortgage/default.nix +++ b/pkgs/development/python-modules/mortgage/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "mortgage"; version = "1.0.5"; + format = "setuptools"; src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 96b922ed47435..ef6bd75d5f97f 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.18"; + version = "0.6.19"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - hash = "sha256-EkHrBhlPlavF6qbTF9myDBYh5eHxiZ4OoDzvlSs/LYM="; + hash = "sha256-t2Y3ASGoMZKlZzbafpAjZHeWgaWS+UsvFd5wyfmJGvE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 96b3206f7fdea..65f35e85a0f1c 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { pname = "moviepy"; version = "1.0.3"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index 2cdfd2c0c7462..48b4d3f4fc2e0 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "mox3"; version = "1.1.0"; + format = "setuptools"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchPypi { diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index ba1e4f4022aeb..4957b392e56fd 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { description = "A Python client module for the Music Player Daemon"; homepage = "https://github.com/Mic92/python-mpd2"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ rvl mic92 hexa ]; + maintainers = with maintainers; [ mic92 hexa ]; }; } diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index eaf7d30efb5d9..f41519c001124 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "mpi4py"; version = "3.1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mpl-scatter-density/default.nix b/pkgs/development/python-modules/mpl-scatter-density/default.nix index f0523c3594dcd..48d05b1e6ca58 100644 --- a/pkgs/development/python-modules/mpl-scatter-density/default.nix +++ b/pkgs/development/python-modules/mpl-scatter-density/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "mpl-scatter-density"; version = "0.7"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/mpldatacursor/default.nix b/pkgs/development/python-modules/mpldatacursor/default.nix index b14470ca215ae..649d5ee814d2b 100644 --- a/pkgs/development/python-modules/mpldatacursor/default.nix +++ b/pkgs/development/python-modules/mpldatacursor/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "mpldatacursor"; version = "0.7.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "joferkington"; diff --git a/pkgs/development/python-modules/mplfinance/default.nix b/pkgs/development/python-modules/mplfinance/default.nix index dfad66f7d758f..91d89c8b9a284 100644 --- a/pkgs/development/python-modules/mplfinance/default.nix +++ b/pkgs/development/python-modules/mplfinance/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "mplfinance"; version = "0.12.7a7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix index bfe442d05f518..d5d779cbd514b 100644 --- a/pkgs/development/python-modules/mplleaflet/default.nix +++ b/pkgs/development/python-modules/mplleaflet/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "mplleaflet"; version = "0.0.5"; + format = "setuptools"; propagatedBuildInputs = [ jinja2 six ]; diff --git a/pkgs/development/python-modules/mpyq/default.nix b/pkgs/development/python-modules/mpyq/default.nix index 94c907c676c49..815c41a80afc0 100644 --- a/pkgs/development/python-modules/mpyq/default.nix +++ b/pkgs/development/python-modules/mpyq/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "mpyq"; version = "0.2.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mqtt2influxdb/default.nix b/pkgs/development/python-modules/mqtt2influxdb/default.nix index a2d7fa25fe0dd..e7892732fcdf5 100644 --- a/pkgs/development/python-modules/mqtt2influxdb/default.nix +++ b/pkgs/development/python-modules/mqtt2influxdb/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "mqtt2influxdb"; version = "1.5.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "hardwario"; diff --git a/pkgs/development/python-modules/ms-active-directory/default.nix b/pkgs/development/python-modules/ms-active-directory/default.nix index b8459dc6d6a0a..ff908beaa7f22 100644 --- a/pkgs/development/python-modules/ms-active-directory/default.nix +++ b/pkgs/development/python-modules/ms-active-directory/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ms-active-directory"; - version = "1.12.1"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zorn96"; repo = "ms_active_directory"; - rev = "v${version}"; - hash = "sha256-mErQib8xTgo29iPAtiLnhxLXyFboAzyEW9A/QMseM6k="; + rev = "refs/tags/v${version}"; + hash = "sha256-+wfhtEGuC1R5jbEnWm4mDHIR096KKEcG/K8SuItwjGk="; }; propagatedBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for integrating with Microsoft Active Directory domains"; homepage = "https://github.com/zorn96/ms_active_directory/"; + changelog = "https://github.com/zorn96/ms_active_directory/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ms-cv/default.nix b/pkgs/development/python-modules/ms-cv/default.nix index 07af4ecb510ff..dbcbc6b0be5be 100644 --- a/pkgs/development/python-modules/ms-cv/default.nix +++ b/pkgs/development/python-modules/ms-cv/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "ms-cv"; version = "0.1.1"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index 3a95fcb86ef59..65894b665cf20 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "msal-extensions"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index 17f5795102856..640b1d2798f06 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "msgpack-numpy"; version = "0.4.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index b2039e23c6ed7..5af0adeb0300a 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.4"; + version = "0.18.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-u1mrj/pHvlbSwh6QtRdJKuVGN1zQ6mRITi/qzrCHnhk="; + hash = "sha256-BcENL1vPCspzYdAHicC5AHs/7xZPWf+Yys37vKgbris="; }; # Requires libasan to be accessible diff --git a/pkgs/development/python-modules/msldap/default.nix b/pkgs/development/python-modules/msldap/default.nix index dc76133547433..a53ec6152e372 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.7"; + version = "0.5.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6gTUPtGQKJSd7HpMRRlw87Iu3I1L2ea2F+QQs1U1jIM="; + hash = "sha256-XzxONiKW4OHrpEftqfIwmIp7KgiCb3s+007JYS68/jM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix index 716667e870d69..e564a0fd5959d 100644 --- a/pkgs/development/python-modules/msrestazure/default.nix +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { version = "0.6.4"; + format = "setuptools"; pname = "msrestazure"; # Pypi tarball doesnt include tests diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index 2392de3847bd9..881253845ed6a 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mujoco"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-pftecOk4q19qKBHs9hBBVenI+SgJg9VT7vc6NKuiY0s="; + hash = "sha256-rZNVihIuvNJnQWqA5tV9DG5r3/LttWNW6fN2js+fDb8="; }; nativeBuildInputs = [ cmake setuptools ]; @@ -36,13 +36,12 @@ buildPythonPackage rec { env.MUJOCO_PATH = "${mujoco}"; env.MUJOCO_PLUGIN_PATH = "${mujoco}/lib"; - env.MUJOCO_CMAKE_ARGS = "-DMUJOCO_SIMULATE_USE_SYSTEM_GLFW=ON"; + env.MUJOCO_CMAKE_ARGS = lib.concatStringsSep " " [ + "-DMUJOCO_SIMULATE_USE_SYSTEM_GLFW=ON" + "-DMUJOCO_PYTHON_USE_SYSTEM_PYBIND11=ON" + ]; preConfigure = - # Use system packages for pybind - '' - ${perl}/bin/perl -0777 -i -pe "s/(findorfetch\(.{3}USE_SYSTEM_PACKAGE.{3})(OFF)(.{3}PACKAGE_NAME.{3}pybind11.*\))/\1ON\3/gms" mujoco/CMakeLists.txt - '' + # Use non-system eigen3, lodepng, abseil: Remove mirror info and prefill # dependency directory. $build from setuptools. (let diff --git a/pkgs/development/python-modules/mujson/default.nix b/pkgs/development/python-modules/mujson/default.nix index c37c38a7ca878..51a1407dff247 100644 --- a/pkgs/development/python-modules/mujson/default.nix +++ b/pkgs/development/python-modules/mujson/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "mujson"; version = "1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mullvad-api/default.nix b/pkgs/development/python-modules/mullvad-api/default.nix index 22e6647b57d20..bc09093c8d665 100644 --- a/pkgs/development/python-modules/mullvad-api/default.nix +++ b/pkgs/development/python-modules/mullvad-api/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "mullvad-api"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { pname = "mullvad_api"; diff --git a/pkgs/development/python-modules/mulpyplexer/default.nix b/pkgs/development/python-modules/mulpyplexer/default.nix index ee27dc20766d0..29b518262ffaa 100644 --- a/pkgs/development/python-modules/mulpyplexer/default.nix +++ b/pkgs/development/python-modules/mulpyplexer/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "mulpyplexer"; version = "0.09"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index 0953e46a5545f..1821bb864bc46 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "multipledispatch"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/multitasking/default.nix b/pkgs/development/python-modules/multitasking/default.nix index a186325b39417..c3401ed6530c9 100644 --- a/pkgs/development/python-modules/multitasking/default.nix +++ b/pkgs/development/python-modules/multitasking/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "multitasking"; version = "0.0.11"; + format = "setuptools"; # GitHub source releases aren't tagged src = fetchPypi { diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index 0ff62dcbee2bb..b754514649a23 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "munch"; version = "4.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix index a047db7ffd9d0..d872783d19044 100644 --- a/pkgs/development/python-modules/munkres/default.nix +++ b/pkgs/development/python-modules/munkres/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "munkres"; version = "1.1.4"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix index e5f5eff6b2844..4ceebd32aa63a 100644 --- a/pkgs/development/python-modules/musicbrainzngs/default.nix +++ b/pkgs/development/python-modules/musicbrainzngs/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "musicbrainzngs"; version = "0.7.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index 3ceb5e966c2bd..f6e8020337c7b 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -8,6 +8,7 @@ buildPythonPackage { pname = "mutag"; version = "0.0.2-2ffa0258ca"; + format = "setuptools"; disabled = ! isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/mutesync/default.nix b/pkgs/development/python-modules/mutesync/default.nix index 382f09ca6d0aa..b574717c0ece6 100644 --- a/pkgs/development/python-modules/mutesync/default.nix +++ b/pkgs/development/python-modules/mutesync/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "mutesync"; version = "0.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mwcli/default.nix b/pkgs/development/python-modules/mwcli/default.nix index cc58e46d20c10..1ea2a58ea8fae 100644 --- a/pkgs/development/python-modules/mwcli/default.nix +++ b/pkgs/development/python-modules/mwcli/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "mwcli"; version = "0.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mwtypes/default.nix b/pkgs/development/python-modules/mwtypes/default.nix index 89e693dda89a2..b51b5d417a13a 100644 --- a/pkgs/development/python-modules/mwtypes/default.nix +++ b/pkgs/development/python-modules/mwtypes/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "mwtypes"; version = "0.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mwxml/default.nix b/pkgs/development/python-modules/mwxml/default.nix index 792b52f01abc5..0c04715374324 100644 --- a/pkgs/development/python-modules/mwxml/default.nix +++ b/pkgs/development/python-modules/mwxml/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "mwxml"; version = "0.3.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index 8b386a425a0ee..df08e56fbf336 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -12,6 +12,8 @@ buildPythonPackage { inherit (pkgs.mxnet) pname version src; + format = "setuptools"; + buildInputs = [ pkgs.mxnet ]; propagatedBuildInputs = [ requests numpy graphviz ]; diff --git a/pkgs/development/python-modules/myhdl/default.nix b/pkgs/development/python-modules/myhdl/default.nix index e5b5bbf97a754..900e188c61dd9 100644 --- a/pkgs/development/python-modules/myhdl/default.nix +++ b/pkgs/development/python-modules/myhdl/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "myhdl"; # The stable version is from 2019 and it doesn't pass tests version = "unstable-2022-04-26"; + format = "setuptools"; # The pypi src doesn't contain the ci script used in checkPhase src = fetchFromGitHub { owner = "myhdl"; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index e3436bbb6b1a7..070e93de7c53c 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -42,714 +42,714 @@ let }; in rec { - mypy-boto3-accessanalyzer = buildMypyBoto3Package "accessanalyzer" "1.28.36" "sha256-1gfL7x81tTVZlYL8UwoI5k8pDotu1byCWqP31CruRIo="; + mypy-boto3-accessanalyzer = buildMypyBoto3Package "accessanalyzer" "1.34.0" "sha256-pdbHDyL7zVOJ38WvH9c9pxhDZhJvAyEuH6C+x9QChdE="; - mypy-boto3-account = buildMypyBoto3Package "account" "1.28.36" "sha256-RDGy7V+YgVlGufL+bFJ1xR5yi4xc2zkV+gTBdXdwkxk="; + mypy-boto3-account = buildMypyBoto3Package "account" "1.34.0" "sha256-C2iAiA83tZ/7XRlccf1iddDfDNkuO2F0B5aOxKbHy2Q="; - mypy-boto3-acm = buildMypyBoto3Package "acm" "1.28.37" "sha256-NDYWiS7MM7z6mCpRASWh42IGsSTUvVzIJU0eH5V7JUI="; + mypy-boto3-acm = buildMypyBoto3Package "acm" "1.34.0" "sha256-SvDBi8A9414Hxb8twcM/6Y2OoUz+/LbZZJ86lu/zmmo="; - mypy-boto3-acm-pca = buildMypyBoto3Package "acm-pca" "1.28.37" "sha256-l79J8dndeHBZTdXhYCUSa39lYFgcgM6/lIUQPx4HbRE="; + mypy-boto3-acm-pca = buildMypyBoto3Package "acm-pca" "1.34.0" "sha256-vQ3bj9v52Xjjs3tjUZoDpCwcN7q6tpn8bZJAyyIaX5w="; - mypy-boto3-alexaforbusiness = buildMypyBoto3Package "alexaforbusiness" "1.28.37" "sha256-Rk2BLp1oqwOG+Rd9lal53RArPjIo1XMkmXhZJLiI6Ik="; + mypy-boto3-alexaforbusiness = buildMypyBoto3Package "alexaforbusiness" "1.34.0" "sha256-wrMSoM3F0HgajmM9X6P+3i6mqD55TWGVv8eJ7XqNjrw="; - mypy-boto3-amp = buildMypyBoto3Package "amp" "1.28.36" "sha256-/iFfYQ2hwndbtOPnFx5GopCNOYi4uAAOTbD8Z8xFOoE="; + mypy-boto3-amp = buildMypyBoto3Package "amp" "1.34.0" "sha256-zdXxnk9+cNRSj4cZLIJiFVRaBZaXOf/C+UaTp6JkZ0U="; - mypy-boto3-amplify = buildMypyBoto3Package "amplify" "1.28.36" "sha256-ORwKl4j3M+O9a/JVrfal2lCBOe8QEcjAWscEhRqPrxc="; + mypy-boto3-amplify = buildMypyBoto3Package "amplify" "1.34.0" "sha256-dWI0x6Ro0FOIeraID9XVLOKMWdKxQy5ywVathCQz2Pc="; - mypy-boto3-amplifybackend = buildMypyBoto3Package "amplifybackend" "1.28.36" "sha256-tx837SLt7DL1bD/bZl0egzVpClfJKaSY6p82yrcHWRQ="; + mypy-boto3-amplifybackend = buildMypyBoto3Package "amplifybackend" "1.34.0" "sha256-wP6fOHAUg4dvrlQ2rUNk/lgIr6JnpWu/0Tr2prTckOk="; - mypy-boto3-amplifyuibuilder = buildMypyBoto3Package "amplifyuibuilder" "1.28.54" "sha256-5Y2AacuMzVHdPntUyDts21bUzttM9t8EdBcwV1MHhyU="; + mypy-boto3-amplifyuibuilder = buildMypyBoto3Package "amplifyuibuilder" "1.34.0" "sha256-1G/VwrU4zUrIw7mojXX5rHxdDUI77iOE2Kl7LJmPjz0="; - mypy-boto3-apigateway = buildMypyBoto3Package "apigateway" "1.28.36" "sha256-5GDltAso++KS+EKZPnvzrVFNAHN3SzDxxeE33mq6xoE="; + mypy-boto3-apigateway = buildMypyBoto3Package "apigateway" "1.34.0" "sha256-PHJBIJccdPtlqU635LkqOkso32xwygSgBwcubHP27ac="; - mypy-boto3-apigatewaymanagementapi = buildMypyBoto3Package "apigatewaymanagementapi" "1.28.36" "sha256-yh5Xd7rKl6eUZBvnqgVU3BEThbIoVOWA15UEYoFicLo="; + mypy-boto3-apigatewaymanagementapi = buildMypyBoto3Package "apigatewaymanagementapi" "1.34.0" "sha256-911Sd+7hnHpAhDFE2lDhl+b3Pewd5QWWOPdg+TcZ6VU="; - mypy-boto3-apigatewayv2 = buildMypyBoto3Package "apigatewayv2" "1.28.36" "sha256-ZSj0PoLQaUtqd0qLzU+Eg3YG0q6GwWEitKZCTfYergI="; + mypy-boto3-apigatewayv2 = buildMypyBoto3Package "apigatewayv2" "1.34.0" "sha256-ydpZ3osSSMwTtGsnRn1SygX5d9Kq8jHwqdQDKcmKXTY="; - mypy-boto3-appconfig = buildMypyBoto3Package "appconfig" "1.28.52" "sha256-OjHFaTlMso7dbUCyNfOtbIgpRQYmVm7n0PoUZjOaf18="; + mypy-boto3-appconfig = buildMypyBoto3Package "appconfig" "1.34.0" "sha256-mhA3LnS9upyI89XPjdTOaTKWbHMRF/xIhnYl432s6x4="; - mypy-boto3-appconfigdata = buildMypyBoto3Package "appconfigdata" "1.28.36" "sha256-dGBUpgH/1QQ3nGxhkLWBW06ngmr+Iq2v9MqjrZ0vP1k="; + mypy-boto3-appconfigdata = buildMypyBoto3Package "appconfigdata" "1.34.0" "sha256-W0hEQ5i8Ef+cuAZZ5nBRaJhAzUC/iDqwbB16RXC1dq0="; - mypy-boto3-appfabric = buildMypyBoto3Package "appfabric" "1.28.36" "sha256-WN7nEPs2KweoGu7XUycFpp8i/bOWSlcr+6BZFSFh6KM="; + mypy-boto3-appfabric = buildMypyBoto3Package "appfabric" "1.34.0" "sha256-wjvOtCvFrj+YPvyqvR8cKIvwvC6x15WeSX6PkNp4OWg="; - mypy-boto3-appflow = buildMypyBoto3Package "appflow" "1.28.42" "sha256-zUqO8SGKoA9umP2iKrw5VXC4pBBVqs4D9Ou/lJwEVBI="; + mypy-boto3-appflow = buildMypyBoto3Package "appflow" "1.34.0" "sha256-XruMwzBrjV7QTHOcHKqszt75cHX+578wbTwFMwyXHzE="; - mypy-boto3-appintegrations = buildMypyBoto3Package "appintegrations" "1.28.55" "sha256-Sii5aQ9Y1YvpW1QLMXOeboLXzSR7RCZA6hDGvI39yWM="; + mypy-boto3-appintegrations = buildMypyBoto3Package "appintegrations" "1.34.0" "sha256-dh804kGi00kWB2mCj7SPpdDh675A77KkxU9A0TjenmU="; - mypy-boto3-application-autoscaling = buildMypyBoto3Package "application-autoscaling" "1.28.36" "sha256-sxkmyfgk3FJPrS9SUJrHA4tNADM8g+wGaEEPnZjv2H4="; + mypy-boto3-application-autoscaling = buildMypyBoto3Package "application-autoscaling" "1.34.0" "sha256-xW+Rc6yjDBviNDBDB63ssg0aPZFytaVfrVlA32wY/D4="; - mypy-boto3-application-insights = buildMypyBoto3Package "application-insights" "1.28.36" "sha256-jNzhi3ashmQFH7QRi28UY5ZZ/su8RwzhU1XzmunOiro="; + mypy-boto3-application-insights = buildMypyBoto3Package "application-insights" "1.34.0" "sha256-p/yLWmIGBSkMcqbjMUjyTYiskfSRWW3hKvtqepJZtyM="; - mypy-boto3-applicationcostprofiler = buildMypyBoto3Package "applicationcostprofiler" "1.28.36" "sha256-keA+JdfyJVGf388qcA0HTIq9bUiMeEbcg1/s/SI7mt4="; + mypy-boto3-applicationcostprofiler = buildMypyBoto3Package "applicationcostprofiler" "1.34.0" "sha256-ToSRJScC8711J5fkZj/TNmUrpiBNwTplGjvpu1gidys="; - mypy-boto3-appmesh = buildMypyBoto3Package "appmesh" "1.28.36" "sha256-1Cf+Mzgg0KDqBRpCWeCR0lbR5q8KJM+p/p2we6925b0="; + mypy-boto3-appmesh = buildMypyBoto3Package "appmesh" "1.34.0" "sha256-AXJ4z/54qPQeHKbZF6Is4OXt9/gZNacmYnLwfxPcn+E="; - mypy-boto3-apprunner = buildMypyBoto3Package "apprunner" "1.28.55" "sha256-lBbqHhOqWoudqK4NDFNSpzR/UA/dLCHzFmZWQSNhJLY="; + mypy-boto3-apprunner = buildMypyBoto3Package "apprunner" "1.34.0" "sha256-w6gwD3m+nbsVvNaWbBnTjktLfkL08XsawNJWYzEgMLI="; - mypy-boto3-appstream = buildMypyBoto3Package "appstream" "1.28.49" "sha256-5TgCIA4bbUHgxMcLHrWPEyIIYhjlCXZlvW8mYubA0+I="; + mypy-boto3-appstream = buildMypyBoto3Package "appstream" "1.34.0" "sha256-wSUalYAu+1FHxM67tZdodL3PqBV4du07p+6yHYRmFNE="; - mypy-boto3-appsync = buildMypyBoto3Package "appsync" "1.28.36" "sha256-Qag3caLiBRlUWl+TbUQjGkoAbQk+CEbuzZAJgq21PdE="; + mypy-boto3-appsync = buildMypyBoto3Package "appsync" "1.34.0" "sha256-5PjtOGmd/65OE57chi0Uk2rUtd9Dr2i4ZaeSv92AxBo="; - mypy-boto3-arc-zonal-shift = buildMypyBoto3Package "arc-zonal-shift" "1.28.36" "sha256-hTGtmMTWhsMqo+Vq2Bxtfo1sGezi1vD05LsQyGOl9Ps="; + mypy-boto3-arc-zonal-shift = buildMypyBoto3Package "arc-zonal-shift" "1.34.0" "sha256-FhQaiu0Sc4HkkaRuhtgvUBMOgj80DbIBzZLEbZB41Cs="; - mypy-boto3-athena = buildMypyBoto3Package "athena" "1.28.36" "sha256-p232qs49wdkbP3RkDWF80bSALl80iiLbLxbfzgsB7iY="; + mypy-boto3-athena = buildMypyBoto3Package "athena" "1.34.0" "sha256-tBvQLE3zxj/4y1Yj05DoZ7pJgQxOJom+S5WnOo/afrE="; - mypy-boto3-auditmanager = buildMypyBoto3Package "auditmanager" "1.28.38" "sha256-t32bXFUOsVNVs+1Sagx2PIO7/Re6gN2cOevLj+7gbqo="; + mypy-boto3-auditmanager = buildMypyBoto3Package "auditmanager" "1.34.0" "sha256-22Xkl1A5wzKDpRQcr/lp7gQsDPtQjvjK3nBm5O2ZS+k="; - mypy-boto3-autoscaling = buildMypyBoto3Package "autoscaling" "1.28.36" "sha256-3b2iUNeY/8ZcZZsyqHTNTsGMwWBxCeiOm+1Tpq+iYf8="; + mypy-boto3-autoscaling = buildMypyBoto3Package "autoscaling" "1.34.0" "sha256-zXvepguIpLfim5EOBOG7Rr86AmW8twHqF+mRj5mkLjs="; - mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.28.36" "sha256-Hx/rpODs11SdfZTQTcOYAIsPbiLDpreqLdbBHGIEp5E="; + mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.34.0" "sha256-16siojcxNe5MuSZSRJXPAz2UudJozEEyCYUrsGNDAM8="; - mypy-boto3-backup = buildMypyBoto3Package "backup" "1.28.36" "sha256-LbGiDazOf32hEoxGTZlTtH9iTj+3ru+sCO0VAMCfN6E="; + mypy-boto3-backup = buildMypyBoto3Package "backup" "1.34.0" "sha256-H4wIDyA+/6sH6X5zp/HGP2vfWIY5HzgTfa1ThXfXwYM="; - mypy-boto3-backup-gateway = buildMypyBoto3Package "backup-gateway" "1.28.36" "sha256-AGbffUSt3ndl5a0B5nl9CYgYExaM1JLT53T9jVJxeno="; + mypy-boto3-backup-gateway = buildMypyBoto3Package "backup-gateway" "1.34.0" "sha256-nSIEEDKJfI852/WBQ7OuDPuVijEiMr1vhpkzODbhRRc="; - mypy-boto3-backupstorage = buildMypyBoto3Package "backupstorage" "1.28.36" "sha256-Km6lRkCrsWep/kAlPXplbyfHyy5D5nnrd0j0v8FID00="; + mypy-boto3-backupstorage = buildMypyBoto3Package "backupstorage" "1.34.0" "sha256-Y8kjZ+ov8OsiJ8Sm1LlvP8YbgVc+AkLkbZIhOh4y7ZY="; - mypy-boto3-batch = buildMypyBoto3Package "batch" "1.28.36" "sha256-SEDD3Fjd4y337atj+RVUKIvpUd0oCvje8gOF1/Rg7Gs="; + mypy-boto3-batch = buildMypyBoto3Package "batch" "1.34.0" "sha256-prxGVwUz+e2fS2hxwiPdvRaWrfNaE+GnzQoauz/eit8="; - mypy-boto3-billingconductor = buildMypyBoto3Package "billingconductor" "1.28.41" "sha256-aUphZNHrTLUt4dOvg+GmZR7z3whq5jx2PVsjvcY0qS0="; + mypy-boto3-billingconductor = buildMypyBoto3Package "billingconductor" "1.34.0" "sha256-quSSSSS54q41Y3I5KLT/siGjdvTtIich6joF/jye07M="; - mypy-boto3-braket = buildMypyBoto3Package "braket" "1.28.53" "sha256-fMNDKmjx/2hUJHWEWcveYbsbIkiWUXTQSv4itP8zOas="; + mypy-boto3-braket = buildMypyBoto3Package "braket" "1.34.0" "sha256-32tO2+oW3RgsVU8LVhKTKUcHLfeamcjslyuy9gDMUko="; - mypy-boto3-budgets = buildMypyBoto3Package "budgets" "1.28.57" "sha256-Af6omXHyctUeXbEOQC/KoiE3ux88r/hyxlWQoMM1eF4="; + mypy-boto3-budgets = buildMypyBoto3Package "budgets" "1.34.0" "sha256-gs8JYnpFNOMWppBO2R3DO+c6RecQC0vzaox5DqXCKOA="; - mypy-boto3-ce = buildMypyBoto3Package "ce" "1.28.36" "sha256-lBrKm4s1QPGTuZHtHt+uNhX9zsMhNuV0l23822IYIDI="; + mypy-boto3-ce = buildMypyBoto3Package "ce" "1.34.0" "sha256-P91yDeobSBrtSnkwTp1bATY/kxJn3unGsdO1SlUtqLE="; - mypy-boto3-chime = buildMypyBoto3Package "chime" "1.28.37" "sha256-fg8svfLvw+Rzhcr+HxrjHtXw9UE1vuccaOFvjfgxC58="; + mypy-boto3-chime = buildMypyBoto3Package "chime" "1.34.0" "sha256-/IBkHJf4t1K/Ubdf/hUw5XToNBTCziMfTSdksxMwA2Q="; - mypy-boto3-chime-sdk-identity = buildMypyBoto3Package "chime-sdk-identity" "1.28.37" "sha256-r+UvZ213ffIOdmZ1V8MNtZN/i3ozeKfwv7VIvJZ4CRg="; + mypy-boto3-chime-sdk-identity = buildMypyBoto3Package "chime-sdk-identity" "1.34.0" "sha256-3gXUFr3+Tc5PgwsQuQY8D2J0SKGQJRXgQz7/XKYNr5k="; - mypy-boto3-chime-sdk-media-pipelines = buildMypyBoto3Package "chime-sdk-media-pipelines" "1.28.54" "sha256-ewC4woDpDkGUBvPgjpcctkO860EJWHGvZrgCgXSsPbA="; + mypy-boto3-chime-sdk-media-pipelines = buildMypyBoto3Package "chime-sdk-media-pipelines" "1.34.0" "sha256-h5RD+anRtH0UQ5pFjhygN9oZDFdIRZMfGXSKlT2HuSY="; - mypy-boto3-chime-sdk-meetings = buildMypyBoto3Package "chime-sdk-meetings" "1.28.36" "sha256-OZijI8aLKnnZnXf3q8LmePd9ncIrDj2zRq19tNlNQTk="; + mypy-boto3-chime-sdk-meetings = buildMypyBoto3Package "chime-sdk-meetings" "1.34.0" "sha256-WgkY9NZsDxKc38kzlUFciLj/rqJ6S/rxFPOzerCsS84="; - mypy-boto3-chime-sdk-messaging = buildMypyBoto3Package "chime-sdk-messaging" "1.28.37" "sha256-qMLqjzniJfyVCfnMGiIPMRzQoIj309P5WDBjy1P7B8Y="; + mypy-boto3-chime-sdk-messaging = buildMypyBoto3Package "chime-sdk-messaging" "1.34.0" "sha256-8Pq48GBFKQRdmoAu9qxAR14xRSP8/roBrZHxzaTBB54="; - mypy-boto3-chime-sdk-voice = buildMypyBoto3Package "chime-sdk-voice" "1.28.36" "sha256-e627SiCiQV38AzvYusuNEsD9XoYkTYYbaTMJ2odKzAo="; + mypy-boto3-chime-sdk-voice = buildMypyBoto3Package "chime-sdk-voice" "1.34.0" "sha256-9fQQgWFKeabSblJIhP6mN0CEnSixkz1r3mf/k6IL/BE="; - mypy-boto3-cleanrooms = buildMypyBoto3Package "cleanrooms" "1.28.38" "sha256-fbuCwuzXiK9ekk30m90WZW7LcDFLeR/Ta9BvFnT/wnU="; + mypy-boto3-cleanrooms = buildMypyBoto3Package "cleanrooms" "1.34.0" "sha256-gucAudT1eWqm/y/gynY7pgBXbs5n7fnzfeSlVQad7HI="; - mypy-boto3-cloud9 = buildMypyBoto3Package "cloud9" "1.28.47" "sha256-vV+cqYs7msRzBkIIz4uA123QM54gFpi1q9lXo997BOk="; + mypy-boto3-cloud9 = buildMypyBoto3Package "cloud9" "1.34.0" "sha256-uX7dER+xkJj38UtmtLpg17CAdaUQi6/CVoRzU/J87v0="; - mypy-boto3-cloudcontrol = buildMypyBoto3Package "cloudcontrol" "1.28.36" "sha256-DshOzjolyUCztdlOqxxvRlKIIJP6izeyhp2Wl6ObCrY="; + mypy-boto3-cloudcontrol = buildMypyBoto3Package "cloudcontrol" "1.34.0" "sha256-81M2llb46sviZ874/vHVaqOU1PvQs+Zdil8bxr1pEWM="; - mypy-boto3-clouddirectory = buildMypyBoto3Package "clouddirectory" "1.28.36" "sha256-ikyPoBWFRXl95QylMg3rstBymj3HKZqQs0orb14Uorg="; + mypy-boto3-clouddirectory = buildMypyBoto3Package "clouddirectory" "1.34.0" "sha256-lWJQClNEhyq9CN8ThcHtVcEsowIp+V8RXh4rgHAclfM="; - mypy-boto3-cloudformation = buildMypyBoto3Package "cloudformation" "1.28.48" "sha256-775Aczl4AIJCh8jVKmU4MRKGL5A7Fv1Ye1ETRJZSNxs="; + mypy-boto3-cloudformation = buildMypyBoto3Package "cloudformation" "1.34.0" "sha256-myXfnvFdncjk6JLMB6qTQ/FfLtXrfTPrXrZa36Y/U48="; - mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.28.36" "sha256-lY3dwCA/xw6YIgmmJeglC3/mHubiKNqPqrrif6ZreDc="; + mypy-boto3-cloudfront = buildMypyBoto3Package "cloudfront" "1.34.0" "sha256-3n/WEiQdcE253J+CFsskoYlNMXASdzkhPTWneSHDKoM="; - mypy-boto3-cloudhsm = buildMypyBoto3Package "cloudhsm" "1.28.39" "sha256-1K3HPvtZSkQZD5/V9T0tXv6PC2NSoB5v5aR20OWV6kw="; + mypy-boto3-cloudhsm = buildMypyBoto3Package "cloudhsm" "1.34.0" "sha256-Sd/YlKNm/1VRoJ+e+3YlOf4jKoewYVGM4FNYlST+9AY="; - mypy-boto3-cloudhsmv2 = buildMypyBoto3Package "cloudhsmv2" "1.28.36" "sha256-mxvW/ge2gEkGF0rz4LJZCkEIveNGkt9ud5bqs4WhlBs="; + mypy-boto3-cloudhsmv2 = buildMypyBoto3Package "cloudhsmv2" "1.34.0" "sha256-TCKdRXnA2x3LBop9boixNmkPafTdIOY8sGaUSeA9Sic="; - mypy-boto3-cloudsearch = buildMypyBoto3Package "cloudsearch" "1.28.36" "sha256-fEGcYuWWDHOalygjig2qdMn8A3T4vBYZIbZRHtRRQns="; + mypy-boto3-cloudsearch = buildMypyBoto3Package "cloudsearch" "1.34.0" "sha256-S1re04NWngrjlcLIPzP4D0I1cVqvt/Taku6CTTfvtMw="; - mypy-boto3-cloudsearchdomain = buildMypyBoto3Package "cloudsearchdomain" "1.28.36" "sha256-yRUv7XlIpCqkyFw+whHh07LUw0aKbcRa0UkR6zpVtCA="; + mypy-boto3-cloudsearchdomain = buildMypyBoto3Package "cloudsearchdomain" "1.34.0" "sha256-jhhwFXH80aZjVqVMZulwoCvu3EmXj4BbJ3DQ6eJPS4E="; - mypy-boto3-cloudtrail = buildMypyBoto3Package "cloudtrail" "1.28.36" "sha256-YUrRZ53Wdd4CCjq9VYRkAIGxu2wYTaqXF7Fp4DA7jM4="; + mypy-boto3-cloudtrail = buildMypyBoto3Package "cloudtrail" "1.34.0" "sha256-24CHnUhqXR0cBPFbdvLGBNO77kKNM5FUnQ+FjQ7QZlg="; - mypy-boto3-cloudtrail-data = buildMypyBoto3Package "cloudtrail-data" "1.28.36" "sha256-aUZYh0fTrcv1d56HRdu7u4CzAMiCvVlN/tKY1e7piLM="; + mypy-boto3-cloudtrail-data = buildMypyBoto3Package "cloudtrail-data" "1.34.0" "sha256-ACiJrI+VTHr06i8PKgDY/K8houFUZQNS1lluouadCTQ="; - mypy-boto3-cloudwatch = buildMypyBoto3Package "cloudwatch" "1.28.36" "sha256-108mLOQPp+qUdIBWHlN2UO5pRrIIrAf2wM/a/BYAFEM="; + mypy-boto3-cloudwatch = buildMypyBoto3Package "cloudwatch" "1.34.0" "sha256-zBiqKxqJ60iYpsIT21lKv2L+mvym6Ma9mqBLmZYZNjU="; - mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.28.52" "sha256-kmPzmdQj79l+8KY7Q/E4qTxCxAEhEPivYiR1Hh04qm0="; + mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.34.0" "sha256-iUgoanqMSyxRopVctyFLiu+otFSgRvdgQPw4mKX3QIk="; - mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.28.36" "sha256-po4qcd6jiYjqMQj7aP+eMzNJcmwjYP22Q92fHkx1q5U="; + mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.0" "sha256-d77ekJZom4AmSFKjIdVxMPJjCrl+yxpOLvkmOFp08x4="; - mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.28.36" "sha256-IuFxPWpE6zCGfbVfhTBtueUSspeVaq9TrESkfHdrxI8="; + mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.34.0" "sha256-TsXVy8bx6kaj84PJiNNU+075Tx3WW0mrtZFOyLx9yT4="; - mypy-boto3-codecommit = buildMypyBoto3Package "codecommit" "1.28.36" "sha256-o/kVzldUZNfMmK3Ni5L0kOLjKLxsB93YwutqM5GvHqQ="; + mypy-boto3-codecommit = buildMypyBoto3Package "codecommit" "1.34.0" "sha256-uxOfWHCeWBYWnNgWaopcJkS0GH/CaW4J4FoXhPvh3VM="; - mypy-boto3-codedeploy = buildMypyBoto3Package "codedeploy" "1.28.55" "sha256-jkN9DCiS5fKhBq7752gRzHwmfdohQBZOSNGaA1OxVbc="; + mypy-boto3-codedeploy = buildMypyBoto3Package "codedeploy" "1.34.0" "sha256-Sxtcl/fO+A2/s/6O3VC1BPIJ3dDamshEEmKXqyg4fN8="; - mypy-boto3-codeguru-reviewer = buildMypyBoto3Package "codeguru-reviewer" "1.28.36" "sha256-xUkKfYEBmqA0D8RKxbf8VF0XeYOgwNWh1y7ORnj1VpM="; + mypy-boto3-codeguru-reviewer = buildMypyBoto3Package "codeguru-reviewer" "1.34.0" "sha256-20W+LBYsQE/pNs94ZbVWNw0+2817gwfGKaJHCoiDsPM="; - mypy-boto3-codeguru-security = buildMypyBoto3Package "codeguru-security" "1.28.36" "sha256-EU6VTdhzWLofMEFF0vOXTDpJI/BkC3FpSAz1rbtbFWA="; + mypy-boto3-codeguru-security = buildMypyBoto3Package "codeguru-security" "1.34.0" "sha256-DTtYCgcy3LWGxuxqSAkeS9qoBq1YWwAWfZU2DD44BOY="; - mypy-boto3-codeguruprofiler = buildMypyBoto3Package "codeguruprofiler" "1.28.36" "sha256-DHUALwX0ec7rzaSsU0vASersuuHpJXY8cDI8cDhzgl0="; + mypy-boto3-codeguruprofiler = buildMypyBoto3Package "codeguruprofiler" "1.34.0" "sha256-pAZL9m0SHRYiIrXzBf+IeEkQOXS4/6OJqoDI6og3N5s="; - mypy-boto3-codepipeline = buildMypyBoto3Package "codepipeline" "1.28.36" "sha256-isqRkPLovlkHgmBuuYDPBTaBlOdu3LgwajD+z3luO8c="; + mypy-boto3-codepipeline = buildMypyBoto3Package "codepipeline" "1.34.0" "sha256-3GNLNY7OYm3bonTrMenNrGiUJiFWEKbv2mBZWMUlTmc="; - mypy-boto3-codestar = buildMypyBoto3Package "codestar" "1.28.36" "sha256-+D1SBuI6JMA0ISBv5OiGkA43dOESGH4d4m8CUN4Uhxk="; + mypy-boto3-codestar = buildMypyBoto3Package "codestar" "1.34.0" "sha256-BAueRLlYZGDiF6DtjxL24twLYYZqD3ErdJ73fsFoG1k="; - mypy-boto3-codestar-connections = buildMypyBoto3Package "codestar-connections" "1.28.36" "sha256-1K0mrUUO0ycP7uBCqnESd/iGiElL0eqJfwLTpgPH5a0="; + mypy-boto3-codestar-connections = buildMypyBoto3Package "codestar-connections" "1.34.0" "sha256-FTz1h4fD+P6L+tgTXs+4iyeowYIejH2o/TwMyby9CXE="; - mypy-boto3-codestar-notifications = buildMypyBoto3Package "codestar-notifications" "1.28.36" "sha256-BYTeNmL6fKXD6Ym0Z3DOZvLaTqRwANDWfCcWs9TUZ+Y="; + mypy-boto3-codestar-notifications = buildMypyBoto3Package "codestar-notifications" "1.34.0" "sha256-JmXEpHbOhcO9F++G+ohXPuXoNILbcL9r5qyH4OooCtc="; - mypy-boto3-cognito-identity = buildMypyBoto3Package "cognito-identity" "1.28.36" "sha256-fJIKiNsKDcoDtTIRMxbxpcO6QZOl8KnCn2qTkb4owLI="; + mypy-boto3-cognito-identity = buildMypyBoto3Package "cognito-identity" "1.34.0" "sha256-6UlyNX0a1wG5FR/WHMZOwysikGffNCX6Fo1MYvFuFwM="; - mypy-boto3-cognito-idp = buildMypyBoto3Package "cognito-idp" "1.28.56" "sha256-LmuBr551lvNWlyPbEFTAgZA4+XSeFX4tK8kbuabo2JU="; + mypy-boto3-cognito-idp = buildMypyBoto3Package "cognito-idp" "1.34.0" "sha256-WVg6clR26IqKS/GhAjK++6wrlzdDpM8Y1hovoTjNoQw="; - mypy-boto3-cognito-sync = buildMypyBoto3Package "cognito-sync" "1.28.36" "sha256-Hx+/3Q+FLMeDRu+ijTl80WbmqjW/jzpW8eDar8hu/ro="; + mypy-boto3-cognito-sync = buildMypyBoto3Package "cognito-sync" "1.34.0" "sha256-JTkmpEHwKN5IyoGVs4beVAEOr1fZPxBoYjzNBgjTEY0="; - mypy-boto3-comprehend = buildMypyBoto3Package "comprehend" "1.28.37" "sha256-OK8LtQoV2Ccqc4qjRBNJirRDM8wHR7VDzcgbaJNrGok="; + mypy-boto3-comprehend = buildMypyBoto3Package "comprehend" "1.34.0" "sha256-C3KrC4tHmNHLe0Hl5TIE0vWZsB9z8wDNRr1SXSsH4e0="; - mypy-boto3-comprehendmedical = buildMypyBoto3Package "comprehendmedical" "1.28.36" "sha256-6uyeuxkhRD5Xpfh5u09U28Zg1OzLyzwhgQZ/LRGI9lc="; + mypy-boto3-comprehendmedical = buildMypyBoto3Package "comprehendmedical" "1.34.0" "sha256-4KzL56xU474te8tW5xVZo6D5Pwe3GLRQbQfX8CXTz9g="; - mypy-boto3-compute-optimizer = buildMypyBoto3Package "compute-optimizer" "1.28.41" "sha256-TYY9yrw8Az+x01fp3mXc2zzX7YBdnAQQr1uy+E8FkdQ="; + mypy-boto3-compute-optimizer = buildMypyBoto3Package "compute-optimizer" "1.34.0" "sha256-k/4Ixaf9n4J8Y5ELjuMZ2dn7DgKftmwQZfdHhYDMc6w="; - mypy-boto3-config = buildMypyBoto3Package "config" "1.28.36" "sha256-3NUJLfbriTXMsGyj+8XNbhI37BLVSm+sShaJJIz6I7s="; + mypy-boto3-config = buildMypyBoto3Package "config" "1.34.0" "sha256-Yr0Cp6vDk/+lGc6ehCIncSbNGxexR3t8ZaH7abEc8DI="; - mypy-boto3-connect = buildMypyBoto3Package "connect" "1.28.55" "sha256-sA6ef9iOyRrCKwxsSHU19IaBwYiVKeTR0+k94wUX4gw="; + mypy-boto3-connect = buildMypyBoto3Package "connect" "1.34.0" "sha256-bAJDjrOQMLJx/iVT8r6nl4x6DGb8vqHeOOVcw4LukOI="; - mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.28.36" "sha256-7+DHcEkDov1/0mNu/mbKaCwwPfvGRYSEfp3+4tnOnuY="; + mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.34.0" "sha256-Wx9vcjlgXdWZ2qP3Y/hTY2LAeTd+hyyV5JSIuKQ5I5k="; - mypy-boto3-connectcampaigns = buildMypyBoto3Package "connectcampaigns" "1.28.39" "sha256-4c074TlgMh8YxdOl9vb+Xs0JEs5k0mA5rYaF+BIH3Ps="; + mypy-boto3-connectcampaigns = buildMypyBoto3Package "connectcampaigns" "1.34.0" "sha256-acfJ74LRwrfpwnBA2JjoqhiRrHjlaNUXLBvKP0RiAiA="; - mypy-boto3-connectcases = buildMypyBoto3Package "connectcases" "1.28.36" "sha256-oYU/yw9CUltwPfvONhCvH6gCXirzKF26RZj9hdKTtPQ="; + mypy-boto3-connectcases = buildMypyBoto3Package "connectcases" "1.34.0" "sha256-U9cPqrV5xnLZoJR0ilBQnOccShQOYRR3e2+tZruL7qY="; - mypy-boto3-connectparticipant = buildMypyBoto3Package "connectparticipant" "1.28.39" "sha256-iOv8UX4eh07Dwk7zvtv1YXeDiX/RHhuEMGzLafBk+kI="; + mypy-boto3-connectparticipant = buildMypyBoto3Package "connectparticipant" "1.34.0" "sha256-kyQhp8/a0H26U6DLBVF9IiCXoT74STsI8ApxVHy0xSQ="; - mypy-boto3-controltower = buildMypyBoto3Package "controltower" "1.28.36" "sha256-0j6Fa0hobGlNfvMDmlNrqp4EqIhnYTo9XJ41VpEY+Cs="; + mypy-boto3-controltower = buildMypyBoto3Package "controltower" "1.34.0" "sha256-TaqzVvy2qGCvb5Orrxk1g8hyPQVHPEre8Zt2qH0D0dY="; - mypy-boto3-cur = buildMypyBoto3Package "cur" "1.28.36" "sha256-pWKHl8zKmx3ypQOiWtFzRb92630sLJVO0qmn5KEZJ14="; + mypy-boto3-cur = buildMypyBoto3Package "cur" "1.34.0" "sha256-vwMILmIX7uzAGXdl1Z5mxVMJlgZCtA3Svp8mFmoZ6tQ="; - mypy-boto3-customer-profiles = buildMypyBoto3Package "customer-profiles" "1.28.39" "sha256-wAghxGUIThqLBfThNliSu39Dl8vmO8QCrfbxvQOuHxc="; + mypy-boto3-customer-profiles = buildMypyBoto3Package "customer-profiles" "1.34.0" "sha256-LxonO6G0Qa8j6VORcAwvR9j+w879Di5pqTzlicC9Dp8="; - mypy-boto3-databrew = buildMypyBoto3Package "databrew" "1.28.36" "sha256-LhvgmeMOlP4EAmx3Xd97ZiHi/FeChpGtZ1LIuGkTnMU="; + mypy-boto3-databrew = buildMypyBoto3Package "databrew" "1.34.0" "sha256-DP1Cuyogrs/K6qM7fnbHWSTPcpjoy1m0XEsq1ONbhxM="; - mypy-boto3-dataexchange = buildMypyBoto3Package "dataexchange" "1.28.36" "sha256-cNgpRQTJ2JhPw+UZo+HiulWg1998kfgnAB/E6gyvetI="; + mypy-boto3-dataexchange = buildMypyBoto3Package "dataexchange" "1.34.0" "sha256-gLJ6AJQLKSiGcwWEgDwipg0D1NqYwNFiXwAUGwCJ2+0="; - mypy-boto3-datapipeline = buildMypyBoto3Package "datapipeline" "1.28.36" "sha256-IkO7QXwdEWmkzaCOrCWTzNv1xpvwOHGp9wlris/KEws="; + mypy-boto3-datapipeline = buildMypyBoto3Package "datapipeline" "1.34.0" "sha256-Amn6pdW5i8+yBzuSRAmj0EnTYEGjzguQxaoLmhFFXck="; - mypy-boto3-datasync = buildMypyBoto3Package "datasync" "1.28.49" "sha256-BcW47DW0aHb+Gabj6fybaiZgtKotWNvNChyKyaagIw4="; + mypy-boto3-datasync = buildMypyBoto3Package "datasync" "1.34.0" "sha256-B1xHynvQcy/CrL/wgANVpZisD3TfXfP5S7s+RVUSvwg="; - mypy-boto3-dax = buildMypyBoto3Package "dax" "1.28.36" "sha256-t5DMgU3iSxWLSXpC9QaNonKKQpl0tr/gQPnPxO+dTbY="; + mypy-boto3-dax = buildMypyBoto3Package "dax" "1.34.0" "sha256-DH5kqV+C4vbZ8fbvAtR93jd5YB22hkYe/xgOF4oru1Y="; - mypy-boto3-detective = buildMypyBoto3Package "detective" "1.28.36" "sha256-RGSt2jtwDqC3qWh+Z6IfWoiVpoLDjSqLTSjo7+SUL3Q="; + mypy-boto3-detective = buildMypyBoto3Package "detective" "1.34.0" "sha256-tKVKacFOFqRPbqIXBfbuqD2yC+Mh2cfTxqKFV4tvT1A="; - mypy-boto3-devicefarm = buildMypyBoto3Package "devicefarm" "1.28.36" "sha256-TSxUsHAhGY4rgscwesf6mnlya8kHb6MZGKPzhud/OC0="; + mypy-boto3-devicefarm = buildMypyBoto3Package "devicefarm" "1.34.0" "sha256-X0D4Am4GUDFl703FmdrPcHXihFdzuch/eQBofDTameQ="; - mypy-boto3-devops-guru = buildMypyBoto3Package "devops-guru" "1.28.36" "sha256-Whn1VVBzBdav0D31XCH5izyVmZGg/ndPlOamIoY5U94="; + mypy-boto3-devops-guru = buildMypyBoto3Package "devops-guru" "1.34.0" "sha256-IxSTAjcJcGySV1Zzlxal23nZz7m1eaCDa8UX41+9l5o="; - mypy-boto3-directconnect = buildMypyBoto3Package "directconnect" "1.28.36" "sha256-YUZ2XsKaPLi4qDF1Cuf5/6BZ1Pi+xf65hTBc0NHfQTc="; + mypy-boto3-directconnect = buildMypyBoto3Package "directconnect" "1.34.0" "sha256-H3xxqWZwjjzf7gFwsEfAcQmFfm3ZxNOBge0yFsfQpLM="; - mypy-boto3-discovery = buildMypyBoto3Package "discovery" "1.28.50" "sha256-bUFzZ+Ipw3hmaTvBBPlLRz48U+alvfLBiOKNljEap38="; + mypy-boto3-discovery = buildMypyBoto3Package "discovery" "1.34.0" "sha256-QT3KX4bHVigaeOxMCBBtLR3lbTLOQAl1JDnMzN7gt9s="; - mypy-boto3-dlm = buildMypyBoto3Package "dlm" "1.28.36" "sha256-i+OVrnJ+irxgIWi0ZEad6lPLNwT1cvfQ+0xKKXWe8z0="; + mypy-boto3-dlm = buildMypyBoto3Package "dlm" "1.34.0" "sha256-uBcxQvYlWvhoVdWThvaETCKCmju0xtIFRcE8Eon6ovI="; - mypy-boto3-dms = buildMypyBoto3Package "dms" "1.28.53" "sha256-CY3bGLiiciRnscCsqOSdFv04YKDG4gN7f/q3um7QwZ8="; + mypy-boto3-dms = buildMypyBoto3Package "dms" "1.34.0" "sha256-xGGMtqja+ipLpWRMXO1VzxHqjlaZDZ31p634u5kmyNs="; - mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.28.36" "sha256-Dbg80rvJBHkXEzLLWeEi7jN6OrVZiJ6+C6wYkhM72J0="; + mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.34.0" "sha256-BuGkdlbgE40NOaa2Uy5ZTa0vdNv7d4OwPI6pTsNsBy4="; - mypy-boto3-docdb-elastic = buildMypyBoto3Package "docdb-elastic" "1.28.36" "sha256-XvcexadEtui/Wh2sZnketqygNgpGfaSAGciM64Yc+Sk="; + mypy-boto3-docdb-elastic = buildMypyBoto3Package "docdb-elastic" "1.34.0" "sha256-7LeK49HTNBf4AZ6Lba0N42/6oTEh6RopgMHm+TfdY5k="; - mypy-boto3-drs = buildMypyBoto3Package "drs" "1.28.47" "sha256-4JBlsWQLu1KsPSTxwy/ySNQM1ZlIaX1sORvES8Lut00="; + mypy-boto3-drs = buildMypyBoto3Package "drs" "1.34.0" "sha256-AFAsrg/ZByd39VCotrmgvVsbtccl6+o0kxRB7vPjQDM="; - mypy-boto3-ds = buildMypyBoto3Package "ds" "1.28.36" "sha256-l/k+1VhA6mi6mVRKCUis0gAv/dizqZB5JIqLmj9+IDI="; + mypy-boto3-ds = buildMypyBoto3Package "ds" "1.34.0" "sha256-qVtMpsnVLF2rN4WaEhrqlTvWvW28RcHIBjsZYwmYapc="; - mypy-boto3-dynamodb = buildMypyBoto3Package "dynamodb" "1.28.55" "sha256-owOfitoHohj5fwxwqC7Zz0YaDLUTMZT88eDoexXImaU="; + mypy-boto3-dynamodb = buildMypyBoto3Package "dynamodb" "1.34.0" "sha256-wNmNfoOwvCLlA59wOIn7liAtgYFxxCBv0x5mWjdlToQ="; - mypy-boto3-dynamodbstreams = buildMypyBoto3Package "dynamodbstreams" "1.28.36" "sha256-mqz+YRVZlSbwEKYbaC4ZbWw0qJTXpRObAphfI4sfRV4="; + mypy-boto3-dynamodbstreams = buildMypyBoto3Package "dynamodbstreams" "1.34.0" "sha256-Zx5cJE+fU9NcvK5rLR966AGIKUvfIwdpLaWWdLmuDzc="; - mypy-boto3-ebs = buildMypyBoto3Package "ebs" "1.28.36" "sha256-w9OLKJAn9UBnA7x+uedhplSV8plZRYlBpviU9Gv1Ny8="; + mypy-boto3-ebs = buildMypyBoto3Package "ebs" "1.34.0" "sha256-xIrrXOayZed+Jcn4CFXXNgKz/G+RdiuwA04wq+Ry/fs="; - mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.28.58" "sha256-p4BGJSydAqtSMH8PFFc/IAwBquLHCq1I6vW50UNySRo="; + mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.34.0" "sha256-8Z1P6bSuQXOvbshB0dLTjlOwxe7E9Ob8utBtBljhMHA="; - mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.28.36" "sha256-oVcd5yqbg8Drozgmog4nonRSe4nOM7rwpqZi9HVYTL0="; + mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.34.0" "sha256-95TXW9HJHciM+lZCdlUYOwcLhkKE8RJpRx9/dEnu3FU="; - mypy-boto3-ecr = buildMypyBoto3Package "ecr" "1.28.45" "sha256-NYShmgGLrNe26BR7ye9pMpZ4FcCRjGzzkp/1Xxyb5gE="; + mypy-boto3-ecr = buildMypyBoto3Package "ecr" "1.34.0" "sha256-uD+wMR6WikLUyoIbAGwY1KPj42S4zr7nWOpPqXxaw0U="; - mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.28.36" "sha256-LiFZtqdGf9tC6Tj4ukclFyaq/bLos5jZCgPL1y/0VMU="; + mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.34.0" "sha256-38ZiRVPr9L+KUF6oL23xsIiKMW0pT/nIngFkhSS3z2Y="; - mypy-boto3-ecs = buildMypyBoto3Package "ecs" "1.28.41" "sha256-/aXw4fpS4o3/Jt+jfzm0p4zqZVcoSJLlk9EUMd3+SVo="; + mypy-boto3-ecs = buildMypyBoto3Package "ecs" "1.34.0" "sha256-o16Lui5CP/yNs2FPWk6+vMh0Whw9LNcmylOc5GGoU+o="; - mypy-boto3-efs = buildMypyBoto3Package "efs" "1.28.53" "sha256-QhSddCRqWUly2w+GLZJHJn/TKpQHbQO88yKny6nj/ZI="; + mypy-boto3-efs = buildMypyBoto3Package "efs" "1.34.0" "sha256-VAK7mfnPBPDC8Azm6Bxl86E8CkeArTmfgqYkIcSblYA="; - mypy-boto3-eks = buildMypyBoto3Package "eks" "1.28.36" "sha256-etvfyKLFr4lKE9DLvKQuHw2YHshhOBTXXTCvDv2hFxE="; + mypy-boto3-eks = buildMypyBoto3Package "eks" "1.34.0" "sha256-nJec25u+np9bwuVP+lsRchVXul3LOphQ+Y1RUGNhpng="; - mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.28.36" "sha256-BwI32rA8Y1lhc+k/XQh+LHPlFHmaCTr37OYvLFJMX1o="; + mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.34.0" "sha256-gbWKw0zDQf3qBlp1KeO7MX1j/GqRUpFAxLG0BKFrHBk="; - mypy-boto3-elasticache = buildMypyBoto3Package "elasticache" "1.28.36" "sha256-6Ymobcuhh1dOqA9IoN9lWrj639ZKu/NQEP6ImlhapFA="; + mypy-boto3-elasticache = buildMypyBoto3Package "elasticache" "1.34.0" "sha256-ArUBQ5XbBz4kTABHwgpE6VoRCu2ILVSEvLb2yQWMbvU="; - mypy-boto3-elasticbeanstalk = buildMypyBoto3Package "elasticbeanstalk" "1.28.36" "sha256-V2vSEaN7Kf2TPateMNtJ95a+Ad/CRcZOV2JsJlTOPIo="; + mypy-boto3-elasticbeanstalk = buildMypyBoto3Package "elasticbeanstalk" "1.34.0" "sha256-ftVFUwY81mg/9zJ4xxVjhXF1HgKpzj1koIS32cMKRLw="; - mypy-boto3-elastictranscoder = buildMypyBoto3Package "elastictranscoder" "1.28.36" "sha256-lkz4up43fVyWCOO9dM4xI285wsAu1lnV4mICuJV8D4k="; + mypy-boto3-elastictranscoder = buildMypyBoto3Package "elastictranscoder" "1.34.0" "sha256-tC+9Ks0DDC3zWBd9C964X8TFoL6kblWxG0jUQrzdID0="; - mypy-boto3-elb = buildMypyBoto3Package "elb" "1.28.36" "sha256-c9Re0WZOn+LaK58VJk+YlI3YWn/wrgT+/TdqrOisBnM="; + mypy-boto3-elb = buildMypyBoto3Package "elb" "1.34.0" "sha256-5Eh5D872pVDd7Q+DDh3zpGMVgS8fUJsV+63H1fet73s="; - mypy-boto3-elbv2 = buildMypyBoto3Package "elbv2" "1.28.42" "sha256-NXyhMxuIbuyyDifzBicvDNQB3ysbVx+azsqpTBhfnZ8="; + mypy-boto3-elbv2 = buildMypyBoto3Package "elbv2" "1.34.0" "sha256-p3rJM3/6flZvJxg5FbkPFQP5PTXNRTMXqO3mB6akpHU="; - mypy-boto3-emr = buildMypyBoto3Package "emr" "1.28.36" "sha256-DrhDkqcxAAUTfheZRpPJQkFFzeDynByF2wn9jyZr0F4="; + mypy-boto3-emr = buildMypyBoto3Package "emr" "1.34.0" "sha256-QWxYOAS5JTS1zEC5Mn0RF9Ys7cuwCs2xv/nLyYSvWIE="; - mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.28.36" "sha256-ZG7mf4C31COK7hobIbTLmd64Ydu2Al+NhSMrS8069jQ="; + mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.34.0" "sha256-tGHWoMVrfH35hLgzDGMSJs5kRTWQqjM/e0IAPe4EfiU="; - mypy-boto3-emr-serverless = buildMypyBoto3Package "emr-serverless" "1.28.54" "sha256-cDbUY1Ftlhyid7CiMEhY7ZepqH2bANrwlU8wdrdDqc4="; + mypy-boto3-emr-serverless = buildMypyBoto3Package "emr-serverless" "1.34.0" "sha256-YgccYi2+XhKiPGCMimrCooYPRV+iRuA1h120UdqJKUc="; - mypy-boto3-entityresolution = buildMypyBoto3Package "entityresolution" "1.28.48" "sha256-xCYg+Ik/VQpDjRR7QKlYyBffsGWZ7PSl531sTSvMv48="; + mypy-boto3-entityresolution = buildMypyBoto3Package "entityresolution" "1.34.0" "sha256-qfRZtRaxysW+Ev16gnj48CePZzLBWrXmrq3tEGtfNbM="; - mypy-boto3-es = buildMypyBoto3Package "es" "1.28.36" "sha256-NfMTzKYwYgZ+dbyIzxn+3poLWo8zjF8ANGWQFtMRTbk="; + mypy-boto3-es = buildMypyBoto3Package "es" "1.34.0" "sha256-h1ALh7JaoeLbfrkrvFuNsqMbNFN9ERcr/m4hKTVrqlU="; - mypy-boto3-events = buildMypyBoto3Package "events" "1.28.46" "sha256-/a4rUcfBPQBFxqCnwt23NeZ655B3CEoo+SKHBZMJGtE="; + mypy-boto3-events = buildMypyBoto3Package "events" "1.34.0" "sha256-1nQVOsAXZ92z1ImWhZcm9HpucFYB5jkMC6wnfS6woxY="; - mypy-boto3-evidently = buildMypyBoto3Package "evidently" "1.28.36" "sha256-U3igtB9eGBYv8VW+PQXD2fc16FKiYl8musH/ccrrMKA="; + mypy-boto3-evidently = buildMypyBoto3Package "evidently" "1.34.0" "sha256-MkBB5iTYJYg2cWFYHR3Qu7TcsDglLPEw0MnoHqij6+A="; - mypy-boto3-finspace = buildMypyBoto3Package "finspace" "1.28.36" "sha256-3l1/ACy5Z09z/ngQKdq3dgBTp05x+NUCRjj1z8I99/4="; + mypy-boto3-finspace = buildMypyBoto3Package "finspace" "1.34.0" "sha256-zYESrekQFm9mU7i4puR+T/dJ7zqen1HYhWLIfCSRfYI="; - mypy-boto3-finspace-data = buildMypyBoto3Package "finspace-data" "1.28.54" "sha256-V5Rxrp94hrUWZgpc+LDn1PwyzZREHDXq3NaZdZQaYoE="; + mypy-boto3-finspace-data = buildMypyBoto3Package "finspace-data" "1.34.0" "sha256-8mND5BbdKY5srFwdpxSyfCUTIP4fa9hztP4daUJOB8k="; - mypy-boto3-firehose = buildMypyBoto3Package "firehose" "1.28.56" "sha256-IPwUkzEymLJ4NgB2OrD4mr5hZsmTaGjbbxCiHyFaaDw="; + mypy-boto3-firehose = buildMypyBoto3Package "firehose" "1.34.0" "sha256-JC+78vL78ro7BmV8SP32l9XgS3Xq5sjmF0Oj1tl+EO4="; - mypy-boto3-fis = buildMypyBoto3Package "fis" "1.28.36" "sha256-km9Ia9Hs/rZv3ljv+BVnR9pOxNK3u5luJOMaW670km0="; + mypy-boto3-fis = buildMypyBoto3Package "fis" "1.34.0" "sha256-0TJ7iAF9hTOiKoW305p8a5fE0lZrdtoFDj/jjZzfdf0="; - mypy-boto3-fms = buildMypyBoto3Package "fms" "1.28.36" "sha256-mzumkMcF2TMrcnHoPPA0SlrmwFAw0TR1cMvSXF28gvM="; + mypy-boto3-fms = buildMypyBoto3Package "fms" "1.34.0" "sha256-tzaSecIXzkC+Zr5MGpU7GaoiGHGsywEglZ8+Ja0XDDo="; - mypy-boto3-forecast = buildMypyBoto3Package "forecast" "1.28.36" "sha256-DCa0GNn7XL3iVgGl5M6E7uyPFdyYjrHfqHakCS7clcc="; + mypy-boto3-forecast = buildMypyBoto3Package "forecast" "1.34.0" "sha256-DuNZe9Q7HuEeJYuBqo7JRBTJgclyUpU9fJ62SCGYpLQ="; - mypy-boto3-forecastquery = buildMypyBoto3Package "forecastquery" "1.28.36" "sha256-s2z8QZR9PP8Kj6yImCwUfh/gtbj4SKLn8wDTOYUVaEE="; + mypy-boto3-forecastquery = buildMypyBoto3Package "forecastquery" "1.34.0" "sha256-IEKWQbwRDHiT/n5dSXXtLDqRVK12+EiSg9J+dGXfqx8="; - mypy-boto3-frauddetector = buildMypyBoto3Package "frauddetector" "1.28.36" "sha256-Zn3rGHErin7nPYnyC0Ojr0Kkc5T+YDD2KmZinYNV9Jg="; + mypy-boto3-frauddetector = buildMypyBoto3Package "frauddetector" "1.34.0" "sha256-EjiFEFpLKN0NmrNY43CFhQZHN+COTwRXx513X6X7vlE="; - mypy-boto3-fsx = buildMypyBoto3Package "fsx" "1.28.44" "sha256-t90+ngxgivF/KThwaB6/LNPZAHL2oLenhl6KUzSZSzU="; + mypy-boto3-fsx = buildMypyBoto3Package "fsx" "1.34.0" "sha256-ldLsj0dqNfvmcmqoikBI6qHPKIljkjfttrm3Rg8VKrE="; - mypy-boto3-gamelift = buildMypyBoto3Package "gamelift" "1.28.36" "sha256-ADxlyEX5KgAewNFq7JhYECNIhaoKiPkdqWK2pnS+65A="; + mypy-boto3-gamelift = buildMypyBoto3Package "gamelift" "1.34.0" "sha256-O9k5Ve7aZte3gwk2FS9i8k/sRsMKj+HIfI/rk9MlI70="; mypy-boto3-gamesparks = buildMypyBoto3Package "gamesparks" "1.28.36" "sha256-6lQXNJ55FYvkFA14rgJGhRMjBHA3YrOybnsKNecX7So="; - mypy-boto3-glacier = buildMypyBoto3Package "glacier" "1.28.36" "sha256-L0a7CoD9I0wM8JvzaAxL8bm1SV1XmFi5lvs2SuGPtl4="; + mypy-boto3-glacier = buildMypyBoto3Package "glacier" "1.34.0" "sha256-j8LUD8EjjRL1av7UEXBqNPEARaSFgstaioGJtbel4oM="; - mypy-boto3-globalaccelerator = buildMypyBoto3Package "globalaccelerator" "1.28.36" "sha256-+nnFS/7kJHvqqiwqkWnYlgeIuSecicI1P+UtWyGUoGQ="; + mypy-boto3-globalaccelerator = buildMypyBoto3Package "globalaccelerator" "1.34.0" "sha256-hvQeuu1TuLO9aB1+lWTGPgpGqoZlC8d3Ru5S4OVLgys="; - mypy-boto3-glue = buildMypyBoto3Package "glue" "1.28.36" "sha256-FhdxJSu2oiCgv9jmrXHahUhZnGEflf6KlIRvSjOG0q4="; + mypy-boto3-glue = buildMypyBoto3Package "glue" "1.34.0" "sha256-ZUe+WMSvYT0v5aXEbYAX5ZitSV9kv9FKVtfeQGIEG6U="; - mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.28.39" "sha256-OsEvT2f3LEvjz6aojIpG2scoZ80hETvk8t/BTumn+9M="; + mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.34.0" "sha256-J8ccxvUnjvC6aITCuLHnEXMlQ3Bdh6HxP+Spu326ZwA="; - mypy-boto3-greengrass = buildMypyBoto3Package "greengrass" "1.28.36" "sha256-vH/viSZe2UcjtbwGN2Zcf9IB1boBHhL3zmy3IHN1rpg="; + mypy-boto3-greengrass = buildMypyBoto3Package "greengrass" "1.34.0" "sha256-ZU/xVWGlMngX0JiAhy9NEFDoXS4fsZvmLAkWqv2pocQ="; - mypy-boto3-greengrassv2 = buildMypyBoto3Package "greengrassv2" "1.28.36" "sha256-VdsQUNg3a2PUaP8rgx3I1ZxUW4hqJsBCS0B8+7CfP1w="; + mypy-boto3-greengrassv2 = buildMypyBoto3Package "greengrassv2" "1.34.0" "sha256-O3g6JHvnfvgKL0ax9R6IWgxdEoALaycfsBAhvWdERH0="; - mypy-boto3-groundstation = buildMypyBoto3Package "groundstation" "1.28.36" "sha256-M0HaOpC6zbIaN3VVcM9oE/QzL+me4d5Co5miJGMU3n8="; + mypy-boto3-groundstation = buildMypyBoto3Package "groundstation" "1.34.0" "sha256-CR3w42iyXmyGMzjCM7M1LKqsIROMjXxxGM8coSTtJ3o="; - mypy-boto3-guardduty = buildMypyBoto3Package "guardduty" "1.28.53" "sha256-ctMp5+GrKYICPioPi5kB7cnxoP9QFIfbYiDxqf/pPCw="; + mypy-boto3-guardduty = buildMypyBoto3Package "guardduty" "1.34.0" "sha256-pXyZFdO9so979yfWaRDI+InxBHBEt1XDEdam3lOUad0="; - mypy-boto3-health = buildMypyBoto3Package "health" "1.28.39" "sha256-yp8r38QxJVKxiZtrCgvUcuqz2HnTM2IvYjyYGTgAqYc="; + mypy-boto3-health = buildMypyBoto3Package "health" "1.34.0" "sha256-st3ygy9yZbAbh1ZWnT8XDZTBz1qWhRWXCEfr5ILQHpo="; - mypy-boto3-healthlake = buildMypyBoto3Package "healthlake" "1.28.36" "sha256-RYbiExGphCkf8v+oC3ixOOFOnUrXE2bGnOvjRUGdQRQ="; + mypy-boto3-healthlake = buildMypyBoto3Package "healthlake" "1.34.0" "sha256-DtMeHx0XiVW9uU8krAhbfnihKpGRd6V82sSF59uTc6U="; - mypy-boto3-honeycode = buildMypyBoto3Package "honeycode" "1.28.36" "sha256-pOWZ+WNmgWwGz1sPq/feZiQ2TlXDcpoWMXcDPSESJOY="; + mypy-boto3-honeycode = buildMypyBoto3Package "honeycode" "1.34.0" "sha256-HNp/STFuMLoO4qyL0iaYeiPpnMV3uzNBNFUDgzrHt9s="; - mypy-boto3-iam = buildMypyBoto3Package "iam" "1.28.37" "sha256-Ob1bi5pIy0fZCdRcE8cTwJnC+EcZYSoKhI16BJfG/PQ="; + mypy-boto3-iam = buildMypyBoto3Package "iam" "1.34.0" "sha256-JIXnU8/hOOzpS6scSYPQ203HbiUxTT/9ub3lxyrRqSw="; - mypy-boto3-identitystore = buildMypyBoto3Package "identitystore" "1.28.40" "sha256-KPPWrEMuciHf3ms3SkUgAaEFNPa5WyFKm5fFfG4o9G8="; + mypy-boto3-identitystore = buildMypyBoto3Package "identitystore" "1.34.0" "sha256-OdJsMjraTe4qhpblBOuwr++4QfiMXtaaMHDAEOTBII4="; - mypy-boto3-imagebuilder = buildMypyBoto3Package "imagebuilder" "1.28.36" "sha256-2fJtgGfwkY3V07kXAiyi61TUmvq3BVqiN+EFzxTQkvI="; + mypy-boto3-imagebuilder = buildMypyBoto3Package "imagebuilder" "1.34.0" "sha256-eDAlL/p9iBVDQyKuDggxdyE3Jz6ch/l5ECn3cNiL9Uo="; - mypy-boto3-importexport = buildMypyBoto3Package "importexport" "1.28.36" "sha256-806+dIMqKZ14MifNoDqKgj8MGPYBQVd8KnT+V+eOr/E="; + mypy-boto3-importexport = buildMypyBoto3Package "importexport" "1.34.0" "sha256-GnIzCaCuRLPdvaAmmID62uY/te1Lx5DFGin2zJuDdAM="; - mypy-boto3-inspector = buildMypyBoto3Package "inspector" "1.28.36" "sha256-plSUqqsTvOMxMeAYueWNpK8JFHdeOOr8DfgSZov9Gbw="; + mypy-boto3-inspector = buildMypyBoto3Package "inspector" "1.34.0" "sha256-85aAE1+azKZ9sFYxLOpVR4SkqrnfFQ1gXgGpzOBK1PE="; - mypy-boto3-inspector2 = buildMypyBoto3Package "inspector2" "1.28.36" "sha256-O20aGL3EhyS5HNYlY6Jv1n0OIUWPr3L2VVjReHwpAGM="; + mypy-boto3-inspector2 = buildMypyBoto3Package "inspector2" "1.34.0" "sha256-W7+5M3OJ0U5irl0mVrKYGG5ae3XRM9fJDfVP4eqbUSc="; - mypy-boto3-internetmonitor = buildMypyBoto3Package "internetmonitor" "1.28.47" "sha256-qNv+Qi/5eZ5oUsysYokQufE3BgL32BzA9gdxWsJ6ocU="; + mypy-boto3-internetmonitor = buildMypyBoto3Package "internetmonitor" "1.34.0" "sha256-IWPylBWqk4uNn4LhwTkc17lbYn1xP1rxVzAGG3V659U="; - mypy-boto3-iot = buildMypyBoto3Package "iot" "1.28.56" "sha256-dLDUJEflskkXKb6soxoKRoPxko/Qb9lWkKjPnVklUWc="; + mypy-boto3-iot = buildMypyBoto3Package "iot" "1.34.0" "sha256-E7ilb7HmEBYm+cvWIDmkvfaR72nlu8QqMr9HJBOeVro="; - mypy-boto3-iot-data = buildMypyBoto3Package "iot-data" "1.28.36" "sha256-DDUn2TFgXeeltWJqH7g7D+gKLSQv832/J4lWBVyWmlQ="; + mypy-boto3-iot-data = buildMypyBoto3Package "iot-data" "1.34.0" "sha256-N6UoHopsT3FM7bU01eWuqRSyyyaLBekkM+hsOU1byIM="; - mypy-boto3-iot-jobs-data = buildMypyBoto3Package "iot-jobs-data" "1.28.36" "sha256-bpKEm6reRSLi74HT9wMGN+xkJPTYSLxOGf8Z7QN1qMY="; + mypy-boto3-iot-jobs-data = buildMypyBoto3Package "iot-jobs-data" "1.34.0" "sha256-ceqk+Gt+IcIVuLp/LMsrjnUXrPt+SY+mI8G3hKdE7TY="; - mypy-boto3-iot-roborunner = buildMypyBoto3Package "iot-roborunner" "1.28.36" "sha256-DFaWmHPzlgZztGfbbxeyDWu2rGLm69r8Ejww5cvzkRQ="; + mypy-boto3-iot-roborunner = buildMypyBoto3Package "iot-roborunner" "1.34.0" "sha256-TfhJHtE2zlEr80SGbxAZfK2+M/ad596fdwex+4GhBf8="; - mypy-boto3-iot1click-devices = buildMypyBoto3Package "iot1click-devices" "1.28.36" "sha256-GROHe78qVJLlPtw+wH73fzyBjTsrKkUbpVN0U26HsJs="; + mypy-boto3-iot1click-devices = buildMypyBoto3Package "iot1click-devices" "1.34.0" "sha256-Zpv/kw541LoC3Z58eKGe7sK5qioWMGswQS0O+jvNZgY="; - mypy-boto3-iot1click-projects = buildMypyBoto3Package "iot1click-projects" "1.28.36" "sha256-XAtVZ+j5k8eb1G79B+sin/W3bVfq+Vtr/P80BU2XnVQ="; + mypy-boto3-iot1click-projects = buildMypyBoto3Package "iot1click-projects" "1.34.0" "sha256-QZ06B5UQSuDPUaXqZYPjawSEjIQjBwP7d5/obpvNivI="; - mypy-boto3-iotanalytics = buildMypyBoto3Package "iotanalytics" "1.28.36" "sha256-jO+/523WSPqhQCAOr6nFiag/tCHL1Up1A0q76jZ7/qE="; + mypy-boto3-iotanalytics = buildMypyBoto3Package "iotanalytics" "1.34.0" "sha256-aDlptQYJQ71WWYsgv+bFRoD2fmeGgiUl1Fv/oOAQJEM="; - mypy-boto3-iotdeviceadvisor = buildMypyBoto3Package "iotdeviceadvisor" "1.28.36" "sha256-0v8vHIOzHO7ZEZEA08hzukJV9EFSnTFh/1K1h3RhCyY="; + mypy-boto3-iotdeviceadvisor = buildMypyBoto3Package "iotdeviceadvisor" "1.34.0" "sha256-DBI4dJXxprfHO3ipLIVb5Ii5NK7qWJRuWjzVfHTnqO4="; - mypy-boto3-iotevents = buildMypyBoto3Package "iotevents" "1.28.36" "sha256-27oaZTqmrBRJ3xlE9QKqLkau+dR30aYdeczVaWwK1Xs="; + mypy-boto3-iotevents = buildMypyBoto3Package "iotevents" "1.34.0" "sha256-cRFcD4DvPzCXS6WeXeaxLj2HY0eQelel5Lju3UAYgcA="; - mypy-boto3-iotevents-data = buildMypyBoto3Package "iotevents-data" "1.28.36" "sha256-De7a/DdIEmK9jkd6CekBQ+ZNlp+5hyavdY5ISYNLM20="; + mypy-boto3-iotevents-data = buildMypyBoto3Package "iotevents-data" "1.34.0" "sha256-K7yAnxjpJfSh6bWnmcdySkCQhhVFt42zU6REiy3zKrk="; - mypy-boto3-iotfleethub = buildMypyBoto3Package "iotfleethub" "1.28.36" "sha256-AH9zk6pQ5OhupzG9lkZGSAX/ngrFovlldGkfn40TZh4="; + mypy-boto3-iotfleethub = buildMypyBoto3Package "iotfleethub" "1.34.0" "sha256-wNm6OJUgAhvrXhtGaty19Tyva+nvonDOHsj9RT37FbY="; - mypy-boto3-iotfleetwise = buildMypyBoto3Package "iotfleetwise" "1.28.57" "sha256-KE8Q0jmXGhRAD3SmioxKVabyM0zLQEvhzogGEAMGvtU="; + mypy-boto3-iotfleetwise = buildMypyBoto3Package "iotfleetwise" "1.34.0" "sha256-SlCLEpSDXygGaK5EfIei/qk/l3CoCZWyEm3yJUPHqxQ="; - mypy-boto3-iotsecuretunneling = buildMypyBoto3Package "iotsecuretunneling" "1.28.36" "sha256-ANWiAgtmQCchCYvPPXUGdUHYLJOCoQAsFz8ybpZSceg="; + mypy-boto3-iotsecuretunneling = buildMypyBoto3Package "iotsecuretunneling" "1.34.0" "sha256-E8658X3yWpIcRKDTtnacjuAAWqr/qnmYXFRJ/7uyKm8="; - mypy-boto3-iotsitewise = buildMypyBoto3Package "iotsitewise" "1.28.36" "sha256-Sr5hmTMLMDxxXwG6s+wv5kkq4NnFCTFjMisOwdniBN4="; + mypy-boto3-iotsitewise = buildMypyBoto3Package "iotsitewise" "1.34.0" "sha256-/WDIf5WRUYbuhkzjXrX1t3BvHd7ZXBem2o8TysFWYQw="; - mypy-boto3-iotthingsgraph = buildMypyBoto3Package "iotthingsgraph" "1.28.36" "sha256-msc7aVFDSQRUNeqHWFqJ+4haUvCq+VYCpmZONl7+ySA="; + mypy-boto3-iotthingsgraph = buildMypyBoto3Package "iotthingsgraph" "1.34.0" "sha256-8D0jqOuusz6SLCr+eKAZpTr9dvdonIc7+UYyXDzVzYQ="; - mypy-boto3-iottwinmaker = buildMypyBoto3Package "iottwinmaker" "1.28.36" "sha256-laSFI1ugTL+9bVVQLuMKvQ9WGgXGikvV3k1DsyTIJ00="; + mypy-boto3-iottwinmaker = buildMypyBoto3Package "iottwinmaker" "1.34.0" "sha256-K5LEh8wdXvftxGstThSBN73K+1FUVlE40JxvjWv6GMA="; - mypy-boto3-iotwireless = buildMypyBoto3Package "iotwireless" "1.28.36" "sha256-CAAkka/CEZ1D+MgK1cbWDm6mArcRPxAo98Rz3ti6oHk="; + mypy-boto3-iotwireless = buildMypyBoto3Package "iotwireless" "1.34.0" "sha256-g2Ab6AQ0fvmEuSqAHlvAPe3TYSz/Nai1U8srjT0QWHw="; - mypy-boto3-ivs = buildMypyBoto3Package "ivs" "1.28.39" "sha256-bsUwfBojGMRujL9yLhIqBLAxEpgz1H3KCSmhoQ/UrfM="; + mypy-boto3-ivs = buildMypyBoto3Package "ivs" "1.34.0" "sha256-iYt/bJaAH7TGN+FeKg9K8/T5QlTB3mhxb+P+53KBSQg="; - mypy-boto3-ivs-realtime = buildMypyBoto3Package "ivs-realtime" "1.28.47" "sha256-f5aHtTu7H0TY3XYW1OJIkwKlKe6iZj0nxEjwlbEmc/4="; + mypy-boto3-ivs-realtime = buildMypyBoto3Package "ivs-realtime" "1.34.0" "sha256-x+B14roN4jNXeLp+Tmwtj28OMeGe80qLMaIbVCzulbY="; - mypy-boto3-ivschat = buildMypyBoto3Package "ivschat" "1.28.36" "sha256-WMq8phYMtEl8Ey7tDxBzVexuR4gmZQlO6qpDwYu8xwY="; + mypy-boto3-ivschat = buildMypyBoto3Package "ivschat" "1.34.0" "sha256-eNwL7uUI7x30KJwNO5U/0XSV1O4YZYu/zYvGQgz7p+8="; - mypy-boto3-kafka = buildMypyBoto3Package "kafka" "1.28.36" "sha256-93kbJxpiLQsnhudgnGoGUimUPfhGMN0cc1x8qqsA/Jc="; + mypy-boto3-kafka = buildMypyBoto3Package "kafka" "1.34.0" "sha256-fBTouiFX1z8WvIECcu8gocENiWMl50hbCEk7K+4OCV0="; - mypy-boto3-kafkaconnect = buildMypyBoto3Package "kafkaconnect" "1.28.39" "sha256-p2vmaWN7oBdsud3bCB2/rCme7IXKJ4xI/XSFj4AqmGo="; + mypy-boto3-kafkaconnect = buildMypyBoto3Package "kafkaconnect" "1.34.0" "sha256-RcUs+Gy7ck1oV7moI3JjHYhkrjcrLW6QQ1WtTt13ass="; - mypy-boto3-kendra = buildMypyBoto3Package "kendra" "1.28.46" "sha256-zeKYrDZdcdNISV2eukD7GN/sdve8R5PNbvOhZN5FyRI="; + mypy-boto3-kendra = buildMypyBoto3Package "kendra" "1.34.0" "sha256-j1fph9WwqBns2BpZjoKTpXC9gUJ4lu+poPBV6LIOusM="; - mypy-boto3-kendra-ranking = buildMypyBoto3Package "kendra-ranking" "1.28.36" "sha256-C1wYGskKNR6E4bL6OR8ERRwHZ8HpTbhCAoiBKIAsgME="; + mypy-boto3-kendra-ranking = buildMypyBoto3Package "kendra-ranking" "1.34.0" "sha256-hbemz5ECtfP3oi645lZT7CCx31yg8MNqbAD32Am6l1U="; - mypy-boto3-keyspaces = buildMypyBoto3Package "keyspaces" "1.28.36" "sha256-p5Tj7bqC/E552Mmr/G+QxOA4LyW4YK9VlztEhKNw/Fc="; + mypy-boto3-keyspaces = buildMypyBoto3Package "keyspaces" "1.34.0" "sha256-Hii5uKPqWNwm/dRYFtdQni1F+WsAB49yeY+cjaJsMH4="; - mypy-boto3-kinesis = buildMypyBoto3Package "kinesis" "1.28.36" "sha256-Q3E8DOj2Oyy9GBEy5xNxAxvZDqwlCu9zV7I51NprhQQ="; + mypy-boto3-kinesis = buildMypyBoto3Package "kinesis" "1.34.0" "sha256-9ATnW63Vl36fCXQbdpuIiIVL3UEcYxNEaGq4ie/ph0E="; - mypy-boto3-kinesis-video-archived-media = buildMypyBoto3Package "kinesis-video-archived-media" "1.28.36" "sha256-v3hjhhFbCTKsfYTUvI57lEvnRSIX5POdjH/4hC+GthA="; + mypy-boto3-kinesis-video-archived-media = buildMypyBoto3Package "kinesis-video-archived-media" "1.34.0" "sha256-QXuYhv4wLd+3X+IG3ynOVVDIVbesn0OiiSojtBC3Hc8="; - mypy-boto3-kinesis-video-media = buildMypyBoto3Package "kinesis-video-media" "1.28.36" "sha256-Si9Dz0blHg5oq8Nnq/6V5NMmt3Zbl9rVt8/UcfwSgnU="; + mypy-boto3-kinesis-video-media = buildMypyBoto3Package "kinesis-video-media" "1.34.0" "sha256-YgkG14UzymthRLg4cga80ZDK9cxZzFBTISmnfTPt8nM="; - mypy-boto3-kinesis-video-signaling = buildMypyBoto3Package "kinesis-video-signaling" "1.28.36" "sha256-sOiEpuZ3AMYRK6daSsoK3ti9LN4v7GgBPSThWTh25Og="; + mypy-boto3-kinesis-video-signaling = buildMypyBoto3Package "kinesis-video-signaling" "1.34.0" "sha256-aNFuruM0kQNhp+wEJr+Bo9MzLieG6a8xzbrHGAovgw8="; - mypy-boto3-kinesis-video-webrtc-storage = buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.28.36" "sha256-AJPSjIIX+AQKXPPoNxTESszrC5ZzQhwHeb/eTF/LJkE="; + mypy-boto3-kinesis-video-webrtc-storage = buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.34.0" "sha256-Oi6r/AxePB0znUPg3fb22qZLDS4Cola5Vvs38Railnc="; - mypy-boto3-kinesisanalytics = buildMypyBoto3Package "kinesisanalytics" "1.28.36" "sha256-K/NUI/VQjoxmiL3s7ASUBCBv9GWqKQYpz4o0+oohDFU="; + mypy-boto3-kinesisanalytics = buildMypyBoto3Package "kinesisanalytics" "1.34.0" "sha256-eEoSmwMTa/hsbKbuKuzAZv4jHljGKq3b5Rw7K2Pgc50="; - mypy-boto3-kinesisanalyticsv2 = buildMypyBoto3Package "kinesisanalyticsv2" "1.28.36" "sha256-k+ftbXSH2gm76lsJvMdvAuAnWBVsLEh829o4x5rUQUQ="; + mypy-boto3-kinesisanalyticsv2 = buildMypyBoto3Package "kinesisanalyticsv2" "1.34.0" "sha256-ZxVW6BKUdgnWKk4J3B2I0vlSLZRR+Dua3Sb/mzIDFNE="; - mypy-boto3-kinesisvideo = buildMypyBoto3Package "kinesisvideo" "1.28.52" "sha256-X05ZXElPveZ44sea7a0F5oO+wIIpYgTISpUwvACPiEY="; + mypy-boto3-kinesisvideo = buildMypyBoto3Package "kinesisvideo" "1.34.0" "sha256-mbvYhX3mrYQUBOHNe1N4ybz9jnVz9C2+eEwb0CFAp9w="; - mypy-boto3-kms = buildMypyBoto3Package "kms" "1.28.37" "sha256-l4RcfT1vhG8hlaWdapdDB6FqCFseZP56/kDppcBra48="; + mypy-boto3-kms = buildMypyBoto3Package "kms" "1.34.0" "sha256-0/rxLiZeadSPkzmVqx/TGMaFMAdIAXS82FcXf8BSUpg="; - mypy-boto3-lakeformation = buildMypyBoto3Package "lakeformation" "1.28.55" "sha256-RgYc0eRv7agKmJVwqTqsx2ua0Y1B8UHbwQ1eCh5kumU="; + mypy-boto3-lakeformation = buildMypyBoto3Package "lakeformation" "1.34.0" "sha256-xIQAyiytQRYcLFWGoEfZJY+4Ga9NeRBuN8MQOZmOypc="; - mypy-boto3-lambda = buildMypyBoto3Package "lambda" "1.28.36" "sha256-cEmOb/a/1gt1hVPSf632kboWlXL6ygHCvUV9oLSLnP8="; + mypy-boto3-lambda = buildMypyBoto3Package "lambda" "1.34.0" "sha256-50wM5UjadHqMbmQ8OdrYqlTWfgV/V3QOx4Cn5WVZBic="; - mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.28.36" "sha256-pe4WZgqSF3iodWqXn94fzNChq946ZydQlwJF7CB0HMc="; + mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.34.0" "sha256-LkD3CCjJYGwlSYRP0meJUCEdVSGGdSRrL9uBtimX4GU="; - mypy-boto3-lex-runtime = buildMypyBoto3Package "lex-runtime" "1.28.36" "sha256-pE1gAxoS2hb4N4H7irZNgXERAXBt/eWqF0CZZjszTyI="; + mypy-boto3-lex-runtime = buildMypyBoto3Package "lex-runtime" "1.34.0" "sha256-oFUSsfT7RXHRAVUUk014lqPylPa+TZuyNuvHRixIxt8="; - mypy-boto3-lexv2-models = buildMypyBoto3Package "lexv2-models" "1.28.36" "sha256-6DXon6AyJugNzp9bKXfvspvWGdD11dV5qxBZa7AikbE="; + mypy-boto3-lexv2-models = buildMypyBoto3Package "lexv2-models" "1.34.0" "sha256-tNe2tLSSupXGHp6u65zeYNSciCC2Wbj/R4ZkDKT5cS8="; - mypy-boto3-lexv2-runtime = buildMypyBoto3Package "lexv2-runtime" "1.28.36" "sha256-6wP6YHyctJWXdPO8bmylwhxtJ3jltbWYyAxdu+5+X5w="; + mypy-boto3-lexv2-runtime = buildMypyBoto3Package "lexv2-runtime" "1.34.0" "sha256-V1OkUcwFYp8TVS2ASFjARJUrIKAx/9zcfQbQMngU5Uc="; - mypy-boto3-license-manager = buildMypyBoto3Package "license-manager" "1.28.36" "sha256-/XOD5I4y2PHzW9Y+akeF1Oovf04jeh4r4ZcxjUP4ZOU="; + mypy-boto3-license-manager = buildMypyBoto3Package "license-manager" "1.34.0" "sha256-93G6q8UIQ/6VtreLOSTQm99tFvsW917t0UgfKkp0kqs="; - mypy-boto3-license-manager-linux-subscriptions = buildMypyBoto3Package "license-manager-linux-subscriptions" "1.28.36" "sha256-LuwZUXbQlSC1YSyfNuensyYVoKwy6cZzMbC2/bGJ5Pw="; + mypy-boto3-license-manager-linux-subscriptions = buildMypyBoto3Package "license-manager-linux-subscriptions" "1.34.0" "sha256-yHvpZZn49SjTn/DLjSRhzGc2vg0IVv5GCeOFnhtScKA="; - mypy-boto3-license-manager-user-subscriptions = buildMypyBoto3Package "license-manager-user-subscriptions" "1.28.36" "sha256-KcTO20KTKnvcCykL5C4BqDFyj/Xrp0l6gH7JslRIzcQ="; + mypy-boto3-license-manager-user-subscriptions = buildMypyBoto3Package "license-manager-user-subscriptions" "1.34.0" "sha256-PR+u+i5zSHFTN6+GuOcWBcON1E2SNABbPavByXz3unE="; - mypy-boto3-lightsail = buildMypyBoto3Package "lightsail" "1.28.36" "sha256-3euT5o4jOo39mco4y7geAA7PBF6z7A3lj451xXnB98o="; + mypy-boto3-lightsail = buildMypyBoto3Package "lightsail" "1.34.0" "sha256-+VLq0hfyQS1IpzEMfB5mhp+gxL76CWh5q1wgJKffWQ8="; - mypy-boto3-location = buildMypyBoto3Package "location" "1.28.36" "sha256-Gl0Q4693qhG9Wii6KlQXw9B5hZcoYoNcsO6rptLGPHQ="; + mypy-boto3-location = buildMypyBoto3Package "location" "1.34.0" "sha256-SDz6L3ePAAA8V99pJrB55/4i+piQY0KpTbsKEJyVpS0="; - mypy-boto3-logs = buildMypyBoto3Package "logs" "1.28.52" "sha256-tR6bl5YSI7/iMUzhaIe70imFezlgph03JIDW1ogWi34="; + mypy-boto3-logs = buildMypyBoto3Package "logs" "1.34.0" "sha256-qFK/bEhzOlHDJMqX2gQr/kxmsNM6q+BC+yfTCSVy1Vs="; - mypy-boto3-lookoutequipment = buildMypyBoto3Package "lookoutequipment" "1.28.48" "sha256-RXWRC9LegKQlODn8zgQJEADZGSuCYMp4/HdFGUge3rU="; + mypy-boto3-lookoutequipment = buildMypyBoto3Package "lookoutequipment" "1.34.0" "sha256-tcwlzJzbFBJXhAoHpw+V5TC3Na3SbD+nkpdOf9RhDZU="; - mypy-boto3-lookoutmetrics = buildMypyBoto3Package "lookoutmetrics" "1.28.36" "sha256-GDkmENl2VbNDdXS26ORGeEoK8YAURJJRVzoxAiFt9L8="; + mypy-boto3-lookoutmetrics = buildMypyBoto3Package "lookoutmetrics" "1.34.0" "sha256-2SRBUd8fZ7i2GbDgBWJcYS0Fbr/U65UmrLbHx57IZ5A="; - mypy-boto3-lookoutvision = buildMypyBoto3Package "lookoutvision" "1.28.36" "sha256-tcA34QM+t2tiaV7kmaNDZjGEbtc6Bs1ZRQoPjHFNojw="; + mypy-boto3-lookoutvision = buildMypyBoto3Package "lookoutvision" "1.34.0" "sha256-+zl9JmGel0rkmGeYaHMlBIfPQfHdJQOk+sG/nuHnzD0="; - mypy-boto3-m2 = buildMypyBoto3Package "m2" "1.28.36" "sha256-6UdS7JMp8vnbP/AHoiQJ+kTBZiPSvymziVeNQnkXNxg="; + mypy-boto3-m2 = buildMypyBoto3Package "m2" "1.34.0" "sha256-ZF3ZViV0pN64OEc8aHuCRR0lnVyHOiTRfqVQGCmMMKE="; - mypy-boto3-machinelearning = buildMypyBoto3Package "machinelearning" "1.28.36" "sha256-ucXN/rMMlxsRBvR0rhvF+X98qKzuvXXHSGRZSqds2Cc="; + mypy-boto3-machinelearning = buildMypyBoto3Package "machinelearning" "1.34.0" "sha256-DeiBu3PQMageEUlVdjH/1uELsPwo4IVhYzDlJFBohKg="; 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-macie2 = buildMypyBoto3Package "macie2" "1.34.0" "sha256-5PO/Zcpo7e1crJTprlKVGYTlzRxZ+0ShNRLLVVjQ5GA="; - mypy-boto3-managedblockchain = buildMypyBoto3Package "managedblockchain" "1.28.58" "sha256-WurxI39UdFSgwdxaymDxsoO03bGZ1ooMaCCwOthnrPo="; + mypy-boto3-managedblockchain = buildMypyBoto3Package "managedblockchain" "1.34.0" "sha256-gUPuS8/ygIdsfCx6S1zpxP936Ah0o5BT4TaDiEW4wPQ="; - mypy-boto3-managedblockchain-query = buildMypyBoto3Package "managedblockchain-query" "1.28.36" "sha256-3RQJLfH4XCw8ajN6NdEZqhnBjfYZvxqbZOISKaQyuq0="; + mypy-boto3-managedblockchain-query = buildMypyBoto3Package "managedblockchain-query" "1.34.0" "sha256-nQxUZ9L1Cs/9bn5Re4Q6/0X/UoJ3CkHsoUbVxzTDV/U="; - mypy-boto3-marketplace-catalog = buildMypyBoto3Package "marketplace-catalog" "1.28.37" "sha256-Egrc6aap+HyguDM71bJrvFrtG0x3mxHjKqusw8PGTc8="; + mypy-boto3-marketplace-catalog = buildMypyBoto3Package "marketplace-catalog" "1.34.0" "sha256-lzl/UK3PULZu+XXbt8wGc6xwmJZBsj3Zfjiq/awWVzI="; - mypy-boto3-marketplace-entitlement = buildMypyBoto3Package "marketplace-entitlement" "1.28.36" "sha256-9pTcu/s4RykpnM/FsI/VuBLmLCz1/AVpWSTPORFVraY="; + mypy-boto3-marketplace-entitlement = buildMypyBoto3Package "marketplace-entitlement" "1.34.0" "sha256-yGaeDZLEmp/Nap++wI6GgQvVW3HxQFcM+ipk7RAuG4g="; - mypy-boto3-marketplacecommerceanalytics = buildMypyBoto3Package "marketplacecommerceanalytics" "1.28.36" "sha256-8omV1nyC83MRbAEwCOzDvyuTHARxCDJtMCkIJ76/42Q="; + mypy-boto3-marketplacecommerceanalytics = buildMypyBoto3Package "marketplacecommerceanalytics" "1.34.0" "sha256-Gzmd4GQnM2sRrL4/FE9kI0R9ItKJ5xdaC/cCGqQ0XAY="; - mypy-boto3-mediaconnect = buildMypyBoto3Package "mediaconnect" "1.28.36" "sha256-xJ/i8IAQvwsCD/8F8hVMGuVpI/8ZbiWCW6w2O9PMmwg="; + mypy-boto3-mediaconnect = buildMypyBoto3Package "mediaconnect" "1.34.0" "sha256-mR45JCaKUwScSb63vyw5dUZmVm2qwkN/e2gp+zBHHpo="; - mypy-boto3-mediaconvert = buildMypyBoto3Package "mediaconvert" "1.28.53" "sha256-nGLoDX8cgcCHad2hpZvOzNSkq+VfWvTQ6qGbsvqbnbc="; + mypy-boto3-mediaconvert = buildMypyBoto3Package "mediaconvert" "1.34.0" "sha256-R3ZE6Uam8sqSVyNqV7jMMfYQa1LgB6kdtNpdTsHNC20="; - mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.28.45" "sha256-vcf1hxhHJ/F6S58p9Jb/Pic063aeLVc+HrzAnN9ph/A="; + mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.34.0" "sha256-iOqhX6q/6NnCnqOEs2OfMFXfHcroZI5wQAaPv5uWwDc="; - mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.28.36" "sha256-ezPUrghBEb7oInGgyP8JlEf2yKSOPHRznBZ7BcNP6Oc="; + mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.34.0" "sha256-4DJ2zVk0satmVn+TZdDExx/+ClJpc1bdmbvl72Joe5U="; - mypy-boto3-mediapackage-vod = buildMypyBoto3Package "mediapackage-vod" "1.28.36" "sha256-CYgKkn7AOmwBgaMNhq2ofKH5dQXu+hgC0In+UfWa9f0="; + mypy-boto3-mediapackage-vod = buildMypyBoto3Package "mediapackage-vod" "1.34.0" "sha256-XwGc3+WD8o/MUfcBocl52TPK/RhiCjEb2qDqcuYwB+g="; - mypy-boto3-mediapackagev2 = buildMypyBoto3Package "mediapackagev2" "1.28.36" "sha256-oGwfsKI4PEhj5oJKr9pLvma7+nNSFyRlMzC2HYnVCsQ="; + mypy-boto3-mediapackagev2 = buildMypyBoto3Package "mediapackagev2" "1.34.0" "sha256-8UYtTNJDsu0CkxQguWOtNI0viERJ4bRBKNa/In4iIA0="; - mypy-boto3-mediastore = buildMypyBoto3Package "mediastore" "1.28.37" "sha256-OptRBCGquVDgcG/7K70WZCdMhGCPSU8Gyb236ooUwhY="; + mypy-boto3-mediastore = buildMypyBoto3Package "mediastore" "1.34.0" "sha256-v2G2wDXGJwMalYnHTRGvdRTUv41bm8adIOj9tgQV0ys="; - mypy-boto3-mediastore-data = buildMypyBoto3Package "mediastore-data" "1.28.36" "sha256-X7PuP1LtOgJo/PJ5TBgq7O0iFAhBiVJRalNbQEWT7W4="; + mypy-boto3-mediastore-data = buildMypyBoto3Package "mediastore-data" "1.34.0" "sha256-bYlKkBh7Kq4PsToHQ4+K5B3h8+IwyS+7ngEJ5AALBus="; - mypy-boto3-mediatailor = buildMypyBoto3Package "mediatailor" "1.28.36" "sha256-1w5g2gzMCvufKYjjXey3ZeokZTxuL97LqHdu3CoG2UA="; + mypy-boto3-mediatailor = buildMypyBoto3Package "mediatailor" "1.34.0" "sha256-PD40mNQDdTmdlbaljPfflhojclRRWgFlE6l66SWpwSM="; - mypy-boto3-medical-imaging = buildMypyBoto3Package "medical-imaging" "1.28.36" "sha256-pAoO8V4SxZnUGou2Gf0p0Shpm7ZIvxdB9ZI8fhZU5U4="; + mypy-boto3-medical-imaging = buildMypyBoto3Package "medical-imaging" "1.34.0" "sha256-3lAWDWzf1MjTDh0+HDnewq0Yo3bUuhSGSSKJvJf6k8g="; - mypy-boto3-memorydb = buildMypyBoto3Package "memorydb" "1.28.36" "sha256-GsdpyKFaQyakXnKJzi2cBE0Vb1gLyUhXQ5VeGlkhVmk="; + mypy-boto3-memorydb = buildMypyBoto3Package "memorydb" "1.34.0" "sha256-bq2FQsYZ/7xi2o4cdacva510FjDRfbNRO2IrA0oxtAg="; - mypy-boto3-meteringmarketplace = buildMypyBoto3Package "meteringmarketplace" "1.28.36" "sha256-LiZj7Dltu+C717k1Aywtkk1faeSUAFYCMiOe5Mgoy4A="; + mypy-boto3-meteringmarketplace = buildMypyBoto3Package "meteringmarketplace" "1.34.0" "sha256-1un4l+XXDAen0NS1lQ2e1XOyUaoOjt+n8AU0VvGlTP0="; - mypy-boto3-mgh = buildMypyBoto3Package "mgh" "1.28.36" "sha256-7AGJAF8dh5FQz46IRinvrTX/PEC8cBkS2G/LMndjNS4="; + mypy-boto3-mgh = buildMypyBoto3Package "mgh" "1.34.0" "sha256-tyA+ywgjdRkIU2vbZwCsQfWIYctw/kLjIGTEAZuf8oU="; - mypy-boto3-mgn = buildMypyBoto3Package "mgn" "1.28.36" "sha256-MMp+P5+6/vc/fSNFUVuKtZCZbyDh8XvGsPg1LFTtzxg="; + mypy-boto3-mgn = buildMypyBoto3Package "mgn" "1.34.0" "sha256-BKzXdrkbnMw4m53xIRBSLta7wxeQpOEMgK6Yj9hmLf0="; - mypy-boto3-migration-hub-refactor-spaces = buildMypyBoto3Package "migration-hub-refactor-spaces" "1.28.36" "sha256-xfTzLCtQPfBM01l96ks/nGGYNgYYTy6GA3I/qU/y0II="; + mypy-boto3-migration-hub-refactor-spaces = buildMypyBoto3Package "migration-hub-refactor-spaces" "1.34.0" "sha256-T37s/ubwuU1zsKk8DmTFum6Ml3+WNZCJ+q8T6F75iUY="; - mypy-boto3-migrationhub-config = buildMypyBoto3Package "migrationhub-config" "1.28.36" "sha256-p3FiriZZMmqWMMPGT4Zu/BRiDch1K4hGqMYM9dVWX7g="; + mypy-boto3-migrationhub-config = buildMypyBoto3Package "migrationhub-config" "1.34.0" "sha256-feqiUjFrwYaAyRh1MZ96VILeEa/WBzUytsnRxXZMxoQ="; - mypy-boto3-migrationhuborchestrator = buildMypyBoto3Package "migrationhuborchestrator" "1.28.36" "sha256-x5vC9TZD5y/wyNCUS4KbcJk3tfMbD6GxhxJQj+DYVo4="; + mypy-boto3-migrationhuborchestrator = buildMypyBoto3Package "migrationhuborchestrator" "1.34.0" "sha256-XY1Ji/aYarPeIBh9r7Hv33b9L4iA3QE9zKTxDKPQ+vQ="; - mypy-boto3-migrationhubstrategy = buildMypyBoto3Package "migrationhubstrategy" "1.28.36" "sha256-HvDtYoWRyBmQxzn/YZJ9nhXgpKAnnwfD8RtTG2RakDM="; + mypy-boto3-migrationhubstrategy = buildMypyBoto3Package "migrationhubstrategy" "1.34.0" "sha256-N/NcnXF14SAs9F1ZwUYxc/5kp7iUWIFJisUfZxMStLU="; - mypy-boto3-mobile = buildMypyBoto3Package "mobile" "1.28.36" "sha256-SyBzpVCo90lFHeT9K9wbxMXNnJEccEY+bWsgnYcnA7Q="; + mypy-boto3-mobile = buildMypyBoto3Package "mobile" "1.34.0" "sha256-fzP70K6S7KPi6GnEj92shU+Dr07ieqDkmrAUEBxMVdI="; - mypy-boto3-mq = buildMypyBoto3Package "mq" "1.28.36" "sha256-nHADqvj4clxfJjeS0eiadhtaVKFKeXWLBG93QOwQkR8="; + mypy-boto3-mq = buildMypyBoto3Package "mq" "1.34.0" "sha256-yua6b3bSoXnJjAvsDHa+aE6DebBjQkAKdsy+nM7TcTE="; - mypy-boto3-mturk = buildMypyBoto3Package "mturk" "1.28.36" "sha256-7h2xEOjgYe1QVV3mbxb7HMZJunHo4RtDdr2Jojr6XDU="; + mypy-boto3-mturk = buildMypyBoto3Package "mturk" "1.34.0" "sha256-qhyVd+9KIaL4hxjjDnw7qdyJdcT6ApCxhoTggOVDr80="; - mypy-boto3-mwaa = buildMypyBoto3Package "mwaa" "1.28.36" "sha256-OyetpZbtbOjtUowUA7ahRY3OGgUEHD+Q7i4rej5CLIs="; + mypy-boto3-mwaa = buildMypyBoto3Package "mwaa" "1.34.0" "sha256-a0p1hoTP8iNP6OPkrq0dlWptYNQNA9hit2tvgCI1+W8="; - mypy-boto3-neptune = buildMypyBoto3Package "neptune" "1.28.36" "sha256-NEu+SKj/eoYlE2bRigVIFcXS+NRcyTwhB+xP0+SLh/s="; + mypy-boto3-neptune = buildMypyBoto3Package "neptune" "1.34.0" "sha256-oMS6e1cPfOZhh+obhOZTMjmwScEzwCBtvmjtpPIjltA="; - mypy-boto3-neptunedata = buildMypyBoto3Package "neptunedata" "1.28.43" "sha256-IWYezgs1FUCYgGvmw6X/8u8QX5uHew5PXhv3gr9MzME="; + mypy-boto3-neptunedata = buildMypyBoto3Package "neptunedata" "1.34.0" "sha256-ZKTaSuLNtxUyP1mW2q8RF8jvXKSfEyHZfJp77xRqbZc="; - mypy-boto3-network-firewall = buildMypyBoto3Package "network-firewall" "1.28.38" "sha256-MR+/d8G6cfpSEXsC9+mk1WXg/y1fQatMDV0uASI9bU0="; + mypy-boto3-network-firewall = buildMypyBoto3Package "network-firewall" "1.34.0" "sha256-I861Vg32yZJjg9/6q2KmFhysk/ysLZAg2ukNlWMEpuY="; - mypy-boto3-networkmanager = buildMypyBoto3Package "networkmanager" "1.28.36" "sha256-KESRmtzmmm/IMlQw8s7alP2PSupcdnXRtx2ZHETPzLA="; + mypy-boto3-networkmanager = buildMypyBoto3Package "networkmanager" "1.34.0" "sha256-vubUkzOk3bBuXVgHzMhYszMOhUqhBoupc7COdP0nneA="; - mypy-boto3-nimble = buildMypyBoto3Package "nimble" "1.28.36" "sha256-VDO5M5cFq0CLE4i017Peq9PFAOzKtld5ID8pgcZXBIA="; + mypy-boto3-nimble = buildMypyBoto3Package "nimble" "1.34.0" "sha256-i0E9kLunDRl+XzU3Ti3vxqHNa2oGHQQ9xDjCtNKi1Lw="; - mypy-boto3-oam = buildMypyBoto3Package "oam" "1.28.36" "sha256-wZ1GYz84QiDvu1EWE8AFrGP/7VnzZbLsrVj8Zt3WehE="; + mypy-boto3-oam = buildMypyBoto3Package "oam" "1.34.0" "sha256-/0ou6QtLQerkqJ+alocpYxUfe9jRHoOgQy9R6sxZAFo="; - mypy-boto3-omics = buildMypyBoto3Package "omics" "1.28.37" "sha256-bJALOo0sx1IwD1RBBx2CeW1JSW0IpqzF6i85ICO9SUM="; + mypy-boto3-omics = buildMypyBoto3Package "omics" "1.34.0" "sha256-HZqOWNHgRX8EKEGtvtbnuFH0BDrOpJpJd32NBpe4RWA="; - mypy-boto3-opensearch = buildMypyBoto3Package "opensearch" "1.28.36" "sha256-97rGlw+REicstwKchMVjN6EuZBxQuSwmhSfBnbHxsS4="; + mypy-boto3-opensearch = buildMypyBoto3Package "opensearch" "1.34.0" "sha256-DRo52YCDLBfE7n+huUyzf89G6yybntFTk0A9w5QLa8o="; - mypy-boto3-opensearchserverless = buildMypyBoto3Package "opensearchserverless" "1.28.36" "sha256-7V+wNpLTrYueSnPkOGD1ARqAewrNjbQzlIPDQJ/eEDY="; + mypy-boto3-opensearchserverless = buildMypyBoto3Package "opensearchserverless" "1.34.0" "sha256-YpbQWnVIXMqTzieWya4MiFz9HpN5YYSSmBjUvmO0VMo="; - mypy-boto3-opsworks = buildMypyBoto3Package "opsworks" "1.28.36" "sha256-Dpp3frNgsAyzKqC0Etq/p7jpjV+1YMwBx2bFqchGpeI="; + mypy-boto3-opsworks = buildMypyBoto3Package "opsworks" "1.34.0" "sha256-398ugKoRKeRqIH/1upx1K6d0Y/WIsMJCNM2Mmwk+S/A="; - mypy-boto3-opsworkscm = buildMypyBoto3Package "opsworkscm" "1.28.36" "sha256-zrkTx2FkTuP880vcmBYwfkHDsPvLmYA3aUEZx7dbHRU="; + mypy-boto3-opsworkscm = buildMypyBoto3Package "opsworkscm" "1.34.0" "sha256-HsUXwbXRPmEaSJjs4EezSHugssLtP2g/NvaI0CnGStA="; - mypy-boto3-organizations = buildMypyBoto3Package "organizations" "1.28.36" "sha256-IFR1uIVZVjJe2sWS9Tv75l67SXiB4Em74iKFz5giAWk="; + mypy-boto3-organizations = buildMypyBoto3Package "organizations" "1.34.0" "sha256-HQrlenaKsc49ugEcKSSRJkAyXwLOJ1Ymq1fTDoXSKXY="; - mypy-boto3-osis = buildMypyBoto3Package "osis" "1.28.36" "sha256-TOEjsJmgoUEXd4H4s4y7Gx7gWxo4GeLWbDd7FA5Xc/o="; + mypy-boto3-osis = buildMypyBoto3Package "osis" "1.34.0" "sha256-2mSI1VTmQWuwxsCgQtmr1w8xE3zIcwztvMuKMqXFF3k="; - mypy-boto3-outposts = buildMypyBoto3Package "outposts" "1.28.51" "sha256-iA+7Mxkp3n6hUJuFhxZ/Nf4vjeQcd3PoOEmjzk2ITI8="; + mypy-boto3-outposts = buildMypyBoto3Package "outposts" "1.34.0" "sha256-IqGeCqd6Nc9MaMEldqVohTNcmf7WvIiEnFGORzpoB0A="; - mypy-boto3-panorama = buildMypyBoto3Package "panorama" "1.28.36" "sha256-st4X3JA9Wf6zBqx9Gr2BxE9Z+1LeU0kiDpI8b+IVnjw="; + mypy-boto3-panorama = buildMypyBoto3Package "panorama" "1.34.0" "sha256-Pw0yRgawY5TC0OIgcYmzK3KEQusyRf3coThpeHL4X30="; - mypy-boto3-payment-cryptography = buildMypyBoto3Package "payment-cryptography" "1.28.36" "sha256-2YvWtVCfr7tYJzml4LdYpEsFrSpLve+nAWF6s2xB6HQ="; + mypy-boto3-payment-cryptography = buildMypyBoto3Package "payment-cryptography" "1.34.0" "sha256-/VwWLFCNWMpppAEAjAGMa4d1SfWAxHxs+17lboZGcC0="; - mypy-boto3-payment-cryptography-data = buildMypyBoto3Package "payment-cryptography-data" "1.28.39" "sha256-aMYAPA0/z6O4fSOcp+IfIaC49NiPq/cmCGSGHCCiyBo="; + mypy-boto3-payment-cryptography-data = buildMypyBoto3Package "payment-cryptography-data" "1.34.0" "sha256-+A49ZU8ITWkdUmGf57szMwIGzEHe6cx9egBEMDPsUKY="; - mypy-boto3-pca-connector-ad = buildMypyBoto3Package "pca-connector-ad" "1.28.38" "sha256-fVexVJjucP+4UEsje+jQU+dbA0ycpQQxWc3dqKnENiY="; + mypy-boto3-pca-connector-ad = buildMypyBoto3Package "pca-connector-ad" "1.34.0" "sha256-pSGVZPLuj8xcSfLqa+xvf4UL/l2Xb5t43KuXlTCfskc="; - mypy-boto3-personalize = buildMypyBoto3Package "personalize" "1.28.36" "sha256-SCQqvz6rBi9Ohbw10A9BS3Yu0xPQLs03a0a0zC9mXoM="; + mypy-boto3-personalize = buildMypyBoto3Package "personalize" "1.34.0" "sha256-pg36s61onSuPDyQeC4otrSEpVxVFwrFwU6NgbOt1fKY="; - mypy-boto3-personalize-events = buildMypyBoto3Package "personalize-events" "1.28.36" "sha256-Znmc+a37B+wlkDCT387ZGCyfQ6kLrQeVcHCkplAAOAo="; + mypy-boto3-personalize-events = buildMypyBoto3Package "personalize-events" "1.34.0" "sha256-dklttvls5In+d9uWONxmhfSOP1TQf+4VMW56JjKICr4="; - mypy-boto3-personalize-runtime = buildMypyBoto3Package "personalize-runtime" "1.28.36" "sha256-EICeLDJQzOWkm+Lk94pfY6KPi+HQY46AbGUxOi4dsxg="; + mypy-boto3-personalize-runtime = buildMypyBoto3Package "personalize-runtime" "1.34.0" "sha256-ncMVAU7pwfB1zZ+xAPFNtiIlGimFbsowHugEUrlbybs="; - mypy-boto3-pi = buildMypyBoto3Package "pi" "1.28.36" "sha256-sHhbm4A0BkC7h9SuYjOpIwQCLtvU5ukYzpgqNruvJnM="; + mypy-boto3-pi = buildMypyBoto3Package "pi" "1.34.0" "sha256-97giGYtpINPHxtcUU6cE/mPF0/r6YfLixAdcC/LGKC0="; - mypy-boto3-pinpoint = buildMypyBoto3Package "pinpoint" "1.28.55" "sha256-Qi9wlrmtGVeGW/BXYJggG12q0g2Jw8pu2A9jd+3ryKI="; + mypy-boto3-pinpoint = buildMypyBoto3Package "pinpoint" "1.34.0" "sha256-oa8RAEtGeoyGpXq2sJSbEnLXorS6liInO196SGO6D/E="; - mypy-boto3-pinpoint-email = buildMypyBoto3Package "pinpoint-email" "1.28.36" "sha256-KGDy7obD+hVisnEStsIGmvUD6/Peyo83/mzKFsKd+xI="; + mypy-boto3-pinpoint-email = buildMypyBoto3Package "pinpoint-email" "1.34.0" "sha256-AHwJtYsAxFiEX16L0HZXz9JzjNZck9V40bFwzicMKUE="; - mypy-boto3-pinpoint-sms-voice = buildMypyBoto3Package "pinpoint-sms-voice" "1.28.36" "sha256-NyUHn3+WgCp5AI0ly9F1gB2uyXICy5ot4HWPkv1sRjE="; + mypy-boto3-pinpoint-sms-voice = buildMypyBoto3Package "pinpoint-sms-voice" "1.34.0" "sha256-oDhem97q9QpsQNy9zCfWOC1cHup3pvLflClVxeWEBuw="; - mypy-boto3-pinpoint-sms-voice-v2 = buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.28.36" "sha256-YO/15ikVJ0OJ4FuEubtcV4nc+NGBFMWwiZUgn28SgFQ="; + mypy-boto3-pinpoint-sms-voice-v2 = buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.34.0" "sha256-Ci/nnvgq6YbVPHLZVmLDHjF8GHpViVP7mfUJREFKndg="; - mypy-boto3-pipes = buildMypyBoto3Package "pipes" "1.28.36" "sha256-wGVcXwhUGM729QsU3Tkmg8aD2s2cpg8/CTqOR1i8Lt4="; + mypy-boto3-pipes = buildMypyBoto3Package "pipes" "1.34.0" "sha256-c/N5SaT4BS0Ldv/P6yi43gB4LzDeqB9y1Xx1UAHf6dU="; - mypy-boto3-polly = buildMypyBoto3Package "polly" "1.28.36" "sha256-fntpy/+K4DYhfdv35hhanDS4oq1P0kNxxDFkkHQRmuU="; + mypy-boto3-polly = buildMypyBoto3Package "polly" "1.34.0" "sha256-kAbx8YHata0ehTTqI/z3YPB6Px3d0ON1ek3a9aY8amU="; - mypy-boto3-pricing = buildMypyBoto3Package "pricing" "1.28.36" "sha256-zmtifAqoWolmES6GVNRHvcvsC43AWpI4BZLipns8vqU="; + mypy-boto3-pricing = buildMypyBoto3Package "pricing" "1.34.0" "sha256-qS9ghI37MKtDIdUuzSVJ02CrB6z2PiIsT8ekEDb6oVM="; - mypy-boto3-privatenetworks = buildMypyBoto3Package "privatenetworks" "1.28.36" "sha256-JUaloEf/CtJBBwvf08tX1dfvMmo5zM85NFGKzLwd0zk="; + mypy-boto3-privatenetworks = buildMypyBoto3Package "privatenetworks" "1.34.0" "sha256-WFX0KaJRo0LCPKEAq8LES0P3WJkt6ywLXqTlOFZyZ1w="; - mypy-boto3-proton = buildMypyBoto3Package "proton" "1.28.36" "sha256-TGSxplMR6PQJT8LOTNUct4VjDAMqtgBkg3HOOB8To7w="; + mypy-boto3-proton = buildMypyBoto3Package "proton" "1.34.0" "sha256-wRBMw/7PWi0s9sJTfnDq3MXcbA5pKwogMDC3UZtLJoY="; - mypy-boto3-qldb = buildMypyBoto3Package "qldb" "1.28.36" "sha256-y1UMibv5dwVuuvs2x3Cprc4gErqxUOYN6Loeaug6Tjw="; + mypy-boto3-qldb = buildMypyBoto3Package "qldb" "1.34.0" "sha256-WQeLaZFGqmU1OYIWsjzttkZDIT1vqrnVLfdo2DBMwGg="; - mypy-boto3-qldb-session = buildMypyBoto3Package "qldb-session" "1.28.36" "sha256-JGlIwudacKEBgKlf2iDn3iRTf/b869rS7fYaK3Q6Jgk="; + mypy-boto3-qldb-session = buildMypyBoto3Package "qldb-session" "1.34.0" "sha256-JHePiaFCfIJPxZzvC1U38xrBGkDvB9+yKwPecaZl7BY="; - mypy-boto3-quicksight = buildMypyBoto3Package "quicksight" "1.28.54" "sha256-NOQ9zNMTJYZNhEoE2xNcyG78x9eajyY0AUDsa5JW3Ls="; + mypy-boto3-quicksight = buildMypyBoto3Package "quicksight" "1.34.0" "sha256-mhGxgfq/DDcmfuEcKTKm/9aq8jxICSqubJhiW36/YgU="; - mypy-boto3-ram = buildMypyBoto3Package "ram" "1.28.36" "sha256-5ne0E27ct5g2LQs3rzEJ5vQdnu/10uIfeS9t4FAVU2U="; + mypy-boto3-ram = buildMypyBoto3Package "ram" "1.34.0" "sha256-9sOspEfirpVQ8cT9ILUSWypxBswpAD75A0hHRV7glNg="; - mypy-boto3-rbin = buildMypyBoto3Package "rbin" "1.28.36" "sha256-ADN+McM/ZuloBxZVug6Zc9w1Bij5pWhzQpP8if47re8="; + mypy-boto3-rbin = buildMypyBoto3Package "rbin" "1.34.0" "sha256-Y+a/p3r5IgWk4oH6MOeq0e7rMiNvLCqoz1ZE+xXNtOw="; - mypy-boto3-rds = buildMypyBoto3Package "rds" "1.28.58" "sha256-pm5I8iTKxAKscXXy99EvF+ZnIpmposPnmo0yG3y3NQU="; + mypy-boto3-rds = buildMypyBoto3Package "rds" "1.34.0" "sha256-mQn18jzLAYMCYqLhbJ6KGazEYCHXVIOAmde9spWRHpQ="; - mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.28.36" "sha256-rNDCwG1tnI3diKXH0sN2Qd/+J4UEh7aKBOWCIX4gvYs="; + mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.34.0" "sha256-qpRaxeJt30Vb108E48E80vX0nmjyVSJNN6tozbkI9Yk="; - mypy-boto3-redshift = buildMypyBoto3Package "redshift" "1.28.36" "sha256-j0MCYKr0R42X1EtoGhNPM7lqTyoisvbYJPdCji8GvI8="; + mypy-boto3-redshift = buildMypyBoto3Package "redshift" "1.34.0" "sha256-xxiPF1JjFfKudYw/96qxKK5K0lDQRdiJ1vMSBWsdXxU="; - mypy-boto3-redshift-data = buildMypyBoto3Package "redshift-data" "1.28.36" "sha256-fEoxqvIsAs8mUTY/dSTAbQOxNlf4+1qpyZO28Fe2PLA="; + mypy-boto3-redshift-data = buildMypyBoto3Package "redshift-data" "1.34.0" "sha256-NdBZxkLTwnY7fgmoqGZKTN/lhCyY/3VGFWWOGeCf//0="; - mypy-boto3-redshift-serverless = buildMypyBoto3Package "redshift-serverless" "1.28.36" "sha256-fd7nHbR/4eo08/RN8u6GESyshRa81BIussx8Rdg0IHE="; + mypy-boto3-redshift-serverless = buildMypyBoto3Package "redshift-serverless" "1.34.0" "sha256-Ken/63gkGvC8ZnWilgccQYAealKWgpftw67QLLPMSe0="; - mypy-boto3-rekognition = buildMypyBoto3Package "rekognition" "1.28.37" "sha256-6eNlzJDFLLP9YsFdogWE1vtXvSNP//N+f4KpnFfnpa4="; + mypy-boto3-rekognition = buildMypyBoto3Package "rekognition" "1.34.0" "sha256-hf6rSVe2fxK8MR5zUz4Drq7qP5+QTTNUAWs4rmqfzIQ="; - mypy-boto3-resiliencehub = buildMypyBoto3Package "resiliencehub" "1.28.36" "sha256-A6Nbwo6IxIBDbhCWqaKIDFYUvHCc1GRHh2IzCaYn6Nc="; + mypy-boto3-resiliencehub = buildMypyBoto3Package "resiliencehub" "1.34.0" "sha256-F/ZRCp/M/6kBI4Apb3mISzqe1Zi4Y7gq/vu0dvyyTvM="; - mypy-boto3-resource-explorer-2 = buildMypyBoto3Package "resource-explorer-2" "1.28.36" "sha256-vTYcU6Lf5mhh3+PtwhLTb72MZwgrykAbXz8coSw7znM="; + mypy-boto3-resource-explorer-2 = buildMypyBoto3Package "resource-explorer-2" "1.34.0" "sha256-5CKBpBoU3pZBXD0/Kz69TAM+51zmnd+314Ou1DOdaso="; - mypy-boto3-resource-groups = buildMypyBoto3Package "resource-groups" "1.28.36" "sha256-0q1trks0Xs22VuqE5nYnMVOmsPQ936UXMN3k7qo2kDc="; + mypy-boto3-resource-groups = buildMypyBoto3Package "resource-groups" "1.34.0" "sha256-Wz1Oo/Ze6ROHkg5EAas7ZKLOWE6RS+uKpNea79WUrLY="; - mypy-boto3-resourcegroupstaggingapi = buildMypyBoto3Package "resourcegroupstaggingapi" "1.28.36" "sha256-A2T8OZr2OibcP+WSCDk4NydfXA8UMI4DPRCnb4l+yWI="; + mypy-boto3-resourcegroupstaggingapi = buildMypyBoto3Package "resourcegroupstaggingapi" "1.34.0" "sha256-ko55TJeH/EGsAp1Y8ZTYhmGEqWGKQTnN3IQEF31V6Ns="; - mypy-boto3-robomaker = buildMypyBoto3Package "robomaker" "1.28.36" "sha256-zgk5TPyOtimF9axIjv8f0chrD2M7LZbeo6Huat6IUEs="; + mypy-boto3-robomaker = buildMypyBoto3Package "robomaker" "1.34.0" "sha256-dAL2P2bxhSc5oLZXhhekrt9y4bWXg7kIr+/FVbkFTww="; - mypy-boto3-rolesanywhere = buildMypyBoto3Package "rolesanywhere" "1.28.36" "sha256-YQKGDMmakoxhIsarmBdvOlqno9Qtm5XqOOuBD3cnhsc="; + mypy-boto3-rolesanywhere = buildMypyBoto3Package "rolesanywhere" "1.34.0" "sha256-U/j/u6pqoHpfNP3GbQ8SZb+qIL842ZcwwdBr1QQhlj0="; - mypy-boto3-route53 = buildMypyBoto3Package "route53" "1.28.36" "sha256-x/T2EZtPlnSFmRkRhU+GSKvRQHpXAL3c+JN6kdmFSuY="; + mypy-boto3-route53 = buildMypyBoto3Package "route53" "1.34.0" "sha256-pXDmqrT5sN7pfkuVStBEC59b9+lLhMuXILiTeWlVFFs="; - mypy-boto3-route53-recovery-cluster = buildMypyBoto3Package "route53-recovery-cluster" "1.28.36" "sha256-UAHjH2z8jCvyR2vdM5igPc1gwkcxX7wb51qZbmHBe9c="; + mypy-boto3-route53-recovery-cluster = buildMypyBoto3Package "route53-recovery-cluster" "1.34.0" "sha256-1IUmycikAtBBNykch2aj7tI6XLRjN7D56YwJn6QRmIQ="; - mypy-boto3-route53-recovery-control-config = buildMypyBoto3Package "route53-recovery-control-config" "1.28.36" "sha256-kcVRZWAIDRrHwGxd/tnWcCuu9fIgdmHzvHIG1XUdMMs="; + mypy-boto3-route53-recovery-control-config = buildMypyBoto3Package "route53-recovery-control-config" "1.34.0" "sha256-hlwovA3tocSTUzsj+TH4VMO/bDrxDNALrAFiTpcgNa0="; - mypy-boto3-route53-recovery-readiness = buildMypyBoto3Package "route53-recovery-readiness" "1.28.36" "sha256-iwncFBFaoMzDDApHHSBfbRaIHUOXaJJO9fWTEK6LAKY="; + mypy-boto3-route53-recovery-readiness = buildMypyBoto3Package "route53-recovery-readiness" "1.34.0" "sha256-DyNRWZ9daJ6VFa7moTjgEIdxcCRgjvZ2n7UKyNfr9z4="; - mypy-boto3-route53domains = buildMypyBoto3Package "route53domains" "1.28.36" "sha256-0g6Xh6GS06L6o0De4V/zQdw0DMOQMFFW7NMWEY7I5fQ="; + mypy-boto3-route53domains = buildMypyBoto3Package "route53domains" "1.34.0" "sha256-xsWqPNO6N5JRHWfST9cVLgHu8B7sNn4cXKylhQbnO88="; - mypy-boto3-route53resolver = buildMypyBoto3Package "route53resolver" "1.28.36" "sha256-o5wa4Jjskxw10OpjvVq62mdyi55nB8xsB1t52hEtrs8="; + mypy-boto3-route53resolver = buildMypyBoto3Package "route53resolver" "1.34.0" "sha256-RnMZIG4PDcZZX34oZMs+I3uCWaJ2XcxVqB7GNvmrqFA="; - mypy-boto3-rum = buildMypyBoto3Package "rum" "1.28.36" "sha256-e342+/wBjUwNWBtQnlPoJtShgDbFXEEGd8B43UPSCFg="; + mypy-boto3-rum = buildMypyBoto3Package "rum" "1.34.0" "sha256-T2OTu4dpOqZq+sxoU/nyXQXNxW6KbIFjIE3+VtfSEwg="; - mypy-boto3-s3 = buildMypyBoto3Package "s3" "1.28.55" "sha256-sAiAn0SOdAdQEtT8VLAXbeC09JvDjjneMMoOdk63UFY="; + mypy-boto3-s3 = buildMypyBoto3Package "s3" "1.34.0" "sha256-dkSgDgluuxwyklUQWfZP+DKWJdrNQIJ87ZSBsU1kxzM="; - mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.28.36" "sha256-ZgJtq2jXRtgUXQrTfIZKSbF7TMTw/bV+bGlxte7kVA8="; + mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.34.0" "sha256-PEGAPyCB/LovPfAsItH3nGnK/I63wEcsfb6MkPAitbY="; - mypy-boto3-s3outposts = buildMypyBoto3Package "s3outposts" "1.28.36" "sha256-56REWXuXLQP2mibMz1s2FbCZFqTRZNOsuUd0IZ3sOJI="; + mypy-boto3-s3outposts = buildMypyBoto3Package "s3outposts" "1.34.0" "sha256-xLuGP9Fe0S7zRimt1AKd9KOrytmNd/GTRg5OVi5Xpos="; - mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.28.57" "sha256-W3QJIXU+RPgr4IrgyJC7o0ox65W1Xyye5X5qpUCnAzo="; + mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.34.0" "sha256-tpGOwQ4THqjaZZG5fsZ+qO/ZDT6tr3kr20tzQQJ13Rc="; - mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.28.36" "sha256-2qwf/dtIhBT5HSYDDEuSy4nqGQrBYEZ/1RiD5vMYPMI="; + mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.34.0" "sha256-jMZ3aWKQPhNec4A/02S1waQi6Mx9JVdENc3kblhsKjA="; - mypy-boto3-sagemaker-edge = buildMypyBoto3Package "sagemaker-edge" "1.28.36" "sha256-JsDQv4j8QB0wrXA3142LdNdYabJd8iB7PiLVZz0X3ss="; + mypy-boto3-sagemaker-edge = buildMypyBoto3Package "sagemaker-edge" "1.34.0" "sha256-F3IN/KA7uzS16HZydXmFXlXseNIdhCais6Abfq7gRdI="; - mypy-boto3-sagemaker-featurestore-runtime = buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.28.57" "sha256-vcK8WdiV8m7cqJ7WkGAqYFLjRmKdqX0qCuxmZKYlrtw="; + mypy-boto3-sagemaker-featurestore-runtime = buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.34.0" "sha256-3ptV7rCUIdKGG04zOTNzMfHVysxJ57FSbgfT8IPAw9M="; - mypy-boto3-sagemaker-geospatial = buildMypyBoto3Package "sagemaker-geospatial" "1.28.36" "sha256-2JU0tA26pENaTJBsg13RV40+gsSRz+g1p/s+5LKtKTM="; + mypy-boto3-sagemaker-geospatial = buildMypyBoto3Package "sagemaker-geospatial" "1.34.0" "sha256-9hKKH/025QQYLrlXCOAQoxuWzTMQlmLSov/hVsubF7M="; - mypy-boto3-sagemaker-metrics = buildMypyBoto3Package "sagemaker-metrics" "1.28.36" "sha256-DF36xuoA1csbTCz/NJ8UhU7NPYU/OgE0+Z1t5ppPKCA="; + mypy-boto3-sagemaker-metrics = buildMypyBoto3Package "sagemaker-metrics" "1.34.0" "sha256-KniU+0ZJKfjrBKDDZz+QyLb1oomSeD/K6fcJgmMAcJQ="; - mypy-boto3-sagemaker-runtime = buildMypyBoto3Package "sagemaker-runtime" "1.28.39" "sha256-BQFdGoaL6GPAtCgFBTT4ajdkSWXsPrxYcLGndAcZw2k="; + mypy-boto3-sagemaker-runtime = buildMypyBoto3Package "sagemaker-runtime" "1.34.0" "sha256-OJYEdi4xILUZoePcGBcLRHAhwppeybNO+l0kyW3a0Co="; - mypy-boto3-savingsplans = buildMypyBoto3Package "savingsplans" "1.28.36" "sha256-EuCyeSHWSlS2OC8DM5alD6IcZ3fewmJavMMHWXL12T0="; + mypy-boto3-savingsplans = buildMypyBoto3Package "savingsplans" "1.34.0" "sha256-HaloEU3+2VgDekIQ5JltgCCG1jJ/ap1qqDGWR51ggtU="; - mypy-boto3-scheduler = buildMypyBoto3Package "scheduler" "1.28.36" "sha256-dMEm7KqoZFFtFnqXR6upXHQ/CeKQO1xQ+v7CoR4o7Xs="; + mypy-boto3-scheduler = buildMypyBoto3Package "scheduler" "1.34.0" "sha256-+gnQjWPtp7KVI/qIY2aXHD9iM7RZIDl0JwRostfhjzc="; - mypy-boto3-schemas = buildMypyBoto3Package "schemas" "1.28.36" "sha256-gq8a1k0MEnXFdmB5IPE9zHYF1rfoSD3Vis7YOVyCTV8="; + mypy-boto3-schemas = buildMypyBoto3Package "schemas" "1.34.0" "sha256-OyWnGUQZKwmAw7tRMt63wG7puIWA7WPyV/rZfPO/KSc="; - mypy-boto3-sdb = buildMypyBoto3Package "sdb" "1.28.36" "sha256-pbH5y/bS15S6BeTPIZ0bw8h0elfLeHdab/IxJF4DNYU="; + mypy-boto3-sdb = buildMypyBoto3Package "sdb" "1.34.0" "sha256-13BuAQD8uDwwDhCw+8O3V882H6/oor5Z8mBmjb7HHAU="; - mypy-boto3-secretsmanager = buildMypyBoto3Package "secretsmanager" "1.28.36" "sha256-fjkIh9Nb03CNjAzpQJUl2tCAU+qNpf0Ef3Lse88JP9M="; + mypy-boto3-secretsmanager = buildMypyBoto3Package "secretsmanager" "1.34.0" "sha256-98GpmijmUKyRg022mo2r5nNPms6S8dei02YWChFAETM="; - mypy-boto3-securityhub = buildMypyBoto3Package "securityhub" "1.28.43" "sha256-Ein8Q/bhJoThpGzGK9ow53WEWs5D5ARW/15s3qzLqnw="; + mypy-boto3-securityhub = buildMypyBoto3Package "securityhub" "1.34.0" "sha256-cY47F8hkhfZUOvTSiwROOByGSKoIDICEd+HaFbaFuFE="; - mypy-boto3-securitylake = buildMypyBoto3Package "securitylake" "1.28.36" "sha256-YKtv/32/5ngUo4GUqeplkL5mmdcWP7rYrypLPJtebQ0="; + mypy-boto3-securitylake = buildMypyBoto3Package "securitylake" "1.34.0" "sha256-h5xo9+FzzQvsyvwwFlmVUesHIEkcJQC8/veieACKvS8="; - mypy-boto3-serverlessrepo = buildMypyBoto3Package "serverlessrepo" "1.28.36" "sha256-oNSQAc9ZBX3+q1ycI0mg4lJ3jjqYkMfb0Cs/wjBRhrY="; + mypy-boto3-serverlessrepo = buildMypyBoto3Package "serverlessrepo" "1.34.0" "sha256-abWCJqFbD/AyPV+7hmY4OlsedFs+p8WpNSXG7hjrj3s="; - mypy-boto3-service-quotas = buildMypyBoto3Package "service-quotas" "1.28.36" "sha256-qWw/5Q/S/60ZJ55wJf+1++YRnXS7fySFJSDLOm9neDE="; + mypy-boto3-service-quotas = buildMypyBoto3Package "service-quotas" "1.34.0" "sha256-wWbm/udCn5Je1gJZ+uDJ4LE8NbQlq1yHVQc6eQ2umIw="; - mypy-boto3-servicecatalog = buildMypyBoto3Package "servicecatalog" "1.28.37" "sha256-BOhaddv6XQwCRLuYk3ybTmFSdAQfWkqMVW6IvB4q/78="; + mypy-boto3-servicecatalog = buildMypyBoto3Package "servicecatalog" "1.34.0" "sha256-K/h4NTDQFrsSs+S42MXvj3RrY4v/ThHCwql2Z2rUYNo="; - mypy-boto3-servicecatalog-appregistry = buildMypyBoto3Package "servicecatalog-appregistry" "1.28.37" "sha256-rUHzIPXave2oWWyEDERmBfybNFyzw2RMxPFFidVqdh8="; + mypy-boto3-servicecatalog-appregistry = buildMypyBoto3Package "servicecatalog-appregistry" "1.34.0" "sha256-XYqa3aiC9pasmkMDXFmHKuK/PWwi6fZs/pt7rXuRFDw="; - mypy-boto3-servicediscovery = buildMypyBoto3Package "servicediscovery" "1.28.52" "sha256-WaiZXFpKr59w0XtjF6mVI7kGt1X+vmbeWiDBNwEaeRw="; + mypy-boto3-servicediscovery = buildMypyBoto3Package "servicediscovery" "1.34.0" "sha256-h9wTiaEakgBlrlwzUulqoEMWmVAKV/METiQppUC+FVI="; - mypy-boto3-ses = buildMypyBoto3Package "ses" "1.28.36" "sha256-HYAl9ock3b9chpYp+wd+sR1DElFN+jxipHc3lGoIFR8="; + mypy-boto3-ses = buildMypyBoto3Package "ses" "1.34.0" "sha256-ieFDjZ8tTPM5wCRWFjNNUuDKOj8K4s4NH1SiJXxbnaQ="; - mypy-boto3-sesv2 = buildMypyBoto3Package "sesv2" "1.28.37" "sha256-TqnrgOc+YI6YA3BtJcN2BdU8Cm3By60yQJPxcWdQrEY="; + mypy-boto3-sesv2 = buildMypyBoto3Package "sesv2" "1.34.0" "sha256-36/TWOTB4FsjkBRpi72SLnVAJXyd4NY0+ZtCBj+zYU0="; - mypy-boto3-shield = buildMypyBoto3Package "shield" "1.28.36" "sha256-io8Ux5jD5gyQwZDENXuT/5/R1iqTWd4c34zzQtBxNyk="; + mypy-boto3-shield = buildMypyBoto3Package "shield" "1.34.0" "sha256-w0D4JKdlitCBIF3NaKn+POYch5CPGIiUZXqBoFzjzz4="; - mypy-boto3-signer = buildMypyBoto3Package "signer" "1.28.36" "sha256-4Aji9L+AI66iB9NaiuV96YefuoEJ0s+BPdsOu/UwDpM="; + mypy-boto3-signer = buildMypyBoto3Package "signer" "1.34.0" "sha256-wR7ZQ8zTjuVPwMqQ7TR+93DWld9JU16rlt2X+z29xZI="; - mypy-boto3-simspaceweaver = buildMypyBoto3Package "simspaceweaver" "1.28.47" "sha256-13RYW3vObQUNBsBtp8uaZZ9JFAiwBwiaYQv8tJ0O85w="; + mypy-boto3-simspaceweaver = buildMypyBoto3Package "simspaceweaver" "1.34.0" "sha256-3J7s6FMRBcI7XaVoXjB3gSNI/Eh7TrE5ij8wRmagK/M="; - mypy-boto3-sms = buildMypyBoto3Package "sms" "1.28.36" "sha256-xV29r8VmjvEQyyTYIdfkB9WbF08kjWbKdtLB5fXoWOo="; + mypy-boto3-sms = buildMypyBoto3Package "sms" "1.34.0" "sha256-ktneEYqlmdhb386de2oQuDN5W4FLTxjWBmnZ0COVASA="; - mypy-boto3-sms-voice = buildMypyBoto3Package "sms-voice" "1.28.36" "sha256-mtX0fSvFofCCD2gQhyc+YBWZbAoR497FAyjUezm4FgU="; + mypy-boto3-sms-voice = buildMypyBoto3Package "sms-voice" "1.34.0" "sha256-KaF8cWo+vin1YA63S6PDTpvjKWtz0Akl18yMVvhjdLo="; - mypy-boto3-snow-device-management = buildMypyBoto3Package "snow-device-management" "1.28.36" "sha256-mD1oojs3893aLdZQybDe41j5bG8dkMT92eq9fDbo5V8="; + mypy-boto3-snow-device-management = buildMypyBoto3Package "snow-device-management" "1.34.0" "sha256-buPLN3Qu+asEf2qrv1Jvhu3gKN6aBrK55jB8IxPoFMs="; - mypy-boto3-snowball = buildMypyBoto3Package "snowball" "1.28.36" "sha256-ngClAeGdx5U6b41iNIABhcrBWzv4t3PB0dkdavx2e2I="; + mypy-boto3-snowball = buildMypyBoto3Package "snowball" "1.34.0" "sha256-xw/tnkf0iJ7gC0MxRo4NTeRRKJDYUzGu5ZMBBKHMEhg="; - mypy-boto3-sns = buildMypyBoto3Package "sns" "1.28.36" "sha256-SXWRhkEBpRR9XS+nFRBIwMTLSxmvN0prcKwu+KrkMGY="; + mypy-boto3-sns = buildMypyBoto3Package "sns" "1.34.0" "sha256-q6P+uPdyHjtZYznBwtWmjSbBdwj35Qx2kdDH35XgATI="; - mypy-boto3-sqs = buildMypyBoto3Package "sqs" "1.28.36" "sha256-2cFZ4CDw7yJabVhQo2c+iyNjJyQ7pf/g0Tdirk/cDiE="; + mypy-boto3-sqs = buildMypyBoto3Package "sqs" "1.34.0" "sha256-C/iZX1iRmrKVOYEA5y6qfaiYrc/Z0zmkLzxIzkc0GdU="; - mypy-boto3-ssm = buildMypyBoto3Package "ssm" "1.28.54" "sha256-cf246Qy7fhVgvU7M9w38JkqsdWQma4GI+YmNNpIJtJ8="; + mypy-boto3-ssm = buildMypyBoto3Package "ssm" "1.34.0" "sha256-roKTbXdJb3lY3CXV231I9jsWTKwDaGxgR1xwkQfer+w="; - mypy-boto3-ssm-contacts = buildMypyBoto3Package "ssm-contacts" "1.28.36" "sha256-MK1Hp9196tv2vFaVtroRPAMSP5lgmBJJZjOi7sqK318="; + mypy-boto3-ssm-contacts = buildMypyBoto3Package "ssm-contacts" "1.34.0" "sha256-wkKPGLm24/zgMKitcF9ZaPt/W4m+yHerR1wbEqJALBM="; - mypy-boto3-ssm-incidents = buildMypyBoto3Package "ssm-incidents" "1.28.36" "sha256-0wYmsUl+q0s163UReHdCGSd18GOAhYh2aZKujT25aZc="; + mypy-boto3-ssm-incidents = buildMypyBoto3Package "ssm-incidents" "1.34.0" "sha256-OB5/E5ZArGtLZ/UaVjDEnzoH4J4vEFehULG8RKCB6gg="; - mypy-boto3-ssm-sap = buildMypyBoto3Package "ssm-sap" "1.28.36" "sha256-aQtr5rgXtokfiI/CoVxD1g4KmP9ii0hELER08sJOu3g="; + mypy-boto3-ssm-sap = buildMypyBoto3Package "ssm-sap" "1.34.0" "sha256-Sz3inwP5mRKJdFqrf5FYmTp6M9o8J/S4H6k/7SMq25E="; - mypy-boto3-sso = buildMypyBoto3Package "sso" "1.28.58" "sha256-EieqwoZ+kj3bbRDgwDDNZEPQXXFv3wFQUCYHivM6zeE="; + mypy-boto3-sso = buildMypyBoto3Package "sso" "1.34.0" "sha256-Iu1KwyWW8DjFJcV46L50gK/G8p2nAqxzzjgBAVTX6nU="; - mypy-boto3-sso-admin = buildMypyBoto3Package "sso-admin" "1.28.44" "sha256-BleFuvoN4f9/6Q/vvDRwgmRBP86F7i7tpaC6G3sXn1Y="; + mypy-boto3-sso-admin = buildMypyBoto3Package "sso-admin" "1.34.0" "sha256-befPkyehC4AKxMotvRzyfZpkqlpkfpI2OKVSw4IFnjo="; - mypy-boto3-sso-oidc = buildMypyBoto3Package "sso-oidc" "1.28.52" "sha256-LGxlGXTsYZdBHiTFGzCCMvRW20Ny0kXMXLoP2YTAbKg="; + mypy-boto3-sso-oidc = buildMypyBoto3Package "sso-oidc" "1.34.0" "sha256-uDHRoc7H3vtM/KYSeH95PdibjiEq/pSSJFcm5kgMMAg="; - mypy-boto3-stepfunctions = buildMypyBoto3Package "stepfunctions" "1.28.36" "sha256-jHlOmKvFyiPvE+NR9Gu4Sd5jS6ym81KG4x5Y3t5Atoc="; + mypy-boto3-stepfunctions = buildMypyBoto3Package "stepfunctions" "1.34.0" "sha256-BtIpbO51DRfLYhcUIO6kYU8g8pvkXuNhhU+LWZpugRA="; - mypy-boto3-storagegateway = buildMypyBoto3Package "storagegateway" "1.28.36" "sha256-59qw52muZfYjmzO3quhIfgSk5xurzialMIEh+k+C69Q="; + mypy-boto3-storagegateway = buildMypyBoto3Package "storagegateway" "1.34.0" "sha256-CIUoGQeMvaGErpr0FnYhBLQ5DS7JIxkqKo6sWLXdGrQ="; - mypy-boto3-sts = buildMypyBoto3Package "sts" "1.28.58" "sha256-vv/scF8fC0Sdo8H1Ksdlhie7KJrs7BpECCZkecRuBTs="; + mypy-boto3-sts = buildMypyBoto3Package "sts" "1.34.0" "sha256-s0fgozbWAWLdlAdNnRD2FPKwmkVcm0JBWFDVTWduIGc="; - mypy-boto3-support = buildMypyBoto3Package "support" "1.28.36" "sha256-HjzL3qwEiQSvJvaiB6pJN/GUMRNseuIqxM7rfrfwRKs="; + mypy-boto3-support = buildMypyBoto3Package "support" "1.34.0" "sha256-3y+uFRJKahLAPoG9gqxK8gqZKJ+OL1Rom/dr/zWIq+k="; - mypy-boto3-support-app = buildMypyBoto3Package "support-app" "1.28.36" "sha256-p/v2QUgmGYRVKGUtrCt9i6c1LKCxqNoNKHnfbAw7qMU="; + mypy-boto3-support-app = buildMypyBoto3Package "support-app" "1.34.0" "sha256-/aYEPAnGgAPB6Tnh5jwYASbP2kVJth+3ZxcMCYgo9n0="; - mypy-boto3-swf = buildMypyBoto3Package "swf" "1.28.36" "sha256-GO8hb3oVmSK0J8GB4ZT1RlqyBaRrOM2ZorOHkE3L8p0="; + mypy-boto3-swf = buildMypyBoto3Package "swf" "1.34.0" "sha256-T8QYHzRjjQyLGqSwc7J6hPXqpeoeCUvlpHbXwnT99rQ="; - mypy-boto3-synthetics = buildMypyBoto3Package "synthetics" "1.28.36" "sha256-6vRCRKjNplmMqmUpvDC/JVPl4q/YUYealQdXOComXNQ="; + mypy-boto3-synthetics = buildMypyBoto3Package "synthetics" "1.34.0" "sha256-gGEu4vQ5T1gSLM33V8Ouj+ZlPQIoY+RRbUz7nvD7PbY="; - mypy-boto3-textract = buildMypyBoto3Package "textract" "1.28.56" "sha256-xWQQAJJSeB/vsY2RAxw4z9lKjtVHJ91tvgZklwl/g74="; + mypy-boto3-textract = buildMypyBoto3Package "textract" "1.34.0" "sha256-AeukQ85jOCNpUxfnedEyacm/bK6pFA32tmhQrieLoMo="; - mypy-boto3-timestream-query = buildMypyBoto3Package "timestream-query" "1.28.36" "sha256-fslhEeOU6hSx6efMMesqkV4MyicL5hAvKBD1ZdyB1Dw="; + mypy-boto3-timestream-query = buildMypyBoto3Package "timestream-query" "1.34.0" "sha256-YriLmrbBd3zPny4MBMJV5G0WB4mQZElBZDOd3DTin74="; - mypy-boto3-timestream-write = buildMypyBoto3Package "timestream-write" "1.28.36" "sha256-dWA9lZ/vw96WA69hyECGnTTo9O+5qPyQWAUCSdevBUM="; + mypy-boto3-timestream-write = buildMypyBoto3Package "timestream-write" "1.34.0" "sha256-fKi5nIyU5BffflHVh21HjcuYE+RXDiq0gXbFOKOAYPE="; - mypy-boto3-tnb = buildMypyBoto3Package "tnb" "1.28.36" "sha256-sGoBXxbU2rLyTbW1olhS3jgrfcw10FtCNgHckcWiSpI="; + mypy-boto3-tnb = buildMypyBoto3Package "tnb" "1.34.0" "sha256-32Pcqs7DamX+sZt3pDF+gCjnAs8JhtJm9+Jl0agIuOA="; - mypy-boto3-transcribe = buildMypyBoto3Package "transcribe" "1.28.36" "sha256-oBof0qzgKgS58e+2teI6bBiIY3svwiyS+Ztzb3wRtLI="; + mypy-boto3-transcribe = buildMypyBoto3Package "transcribe" "1.34.0" "sha256-cKiJ306Y96xLHB7vX46uaw145BPLK/1g3OrMIMB0pPo="; - mypy-boto3-transfer = buildMypyBoto3Package "transfer" "1.28.58" "sha256-aTpJa78Q/Z2xCtMCsExVqHsZwVlRlzBwKl3m/sWvXcM="; + mypy-boto3-transfer = buildMypyBoto3Package "transfer" "1.34.0" "sha256-mYyymy+TUlt7bjuZMSqmO9dfcIzqod2t4gFEwMGPuzo="; - mypy-boto3-translate = buildMypyBoto3Package "translate" "1.28.36" "sha256-Q2FuBXtXWenPvkJ3PprDolsO6ur5QAAn0y1ORYEQIMM="; + mypy-boto3-translate = buildMypyBoto3Package "translate" "1.34.0" "sha256-4tjjmwMtIPpMwKZ3yqB96XEb1WidCxMIj2Cfjn0nTy8="; - mypy-boto3-verifiedpermissions = buildMypyBoto3Package "verifiedpermissions" "1.28.36" "sha256-HpiBOyeWvB/T/MquJ0R8Uk647VqCAlmC0Tryw9iojjA="; + mypy-boto3-verifiedpermissions = buildMypyBoto3Package "verifiedpermissions" "1.34.0" "sha256-ymLrwwRtiAGezcfhz/j77y+5L+37vKpcqPm48nqUMr4="; - mypy-boto3-voice-id = buildMypyBoto3Package "voice-id" "1.28.36" "sha256-B4R1U1eU4IZdB/Q+keSRL41zLvBMBJUiGw0RcCsC2l4="; + mypy-boto3-voice-id = buildMypyBoto3Package "voice-id" "1.34.0" "sha256-c6HseKIqRPs8NmFZYsg+9jWCMGpMi+VpvM9BiWq16PY="; - mypy-boto3-vpc-lattice = buildMypyBoto3Package "vpc-lattice" "1.28.41" "sha256-azHtPlg9etjfZOpN2505djAq9enyrIkz5NcIQE+fl9U="; + mypy-boto3-vpc-lattice = buildMypyBoto3Package "vpc-lattice" "1.34.0" "sha256-zyqcDplqAYFrUjrz28SHrIemPSTzvfUb7x6CXxXCTNc="; - mypy-boto3-waf = buildMypyBoto3Package "waf" "1.28.36" "sha256-andRHQn1HAms2m57rIy+40iF7jz4nzGzYH24fP8qHSw="; + mypy-boto3-waf = buildMypyBoto3Package "waf" "1.34.0" "sha256-TVOBwTITXBYFoGvXULoi8OL7OJXZKJbCpZPaZ5siWXk="; - mypy-boto3-waf-regional = buildMypyBoto3Package "waf-regional" "1.28.36" "sha256-WoIforrEs7OOroJB5YvPSw/M9tvrojNnbFJdG7BlzkU="; + mypy-boto3-waf-regional = buildMypyBoto3Package "waf-regional" "1.34.0" "sha256-zv/IPDU6lqmmIfTq57d7VH3SyA7UkgWW2Hysk2zamcM="; - mypy-boto3-wafv2 = buildMypyBoto3Package "wafv2" "1.28.57" "sha256-7xrRaEm54cKtRZplu6l8UbTg+hF6Y5qP9/lgAV8D6AY="; + mypy-boto3-wafv2 = buildMypyBoto3Package "wafv2" "1.34.0" "sha256-5UQSZwFRzQEmlkAQqr493G0RGSLS/Jf0w2EveIbQQbg="; - mypy-boto3-wellarchitected = buildMypyBoto3Package "wellarchitected" "1.28.36" "sha256-Xsu8CV0MvpmbAMA6ZMoIPQHSMJn8okag1SxKW0SUv1I="; + mypy-boto3-wellarchitected = buildMypyBoto3Package "wellarchitected" "1.34.0" "sha256-tzXpOWC6/WJ+/wUgwYtgI7scq7wRpACW8q1z9RwyhbA="; - mypy-boto3-wisdom = buildMypyBoto3Package "wisdom" "1.28.36" "sha256-paheK7r4sqDjBbUVieh6E5gPAbmVaEFAC3NsWsCWxBA="; + mypy-boto3-wisdom = buildMypyBoto3Package "wisdom" "1.34.0" "sha256-b3WtzCoQgLlfex22Nux3PrQkfO+QmJ5l6Bv3lFGx4Jk="; - mypy-boto3-workdocs = buildMypyBoto3Package "workdocs" "1.28.36" "sha256-dQysUcm1xlXJbcM1vdYZ7+migQgjHl4gSqHoZDKnhHg="; + mypy-boto3-workdocs = buildMypyBoto3Package "workdocs" "1.34.0" "sha256-96V+xgJ+DvqA4A7teCEpVVirlTVxCehXzNcPWUojPH4="; - mypy-boto3-worklink = buildMypyBoto3Package "worklink" "1.28.36" "sha256-oFjYLBxp/dZf1+IN5rj3usSUvZnRyhRMu63mRgdsrmI="; + mypy-boto3-worklink = buildMypyBoto3Package "worklink" "1.34.0" "sha256-dEWnbAtuUH14ojkOdeQvPvnVYZYxEsPvXuamyil2AHE="; - mypy-boto3-workmail = buildMypyBoto3Package "workmail" "1.28.50" "sha256-OfRyehgMROua9Ydcc8HBvBp4eddo0re1w0fciBVUuS4="; + mypy-boto3-workmail = buildMypyBoto3Package "workmail" "1.34.0" "sha256-D0gfIW2sbxQ/JOi5f9S6/KezsEKz4239srdL8EfFjG8="; - mypy-boto3-workmailmessageflow = buildMypyBoto3Package "workmailmessageflow" "1.28.36" "sha256-hfRjdhr/xJJNWYy4XDg8LT00sx/JGAEa4D+5GyR+FCo="; + mypy-boto3-workmailmessageflow = buildMypyBoto3Package "workmailmessageflow" "1.34.0" "sha256-e4wgFvtlfx0u6eGphRU7viGzZ4gbZijj4vjziPLPWX8="; - mypy-boto3-workspaces = buildMypyBoto3Package "workspaces" "1.28.44" "sha256-/LXeiuXeNTgfAf8BrzC/z0kdK201Htkau79BH0MQEO4="; + mypy-boto3-workspaces = buildMypyBoto3Package "workspaces" "1.34.0" "sha256-tWpSNHiUbaBwmhg7FfY58ZJKxIt3lGwpV1/9AXhfh64="; - mypy-boto3-workspaces-web = buildMypyBoto3Package "workspaces-web" "1.28.36" "sha256-kVVNGZYzZ2wIQVOCq3domqztTqsHY8FFHgeT5GCWtg0="; + mypy-boto3-workspaces-web = buildMypyBoto3Package "workspaces-web" "1.34.0" "sha256-RImlbT5Lpu2IoTrEQv5Bzk3NnkMV9jQjHGDnxCK3x18="; - mypy-boto3-xray = buildMypyBoto3Package "xray" "1.28.47" "sha256-1OiTpbaBm2aAls4A7ZaZBNAM8DTRuQcwNKJDq3lOKMY="; + mypy-boto3-xray = buildMypyBoto3Package "xray" "1.34.0" "sha256-8weFeYAit/DBFOhReQr5uSy0Am7Sh1fpYtMPtDka+OI="; } diff --git a/pkgs/development/python-modules/mypy-boto3/update.sh b/pkgs/development/python-modules/mypy-boto3/update.sh new file mode 100644 index 0000000000000..09ed48adc8254 --- /dev/null +++ b/pkgs/development/python-modules/mypy-boto3/update.sh @@ -0,0 +1,386 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update + +set -eu -o pipefail + +source_file=pkgs/development/python-modules/mypy-boto3/default.nix + +version="1.34.0" + +nix-update python311Packages.botocore-stubs --commit --build + +packages=( + 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-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) + +for package in "${packages[@]}"; do + echo "Updating ${package}" + + url="https://pypi.io/packages/source/m/${package}/${package}-${version}.tar.gz" + hash=$(nix-prefetch-url --type sha256 $url) + sri_hash="$(nix hash to-sri --type sha256 $hash)" + + awk -i inplace -v package="$package" -v new_version="$version" -v new_sha256="$sri_hash" ' + $1 == package { + $5 = "\"" new_version "\""; + $6 = "\"" new_sha256 "\";"; + } + {print} + ' $source_file + +done + +nixpkgs-fmt $source_file diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index d821adc3bb257..e43129a94fcf4 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -7,7 +7,8 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "2.2.0"; + version = "2.2.1"; + format = "setuptools"; nativeBuildInputs = [ pkg-config @@ -22,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-BDaERfnEh9irt6h449I+kj5gcsBKbDIPng3IqC77oU4="; + hash = "sha256-LHrRW4cpOxL9RLR8RoeeyV7GR/RWfoZszXC4M3WE6bI="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/nad-receiver/default.nix b/pkgs/development/python-modules/nad-receiver/default.nix index ed836bded2048..a53ff6f84f221 100644 --- a/pkgs/development/python-modules/nad-receiver/default.nix +++ b/pkgs/development/python-modules/nad-receiver/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "nad-receiver"; version = "0.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "joopert"; diff --git a/pkgs/development/python-modules/names/default.nix b/pkgs/development/python-modules/names/default.nix index b2d6a25bb5ae1..89ca958582c2a 100644 --- a/pkgs/development/python-modules/names/default.nix +++ b/pkgs/development/python-modules/names/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "names"; version = "0.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "treyhunner"; diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix index 133fd4932b44f..24a27c84bbd57 100644 --- a/pkgs/development/python-modules/nampa/default.nix +++ b/pkgs/development/python-modules/nampa/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "nampa"; version = "1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "thebabush"; diff --git a/pkgs/development/python-modules/nanoleaf/default.nix b/pkgs/development/python-modules/nanoleaf/default.nix index 67cfdd353771c..a77998c994c55 100644 --- a/pkgs/development/python-modules/nanoleaf/default.nix +++ b/pkgs/development/python-modules/nanoleaf/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "nanoleaf"; version = "0.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix index 765941457d4ab..06b2ed5f634f2 100644 --- a/pkgs/development/python-modules/nanomsg-python/default.nix +++ b/pkgs/development/python-modules/nanomsg-python/default.nix @@ -3,6 +3,7 @@ buildPythonPackage { pname = "nanomsg-python"; version = "1.0.20190114"; + format = "setuptools"; src = fetchFromGitHub { owner = "tonysimpson"; diff --git a/pkgs/development/python-modules/nanotime/default.nix b/pkgs/development/python-modules/nanotime/default.nix index e7802871b0853..aeabc540eb005 100644 --- a/pkgs/development/python-modules/nanotime/default.nix +++ b/pkgs/development/python-modules/nanotime/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "nanotime"; version = "0.5.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/natasha/default.nix b/pkgs/development/python-modules/natasha/default.nix index ca49c2653b68e..3d25ccf73fc99 100644 --- a/pkgs/development/python-modules/natasha/default.nix +++ b/pkgs/development/python-modules/natasha/default.nix @@ -5,7 +5,7 @@ , razdel , navec , slovnet -, yagry +, yargy , ipymarkup , pytestCheckHook }: @@ -20,11 +20,11 @@ buildPythonPackage rec { hash = "sha256-Rgguazgq06a8B9jeRnfHD5VTR+Xrd+8OCsQUfaGLEq0="; }; - propagatedBuildInputs = [ pymorphy2 navec razdel slovnet yagry ipymarkup ]; + propagatedBuildInputs = [ pymorphy2 navec razdel slovnet yargy ipymarkup ]; nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/" ]; - pythonImportCheck = [ "natasha" ]; + pythonImportsCheck = [ "natasha" ]; meta = with lib; { description = "NLP framework for Russian language"; diff --git a/pkgs/development/python-modules/naturalsort/default.nix b/pkgs/development/python-modules/naturalsort/default.nix index 98ced7a381c24..9d7572fb0f701 100644 --- a/pkgs/development/python-modules/naturalsort/default.nix +++ b/pkgs/development/python-modules/naturalsort/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "naturalsort"; version = "1.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "xolox"; diff --git a/pkgs/development/python-modules/navec/default.nix b/pkgs/development/python-modules/navec/default.nix index 02a55e5d6619f..2f39e56b492c3 100644 --- a/pkgs/development/python-modules/navec/default.nix +++ b/pkgs/development/python-modules/navec/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook gensim ]; # TODO: remove when gensim usage will be fixed in `navec`. disabledTests = [ "test_gensim" ]; - pythonImportCheck = [ "navec" ]; + pythonImportsCheck = [ "navec" ]; meta = with lib; { description = "Compact high quality word embeddings for Russian language"; diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix index c986085a61e34..306d927faa4bb 100644 --- a/pkgs/development/python-modules/nbconflux/default.nix +++ b/pkgs/development/python-modules/nbconflux/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "nbconflux"; version = "0.7.0"; + format = "setuptools"; disabled = isPy27; # no longer compatible with python 2 urllib src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 4afb593479d67..b89770aa35002 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -32,14 +32,14 @@ let }; in buildPythonPackage rec { pname = "nbconvert"; - version = "7.11.0"; + version = "7.13.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-q+3AHPVDF3/94L/Cppcm1aR49q8QozL8G/Kfy08M8AA="; + hash = "sha256-xvYchvylsovRf0+aMIJI5Z+itUkZ4VifbMNXXF3+wr0="; }; # Add $out/share/jupyter to the list of paths that are used to search for diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix index 58b02546f7e70..afea038d6db7b 100644 --- a/pkgs/development/python-modules/nbsmoke/default.nix +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "nbsmoke"; version = "0.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nc-dnsapi/default.nix b/pkgs/development/python-modules/nc-dnsapi/default.nix index b68ef8fdf055a..4229fa613f19d 100644 --- a/pkgs/development/python-modules/nc-dnsapi/default.nix +++ b/pkgs/development/python-modules/nc-dnsapi/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "nc-dnsapi"; version = "0.1.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "nbuchwitz"; diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix index 39429950b71c6..d3d129efa2dce 100644 --- a/pkgs/development/python-modules/ndg-httpsclient/default.nix +++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "0.5.1"; + format = "setuptools"; pname = "ndg-httpsclient"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/ndms2-client/default.nix b/pkgs/development/python-modules/ndms2-client/default.nix index feeb36737a8a3..ff872aa6f3861 100644 --- a/pkgs/development/python-modules/ndms2-client/default.nix +++ b/pkgs/development/python-modules/ndms2-client/default.nix @@ -1,22 +1,27 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "ndms2-client"; - version = "0.1.2"; + version = "0.1.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "foxel"; repo = "python_ndms2_client"; rev = version; - hash = "sha256-cM36xNLymg5Xph3bvbUGdAEmMABJ9y3/w/U8re6ZfB4="; + hash = "sha256-A19olC1rTHTy0xyeSP45fqvv9GUynQSrMgXBgW8ySOs="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 8bfe1347e6df3..bf9c2ad59d6f8 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -9,6 +9,7 @@ buildPythonPackage { pname = "ndtypes"; + format = "setuptools"; disabled = isPy27; inherit (libndtypes) version src meta; diff --git a/pkgs/development/python-modules/nengo/default.nix b/pkgs/development/python-modules/nengo/default.nix index c422278c830ce..da5d79e31e655 100644 --- a/pkgs/development/python-modules/nengo/default.nix +++ b/pkgs/development/python-modules/nengo/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "nengo"; version = "3.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "nengo"; diff --git a/pkgs/development/python-modules/nested-lookup/default.nix b/pkgs/development/python-modules/nested-lookup/default.nix index c8c00c3366ebe..0a59a372d00e5 100644 --- a/pkgs/development/python-modules/nested-lookup/default.nix +++ b/pkgs/development/python-modules/nested-lookup/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "nested-lookup"; version = "0.2.25"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index 2a9f4b78b5c8f..98c886d2825e3 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "netaddr"; version = "0.8.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/netapp-ontap/default.nix b/pkgs/development/python-modules/netapp-ontap/default.nix index 28a953f29f131..7516c5da20e33 100644 --- a/pkgs/development/python-modules/netapp-ontap/default.nix +++ b/pkgs/development/python-modules/netapp-ontap/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "netapp-ontap"; - version = "9.13.1.0"; + version = "9.14.1.0"; format = "setuptools"; src = fetchPypi { pname = "netapp_ontap"; inherit version; - sha256 = "sha256-jPKfPJXtzARRlSuwkfJeZueQouwaaa0D6rZ+BcpILq0="; + sha256 = "sha256-nh7SHcyujTVXSgxQajRA4EueN6Hf8cKueQbsbnr6+qw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index f44d54993d5ba..6ea7841dff875 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "netdisco"; version = "3.0.0"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/netmap/default.nix b/pkgs/development/python-modules/netmap/default.nix index 012599216074c..11133c44f8808 100644 --- a/pkgs/development/python-modules/netmap/default.nix +++ b/pkgs/development/python-modules/netmap/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "netmap"; version = "0.7.0.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "home-assistant-libs"; diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix index 513c3ade941fb..7c2fbda27ced6 100644 --- a/pkgs/development/python-modules/netmiko/default.nix +++ b/pkgs/development/python-modules/netmiko/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "netmiko"; version = "4.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index b793bc57bf0e8..20c73fb6adf86 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade version = "3.1"; + format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index b0748f64b805b..c05c0fb25a74d 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -5,14 +5,15 @@ , numpy , openpyxl , pandas +, poetry-core , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "niapy"; - version = "2.0.5"; - format = "setuptools"; + version = "2.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,9 +21,13 @@ buildPythonPackage rec { owner = "NiaOrg"; repo = "NiaPy"; rev = "refs/tags/${version}"; - hash = "sha256-qstTxUo4jZ8YKbEjtDtSZUvR67VNkBQJdXeERJPOMDw="; + hash = "sha256-cT5CU1r3LZ9ValJwRUA0PaISmF6kXAz40alXbWYogGA="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ matplotlib numpy diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index a437ec2547ce9..7994543ac4bd2 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.5.2"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-qlGQtjRG92AhFY+sF3mB4ghIn4kydkbDOolLu9Qh0JM="; + hash = "sha256-VDK6ZCyW8fmp9Ap/AwgLbU5vlyhYXIGYD6eZ3esSCiU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nidaqmx/default.nix b/pkgs/development/python-modules/nidaqmx/default.nix index 785b88185149a..2cbc5c4909575 100644 --- a/pkgs/development/python-modules/nidaqmx/default.nix +++ b/pkgs/development/python-modules/nidaqmx/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "nidaqmx"; version = src.rev; + format = "setuptools"; # 3.10 is not supported, upstream inactive disabled = pythonAtLeast "3.10"; diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix index 3f6e521047ab6..a253b04228f6c 100644 --- a/pkgs/development/python-modules/nimfa/default.nix +++ b/pkgs/development/python-modules/nimfa/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "nimfa"; version = "1.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nine/default.nix b/pkgs/development/python-modules/nine/default.nix index e2ca5c6f27dd9..a969399d3384d 100644 --- a/pkgs/development/python-modules/nine/default.nix +++ b/pkgs/development/python-modules/nine/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "nine"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index 9f600bdf86ac1..63e6989d4daca 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { version = "0.5.0"; + format = "setuptools"; pname = "nipy"; disabled = pythonOlder "2.6"; diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index f4e8fbcdae073..3132d1900847b 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "nitransforms"; version = "23.0.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/nix-kernel/default.nix b/pkgs/development/python-modules/nix-kernel/default.nix index 8ec80af0736b0..c03db9cf42f24 100644 --- a/pkgs/development/python-modules/nix-kernel/default.nix +++ b/pkgs/development/python-modules/nix-kernel/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "nix-kernel"; version = "unstable-2020-04-26"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index ec967493d0806..ca2183e82a4c1 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; version = "7.0.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/pkgs/development/python-modules/nixpkgs-pytools/default.nix index e0af4c4969937..d6c3c89887ec6 100644 --- a/pkgs/development/python-modules/nixpkgs-pytools/default.nix +++ b/pkgs/development/python-modules/nixpkgs-pytools/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "nixpkgs-pytools"; version = "1.3.0"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index acebe5d758f7b..6deb9bac96ed4 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "nixpkgs"; version = "0.2.4"; + format = "setuptools"; disabled = ! pythonAtLeast "3.5"; src = fetchPypi { diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index 390658f8167b7..5a81392881833 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "nocasedict"; version = "2.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nodepy-runtime/default.nix b/pkgs/development/python-modules/nodepy-runtime/default.nix index 5be806e4cefeb..baa078f9082e0 100644 --- a/pkgs/development/python-modules/nodepy-runtime/default.nix +++ b/pkgs/development/python-modules/nodepy-runtime/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "nodepy-runtime"; version = "2.1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix index ebd0178602ca3..10521f06723ab 100644 --- a/pkgs/development/python-modules/noise/default.nix +++ b/pkgs/development/python-modules/noise/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "noise"; version = "1.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/noiseprotocol/default.nix b/pkgs/development/python-modules/noiseprotocol/default.nix index 596468f83ca2c..d1cc83e517ad3 100644 --- a/pkgs/development/python-modules/noiseprotocol/default.nix +++ b/pkgs/development/python-modules/noiseprotocol/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "noiseprotocol"; version = "0.3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "plizonczyk"; diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix index 5770b61718a40..862b3af929585 100644 --- a/pkgs/development/python-modules/normality/default.nix +++ b/pkgs/development/python-modules/normality/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "normality"; version = "2.2.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "pudo"; diff --git a/pkgs/development/python-modules/nose-cov/default.nix b/pkgs/development/python-modules/nose-cov/default.nix index a95e162b1ba4f..c9bc139c77bf9 100644 --- a/pkgs/development/python-modules/nose-cov/default.nix +++ b/pkgs/development/python-modules/nose-cov/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "nose-cov"; version = "1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nose-cprof/default.nix b/pkgs/development/python-modules/nose-cprof/default.nix index f4959ec7be78d..58ffc4a25c680 100644 --- a/pkgs/development/python-modules/nose-cprof/default.nix +++ b/pkgs/development/python-modules/nose-cprof/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "nose-cprof"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nose-exclude/default.nix b/pkgs/development/python-modules/nose-exclude/default.nix index 81204a34bd9c1..f584779848893 100644 --- a/pkgs/development/python-modules/nose-exclude/default.nix +++ b/pkgs/development/python-modules/nose-exclude/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "nose-exclude"; version = "0.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/pkgs/development/python-modules/nose-pattern-exclude/default.nix index a550dc5aee156..cb0ef287cef14 100644 --- a/pkgs/development/python-modules/nose-pattern-exclude/default.nix +++ b/pkgs/development/python-modules/nose-pattern-exclude/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "nose-pattern-exclude"; version = "0.1.3"; + format = "setuptools"; propagatedBuildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix index 786820b1adf41..afb797d3e2f25 100644 --- a/pkgs/development/python-modules/nose-randomly/default.nix +++ b/pkgs/development/python-modules/nose-randomly/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "nose-randomly"; version = "1.2.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nose-timer/default.nix b/pkgs/development/python-modules/nose-timer/default.nix index de3bbdc9a439b..51b4bf80d0e8c 100644 --- a/pkgs/development/python-modules/nose-timer/default.nix +++ b/pkgs/development/python-modules/nose-timer/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "nose-timer"; version = "1.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "mahmoudimus"; diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index 981d5dc03729e..376e56041b614 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { version = "1.3.7"; + format = "setuptools"; pname = "nose"; src = fetchPypi { diff --git a/pkgs/development/python-modules/nose3/default.nix b/pkgs/development/python-modules/nose3/default.nix index f9966b246602d..df6d75a07dc5a 100644 --- a/pkgs/development/python-modules/nose3/default.nix +++ b/pkgs/development/python-modules/nose3/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "nose3"; version = "1.3.8"; + format = "setuptools"; # https://github.com/jayvdb/nose3/issues/5 disabled = pythonAtLeast "3.12"; diff --git a/pkgs/development/python-modules/nose_warnings_filters/default.nix b/pkgs/development/python-modules/nose_warnings_filters/default.nix index 6617c85d16d47..a10302559cb05 100644 --- a/pkgs/development/python-modules/nose_warnings_filters/default.nix +++ b/pkgs/development/python-modules/nose_warnings_filters/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "nose_warnings_filters"; version = "0.1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nosexcover/default.nix b/pkgs/development/python-modules/nosexcover/default.nix index f60ed65448d74..21d11f0d6d907 100644 --- a/pkgs/development/python-modules/nosexcover/default.nix +++ b/pkgs/development/python-modules/nosexcover/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "nosexcover"; version = "1.0.11"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/notedown/default.nix b/pkgs/development/python-modules/notedown/default.nix index 8ecbf1f5afab3..9301fb13dd0d0 100644 --- a/pkgs/development/python-modules/notedown/default.nix +++ b/pkgs/development/python-modules/notedown/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "notedown"; version = "1.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/notify2/default.nix b/pkgs/development/python-modules/notify2/default.nix index 28c74415c5dc1..1f087cb77a363 100644 --- a/pkgs/development/python-modules/notify2/default.nix +++ b/pkgs/development/python-modules/notify2/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "notify2"; version = "0.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix index 91cf18e3a2c1a..9848868f0062e 100644 --- a/pkgs/development/python-modules/notion-client/default.nix +++ b/pkgs/development/python-modules/notion-client/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "notion-client"; version = "2.0.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix index 90695b84c6604..a67888564c6ba 100644 --- a/pkgs/development/python-modules/notmuch/default.nix +++ b/pkgs/development/python-modules/notmuch/default.nix @@ -10,6 +10,8 @@ buildPythonPackage { sourceRoot = notmuch.pythonSourceRoot; + format = "setuptools"; + buildInputs = [ python notmuch ]; postPatch = '' diff --git a/pkgs/development/python-modules/notmuch2/default.nix b/pkgs/development/python-modules/notmuch2/default.nix index 9bb930d6cfa4b..08d0cd0929f62 100644 --- a/pkgs/development/python-modules/notmuch2/default.nix +++ b/pkgs/development/python-modules/notmuch2/default.nix @@ -8,6 +8,7 @@ buildPythonPackage { pname = "notmuch2"; + format = "setuptools"; inherit (notmuch) version src; sourceRoot = "notmuch-${notmuch.version}/bindings/python-cffi"; diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/development/python-modules/nototools/default.nix index 1b515b486f5f9..1b515b486f5f9 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/development/python-modules/nototools/default.nix diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index 5a31394c2d356..ff0aa18a2d36f 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "nplusone"; version = "1.0.0"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/npyscreen/default.nix b/pkgs/development/python-modules/npyscreen/default.nix index 1e93d54b3a298..764e46dcadec1 100644 --- a/pkgs/development/python-modules/npyscreen/default.nix +++ b/pkgs/development/python-modules/npyscreen/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "npyscreen"; version = "4.10.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nsapi/default.nix b/pkgs/development/python-modules/nsapi/default.nix index 453eeb2c9519e..4e3a7bc5bf3c5 100644 --- a/pkgs/development/python-modules/nsapi/default.nix +++ b/pkgs/development/python-modules/nsapi/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "nsapi"; version = "3.0.5"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/nsz/default.nix b/pkgs/development/python-modules/nsz/default.nix index 06cb7a9457b13..05bbad2d2180c 100644 --- a/pkgs/development/python-modules/nsz/default.nix +++ b/pkgs/development/python-modules/nsz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nsz"; - version = "4.5.0"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "nicoboss"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/46qOQEuzSBmnFG0XW4z71HAHpuyqhia29KQkUlDsgg="; + hash = "sha256-ch4HzQFa95o3HMsi7R0LpPWmhN/Z9EYfrmCdUZLwPSE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ntplib/default.nix b/pkgs/development/python-modules/ntplib/default.nix index 399d27695ad1b..8c937e36f4141 100644 --- a/pkgs/development/python-modules/ntplib/default.nix +++ b/pkgs/development/python-modules/ntplib/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "ntplib"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index c43cb81eb2fc7..10529adf74a78 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "0.5.13"; + format = "setuptools"; pname = "num2words"; src = fetchPypi { diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix index 64d6d291633e8..cc04bea1e3a14 100644 --- a/pkgs/development/python-modules/numericalunits/default.nix +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "1.25"; + format = "setuptools"; pname = "numericalunits"; src = fetchPypi { diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 155d1c60b1757..056d893ba75f1 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "numpy-stl"; version = "3.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 82ceee47d066d..62ffc91e87677 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -11,6 +11,7 @@ , cython_3 , gfortran , meson-python +, mesonEmulatorHook , pkg-config , xcbuild @@ -83,6 +84,10 @@ in buildPythonPackage rec { rm numpy/core/tests/test_cython.py patchShebangs numpy/_build_utils/*.py + + # remove needless reference to full Python path stored in built wheel + substituteInPlace numpy/meson.build \ + --replace 'py.full_path()' "'python'" ''; nativeBuildInputs = [ @@ -92,6 +97,8 @@ in buildPythonPackage rec { pkg-config ] ++ lib.optionals (stdenv.isDarwin) [ xcbuild.xcrun + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ @@ -110,6 +117,11 @@ in buildPythonPackage rec { export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) ''; + # HACK: copy mesonEmulatorHook's flags to the variable used by meson-python + postConfigure = '' + mesonFlags="$mesonFlags ''${mesonFlagsArray[@]}" + ''; + preBuild = '' ln -s ${cfg} site.cfg ''; diff --git a/pkgs/development/python-modules/nvdlib/default.nix b/pkgs/development/python-modules/nvdlib/default.nix new file mode 100644 index 0000000000000..e79b8c0513cd6 --- /dev/null +++ b/pkgs/development/python-modules/nvdlib/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, responses +, setuptools +}: + +buildPythonPackage rec { + pname = "nvdlib"; + version = "0.7.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Vehemont"; + repo = "nvdlib"; + rev = "refs/tags/v${version}"; + hash = "sha256-p2xx+QC0P30FR+nMiFW/PoINbcTM49ufADW9B9u2WxI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ + "nvdlib" + ]; + + meta = with lib; { + description = "Module to interact with the National Vulnerability CVE/CPE API"; + homepage = "https://github.com/Vehemont/nvdlib/"; + changelog = "https://github.com/vehemont/nvdlib/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/oauth/default.nix b/pkgs/development/python-modules/oauth/default.nix index c74de8d6bd6ed..434f40b17cd97 100644 --- a/pkgs/development/python-modules/oauth/default.nix +++ b/pkgs/development/python-modules/oauth/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "oauth"; version = "1.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/oauth2/default.nix b/pkgs/development/python-modules/oauth2/default.nix index d9c0ae505f71c..981299a9ac05c 100644 --- a/pkgs/development/python-modules/oauth2/default.nix +++ b/pkgs/development/python-modules/oauth2/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "oauth2"; version = "1.9.0.post1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/pkgs/development/python-modules/oauth2client/default.nix index dc6e65d95cbf7..a924fa81c7aed 100644 --- a/pkgs/development/python-modules/oauth2client/default.nix +++ b/pkgs/development/python-modules/oauth2client/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "oauth2client"; version = "4.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 5f652cb97f3cf..cb00eb5dafd54 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "obfsproxy"; version = "0.2.13"; + format = "setuptools"; src = fetchgit { url = "https://git.torproject.org/pluggable-transports/obfsproxy.git"; diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix index be8a3d8327d28..24a14b37f98ca 100644 --- a/pkgs/development/python-modules/objax/default.nix +++ b/pkgs/development/python-modules/objax/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "objax"; version = "1.8.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "google"; diff --git a/pkgs/development/python-modules/obspy/default.nix b/pkgs/development/python-modules/obspy/default.nix index 0f5f2c003da06..422a0553e101c 100644 --- a/pkgs/development/python-modules/obspy/default.nix +++ b/pkgs/development/python-modules/obspy/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "obspy"; version = "1.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 5101460704fd7..f75cd25f21ece 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.113.0"; + version = "2.118.0"; 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-Ui7/rD307fSdAPexZF9VU4NC9udjEGcFpjg/Ob6GVvo="; + hash = "sha256-bmV2IFMh/lp7+7MMqlg9zm8VkdZE48zqf8N3+/sSkTc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ocifs/default.nix b/pkgs/development/python-modules/ocifs/default.nix index 479f2c8396486..8fab505c310d1 100644 --- a/pkgs/development/python-modules/ocifs/default.nix +++ b/pkgs/development/python-modules/ocifs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ocifs"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oracle"; repo = "ocifs"; - rev = "refs/tags/${version}"; - hash = "sha256-ugNITi2tSf3lhbASgr6ErmFDYinQjnhmtRjV3YL7F9U="; + rev = "refs/tags/v${version}"; + hash = "sha256-IGl9G4NyzhcqrfYfgeZin+wt1OwHmh6780MPfZBwsXA="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Oracle Cloud Infrastructure Object Storage fsspec implementation"; homepage = "https://ocifs.readthedocs.io"; - changelog = "https://github.com/oracle/ocifs/releases/tag/${version}"; + changelog = "https://github.com/oracle/ocifs/releases/tag/v${version}"; license = with licenses; [ upl ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index ff874ac6fb150..9b9f44d211bcd 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "odfpy"; version = "1.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index d36bc9004e33b..6b415cf9f52a2 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "2.12.0"; + version = "2.12.3"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-0Ic7WKQbwA7TnFvXRZz+mFehjWP6n+Pyp0IySMy8sdw="; + hash = "sha256-fzHEy9/BxstPAYhVTG0o7Gn2D9UKuSZvI0X5ynZ+oEk="; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/offtrac/default.nix b/pkgs/development/python-modules/offtrac/default.nix index 1ae555ffa15a9..51ce4210e5618 100644 --- a/pkgs/development/python-modules/offtrac/default.nix +++ b/pkgs/development/python-modules/offtrac/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "offtrac"; version = "0.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix index 72e2be7c78bd8..8ebac1d06a566 100644 --- a/pkgs/development/python-modules/ofxclient/default.nix +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { version = "2.0.3"; + format = "setuptools"; pname = "ofxclient"; src = fetchPypi { diff --git a/pkgs/development/python-modules/ofxhome/default.nix b/pkgs/development/python-modules/ofxhome/default.nix index 72ca65ed17116..09f901a30008e 100644 --- a/pkgs/development/python-modules/ofxhome/default.nix +++ b/pkgs/development/python-modules/ofxhome/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "0.3.3"; + format = "setuptools"; pname = "ofxhome"; src = fetchPypi { diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix index a364c7393ba89..c133db4b42654 100644 --- a/pkgs/development/python-modules/ofxparse/default.nix +++ b/pkgs/development/python-modules/ofxparse/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "ofxparse"; version = "0.21"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ofxtools/default.nix b/pkgs/development/python-modules/ofxtools/default.nix index d145610dc33b6..a9306b2dca4b4 100644 --- a/pkgs/development/python-modules/ofxtools/default.nix +++ b/pkgs/development/python-modules/ofxtools/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "ofxtools"; version = "0.9.5"; + format = "setuptools"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix index c82b13cc2ee75..4c51df76f14e6 100644 --- a/pkgs/development/python-modules/okonomiyaki/default.nix +++ b/pkgs/development/python-modules/okonomiyaki/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "okonomiyaki"; version = "1.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "enthought"; diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index d6068b59e0438..13218b0d8f08b 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "okta"; - version = "2.9.3"; + version = "2.9.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mOKVCRp8cLY7p0AVbvphWdB3II6eB6HlN8i1HrVUH+o="; + hash = "sha256-qMcO0TTbMPjc+r2IOlwJqbaSOztat9MmYWH4kgy9vwA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index 130b45d631e61..fa038770a0930 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "ome-zarr"; version = "0.8.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/omorfi/default.nix b/pkgs/development/python-modules/omorfi/default.nix index 6bbe964de7344..55fe7a0454aec 100644 --- a/pkgs/development/python-modules/omorfi/default.nix +++ b/pkgs/development/python-modules/omorfi/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "omorfi"; + format = "setuptools"; inherit (pkgs.omorfi) src version; sourceRoot = "${src.name}/src/python"; diff --git a/pkgs/development/python-modules/omrdatasettools/default.nix b/pkgs/development/python-modules/omrdatasettools/default.nix index 45c6ee0a90e50..c210349ad631d 100644 --- a/pkgs/development/python-modules/omrdatasettools/default.nix +++ b/pkgs/development/python-modules/omrdatasettools/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { pname = "omrdatasettools"; version = "1.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/onetimepass/default.nix b/pkgs/development/python-modules/onetimepass/default.nix index 6b339294a5cb9..3bea443a36f23 100644 --- a/pkgs/development/python-modules/onetimepass/default.nix +++ b/pkgs/development/python-modules/onetimepass/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "onetimepass"; version = "1.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "tadeck"; diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix index 0877067843230..066d1d89ce8f2 100644 --- a/pkgs/development/python-modules/onkyo-eiscp/default.nix +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "onkyo-eiscp"; version = "1.2.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/online-judge-api-client/default.nix b/pkgs/development/python-modules/online-judge-api-client/default.nix index 5a96133a0daa2..0a1268e5264f8 100644 --- a/pkgs/development/python-modules/online-judge-api-client/default.nix +++ b/pkgs/development/python-modules/online-judge-api-client/default.nix @@ -21,6 +21,7 @@ let in buildPythonPackage rec { pname = "online-judge-api-client"; version = "10.10.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "online-judge-tools"; diff --git a/pkgs/development/python-modules/online-judge-tools/default.nix b/pkgs/development/python-modules/online-judge-tools/default.nix index 34e1882d60e95..58d535e6ab788 100644 --- a/pkgs/development/python-modules/online-judge-tools/default.nix +++ b/pkgs/development/python-modules/online-judge-tools/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "online-judge-tools"; version = "11.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "online-judge-tools"; diff --git a/pkgs/development/python-modules/onnxmltools/default.nix b/pkgs/development/python-modules/onnxmltools/default.nix index 97eaf68254b67..b24537ddcdf35 100644 --- a/pkgs/development/python-modules/onnxmltools/default.nix +++ b/pkgs/development/python-modules/onnxmltools/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "onnxmltools"; - version = "1.11.2"; + version = "1.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "onnx"; repo = "onnxmltools"; - rev = "v${version}"; - hash = "sha256-uLFAGtCDLdMd0SMoonMXFE0kGHuDpwp6IrIbD0t8l4M="; + rev = "refs/tags/${version}"; + hash = "sha256-/UKGo56riLnATcn7kA++QoFkkILVGYBwqRZZ+PYB1/0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix index 3034cb8fcc0f9..0f078aa6fc479 100644 --- a/pkgs/development/python-modules/opcua-widgets/default.nix +++ b/pkgs/development/python-modules/opcua-widgets/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "opcua-widgets"; version = "0.6.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "FreeOpcUa"; diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix new file mode 100644 index 0000000000000..f1272e1e3640b --- /dev/null +++ b/pkgs/development/python-modules/open-clip-torch/default.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, buildPythonPackage +, braceexpand +, ftfy +, huggingface-hub +, pandas +, protobuf +, pytestCheckHook +, regex +, sentencepiece +, timm +, torch +, torchvision +, tqdm +, transformers +, setuptools +, webdataset +, wheel +, fetchFromGitHub +}: +buildPythonPackage rec { + pname = "open-clip-torch"; + version = "2.23.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mlfoundations"; + repo = "open_clip"; + rev = "v${version}"; + hash = "sha256-Txm47Tc4KMbz1i2mROT+IYbgS1Y0yHK80xY0YldgBFQ="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + ftfy + huggingface-hub + protobuf + regex + sentencepiece + timm + torch + torchvision + tqdm + ]; + + nativeCheckInputs = [ + pytestCheckHook + braceexpand + pandas + transformers + webdataset + ]; + + pythonImportsCheck = [ "open_clip" ]; + + disabledTestPaths = lib.optionals (stdenv.isAarch64 || stdenv.isDarwin) [ + "tests/test_wds.py" + ]; + + disabledTests = [ + # requires network + "test_download_pretrained_from_hfh" + "test_inference_simple" + "test_inference_with_data" + "test_pretrained_text_encoder" + "test_training_mt5" + ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + "test_training" + "test_training_coca" + "test_training_unfreezing_vit" + "test_training_clip_with_jit" + ]; + + meta = with lib; { + description = "An open source implementation of CLIP"; + homepage = "https://github.com/mlfoundations/open_clip"; + license = licenses.asl20; + maintainers = with maintainers; [ iynaix ]; + mainProgram = "open-clip"; + }; +} diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix index 4aec00f312b20..6da3633723694 100644 --- a/pkgs/development/python-modules/open-meteo/default.nix +++ b/pkgs/development/python-modules/open-meteo/default.nix @@ -3,8 +3,9 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, mashumaro +, orjson , poetry-core -, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,46 +13,47 @@ buildPythonPackage rec { pname = "open-meteo"; - version = "0.2.1"; + version = "0.3.1"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-open-meteo"; rev = "v${version}"; - sha256 = "0i8jmhd29vvkpfxs9l5wy8525ngs79mnc7si2j9b1nc41xrv91f6"; + hash = "sha256-IB+dfQ4bb4dMYYQUVH9YbP3arvfgt4SooPlOKP3AVI8="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - aresponses - pydantic + mashumaro + orjson ]; nativeCheckInputs = [ + aresponses pytest-asyncio pytestCheckHook ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" \ - --replace 'aiohttp = "^3.8.1"' 'aiohttp = "^3.8.0"' - ''; - pythonImportsCheck = [ "open_meteo" ]; meta = with lib; { + changelog = "https://github.com/frenck/python-open-meteo/releases/tag/v${version}"; description = "Python client for the Open-Meteo API"; homepage = "https://github.com/frenck/python-open-meteo"; license = licenses.mit; diff --git a/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch b/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch index 5038a5ba52e05..d31a4798af05c 100644 --- a/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch +++ b/pkgs/development/python-modules/openai-triton/0000-dont-download-ptxas.patch @@ -1,39 +1,15 @@ diff --git a/python/setup.py b/python/setup.py -index 2ac3accd2..f26161c72 100644 +index 18764ec13..b3bb5b60a 100644 --- a/python/setup.py +++ b/python/setup.py -@@ -101,25 +101,6 @@ def get_thirdparty_packages(triton_cache_path): - # ---- package data --- +@@ -269,10 +269,6 @@ class CMakeBuild(build_ext): + subprocess.check_call(["cmake", self.base_dir] + cmake_args, cwd=cmake_dir, env=env) + subprocess.check_call(["cmake", "--build", "."] + build_args, cwd=cmake_dir) - --def download_and_copy_ptxas(): -- base_dir = os.path.dirname(__file__) -- src_path = "bin/ptxas" -- url = "https://conda.anaconda.org/nvidia/label/cuda-12.0.0/linux-64/cuda-nvcc-12.0.76-0.tar.bz2" -- dst_prefix = os.path.join(base_dir, "triton") -- dst_suffix = os.path.join("third_party", "cuda", src_path) -- dst_path = os.path.join(dst_prefix, dst_suffix) -- if not os.path.exists(dst_path): -- print(f'downloading and extracting {url} ...') -- ftpstream = urllib.request.urlopen(url) -- file = tarfile.open(fileobj=ftpstream, mode="r|*") -- with tempfile.TemporaryDirectory() as temp_dir: -- file.extractall(path=temp_dir) -- src_path = os.path.join(temp_dir, src_path) -- os.makedirs(os.path.split(dst_path)[0], exist_ok=True) -- shutil.copy(src_path, dst_path) -- return dst_suffix -- - - # ---- cmake extension ---- - - -@@ -200,8 +181,6 @@ class CMakeBuild(build_ext): - subprocess.check_call(["cmake", "--build", "."] + build_args, cwd=self.build_temp) - - -download_and_copy_ptxas() - +- setup( name="triton", - version="2.0.0", + version="2.1.0", diff --git a/pkgs/development/python-modules/openai-triton/bin.nix b/pkgs/development/python-modules/openai-triton/bin.nix index a1a04fcf944b1..f5a4148d28a7b 100644 --- a/pkgs/development/python-modules/openai-triton/bin.nix +++ b/pkgs/development/python-modules/openai-triton/bin.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "triton"; - version = "2.0.0"; + version = "2.1.0"; format = "wheel"; src = @@ -62,7 +62,7 @@ buildPythonPackage rec { newStr = lib.concatMapStringsSep ", " quote new; in '' - substituteInPlace $out/${python.sitePackages}/triton/compiler.py \ + substituteInPlace $out/${python.sitePackages}/triton/common/build.py \ --replace '${oldStr}' '${newStr}' ''); diff --git a/pkgs/development/python-modules/openai-triton/binary-hashes.nix b/pkgs/development/python-modules/openai-triton/binary-hashes.nix index a6baea5942b0a..d5f588dc947c7 100644 --- a/pkgs/development/python-modules/openai-triton/binary-hashes.nix +++ b/pkgs/development/python-modules/openai-triton/binary-hashes.nix @@ -6,26 +6,26 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.0.0" = { + "2.1.0" = { x86_64-linux-38 = { - name = "triton-2.0.0-1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-nUl4KYt0/PWadf5x5TXAkrAjCIkzsvHfkz7DJhXkvu8="; + name = "triton-2.1.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; + hash = "sha256-Ofb7a9zLPpjzFS4/vqck8a6ufXSUErux+pxEHUdOuiY="; }; x86_64-linux-39 = { - name = "triton-2.0.0-1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-dPEYwStDf7LKJeGgR1kXO1F1gvz0x74RkTMWx2QhNlY="; + name = "triton-2.1.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; + hash = "sha256-IVROUiwCAFpibIrWPTm9/y8x1BBpWSkZ7ygelk7SZEY="; }; x86_64-linux-310 = { - name = "triton-2.0.0-1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-OIBu6WY/Sw981keQ6WxXk3QInlj0mqxKZggSGqVeJQU="; + name = "triton-2.1.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; + hash = "sha256-ZkOZI6MNXUg5mwip6uEDcPbCYaXshkpkmDuuYxUtOdc="; }; x86_64-linux-311 = { - name = "triton-2.0.0-1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; - hash = "sha256-ImlBx7hZUhnd71mh/bgh6MdEKJoTJBXd1YT6zt60dbE="; + name = "triton-2.1.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/triton-2.1.0-0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"; + hash = "sha256-kZsGRT8AM+pSwT6veDPeDlfbMXjSPU4E+fxxxPLDK/g="; }; }; } diff --git a/pkgs/development/python-modules/openai-triton/default.nix b/pkgs/development/python-modules/openai-triton/default.nix index e1ac9cb4cef6e..46f1e6de56840 100644 --- a/pkgs/development/python-modules/openai-triton/default.nix +++ b/pkgs/development/python-modules/openai-triton/default.nix @@ -2,10 +2,11 @@ , config , buildPythonPackage , fetchFromGitHub +, fetchpatch , addOpenGLRunpath +, setuptools , pytestCheckHook , pythonRelaxDepsHook -, pkgsTargetTarget , cmake , ninja , pybind11 @@ -23,46 +24,32 @@ }: let - # A time may come we'll want to be cross-friendly - # - # Short explanation: we need pkgsTargetTarget, because we use string - # interpolation instead of buildInputs. - # - # Long explanation: OpenAI/triton downloads and vendors a copy of NVidia's - # ptxas compiler. We're not running this ptxas on the build machine, but on - # the user's machine, i.e. our Target platform. The second "Target" in - # pkgsTargetTarget maybe doesn't matter, because ptxas compiles programs to - # be executed on the GPU. - # Cf. https://nixos.org/manual/nixpkgs/unstable/#sec-cross-infra - ptxas = "${pkgsTargetTarget.cudaPackages.cuda_nvcc}/bin/ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py) + ptxas = "${cudaPackages.cuda_nvcc}/bin/ptxas"; # Make sure cudaPackages is the right version each update (See python/setup.py) in buildPythonPackage rec { pname = "triton"; - version = "2.0.0"; - format = "setuptools"; + version = "2.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = "v${version}"; - hash = "sha256-9GZzugab+Pdt74Dj6zjlEzjj4BcJ69rzMJmqcVMxsKU="; + hash = "sha256-8UTUwLH+SriiJnpejdrzz9qIquP2zBp1/uwLdHmv0XQ="; }; patches = [ - # TODO: there have been commits upstream aimed at removing the "torch" - # circular dependency, but the patches fail to apply on the release - # revision. Keeping the link for future reference - # Also cf. https://github.com/openai/triton/issues/1374 - - # (fetchpatch { - # url = "https://github.com/openai/triton/commit/fc7c0b0e437a191e421faa61494b2ff4870850f1.patch"; - # hash = "sha256-f0shIqHJkVvuil2Yku7vuqWFn7VCRKFSFjYRlwx25ig="; - # }) + # fix overflow error + (fetchpatch { + url = "https://github.com/openai/triton/commit/52c146f66b79b6079bcd28c55312fc6ea1852519.patch"; + hash = "sha256-098/TCQrzvrBAbQiaVGCMaF3o5Yc3yWDxzwSkzIuAtY="; + }) ] ++ lib.optionals (!cudaSupport) [ ./0000-dont-download-ptxas.patch ]; nativeBuildInputs = [ + setuptools pythonRelaxDepsHook # pytestCheckHook # Requires torch (circular dependency) and probably needs GPUs: cmake @@ -111,7 +98,7 @@ buildPythonPackage rec { --replace "include(GoogleTest)" "find_package(GTest REQUIRED)" '' + lib.optionalString cudaSupport '' # Use our linker flags - substituteInPlace python/triton/compiler.py \ + substituteInPlace python/triton/common/build.py \ --replace '${oldStr}' '${newStr}' ''; diff --git a/pkgs/development/python-modules/openai-triton/prefetch.sh b/pkgs/development/python-modules/openai-triton/prefetch.sh index 07e39e176dba0..f218718a5cf30 100755 --- a/pkgs/development/python-modules/openai-triton/prefetch.sh +++ b/pkgs/development/python-modules/openai-triton/prefetch.sh @@ -8,10 +8,10 @@ version=$1 linux_bucket="https://download.pytorch.org/whl" url_and_key_list=( - "x86_64-linux-38 $linux_bucket/triton-${version}-1-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $linux_bucket/triton-${version}-1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp39-cp39-linux_x86_64.whl" - "x86_64-linux-310 $linux_bucket/triton-${version}-1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-linux-311 $linux_bucket/triton-${version}-1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp311-cp311-linux_x86_64.whl" + "x86_64-linux-38 $linux_bucket/triton-${version}-0-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_bucket/triton-${version}-0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_bucket/triton-${version}-0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-linux-311 $linux_bucket/triton-${version}-0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp311-cp311-linux_x86_64.whl" ) hashfile=binary-hashes-"$version".nix diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 3c13e035bf025..bb2a4efdf5a7d 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.3.7"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Pa53s3U5vby1Fq14WMCJnSR6KA3xkVHmBexkNoX/0sk="; + hash = "sha256-bRnsUpHhi+CAzUQSqMFmVWItn6KIKaXMjggxNixaY6Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 847a9fdcbddf3..9312f4b1b2b94 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -70,6 +70,5 @@ buildPythonPackage rec { description = "Validates OpenAPI Specs against the OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0.0 specification"; homepage = "https://github.com/p1c2u/openapi-spec-validator"; license = licenses.asl20; - maintainers = with maintainers; [ rvl ]; }; } diff --git a/pkgs/development/python-modules/opencensus-context/default.nix b/pkgs/development/python-modules/opencensus-context/default.nix index 0379b27519eaf..ae7897eae7acf 100644 --- a/pkgs/development/python-modules/opencensus-context/default.nix +++ b/pkgs/development/python-modules/opencensus-context/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "opencensus-context"; version = "0.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/opencensus-ext-azure/default.nix b/pkgs/development/python-modules/opencensus-ext-azure/default.nix index 7250a0841f249..534213c2dbc3f 100644 --- a/pkgs/development/python-modules/opencensus-ext-azure/default.nix +++ b/pkgs/development/python-modules/opencensus-ext-azure/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "opencensus-ext-azure"; - version = "1.1.11"; + version = "1.1.12"; format = "setuptools"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - hash = "sha256-IdTU0FGdSCOdBBQskLalH17MBDaE64DPoKcBqiM0YHM="; + hash = "sha256-hrseR84dIKytlq08Efjvsvp6tensSJbzBj2F+JlJBGI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opencensus/default.nix b/pkgs/development/python-modules/opencensus/default.nix index fa7141a8fb2ed..67aa2e899790f 100644 --- a/pkgs/development/python-modules/opencensus/default.nix +++ b/pkgs/development/python-modules/opencensus/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "opencensus"; version = "0.11.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix index ce6ccee9793c0..a2110cb6a309d 100644 --- a/pkgs/development/python-modules/openidc-client/default.nix +++ b/pkgs/development/python-modules/openidc-client/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "openidc-client"; version = "0.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/openllm-core/default.nix b/pkgs/development/python-modules/openllm-core/default.nix index ab39bf6c11b91..b18017e10d183 100644 --- a/pkgs/development/python-modules/openllm-core/default.nix +++ b/pkgs/development/python-modules/openllm-core/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openllm-core"; - version = "0.4.22"; + version = "0.4.41"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "bentoml"; repo = "OpenLLM"; rev = "refs/tags/v${version}"; - hash = "sha256-Hgwc4rneY0d7KZHuBIWRpndLksts5DTvaYuwZOO4sdI="; + hash = "sha256-9mr6sw4/h5cYSmo1CDT2SKq4NVz1ZcoyqnYOwhlfaiQ="; }; sourceRoot = "source/openllm-core"; diff --git a/pkgs/development/python-modules/openrouteservice/default.nix b/pkgs/development/python-modules/openrouteservice/default.nix index 9f93d566b0bcf..72945907d4ebd 100644 --- a/pkgs/development/python-modules/openrouteservice/default.nix +++ b/pkgs/development/python-modules/openrouteservice/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "openrouteservice"; version = "2.3.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "GIScience"; diff --git a/pkgs/development/python-modules/opensensemap-api/default.nix b/pkgs/development/python-modules/opensensemap-api/default.nix index 326f7d2acedab..a5730f8ba9fda 100644 --- a/pkgs/development/python-modules/opensensemap-api/default.nix +++ b/pkgs/development/python-modules/opensensemap-api/default.nix @@ -2,20 +2,22 @@ , aiohttp , async-timeout , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder }: buildPythonPackage rec { pname = "opensensemap-api"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-UrgQjZYw7TlFvhnaI7wFUpuUYeVKO5hsnx8h1OKfV8w="; + src = fetchFromGitHub { + owner = "home-assistant-ecosystem"; + repo = "python-opensensemap-api"; + rev = "refs/tags/${version}"; + hash = "sha256-iUSdjU41JOT7k044EI2XEvJiSo6V4mO6S51EcIughEM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index 9950b6af1620a..0a75792644b18 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "openshift"; version = "0.13.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "openshift"; diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix index bcbbd28178e4c..6ddf5c6d03788 100644 --- a/pkgs/development/python-modules/opensimplex/default.nix +++ b/pkgs/development/python-modules/opensimplex/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "opensimplex"; version = "0.4.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "lmas"; diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index 00b2128db2aaa..819bf7508d41c 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "openstackdocstheme"; version = "3.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix index 7e0cdfb71a141..2aa81629c6233 100644 --- a/pkgs/development/python-modules/openstep-plist/default.nix +++ b/pkgs/development/python-modules/openstep-plist/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "openstep-plist"; version = "0.3.0.post1"; + format = "setuptools"; src = fetchPypi { pname = "openstep_plist"; diff --git a/pkgs/development/python-modules/opentypespec/default.nix b/pkgs/development/python-modules/opentypespec/default.nix index c4bf0cde2c972..0355ec02146dd 100644 --- a/pkgs/development/python-modules/opentypespec/default.nix +++ b/pkgs/development/python-modules/opentypespec/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "opentypespec"; version = "1.9.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix index 60f94072681d6..4661bb4dcf4cf 100644 --- a/pkgs/development/python-modules/openwebifpy/default.nix +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "openwebifpy"; version = "3.2.7"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix index a58d9c08c5cf5..7c507cba15e0f 100644 --- a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix +++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "openwrt-luci-rpc"; version = "1.1.16"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix b/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix index 14d0909e658ea..c5a5ac35b3cd6 100644 --- a/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix +++ b/pkgs/development/python-modules/openwrt-ubus-rpc/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "openwrt-ubus-rpc"; version = "0.0.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "Noltari"; diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 72e83c216699c..f3e3828965d1a 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.39"; + version = "0.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-5JcediHl2TeMhYa6OJqoW5K0SlAjdIrMwj2IHh3qW7I="; + hash = "sha256-218AQ++ndwfS9wStWF7Zcn12gyoy5K7PAwv0HDGqbww="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 57b8b3d8475ab..42fb645ed0978 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.14.1"; + version = "1.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-aHolI+vM3sA83elsqxY5yaiZGB+I0okjSdRmjTRaxJI="; + hash = "sha256-UlxArfNK4Ialodpne5GY7GuWGUBcLbSjAidL67Li0S0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 7a3b3cca06b0e..39b1455b76bae 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -12,7 +12,6 @@ , colorlog , distributed , fakeredis -, fastai , google-cloud-storage , lightgbm , matplotlib @@ -44,7 +43,7 @@ buildPythonPackage rec { pname = "optuna"; - version = "3.4.0"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -53,7 +52,7 @@ buildPythonPackage rec { owner = "optuna"; repo = "optuna"; rev = "refs/tags/v${version}"; - hash = "sha256-WUjO13NxX0FneOPS4nn6aHq48X95r+GJR/Oxir6n8Pk="; + hash = "sha256-lNurMkZZKpKXXQoqhuRUv8LCbdSi1ryj3kYYioYZPF0="; }; nativeBuildInputs = [ @@ -77,7 +76,6 @@ buildPythonPackage rec { catboost cma distributed - fastai lightgbm mlflow pandas diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index d023c570bcbbd..c30d708511866 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "opuslib"; version = "3.0.3"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index cdaa5ee907a6d..f5cb156932d20 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -4,22 +4,26 @@ , cython_3 , fetchPypi , pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { pname = "oracledb"; - version = "1.4.2"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4o7ZBG8nNdwt1bvN82Z/KE44Tg7H7tPus3mPqKfUfjY="; + hash = "sha256-+0SB560anoEhSCiiGaRbZTMB2AxaHMR+A4VxBbYa4sk="; }; nativeBuildInputs = [ cython_3 + setuptools + wheel ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index e40a9a03e7641..37683a9994882 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { pname = "orange-canvas-core"; version = "0.1.35"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix index c89a1a8e2ce0c..3a1d5cd6e8933 100644 --- a/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/pkgs/development/python-modules/orange-widget-base/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "orange-widget-base"; version = "4.22.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index 1100ae7f6dc6e..fe7f775541822 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -45,6 +45,7 @@ let self = buildPythonPackage rec { pname = "orange3"; version = "3.36.2"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/oras/default.nix b/pkgs/development/python-modules/oras/default.nix new file mode 100644 index 0000000000000..6dd42eeca3db1 --- /dev/null +++ b/pkgs/development/python-modules/oras/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jsonschema +, pytestCheckHook +, pythonOlder +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "oras"; + version = "0.1.26"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "oras-project"; + repo = "oras-py"; + rev = "refs/tags/${version}"; + hash = "sha256-t3098ZeAkwLhinyrFwmi7KKrFgZZKPN6qvp3REQNwG8="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + jsonschema + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "oras" + ]; + + disabledTests = [ + # Test requires network access + "test_get_many_tags" + ]; + + meta = with lib; { + description = "ORAS Python SDK"; + homepage = "https://github.com/oras-project/oras-py"; + changelog = "https://github.com/oras-project/oras-py/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix index f2688d46b2e3b..fb7c4395e56c7 100644 --- a/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/pkgs/development/python-modules/orderedmultidict/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "orderedmultidict"; version = "1.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix index 4141d053ad456..1ab63309c3913 100644 --- a/pkgs/development/python-modules/orderedset/default.nix +++ b/pkgs/development/python-modules/orderedset/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "orderedset"; version = "2.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/orvibo/default.nix b/pkgs/development/python-modules/orvibo/default.nix index 8de932a82f0e4..031866b688b9c 100644 --- a/pkgs/development/python-modules/orvibo/default.nix +++ b/pkgs/development/python-modules/orvibo/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "orvibo"; version = "1.1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "happyleavesaoc"; diff --git a/pkgs/development/python-modules/os-service-types/default.nix b/pkgs/development/python-modules/os-service-types/default.nix index de138c5a16027..7ec653e4fcad5 100644 --- a/pkgs/development/python-modules/os-service-types/default.nix +++ b/pkgs/development/python-modules/os-service-types/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "os-service-types"; version = "1.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 2add2f7e98d1f..1bde4e8eedb5d 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "osc-lib"; version = "2.8.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "openstack"; diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 737ea42084729..4055fc176885f 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "osc"; version = "1.3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "openSUSE"; diff --git a/pkgs/development/python-modules/oscpy/default.nix b/pkgs/development/python-modules/oscpy/default.nix index 894e884a4de2f..a783889e38ab7 100644 --- a/pkgs/development/python-modules/oscpy/default.nix +++ b/pkgs/development/python-modules/oscpy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "oscpy"; version = "0.6.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "kivy"; diff --git a/pkgs/development/python-modules/oset/default.nix b/pkgs/development/python-modules/oset/default.nix index 5d8a5f741bdc8..7cc3238060293 100644 --- a/pkgs/development/python-modules/oset/default.nix +++ b/pkgs/development/python-modules/oset/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "oset"; version = "0.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index e6b7d7b05f3ac..795ab46d8d900 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { pname = "oslo-concurrency"; version = "5.2.0"; + format = "setuptools"; src = fetchPypi { pname = "oslo.concurrency"; diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 50a544c1d7fb6..11384932218d6 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "oslo-config"; version = "9.2.0"; + format = "setuptools"; src = fetchPypi { pname = "oslo.config"; diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index a8052d4211c08..351c213faffd8 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "oslo-db"; version = "14.0.0"; + format = "setuptools"; src = fetchPypi { pname = "oslo.db"; diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix index e4d0f9f75d932..6c7f2065a8368 100644 --- a/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/pkgs/development/python-modules/oslo-i18n/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "oslo-i18n"; version = "6.1.0"; + format = "setuptools"; src = fetchPypi { pname = "oslo.i18n"; diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix index 1e89c69f7e2f2..acfdcbfecb0ab 100644 --- a/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "oslo-serialization"; version = "5.2.0"; + format = "setuptools"; src = fetchPypi { pname = "oslo.serialization"; diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 0d55f870e5fa4..688402199bfc9 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { pname = "oslo-utils"; version = "6.2.1"; + format = "setuptools"; src = fetchPypi { pname = "oslo.utils"; diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix index 7545d9c010061..2c8a557e6ef72 100644 --- a/pkgs/development/python-modules/osmpythontools/default.nix +++ b/pkgs/development/python-modules/osmpythontools/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "osmpythontools"; version = "0.3.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "mocnik-science"; diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index 9b30afeb49277..17b3ad2c8b05b 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ossfs"; - version = "2023.8.0"; + version = "2023.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-v6QZgv1QwBrQpCwP/1z6704UNvQyoCrpQGkhTmncbjQ="; + hash = "sha256-N1NkpI8inGJCf0xuc+FFmVX85CS7vqzoNddxZ9kqEk0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ots-python/default.nix b/pkgs/development/python-modules/ots-python/default.nix index 32863e2e4bd31..f6a86a564136b 100644 --- a/pkgs/development/python-modules/ots-python/default.nix +++ b/pkgs/development/python-modules/ots-python/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "ots-python"; version = "9.1.0"; + format = "setuptools"; src = fetchPypi { pname = "opentype-sanitizer"; diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index 66597cb0671e0..f081bbed2bcb6 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "outcome"; version = "1.2.0"; + format = "setuptools"; disabled = pythonOlder "3.4"; src = fetchPypi { diff --git a/pkgs/development/python-modules/ovmfvartool/default.nix b/pkgs/development/python-modules/ovmfvartool/default.nix index 12f65fe86cf39..8c5f435656177 100644 --- a/pkgs/development/python-modules/ovmfvartool/default.nix +++ b/pkgs/development/python-modules/ovmfvartool/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ovmfvartool"; version = "unstable-2022-09-04"; + format = "setuptools"; src = fetchFromGitHub { owner = "hlandau"; diff --git a/pkgs/development/python-modules/pa-ringbuffer/default.nix b/pkgs/development/python-modules/pa-ringbuffer/default.nix index 066c4a47ae4e1..a18eda1f92bf6 100644 --- a/pkgs/development/python-modules/pa-ringbuffer/default.nix +++ b/pkgs/development/python-modules/pa-ringbuffer/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pa-ringbuffer"; version = "0.1.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "spatialaudio"; diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index dcc49b99af29d..f51d7e4518cc9 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.11.2"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Afv3SkHvhc9BPx7eUpoUEfZYvaZu0i1F0nKArZzrpHE="; + hash = "sha256-hPgFP0uFKUuYs7eHFUdYR/tI9FJewwLQbcNbJqmzB4o="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/packbits/default.nix b/pkgs/development/python-modules/packbits/default.nix index 561903e8f5fdb..8e9b655c0a3b1 100644 --- a/pkgs/development/python-modules/packbits/default.nix +++ b/pkgs/development/python-modules/packbits/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "packbits"; version = "0.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pad4pi/default.nix b/pkgs/development/python-modules/pad4pi/default.nix index 356a599b0d46b..bc6c0d27aff43 100644 --- a/pkgs/development/python-modules/pad4pi/default.nix +++ b/pkgs/development/python-modules/pad4pi/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pad4pi"; version = "1.1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pagelabels/default.nix b/pkgs/development/python-modules/pagelabels/default.nix index c17f0ad60dd52..44b246869aa5f 100644 --- a/pkgs/development/python-modules/pagelabels/default.nix +++ b/pkgs/development/python-modules/pagelabels/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pagelabels"; version = "1.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 2712aded53681..8c0e54d18d608 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "paho-mqtt"; version = "1.6.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "eclipse"; diff --git a/pkgs/development/python-modules/palace/default.nix b/pkgs/development/python-modules/palace/default.nix index 60d73bca09f64..09aa409a42c12 100644 --- a/pkgs/development/python-modules/palace/default.nix +++ b/pkgs/development/python-modules/palace/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "palace"; version = "0.2.5"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromSourcehut { diff --git a/pkgs/development/python-modules/pallets-sphinx-themes/default.nix b/pkgs/development/python-modules/pallets-sphinx-themes/default.nix index 460d99575b9e9..9020e458bc085 100644 --- a/pkgs/development/python-modules/pallets-sphinx-themes/default.nix +++ b/pkgs/development/python-modules/pallets-sphinx-themes/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pallets-sphinx-themes"; version = "2.1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "pallets"; diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix index eb1ebff48137e..389cf10a772e0 100644 --- a/pkgs/development/python-modules/pamela/default.nix +++ b/pkgs/development/python-modules/pamela/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pamela"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix index d792c439b5811..e5222cf7ef83d 100644 --- a/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/pkgs/development/python-modules/pandas-datareader/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pandas-datareader"; version = "0.10.0"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/pandoc-attributes/default.nix b/pkgs/development/python-modules/pandoc-attributes/default.nix index d4da8e3cac622..8c97744e9a118 100644 --- a/pkgs/development/python-modules/pandoc-attributes/default.nix +++ b/pkgs/development/python-modules/pandoc-attributes/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pandoc-attributes"; version = "0.1.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix index 9dac79bea7439..8ddaa9d78a091 100644 --- a/pkgs/development/python-modules/pandocfilters/default.nix +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "1.5.0"; + format = "setuptools"; pname = "pandocfilters"; src = fetchPypi { diff --git a/pkgs/development/python-modules/papis-python-rofi/default.nix b/pkgs/development/python-modules/papis-python-rofi/default.nix index 3d3ce9a002b68..53bf62c5db155 100644 --- a/pkgs/development/python-modules/papis-python-rofi/default.nix +++ b/pkgs/development/python-modules/papis-python-rofi/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "papis-python-rofi"; version = "1.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/para/default.nix b/pkgs/development/python-modules/para/default.nix index e1f3f828120f6..765672d7a3626 100644 --- a/pkgs/development/python-modules/para/default.nix +++ b/pkgs/development/python-modules/para/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "para"; version = "0.0.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index 79a073af9955c..b6ee36c3dce2f 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "parametrize-from-file"; - version = "0.18.0"; + version = "0.19.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "parametrize_from_file"; - hash = "sha256-mYE8J7XWlvCS2H3kt0bB8dyPHFDqmW8NiH9UCrNccAU="; + hash = "sha256-FPTO2hYZT7bsQyPNcjBEk8SZKp51o/eMV5/U58W5SPI="; }; # patch out coveralls since it doesn't provide us value diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 1f2ddb3d8cfd7..bed92d7a3565c 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "paramz"; version = "0.9.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/parquet/default.nix b/pkgs/development/python-modules/parquet/default.nix index 89503526654e7..0e6cd2222f73b 100644 --- a/pkgs/development/python-modules/parquet/default.nix +++ b/pkgs/development/python-modules/parquet/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "parquet"; version = "1.3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "jcrobak"; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index e7ebfb5c63e40..45af3a0e7fb28 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "parse-type"; version = "0.6.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "jenisys"; diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index fab03550fd1f8..ccb5bbcfda18c 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "parsedatetime"; version = "2.6"; + format = "setuptools"; disabled = isPy27; # no longer compatible with icu package src = fetchPypi { diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index fe31d7d746713..7d76ef5d80aa3 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "parso"; version = "0.8.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 52e76646875e3..db823218a61b8 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "partd"; version = "1.4.0"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index 69eabb7cf57f3..9a271ccb55df9 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "particle"; - version = "0.23.0"; + version = "0.23.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-2BD4/CfeuOf9ZBdAF9lgfVBSIknAlzoACOWA+T2xF1A="; + hash = "sha256-7uKLDoRr/qTf1w6exf/jJEYT2wi2tqm3c/VaQxB1L6s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pastel/default.nix b/pkgs/development/python-modules/pastel/default.nix index ed91aaf400772..59fd518eca620 100644 --- a/pkgs/development/python-modules/pastel/default.nix +++ b/pkgs/development/python-modules/pastel/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pastel"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix index 126155722f4f6..d91ca4be74dbd 100644 --- a/pkgs/development/python-modules/patch-ng/default.nix +++ b/pkgs/development/python-modules/patch-ng/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "1.17.4"; # note: `conan` package may require a hardcoded one + format = "setuptools"; pname = "patch-ng"; src = fetchPypi { diff --git a/pkgs/development/python-modules/patch/default.nix b/pkgs/development/python-modules/patch/default.nix index ed11b3a4b52f6..d307399707c1b 100644 --- a/pkgs/development/python-modules/patch/default.nix +++ b/pkgs/development/python-modules/patch/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "1.16"; + format = "setuptools"; pname = "patch"; src = fetchzip { diff --git a/pkgs/development/python-modules/path-and-address/default.nix b/pkgs/development/python-modules/path-and-address/default.nix index a01c798615cf4..4a72431c7521f 100644 --- a/pkgs/development/python-modules/path-and-address/default.nix +++ b/pkgs/development/python-modules/path-and-address/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "2.0.1"; + format = "setuptools"; pname = "path-and-address"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pathlib/default.nix b/pkgs/development/python-modules/pathlib/default.nix index 6bf24b8f15ef5..1e34b92a4314d 100644 --- a/pkgs/development/python-modules/pathlib/default.nix +++ b/pkgs/development/python-modules/pathlib/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pathlib"; version = "1.0.1"; + format = "setuptools"; disabled = pythonAtLeast "3.4"; # Was added to std library in Python 3.4 src = fetchPypi { diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index b844a1528b5c7..15238a8589908 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "pathlib2"; version = "2.3.7.post1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pathtools/default.nix b/pkgs/development/python-modules/pathtools/default.nix index 86c2aeb88dc06..754669eb42fe8 100644 --- a/pkgs/development/python-modules/pathtools/default.nix +++ b/pkgs/development/python-modules/pathtools/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pathtools"; version = "0.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index 9d31fa9e93eed..d36400970391a 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -1,7 +1,7 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , p7zip , cabextract @@ -60,6 +60,8 @@ buildPythonPackage rec { "test_unzip_file" "test_zip" "test_zip_file" + ] ++ lib.optionals stdenv.isDarwin [ + "test_ar" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/patrowl4py/default.nix b/pkgs/development/python-modules/patrowl4py/default.nix index 22f2f1ab145d9..e756dc838019c 100644 --- a/pkgs/development/python-modules/patrowl4py/default.nix +++ b/pkgs/development/python-modules/patrowl4py/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { pname = "patrowl4py"; version = "1.1.9"; + format = "setuptools"; src = fetchFromGitHub { owner = "Patrowl"; diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix index f9020c0c1678f..a1ed788dda12d 100644 --- a/pkgs/development/python-modules/patsy/default.nix +++ b/pkgs/development/python-modules/patsy/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "patsy"; version = "0.5.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pbkdf2/default.nix b/pkgs/development/python-modules/pbkdf2/default.nix index 8f489ca24b9c2..9068b6887b47a 100644 --- a/pkgs/development/python-modules/pbkdf2/default.nix +++ b/pkgs/development/python-modules/pbkdf2/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pbkdf2"; version = "1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 13b61c89232eb..bda6c9080f0c5 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pbr"; version = "5.11.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 61072507e2943..11b442218809d 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "pc-ble-driver-py"; version = "0.17.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix index 0985d32afb55a..e57934f4daf97 100644 --- a/pkgs/development/python-modules/pcpp/default.nix +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pcpp"; version = "1.30"; + format = "setuptools"; src = fetchFromGitHub { owner = "ned14"; diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/pkgs/development/python-modules/pdfkit/default.nix index 73d09c755ac54..e055ed9718420 100644 --- a/pkgs/development/python-modules/pdfkit/default.nix +++ b/pkgs/development/python-modules/pdfkit/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pdfkit"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pdfminer-six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix index cd378941b151f..bc182442af4f1 100644 --- a/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -1,19 +1,22 @@ { lib , buildPythonPackage , fetchFromGitHub +, importlib-metadata , isPy3k , cryptography , charset-normalizer , pythonOlder , typing-extensions , pytestCheckHook +, setuptools +, substituteAll , ocrmypdf }: buildPythonPackage rec { pname = "pdfminer-six"; - version = "20221105"; - format = "setuptools"; + version = "20231228"; + pyproject = true; disabled = !isPy3k; @@ -21,13 +24,27 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - hash = "sha256-OyEeQBuYfj4iEcRt2/daSaUfTOjCVSCyHW2qffal+Bk="; + hash = "sha256-LXPECQQojD3IY9zRkrDBufy4A8XUuYiRpryqUx/I3qo="; }; + patches = [ + (substituteAll { + src = ./disable-setuptools-git-versioning.patch; + inherit version; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ charset-normalizer cryptography - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + typing-extensions + ]; postInstall = '' for file in $out/bin/*.py; do @@ -35,12 +52,6 @@ buildPythonPackage rec { done ''; - postPatch = '' - # Version is not stored in repo, gets added by a GitHub action after tag is created - # https://github.com/pdfminer/pdfminer.six/pull/727 - substituteInPlace pdfminer/__init__.py --replace "__VERSION__" ${version} - ''; - pythonImportsCheck = [ "pdfminer" "pdfminer.high_level" diff --git a/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch b/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch new file mode 100644 index 0000000000000..2dec0e147b9f3 --- /dev/null +++ b/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch @@ -0,0 +1,14 @@ +--- a/setup.py ++++ b/setup.py +@@ -7,10 +7,7 @@ + + setup( + name="pdfminer.six", +- setuptools_git_versioning={ +- "enabled": True, +- }, +- setup_requires=["setuptools-git-versioning<2"], ++ version="@version@", + packages=["pdfminer"], + package_data={"pdfminer": ["cmap/*.pickle.gz", "py.typed"]}, + install_requires=[ diff --git a/pkgs/development/python-modules/pdfrw/default.nix b/pkgs/development/python-modules/pdfrw/default.nix index 5cc619ef6a47d..8eccbfbb7f1f7 100644 --- a/pkgs/development/python-modules/pdfrw/default.nix +++ b/pkgs/development/python-modules/pdfrw/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pdfrw"; version = "0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index efb26fa4955dc..9d3971ce323df 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pdftotext"; version = "2.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index 1ee1cb4804df8..8f1049cc18e90 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pdfx"; version = "1.4.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "metachris"; diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index 1c3e5ef08af60..72e2046105a97 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "pdoc3"; version = "0.10.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pdunehd/default.nix b/pkgs/development/python-modules/pdunehd/default.nix index e3ae53ecb85ec..6d9248b2db101 100644 --- a/pkgs/development/python-modules/pdunehd/default.nix +++ b/pkgs/development/python-modules/pdunehd/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pdunehd"; version = "1.3.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index d9c344e6e72c1..a1aa0cbfce1c2 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.5.20"; + version = "19.5.23"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-atrrPU9aQvpbI3JYdsnGkdRpq3SRuBJpezF1qc1USB0="; + hash = "sha256-lLxwc9maivUJAF2Day16B86ELVqsoVJsY9j4rS5FbPM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index bab37b5b7d793..1345242c20510 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.6.2"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hqXHU6PHn2jkWBRRCRuGIGjSCUc6jfUaHgrn3glTwlE="; + hash = "sha256-sdv9rMj5Qh2/QtBVSxHMAP/Tk+ZyrHtNfX/4q8/Qw3A="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 8fedf5c694b77..a2aac534366e8 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { pname = "pelican"; version = "4.8.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pep8/default.nix b/pkgs/development/python-modules/pep8/default.nix index cc0e546b957c8..74bf420452b9a 100644 --- a/pkgs/development/python-modules/pep8/default.nix +++ b/pkgs/development/python-modules/pep8/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pep8"; version = "1.7.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/peppercorn/default.nix b/pkgs/development/python-modules/peppercorn/default.nix index 310cc565b21fc..086c5edcee329 100644 --- a/pkgs/development/python-modules/peppercorn/default.nix +++ b/pkgs/development/python-modules/peppercorn/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "peppercorn"; version = "0.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix index 58e7aff5601d3..a1061d8310d4c 100644 --- a/pkgs/development/python-modules/percol/default.nix +++ b/pkgs/development/python-modules/percol/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "percol"; version = "unstable-2019-07-24"; + format = "setuptools"; src = fetchFromGitHub { owner = "mooz"; diff --git a/pkgs/development/python-modules/permissionedforms/default.nix b/pkgs/development/python-modules/permissionedforms/default.nix index db4f02bef9158..c317826391ddb 100644 --- a/pkgs/development/python-modules/permissionedforms/default.nix +++ b/pkgs/development/python-modules/permissionedforms/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "permissionedforms"; version = "0.1"; + format = "setuptools"; src = fetchFromGitHub { repo = "django-permissionedforms"; diff --git a/pkgs/development/python-modules/persist-queue/default.nix b/pkgs/development/python-modules/persist-queue/default.nix index 6d29659f8ffd1..9682ac59946b1 100644 --- a/pkgs/development/python-modules/persist-queue/default.nix +++ b/pkgs/development/python-modules/persist-queue/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "persist-queue"; version = "0.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/persisting-theory/default.nix b/pkgs/development/python-modules/persisting-theory/default.nix index 0555e53e47401..0890f86fc160c 100644 --- a/pkgs/development/python-modules/persisting-theory/default.nix +++ b/pkgs/development/python-modules/persisting-theory/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "persisting-theory"; version = "1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pexif/default.nix b/pkgs/development/python-modules/pexif/default.nix index a31d80eed0521..fb61b376021ad 100644 --- a/pkgs/development/python-modules/pexif/default.nix +++ b/pkgs/development/python-modules/pexif/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pexif"; version = "0.15"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index 40d61aec5c52d..ebe63b4a4170b 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -7,6 +7,7 @@ buildPythonPackage (rec { pname = "pexpect"; version = "4.8.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix index 8f7f1e96effed..aff6d3d2149b5 100644 --- a/pkgs/development/python-modules/pgcli/default.nix +++ b/pkgs/development/python-modules/pgcli/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { pname = "pgcli"; version = "4.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 4edaa22bb16d9..764162a13c582 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "5.5"; + version = "5.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yz6Q+Vt7ZuT9NaxuQQA+BH7U6Efaim7No6GJmnOQo1o="; + hash = "sha256-5JYygEthxFvjjbKpzw2CJNAvtrnCqdnR0sbJHhNRYFw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pgpdump/default.nix b/pkgs/development/python-modules/pgpdump/default.nix index e952ced742c6e..d3f87c9e19476 100644 --- a/pkgs/development/python-modules/pgpdump/default.nix +++ b/pkgs/development/python-modules/pgpdump/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pgpdump"; version = "1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix index 4660461e91c19..510d5e66bdbb1 100644 --- a/pkgs/development/python-modules/pgsanity/default.nix +++ b/pkgs/development/python-modules/pgsanity/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pgsanity"; version = "0.2.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 1a86bce729699..5c4e1bf84a2ac 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pgspecial"; version = "2.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix index fa4c43c59c901..e943afa3caeff 100644 --- a/pkgs/development/python-modules/phe/default.nix +++ b/pkgs/development/python-modules/phe/default.nix @@ -3,6 +3,7 @@ let pname = "phe"; version = "1.5.0"; + format = "setuptools"; in buildPythonPackage { diff --git a/pkgs/development/python-modules/phone-modem/default.nix b/pkgs/development/python-modules/phone-modem/default.nix index 635d1ce2d850a..8ec54bd84012f 100644 --- a/pkgs/development/python-modules/phone-modem/default.nix +++ b/pkgs/development/python-modules/phone-modem/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "phone-modem"; version = "0.1.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/phpserialize/default.nix b/pkgs/development/python-modules/phpserialize/default.nix index 9323fe6a264fd..5c5d9929100d5 100644 --- a/pkgs/development/python-modules/phpserialize/default.nix +++ b/pkgs/development/python-modules/phpserialize/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "phpserialize"; version = "1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index b43c5fd4b446a..20bbc0066d23f 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "piccata"; version = "2.0.2"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index 3b68065a23b2a..ece887f143285 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,12 +2,13 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.18.0"; + version = "0.19.0"; + format = "setuptools"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-tEgYrQaVcWZadmhV6JRuXnk8m9oJLNSfb0hA309bX1U="; + hash = "sha256-pGMOc/GSh3q2HW1mfW+XFgpOyiXd3cdh56cvXatseuc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix index 381f03bdce5cc..d6be608aaa2bb 100644 --- a/pkgs/development/python-modules/pickleshare/default.nix +++ b/pkgs/development/python-modules/pickleshare/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "0.7.5"; + format = "setuptools"; pname = "pickleshare"; src = fetchPypi { diff --git a/pkgs/development/python-modules/picos/default.nix b/pkgs/development/python-modules/picos/default.nix index a5af53c1b8ccb..5bc5e35c6332e 100644 --- a/pkgs/development/python-modules/picos/default.nix +++ b/pkgs/development/python-modules/picos/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "picos"; version = "2.0"; + format = "setuptools"; src = fetchFromGitLab { owner = "picos-api"; diff --git a/pkgs/development/python-modules/picosvg/default.nix b/pkgs/development/python-modules/picosvg/default.nix index f543b61b2bc9f..87f3eccfdb0ed 100644 --- a/pkgs/development/python-modules/picosvg/default.nix +++ b/pkgs/development/python-modules/picosvg/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "picosvg"; version = "0.22.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "googlefonts"; diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index f4ce57b3a20d1..de7856accabc5 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pid"; version = "3.0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index 691733bfb6dfb..0825380a925ba 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "0.10.0"; + format = "setuptools"; pname = "piep"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix index 329989232fa42..f2d7dbe2b11ae 100644 --- a/pkgs/development/python-modules/piexif/default.nix +++ b/pkgs/development/python-modules/piexif/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "piexif"; version = "1.1.3"; + format = "setuptools"; # patch does not apply to PyPI sdist due to different line endings src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pijuice/default.nix b/pkgs/development/python-modules/pijuice/default.nix index 59f898f7906f5..a42c7ad8c1ede 100644 --- a/pkgs/development/python-modules/pijuice/default.nix +++ b/pkgs/development/python-modules/pijuice/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pijuice"; version = "1.7"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix index 051fdef8fe7d3..0374a5c16d0d9 100644 --- a/pkgs/development/python-modules/pika-pool/default.nix +++ b/pkgs/development/python-modules/pika-pool/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "pika-pool"; version = "0.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/pkgs/development/python-modules/pillowfight/default.nix index b0a8d6d913c68..097fb810ad88c 100644 --- a/pkgs/development/python-modules/pillowfight/default.nix +++ b/pkgs/development/python-modules/pillowfight/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pillowfight"; version = "0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pinboard/default.nix b/pkgs/development/python-modules/pinboard/default.nix index 8f177dab8bc36..83fe4a330c3d9 100644 --- a/pkgs/development/python-modules/pinboard/default.nix +++ b/pkgs/development/python-modules/pinboard/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pinboard"; version = "2.1.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "lionheart"; diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index 62fb96fb31aa8..91ca5ca0e75fa 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pinecone-client"; version = "2.2.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 9d0b7f65f6362..ff5a1fdeafa7d 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pivy"; version = "0.6.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "coin3d"; diff --git a/pkgs/development/python-modules/pixcat/default.nix b/pkgs/development/python-modules/pixcat/default.nix index 90fdae5dcf03e..b5629cebb937e 100644 --- a/pkgs/development/python-modules/pixcat/default.nix +++ b/pkgs/development/python-modules/pixcat/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pixcat"; version = "0.1.4"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix new file mode 100644 index 0000000000000..d541cd00dc5ab --- /dev/null +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, nix-update-script +, hatch-vcs +, hatchling +, bdffont +, brotli +, fonttools +, pypng +}: + +buildPythonPackage rec { + pname = "pixel-font-builder"; + version = "0.0.10"; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + pname = "pixel_font_builder"; + inherit version; + hash = "sha256-evLsNRSC9sPZfhNc8tYbZ/bIrBxSbLuiGRD3ld7Jkbo="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + nativeCheckInputs = [ + pytestCheckHook + pypng + ]; + + propagatedBuildInputs = [ + bdffont + brotli + fonttools + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/TakWolf/pixel-font-builder"; + description = "A library that helps create pixel style fonts"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/development/python-modules/pkce/default.nix b/pkgs/development/python-modules/pkce/default.nix index ecd128744d072..e302e1c978ca0 100644 --- a/pkgs/development/python-modules/pkce/default.nix +++ b/pkgs/development/python-modules/pkce/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pkce"; version = "1.0.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "RomeoDespres"; diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index 2c1e92c75d842..8cd0a5ef1f046 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/karpierz/pkg_about/"; changelog = "https://github.com/karpierz/pkg_about/blob/${version}/CHANGES.rst"; license = licenses.zlib; - maintainers = [ teams.ororatech ]; + maintainers = teams.ororatech.members; }; } diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix index 08eee37498bb2..0c841adf406a3 100644 --- a/pkgs/development/python-modules/pkginfo2/default.nix +++ b/pkgs/development/python-modules/pkginfo2/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pkginfo2"; version = "30.0.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pkuseg/default.nix b/pkgs/development/python-modules/pkuseg/default.nix index 474d66dafc63b..1d25692cb5b20 100644 --- a/pkgs/development/python-modules/pkuseg/default.nix +++ b/pkgs/development/python-modules/pkuseg/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pkuseg"; version = "0.0.25"; + format = "setuptools"; disabled = !isPy3k || pythonAtLeast "3.9"; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 1fcff9e478036..109b72039b1dc 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "18.0.0"; + version = "18.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1OV/oybxZXF2kjLoSA2KyQaTR91jqEWstpELSlUIg2o="; + hash = "sha256-0u1gj8ZpUL/eehsPNjq7JoDdVDDhlS9SGDw5xizxRlE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plantuml/default.nix b/pkgs/development/python-modules/plantuml/default.nix index b9d7c15f8346f..1053403dcf71d 100644 --- a/pkgs/development/python-modules/plantuml/default.nix +++ b/pkgs/development/python-modules/plantuml/default.nix @@ -9,6 +9,7 @@ buildPythonPackage { pname = "plantuml"; version = "0.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "dougn"; diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 9e6263351daaa..722d06a103778 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "plaster-pastedeploy"; version = "1.0.1"; + format = "setuptools"; src = fetchPypi { pname = "plaster_pastedeploy"; diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index f3ba127b0a926..b0ce5c418df45 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "plaster"; version = "1.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/playsound/default.nix b/pkgs/development/python-modules/playsound/default.nix index 799bf70457bf9..0eb7e56c7b2be 100644 --- a/pkgs/development/python-modules/playsound/default.nix +++ b/pkgs/development/python-modules/playsound/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "playsound"; version = "1.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "TaylorSMarks"; diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 47ce92cc68f6d..d5579de5d25b2 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.6"; + version = "4.15.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-VU1HVAxAOraTd4VQIqG/MLkw77xciCICIh1zbzGn/dQ="; + hash = "sha256-jI/yQuyPfZNZf6yG35rdIYmnJmRuNYUNpEJBNzDMnrY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plexauth/default.nix b/pkgs/development/python-modules/plexauth/default.nix index c7c9c2ba5dbd1..fd7f11e14d27e 100644 --- a/pkgs/development/python-modules/plexauth/default.nix +++ b/pkgs/development/python-modules/plexauth/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "plexauth"; version = "0.0.6"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 4698a84cefb15..fc2c8b49069d3 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "plotly"; version = "5.16.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index f90b4b415300b..be228d2318655 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "1.0.1"; + format = "setuptools"; pname = "pluginbase"; src = fetchPypi { diff --git a/pkgs/development/python-modules/plugnplay/default.nix b/pkgs/development/python-modules/plugnplay/default.nix index a0eda76e4ddf6..1b8449ffe7cec 100644 --- a/pkgs/development/python-modules/plugnplay/default.nix +++ b/pkgs/development/python-modules/plugnplay/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "plugnplay"; version = "0.5.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 14e77c816b888..7eb310c93008f 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.35.1"; + version = "0.35.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-eHJQXLiuWmJo/Eo4B8gEo44rwpPA7ASjxKSmdu6Tv9M="; + hash = "sha256-5clHLE8QavccxAhBEa6W2yOtWYmQ5oa9ZcctEIKXru4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ply/default.nix b/pkgs/development/python-modules/ply/default.nix index e177ce709171e..fca97226d6775 100644 --- a/pkgs/development/python-modules/ply/default.nix +++ b/pkgs/development/python-modules/ply/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "ply"; version = "3.11"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix index 5b8bc870b838d..c6af90310c7b5 100644 --- a/pkgs/development/python-modules/plyer/default.nix +++ b/pkgs/development/python-modules/plyer/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "plyer"; version = "2.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "kivy"; diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 20495ba0dd012..050d6ef56f6bc 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "plyfile"; version = "1.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index 2d412c12d16ec..d8293f85a9bcf 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "plyvel"; version = "1.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pmsensor/default.nix b/pkgs/development/python-modules/pmsensor/default.nix index 1d64852f281e3..48156a3eae95c 100644 --- a/pkgs/development/python-modules/pmsensor/default.nix +++ b/pkgs/development/python-modules/pmsensor/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pmsensor"; version = "0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pmw/default.nix b/pkgs/development/python-modules/pmw/default.nix index de33eecf0886c..ab9f3fb60b286 100644 --- a/pkgs/development/python-modules/pmw/default.nix +++ b/pkgs/development/python-modules/pmw/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pmw"; version = "2.1.1"; + format = "setuptools"; src = fetchPypi { pname = "Pmw"; diff --git a/pkgs/development/python-modules/pnglatex/default.nix b/pkgs/development/python-modules/pnglatex/default.nix index 579eb523d10ce..d953678942bfb 100644 --- a/pkgs/development/python-modules/pnglatex/default.nix +++ b/pkgs/development/python-modules/pnglatex/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pnglatex"; version = "1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pocket/default.nix b/pkgs/development/python-modules/pocket/default.nix index e5a2d464bde8f..799f5ef261fa5 100644 --- a/pkgs/development/python-modules/pocket/default.nix +++ b/pkgs/development/python-modules/pocket/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pocket"; version = "0.3.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix index 48504c8a3ee26..ba4778123ae9e 100644 --- a/pkgs/development/python-modules/podcats/default.nix +++ b/pkgs/development/python-modules/podcats/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "podcats"; version = "0.5.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "jakubroztocil"; diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index b3ba05351ea2e..a76e6559b69ef 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "podman"; - version = "4.8.0"; + version = "4.8.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "containers"; repo = "podman-py"; rev = "refs/tags/v${version}"; - hash = "sha256-lw8ZW1Uh6pbL5Z15NBBgKFm1143rEyFdecBHsSwBYVo="; + hash = "sha256-KecYH3fUaWNXx6WQ0NFmEm8o4OkOyYfSHIAh2p+Am1k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/poetry-semver/default.nix b/pkgs/development/python-modules/poetry-semver/default.nix index 8c0c11f99efdd..422dbd04f881e 100644 --- a/pkgs/development/python-modules/poetry-semver/default.nix +++ b/pkgs/development/python-modules/poetry-semver/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "poetry-semver"; version = "0.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/polarizationsolver/default.nix b/pkgs/development/python-modules/polarizationsolver/default.nix index d7385bd9f6420..aebc74ede9ced 100644 --- a/pkgs/development/python-modules/polarizationsolver/default.nix +++ b/pkgs/development/python-modules/polarizationsolver/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "polarizationsolver"; version = "unstable-2021-11-02"; + format = "setuptools"; src = fetchFromGitLab { owner = "reinholdt"; diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index 991a3a3684cd1..d967ca27c8ff1 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -13,7 +13,7 @@ }: let pname = "polars"; - version = "0.19.12"; + version = "0.20.0"; rootSource = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; @@ -28,8 +28,10 @@ let in buildPythonPackage { inherit pname version; - format = "pyproject"; - disabled = pythonOlder "3.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; + src = rootSource; # Cargo.lock file is sometimes behind actual release which throws an error, @@ -46,12 +48,15 @@ buildPythonPackage { "jsonpath_lib-0.3.0" = "sha256-NKszYpDGG8VxfZSMbsTlzcMGFHBOUeFojNw4P2wM3qk="; }; }; + cargoRoot = "py-polars"; # Revisit this whenever package or Rust is upgraded RUSTC_BOOTSTRAP = 1; - propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ + typing-extensions + ]; dontUseCmakeConfigure = true; @@ -71,7 +76,6 @@ buildPythonPackage { darwin.apple_sdk.frameworks.Security ]; - pythonImportsCheck = [ "polars" ]; # nativeCheckInputs = [ # pytestCheckHook # fixtures @@ -82,9 +86,14 @@ buildPythonPackage { # pydot # ]; + pythonImportsCheck = [ + "polars" + ]; + meta = with lib; { - description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js "; + description = "Fast multi-threaded DataFrame library"; homepage = "https://github.com/pola-rs/polars"; + changelog = "https://github.com/pola-rs/polars/releases/tag/py-${version}"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/polib/default.nix b/pkgs/development/python-modules/polib/default.nix index c96b90b6c5211..73276d9b65993 100644 --- a/pkgs/development/python-modules/polib/default.nix +++ b/pkgs/development/python-modules/polib/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "polib"; version = "1.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index 082fe4ec1965b..e324813c6a587 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.5.1.20230817"; + version = "1.5.1.20231109"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eSCJYZWvFjIwY18aXO4JWPVgA++MQh+AXsgfE0+ApXw="; + hash = "sha256-dOVtQQVgkVwsUTLjYbATDkv/4xKi9FIw6sUNfAlLxAo="; }; # Tests are not shipped and there are no GitHub tags diff --git a/pkgs/development/python-modules/pomegranate/disable-failed-on-nextworkx-2.6.patch b/pkgs/development/python-modules/pomegranate/disable-failed-on-nextworkx-2.6.patch deleted file mode 100644 index 484ca4f9cbc8f..0000000000000 --- a/pkgs/development/python-modules/pomegranate/disable-failed-on-nextworkx-2.6.patch +++ /dev/null @@ -1,26 +0,0 @@ -Test started failing after upgrading networkx 2.5.1 -> 2.6.2: - https://github.com/jmschrei/pomegranate/issues/939 - -Failures look benigh. ---- a/tests/test_bayesian_network.py -+++ b/tests/test_bayesian_network.py -@@ -1057,7 +1057,8 @@ def test_exact_structure_learning_exclude_edges(): - assert_not_equal(model.structure[-2], (d-1,)) - assert_equal(model.structure[-2], (1,)) - --def test_exact_dp_structure_learning_exclude_edges(): -+# disabled for https://github.com/jmschrei/pomegranate/issues/939 -+def disabled_exact_dp_structure_learning_exclude_edges(): - for X in datasets: - X = X.copy() - X[:,1] = X[:,-1] -@@ -1139,7 +1140,8 @@ def test_constrained_parents_structure_learning_exclude_edges(): - assert_equal(model.structure[7], (2,)) - assert_equal(model.structure[4], (0,)) - --def test_constrained_slap_structure_learning_exclude_edges(): -+# disabled for https://github.com/jmschrei/pomegranate/issues/939 -+def disabled_constrained_slap_structure_learning_exclude_edges(): - for X in datasets: - X = X.copy() - X[:,1] = X[:,-1] diff --git a/pkgs/development/python-modules/ponywhoosh/default.nix b/pkgs/development/python-modules/ponywhoosh/default.nix index 589be17b0163e..2a905326cbc22 100644 --- a/pkgs/development/python-modules/ponywhoosh/default.nix +++ b/pkgs/development/python-modules/ponywhoosh/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ponywhoosh"; version = "1.7.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index 79d3eebf93e5c..1a96522844d4e 100644 --- a/pkgs/development/python-modules/pook/default.nix +++ b/pkgs/development/python-modules/pook/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pook"; version = "1.1.1"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/poolsense/default.nix b/pkgs/development/python-modules/poolsense/default.nix index 53d1422997070..85c8a8ec518f5 100644 --- a/pkgs/development/python-modules/poolsense/default.nix +++ b/pkgs/development/python-modules/poolsense/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "poolsense"; version = "0.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 0f20800ece0d4..a8af71d51a64a 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.2"; + version = "3.1.0"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-QASqjphAWtYuIyhbFTYwv1gD+rXvrmp5W0Te4MFn1AA="; + hash = "sha256-+FxRC1NxDaZHjMQFTyRymvHp6A3VE76kANgpVtq2WEs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/power/default.nix b/pkgs/development/python-modules/power/default.nix index 18784f88ba15b..7d82d8e8acb63 100644 --- a/pkgs/development/python-modules/power/default.nix +++ b/pkgs/development/python-modules/power/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "power"; version = "1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/powerline-mem-segment/default.nix b/pkgs/development/python-modules/powerline-mem-segment/default.nix index 7bc38f2227aee..64eae31c0a250 100644 --- a/pkgs/development/python-modules/powerline-mem-segment/default.nix +++ b/pkgs/development/python-modules/powerline-mem-segment/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "powerline-mem-segment"; version = "2.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index c7e0c8565c0aa..5516db843bcfc 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { version = "2.8.3"; pname = "powerline"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix index b7963258f3381..a4eaad98b8dd9 100644 --- a/pkgs/development/python-modules/poyo/default.nix +++ b/pkgs/development/python-modules/poyo/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "0.5.0"; + format = "setuptools"; pname = "poyo"; src = fetchPypi { diff --git a/pkgs/development/python-modules/ppdeep/default.nix b/pkgs/development/python-modules/ppdeep/default.nix index bbb5c3fc923c9..4ea7033b11f39 100644 --- a/pkgs/development/python-modules/ppdeep/default.nix +++ b/pkgs/development/python-modules/ppdeep/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "ppdeep"; version = "20200505"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index 333c0df0a274c..ec9bddb5ec99c 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pplpy"; version = "0.8.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pproxy/default.nix b/pkgs/development/python-modules/pproxy/default.nix index 0673a3f8dba3b..e37c43baf34b6 100644 --- a/pkgs/development/python-modules/pproxy/default.nix +++ b/pkgs/development/python-modules/pproxy/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pproxy"; version = "2.3.7"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/pq/default.nix b/pkgs/development/python-modules/pq/default.nix index 320c264acaacb..cc65a00759981 100644 --- a/pkgs/development/python-modules/pq/default.nix +++ b/pkgs/development/python-modules/pq/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pq"; version = "1.9.1"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index cddca33b84baf..a69044eb14ec7 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "preggy"; version = "1.4.4"; + format = "setuptools"; propagatedBuildInputs = [ six unidecode ]; nativeCheckInputs = [ nose yanc ]; diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 21214b5fe7526..2143ad2edc2a8 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "premailer"; version = "3.10.0"; + format = "setuptools"; disabled = isPy27; # no longer compatible with urllib src = fetchPypi { diff --git a/pkgs/development/python-modules/primecountpy/default.nix b/pkgs/development/python-modules/primecountpy/default.nix index c2ad9ca512b02..463a0cf50be64 100644 --- a/pkgs/development/python-modules/primecountpy/default.nix +++ b/pkgs/development/python-modules/primecountpy/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "primecountpy"; version = "0.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/prison/default.nix b/pkgs/development/python-modules/prison/default.nix index d70808d97218b..e85ca0f7eb600 100644 --- a/pkgs/development/python-modules/prison/default.nix +++ b/pkgs/development/python-modules/prison/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "prison"; version = "0.1.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "betodealmeida"; diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix index a2a1d04ebe0ed..f6285605c3998 100644 --- a/pkgs/development/python-modules/proboscis/default.nix +++ b/pkgs/development/python-modules/proboscis/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "proboscis"; version = "1.2.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index 5f50b2a4d1809..436ca00267584 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "process-tests"; version = "2.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/prodict/default.nix b/pkgs/development/python-modules/prodict/default.nix index e3cc7564ef8b8..b793c27729853 100644 --- a/pkgs/development/python-modules/prodict/default.nix +++ b/pkgs/development/python-modules/prodict/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "prodict"; version = "0.8.6"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/proglog/default.nix b/pkgs/development/python-modules/proglog/default.nix index d22951ac7e2b2..b8e327e91c48b 100644 --- a/pkgs/development/python-modules/proglog/default.nix +++ b/pkgs/development/python-modules/proglog/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "proglog"; version = "0.1.10"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix index 192841994ec84..51c707bdde91d 100644 --- a/pkgs/development/python-modules/progress/default.nix +++ b/pkgs/development/python-modules/progress/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "1.6"; + format = "setuptools"; pname = "progress"; src = fetchPypi { diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index 68967ecf6533a..2a8f85893a52d 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "progressbar"; version = "2.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/pkgs/development/python-modules/progressbar33/default.nix index a483a6001f000..4ed2e42eb161f 100644 --- a/pkgs/development/python-modules/progressbar33/default.nix +++ b/pkgs/development/python-modules/progressbar33/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "progressbar33"; version = "2.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix index 4b845b3789be4..b2acd8e5bbdd8 100644 --- a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix +++ b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "prometheus-flask-exporter"; version = "0.22.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "rycus86"; diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix index 451d6f79091bc..f293c2f13b355 100644 --- a/pkgs/development/python-modules/property-manager/default.nix +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "property-manager"; version = "3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "xolox"; diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix index 7ff0690f3a580..2a4e89cc60711 100644 --- a/pkgs/development/python-modules/protego/default.nix +++ b/pkgs/development/python-modules/protego/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "protego"; version = "0.3.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index d75842e507a2c..a6c49c51b7223 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "proto-plus"; version = "1.22.3"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 3a42754de7783..f2d2d52f2c8fc 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -22,6 +22,7 @@ buildPythonPackage { # protobuf 21 corresponds with its python library 4.21 version = "4.${protobufVersionMajor}.${protobufVersionMinor}"; + format = "setuptools"; sourceRoot = "${protobuf.src.name}/python"; diff --git a/pkgs/development/python-modules/protobuf3-to-dict/default.nix b/pkgs/development/python-modules/protobuf3-to-dict/default.nix index ffc21c1428fe1..4160f7760a0c4 100644 --- a/pkgs/development/python-modules/protobuf3-to-dict/default.nix +++ b/pkgs/development/python-modules/protobuf3-to-dict/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "protobuf3-to-dict"; version = "0.1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/proton-client/default.nix b/pkgs/development/python-modules/proton-client/default.nix index ae29bf631a518..c8714a741a478 100644 --- a/pkgs/development/python-modules/proton-client/default.nix +++ b/pkgs/development/python-modules/proton-client/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "proton-client"; version = "0.7.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix new file mode 100644 index 0000000000000..9623cb0544d9d --- /dev/null +++ b/pkgs/development/python-modules/proton-core/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, aiohttp +, bcrypt +, pyopenssl +, python-gnupg +, requests +, pytestCheckHook +}: + +buildPythonPackage { + pname = "proton-core"; + version = "0.1.15-unstable-2023-10-24"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-core"; + rev = "5e795e04094dff67c03c56f2f3de03ff43514cc4"; + hash = "sha256-hchwrolc65tVmSe2IzxwH2zDU2JZzXrCMzWaETWcMDI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + bcrypt + aiohttp + pyopenssl + python-gnupg + requests + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=proton --cov-report html --cov-report term" "" + ''; + + pythonImportsCheck = [ "proton" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # Single test, requires internet connection + "tests/test_alternativerouting.py" + ]; + + disabledTests = [ + # Invalid modulus + "test_modulus_verification" + # Permission denied: '/run' + "test_broken_data" + "test_broken_index" + "test_sessions" + # No working transports found + "test_auto_works_on_prod" + "test_ping" + "test_successful" + "test_without_pinning" + # Failed assertions + "test_bad_pinning_fingerprint_changed" + "test_bad_pinning_url_changed" + ]; + + meta = { + description = "Core logic used by the other Proton components"; + homepage = "https://github.com/ProtonVPN/python-proton-core"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix new file mode 100644 index 0000000000000..78de141dad56b --- /dev/null +++ b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, proton-keyring-linux +, pytestCheckHook +}: + +buildPythonPackage { + pname = "proton-keyring-linux-secretservice"; + version = "0.0.1-unstable-2023-04-14"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-keyring-linux-secretservice"; + rev = "973d2646ec4d04bc270df53058df892950244e70"; + hash = "sha256-JlhvJBpbewT2c8k31CPMUlvvo/orWW1qfylFZLnDxeY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + proton-keyring-linux + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=proton.keyring_linux.secretservice --cov-report html --cov-report term" "" + ''; + + pythonImportsCheck = [ "proton.keyring_linux" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "ProtonVPN component to access Linux's keyring secret service API"; + homepage = "https://github.com/ProtonVPN/python-proton-keyring-linux-secretservice"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix new file mode 100644 index 0000000000000..4dac98134ac0a --- /dev/null +++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, keyring +, proton-core +, pytestCheckHook +}: + +buildPythonPackage { + pname = "proton-keyring-linux"; + version = "0.0.1-unstable-2023-04-14"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-keyring-linux"; + rev = "5ff3c7f9a1a162836649502dd23c2fbe1f487d73"; + hash = "sha256-4d8ZePG8imURhdNtLbraMRisrTLoRvJ+L2UuuOo3MPM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + keyring + proton-core + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=proton.keyring_linux.core --cov-report html --cov-report term" "" + ''; + + pythonImportsCheck = [ "proton.keyring_linux.core" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "ProtonVPN core component to access Linux's keyring"; + homepage = "https://github.com/ProtonVPN/python-proton-keyring-linux"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix new file mode 100644 index 0000000000000..0906d2bd4248a --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, proton-core +, proton-vpn-connection +, proton-vpn-logger +, proton-vpn-killswitch +, proton-vpn-session +, distro +, pytestCheckHook +}: + +buildPythonPackage { + pname = "proton-vpn-api-core"; + version = "0.20.1-unstable-2023-10-10"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-api-core"; + rev = "9c03fc30d3ff08559cab3644eadde027b029375d"; + hash = "sha256-vnz1+NazQceAs9KA3Jq0tsJditRoG/LoBR+0wuDzzHk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + distro + proton-core + proton-vpn-connection + proton-vpn-logger + proton-vpn-killswitch + proton-vpn-session + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=proton/vpn/core/ --cov-report html --cov-report term" "" + ''; + + pythonImportsCheck = [ "proton.vpn.core" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + ''; + + disabledTestPaths = [ + # Has a single test failing with Permission denied: '/run' + "tests/test_session.py" + ]; + + meta = with lib; { + description = "Acts as a facade to the other Proton VPN components, exposing a uniform API to the available Proton VPN services"; + homepage = "https://github.com/ProtonVPN/python-proton-vpn-api-core"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/proton-vpn-connection/default.nix b/pkgs/development/python-modules/proton-vpn-connection/default.nix new file mode 100644 index 0000000000000..7acbb173e8b6f --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-connection/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, proton-core +, proton-vpn-killswitch +, proton-vpn-logger +, jinja2 +, pytestCheckHook +}: + +buildPythonPackage { + pname = "proton-vpn-connection"; + version = "0.11.0-unstable-2023-09-05"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-connection"; + rev = "747ccacb5350ad59f2a09953b8d20c5c161aab54"; + hash = "sha256-WyMG0kmwBKoWc0mHnaop9E0upPAYHFwS/A9I1//WwlY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + jinja2 + proton-core + proton-vpn-killswitch + proton-vpn-logger + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=proton.vpn.connection --cov-report html --cov-report term" "" + ''; + + pythonImportsCheck = [ "proton.vpn.connection" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Permission denied: '/run' + "test_ensure_configuration_file_is_deleted" + "test_ensure_generate_is_returning_expected_content" + "test_ensure_same_configuration_file_in_case_of_duplicate" + "test_ensure_configuration_file_is_created" + "test_wireguard_config_content_generation" + "test_wireguard_with_malformed_credentials" + "test_wireguard_with_non_certificate" + "test_wireguard_without_settings" + # Neiter udp or tcp are working + "test_ovpnconfig_with_settings" + "test_ovpnconfig_with_missing_settings_applies_expected_defaults" + "test_ovpnconfig_with_malformed_params" + "test_ovpnconfig_with_certificate_and_malformed_credentials" + "test_ovpnconfig_with_malformed_server" + "test_ovpnconfig_with_malformed_server_and_credentials" + ]; + + meta = with lib; { + description = "Defines the interface that VPN connection backends should implement"; + homepage = "https://github.com/ProtonVPN/python-proton-vpn-connection"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix new file mode 100644 index 0000000000000..d0f62ac6f9982 --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, gobject-introspection +, setuptools +, networkmanager +, proton-vpn-killswitch +, proton-vpn-logger +, pycairo +, pygobject3 +, pytestCheckHook +}: + +buildPythonPackage { + pname = "proton-vpn-killswitch-network-manager"; + version = "0.2.0-unstable-2023-09-05"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-killswitch-network-manager"; + rev = "39d4398f169539e335c1f661e0dfc5551df0e6af"; + hash = "sha256-vmTXMIhXZgRvXeUX/XslT+ShqY60w4P7kJBQzWhA66k="; + }; + + nativeBuildInputs = [ + # Solves ImportError: cannot import name NM, introspection typelib not found + gobject-introspection + setuptools + ]; + + propagatedBuildInputs = [ + # Needed here for the NM namespace + networkmanager + proton-vpn-killswitch + proton-vpn-logger + pycairo + pygobject3 + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=proton.vpn.killswitch.backend.linux.networkmanager --cov-report=html --cov-report=term" "" + ''; + + pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.networkmanager" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Implementation of the proton-vpn-killswitch interface using Network Manager"; + homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch-network-manager"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix new file mode 100644 index 0000000000000..d36dedfbd4aa9 --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, proton-core +, pytestCheckHook +}: + +buildPythonPackage { + pname = "proton-vpn-killswitch"; + version = "0.2.0-unstable-2023-09-05"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-killswitch"; + rev = "6e84588ea6ae0946141d4b44b2cf5df8465d5eba"; + hash = "sha256-eFwWN8E+nIDpbut8tkWqXucLhzm7HaLAMBIbAq/X2eo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + proton-core + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=proton --cov-report=html --cov-report=term" "" + ''; + + pythonImportsCheck = [ "proton.vpn.killswitch.interface" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Defines the ProtonVPN kill switch interface"; + homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/proton-vpn-logger/default.nix b/pkgs/development/python-modules/proton-vpn-logger/default.nix new file mode 100644 index 0000000000000..6091c2b25a1e4 --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-logger/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, proton-core +, pytestCheckHook +}: + +buildPythonPackage { + pname = "proton-vpn-logger"; + version = "0.2.1-unstable-2023-05-10"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-logger"; + rev = "0acbc1ab41a65cbc9ceb340e3db011e6f89eb65a"; + hash = "sha256-VIggBKopAAKiNdQ5ypG1qI74E2WMDwDSriSuka/DBKA="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + proton-core + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=proton/vpn/logging/ --cov-report html --cov-report term" "" + ''; + + pythonImportsCheck = [ "proton.vpn.logging" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = "General purpose logging package for the entire ProtonVPN Linux client"; + homepage = "https://github.com/ProtonVPN/python-proton-vpn-logger"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix new file mode 100644 index 0000000000000..9eca560ac0058 --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, gobject-introspection +, setuptools +, proton-core +, proton-vpn-network-manager +, pytestCheckHook +}: + +buildPythonPackage { + pname = "proton-vpn-network-manager-openvpn"; + version = "0.0.4-unstable-2023-07-05"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-network-manager-openvpn"; + rev = "b79f6732646378ef1b92696de3665ff9560286d3"; + hash = "sha256-Z5X8RRu+1KaZ0pnH7tzGhfeST2W8bxMZnuryLhFjG/g="; + }; + + nativeBuildInputs = [ + # Solves Namespace NM not available + gobject-introspection + setuptools + ]; + + propagatedBuildInputs = [ + proton-core + proton-vpn-network-manager + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=proton.vpn.backend.linux.networkmanager.protocol.openvpn --cov-report html --cov-report term" "" + ''; + + pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager.protocol" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Adds support for the OpenVPN protocol using NetworkManager"; + homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-openvpn"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix new file mode 100644 index 0000000000000..f8874e1d0f3ad --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, gobject-introspection +, setuptools +, networkmanager +, proton-core +, proton-vpn-connection +, pycairo +, pygobject3 +, pytestCheckHook +}: + +buildPythonPackage { + pname = "proton-vpn-network-manager"; + version = "0.3.0-unstable-2023-09-05"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-network-manager"; + rev = "6ffd04fa0ae88a89d2b733443317066ef23b3ccd"; + hash = "sha256-Bqlwo7U/mwodQarl30n3/BNETqit1MVQUJT+mAhC6AI="; + }; + + nativeBuildInputs = [ + # Needed to recognize the NM namespace + gobject-introspection + setuptools + ]; + + propagatedBuildInputs = [ + # Needed here for the NM namespace + networkmanager + proton-core + proton-vpn-connection + pycairo + pygobject3 + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=proton/vpn/backend/linux/networkmanager --cov-report html --cov-report term" "" + ''; + + pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager"; + homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/proton-vpn-session/default.nix b/pkgs/development/python-modules/proton-vpn-session/default.nix new file mode 100644 index 0000000000000..b61bed91682ae --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-session/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, cryptography +, distro +, proton-core +, proton-vpn-logger +, pynacl +, aiohttp +, pyopenssl +, pytest-asyncio +, requests +, pytestCheckHook +}: + +buildPythonPackage { + pname = "proton-vpn-session"; + version = "0.6.2-unstable-2023-10-24"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-session"; + rev = "419b25bd1823f78d1219dc4cc441eeaf37646068"; + hash = "sha256-YPyNxbKxw+670bNQZ7U5nljyUjsNJ+k7eL+HpGiSCLk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cryptography + distro + proton-core + proton-vpn-logger + pynacl + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=proton.vpn.session --cov-report term" "" + ''; + + pythonImportsCheck = [ "proton.vpn.session" ]; + + postInstall = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + aiohttp + pyopenssl + pytest-asyncio + requests + pytestCheckHook + ]; + + meta = { + description = "Provides utility classes to manage VPN sessions"; + homepage = "https://github.com/ProtonVPN/python-proton-vpn-session"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/protonup-ng/default.nix b/pkgs/development/python-modules/protonup-ng/default.nix index f79285ce96a7a..02695a5e3515f 100644 --- a/pkgs/development/python-modules/protonup-ng/default.nix +++ b/pkgs/development/python-modules/protonup-ng/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "protonup-ng"; version = "0.2.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { @@ -24,6 +25,7 @@ buildPythonPackage rec { homepage = "https://github.com/cloudishBenne/protonup-ng"; description = "CLI program and API to automate the installation and update of GloriousEggroll's Proton-GE"; license = licenses.gpl3Only; - maintainers = with maintainers; [ Madouura ]; + maintainers = with maintainers; [ Madouura cafkafk ]; + mainProgram = "protonup"; }; } diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index dee0b8cc6a857..2c1818434ac42 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { pname = "protonvpn-nm-lib"; version = "3.16.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index 91b7e412b5815..64e63b9c954b8 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "prov"; version = "2.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix index 869ac7457c76e..67f9be4dba4ca 100644 --- a/pkgs/development/python-modules/prox-tv/default.nix +++ b/pkgs/development/python-modules/prox-tv/default.nix @@ -12,6 +12,7 @@ buildPythonPackage { pname = "prox-tv"; version = "3.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "albarji"; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index f2b5735083b2d..0702d4891cbc9 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "psautohint"; version = "2.4.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/psycopg/ctypes.patch b/pkgs/development/python-modules/psycopg/ctypes.patch index a76d38f85e801..d2b0842b44b4f 100644 --- a/pkgs/development/python-modules/psycopg/ctypes.patch +++ b/pkgs/development/python-modules/psycopg/ctypes.patch @@ -1,5 +1,5 @@ diff --git a/psycopg/psycopg/pq/_pq_ctypes.py b/psycopg/psycopg/pq/_pq_ctypes.py -index 4f9d00fb..24b90ef6 100644 +index 9ca1d129..02929ab6 100644 --- a/psycopg/psycopg/pq/_pq_ctypes.py +++ b/psycopg/psycopg/pq/_pq_ctypes.py @@ -11,14 +11,10 @@ from ctypes import Structure, CFUNCTYPE, POINTER @@ -30,17 +30,26 @@ index 4f9d00fb..24b90ef6 100644 fdopen = libc.fdopen fdopen.argtypes = (c_int, c_char_p) diff --git a/tests/fix_pq.py b/tests/fix_pq.py -index 6811a26c..c1829c82 100644 +index 917dfc91..505f2d65 100644 --- a/tests/fix_pq.py +++ b/tests/fix_pq.py -@@ -51,9 +51,7 @@ def libpq(): - from psycopg.pq.misc import find_libpq_full_path - - # Not available when testing the binary package +@@ -47,18 +47,7 @@ def pytest_runtest_setup(item): + @pytest.fixture + def libpq(): + """Return a ctypes wrapper to access the libpq.""" +- try: +- from psycopg.pq.misc import find_libpq_full_path +- +- # Not available when testing the binary package - libname = find_libpq_full_path() - assert libname, "libpq libname not found" -- return ctypes.pydll.LoadLibrary(libname) -+ return ctypes.pydll.LoadLibrary("@libpq@") - except Exception as e: - if pq.__impl__ == "binary": - pytest.skip(f"can't load libpq for testing: {e}") +- return ctypes.cdll.LoadLibrary(libname) +- except Exception as e: +- if pq.__impl__ == "binary": +- pytest.skip(f"can't load libpq for testing: {e}") +- else: +- raise ++ return ctypes.cdll.LoadLibrary("@libpq@") + + + @pytest.fixture diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index b73c74ca0ae36..d66f21ca26790 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -35,13 +35,13 @@ let pname = "psycopg"; - version = "3.1.13"; + version = "3.1.14"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-N+x8RErlId1uBgXZjBBjtPxqJXGuXZEl78DKVKjhy9w="; + hash = "sha256-zocRBnrQoJDWI4qhxDnxxIeiLdaWolvsujqfHBYQc/A="; }; patches = [ @@ -52,11 +52,9 @@ let }) (fetchpatch { - # fix environment variables leaking into test environment - # https://github.com/psycopg/psycopg/pull/683 - # https://github.com/psycopg/psycopg/issues/681 - url = "https://github.com/psycopg/psycopg/commit/f060855aa6126e811de243c7213d2caff9c88123.patch"; - hash = "sha256-QsFxK8Qasw9kbNCUUCqbOHaf53kT5NONlr28vGoPda0="; + # add fixture to mark flaky ref count tests + url = "https://github.com/psycopg/psycopg/commit/70ef364324ba3448ef9ac0e29329c9d802380e4b.patch"; + hash = "sha256-8PlrBcIumlxFjNXCAfm4NpSIxAnvLR8TopHzneJyzf0="; }) ]; @@ -214,7 +212,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o" "cache_dir=$TMPDIR" - "-m" "'not timing'" + "-m" "'not refcount and not timing'" ]; postCheck = '' diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix index a504c8484ab24..411630135acc9 100644 --- a/pkgs/development/python-modules/psycopg2cffi/default.nix +++ b/pkgs/development/python-modules/psycopg2cffi/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "psycopg2cffi"; version = "2.8.1"; + format = "setuptools"; # NB: This is a fork. # The original repo exists at https://github.com/chtd/psycopg2cffi, however diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix index 169f08fb3594c..7a3980ceb9b9a 100644 --- a/pkgs/development/python-modules/ptable/default.nix +++ b/pkgs/development/python-modules/ptable/default.nix @@ -3,6 +3,7 @@ buildPythonPackage { pname = "ptable"; version = "unstable-2019-06-14"; + format = "setuptools"; # https://github.com/kxxoling/PTable/issues/27 src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/ptest/default.nix b/pkgs/development/python-modules/ptest/default.nix index 2a4180a4cbeda..1b063e784a9db 100644 --- a/pkgs/development/python-modules/ptest/default.nix +++ b/pkgs/development/python-modules/ptest/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "ptest"; version = "1.7.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "KarlGong"; diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 355171856fbd0..9db2e9c1d2c0a 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -3,9 +3,7 @@ , pythonOlder , fetchPypi , appdirs -, black , importlib-metadata -, isPy3k , jedi , prompt-toolkit , pygments @@ -25,7 +23,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ appdirs - black # yes, this is in install_requires jedi prompt-toolkit pygments diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index 496f8161e7923..a987db97d547a 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "ptyprocess"; version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix index 3f86abf0ea143..9de169f696dd1 100644 --- a/pkgs/development/python-modules/publicsuffix/default.nix +++ b/pkgs/development/python-modules/publicsuffix/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "publicsuffix"; version = "1.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix index 915c1d98cee94..064dc3f5f94f8 100644 --- a/pkgs/development/python-modules/publicsuffix2/default.nix +++ b/pkgs/development/python-modules/publicsuffix2/default.nix @@ -7,6 +7,7 @@ buildPythonPackage { # tags have dashes, while the library version does not # see https://github.com/nexB/python-publicsuffix2/issues/12 version = lib.replaceStrings ["-"] [""] tagVersion; + format = "setuptools"; src = fetchFromGitHub { owner = "nexB"; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index ad60d8e79f855..b5bd3d8f50a21 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20231122"; + version = "0.10.0.20231214"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0CrHVPoQTS3I9ZPvf/4wWQX4vYn5vAeWUxNanjnbF60="; + hash = "sha256-dqLtRoFPCR6oZ/tApsIMFCpDeveq56yOtCXdxGS8uOE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pubnubsub-handler/default.nix b/pkgs/development/python-modules/pubnubsub-handler/default.nix index 32ad2a8e1b8d2..8d8c8da9620e3 100644 --- a/pkgs/development/python-modules/pubnubsub-handler/default.nix +++ b/pkgs/development/python-modules/pubnubsub-handler/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pubnubsub-handler"; version = "1.0.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 816af17c69fd6..6ecd6d4ba8c0d 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -1,4 +1,5 @@ { lib +, cbc , amply , buildPythonPackage , fetchFromGitHub @@ -21,6 +22,12 @@ buildPythonPackage rec { hash = "sha256-j0f6OiscJyTqPNyLp0qWRjCGLWuT3HdU1S/sxpnsiMo="; }; + postPatch = '' + sed -i pulp/pulp.cfg.linux \ + -e 's|CbcPath = .*|CbcPath = ${cbc}/bin/cbc|' \ + -e 's|PulpCbcPath = .*|PulpCbcPath = ${cbc}/bin/cbc|' + ''; + propagatedBuildInputs = [ amply pyparsing @@ -34,14 +41,8 @@ buildPythonPackage rec { "pulp" ]; - disabledTests = [ - # The solver is not available - "PULP_CBC_CMDTest" - "test_examples" - ]; - meta = with lib; { - description = "Module to generate generate MPS or LP files"; + description = "Module to generate MPS or LP files"; homepage = "https://github.com/coin-or/pulp"; license = licenses.mit; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index bddb4b686b2e5..5b87a24ddf551 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pulsectl"; version = "23.5.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index 94a940f8a9fec..b61bc41505db4 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { inherit (pulumi) version src; pname = "pulumi"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/pure-cdb/default.nix b/pkgs/development/python-modules/pure-cdb/default.nix index ea25ba2f595fd..f8df017c9b18c 100644 --- a/pkgs/development/python-modules/pure-cdb/default.nix +++ b/pkgs/development/python-modules/pure-cdb/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pure-cdb"; version = "4.0.0"; + format = "setuptools"; disabled = pythonOlder "3.4"; # Archive on pypi has no tests. diff --git a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix index 8e40d182212dc..6a734f93ab996 100644 --- a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix +++ b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "pure-python-adb-homeassistant"; version = "0.1.7.dev0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pure-python-adb/default.nix b/pkgs/development/python-modules/pure-python-adb/default.nix index 31ec5d5091180..531e1c30a1ef9 100644 --- a/pkgs/development/python-modules/pure-python-adb/default.nix +++ b/pkgs/development/python-modules/pure-python-adb/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pure-python-adb"; version = "0.3.0.dev0"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index 156f5d4bc2228..a147f0a55306a 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -10,6 +10,7 @@ buildPythonPackage { pname = "purepng"; version = "0.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "Scondo"; diff --git a/pkgs/development/python-modules/purl/default.nix b/pkgs/development/python-modules/purl/default.nix index 6c180222e88e2..8e0ba9c2eb5a6 100644 --- a/pkgs/development/python-modules/purl/default.nix +++ b/pkgs/development/python-modules/purl/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "purl"; version = "1.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "codeinthehole"; diff --git a/pkgs/development/python-modules/push-receiver/default.nix b/pkgs/development/python-modules/push-receiver/default.nix index c8ab6b64eccf6..ef73b6d0b3c45 100644 --- a/pkgs/development/python-modules/push-receiver/default.nix +++ b/pkgs/development/python-modules/push-receiver/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "push-receiver"; version = "0.1.1"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/pushover-complete/default.nix b/pkgs/development/python-modules/pushover-complete/default.nix index 33741f9f29246..f660e23bd0198 100644 --- a/pkgs/development/python-modules/pushover-complete/default.nix +++ b/pkgs/development/python-modules/pushover-complete/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "pushover-complete"; version = "1.1.1"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/pvextractor/default.nix b/pkgs/development/python-modules/pvextractor/default.nix index efee87277cb5a..592a5c107dad7 100644 --- a/pkgs/development/python-modules/pvextractor/default.nix +++ b/pkgs/development/python-modules/pvextractor/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "pvextractor"; version = "0.4"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 683295edbc7fc..2c8894cbb11f7 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.2"; + version = "0.10.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi{ inherit pname version; - hash = "sha256-gCOFP2heAtzpe38j1ljOz1yR1P8pRZ0eILVK8Kd3tFc="; + hash = "sha256-AkobUj1zpjMyNhLn8xWhcJzwbR/UP/CCGQH2akBostk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix index 6963d37000138..d886bbd30ac9f 100644 --- a/pkgs/development/python-modules/pvo/default.nix +++ b/pkgs/development/python-modules/pvo/default.nix @@ -4,16 +4,17 @@ , buildPythonPackage , fetchFromGitHub , poetry-core -, pydantic +, mashumaro , pytest-asyncio , pytestCheckHook , pythonOlder +, syrupy , yarl }: buildPythonPackage rec { pname = "pvo"; - version = "2.0.0"; + version = "2.1.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-pvoutput"; rev = "refs/tags/v${version}"; - hash = "sha256-SvsrvGwIAlj/8hdk90+rxigVrx6n3YInvF/4eux2H04="; + hash = "sha256-Js8oPEMxJyWK1E6GDm1xwm2BilnV3WBM6Hibf6oFOKE="; }; postPatch = '' @@ -38,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - pydantic + mashumaro yarl ]; @@ -46,6 +47,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix index bea63909ab5bf..2c85434ac6bcf 100644 --- a/pkgs/development/python-modules/pweave/default.nix +++ b/pkgs/development/python-modules/pweave/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "pweave"; version = "0.30.3"; + format = "setuptools"; src = fetchPypi { pname = "Pweave"; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 32c8b966ad585..4fcb8588147ff 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -30,6 +30,7 @@ in buildPythonPackage rec { pname = "pwntools"; version = "4.11.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pxml/default.nix b/pkgs/development/python-modules/pxml/default.nix index 5ef283a26cccc..360a761d88972 100644 --- a/pkgs/development/python-modules/pxml/default.nix +++ b/pkgs/development/python-modules/pxml/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pxml"; version = "0.2.13"; + format = "setuptools"; disabled = pythonAtLeast "3.8"; src = fetchPypi { diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 446edb4221ebb..6cf165d8b0937 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "py-air-control-exporter"; version = "0.3.1"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/py-air-control/default.nix b/pkgs/development/python-modules/py-air-control/default.nix index 77b61123d9e0c..47470eb48fe9e 100644 --- a/pkgs/development/python-modules/py-air-control/default.nix +++ b/pkgs/development/python-modules/py-air-control/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "py-air-control"; version = "2.1.0"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/py-cid/default.nix b/pkgs/development/python-modules/py-cid/default.nix index 9e34693eb021d..947583f0a7b3f 100644 --- a/pkgs/development/python-modules/py-cid/default.nix +++ b/pkgs/development/python-modules/py-cid/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "py-cid"; version = "0.3.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/py-deprecate/default.nix b/pkgs/development/python-modules/py-deprecate/default.nix index 4684b51d79a96..de7e506c0db31 100644 --- a/pkgs/development/python-modules/py-deprecate/default.nix +++ b/pkgs/development/python-modules/py-deprecate/default.nix @@ -8,6 +8,7 @@ let pname = "py-deprecate"; version = "0.3.2"; + format = "setuptools"; in buildPythonPackage { inherit pname version; diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix index 9a7d1c3720c8f..7845bfe175014 100644 --- a/pkgs/development/python-modules/py-ecc/default.nix +++ b/pkgs/development/python-modules/py-ecc/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "py-ecc"; version = "6.0.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix index 8ede11e359031..ed92c9c2e41eb 100644 --- a/pkgs/development/python-modules/py-eth-sig-utils/default.nix +++ b/pkgs/development/python-modules/py-eth-sig-utils/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "py-eth-sig-utils"; version = "0.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "rmeissner"; diff --git a/pkgs/development/python-modules/py-expression-eval/default.nix b/pkgs/development/python-modules/py-expression-eval/default.nix index 6aee63effb343..13797e3adc784 100644 --- a/pkgs/development/python-modules/py-expression-eval/default.nix +++ b/pkgs/development/python-modules/py-expression-eval/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "py-expression-eval"; version = "0.3.14"; + format = "setuptools"; src = fetchFromGitHub { owner = "axiacore"; diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix index d148e539d3fff..d22e931cd9373 100644 --- a/pkgs/development/python-modules/py-libzfs/default.nix +++ b/pkgs/development/python-modules/py-libzfs/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "py-libzfs"; version = "22.12.4.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "truenas"; diff --git a/pkgs/development/python-modules/py-lru-cache/default.nix b/pkgs/development/python-modules/py-lru-cache/default.nix index d2057d2cf9801..85045a156bd5e 100644 --- a/pkgs/development/python-modules/py-lru-cache/default.nix +++ b/pkgs/development/python-modules/py-lru-cache/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "py-lru-cache"; version = "0.1.4"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/py-multiaddr/default.nix b/pkgs/development/python-modules/py-multiaddr/default.nix index b631dbdc316cb..28ee3cffb9172 100644 --- a/pkgs/development/python-modules/py-multiaddr/default.nix +++ b/pkgs/development/python-modules/py-multiaddr/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "py-multiaddr"; version = "0.0.9"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/py-sonic/default.nix b/pkgs/development/python-modules/py-sonic/default.nix index a3e7cd5036086..ec0da2c3ab3bf 100644 --- a/pkgs/development/python-modules/py-sonic/default.nix +++ b/pkgs/development/python-modules/py-sonic/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "py-sonic"; version = "1.0.0"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/py-ubjson/default.nix b/pkgs/development/python-modules/py-ubjson/default.nix index 5cb8cfc40220d..175b635257619 100644 --- a/pkgs/development/python-modules/py-ubjson/default.nix +++ b/pkgs/development/python-modules/py-ubjson/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "py-ubjson"; version = "0.16.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "Iotic-Labs"; diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index c1cf60ca4d779..3dec18b6e0fc7 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "py"; version = "1.11.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/py2bit/default.nix b/pkgs/development/python-modules/py2bit/default.nix index 7699ccab3a2ee..9f45e4e2d9e35 100644 --- a/pkgs/development/python-modules/py2bit/default.nix +++ b/pkgs/development/python-modules/py2bit/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "py2bit"; version = "0.3.0"; + format = "setuptools"; checkInput = [ pytest ]; diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix index 12297b9a6f78b..5e8027bb60060 100644 --- a/pkgs/development/python-modules/py3dns/default.nix +++ b/pkgs/development/python-modules/py3dns/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "py3dns"; version = "3.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index 7365db7cd3007..fa7fb2cee1db1 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "py4j"; version = "0.10.9.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 94bf1eef12d8f..39baa283996a7 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.14.0"; + version = "4.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-R52j4JnoM0nlZvlcDox2Wz3WjTEstNaqbg8SPiPHD4c="; + hash = "sha256-p31JRojOwoWQZE1w6UXEja0UvloMDbtKw75HHMUzgFU="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix index 6bfa6900e78a8..c5428a30bda80 100644 --- a/pkgs/development/python-modules/pyacoustid/default.nix +++ b/pkgs/development/python-modules/pyacoustid/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pyacoustid"; version = "1.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyaehw4a1/default.nix b/pkgs/development/python-modules/pyaehw4a1/default.nix index 0aa37cbae1e51..2f500ea91a226 100644 --- a/pkgs/development/python-modules/pyaehw4a1/default.nix +++ b/pkgs/development/python-modules/pyaehw4a1/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyaehw4a1"; version = "0.3.9"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/pyaes/default.nix b/pkgs/development/python-modules/pyaes/default.nix index 2674211479fd7..4d98e7cfac63f 100644 --- a/pkgs/development/python-modules/pyaes/default.nix +++ b/pkgs/development/python-modules/pyaes/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyaes"; version = "1.6.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 2e3f3f6fabd6f..3e3b44cb237e6 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -16,24 +16,18 @@ buildPythonPackage rec { pname = "pyairvisual"; - version = "2023.11.0"; + version = "2023.12.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bachya"; repo = "pyairvisual"; rev = "refs/tags/${version}"; - hash = "sha256-69lLw+ZYQ4hfD6xsfq1DVTWCnbp7e+qexuW3osDUejg="; + hash = "sha256-uN31LeHYmg4V6Ln3EQp765nOsN5v56TxjYSS/g6TUCY="; }; - postPatch = '' - substituteInPlace pyproject.toml --replace \ - 'certifi = ">=2023.07.22"' \ - 'certifi = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix index 680a8f6f8307a..a3014aa292883 100644 --- a/pkgs/development/python-modules/pyalgotrade/default.nix +++ b/pkgs/development/python-modules/pyalgotrade/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "pyalgotrade"; version = "0.20"; + format = "setuptools"; src = fetchPypi { pname = "PyAlgoTrade"; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index a0a898b970625..3fcf2468aea31 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyaml"; version = "23.9.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyarlo/default.nix b/pkgs/development/python-modules/pyarlo/default.nix index 63c766ffb5bc9..199dc61015a70 100644 --- a/pkgs/development/python-modules/pyarlo/default.nix +++ b/pkgs/development/python-modules/pyarlo/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pyarlo"; version = "0.2.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "tchellomello"; diff --git a/pkgs/development/python-modules/pyarr/default.nix b/pkgs/development/python-modules/pyarr/default.nix index 2da0b65e5bedb..7f2a4ce78878d 100644 --- a/pkgs/development/python-modules/pyarr/default.nix +++ b/pkgs/development/python-modules/pyarr/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyarr"; version = "5.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 90fae9e2722cb..39c0420542074 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -27,6 +27,7 @@ in buildPythonPackage rec { pname = "pyarrow"; + format = "setuptools"; inherit (arrow-cpp) version src; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pyasn/default.nix b/pkgs/development/python-modules/pyasn/default.nix index 026b5fdff6838..6da1ae55f5993 100644 --- a/pkgs/development/python-modules/pyasn/default.nix +++ b/pkgs/development/python-modules/pyasn/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyasn"; version = "1.6.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 7a0735269897b..28516a203e4bf 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pyasn1-modules"; version = "0.3.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pyasuswrt/default.nix b/pkgs/development/python-modules/pyasuswrt/default.nix new file mode 100644 index 0000000000000..6ad2ab682e4b5 --- /dev/null +++ b/pkgs/development/python-modules/pyasuswrt/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "pyasuswrt"; + version = "0.1.21"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ollo69"; + repo = "pyasuswrt"; + rev = "refs/tags/v${version}"; + hash = "sha256-kg475AWmc0i/W4dBg8jFmNyz3V67xjvzPkSlS09/9Oc="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Tests require physical hardware + doCheck = false; + + pythonImportsCheck = [ + "pyasuswrt" + ]; + + meta = with lib; { + description = "Library for communication with ASUSWRT routers via HTTP"; + homepage = "https://github.com/ollo69/pyasuswrt"; + changelog = "https://github.com/ollo69/pyasuswrt/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 5c37066ae9d19..74098c5ba877c 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -16,20 +16,26 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "7.6.0"; - format = "pyproject"; + version = "8.0.2"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "jabesq"; repo = "pyatmo"; rev = "refs/tags/v${version}"; - hash = "sha256-rAmSxayXljOJchiMtSOgnotzQmapK2n86HwNi9HJX68="; + hash = "sha256-AKpDXfNF2t/3F4SmMWIgfkxHgcJobYs225gIeJ31l6k="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "oauthlib~=3.1" "oauthlib" \ + --replace "requests~=2.24" "requests" + ''; + nativeBuildInputs = [ setuptools-scm ]; @@ -49,12 +55,6 @@ buildPythonPackage rec { time-machine ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "oauthlib~=3.1" "oauthlib" \ - --replace "requests~=2.24" "requests" - ''; - pythonImportsCheck = [ "pyatmo" ]; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index b5785dfd3f2e3..d584b410d7cdc 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.14.4"; + version = "0.14.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "postlund"; repo = "pyatv"; rev = "refs/tags/v${version}"; - hash = "sha256-w3WOlZFfuCmekUsr8msi2LXTm6j8/Bk49L3MiYF7lOM="; + hash = "sha256-Uykj9MIUFcZyTWOBjUhL9+qItbnpwtuTd2Cx5jI7Wtw="; }; postPatch = '' @@ -92,7 +92,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (stdenv.isDarwin) [ + disabledTests = [ + # https://github.com/postlund/pyatv/issues/2307 + "test_zeroconf_service_published" + ] ++ lib.optionals (stdenv.isDarwin) [ # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False "test_stream_retransmission" ]; diff --git a/pkgs/development/python-modules/pyautogui/default.nix b/pkgs/development/python-modules/pyautogui/default.nix index 8443284964ca7..04cd0513dd2b3 100644 --- a/pkgs/development/python-modules/pyautogui/default.nix +++ b/pkgs/development/python-modules/pyautogui/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "pyautogui"; version = "0.9.53"; + format = "setuptools"; src = fetchFromGitHub { owner = "asweigart"; diff --git a/pkgs/development/python-modules/pyavm/default.nix b/pkgs/development/python-modules/pyavm/default.nix index ec95e2de171f9..ef8a82a1cd429 100644 --- a/pkgs/development/python-modules/pyavm/default.nix +++ b/pkgs/development/python-modules/pyavm/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pyavm"; version = "0.9.5"; + format = "setuptools"; src = fetchPypi { pname = "PyAVM"; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 99aef4c985afa..e3826a9a36989 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "0.3.27"; + format = "setuptools"; pname = "pyaxmlparser"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index ec62c32a10791..e60079ed24179 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { version = "0.16.3"; + format = "setuptools"; pname = "pybids"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 9eeb40225cabb..223c505df1469 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -38,6 +38,7 @@ in buildPythonPackage rec { pname = "pybind11"; version = "2.11.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "pybind"; diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix index 2e178163c1056..04a9ba95a89e1 100644 --- a/pkgs/development/python-modules/pybtex/default.nix +++ b/pkgs/development/python-modules/pybtex/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "0.24.0"; + format = "setuptools"; pname = "pybtex"; doCheck = false; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 4e9e848070f61..197d079071287 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pybullet"; version = "3.2.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycapnp/default.nix b/pkgs/development/python-modules/pycapnp/default.nix index b18fa3b3fc7f5..e10075e277265 100644 --- a/pkgs/development/python-modules/pycapnp/default.nix +++ b/pkgs/development/python-modules/pycapnp/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pycapnp"; version = "1.1.0"; + format = "setuptools"; disabled = isPyPy || isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix index fb298e62eff92..e8f0323b2f92e 100644 --- a/pkgs/development/python-modules/pycdio/default.nix +++ b/pkgs/development/python-modules/pycdio/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pycdio"; version = "2.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix index e1af0553f5d01..339ade0ca71f2 100644 --- a/pkgs/development/python-modules/pycfdns/default.nix +++ b/pkgs/development/python-modules/pycfdns/default.nix @@ -1,30 +1,36 @@ { lib , aiohttp -, async-timeout , buildPythonPackage , fetchFromGitHub +, poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "pycfdns"; - version = "2.0.1"; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; + + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-f6kxYX/dg16OWYpw29dH4Z26ncLZCYyHKGc4fzoCld0="; + hash = "sha256-bLzDakxKq8fcjEKSxc6D5VN9gfAu1M3/zaAU2UYnwSs="; }; postPatch = '' - substituteInPlace setup.py \ - --replace 'version="master",' 'version="${version}",' + substituteInPlace pyproject.toml \ + --replace 'version="0",' 'version="${version}",' ''; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp - async-timeout ]; # Project has no tests diff --git a/pkgs/development/python-modules/pycflow2dot/default.nix b/pkgs/development/python-modules/pycflow2dot/default.nix index db1ac8fabb2f3..34ea15664c4b2 100644 --- a/pkgs/development/python-modules/pycflow2dot/default.nix +++ b/pkgs/development/python-modules/pycflow2dot/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pycflow2dot"; version = "0.2.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pychannels/default.nix b/pkgs/development/python-modules/pychannels/default.nix index d498fba21c2ef..e7185f3697dcd 100644 --- a/pkgs/development/python-modules/pychannels/default.nix +++ b/pkgs/development/python-modules/pychannels/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pychannels"; version = "1.2.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "fancybits"; diff --git a/pkgs/development/python-modules/pychart/default.nix b/pkgs/development/python-modules/pychart/default.nix index f020361474a18..aa9ef1c11c9bb 100644 --- a/pkgs/development/python-modules/pychart/default.nix +++ b/pkgs/development/python-modules/pychart/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pychart"; version = "1.39"; + format = "setuptools"; disabled = ! isPy27; diff --git a/pkgs/development/python-modules/pychm/default.nix b/pkgs/development/python-modules/pychm/default.nix index e9cc2c319fffc..175acf928256e 100644 --- a/pkgs/development/python-modules/pychm/default.nix +++ b/pkgs/development/python-modules/pychm/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pychm"; version = "0.8.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyclimacell/default.nix b/pkgs/development/python-modules/pyclimacell/default.nix index 0f8c84a0163a1..f8f58b19ccd20 100644 --- a/pkgs/development/python-modules/pyclimacell/default.nix +++ b/pkgs/development/python-modules/pyclimacell/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pyclimacell"; version = "0.18.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index a66c0ef49117b..aa503a379cf10 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "pycognito"; version = "2023.5.0"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index 249d19f69f54e..4fe038b8ab2b2 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pycoin"; version = "0.92.20230326"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 24f4d26fe02dc..3f489e2df2bc5 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pycollada"; version = "0.7.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycomposefile/default.nix b/pkgs/development/python-modules/pycomposefile/default.nix index e7707c763a207..2789fbb69d225 100644 --- a/pkgs/development/python-modules/pycomposefile/default.nix +++ b/pkgs/development/python-modules/pycomposefile/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pycomposefile"; version = "0.0.30"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycosat/default.nix b/pkgs/development/python-modules/pycosat/default.nix index 9fc633c6808b6..536f98cb27337 100644 --- a/pkgs/development/python-modules/pycosat/default.nix +++ b/pkgs/development/python-modules/pycosat/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pycosat"; version = "0.6.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycotap/default.nix b/pkgs/development/python-modules/pycotap/default.nix index 652f3c1b1dcb9..3f1007317abf7 100644 --- a/pkgs/development/python-modules/pycotap/default.nix +++ b/pkgs/development/python-modules/pycotap/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pycotap"; version = "1.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index 95f74e68bd817..49a1ad025000c 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pycountry"; version = "22.3.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index edc6744f672c6..fa0622df9ff91 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pycparser"; version = "2.21"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix new file mode 100644 index 0000000000000..4ed22901637e6 --- /dev/null +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -0,0 +1,71 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, hatchling +, aiosqlite +, anyio +, channels +, pycrdt +, pytest-asyncio +, pytestCheckHook +, uvicorn +, websockets +}: + +buildPythonPackage rec { + pname = "pycrdt-websocket"; + version = "0.12.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jupyter-server"; + repo = "pycrdt-websocket"; + rev = "refs/tags/v${version}"; + hash = "sha256-VYD1OrerqwzjaT1Eb6q+kryf15iHCMSHJZbon225bio="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + aiosqlite + anyio + pycrdt + ]; + + passthru.optional-dependencies = { + django = [ + channels + ]; + }; + + pythonImportsCheck = [ + "pycrdt_websocket" + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + uvicorn + websockets + ]; + + disabledTestPaths = [ + # requires nodejs and installed js modules + "tests/test_pycrdt_yjs.py" + ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "WebSocket Connector for pycrdt"; + homepage = "https://github.com/jupyter-server/pycrdt-websocket"; + changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = teams.jupyter.members; + }; +} diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock new file mode 100644 index 0000000000000..d638e9082b3bd --- /dev/null +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -0,0 +1,519 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "atomic_refcell" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "indoc" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "libc" +version = "0.2.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pycrdt" +version = "0.8.2" +dependencies = [ + "pyo3", + "yrs", +] + +[[package]] +name = "pyo3" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom", + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[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", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags", +] + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[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.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "smallstr" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b1aefdf380735ff8ded0b15f31aab05daf1f70216c01c02a12926badd1df9d" +dependencies = [ + "smallvec", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] +name = "thiserror" +version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unindent" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasm-bindgen" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.43", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "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.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "yrs" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68aea14c6c33f2edd8a5ff9415360cfa5b98d90cce30c5ee3be59a8419fb15a9" +dependencies = [ + "atomic_refcell", + "rand", + "serde", + "serde_json", + "smallstr", + "smallvec", + "thiserror", +] diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix new file mode 100644 index 0000000000000..d33a8622733c1 --- /dev/null +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, libiconv +, cargo +, rustPlatform +, rustc +, pydantic +, pytestCheckHook +, y-py +}: + +buildPythonPackage rec { + pname = "pycrdt"; + version = "0.8.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jupyter-server"; + repo = "pycrdt"; + rev = "refs/tags/v${version}"; + hash = "sha256-RY0ndkMW4a2KxkebkoSEAzCgdUyHujglHJCzkoFCJZA="; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + + pythonImportsCheck = [ "pycrdt" ]; + + # requires pydantic>=2.5 + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + y-py + pydantic + ]; + + meta = with lib; { + description = "CRDTs based on Yrs"; + homepage = "https://github.com/jupyter-server/pycrdt"; + changelog = "https://github.com/jupyter-server/pycrdt/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = teams.jupyter.members; + }; +} diff --git a/pkgs/development/python-modules/pycritty/default.nix b/pkgs/development/python-modules/pycritty/default.nix index 726e47bf1fb8e..18101f057587a 100644 --- a/pkgs/development/python-modules/pycritty/default.nix +++ b/pkgs/development/python-modules/pycritty/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pycritty"; version = "0.4.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix index 7aa8afee10880..2e607b50dd745 100644 --- a/pkgs/development/python-modules/pycron/default.nix +++ b/pkgs/development/python-modules/pycron/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "pycron"; version = "3.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "kipe"; diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index 364a218aaa1b9..72b91834eed7e 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pycrypto"; version = pycryptodome.version; + format = "setuptools"; # Cannot build wheel otherwise (zip 1980 issue) SOURCE_DATE_EPOCH=315532800; diff --git a/pkgs/development/python-modules/pycsdr/default.nix b/pkgs/development/python-modules/pycsdr/default.nix index 3ee5b1449a635..08f03019dd785 100644 --- a/pkgs/development/python-modules/pycsdr/default.nix +++ b/pkgs/development/python-modules/pycsdr/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pycsdr"; version = "0.18.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "jketterl"; diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 8c2005c0cc2cd..4f4c9291ae394 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -25,6 +25,7 @@ in buildPythonPackage rec { pname = "pycuda"; version = "2023.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix index 9f2d182fb5c6d..9b4a1a2d0ee7f 100644 --- a/pkgs/development/python-modules/pycups/default.nix +++ b/pkgs/development/python-modules/pycups/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pycups"; version = "2.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index fb4aacf3b83db..29c4a2034b2f7 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pycurl"; version = "7.45.2"; + format = "setuptools"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { diff --git a/pkgs/development/python-modules/pycxx/default.nix b/pkgs/development/python-modules/pycxx/default.nix index c0cf0ac0dc139..5cc1056f83271 100644 --- a/pkgs/development/python-modules/pycxx/default.nix +++ b/pkgs/development/python-modules/pycxx/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pycxx"; version = "7.1.4"; + format = "setuptools"; src = fetchurl { url = "mirror://sourceforge/cxx/CXX/PyCXX%20V${version}/pycxx-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix index b5516bc144e09..c84b22b7b54d2 100644 --- a/pkgs/development/python-modules/pycyphal/default.nix +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { ''; homepage = "https://opencyphal.org/"; license = licenses.mit; - maintainers = [ teams.ororatech ]; + maintainers = teams.ororatech.members; }; } diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index 18fd4dc70b4ad..541d7124f11a7 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pydal"; - version = "20230521.1"; + version = "20231114.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EEeKYeYnxbjLdpH39+v3IQhFSFMWST0310DCl/ttGEU="; + hash = "sha256-xC0W/Knju205mu+yQ0wOcIYu4Tx1Q3hS9CGSBDLuX7E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydanfossair/default.nix b/pkgs/development/python-modules/pydanfossair/default.nix index 5ce5ebffeaad8..226e5a1aa4ef8 100644 --- a/pkgs/development/python-modules/pydanfossair/default.nix +++ b/pkgs/development/python-modules/pydanfossair/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pydanfossair"; version = "0.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "JonasPed"; diff --git a/pkgs/development/python-modules/pydash/0001-Only-build-unit-tests.patch b/pkgs/development/python-modules/pydash/0001-Only-build-unit-tests.patch deleted file mode 100644 index 56a5ff391194c..0000000000000 --- a/pkgs/development/python-modules/pydash/0001-Only-build-unit-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2fe7a445bafedee2c43050e40697d8b0fd7f7b30 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Fri, 19 Mar 2021 19:37:34 +0100 -Subject: [PATCH] Only build unit-tests - ---- - setup.cfg | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/setup.cfg b/setup.cfg -index 2c2f49f..a5ec152 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -83,13 +83,6 @@ force_sort_within_sections = true - junit_family = xunit2 - addopts = - --verbose -- --doctest-modules -- --no-cov-on-fail -- --cov-fail-under=100 -- --cov-report=term-missing -- --cov-report=xml:build/coverage/coverage.xml -- --cov-report=html:build/coverage -- --junitxml=build/testresults/junit.xml - - [coverage:run] - omit = --- -2.29.3 - diff --git a/pkgs/development/python-modules/pydenticon/default.nix b/pkgs/development/python-modules/pydenticon/default.nix index 44913e1de4763..d0a17a0357d63 100644 --- a/pkgs/development/python-modules/pydenticon/default.nix +++ b/pkgs/development/python-modules/pydenticon/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pydenticon"; version = "0.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pydes/default.nix b/pkgs/development/python-modules/pydes/default.nix index 0bceaeceaa376..13820649912b5 100644 --- a/pkgs/development/python-modules/pydes/default.nix +++ b/pkgs/development/python-modules/pydes/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pydes"; version = "unstable-2019-01-08"; + format = "setuptools"; src = fetchFromGitHub { owner = "twhiteman"; diff --git a/pkgs/development/python-modules/pydigiham/default.nix b/pkgs/development/python-modules/pydigiham/default.nix index 8ae69c9bf5dc4..a4e7f3db82b70 100644 --- a/pkgs/development/python-modules/pydigiham/default.nix +++ b/pkgs/development/python-modules/pydigiham/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pydigiham"; version = "0.6.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "jketterl"; diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix index ad39feabd07d7..0d4ef3ce3f5e6 100644 --- a/pkgs/development/python-modules/pydispatcher/default.nix +++ b/pkgs/development/python-modules/pydispatcher/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "2.0.7"; + format = "setuptools"; pname = "pydispatcher"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pydocumentdb/default.nix b/pkgs/development/python-modules/pydocumentdb/default.nix index 7a78730d39b05..e2c075ae7f389 100644 --- a/pkgs/development/python-modules/pydocumentdb/default.nix +++ b/pkgs/development/python-modules/pydocumentdb/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "2.3.5"; + format = "setuptools"; pname = "pydocumentdb"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index dc36f149a9b1c..ba6216011627c 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.11.0"; + version = "2023.12.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-gKOyTvdETGzKlpU67UKaHYTIvnAX9znHIynP3BiVbt4="; + hash = "sha256-w5M6ihPGOVCqMrWd8qj6XEmS4tfxKhwpwZSXjcOc4z0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index ddeb72bfbdf97..66a05d81fa84d 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydrive2"; - version = "1.17.0"; + version = "1.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyDrive2"; inherit version; - hash = "sha256-aP6pNDR7thK3qEiBHUgUnbhAvPtfpNeothYbLSrf7HA="; + hash = "sha256-SdyohC98PWP9NatVSSryqLWznxzIEQQv43/77RxIMD8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix index 83820629552fd..3b4f4620e1469 100644 --- a/pkgs/development/python-modules/pyechonest/default.nix +++ b/pkgs/development/python-modules/pyechonest/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyechonest"; version = "9.0.0"; + format = "setuptools"; disabled = isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix index b9061f3a5d2bb..b367f680e5051 100644 --- a/pkgs/development/python-modules/pyeclib/default.nix +++ b/pkgs/development/python-modules/pyeclib/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyeclib"; version = "unstable-2022-03-11"; + format = "setuptools"; src = fetchFromGitHub { owner = "openstack"; diff --git a/pkgs/development/python-modules/pyedimax/default.nix b/pkgs/development/python-modules/pyedimax/default.nix index 03229b30bdddd..e96147ef67a03 100644 --- a/pkgs/development/python-modules/pyedimax/default.nix +++ b/pkgs/development/python-modules/pyedimax/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyedimax"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyemby/default.nix b/pkgs/development/python-modules/pyemby/default.nix index 33180d742e4d7..2646744d0bf8c 100644 --- a/pkgs/development/python-modules/pyemby/default.nix +++ b/pkgs/development/python-modules/pyemby/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyemby"; version = "1.9"; + format = "setuptools"; src = fetchFromGitHub { owner = "mezz64"; diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index 72ec80c6b4a11..1fd61b054f67a 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -47,6 +47,5 @@ buildPythonPackage rec { description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance"; homepage = "https://github.com/wmayner/pyemd"; license = licenses.mit; - maintainers = with maintainers; [ rvl ]; }; } diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 9238e381483ac..448183cf0f580 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyenchant"; version = "3.2.2"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index ce1e74e3ffccc..55a23f8f8d03f 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.14.3"; + version = "1.15.2"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-cjkmRGieSKynL8cZORp11/ViK8oCBAZXrgbFKumWKaM="; + hash = "sha256-4vKfgpCo28btFCTbj7xge7bDImafbOWsabhdMJK5p3Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyepsg/default.nix b/pkgs/development/python-modules/pyepsg/default.nix index 2e0b2c282a26c..0fb511e1c8341 100644 --- a/pkgs/development/python-modules/pyepsg/default.nix +++ b/pkgs/development/python-modules/pyepsg/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyepsg"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyeverlights/default.nix b/pkgs/development/python-modules/pyeverlights/default.nix index 00b9f8fb0154a..22183ddcea285 100644 --- a/pkgs/development/python-modules/pyeverlights/default.nix +++ b/pkgs/development/python-modules/pyeverlights/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyeverlights"; version = "0.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "joncar"; diff --git a/pkgs/development/python-modules/pyevmasm/default.nix b/pkgs/development/python-modules/pyevmasm/default.nix index bccf243a0a020..3b544036ce5a6 100644 --- a/pkgs/development/python-modules/pyevmasm/default.nix +++ b/pkgs/development/python-modules/pyevmasm/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyevmasm"; version = "0.2.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "crytic"; diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix index f20e44b1f8d90..3c9dd3b09b87b 100644 --- a/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyexcel-io"; version = "0.6.6"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix index 519d6b4fc0c65..22339eb15bfec 100644 --- a/pkgs/development/python-modules/pyexcel-ods/default.nix +++ b/pkgs/development/python-modules/pyexcel-ods/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "pyexcel-ods"; version = "0.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix index 314dca9d0ed28..2188d25532ca9 100644 --- a/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "pyexcel-xls"; version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix index 5106df79a2d07..6c35f7b10af5f 100644 --- a/pkgs/development/python-modules/pyexcel/default.nix +++ b/pkgs/development/python-modules/pyexcel/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pyexcel"; version = "0.7.0"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 912754373f3eb..f1c07d89d2dcf 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "5.2.4"; + format = "setuptools"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/pyfakewebcam/default.nix b/pkgs/development/python-modules/pyfakewebcam/default.nix index c130accd40c01..22e56a0a36c7a 100644 --- a/pkgs/development/python-modules/pyfakewebcam/default.nix +++ b/pkgs/development/python-modules/pyfakewebcam/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyfakewebcam"; version = "0.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix index d27cccfbd8c00..106bfa8d893f1 100644 --- a/pkgs/development/python-modules/pyfantom/default.nix +++ b/pkgs/development/python-modules/pyfantom/default.nix @@ -6,6 +6,7 @@ buildPythonPackage { pname = "pyfantom"; version = "unstable-2013-12-18"; + format = "setuptools"; src = fetchgit { url = "http://git.ni.fr.eu.org/pyfantom.git"; diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix index 77ddabe2057ed..997c9e1863865 100644 --- a/pkgs/development/python-modules/pyfcm/default.nix +++ b/pkgs/development/python-modules/pyfcm/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyfcm"; version = "1.4.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "olucurious"; diff --git a/pkgs/development/python-modules/pyfido/default.nix b/pkgs/development/python-modules/pyfido/default.nix index d6f5207bce31c..b07c8d1a5e11b 100644 --- a/pkgs/development/python-modules/pyfido/default.nix +++ b/pkgs/development/python-modules/pyfido/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyfido"; version = "2.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index 0b3bdb7f6d345..a434ed3351eb4 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "1.0.2"; + format = "setuptools"; pname = "pyfiglet"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix index deda70651a568..7622f858959ba 100644 --- a/pkgs/development/python-modules/pyfireservicerota/default.nix +++ b/pkgs/development/python-modules/pyfireservicerota/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pyfireservicerota"; version = "0.0.43"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyflic/default.nix b/pkgs/development/python-modules/pyflic/default.nix index ead4b33929d8d..4ac6d735742e4 100644 --- a/pkgs/development/python-modules/pyflic/default.nix +++ b/pkgs/development/python-modules/pyflic/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyflic"; version = "2.0.3"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyflick/default.nix b/pkgs/development/python-modules/pyflick/default.nix index b6a9c2cf96d46..437f084748732 100644 --- a/pkgs/development/python-modules/pyflick/default.nix +++ b/pkgs/development/python-modules/pyflick/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pyflick"; version = "0.0.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/pyfnip/default.nix b/pkgs/development/python-modules/pyfnip/default.nix index 1306c530bb439..0dca398df7ccd 100644 --- a/pkgs/development/python-modules/pyfnip/default.nix +++ b/pkgs/development/python-modules/pyfnip/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyfnip"; version = "0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyformlang/default.nix b/pkgs/development/python-modules/pyformlang/default.nix new file mode 100644 index 0000000000000..d4a055d459cd2 --- /dev/null +++ b/pkgs/development/python-modules/pyformlang/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, networkx +, numpy +, pydot +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyformlang"; + version = "1.0.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ysX6c8q26bcQyq6GgKBKxTdp00j+4ypb3mgM2cqCmBs="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + networkx + numpy + pydot + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyformlang" ]; + + meta = with lib; { + description = "A python framework for formal grammars"; + homepage = "https://pypi.org/project/pyformlang/"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/pyfreedompro/default.nix b/pkgs/development/python-modules/pyfreedompro/default.nix index f5fd102ed7fca..9a18a3f849943 100644 --- a/pkgs/development/python-modules/pyfreedompro/default.nix +++ b/pkgs/development/python-modules/pyfreedompro/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyfreedompro"; version = "1.1.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix index dfe5449b2826b..a47dff1326458 100644 --- a/pkgs/development/python-modules/pyfribidi/default.nix +++ b/pkgs/development/python-modules/pyfribidi/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "0.12.0"; + format = "setuptools"; pname = "pyfribidi"; disabled = isPyPy; diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index 90fd790380833..822c040c7e746 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -12,6 +12,7 @@ in buildPythonPackage rec { pname = "pyftgl"; version = "0.4b"; + format = "setuptools"; src = fetchFromGitHub { owner = "umlaeute"; diff --git a/pkgs/development/python-modules/pyfttt/default.nix b/pkgs/development/python-modules/pyfttt/default.nix index c8b52fce409ad..8b3687928121b 100644 --- a/pkgs/development/python-modules/pyfttt/default.nix +++ b/pkgs/development/python-modules/pyfttt/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pyfttt"; version = "0.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index 6c5de6581d577..4470ac383042a 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pygal"; version = "3.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index 3c530d199f81f..e2314f9c6e920 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pygame-gui"; version = "069"; + format = "setuptools"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index bf123eef02a5c..5fe78281c8845 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pygame_sdl2"; version = "2.1.0"; + format = "setuptools"; renpy_version = renpy.base_version; name = "${pname}-${version}-${renpy_version}"; diff --git a/pkgs/development/python-modules/pygatt/default.nix b/pkgs/development/python-modules/pygatt/default.nix index 0401fa3d4cbe2..b2bf9416508db 100644 --- a/pkgs/development/python-modules/pygatt/default.nix +++ b/pkgs/development/python-modules/pygatt/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "pygatt"; version = "4.0.5"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index d1b5b31ed9514..e7df202704e43 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pygdbmi"; version = "0.11.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "cs01"; diff --git a/pkgs/development/python-modules/pygeoip/default.nix b/pkgs/development/python-modules/pygeoip/default.nix index b9b588d669aed..66d7140f38e06 100644 --- a/pkgs/development/python-modules/pygeoip/default.nix +++ b/pkgs/development/python-modules/pygeoip/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pygeoip"; version = "0.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix index a31725a1002b8..657da35b4ad32 100644 --- a/pkgs/development/python-modules/pygeos/default.nix +++ b/pkgs/development/python-modules/pygeos/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , python -, geos +, geos_3_11 , pytestCheckHook , cython , numpy @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pygeos"; version = "0.14"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -18,7 +19,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - geos # for geos-config + geos_3_11 # for geos-config cython ]; @@ -47,6 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/pygeos/pygeos"; changelog = "https://github.com/pygeos/pygeos/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ nialov ]; + maintainers = teams.geospatial.members; }; } diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 393ec9f2e4cc9..62c8598f59187 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { version = "2.0.10"; + format = "setuptools"; pname = "pyglet"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix index 0a88e34005cda..edd212b60d9d7 100644 --- a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix +++ b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pygments-markdown-lexer"; version = "0.1.0.dev39"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pygments-style-github/default.nix b/pkgs/development/python-modules/pygments-style-github/default.nix index 918456774f57a..3bf20f31c7643 100644 --- a/pkgs/development/python-modules/pygments-style-github/default.nix +++ b/pkgs/development/python-modules/pygments-style-github/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pygments-style-github"; version = "0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pygpgme/default.nix b/pkgs/development/python-modules/pygpgme/default.nix index ea6364f1125b4..f4a09dbbfa0f6 100644 --- a/pkgs/development/python-modules/pygpgme/default.nix +++ b/pkgs/development/python-modules/pygpgme/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "0.3"; + format = "setuptools"; pname = "pygpgme"; # Native code doesn't compile against the C API of Python 3.11: diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 12876e2a3e022..df256c3a93e6a 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "pygraphviz"; version = "1.11"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix index 92526b465b17b..2b1bccc8d2b23 100644 --- a/pkgs/development/python-modules/pygreat/default.nix +++ b/pkgs/development/python-modules/pygreat/default.nix @@ -3,6 +3,7 @@ buildPythonPackage { pname = "pygreat"; version = "2019.5.1.dev0"; + format = "setuptools"; src = fetchFromGitHub { owner = "greatscottgadgets"; diff --git a/pkgs/development/python-modules/pygrok/default.nix b/pkgs/development/python-modules/pygrok/default.nix index 7414b0df0df2c..9da5545d28736 100644 --- a/pkgs/development/python-modules/pygrok/default.nix +++ b/pkgs/development/python-modules/pygrok/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pygrok"; version = "1.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "garyelephant"; diff --git a/pkgs/development/python-modules/pygsl/default.nix b/pkgs/development/python-modules/pygsl/default.nix index d55ac1d56be7b..13a4644962b39 100644 --- a/pkgs/development/python-modules/pygsl/default.nix +++ b/pkgs/development/python-modules/pygsl/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pygsl"; version = "2.3.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pygtail/default.nix b/pkgs/development/python-modules/pygtail/default.nix index 492a36c50a253..d6e7206ae6c69 100644 --- a/pkgs/development/python-modules/pygtail/default.nix +++ b/pkgs/development/python-modules/pygtail/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pygtail"; version = "0.8.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "bgreenlee"; diff --git a/pkgs/development/python-modules/pygti/default.nix b/pkgs/development/python-modules/pygti/default.nix index 0e0672cb09396..6db8efa7aa310 100644 --- a/pkgs/development/python-modules/pygti/default.nix +++ b/pkgs/development/python-modules/pygti/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pygti"; version = "0.9.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/pygtkspellcheck/default.nix b/pkgs/development/python-modules/pygtkspellcheck/default.nix index a467ff0746434..22b71bdbac833 100644 --- a/pkgs/development/python-modules/pygtkspellcheck/default.nix +++ b/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pygtkspellcheck"; - version = "5.0.2"; + version = "5.0.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-rWV/ghoMWHOAmT8ablwOjJSEhtvPqT/UdoZBXL5Nj0s="; + hash = "sha256-NzaxRXU3BTIcRO9nowEak+Vk+XYw8nBCsTl//e/qg6w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pygtrie/default.nix b/pkgs/development/python-modules/pygtrie/default.nix index 2261129674494..88a69922988c7 100644 --- a/pkgs/development/python-modules/pygtrie/default.nix +++ b/pkgs/development/python-modules/pygtrie/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { pname = "pygtrie"; version = "2.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-IDUUrYJutAPasdLi3dA04NFTS75NvgITuwWT9mvrpOI="; diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index 5e83dc793ca5c..8d3037baa4546 100644 --- a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { pname = "pyhanko-certvalidator"; - version = "0.23.0"; - format = "pyproject"; + version = "0.26.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "MatthiasValvekens"; repo = "certvalidator"; rev = "refs/tags/v${version}"; - hash = "sha256-q2YxncyMHmbRmcoLb68huK02CYiKqF2CFRl8vkUfxg4="; + hash = "sha256-yGFaRpAOTbuVfY5UefC1sdJS4FFkgkIZnHHG35p3n3E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyhanko/0001-Updating-pytest-aiohttp-version.patch b/pkgs/development/python-modules/pyhanko/0001-Updating-pytest-aiohttp-version.patch deleted file mode 100644 index 562dc6461ef93..0000000000000 --- a/pkgs/development/python-modules/pyhanko/0001-Updating-pytest-aiohttp-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 942d4fd37786941bae91b769ef6499a4b4da6843 Mon Sep 17 00:00:00 2001 -From: "P. R. d. O" <d.ol.rod@tutanota.com> -Date: Sat, 9 Apr 2022 12:40:59 -0600 -Subject: [PATCH] Updating pytest-aiohttp version - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index fe33d9a..694fab4 100644 ---- a/setup.py -+++ b/setup.py -@@ -85,7 +85,7 @@ setup( - tests_require=[ - 'pytest>=6.1.1', 'requests-mock>=1.8.0', - 'freezegun>=1.1.0', 'certomancer~=0.8.1', -- 'aiohttp~=3.8.0', 'pytest-aiohttp~=0.3.0', -+ 'aiohttp~=3.8.0', 'pytest-aiohttp~=1.0.3', - 'python-pae==0.1.0' - ], - keywords="signature pdf pades digital-signature pkcs11" --- -2.35.1 - diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix index 8db7aef6d1926..89864ebd62618 100644 --- a/pkgs/development/python-modules/pyhanko/default.nix +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -27,20 +27,21 @@ , tzlocal , uharfbuzz , wheel +, xsdata }: buildPythonPackage rec { pname = "pyhanko"; - version = "0.20.0"; - format = "pyproject"; + version = "0.21.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "pyHanko"; rev = "refs/tags/v${version}"; - hash = "sha256-mWhkTVhq3bDkOlhUZIBBqwXUuQCXcFHW1haGOGMywzg="; + hash = "sha256-+RlrXuKMY89mO4iuFw7RLQABy+wLrAeHlEvTDCpBSqU="; }; postPatch = '' @@ -86,6 +87,9 @@ buildPythonPackage rec { async-http = [ aiohttp ]; + etsi = [ + xsdata + ]; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix index eac566b9037ee..da522b98cec2e 100644 --- a/pkgs/development/python-modules/pyhcl/default.nix +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pyhcl"; version = "0.4.4"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyheif/default.nix b/pkgs/development/python-modules/pyheif/default.nix index 828847cf82fbc..65b895b340da7 100644 --- a/pkgs/development/python-modules/pyheif/default.nix +++ b/pkgs/development/python-modules/pyheif/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyheif"; version = "0.7.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix index 7a05306fa8396..a5b58dc5cdaef 100644 --- a/pkgs/development/python-modules/pyheos/default.nix +++ b/pkgs/development/python-modules/pyheos/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyheos"; version = "0.7.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "andrewsayre"; diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix index ec6d51191966f..341e08186470c 100644 --- a/pkgs/development/python-modules/pyhiveapi/default.nix +++ b/pkgs/development/python-modules/pyhiveapi/default.nix @@ -14,9 +14,8 @@ buildPythonPackage rec { pname = "pyhiveapi"; - version = "0.5.15"; - - format = "pyproject"; + version = "0.5.16"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -24,7 +23,7 @@ buildPythonPackage rec { owner = "Pyhass"; repo = "Pyhiveapi"; rev = "refs/tags/v${version}"; - hash = "sha256-tR2PCR1qGn4KnqAjEpcRTcVlMEpKCwn5RAm99AXBSnk="; + hash = "sha256-gPou5KGLFEFP29qSpRg+6sCiXOwfoF1gyhBVERYJ1LI="; }; postPatch = '' @@ -59,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interface with the Hive API"; homepage = "https://github.com/Pyhass/Pyhiveapi"; + changelog = "https://github.com/Pyhass/Pyhiveapi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index e30063e826d9b..c3e26156f5a2a 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyhomematic"; version = "0.1.77"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pyhomepilot/default.nix b/pkgs/development/python-modules/pyhomepilot/default.nix index 12c395ff954b9..80eacd42b39f5 100644 --- a/pkgs/development/python-modules/pyhomepilot/default.nix +++ b/pkgs/development/python-modules/pyhomepilot/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyhomepilot"; version = "0.0.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyi2cflash/default.nix b/pkgs/development/python-modules/pyi2cflash/default.nix index 7ac3aa5af08e9..7a8a0ac595a6a 100644 --- a/pkgs/development/python-modules/pyi2cflash/default.nix +++ b/pkgs/development/python-modules/pyi2cflash/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyi2cflash"; version = "0.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix index db4bf7eb3c5e6..6e2264b017eaf 100644 --- a/pkgs/development/python-modules/pyialarm/default.nix +++ b/pkgs/development/python-modules/pyialarm/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pyialarm"; version = "2.2.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 299918b5a4aef..f584358109913 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "pyicloud"; version = "1.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "picklepete"; diff --git a/pkgs/development/python-modules/pyimpfuzzy/default.nix b/pkgs/development/python-modules/pyimpfuzzy/default.nix index 18ebf3231e379..39bbee74e539d 100644 --- a/pkgs/development/python-modules/pyimpfuzzy/default.nix +++ b/pkgs/development/python-modules/pyimpfuzzy/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyimpfuzzy"; version = "0.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyinotify/default.nix b/pkgs/development/python-modules/pyinotify/default.nix index e5714ec18001f..9a2a99765504a 100644 --- a/pkgs/development/python-modules/pyinotify/default.nix +++ b/pkgs/development/python-modules/pyinotify/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pyinotify"; version = "0.9.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix index 1d4f4cfa7847f..1172e595e213d 100644 --- a/pkgs/development/python-modules/pyinputevent/default.nix +++ b/pkgs/development/python-modules/pyinputevent/default.nix @@ -6,6 +6,7 @@ buildPythonPackage { pname = "pyinputevent"; version = "2016-10-18"; + format = "setuptools"; src = fetchFromGitHub { owner = "ntzrmtthihu777"; diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 176e9fcd1545a..9a6e1b54ec367 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.5.2"; + version = "1.5.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7iiB/a8E8E2TSkGuAWR08ESExDz8DKTMjqp4Xnp3wHU="; + hash = "sha256-9d6QbekUv63sjKdK+ZogYOkGfFXVW+JB6ITHnehLwtM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyipv8/default.nix b/pkgs/development/python-modules/pyipv8/default.nix new file mode 100644 index 0000000000000..6d0f618df8d29 --- /dev/null +++ b/pkgs/development/python-modules/pyipv8/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchPypi +, buildPythonPackage +, cryptography +, libnacl +, aiohttp +, aiohttp-apispec +, pyopenssl +, pyasn1 +, marshmallow +, typing-extensions +, packaging +, apispec +}: + +buildPythonPackage rec { + pname = "pyipv8"; + version = "2.12.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FXvMykUko3v0GmAZYUt5esBuTbxqpjOL4YxrRfE3u5o="; + }; + + propagatedBuildInputs = [ + cryptography + libnacl + aiohttp + aiohttp-apispec + pyopenssl + pyasn1 + marshmallow + typing-extensions + packaging + apispec + ]; + + doCheck = false; + + meta = with lib; { + description = "Python implementation of Tribler's IPv8 p2p-networking layer"; + homepage = "https://github.com/Tribler/py-ipv8"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ + mkg20001 + ]; + }; +} diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index de604737ace6e..1c3669bc1aa76 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "2023.10.0"; + version = "2023.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "pyiqvia"; rev = "refs/tags/${version}"; - hash = "sha256-8eTa2h+1QOL0T13+lg2OzvaQv6CYYKkviQb4J5KPsvM="; + hash = "sha256-qq6UQUz60WkmWqdmExlSQT3wapaHJr8DeH1eVrTOnpQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyixapi/default.nix b/pkgs/development/python-modules/pyixapi/default.nix index 80111d561b65a..ce5a265ba2637 100644 --- a/pkgs/development/python-modules/pyixapi/default.nix +++ b/pkgs/development/python-modules/pyixapi/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pyixapi"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix index 102ccaf06cf86..ed0a5281e0fa4 100644 --- a/pkgs/development/python-modules/pyjet/default.nix +++ b/pkgs/development/python-modules/pyjet/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyjet"; version = "1.9.0"; + format = "setuptools"; # tests not included in pypi tarball src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyjks/default.nix b/pkgs/development/python-modules/pyjks/default.nix index a05dcadeb84d0..19d885284ea4c 100644 --- a/pkgs/development/python-modules/pyjks/default.nix +++ b/pkgs/development/python-modules/pyjks/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pyjks"; version = "20.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyjsparser/default.nix b/pkgs/development/python-modules/pyjsparser/default.nix index 227cc14b4e63c..e7ef79b092cad 100644 --- a/pkgs/development/python-modules/pyjsparser/default.nix +++ b/pkgs/development/python-modules/pyjsparser/default.nix @@ -8,6 +8,7 @@ let pyjsparser = buildPythonPackage rec { pname = "pyjsparser"; version = "2.7.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "PiotrDabkowski"; diff --git a/pkgs/development/python-modules/pyjwkest/default.nix b/pkgs/development/python-modules/pyjwkest/default.nix index 945cc20528e3d..f89cd22a4c0c3 100644 --- a/pkgs/development/python-modules/pyjwkest/default.nix +++ b/pkgs/development/python-modules/pyjwkest/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "pyjwkest"; version = "1.4.2"; + format = "setuptools"; meta = { description = "Implementation of JWT, JWS, JWE and JWK"; diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index d41b6e6252014..0ba615277e360 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pykdtree"; version = "1.3.7.post0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index bb16c04bec866..25db2847dd350 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pykerberos"; version = "1.2.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pykmtronic/default.nix b/pkgs/development/python-modules/pykmtronic/default.nix index 67f6da455eb19..092a3d826a40b 100644 --- a/pkgs/development/python-modules/pykmtronic/default.nix +++ b/pkgs/development/python-modules/pykmtronic/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pykmtronic"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index 474b526abdd50..99f90e17b028a 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -5,13 +5,14 @@ , fetchFromGitHub , prompt-toolkit , pycryptodome +, pydantic , pythonOlder , setuptools }: buildPythonPackage rec { pname = "pykoplenti"; - version = "1.0.0"; + version = "1.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "stegm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XBOKf3i8xywU/1Kzl+VI1Qnkp9ohpSuDX3AnotD32oo="; + hash = "sha256-2sGkHCIGo1lzLurvQBmq+16sodAaK8v+mAbIH/Gd3+E="; }; nativeBuildInputs = [ @@ -35,11 +36,17 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - click - prompt-toolkit pycryptodome + pydantic ]; + passthru.optional-dependencies = { + CLI = [ + click + prompt-toolkit + ]; + }; + # Project has no tests doCheck = false; diff --git a/pkgs/development/python-modules/pykwalify/default.nix b/pkgs/development/python-modules/pykwalify/default.nix index 41d6a0982104e..790b41626bf0c 100644 --- a/pkgs/development/python-modules/pykwalify/default.nix +++ b/pkgs/development/python-modules/pykwalify/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { version = "1.8.0"; + format = "setuptools"; pname = "pykwalify"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix index 0080ad8293a0f..8e66fc08a6560 100644 --- a/pkgs/development/python-modules/pylatexenc/default.nix +++ b/pkgs/development/python-modules/pylatexenc/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pylatexenc"; version = "2.10"; + format = "setuptools"; src = fetchFromGitHub { owner = "phfaist"; diff --git a/pkgs/development/python-modules/pyld/default.nix b/pkgs/development/python-modules/pyld/default.nix index 464065cbc1750..89d5544a31136 100644 --- a/pkgs/development/python-modules/pyld/default.nix +++ b/pkgs/development/python-modules/pyld/default.nix @@ -21,6 +21,7 @@ in buildPythonPackage rec { pname = "pyld"; version = "1.0.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "digitalbazaar"; diff --git a/pkgs/development/python-modules/pylev/default.nix b/pkgs/development/python-modules/pylev/default.nix index c9c3340db1924..fdc5e2c080127 100644 --- a/pkgs/development/python-modules/pylev/default.nix +++ b/pkgs/development/python-modules/pylev/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pylev"; version = "1.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "toastdriven"; diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix index e1280764972d3..68f2d2d125ca7 100644 --- a/pkgs/development/python-modules/pylibacl/default.nix +++ b/pkgs/development/python-modules/pylibacl/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pylibacl"; version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/pkgs/development/python-modules/pylibconfig2/default.nix index 2cabb78544eb0..0742272543434 100644 --- a/pkgs/development/python-modules/pylibconfig2/default.nix +++ b/pkgs/development/python-modules/pylibconfig2/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { pname = "pylibconfig2"; version = "0.2.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pylibdmtx/default.nix b/pkgs/development/python-modules/pylibdmtx/default.nix index 2152ac54241d4..bf2c4815ec3a6 100644 --- a/pkgs/development/python-modules/pylibdmtx/default.nix +++ b/pkgs/development/python-modules/pylibdmtx/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pylibdmtx"; version = "0.1.10"; + format = "setuptools"; src = fetchFromGitHub { owner = "NaturalHistoryMuseum"; diff --git a/pkgs/development/python-modules/pylibjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg/default.nix new file mode 100644 index 0000000000000..65055d94280c6 --- /dev/null +++ b/pkgs/development/python-modules/pylibjpeg/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, setuptools +, numpy +, pydicom +, pylibjpeg-libjpeg +}: + +let + pylibjpeg-data = buildPythonPackage rec { + pname = "pylibjpeg-data"; + version = "1.0.0dev0"; + pyproject = true; + + nativeBuildInputs = [ setuptools ]; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = "pylibjpeg-data"; + rev = "2ab4b8a65b070656eca2582bd23197a3d01cdccd"; + hash = "sha256-cFE1XjrqyGqwHCYGRucXK+q4k7ftUIbYwBw4WwIFtEc="; + }; + + doCheck = false; + }; +in + +buildPythonPackage rec { + pname = "pylibjpeg"; + version = "1.4.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = "pylibjpeg"; + rev = "refs/tags/v${version}"; + hash = "sha256-Px1DyYDkKAUdYo+ZxZ1w7TkPzWN++styiFl02iQOvyQ="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + pydicom + pylibjpeg-data + pylibjpeg-libjpeg + ]; + + pythonImportsCheck = [ "pylibjpeg" ]; + + meta = with lib; { + description = "Python framework for decoding JPEG images, with a focus on supporting Pydicom"; + homepage = "https://github.com/pydicom/pylibjpeg"; + changelog = "https://github.com/pydicom/pylibjpeg/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + # several test failures of form + # "pydicom.errors.InvalidDicomError: File is missing DICOM File Meta Information header or the 'DICM' prefix is missing from the header. ..." + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index e56b1dfa36839..db962d165f8b2 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pyliblo"; version = "0.10.0"; + format = "setuptools"; disabled = isPyPy; src = fetchurl { diff --git a/pkgs/development/python-modules/pylint-celery/default.nix b/pkgs/development/python-modules/pylint-celery/default.nix index 6bc7a93049e93..d89afecbaa11f 100644 --- a/pkgs/development/python-modules/pylint-celery/default.nix +++ b/pkgs/development/python-modules/pylint-celery/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pylint-celery"; version = "0.3"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pylint-flask/default.nix b/pkgs/development/python-modules/pylint-flask/default.nix index 5077d07a936b2..4a26e256d803e 100644 --- a/pkgs/development/python-modules/pylint-flask/default.nix +++ b/pkgs/development/python-modules/pylint-flask/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pylint-flask"; version = "0.6"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/pylnk3/default.nix b/pkgs/development/python-modules/pylnk3/default.nix index ed50da8b07770..8a48fb731b85b 100644 --- a/pkgs/development/python-modules/pylnk3/default.nix +++ b/pkgs/development/python-modules/pylnk3/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pylnk3"; version = "0.4.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/pylpsd/default.nix b/pkgs/development/python-modules/pylpsd/default.nix index b74a7e65aa15b..c04d82c802762 100644 --- a/pkgs/development/python-modules/pylpsd/default.nix +++ b/pkgs/development/python-modules/pylpsd/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pylpsd"; version = "0.1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-evPL9vF75S8ATkFwzQjh4pLI/aXGXWwoypCb24nXAN8="; diff --git a/pkgs/development/python-modules/pyls-flake8/default.nix b/pkgs/development/python-modules/pyls-flake8/default.nix index 113cf8f24e1f6..9f217aca39072 100644 --- a/pkgs/development/python-modules/pyls-flake8/default.nix +++ b/pkgs/development/python-modules/pyls-flake8/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pyls-flake8"; version = "0.4.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index 8ec10735cadcb..e42c4129e791f 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "pyls-isort"; version = "0.2.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "paradoxxxzero"; diff --git a/pkgs/development/python-modules/pyls-memestra/default.nix b/pkgs/development/python-modules/pyls-memestra/default.nix index 62ae057613a6d..312479d223d77 100644 --- a/pkgs/development/python-modules/pyls-memestra/default.nix +++ b/pkgs/development/python-modules/pyls-memestra/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pyls-memestra"; version = "0.0.16"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix index 509df2efaf79f..d6da0c2925968 100644 --- a/pkgs/development/python-modules/pyls-spyder/default.nix +++ b/pkgs/development/python-modules/pyls-spyder/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyls-spyder"; version = "0.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "spyder-ide"; diff --git a/pkgs/development/python-modules/pylsp-rope/default.nix b/pkgs/development/python-modules/pylsp-rope/default.nix index 1199f40eaeec0..4204499b16c39 100644 --- a/pkgs/development/python-modules/pylsp-rope/default.nix +++ b/pkgs/development/python-modules/pylsp-rope/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pylsp-rope"; version = "0.1.11"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pylsqpack/default.nix b/pkgs/development/python-modules/pylsqpack/default.nix index 3c2eba13d2b93..54123b656e1b2 100644 --- a/pkgs/development/python-modules/pylsqpack/default.nix +++ b/pkgs/development/python-modules/pylsqpack/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pylsqpack"; version = "0.3.17"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix index 69e4af22ccf1e..e4368ec1ac3c0 100644 --- a/pkgs/development/python-modules/pylti/default.nix +++ b/pkgs/development/python-modules/pylti/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { pname = "pylti"; version = "0.7.0"; + format = "setuptools"; disabled = !isPy27; diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix index dfcc0a05798db..b55696d840f97 100644 --- a/pkgs/development/python-modules/pylutron/default.nix +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pylutron"; version = "0.2.10"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix index bde5935d563ed..f3965de56b859 100644 --- a/pkgs/development/python-modules/pylxd/default.nix +++ b/pkgs/development/python-modules/pylxd/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "pylxd"; version = "2.3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "lxc"; diff --git a/pkgs/development/python-modules/pylyrics/default.nix b/pkgs/development/python-modules/pylyrics/default.nix index a3e651e17766e..26530cabf401c 100644 --- a/pkgs/development/python-modules/pylyrics/default.nix +++ b/pkgs/development/python-modules/pylyrics/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pylyrics"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { pname = "PyLyrics"; diff --git a/pkgs/development/python-modules/pylzma/default.nix b/pkgs/development/python-modules/pylzma/default.nix index 78bc24d35d464..aa39989449945 100644 --- a/pkgs/development/python-modules/pylzma/default.nix +++ b/pkgs/development/python-modules/pylzma/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pylzma"; version = "0.5.0"; + format = "setuptools"; # This vendors an old LZMA SDK # After some discussion, it seemed most reasonable to keep it that way diff --git a/pkgs/development/python-modules/pymacaroons/default.nix b/pkgs/development/python-modules/pymacaroons/default.nix index c9ffcc0a0702c..2950e71020dbb 100644 --- a/pkgs/development/python-modules/pymacaroons/default.nix +++ b/pkgs/development/python-modules/pymacaroons/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pymacaroons"; version = "0.13.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix index 57a806c60b4ef..755c03501e562 100644 --- a/pkgs/development/python-modules/pymarshal/default.nix +++ b/pkgs/development/python-modules/pymarshal/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pymarshal"; version = "2.2.0"; + format = "setuptools"; disabled = pythonOlder "3.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pymata-express/default.nix b/pkgs/development/python-modules/pymata-express/default.nix index a4306fb4ed827..47475845198a4 100644 --- a/pkgs/development/python-modules/pymata-express/default.nix +++ b/pkgs/development/python-modules/pymata-express/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pymata-express"; version = "1.21"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pymaven-patch/default.nix b/pkgs/development/python-modules/pymaven-patch/default.nix index 602399b2d024a..8218ccddcc61e 100644 --- a/pkgs/development/python-modules/pymaven-patch/default.nix +++ b/pkgs/development/python-modules/pymaven-patch/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "pymaven-patch"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 374f7d26c9d03..93f68ad6b216b 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,12 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.40"; + version = "2.4.41"; + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-PWpVKtNEof/54MgRNhrJ2LuCAc9qrK1yJNUW+gN8yzA="; + hash = "sha256-7TIlzphdBhA6qyUa/Ig9BKmKHW21xzmV595MqssfZs0="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 355d8511b6a4c..746525e7030c2 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.10.0"; + version = "5.10.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-cjvEP7vkFQKwUPwHw3JWbS8+U8PEaL3c1D2NwV3uLOU="; + hash = "sha256-cVmIxwO1TQ8H+Sm828sxaZ6InvIkdCRhFSH5k52W1DI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymdstat/default.nix b/pkgs/development/python-modules/pymdstat/default.nix index 54c2096978617..ced572b7b36d0 100644 --- a/pkgs/development/python-modules/pymdstat/default.nix +++ b/pkgs/development/python-modules/pymdstat/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pymdstat"; version = "0.4.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "nicolargo"; diff --git a/pkgs/development/python-modules/pymediaroom/default.nix b/pkgs/development/python-modules/pymediaroom/default.nix index 364063f786281..744ef3d02e2b3 100644 --- a/pkgs/development/python-modules/pymediaroom/default.nix +++ b/pkgs/development/python-modules/pymediaroom/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pymediaroom"; version = "0.6.5.4"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pymemoize/default.nix b/pkgs/development/python-modules/pymemoize/default.nix index 9fdb8bbc26512..14f2fc39aa9e7 100644 --- a/pkgs/development/python-modules/pymemoize/default.nix +++ b/pkgs/development/python-modules/pymemoize/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pymemoize"; version = "1.0.3"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/pyment/default.nix b/pkgs/development/python-modules/pyment/default.nix index fbf2c93fde605..768bc459b5b57 100644 --- a/pkgs/development/python-modules/pyment/default.nix +++ b/pkgs/development/python-modules/pyment/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyment"; version = "0.3.3"; + format = "setuptools"; src = fetchPypi { pname = "Pyment"; diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index 7742a8890455c..f8371a4db057c 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pymetar"; version = "1.4"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pymeteireann/default.nix b/pkgs/development/python-modules/pymeteireann/default.nix index 711392b4a30f7..be85e6a5e008c 100644 --- a/pkgs/development/python-modules/pymeteireann/default.nix +++ b/pkgs/development/python-modules/pymeteireann/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pymeteireann"; version = "2021.8.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "DylanGore"; diff --git a/pkgs/development/python-modules/pymeteoclimatic/default.nix b/pkgs/development/python-modules/pymeteoclimatic/default.nix index 463acc3f9d955..b47809d13a772 100644 --- a/pkgs/development/python-modules/pymeteoclimatic/default.nix +++ b/pkgs/development/python-modules/pymeteoclimatic/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pymeteoclimatic"; version = "0.0.6"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pymiele/default.nix b/pkgs/development/python-modules/pymiele/default.nix new file mode 100644 index 0000000000000..db951d6d7a990 --- /dev/null +++ b/pkgs/development/python-modules/pymiele/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "pymiele"; + version = "0.1.7"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-nlilHcBdWpCIknhE/RRvcmuz1waNdmcPt++Vi3amvHg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ + "pymiele" + ]; + + meta = with lib; { + changelog = "https://github.com/astrandb/pymiele/releases/tag/v${version}"; + description = "Lib for Miele integration with Home Assistant"; + homepage = "https://github.com/astrandb/pymiele"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix index 0724161bf4236..be0ee9bd2bc45 100644 --- a/pkgs/development/python-modules/pymilter/default.nix +++ b/pkgs/development/python-modules/pymilter/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pymilter"; version = "1.0.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "sdgathman"; diff --git a/pkgs/development/python-modules/pymitv/default.nix b/pkgs/development/python-modules/pymitv/default.nix index bc53a9e79a2be..98d3a88e97b95 100644 --- a/pkgs/development/python-modules/pymitv/default.nix +++ b/pkgs/development/python-modules/pymitv/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pymitv"; version = "1.5.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 539502db35b3e..4c6676ae97a0f 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -72,6 +72,10 @@ buildPythonPackage rec { disabledTests = [ # Tests often hang "test_connected" + ] ++ lib.optionals (lib.versionAtLeast aiohttp.version "3.9.0") [ + "test_split_serial_packet" + "test_serial_poll" + "test_simulator" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix index 637bd4dc17b37..64858b1e076e6 100644 --- a/pkgs/development/python-modules/pymoo/default.nix +++ b/pkgs/development/python-modules/pymoo/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { pname = "pymoo"; version = "0.6.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "anyoptimization"; diff --git a/pkgs/development/python-modules/pymorphy2/default.nix b/pkgs/development/python-modules/pymorphy2/default.nix index 5195840c3119f..300a9230d2e1d 100644 --- a/pkgs/development/python-modules/pymorphy2/default.nix +++ b/pkgs/development/python-modules/pymorphy2/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pymorphy2"; version = "0.9.1"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pymorphy3/default.nix b/pkgs/development/python-modules/pymorphy3/default.nix index 2ef0e9629bd50..4c071939740ed 100644 --- a/pkgs/development/python-modules/pymorphy3/default.nix +++ b/pkgs/development/python-modules/pymorphy3/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pymorphy3"; version = "1.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "no-plagiarism"; diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix index f80a920631956..dc58ba668692b 100644 --- a/pkgs/development/python-modules/pymvglive/default.nix +++ b/pkgs/development/python-modules/pymvglive/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pymvglive"; version = "1.1.4"; + format = "setuptools"; src = fetchPypi { pname = "PyMVGLive"; diff --git a/pkgs/development/python-modules/pymystem3/default.nix b/pkgs/development/python-modules/pymystem3/default.nix index b8aa6469b7f81..9ffb4bcdedae6 100644 --- a/pkgs/development/python-modules/pymystem3/default.nix +++ b/pkgs/development/python-modules/pymystem3/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "pymystem3"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pynac/default.nix b/pkgs/development/python-modules/pynac/default.nix index a6df8cb036d4e..45fb25f7315a1 100644 --- a/pkgs/development/python-modules/pynac/default.nix +++ b/pkgs/development/python-modules/pynac/default.nix @@ -6,6 +6,7 @@ buildPythonPackage { pname = "pynac"; version = "0.2"; + format = "setuptools"; src = fetchurl { url = "mirror://sourceforge/project/pynac/pynac/pynac-0.2/pynac-0.2.tar.gz"; diff --git a/pkgs/development/python-modules/pynanoleaf/default.nix b/pkgs/development/python-modules/pynanoleaf/default.nix index 9fab8f7b31c02..443865d8eaad6 100644 --- a/pkgs/development/python-modules/pynanoleaf/default.nix +++ b/pkgs/development/python-modules/pynanoleaf/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pynanoleaf"; version = "0.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 9dd31aa725b3b..d3efec9a6a264 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { version = "2.0.3"; pname = "pync"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyngo/default.nix b/pkgs/development/python-modules/pyngo/default.nix index 91d39a4ab0a22..81bddae490d3a 100644 --- a/pkgs/development/python-modules/pyngo/default.nix +++ b/pkgs/development/python-modules/pyngo/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pyngo"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "yezz123"; repo = "pyngo"; - rev = version; - hash = "sha256-qOY1ILMDqSguLnbhuu5JJVMvG3uA08Lv2fB70TgrKqI="; + rev = "refs/tags/${version}"; + hash = "sha256-cMWYmCbkhJmz+RMCh3NIhOkC5bX46nwz09WhTV+Mz6w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index bd3931e4f1dc3..e5c027171813c 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.0.1"; + version = "7.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wTK0DnsZBbB9nHMe8hUQjMl3sbv0RaFGiU4NSJshPrY="; + hash = "sha256-VEIsGjVFx5Q7G2cKtMYQY7Te1TpFUZYZJRZvRMAwSS8="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index 2d1979c1b0c13..c00032cb2c4e2 100644 --- a/pkgs/tools/security/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -1,5 +1,5 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi , pythonRelaxDepsHook , installShellFiles @@ -30,17 +30,17 @@ let pname = "pynitrokey"; - version = "0.4.43"; + version = "0.4.44"; mainProgram = "nitropy"; in -buildPythonApplication { +buildPythonPackage { inherit pname version; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dYOdokqALDg4Xn7N6Yd0skM/tit+j5+xY73sm9k76hE="; + hash = "sha256-SWLxiUAE8AVa+EYjOk0kzOcW65TJbvUe627VmJY7nFY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index 859b12647460f..2bfdd61a62025 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pynmea2"; version = "1.19.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pynut2/default.nix b/pkgs/development/python-modules/pynut2/default.nix index 11313dcadc696..4c56cdff0de8a 100644 --- a/pkgs/development/python-modules/pynut2/default.nix +++ b/pkgs/development/python-modules/pynut2/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pynut2"; version = "2.1.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "mezz64"; diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 2ce6e83315a3f..829ec7d68b121 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , msgpack , greenlet , pythonOlder @@ -9,14 +10,16 @@ buildPythonPackage rec { pname = "pynvim"; - version = "0.4.3"; - format = "setuptools"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-OnlTeL3l6AkvvrOhqZvpxhPSaFVC8dsOXG/UZ+7Vbf8="; + src = fetchFromGitHub { + owner = "neovim"; + repo = "pynvim"; + rev = "refs/tags/${version}"; + hash = "sha256-3LqgKENFzdfCjMlD6Xzv5W23yvIkNMUYo2+LlzKZ3cc="; }; postPatch = '' @@ -24,6 +27,10 @@ buildPythonPackage rec { --replace " + pytest_runner" "" ''; + buildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ msgpack ] ++ lib.optionals (!isPyPy) [ diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index c3f75acfc569d..7a280bfed9038 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pynvml"; version = "11.5.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix index d2dd95f42451b..5c3b5c7c49a28 100644 --- a/pkgs/development/python-modules/pynws/default.nix +++ b/pkgs/development/python-modules/pynws/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pynws"; version = "1.6.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pynx584/default.nix b/pkgs/development/python-modules/pynx584/default.nix index e5f3a81218daa..405f66a7465c6 100644 --- a/pkgs/development/python-modules/pynx584/default.nix +++ b/pkgs/development/python-modules/pynx584/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pynx584"; version = "0.8.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/pynzb/default.nix b/pkgs/development/python-modules/pynzb/default.nix index 3f1cca75dc15c..18ef6c0312851 100644 --- a/pkgs/development/python-modules/pynzb/default.nix +++ b/pkgs/development/python-modules/pynzb/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pynzb"; version = "0.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 9e0de7f3915d2..30f1a4115079a 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.6.2"; + version = "6.7.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-hh2sfWOUp3ac75NEuTrw3YkvS7hXpzJp39v6cfrhNiQ="; + hash = "sha256-HoTtvda97ghQ0SQBZFGkDAwD2WNtZpIum2m1khivEK4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index c57fd7f12276b..37ec8b60f0f37 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2023.11.0"; + version = "2023.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "pyopenuv"; rev = "refs/tags/${version}"; - hash = "sha256-qlyKLovM0h3iWvhGecaFPswnchZXPNkr0PbSqK2UW0c="; + hash = "sha256-r+StbiU77/1dz41tCseleIWjiIvuvRveVgPNr3n4CEY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyopnsense/default.nix b/pkgs/development/python-modules/pyopnsense/default.nix index a1df192ac223a..7fdd6170a3774 100644 --- a/pkgs/development/python-modules/pyopnsense/default.nix +++ b/pkgs/development/python-modules/pyopnsense/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "pyopnsense"; version = "0.4.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index f164e91b7b9da..fe9574105289f 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.13.1"; + version = "1.16.0"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gacou54"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LahLR+LbppcPKs0gPT2lEP48XG6pbGMvCBW/EwAIFDQ="; + hash = "sha256-qwH3kJzJRHuuGW7tgcaQjT+JwDsAZksQDZciaJLC55Q="; }; nativeBuildInputs = [ pythonRelaxDepsHook poetry-core ]; diff --git a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix index 0c07a12fc1f33..5aa9352f7a4cc 100644 --- a/pkgs/development/python-modules/pyoutbreaksnearme/default.nix +++ b/pkgs/development/python-modules/pyoutbreaksnearme/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoutbreaksnearme"; - version = "2023.10.0"; + version = "2023.12.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "pyoutbreaksnearme"; rev = "refs/tags/${version}"; - hash = "sha256-G+/ooNhiYOaV0kjfr8Z1d31XxRYFArQnt1oIuMQfXdY="; + hash = "sha256-oR/DApOxNSSczrBeH4sytd/vasbD4rA1poW4zNoeAnU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index af384e0a228cb..1cb5100764319 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.13.3"; + version = "1.13.4"; 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-OvzK7NHRcv/UGLLZ60yNBNdK/J21iFh8myCvdBec+7Q="; + hash = "sha256-VMf6WBWf33KEWJG8UtCDZCa20a8kmVd5UpLIcJgzDis="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyparser/default.nix b/pkgs/development/python-modules/pyparser/default.nix index 8e4deafd542c7..f7db023608c24 100644 --- a/pkgs/development/python-modules/pyparser/default.nix +++ b/pkgs/development/python-modules/pyparser/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "pyparser"; version = "1.0"; + format = "setuptools"; # Missing tests on Pypi src = fetchFromBitbucket { diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index 84d8439a5360b..7eeedaa2cad8d 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pyparted"; version = "3.13.0"; + format = "setuptools"; disabled = isPyPy; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 9c497b3e3b504..73a261d07a217 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { pname = "pypass"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pypblib/default.nix b/pkgs/development/python-modules/pypblib/default.nix index 4cf8d5fc7b65d..0132f43ffa467 100644 --- a/pkgs/development/python-modules/pypblib/default.nix +++ b/pkgs/development/python-modules/pypblib/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pypblib"; version = "0.0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pypca/default.nix b/pkgs/development/python-modules/pypca/default.nix index 86adb4e3e14aa..28e958e4b6260 100644 --- a/pkgs/development/python-modules/pypca/default.nix +++ b/pkgs/development/python-modules/pypca/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pypca"; version = "0.0.13"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix index ef973625ec74a..2c3997c8941aa 100644 --- a/pkgs/development/python-modules/pypcap/default.nix +++ b/pkgs/development/python-modules/pypcap/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pypcap"; version = "1.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "pynetwork"; diff --git a/pkgs/development/python-modules/pypdf3/default.nix b/pkgs/development/python-modules/pypdf3/default.nix index 0ac738f513a69..f70b04db22272 100644 --- a/pkgs/development/python-modules/pypdf3/default.nix +++ b/pkgs/development/python-modules/pypdf3/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pypdf3"; version = "1.0.6"; + format = "setuptools"; src = fetchPypi { pname = "PyPDF3"; diff --git a/pkgs/development/python-modules/pypeg2/default.nix b/pkgs/development/python-modules/pypeg2/default.nix index 8b630f743d198..092ba9472aa75 100644 --- a/pkgs/development/python-modules/pypeg2/default.nix +++ b/pkgs/development/python-modules/pypeg2/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "2.15.2"; + format = "setuptools"; pname = "pypeg2"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pypemicro/default.nix b/pkgs/development/python-modules/pypemicro/default.nix index 6accd0e94343a..f73649ac72fe8 100644 --- a/pkgs/development/python-modules/pypemicro/default.nix +++ b/pkgs/development/python-modules/pypemicro/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pypemicro"; version = "0.1.11"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index 127301752d657..73ea4bd1c80db 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "1.8.2"; + format = "setuptools"; pname = "pyperclip"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index a1e4b81c6ae25..15eb6342988fb 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -39,6 +39,5 @@ buildPythonPackage rec { homepage = "https://github.com/Kozea/Pyphen"; changelog = "https://github.com/Kozea/Pyphen/releases/tag/${version}"; license = with licenses; [gpl2 lgpl21 mpl20]; - maintainers = with maintainers; [ rvl ]; }; } diff --git a/pkgs/development/python-modules/pyphotonfile/default.nix b/pkgs/development/python-modules/pyphotonfile/default.nix index 7a350bd3b13fe..9d7a30213869a 100644 --- a/pkgs/development/python-modules/pyphotonfile/default.nix +++ b/pkgs/development/python-modules/pyphotonfile/default.nix @@ -6,6 +6,7 @@ }: let version = "0.2.1"; + format = "setuptools"; in buildPythonPackage { pname = "pyphotonfile"; diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix index 1fc4198ebeb6e..3d1b9807b34da 100644 --- a/pkgs/development/python-modules/pypillowfight/default.nix +++ b/pkgs/development/python-modules/pypillowfight/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pypillowfight"; version = "0.3.0"; + format = "setuptools"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 8175214d68d1d..f42315c331981 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.49.0"; + version = "0.50.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mozillazg"; repo = "python-pinyin"; rev = "refs/tags/v${version}"; - hash = "sha256-4XiPkx7tYD5PQVyeJ/nvxrRzWmeLp9JfY1B853IEE7U="; + hash = "sha256-9RnuC9AvTlUtZqep6kn5y1xQcq/dzA9jTZXAsMpKZWc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pypresence/default.nix b/pkgs/development/python-modules/pypresence/default.nix index e400956aaf499..32f81827836b4 100644 --- a/pkgs/development/python-modules/pypresence/default.nix +++ b/pkgs/development/python-modules/pypresence/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pypresence"; version = "4.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyprof2calltree/default.nix b/pkgs/development/python-modules/pyprof2calltree/default.nix index 77f24e3e15e23..c0f71dc8b64f1 100644 --- a/pkgs/development/python-modules/pyprof2calltree/default.nix +++ b/pkgs/development/python-modules/pyprof2calltree/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyprof2calltree"; version = "1.4.5"; + format = "setuptools"; # Fetch from GitHub because the PyPi packaged version does not # include all test files. diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 576688accc075..242e80bc4a4e7 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "pyproj"; version = "3.6.1"; + format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyptlib/default.nix b/pkgs/development/python-modules/pyptlib/default.nix index 9f9f99884b985..24d4cbf86b293 100644 --- a/pkgs/development/python-modules/pyptlib/default.nix +++ b/pkgs/development/python-modules/pyptlib/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyptlib"; version = "0.0.6"; + format = "setuptools"; disabled = isPyPy || isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/pypubsub/default.nix b/pkgs/development/python-modules/pypubsub/default.nix index db473a2938957..e883700ca78ba 100644 --- a/pkgs/development/python-modules/pypubsub/default.nix +++ b/pkgs/development/python-modules/pypubsub/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pypubsub"; version = "4.0.3"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index cf2a413a04d25..9b8ebad61eebe 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "pypugjs"; version = "5.9.12"; + format = "setuptools"; src = fetchFromGitHub { owner = "kakulukia"; diff --git a/pkgs/development/python-modules/pyqldb/default.nix b/pkgs/development/python-modules/pyqldb/default.nix index 5d072364ea3c1..377a33cb90a3a 100644 --- a/pkgs/development/python-modules/pyqldb/default.nix +++ b/pkgs/development/python-modules/pyqldb/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyqldb"; version = "3.2.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "awslabs"; diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix index 345b5aa13a1e2..ad1ed8e170381 100644 --- a/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/pkgs/development/python-modules/pyqt-builder/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.15.2"; + version = "1.15.3"; format = "pyproject"; src = fetchPypi { pname = "PyQt-builder"; inherit version; - hash = "sha256-dGz+g8A+v/RFjUeKHAZxR5Dvk+RY7NWii8KDe6yI63Q="; + hash = "sha256-WzPpnty3fUpjo4YF9EV6BM/04lTHce1SnryViZBszbE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyqt-builder/use-sip-distinfo-from-path.patch b/pkgs/development/python-modules/pyqt-builder/use-sip-distinfo-from-path.patch deleted file mode 100644 index 43b2d7367e963..0000000000000 --- a/pkgs/development/python-modules/pyqt-builder/use-sip-distinfo-from-path.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/pyqtbuild/builder.py b/pyqtbuild/builder.py -index 3f35a7f..58701dd 100644 ---- a/pyqtbuild/builder.py -+++ b/pyqtbuild/builder.py -@@ -51,15 +51,6 @@ class QmakeBuilder(Builder): - """ Set default values for user options that haven't been set yet. """ - - if tool in Option.BUILD_TOOLS: -- # A PEP 517 frontend will set PATH so that sip-distinfo is found on -- # it. However for our own frontends we want to use the version -- # corresponding to the frontend (and, anyway, the frontend may not -- # be on PATH). -- if tool != 'pep517': -- self._sip_distinfo = os.path.join( -- os.path.abspath(os.path.dirname(sys.argv[0])), -- self._sip_distinfo) -- - # Check we have a qmake. - if self.qmake is None: - self.qmake = self._find_exe('qmake') diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index 641b12f4e50d9..db37cab6ac1a5 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "PyQt6"; - version = "6.5.2"; + version = "6.6.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-FIfuc1D5/7ZtYKtBdlGSUsKzcXYsvo+DQP2VH2OAEoA="; + hash = "sha256-nxWKop0gUULFbw810HeEuN8L4oN40gqXvNqL1k/9A3k="; }; patches = [ @@ -132,11 +132,7 @@ buildPythonPackage rec { ++ lib.optional withLocation "PyQt6.QtPositioning" ; - # fix build with qt 6.6 - env.NIX_CFLAGS_COMPILE = toString ([ - "-fpermissive" - ] - ++ lib.optional (stdenv.isDarwin) "-Wno-address-of-temporary"); + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-address-of-temporary"; meta = with lib; { description = "Python bindings for Qt6"; diff --git a/pkgs/development/python-modules/pyqt6-charts.nix b/pkgs/development/python-modules/pyqt6-charts.nix index 6d2a110c8890d..258a9c2eb8f4f 100644 --- a/pkgs/development/python-modules/pyqt6-charts.nix +++ b/pkgs/development/python-modules/pyqt6-charts.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "PyQt6_Charts"; - version = "6.5.0"; + version = "6.6.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-b/APZbJRf5m/EG3dKMdvPKNE+R7PW6aBkeIKLZACSWI="; + sha256 = "sha256-FMxuXRnK6AEpUkpC+mMy0NXa2kKCqUI0Jea5rhtrxW0="; }; # fix include path and increase verbosity diff --git a/pkgs/development/python-modules/pyqt6-webengine.nix b/pkgs/development/python-modules/pyqt6-webengine.nix index d3b70a02f77dd..1b42da5731e8e 100644 --- a/pkgs/development/python-modules/pyqt6-webengine.nix +++ b/pkgs/development/python-modules/pyqt6-webengine.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "PyQt6_WebEngine"; - version = "6.5.0"; + version = "6.6.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-i6nbVsTBgaKi+rFnPKNeW2PcaRE/CFAn3cQ8cQttbuk="; + hash = "sha256-1QuYTD+F5AnmkrFWEychUi1OjPm2wl4M+Sfuot+zlIc="; }; # fix include path and increase verbosity diff --git a/pkgs/development/python-modules/pyqtwebengine/fix-build-with-qt-514.patch b/pkgs/development/python-modules/pyqtwebengine/fix-build-with-qt-514.patch deleted file mode 100644 index 1ae911c14817b..0000000000000 --- a/pkgs/development/python-modules/pyqtwebengine/fix-build-with-qt-514.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip b/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip -index 5fb508f..7a4654a 100644 ---- a/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip -+++ b/sip/QtWebEngineWidgets/qwebenginecertificateerror.sip -@@ -48,7 +48,7 @@ public: - %If (QtWebEngine_5_8_0 -) - CertificateTransparencyRequired, - %End --%If (QtWebEngine_5_14_0 -) -+%If (QtWebEngine_5_15_0 -) - CertificateKnownInterceptionBlocked, - %End - }; -diff --git a/sip/QtWebEngineWidgets/qwebenginepage.sip b/sip/QtWebEngineWidgets/qwebenginepage.sip -index 0dcbed2..9aa3443 100644 ---- a/sip/QtWebEngineWidgets/qwebenginepage.sip -+++ b/sip/QtWebEngineWidgets/qwebenginepage.sip -@@ -663,10 +663,10 @@ signals: - %End - - public: --%If (QtWebEngine_5_14_0 -) -+%If (QtWebEngine_5_15_0 -) - qint64 renderProcessPid() const; - %End --%If (QtWebEngine_5_14_0 -) -+%If (QtWebEngine_5_15_0 -) - void renderProcessPidChanged(qint64 pid); - %End - }; - diff --git a/pkgs/development/python-modules/pyquaternion/default.nix b/pkgs/development/python-modules/pyquaternion/default.nix index 512038a8acc6e..cb10c3bc55454 100644 --- a/pkgs/development/python-modules/pyquaternion/default.nix +++ b/pkgs/development/python-modules/pyquaternion/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyquaternion"; version = "0.9.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyrabbit2/default.nix b/pkgs/development/python-modules/pyrabbit2/default.nix index 0f88c0afb7adc..8cd8be5186160 100644 --- a/pkgs/development/python-modules/pyrabbit2/default.nix +++ b/pkgs/development/python-modules/pyrabbit2/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyrabbit2"; version = "1.0.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyramid-beaker/default.nix b/pkgs/development/python-modules/pyramid-beaker/default.nix index 4a9fd61f26163..aad88af5f16a4 100644 --- a/pkgs/development/python-modules/pyramid-beaker/default.nix +++ b/pkgs/development/python-modules/pyramid-beaker/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyramid-beaker"; version = "0.8"; + format = "setuptools"; src = fetchPypi { pname = "pyramid_beaker"; diff --git a/pkgs/development/python-modules/pyramid-chameleon/default.nix b/pkgs/development/python-modules/pyramid-chameleon/default.nix index 69862bdfe5543..81e3d151e91e4 100644 --- a/pkgs/development/python-modules/pyramid-chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid-chameleon/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "pyramid-chameleon"; version = "0.3"; + format = "setuptools"; src = fetchPypi { pname = "pyramid_chameleon"; diff --git a/pkgs/development/python-modules/pyramid-exclog/default.nix b/pkgs/development/python-modules/pyramid-exclog/default.nix index c54ff94ff1670..b0deb497a56f9 100644 --- a/pkgs/development/python-modules/pyramid-exclog/default.nix +++ b/pkgs/development/python-modules/pyramid-exclog/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyramid-exclog"; version = "1.1"; + format = "setuptools"; src = fetchPypi { pname = "pyramid_exclog"; diff --git a/pkgs/development/python-modules/pyramid-mako/default.nix b/pkgs/development/python-modules/pyramid-mako/default.nix index d55eee1a37f33..11af191361377 100644 --- a/pkgs/development/python-modules/pyramid-mako/default.nix +++ b/pkgs/development/python-modules/pyramid-mako/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pyramid-mako"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyrdfa3/default.nix b/pkgs/development/python-modules/pyrdfa3/default.nix index 398da024053af..ef6d33cb8e804 100644 --- a/pkgs/development/python-modules/pyrdfa3/default.nix +++ b/pkgs/development/python-modules/pyrdfa3/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pyrdfa3"; version = "3.5.3"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index 7372e88482fff..1a575db7c2e21 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.2.5"; + version = "1.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Roche"; repo = "pyreadstat"; rev = "refs/tags/v${version}"; - hash = "sha256-npzriBrp/ex0noH6EAmWnFyHzVkOKvQ68J578NujMHA="; + hash = "sha256-VcPpGRrE/5udNijodO88Lw69JPOm6ZN7BZb4xD34srQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrect/default.nix b/pkgs/development/python-modules/pyrect/default.nix index ac0b6b598d801..0d61a2e182a0f 100644 --- a/pkgs/development/python-modules/pyrect/default.nix +++ b/pkgs/development/python-modules/pyrect/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyrect"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { pname = "PyRect"; diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix index a3bbd94663c26..26c52f87c8817 100644 --- a/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyrfxtrx"; version = "0.30.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "Danielhiversen"; diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index 0233d2d0d1c4f..98a02ad48e33d 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyrisco"; version = "0.5.8"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyro-api/default.nix b/pkgs/development/python-modules/pyro-api/default.nix index aaf4571900b72..9791d8bbaa8e1 100644 --- a/pkgs/development/python-modules/pyro-api/default.nix +++ b/pkgs/development/python-modules/pyro-api/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "0.1.2"; + format = "setuptools"; pname = "pyro-api"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index 9d2c220c472f8..b9669e41d3b22 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pyroma"; version = "3.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "regebro"; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 48ad5bb08e94d..f24534af0083a 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.9"; + version = "0.7.10"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tp2C8UCwd0MX17pA9sX6HXVQmLo/PrYZmC0W51DcYxo="; + hash = "sha256-zC+QqtFRfLCzAQQfZ4zI08NCfCblPxXHjJPGeSjYmgI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index 4f7eb66231951..b84d1a67f1d8d 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pyrr"; version = "unstable-2022-07-22"; + format = "setuptools"; src = fetchFromGitHub { owner = "adamlwgriffiths"; diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 37de5033477f6..2f21caa001d39 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pyrsistent"; version = "0.19.3"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/pyrss2gen/default.nix b/pkgs/development/python-modules/pyrss2gen/default.nix index 00c823475a63a..9820eb1583f0f 100644 --- a/pkgs/development/python-modules/pyrss2gen/default.nix +++ b/pkgs/development/python-modules/pyrss2gen/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pyrss2gen"; version = "1.1"; + format = "setuptools"; src = fetchPypi { pname = "PyRSS2Gen"; diff --git a/pkgs/development/python-modules/pysabnzbd/default.nix b/pkgs/development/python-modules/pysabnzbd/default.nix index e77b8cd681889..e6116e6442d17 100644 --- a/pkgs/development/python-modules/pysabnzbd/default.nix +++ b/pkgs/development/python-modules/pysabnzbd/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pysabnzbd"; version = "1.1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "jeradM"; diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 108e2dab9124f..50661d9246919 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "pysam"; version = "0.21.0"; + format = "setuptools"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. diff --git a/pkgs/development/python-modules/pysatochip/default.nix b/pkgs/development/python-modules/pysatochip/default.nix index 4547fa827b72e..f508bc303239d 100644 --- a/pkgs/development/python-modules/pysatochip/default.nix +++ b/pkgs/development/python-modules/pysatochip/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "pysatochip"; version = "0.14.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pysbd/default.nix b/pkgs/development/python-modules/pysbd/default.nix index 684846a0ceb59..f2062569534e6 100644 --- a/pkgs/development/python-modules/pysbd/default.nix +++ b/pkgs/development/python-modules/pysbd/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pysbd"; version = "0.3.4"; + format = "setuptools"; disabled = pythonOlder "3.5"; # provides no sdist on pypi diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 784978b7ca479..779af5e7f4f87 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "pyscf"; version = "2.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "pyscf"; diff --git a/pkgs/development/python-modules/pyschedule/default.nix b/pkgs/development/python-modules/pyschedule/default.nix index 7ee23f34e0938..3d51b3bb9deea 100644 --- a/pkgs/development/python-modules/pyschedule/default.nix +++ b/pkgs/development/python-modules/pyschedule/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyschedule"; version = "0.2.34"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyschlage/default.nix b/pkgs/development/python-modules/pyschlage/default.nix index 8cedcfb434ad4..d4b8d2970a1ee 100644 --- a/pkgs/development/python-modules/pyschlage/default.nix +++ b/pkgs/development/python-modules/pyschlage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2023.11.0"; + version = "2023.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; rev = "refs/tags/${version}"; - hash = "sha256-18kVXGpklfvCGOy2jBOG9BAAzE0ZVQ3LONjiwo9YnjU="; + hash = "sha256-arodPjiigEx90W8ycneD8Ho6SLQaB9FfFtdV74fZp2w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix index f04b85a9d0032..50a1389fbb238 100644 --- a/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "pyscreenshot"; version = "3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyscrypt/default.nix b/pkgs/development/python-modules/pyscrypt/default.nix index 372f6db083244..223802d449965 100644 --- a/pkgs/development/python-modules/pyscrypt/default.nix +++ b/pkgs/development/python-modules/pyscrypt/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyscrypt"; version = "1.6.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pysendfile/default.nix b/pkgs/development/python-modules/pysendfile/default.nix index d2a73bb728207..af3c07cb851ce 100644 --- a/pkgs/development/python-modules/pysendfile/default.nix +++ b/pkgs/development/python-modules/pysendfile/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pysendfile"; version = "2.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix index 0c8e324402096..eccb831300fe0 100644 --- a/pkgs/development/python-modules/pysensors/default.nix +++ b/pkgs/development/python-modules/pysensors/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, unittestCheckHook, fetchFromGitHub, lm_sensors }: buildPythonPackage { version = "2017-07-13"; + format = "setuptools"; pname = "pysensors"; # note that https://pypi.org/project/PySensors/ is a different project diff --git a/pkgs/development/python-modules/pyserial-asyncio/default.nix b/pkgs/development/python-modules/pyserial-asyncio/default.nix index 34bfacb9c0c59..6167c40d44f07 100644 --- a/pkgs/development/python-modules/pyserial-asyncio/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyserial-asyncio"; version = "0.6"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/pysftp/default.nix b/pkgs/development/python-modules/pysftp/default.nix index 3333a30bd1ac7..c138f21f01793 100644 --- a/pkgs/development/python-modules/pysftp/default.nix +++ b/pkgs/development/python-modules/pysftp/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pysftp"; version = "0.2.9"; + format = "setuptools"; disabled = isPyPy; src = fetchPypi { diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix index 6956aca6826de..4da347ad89696 100644 --- a/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/pkgs/development/python-modules/pysiaalarm/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pysiaalarm"; version = "3.1.1"; + format = "setuptools"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index d80e23d269eff..5ede9fb34ba91 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.10.9"; + version = "0.10.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-zKV2yDLhoRTvlDZ/bwEyJhtE6hx1IAgKNI37J31nQo8="; + hash = "sha256-QudaAZOxUXLUMMx10gEpWcaI+2ewpkNZOGUDEbxChg0="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix index 43c8e81f5aa76..b0cd337304afe 100644 --- a/pkgs/development/python-modules/pysigset/default.nix +++ b/pkgs/development/python-modules/pysigset/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pysigset"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pysimplesoap/default.nix b/pkgs/development/python-modules/pysimplesoap/default.nix index 14bb929936ded..d02761a1c9220 100644 --- a/pkgs/development/python-modules/pysimplesoap/default.nix +++ b/pkgs/development/python-modules/pysimplesoap/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pysimplesoap"; version = "1.16.2"; + format = "setuptools"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/pysingleton/default.nix b/pkgs/development/python-modules/pysingleton/default.nix index 22e4ade4a8822..790c7a0f9171d 100644 --- a/pkgs/development/python-modules/pysingleton/default.nix +++ b/pkgs/development/python-modules/pysingleton/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pysingleton"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix index 369cd6ecea6e9..89b6ba537aec4 100644 --- a/pkgs/development/python-modules/pysmartthings/default.nix +++ b/pkgs/development/python-modules/pysmartthings/default.nix @@ -21,20 +21,23 @@ buildPythonPackage rec { hash = "sha256-r+f2+vEXJdQGDlbs/MhraFgEmsAf32PU282blLRLjzc="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "aiohttp>=3.8.0,<4.0.0" "aiohttp<=4.0.0" + ''; + propagatedBuildInputs = [ aiohttp ]; + # https://github.com/andrewsayre/pysmartthings/issues/80 + doCheck = lib.versionOlder aiohttp.version "3.9.0"; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "aiohttp>=3.8.0,<4.0.0" "aiohttp<=4.0.0" - ''; - pythonImportsCheck = [ "pysmartthings" ]; diff --git a/pkgs/development/python-modules/pysmf/default.nix b/pkgs/development/python-modules/pysmf/default.nix index 2fc1637d22a5c..6b3b50e9e1e7e 100644 --- a/pkgs/development/python-modules/pysmf/default.nix +++ b/pkgs/development/python-modules/pysmf/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pysmf"; version = "0.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix index 7b96b97f0bb9c..3e32fd5bd4317 100644 --- a/pkgs/development/python-modules/pysmi/default.nix +++ b/pkgs/development/python-modules/pysmi/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "0.3.4"; + format = "setuptools"; pname = "pysmi"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix index 67dae25bdd025..58381f99db3e8 100644 --- a/pkgs/development/python-modules/pysml/default.nix +++ b/pkgs/development/python-modules/pysml/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysml"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mtdcr"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BtOx/kqPuvaaIyh/2/X5pW5BRvpsnMUMr1u6iZzbkt4="; + hash = "sha256-TLIpc0bVx1As2oLyYD+BBMalwJiKdvBCcrd1tUNyh6Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysnmp-pysmi/default.nix b/pkgs/development/python-modules/pysnmp-pysmi/default.nix index 1a9cab98915d9..788a267d347b4 100644 --- a/pkgs/development/python-modules/pysnmp-pysmi/default.nix +++ b/pkgs/development/python-modules/pysnmp-pysmi/default.nix @@ -9,8 +9,8 @@ buildPythonPackage rec { pname = "pysnmp-pysmi"; - version = "1.1.10"; - format = "pyproject"; + version = "1.1.11"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pysnmp"; repo = "pysmi"; rev = "refs/tags/v${version}"; - hash = "sha256-ZfN0nU9IurBEjSZijC2E4UoLIM54mBFgv7rcI1v/a4Q="; + hash = "sha256-qe99nLOyUvE6LJagtQ9whPF4zwIWiM7g5zn40QsmrmA="; }; nativeBuildInputs = [ @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "SNMP MIB parser"; homepage = "https://github.com/pysnmp/pysmi"; + changelog = "https://github.com/pysnmp/pysmi/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index 0b0e298d5d001..6921ef3ad9a96 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pysnmp"; version = "4.4.12"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pysocks/default.nix b/pkgs/development/python-modules/pysocks/default.nix index 70fb74ab4ddfa..b007ef9a41417 100644 --- a/pkgs/development/python-modules/pysocks/default.nix +++ b/pkgs/development/python-modules/pysocks/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pysocks"; version = "1.7.1"; + format = "setuptools"; src = fetchPypi { pname = "PySocks"; diff --git a/pkgs/development/python-modules/pysol-cards/default.nix b/pkgs/development/python-modules/pysol-cards/default.nix index 5759b47005b95..9816445bc2f20 100644 --- a/pkgs/development/python-modules/pysol-cards/default.nix +++ b/pkgs/development/python-modules/pysol-cards/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pysol-cards"; version = "0.14.3"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix index 1e2e3d5dbf6c1..2a4e57154cea1 100644 --- a/pkgs/development/python-modules/pysolr/default.nix +++ b/pkgs/development/python-modules/pysolr/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pysolr"; version = "3.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 778b862ac2cca..abb395bb12832 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "pysonos"; version = "0.0.54"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pyspellchecker/default.nix b/pkgs/development/python-modules/pyspellchecker/default.nix index f4cc258d3eadc..0a8b0162ad746 100644 --- a/pkgs/development/python-modules/pyspellchecker/default.nix +++ b/pkgs/development/python-modules/pyspellchecker/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyspellchecker"; - version = "0.7.2"; + version = "0.7.3"; format = "pyproject"; src = fetchFromGitHub { owner = "barrust"; repo = "pyspellchecker"; rev = "refs/tags/v${version}"; - hash = "sha256-DV2JxUKTCVJRRLmi+d5dMloCgpYwC5uyI1o34L26TxA="; + hash = "sha256-DUFJGO0Ncobr36k0hQRgeHf77Mds53JJHOMlf4/zfAI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix index 74e264b9da092..3bf3a296d5655 100644 --- a/pkgs/development/python-modules/pyspf/default.nix +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyspf"; version = "2.0.14"; + format = "setuptools"; src = fetchFromGitHub { owner = "sdgathman"; diff --git a/pkgs/development/python-modules/pyspiflash/default.nix b/pkgs/development/python-modules/pyspiflash/default.nix index fcab563b5ab39..24306c4893c32 100644 --- a/pkgs/development/python-modules/pyspiflash/default.nix +++ b/pkgs/development/python-modules/pyspiflash/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyspiflash"; version = "0.6.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyspinel/default.nix b/pkgs/development/python-modules/pyspinel/default.nix index 69c06b8876d26..c969b471e019e 100644 --- a/pkgs/development/python-modules/pyspinel/default.nix +++ b/pkgs/development/python-modules/pyspinel/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyspinel"; version = "unstable-2021-08-19"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 9107961653401..650af9af50a6b 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pyspnego"; version = "0.9.2"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pysqlcipher3/default.nix b/pkgs/development/python-modules/pysqlcipher3/default.nix index 7441689895cb3..1b573628edda1 100644 --- a/pkgs/development/python-modules/pysqlcipher3/default.nix +++ b/pkgs/development/python-modules/pysqlcipher3/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pysqlcipher3"; version = "1.2.0"; + format = "setuptools"; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index ff48960f815b8..17122d24089ef 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pysrt"; version = "1.1.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "byroot"; diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix index b69bf47c96d76..820400e9e4ecb 100644 --- a/pkgs/development/python-modules/pyssim/default.nix +++ b/pkgs/development/python-modules/pyssim/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyssim"; version = "0.6"; + format = "setuptools"; propagatedBuildInputs = [ numpy scipy pillow ]; diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index ff4c6f6692239..43d51869ffb82 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "pystemd"; version = "0.13.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-Tc+ksTpVaFxJ09F8EGMeyhjDN3D2Yxb47yM3uJUcwUQ="; diff --git a/pkgs/development/python-modules/pysvg-py3/default.nix b/pkgs/development/python-modules/pysvg-py3/default.nix index 6f9ba796132e9..1647ce892ec9b 100644 --- a/pkgs/development/python-modules/pysvg-py3/default.nix +++ b/pkgs/development/python-modules/pysvg-py3/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pysvg-py3"; version = "0.2.2-post3"; + format = "setuptools"; src = fetchFromGitHub { owner = "alorence"; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 5a99cbb62ee76..b2cda67a8abae 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.41.0"; + version = "0.42.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-n4hTS3LnS8AOr1VNSqcVYul/qiTiLvI2bsOJJLbKA3E="; + hash = "sha256-oJUdQex+kjL4Yuuz02ASjFDjyfWA/Hsopy+ujGbDkLs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytabix/default.nix b/pkgs/development/python-modules/pytabix/default.nix index fb2e622eac9c0..7ad01093b212b 100644 --- a/pkgs/development/python-modules/pytabix/default.nix +++ b/pkgs/development/python-modules/pytabix/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pytabix"; version = "0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytankerkoenig/default.nix b/pkgs/development/python-modules/pytankerkoenig/default.nix index 0a6403107ab8d..83c73a9d93d2a 100644 --- a/pkgs/development/python-modules/pytankerkoenig/default.nix +++ b/pkgs/development/python-modules/pytankerkoenig/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pytankerkoenig"; version = "0.0.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 2d4c8286d6103..d0f7f79c5636b 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.3.16"; + version = "3.3.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-omeJUF4bY/FfXMmBvpVo3dr7B/pUy8YXt0DPaSe3VkA="; + hash = "sha256-CiLZ+FUmawZaKQxkDxYCv0Qs/djFuIVSyQ0eSi41HDg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index d74ec86528272..6968f568941ae 100644 --- a/pkgs/development/python-modules/pyte/default.nix +++ b/pkgs/development/python-modules/pyte/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyte"; version = "0.8.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "selectel"; diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 5d1efa486fb53..458d0942854a5 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.4.14"; + version = "1.4.16"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = "refs/tags/${version}"; - hash = "sha256-EZ6W7DTcmZWjP2BmopU2G3S/82juGG+/ht5Fd8G0W1A="; + hash = "sha256-K0eb9j3X5jfNEdAbpK75gbOdD8nerEwlOXUdAGUFT+8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index c109a707d24d8..b256977a531de 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.18.1"; + version = "2.18.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-8bt6ps5bwT+Atr6JgQMxe234bL/ZriYlURUdX0sC1kk="; + hash = "sha256-j7SNXFiQUofP5NtggSOwLxXkg267yneqoWH2uoDZogs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 5e1f9223019ae..40fb270b199a5 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { pname = "pytest-astropy"; version = "0.10.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix index 918d53c4fa7f7..a5fbb9874c576 100644 --- a/pkgs/development/python-modules/pytest-black/default.nix +++ b/pkgs/development/python-modules/pytest-black/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pytest-black"; version = "0.3.12"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix index 58b69c4ce560e..4fbfd57fe583e 100644 --- a/pkgs/development/python-modules/pytest-catchlog/default.nix +++ b/pkgs/development/python-modules/pytest-catchlog/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pytest-catchlog"; version = "1.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/pkgs/development/python-modules/pytest-click/default.nix index ffc13ca9eb58d..eaf81fa468db8 100644 --- a/pkgs/development/python-modules/pytest-click/default.nix +++ b/pkgs/development/python-modules/pytest-click/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pytest-click"; version = "1.1.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 7df529a837382..08ab3e4d10343 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pytest-cov"; version = "4.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index 44322ef2d1b87..7aa58096f1bf7 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "0.2.2"; + format = "setuptools"; pname = "pytest-cram"; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix index 8cecd7f7f0bd2..6bb6463d00883 100644 --- a/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/pkgs/development/python-modules/pytest-dependency/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pytest-dependency"; version = "0.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index f78a637a5b8ad..048bd9d483380 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pytest-django"; version = "4.5.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-dotenv/default.nix b/pkgs/development/python-modules/pytest-dotenv/default.nix index 05e5da7ffdd54..9f045315f6d13 100644 --- a/pkgs/development/python-modules/pytest-dotenv/default.nix +++ b/pkgs/development/python-modules/pytest-dotenv/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pytest-dotenv"; version = "0.5.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-error-for-skips/default.nix b/pkgs/development/python-modules/pytest-error-for-skips/default.nix index 7ed7972792a30..574e36c11970d 100644 --- a/pkgs/development/python-modules/pytest-error-for-skips/default.nix +++ b/pkgs/development/python-modules/pytest-error-for-skips/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pytest-error-for-skips"; version = "2.0.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "jankatins"; diff --git a/pkgs/development/python-modules/pytest-expect/default.nix b/pkgs/development/python-modules/pytest-expect/default.nix index dfd498c6b1e16..df5376e310e74 100644 --- a/pkgs/development/python-modules/pytest-expect/default.nix +++ b/pkgs/development/python-modules/pytest-expect/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pytest-expect"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index 32392f8f14ce5..31ab985dbff2d 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pytest-fixture-config"; version = "1.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index ae92c18766a9e..d6709da423adf 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { # retaining package to not break other packages pname = "pytest-flakes"; version = "4.0.5"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pytest-freezegun/default.nix b/pkgs/development/python-modules/pytest-freezegun/default.nix index 95ccd9b77cd4e..0435eb095124b 100644 --- a/pkgs/development/python-modules/pytest-freezegun/default.nix +++ b/pkgs/development/python-modules/pytest-freezegun/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pytest-freezegun"; version = "0.4.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "ktosiek"; diff --git a/pkgs/development/python-modules/pytest-grpc/default.nix b/pkgs/development/python-modules/pytest-grpc/default.nix index da106064a8042..9918faad2c2e3 100644 --- a/pkgs/development/python-modules/pytest-grpc/default.nix +++ b/pkgs/development/python-modules/pytest-grpc/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pytest-grpc"; version = "0.8.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index 7ac3fdc47f28b..6d1c3cf4f136d 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pytest-helpers-namespace"; version = "2021.12.29"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix index 6f5f6484a5702..63771bf4cf3c1 100644 --- a/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -22,14 +22,14 @@ let self = buildPythonPackage rec { pname = "pytest-jupyter"; - version = "0.7.0"; - format = "pyproject"; + version = "0.8.0"; + pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pytest-jupyter"; rev = "refs/tags/v${version}"; - hash = "sha256-ZocpIBHnXTvQdjWU8yVhGK49I+FFct+teDhghiMnvW0="; + hash = "sha256-ND51UpPsvZGH6LdEaNFXaBLoCMB4n7caPoo1/Go9fNs="; }; nativeBuildInputs = [ @@ -44,15 +44,18 @@ let self = buildPythonPackage rec { jupyter-core ]; - passthru.optional-dependencies = rec { + passthru.optional-dependencies = { client = [ jupyter-client + nbformat ipykernel ]; server = [ jupyter-server + jupyter-client nbformat - ] ++ client; + ipykernel + ]; }; doCheck = false; # infinite recursion with jupyter-server diff --git a/pkgs/development/python-modules/pytest-lazy-fixture/default.nix b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix index 8f41c5c55b9c2..1b49ea4ce8e57 100644 --- a/pkgs/development/python-modules/pytest-lazy-fixture/default.nix +++ b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pytest-lazy-fixture"; version = "0.6.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 63b64f2331997..9e90f9533d855 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "pytest-mpl"; version = "0.16.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 8514fbb7202a4..4e368fb1f1693 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pytest-mypy"; version = "0.10.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix index ac7936c0146ee..29ea593acc374 100644 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pytest-openfiles"; version = "0.5.0"; + format = "setuptools"; disabled = isPy27; # abandoned src = fetchPypi { diff --git a/pkgs/development/python-modules/pytest-plt/default.nix b/pkgs/development/python-modules/pytest-plt/default.nix index 4893635c220ea..c1163516500e9 100644 --- a/pkgs/development/python-modules/pytest-plt/default.nix +++ b/pkgs/development/python-modules/pytest-plt/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pytest-plt"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-pytestrail/default.nix b/pkgs/development/python-modules/pytest-pytestrail/default.nix index 9378454cfc389..228e952436daa 100644 --- a/pkgs/development/python-modules/pytest-pytestrail/default.nix +++ b/pkgs/development/python-modules/pytest-pytestrail/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pytest-pytestrail"; version = "0.10.5"; + format = "setuptools"; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix index 78b99714378f6..edca8cbaa97dd 100644 --- a/pkgs/development/python-modules/pytest-raisesregexp/default.nix +++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pytest-raisesregexp"; version = "2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix index 153bd7da3a7e1..5218f0a778e52 100644 --- a/pkgs/development/python-modules/pytest-random-order/default.nix +++ b/pkgs/development/python-modules/pytest-random-order/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "1.1.0"; + format = "setuptools"; pname = "pytest-random-order"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pytest-recording/default.nix b/pkgs/development/python-modules/pytest-recording/default.nix index 7a53cbbba882e..e35b1a352b858 100644 --- a/pkgs/development/python-modules/pytest-recording/default.nix +++ b/pkgs/development/python-modules/pytest-recording/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pytest-recording"; - version = "0.13.0"; + version = "0.13.1"; format = "pyproject"; src = fetchFromGitHub { owner = "kiwicom"; repo = "pytest-recording"; - rev = "v${version}"; - hash = "sha256-SCHdzii6GYVWVY7MW/IW6CNZMuu5h/jXEj49P0jvhoE="; + rev = "refs/tags/v${version}"; + hash = "sha256-HyV1wWYS/8p45mZxgA1XSChLCTYq5iOzBRqKXyZpwgo="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index e804a0482dc1e..c306f8ef8f6d0 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -36,17 +36,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - numpy - pandas - pillow pytest-datadir pyyaml ]; nativeCheckInputs = [ - pytestCheckHook matplotlib + pandas + pytestCheckHook ]; pythonImportsCheck = [ @@ -54,6 +52,12 @@ buildPythonPackage rec { "pytest_regressions.plugin" ]; + passthru.optional-dependencies = { + dataframe = [ pandas numpy ]; + image = [ numpy pillow ]; + num = [ numpy pandas ]; + }; + meta = with lib; { description = "Pytest fixtures to write regression tests"; longDescription = '' diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix index f82e5a661e41d..28e62eaa7e459 100644 --- a/pkgs/development/python-modules/pytest-resource-path/default.nix +++ b/pkgs/development/python-modules/pytest-resource-path/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pytest-resource-path"; version = "1.3.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index 7de68cadbb1e3..b0b5e8bfb98a2 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "pytest-server-fixtures"; version = "1.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 41890215025ca..2a965000d4f08 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "pytest-services"; version = "2.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index d3ea76b8a1bbe..6a1d75be5315a 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pytest-subprocess"; version = "1.5.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/pkgs/development/python-modules/pytest-subtesthack/default.nix index 775b3cc55251c..319fffe01db35 100644 --- a/pkgs/development/python-modules/pytest-subtesthack/default.nix +++ b/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pytest-subtesthack"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-testinfra/default.nix b/pkgs/development/python-modules/pytest-testinfra/default.nix index 3f2cbf8d874ae..bdf97e9c5c314 100644 --- a/pkgs/development/python-modules/pytest-testinfra/default.nix +++ b/pkgs/development/python-modules/pytest-testinfra/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pytest-testinfra"; version = "10.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index b1e46802b450a..0a39ce94b2e2b 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pytest-tornado"; version = "0.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix index 9fca8d8602620..c95165ea01f6c 100644 --- a/pkgs/development/python-modules/pytest-tornasync/default.nix +++ b/pkgs/development/python-modules/pytest-tornasync/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pytest-tornasync"; version = "0.6.0.post2"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index 872e9dc8fc0dd..243ea9781f3e6 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pytest-trio"; version = "0.8.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pytest-vcr/default.nix b/pkgs/development/python-modules/pytest-vcr/default.nix index 3887261ba5b56..eb28f2f74c287 100644 --- a/pkgs/development/python-modules/pytest-vcr/default.nix +++ b/pkgs/development/python-modules/pytest-vcr/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pytest-vcr"; version = "1.0.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "ktosiek"; diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 0feb637f4b509..408430d5127c2 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pytest-virtualenv"; version = "1.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix index d088bde8b0c9d..594c27f18ec8d 100644 --- a/pkgs/development/python-modules/pytest-warnings/default.nix +++ b/pkgs/development/python-modules/pytest-warnings/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pytest-warnings"; version = "0.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-watch/default.nix b/pkgs/development/python-modules/pytest-watch/default.nix index 077b3eca6bfa1..6158106d92deb 100644 --- a/pkgs/development/python-modules/pytest-watch/default.nix +++ b/pkgs/development/python-modules/pytest-watch/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pytest-watch"; version = "4.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix index 1bd44dc3fc7c0..9d039abd13f9d 100644 --- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix +++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-axolotl-curve25519"; version = "0.4.1.post2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix index 3b55811f4e47c..3725d0359a4e0 100644 --- a/pkgs/development/python-modules/python-axolotl/default.nix +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-axolotl"; version = "0.2.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-baseconv/default.nix b/pkgs/development/python-modules/python-baseconv/default.nix index f9ac014919c2d..6e9acbb7873c7 100644 --- a/pkgs/development/python-modules/python-baseconv/default.nix +++ b/pkgs/development/python-modules/python-baseconv/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "python-baseconv"; version = "1.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version ; diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix index 1a4a5d5b77cce..ea180de55d56e 100644 --- a/pkgs/development/python-modules/python-bidi/default.nix +++ b/pkgs/development/python-modules/python-bidi/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-bidi"; version = "0.4.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 2ffc8ed0b7f22..bfa3f38e4597c 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -55,6 +55,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (lib.versionAtLeast aiohttp.version "3.9.0") [ + # https://github.com/liudger/python-bsblan/issues/808 + "test_http_error400" + "test_not_authorized_401_response" + ]; + pythonImportsCheck = [ "bsblan" ]; diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index 6473cb660086e..ea79dcf2f80b3 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "python-cinderclient"; version = "9.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-codon-tables/default.nix b/pkgs/development/python-modules/python-codon-tables/default.nix index a3a5397c96c9c..455ea329675d3 100644 --- a/pkgs/development/python-modules/python-codon-tables/default.nix +++ b/pkgs/development/python-modules/python-codon-tables/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "python-codon-tables"; version = "0.1.12"; + format = "setuptools"; src = fetchPypi { pname = "python_codon_tables"; diff --git a/pkgs/development/python-modules/python-constraint/default.nix b/pkgs/development/python-modules/python-constraint/default.nix index d26d7e91c96c7..7b191010aac58 100644 --- a/pkgs/development/python-modules/python-constraint/default.nix +++ b/pkgs/development/python-modules/python-constraint/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "python-constraint"; version = "1.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "python-constraint"; diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix index 2efaa484fd74d..34ed7eba301e5 100644 --- a/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "python-crfsuite"; - version = "0.9.9"; + version = "0.9.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-yqYmHWlVRmdW+Ya3/PvU/VBiKWPjvbXMGAwSnGKzp20="; + hash = "sha256-84UkYx4rUzNB8Q8sd2iScNxuzVmFSV3M96o3sQRbwuU="; }; preCheck = '' diff --git a/pkgs/development/python-modules/python-csxcad/default.nix b/pkgs/development/python-modules/python-csxcad/default.nix index 1044fe0a2748f..b7dc56ed27746 100644 --- a/pkgs/development/python-modules/python-csxcad/default.nix +++ b/pkgs/development/python-modules/python-csxcad/default.nix @@ -10,14 +10,10 @@ buildPythonPackage rec { pname = "python-csxcad"; - version = "unstable-2020-02-18"; + version = csxcad.version; + format = "setuptools"; - src = fetchFromGitHub { - owner = "thliebig"; - repo = "CSXCAD"; - rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518"; - sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb"; - }; + src = csxcad.src; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/pkgs/development/python-modules/python-ctags3/default.nix index 4c987250e49fe..245fa3209ccb0 100644 --- a/pkgs/development/python-modules/python-ctags3/default.nix +++ b/pkgs/development/python-modules/python-ctags3/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-ctags3"; version = "1.5.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "universal-ctags"; diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index acb47fceb8b12..a987dc12e6bbb 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -21,6 +21,7 @@ let in buildPythonPackage rec { pname = "python-dbusmock"; version = "0.29.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "martinpitt"; diff --git a/pkgs/development/python-modules/python-didl-lite/default.nix b/pkgs/development/python-modules/python-didl-lite/default.nix index f808efe2c1310..aaa5467308442 100644 --- a/pkgs/development/python-modules/python-didl-lite/default.nix +++ b/pkgs/development/python-modules/python-didl-lite/default.nix @@ -4,20 +4,27 @@ , pythonOlder , defusedxml , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "python-didl-lite"; - version = "1.3.2"; - disabled = pythonOlder "3.5.3"; + version = "1.4.0"; + pyroject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "StevenLooman"; - repo = pname; - rev = version; - hash = "sha256-laKmWGDEzlBVJCUSKxekjPEXVlAz4MIzM7dNJfta/ek="; + repo = "python-didl-lite"; + rev = "refs/tags/${version}"; + hash = "sha256-A+G97T/udyL/yRqykq1sEGDEI6ZwtDBc5xUNFiJp0UQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ defusedxml ]; @@ -26,11 +33,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "didl_lite" ]; + pythonImportsCheck = [ + "didl_lite" + ]; meta = with lib; { description = "DIDL-Lite (Digital Item Declaration Language) tools for Python"; homepage = "https://github.com/StevenLooman/python-didl-lite"; + changelog = "https://github.com/StevenLooman/python-didl-lite/blob/${version}/CHANGES.rst"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/python-djvulibre/default.nix b/pkgs/development/python-modules/python-djvulibre/default.nix new file mode 100644 index 0000000000000..3853e79511678 --- /dev/null +++ b/pkgs/development/python-modules/python-djvulibre/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, djvulibre +, ghostscript_headless +, packaging +, pkg-config +, requests +, setuptools +, unittestCheckHook +, wheel +}: + +buildPythonPackage rec { + pname = "python-djvulibre"; + version = "0.9.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "FriedrichFroebel"; + repo = "python-djvulibre"; + rev = version; + hash = "sha256-OrOZFvzDEBwBmIc+i3LjNTh6K2vhe6NWtSJrFTSkrgA="; + }; + + nativeBuildInputs = [ + cython + packaging + pkg-config + setuptools + wheel + ]; + + buildInputs = [ + djvulibre + ghostscript_headless + ]; + + preCheck = '' + rm -rf djvu + ''; + + nativeCheckInputs = [ unittestCheckHook ]; + + unittestFlagsArray = [ "tests" "-v" ]; + + meta = with lib; { + description = "Python support for the DjVu image format"; + homepage = "https://github.com/FriedrichFroebel/python-djvulibre"; + license = licenses.gpl2Only; + changelog = "https://github.com/FriedrichFroebel/python-djvulibre/releases/tag/${version}"; + maintainers = with maintainers; [ dansbandit ]; + }; +} diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index 36146bbe05e3e..79ba5c871a5ff 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "python-docx"; version = "0.8.11"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-doi/default.nix b/pkgs/development/python-modules/python-doi/default.nix index e0cb03d611d1e..b917611deb36a 100644 --- a/pkgs/development/python-modules/python-doi/default.nix +++ b/pkgs/development/python-modules/python-doi/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-doi"; version = "0.1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "papis"; diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index e98e7baac2d54..b335a8a9831c7 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "python-dotenv"; version = "1.0.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix index 644acb8a4883a..4d12ee0c99d7c 100644 --- a/pkgs/development/python-modules/python-ecobee-api/default.nix +++ b/pkgs/development/python-modules/python-ecobee-api/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "python-ecobee-api"; version = "0.2.17"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix index 212e191568c3d..948076b5f2767 100644 --- a/pkgs/development/python-modules/python-editor/default.nix +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "1.0.4"; + format = "setuptools"; pname = "python-editor"; src = fetchPypi { diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index d4a2ca1dd6b5e..6bc480b315de6 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "python-efl"; version = "1.26.1"; + format = "setuptools"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix index f9b01802c4210..4e711d914086b 100644 --- a/pkgs/development/python-modules/python-etcd/default.nix +++ b/pkgs/development/python-modules/python-etcd/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "python-etcd"; version = "0.4.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-ethtool/default.nix b/pkgs/development/python-modules/python-ethtool/default.nix index e758f4a1ef71b..d91550e029131 100644 --- a/pkgs/development/python-modules/python-ethtool/default.nix +++ b/pkgs/development/python-modules/python-ethtool/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "python-ethtool"; version = "0.15"; + format = "setuptools"; src = fetchFromGitHub { owner = "fedora-python"; diff --git a/pkgs/development/python-modules/python-ev3dev2/default.nix b/pkgs/development/python-modules/python-ev3dev2/default.nix index b5fc2e4fe537d..219678ef24218 100644 --- a/pkgs/development/python-modules/python-ev3dev2/default.nix +++ b/pkgs/development/python-modules/python-ev3dev2/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "python-ev3dev2"; version = "2.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ev3dev"; diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix index 4670d58420bb9..c359d4ee87f7c 100644 --- a/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/pkgs/development/python-modules/python-frontmatter/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-frontmatter"; version = "1.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "eyeseast"; diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index a7e27ac64aa12..0e362ea35f187 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.11.0"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8d/cjD7dcA4/bKZtQUjgUPVgfZdjl+ibOFRpC9dyybA="; + hash = "sha256-RbpbFd+GqFPl88FqKvYEE6HcwFRzPDUTs3vMYM6x7es="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-google-nest/default.nix b/pkgs/development/python-modules/python-google-nest/default.nix index 3d086fa2684e9..32dc8de3964ad 100644 --- a/pkgs/development/python-modules/python-google-nest/default.nix +++ b/pkgs/development/python-modules/python-google-nest/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-google-nest"; - version = "5.1.1"; + version = "5.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-y3BOhorVkJ3rFPifNOopLMqk6y1fHX5vxHGiqWvWHhE="; + hash = "sha256-qL4Qk2NW41Sb9raF0vnEb04w3uyaWPauDnNY+DvnNgQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 98cc6109ae784..8f4292d6bc3ef 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "23.11.0"; + version = "23.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7HneedqHbNB9ZYFUCCQ/puLtA1QlIkTKqji0py9hwBE="; + hash = "sha256-rqaiygGdZMyZwHaNhmmbP3eRKpO8yT9hgFsz+azHzaM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-hglib/default.nix b/pkgs/development/python-modules/python-hglib/default.nix index b7492239382fd..5cce7429173f0 100644 --- a/pkgs/development/python-modules/python-hglib/default.nix +++ b/pkgs/development/python-modules/python-hglib/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "python-hglib"; version = "2.6.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index e7c0a2a26305a..ca6c2770db468 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -1,37 +1,42 @@ { lib , aiohttp , aresponses -, awesomeversion +, async-timeout , buildPythonPackage , fetchFromGitHub , poetry-core -, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder +, syrupy }: buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "2.1.2"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "DCSBL"; - repo = pname; + repo = "python-homewizard-energy"; rev = "refs/tags/v${version}"; - hash = "sha256-iyDRhTV5GSBTVK7ccJhUOrCpE9YuiI1vJM4XroCyIwE="; + hash = "sha256-p7uwodjC+wTGrlKf4i4ZRTPg9Qh9krsmwPpWNdF6J4U="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ - awesomeversion aiohttp + async-timeout ]; __darwinAllowLocalNetworking = true; @@ -40,6 +45,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ @@ -48,8 +54,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library to communicate with HomeWizard Energy devices"; - homepage = "https://github.com/DCSBL/python-homewizard-energy"; - changelog = "https://github.com/DCSBL/python-homewizard-energy/releases/tag/v${version}"; + homepage = "https://github.com/homewizard/python-homewizard-energy"; + changelog = "https://github.com/homewizard/python-homewizard-energy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-hpilo/default.nix b/pkgs/development/python-modules/python-hpilo/default.nix index c23f9eb4ac264..8ee2dafc47b23 100644 --- a/pkgs/development/python-modules/python-hpilo/default.nix +++ b/pkgs/development/python-modules/python-hpilo/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "python-hpilo"; version = "4.4.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "seveas"; diff --git a/pkgs/development/python-modules/python-i18n/default.nix b/pkgs/development/python-modules/python-i18n/default.nix index d12d8b841344b..d452cde8a0d7c 100644 --- a/pkgs/development/python-modules/python-i18n/default.nix +++ b/pkgs/development/python-modules/python-i18n/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-i18n"; version = "0.3.9"; + format = "setuptools"; src = fetchFromGitHub { owner = "danhper"; diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index d8a28d81fcb42..10af09c067201 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { pname = "python-ironicclient"; version = "5.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index e4ff8f1e7e511..2632372f0dd84 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { pname = "python-jenkins"; version = "1.8.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index 603bc629e5ac6..b9400a2239ae0 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "python-json-logger"; version = "2.0.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index d60c1edcf9679..2cb13c747742e 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "python-jsonrpc-server"; version = "0.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "palantir"; diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix index ed7a31b0cfe77..e88a49f4cc35f 100644 --- a/pkgs/development/python-modules/python-ldap-test/default.nix +++ b/pkgs/development/python-modules/python-ldap-test/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-ldap-test"; version = "0.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-linux-procfs/default.nix b/pkgs/development/python-modules/python-linux-procfs/default.nix index 4c025b1add9cf..2eacf7a0d69d0 100644 --- a/pkgs/development/python-modules/python-linux-procfs/default.nix +++ b/pkgs/development/python-modules/python-linux-procfs/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-linux-procfs"; version = "0.6.3"; + format = "setuptools"; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/python/${pname}/${pname}.git"; diff --git a/pkgs/development/python-modules/python-logstash/default.nix b/pkgs/development/python-modules/python-logstash/default.nix index 3f281d9696ecd..0ce49d98de036 100644 --- a/pkgs/development/python-modules/python-logstash/default.nix +++ b/pkgs/development/python-modules/python-logstash/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-logstash"; version = "0.4.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-louvain/default.nix b/pkgs/development/python-modules/python-louvain/default.nix index 32bd611e704aa..c6161735d4352 100644 --- a/pkgs/development/python-modules/python-louvain/default.nix +++ b/pkgs/development/python-modules/python-louvain/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "python-louvain"; version = "0.16"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix index d3b6a90c59255..63caba5e9d022 100644 --- a/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "python-lsp-black"; version = "1.3.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix index 01d9e4eb49d17..e7c344c8fdbb1 100644 --- a/pkgs/development/python-modules/python-lsp-ruff/default.nix +++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-lsp-ruff"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "python-lsp-ruff"; - sha256 = "sha256-lCTBFKTb1djrRQcX4Eg/G2Fs+VrqTvJ/XVnUPVM/5nE="; + sha256 = "sha256-sgS0wwFuAaaen9b/vpJrpAsUvE2lehfHVaOB/hSol9k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix index 3b4a7ecc11948..b1aa0c68b2090 100644 --- a/pkgs/development/python-modules/python-ly/default.nix +++ b/pkgs/development/python-modules/python-ly/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-ly"; version = "0.9.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-lzf/default.nix b/pkgs/development/python-modules/python-lzf/default.nix index 61194ff8f9cbf..d7548fd8446f1 100644 --- a/pkgs/development/python-modules/python-lzf/default.nix +++ b/pkgs/development/python-modules/python-lzf/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "0.2.4"; + format = "setuptools"; pname = "python-lzf"; src = fetchPypi { diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 890cfb50c2cc7..efb32d8444ab2 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "python-magic"; version = "0.4.27"; + format = "setuptools"; src = fetchFromGitHub { owner = "ahupp"; diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 5eee8f59c39b5..d887e0c3ae836 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { pname = "python-mapnik"; version = "unstable-2020-09-08"; + format = "setuptools"; src = fetchFromGitHub { owner = "mapnik"; @@ -126,6 +127,7 @@ buildPythonPackage rec { "test_raster_warping_does_not_overclip_source" "test_render_points" "test_render_with_scale_factor" + "test_style_level_comp_op" "test_style_level_image_filter" "test_that_coordinates_do_not_overflow_and_polygon_is_rendered_csv" "test_that_coordinates_do_not_overflow_and_polygon_is_rendered_memory" @@ -135,6 +137,7 @@ buildPythonPackage rec { "test_wgs84_inverse_forward" ] ++ lib.optionals stdenv.isDarwin [ "test_passing_pycairo_context_pdf" + "test_passing_pycairo_context_svg" ]; pythonImportsCheck = [ "mapnik" ]; diff --git a/pkgs/development/python-modules/python-markdown-math/default.nix b/pkgs/development/python-modules/python-markdown-math/default.nix index 959448d2ea226..9ea32e8606462 100644 --- a/pkgs/development/python-modules/python-markdown-math/default.nix +++ b/pkgs/development/python-modules/python-markdown-math/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "python-markdown-math"; version = "0.8"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 36e6ca30fcbd4..7d8b5cd3dd153 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -5,11 +5,11 @@ # build , setuptools -, wheel # propagates , aiohttp , aiorun +, async-timeout , coloredlogs , dacite , orjson @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "4.0.2"; + version = "5.0.3"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -37,17 +37,22 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-fyVvmYznYuhDhU3kApXgXjkPdwhJFxoFq3U87ichmt8="; + hash = "sha256-bR6AVoy9f02RKZ57dnHTDAv5LTCcd/qBbzMDRKsGbfM="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' + ''; + nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ aiohttp aiorun + async-timeout coloredlogs dacite orjson diff --git a/pkgs/development/python-modules/python-memcached/default.nix b/pkgs/development/python-modules/python-memcached/default.nix index 180e70f1c1d32..27a9eed537bb2 100644 --- a/pkgs/development/python-modules/python-memcached/default.nix +++ b/pkgs/development/python-modules/python-memcached/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "python-memcached"; version = "1.59"; + format = "setuptools"; src = fetchFromGitHub { owner = "linsomniac"; diff --git a/pkgs/development/python-modules/python-mimeparse/default.nix b/pkgs/development/python-modules/python-mimeparse/default.nix index e5aa879136b18..ddf89c914ad0b 100644 --- a/pkgs/development/python-modules/python-mimeparse/default.nix +++ b/pkgs/development/python-modules/python-mimeparse/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "python-mimeparse"; version = "1.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-mnist/default.nix b/pkgs/development/python-modules/python-mnist/default.nix index 131c0f2f5acba..5937fceb1a9c8 100644 --- a/pkgs/development/python-modules/python-mnist/default.nix +++ b/pkgs/development/python-modules/python-mnist/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-mnist"; version = "0.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 4834b6bd9aa79..c0e72be598252 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "python-mpv-jsonipc"; version = "1.2.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/python-myq/default.nix b/pkgs/development/python-modules/python-myq/default.nix deleted file mode 100644 index 88248abde3a3e..0000000000000 --- a/pkgs/development/python-modules/python-myq/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, aiohttp -, beautifulsoup4 -, buildPythonPackage -, fetchFromGitHub -, pkce -, poetry-core -, pythonOlder -}: - -buildPythonPackage rec { - pname = "python-myq"; - version = "3.1.13"; - pyproject = true; - - disabled = pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "Python-MyQ"; - repo = "Python-MyQ"; - rev = "refs/tags/v${version}"; - hash = "sha256-kW03swRXZdkh45I/up/FIxv0WGBRqTlDt1X71Ow/hrg="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry-core==1.6.1" "poetry-core" - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - propagatedBuildInputs = [ - aiohttp - beautifulsoup4 - pkce - ]; - - # Project has no tests - doCheck = false; - - pythonImportsCheck = [ - "pymyq" - ]; - - meta = with lib; { - description = "Python wrapper for MyQ API"; - 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/python-mystrom/default.nix b/pkgs/development/python-modules/python-mystrom/default.nix index 16b634999c894..2d663e71ff899 100644 --- a/pkgs/development/python-modules/python-mystrom/default.nix +++ b/pkgs/development/python-modules/python-mystrom/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "python-mystrom"; version = "2.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix index 6c47e8189a920..8051c79173e83 100644 --- a/pkgs/development/python-modules/python-ndn/default.nix +++ b/pkgs/development/python-modules/python-ndn/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { "lark" ]; - pythonImportChecks = [ "ndn" ]; + pythonImportsCheck = [ "ndn" ]; meta = with lib; { description = "An NDN client library with AsyncIO support"; diff --git a/pkgs/development/python-modules/python-nmap/default.nix b/pkgs/development/python-modules/python-nmap/default.nix index a68794af5a4d2..d0f3129a321c1 100644 --- a/pkgs/development/python-modules/python-nmap/default.nix +++ b/pkgs/development/python-modules/python-nmap/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "python-nmap"; version = "0.7.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-nvd3/default.nix b/pkgs/development/python-modules/python-nvd3/default.nix index 6ad6b6d56de0c..7abdfd1ab3d51 100644 --- a/pkgs/development/python-modules/python-nvd3/default.nix +++ b/pkgs/development/python-modules/python-nvd3/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-nvd3"; version = "0.15.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "areski"; diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix index cd45cbe7d284b..cd1baccf286c8 100644 --- a/pkgs/development/python-modules/python-oauth2/default.nix +++ b/pkgs/development/python-modules/python-oauth2/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "python-oauth2"; version = "1.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix index e255a9b8915c1..8d0459e6eb633 100644 --- a/pkgs/development/python-modules/python-olm/default.nix +++ b/pkgs/development/python-modules/python-olm/default.nix @@ -8,6 +8,7 @@ buildPythonPackage { pname = "python-olm"; + format = "setuptools"; inherit (olm) src version; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix index eef8f21cb3aaa..791bf25450514 100644 --- a/pkgs/development/python-modules/python-on-whales/default.nix +++ b/pkgs/development/python-modules/python-on-whales/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-on-whales"; - version = "0.67.0"; + version = "0.68.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gabrieldemarmiesse"; repo = "python-on-whales"; rev = "refs/tags/v${version}"; - hash = "sha256-wO2ZSELxu8BmIZN4x2mSLzsbU3sU49MEpjTfiSzVzaE="; + hash = "sha256-S9IfCCGMVXo7IPyOtu7TIeWRovE1fLQ9pjRO6tVJ4bU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-openems/default.nix b/pkgs/development/python-modules/python-openems/default.nix index 7a186276dfc79..8da6b87f8ba5d 100644 --- a/pkgs/development/python-modules/python-openems/default.nix +++ b/pkgs/development/python-modules/python-openems/default.nix @@ -12,14 +12,10 @@ buildPythonPackage rec { pname = "python-openems"; - version = "unstable-2020-02-15"; + version = openems.version; + format = "setuptools"; - src = fetchFromGitHub { - owner = "thliebig"; - repo = "openEMS"; - rev = "ba793ac84e2f78f254d6d690bb5a4c626326bbfd"; - sha256 = "1dca6b6ccy771irxzsj075zvpa3dlzv4mjb8xyg9d889dqlgyl45"; - }; + src = openems.src; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/python-opensky/default.nix b/pkgs/development/python-modules/python-opensky/default.nix index 0f23163d9affa..e6b7a41f6e68b 100644 --- a/pkgs/development/python-modules/python-opensky/default.nix +++ b/pkgs/development/python-modules/python-opensky/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "python-opensky"; - version = "0.2.1"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "joostlek"; repo = "python-opensky"; rev = "refs/tags/v${version}"; - hash = "sha256-xNXFvCUZ/x5ox3KxmG3eA73wpX4fwhvAVmlfcKiT1V8="; + hash = "sha256-Ia6/Lr/uNuF1u0s4g0tpYaW+hKeLbUKxYC/O+ZBqiXI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index fdafe57d5ccf0..670fdaad51c8c 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "python-openstackclient"; version = "6.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-openzwave-mqtt/default.nix b/pkgs/development/python-modules/python-openzwave-mqtt/default.nix index 68b51fc2fb3dd..1138f3820a11b 100644 --- a/pkgs/development/python-modules/python-openzwave-mqtt/default.nix +++ b/pkgs/development/python-modules/python-openzwave-mqtt/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "python-openzwave-mqtt"; version = "1.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "cgarwood"; diff --git a/pkgs/development/python-modules/python-osc/default.nix b/pkgs/development/python-modules/python-osc/default.nix index 500e6beb0b0ef..86c5894d81789 100644 --- a/pkgs/development/python-modules/python-osc/default.nix +++ b/pkgs/development/python-modules/python-osc/default.nix @@ -1,22 +1,39 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "python-osc"; version = "1.8.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-pc4bpWyNgt9Ryz8pRrXdM6cFInkazEuFZOYtKyCtnKo="; }; - pythonImportsCheck = [ "pythonosc" ]; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pythonosc" + ]; meta = with lib; { description = "Open Sound Control server and client in pure python"; homepage = "https://github.com/attwad/python-osc"; + changelog = "https://github.com/attwad/python-osc/blob/v${version}/CHANGELOG.md"; license = licenses.unlicense; maintainers = with maintainers; [ anirrudh ]; }; diff --git a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix index ad8117b996bfb..e9ad3d9893ef2 100644 --- a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix +++ b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "python-owasp-zap-v2-4"; version = "0.0.18"; + format = "setuptools"; src = fetchFromGitHub { owner = "zaproxy"; diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix index 2e2b59eb29d41..d4380da9b4e97 100644 --- a/pkgs/development/python-modules/python-packer/default.nix +++ b/pkgs/development/python-modules/python-packer/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-packer"; version = "0.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index feeb22373d87c..6437bbffe01cc 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-periphery"; version = "2.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-picnic-api/default.nix b/pkgs/development/python-modules/python-picnic-api/default.nix index 4ff18224d2d83..b467a1a36f843 100644 --- a/pkgs/development/python-modules/python-picnic-api/default.nix +++ b/pkgs/development/python-modules/python-picnic-api/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "python-picnic-api"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-pidfile/default.nix b/pkgs/development/python-modules/python-pidfile/default.nix index 4bcc21ba1c770..b9629d7303cec 100644 --- a/pkgs/development/python-modules/python-pidfile/default.nix +++ b/pkgs/development/python-modules/python-pidfile/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "python-pidfile"; version = "3.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-pipedrive/default.nix b/pkgs/development/python-modules/python-pipedrive/default.nix index a8d96043d8d70..a3c37ab5a5daa 100644 --- a/pkgs/development/python-modules/python-pipedrive/default.nix +++ b/pkgs/development/python-modules/python-pipedrive/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "python-pipedrive"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-pkcs11/default.nix b/pkgs/development/python-modules/python-pkcs11/default.nix index d0d4b4e98d392..788ab4a35f916 100644 --- a/pkgs/development/python-modules/python-pkcs11/default.nix +++ b/pkgs/development/python-modules/python-pkcs11/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "python-pkcs11"; version = "0.7.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "danni"; diff --git a/pkgs/development/python-modules/python-pptx/default.nix b/pkgs/development/python-modules/python-pptx/default.nix index e49dccec8206a..b18a5606f66b8 100644 --- a/pkgs/development/python-modules/python-pptx/default.nix +++ b/pkgs/development/python-modules/python-pptx/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "python-pptx"; version = "0.6.23"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix index 05b73e43a8598..6ebb017e7fd79 100644 --- a/pkgs/development/python-modules/python-prctl/default.nix +++ b/pkgs/development/python-modules/python-prctl/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "python-prctl"; version = "1.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index 0ea759d92dcfa..790f1e58c2958 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "python-ptrace"; version = "0.9.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 7aae0e442d28d..c131a3b0c0eb9 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -29,7 +29,7 @@ let cmakeFlags = old.cmakeFlags ++ [ "-DCMAKE_CTEST_ARGUMENTS=-E;valgrind_unittest" ]; }); in buildPythonPackage rec { - version = "1.13"; + version = "1.14"; pname = "python-rapidjson"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ in buildPythonPackage rec { owner = "python-rapidjson"; repo = "python-rapidjson"; rev = "refs/tags/v${version}"; - hash = "sha256-lWF/INhgeFQoPAhyL655UCcVamFELra29R6JPJSAmMg="; + hash = "sha256-fCC6jYUIB89HlEnbsmL0MeCBOO4NAZtePuPgZKYxoM8="; }; setupPyBuildFlags = [ diff --git a/pkgs/development/python-modules/python-registry/default.nix b/pkgs/development/python-modules/python-registry/default.nix index ef5ba5b438be6..4f8c4beae6c96 100644 --- a/pkgs/development/python-modules/python-registry/default.nix +++ b/pkgs/development/python-modules/python-registry/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "python-registry"; version = "1.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "williballenthin"; diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 3fa39b27fba57..6bae6be92c1dd 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , aiohttp -, alexapy , async-timeout , buildPythonPackage , click @@ -20,8 +19,8 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.35.3"; - format = "pyproject"; + version = "0.38.0"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -29,12 +28,12 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-3XTVHs+mLePudLnr+bAN4pHvHtUcE0D5Hw+50Vxhlzw="; + hash = "sha256-jYESUMhLb5oiM3PWIIIU4dn/waGUnCAaXe0URnIq0C8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "poetry-core==1.6.1" "poetry-core" + --replace "poetry-core==1.7.1" "poetry-core" ''; pythonRelaxDeps = [ @@ -47,7 +46,6 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - alexapy aiohttp async-timeout click diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix index d7f62a49f12ff..dfc512f6bc552 100644 --- a/pkgs/development/python-modules/python-sat/default.nix +++ b/pkgs/development/python-modules/python-sat/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-sat"; version = "0.1.7.dev1"; + format = "setuptools"; src = fetchFromGitHub { owner = "pysathq"; diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix index 1a7974ecd267a..754d7e79807e6 100644 --- a/pkgs/development/python-modules/python-simple-hipchat/default.nix +++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-simple-hipchat"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-status/default.nix b/pkgs/development/python-modules/python-status/default.nix index 2633d93c312f3..cf3beab789b67 100644 --- a/pkgs/development/python-modules/python-status/default.nix +++ b/pkgs/development/python-modules/python-status/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "python-status"; version = "1.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-string-utils/default.nix b/pkgs/development/python-modules/python-string-utils/default.nix index d0164062b90bf..17619b1b4db72 100644 --- a/pkgs/development/python-modules/python-string-utils/default.nix +++ b/pkgs/development/python-modules/python-string-utils/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "python-string-utils"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 262f1d22e8ca5..7fab5e1364a15 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "20.6"; + version = "20.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-t6yHl2uNdGaTLdbQTXp3+zds2pab4T6Pe69mu31HahA="; + hash = "sha256-lUErrBF4iucgWRRT535pwaayYY+gLgsT6Zmc+FM8aE0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-telegram/default.nix b/pkgs/development/python-modules/python-telegram/default.nix index 50a14d6ccc279..003806712d0e0 100644 --- a/pkgs/development/python-modules/python-telegram/default.nix +++ b/pkgs/development/python-modules/python-telegram/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "python-telegram"; version = "0.18.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/python-trovo/default.nix b/pkgs/development/python-modules/python-trovo/default.nix index 6c443400d1c02..ae2b610ca3c7b 100644 --- a/pkgs/development/python-modules/python-trovo/default.nix +++ b/pkgs/development/python-modules/python-trovo/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "python-trovo"; version = "0.1.6"; + format = "setuptools"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix index 94f56698a3e7f..e2f16cef34d9c 100644 --- a/pkgs/development/python-modules/python-u2flib-host/default.nix +++ b/pkgs/development/python-modules/python-u2flib-host/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python-u2flib-host"; version = "3.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index 8a187257ca76d..12ba28e04e68c 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "python-uinput"; version = "0.11.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/pkgs/development/python-modules/python-unshare/default.nix index f80721078dbb0..86958dfc003e0 100644 --- a/pkgs/development/python-modules/python-unshare/default.nix +++ b/pkgs/development/python-modules/python-unshare/default.nix @@ -8,6 +8,7 @@ buildPythonPackage { # pypi version doesn't support Python 3 and the package didn't update for a long time: # https://github.com/TheTincho/python-unshare/pull/8 version = "unstable-2018-05-20"; + format = "setuptools"; src = fetchFromGitHub { owner = "TheTincho"; diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index a5a76bf45282c..94b1dbba5628f 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "python-vipaccess"; version = "0.14.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index bb603396c7871..cdc557bbe879d 100644 --- a/pkgs/development/python-modules/python-vlc/default.nix +++ b/pkgs/development/python-modules/python-vlc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-vlc"; - version = "3.0.18122"; + version = "3.0.20123"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EDm94oeFO0t7Yboi2DdhgyQ094UG2nYt+wYCkb8yiX0="; + hash = "sha256-JE+7njkqAyaEH8qSbW0SoqNsVGmCGR9JPxSPoZ5msdQ="; }; patches = [ diff --git a/pkgs/development/python-modules/python-whois/default.nix b/pkgs/development/python-modules/python-whois/default.nix index 0a52e0b25c3e5..6cdfb81628a3a 100644 --- a/pkgs/development/python-modules/python-whois/default.nix +++ b/pkgs/development/python-modules/python-whois/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "python-whois"; version = "0.8.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-wifi/default.nix b/pkgs/development/python-modules/python-wifi/default.nix index a679100d37605..05936274eef01 100644 --- a/pkgs/development/python-modules/python-wifi/default.nix +++ b/pkgs/development/python-modules/python-wifi/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "python-wifi"; version = "0.6.1"; + format = "setuptools"; disabled = !isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/python-wink/default.nix b/pkgs/development/python-modules/python-wink/default.nix index fa0dc670133ee..45f3604624743 100644 --- a/pkgs/development/python-modules/python-wink/default.nix +++ b/pkgs/development/python-modules/python-wink/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "python-wink"; version = "1.10.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index 428bf73beb151..73957c33da267 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -9,6 +9,7 @@ buildPythonPackage { pname = "python-xmp-toolkit"; version = "2.0.2"; + format = "setuptools"; # PyPi has version 2.0.1; the tests fail # There are commits for a 2.0.2 release that was never published diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix index 9170ce7981156..b71ae929d17ff 100644 --- a/pkgs/development/python-modules/python3-application/default.nix +++ b/pkgs/development/python-modules/python3-application/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python3-application"; version = "3.0.6"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/python3-eventlib/default.nix b/pkgs/development/python-modules/python3-eventlib/default.nix index 74abe970399c0..8a394a2d13136 100644 --- a/pkgs/development/python-modules/python3-eventlib/default.nix +++ b/pkgs/development/python-modules/python3-eventlib/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python3-eventlib"; version = "0.3.0"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/python3-gnutls/default.nix b/pkgs/development/python-modules/python3-gnutls/default.nix index 4fcd528ad97cc..72f695326d758 100644 --- a/pkgs/development/python-modules/python3-gnutls/default.nix +++ b/pkgs/development/python-modules/python3-gnutls/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "python3-gnutls"; version = "3.1.9"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix index 769067f53fb0d..9c70c1ff94787 100644 --- a/pkgs/development/python-modules/python3-openid/default.nix +++ b/pkgs/development/python-modules/python3-openid/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "python3-openid"; version = "3.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index e24f4f65d53e9..dbd9c3d8c469f 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "python_openzwave"; version = "0.4.19"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pythondialog/default.nix b/pkgs/development/python-modules/pythondialog/default.nix index 3aa139b64b0ce..abf7b8e9eb2a2 100644 --- a/pkgs/development/python-modules/pythondialog/default.nix +++ b/pkgs/development/python-modules/pythondialog/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pythondialog"; version = "3.5.3"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index dcb03ad0c5179..2c4095b532f5b 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -18,6 +18,7 @@ let in buildPythonPackage rec { pname = "pythran"; version = "0.13.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "serge-sans-paille"; diff --git a/pkgs/development/python-modules/pytidylib/default.nix b/pkgs/development/python-modules/pytidylib/default.nix index 20aa6f817160c..e8d417f0cec59 100644 --- a/pkgs/development/python-modules/pytidylib/default.nix +++ b/pkgs/development/python-modules/pytidylib/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pytidylib"; version = "0.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytikz-allefeld/default.nix b/pkgs/development/python-modules/pytikz-allefeld/default.nix index 4701431e715d2..fe59dc0a5208c 100644 --- a/pkgs/development/python-modules/pytikz-allefeld/default.nix +++ b/pkgs/development/python-modules/pytikz-allefeld/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "pytikz-allefeld"; # "pytikz" on pypi is a different module version = "unstable-2022-11-01"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 7b1d221106328..73b084ec9d3d3 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytile"; - version = "2023.10.0"; + version = "2023.12.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "pytile"; rev = "refs/tags/${version}"; - hash = "sha256-L1Ovpxn7Y+reK8YcVBPwoRjKxcyByrPGz5i/csGzKfE="; + hash = "sha256-oHOeEaqkh+RjhpdQ5v1tFhaS6gUzl8UzDGnPLNRY90c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index 257314860d502..41cfa632dd2e9 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pytimeparse"; version = "1.1.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytimeparse2/default.nix b/pkgs/development/python-modules/pytimeparse2/default.nix index becbbb267e481..b35202e6fd4b1 100644 --- a/pkgs/development/python-modules/pytimeparse2/default.nix +++ b/pkgs/development/python-modules/pytimeparse2/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pytimeparse2"; version = "1.7.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "onegreyonewhite"; diff --git a/pkgs/development/python-modules/pytm/default.nix b/pkgs/development/python-modules/pytm/default.nix index a1567c9383ed1..be8f5089466ed 100644 --- a/pkgs/development/python-modules/pytm/default.nix +++ b/pkgs/development/python-modules/pytm/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pytm"; version = "1.2.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index 1081f31479640..eb25af8282782 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pytomlpp"; version = "1.0.13"; + format = "setuptools"; src = fetchFromGitHub { owner = "bobfang1992"; diff --git a/pkgs/development/python-modules/pytomorrowio/default.nix b/pkgs/development/python-modules/pytomorrowio/default.nix index 1b5bd96110e8d..83d5af50c96fc 100644 --- a/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/pkgs/development/python-modules/pytomorrowio/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pytomorrowio"; version = "0.3.6"; + format = "setuptools"; disabled = pythonOlder "3.9"; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 0da6f9c8eb2cf..b3fa77915ea21 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "pytools"; version = "2023.1.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index c2244a1c14477..fdced71d178a3 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.1.2"; + version = "2.1.3"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-d5DKAx67uuIPxtSgazIQnxLiHTBD0lwHaB6LD3R6vKA="; + hash = "sha256-3ELx4ukYlmsWvzK+GxEXM/0xFPPcZZcMv566jOXfcMs="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index b73af6f8658bf..0ef7e51d2c389 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -14,7 +14,8 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.3.0"; + version = "2.4.1"; + format = "setuptools"; disabled = isPy27; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eDQQPIyUUEkvpXjWAcyljlFgVlu9is4fPPUTudP7NF4="; + hash = "sha256-LftT/ATrvEkVJPS63LSN/7vCsHhobm6xk8hFEa+wrzE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 56473cc95ae26..69f33db742a6a 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pytorch-pfn-extras"; version = "0.7.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "pfnet"; diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix index f854589103a10..6bd4c17f50ea3 100644 --- a/pkgs/development/python-modules/pytraccar/default.nix +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -1,10 +1,8 @@ { lib , aiohttp -, aresponses , buildPythonPackage , fetchFromGitHub , poetry-core -, pydantic , pytestCheckHook , pytest-asyncio , pythonOlder @@ -12,16 +10,16 @@ buildPythonPackage rec { pname = "pytraccar"; - version = "1.0.0"; - format = "pyproject"; + version = "2.0.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; - rev = version; - hash = "sha256-ngyLe6sbTTQ7n4WdV06OlQnn/vqkD+JUruyMYS1Ym+Q="; + repo = "pytraccar"; + rev = "refs/tags/${version}"; + hash = "sha256-7QGgI+DDYbordBx4LbtCvPWyEh6ur2RrSKMuDlwRlTo="; }; nativeBuildInputs = [ @@ -30,11 +28,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - pydantic ]; + # https://github.com/ludeeus/pytraccar/issues/31 + doCheck = lib.versionOlder aiohttp.version "3.9.0"; + nativeCheckInputs = [ - aresponses pytestCheckHook pytest-asyncio ]; @@ -56,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to handle device information from Traccar"; homepage = "https://github.com/ludeeus/pytraccar"; + changelog = "https://github.com/ludeeus/pytraccar/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix index 20b08ebd44314..9a60920dd7b88 100644 --- a/pkgs/development/python-modules/pytrafikverket/default.nix +++ b/pkgs/development/python-modules/pytrafikverket/default.nix @@ -2,26 +2,29 @@ , buildPythonPackage , fetchPypi , aiohttp -, async-timeout , lxml , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pytrafikverket"; - version = "0.3.8"; - format = "setuptools"; + version = "0.3.9.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3p2tKFuzgl+VFRRXV66MRgcL1XS8xxDqMOUZw+Ql/5E="; + hash = "sha256-NxxuyLnzJ8T2jaQ761O943rpBbNwp/F4PygyQULkXzw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp - async-timeout lxml ]; diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix index 01c4ea014adca..88bbce684fca7 100644 --- a/pkgs/development/python-modules/pytricia/default.nix +++ b/pkgs/development/python-modules/pytricia/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pytricia"; version = "unstable-2019-01-16"; + format = "setuptools"; src = fetchFromGitHub { owner = "jsommers"; diff --git a/pkgs/development/python-modules/pytun/default.nix b/pkgs/development/python-modules/pytun/default.nix index 3437c0fbe7a56..0c16d8eb5f55a 100644 --- a/pkgs/development/python-modules/pytun/default.nix +++ b/pkgs/development/python-modules/pytun/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pytun"; version = "2.3.0"; + format = "setuptools"; src = fetchFromGitHub { rev = "v${version}"; diff --git a/pkgs/development/python-modules/pytweening/default.nix b/pkgs/development/python-modules/pytweening/default.nix index c97f4f7341e0d..32a433cafbf12 100644 --- a/pkgs/development/python-modules/pytweening/default.nix +++ b/pkgs/development/python-modules/pytweening/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "pytweening"; version = "1.0.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index 342bb088170db..f6b8e94389256 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pytzdata"; version = "2020.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyuavcan/default.nix b/pkgs/development/python-modules/pyuavcan/default.nix index f5152f8e9bf2d..33efaf5f790a1 100644 --- a/pkgs/development/python-modules/pyuavcan/default.nix +++ b/pkgs/development/python-modules/pyuavcan/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pyuavcan"; version = "1.1.0.dev1"; + format = "setuptools"; disabled = pythonOlder "3.7"; # only python>=3.7 is supported src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 8c3c0d86f3b8c..685da38ed2f18 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "pyudev"; version = "0.24.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index 0ac0a6941254e..5b0272076b9fc 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pyunifi"; version = "2.21"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 00b0f3740c352..afb99b74c6dcd 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -2,9 +2,13 @@ , aiofiles , aiohttp , aioshutil +, async-timeout , buildPythonPackage , dateparser , fetchFromGitHub +, ffmpeg +, hatch-vcs +, hatchling , ipython , orjson , packaging @@ -22,37 +26,34 @@ , python-dotenv , pythonOlder , pytz -, setuptools -, setuptools-scm , termcolor , typer -, ffmpeg }: buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.21.0"; - format = "pyproject"; + version = "4.22.3"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "briis"; - repo = pname; + repo = "pyunifiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-BFcICpWq0aBjEww9EuO6UH8oGX8fufernFqh/gihIrM="; + hash = "sha256-KpijjKy5poiWghupXq8rNCtzuPXsPgu+ePAowhzOSYI="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov=pyunifiprotect --cov-append" "" + --replace "--strict-markers -ra -Wd --ignore=.* --no-cov-on-fail --cov=pyunifiprotect --cov-append --maxfail=10 -n=auto" "" ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ - setuptools - setuptools-scm + hatch-vcs + hatchling ]; propagatedBuildInputs = [ @@ -67,7 +68,10 @@ buildPythonPackage rec { pyjwt pytz typer - ] ++ typer.optional-dependencies.all; + ] ++ typer.optional-dependencies.all + ++ lib.optionals (pythonOlder "3.11") [ + async-timeout + ]; passthru.optional-dependencies = { shell = [ diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index cd0460dc7e194..34c4d1f54ae68 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "pyupdate"; version = "1.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index 05fb6b682716d..091ee1b5f4f48 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyusb"; version = "1.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyuseragents/default.nix b/pkgs/development/python-modules/pyuseragents/default.nix index beafd4bff271d..0bfae94e02752 100644 --- a/pkgs/development/python-modules/pyuseragents/default.nix +++ b/pkgs/development/python-modules/pyuseragents/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyuseragents"; version = "1.0.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "Animenosekai"; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index 12a74c3f192cc..9b4023bc498d0 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "pyutil"; version = "3.3.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix index a8af2db236229..ba1670a92645a 100644 --- a/pkgs/development/python-modules/pyutilib/default.nix +++ b/pkgs/development/python-modules/pyutilib/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyutilib"; version = "6.0.0"; + format = "setuptools"; src = fetchPypi { pname = "PyUtilib"; diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index f3209e3bdf218..594e1d7b34e08 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pyuv"; version = "1.4.0"; + format = "setuptools"; disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index ad79a35d5e04c..9f206dcda1bff 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { version = "0.4.0"; + format = "setuptools"; pname = "pyvcd"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix index 54456cf42789e..bc526604d87b1 100644 --- a/pkgs/development/python-modules/pyverilog/default.nix +++ b/pkgs/development/python-modules/pyverilog/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pyverilog"; version = "1.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index ef4e572c873af..3712580637635 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.79"; + version = "9.2.82"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-wtRguqbSvypScYhPlnWXM1qcppaw2Tb93GNYc/fziCM="; + hash = "sha256-m3vHz56w15M2oZhSDzO5wiAVk1+/DoxZxS0qBFh5pQM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 20d632456ea64..0fa3895caa58d 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.29.0"; + version = "2.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = "refs/tags/${version}"; - hash = "sha256-FTvlRCPajRqKLCb5x1Gz/EGZIdMhXow4nP+WlWbjLko="; + hash = "sha256-qK5JCaCL+gbgNcBo5IjhlRrXD1IhA1B56hmcjvPie6Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 70272d54ac8d6..a3872cdb858ba 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "pyvips"; version = "2.2.1"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix index 0ba6c4ba6c00f..b4d29851ef34f 100644 --- a/pkgs/development/python-modules/pyvirtualdisplay/default.nix +++ b/pkgs/development/python-modules/pyvirtualdisplay/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pyvirtualdisplay"; version = "3.0"; + format = "setuptools"; propagatedBuildInputs = [ easyprocess ]; diff --git a/pkgs/development/python-modules/pyvisa/default.nix b/pkgs/development/python-modules/pyvisa/default.nix index 850b19e5b1af6..a104726ac8034 100644 --- a/pkgs/development/python-modules/pyvisa/default.nix +++ b/pkgs/development/python-modules/pyvisa/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pyvisa"; version = "1.13.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index eb457166876cf..0493509e976b2 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.42.3"; + version = "0.43.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RIeasdsLCBBs9eXUts53zlCkqkME48GBWVAcBoEHuOM="; + hash = "sha256-H7WkRK9lP92L47nFNDT1WusWfU0bLgXBA+KQqTyedL4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvizio/default.nix b/pkgs/development/python-modules/pyvizio/default.nix index 567e8c4d5ebbe..41b42b85b0d90 100644 --- a/pkgs/development/python-modules/pyvizio/default.nix +++ b/pkgs/development/python-modules/pyvizio/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "pyvizio"; version = "0.1.61"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 02550d61a9eeb..f70b12e362518 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -1,28 +1,35 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchFromGitHub , pytestCheckHook , pythonOlder , pyyaml +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "pyvlx"; - version = "0.2.20"; - format = "setuptools"; + version = "0.2.21"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "Julius2342"; - repo = pname; - rev = version; - sha256 = "1irjix9kr6qih84gii7k1a9c67n8133gpnmwfd09550jsqdmg006"; + repo = "pyvlx"; + rev = "refs/tags/${version}"; + hash = "sha256-t6lbpP9IwNhXpoZ9+0n9vKCuZ+azWqP7w5v0BfqbMcs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyyaml + typing-extensions ]; nativeCheckInputs = [ @@ -34,14 +41,15 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Python client to work with Velux units"; longDescription = '' PyVLX uses the Velux KLF 200 interface to control io-Homecontrol devices, e.g. Velux Windows. ''; homepage = "https://github.com/Julius2342/pyvlx"; + changelog = "https://github.com/Julius2342/pyvlx/releases/tag/${version}"; license = with licenses; [ lgpl2Only ]; maintainers = with maintainers; [ fab ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 4498b4f150908..e16505006c479 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -14,13 +14,14 @@ buildPythonPackage rec { pname = "pyvo"; - version = "1.4.2"; + version = "1.5"; + format = "setuptools"; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-Zv4piGWs/XJbxfGHUHctfxuImbjluxd1chUgvtV9lcs="; + hash = "sha256-heTWWyxmRaDlI9NHzZab5OLOBIbVdb45v67Rq5ckzc8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyvolumio/default.nix b/pkgs/development/python-modules/pyvolumio/default.nix index 05dcbce167e86..aac4f9c73a710 100644 --- a/pkgs/development/python-modules/pyvolumio/default.nix +++ b/pkgs/development/python-modules/pyvolumio/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyvolumio"; version = "0.1.5"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix index 595fa345f303b..5c17554935d2e 100644 --- a/pkgs/development/python-modules/pyvoro/default.nix +++ b/pkgs/development/python-modules/pyvoro/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "1.3.2"; + format = "setuptools"; pname = "pyvoro"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix index 2e09573d848c8..2f73d23eb70a0 100644 --- a/pkgs/development/python-modules/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pywal"; version = "3.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix index a2cd2a6eed5ad..013ca015df94c 100644 --- a/pkgs/development/python-modules/pywatchman/default.nix +++ b/pkgs/development/python-modules/pywatchman/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pywatchman"; version = "1.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index 591fb0026c2bd..6930f4ba374d5 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pywayland"; version = "0.4.17"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index 806f8e2138311..501d0a56f783a 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "pywebpush"; version = "1.14.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix index ac637d4501a89..a7e7976a10192 100644 --- a/pkgs/development/python-modules/pywerview/default.nix +++ b/pkgs/development/python-modules/pywerview/default.nix @@ -9,22 +9,27 @@ , pyasn1 , pycryptodome , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pywerview"; - version = "0.5.2"; - format = "setuptools"; + version = "0.6"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "the-useless-one"; - repo = pname; + repo ="pywerview"; rev = "refs/tags/v${version}"; - hash = "sha256-BWH9zYrlbzQC0/cc5k5BlXWyh38gI+hwwTCWhe1xgog="; + hash = "sha256-WZE6qWq9v4A78YELMEcbgyufBRrVFRTqlhGmknpKn1Y="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ beautifulsoup4 gssapi diff --git a/pkgs/development/python-modules/pyworld/default.nix b/pkgs/development/python-modules/pyworld/default.nix index bf31d646ff5f8..cf1547c8cab6f 100644 --- a/pkgs/development/python-modules/pyworld/default.nix +++ b/pkgs/development/python-modules/pyworld/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyworld"; version = "0.3.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index 1774e89ed753c..393f631233228 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyx"; version = "0.16"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix index 2bc4a9bf950e6..ebb922c8d97a5 100644 --- a/pkgs/development/python-modules/pyxattr/default.nix +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyxattr"; version = "0.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/pkgs/development/python-modules/pyxdg/default.nix index 9e3c24fdb6d34..a5ef39c2f69a6 100644 --- a/pkgs/development/python-modules/pyxdg/default.nix +++ b/pkgs/development/python-modules/pyxdg/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "pyxdg"; version = "0.28"; + format = "setuptools"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; diff --git a/pkgs/development/python-modules/pyxeoma/default.nix b/pkgs/development/python-modules/pyxeoma/default.nix index 2fa840078df81..2036440a4699b 100644 --- a/pkgs/development/python-modules/pyxeoma/default.nix +++ b/pkgs/development/python-modules/pyxeoma/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyxeoma"; version = "1.4.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyxiaomigateway/default.nix b/pkgs/development/python-modules/pyxiaomigateway/default.nix index dd9ceacc1f9ea..dde2e8df94ae3 100644 --- a/pkgs/development/python-modules/pyxiaomigateway/default.nix +++ b/pkgs/development/python-modules/pyxiaomigateway/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "pyxiaomigateway"; version = "0.14.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "Danielhiversen"; diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index 1242697abab32..e6f940e0272f0 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "pyxl3"; version = "1.4"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix index e8956dba3484c..80b26e7080fcd 100644 --- a/pkgs/development/python-modules/pyxnat/default.nix +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "pyxnat"; version = "1.6"; + format = "setuptools"; disabled = pythonOlder "3.8"; # PyPI dist missing test configuration files: diff --git a/pkgs/development/python-modules/pyyaml-env-tag/default.nix b/pkgs/development/python-modules/pyyaml-env-tag/default.nix index 208f608855c56..71488c1bb5eb7 100644 --- a/pkgs/development/python-modules/pyyaml-env-tag/default.nix +++ b/pkgs/development/python-modules/pyyaml-env-tag/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "pyyaml-env-tag"; version = "0.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/pyzbar/default.nix b/pkgs/development/python-modules/pyzbar/default.nix index fca8feab0c3f6..60241e40773fa 100644 --- a/pkgs/development/python-modules/pyzbar/default.nix +++ b/pkgs/development/python-modules/pyzbar/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "pyzbar"; version = "0.1.9"; + format = "setuptools"; src = fetchFromGitHub { owner = "NaturalHistoryMuseum"; diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix index f83a741dfd900..7c35ba6869292 100644 --- a/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/pkgs/development/python-modules/qdarkstyle/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "qdarkstyle"; version = "3.2.3"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/qdldl/default.nix b/pkgs/development/python-modules/qdldl/default.nix index 8369bbf2a33d3..1a988afce4288 100644 --- a/pkgs/development/python-modules/qdldl/default.nix +++ b/pkgs/development/python-modules/qdldl/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "qdldl"; version = "0.1.7.post0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 37ca849a76763..e57e607afcf3a 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.6.2"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UGD8hl0KN6PzLvmE4ZK+GsQbM3Bp8t9Mz4K62N6Zv/s="; + hash = "sha256-fC28uQK4mAN21VdAeT4NbezZY1qZVOIK3rs3v31S39Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qgrid/default.nix b/pkgs/development/python-modules/qgrid/default.nix index f5758c3182d91..778a9eae37145 100644 --- a/pkgs/development/python-modules/qgrid/default.nix +++ b/pkgs/development/python-modules/qgrid/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "qgrid"; version = "1.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/pkgs/development/python-modules/qimage2ndarray/default.nix index 2aead62789f7a..2a5f575fb117d 100644 --- a/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "qimage2ndarray"; version = "1.10.0"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/qingping-ble/default.nix b/pkgs/development/python-modules/qingping-ble/default.nix index 8140226b4dd95..7c7431b01e872 100644 --- a/pkgs/development/python-modules/qingping-ble/default.nix +++ b/pkgs/development/python-modules/qingping-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "qingping-ble"; - version = "0.8.2"; + version = "0.9.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-vfezalq3x9KAMtwixUkIVQIwBO2zd+BDl+JwdRqBn7w="; + hash = "sha256-h2PVrwesUaJfwJtuNf44bd1MefpSmOm7Q4A/URvd+IY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index e774990fb9998..ecd8905583e2b 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -147,7 +147,7 @@ buildPythonPackage rec { postCheck = "popd"; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = true; description = "High performance simulators for Qiskit"; homepage = "https://qiskit.org/aer"; downloadPage = "https://github.com/QISKit/qiskit-aer/releases"; diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index 880804ff8527c..559ed8f69bbea 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { pname = "qiskit-finance"; version = "0.3.4"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 4bf996a26507e..24bee7d9dbc4b 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -41,6 +41,7 @@ in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; version = "0.20.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index 2c963271a4dbd..9fbaa5957fee8 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { pname = "qiskit-ignis"; version = "0.7.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index 1c23fb3b0398d..da26fa3a27318 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; version = "0.6.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 8fc30687f69e4..b9083bdcd51fd 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { pname = "qiskit-nature"; version = "0.6.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix index f68149529e648..bd3d8251f10a0 100644 --- a/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { pname = "qiskit-optimization"; version = "0.5.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 2c290493b063d..38c01d252ae13 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -1,11 +1,13 @@ { stdenv , lib +, pythonAtLeast , pythonOlder , buildPythonPackage , fetchFromGitHub , cargo , rustPlatform , rustc +, libiconv # Python requirements , dill , numpy @@ -33,7 +35,7 @@ , seaborn # Crosstalk-adaptive layout pass , withCrosstalkPass ? false -, z3 +, z3-solver # test requirements , ddt , hypothesis @@ -53,14 +55,15 @@ let pylatexenc seaborn ]; - crosstalkPackages = [ z3 ]; + crosstalkPackages = [ z3-solver ]; in buildPythonPackage rec { pname = "qiskit-terra"; version = "0.25.1"; + format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "qiskit"; @@ -71,10 +74,12 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-rust rustc cargo rustPlatform.cargoSetupHook ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-SXC0UqWjWqLlZvKCRBylSX73r4Vale130KzS0zM8gjQ="; + hash = "sha256-f5VLNxv9DKwfRy5zacydfz4Zrkbiee7JecOAbVelSto="; }; propagatedBuildInputs = [ @@ -116,6 +121,8 @@ buildPythonPackage rec { "test/randomized/" # These tests consistently fail on GitHub Actions build "test/python/quantum_info/operators/test_random.py" + # Too many floating point arithmetic errors + "test/visual/mpl/circuit/test_circuit_matplotlib_drawer.py" ]; pytestFlagsArray = [ "--durations=10" ]; disabledTests = [ @@ -125,6 +132,11 @@ buildPythonPackage rec { "TestGraphMatplotlibDrawer" "test_copy" # assertNotIn doesn't seem to work as expected w/ pytest vs unittest + "test_bound_pass_manager" # AssertionError: 0 != 2 + "test_complex_parameter_bound_to_real" # qiskit.circuit.exceptions.CircuitError: "Invalid param type <class 'complex'> for gate rx." + "test_expressions_of_parameter_with_constant" # Floating point arithmetic error + "test_handle_measurement" # AssertionError: The two circuits are not equal + # Flaky tests "test_pulse_limits" # Fails on GitHub Actions, probably due to minor floating point arithmetic error. "test_cx_equivalence" # Fails due to flaky test @@ -195,7 +207,6 @@ buildPythonPackage rec { meta = with lib; { - broken = true; # tests segfault python description = "Provides the foundations for Qiskit."; longDescription = '' Allows the user to write quantum circuits easily, and takes care of the constraints of real hardware. diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 9539564132636..13d70a2d472aa 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -29,6 +29,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history version = "0.41.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index f480217aa621e..9f0538136afce 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "4.0.1"; + version = "4.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; rev = "refs/tags/v${version}"; - hash = "sha256-s1d8oTrmptS3exUqn9HSSla6P4dIxS/qNalsDTbFmFs="; + hash = "sha256-brniRAGwN/areB7MnaGeF7CdNku7DG/Q+8TmCXY99iU="; }; pythonImportsCheck = [ "qpsolvers" ]; diff --git a/pkgs/development/python-modules/qt-material/default.nix b/pkgs/development/python-modules/qt-material/default.nix index c7c195cdfc48f..25885676a9daf 100644 --- a/pkgs/development/python-modules/qt-material/default.nix +++ b/pkgs/development/python-modules/qt-material/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "qt-material"; version = "2.14"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/qt5reactor/default.nix b/pkgs/development/python-modules/qt5reactor/default.nix index e479e53dec563..07420ca1502d9 100644 --- a/pkgs/development/python-modules/qt5reactor/default.nix +++ b/pkgs/development/python-modules/qt5reactor/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "qt5reactor"; version = "0.6.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 7e6d4a826eeb4..15806119cb787 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { pname = "qtile"; version = "0.23.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "qtile"; diff --git a/pkgs/development/python-modules/quamash/default.nix b/pkgs/development/python-modules/quamash/default.nix index bca7c8dc7d63c..7257f480696d0 100644 --- a/pkgs/development/python-modules/quamash/default.nix +++ b/pkgs/development/python-modules/quamash/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "quamash"; version = "0.6.1"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index 71e09ef98ed52..e9643b813d77b 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "queuelib"; version = "1.6.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index ad258fc123ef8..995a839ebf2d0 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.8.0"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-T1w4QG0KBPBekETd+nMNbvPF2mgBZgQ/jhWcP9694mg="; + hash = "sha256-JloEScP6pvUcIdL7VidD60hFPCSqOByMDttDUwDJkxs="; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/pkgs/development/python-modules/rachiopy/default.nix b/pkgs/development/python-modules/rachiopy/default.nix index ccd1f9aef64d3..83a0ef3146d5a 100644 --- a/pkgs/development/python-modules/rachiopy/default.nix +++ b/pkgs/development/python-modules/rachiopy/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "rachiopy"; version = "1.0.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "rfverbruggen"; diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix index e862c70c1223b..cbc4be6e7aa11 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -3,6 +3,7 @@ buildPythonPackage { pname = "radicale_infcloud"; version = "unstable-2022-04-18"; + format = "setuptools"; src = fetchFromGitHub { owner = "Unrud"; diff --git a/pkgs/development/python-modules/radio-beam/default.nix b/pkgs/development/python-modules/radio-beam/default.nix index 41653caaa3e09..6d743125e8805 100644 --- a/pkgs/development/python-modules/radio-beam/default.nix +++ b/pkgs/development/python-modules/radio-beam/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "radio-beam"; - version = "0.3.6"; + version = "0.3.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-U+IjOTt7x9uzUl7IcQRu2s+MBKF/OR+sLddvHmp9hqU="; + hash = "sha256-7AFkuuYLzibwwgz6zrFw0fBXCnGLzdm4OgT+Chve5jU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/radiotherm/default.nix b/pkgs/development/python-modules/radiotherm/default.nix index e7cd4fb1f8541..1d62144e00cc8 100644 --- a/pkgs/development/python-modules/radiotherm/default.nix +++ b/pkgs/development/python-modules/radiotherm/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "radiotherm"; version = "2.1.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix index a210429e98506..9d20fa6a09f6b 100644 --- a/pkgs/development/python-modules/rainbowstream/default.nix +++ b/pkgs/development/python-modules/rainbowstream/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { pname = "rainbowstream"; version = "1.5.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "orakaro"; diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix index 081a3a2857188..3c2be0da47928 100644 --- a/pkgs/development/python-modules/ramlfications/default.nix +++ b/pkgs/development/python-modules/ramlfications/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "ramlfications"; version = "0.1.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/random2/default.nix b/pkgs/development/python-modules/random2/default.nix index cb84d32ef414c..ee289b906d343 100644 --- a/pkgs/development/python-modules/random2/default.nix +++ b/pkgs/development/python-modules/random2/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "random2"; version = "1.0.1"; + format = "setuptools"; doCheck = !isPyPy; src = fetchPypi { diff --git a/pkgs/development/python-modules/rapidfuzz-capi/default.nix b/pkgs/development/python-modules/rapidfuzz-capi/default.nix index b0235f1eda448..9444b949a5105 100644 --- a/pkgs/development/python-modules/rapidfuzz-capi/default.nix +++ b/pkgs/development/python-modules/rapidfuzz-capi/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "rapidfuzz-capi"; version = "1.0.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "maxbachmann"; diff --git a/pkgs/development/python-modules/rapidgzip/default.nix b/pkgs/development/python-modules/rapidgzip/default.nix index 4507468766690..82322c07c7d07 100644 --- a/pkgs/development/python-modules/rapidgzip/default.nix +++ b/pkgs/development/python-modules/rapidgzip/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "rapidgzip"; - version = "0.10.4"; + version = "0.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dTVQTxzgjHAUuoWA2+asMI5g2fIWvHEl46bdTIAxAvg="; + hash = "sha256-pcKO9BovkUDlRjE8MZQEfTSutVMB/9beyAyP3vChMUE="; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index 2f988ddace7f6..702e47b4bdf63 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -9,6 +9,7 @@ assert !useUnrar -> libarchive != null; buildPythonPackage rec { pname = "rarfile"; version = "4.1"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix index 1555dfca2197a..f07b28bec4f40 100644 --- a/pkgs/development/python-modules/ratarmount/default.nix +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "ratarmount"; version = "0.14.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/ratarmountcore/default.nix b/pkgs/development/python-modules/ratarmountcore/default.nix index 49ffdb17cfa5e..90a45cecdb7ad 100644 --- a/pkgs/development/python-modules/ratarmountcore/default.nix +++ b/pkgs/development/python-modules/ratarmountcore/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "ratarmountcore"; version = "0.6.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/ratelim/default.nix b/pkgs/development/python-modules/ratelim/default.nix index 8fc3323ce1b5b..c271b44ca32f9 100644 --- a/pkgs/development/python-modules/ratelim/default.nix +++ b/pkgs/development/python-modules/ratelim/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "ratelim"; version = "0.1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ratelimit/default.nix b/pkgs/development/python-modules/ratelimit/default.nix index 7a1af77df0e26..5a2c40efd1055 100644 --- a/pkgs/development/python-modules/ratelimit/default.nix +++ b/pkgs/development/python-modules/ratelimit/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "ratelimit"; version = "2.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "tomasbasham"; diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index cdcec2bf249d0..dec666782d12c 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "raven"; version = "6.10.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "getsentry"; diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix index 83252b1c3338f..7a644220e93a9 100644 --- a/pkgs/development/python-modules/rawkit/default.nix +++ b/pkgs/development/python-modules/rawkit/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "rawkit"; version = "0.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/razdel/default.nix b/pkgs/development/python-modules/razdel/default.nix index c870ba819ba17..66c2f4fae5e23 100644 --- a/pkgs/development/python-modules/razdel/default.nix +++ b/pkgs/development/python-modules/razdel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "razdel" ]; - pythonImportCheck = [ "razdel" ]; + pythonImportsCheck = [ "razdel" ]; meta = with lib; { description = "Rule-based system for Russian sentence and word tokenization"; diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index 1c99ee0fc8df8..470a8051020fb 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "rbtools"; version = "1.0.2"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix index 6b04c0f1cd916..b1360d7bf5206 100644 --- a/pkgs/development/python-modules/readability-lxml/default.nix +++ b/pkgs/development/python-modules/readability-lxml/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "readability-lxml"; version = "0.8.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "buriy"; diff --git a/pkgs/development/python-modules/readlike/default.nix b/pkgs/development/python-modules/readlike/default.nix index 6fc271f7811a0..da43d1cec2ceb 100644 --- a/pkgs/development/python-modules/readlike/default.nix +++ b/pkgs/development/python-modules/readlike/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "readlike"; version = "0.1.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "jangler"; diff --git a/pkgs/development/python-modules/readme/default.nix b/pkgs/development/python-modules/readme/default.nix index 6a43bcdc3e069..3d18bb8df7f5e 100644 --- a/pkgs/development/python-modules/readme/default.nix +++ b/pkgs/development/python-modules/readme/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "readme"; version = "0.7.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index fc2fd653083d5..0ce923663f886 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; version = "2.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index ebe070f2735f7..3faf8493043ab 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "recommonmark"; version = "0.7.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "rtfd"; diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index 3ddc6bb4ccc90..8903d01346469 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "2.1.1"; + version = "2.1.2"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-I5D4CAk0C60H2hMBV62gOaIRA+wYF2ORKxHfWustQz0="; + hash = "sha256-6qFUw5xfZvDuM/UBEGtoiHON15/6oq1S8H0Z1qk3k8s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/redbaron/default.nix b/pkgs/development/python-modules/redbaron/default.nix index 46123c39496f0..52a3ac5b265e9 100644 --- a/pkgs/development/python-modules/redbaron/default.nix +++ b/pkgs/development/python-modules/redbaron/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "redbaron"; version = "0.9.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/reflink/default.nix b/pkgs/development/python-modules/reflink/default.nix index 44106c6ca8142..ab7504cf2f312 100644 --- a/pkgs/development/python-modules/reflink/default.nix +++ b/pkgs/development/python-modules/reflink/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "reflink"; version = "0.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index c3b959a65ef00..2b702284be7d3 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2023.11.0"; + version = "2023.12.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bachya"; repo = "regenmaschine"; rev = "refs/tags/${version}"; - hash = "sha256-FRfw3B2zHEspKf1LENrB3Ayu6/t3hyS8sjuwoBC5Lfk="; + hash = "sha256-9VBqLmbWJCrfDw9T1qmE9KkdlS+MDnvoG8O9dPCuJDs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 316d81b706582..86a41f4a9f0d9 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "reikna"; version = "0.8.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix index 1a6ac76db05c0..b1f28e269099e 100644 --- a/pkgs/development/python-modules/remi/default.nix +++ b/pkgs/development/python-modules/remi/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "remi"; version = "2022.7.27"; + format = "setuptools"; src = fetchFromGitHub { owner = "rawpython"; diff --git a/pkgs/development/python-modules/remote-pdb/default.nix b/pkgs/development/python-modules/remote-pdb/default.nix index cbaf07ebe2b96..5081c34c3c464 100644 --- a/pkgs/development/python-modules/remote-pdb/default.nix +++ b/pkgs/development/python-modules/remote-pdb/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { pname = "remote-pdb"; version = "2.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ionelmc"; repo = "python-remote-pdb"; diff --git a/pkgs/development/python-modules/remotezip/default.nix b/pkgs/development/python-modules/remotezip/default.nix index 5a79b68e6b851..6581fc6189bea 100644 --- a/pkgs/development/python-modules/remotezip/default.nix +++ b/pkgs/development/python-modules/remotezip/default.nix @@ -9,7 +9,7 @@ buildPythonPackage { pname = "remotezip"; - version = "0.12.1"; + version = "0.12.2"; format = "setuptools"; src = fetchFromGitHub { @@ -17,8 +17,8 @@ buildPythonPackage { repo = "python-remotezip"; # upstream does not tag releases, determined with git blame # pypi archive lacks files for tests - rev = "da62e115bdb2071ad08a8c91f7ae48f2c1827e0c"; - hash = "sha256-su4dlV8KZuewf/yGdTnGHK9hNLHwGe10ditmFcne4Us="; + rev = "3723724d6d877d3166d52f4528ffa7bd5bf6627f"; + hash = "sha256-iYxHW8RdLFrpjkcEvpfF/NWBnw7Dd5cx2ghpof2XFn4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 58fc148997b9a..6310d70d2cc64 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x6+rFstZM7Uplwa8NeRBTb8FYSD/NGjN/3q5earvN7c="; + hash = "sha256-HDaX94XHkyrIA0hWYwcpUItEIeRK2ACvS6jg1YA6Wv4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/renson-endura-delta/default.nix b/pkgs/development/python-modules/renson-endura-delta/default.nix new file mode 100644 index 0000000000000..013678d5eeec9 --- /dev/null +++ b/pkgs/development/python-modules/renson-endura-delta/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, setuptools +}: + +buildPythonPackage rec { + pname = "renson-endura-delta"; + version = "1.7.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jimmyd-be"; + repo = "Renson-endura-delta-library"; + rev = "refs/tags/${version}"; + hash = "sha256-ndk0qcRUWxUimNHg62UgeYK/MRKQd3e4JQDh9x8vFj8="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ + "renson_endura_delta" + ]; + + meta = with lib; { + description = "Module to interact with Renson endura delta"; + homepage = "https://github.com/jimmyd-be/Renson-endura-delta-library"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 2fbacc6ea9809..77097cbe64d5b 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.8.1"; + version = "0.8.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-zxIx7+cpYKN811yz+nxjtOagHOMMIs1YU0ZLN9q5T7M="; + hash = "sha256-wayaXNAZCo387laJRxiJai79CRJGgDlFYfSd603CAEA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix index 1c5417c75a19e..e3af1cb11cc5d 100644 --- a/pkgs/development/python-modules/reorder-python-imports/default.nix +++ b/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "reorder-python-imports"; version = "3.12.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/reparser/default.nix b/pkgs/development/python-modules/reparser/default.nix index 90d701a0e4651..fe0befde9db1b 100644 --- a/pkgs/development/python-modules/reparser/default.nix +++ b/pkgs/development/python-modules/reparser/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "reparser"; version = "1.4.3"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/repath/default.nix b/pkgs/development/python-modules/repath/default.nix index f66a42155da0d..b052b408e9f4c 100644 --- a/pkgs/development/python-modules/repath/default.nix +++ b/pkgs/development/python-modules/repath/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "repath"; version = "0.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/repocheck/default.nix b/pkgs/development/python-modules/repocheck/default.nix index 9d6c2c419216d..0fbfbbb25269c 100644 --- a/pkgs/development/python-modules/repocheck/default.nix +++ b/pkgs/development/python-modules/repocheck/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "repocheck"; version = "2015-08-05"; + format = "setuptools"; src = fetchFromGitHub { sha256 = "1jc4v5zy7z7xlfmbfzvyzkyz893f5x2k6kvb3ni3rn2df7jqhc81"; diff --git a/pkgs/development/python-modules/reportlab/darwin-m1-compat.patch b/pkgs/development/python-modules/reportlab/darwin-m1-compat.patch deleted file mode 100644 index 5c9d4404f97e6..0000000000000 --- a/pkgs/development/python-modules/reportlab/darwin-m1-compat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 7625074..b3aa2fc 100644 ---- a/setup.py -+++ b/setup.py -@@ -249,7 +249,7 @@ class inc_lib_dirs: - aDir(L, os.path.join("/usr/lib", "python%s" % sys.version[:3], "config")) - elif platform == "darwin": - machine = sysconfig_platform.split('-')[-1] -- if machine=='arm64' or os.environ.get('ARCHFLAGS','')=='-arch arm64': -+ if False and machine=='arm64' or os.environ.get('ARCHFLAGS','')=='-arch arm64': - #print('!!!!! detected darwin arm64 build') - #probably an M1 - target = pjoin( diff --git a/pkgs/development/python-modules/requests-hawk/default.nix b/pkgs/development/python-modules/requests-hawk/default.nix index 74bafbcabca5e..0f4b040be5826 100644 --- a/pkgs/development/python-modules/requests-hawk/default.nix +++ b/pkgs/development/python-modules/requests-hawk/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "requests-hawk"; version = "1.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index 225bf1ecbbdfc..150719c6fff62 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "requests-oauthlib"; version = "1.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/requests-wsgi-adapter/default.nix b/pkgs/development/python-modules/requests-wsgi-adapter/default.nix index 77386c21a8698..906bf06f8eafc 100644 --- a/pkgs/development/python-modules/requests-wsgi-adapter/default.nix +++ b/pkgs/development/python-modules/requests-wsgi-adapter/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "requests-wsgi-adapter"; version = "0.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/pkgs/development/python-modules/requestsexceptions/default.nix index 55b3209553510..5530c2ecd48cb 100644 --- a/pkgs/development/python-modules/requestsexceptions/default.nix +++ b/pkgs/development/python-modules/requestsexceptions/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "requestsexceptions"; version = "1.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/reretry/default.nix b/pkgs/development/python-modules/reretry/default.nix index c4c6928af0420..e5db5b50cbaaa 100644 --- a/pkgs/development/python-modules/reretry/default.nix +++ b/pkgs/development/python-modules/reretry/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "reretry"; version = "0.11.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/resize-right/default.nix b/pkgs/development/python-modules/resize-right/default.nix index 6a0b9b5cd7731..99b42faf39952 100644 --- a/pkgs/development/python-modules/resize-right/default.nix +++ b/pkgs/development/python-modules/resize-right/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "resize-right"; version = "0.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index dc809ecbdee07..e1ba1bcf557e6 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/pull/128636 # https://github.com/ansible/ansible/blob/devel/requirements.txt version = "0.5.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "sarugaku"; diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 875771d8f8c6e..169e28773b42b 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -5,21 +5,26 @@ , pytestCheckHook , pythonAtLeast , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "restrictedpython"; - version = "6.2"; - format = "setuptools"; + version = "7.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "RestrictedPython"; inherit version; - hash = "sha256-23Prfjs5ZQ8NIdEMyN2pwOKYbmIclLDF3jL7De46CK8="; + hash = "sha256-U3BK+7w1D9yPskVEE2e+Zxyfg4CGkgGy6EUudPzj2xQ="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock diff --git a/pkgs/development/python-modules/result/default.nix b/pkgs/development/python-modules/result/default.nix index e969764f90cfe..3f15c2ce4c1a7 100644 --- a/pkgs/development/python-modules/result/default.nix +++ b/pkgs/development/python-modules/result/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "result"; version = "0.7.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "rustedpy"; diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index d0ba2a4da77bd..889c729950e08 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "rethinkdb"; version = "2.4.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/retry/default.nix b/pkgs/development/python-modules/retry/default.nix index e093f761f251d..993c7270b8073 100644 --- a/pkgs/development/python-modules/retry/default.nix +++ b/pkgs/development/python-modules/retry/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "retry"; version = "0.9.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix index 38e79765aafb0..572c29931ad39 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/development/python-modules/reuse/default.nix @@ -1,6 +1,16 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, binaryornot +, boolean-py +, debian +, jinja2 +, license-expression +, pytestCheckHook +}: -python3Packages.buildPythonApplication rec { +buildPythonPackage rec { pname = "reuse"; version = "2.1.0"; format = "pyproject"; @@ -12,11 +22,11 @@ python3Packages.buildPythonApplication rec { hash = "sha256-MEQiuBxe/ctHlAnmLhQY4QH62uAcHb7CGfZz+iZCRSk="; }; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ binaryornot boolean-py debian @@ -24,13 +34,15 @@ python3Packages.buildPythonApplication rec { license-expression ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # pytest wants to execute the actual source files for some reason, which fails with ImportPathMismatchError() "src/reuse" ]; + pythonImportsCheck = [ "reuse" ]; + meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; homepage = "https://github.com/fsfe/reuse-tool"; diff --git a/pkgs/development/python-modules/rfc3339-validator/default.nix b/pkgs/development/python-modules/rfc3339-validator/default.nix index e1a9f03188820..9de6919692a4e 100644 --- a/pkgs/development/python-modules/rfc3339-validator/default.nix +++ b/pkgs/development/python-modules/rfc3339-validator/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "rfc3339-validator"; version = "0.1.4"; + format = "setuptools"; src = fetchPypi { pname = "rfc3339_validator"; diff --git a/pkgs/development/python-modules/rfc3339/default.nix b/pkgs/development/python-modules/rfc3339/default.nix index 4b1355e511a8a..9c5faa38131cb 100644 --- a/pkgs/development/python-modules/rfc3339/default.nix +++ b/pkgs/development/python-modules/rfc3339/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "rfc3339"; version = "6.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rfc3987/default.nix b/pkgs/development/python-modules/rfc3987/default.nix index 41beb1c8c17f5..51c6d04ea6dc5 100644 --- a/pkgs/development/python-modules/rfc3987/default.nix +++ b/pkgs/development/python-modules/rfc3987/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "rfc3987"; version = "1.3.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rfc7464/default.nix b/pkgs/development/python-modules/rfc7464/default.nix index 9e5a5d3689da6..e65c9ec3ab2ab 100644 --- a/pkgs/development/python-modules/rfc7464/default.nix +++ b/pkgs/development/python-modules/rfc7464/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "rfc7464"; version = "17.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 6aad6e5279752..a08a084484380 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.7.1"; + version = "1.7.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ewels"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rWVJEuJx5nDUg6RvhubHu9U2Glilrkugjg28SpFIZys="; + hash = "sha256-uPEPYQIoLdjUJZlcg/0jenzIz464nwGi5KfOOyIQ/3I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rich-pixels/default.nix b/pkgs/development/python-modules/rich-pixels/default.nix index 9e40b4b52fcfb..a086065725b55 100644 --- a/pkgs/development/python-modules/rich-pixels/default.nix +++ b/pkgs/development/python-modules/rich-pixels/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "rich-pixels"; - version = "2.1.1"; + version = "2.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "darrenburns"; repo = "rich-pixels"; rev = version; - hash = "sha256-zI6jtEdmBAEGxyASo/6fiHdzwzoSwXN7A5x1CmYS5qc="; + hash = "sha256-fbpnHEfBPWLSYhgETqKbdmmzt7Lu/4oKgetjgNvv04c="; }; nativeBuildInputs = [ @@ -49,9 +49,7 @@ buildPythonPackage rec { description = "A Rich-compatible library for writing pixel images and ASCII art to the terminal"; homepage = "https://github.com/darrenburns/rich-pixels"; changelog = "https://github.com/darrenburns/rich-pixels/releases/tag/${src.rev}"; - # upstream has no license specified - # https://github.com/darrenburns/rich-pixels/issues/11 - license = licenses.unfree; + license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; } diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index ac7d76f4377ea..8065fea978bfe 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -2,6 +2,7 @@ , asyncclick , buildPythonPackage , fetchPypi +, firebase-messaging , oauthlib , poetry-core , pytest-asyncio @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.8.3"; + version = "0.8.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-d3GcswCTI8UUj4Ph/WujnQQlHB9m46UjNRkN0nA6Sxs="; + hash = "sha256-WYoElfkq0/uK3GPcIwDUP9w8l5zN9G2X/KDJbJNse9s="; }; nativeBuildInputs = [ @@ -40,6 +41,12 @@ buildPythonPackage rec { requests-oauthlib ]; + passthru.optional-dependencies = { + listen = [ + firebase-messaging + ]; + }; + nativeCheckInputs = [ pytest-asyncio pytest-mock diff --git a/pkgs/development/python-modules/riprova/default.nix b/pkgs/development/python-modules/riprova/default.nix index c4a0ee950704b..cafe14e01bd91 100644 --- a/pkgs/development/python-modules/riprova/default.nix +++ b/pkgs/development/python-modules/riprova/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec{ pname = "riprova"; version = "0.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index ab52aec1a2362..5df3998f80154 100644 --- a/pkgs/development/python-modules/rising/default.nix +++ b/pkgs/development/python-modules/rising/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "rising"; version = "0.3.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix index 6793cf747b5f1..c73433e146a1c 100644 --- a/pkgs/development/python-modules/rlax/default.nix +++ b/pkgs/development/python-modules/rlax/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "rlax"; version = "0.1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index b0e7d123e6910..9938ad1c44102 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "rlp"; version = "3.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ethereum"; diff --git a/pkgs/development/python-modules/rmsd/default.nix b/pkgs/development/python-modules/rmsd/default.nix index 2a0f2ecb50b2c..1def479816f6e 100644 --- a/pkgs/development/python-modules/rmsd/default.nix +++ b/pkgs/development/python-modules/rmsd/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "rmsd"; version = "1.5.1"; + format = "setuptools"; propagatedBuildInputs = [ scipy ]; diff --git a/pkgs/development/python-modules/rnc2rng/default.nix b/pkgs/development/python-modules/rnc2rng/default.nix index 104a6f12a675d..e6abf4f189f00 100644 --- a/pkgs/development/python-modules/rnc2rng/default.nix +++ b/pkgs/development/python-modules/rnc2rng/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "rnc2rng"; version = "2.6.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 0640ce63db351..4b1ccc9bad622 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.6.8"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-MDD0Vs5XIWqxKHbrAa0vXJRd8uYZDlr//hP1NBf4b7U="; + hash = "sha256-L99eeDGbXXS9bff+r4j5AmmuICfeNKRD8+71+ojw320="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/pkgs/development/python-modules/robot-detection/default.nix index 31b1f43a4e24f..87475e14e0916 100644 --- a/pkgs/development/python-modules/robot-detection/default.nix +++ b/pkgs/development/python-modules/robot-detection/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "robot-detection"; version = "0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index eea465ee8fb94..0586fccd8853f 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "1.3.1"; + format = "setuptools"; pname = "robotframework-databaselibrary"; src = fetchPypi { diff --git a/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/pkgs/development/python-modules/robotframework-selenium2library/default.nix index 6d079a99b4f1d..5d88338758088 100644 --- a/pkgs/development/python-modules/robotframework-selenium2library/default.nix +++ b/pkgs/development/python-modules/robotframework-selenium2library/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "3.0.0"; + format = "setuptools"; pname = "robotframework-selenium2library"; src = fetchPypi { diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 114c24aa1c98b..1412fbe22a7f3 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { version = "6.1.2"; + format = "setuptools"; pname = "robotframework-seleniumlibrary"; # no tests included in PyPI tarball diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index e72a723086432..0a55d66b0a60d 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "3.8.0"; + format = "setuptools"; pname = "robotframework-sshlibrary"; src = fetchPypi { diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 3dcf1606c8ceb..48cf214986c2c 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { version = "0.1rc4"; + format = "setuptools"; pname = "robotframework-tools"; src = fetchPypi { diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 122e2ff326ff3..31bd894f5c01e 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "robotframework"; version = "6.1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index d11c38444a35d..ef338ef0d341a 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "3.0.1"; + format = "setuptools"; pname = "robotstatuschecker"; # no tests included in PyPI tarball diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 544beaf120726..ffc86ec86815b 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "robotsuite"; version = "2.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix index 65b7c62b9e34c..9d86e73bd8517 100644 --- a/pkgs/development/python-modules/rocket-errbot/default.nix +++ b/pkgs/development/python-modules/rocket-errbot/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "rocket-errbot"; version = "1.2.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix index c4826e6bc4add..354e2f650fac7 100644 --- a/pkgs/development/python-modules/roku/default.nix +++ b/pkgs/development/python-modules/roku/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { version = "4.1"; + format = "setuptools"; pname = "roku"; disabled = isPy27; diff --git a/pkgs/development/python-modules/roman/default.nix b/pkgs/development/python-modules/roman/default.nix index cde0ab0f271b6..f1a0ac31e1e6a 100644 --- a/pkgs/development/python-modules/roman/default.nix +++ b/pkgs/development/python-modules/roman/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "2.0.0"; + format = "setuptools"; pname = "roman"; src = fetchPypi { diff --git a/pkgs/development/python-modules/ronin/default.nix b/pkgs/development/python-modules/ronin/default.nix index c9b0a0d25617f..5b001aa392a39 100644 --- a/pkgs/development/python-modules/ronin/default.nix +++ b/pkgs/development/python-modules/ronin/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "ronin"; version = "1.1.1"; + format = "setuptools"; src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index 4b65adafdc9fd..02fdef0c54b06 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "roombapy"; - version = "1.6.9"; + version = "1.6.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pschmitt"; repo = "roombapy"; rev = "refs/tags/${version}"; - hash = "sha256-Bu8wl5Qtys1sy5FnB+2NCGnXnuq9u+TUUR9zNdlOFTU="; + hash = "sha256-aGNSySSKCx/8GYUdDWMSAhMBex738UACqnqj/Qx1m38="; }; postPatch = '' diff --git a/pkgs/development/python-modules/routeros-api/default.nix b/pkgs/development/python-modules/routeros-api/default.nix index 622d29584f021..52bc4295a89f6 100644 --- a/pkgs/development/python-modules/routeros-api/default.nix +++ b/pkgs/development/python-modules/routeros-api/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "routeros-api"; version = "0.17.0"; + format = "setuptools"; # N.B. The version published on PyPI is missing tests. src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix index ea548fcfe56f9..0a05e54741b95 100644 --- a/pkgs/development/python-modules/routes/default.nix +++ b/pkgs/development/python-modules/routes/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "routes"; version = "2.5.1"; + format = "setuptools"; src = fetchPypi { pname = "Routes"; diff --git a/pkgs/development/python-modules/rpdb/default.nix b/pkgs/development/python-modules/rpdb/default.nix index 69a886f6e0da2..7b3fb288f26ce 100644 --- a/pkgs/development/python-modules/rpdb/default.nix +++ b/pkgs/development/python-modules/rpdb/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "rpdb"; version = "0.1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rpi-gpio/default.nix b/pkgs/development/python-modules/rpi-gpio/default.nix index f1ef22515eb0a..a045744d122ed 100644 --- a/pkgs/development/python-modules/rpi-gpio/default.nix +++ b/pkgs/development/python-modules/rpi-gpio/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "rpi-gpio"; version = "0.7.1"; + format = "setuptools"; src = fetchPypi { pname = "RPi.GPIO"; diff --git a/pkgs/development/python-modules/rpi-gpio2/default.nix b/pkgs/development/python-modules/rpi-gpio2/default.nix index 43f6e0bbb95ec..2836cd7e3703a 100644 --- a/pkgs/development/python-modules/rpi-gpio2/default.nix +++ b/pkgs/development/python-modules/rpi-gpio2/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "rpi-gpio2"; version = "0.4.0"; + format = "setuptools"; # PyPi source does not work for some reason src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/rplcd/default.nix b/pkgs/development/python-modules/rplcd/default.nix index 466bfa0ae9665..1022f40141c72 100644 --- a/pkgs/development/python-modules/rplcd/default.nix +++ b/pkgs/development/python-modules/rplcd/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "rplcd"; version = "1.3.1"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/rpmfile/default.nix b/pkgs/development/python-modules/rpmfile/default.nix index 6af50237e4bb8..2b4d718fc3d44 100644 --- a/pkgs/development/python-modules/rpmfile/default.nix +++ b/pkgs/development/python-modules/rpmfile/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "rpmfile"; version = "2.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index 9957393770b35..2d8a45fd102fd 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "rpmfluff"; version = "0.5.7.1"; + format = "setuptools"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 837d77b4dce29..b957fb1170417 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { version = "3.5.14"; + format = "setuptools"; pname = "rpy2"; disabled = isPyPy; diff --git a/pkgs/development/python-modules/rst2ansi/default.nix b/pkgs/development/python-modules/rst2ansi/default.nix index 7e09d32a0a80d..763a3913bd604 100644 --- a/pkgs/development/python-modules/rst2ansi/default.nix +++ b/pkgs/development/python-modules/rst2ansi/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "rst2ansi"; version = "0.1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix index 02bb45fd6bc05..33f6ba217882b 100644 --- a/pkgs/development/python-modules/rtmidi-python/default.nix +++ b/pkgs/development/python-modules/rtmidi-python/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "rtmidi-python"; version = "0.2.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix index 361ba5e7fb56e..83d6198403773 100644 --- a/pkgs/development/python-modules/rtmixer/default.nix +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "rtmixer"; version = "0.1.4"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index a7130a1019287..2ccec6d9e5b10 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "rtoml"; version = "0.8"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/rtree/default.nix b/pkgs/development/python-modules/rtree/default.nix index 0de516ec85f03..b4a2cc68ab8fa 100644 --- a/pkgs/development/python-modules/rtree/default.nix +++ b/pkgs/development/python-modules/rtree/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "rtree"; version = "1.1.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index 808dca3d44f9a..d43065300feea 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "rtslib"; version = "2.1.76"; + format = "setuptools"; src = fetchFromGitHub { owner = "open-iscsi"; diff --git a/pkgs/development/python-modules/ruamel-base/default.nix b/pkgs/development/python-modules/ruamel-base/default.nix index 675ae527b311e..a3906794bd845 100644 --- a/pkgs/development/python-modules/ruamel-base/default.nix +++ b/pkgs/development/python-modules/ruamel-base/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "ruamel-base"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { pname = "ruamel.base"; diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index 0c34a24d0864c..56df9d20c5911 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "ruamel-yaml"; version = "0.17.32"; + format = "setuptools"; src = fetchPypi { pname = "ruamel.yaml"; diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index 51cec6f860253..08303c74ae717 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "rubymarshal"; version = "1.2.7"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix index 57d3005929959..eecd65b513de6 100644 --- a/pkgs/development/python-modules/ruffus/default.nix +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "ruffus"; version = "2.8.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "cgat-developers"; diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index 4c929ceef965a..b199defc2a080 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "rustworkx"; version = "0.13.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "Qiskit"; diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix index 3dc07cd0def4b..852dfcb7e6631 100644 --- a/pkgs/development/python-modules/rx/default.nix +++ b/pkgs/development/python-modules/rx/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "rx"; version = "3.2.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; # Use fetchPypi to avoid the updater script to migrate it to `reactivex` which diff --git a/pkgs/development/python-modules/s2clientprotocol/default.nix b/pkgs/development/python-modules/s2clientprotocol/default.nix index 43c89aa9e7763..0bbc0fefe2d89 100644 --- a/pkgs/development/python-modules/s2clientprotocol/default.nix +++ b/pkgs/development/python-modules/s2clientprotocol/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "s2clientprotocol"; version = "3.19.1.58600.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index bc4ea00f055c3..184f27c292ea4 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.10.0"; + version = "2023.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xA8jjMyf7/8/bQnUtXYqvWyRO6QuGjKJdrVNA4kBuDU="; + hash = "sha256-tewHBiSBu7RcsGGzGYTHGI0QbiksJwMwOeAk5LpXQNw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sabyenc/default.nix b/pkgs/development/python-modules/sabyenc/default.nix index e8294ce7bcdc1..8ba0b1df0db9d 100644 --- a/pkgs/development/python-modules/sabyenc/default.nix +++ b/pkgs/development/python-modules/sabyenc/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sabyenc"; version = "3.3.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sacremoses/default.nix b/pkgs/development/python-modules/sacremoses/default.nix index 9efb29ba76f20..63584a0437783 100644 --- a/pkgs/development/python-modules/sacremoses/default.nix +++ b/pkgs/development/python-modules/sacremoses/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "sacremoses"; version = "0.0.35"; + format = "setuptools"; src = fetchFromGitHub { owner = "alvations"; diff --git a/pkgs/development/python-modules/safeio/default.nix b/pkgs/development/python-modules/safeio/default.nix index 313c32156c4c5..d0dd6c4ca5e16 100644 --- a/pkgs/development/python-modules/safeio/default.nix +++ b/pkgs/development/python-modules/safeio/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "safeio"; version = "1.2"; + format = "setuptools"; src = fetchPypi { pname = "safeIO"; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index d213026bd5b86..60b745a384559 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "salmon-mail"; version = "3.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sampledata/default.nix b/pkgs/development/python-modules/sampledata/default.nix index 93d45b3d1a0da..ae5086fe47b78 100644 --- a/pkgs/development/python-modules/sampledata/default.nix +++ b/pkgs/development/python-modules/sampledata/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "sampledata"; version = "0.3.7"; + format = "setuptools"; meta = { description = "Sample Data generator for Python "; diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix index 92af8775d81db..665c740b4f637 100644 --- a/pkgs/development/python-modules/samsungctl/default.nix +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "samsungctl"; version = "0.7.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sane/default.nix b/pkgs/development/python-modules/sane/default.nix index b02feb9e2192e..4198549f24ccc 100644 --- a/pkgs/development/python-modules/sane/default.nix +++ b/pkgs/development/python-modules/sane/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "sane"; version = "2.9.1"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/saneyaml/default.nix b/pkgs/development/python-modules/saneyaml/default.nix index acbaca9ff018a..37ba299b8f5ba 100644 --- a/pkgs/development/python-modules/saneyaml/default.nix +++ b/pkgs/development/python-modules/saneyaml/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "saneyaml"; version = "0.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sarif-om/default.nix b/pkgs/development/python-modules/sarif-om/default.nix index b7b334ebf9ba3..dafaad9d11e33 100644 --- a/pkgs/development/python-modules/sarif-om/default.nix +++ b/pkgs/development/python-modules/sarif-om/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "sarif-om"; version = "1.0.4"; + format = "setuptools"; src = fetchPypi { pname = "sarif_om"; diff --git a/pkgs/development/python-modules/scales/default.nix b/pkgs/development/python-modules/scales/default.nix index 93e566fd380b5..9c7ebfe8e9a02 100644 --- a/pkgs/development/python-modules/scales/default.nix +++ b/pkgs/development/python-modules/scales/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "scales"; version = "1.0.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 4f2c9cad8e360..472bbe084319e 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "scapy"; version = "2.5.0"; + format = "setuptools"; disabled = isPyPy; diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index a1b355f1b8324..c08f992f2293b 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { version = "0.5.9"; + format = "setuptools"; pname = "scikit-bio"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index 553afcd8a1fab..b3e4891333acc 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "scikit-fmm"; version = "2023.4.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/scikit-learn-extra/default.nix b/pkgs/development/python-modules/scikit-learn-extra/default.nix index 23718fde945a7..c6d897fb49fec 100644 --- a/pkgs/development/python-modules/scikit-learn-extra/default.nix +++ b/pkgs/development/python-modules/scikit-learn-extra/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "scikit-learn-extra"; version = "0.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "scikit-learn-contrib"; diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index fa2510b0a441c..6a7c5fa705735 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { pname = "scikit-learn"; version = "1.3.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix index 09c9547fd5832..0456d3697ad25 100644 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/pkgs/development/python-modules/scikit-optimize/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "scikit-optimize"; version = "0.9.0"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index e2b6fae9aa018..c4730484f7265 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { pname = "scikit-tda"; version = "1.0.0"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 36e69d778db8e..6e10bb5a18828 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "1.5.0"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eEK2U1gTw3PP7kt2lNjiEs8yZX9Cmty0LIgZqg7FsJc="; + hash = "sha256-qY8puMt6ogMjx2QmAhPjCkimKp4Zfghur//MXRhsfFg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/scour/default.nix b/pkgs/development/python-modules/scour/default.nix index b38d095a845f8..66f0613fc5f74 100644 --- a/pkgs/development/python-modules/scour/default.nix +++ b/pkgs/development/python-modules/scour/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "scour"; version = "0.38.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index d85d8f1dac75e..3be97953547f5 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "scp"; version = "0.14.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/pkgs/development/python-modules/scrapy-deltafetch/default.nix index 95091a0be765c..755b3f02df658 100644 --- a/pkgs/development/python-modules/scrapy-deltafetch/default.nix +++ b/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "scrapy-deltafetch"; version = "2.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix index 5559586d04ce0..da37c1712abad 100644 --- a/pkgs/development/python-modules/scrapy-splash/default.nix +++ b/pkgs/development/python-modules/scrapy-splash/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "scrapy-splash"; version = "0.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/screed/default.nix b/pkgs/development/python-modules/screed/default.nix index 604d77c493d73..307844854d87a 100644 --- a/pkgs/development/python-modules/screed/default.nix +++ b/pkgs/development/python-modules/screed/default.nix @@ -8,12 +8,13 @@ buildPythonPackage rec { pname = "screed"; - version = "1.1.2"; + version = "1.1.3"; + format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-c0/6eopkUoZJbYlbc2+R1rKYiVbi/UI1gSPZPshRm2o="; + hash = "sha256-N+gWl8fbqVoFNVTltahq/zKXBeHPXfxee42lht7gcrg="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix index c6102f1453105..f61c1747e0595 100644 --- a/pkgs/development/python-modules/scripttest/default.nix +++ b/pkgs/development/python-modules/scripttest/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "scripttest"; version = "1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sdnotify/default.nix b/pkgs/development/python-modules/sdnotify/default.nix index a447283c63ab0..c6c0fb224b317 100644 --- a/pkgs/development/python-modules/sdnotify/default.nix +++ b/pkgs/development/python-modules/sdnotify/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "sdnotify"; version = "0.3.2"; + format = "setuptools"; src = fetchPypi { sha256 = "1wdrdg2j16pmqhk0ify20s5pngijh7zc6hyxhh8w8v5k8v3pz5vk"; diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 92923170c0de4..9101c654b9c6d 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { pname = "seabreeze"; version = "1.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ap--"; diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 17c2324598e53..2e2455d4e349e 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "secp256k1"; version = "0.14.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/secure/default.nix b/pkgs/development/python-modules/secure/default.nix index 890d022f1a997..c1fbd3e83e2a7 100644 --- a/pkgs/development/python-modules/secure/default.nix +++ b/pkgs/development/python-modules/secure/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "0.3.0"; + format = "setuptools"; pname = "secure"; disabled = isPy27; diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix index 4a0ce694866b4..17689019a4065 100644 --- a/pkgs/development/python-modules/securesystemslib/default.nix +++ b/pkgs/development/python-modules/securesystemslib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "securesystemslib"; - version = "0.30.0"; + version = "0.31.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "secure-systems-lab"; repo = "securesystemslib"; rev = "refs/tags/v${version}"; - hash = "sha256-Jqw65VTMLA/X7VQGxN0BlTzF/lxBYirDKBf+xI9cfhg="; + hash = "sha256-REi38rIVZmWawFGcrPl9QzSthW4jHZDr/0ug7kJRz3Y="; }; nativeBuildInputs = [ @@ -88,7 +88,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cryptographic and general-purpose routines"; homepage = "https://github.com/secure-systems-lab/securesystemslib"; - changelog = "https://github.com/secure-systems-lab/securesystemslib/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/secure-systems-lab/securesystemslib/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index 8788bf6653635..39b173d0875f0 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "seekpath"; version = "2.0.1"; + format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index 97805642dc4c9..19a833bd0ee5c 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "segments"; version = "2.2.0"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix index 297a6514ec632..ef9df617b6df3 100644 --- a/pkgs/development/python-modules/selectors2/default.nix +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { version = "2.0.2"; + format = "setuptools"; pname = "selectors2"; src = fetchPypi { diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 6f3e9914243c7..82f336a7fd43c 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.10.0"; + version = "6.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; rev = "refs/tags/${version}"; - hash = "sha256-/un/m4Br0Ylk00fS/U+QKeXwM1Ix5TFedaPhCyScWvs="; + hash = "sha256-wcQLdU80pcyEplzL8lnehtToqYiTrX1n5TjmK5zturE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sentence-splitter/default.nix b/pkgs/development/python-modules/sentence-splitter/default.nix index a544a006ce805..7e7891433cd7e 100644 --- a/pkgs/development/python-modules/sentence-splitter/default.nix +++ b/pkgs/development/python-modules/sentence-splitter/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "sentence-splitter"; version = "1.4"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/sentencepiece/default.nix b/pkgs/development/python-modules/sentencepiece/default.nix index dc7335b351f87..0307cd4be7fcc 100644 --- a/pkgs/development/python-modules/sentencepiece/default.nix +++ b/pkgs/development/python-modules/sentencepiece/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "sentencepiece"; + format = "setuptools"; inherit (sentencepiece) version src; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/sentinel/default.nix b/pkgs/development/python-modules/sentinel/default.nix index 33d5f2990320c..adec747c772ad 100644 --- a/pkgs/development/python-modules/sentinel/default.nix +++ b/pkgs/development/python-modules/sentinel/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sentinel"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sentinels/default.nix b/pkgs/development/python-modules/sentinels/default.nix index ba2412cecbf6f..331c957a9f4f6 100644 --- a/pkgs/development/python-modules/sentinels/default.nix +++ b/pkgs/development/python-modules/sentinels/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "sentinels"; version = "1.0.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index cabee11f0d6df..90fd136996b39 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.37.1"; + version = "1.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-y1fZe3ql8twSsTl24bP0fqA6myMv71I6IgzOVucbuvM="; + hash = "sha256-tYfnQ6L91KrRCR32dgzcDtA7eO+LHRAHBklxU8cXkK8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index 4ee432a9fce92..8be976ca36428 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "serpent"; version = "1.41"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix index 13d21b1be6c59..b90ab00a4789a 100644 --- a/pkgs/development/python-modules/servefile/default.nix +++ b/pkgs/development/python-modules/servefile/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "servefile"; version = "0.5.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "sebageek"; diff --git a/pkgs/development/python-modules/serverfiles/default.nix b/pkgs/development/python-modules/serverfiles/default.nix index 955e18e589e81..9c8fa8cb14973 100644 --- a/pkgs/development/python-modules/serverfiles/default.nix +++ b/pkgs/development/python-modules/serverfiles/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "serverfiles"; version = "0.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index 5e4fbecccba69..09d29ad34533a 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "setproctitle"; version = "1.3.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index 09a3f565d543d..46e1b9a18a3ef 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.5.2"; + version = "3.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "codrsquad"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-r3pGlcdem+c5I2dKrRueksesqq9HTk0oEr/xJuM7vuc="; + hash = "sha256-OI7PU5LQ6w0iAbK7nsP+6RizsEWjKP9nec2J6n0xUhI="; }; preBuild = '' diff --git a/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix b/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix index fbf05cce22b20..4e090aac53b6c 100644 --- a/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix +++ b/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "setuptools-declarative-requirements"; version = "1.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix index 06e699e19a31d..8e0b4af312b5f 100644 --- a/pkgs/development/python-modules/setuptools-git/default.nix +++ b/pkgs/development/python-modules/setuptools-git/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "setuptools-git"; version = "1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/setuptools-lint/default.nix b/pkgs/development/python-modules/setuptools-lint/default.nix index f1eb2903f03ee..561b75e804832 100644 --- a/pkgs/development/python-modules/setuptools-lint/default.nix +++ b/pkgs/development/python-modules/setuptools-lint/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "setuptools-lint"; version = "0.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index d2f6a10a3700f..7e555298907aa 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "setuptools-scm-git-archive"; version = "1.4"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 7b981be995575..676c2510f6b94 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { pname = "sfepy"; version = "2023.1"; + format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sgmllib3k/default.nix b/pkgs/development/python-modules/sgmllib3k/default.nix index 05eb7da773951..e828e750fc8fb 100644 --- a/pkgs/development/python-modules/sgmllib3k/default.nix +++ b/pkgs/development/python-modules/sgmllib3k/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , isPy27 , pytestCheckHook , pythonAtLeast @@ -13,11 +13,9 @@ buildPythonPackage rec { disabled = isPy27; - src = fetchFromGitHub { - owner = "hsoft"; - repo = "sgmllib"; - rev = "799964676f35349ca2dd04503e34c2b3ad522c0d"; - sha256 = "0bzf6pv85dzfxfysm6zbj8m40hp0xzr9h8qlk4hp3nmy88rznqvr"; + src = fetchPypi { + inherit pname version; + hash = "sha256-eGj7HIv6dkwaxWPTzzacOB0TJdNhJJM6cm8p/NqoEuk="; }; nativeCheckInputs = [ @@ -28,6 +26,8 @@ buildPythonPackage rec { "test_declaration_junk_chars" ]; + doCheck = false; + pythonImportsCheck = [ "sgmllib" ]; diff --git a/pkgs/development/python-modules/sgp4/default.nix b/pkgs/development/python-modules/sgp4/default.nix index 9f6693603e046..daa6a08f67f15 100644 --- a/pkgs/development/python-modules/sgp4/default.nix +++ b/pkgs/development/python-modules/sgp4/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sgp4"; version = "2.23"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 5fbd75d7e42ac..9a5d5fe57a7a1 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "shamir-mnemonic"; version = "0.2.2"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/by-name/ki/kikit/shapely/default.nix b/pkgs/development/python-modules/shapely/1.8.nix index 7f136a1338ade..28a248af0bed9 100644 --- a/pkgs/by-name/ki/kikit/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/1.8.nix @@ -2,39 +2,32 @@ , stdenv , buildPythonPackage , fetchPypi -, substituteAll -, pythonOlder -, geos , pytestCheckHook +, pythonOlder +, substituteAll + , cython +, geos_3_11 , numpy +, oldest-supported-numpy +, setuptools +, wheel }: buildPythonPackage rec { pname = "Shapely"; - version = "1.8.4"; - disabled = pythonOlder "3.6"; + version = "1.8.5"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; + hash = "sha256-6CttYOz7EkEgyI/hBqR4WWu+qxQhFtfn9ko2TayQKpI="; }; - nativeBuildInputs = [ - geos # for geos-config - cython - ]; - - propagatedBuildInputs = [ - numpy - ]; - - checkInputs = [ - pytestCheckHook - ]; - # Environment variable used in shapely/_buildcfg.py - GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; + GEOS_LIBRARY_PATH = "${geos_3_11}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; patches = [ # Patch to search form GOES .so/.dylib files in a Nix-aware way @@ -45,6 +38,30 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace pyproject.toml --replace "setuptools<64" "setuptools" + ''; + + nativeBuildInputs = [ + cython + geos_3_11 # for geos-config + oldest-supported-numpy + setuptools + wheel + ]; + + buildInputs = [ + geos_3_11 + ]; + + propagatedBuildInputs = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + preCheck = '' rm -r shapely # prevent import of local shapely ''; @@ -63,9 +80,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "shapely" ]; meta = with lib; { - description = "Geometric objects, predicates, and operations"; - homepage = "https://pypi.python.org/pypi/Shapely/"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ knedlsepp ]; + changelog = "https://github.com/shapely/shapely/blob/${version}/CHANGES.txt"; + description = "Manipulation and analysis of geometric objects"; + homepage = "https://github.com/shapely/shapely"; + license = licenses.bsd3; + maintainers = teams.geospatial.members; }; } diff --git a/pkgs/by-name/ki/kikit/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch index 12f93e757f9aa..12f93e757f9aa 100644 --- a/pkgs/by-name/ki/kikit/shapely/library-paths.patch +++ b/pkgs/development/python-modules/shapely/library-paths.patch diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/pkgs/development/python-modules/sharedmem/default.nix index 942e272229a7f..0e4a36f6ce276 100644 --- a/pkgs/development/python-modules/sharedmem/default.nix +++ b/pkgs/development/python-modules/sharedmem/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "sharedmem"; version = "0.3.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/shellescape/default.nix b/pkgs/development/python-modules/shellescape/default.nix index 6244baca90d52..6ea61402c0493 100644 --- a/pkgs/development/python-modules/shellescape/default.nix +++ b/pkgs/development/python-modules/shellescape/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "shellescape"; version = "3.8.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "chrissimpkins"; diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix index e7efb1ef2dc6d..b0591385b961d 100644 --- a/pkgs/development/python-modules/shippai/default.nix +++ b/pkgs/development/python-modules/shippai/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "shippai"; # Please make sure that vdirsyncer still builds if you update this package. version = "0.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/shlib/default.nix b/pkgs/development/python-modules/shlib/default.nix index 03c94140a54e5..a29ba450df8d3 100644 --- a/pkgs/development/python-modules/shlib/default.nix +++ b/pkgs/development/python-modules/shlib/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "shlib"; version = "1.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "KenKundert"; diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 0c4b1afb930c2..29fc4789d1777 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.30.1"; + version = "1.31.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vttujCtEWVksG8F7TUtX2rDLWKRVrVie4mpjBCQs1QU="; + hash = "sha256-xzJ1OG6gI5DhlsNcZgcGoo3U1TfFoh6zh6tiNvrCUfY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/should-dsl/default.nix b/pkgs/development/python-modules/should-dsl/default.nix index 7510ba88d1d52..444e04b7f36f8 100644 --- a/pkgs/development/python-modules/should-dsl/default.nix +++ b/pkgs/development/python-modules/should-dsl/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "should-dsl"; version = "2.1.2"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/pkgs/development/python-modules/shouldbe/default.nix index 20634f4a9f024..0c03d6d58d420 100644 --- a/pkgs/development/python-modules/shouldbe/default.nix +++ b/pkgs/development/python-modules/shouldbe/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { version = "0.1.2"; + format = "setuptools"; pname = "shouldbe"; # incompatible, https://github.com/DirectXMan12/should_be/issues/4 disabled = pythonAtLeast "3.8"; diff --git a/pkgs/development/python-modules/show-in-file-manager/default.nix b/pkgs/development/python-modules/show-in-file-manager/default.nix index d5f95aa466b59..c77d547bf6f84 100644 --- a/pkgs/development/python-modules/show-in-file-manager/default.nix +++ b/pkgs/development/python-modules/show-in-file-manager/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "show-in-file-manager"; version = "1.1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/showit/default.nix b/pkgs/development/python-modules/showit/default.nix index bb74352b1a8c5..4b424f76a2e39 100644 --- a/pkgs/development/python-modules/showit/default.nix +++ b/pkgs/development/python-modules/showit/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "showit"; version = "1.1.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "freeman-lab"; diff --git a/pkgs/development/python-modules/shutilwhich/default.nix b/pkgs/development/python-modules/shutilwhich/default.nix index 5bcd2bca8bdd0..c3c48f47e6cd5 100644 --- a/pkgs/development/python-modules/shutilwhich/default.nix +++ b/pkgs/development/python-modules/shutilwhich/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "shutilwhich"; version = "1.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "mbr"; diff --git a/pkgs/development/python-modules/signify/certificate-expiration-date.patch b/pkgs/development/python-modules/signify/certificate-expiration-date.patch deleted file mode 100644 index 6554211a4bc71..0000000000000 --- a/pkgs/development/python-modules/signify/certificate-expiration-date.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/tests/test_authenticode.py b/tests/test_authenticode.py -index 7e2c709..2f27e09 100644 ---- a/tests/test_authenticode.py -+++ b/tests/test_authenticode.py -@@ -153,10 +153,12 @@ class AuthenticodeParserTestCase(unittest.TestCase): - """this certificate is revoked""" - with open(str(root_dir / "test_data" / "jameslth"), "rb") as f: - pefile = SignedPEFile(f) -- pefile.verify() -+ pefile.verify(verification_context_kwargs= -+ {'timestamp': datetime.datetime(2021, 1, 1, tzinfo=datetime.timezone.utc)}) - - def test_jameslth_revoked(self): - """this certificate is revoked""" -+ # TODO: this certificate is now expired, so it will not show up as valid anyway - with open(str(root_dir / "test_data" / "jameslth"), "rb") as f: - pefile = SignedPEFile(f) - with self.assertRaises(VerificationError): diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix index 6145279c3258f..9bd957780adee 100644 --- a/pkgs/development/python-modules/simanneal/default.nix +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "simanneal"; version = "0.5.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "perrygeo"; diff --git a/pkgs/development/python-modules/simple-rlp/default.nix b/pkgs/development/python-modules/simple-rlp/default.nix index 06837ba1f3421..f91f21a67d0c4 100644 --- a/pkgs/development/python-modules/simple-rlp/default.nix +++ b/pkgs/development/python-modules/simple-rlp/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "simple-rlp"; version = "0.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/simple-term-menu/default.nix b/pkgs/development/python-modules/simple-term-menu/default.nix new file mode 100644 index 0000000000000..9f21c327da978 --- /dev/null +++ b/pkgs/development/python-modules/simple-term-menu/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "simple-term-menu"; + version = "1.6.4"; + pyproject = true; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-vpxdvY3xKkBLFM2Oldb8AtWMYOJVX2Xd3kF3fEh/s7k="; + }; + + nativeBuildInputs = [ setuptools ]; + + pythonImportsCheck = [ "simple_term_menu" ]; + + # no unit tests in the upstream + doCheck = false; + + meta = with lib; { + description = "A Python package which creates simple interactive menus on the command line"; + homepage = "https://github.com/IngoMeyer441/simple-term-menu"; + license = licenses.mit; + changelog = "https://github.com/IngoMeyer441/simple-term-menu/releases/tag/v${version}"; + maintainers = with maintainers; [ smrehman ]; + }; +} diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix index 7228e6d9f3e90..485a9a5c7cd4a 100644 --- a/pkgs/development/python-modules/simple-websocket-server/default.nix +++ b/pkgs/development/python-modules/simple-websocket-server/default.nix @@ -3,6 +3,7 @@ buildPythonPackage { pname = "simple-websocket-server"; version = "20180414"; + format = "setuptools"; src = fetchFromGitHub { owner = "dpallot"; repo = "simple-websocket-server"; diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix index 4ab18efe332ae..ed90911dfc9b5 100644 --- a/pkgs/development/python-modules/simpleaudio/default.nix +++ b/pkgs/development/python-modules/simpleaudio/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "simpleaudio"; version = "1.0.4"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix index 40bc248d8a0bb..1db9ff589e982 100644 --- a/pkgs/development/python-modules/simplebayes/default.nix +++ b/pkgs/development/python-modules/simplebayes/default.nix @@ -9,6 +9,7 @@ buildPythonPackage { pname = "simplebayes"; version = "1.5.8"; + format = "setuptools"; # Use GitHub instead of pypi, because it contains tests. src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/simplegeneric/default.nix b/pkgs/development/python-modules/simplegeneric/default.nix index ea320a2ad5af5..4bc1683404d6c 100644 --- a/pkgs/development/python-modules/simplegeneric/default.nix +++ b/pkgs/development/python-modules/simplegeneric/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "simplegeneric"; version = "0.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/simplehound/default.nix b/pkgs/development/python-modules/simplehound/default.nix index 307010f3feaf3..af97b7cc96197 100644 --- a/pkgs/development/python-modules/simplehound/default.nix +++ b/pkgs/development/python-modules/simplehound/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "simplehound"; version = "0.6"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/simplekml/default.nix b/pkgs/development/python-modules/simplekml/default.nix index 0d5020c59958d..550cd81a4f4e8 100644 --- a/pkgs/development/python-modules/simplekml/default.nix +++ b/pkgs/development/python-modules/simplekml/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "simplekml"; version = "1.3.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix index 6c7f5f7c1afb2..4c70b8a8df19e 100644 --- a/pkgs/development/python-modules/simplemma/default.nix +++ b/pkgs/development/python-modules/simplemma/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "simplemma"; version = "0.9.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/simplenote/default.nix b/pkgs/development/python-modules/simplenote/default.nix index 5cde9b794cdf4..1a00b7ef5b6a4 100644 --- a/pkgs/development/python-modules/simplenote/default.nix +++ b/pkgs/development/python-modules/simplenote/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "simplenote"; version = "2.1.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "simplenote-vim"; diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix index 406283fc8b09d..7000b010af966 100644 --- a/pkgs/development/python-modules/simplesat/default.nix +++ b/pkgs/development/python-modules/simplesat/default.nix @@ -9,6 +9,7 @@ let version = "0.8.2"; + format = "setuptools"; versionFile = writeText "simplesat_ver" '' version = '${version}' diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 6863d1f1a889c..03acfc90c5d8d 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2023.10.0"; - format = "pyproject"; + version = "2023.12.0"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bachya"; repo = "simplisafe-python"; rev = "refs/tags/${version}"; - hash = "sha256-U3SbaR8PTTvoAMu65+LAHSwTmR7iwqiidbefW8bNSCo="; + hash = "sha256-Nr4HvjIOLk/WMKCjj/ZX67OBSImRhs9SfZtLjFs81Sk="; }; diff --git a/pkgs/development/python-modules/siobrultech-protocols/default.nix b/pkgs/development/python-modules/siobrultech-protocols/default.nix index e21580162cfe8..49d873f95167a 100644 --- a/pkgs/development/python-modules/siobrultech-protocols/default.nix +++ b/pkgs/development/python-modules/siobrultech-protocols/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "siobrultech-protocols"; - version = "0.13.0"; + version = "0.14.0"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sdwilsh"; repo = "siobrultech-protocols"; rev = "refs/tags/v${version}"; - hash = "sha256-6BGhelyv0FoPyGwzgIX5Gbbu9Ks19MtL1AZQRZWKzhM="; + hash = "sha256-8tls2wlLA3wQ78gK4JvvhSWZS5oHRzzsKE73M4i1eyg="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index f4870f2fa6f15..ec9c843dc885e 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "sip"; - version = "6.7.11"; + version = "6.7.12"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-8Nwyh6CxcuVmSTHIeEd1DUfk/c2k/jYrUUr47dZVtGk="; + hash = "sha256-COZvdCWS64GKyP2kFz4u1kyfLUC3C+4R2xxJkSfZhFA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sipyco/default.nix b/pkgs/development/python-modules/sipyco/default.nix index a44977c062790..568134d94d152 100644 --- a/pkgs/development/python-modules/sipyco/default.nix +++ b/pkgs/development/python-modules/sipyco/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "sipyco"; version = "1.4"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index d3896772bb8eb..d21b21542e4c8 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "skein"; version = "0.8.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-nXTqsJNX/LwAglPcPZkmdYPfF+vDLN+nNdZaDFTrHzE="; diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix index d12726ec391c9..2c35cba96937d 100644 --- a/pkgs/development/python-modules/skia-pathops/default.nix +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "skia-pathops"; version = "0.8.0.post1"; + format = "setuptools"; src = fetchPypi { pname = "skia-pathops"; diff --git a/pkgs/development/python-modules/skidl/default.nix b/pkgs/development/python-modules/skidl/default.nix index 3b4f42c1feeed..5afcc931ac541 100644 --- a/pkgs/development/python-modules/skidl/default.nix +++ b/pkgs/development/python-modules/skidl/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "skidl"; version = "1.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "xesscorp"; diff --git a/pkgs/development/python-modules/skl2onnx/default.nix b/pkgs/development/python-modules/skl2onnx/default.nix index 1698d2de4573e..83a403ff7cd0c 100644 --- a/pkgs/development/python-modules/skl2onnx/default.nix +++ b/pkgs/development/python-modules/skl2onnx/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "skl2onnx"; version = "1.15.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 13757f13e1aac..01d23f596dd9e 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { pname = "skorch"; version = "0.15.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/skybellpy/default.nix b/pkgs/development/python-modules/skybellpy/default.nix index 093df95b56579..d09939ea853c0 100644 --- a/pkgs/development/python-modules/skybellpy/default.nix +++ b/pkgs/development/python-modules/skybellpy/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "skybellpy"; version = "0.6.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix index 9b6d92e217d69..b3dc5a236ea46 100644 --- a/pkgs/development/python-modules/skyfield/default.nix +++ b/pkgs/development/python-modules/skyfield/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "skyfield"; version = "1.45"; + format = "setuptools"; src = fetchFromGitHub { owner = "skyfielders"; diff --git a/pkgs/development/python-modules/skytemple-eventserver/default.nix b/pkgs/development/python-modules/skytemple-eventserver/default.nix index e258b46c584f1..dc31cbcbd9eca 100644 --- a/pkgs/development/python-modules/skytemple-eventserver/default.nix +++ b/pkgs/development/python-modules/skytemple-eventserver/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "skytemple-eventserver"; version = "1.6.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "SkyTemple"; diff --git a/pkgs/development/python-modules/skytemple-icons/default.nix b/pkgs/development/python-modules/skytemple-icons/default.nix index 0bcbff47ade2d..34b9dd5cee730 100644 --- a/pkgs/development/python-modules/skytemple-icons/default.nix +++ b/pkgs/development/python-modules/skytemple-icons/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "skytemple-icons"; version = "1.3.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "SkyTemple"; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index a015400616e3d..6f2305962d425 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.26.0"; + version = "3.26.1"; 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-jvLzZFlR2msyCc9C7WvYpXIGoKCDRxJI5lgNUtbGh/w="; + hash = "sha256-jg4mUVT1sB9hxRqhLOeZxQHTpBK/N76b2XUaFe/nBKY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index c45d8394fa85a..ead249a9a7223 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.26.0"; + version = "3.26.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-jvLzZFlR2msyCc9C7WvYpXIGoKCDRxJI5lgNUtbGh/w="; + hash = "sha256-jg4mUVT1sB9hxRqhLOeZxQHTpBK/N76b2XUaFe/nBKY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix index 41578b3dc0478..4f4554b5a4ae9 100644 --- a/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/pkgs/development/python-modules/sleekxmpp/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sleekxmpp"; version = "1.3.3"; + format = "setuptools"; disabled = pythonAtLeast "3.10"; # Deprecated in favor of Slixmpp diff --git a/pkgs/development/python-modules/sleepyq/default.nix b/pkgs/development/python-modules/sleepyq/default.nix index 0a335de3177f2..e93a77fd2e79e 100644 --- a/pkgs/development/python-modules/sleepyq/default.nix +++ b/pkgs/development/python-modules/sleepyq/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "sleepyq"; version = "0.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index f74447750cc3a..eb96fb50928c2 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "slicedimage"; version = "4.1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "spacetx"; diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 363bd0ab62d78..a615192aa7be2 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -9,6 +9,7 @@ buildPythonPackage { pname = "slob"; version = "unstable-2020-06-26"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/slovnet/default.nix b/pkgs/development/python-modules/slovnet/default.nix index 83f431a6a8c5b..7f813564cafd1 100644 --- a/pkgs/development/python-modules/slovnet/default.nix +++ b/pkgs/development/python-modules/slovnet/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # Tries to download model binary artifacts: "tests/test_api.py" ]; - pythonImportCheck = [ "slovnet" ]; + pythonImportsCheck = [ "slovnet" ]; meta = with lib; { description = "Deep-learning based NLP modeling for Russian language"; diff --git a/pkgs/development/python-modules/slugid/default.nix b/pkgs/development/python-modules/slugid/default.nix index 34f394bee3029..3d3e541872673 100644 --- a/pkgs/development/python-modules/slugid/default.nix +++ b/pkgs/development/python-modules/slugid/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "slugid"; version = "2.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "taskcluster"; diff --git a/pkgs/development/python-modules/smart-meter-texas/default.nix b/pkgs/development/python-modules/smart-meter-texas/default.nix index bd0d181a3ede3..556f978c73124 100644 --- a/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "smart-meter-texas"; version = "0.5.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/smarthab/default.nix b/pkgs/development/python-modules/smarthab/default.nix index f26e294b938fd..f317e9a008ede 100644 --- a/pkgs/development/python-modules/smarthab/default.nix +++ b/pkgs/development/python-modules/smarthab/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "smarthab"; version = "0.21"; + format = "setuptools"; src = fetchPypi { pname = "SmartHab"; diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix index af21271edc51b..0e5ef76927e44 100644 --- a/pkgs/development/python-modules/smartypants/default.nix +++ b/pkgs/development/python-modules/smartypants/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { version = "2.0.1"; + format = "setuptools"; pname = "smartypants"; disabled = isPyPy; diff --git a/pkgs/development/python-modules/smbus-cffi/default.nix b/pkgs/development/python-modules/smbus-cffi/default.nix index 1612a606f3167..b32cde3a87a4b 100644 --- a/pkgs/development/python-modules/smbus-cffi/default.nix +++ b/pkgs/development/python-modules/smbus-cffi/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "smbus-cffi"; version = "0.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/smdebug-rulesconfig/default.nix b/pkgs/development/python-modules/smdebug-rulesconfig/default.nix index 864a395cc88cd..1c64184c093bd 100644 --- a/pkgs/development/python-modules/smdebug-rulesconfig/default.nix +++ b/pkgs/development/python-modules/smdebug-rulesconfig/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "smdebug-rulesconfig"; version = "1.0.1"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/smhi-pkg/default.nix b/pkgs/development/python-modules/smhi-pkg/default.nix index e1310a0a386ce..a6b5334cedfcc 100644 --- a/pkgs/development/python-modules/smhi-pkg/default.nix +++ b/pkgs/development/python-modules/smhi-pkg/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "smhi-pkg"; version = "1.0.16"; + format = "setuptools"; src = fetchFromGitHub { owner = "joysoftware"; diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix index 53afd01afcfa2..5cfc8917a8c1d 100644 --- a/pkgs/development/python-modules/smmap/default.nix +++ b/pkgs/development/python-modules/smmap/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "smmap"; version = "5.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936"; diff --git a/pkgs/development/python-modules/smtpdfix/default.nix b/pkgs/development/python-modules/smtpdfix/default.nix new file mode 100644 index 0000000000000..f9d7d2931e5a8 --- /dev/null +++ b/pkgs/development/python-modules/smtpdfix/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pytest +, portpicker +, cryptography +, aiosmtpd +, pytestCheckHook +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "smtpdfix"; + version = "0.5.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-882i0T6EySZ6jxOgoM11MU+ha41XfKjDDhUjeX7qvp4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiosmtpd + cryptography + portpicker + pytest + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + meta = with lib; { + description = "An SMTP server for use as a pytest fixture for testing"; + homepage = "https://github.com/bebleo/smtpdfix"; + changelog = "https://github.com/bebleo/smtpdfix/releases/tag/v${version}"; + license = licenses.mit; + maintainers = teams.wdz.members; + }; +} diff --git a/pkgs/development/python-modules/snakebite/default.nix b/pkgs/development/python-modules/snakebite/default.nix index a5b8a99311026..898ba52a4eeed 100644 --- a/pkgs/development/python-modules/snakebite/default.nix +++ b/pkgs/development/python-modules/snakebite/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "snakebite"; version = "2.11.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/snapshottest/default.nix b/pkgs/development/python-modules/snapshottest/default.nix index a36c8e48d4900..b19873318fd7d 100644 --- a/pkgs/development/python-modules/snapshottest/default.nix +++ b/pkgs/development/python-modules/snapshottest/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "snapshottest"; version = "0.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index 60ba22e903906..a1723bd15792a 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "snowballstemmer"; version = "2.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index fc3974db138bd..8db6256a886ab 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.3.1"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-u2ZyK9ZKvNdqarBqZCPWdLy3Kfm6ORBWl375Lzg6rbg="; + hash = "sha256-ZU5KH2ikkVRL2PfFqwLrhTHfZ8X0MJ1SU70gQET4obM="; }; # snowflake-connector-python requires arrow 10.0.1, which we don't have in diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix index 9290e2f369874..17b2c4bd8f3ce 100644 --- a/pkgs/development/python-modules/snuggs/default.nix +++ b/pkgs/development/python-modules/snuggs/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "snuggs"; version = "1.4.7"; + format = "setuptools"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index 5506f417be04c..d81101ac9a9dc 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "social-auth-core"; - version = "4.4.2"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "python-social-auth"; repo = "social-core"; rev = "refs/tags/${version}"; - hash = "sha256-o/qx3bwaj2fiNKM3fafFxOW27JrJ9jG4M4uSnnJDpes="; + hash = "sha256-5WEXXLl0IUPMbji8bWjTbAjY8VSLOTQvrfSCE9+ui5Y="; }; propagatedBuildInputs = [ @@ -75,6 +75,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for social authentication/registration mechanisms"; homepage = "https://github.com/python-social-auth/social-core"; + changelog = "https://github.com/python-social-auth/social-core/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ n0emis ]; }; diff --git a/pkgs/development/python-modules/socketio-client/default.nix b/pkgs/development/python-modules/socketio-client/default.nix index 43587824e01a7..3c45ee1d54622 100644 --- a/pkgs/development/python-modules/socketio-client/default.nix +++ b/pkgs/development/python-modules/socketio-client/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "socketio-client"; version = "0.7.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "invisibleroads"; diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix index c7235468370f2..37d75b76edd9f 100644 --- a/pkgs/development/python-modules/sockjs-tornado/default.nix +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sockjs-tornado"; version = "1.0.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sockjs/default.nix b/pkgs/development/python-modules/sockjs/default.nix index d589179338fd5..228ac2fd6bbf8 100644 --- a/pkgs/development/python-modules/sockjs/default.nix +++ b/pkgs/development/python-modules/sockjs/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sockjs"; version = "0.11.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 01128c77a5d2e..40bcd475604e9 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.29.1"; + version = "0.30.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "refs/tags/v${version}"; - hash = "sha256-Kp9rG7fJzvmnLpjVulf9kODoABdjaaHvgyed9I+FHVA="; + hash = "sha256-MajtB754VY+WmeJ2UROeNfvFdqSWIDXQwDSDK7zn8fk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 28c24f533d75a..8ce880889d663 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.10"; + version = "6.1.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "softlayer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-0NLa+kEArKqfqytnxbzXnX/OVhYFBKZO9odXGR0AoSA="; + hash = "sha256-2iN3T58aICQlGwr10/e/mWE9pA4rbJCBTE1jTu3GeGk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/solaredge/default.nix b/pkgs/development/python-modules/solaredge/default.nix index f593ff5016202..6dc0fa09be312 100644 --- a/pkgs/development/python-modules/solaredge/default.nix +++ b/pkgs/development/python-modules/solaredge/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "solaredge"; version = "0.0.4"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/solc-select/default.nix b/pkgs/development/python-modules/solc-select/default.nix index d9910e570d5d5..f0724bd241ad3 100644 --- a/pkgs/development/python-modules/solc-select/default.nix +++ b/pkgs/development/python-modules/solc-select/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "solc-select"; version = "1.0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/somfy-mylink-synergy/default.nix b/pkgs/development/python-modules/somfy-mylink-synergy/default.nix index b0fa5948c0da1..fce4af2086804 100644 --- a/pkgs/development/python-modules/somfy-mylink-synergy/default.nix +++ b/pkgs/development/python-modules/somfy-mylink-synergy/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "somfy-mylink-synergy"; version = "1.0.6"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/sonarr/default.nix b/pkgs/development/python-modules/sonarr/default.nix index 2cc1095b9ede3..0d2fe50b39762 100644 --- a/pkgs/development/python-modules/sonarr/default.nix +++ b/pkgs/development/python-modules/sonarr/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "sonarr"; version = "0.3.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ctalkington"; diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix index 73bc2757c6f27..97cf9d8afa159 100644 --- a/pkgs/development/python-modules/sortedcollections/default.nix +++ b/pkgs/development/python-modules/sortedcollections/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "sortedcollections"; version = "2.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "grantjenks"; diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix index 3b60be8c4877d..5cf34d566dcef 100644 --- a/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -8,6 +8,7 @@ let sortedcontainers = buildPythonPackage rec { pname = "sortedcontainers"; version = "2.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "grantjenks"; diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix index ca21c4cebb8ea..573d1a108027b 100644 --- a/pkgs/development/python-modules/soundcloud-v2/default.nix +++ b/pkgs/development/python-modules/soundcloud-v2/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "soundcloud-v2"; version = "1.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 46e16e58a35dc..783469c27795d 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "sounddevice"; version = "0.4.6"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index a6875d5edca32..01e41ebd2e860 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "soundfile"; version = "0.12.1"; + format = "setuptools"; # https://github.com/bastibe/python-soundfile/issues/157 disabled = isPyPy || stdenv.isi686; diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix index 9bcb74a242fff..103c100492843 100644 --- a/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "spacy-alignments"; version = "0.9.0"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/spacy-loggers/default.nix b/pkgs/development/python-modules/spacy-loggers/default.nix index 293224c3d07c0..72361aa04bf85 100644 --- a/pkgs/development/python-modules/spacy-loggers/default.nix +++ b/pkgs/development/python-modules/spacy-loggers/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "spacy-loggers"; version = "1.0.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/spacy-pkuseg/default.nix b/pkgs/development/python-modules/spacy-pkuseg/default.nix index b904569010f7e..02f47d7911541 100644 --- a/pkgs/development/python-modules/spacy-pkuseg/default.nix +++ b/pkgs/development/python-modules/spacy-pkuseg/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "spacy-pkuseg"; version = "0.0.33"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 475a9c6540a02..ea4172d779548 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.3.3"; + version = "1.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Q8oV0mw8POFscFcdsYZfTkavNVQyqWdLAdb4lDX4ahM="; + hash = "sha256-N2StqGUqOYS9mW/DAeSntNg3kii+UPdTUHDV7g1Hvus="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index 287364dc873ab..08f54e6f125c0 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -75,7 +75,6 @@ let description = "Models for the spaCy NLP library"; homepage = "https://github.com/explosion/spacy-models"; license = licenses.${license}; - maintainers = with maintainers; [ rvl ]; }; }; diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix index a5f5f6bf92a4c..87d05612e7125 100644 --- a/pkgs/development/python-modules/spake2/default.nix +++ b/pkgs/development/python-modules/spake2/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "spake2"; version = "0.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/spark_parser/default.nix b/pkgs/development/python-modules/spark_parser/default.nix index fb30daf81fe7e..6751a8f3cfecb 100644 --- a/pkgs/development/python-modules/spark_parser/default.nix +++ b/pkgs/development/python-modules/spark_parser/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "spark_parser"; version = "1.8.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sparklines/default.nix b/pkgs/development/python-modules/sparklines/default.nix index b94a56439d53b..a41b8af8418d0 100644 --- a/pkgs/development/python-modules/sparklines/default.nix +++ b/pkgs/development/python-modules/sparklines/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "sparklines"; version = "0.4.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "deeplook"; diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix index 41248d73b8fab..f3b85e5b0bec4 100644 --- a/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "sparqlwrapper"; version = "2.0.0"; + format = "setuptools"; src = fetchPypi { pname = "SPARQLWrapper"; diff --git a/pkgs/development/python-modules/speaklater/default.nix b/pkgs/development/python-modules/speaklater/default.nix index a9acfb2dbb386..1ae66d9f4ffec 100644 --- a/pkgs/development/python-modules/speaklater/default.nix +++ b/pkgs/development/python-modules/speaklater/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "speaklater"; version = "1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/speaklater3/default.nix b/pkgs/development/python-modules/speaklater3/default.nix index 60c4c99fd3a28..5898dfe5cd1aa 100644 --- a/pkgs/development/python-modules/speaklater3/default.nix +++ b/pkgs/development/python-modules/speaklater3/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "speaklater3"; version = "1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 98132c9f17d34..f0eda6956e2cb 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "spectral-cube"; - version = "0.6.3"; + version = "0.6.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7wfvsravSkAGkTtuPE01wPW7wEHKVWT8kYQn93Q2B4M="; + hash = "sha256-gJzrr3+/FsQN/HHDERxf/NECArwOaTqFwmI/Q2Z9HTM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/pkgs/development/python-modules/speedtest-cli/default.nix index b4842a547610a..d91edda3a546a 100644 --- a/pkgs/development/python-modules/speedtest-cli/default.nix +++ b/pkgs/development/python-modules/speedtest-cli/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "speedtest-cli"; version = "2.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/speg/default.nix b/pkgs/development/python-modules/speg/default.nix index 5c969f55b1681..93ae40d326038 100644 --- a/pkgs/development/python-modules/speg/default.nix +++ b/pkgs/development/python-modules/speg/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "speg"; version = "0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix index 79f7aa0739cdd..99e366a5c29a7 100644 --- a/pkgs/development/python-modules/sphfile/default.nix +++ b/pkgs/development/python-modules/sphfile/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sphfile"; version = "1.0.3"; + format = "setuptools"; src = fetchurl { url = "mirror://pypi/s/sphfile/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix index d2720bd1246ed..7ab3ae03c3433 100644 --- a/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "sphinx-argparse"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { pname = "sphinx_argparse"; diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index 3d47f22c87261..ca80a717ba545 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "2.1.1"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+625bnkCDWsOxF2IhRe/gW1rWHotNA++HsMRNeMApsg="; + hash = "sha256-CevWdKMrREZyIrD7ipF7l8iVI/INvwW1LLij8OFXFN4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix index 379dbdd0b3da9..d090d2b8b56a2 100644 --- a/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "sphinx-autobuild"; version = "2021.3.14"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index d99577fd234eb..59f832b999d64 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "1.24.0"; + version = "1.24.1"; in buildPythonPackage { @@ -22,7 +22,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-lORABmlBuyN3BLuIB4Xi0F6K5UBsiGdP7vu5OK0Nxq8="; + hash = "sha256-Bmg6K3bDx7GTG3XkDgIRhm+7ULpMToAtCQHZtOhJrdI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-basic-ng/default.nix b/pkgs/development/python-modules/sphinx-basic-ng/default.nix index a3da400d10705..990be1979b4e2 100644 --- a/pkgs/development/python-modules/sphinx-basic-ng/default.nix +++ b/pkgs/development/python-modules/sphinx-basic-ng/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "sphinx-basic-ng"; version = "1.0.0.beta2"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-better-theme/default.nix b/pkgs/development/python-modules/sphinx-better-theme/default.nix index 8227eca47d844..8000c8bbb820f 100644 --- a/pkgs/development/python-modules/sphinx-better-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-better-theme/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sphinx-better-theme"; version = "0.1.5"; + format = "setuptools"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 872df1fbb451e..bb96443d3183d 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "1.0.1"; + version = "1.1.0"; format = "wheel"; @@ -20,7 +20,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - hash = "sha256-0V+CSLNxippr4LphejLRWR+fo5xhRGm/rOd3uganO3U="; + hash = "sha256-CIvGnWX6uERq24aR7WFof3G/dQTJdAr2i8eM+TaiYRI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-copybutton/default.nix b/pkgs/development/python-modules/sphinx-copybutton/default.nix index 040bed82cdec4..5a765e7c120c5 100644 --- a/pkgs/development/python-modules/sphinx-copybutton/default.nix +++ b/pkgs/development/python-modules/sphinx-copybutton/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "sphinx-copybutton"; version = "0.5.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "executablebooks"; diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index 921669d4ca711..9812768a5de81 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinx-external-toc"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_external_toc"; - sha256 = "sha256-990JX/OrD7dKMQ1BCwo2GPwd3G8s5DWJfWWayqSj6yQ="; + sha256 = "sha256-p9LGPMR+xohUZEOyi8TvRmEhgn7z3Hu1Cd41S61OouA="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinx-fortran/default.nix b/pkgs/development/python-modules/sphinx-fortran/default.nix index cd47d3c4743f8..b4e2b7dd6e4f4 100644 --- a/pkgs/development/python-modules/sphinx-fortran/default.nix +++ b/pkgs/development/python-modules/sphinx-fortran/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "sphinx-fortran"; version = "unstable-2022-03-02"; + format = "setuptools"; src = fetchFromGitHub { owner = "VACUMM"; diff --git a/pkgs/development/python-modules/sphinx-issues/default.nix b/pkgs/development/python-modules/sphinx-issues/default.nix index 4ea94b7618908..9cf4b680c7cd5 100644 --- a/pkgs/development/python-modules/sphinx-issues/default.nix +++ b/pkgs/development/python-modules/sphinx-issues/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sphinx-issues"; version = "3.0.1"; + format = "setuptools"; outputs = [ "out" "doc" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix index 68590ed24ecd6..c557325cd376c 100644 --- a/pkgs/development/python-modules/sphinx-jinja/default.nix +++ b/pkgs/development/python-modules/sphinx-jinja/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sphinx-jinja"; version = "2.0.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix index 5dff846924d8a..592151ecccf16 100644 --- a/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix +++ b/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix @@ -1,34 +1,54 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub +, flit-core +, packaging , sphinx -, importlib-resources +, click +, myst-parser +, pytest-regressions +, pytestCheckHook +, sphinx-external-toc +, sphinxcontrib-bibtex +, texsoup }: buildPythonPackage rec { pname = "sphinx-jupyterbook-latex"; - version = "0.5.2"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit version; - pname = "sphinx_jupyterbook_latex"; - hash = "sha256-2h060Cj1XdvxC5Ewu58k/GDK+2ccvTnf2VU3qvyQly4="; + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "sphinx-jupyterbook-latex"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZTR+s6a/++xXrLMtfFRmSmAeMWa/1de12ukxfsx85g4="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "sphinx>=4,<5.1" "sphinx" - ''; + nativeBuildInputs = [ + flit-core + ]; - propagatedBuildInputs = [ sphinx ] - ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; + propagatedBuildInputs = [ + packaging + sphinx + ]; pythonImportsCheck = [ "sphinx_jupyterbook_latex" ]; + nativeCheckInputs = [ + click + myst-parser + pytest-regressions + pytestCheckHook + sphinx-external-toc + sphinxcontrib-bibtex + texsoup + ]; + meta = with lib; { description = "Latex specific features for jupyter book"; homepage = "https://github.com/executablebooks/sphinx-jupyterbook-latex"; diff --git a/pkgs/development/python-modules/sphinx-markdown-parser/default.nix b/pkgs/development/python-modules/sphinx-markdown-parser/default.nix index 626e8dba585b2..dc9ab56ed3fc1 100644 --- a/pkgs/development/python-modules/sphinx-markdown-parser/default.nix +++ b/pkgs/development/python-modules/sphinx-markdown-parser/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "sphinx-markdown-parser"; version = "0.2.4"; + format = "setuptools"; # PyPi release does not include requirements.txt src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sphinx-markdown-tables/default.nix b/pkgs/development/python-modules/sphinx-markdown-tables/default.nix index 55fb0b41f43e9..a560314a29865 100644 --- a/pkgs/development/python-modules/sphinx-markdown-tables/default.nix +++ b/pkgs/development/python-modules/sphinx-markdown-tables/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "sphinx-markdown-tables"; version = "0.0.17"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinx-serve/default.nix b/pkgs/development/python-modules/sphinx-serve/default.nix index ca2b587e3acc0..1f1c7b0e071db 100644 --- a/pkgs/development/python-modules/sphinx-serve/default.nix +++ b/pkgs/development/python-modules/sphinx-serve/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "sphinx-serve"; version = "1.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix index d29cfdb7a761c..0aaad111f73db 100644 --- a/pkgs/development/python-modules/sphinx-testing/default.nix +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "sphinx-testing"; version = "1.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index 77fe8929b2faa..3945f8bf4c4f3 100644 --- a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-apidoc"; version = "0.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 2d8dca9912909..b08ecd9ebea23 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-bibtex"; version = "2.6.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 44c4de9570dd8..9f0790c0d6431 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-blockdiag"; version = "3.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix b/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix index d7cea5a6418a5..732ed446aa28e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-excel-table"; version = "1.0.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix index 79a326150073f..f29e46b014e0f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-fulltoc"; version = "1.2.0"; + format = "setuptools"; # pkgutil namespaces are broken in nixpkgs (because they can't scan multiple # directories). But python2 is EOL, so not supporting it, should be ok. diff --git a/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix index 96dad44be8bf2..8be6779391a36 100644 --- a/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-httpdomain"; version = "1.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index 2b8c2cd75826e..f0728a67adb2e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-jsmath"; version = "1.0.1"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 6e3279b4de966..7fd16c67bdd46 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; version = "0.8.3"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix index 67d7d9b587f90..63dcfb16242b5 100644 --- a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-programoutput"; version = "0.17"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index dd83acb3d2057..f74a43687be09 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; version = "0.4.16"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 85a736bd880c6..58312bdce739c 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "refs/tags/v${version}"; - hash = "sha256-ZLIxbFgayG+WVvSXu74eZJ/PbSHg6dzkkIr1OBry4DE="; + hash = "sha256-B+bJ1tKqTTlbNeJLxk56o2a21n3Yg6OHwJiFfCx46aw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/spidev/default.nix b/pkgs/development/python-modules/spidev/default.nix index fd3a12d7da45d..b4e5344cca85c 100644 --- a/pkgs/development/python-modules/spidev/default.nix +++ b/pkgs/development/python-modules/spidev/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "spidev"; version = "3.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/spinners/default.nix b/pkgs/development/python-modules/spinners/default.nix index 1e71296fd1762..6328a43df8f77 100644 --- a/pkgs/development/python-modules/spinners/default.nix +++ b/pkgs/development/python-modules/spinners/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "spinners"; version = "0.0.24"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index d8e6b0ab45ef3..a05a02966e07a 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { pname = "spsdk"; version = "1.11.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "nxp-mcuxpresso"; diff --git a/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/pkgs/development/python-modules/sqlalchemy-citext/default.nix index 9bf638647680a..b040ee597ef8b 100644 --- a/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "sqlalchemy-citext"; version = "1.8.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index c71172764af79..cf3a6b64cfcc0 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "sqlalchemy-migrate"; version = "0.13.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index a5d3e5ea11fb4..b0bb24399122b 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "sqlglot"; version = "17.14.2"; + format = "setuptools"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 92cc4ea62784b..c103599b8b26e 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.35.2"; + version = "3.36"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WQsUrSd5FMs/x9XiVHZIR/rNqqI8e6/YXsk4dPb0IUM="; + hash = "sha256-3MMROU/obcFvZQN7AHXiOO/P0uEuZdU+0ZaVRQKZbzw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix index f506430619a99..41889bfce1377 100644 --- a/pkgs/development/python-modules/sqlitedict/default.nix +++ b/pkgs/development/python-modules/sqlitedict/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "sqlitedict"; version = "2.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "RaRe-Technologies"; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 936d904c65237..b44d2efcb184b 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.7.11"; + version = "1.7.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gjObtmEvvyCnqd+bLdirzW18/AarmvhF6ItvqJ2Qmuo="; + hash = "sha256-9sl/tH/TNXGkeTcXhG9i6/QByOO7SC0GkzyEhzVfJdk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlmodel/default.nix b/pkgs/development/python-modules/sqlmodel/default.nix index 5b7449d4a7962..26a0c7f5c9072 100644 --- a/pkgs/development/python-modules/sqlmodel/default.nix +++ b/pkgs/development/python-modules/sqlmodel/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, dirty-equals , fastapi , fetchFromGitHub , poetry-core @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "sqlmodel"; - version = "0.0.12"; + version = "0.0.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "sqlmodel"; rev = "refs/tags/${version}"; - hash = "sha256-ER8NGDcCCCXT8lsm8fgJUaLyjdf5v2/UdrBw5T9EeXQ="; + hash = "sha256-EEOS7c0ospo7qjqPQkKwYXeVmBR5DueONzmjspV6w7w="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + dirty-equals fastapi pytest-asyncio pytestCheckHook @@ -45,7 +47,8 @@ buildPythonPackage rec { disabledTestPaths = [ # Coverage - "tests/test_tutorial/test_create_db_and_table/test_tutorial001.py" + "docs_src/tutorial/" + "tests/test_tutorial/" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sqlsoup/default.nix b/pkgs/development/python-modules/sqlsoup/default.nix index 6a06ef247a0b8..d75621cc6345c 100644 --- a/pkgs/development/python-modules/sqlsoup/default.nix +++ b/pkgs/development/python-modules/sqlsoup/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sqlsoup"; version = "0.9.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix index 09eac58bae7ca..65470114c14f5 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.9.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4+jj9kRT6AR8u9nIlEkILY+/GQ7EBRd5V2oLeMLSo3o="; + hash = "sha256-QR5IlMHrDNsauKW3VQG0ibMUwetATuwX4fszGPzKuxg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/squarify/default.nix b/pkgs/development/python-modules/squarify/default.nix index e0fe054156c67..5bdc4c43f3fb1 100644 --- a/pkgs/development/python-modules/squarify/default.nix +++ b/pkgs/development/python-modules/squarify/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "squarify"; version = "0.4.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "laserson"; diff --git a/pkgs/development/python-modules/sre-yield/default.nix b/pkgs/development/python-modules/sre-yield/default.nix index 91e6904b57726..33b64d38d6296 100644 --- a/pkgs/development/python-modules/sre-yield/default.nix +++ b/pkgs/development/python-modules/sre-yield/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "sre-yield"; version = "1.2"; + format = "setuptools"; src = fetchPypi { pname = "sre_yield"; diff --git a/pkgs/development/python-modules/srpenergy/default.nix b/pkgs/development/python-modules/srpenergy/default.nix index e36bd7c2e4b86..35a937f960888 100644 --- a/pkgs/development/python-modules/srpenergy/default.nix +++ b/pkgs/development/python-modules/srpenergy/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "srpenergy"; version = "1.3.6"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/srt/default.nix b/pkgs/development/python-modules/srt/default.nix index 62d03be0b177e..8fb0d72761418 100644 --- a/pkgs/development/python-modules/srt/default.nix +++ b/pkgs/development/python-modules/srt/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "srt"; version = "3.5.3"; + format = "setuptools"; disabled = pythonOlder "2.7"; diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index 17378c8611a08..07c8f6a6c5849 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "sshfs"; version = "2023.10.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "fsspec"; diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/pkgs/development/python-modules/sshpubkeys/default.nix index 955eb905ac29f..a63b456292f37 100644 --- a/pkgs/development/python-modules/sshpubkeys/default.nix +++ b/pkgs/development/python-modules/sshpubkeys/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "3.3.1"; + format = "setuptools"; pname = "sshpubkeys"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index 2e585c2bbc312..905ecc9258f0a 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "0.4.0"; + format = "setuptools"; pname = "sshtunnel"; src = fetchPypi { diff --git a/pkgs/development/python-modules/sslib/default.nix b/pkgs/development/python-modules/sslib/default.nix index 407053785f09c..4f0492b84b37e 100644 --- a/pkgs/development/python-modules/sslib/default.nix +++ b/pkgs/development/python-modules/sslib/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "sslib"; version = "0.2.0"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index cba83f5df09b2..370aaf8746f96 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "stack-data"; version = "0.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "alexmojaki"; diff --git a/pkgs/development/python-modules/starlette-wtf/default.nix b/pkgs/development/python-modules/starlette-wtf/default.nix new file mode 100644 index 0000000000000..113c1442a99e6 --- /dev/null +++ b/pkgs/development/python-modules/starlette-wtf/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, itsdangerous +, python-multipart +, starlette +, wtforms +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "starlette-wtf"; + version = "0.4.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "muicss"; + repo = "starlette-wtf"; + rev = "v${version}"; + hash = "sha256-TSxcIgINRjQwiyhpGOEEpXJKcPlhFCxMQh4/GY1g1lw="; + }; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + itsdangerous + python-multipart + starlette + wtforms + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "A simple tool for integrating Starlette and WTForms"; + changelog = "https://github.com/muicss/starlette-wtf/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/muicss/starlette-wtf"; + license = licenses.mit; + maintainers = teams.wdz.members; + }; +} diff --git a/pkgs/development/python-modules/stashy/default.nix b/pkgs/development/python-modules/stashy/default.nix index fa866cc260378..fbac0df71f1de 100644 --- a/pkgs/development/python-modules/stashy/default.nix +++ b/pkgs/development/python-modules/stashy/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "stashy"; version = "0.7"; + format = "setuptools"; disabled = pythonOlder "3.4"; src = fetchPypi { diff --git a/pkgs/development/python-modules/statistics/default.nix b/pkgs/development/python-modules/statistics/default.nix index 40a51373c70e3..2e3c62671a1cb 100644 --- a/pkgs/development/python-modules/statistics/default.nix +++ b/pkgs/development/python-modules/statistics/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "statistics"; version = "1.0.3.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stdiomask/default.nix b/pkgs/development/python-modules/stdiomask/default.nix index 1ad09c22da8ec..90d73baceecf3 100644 --- a/pkgs/development/python-modules/stdiomask/default.nix +++ b/pkgs/development/python-modules/stdiomask/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "stdiomask"; version = "0.0.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stdlibs/default.nix b/pkgs/development/python-modules/stdlibs/default.nix index 1b2f80da245d0..443dc56aee112 100644 --- a/pkgs/development/python-modules/stdlibs/default.nix +++ b/pkgs/development/python-modules/stdlibs/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "stdlibs"; - version = "2023.11.2"; + version = "2023.12.15"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "omnilib"; repo = "stdlibs"; rev = "refs/tags/v${version}"; - hash = "sha256-084px8p+pOHonSiOvi/BklaccudSlw9URtCaalWlI0o="; + hash = "sha256-1Av10FNJkCC2XGNx1LDqd0GwiNPIDPXPFatW8+2XoaI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/stestr/default.nix b/pkgs/development/python-modules/stestr/default.nix index afce80b83c342..160b3d15b1133 100644 --- a/pkgs/development/python-modules/stestr/default.nix +++ b/pkgs/development/python-modules/stestr/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "stestr"; version = "4.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 45a3e744f1ec5..b2328f8d9ff43 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "stevedore"; version = "5.1.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/stim/default.nix b/pkgs/development/python-modules/stim/default.nix index 734a3b3c9ff1c..0e779f3850a44 100644 --- a/pkgs/development/python-modules/stim/default.nix +++ b/pkgs/development/python-modules/stim/default.nix @@ -1,33 +1,32 @@ { lib -, pkgs , buildPythonPackage -, pythonOlder -, pytestCheckHook -, pytest-xdist -, fetchFromGitHub -, numpy -, pybind11 , cirq-core +, fetchFromGitHub , matplotlib , networkx +, numpy +, pandas +, pybind11 +, pytest-xdist +, pytestCheckHook +, pythonOlder , scipy , setuptools , wheel -, pandas }: buildPythonPackage rec { pname = "stim"; - version = "1.9.0"; - format = "pyproject"; + version = "1.12.1"; + pyproject = true; disabled = pythonOlder "3.6"; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "quantumlib"; repo = "Stim"; rev = "refs/tags/v${version}"; - hash = "sha256-zXWdJjFkf74FCWxyVMF8dx0P8GmUkuHFxUo5wYNU2o0="; + hash = "sha256-vDpW8cn1JPARDIXpLyK9uenhHmva0FwnWIDV7dSHbIY="; }; postPatch = '' @@ -47,34 +46,31 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook - pytest-xdist - cirq-core matplotlib networkx - scipy pandas + pytest-xdist + pytestCheckHook + scipy ]; - meta = { - description = "A tool for high performance simulation and analysis of quantum stabilizer circuits, especially quantum error correction (QEC) circuits."; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ chrispattison ]; - homepage = "https://github.com/quantumlib/stim"; - }; - - pythonImportsCheck = [ "stim" ]; + pythonImportsCheck = [ + "stim" + ]; enableParallelBuilding = true; disabledTestPaths = [ - # No pymatching - "glue/sample/src/sinter/main_test.py" - "glue/sample/src/sinter/decoding_test.py" - "glue/sample/src/sinter/predict_test.py" - "glue/sample/src/sinter/collection_test.py" - "glue/sample/src/sinter/collection_work_manager.py" - "glue/sample/src/sinter/worker_test.py" + # Don't test sample + "glue/sample/" ]; + + meta = with lib; { + description = "A tool for high performance simulation and analysis of quantum stabilizer circuits, especially quantum error correction (QEC) circuits"; + homepage = "https://github.com/quantumlib/stim"; + changelog = "https://github.com/quantumlib/Stim/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ chrispattison ]; + }; } diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index f79caf582f93a..55a86231aa708 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "stm32loader"; version = "0.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stopit/default.nix b/pkgs/development/python-modules/stopit/default.nix index 7fdb46764e6b9..06ed79491ed71 100644 --- a/pkgs/development/python-modules/stopit/default.nix +++ b/pkgs/development/python-modules/stopit/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "stopit"; version = "1.1.2"; + format = "setuptools"; # tests are missing from the PyPi tarball src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/strategies/default.nix b/pkgs/development/python-modules/strategies/default.nix index f11ce2ce5c8fd..f9f31e34d1586 100644 --- a/pkgs/development/python-modules/strategies/default.nix +++ b/pkgs/development/python-modules/strategies/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "strategies"; version = "0.2.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/streamdeck/default.nix b/pkgs/development/python-modules/streamdeck/default.nix index 8354b840238fa..6202fcdf1f798 100644 --- a/pkgs/development/python-modules/streamdeck/default.nix +++ b/pkgs/development/python-modules/streamdeck/default.nix @@ -8,11 +8,12 @@ buildPythonPackage rec { pname = "streamdeck"; - version = "0.9.4"; + version = "0.9.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-aVmWbrBhZ49NfwOp23FD1dxZF+w/q26fIOVs7iQXUxo="; + hash = "sha256-BHliZrRFd64D+UD1xcpp2HAH4D0Z7tibawJobAMM65E="; }; patches = [ diff --git a/pkgs/development/python-modules/streaming-form-data/default.nix b/pkgs/development/python-modules/streaming-form-data/default.nix index f3aa0aa281163..8c631510ec430 100644 --- a/pkgs/development/python-modules/streaming-form-data/default.nix +++ b/pkgs/development/python-modules/streaming-form-data/default.nix @@ -4,6 +4,7 @@ cython, smart-open, pytestCheckHook, moto, requests-toolbelt }: buildPythonPackage rec { pname = "streaming-form-data"; version = "1.13.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/strict-rfc3339/default.nix b/pkgs/development/python-modules/strict-rfc3339/default.nix index e76365a525adf..783aa49904d7f 100644 --- a/pkgs/development/python-modules/strict-rfc3339/default.nix +++ b/pkgs/development/python-modules/strict-rfc3339/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "strict-rfc3339"; version = "0.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stringbrewer/default.nix b/pkgs/development/python-modules/stringbrewer/default.nix index fc39d515a6ec6..d93552816cd26 100644 --- a/pkgs/development/python-modules/stringbrewer/default.nix +++ b/pkgs/development/python-modules/stringbrewer/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "stringbrewer"; version = "0.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stringcase/default.nix b/pkgs/development/python-modules/stringcase/default.nix index e02cc0384f9a4..3875afcc72baa 100644 --- a/pkgs/development/python-modules/stringcase/default.nix +++ b/pkgs/development/python-modules/stringcase/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "stringcase"; version = "1.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stringly/default.nix b/pkgs/development/python-modules/stringly/default.nix index 777fc11ed37f5..b0b8f0515b59a 100644 --- a/pkgs/development/python-modules/stringly/default.nix +++ b/pkgs/development/python-modules/stringly/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "stringly"; version = "1.0b2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 3f91435b3aa79..0a17d51a77488 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "7.5.0"; + version = "7.7.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-duDfcHHaXvORNNkpuMf6zxMZqkfCIr8ScrSKxVq/PW8="; + hash = "sha256-4T/gfU0jNMgzjqJpohZzpOf4YqdUjh7drEqgILWW25Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/pkgs/development/python-modules/stups-cli-support/default.nix index 1ec1bb017dfa7..33673f7a47af5 100644 --- a/pkgs/development/python-modules/stups-cli-support/default.nix +++ b/pkgs/development/python-modules/stups-cli-support/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "stups-cli-support"; version = "1.1.20"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix index 46b5f9046f605..2b668871f57f6 100644 --- a/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/pkgs/development/python-modules/stups-fullstop/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "stups-fullstop"; version = "1.1.31"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/stups-tokens/default.nix b/pkgs/development/python-modules/stups-tokens/default.nix index 8f046986a0257..dd95394632659 100644 --- a/pkgs/development/python-modules/stups-tokens/default.nix +++ b/pkgs/development/python-modules/stups-tokens/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "stups-tokens"; version = "1.1.19"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix index e9a1bad22e32a..3fd99c0621678 100644 --- a/pkgs/development/python-modules/stups-zign/default.nix +++ b/pkgs/development/python-modules/stups-zign/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "stups-zign"; version = "1.2"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 0b6d801c8ed0c..b72d8e0311ccc 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -90,6 +90,11 @@ buildPythonPackage rec { homepage = "https://github.com/Diaoul/subliminal"; changelog = "https://github.com/Diaoul/subliminal/blob/${version}/HISTORY.rst"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ doronbehar ]; + # Too many tests fail ever since a certain python-updates merge, see: + # https://github.com/Diaoul/subliminal/issues/1062 . Disabling tests + # alltogether may produce a not completly failing executable, but that + # executable apparently isn't able to download subtitles at all. + broken = true; }; } diff --git a/pkgs/development/python-modules/subunit2sql/default.nix b/pkgs/development/python-modules/subunit2sql/default.nix index 2f29322b9a8ab..d52180a3d0c47 100644 --- a/pkgs/development/python-modules/subunit2sql/default.nix +++ b/pkgs/development/python-modules/subunit2sql/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "subunit2sql"; version = "1.10.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index e1ad7981b047d..0ddabc8c4554f 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/pkgs/development/python-modules/succulent/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "succulent"; - version = "0.2.6"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "succulent"; rev = "refs/tags/${version}"; - hash = "sha256-CGDgt6tv+KysrytJsgDKwf2yv6shXizvD67XsGBg+nI="; + hash = "sha256-2WiKrIQkgFIjmZkEA8veXcKCY4X0aygqoP7R3UCCljQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/sudachidict/default.nix b/pkgs/development/python-modules/sudachidict/default.nix new file mode 100644 index 0000000000000..72826908612c7 --- /dev/null +++ b/pkgs/development/python-modules/sudachidict/default.nix @@ -0,0 +1,42 @@ +{ buildPythonPackage +, fetchFromGitHub +, sudachidict +, setuptools +}: + +buildPythonPackage rec { + pname = "sudachidict-${sudachidict.dict-type}"; + inherit (sudachidict) version meta; + pyproject = true; + + src = fetchFromGitHub { + owner = "WorksApplications"; + repo = "SudachiDict"; + rev = "refs/tags/v${version}"; + hash = "sha256-xJ/iPywOZA2kzHaVU43Bc8TUboj3OpDg1kLFMIc/T90="; + }; + + sourceRoot = "source/python"; + + # setup script tries to get data from the network but we use the nixpkgs' one + postPatch = '' + substituteInPlace setup.py \ + --replace 'ZIP_NAME = urlparse(ZIP_URL).path.split("/")[-1]' "" \ + --replace "not os.path.exists(RESOURCE_DIR)" "False" + substituteInPlace INFO.json \ + --replace "%%VERSION%%" ${version} \ + --replace "%%DICT_VERSION%%" ${version} \ + --replace "%%DICT_TYPE%%" ${sudachidict.dict-type} + ''; + + nativeBuildInputs = [ + setuptools + ]; + + # we need to prepare some files before the build + # https://github.com/WorksApplications/SudachiDict/blob/develop/package_python.sh + preBuild = '' + install -Dm644 ${sudachidict}/share/system.dic -t sudachidict_${sudachidict.dict-type}/resources + touch sudachidict_${sudachidict.dict-type}/__init__.py + ''; +} diff --git a/pkgs/development/python-modules/sudachipy/default.nix b/pkgs/development/python-modules/sudachipy/default.nix new file mode 100644 index 0000000000000..bfaf9be85846b --- /dev/null +++ b/pkgs/development/python-modules/sudachipy/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, buildPythonPackage +, cargo +, libiconv +, rustPlatform +, rustc +, sudachi-rs +, setuptools-rust +, pytestCheckHook +, sudachidict-core +, tokenizers +}: + +buildPythonPackage rec { + pname = "sudachipy"; + inherit (sudachi-rs) src version; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-Am+ae2lgnndSDzf0GF8R1i6OPLdIlm2dLThqYqXbscA="; + }; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools-rust + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + + preBuild = '' + cd python + ''; + + nativeCheckInputs = [ + pytestCheckHook + sudachidict-core + tokenizers + ]; + + pythonImportsCheck = [ + "sudachipy" + ]; + + meta = sudachi-rs.meta // { + homepage = "https://github.com/WorksApplications/sudachi.rs/tree/develop/python"; + mainProgram = "sudachipy"; + }; +} diff --git a/pkgs/development/python-modules/sunweg/default.nix b/pkgs/development/python-modules/sunweg/default.nix index b33220898cd33..80b8b08251c7b 100644 --- a/pkgs/development/python-modules/sunweg/default.nix +++ b/pkgs/development/python-modules/sunweg/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sunweg"; - version = "2.0.0"; + version = "2.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rokam"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-S92PybN+pReI9WtJr9as95uceicsSMadMQfh9JxsE8U="; + hash = "sha256-rqxpHnKHS5rgQ6iH5NSL2F71EnpOBxpICUk74YwtEDc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix index 445f942581b41..41e83ccd5519d 100644 --- a/pkgs/development/python-modules/surepy/default.nix +++ b/pkgs/development/python-modules/surepy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "surepy"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "benleb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/fgNznsucjHPO44lK4tk5tDJHKjCJEbPtOO7YHmDcRQ="; + hash = "sha256-ETgpXSUUsV1xoZjdnL2bzn4HwDjKC2t13yXwf28OBqI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index b6623d3b80096..257a901aa7209 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "svg2tikz"; - version = "2.1.0"; + version = "3.0.0"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "xyz2tex"; repo = "svg2tikz"; rev = "refs/tags/v${version}"; - hash = "sha256-v8+0h90uJlkI5eJcwCG55nxPz8n2aJXwP8Ocp48cl9M="; + hash = "sha256-YnWkj4xvjGzpKQv+H+spage+dy+fC9fJkqsOaQ6C1Ho="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix index 7f03007ee5f26..7ac6fd9f13cfc 100644 --- a/pkgs/development/python-modules/svgwrite/default.nix +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "svgwrite"; version = "1.4.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "mozman"; diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix index 124b69135253b..7b9ed410106be 100644 --- a/pkgs/development/python-modules/swagger-spec-validator/default.nix +++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "swagger-spec-validator"; version = "2.7.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "Yelp"; diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix index e44fd471bc79e..6f3cd92d90eda 100644 --- a/pkgs/development/python-modules/swagger-ui-bundle/default.nix +++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "swagger-ui-bundle"; version = "0.0.9"; + format = "setuptools"; src = fetchPypi { pname = "swagger_ui_bundle"; diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index 95dd8e55d4a4e..464b044ad15a9 100644 --- a/pkgs/development/python-modules/swift/default.nix +++ b/pkgs/development/python-modules/swift/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { pname = "swift"; version = "2.32.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/swisshydrodata/default.nix b/pkgs/development/python-modules/swisshydrodata/default.nix index 38ed15981fd44..1ab94a63df381 100644 --- a/pkgs/development/python-modules/swisshydrodata/default.nix +++ b/pkgs/development/python-modules/swisshydrodata/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "swisshydrodata"; version = "0.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "Bouni"; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index a88e21021e419..cf250568b6099 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "sympy"; version = "1.12"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/syncer/default.nix b/pkgs/development/python-modules/syncer/default.nix index 48345b94e4213..cb86cd2e7ceea 100644 --- a/pkgs/development/python-modules/syncer/default.nix +++ b/pkgs/development/python-modules/syncer/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "syncer"; version = "2.0.3"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/synergy/default.nix b/pkgs/development/python-modules/synergy/default.nix index 0b6c367db6eea..570390d67f153 100644 --- a/pkgs/development/python-modules/synergy/default.nix +++ b/pkgs/development/python-modules/synergy/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "synergy"; version = "0.5.1"; + format = "setuptools"; disabled = pythonOlder "3.5"; # Pypi does not contain unit tests diff --git a/pkgs/development/python-modules/systembridge/default.nix b/pkgs/development/python-modules/systembridge/default.nix index 5cac083229bea..f60a1c3298c4b 100644 --- a/pkgs/development/python-modules/systembridge/default.nix +++ b/pkgs/development/python-modules/systembridge/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "systembridge"; version = "2.3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "timmo001"; diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index da81905fca37f..de195da11240d 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "systemd"; version = "235"; + format = "setuptools"; src = fetchFromGitHub { owner = "systemd"; diff --git a/pkgs/development/python-modules/sysv_ipc/default.nix b/pkgs/development/python-modules/sysv_ipc/default.nix index a58b714a4ac80..faf5b5d7d9922 100644 --- a/pkgs/development/python-modules/sysv_ipc/default.nix +++ b/pkgs/development/python-modules/sysv_ipc/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "sysv_ipc"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index 0569b2e661c3e..6179680068434 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { pname = "tabcmd"; version = "2.0.12"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/tabledata/default.nix b/pkgs/development/python-modules/tabledata/default.nix index b178665628a60..290774b17b41d 100644 --- a/pkgs/development/python-modules/tabledata/default.nix +++ b/pkgs/development/python-modules/tabledata/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "tabledata"; version = "1.3.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "thombashi"; diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index c1726ee97a853..3879520b25100 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { pname = "tables"; version = "3.8.0"; + format = "setuptools"; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/tadasets/default.nix b/pkgs/development/python-modules/tadasets/default.nix index 7eab0e9cda51e..7b9001cd132e2 100644 --- a/pkgs/development/python-modules/tadasets/default.nix +++ b/pkgs/development/python-modules/tadasets/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "tadasets"; version = "0.0.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/tahoma-api/default.nix b/pkgs/development/python-modules/tahoma-api/default.nix index 14989f9ac750d..edd3469416680 100644 --- a/pkgs/development/python-modules/tahoma-api/default.nix +++ b/pkgs/development/python-modules/tahoma-api/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "tahoma-api"; version = "0.0.17"; + format = "setuptools"; src = fetchFromGitHub { owner = "philklei"; diff --git a/pkgs/development/python-modules/tailer/default.nix b/pkgs/development/python-modules/tailer/default.nix index b8e19b7d97d83..8079d7d2c614e 100644 --- a/pkgs/development/python-modules/tailer/default.nix +++ b/pkgs/development/python-modules/tailer/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "tailer"; version = "0.4.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "six8"; diff --git a/pkgs/development/python-modules/takethetime/default.nix b/pkgs/development/python-modules/takethetime/default.nix index 7bc914ed85db2..c79df0b179f12 100644 --- a/pkgs/development/python-modules/takethetime/default.nix +++ b/pkgs/development/python-modules/takethetime/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "takethetime"; version = "0.3.1"; + format = "setuptools"; src = fetchPypi { pname = "TakeTheTime"; diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix index 126ea75f6a51c..b7fdbcd5a9fbb 100644 --- a/pkgs/development/python-modules/tasklib/default.nix +++ b/pkgs/development/python-modules/tasklib/default.nix @@ -14,6 +14,7 @@ wsl_stub = writeShellScriptBin "wsl" "true"; in buildPythonPackage rec { pname = "tasklib"; version = "2.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 5e9b2f3269e1c..40acca5735e3b 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "taskw"; version = "2.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/taxi/default.nix b/pkgs/development/python-modules/taxi/default.nix index 1d7c80e4dd0aa..beda64f22eb5d 100644 --- a/pkgs/development/python-modules/taxi/default.nix +++ b/pkgs/development/python-modules/taxi/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "taxi"; version = "6.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "sephii"; diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 0441fb2894fd2..e735f6aae217a 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "tblib"; version = "2.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/tcolorpy/default.nix b/pkgs/development/python-modules/tcolorpy/default.nix index 9114043e149be..87c9f5b8147d3 100644 --- a/pkgs/development/python-modules/tcolorpy/default.nix +++ b/pkgs/development/python-modules/tcolorpy/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "tcolorpy"; version = "0.1.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "thombashi"; diff --git a/pkgs/development/python-modules/telegram/default.nix b/pkgs/development/python-modules/telegram/default.nix index c297efc0efdd9..d07baaa4169fd 100644 --- a/pkgs/development/python-modules/telegram/default.nix +++ b/pkgs/development/python-modules/telegram/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "telegram"; version = "0.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/telepath/default.nix b/pkgs/development/python-modules/telepath/default.nix index 5a38142eade3c..40aa3ca5982b9 100644 --- a/pkgs/development/python-modules/telepath/default.nix +++ b/pkgs/development/python-modules/telepath/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "telepath"; version = "0.3"; + format = "setuptools"; src = fetchFromGitHub { repo = "telepath"; diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index 346f7de2b8984..8cea09fea3a02 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "telethon-session-sqlalchemy"; version = "0.2.16"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix index 40198cddb681f..787824d503884 100644 --- a/pkgs/development/python-modules/telfhash/default.nix +++ b/pkgs/development/python-modules/telfhash/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "telfhash"; version = "0.9.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "trendmicro"; diff --git a/pkgs/development/python-modules/temperusb/default.nix b/pkgs/development/python-modules/temperusb/default.nix index 929560167e76e..79363508ecbf4 100644 --- a/pkgs/development/python-modules/temperusb/default.nix +++ b/pkgs/development/python-modules/temperusb/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "temperusb"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-enYhqtJnORKhBoZkZPISLCt9Ec5SN6txD3z0SXuPrQo="; + hash = "sha256-PwKHT1zzVn+nmxO/R+aK+029WaaHBo7FyVV4eQtHhbM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix index 344ed1ea68d9a..d7e2c91357721 100644 --- a/pkgs/development/python-modules/tempita/default.nix +++ b/pkgs/development/python-modules/tempita/default.nix @@ -2,6 +2,7 @@ buildPythonPackage { version = "0.5.3-2016-09-28"; + format = "setuptools"; pname = "tempita"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 3fd7a441106d9..e857a2916e202 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; version = "4.9.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "tensorflow"; diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index be299e867d320..0f11461eb9d66 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "tensorflow-metadata"; version = "1.14.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "tensorflow"; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index fa70e4cc4a305..1040023619262 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -22,7 +22,7 @@ , tensorboard , config , cudaSupport ? config.cudaSupport -, cudaPackages ? {} +, cudaPackagesGoogle , zlib , python , keras-applications @@ -43,7 +43,7 @@ assert ! (stdenv.isDarwin && cudaSupport); let packages = import ./binary-hashes.nix; - inherit (cudaPackages) cudatoolkit cudnn; + inherit (cudaPackagesGoogle) cudatoolkit cudnn; in buildPythonPackage { pname = "tensorflow" + lib.optionalString cudaSupport "-gpu"; inherit (packages) version; @@ -200,7 +200,7 @@ in buildPythonPackage { ]; passthru = { - inherit cudaPackages; + cudaPackages = cudaPackagesGoogle; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index ff95c847eae5e..8714a77d88126 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -19,8 +19,8 @@ # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 , config , cudaSupport ? config.cudaSupport -, cudaPackages ? { } -, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities +, cudaPackagesGoogle +, cudaCapabilities ? cudaPackagesGoogle.cudaFlags.cudaCapabilities , mklSupport ? false, mkl , tensorboardSupport ? true # XLA without CUDA is broken @@ -50,14 +50,15 @@ let # __ZN4llvm11SmallPtrSetIPKNS_10AllocaInstELj8EED1Ev in any of the # translation units, so the build fails at link time stdenv = - if cudaSupport then cudaPackages.backendStdenv + if cudaSupport then cudaPackagesGoogle.backendStdenv else if originalStdenv.isDarwin then llvmPackages_11.stdenv else originalStdenv; - inherit (cudaPackages) cudatoolkit nccl; + inherit (cudaPackagesGoogle) cudatoolkit nccl; # use compatible cuDNN (https://www.tensorflow.org/install/source#gpu) # cudaPackages.cudnn led to this: # https://github.com/tensorflow/tensorflow/issues/60398 - cudnn = cudaPackages.cudnn_8_6; + cudnnAttribute = "cudnn_8_6"; + cudnn = cudaPackagesGoogle.${cudnnAttribute}; gentoo-patches = fetchzip { url = "https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.12.0.tar.bz2"; hash = "sha256-SCRX/5/zML7LmKEPJkcM5Tebez9vv/gmE4xhT/jyqWs="; @@ -65,15 +66,7 @@ let protobuf-extra = linkFarm "protobuf-extra" [ { name = "include"; path = protobuf-core.src; } ]; -in - -assert cudaSupport -> cudatoolkit != null - && cudnn != null; -# unsupported combination -assert ! (stdenv.isDarwin && cudaSupport); - -let withTensorboard = (pythonOlder "3.6") || tensorboardSupport; # FIXME: migrate to redist cudaPackages @@ -111,6 +104,7 @@ let tfFeature = x: if x then "1" else "0"; version = "2.13.0"; + format = "setuptools"; variant = lib.optionalString cudaSupport "-gpu"; pname = "tensorflow${variant}"; @@ -427,7 +421,9 @@ let x86_64-linux = if cudaSupport then "sha256-5VFMNHeLrUxW5RTr6EhT3pay9nWJ5JkZTGirDds5QkU=" else "sha256-KzgWV69Btr84FdwQ5JI2nQEsqiPg1/+TWdbw5bmxXOE="; - aarch64-linux = "sha256-9btXrNHqd720oXTPDhSmFidv5iaZRLjCVX8opmrMjXk="; + aarch64-linux = if cudaSupport + then "sha256-ty5+51BwHWE1xR4/0WcWTp608NzSAS/iiyN+9zx7/wI=" + else "sha256-9btXrNHqd720oXTPDhSmFidv5iaZRLjCVX8opmrMjXk="; x86_64-darwin = "sha256-gqb03kB0z2pZQ6m1fyRp1/Nbt8AVVHWpOJSeZNCLc4w="; aarch64-darwin = "sha256-WdgAaFZU+ePwWkVBhLzjlNT7ELfGHOTaMdafcAMD5yo="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); @@ -484,13 +480,18 @@ let }; meta = with lib; { + badPlatforms = lib.optionals cudaSupport lib.platforms.darwin; changelog = "https://github.com/tensorflow/tensorflow/releases/tag/v${version}"; description = "Computation using data flow graphs for scalable machine learning"; homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; linux ++ darwin; - broken = stdenv.isDarwin || !(xlaSupport -> cudaSupport); + broken = + stdenv.isDarwin + || !(xlaSupport -> cudaSupport) + || !(cudaSupport -> builtins.hasAttr cudnnAttribute cudaPackagesGoogle) + || !(cudaSupport -> cudaPackagesGoogle ? cudatoolkit); } // lib.optionalAttrs stdenv.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s @@ -593,7 +594,7 @@ in buildPythonPackage { # Regression test for #77626 removed because not more `tensorflow.contrib`. passthru = { - inherit cudaPackages; + cudaPackages = cudaPackagesGoogle; deps = bazel-build.deps; libtensorflow = bazel-build.out; }; diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix index 475e7627e4baa..e108b1a773cba 100644 --- a/pkgs/development/python-modules/tensorrt/default.nix +++ b/pkgs/development/python-modules/tensorrt/default.nix @@ -11,7 +11,7 @@ let in buildPythonPackage rec { pname = "tensorrt"; - version = cudaPackages.tensorrt.version; + version = lib.optionalString (cudaPackages ? tensorrt) cudaPackages.tensorrt.version; src = cudaPackages.tensorrt.src; @@ -48,5 +48,8 @@ buildPythonPackage rec { license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ aidalgol ]; + broken = + !(cudaPackages ? tensorrt) + || !(cudaPackages ? cudnn); }; } diff --git a/pkgs/development/python-modules/terminaltables/default.nix b/pkgs/development/python-modules/terminaltables/default.nix index 7b548b763fdf2..83895d7ad0bc2 100644 --- a/pkgs/development/python-modules/terminaltables/default.nix +++ b/pkgs/development/python-modules/terminaltables/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "terminaltables"; version = "3.1.10"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/termstyle/default.nix b/pkgs/development/python-modules/termstyle/default.nix index 0a1c4e764129c..862cea1741687 100644 --- a/pkgs/development/python-modules/termstyle/default.nix +++ b/pkgs/development/python-modules/termstyle/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "termstyle"; version = "0.1.11"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index fe840bcd4e2cd..0c2b87bade1ce 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.7"; + version = "3.9.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-A59b7qr9Y4LuIwP51ci7k1019/T+qNcDYPDNCkmqpi4="; + hash = "sha256-9ySUgRz1Zp0tkHCEkDcygm97mji4mjA5ltrriP9zAiQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix index be8e8ff45e053..b11cf5535d1d1 100644 --- a/pkgs/development/python-modules/tess/default.nix +++ b/pkgs/development/python-modules/tess/default.nix @@ -9,6 +9,7 @@ buildPythonPackage { pname = "tess"; version = "unstable-2019-05-07"; + format = "setuptools"; src = fetchFromGitHub { owner = "wackywendell"; diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index 4b7a89ea7b73e..7959d38d2d3c5 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "tesserocr"; version = "2.6.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix index b2044e2f07323..0c4e75169c9f5 100644 --- a/pkgs/development/python-modules/test-tube/default.nix +++ b/pkgs/development/python-modules/test-tube/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "test-tube"; version = "0.628"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index 908779a45d696..60abdaa863847 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "testrepository"; version = "0.0.20"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/testresources/default.nix b/pkgs/development/python-modules/testresources/default.nix index 8a7a6160e1af5..4a9d43d6246d6 100644 --- a/pkgs/development/python-modules/testresources/default.nix +++ b/pkgs/development/python-modules/testresources/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "testresources"; version = "2.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix index 8df35ac4b8895..4e7dcef3e90d8 100644 --- a/pkgs/development/python-modules/testscenarios/default.nix +++ b/pkgs/development/python-modules/testscenarios/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "testscenarios"; version = "0.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index c4f74d377d5fb..24fa17a446239 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "testtools"; version = "2.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/texsoup/default.nix b/pkgs/development/python-modules/texsoup/default.nix new file mode 100644 index 0000000000000..da59b2fc28bc5 --- /dev/null +++ b/pkgs/development/python-modules/texsoup/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "texsoup"; + version = "0.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "alvinwan"; + repo = "TexSoup"; + rev = "refs/tags/${version}"; + hash = "sha256-XKYJycYivtrszU46B3Bd4JLrvckBpQu9gKDMdr6MyZU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ "TexSoup" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + substituteInPlace pytest.ini \ + --replace "--cov=TexSoup" "" + ''; + + meta = with lib; { + description = "Fault-tolerant Python3 package for searching, navigating, and modifying LaTeX documents"; + homepage = "https://github.com/alvinwan/TexSoup"; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/text-unidecode/default.nix b/pkgs/development/python-modules/text-unidecode/default.nix index 30f5b73f5fd36..b971b94c99ab6 100644 --- a/pkgs/development/python-modules/text-unidecode/default.nix +++ b/pkgs/development/python-modules/text-unidecode/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "text-unidecode"; version = "1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 4167cfd7d969b..18bdddfa08185 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -68,6 +68,5 @@ buildPythonPackage rec { description = "Higher-level text processing, built on spaCy"; homepage = "https://textacy.readthedocs.io/"; license = licenses.asl20; - maintainers = with maintainers; [ rvl ]; }; } diff --git a/pkgs/development/python-modules/textdistance/default.nix b/pkgs/development/python-modules/textdistance/default.nix index 2c2d5ee23adf6..c362e936eb32d 100644 --- a/pkgs/development/python-modules/textdistance/default.nix +++ b/pkgs/development/python-modules/textdistance/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "textdistance"; - version = "4.6.0"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cyxQMVzU7pRjg4ZDzxnWkiEwLDYDHqpgcMMMwKpdqMo="; + hash = "sha256-JYllgBse+FaGppq/bDzv3F2iHC+9iMkMaHJfV6fUXyE="; }; # There aren't tests diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/pkgs/development/python-modules/textwrap3/default.nix index 2ba2ea4944c17..17832c11b8cf0 100644 --- a/pkgs/development/python-modules/textwrap3/default.nix +++ b/pkgs/development/python-modules/textwrap3/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "textwrap3"; version = "0.9.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/tflearn/default.nix b/pkgs/development/python-modules/tflearn/default.nix index 91a92d6b8de45..d2eee46f14ce8 100644 --- a/pkgs/development/python-modules/tflearn/default.nix +++ b/pkgs/development/python-modules/tflearn/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "tflearn"; version = "0.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/theano-pymc/default.nix b/pkgs/development/python-modules/theano-pymc/default.nix index 441843a852724..fa8218237cc12 100644 --- a/pkgs/development/python-modules/theano-pymc/default.nix +++ b/pkgs/development/python-modules/theano-pymc/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "theano-pymc"; version = "1.1.2"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { diff --git a/pkgs/development/python-modules/theano/default.nix b/pkgs/development/python-modules/theano/default.nix index 428bf4310d6b5..78a2a0836e765 100644 --- a/pkgs/development/python-modules/theano/default.nix +++ b/pkgs/development/python-modules/theano/default.nix @@ -51,6 +51,7 @@ let in buildPythonPackage rec { pname = "theano"; version = "1.0.5"; + format = "setuptools"; disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix index 1a07edc441d48..b03038c4aa5fd 100644 --- a/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/pkgs/development/python-modules/thermopro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thermopro-ble"; - version = "0.4.5"; + version = "0.5.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-z3RrPOV7NGl3aNor+baeVivn+DKwYHcrdlM5sNMGVD0="; + hash = "sha256-4lk/K9XW9naPDRXmuqKFBdOwMtLlQE8etJFEbNgfIvA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index b1f994fde7634..564e7d73e6191 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "3.10.7"; + format = "setuptools"; pname = "thespian"; src = fetchPypi { diff --git a/pkgs/development/python-modules/threadloop/default.nix b/pkgs/development/python-modules/threadloop/default.nix index 2fb8dd4420efe..fdf0e3a08114a 100644 --- a/pkgs/development/python-modules/threadloop/default.nix +++ b/pkgs/development/python-modules/threadloop/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "threadloop"; version = "1.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/threadpool/default.nix b/pkgs/development/python-modules/threadpool/default.nix index 9c83e7e45c287..4b08fd7acef83 100644 --- a/pkgs/development/python-modules/threadpool/default.nix +++ b/pkgs/development/python-modules/threadpool/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "threadpool"; version = "1.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/three-merge/default.nix b/pkgs/development/python-modules/three-merge/default.nix index 2bb1891cd0bbc..18d9eea211e5d 100644 --- a/pkgs/development/python-modules/three-merge/default.nix +++ b/pkgs/development/python-modules/three-merge/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "three-merge"; version = "0.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index 4ff39c59c4687..5d210e3f3f3a1 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "thrift"; version = "0.16.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/throttler/default.nix b/pkgs/development/python-modules/throttler/default.nix index 2742cdaa29350..dea390403592a 100644 --- a/pkgs/development/python-modules/throttler/default.nix +++ b/pkgs/development/python-modules/throttler/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "throttler"; version = "1.2.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "uburuntu"; diff --git a/pkgs/development/python-modules/tika/default.nix b/pkgs/development/python-modules/tika/default.nix index 551813db15edd..7e2ce76f9f762 100644 --- a/pkgs/development/python-modules/tika/default.nix +++ b/pkgs/development/python-modules/tika/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "tika"; version = "2.6.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix index ce46fd56f243f..a33a219b1f02a 100644 --- a/pkgs/development/python-modules/tilestache/default.nix +++ b/pkgs/development/python-modules/tilestache/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "tilestache"; version = "1.51.14"; + format = "setuptools"; disabled = !isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/timeago/default.nix b/pkgs/development/python-modules/timeago/default.nix index 6a84d909f3639..8f450d2c03a80 100644 --- a/pkgs/development/python-modules/timeago/default.nix +++ b/pkgs/development/python-modules/timeago/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "timeago"; version = "1.0.16"; + format = "setuptools"; src = fetchFromGitHub { owner = "hustcc"; diff --git a/pkgs/development/python-modules/timecop/default.nix b/pkgs/development/python-modules/timecop/default.nix index 272657dfaafdf..fb455d079b0e4 100644 --- a/pkgs/development/python-modules/timecop/default.nix +++ b/pkgs/development/python-modules/timecop/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "timecop"; version = "0.5.0dev"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/timelib/default.nix b/pkgs/development/python-modules/timelib/default.nix index e0f76c0c2e654..2667867505a6c 100644 --- a/pkgs/development/python-modules/timelib/default.nix +++ b/pkgs/development/python-modules/timelib/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "timelib"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/timeout-decorator/default.nix b/pkgs/development/python-modules/timeout-decorator/default.nix index c2d21fea153fe..2907117d34836 100644 --- a/pkgs/development/python-modules/timeout-decorator/default.nix +++ b/pkgs/development/python-modules/timeout-decorator/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { pname = "timeout-decorator"; version = "0.5.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/tinyobjloader-py/default.nix b/pkgs/development/python-modules/tinyobjloader-py/default.nix index 3c36dded5ee7a..21dc0a5f4ddf2 100644 --- a/pkgs/development/python-modules/tinyobjloader-py/default.nix +++ b/pkgs/development/python-modules/tinyobjloader-py/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { pname = "tinyobjloader-py"; + format = "setuptools"; inherit (tinyobjloader) version src; # Build needs headers from ${src}, setting sourceRoot or fetching from pypi won't work. diff --git a/pkgs/development/python-modules/tissue/default.nix b/pkgs/development/python-modules/tissue/default.nix index e1ef7f9edf46a..3c5b1a452b5d3 100644 --- a/pkgs/development/python-modules/tissue/default.nix +++ b/pkgs/development/python-modules/tissue/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "tissue"; version = "0.9.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index c6809a06a4066..a64fd4fd79c2a 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "tlsh"; version = "4.10.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "trendmicro"; diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index c6146140163cd..467a50a4027e5 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "tlslite-ng"; version = "0.7.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix index 107c3ae75c5a9..46af9553fcd15 100644 --- a/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/pkgs/development/python-modules/tokenize-rt/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "tokenize-rt"; version = "4.2.1"; + format = "setuptools"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix index bed053f828268..f417235613818 100644 --- a/pkgs/development/python-modules/tokenlib/default.nix +++ b/pkgs/development/python-modules/tokenlib/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "tokenlib"; version = "0.3.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "mozilla-services"; diff --git a/pkgs/development/python-modules/toml-adapt/default.nix b/pkgs/development/python-modules/toml-adapt/default.nix index 66ad2d58dbc75..a786be8718d21 100644 --- a/pkgs/development/python-modules/toml-adapt/default.nix +++ b/pkgs/development/python-modules/toml-adapt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "toml-adapt"; - version = "0.2.12"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DtxA63lutgjGMH8GYz5r6IFEuuZ9iFGPGup960c4xgE="; + hash = "sha256-BI0yZlut9PEupa597KN4qdVABOiOLwFpovN8L1lfUmk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix index bdc1b141eed72..aa12d2936c42b 100644 --- a/pkgs/development/python-modules/toml/default.nix +++ b/pkgs/development/python-modules/toml/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "toml"; version = "0.10.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index c6c9ecf31d84f..60e38571a7593 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "toolz"; version = "0.12.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index 74eefd0718904..7a4756e905ccb 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -24,7 +24,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.1.1"; + version = "2.1.2"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 42eed4485ebf3..b22d01262065f 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -6,86 +6,86 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.1.1" = { + "2.1.2" = { x86_64-linux-38 = { - name = "torch-2.1.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.1.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-h8y2g+ZCqYuO8FRV722GRntiB1pDJfTV+aouiTL2Bzk="; + name = "torch-2.1.2-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-2qF5u1WPePIWXbl0pnROyN4upx62qvNiva52FgEsAwI="; }; x86_64-linux-39 = { - name = "torch-2.1.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.1.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-KCRfYtEHPCfW8N4DqBrUnVMzxGBlke2I/tHtuX8FUz0="; + name = "torch-2.1.2-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-6q9pB+NyPAymqR314Bp+74yr7JMSDppQc59aXxSiqkY="; }; x86_64-linux-310 = { - name = "torch-2.1.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.1.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-7HbRE1DI6IejTTZgLNN/UGObyc2p+upNQ/IHDpeS5KQ="; + name = "torch-2.1.2-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-shhLdynvO5sQBlwHSjfB5gP9mfkeODduJct+1uHVRpY="; }; x86_64-linux-311 = { - name = "torch-2.1.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.1.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-g7/hE036irhlU8Fdpd/6GQqG2CKvr+jqbeEWnBDZcao="; + name = "torch-2.1.2-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-ygXK6TNFBNGQPhbFDd8EUymoWdWxon7S3B1Y7QZt9vo="; }; x86_64-darwin-38 = { - name = "torch-2.1.1-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-1WsDIXZFjir0cJYnu9LCD+KRfv+M0Ien/jE6zM9c4vE="; + name = "torch-2.1.2-cp38-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp38-none-macosx_10_9_x86_64.whl"; + hash = "sha256-jiId7M0N72wrrf9r5APgxTSRgF7ZkV4sAprbzbh6trU="; }; x86_64-darwin-39 = { - name = "torch-2.1.1-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-cVtQ2MHeXaVSSmgofrAA9z4CbnTV9rErxFDvaZX89fk="; + name = "torch-2.1.2-cp39-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-aYTNUFfAyXezyXVyVOmJ0/EST0zp0HyqbLY3eDxx1Co="; }; x86_64-darwin-310 = { - name = "torch-2.1.1-cp310-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp310-none-macosx_10_9_x86_64.whl"; - hash = "sha256-Hh5frd1DqPLA4OIr6s0eI1ouRHeU2AdIPJSp4xtUp1g="; + name = "torch-2.1.2-cp310-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp310-none-macosx_10_9_x86_64.whl"; + hash = "sha256-2bU1ytDfPROZfb6L1orDPg465Td2OcmIGUjkB5SmFAM="; }; x86_64-darwin-311 = { - name = "torch-2.1.1-cp311-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp311-none-macosx_10_9_x86_64.whl"; - hash = "sha256-pwWTgG8dfmtTZX2WgQUY2g+I7yYIyYpAKVV2W4x51Sw="; + name = "torch-2.1.2-cp311-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp311-none-macosx_10_9_x86_64.whl"; + hash = "sha256-dtN5Z8McmVSK0sTT8s8ZHbSEdvLmmzWgk3E3EW2jVqE="; }; aarch64-darwin-38 = { - name = "torch-2.1.1-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-KeO5CowoH2ZggEqTnR9CGGBMgBYuUh4ebYyFVzJZAqA="; + name = "torch-2.1.2-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-BbGFlPYKkRoMTwI/OKi9p3Ex+6X9dBvaYm6X3PWj3Qo="; }; aarch64-darwin-39 = { - name = "torch-2.1.1-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-22foclx29Mf08C51UbsW6BuhoZEoZ7w117uW0r6MeLQ="; + name = "torch-2.1.2-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-vBldeSf+q8DrfBEORXyVXtKrYW88fChDndQYjPWJaZ8="; }; aarch64-darwin-310 = { - name = "torch-2.1.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-52vzxcNUh08dpGXIUqL7YO5svOMG6TUzeIV2DwgPm6o="; + name = "torch-2.1.2-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-+aVdVa8Cgm6/ut9Om2gvDyd2a8M9+CNrSNKNcFWHho8="; }; aarch64-darwin-311 = { - name = "torch-2.1.1-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-4xL36C5JVl92Z7C7+VWasMWXBj2TBEdAeBwCrNWoeXg="; + name = "torch-2.1.2-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-4tg/B7SqyYNFPqW/j5qp2s8ieKjTEkf12QN/N778YOQ="; }; aarch64-linux-38 = { - name = "torch-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-nKD8vz1bpkTWqFcsg6mrvfX3/1dbw4Up72wYWjpxvek="; + name = "torch-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-4yJfR9ULtm91b+kZanaAVdHCawIVTrH3cM5HoleNOqc="; }; aarch64-linux-39 = { - name = "torch-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-sxIwvQWEJOVtun+JkoDbxqyLmUjkOQLgyEpEZmsewVE="; + name = "torch-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-2TunD2ewjCrlWY7nEcvFRqG8gQLO+TiQS4yFwgiaUaA="; }; aarch64-linux-310 = { - name = "torch-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-hP79YzVkFsDNIFeGN8zbuCFkmTQA7Re1fJUd1jdtzug="; + name = "torch-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-vvaZbCfY9ukupOE6dy2JYR2g4QO0h5DeeBMeMIz3MHY="; }; aarch64-linux-311 = { - name = "torch-2.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-YbUbM8YXN8KHBYsMMGHmqdPDY4Y+SglPgEvEhoiKGIo="; + name = "torch-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-jzLOWRYWowME83p9XqgLacqeG5S7p/MIGEv2Fv2uoVU="; }; }; } diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index d18dd97df5b45..8fb227cbd36be 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -125,7 +125,7 @@ let in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.8.0"; @@ -134,14 +134,16 @@ in buildPythonPackage rec { "out" # output standard python package "dev" # output libtorch headers "lib" # output libtorch libraries + "cxxdev" # propagated deps for the cmake consumers of torch ]; + cudaPropagateToOutput = "cxxdev"; src = fetchFromGitHub { owner = "pytorch"; repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-01+uqHvPbQVXKLohGWfsCsZOjb7xmfjBKkTGUGMEdAI="; + hash = "sha256-E/GQCRWBf3hYsDCCk0twaL9gkVOCEQeCvO3Va+jgIdE="; }; patches = lib.optionals cudaSupport [ @@ -180,7 +182,7 @@ in buildPythonPackage rec { # Strangely, this is never set in cmake substituteInPlace cmake/public/LoadHIP.cmake \ --replace "set(ROCM_PATH \$ENV{ROCM_PATH})" \ - "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitString "." rocmPackages.clr.version))})" + "set(ROCM_PATH \$ENV{ROCM_PATH})''\nset(ROCM_VERSION ${lib.concatStrings (lib.intersperse "0" (lib.splitVersion rocmPackages.clr.version))})" '' # Detection of NCCL version doesn't work particularly well when using the static binary. + lib.optionalString cudaSupport '' @@ -271,7 +273,7 @@ in buildPythonPackage rec { PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_NUMBER = 0; - USE_NCCL = setBool (cudaPackages ? nccl); + USE_NCCL = setBool (cudaSupport && cudaPackages ? nccl); USE_SYSTEM_NCCL = setBool useSystemNccl; # don't build pytorch's third_party NCCL USE_STATIC_NCCL = setBool useSystemNccl; @@ -337,7 +339,9 @@ in buildPythonPackage rec { buildInputs = [ blas blas.provider ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cccl.dev # <thrust/*> - cuda_cudart # cuda_runtime.h and libraries + cuda_cudart.dev # cuda_runtime.h and libraries + cuda_cudart.lib + cuda_cudart.static cuda_cupti.dev # For kineto cuda_cupti.lib # For kineto cuda_nvcc.dev # crt/host_config.h; even though we include this in nativeBuildinputs, it's needed here too @@ -370,7 +374,10 @@ in buildPythonPackage rec { ++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ] ++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ] ++ lib.optionals stdenv.isLinux [ numactl ] - ++ lib.optionals stdenv.isDarwin [ Accelerate CoreServices libobjc ]; + ++ lib.optionals stdenv.isDarwin [ Accelerate CoreServices libobjc ] + ++ lib.optionals tritonSupport [ openai-triton ] + ++ lib.optionals MPISupport [ mpi ] + ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; propagatedBuildInputs = [ cffi @@ -391,8 +398,10 @@ in buildPythonPackage rec { # torch/csrc requires `pybind11` at runtime pybind11 + ] ++ lib.optionals tritonSupport [ openai-triton ]; + + propagatedCxxBuildInputs = [ ] - ++ lib.optionals tritonSupport [ openai-triton ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; @@ -453,7 +462,10 @@ in buildPythonPackage rec { --replace "/build/source/torch/include" "$dev/include" ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = '' + mkdir -p "$cxxdev/nix-support" + printWords "''${propagatedCxxBuildInputs[@]}" >> "$cxxdev/nix-support/propagated-build-inputs" + '' + lib.optionalString stdenv.isDarwin '' for f in $(ls $lib/lib/*.dylib); do install_name_tool -id $lib/lib/$(basename $f) $f || true done diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 5ad263a8df677..c3567506337d9 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.1.1"; + version = "2.1.2"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 21241253da3ff..964e122168f7f 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -6,86 +6,86 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.1.1" = { + "2.1.2" = { x86_64-linux-38 = { - name = "torchaudio-2.1.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-GM8TlEbiLP2K+jglzkkvPPEf00LxcI7o9K+EtIKLTGA="; + name = "torchaudio-2.1.2-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-nptbhxqUhL5rUK687w+M8Cb5w9MLhtfEz0mHbDAwGBU="; }; x86_64-linux-39 = { - name = "torchaudio-2.1.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-4YdH1mdew+TFmvpA23Lp5+pNcVy5KxQ9pV31lhPAPTA="; + name = "torchaudio-2.1.2-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-L1s1TSIGHHm4fdDBoIQamQVtMuqNuIIf2NZz1rB3wbI="; }; x86_64-linux-310 = { - name = "torchaudio-2.1.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-7/gmDgL4imlKlksrtvY3pq8xB3h9kH6uflgBgWAzv6c="; + name = "torchaudio-2.1.2-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-HoqSB2Mei6bsve48nWbx6dQ4rWKwtNTxhAFti+idaKc="; }; x86_64-linux-311 = { - name = "torchaudio-2.1.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-qq2dkQ5CDBlVsIpa8yatlplLitDQWW/L9gGxVYDof6c="; + name = "torchaudio-2.1.2-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.1.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-jFpvXk1EDXfU/KxVFV7/xGSpkGIddkinFVZ7eJWr8nU="; }; x86_64-darwin-38 = { - name = "torchaudio-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-b8d8SNB5zSbvQMYTqm8xxcePD4FiEWYqJ4Vsf1RPHMw="; + name = "torchaudio-2.1.2-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp38-cp38-macosx_10_13_x86_64.whl"; + hash = "sha256-0O/QCMNd7JYrgPXc40aL0biDAc9lFSu/p/dMAAWhfok="; }; x86_64-darwin-39 = { - name = "torchaudio-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-f/BYndc9vepm7SHIF8ttHvjs0+6EmXrqf8DjUroWjkg="; + name = "torchaudio-2.1.2-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp39-cp39-macosx_10_13_x86_64.whl"; + hash = "sha256-rlDc801cb3MYDPaUGV7jEZS51gkDKFdcMKWWC8cW+lI="; }; x86_64-darwin-310 = { - name = "torchaudio-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-JPpYcPYgmU5FiEUtVO3LL/tfUJ1+42ugToxo6yiv/Io="; + name = "torchaudio-2.1.2-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp310-cp310-macosx_10_13_x86_64.whl"; + hash = "sha256-BvjAKBTmzdeGJrv0StK7ivpbOatlDGrxgyijIxFGEFg="; }; x86_64-darwin-311 = { - name = "torchaudio-2.1.1-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-7j9/B9sCOprjYGpjDbRyJ+d/IOYEyZQGdnzsWKE5uW4="; + name = "torchaudio-2.1.2-cp311-cp311-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp311-cp311-macosx_10_13_x86_64.whl"; + hash = "sha256-wQhO7fTO0a+f3RiRBpD/YV+JuuswsyAwgGVD+8bzZX4="; }; aarch64-darwin-38 = { - name = "torchaudio-2.1.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-L+SgvGuooE9xrLxmT93CtzY3y/G+NFxkM0KprtNDVDo="; + name = "torchaudio-2.1.2-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-MK2XESQSWSUYlT88ws0bauFT1lY91b2eq2qXIxX+nZ4="; }; aarch64-darwin-39 = { - name = "torchaudio-2.1.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-VwmUP7JnXIVDvrYfAz+50AGr8VXxUJrzPhO8uD9UPQo="; + name = "torchaudio-2.1.2-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-FHKcyd9S3vpnT89e1N4NZQcDjvGAErlqL1anftcGdt0="; }; aarch64-darwin-310 = { - name = "torchaudio-2.1.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-fNRlvgb9OHNq2n1MCG8M3SSd4ot1ddEDXOJd+ziW+kw="; + name = "torchaudio-2.1.2-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-nWdmc8HOTdEfyhReOmzZtOW4l8/60PYX0pBvLT/Iw6k="; }; aarch64-darwin-311 = { - name = "torchaudio-2.1.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-+tHGDPveoxu7KgDk0fFTYEYG3N00vJdPQ8YvpuJpYns="; + name = "torchaudio-2.1.2-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.1.2-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-hgrMMuZQcGPywT2B4mcYGZ4hXzSivNbJYJol6b8hqjY="; }; aarch64-linux-38 = { - name = "torchaudio-2.1.1-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.1.1-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-bnhAF5QfPoGtvvJGIkqT1eXSZocF3NxFlWZo3nuiLTI="; + name = "torchaudio-2.1.2-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-2.1.2-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-/3FWsw6wXpEkKGwwyA2oS5PiJ9AJrblusZSJYAtFkzI="; }; aarch64-linux-39 = { - name = "torchaudio-2.1.1-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.1.1-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-FXE1qdeNwSe7J0XEZUqn6hQd3Huzn8rSHf+Oq6VXihQ="; + name = "torchaudio-2.1.2-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-2.1.2-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-s7u1Mk5wXe13YW5UZZGySa51iNNaPowsTB2Yal6lHvQ="; }; aarch64-linux-310 = { - name = "torchaudio-2.1.1-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.1.1-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-dK3UoOX6BJmO1SoBN9Ox2cKtJdqCEsRt8O1z+h0Uanc="; + name = "torchaudio-2.1.2-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-2.1.2-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-+CZX/E7DtHO/bHUsDuYtf1Ea+e835RQ/gznsBJUE12c="; }; aarch64-linux-311 = { - name = "torchaudio-2.1.1-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.1.1-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-6toEKY1TfF0CddoRIsRxmMF31CYetaXSI24Rqg6FyB8="; + name = "torchaudio-2.1.2-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-2.1.2-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-mmut6KJJWnJPTuastehoKP9Ag9xsfFfGOGtUoOp6/nE="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index 1014ab523821a..81863b4dec189 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -15,13 +15,14 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.1.1"; + version = "2.1.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; rev = "refs/tags/v${version}"; - hash = "sha256-5UlnOGXXFu1p9M5B+Ixc9DW5hLZ1nskv81Y+McbWu6Q="; + hash = "sha256-kSBDQtOi0ZEnIg801kTtvqBAEbzaUNhWG/9jot2O3o4="; }; patches = [ @@ -60,17 +61,7 @@ buildPythonPackage rec { ffmpeg-full pybind11 sox - ] ++ lib.optionals cudaSupport [ - cudaPackages.libcurand.dev - cudaPackages.libcurand.lib - cudaPackages.cuda_cudart # cuda_runtime.h and libraries - cudaPackages.cuda_cccl.dev # <thrust/*> - cudaPackages.cuda_nvtx.dev - cudaPackages.cuda_nvtx.lib # -llibNVToolsExt - cudaPackages.libcublas.dev - cudaPackages.libcublas.lib - cudaPackages.libcufft.dev - cudaPackages.libcufft.lib + torch.cxxdev ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/torchgpipe/default.nix b/pkgs/development/python-modules/torchgpipe/default.nix index 0ebce5b66ddb7..f96add92f0cc7 100644 --- a/pkgs/development/python-modules/torchgpipe/default.nix +++ b/pkgs/development/python-modules/torchgpipe/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "torchgpipe"; version = "0.0.7"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index 574476ef87772..3f4afca9f3087 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -16,7 +16,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.16.1"; + version = "0.16.2"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index f560d78baaa4d..713228240cab9 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,66 +6,66 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.16.1" = { + "0.16.2" = { x86_64-linux-38 = { - name = "torchvision-0.16.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-xPO1sRtw2yyLBlrp3kduqc6yrVc8fFgGi+CXWkABgrQ="; + name = "torchvision-0.16.2-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-AmZyfQifUSqpAK6tKQhTD1TZB3eEveHnykb2a49Wfpg="; }; x86_64-linux-39 = { - name = "torchvision-0.16.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-1voLyIMnBZI9kBleyb819IhwW0nAFEizcCy3t9ebVPk="; + name = "torchvision-0.16.2-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-qhMlpuBBYD3uzvxWnmS4x1psmhuHbimi3vKYuoRWR00="; }; x86_64-linux-310 = { - name = "torchvision-0.16.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-AglL7N9dxCpq/iGQ4ayz8y3ZwtOt2Cfd/pG1RMwjrfQ="; + name = "torchvision-0.16.2-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-uqeXDGtUNzEuXdC9DyVxogt4bD4oW6/W7T5PYqXDx24="; }; x86_64-linux-311 = { - name = "torchvision-0.16.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-tO7B2cBOsDa05yrqX0OuM8BkFNqdNjkb0E/9Ma2C+6k="; + name = "torchvision-0.16.2-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.16.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-CS1ZEQqf7PfDtE0YsbWqELqJjiVB4HtnT+WSaFIeuMs="; }; x86_64-darwin-38 = { - name = "torchvision-0.16.1-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-TyytYh+5bPEOKa+T4WyYsyJr3VOucStX6HPD3q8GFhc="; + name = "torchvision-0.16.2-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp38-cp38-macosx_10_13_x86_64.whl"; + hash = "sha256-uCcy3Ph2o3yFJ3I0KqbuNIDAO7PiqAKuEJ/F9+KNJuk="; }; x86_64-darwin-39 = { - name = "torchvision-0.16.1-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-8U0gHDcXbcQQbux2sinWWFoVBSZrjOqZ0zZv04iXt8A="; + name = "torchvision-0.16.2-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp39-cp39-macosx_10_13_x86_64.whl"; + hash = "sha256-VhFSaLN/C3U2TjZU5HrZq8Zqw0wfnl49+omiLWpAAXo="; }; x86_64-darwin-310 = { - name = "torchvision-0.16.1-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-mHEyeV5cA3y3TnvjWmk5mf2y9gMVImbuFbgCBug6Www="; + name = "torchvision-0.16.2-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp310-cp310-macosx_10_13_x86_64.whl"; + hash = "sha256-vIbygAyywMGgnFgUCc3Wv/ZuYvED3IP8Y/czRiZMN1Y="; }; x86_64-darwin-311 = { - name = "torchvision-0.16.1-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-Supc9JHGwhscvbsb8qODilnU25OtX0kBmmVk08pxJ8c="; + name = "torchvision-0.16.2-cp311-cp311-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp311-cp311-macosx_10_13_x86_64.whl"; + hash = "sha256-Z7Gq+LjLAs513URfKRonyANqUC+MCqduKMN6D6rC4VM="; }; aarch64-darwin-38 = { - name = "torchvision-0.16.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-HWFLPJ4t6c11zA5OGSP8+7zZ/bnwigu7v34TXkoKHPo="; + name = "torchvision-0.16.2-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-SwZRQ9GnIP6KkHf9S+NdSR+YgZ7ICz27w+xk0LcHqQY="; }; aarch64-darwin-39 = { - name = "torchvision-0.16.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-oV6IqTp1Acx1t2Gi3NB6rtqvnL+vSMiv+oyYmJ7LsZ0="; + name = "torchvision-0.16.2-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-goBfhEWwlPnR53A5DubMhoVeiZVeCM40ry4idPwOXEU="; }; aarch64-darwin-310 = { - name = "torchvision-0.16.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-JdpqeyLqA0j2LEXsDa8VdzEJa6vK5l0iJAQIGvluCFw="; + name = "torchvision-0.16.2-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-sCS9QS3206AH3OvzEaiU6zxcIeGvgNEr44K7ywl6fDo="; }; aarch64-darwin-311 = { - name = "torchvision-0.16.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-M5F1cWdjes4+8zpnydXvhrH4y9k+qlutRe688mbqYIk="; + name = "torchvision-0.16.2-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.16.2-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-vvMNA+HRxil2H03KUdO32KDcCszm9AaKsqFjTo57ZOA="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 223130918af59..fc8526395f94b 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -8,39 +8,16 @@ , pillow , pytest , scipy -, symlinkJoin , torch , which }: let inherit (torch) cudaCapabilities cudaPackages cudaSupport; - inherit (cudaPackages) backendStdenv cudaVersion; - - # NOTE: torchvision doesn't use cudnn; torch does! - # For this reason it is not included. - cuda-common-redist = with cudaPackages; [ - cuda_cccl # <thrust/*> - libcublas # cublas_v2.h - libcusolver # cusolverDn.h - libcusparse # cusparse.h - ]; - - cuda-native-redist = symlinkJoin { - name = "cuda-native-redist-${cudaVersion}"; - paths = with cudaPackages; [ - cuda_cudart # cuda_runtime.h - cuda_nvcc - ] ++ cuda-common-redist; - }; - - cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; - paths = cuda-common-redist; - }; + inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.16.1"; + version = "0.16.2"; in buildPythonPackage { inherit pname version; @@ -49,12 +26,18 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-TsYBDtedTQ3+F3LM4JwzkGH2XOr0WSp1Au5YoR07rSA="; + hash = "sha256-fSFoMZbF0bYqonvgoNAE8ZzwCsjhCdVo2BJ0pOC2zd0="; }; - nativeBuildInputs = [ libpng ninja which ] ++ lib.optionals cudaSupport [ cuda-native-redist ]; + nativeBuildInputs = [ + libpng + ninja + which + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + ]; - buildInputs = [ libjpeg_turbo libpng ] ++ lib.optionals cudaSupport [ cuda-redist ]; + buildInputs = [ libjpeg_turbo libpng torch.cxxdev ]; propagatedBuildInputs = [ numpy pillow torch scipy ]; diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index ac57f212d229e..75187d12d29f3 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { pname = "tornado"; version = "6.3.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "tornadoweb"; diff --git a/pkgs/development/python-modules/torpy/default.nix b/pkgs/development/python-modules/torpy/default.nix index ea9c96d33e153..cfaaef421926f 100644 --- a/pkgs/development/python-modules/torpy/default.nix +++ b/pkgs/development/python-modules/torpy/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "torpy"; version = "1.1.6"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/torrequest/default.nix b/pkgs/development/python-modules/torrequest/default.nix index 99ea0e4e53515..90a0ab747a88a 100644 --- a/pkgs/development/python-modules/torrequest/default.nix +++ b/pkgs/development/python-modules/torrequest/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "torrequest"; version = "0.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/traceback2/default.nix b/pkgs/development/python-modules/traceback2/default.nix index 040874286bde0..9992cd1470b76 100644 --- a/pkgs/development/python-modules/traceback2/default.nix +++ b/pkgs/development/python-modules/traceback2/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "1.4.0"; + format = "setuptools"; pname = "traceback2"; src = fetchPypi { diff --git a/pkgs/development/python-modules/tracerite/default.nix b/pkgs/development/python-modules/tracerite/default.nix index e94e8a8d1d95b..981cd2087456d 100644 --- a/pkgs/development/python-modules/tracerite/default.nix +++ b/pkgs/development/python-modules/tracerite/default.nix @@ -4,18 +4,21 @@ , setuptools-scm , html5tagger , python +, pythonOlder }: buildPythonPackage rec { pname = "tracerite"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "sanic-org"; repo = "tracerite"; - rev = "v${version}"; - hash = "sha256-At8wVR3EcHEi051BBfjb+sOhs93GyzWlEAjtehTMeNU="; + rev = "refs/tags/v${version}"; + hash = "sha256-rI1MNdYl/P64tUHyB3qV9gfLbGbCVOXnEFoqFTkaqgg="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -40,8 +43,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Tracebacks for Humans (in Jupyter notebooks"; + description = "Tracebacks for Humans in Jupyter notebooks"; homepage = "https://github.com/sanic-org/tracerite"; + changelog = "https://github.com/sanic-org/tracerite/releases/tag/v${version}"; license = licenses.unlicense; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix index c2adc9ec9c5aa..a447ae2ad0bae 100644 --- a/pkgs/development/python-modules/tracing/default.nix +++ b/pkgs/development/python-modules/tracing/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "tracing"; version = "0.8"; + format = "setuptools"; src = fetchurl { url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_${version}.orig.tar.gz"; diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix index 152b9e640040a..3f8ab6fa4dd12 100644 --- a/pkgs/development/python-modules/traittypes/default.nix +++ b/pkgs/development/python-modules/traittypes/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "traittypes"; version = "unstable-2019-06-23"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 12a86a1344578..acb0488e41cd5 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "transaction"; - version = "3.1.0"; + version = "4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZdCx6pLb58Tjsjf7a9i0Heoj10Wee92MOIC//a+RL6Q="; + hash = "sha256-aANduRP2DRvhL2Vj0gHaqzbIPnY94ViZ/4M48m5eYvI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/translatepy/default.nix b/pkgs/development/python-modules/translatepy/default.nix index 08e7dfab61779..cb3c6c19d8b13 100644 --- a/pkgs/development/python-modules/translatepy/default.nix +++ b/pkgs/development/python-modules/translatepy/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "translatepy"; version = "2.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "Animenosekai"; diff --git a/pkgs/development/python-modules/translationstring/default.nix b/pkgs/development/python-modules/translationstring/default.nix index f7036128e08ec..ab6c1808e428d 100644 --- a/pkgs/development/python-modules/translationstring/default.nix +++ b/pkgs/development/python-modules/translationstring/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "translationstring"; version = "1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/translitcodec/default.nix b/pkgs/development/python-modules/translitcodec/default.nix new file mode 100644 index 0000000000000..20da4d3431c4c --- /dev/null +++ b/pkgs/development/python-modules/translitcodec/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pythonOlder }: + +let + pname = "translitcodec"; + version = "0.7.0"; +in buildPythonPackage { + inherit pname version; + + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "claudep"; + repo = pname; + rev = "version-${version}"; + hash = "sha256-/EKquTchx9i3fZqJ6AMzHYP9yCORvwbuUQ95WJQOQbI="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ pname ]; + + meta = with lib; { + description = "Unicode to 8-bit charset transliteration codec"; + homepage = "https://github.com/claudep/translitcodec"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ rycee ]; + }; +} diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix index 3a484692d1a23..5c2cf2ee85dee 100644 --- a/pkgs/development/python-modules/transmissionrpc/default.nix +++ b/pkgs/development/python-modules/transmissionrpc/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "transmissionrpc"; version = "0.11"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/trectools/default.nix b/pkgs/development/python-modules/trectools/default.nix index 3948d0441d90b..f6870bd48c1ab 100644 --- a/pkgs/development/python-modules/trectools/default.nix +++ b/pkgs/development/python-modules/trectools/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "trectools"; version = "0.0.49"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index 6eb833b92d50a..cd572618a2fd8 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings to the Tree-sitter parsing library"; homepage = "https://github.com/tree-sitter/py-tree-sitter"; + changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/treelog/default.nix b/pkgs/development/python-modules/treelog/default.nix index e3b85cd64fb8f..5f825bee623c8 100644 --- a/pkgs/development/python-modules/treelog/default.nix +++ b/pkgs/development/python-modules/treelog/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "treelog"; version = "1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 540e52f0793bf..69e0c2c9d40d6 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "treq"; version = "22.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 23af30faefbab..42e1352049b56 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { pname = "trezor"; version = "0.13.8"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index d6ff9bb36dfa0..0cece3cc0a98a 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "trezor_agent"; version = "0.12.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/trfl/default.nix b/pkgs/development/python-modules/trfl/default.nix index b81481e3841b6..8538b47598ede 100644 --- a/pkgs/development/python-modules/trfl/default.nix +++ b/pkgs/development/python-modules/trfl/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "trfl"; version = "1.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "deepmind"; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 477fb3b97438c..3199218ef6599 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.0.5"; + version = "4.0.8"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ub/P7AO3CrTSHwVd8atz6HQN0LyP1WSCc+74/sds3fk="; + hash = "sha256-FvMFC1h3gu61jZPSPmxYHQmxnxYKmtYAecc/0IT9E8I="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index e9691044a9261..041f3db4c803b 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -9,14 +9,14 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.8.7"; + version = "2023.11.22"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yfKgqF1UXlNi6Wfk8Gn1b939kSFeIv+kjGb7KDUhMZo="; + hash = "sha256-wxp+kvll8GCiRLV9jtXub1P8tBPuF855DgBXfLNprZk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/trueskill/default.nix b/pkgs/development/python-modules/trueskill/default.nix index db16ed7fafbc8..ae17c8fa83c21 100644 --- a/pkgs/development/python-modules/trueskill/default.nix +++ b/pkgs/development/python-modules/trueskill/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "trueskill"; version = "0.4.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ttach/default.nix b/pkgs/development/python-modules/ttach/default.nix index 5a7420a270748..39d504cf1b46d 100644 --- a/pkgs/development/python-modules/ttach/default.nix +++ b/pkgs/development/python-modules/ttach/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "ttach"; version = "0.0.3"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix index b4e5dcc1ec2e1..e2bfe61504afe 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.8.1"; + version = "1.8.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jschlyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7w+VFxqv1htN5rKvMbcBV6uYqT3PT0ocv3S9Om2Ol3k="; + hash = "sha256-i9vJr7uTpkUZ9WiL0BGidIgCdG87k8JnmZuPqt6qLQE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tubes/default.nix b/pkgs/development/python-modules/tubes/default.nix index 4c787af378a23..28d7b7bc4be22 100644 --- a/pkgs/development/python-modules/tubes/default.nix +++ b/pkgs/development/python-modules/tubes/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "tubes"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { pname = "Tubes"; diff --git a/pkgs/development/python-modules/tunigo/default.nix b/pkgs/development/python-modules/tunigo/default.nix index c69f00f251b7a..600228b0d66f7 100644 --- a/pkgs/development/python-modules/tunigo/default.nix +++ b/pkgs/development/python-modules/tunigo/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "tunigo"; version = "1.0.0"; + format = "setuptools"; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/tuyaha/default.nix b/pkgs/development/python-modules/tuyaha/default.nix index 53d6c83d48ab2..5973b763ef636 100644 --- a/pkgs/development/python-modules/tuyaha/default.nix +++ b/pkgs/development/python-modules/tuyaha/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "tuyaha"; version = "0.0.11"; + format = "setuptools"; src = fetchFromGitHub { owner = "PaulAnnekov"; diff --git a/pkgs/development/python-modules/tvdb-api/default.nix b/pkgs/development/python-modules/tvdb-api/default.nix index bec0964acc0d6..f4255d8e854b7 100644 --- a/pkgs/development/python-modules/tvdb-api/default.nix +++ b/pkgs/development/python-modules/tvdb-api/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "tvdb-api"; version = "3.2.0-beta"; + format = "setuptools"; src = fetchFromGitHub { owner = "dbr"; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index c053a9294fe99..dfdf4676821d9 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.10.2"; + version = "8.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-3Gm1oKhKcTb3c+awMKVQ3qFKkdXC3azR1ECTdw60oCg="; + hash = "sha256-yz1jFEjbnG5hqC5wqvxcP3pNLI3GalXWbREToCwf9BU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twitch-python/default.nix b/pkgs/development/python-modules/twitch-python/default.nix index e2f9c8caf31cb..a42f80b36da86 100644 --- a/pkgs/development/python-modules/twitch-python/default.nix +++ b/pkgs/development/python-modules/twitch-python/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "twitch-python"; version = "0.0.20"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/twofish/default.nix b/pkgs/development/python-modules/twofish/default.nix index 1fe541b072907..5076de1ad3c33 100644 --- a/pkgs/development/python-modules/twofish/default.nix +++ b/pkgs/development/python-modules/twofish/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "twofish"; version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/txdbus/default.nix b/pkgs/development/python-modules/txdbus/default.nix index 31afbd4fdf950..3f377313a0bd2 100644 --- a/pkgs/development/python-modules/txdbus/default.nix +++ b/pkgs/development/python-modules/txdbus/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "txdbus"; version = "1.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/txgithub/default.nix b/pkgs/development/python-modules/txgithub/default.nix index 45e366764980b..8fa0229f0ca52 100644 --- a/pkgs/development/python-modules/txgithub/default.nix +++ b/pkgs/development/python-modules/txgithub/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "txgithub"; version = "15.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/txrequests/default.nix b/pkgs/development/python-modules/txrequests/default.nix index afe4b0f93b239..706a97b6297ab 100644 --- a/pkgs/development/python-modules/txrequests/default.nix +++ b/pkgs/development/python-modules/txrequests/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "txrequests"; version = "0.9.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/txzmq/default.nix b/pkgs/development/python-modules/txzmq/default.nix index 4f6a4067d55ad..a8e75896b7c26 100644 --- a/pkgs/development/python-modules/txzmq/default.nix +++ b/pkgs/development/python-modules/txzmq/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "txzmq"; version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 214f7cf4d1abf..7983ac8d29bf8 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -24,7 +24,7 @@ let in buildPythonPackage rec { pname = "type-infer"; - version = "0.0.16"; + version = "0.0.17"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "type_infer"; inherit version; - hash = "sha256-EWH8odCHAzrEcBtFEYBm5gt4zlrwrK33c6uEfFBgPfA="; + hash = "sha256-2bPXJuGDXTVoYUP9IfwyRy8LbMT/ySoHDzuelrOq/DU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index 7bc93024121e1..ada4762cffe8b 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -44,709 +44,709 @@ let }; in rec { - types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.6.0" "sha256-Bit55lGYI8+VOEm+6NKlfxWldFWdiAFwRZjJsgwuv7Q="; + types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.8.0" "sha256-7TmekyZVc2l2er1TIJURP7Qy0n7xRYnXt44FJr5XBWA="; - types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.5.2.post3" "sha256-zuBKsuPD3Sjl8KWKIlMgKtzfmtVc8ZZyIMKyPC2QjmY="; + types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.8.0" "sha256-rVwj3gN9+U5m6xXwytQpE8mSVPTlezzeNIwNH2vgR4Y="; - types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.5.4" "sha256-B7SsW+FtSOMfFFdfmH9iv/i9R/qj6ImAr95gpPAf3G4="; + types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.8.0" "sha256-VzV8viXJpHfI1aD1UtCX+GSSZKhRSTzMX5dnkGhm+9Y="; - types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.6.0" "sha256-AO3CEqWkLBTkx4k8YamcUUCg2TwHODCMjz6ujubzLjA="; + types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.8.0" "sha256-ib044RjF+1projrSoyiMdj9LkbT1BJrfObxs1ukSNHo="; - types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.6.0" "sha256-Pjfm+q8Wq7BT3QfFcLuODteOZdvNXSegde1sc6z2UOk="; + types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.9.0" "sha256-lNp/rvyWKvD9jY9J9vU98CFyB/ysiS8JslXrjK2BtgE="; - types-aiobotocore-amp = buildTypesAiobotocorePackage "amp" "2.6.0" "sha256-EZ/wSfcWnT7DoSRegMZnzukVLlTFYP2UsR+rEiLwtnE="; + types-aiobotocore-amp = buildTypesAiobotocorePackage "amp" "2.9.0" "sha256-OiejoMmWNnF3dBKPWInCurB2xe0hnKG/FAR8NVuIeiU="; - types-aiobotocore-amplify = buildTypesAiobotocorePackage "amplify" "2.6.0" "sha256-IkvRE9xD0y8l48rWuV1cvnOQ7eHr0hYsrD3NusofgyI="; + types-aiobotocore-amplify = buildTypesAiobotocorePackage "amplify" "2.9.0" "sha256-LUW+yAw4K8kOxSqF3tJuqXqHc83+3thnCbdWcz/PnO0="; - types-aiobotocore-amplifybackend = buildTypesAiobotocorePackage "amplifybackend" "2.6.0" "sha256-4sSNDhmNuOnYPq0X/G8m0XDP08W+MUQ3xiWK9Yc8U6Q="; + types-aiobotocore-amplifybackend = buildTypesAiobotocorePackage "amplifybackend" "2.9.0" "sha256-TTmpkylWnRxNs+1s75qTdQ+GgWnyfyUZhfE1e1eSYXE="; - types-aiobotocore-amplifyuibuilder = buildTypesAiobotocorePackage "amplifyuibuilder" "2.6.0" "sha256-K1esoNUDYWzqK12X6o5c12XJQGGDNlCyUiVsNsUaQhI="; + types-aiobotocore-amplifyuibuilder = buildTypesAiobotocorePackage "amplifyuibuilder" "2.9.0" "sha256-ovLWirPFaMwFjk6e7zZbSoDxiXp0/ll6HnT9pxEJCaY="; - types-aiobotocore-apigateway = buildTypesAiobotocorePackage "apigateway" "2.6.0" "sha256-r4eDPDqkcQhApN/+4xjDuillQnDOqu2xqyACYHqXRpw="; + types-aiobotocore-apigateway = buildTypesAiobotocorePackage "apigateway" "2.9.0" "sha256-mexH2IJbHyMzKRL1jVUuqiUdHBOOHRhCDR29GVIOgmc="; - types-aiobotocore-apigatewaymanagementapi = buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.6.0" "sha256-sAJW4q/mUaRsiN7Yt/uBMbxDfKhTSdiZaDd7nvvM3og="; + types-aiobotocore-apigatewaymanagementapi = buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.9.0" "sha256-ISlXwESp+llqSMTv2T7CwtTAuIXfiRTGwQnIejOb7aU="; - types-aiobotocore-apigatewayv2 = buildTypesAiobotocorePackage "apigatewayv2" "2.6.0" "sha256-cNNVvAX1o+ZieUaW59yp5ELFf2S96XdCOLeVe91oFI8="; + types-aiobotocore-apigatewayv2 = buildTypesAiobotocorePackage "apigatewayv2" "2.9.0" "sha256-h2C2CZVVH72OML31/f0Yl8Ril2uGEvFKwHnumP9FoVo="; - types-aiobotocore-appconfig = buildTypesAiobotocorePackage "appconfig" "2.6.0" "sha256-qliKZTlmnPwRdhQs26M0PlCM91Mn7cHCmccCAhDtryU="; + types-aiobotocore-appconfig = buildTypesAiobotocorePackage "appconfig" "2.9.0" "sha256-SO7ZAepv4lNrfZ6u3krEsN62LxLsK3p/hD3Bi68pYog="; - types-aiobotocore-appconfigdata = buildTypesAiobotocorePackage "appconfigdata" "2.6.0" "sha256-DcLOpKbUl/YOinXXtlo2su0uMh0Ja5cGrpbmKuQVGvw="; + types-aiobotocore-appconfigdata = buildTypesAiobotocorePackage "appconfigdata" "2.9.0" "sha256-qApIy0bwsg3T5LY1CzqpKfg8F+5MU/1Ygt7qN+TYI4c="; - types-aiobotocore-appfabric = buildTypesAiobotocorePackage "appfabric" "2.6.0" "sha256-yQvNa3iBsoAD4oBVmt0ZNjziBEhzTUE6E6FFLluxTZw="; + types-aiobotocore-appfabric = buildTypesAiobotocorePackage "appfabric" "2.9.0" "sha256-wolhhyFXsLIp8phvKat8baoUd6WJTv23J6eoThQ4QJ0="; - types-aiobotocore-appflow = buildTypesAiobotocorePackage "appflow" "2.6.0" "sha256-ILdWiqipfSnSjdToIq++JIu1WUmv+lMX72Ymo9KGZ9s="; + types-aiobotocore-appflow = buildTypesAiobotocorePackage "appflow" "2.9.0" "sha256-QO6o0BPDJ/qOul8XkN+BW36aQomv//+1kG6sa8gljuE="; - types-aiobotocore-appintegrations = buildTypesAiobotocorePackage "appintegrations" "2.6.0" "sha256-ZPNB2PUpeTttagX1rRmgINgahj3cNuBdKQMvdFNK15Y="; + types-aiobotocore-appintegrations = buildTypesAiobotocorePackage "appintegrations" "2.9.0" "sha256-/zUXglyQUewxMcRgoCLPHHrc8fIjm68C547o4DOn/j8="; - types-aiobotocore-application-autoscaling = buildTypesAiobotocorePackage "application-autoscaling" "2.6.0" "sha256-p5EgvysfhIHz4ZALV8tJz/7ZkRIu2BIZwENiiVho67w="; + types-aiobotocore-application-autoscaling = buildTypesAiobotocorePackage "application-autoscaling" "2.9.0" "sha256-G2pTcy4uLL7ypl3PcKvI1g5jD7Ytxu37jxWs+i1opHM="; - types-aiobotocore-application-insights = buildTypesAiobotocorePackage "application-insights" "2.6.0" "sha256-PUDqMFJu2BG3WVCS6SYyltrSr64VblVAgrCYQ6FR2sk="; + types-aiobotocore-application-insights = buildTypesAiobotocorePackage "application-insights" "2.9.0" "sha256-YwwGYTwwFOsyfsyY8L5dKhFl+uGTT+oKYEXSgo1UPXE="; - types-aiobotocore-applicationcostprofiler = buildTypesAiobotocorePackage "applicationcostprofiler" "2.6.0" "sha256-bGlbP0d38vFHkITC84N43Vt1Nrsf3+ByWSvvteDejBw="; + types-aiobotocore-applicationcostprofiler = buildTypesAiobotocorePackage "applicationcostprofiler" "2.9.0" "sha256-ghooPwffm8YMs50MpYT82WJz7vHsMi/HZy0drnSXJUA="; - types-aiobotocore-appmesh = buildTypesAiobotocorePackage "appmesh" "2.6.0" "sha256-Lcoc/IJ9o1glV8gNNA/t9B3J6K5Qz/50fqPMsF78WVI="; + types-aiobotocore-appmesh = buildTypesAiobotocorePackage "appmesh" "2.9.0" "sha256-tydjCV77K/EAyddwmiMDXsEC469GbgNcZRLMmy61Zh4="; - types-aiobotocore-apprunner = buildTypesAiobotocorePackage "apprunner" "2.6.0" "sha256-zyesnbNmSrQEsBVQJouP05zxhBTikGZVCR/VFdEkHNE="; + types-aiobotocore-apprunner = buildTypesAiobotocorePackage "apprunner" "2.9.0" "sha256-nt2evZ5TqcCrwjGPornCrY27nlQX09RpYEHoYRb9XUA="; - types-aiobotocore-appstream = buildTypesAiobotocorePackage "appstream" "2.6.0" "sha256-+4LWBHHwL1R4jBGHChSUOq9vFc+k7NmRXvo8ZjDIyXk="; + types-aiobotocore-appstream = buildTypesAiobotocorePackage "appstream" "2.9.0" "sha256-q/LwAh7O9SZOXjGawKwCcZFwRGmztfRjZ0sUkS/QuOc="; - types-aiobotocore-appsync = buildTypesAiobotocorePackage "appsync" "2.6.0" "sha256-JFrBy9Ck/Ni4lwHV47fkzt/YI5cX9FvTeaT0tNgzdqs="; + types-aiobotocore-appsync = buildTypesAiobotocorePackage "appsync" "2.9.0" "sha256-e4AE0rYgr61INMVTIuv3G35ywBnfnGo0+ZkAUbJCxS8="; - types-aiobotocore-arc-zonal-shift = buildTypesAiobotocorePackage "arc-zonal-shift" "2.6.0" "sha256-qTW58yyFwbBYyisuL4NkaEXqblJ3vevXI1lHZVX4mZY="; + types-aiobotocore-arc-zonal-shift = buildTypesAiobotocorePackage "arc-zonal-shift" "2.9.0" "sha256-PM6yAXmqwLXs7NAC6hnFUVCnkWg3iNz8hCN7soWSxPE="; - types-aiobotocore-athena = buildTypesAiobotocorePackage "athena" "2.6.0" "sha256-xmTKI8q82UohBE+Wh+j1xivsY8wmrcvOlDAlwTpJmxE="; + types-aiobotocore-athena = buildTypesAiobotocorePackage "athena" "2.9.0" "sha256-uMKc1u/u3ppRCVVPZ05VTlXoEfxCY9tyLqYpxnl+CWc="; - types-aiobotocore-auditmanager = buildTypesAiobotocorePackage "auditmanager" "2.6.0" "sha256-a+47CFM19RM3Y+9wLLe8D4II7rKeDQ93dy68jqJqBD4="; + types-aiobotocore-auditmanager = buildTypesAiobotocorePackage "auditmanager" "2.9.0" "sha256-gPzB/GSkjq44Q2SjjDWJyidFNzg4veag0PvQ7nFl+pY="; - types-aiobotocore-autoscaling = buildTypesAiobotocorePackage "autoscaling" "2.6.0" "sha256-s0ClcRgYJcd5GZXYWMn2FieNXebdlS9206mLtKCSy44="; + types-aiobotocore-autoscaling = buildTypesAiobotocorePackage "autoscaling" "2.9.0" "sha256-AaCvm94dtOdLlOA1X8k5r2K1sbpTerX6cJEjdGs3L6Y="; - types-aiobotocore-autoscaling-plans = buildTypesAiobotocorePackage "autoscaling-plans" "2.6.0" "sha256-ZhOokFIm5KHBc5X+Lp19z5N7BudTQHU5KjHGYCrW/aE="; + types-aiobotocore-autoscaling-plans = buildTypesAiobotocorePackage "autoscaling-plans" "2.9.0" "sha256-p43Kie/Ax1BNmIN2Sny05NlxHWuasbXLlRbTNpvI8eM="; - types-aiobotocore-backup = buildTypesAiobotocorePackage "backup" "2.6.0" "sha256-rmm10kZXRkmj0TxqARf+57Nz8LapZF7TaH9GGwhIHys="; + types-aiobotocore-backup = buildTypesAiobotocorePackage "backup" "2.9.0" "sha256-CO6ETR9Q1Lkj0o4d24iVfhvLyN3FBTpWQYrWStvPVP4="; - types-aiobotocore-backup-gateway = buildTypesAiobotocorePackage "backup-gateway" "2.6.0" "sha256-/YH0nuyWaEVPlZFxJarGkWOnLcpiIvvf/GCmxMOaybI="; + types-aiobotocore-backup-gateway = buildTypesAiobotocorePackage "backup-gateway" "2.9.0" "sha256-TGtFwgq00PrrVKxJYhiIWMzUGpsvFMYVjS5xBxEorWI="; - types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.6.0" "sha256-OC1xWUT0BjBoelAxHkprhD54kF+YbK30H/42Q3XxdwY="; + types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.9.0" "sha256-gNXODf0OIkG0Dw4JOZU0XuRKmf8CIc+GTcgZ8PUnRcY="; - types-aiobotocore-batch = buildTypesAiobotocorePackage "batch" "2.6.0" "sha256-/5yrgR7NbQ6GbkC9SsHaAhDa3juBjyRt705wHTu6Mr8="; + types-aiobotocore-batch = buildTypesAiobotocorePackage "batch" "2.9.0" "sha256-x/sNVy1MmdBelRwb+ytT13K9FcgUdnoahgckniLN9Gs="; - types-aiobotocore-billingconductor = buildTypesAiobotocorePackage "billingconductor" "2.6.0" "sha256-bDEICyyIUCRxbTWZFXHsj5yncQI+F+geC92vvsrKCxw="; + types-aiobotocore-billingconductor = buildTypesAiobotocorePackage "billingconductor" "2.9.0" "sha256-wsbM8GYdwDf1ILZZBM/lBQo/qTduA49pljwfVlNTPo8="; - types-aiobotocore-braket = buildTypesAiobotocorePackage "braket" "2.6.0" "sha256-aobQZov192xNkN7cwIKLgJnhxltyLpWw1oKk2m1HkV8="; + types-aiobotocore-braket = buildTypesAiobotocorePackage "braket" "2.9.0" "sha256-Wi8Y5Ue4xiVm+3Ol9e3nDOS8QL1LjcUQsySIWc1R16M="; - types-aiobotocore-budgets = buildTypesAiobotocorePackage "budgets" "2.6.0" "sha256-0tFKq0VomVAD9NRtlQzilQEZHFOZp40vtTKfoBqjpyU="; + types-aiobotocore-budgets = buildTypesAiobotocorePackage "budgets" "2.9.0" "sha256-PU74F6DnMXB435pCmee7IAPS7YSR0pFBjDqgPMfORT4="; - types-aiobotocore-ce = buildTypesAiobotocorePackage "ce" "2.6.0" "sha256-eKYNFMlDt9uUaqsK8PPTpt1wghN3nGgM+idQBVei8eY="; + types-aiobotocore-ce = buildTypesAiobotocorePackage "ce" "2.9.0" "sha256-0drcozC0lKqYuHK3vSF2QG/7lywN6yKxbwJxqMIrIDM="; - types-aiobotocore-chime = buildTypesAiobotocorePackage "chime" "2.6.0" "sha256-5d9LUaSDvYI/Nrsmg4MnM0ucXmyzUQKV4DpX9pZst2s="; + types-aiobotocore-chime = buildTypesAiobotocorePackage "chime" "2.9.0" "sha256-IGF7YcjgZy99X4KZA0CYJDMcJP8S9GZHwInW8eqLsCc="; - types-aiobotocore-chime-sdk-identity = buildTypesAiobotocorePackage "chime-sdk-identity" "2.6.0" "sha256-UXVS4iTbkv9/xmL5AFv3xlWtWk5qN/dam/ic4mg3+cI="; + types-aiobotocore-chime-sdk-identity = buildTypesAiobotocorePackage "chime-sdk-identity" "2.9.0" "sha256-MwfvczW4j4IjZBPUTyA0WcT8sqSTYhrnEzkKrVXuIY4="; - types-aiobotocore-chime-sdk-media-pipelines = buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.6.0" "sha256-+2AioI5B/K5QhDsaBSAFyNW0Fd49EA8ZBVrULd3u7qQ="; + types-aiobotocore-chime-sdk-media-pipelines = buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.9.0" "sha256-PsEsAjsehN5w5pV+ZHajY+r+9+9SCSutEKA5UGvePeY="; - types-aiobotocore-chime-sdk-meetings = buildTypesAiobotocorePackage "chime-sdk-meetings" "2.6.0" "sha256-oxlFkYpDoi7pidqzDOYdeTazVl/HjnuZmnjMGZa/WIE="; + types-aiobotocore-chime-sdk-meetings = buildTypesAiobotocorePackage "chime-sdk-meetings" "2.9.0" "sha256-XDyk+ljdPfm8poC4A65rz30zviN5XqBo4Ud4K/SN8bY="; - types-aiobotocore-chime-sdk-messaging = buildTypesAiobotocorePackage "chime-sdk-messaging" "2.6.0" "sha256-THOQl3ZUILwLRwYlBb7fQDgpYz7wkMyd+tSLEmHHBVY="; + types-aiobotocore-chime-sdk-messaging = buildTypesAiobotocorePackage "chime-sdk-messaging" "2.9.0" "sha256-7MQKlLPYRS64OH0CA8SYXJhE52gT9v4BkCzoypV2I/k="; - types-aiobotocore-chime-sdk-voice = buildTypesAiobotocorePackage "chime-sdk-voice" "2.6.0" "sha256-RwMXK2NrM4BDzeg5lcpxfVzxFzrqjZw+xhZnJL81Uqw="; + types-aiobotocore-chime-sdk-voice = buildTypesAiobotocorePackage "chime-sdk-voice" "2.9.0" "sha256-Do/nRj4qmUABDW20dkTU+KK8O/C7yhRIEjV6bCbfjGs="; - types-aiobotocore-cleanrooms = buildTypesAiobotocorePackage "cleanrooms" "2.6.0" "sha256-i2XmS1m6YO7dOaMZKb0WRQB2WpRue+OCLbdR59oWA1Q="; + types-aiobotocore-cleanrooms = buildTypesAiobotocorePackage "cleanrooms" "2.9.0" "sha256-wfLyaQu2gfOe2+GT+Umwo6VBo70wjmhpKF3qGquaoZo="; - types-aiobotocore-cloud9 = buildTypesAiobotocorePackage "cloud9" "2.6.0" "sha256-W3ni8q7n4l8+SP/RyxibCTptextx4Vd8bmiQ3lhgszQ="; + types-aiobotocore-cloud9 = buildTypesAiobotocorePackage "cloud9" "2.9.0" "sha256-tt+houhkHEPlRxagLzVKn/SVP4Uj9Sv1UsPyidSNLVM="; - types-aiobotocore-cloudcontrol = buildTypesAiobotocorePackage "cloudcontrol" "2.6.0" "sha256-qWbYfegOQ6QcEWA/gce9ZiIOBIVeWIj1qjfsksncDxY="; + types-aiobotocore-cloudcontrol = buildTypesAiobotocorePackage "cloudcontrol" "2.9.0" "sha256-QIsTkVZnkkzFvZAOFYvF/erH2ov/F01lRDWFglY3Tmw="; - types-aiobotocore-clouddirectory = buildTypesAiobotocorePackage "clouddirectory" "2.6.0" "sha256-5TzDHj/t0tqxbRYfnGRP9LNq9pSFj7aidadVB03ZY1k="; + types-aiobotocore-clouddirectory = buildTypesAiobotocorePackage "clouddirectory" "2.9.0" "sha256-gNcIZFG9zk+VZPcT9yxYYVjKPcqO2RJNFjpPNfbnK7E="; - types-aiobotocore-cloudformation = buildTypesAiobotocorePackage "cloudformation" "2.6.0" "sha256-EyiQY0NCVa3XuRpBH7aXEA7cBx8BzyRP917f/Ogx0mw="; + types-aiobotocore-cloudformation = buildTypesAiobotocorePackage "cloudformation" "2.9.0" "sha256-zdEa2iNNy8gFFkK15ifS3TO7lbauVxDfLyzM8a27NyI="; - types-aiobotocore-cloudfront = buildTypesAiobotocorePackage "cloudfront" "2.6.0" "sha256-f9nqoXlg7sgY2QCkE1/+Q72N/8Besrl6gncmU+vNt/I="; + types-aiobotocore-cloudfront = buildTypesAiobotocorePackage "cloudfront" "2.9.0" "sha256-S7FeyJ8x4C+/PeeR4kXa1YhyDm5DX2XmoTk4AZMjxKo="; - types-aiobotocore-cloudhsm = buildTypesAiobotocorePackage "cloudhsm" "2.6.0" "sha256-a3QRjQhW+cRJykNjhhJREGwuZxR0b+WxgRuS2yuGcTQ="; + types-aiobotocore-cloudhsm = buildTypesAiobotocorePackage "cloudhsm" "2.9.0" "sha256-epgeZ3U179/91Qy4GZ/fLQGFyIQkn222wHoSOUE2+w0="; - types-aiobotocore-cloudhsmv2 = buildTypesAiobotocorePackage "cloudhsmv2" "2.6.0" "sha256-FyktFlTQAbS6YnoXljvtn6CabJHGLkRv1jCgb9dbz+s="; + types-aiobotocore-cloudhsmv2 = buildTypesAiobotocorePackage "cloudhsmv2" "2.9.0" "sha256-wDbY2WENp0RgQ7TwJztZApfUyRQG1hXeMSLInRh5Ot8="; - types-aiobotocore-cloudsearch = buildTypesAiobotocorePackage "cloudsearch" "2.6.0" "sha256-eKLM+GYjbm3cweMtF/XI6k+P8t9gaJeRCeMHQbc832g="; + types-aiobotocore-cloudsearch = buildTypesAiobotocorePackage "cloudsearch" "2.9.0" "sha256-c+W60cxtipCAW8sM4QyTRLmZo8xZBm3FCyzqGNwK/Zc="; - types-aiobotocore-cloudsearchdomain = buildTypesAiobotocorePackage "cloudsearchdomain" "2.6.0" "sha256-wn03HlgBaZIAkw8gxPehSKpcfQGOhYp0U1CF/84M/lg="; + types-aiobotocore-cloudsearchdomain = buildTypesAiobotocorePackage "cloudsearchdomain" "2.9.0" "sha256-WR5b8vBbUxFmsH8tNnho4jqY6jrPsHYXljflL6y6JHc="; - types-aiobotocore-cloudtrail = buildTypesAiobotocorePackage "cloudtrail" "2.6.0" "sha256-/vpOE8tU7SsjHmn/YyVfku05ZGBZIiVuFsG6aK47K28="; + types-aiobotocore-cloudtrail = buildTypesAiobotocorePackage "cloudtrail" "2.9.0" "sha256-roSPY8CJBwX/wCMRd7qLLjLSkk0ys2HT3n4ZFpEE+VU="; - types-aiobotocore-cloudtrail-data = buildTypesAiobotocorePackage "cloudtrail-data" "2.6.0" "sha256-8W7TrB1EXp5JeBQ9xqkqFhf+Frflpd5bfVxpqju2ZPM="; + types-aiobotocore-cloudtrail-data = buildTypesAiobotocorePackage "cloudtrail-data" "2.9.0" "sha256-t+1vtSNNEBhMieXbkdoUBEXCTPd5me1fDOdHaI5tNfE="; - types-aiobotocore-cloudwatch = buildTypesAiobotocorePackage "cloudwatch" "2.6.0" "sha256-ntQkDjM3I3wuMH5jsifODEwRna2ctRW1M9bzyEjIF7w="; + types-aiobotocore-cloudwatch = buildTypesAiobotocorePackage "cloudwatch" "2.9.0" "sha256-LxuZoxlhUwRorUAGDxTfAIhgTzJm4jMTUS13zMnfaZY="; - types-aiobotocore-codeartifact = buildTypesAiobotocorePackage "codeartifact" "2.6.0" "sha256-NuMqaomry4ezNNRKBLOJ0xNwGUO2Prl4nf/5O38oyqI="; + types-aiobotocore-codeartifact = buildTypesAiobotocorePackage "codeartifact" "2.9.0" "sha256-eEI1k5dZpy0TuuoYDRFGp9OPWzFXg0mtx0HwB2H4OsM="; - types-aiobotocore-codebuild = buildTypesAiobotocorePackage "codebuild" "2.6.0" "sha256-dYe3uLk0ssQPQPEo+3glh+ic6recgV5WPIN09lLuuA4="; + types-aiobotocore-codebuild = buildTypesAiobotocorePackage "codebuild" "2.9.0" "sha256-AyFoSrmu8DA8UFb7o8Bd4eoUSoTXvdHoADkKH5DBVxM="; - types-aiobotocore-codecatalyst = buildTypesAiobotocorePackage "codecatalyst" "2.6.0" "sha256-7MKRVJ4fgberRmkHWHfvrfzU2+BYhMZxgb2ge7NAQp4="; + types-aiobotocore-codecatalyst = buildTypesAiobotocorePackage "codecatalyst" "2.9.0" "sha256-IT7jtWd5QrAaeRG+kgu21KVcWtKiAyEB04E2BsDTPzQ="; - types-aiobotocore-codecommit = buildTypesAiobotocorePackage "codecommit" "2.6.0" "sha256-7StmPVxVNfFpqQmjyM4cn9NBrAsuUjxRkP0WgGCnuso="; + types-aiobotocore-codecommit = buildTypesAiobotocorePackage "codecommit" "2.9.0" "sha256-8wsxzSNeMKOr1N0UJo9sn0Jcp+WCvLOufA67aL49FjQ="; - types-aiobotocore-codedeploy = buildTypesAiobotocorePackage "codedeploy" "2.6.0" "sha256-4TUcqf3kuRqsMjhfrUTX3/aOSl43NtwmbSgM6KtjAlk="; + types-aiobotocore-codedeploy = buildTypesAiobotocorePackage "codedeploy" "2.9.0" "sha256-7NsJWQv4gw2zBYQTxm9p0hEis70WnTNgT5isd55mnt8="; - types-aiobotocore-codeguru-reviewer = buildTypesAiobotocorePackage "codeguru-reviewer" "2.6.0" "sha256-qD42WySh9NpQBOveTRGP3hIp8zD1Y1DzSiM7kbbfR88="; + types-aiobotocore-codeguru-reviewer = buildTypesAiobotocorePackage "codeguru-reviewer" "2.9.0" "sha256-zzl4ICc11BaNsYjJZG3lK8ehQlVFi8fWDxunVK4y6wA="; - types-aiobotocore-codeguru-security = buildTypesAiobotocorePackage "codeguru-security" "2.6.0" "sha256-1qgsFoogu8MnWoCeKnqy4KIY7UdMeUPnaS1zVSVl2Mg="; + types-aiobotocore-codeguru-security = buildTypesAiobotocorePackage "codeguru-security" "2.9.0" "sha256-gEYXn3oLTVMgskv43TJLnj4lC+RmiEQMO7ngz8a/dws="; - types-aiobotocore-codeguruprofiler = buildTypesAiobotocorePackage "codeguruprofiler" "2.6.0" "sha256-7Nbb+l7y5ccrVGymZ46nKwnGoa5nThrIOZ1AG0ykPEw="; + types-aiobotocore-codeguruprofiler = buildTypesAiobotocorePackage "codeguruprofiler" "2.9.0" "sha256-mrEhrQcd/SmrBFs1AVv6ddPqWairhYHMdIxBeL/JiNI="; - types-aiobotocore-codepipeline = buildTypesAiobotocorePackage "codepipeline" "2.6.0" "sha256-cIvM4g/CldgLuN10a3lNhISz08gT6VxZHMS5xo+B2IA="; + types-aiobotocore-codepipeline = buildTypesAiobotocorePackage "codepipeline" "2.9.0" "sha256-wLaqSsUgOosJ+0zUST9DVEPtW12QbPLQ4zHz6GAuJrQ="; - types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.6.0" "sha256-6b3QfRecmprhRU+loWafrcL1mWNLFmZXZOAhUMkpGqU="; + types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.9.0" "sha256-TB+XKOtfpjEtyHpmlAggN8LlrPVU2J7J8dGOtNN0jGo="; - types-aiobotocore-codestar-connections = buildTypesAiobotocorePackage "codestar-connections" "2.6.0" "sha256-D/icEGVsuYSU7hCw2VEojLTkdaBcK6SoEZqpvD/NKV0="; + types-aiobotocore-codestar-connections = buildTypesAiobotocorePackage "codestar-connections" "2.9.0" "sha256-fI+dnGtR3w87Pkqgk8my60jiB03gsEYFHtGGoU1/uYY="; - types-aiobotocore-codestar-notifications = buildTypesAiobotocorePackage "codestar-notifications" "2.6.0" "sha256-7vWHwrG7Z80Zb3ncGBqN4ItKAVWLR0XHITJxMmE8y8Y="; + types-aiobotocore-codestar-notifications = buildTypesAiobotocorePackage "codestar-notifications" "2.9.0" "sha256-xwE39rQ720hvrqAPosru14lVIJ84GI8CvN80NQVQA8o="; - types-aiobotocore-cognito-identity = buildTypesAiobotocorePackage "cognito-identity" "2.6.0" "sha256-C1JRefgyuiKDOJMhShyDPDjfKp5S5OMCaHcnORLxnvY="; + types-aiobotocore-cognito-identity = buildTypesAiobotocorePackage "cognito-identity" "2.9.0" "sha256-XuqXsgCd+loZYn6TMZUALvNJJv0WUdLsQuO6c0KW/bs="; - types-aiobotocore-cognito-idp = buildTypesAiobotocorePackage "cognito-idp" "2.6.0" "sha256-ks8MmuhrmdTS509vgxZ0raZqISMPaAItEjf93ppWhrU="; + types-aiobotocore-cognito-idp = buildTypesAiobotocorePackage "cognito-idp" "2.9.0" "sha256-/TKEYsj+xGxfw2FmQHdsXa5T96OIhiSukUjUStuW5eM="; - types-aiobotocore-cognito-sync = buildTypesAiobotocorePackage "cognito-sync" "2.6.0" "sha256-pOLa8tDqPexDigPbRqTjnr7/ricz92/Ml79AyUXvXBg="; + types-aiobotocore-cognito-sync = buildTypesAiobotocorePackage "cognito-sync" "2.9.0" "sha256-nceU9SKeGSl5JuiuKTpBAfijsReTn7dRyboy8f74ecw="; - types-aiobotocore-comprehend = buildTypesAiobotocorePackage "comprehend" "2.6.0" "sha256-qXIwjiNksQbQiTtwaKWNHaUCras/moRuFXN3sOEPYMc="; + types-aiobotocore-comprehend = buildTypesAiobotocorePackage "comprehend" "2.9.0" "sha256-meEKFbIuWqGrg9ZL7XJW8POWwgjiHxbIgXJPjIrkeU0="; - types-aiobotocore-comprehendmedical = buildTypesAiobotocorePackage "comprehendmedical" "2.6.0" "sha256-C98s7dkFRgj8m4M+MmjvCWwrdohkLJafgo9j2ACQ2l4="; + types-aiobotocore-comprehendmedical = buildTypesAiobotocorePackage "comprehendmedical" "2.9.0" "sha256-5NmX7q2dBWUFR+MZ3L37nSKUofJnjQ4CUNzJ0buxwYo="; - types-aiobotocore-compute-optimizer = buildTypesAiobotocorePackage "compute-optimizer" "2.6.0" "sha256-4MRGtyFWceAuspTW6Xqwjf2ta0VC1SIoK/U80QZw7UA="; + types-aiobotocore-compute-optimizer = buildTypesAiobotocorePackage "compute-optimizer" "2.9.0" "sha256-66KGrkc1LMXyJqCl4hLhEqYd5f4x5n+A1aiNmEeY0Ic="; - types-aiobotocore-config = buildTypesAiobotocorePackage "config" "2.6.0" "sha256-qW+R5X/fu784kjARjISaNxwzIJn74SXfUaPEuGqsM1M="; + types-aiobotocore-config = buildTypesAiobotocorePackage "config" "2.9.0" "sha256-Jal8H6TgvHWBMkTtGM3Gcth77cJfkiew6uIGmCIoZqA="; - types-aiobotocore-connect = buildTypesAiobotocorePackage "connect" "2.6.0" "sha256-d+7VqW5H0hyINQVXoy6djyFmkGzlhLnEpzURuPQLyBc="; + types-aiobotocore-connect = buildTypesAiobotocorePackage "connect" "2.9.0" "sha256-iQgYO2rjkaMI0xRslJRVAQ2HPcvj8tYM+/g2xQySY7I="; - types-aiobotocore-connect-contact-lens = buildTypesAiobotocorePackage "connect-contact-lens" "2.6.0" "sha256-3d2WJQpohaiwdsKOS2u5kNhHVsgELMxgjunHAk6v7Y8="; + types-aiobotocore-connect-contact-lens = buildTypesAiobotocorePackage "connect-contact-lens" "2.9.0" "sha256-4dVbw+1XCJnxkJLNyxTpibr1u2KPnuM9aSzk1/UuBxc="; - types-aiobotocore-connectcampaigns = buildTypesAiobotocorePackage "connectcampaigns" "2.6.0" "sha256-lsDs0yxFf4ForZ2bU719LFCDHzR9lOE211XuYGYKZCw="; + types-aiobotocore-connectcampaigns = buildTypesAiobotocorePackage "connectcampaigns" "2.9.0" "sha256-SpQk9aatNLlOxwNTghJYoOqlmv8NQBxVyMPsx0kDhFY="; - types-aiobotocore-connectcases = buildTypesAiobotocorePackage "connectcases" "2.6.0" "sha256-/MRl46K5h5mtboGhWDop0psxPyxhm3tKhzvMpr91d/w="; + types-aiobotocore-connectcases = buildTypesAiobotocorePackage "connectcases" "2.9.0" "sha256-CaU1bmYjX/4+rgDqkkoOihLpzTxOoiquriDEGxruxoE="; - types-aiobotocore-connectparticipant = buildTypesAiobotocorePackage "connectparticipant" "2.6.0" "sha256-3E+8scTPCcNm8RDoxGWSm/u6drT12aiFqf3LbxWTy8w="; + types-aiobotocore-connectparticipant = buildTypesAiobotocorePackage "connectparticipant" "2.9.0" "sha256-AsHLSsmfYb4WC0068U1VLvsA/h/V+IPpSsshPDj0yD8="; - types-aiobotocore-controltower = buildTypesAiobotocorePackage "controltower" "2.6.0" "sha256-Df25Lah8FBdCrbWMC+Y9ayQCO3ijG8cMdypA2+sE3oY="; + types-aiobotocore-controltower = buildTypesAiobotocorePackage "controltower" "2.9.0" "sha256-oUPutZNbGyiIOow0sjhdyCmrcymVtVUfmV22CTa3jk8="; - types-aiobotocore-cur = buildTypesAiobotocorePackage "cur" "2.6.0" "sha256-i+n53Eejdz26WGsHBmLR3V0ZxOBHPtTTzoxH0mmKPig="; + types-aiobotocore-cur = buildTypesAiobotocorePackage "cur" "2.9.0" "sha256-PGAEGW5hQNiSvUmaO1c9ruV4p/geuSXuKUBBqfCn9h0="; - types-aiobotocore-customer-profiles = buildTypesAiobotocorePackage "customer-profiles" "2.6.0" "sha256-i1mv2M3bboOF3+iIKYhp4raYb7mHiQTirlWsttB/dXY="; + types-aiobotocore-customer-profiles = buildTypesAiobotocorePackage "customer-profiles" "2.9.0" "sha256-6TkyPbfYX4l+rg5fYAxL7YRk+q7btyAnUmZsddEEMKI="; - types-aiobotocore-databrew = buildTypesAiobotocorePackage "databrew" "2.6.0" "sha256-WMVPGbQkdbKc2T+gR9P3oWUxl5VSVf4IdcLeuW9SNUo="; + types-aiobotocore-databrew = buildTypesAiobotocorePackage "databrew" "2.9.0" "sha256-dMNEL+UBheYxenwHbopFigH8y/WaVN9W37Qsm8hj2LI="; - types-aiobotocore-dataexchange = buildTypesAiobotocorePackage "dataexchange" "2.6.0" "sha256-okcgm0Lx5s2AM2mprVwNjeI1TTmlR73FgjWbYa9uRdE="; + types-aiobotocore-dataexchange = buildTypesAiobotocorePackage "dataexchange" "2.9.0" "sha256-+fQQWK+j80sUcm5+cm1x4dmexMyzYLj+/wwSs7doPGM="; - types-aiobotocore-datapipeline = buildTypesAiobotocorePackage "datapipeline" "2.6.0" "sha256-k0tYIWqPEnETISThasPHa9AaWdAs0p+hfrUuCI7VTJk="; + types-aiobotocore-datapipeline = buildTypesAiobotocorePackage "datapipeline" "2.9.0" "sha256-Xbqot0kb2uRuzVw4mBDwXgUyxJmXNb7s00DfE12gnK0="; - types-aiobotocore-datasync = buildTypesAiobotocorePackage "datasync" "2.6.0" "sha256-C138viPl57+Z79k1C0c4IjgdpMd4PhO352fUs6/YnE0="; + types-aiobotocore-datasync = buildTypesAiobotocorePackage "datasync" "2.9.0" "sha256-h1JZgAPPSynyE2R3ZFr94gql6NNBtAAZzT/vLu36974="; - types-aiobotocore-dax = buildTypesAiobotocorePackage "dax" "2.6.0" "sha256-1BtV4vajDTlmNhX4oh1h81+1MsIe63gxnkd1oWn0yeI="; + types-aiobotocore-dax = buildTypesAiobotocorePackage "dax" "2.9.0" "sha256-m5XoWZXVHsz/tnVJTJikanRovgdjn9YA6fqCih+J2FY="; - types-aiobotocore-detective = buildTypesAiobotocorePackage "detective" "2.6.0" "sha256-UP8rTuCwNq6Eu5gYrMj5c+JaNy9grOOL9RRi/QsDvzE="; + types-aiobotocore-detective = buildTypesAiobotocorePackage "detective" "2.9.0" "sha256-u/RH0O+wJ+zSxENwkZ34qsvRyCLxYVcaXUwJSrRoWa8="; - types-aiobotocore-devicefarm = buildTypesAiobotocorePackage "devicefarm" "2.6.0" "sha256-Mc4Kl4dZyn9y+9V44QilacOHN9+E1M79uNLATsoH2Ks="; + types-aiobotocore-devicefarm = buildTypesAiobotocorePackage "devicefarm" "2.9.0" "sha256-yZiJ42Tux6ElMCAonjsrlHIvIRMF8TndCgj8m2dqPgI="; - types-aiobotocore-devops-guru = buildTypesAiobotocorePackage "devops-guru" "2.6.0" "sha256-pPn7O3oK75zRmOFMQmyzmRcjpRTswrVhdbkcqaI5Sj8="; + types-aiobotocore-devops-guru = buildTypesAiobotocorePackage "devops-guru" "2.9.0" "sha256-YG4OKgu+APHPvnPJxWhb7F8P7mAzhg//0A5I34mL2WA="; - types-aiobotocore-directconnect = buildTypesAiobotocorePackage "directconnect" "2.6.0" "sha256-LwbqLf3BEwW/+f6vsddXt+FiyGkRKIPXfaqW5rtDrig="; + types-aiobotocore-directconnect = buildTypesAiobotocorePackage "directconnect" "2.9.0" "sha256-hSaANopHROSG3tI1Oo76m+MMCN/BwlhdkIil5ej47b8="; - types-aiobotocore-discovery = buildTypesAiobotocorePackage "discovery" "2.6.0" "sha256-mBruXgMAELLGyEg7ON8PFesERMf5og8As58U9pvIKRc="; + types-aiobotocore-discovery = buildTypesAiobotocorePackage "discovery" "2.9.0" "sha256-4bT4zpTZ7dS2dnfIRCQO9kx4LxMqct+sGX0RwFYm3q4="; - types-aiobotocore-dlm = buildTypesAiobotocorePackage "dlm" "2.6.0" "sha256-JLOVu9OlJgrfTBlmzVNN5saYO8AFk8N54hRzDAjq7WI="; + types-aiobotocore-dlm = buildTypesAiobotocorePackage "dlm" "2.9.0" "sha256-3CJqMAU6V6BnwImfNmDdTvvcbbhLTC6txb1rYsroiW8="; - types-aiobotocore-dms = buildTypesAiobotocorePackage "dms" "2.6.0" "sha256-cWGwdGBTgEag5SeRDLvAJtCS1dAxtt5R0uanPI6RjkY="; + types-aiobotocore-dms = buildTypesAiobotocorePackage "dms" "2.9.0" "sha256-4LLK2nScAVX2XtHIj0ajO7MZhz7OV+xarlCr5Y2bjXU="; - types-aiobotocore-docdb = buildTypesAiobotocorePackage "docdb" "2.6.0" "sha256-yYm/H31gRIDV+r2H+8cTHkc5h40aFFUQ7zlX1wyLPAI="; + types-aiobotocore-docdb = buildTypesAiobotocorePackage "docdb" "2.9.0" "sha256-jBEpqZFqzAY8KOsG7RhBzg0HVEtfwkmc6KfrpOmHQJs="; - types-aiobotocore-docdb-elastic = buildTypesAiobotocorePackage "docdb-elastic" "2.6.0" "sha256-ro0xv2HHzTXA6tRNnr3eQjCj5iaqc1wOcsKny8j/hoQ="; + types-aiobotocore-docdb-elastic = buildTypesAiobotocorePackage "docdb-elastic" "2.9.0" "sha256-WnGjpT3cf+KucO+p2uoerdyMvnW2vPEpSiPtSrPwqWg="; - types-aiobotocore-drs = buildTypesAiobotocorePackage "drs" "2.6.0" "sha256-4CeNeftLpPSZYqw09LcPRC+8yVp+84azRHQ8O0JFOOo="; + types-aiobotocore-drs = buildTypesAiobotocorePackage "drs" "2.9.0" "sha256-ZS7Ux9Oa24Yvwl2R4ahsJMJKK2+ZkB0Gl5vymbF1KuI="; - types-aiobotocore-ds = buildTypesAiobotocorePackage "ds" "2.6.0" "sha256-HZEA8fivN05Puxycyl+2z4kIJMbGtF0J7ohLOwx+IzM="; + types-aiobotocore-ds = buildTypesAiobotocorePackage "ds" "2.9.0" "sha256-LyM6Mu6f0Ophm5D7li+RORL3pPKMF31FGAjhKifFgK0="; - types-aiobotocore-dynamodb = buildTypesAiobotocorePackage "dynamodb" "2.6.0" "sha256-dFo/YsEQg7TXB5NENmFOv37R3B2GoN0TlIiULWEQr9I="; + types-aiobotocore-dynamodb = buildTypesAiobotocorePackage "dynamodb" "2.9.0" "sha256-11VNAEeYMpdv1QeHzfZF8s6eELfHAf+6kwZ98lZVtss="; - types-aiobotocore-dynamodbstreams = buildTypesAiobotocorePackage "dynamodbstreams" "2.6.0" "sha256-8wsE774l7M8Qb3UiaxkAdN6sdnXs5oS4cFhncW0joBI="; + types-aiobotocore-dynamodbstreams = buildTypesAiobotocorePackage "dynamodbstreams" "2.9.0" "sha256-V3KpPB/ZFn4ekwqCzAYlCd7Sm2eOmDSErKrW5Inq6bw="; - types-aiobotocore-ebs = buildTypesAiobotocorePackage "ebs" "2.6.0" "sha256-95lUlfOjLVgHufSv3UvaKB1K0F2N0cvtCcKh96VBtqg="; + types-aiobotocore-ebs = buildTypesAiobotocorePackage "ebs" "2.9.0" "sha256-P/xyl8314GuciTxaWNDqBxvTNIgBrmgwEGnf3ndFhhY="; - types-aiobotocore-ec2 = buildTypesAiobotocorePackage "ec2" "2.6.0" "sha256-hSuwPcQEk9Qgkc/JtcZp2vqLXnMQN9gtzjkuC1Bv1C4="; + types-aiobotocore-ec2 = buildTypesAiobotocorePackage "ec2" "2.9.0" "sha256-hZl7h0GbT4uW+xFrj+DrM78oBxVVkklUtdvPhiwD4IU="; - types-aiobotocore-ec2-instance-connect = buildTypesAiobotocorePackage "ec2-instance-connect" "2.6.0" "sha256-0Lwxob43TzJHNcriUEa3BAZE64iqS9Js4TtfL20YRj0="; + types-aiobotocore-ec2-instance-connect = buildTypesAiobotocorePackage "ec2-instance-connect" "2.9.0" "sha256-bsREnDH2iIpXXJTaAeFpdqTFUW8NXFYrnilCldvsZeU="; - types-aiobotocore-ecr = buildTypesAiobotocorePackage "ecr" "2.6.0" "sha256-bMPp7QPa2f8GCRmX3y78XvZTUyYNfYxXDKj5lckBBvE="; + types-aiobotocore-ecr = buildTypesAiobotocorePackage "ecr" "2.9.0" "sha256-aRogeu240sXzGG3SqtgPlMro/VgfZ+ab8mN8llrd0BM="; - types-aiobotocore-ecr-public = buildTypesAiobotocorePackage "ecr-public" "2.6.0" "sha256-O2RieTv4vyZ6/mR8BRltfbGcPUjAyIIqriskSlmNcb4="; + types-aiobotocore-ecr-public = buildTypesAiobotocorePackage "ecr-public" "2.9.0" "sha256-me4OICl7bpjD8So1+Fi3WAPStmHN03Iy/UpSKkJ9vjs="; - types-aiobotocore-ecs = buildTypesAiobotocorePackage "ecs" "2.6.0" "sha256-C660Ync/6dV8c9i+N7bgV0TYaPScrJ40KPdG3LItGGs="; + types-aiobotocore-ecs = buildTypesAiobotocorePackage "ecs" "2.9.0" "sha256-j7Uii76S/VHqEaCwY0oazbiZPjhHGzgNpDftur9sAdQ="; - types-aiobotocore-efs = buildTypesAiobotocorePackage "efs" "2.6.0" "sha256-jhIpP0cJEv2SqvmBJtxNVoWF4AOWci2sPj04dN3N+bo="; + types-aiobotocore-efs = buildTypesAiobotocorePackage "efs" "2.9.0" "sha256-RglLUdWAGoXqlhDeJ5YDuKRGBuN3L4/bX1ooiextOGM="; - types-aiobotocore-eks = buildTypesAiobotocorePackage "eks" "2.6.0" "sha256-MXMbA1QAyRMhTqihwKztK3EoRp1iesCvPEz30Xc/in8="; + types-aiobotocore-eks = buildTypesAiobotocorePackage "eks" "2.9.0" "sha256-VrEKbEiAKCuBQyKBRCY/XYD/4akxVF/x2aHpwTsp/gk="; - types-aiobotocore-elastic-inference = buildTypesAiobotocorePackage "elastic-inference" "2.6.0" "sha256-xjMVOk0fzyvDoSNb+kxVQT9emfvIG/6Ws3h3MfCCTOY="; + types-aiobotocore-elastic-inference = buildTypesAiobotocorePackage "elastic-inference" "2.9.0" "sha256-gkzqiodMq81O8d8WTwsSHcXVRdcsW+fcH0UDkWVm6NU="; - types-aiobotocore-elasticache = buildTypesAiobotocorePackage "elasticache" "2.6.0" "sha256-7iUYuPOerdp1+fxI/KdC4sEWDOTJQAgYYheEmSvjBFo="; + types-aiobotocore-elasticache = buildTypesAiobotocorePackage "elasticache" "2.9.0" "sha256-v27Lu2Oe+kTjXR82WcJ+ocSSiYcepLt8J4E0e3gTSQQ="; - types-aiobotocore-elasticbeanstalk = buildTypesAiobotocorePackage "elasticbeanstalk" "2.6.0" "sha256-yCF9EHyTsf1hmoeSGrNiM2Dd8gtGlcX79zqF25btN04="; + types-aiobotocore-elasticbeanstalk = buildTypesAiobotocorePackage "elasticbeanstalk" "2.9.0" "sha256-2NBo1cUIyXTWkrMQaGt5oQfLovrhdZAtNIrA3KmyBNI="; - types-aiobotocore-elastictranscoder = buildTypesAiobotocorePackage "elastictranscoder" "2.6.0" "sha256-vRVH67/SbkncE4q3gssGce4NtTYgFM56RLzDKyvBCpc="; + types-aiobotocore-elastictranscoder = buildTypesAiobotocorePackage "elastictranscoder" "2.9.0" "sha256-eDz+7wmr8LIkO1LtxvLoHrfVllycbcQRHA8HLfK/Aig="; - types-aiobotocore-elb = buildTypesAiobotocorePackage "elb" "2.6.0" "sha256-+mFIAOecS21QFsnB+V1EFyGLv6uW+oMzkRi051HvPGA="; + types-aiobotocore-elb = buildTypesAiobotocorePackage "elb" "2.9.0" "sha256-nj8CLLrTrGS7GOC90xGxDqVLhxK3mvmWthUucwcf7VU="; - types-aiobotocore-elbv2 = buildTypesAiobotocorePackage "elbv2" "2.6.0" "sha256-OIWzkp7AC2bK55bl3WvL2Zk7M0WRPc8jVHekPAGDtyw="; + types-aiobotocore-elbv2 = buildTypesAiobotocorePackage "elbv2" "2.9.0" "sha256-ILngqOQ5oVsgGj6LRYlx/LrfKf85aakeRP+z96z2FnE="; - types-aiobotocore-emr = buildTypesAiobotocorePackage "emr" "2.6.0" "sha256-TWCgT2xBi3UajaF6L+m61Q27YV8RCm+e/jRVnZKjwrI="; + types-aiobotocore-emr = buildTypesAiobotocorePackage "emr" "2.9.0" "sha256-pazXV8RBOciYO4DT8N5Ztl+prpSMqY4PtHTw6fpDVrk="; - types-aiobotocore-emr-containers = buildTypesAiobotocorePackage "emr-containers" "2.6.0" "sha256-pBr9zVqEbP0na385scKW28d0qIB+7HQdYC5QTdhxHNA="; + types-aiobotocore-emr-containers = buildTypesAiobotocorePackage "emr-containers" "2.9.0" "sha256-rgnCpxI5VF5PIks1ucO18odXbdJLY6avolYSSYM/ucs="; - types-aiobotocore-emr-serverless = buildTypesAiobotocorePackage "emr-serverless" "2.6.0" "sha256-mdpuehCY0ki+sZSlNS0kIwijZphoyQixNWY4WKEcrMs="; + types-aiobotocore-emr-serverless = buildTypesAiobotocorePackage "emr-serverless" "2.9.0" "sha256-ONqc3bBUEpKy6+GlOtZf8Sqf+NaQXbRvVdu/NtA8g/U="; - types-aiobotocore-entityresolution = buildTypesAiobotocorePackage "entityresolution" "2.6.0" "sha256-lFbcxmw7Le/rVVL70cOY/vEUShSRnsOdul+eI1jzX7Y="; + types-aiobotocore-entityresolution = buildTypesAiobotocorePackage "entityresolution" "2.9.0" "sha256-du/tPdrQIaCvndaZMU5Bz3biL8GxT1PQGR/rRbSioTk="; - types-aiobotocore-es = buildTypesAiobotocorePackage "es" "2.6.0" "sha256-A/1kM0X4bKrPIXBpir9FuEkuYmUb/K06gfut6faGN0A="; + types-aiobotocore-es = buildTypesAiobotocorePackage "es" "2.9.0" "sha256-2zELfFO2ukQ3CIBA72Ktd67H+VtLSpXEJ8bAARb+Nas="; - types-aiobotocore-events = buildTypesAiobotocorePackage "events" "2.6.0" "sha256-X0r0VZ/ZWYrn2NdE5dJrcS74OyWIvWMDJGSNheIOm0A="; + types-aiobotocore-events = buildTypesAiobotocorePackage "events" "2.9.0" "sha256-wluojbZEFpeJcLDmNqcBzVyAbXi2oe65MNDsSxizwbI="; - types-aiobotocore-evidently = buildTypesAiobotocorePackage "evidently" "2.6.0" "sha256-ec9XPmiGjhH+MsW81JtH13KACasiWqtmxOC/O8ewbgE="; + types-aiobotocore-evidently = buildTypesAiobotocorePackage "evidently" "2.9.0" "sha256-y2ZTQ/N2YXFBylexjWfEoeUxlhSNEykUNqzhFvjDprE="; - types-aiobotocore-finspace = buildTypesAiobotocorePackage "finspace" "2.6.0" "sha256-fPG/13VJzvdfoADYZXTZ2ssdJrKQ/MEic6rhsNUE4tU="; + types-aiobotocore-finspace = buildTypesAiobotocorePackage "finspace" "2.9.0" "sha256-JJ1KeDC+sUkixipaE/eEPZLxu4e1IP+yaGrHr/eh2kQ="; - types-aiobotocore-finspace-data = buildTypesAiobotocorePackage "finspace-data" "2.6.0" "sha256-2mAHrKw7Hur/nrVQpuRwGae5CumbjbQb4V9Z6NlsSmo="; + types-aiobotocore-finspace-data = buildTypesAiobotocorePackage "finspace-data" "2.9.0" "sha256-9KCNrLD1vKELitGKWmEKLDsniQTZ+CSLPqJIXU/Ndkg="; - types-aiobotocore-firehose = buildTypesAiobotocorePackage "firehose" "2.6.0" "sha256-viWUrt2F0O1jVhkxK5G776A4r7d4jJJVI/5UsUS+cao="; + types-aiobotocore-firehose = buildTypesAiobotocorePackage "firehose" "2.9.0" "sha256-NY8XyhCzze30cdDT76faqaFRuhwD43DjTc59h6LwN4M="; - types-aiobotocore-fis = buildTypesAiobotocorePackage "fis" "2.6.0" "sha256-4T/EcdB+5TV8PnX1Z9c8Ato19kznO3yQPZohuWD1+J8="; + types-aiobotocore-fis = buildTypesAiobotocorePackage "fis" "2.9.0" "sha256-oVOz3nStBFvOrlJEy4v9kKjkBbM/cubP/01KUnGGKIk="; - types-aiobotocore-fms = buildTypesAiobotocorePackage "fms" "2.6.0" "sha256-VIGEXyDyUEWshdYFUJ3VmCS1z/ZBOKq2PYCosalPZAw="; + types-aiobotocore-fms = buildTypesAiobotocorePackage "fms" "2.9.0" "sha256-YdsSwRZitM81L1VrQ8MWLAo5OzMVYHhHlLn0cr+rX1M="; - types-aiobotocore-forecast = buildTypesAiobotocorePackage "forecast" "2.6.0" "sha256-rMjrKtR8BWtAYoyBY52o/5wbZCHqX1aFMRsVCunZTeo="; + types-aiobotocore-forecast = buildTypesAiobotocorePackage "forecast" "2.9.0" "sha256-PSlAjO+J5FmGeerxaXGLblTsxCV/N3pgrp9YE+wbuLE="; - types-aiobotocore-forecastquery = buildTypesAiobotocorePackage "forecastquery" "2.6.0" "sha256-rh53/1tmYyADrkUtQjrwrcEe78ji6II0yYnMQO38AOU="; + types-aiobotocore-forecastquery = buildTypesAiobotocorePackage "forecastquery" "2.9.0" "sha256-6wtsWxphhZX6EXACPnQoOEk5jhYU2F0O6uQWd4YcmMU="; - types-aiobotocore-frauddetector = buildTypesAiobotocorePackage "frauddetector" "2.6.0" "sha256-ICRkb+GIWginbc2LvsJTzBaEXDlwg+JOqWQwNRzu+CI="; + types-aiobotocore-frauddetector = buildTypesAiobotocorePackage "frauddetector" "2.9.0" "sha256-baWI2JgVwKt009qHelIWdlinITQx3PMmDL2GR4JYs7s="; - types-aiobotocore-fsx = buildTypesAiobotocorePackage "fsx" "2.6.0" "sha256-vZiK+Kat3RKN/OcKny5qLF+pYljoVlJGG9Kdlb75GWk="; + types-aiobotocore-fsx = buildTypesAiobotocorePackage "fsx" "2.9.0" "sha256-9U5ZyZVlovbMhAEpdxatXMdG+4UiNDzCgOPcolFVz+o="; - types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.6.0" "sha256-9qk0jvEAU6vh++k18ccjrZNLnYlOqiAGuVvBGS5QetQ="; + types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.9.0" "sha256-zMDERQRfFSDc1ULOKnxh0pCJFto19rc/S4MpPWp/AIQ="; 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-glacier = buildTypesAiobotocorePackage "glacier" "2.9.0" "sha256-gwWW/i5HfpPyNOTW+B2oXm8RiTMBWrlzfdrS15ysR3g="; - types-aiobotocore-globalaccelerator = buildTypesAiobotocorePackage "globalaccelerator" "2.6.0" "sha256-U/74XOX/pXh4JJ4n6Fu6quL6gQwz+zt9bOWj/QYOS+8="; + types-aiobotocore-globalaccelerator = buildTypesAiobotocorePackage "globalaccelerator" "2.9.0" "sha256-5w83+uCKnfu2JzAhyhNgyw2fJGHOzLOgS9ihuZ5mjXc="; - types-aiobotocore-glue = buildTypesAiobotocorePackage "glue" "2.6.0" "sha256-K2asnioD1r9BJCX2PaNaN+fKDyA+oQhvdM0h0LgxbEY="; + types-aiobotocore-glue = buildTypesAiobotocorePackage "glue" "2.9.0" "sha256-UWnIh8+CcSpWPvAHnWJrLORqFKkMSHvxV2QIO2kLHxg="; - types-aiobotocore-grafana = buildTypesAiobotocorePackage "grafana" "2.6.0" "sha256-acNr8U/E2Eq4wp68Td0k8xdORhT6ZOJBOi0enBnaacE="; + types-aiobotocore-grafana = buildTypesAiobotocorePackage "grafana" "2.9.0" "sha256-LWncyuBU2zDhoF5ob81cg+NWlOI8QiZkbpUSRRolh9E="; - types-aiobotocore-greengrass = buildTypesAiobotocorePackage "greengrass" "2.6.0" "sha256-9mqnIWlLUoz28qp8AH8LiNdDgcJ04P0Z+jxNb/91jUg="; + types-aiobotocore-greengrass = buildTypesAiobotocorePackage "greengrass" "2.9.0" "sha256-pjBy3YHHblL5JWCycMfZxpFQdPyAGla9TVmLLceRsrY="; - types-aiobotocore-greengrassv2 = buildTypesAiobotocorePackage "greengrassv2" "2.6.0" "sha256-+G6nPOY2Suxa8LPTG8SHOZfwaIJQIyVGTRcsAQYXZzY="; + types-aiobotocore-greengrassv2 = buildTypesAiobotocorePackage "greengrassv2" "2.9.0" "sha256-IAlQveKtmaP02odHz8WQdNdWLFjz0gPr66HMSyOhnMs="; - types-aiobotocore-groundstation = buildTypesAiobotocorePackage "groundstation" "2.6.0" "sha256-VGGDcARvtSeukjgVB9jwSamIrlrNCF+0pNszN6VkMC0="; + types-aiobotocore-groundstation = buildTypesAiobotocorePackage "groundstation" "2.9.0" "sha256-qcjfgSR8lbOus3bcx/zlPSuGJ53B/Kuo1GCyU4VsYMo="; - types-aiobotocore-guardduty = buildTypesAiobotocorePackage "guardduty" "2.6.0" "sha256-3bScTMTc7PMrHvZpfPYENj55w2JjnK/pVuNLcxCjw5Q="; + types-aiobotocore-guardduty = buildTypesAiobotocorePackage "guardduty" "2.9.0" "sha256-ecsB0KFITMENFwZX2EKpmToi1iYTeeRtrooAX3zXfpc="; - types-aiobotocore-health = buildTypesAiobotocorePackage "health" "2.6.0" "sha256-WBxZlnWrZ6b0MIEomvgUDqiKNe9KIIgOrNrRhRw07EA="; + types-aiobotocore-health = buildTypesAiobotocorePackage "health" "2.9.0" "sha256-nz7sUPMH8gVy5Oz+eatRd8iLfHKxcDHFRIqh80EuZWE="; - types-aiobotocore-healthlake = buildTypesAiobotocorePackage "healthlake" "2.6.0" "sha256-8ofimJ4eTxq8yQjCc23FQ2OktMCNwlIBCn+eC+HLqlc="; + types-aiobotocore-healthlake = buildTypesAiobotocorePackage "healthlake" "2.9.0" "sha256-S8Ds3s45HY0b007saVNSd0bfmvP3lbSNXEWUSBCsD/8="; - types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.6.0" "sha256-dCjt22yHlShPdG6Jipy3m4Rx3G4OLPiuUi1gyubcQ/g="; + types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.9.0" "sha256-+D9MESYNaP60NSl/5OKLVyHQQqikU4AHR6CV+wb1J58="; - types-aiobotocore-iam = buildTypesAiobotocorePackage "iam" "2.6.0" "sha256-NPvYTwvZY5MjfdIlTMRZEQ1S9IvxvQjoi5K2LOlSrMM="; + types-aiobotocore-iam = buildTypesAiobotocorePackage "iam" "2.9.0" "sha256-b1VvcL7w/QC4svZCuDnP+OC+wOHWvrArUFLCw94S7Vw="; - types-aiobotocore-identitystore = buildTypesAiobotocorePackage "identitystore" "2.6.0" "sha256-u4d+/kVZ+qtLyueNSGy6a2VoB0jIYdKZqvCQQfarbx4="; + types-aiobotocore-identitystore = buildTypesAiobotocorePackage "identitystore" "2.9.0" "sha256-qsU85n679BxZn3QgC0iSXnX+GANPhdUNQuSn5/WIjq4="; - types-aiobotocore-imagebuilder = buildTypesAiobotocorePackage "imagebuilder" "2.6.0" "sha256-uhkFIVr68n0ShrpZY9qyghd0XgMb0ZT6fF9WdjtF7g0="; + types-aiobotocore-imagebuilder = buildTypesAiobotocorePackage "imagebuilder" "2.9.0" "sha256-U3PWbTbhSb48R1QPdzH1kLBI/Y6Iv1MnQz1IeuaQGj8="; - types-aiobotocore-importexport = buildTypesAiobotocorePackage "importexport" "2.6.0" "sha256-m0fUuupB8Eb9pJQnuir4THb4TdDstKcxHQRgz8Ce2Zg="; + types-aiobotocore-importexport = buildTypesAiobotocorePackage "importexport" "2.9.0" "sha256-vnnAftGX1FxCdqz9ROaWcuaugIDXPfySRWVJieU33VA="; - types-aiobotocore-inspector = buildTypesAiobotocorePackage "inspector" "2.6.0" "sha256-dJQnb6AwtmScEIun0QB9CiiPkbdKti9+mc5LN3vf7e0="; + types-aiobotocore-inspector = buildTypesAiobotocorePackage "inspector" "2.9.0" "sha256-4tYe+EtujEhaVYbddCBuVSoGzai0+oiJPxkZ+fxxz9M="; - types-aiobotocore-inspector2 = buildTypesAiobotocorePackage "inspector2" "2.6.0" "sha256-kAhdyymMdbrPoCFzKiVCFzBlfpmz4aGlZ1Ilkrc8EiQ="; + types-aiobotocore-inspector2 = buildTypesAiobotocorePackage "inspector2" "2.9.0" "sha256-VXniTrBibInkgj0jMWbb9RD8+Er9JUJ0xfAeWfwKdXE="; - types-aiobotocore-internetmonitor = buildTypesAiobotocorePackage "internetmonitor" "2.6.0" "sha256-3oJbkuU013LR7DUXvr8y0nbYh3caAF1c4GtgM1CizdU="; + types-aiobotocore-internetmonitor = buildTypesAiobotocorePackage "internetmonitor" "2.9.0" "sha256-70lW/bzAirzq1ui/TtiFyKGesZMJ3Z8jwGgc3j0GoUk="; - types-aiobotocore-iot = buildTypesAiobotocorePackage "iot" "2.6.0" "sha256-Rt6dsE/9aR5AZC47G3RayV56VVobDWEah64cNHsaYII="; + types-aiobotocore-iot = buildTypesAiobotocorePackage "iot" "2.9.0" "sha256-j8i0uB5Ul4pxxMjyPdR94ssh1lus4MAR1Il31ueJiw0="; - types-aiobotocore-iot-data = buildTypesAiobotocorePackage "iot-data" "2.6.0" "sha256-KpgEjoEsCSiC6aKyHy64it0k87XYICbxMhUFYUjCBuo="; + types-aiobotocore-iot-data = buildTypesAiobotocorePackage "iot-data" "2.9.0" "sha256-9gblz4bopGjfFh3dgw0Jy7KVl8SNO+kE8l+l5mAgUws="; - types-aiobotocore-iot-jobs-data = buildTypesAiobotocorePackage "iot-jobs-data" "2.6.0" "sha256-IQRarMn1ZAh+kUG1I4Cyt/6WrIoby07g3qcSzpWUWWM="; + types-aiobotocore-iot-jobs-data = buildTypesAiobotocorePackage "iot-jobs-data" "2.9.0" "sha256-wykkgo48vdRg401bVR1TxCFFZXzESjeZM8Tc7wPVI6w="; - types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.6.0" "sha256-BFSV0lfXriD43UFXjdomHIQO60TjrYWmL6+htf9Z3mE="; + types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.9.0" "sha256-ufnfEl+MjD/FAJ6ga2/rAvVrAbg+lCqwXxh58VDezxk="; - types-aiobotocore-iot1click-devices = buildTypesAiobotocorePackage "iot1click-devices" "2.6.0" "sha256-MRRil8KuR88NvjAOQHQSftplzk7+sdAJBb1Koxj1j8o="; + types-aiobotocore-iot1click-devices = buildTypesAiobotocorePackage "iot1click-devices" "2.9.0" "sha256-8TF24GJwZT8c0XBV15XOJqP4/pMPdanURcxnbVu8gRg="; - types-aiobotocore-iot1click-projects = buildTypesAiobotocorePackage "iot1click-projects" "2.6.0" "sha256-6YRdsbNw685KvSLCPP6cpCVA5zqht9gF/SthHHtjxfI="; + types-aiobotocore-iot1click-projects = buildTypesAiobotocorePackage "iot1click-projects" "2.9.0" "sha256-IV8WCyvx2BVG5R3JUM2Q8r5n+qlVd/JiLUneW6DcQTw="; - types-aiobotocore-iotanalytics = buildTypesAiobotocorePackage "iotanalytics" "2.6.0" "sha256-uhxX742flhdDM7zoYm6yggc41NW7glGPijiql4XKJa4="; + types-aiobotocore-iotanalytics = buildTypesAiobotocorePackage "iotanalytics" "2.9.0" "sha256-00lziwTYF800ejKy11K26LL1GpFi3e+57OQwQk4KN4s="; - types-aiobotocore-iotdeviceadvisor = buildTypesAiobotocorePackage "iotdeviceadvisor" "2.6.0" "sha256-jrOVxsJHgpEvyLhreMrzttu3yQ4FXm4+MVDlNNIKWVU="; + types-aiobotocore-iotdeviceadvisor = buildTypesAiobotocorePackage "iotdeviceadvisor" "2.9.0" "sha256-/FnVwPFQTDi0XGYf1N5rzUUV9HLqy+xrDIdIlwbhEqY="; - types-aiobotocore-iotevents = buildTypesAiobotocorePackage "iotevents" "2.6.0" "sha256-M3wUbFFGsYQesy7ASen+b6yokGkjXY0P5wpGexO2CGg="; + types-aiobotocore-iotevents = buildTypesAiobotocorePackage "iotevents" "2.9.0" "sha256-Tsj+xTdDp2iP3suK6Y09hLwOOA80xJ/HH76f6rmbsSI="; - types-aiobotocore-iotevents-data = buildTypesAiobotocorePackage "iotevents-data" "2.6.0" "sha256-ESm7ZCtEvHo/r9LXnBaIAVAb4bQkGjIlmUNlo/JuzjE="; + types-aiobotocore-iotevents-data = buildTypesAiobotocorePackage "iotevents-data" "2.9.0" "sha256-DPq/6llPXr+gUikXOqRuakoSL5pOLu21AXFabe2krk0="; - types-aiobotocore-iotfleethub = buildTypesAiobotocorePackage "iotfleethub" "2.6.0" "sha256-0NMp62HDGZ0FHVtyHOvgfMUaedqZG9bY46d2OrpGK7E="; + types-aiobotocore-iotfleethub = buildTypesAiobotocorePackage "iotfleethub" "2.9.0" "sha256-C56Ab8SK7LVCL0rQ0MaykTpfh+7q1GWvNpO1T6QLxYw="; - types-aiobotocore-iotfleetwise = buildTypesAiobotocorePackage "iotfleetwise" "2.6.0" "sha256-jbLoJOgFRNSPaFv/diM8L0mTGIB2IjAzHqx/QH7lriQ="; + types-aiobotocore-iotfleetwise = buildTypesAiobotocorePackage "iotfleetwise" "2.9.0" "sha256-Sdnl//LbfuifTiQXyvDprkaZi9/MG1i51QijsKNyvp0="; - types-aiobotocore-iotsecuretunneling = buildTypesAiobotocorePackage "iotsecuretunneling" "2.6.0" "sha256-8zvG95bDvJWNRmw9sCdBfPxQPdb4TNAzqMcth+hliLI="; + types-aiobotocore-iotsecuretunneling = buildTypesAiobotocorePackage "iotsecuretunneling" "2.9.0" "sha256-d4/KliyqdzNJRICYyU6aTs1rrzF+W7B7xpywPG5KDik="; - types-aiobotocore-iotsitewise = buildTypesAiobotocorePackage "iotsitewise" "2.6.0" "sha256-1i4Z4CE9PG7JByR9RpPazu7RmPIjNeDecnz5LH2ls2A="; + types-aiobotocore-iotsitewise = buildTypesAiobotocorePackage "iotsitewise" "2.9.0" "sha256-6+nlzU+QZYgNoaE39Md9hT0vYM3DLQoRl5jIEK2HiGQ="; - types-aiobotocore-iotthingsgraph = buildTypesAiobotocorePackage "iotthingsgraph" "2.6.0" "sha256-6161RDBwnvqvBtJWs5bPieI6AdwKFCmiT6ixKRE9GuM="; + types-aiobotocore-iotthingsgraph = buildTypesAiobotocorePackage "iotthingsgraph" "2.9.0" "sha256-Ou+3C8Gir/InKP5sLv08F6M9FOH51/bQSpqoAezjr44="; - types-aiobotocore-iottwinmaker = buildTypesAiobotocorePackage "iottwinmaker" "2.6.0" "sha256-/h85AoG+poq4t0EvpXdofWfbaEBD6CiCxhdaGKLi4C0="; + types-aiobotocore-iottwinmaker = buildTypesAiobotocorePackage "iottwinmaker" "2.9.0" "sha256-9fi9KvxlvSjBSDBtpvzKUQ8AA1Bl+awBgA4kckOF5+w="; - types-aiobotocore-iotwireless = buildTypesAiobotocorePackage "iotwireless" "2.6.0" "sha256-kuOboqDTHpdSW6vD/JGOdLL2U639wM+2V2KaSm1j0xo="; + types-aiobotocore-iotwireless = buildTypesAiobotocorePackage "iotwireless" "2.9.0" "sha256-GIPR7G7l1BTFVrURSJsJKwCwjXozrIyHZqdLzWrLj2A="; - types-aiobotocore-ivs = buildTypesAiobotocorePackage "ivs" "2.6.0" "sha256-CiMKW2suhsU2dZsLQkL3hK2qKRJ56FS4Ix7Dt347bMA="; + types-aiobotocore-ivs = buildTypesAiobotocorePackage "ivs" "2.9.0" "sha256-XXUYFZqxU9K6UZEpFxQORvqmpC/b3/JFOI3P1IX08kc="; - types-aiobotocore-ivs-realtime = buildTypesAiobotocorePackage "ivs-realtime" "2.6.0" "sha256-y4RRQdjaJS9GLW7HUNC9f3kWCOAGijlisrlB0MYQ1As="; + types-aiobotocore-ivs-realtime = buildTypesAiobotocorePackage "ivs-realtime" "2.9.0" "sha256-HFRzKZmGZQJO//hoP6Buha2KH1JVbwvQW8N4IG69ZdA="; - types-aiobotocore-ivschat = buildTypesAiobotocorePackage "ivschat" "2.6.0" "sha256-5ANdk601wY6vtjYbe8CxtY9lK4Fe6wbl5uB6Mq6uqII="; + types-aiobotocore-ivschat = buildTypesAiobotocorePackage "ivschat" "2.9.0" "sha256-P+PaFBQs24/KTvcmAU7AtLeKW/sfePbRj++m8lQdgLY="; - types-aiobotocore-kafka = buildTypesAiobotocorePackage "kafka" "2.6.0" "sha256-cvmNob4pGa18W/2uh16zFJ58f0MHRDL2LwOKrsO16uI="; + types-aiobotocore-kafka = buildTypesAiobotocorePackage "kafka" "2.9.0" "sha256-TCgBYbKAaohObSeBuJ8jOjHZASNJrS16RTVdSCFLOjc="; - types-aiobotocore-kafkaconnect = buildTypesAiobotocorePackage "kafkaconnect" "2.6.0" "sha256-pOk51+FrlKDNPPDaa1mf3HjpCqlUskeRYITkFp91l6M="; + types-aiobotocore-kafkaconnect = buildTypesAiobotocorePackage "kafkaconnect" "2.9.0" "sha256-w8XWZ2J7LKHe9fmS/bI0tzX/Pp8ezHYZs6bgSeI0CxI="; - types-aiobotocore-kendra = buildTypesAiobotocorePackage "kendra" "2.6.0" "sha256-1WeJI++z4QiF0bZ4FyNgoNWY6X62ZCyq7PGNM9urFn4="; + types-aiobotocore-kendra = buildTypesAiobotocorePackage "kendra" "2.9.0" "sha256-4T9pwC8a61FQZgWj57NbH4uJBN3OeDAmOJLd/ZQOf04="; - types-aiobotocore-kendra-ranking = buildTypesAiobotocorePackage "kendra-ranking" "2.6.0" "sha256-uaeHdW8lew6jq2KQApkY76eWRkYVLffN0h71icP9viE="; + types-aiobotocore-kendra-ranking = buildTypesAiobotocorePackage "kendra-ranking" "2.9.0" "sha256-MYirajXde6U4Qy1gMT9WeZ8A778jVNeSV7ms4IWmwRA="; - types-aiobotocore-keyspaces = buildTypesAiobotocorePackage "keyspaces" "2.6.0" "sha256-vbWWkLbVnzfWHp3Yy3S6mh0+tHrkA/5Krw4GVSdILls="; + types-aiobotocore-keyspaces = buildTypesAiobotocorePackage "keyspaces" "2.9.0" "sha256-VMRYuJ97TdlvfYLbnzIzh/bDrYM5JfMS0eEHltXT1Hc="; - types-aiobotocore-kinesis = buildTypesAiobotocorePackage "kinesis" "2.6.0" "sha256-n5u7dzAnZ7YRGIC2qyynlsALR7tONulc0ZmimW+xotk="; + types-aiobotocore-kinesis = buildTypesAiobotocorePackage "kinesis" "2.9.0" "sha256-EV//x+21dM7Olz876nZlUZVFlabuCothyxFrT7MpcqA="; - types-aiobotocore-kinesis-video-archived-media = buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.6.0" "sha256-mjY7GbQ20pzL38tQMoluJISpaxk/IreluvmX7XsLfTg="; + types-aiobotocore-kinesis-video-archived-media = buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.9.0" "sha256-lP+YgnzAB5e1F2OAwFyPHslYiNZswc6tSLZ4F9OpfD4="; - types-aiobotocore-kinesis-video-media = buildTypesAiobotocorePackage "kinesis-video-media" "2.6.0" "sha256-8kK4JurIaid4k0BkpoZkaosn7cOIyMTt0RXnoJZUtSc="; + types-aiobotocore-kinesis-video-media = buildTypesAiobotocorePackage "kinesis-video-media" "2.9.0" "sha256-VvXlHziQ/ehNaZ7r8DRwXCviK1Zwi04805+josYiIjg="; - types-aiobotocore-kinesis-video-signaling = buildTypesAiobotocorePackage "kinesis-video-signaling" "2.6.0" "sha256-nUOb5NwCsz/7Z0bUMUsxysn2bgNi+yTvyGGCkwzCU1o="; + types-aiobotocore-kinesis-video-signaling = buildTypesAiobotocorePackage "kinesis-video-signaling" "2.9.0" "sha256-essOlk7mViB1gaphCiybJncXX7USKk3K7Rt1r+ecTBk="; - types-aiobotocore-kinesis-video-webrtc-storage = buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.6.0" "sha256-Tw+ozecMKAw56x47Wqq3wwwcmDT+5LvoUDAZSX0z2I4="; + types-aiobotocore-kinesis-video-webrtc-storage = buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.9.0" "sha256-KGlU4WaBWQh7nvaqmktkpaSvyJSGtQ2//io9puKB9qA="; - types-aiobotocore-kinesisanalytics = buildTypesAiobotocorePackage "kinesisanalytics" "2.6.0" "sha256-QY5tN7QVP2WC7P/se6wNrnLp3sJVIr/rTEs9ePpADPE="; + types-aiobotocore-kinesisanalytics = buildTypesAiobotocorePackage "kinesisanalytics" "2.9.0" "sha256-2SnuovecO3+lQwNfA1+CtifQWkuall8zQbMNvH7fQGo="; - types-aiobotocore-kinesisanalyticsv2 = buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.6.0" "sha256-aedmxGOuU70uX/+bQL8coUWBpk9IQHAL7VqusH8zPbs="; + types-aiobotocore-kinesisanalyticsv2 = buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.9.0" "sha256-O0W2jEiHV1XCmZq+DtrkRZXJSIiUulsX7Tt+oVLjOcY="; - types-aiobotocore-kinesisvideo = buildTypesAiobotocorePackage "kinesisvideo" "2.6.0" "sha256-wyT6YahL3sRGHQcBTAyLd7l75wVWRp2waS+Q46Me/ok="; + types-aiobotocore-kinesisvideo = buildTypesAiobotocorePackage "kinesisvideo" "2.9.0" "sha256-tv1mzlK2ccp6Ea9bBNrTHo5E6gCWr1OHR/M7119bM00="; - types-aiobotocore-kms = buildTypesAiobotocorePackage "kms" "2.6.0" "sha256-mY26ICYSENAruEn4986zxi5R9ong4nyuRAHgMZDliqo="; + types-aiobotocore-kms = buildTypesAiobotocorePackage "kms" "2.9.0" "sha256-I3NUNatXbcd5bJJlwox92ZLHH8K0i7Eg05ygdPsgT8E="; - types-aiobotocore-lakeformation = buildTypesAiobotocorePackage "lakeformation" "2.6.0" "sha256-CR3Uopf6izBTlR16yIA3CUikWrS3OzkFZFpbJNDhBVs="; + types-aiobotocore-lakeformation = buildTypesAiobotocorePackage "lakeformation" "2.9.0" "sha256-jcCQw7bdwDGSkkPFI9t7vxvHpVRuqI99myHWzFG+ivc="; - types-aiobotocore-lambda = buildTypesAiobotocorePackage "lambda" "2.6.0" "sha256-pkZMQu5himEPO7z/AF7INb7H7jjmkyQV1ql2epF4yYA="; + types-aiobotocore-lambda = buildTypesAiobotocorePackage "lambda" "2.9.0" "sha256-p0gG1HwHYTk7TuE6BiPPhxEcegoCqu4JLdXoFpyy5Ps="; - types-aiobotocore-lex-models = buildTypesAiobotocorePackage "lex-models" "2.6.0" "sha256-sIQ85LzkQgMvVfAKEc5HxIXx85Tckx4HVXcex2hxZ6I="; + types-aiobotocore-lex-models = buildTypesAiobotocorePackage "lex-models" "2.9.0" "sha256-iapgXNpWmUuQtDmSouZoBf770ZFFeBg2qCxkmhNR1lc="; - types-aiobotocore-lex-runtime = buildTypesAiobotocorePackage "lex-runtime" "2.6.0" "sha256-IZvLF0Wg7od/LqC2bcCxtvNun0n9JViuXE/CQMoBdMc="; + types-aiobotocore-lex-runtime = buildTypesAiobotocorePackage "lex-runtime" "2.9.0" "sha256-9A47OeYzpWp+k02C77P8gHpdEHom7XmEH8JS2mh5TAA="; - types-aiobotocore-lexv2-models = buildTypesAiobotocorePackage "lexv2-models" "2.6.0" "sha256-9eebhFQqnsParfZ1poJJX/ehx1lNHIynFwXEzAo10JM="; + types-aiobotocore-lexv2-models = buildTypesAiobotocorePackage "lexv2-models" "2.9.0" "sha256-IqM3pr5JDBylz73YilEChhlEvvk1H9+lx24E0DvbPMA="; - types-aiobotocore-lexv2-runtime = buildTypesAiobotocorePackage "lexv2-runtime" "2.6.0" "sha256-ot+oM2a+CA/92d+tY54tqdOlsZWReknv+Pt3Aw8V1GU="; + types-aiobotocore-lexv2-runtime = buildTypesAiobotocorePackage "lexv2-runtime" "2.9.0" "sha256-8Uuu8yCz7GkVoAyCAJGO8TdKyVAV9aScjLguHvPzMT0="; - types-aiobotocore-license-manager = buildTypesAiobotocorePackage "license-manager" "2.6.0" "sha256-iNlzgcjg3VrIZJEi2f+7msFqrfWsUS24k7OERB28uRo="; + types-aiobotocore-license-manager = buildTypesAiobotocorePackage "license-manager" "2.9.0" "sha256-LFojS+okyetuWB/i2NBXWb2rAkqziigx0cq5xj+YSsk="; - types-aiobotocore-license-manager-linux-subscriptions = buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.6.0" "sha256-1exWgnbG5ikd1pHWClPGq3Luku5qyTtG6pwvqL/zWdk="; + types-aiobotocore-license-manager-linux-subscriptions = buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.9.0" "sha256-XQC3AGX/PtX9/c5NmwuIBPsXIuaUobSf6Bn+WYgSvJw="; - types-aiobotocore-license-manager-user-subscriptions = buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.6.0" "sha256-0fLwCr5eDRxcGZdw3sqExh8awX1qu5XmEYMD63xhD3w="; + types-aiobotocore-license-manager-user-subscriptions = buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.9.0" "sha256-sdUnhXztbU0Ud39fzE/bWvOknrivY+qpLgSY5myURro="; - types-aiobotocore-lightsail = buildTypesAiobotocorePackage "lightsail" "2.6.0" "sha256-eiibXP8S+xvn+PTX8cd3WiN6yL2JmjK9EG9BryexFjY="; + types-aiobotocore-lightsail = buildTypesAiobotocorePackage "lightsail" "2.9.0" "sha256-tTrZxkme+JeyXeuyWI3F7lr9mB+thfJaukNmIyaPBZc="; - types-aiobotocore-location = buildTypesAiobotocorePackage "location" "2.6.0" "sha256-3zQZyDgaMuj5SAQ7Nc+XzF5dUi1E9bAjv9mIscJxfqM="; + types-aiobotocore-location = buildTypesAiobotocorePackage "location" "2.9.0" "sha256-5Tiufq/wTJ89p3K4x1k/40cbL89M0O3dF6POFYMNr4A="; - types-aiobotocore-logs = buildTypesAiobotocorePackage "logs" "2.6.0" "sha256-qyA1uCrAFGZHMlfL8Dou1YkM6rb9xwcrDQmteSqOadM="; + types-aiobotocore-logs = buildTypesAiobotocorePackage "logs" "2.9.0" "sha256-FrDg0lFXFTwBE81DZ4VOICgZLvDscip0k5oOGVXdRQ0="; - types-aiobotocore-lookoutequipment = buildTypesAiobotocorePackage "lookoutequipment" "2.6.0" "sha256-ilPodAPj7J6xVCPEjsBQcQ4I5dNMEM2/hM1j8PJMUto="; + types-aiobotocore-lookoutequipment = buildTypesAiobotocorePackage "lookoutequipment" "2.9.0" "sha256-IhhEOxTZVrKs6HxrkjssZEjV33wYX9rCpPG7SdinTRw="; - types-aiobotocore-lookoutmetrics = buildTypesAiobotocorePackage "lookoutmetrics" "2.6.0" "sha256-m/13nELWqdPNkZXmA3FhArlOKhB1CcbTaAsI9Iqzrik="; + types-aiobotocore-lookoutmetrics = buildTypesAiobotocorePackage "lookoutmetrics" "2.9.0" "sha256-TKzrgxj0rLBfeolbqKTSPjjZIJa7BC0wdpV2pY1K2BA="; - types-aiobotocore-lookoutvision = buildTypesAiobotocorePackage "lookoutvision" "2.6.0" "sha256-gW+GFoQhI1Mj412Gh3MXfoSMKpNscUB4AqC9WMF4ACI="; + types-aiobotocore-lookoutvision = buildTypesAiobotocorePackage "lookoutvision" "2.9.0" "sha256-TZKj6Vo0pEmwN7jlC2JxXhm9/IX58FJDRHqZSILF0zk="; - types-aiobotocore-m2 = buildTypesAiobotocorePackage "m2" "2.6.0" "sha256-DoFG4FxvJFnN54G5F2LZY5M0aYlCU9H5wwnAsiHaRmc="; + types-aiobotocore-m2 = buildTypesAiobotocorePackage "m2" "2.9.0" "sha256-7DFARf/Jd0cPLKl3sxttpLn2cBZpC/xMyzQZbIsiko0="; - types-aiobotocore-machinelearning = buildTypesAiobotocorePackage "machinelearning" "2.6.0" "sha256-VZajCqSzofQLUBrXbMzdaPmbIDNp5YuUUk1wberVcFs="; + types-aiobotocore-machinelearning = buildTypesAiobotocorePackage "machinelearning" "2.9.0" "sha256-UPTKT53+mTHnVmuMSaGhBT+KEYsaTvOdBcQ1Em/SEis="; 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-macie2 = buildTypesAiobotocorePackage "macie2" "2.9.0" "sha256-GmSUlIinWqaxsQpTsIWNgEsZXUdheMiDs/qpHfbGAUs="; - types-aiobotocore-managedblockchain = buildTypesAiobotocorePackage "managedblockchain" "2.6.0" "sha256-k/J7hBJDfGXMFR9jn7Tiec8bClrXIz6XyLMqLJad6oU="; + types-aiobotocore-managedblockchain = buildTypesAiobotocorePackage "managedblockchain" "2.9.0" "sha256-8ZTWT2U0eMkXqCbOTCMkKWo7x2lIyEAbSYZ2P0ssp3c="; - types-aiobotocore-managedblockchain-query = buildTypesAiobotocorePackage "managedblockchain-query" "2.6.0" "sha256-swmAlpVrP1eSvJatWaJL6QDfgZ0xzBttrpHt1aNULUk="; + types-aiobotocore-managedblockchain-query = buildTypesAiobotocorePackage "managedblockchain-query" "2.9.0" "sha256-0KUY9/My/m2dcxtw59yFZJHdCSZcrSfkdzHDgxBtEnE="; - types-aiobotocore-marketplace-catalog = buildTypesAiobotocorePackage "marketplace-catalog" "2.6.0" "sha256-9yD3FIFrRDMAckbztjrKeUEyXCUOggF5UfsPe5hcQ1Q="; + types-aiobotocore-marketplace-catalog = buildTypesAiobotocorePackage "marketplace-catalog" "2.9.0" "sha256-Bj1SMCXCljNw+1nakhnyvzqinyWliaE5YzvOaWrThfc="; - types-aiobotocore-marketplace-entitlement = buildTypesAiobotocorePackage "marketplace-entitlement" "2.6.0" "sha256-Q6S9pTfquW+Hv4uB9tbS/TEsC/i7iDfA+LyZCHq3cRI="; + types-aiobotocore-marketplace-entitlement = buildTypesAiobotocorePackage "marketplace-entitlement" "2.9.0" "sha256-DDozTz6pHq/BHmU8ikS18G+uIXGldY2QsOOAMycvogA="; - types-aiobotocore-marketplacecommerceanalytics = buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.6.0" "sha256-iyHFWN8tWgQoShTO6bJQB89K+4JVWjMihzjMr2Lssvw="; + types-aiobotocore-marketplacecommerceanalytics = buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.9.0" "sha256-/QjGbtwTKhmADkR2NXN304fDH3+oiB3I1Ykvsajexl4="; - types-aiobotocore-mediaconnect = buildTypesAiobotocorePackage "mediaconnect" "2.6.0" "sha256-hEwlISpSm6r+a1MXxSH3UrBOiNu+Cx9d1T2RsFfrcyA="; + types-aiobotocore-mediaconnect = buildTypesAiobotocorePackage "mediaconnect" "2.9.0" "sha256-kYZBNr9zEjtTFXgk69fw2ZpsDxw49XzmtCVoqmIRBpA="; - types-aiobotocore-mediaconvert = buildTypesAiobotocorePackage "mediaconvert" "2.6.0" "sha256-VdxG2yvN6g9UAn54OP6uafHGN+iHjNrfO4H5f5h6w18="; + types-aiobotocore-mediaconvert = buildTypesAiobotocorePackage "mediaconvert" "2.9.0" "sha256-HnCyx0mhKwwyKKF1gsMkUbHUSBXJURtZKL2krl3wPyY="; - types-aiobotocore-medialive = buildTypesAiobotocorePackage "medialive" "2.6.0" "sha256-hrfqkhKWIcP+fjDaeFjvk6c6GBTgsY3yxPodx9fFpxk="; + types-aiobotocore-medialive = buildTypesAiobotocorePackage "medialive" "2.9.0" "sha256-VGqfVzvxAgF12UktAKEEvp7gdwF/Uvs1wF0Fv23/o7U="; - types-aiobotocore-mediapackage = buildTypesAiobotocorePackage "mediapackage" "2.6.0" "sha256-c7XLKvwiQL6e0tWH0DmOyauTz3q5b0hOVpjVzR1rmH8="; + types-aiobotocore-mediapackage = buildTypesAiobotocorePackage "mediapackage" "2.9.0" "sha256-E/5E4rIgle3Ge8h1jXg0EImztJamLWGTx3unCS3i3Wo="; - types-aiobotocore-mediapackage-vod = buildTypesAiobotocorePackage "mediapackage-vod" "2.6.0" "sha256-zw2mJFQgX9xqjsvldssfMeulgCEY0kqaNg+nUe9PpCc="; + types-aiobotocore-mediapackage-vod = buildTypesAiobotocorePackage "mediapackage-vod" "2.9.0" "sha256-Ly2iBYcmbmfzFhjXwVpnVkLYiYBVnb2cIQLEQ1PHHPs="; - types-aiobotocore-mediapackagev2 = buildTypesAiobotocorePackage "mediapackagev2" "2.6.0" "sha256-fdZn+f03iIzzkpSCdTh2uUY4WcU1DcyRxozP7SSkGyo="; + types-aiobotocore-mediapackagev2 = buildTypesAiobotocorePackage "mediapackagev2" "2.9.0" "sha256-j7vEKKolHogemhfN8p3RDdLLUCIm4XK4LbgTN1RjHVc="; - types-aiobotocore-mediastore = buildTypesAiobotocorePackage "mediastore" "2.6.0" "sha256-KoZKeJPlIWhgifauIOSSLZaSJWn3E0lSNUOhKPfI0Go="; + types-aiobotocore-mediastore = buildTypesAiobotocorePackage "mediastore" "2.9.0" "sha256-sijOkeKG3EZU2aMkgVHhfnEVJCw/6LjCj3yn514BxHE="; - types-aiobotocore-mediastore-data = buildTypesAiobotocorePackage "mediastore-data" "2.6.0" "sha256-HT/Kvi15YJLEno70ayEXQLPi9Y6NlRD8134IRJ7gdRY="; + types-aiobotocore-mediastore-data = buildTypesAiobotocorePackage "mediastore-data" "2.9.0" "sha256-YmAiMfw/OPkzyFQCqutBCcPHLgGnTTd64zZA+IQktSQ="; - types-aiobotocore-mediatailor = buildTypesAiobotocorePackage "mediatailor" "2.6.0" "sha256-3F1Gpd2kOU1rS7iSyDr0pkRECqYsyeeEQKDH2OO9H/A="; + types-aiobotocore-mediatailor = buildTypesAiobotocorePackage "mediatailor" "2.9.0" "sha256-fvf8n0wwbaJQd6T+zag7fLW4DYFs97YA7PS4LjvrK6g="; - types-aiobotocore-medical-imaging = buildTypesAiobotocorePackage "medical-imaging" "2.6.0" "sha256-zUXGqquEveHHDqA8XeJX++Yc42rnyW9Vzt5A7LOImfk="; + types-aiobotocore-medical-imaging = buildTypesAiobotocorePackage "medical-imaging" "2.9.0" "sha256-APuySk3bcst59XgijDYhuphIM2jqUFpjwiI1B9IcVA8="; - types-aiobotocore-memorydb = buildTypesAiobotocorePackage "memorydb" "2.6.0" "sha256-FJ9aeZRCY+bhot3cU3qX4EuFAowPCc7kT2D0FGVTpys="; + types-aiobotocore-memorydb = buildTypesAiobotocorePackage "memorydb" "2.9.0" "sha256-k0gaSat1viRrS1vH+xuGxO8zUAY5BucpbKFshKR/Gv0="; - types-aiobotocore-meteringmarketplace = buildTypesAiobotocorePackage "meteringmarketplace" "2.6.0" "sha256-WsWw1y5XueMQnRTWYQP73GawsSzEsliPzu9Xlij3UAo="; + types-aiobotocore-meteringmarketplace = buildTypesAiobotocorePackage "meteringmarketplace" "2.9.0" "sha256-MS5ZMEW0iaHhjIgqTXLNNuYEBN9L5djCQupJfayNLx4="; - types-aiobotocore-mgh = buildTypesAiobotocorePackage "mgh" "2.6.0" "sha256-7wvX7X/NdB+GlWDogT2benTSC7ZCdVv97Zi6r+s5B2E="; + types-aiobotocore-mgh = buildTypesAiobotocorePackage "mgh" "2.9.0" "sha256-g0uAmEucyImVVykA5g4BBclrd/n8Cl9hm2vkPpL21Vo="; - types-aiobotocore-mgn = buildTypesAiobotocorePackage "mgn" "2.6.0" "sha256-e6TTldFkZXf8A8bV7RKkIl6AD/lCC9elB6mT3WeWEiM="; + types-aiobotocore-mgn = buildTypesAiobotocorePackage "mgn" "2.9.0" "sha256-xNecFvFbcQGCeE4ImLQYAB+/gv7ThrQC/E0CPoslcdA="; - types-aiobotocore-migration-hub-refactor-spaces = buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.6.0" "sha256-HVoia2UZMrjgH6aUQGit+MueUk0qW3KjWKYJy2pHlp0="; + types-aiobotocore-migration-hub-refactor-spaces = buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.9.0" "sha256-zPm3aK/YaBfrkcnU2l1zN1RMl+hdiqcsBke1zwlxbt4="; - types-aiobotocore-migrationhub-config = buildTypesAiobotocorePackage "migrationhub-config" "2.6.0" "sha256-hXju28oSNGlQ0qCwFD+qoyWFpKMbFkGWEXteOVOKiII="; + types-aiobotocore-migrationhub-config = buildTypesAiobotocorePackage "migrationhub-config" "2.9.0" "sha256-XG30N9nTD8JPdIsbRb3A1YgUpzZCFx4CH9Q6i5LOPJM="; - types-aiobotocore-migrationhuborchestrator = buildTypesAiobotocorePackage "migrationhuborchestrator" "2.6.0" "sha256-mo4vH/xsbRf1UViSRu4P2YzI+7LFkkzXsHeZZLdXg+U="; + types-aiobotocore-migrationhuborchestrator = buildTypesAiobotocorePackage "migrationhuborchestrator" "2.9.0" "sha256-umzeHkjT+3mMucBJ8Md4V2RCuv7K51gZ/bJniv00+9Q="; - types-aiobotocore-migrationhubstrategy = buildTypesAiobotocorePackage "migrationhubstrategy" "2.6.0" "sha256-eU4j+9z++Kgp2TaUX214XGuIXPxCriKu9w+XW8mZp+c="; + types-aiobotocore-migrationhubstrategy = buildTypesAiobotocorePackage "migrationhubstrategy" "2.9.0" "sha256-AkZAtkQXJ9ygWVerPMbd2qLmeaXpe0tztITkVlSjuzU="; - types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.6.0" "sha256-HKolI0fcGWye3Xow73qXOJRQ/Wb23ZXWLYyfA94zZT0="; + types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.9.0" "sha256-KLXvbCcc3OAEC5vBeDeBzaVaK1Kxw0jjhUS/1OdwOb8="; - types-aiobotocore-mq = buildTypesAiobotocorePackage "mq" "2.6.0" "sha256-61iFbkOYLF6y1QUGePVAVEFqGgTmPbLYS7VDbvzmInA="; + types-aiobotocore-mq = buildTypesAiobotocorePackage "mq" "2.9.0" "sha256-mi26QEURtPYs0r1iCEOpDlcKl1ioESD3GDh6shUQUzw="; - types-aiobotocore-mturk = buildTypesAiobotocorePackage "mturk" "2.6.0" "sha256-pdRp9XjLVLCHeMSMV+NycKNt9kbH93/ZJKbiwNlb+A4="; + types-aiobotocore-mturk = buildTypesAiobotocorePackage "mturk" "2.9.0" "sha256-X9E9lrFhfRHqfPZmOj1PtAHMLlz+2elYsUrb10/Wgzc="; - types-aiobotocore-mwaa = buildTypesAiobotocorePackage "mwaa" "2.6.0" "sha256-3/LXxvsVmKHpZPr1BISTndLFPmF3LF75kihknSt2cMk="; + types-aiobotocore-mwaa = buildTypesAiobotocorePackage "mwaa" "2.9.0" "sha256-l0ObDU6cjOCZOdcs047zx/1yoaZ8KN/3HEjAwYe9VK8="; - types-aiobotocore-neptune = buildTypesAiobotocorePackage "neptune" "2.6.0" "sha256-2EIBP4NhRy+/OeFuPP/SIf1q6BhlKU9CFH7AM+y3558="; + types-aiobotocore-neptune = buildTypesAiobotocorePackage "neptune" "2.9.0" "sha256-cTEuEXJU/SzRNgxH1XjfFi/r7JCcB2Pru7mKckjBQ7U="; - types-aiobotocore-network-firewall = buildTypesAiobotocorePackage "network-firewall" "2.6.0" "sha256-3bVNQSzaMhkpiN1mhS9Lz2EfeEJpkSIcPCKPC6s02Uo="; + types-aiobotocore-network-firewall = buildTypesAiobotocorePackage "network-firewall" "2.9.0" "sha256-WtJSxvpB1T9CCaKnjBpsOJSelZtP8ySwpWeYiaJD1MA="; - types-aiobotocore-networkmanager = buildTypesAiobotocorePackage "networkmanager" "2.6.0" "sha256-Pwmgi4ybpOtLWlY62+QcBHT0iF/6B4Hxbv4CQPA+7/o="; + types-aiobotocore-networkmanager = buildTypesAiobotocorePackage "networkmanager" "2.9.0" "sha256-tDkjd34+PRsaypovhsY9AER8VbnyrrCx/njtxO7CJEk="; - types-aiobotocore-nimble = buildTypesAiobotocorePackage "nimble" "2.6.0" "sha256-x+wmTG6jeK8KpSDdhOZkbkRZ7ai7N4xaU4cEmHhO5xA="; + types-aiobotocore-nimble = buildTypesAiobotocorePackage "nimble" "2.9.0" "sha256-JuAsL2FAqZL8n8ODVpmQo38YJKBKzHT2VRAWVmPgvzI="; - types-aiobotocore-oam = buildTypesAiobotocorePackage "oam" "2.6.0" "sha256-Q/msYeaXs9MxXj6X0p8Gw08/Y4FvvV2xAbEXU6iqi2g="; + types-aiobotocore-oam = buildTypesAiobotocorePackage "oam" "2.9.0" "sha256-GQVHH8NbG8Uzd0dPc5MaNpDIPGct/07JsokCwi3JfxY="; - types-aiobotocore-omics = buildTypesAiobotocorePackage "omics" "2.6.0" "sha256-UB0y0l2fb58yNJr36WpCeTDETAcdQkYd2ueETFEQSTo="; + types-aiobotocore-omics = buildTypesAiobotocorePackage "omics" "2.9.0" "sha256-Aq/0h7leT1KU+nQZWjg+KNhgV3osRREQv+QTMpYTZek="; - types-aiobotocore-opensearch = buildTypesAiobotocorePackage "opensearch" "2.6.0" "sha256-ynRq7qRVNgpsP4lp6pbZqTv3zrF5Zu1v+STvv/yPgKw="; + types-aiobotocore-opensearch = buildTypesAiobotocorePackage "opensearch" "2.9.0" "sha256-lHZbMOVxTMolfPUCikFyK2REkgjnCMY49P5U4W4g/Iw="; - types-aiobotocore-opensearchserverless = buildTypesAiobotocorePackage "opensearchserverless" "2.6.0" "sha256-M2tvTKjIg8aEP3KZvrMTCgiJqb6oWL9T5ylkj+Fr184="; + types-aiobotocore-opensearchserverless = buildTypesAiobotocorePackage "opensearchserverless" "2.9.0" "sha256-COWGlK+XlrEtq5Xqg7x+hrFO7HU7uCLEOXDE2p9U3aI="; - types-aiobotocore-opsworks = buildTypesAiobotocorePackage "opsworks" "2.6.0" "sha256-XY9DqNQUjFaumcOd2dvX/kV2sWt67Ni26H5SzCarr2E="; + types-aiobotocore-opsworks = buildTypesAiobotocorePackage "opsworks" "2.9.0" "sha256-8W8uYZ/HqFcFgJubslCwIp1CpbrUNza3Ef0Pk7V76zg="; - types-aiobotocore-opsworkscm = buildTypesAiobotocorePackage "opsworkscm" "2.6.0" "sha256-k1QO54TXJJG5jAvPcoEyZEdEXSmLzHdSPDyF60Zmf78="; + types-aiobotocore-opsworkscm = buildTypesAiobotocorePackage "opsworkscm" "2.9.0" "sha256-b5K01pxx7Mc5ykpssw/bxY7/PBSSa7a/nIcbcd3oz7w="; - types-aiobotocore-organizations = buildTypesAiobotocorePackage "organizations" "2.6.0" "sha256-kDxDdLaWlaNLfSCOc5Kho73cbk33FnK9c12PYKhdbFQ="; + types-aiobotocore-organizations = buildTypesAiobotocorePackage "organizations" "2.9.0" "sha256-H92GHj8b2aeN2REWpG1EvyLv2HWjFZxg2DgQXH9BbPg="; - types-aiobotocore-osis = buildTypesAiobotocorePackage "osis" "2.6.0" "sha256-Q8EIdCvT0Zjj9udUNpWZzgNClVjNBWTW3V7emhdf+yg="; + types-aiobotocore-osis = buildTypesAiobotocorePackage "osis" "2.9.0" "sha256-0Dxf0aa76MBWX5TSdSWoFemHJ7wKqzj+vPDgZ9yMQTY="; - types-aiobotocore-outposts = buildTypesAiobotocorePackage "outposts" "2.6.0" "sha256-tXAQ+tNeZUF1snrB+76Ku+j1Wdslah38s0YMBOINrlo="; + types-aiobotocore-outposts = buildTypesAiobotocorePackage "outposts" "2.9.0" "sha256-62W37n830OMhhCTsEP1r5mrCY8MZZM+OPgvZ/ox4S70="; - types-aiobotocore-panorama = buildTypesAiobotocorePackage "panorama" "2.6.0" "sha256-/XJsZV5Yhp5BMSheF9zVf+MSJsH2zUrpnrkSwo+4PfI="; + types-aiobotocore-panorama = buildTypesAiobotocorePackage "panorama" "2.9.0" "sha256-OBQI+qRwV3nB29WFuIPxXIc2fV5RaMaaCiJtYTKp28A="; - types-aiobotocore-payment-cryptography = buildTypesAiobotocorePackage "payment-cryptography" "2.6.0" "sha256-x6uUO578BIDl1kFdyKXSPnegKLAX3FG4U5rDjsQpVQQ="; + types-aiobotocore-payment-cryptography = buildTypesAiobotocorePackage "payment-cryptography" "2.9.0" "sha256-3qawANwA/wOWqNl3Q6RKS2CLb1pw8K6dbX4jW2MAHEc="; - types-aiobotocore-payment-cryptography-data = buildTypesAiobotocorePackage "payment-cryptography-data" "2.6.0" "sha256-+eHgcPA+egPBR06Mddw0RXuivpiprPMnBhPfCmh0sS4="; + types-aiobotocore-payment-cryptography-data = buildTypesAiobotocorePackage "payment-cryptography-data" "2.9.0" "sha256-adLvjvZNRcNM07nvr3Frh5a2X7wgOuxdZ21iLnw9crU="; - types-aiobotocore-personalize = buildTypesAiobotocorePackage "personalize" "2.6.0" "sha256-5s0KmOdQyPtcFtb+XkR/zHEiEdZcDwZwldwUy+dvC4s="; + types-aiobotocore-personalize = buildTypesAiobotocorePackage "personalize" "2.9.0" "sha256-apNRfsAdZHuqs3SMUgnuZun8GbCog/5s7MSdyVIHz5Y="; - types-aiobotocore-personalize-events = buildTypesAiobotocorePackage "personalize-events" "2.6.0" "sha256-+9wtXNgXQhACa8NYfcjbZcJj0j9PlOavxs+c4NXy0kE="; + types-aiobotocore-personalize-events = buildTypesAiobotocorePackage "personalize-events" "2.9.0" "sha256-sxcApDREahAvxXswhv7iZkrYXcjdOGa//SFSvtlHMJ0="; - types-aiobotocore-personalize-runtime = buildTypesAiobotocorePackage "personalize-runtime" "2.6.0" "sha256-tvLfXhaFpdivIBtFYp0G4/QihOMSGXK1nVDFKuMJCto="; + types-aiobotocore-personalize-runtime = buildTypesAiobotocorePackage "personalize-runtime" "2.9.0" "sha256-eurE8IY3eyuUjj3rhT59xu0KHRnbJy/OL05XKBov0Y8="; - types-aiobotocore-pi = buildTypesAiobotocorePackage "pi" "2.6.0" "sha256-j0ngXkDGIhSh/b1RPn+NY6V2BAUZJdvuT18iALwRkAY="; + types-aiobotocore-pi = buildTypesAiobotocorePackage "pi" "2.9.0" "sha256-bWg/J1JyM4pkKalsMqUMPMYJ+T+SSzR4P0+VJTSodWM="; - types-aiobotocore-pinpoint = buildTypesAiobotocorePackage "pinpoint" "2.6.0" "sha256-Txme0jlgoF9IYywdKqv71kcEqBfF1juTJcagi/2wQ20="; + types-aiobotocore-pinpoint = buildTypesAiobotocorePackage "pinpoint" "2.9.0" "sha256-jKAsxMwQCI/DOY8HiRmmXdVqWAoVD4ULdwSoU18kmJs="; - types-aiobotocore-pinpoint-email = buildTypesAiobotocorePackage "pinpoint-email" "2.6.0" "sha256-c6tqmW7i5AXrH2PFyVPCpBkDaiMdTu2fmbHeuc3SzPg="; + types-aiobotocore-pinpoint-email = buildTypesAiobotocorePackage "pinpoint-email" "2.9.0" "sha256-JgTZiFxdBNTAHT7X3LdTTEvI5Z+MjF6JcZ8zbjZxsSA="; - types-aiobotocore-pinpoint-sms-voice = buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.6.0" "sha256-qvVYusxMw+ZrMJAKXqk1HzEDYHsvaUthnYMDF6b0xbQ="; + types-aiobotocore-pinpoint-sms-voice = buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.9.0" "sha256-HGsiBhxwTVKUFQgGlx17n0/HUEL7/FIHgxKxFg4Vsc8="; - types-aiobotocore-pinpoint-sms-voice-v2 = buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.6.0" "sha256-ErqAFQYtKfsNABPm+KpOKm88Mh5MmXou6bqJfsqXdt0="; + types-aiobotocore-pinpoint-sms-voice-v2 = buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.9.0" "sha256-fXszL3FutdKRAkh3gWvu5xiGlvy3Nn/r0MCKYW5UAYg="; - types-aiobotocore-pipes = buildTypesAiobotocorePackage "pipes" "2.6.0" "sha256-vOszu7z/DiZwXrdqoiLUlpLQLNNuRbskI59BBippizI="; + types-aiobotocore-pipes = buildTypesAiobotocorePackage "pipes" "2.9.0" "sha256-Qs9ndgWnw7yUvKJcI36i8c1imwWvX3isJocEYjj93Ls="; - types-aiobotocore-polly = buildTypesAiobotocorePackage "polly" "2.6.0" "sha256-AKP23N3xMzdOti6J7vONDM/cwdqTHYkiM6c/njspSXI="; + types-aiobotocore-polly = buildTypesAiobotocorePackage "polly" "2.9.0" "sha256-9PNsD5t7iZh+Bcnbqbq1RV7IMbDT/IptteaUsJB+AKs="; - types-aiobotocore-pricing = buildTypesAiobotocorePackage "pricing" "2.6.0" "sha256-PccslOI6F2k50g03j22AYN3xtTsTW3ie4W4pEaT2XwY="; + types-aiobotocore-pricing = buildTypesAiobotocorePackage "pricing" "2.9.0" "sha256-zYgDgmqCshI/LbmZYO+X9+sq1Bi3xlBDugnqVfewu1Q="; - types-aiobotocore-privatenetworks = buildTypesAiobotocorePackage "privatenetworks" "2.6.0" "sha256-3e6/IA6QYgGhipt5XP/b4h3soko1tLntMieXOmeWjlI="; + types-aiobotocore-privatenetworks = buildTypesAiobotocorePackage "privatenetworks" "2.9.0" "sha256-QX/fr036L4eVPdUnUexEDJc++oIx8WJRwI1YmnFuYqc="; - types-aiobotocore-proton = buildTypesAiobotocorePackage "proton" "2.6.0" "sha256-rtJ+idGSdRVZafFNppQgIQUobKzClCKHf4RqlBtppBw="; + types-aiobotocore-proton = buildTypesAiobotocorePackage "proton" "2.9.0" "sha256-zx4Zt8J/xgql2vu/tZgwmFLWq+2bhhq2u6q08L5nkBY="; - types-aiobotocore-qldb = buildTypesAiobotocorePackage "qldb" "2.6.0" "sha256-AqV8yAUYTT8nc3jQkq0qDzZRKxewsrxIR/kVJiX3fwI="; + types-aiobotocore-qldb = buildTypesAiobotocorePackage "qldb" "2.9.0" "sha256-0Ob22rt0ZfEuoez9knN5BegTWTI+T0cwH96rkKHWVWg="; - types-aiobotocore-qldb-session = buildTypesAiobotocorePackage "qldb-session" "2.6.0" "sha256-N4YntFIEyhhryAaIFY8Gu4Uehw6D/VcTeIlBxx7ej4c="; + types-aiobotocore-qldb-session = buildTypesAiobotocorePackage "qldb-session" "2.9.0" "sha256-TVm24eYojgTrdWzFKgL2pkjekx9Bd8cqTKVGybs+2Bw="; - types-aiobotocore-quicksight = buildTypesAiobotocorePackage "quicksight" "2.6.0" "sha256-DOum/vx6URynxImQN9SRhAr5rFgZdSJMdtAMom5YHe8="; + types-aiobotocore-quicksight = buildTypesAiobotocorePackage "quicksight" "2.9.0" "sha256-RTV8LwRM/lNYFCx4L2PnJhXHCjeDHKsMmHATcUOd2R8="; - types-aiobotocore-ram = buildTypesAiobotocorePackage "ram" "2.6.0" "sha256-pZ/h8/1njNNp9+nhpbU/VhGevrZkSrWnhWm3weHAxWQ="; + types-aiobotocore-ram = buildTypesAiobotocorePackage "ram" "2.9.0" "sha256-twdBnpMqPTyb+tVD7Qa37C29hds3UM7Y6/63qr4IBxM="; - types-aiobotocore-rbin = buildTypesAiobotocorePackage "rbin" "2.6.0" "sha256-TOI2FQdO71XT1NESXGrZN+UI6c7CGRmsBbp4ipuQwhg="; + types-aiobotocore-rbin = buildTypesAiobotocorePackage "rbin" "2.9.0" "sha256-FxYiwMon/E3g5uphHutjXsZ4gvhyoy4BE7gfX9v9KOY="; - types-aiobotocore-rds = buildTypesAiobotocorePackage "rds" "2.6.0" "sha256-M0IDOMbqGdLl0WSipPirjDn3Fr4AQ06+j3m0Ci3jyBE="; + types-aiobotocore-rds = buildTypesAiobotocorePackage "rds" "2.9.0" "sha256-4UwgKkbnHgSrDIjVgp729mt1LWtTTmr4Vqk+MGkyHDg="; - types-aiobotocore-rds-data = buildTypesAiobotocorePackage "rds-data" "2.6.0" "sha256-GYddRqZeBP5f6chzZON9y59KcBiss9eWa8rVGo53C0g="; + types-aiobotocore-rds-data = buildTypesAiobotocorePackage "rds-data" "2.9.0" "sha256-1bOOeQqg9AdlHIuznEUF2Q8+1iN4ZwvFfRMnzAew9xQ="; - types-aiobotocore-redshift = buildTypesAiobotocorePackage "redshift" "2.6.0" "sha256-6znZQUxNKE7SB6G+9l4iQSP9hZt+plKFA8VkE1scxrU="; + types-aiobotocore-redshift = buildTypesAiobotocorePackage "redshift" "2.9.0" "sha256-uUhg8pu/tPO5ufx3oAA803ddLMIJb8ZRFqYYY7asprU="; - types-aiobotocore-redshift-data = buildTypesAiobotocorePackage "redshift-data" "2.6.0" "sha256-FRJeBjA5dfnnZ586VShmPt0CBgi5+ZYbldOUZIGR2L0="; + types-aiobotocore-redshift-data = buildTypesAiobotocorePackage "redshift-data" "2.9.0" "sha256-HtJan10OMZZP0DTFw4b4iadl+ufHbbCGkypk6gTHevA="; - types-aiobotocore-redshift-serverless = buildTypesAiobotocorePackage "redshift-serverless" "2.6.0" "sha256-lMNUId8z4h/m0FmusvEjYoQj+PUSLaiOREd27vF3qxI="; + types-aiobotocore-redshift-serverless = buildTypesAiobotocorePackage "redshift-serverless" "2.9.0" "sha256-TL4NDdKm50bgUZV+bkxqRY1P5C48tT7+E4wiNMgMLG4="; - types-aiobotocore-rekognition = buildTypesAiobotocorePackage "rekognition" "2.6.0" "sha256-8luG3yWj82hmMq5KYjNG58pbiDBMk+D6ykgzqE752T8="; + types-aiobotocore-rekognition = buildTypesAiobotocorePackage "rekognition" "2.9.0" "sha256-zAYEPrQ5SexvufL2aSagLLWx2VPFURLRu+YwL/m4cWA="; - types-aiobotocore-resiliencehub = buildTypesAiobotocorePackage "resiliencehub" "2.6.0" "sha256-nXZ7ZrpEOSdXdcuGVMNI7hjx6oisnnej18vALIEEzGQ="; + types-aiobotocore-resiliencehub = buildTypesAiobotocorePackage "resiliencehub" "2.9.0" "sha256-3C1PcG2DzbRT3Yrloipng73tZKdcGiYniU5n095Lodc="; - types-aiobotocore-resource-explorer-2 = buildTypesAiobotocorePackage "resource-explorer-2" "2.6.0" "sha256-cjBd3Ns1ckr7DT9gpaeb8CbXOrmwU3gENN5Is5BwrZI="; + types-aiobotocore-resource-explorer-2 = buildTypesAiobotocorePackage "resource-explorer-2" "2.9.0" "sha256-UzzHOnTX2tLVEY+xJVrDu4I8/RP8/rx2rNZcINs4DOM="; - types-aiobotocore-resource-groups = buildTypesAiobotocorePackage "resource-groups" "2.6.0" "sha256-GcbI21WVdMmwMcpbBkma4VrLsLVRP24/Uk43+4vE864="; + types-aiobotocore-resource-groups = buildTypesAiobotocorePackage "resource-groups" "2.9.0" "sha256-w7MJhBAtOsbZqZQlJdFiP4q8qpk7nc1YEXCgbw3Fd20="; - types-aiobotocore-resourcegroupstaggingapi = buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.6.0" "sha256-pW8/wn2Qk1jf1d2kYZ84yEaNUcl6xgHw+yuT0bHnsBE="; + types-aiobotocore-resourcegroupstaggingapi = buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.9.0" "sha256-dkRibrcQpSnU4ChhRSibjQbosbOy6wd42P91MVrD7+o="; - types-aiobotocore-robomaker = buildTypesAiobotocorePackage "robomaker" "2.6.0" "sha256-aKO/fGT4UANiYkZOUuOQ4ungKpW8p+yAT5+42WHgp3M="; + types-aiobotocore-robomaker = buildTypesAiobotocorePackage "robomaker" "2.9.0" "sha256-n5zLgWXRlVz+dXVOeEg4ZVq2mCiBDB/4pJfHeFF6Z5Q="; - types-aiobotocore-rolesanywhere = buildTypesAiobotocorePackage "rolesanywhere" "2.6.0" "sha256-jTAe8nMwbXwb+1uf9ITVIKtKyOLIwFH6yi+2IYYVIyU="; + types-aiobotocore-rolesanywhere = buildTypesAiobotocorePackage "rolesanywhere" "2.9.0" "sha256-HNjHfM7Oi4HKmYL5Sgwqjg2hWyKmLXYq1nDwhmVN6cs="; - types-aiobotocore-route53 = buildTypesAiobotocorePackage "route53" "2.6.0" "sha256-RMIrcFD+1RbA3AcRw3TSjENBzmHQL1zHX7FoOFA+UP0="; + types-aiobotocore-route53 = buildTypesAiobotocorePackage "route53" "2.9.0" "sha256-d54iOVNPFrwS9Cw/uDZO7CCIsj2QzeKkgKy+cWehfcQ="; - types-aiobotocore-route53-recovery-cluster = buildTypesAiobotocorePackage "route53-recovery-cluster" "2.6.0" "sha256-mBwT11n8moLt/j46AayYES6rjVo3Tpa5UWJ4Klb1N0g="; + types-aiobotocore-route53-recovery-cluster = buildTypesAiobotocorePackage "route53-recovery-cluster" "2.9.0" "sha256-MLPzjWP6xBrczesskwbvKVbjFT8ZC8MV7jgkR/AAxu0="; - types-aiobotocore-route53-recovery-control-config = buildTypesAiobotocorePackage "route53-recovery-control-config" "2.6.0" "sha256-qYYT1FRpqxtR9LPGMOH+p0+kbeGvfrlIE6rp5Nupioc="; + types-aiobotocore-route53-recovery-control-config = buildTypesAiobotocorePackage "route53-recovery-control-config" "2.9.0" "sha256-nl1PsCKbjiizg+oPVkYvkb1iuN/egoBQp6EN1BWcrQw="; - types-aiobotocore-route53-recovery-readiness = buildTypesAiobotocorePackage "route53-recovery-readiness" "2.6.0" "sha256-66kGFeDv4PkKYd4UEL4Feqw5LnygBMGvHqctC4EWnNU="; + types-aiobotocore-route53-recovery-readiness = buildTypesAiobotocorePackage "route53-recovery-readiness" "2.9.0" "sha256-cFWmcjptrX/infPksVRugvHdnKFU0SG/90OU+HPl5ZY="; - types-aiobotocore-route53domains = buildTypesAiobotocorePackage "route53domains" "2.6.0" "sha256-TQ7aNPrky6O+xQefuSkHyFN0XJC5u3xMaT0yrjwYv3E="; + types-aiobotocore-route53domains = buildTypesAiobotocorePackage "route53domains" "2.9.0" "sha256-1LucO4/jgl1YpMlbYuIJXrhxkLx6tdKTMaoMAWTDybM="; - types-aiobotocore-route53resolver = buildTypesAiobotocorePackage "route53resolver" "2.6.0" "sha256-55qUjFm6ryLjGAmxGLFkl9dPHXjDWyIINZQRQXe4bnk="; + types-aiobotocore-route53resolver = buildTypesAiobotocorePackage "route53resolver" "2.9.0" "sha256-s8DoTrQEjGpqwwYlwEkoCNopDow+M7rbQZCqU2aBdZ4="; - types-aiobotocore-rum = buildTypesAiobotocorePackage "rum" "2.6.0" "sha256-e8LzXHMfEgkcJKx5a/I//L4/oCz1l7N487wNoTtBP1Y="; + types-aiobotocore-rum = buildTypesAiobotocorePackage "rum" "2.9.0" "sha256-dRncp/7Z8FeJ/sBqHFHO7z4XZKgWeOuRPGzXf4djzg4="; - types-aiobotocore-s3 = buildTypesAiobotocorePackage "s3" "2.6.0" "sha256-MIp/lGwJah2Jj/2KFfoeW2uQlV1DZbP8TYcdsNvEMU8="; + types-aiobotocore-s3 = buildTypesAiobotocorePackage "s3" "2.9.0" "sha256-KwNH+X1Kl61L+iuK+XtZWGhTl71RpHyJhCfB+Hw1IyU="; - types-aiobotocore-s3control = buildTypesAiobotocorePackage "s3control" "2.6.0" "sha256-eyiAFFT5KOtTDT2EZNah1KRdcWw1v1titjHwG3DnRj4="; + types-aiobotocore-s3control = buildTypesAiobotocorePackage "s3control" "2.9.0" "sha256-/earpJzKe0zF+fjxUa/Z6JKmxxWfOlMngxlia6aTFxs="; - types-aiobotocore-s3outposts = buildTypesAiobotocorePackage "s3outposts" "2.6.0" "sha256-g4wAsVc3gqiovsXZtEey4XKmLp/UkIeKD1pEjiey5DE="; + types-aiobotocore-s3outposts = buildTypesAiobotocorePackage "s3outposts" "2.9.0" "sha256-lLp/gUu5jrOJ6ZXQ4qKVfREsN4WYl/h9zgfgTUtYiiQ="; - types-aiobotocore-sagemaker = buildTypesAiobotocorePackage "sagemaker" "2.6.0" "sha256-GUcRyWviI+JCG7XTGBQcUljxAdjBzso76d5A3ql5lbA="; + types-aiobotocore-sagemaker = buildTypesAiobotocorePackage "sagemaker" "2.9.0" "sha256-kAunITSH13bGe6XWTlG/QSelzDFnINih/o/zuFR34us="; - types-aiobotocore-sagemaker-a2i-runtime = buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.6.0" "sha256-7znJt8gJGnBbTndTPeFOpN6iytOPTJPgvA/tHeYQVoo="; + types-aiobotocore-sagemaker-a2i-runtime = buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.9.0" "sha256-U9cVOg2CkVclCqSqr4okJJSC0ZmGIH390KTNKMJUBhw="; - types-aiobotocore-sagemaker-edge = buildTypesAiobotocorePackage "sagemaker-edge" "2.6.0" "sha256-O3oCXuvREHW7lcwDzbJRogb9Qa2Wfb8C5/rbpjhVm8A="; + types-aiobotocore-sagemaker-edge = buildTypesAiobotocorePackage "sagemaker-edge" "2.9.0" "sha256-Oe78n3fu201OmZpPb4cjhLY1x1KTT5MYLXdy9M4KkOE="; - types-aiobotocore-sagemaker-featurestore-runtime = buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.6.0" "sha256-mcU7ZGAGzbV7i8H1qMWFI9vm/8APRfmaAncxKBJL+NU="; + types-aiobotocore-sagemaker-featurestore-runtime = buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.9.0" "sha256-xmRI5TMR99TROVf1CPif60NeLhCqNpb6Lt662fGK+WY="; - types-aiobotocore-sagemaker-geospatial = buildTypesAiobotocorePackage "sagemaker-geospatial" "2.6.0" "sha256-uKvgKNZHFZIYsE0hMWjuHN+QzI/eQcCn4HD2C8H+d2I="; + types-aiobotocore-sagemaker-geospatial = buildTypesAiobotocorePackage "sagemaker-geospatial" "2.9.0" "sha256-OPIq8UKHJNDe7lMbHkHt4z57k3L7y6ys0a9TSJiiFIg="; - types-aiobotocore-sagemaker-metrics = buildTypesAiobotocorePackage "sagemaker-metrics" "2.6.0" "sha256-Hnq9JAdPiqfhb/uLQhMk7JWZ8xHko06KqHXh9f6al/8="; + types-aiobotocore-sagemaker-metrics = buildTypesAiobotocorePackage "sagemaker-metrics" "2.9.0" "sha256-oyBG62dmdxbZaIAIb5cXq+qWYD/yDPHvHu6Z+wOg9Jc="; - types-aiobotocore-sagemaker-runtime = buildTypesAiobotocorePackage "sagemaker-runtime" "2.6.0" "sha256-/7Zzo383eWFjEHxZST1QKzTNHunhR8mjSE2uEHUw9IE="; + types-aiobotocore-sagemaker-runtime = buildTypesAiobotocorePackage "sagemaker-runtime" "2.9.0" "sha256-KDkf3G/inaFjLe0jfgdUQ31ugbj8mmgYzJKvb1W15lA="; - types-aiobotocore-savingsplans = buildTypesAiobotocorePackage "savingsplans" "2.6.0" "sha256-6sIHmILzIg1aOskXnjbDDzbkygXDwFcnd9mfuuhRFZQ="; + types-aiobotocore-savingsplans = buildTypesAiobotocorePackage "savingsplans" "2.9.0" "sha256-f4DbYsiuX1xrLMZ9foOyJC5NhVtMym3mnj8RD+MvlIo="; - types-aiobotocore-scheduler = buildTypesAiobotocorePackage "scheduler" "2.6.0" "sha256-2BnFCPgaAWxBsc+79oQT+DDj6IM7cV7F+LjqsFG6BBc="; + types-aiobotocore-scheduler = buildTypesAiobotocorePackage "scheduler" "2.9.0" "sha256-HuXw6MBuBzaDpf6HfR++F8LC+5WgpThF+BQz2nO1LHQ="; - types-aiobotocore-schemas = buildTypesAiobotocorePackage "schemas" "2.6.0" "sha256-TW57DJw0QgnPrIWlOlAvESYSEPUD/UKbXVs+NYW+7r0="; + types-aiobotocore-schemas = buildTypesAiobotocorePackage "schemas" "2.9.0" "sha256-du/fn168xn0Nzox8vbEOJXnIcRBWatgihJZRGTzy4pE="; - types-aiobotocore-sdb = buildTypesAiobotocorePackage "sdb" "2.6.0" "sha256-cLciwg4d5EZKYquNitl3yD+8eJnemEiF27LcXfxy0Zs="; + types-aiobotocore-sdb = buildTypesAiobotocorePackage "sdb" "2.9.0" "sha256-zgWv9fUOlUWDeBSZwHLG1Oc8CRY7uK/Hu3EJAJsVcEQ="; - types-aiobotocore-secretsmanager = buildTypesAiobotocorePackage "secretsmanager" "2.6.0" "sha256-dvte4Yjl+a/UqL5v7xJ9626igVjx/ZPdM2SsLGsVdDk="; + types-aiobotocore-secretsmanager = buildTypesAiobotocorePackage "secretsmanager" "2.9.0" "sha256-fdnSUH7SuYoKqWohGCmJRbKVJwkNgalBIdL+ZSA95uY="; - types-aiobotocore-securityhub = buildTypesAiobotocorePackage "securityhub" "2.6.0" "sha256-36BIOCHnkFyEp3MPa5NfjNJNBeqVMCmx9C907Bw3YWQ="; + types-aiobotocore-securityhub = buildTypesAiobotocorePackage "securityhub" "2.9.0" "sha256-i02XTjgEgzXFnsHqgReWb/p+OhWdXA90pduejrStXug="; - types-aiobotocore-securitylake = buildTypesAiobotocorePackage "securitylake" "2.6.0" "sha256-DKmk2ddd7b0g6mnt0d37Y1ofb6dgN/6XFBCElqdQ9+A="; + types-aiobotocore-securitylake = buildTypesAiobotocorePackage "securitylake" "2.9.0" "sha256-tZq7D3UPg/G05ZHl0btwePfrKz69vfo4Kpwf5haepv4="; - types-aiobotocore-serverlessrepo = buildTypesAiobotocorePackage "serverlessrepo" "2.6.0" "sha256-PRzh/JFCHUqXTSAR4IoftxvkRBsVq4XEX7ihC9FzqSI="; + types-aiobotocore-serverlessrepo = buildTypesAiobotocorePackage "serverlessrepo" "2.9.0" "sha256-6Z4f/NRtoFtdiFFcVc+3a908H8JcRKNzcImAVPk4quo="; - types-aiobotocore-service-quotas = buildTypesAiobotocorePackage "service-quotas" "2.6.0" "sha256-GcDl3LIy+urPEzXINmU4g7xgk8IIIJ6fBFFXhv18eSA="; + types-aiobotocore-service-quotas = buildTypesAiobotocorePackage "service-quotas" "2.9.0" "sha256-U3S8VoxZD2YIW9yHUU+jk9QqG6gI+wiJBaeXEx964p0="; - types-aiobotocore-servicecatalog = buildTypesAiobotocorePackage "servicecatalog" "2.6.0" "sha256-5IoQuLh6bh3mlzInR+Aci6yIRCSYJXfbvv49FEs2tPA="; + types-aiobotocore-servicecatalog = buildTypesAiobotocorePackage "servicecatalog" "2.9.0" "sha256-xYV3AUOEcU1fuzntpgoNT2gFykL2CmvYi7AnVoTrtjA="; - types-aiobotocore-servicecatalog-appregistry = buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.6.0" "sha256-l0xrQXkDYmB3+RFtwJ70l6GgKeA0z1V107HG8Ddvb8U="; + types-aiobotocore-servicecatalog-appregistry = buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.9.0" "sha256-1fYP1lZcVAdtOjmN4hfLJbZ1526Gaf7xqxj0xmqZimA="; - types-aiobotocore-servicediscovery = buildTypesAiobotocorePackage "servicediscovery" "2.6.0" "sha256-KLdOmaO6x7AmQInP1RRAf8s5rlpD0PpDHeBnor5gl2A="; + types-aiobotocore-servicediscovery = buildTypesAiobotocorePackage "servicediscovery" "2.9.0" "sha256-SPAmhlm5j8zhyJeERoHo4oaJ73PSdTpQWbseY21jJw8="; - types-aiobotocore-ses = buildTypesAiobotocorePackage "ses" "2.6.0" "sha256-QNjpM0m1PKSQx2f1eNkOeNP7pHN0PfHZlMFVQbGOgGU="; + types-aiobotocore-ses = buildTypesAiobotocorePackage "ses" "2.9.0" "sha256-GM3RaxZuprL1PBlTbk3UOO9M5pu1nQekIcUzrCbSXC8="; - types-aiobotocore-sesv2 = buildTypesAiobotocorePackage "sesv2" "2.6.0" "sha256-5g1LUvS324evqH+Rv+pUKlePnE3QqMqpiLCrknxjQX8="; + types-aiobotocore-sesv2 = buildTypesAiobotocorePackage "sesv2" "2.9.0" "sha256-bn0DLwQuzoyrZ8odMQcDfFApt/GTnPNdeT693yF/k3s="; - types-aiobotocore-shield = buildTypesAiobotocorePackage "shield" "2.6.0" "sha256-5NbnrGPo9jTCIxq7ubNX/OuKZOXU0PoSwgTjfuMvnKY="; + types-aiobotocore-shield = buildTypesAiobotocorePackage "shield" "2.9.0" "sha256-g2WTDLMdIrSJLQj87lHT9aO54Nuo8IVSzqkpuQqqJBE="; - types-aiobotocore-signer = buildTypesAiobotocorePackage "signer" "2.6.0" "sha256-AZRsUZpKhzPiHoUcboBeX5zYlVD9kY6F4n6/ifRTpr8="; + types-aiobotocore-signer = buildTypesAiobotocorePackage "signer" "2.9.0" "sha256-4izCsd6sv53hqImdd5eYJmBg8zSvHkQ6rcqOLfKJF44="; - types-aiobotocore-simspaceweaver = buildTypesAiobotocorePackage "simspaceweaver" "2.6.0" "sha256-WrkKQxXI7eIaX4GimyDyBqDWVjw0eF3jJTA40JScvG0="; + types-aiobotocore-simspaceweaver = buildTypesAiobotocorePackage "simspaceweaver" "2.9.0" "sha256-3cJaY6BwMo1G6BguoEYjbUHNb0OkWOIcyh8kxN06t3E="; - types-aiobotocore-sms = buildTypesAiobotocorePackage "sms" "2.6.0" "sha256-I//ZK5HolYkCfpTCPYhEDALfcn9AYcLk7x7vfRjTDlo="; + types-aiobotocore-sms = buildTypesAiobotocorePackage "sms" "2.9.0" "sha256-PsLWqcPoKDgofkcIeC1P9DKzFVdkhq9A9IjA7uavoIk="; - types-aiobotocore-sms-voice = buildTypesAiobotocorePackage "sms-voice" "2.6.0" "sha256-Qz+ZXVBSe3kHgGlqQjgxWoQhnguqauxmPKaISQbAG/8="; + types-aiobotocore-sms-voice = buildTypesAiobotocorePackage "sms-voice" "2.9.0" "sha256-+AyzDu7C0wnniV5dphcvlswRDjktAJS9JPc52Jy5Mqk="; - types-aiobotocore-snow-device-management = buildTypesAiobotocorePackage "snow-device-management" "2.6.0" "sha256-Fh35RpHExkL/PeqEnWNR2pJYWERDJzOF9oE3SvIxxQ4="; + types-aiobotocore-snow-device-management = buildTypesAiobotocorePackage "snow-device-management" "2.9.0" "sha256-boSrX4EczJXDyxYFDFcn4uaTJ1GJfWHV47Mt0iWUYXY="; - types-aiobotocore-snowball = buildTypesAiobotocorePackage "snowball" "2.6.0" "sha256-Wia4Xc/Kt8j6X5rZ9vvxupr6tCv1XQQQFOwRnugL0lE="; + types-aiobotocore-snowball = buildTypesAiobotocorePackage "snowball" "2.9.0" "sha256-5ofD5IlGtmtd4k0Tja/qXOn2cWddeqMSvorIAv0mfIE="; - types-aiobotocore-sns = buildTypesAiobotocorePackage "sns" "2.6.0" "sha256-hDPU7e14iYcpt8dXzjx7PgT4TQloAn2ZYrq6cMtMncc="; + types-aiobotocore-sns = buildTypesAiobotocorePackage "sns" "2.9.0" "sha256-6yF9zXzRUyi+EvmIeEt1sjsyOkwoT0bKdr3Dtz4q9oE="; - types-aiobotocore-sqs = buildTypesAiobotocorePackage "sqs" "2.6.0" "sha256-J5QSpJQjhO6T2uGpDstHdEVJTLuTIxilmYmKdtB7u6g="; + types-aiobotocore-sqs = buildTypesAiobotocorePackage "sqs" "2.9.0" "sha256-bN1OXfRr0M9TGdOxZ3hzF4yVRo8qLtdJ1GIqp1WwY8g="; - types-aiobotocore-ssm = buildTypesAiobotocorePackage "ssm" "2.6.0" "sha256-NxTwgcrDNOHZ8PReIgfTOGLTl7bL1948NKAyjJ0QYKc="; + types-aiobotocore-ssm = buildTypesAiobotocorePackage "ssm" "2.9.0" "sha256-IdkwP86TCIY2v6ZV35SYMmxUqW204y7HXTFtoA3Z/A4="; - types-aiobotocore-ssm-contacts = buildTypesAiobotocorePackage "ssm-contacts" "2.6.0" "sha256-fWnCKnG6ikXzDx40HFxlh9DyLVlX9pBB4CMcJxUt+Ps="; + types-aiobotocore-ssm-contacts = buildTypesAiobotocorePackage "ssm-contacts" "2.9.0" "sha256-xyQkxMnmInrwXdTcjv+2V5BUYS1OrQXbZLPjgMOIvwQ="; - types-aiobotocore-ssm-incidents = buildTypesAiobotocorePackage "ssm-incidents" "2.6.0" "sha256-6wkvuRGT91a0Ggxt13amMzjWd6Pj62w4nrvWQNQ0GxI="; + types-aiobotocore-ssm-incidents = buildTypesAiobotocorePackage "ssm-incidents" "2.9.0" "sha256-DhGvTnJzNCZgSSZ63kjWhPYnH/SF+S2QHMU/0fgx8Mg="; - types-aiobotocore-ssm-sap = buildTypesAiobotocorePackage "ssm-sap" "2.6.0" "sha256-7NkEDcuph8xxjlDjuEiSuhvM5srAeY4QfAKLwFLhCsU="; + types-aiobotocore-ssm-sap = buildTypesAiobotocorePackage "ssm-sap" "2.9.0" "sha256-j1QoIAprz33FLjIAmHj+v+2SYFQnL4XFEc+hyMLt78U="; - types-aiobotocore-sso = buildTypesAiobotocorePackage "sso" "2.6.0" "sha256-pM6yxg0MxTXjSWZ/CLsatlIMx4tO0p9ZKRzOhyJYXWc="; + types-aiobotocore-sso = buildTypesAiobotocorePackage "sso" "2.9.0" "sha256-TQxkfWv0SiS1smEPwlBKgtbhJhU+7ieokyx5zilAlNU="; - types-aiobotocore-sso-admin = buildTypesAiobotocorePackage "sso-admin" "2.6.0" "sha256-idc5d/Kvjhd7RkTHuErSoP/f64/Q1+jg0TE3UMiL4pQ="; + types-aiobotocore-sso-admin = buildTypesAiobotocorePackage "sso-admin" "2.9.0" "sha256-1vMwGFdAnCgwgwlV1fS0/w+o9gza4bokOIRmnse+Zh0="; - types-aiobotocore-sso-oidc = buildTypesAiobotocorePackage "sso-oidc" "2.6.0" "sha256-3eJaNx/Tzy9XQtHSPGKlkMG7klB2KDgL60knGghWAn8="; + types-aiobotocore-sso-oidc = buildTypesAiobotocorePackage "sso-oidc" "2.9.0" "sha256-iTJyIepGMJ5NUX/khzrdliVl4/uJkDmXfTBdHk4k9mo="; - types-aiobotocore-stepfunctions = buildTypesAiobotocorePackage "stepfunctions" "2.6.0" "sha256-7y8SiLa09lDqnMZtlG0Qw5tvAvQMvTNqMuCpRecOpXc="; + types-aiobotocore-stepfunctions = buildTypesAiobotocorePackage "stepfunctions" "2.9.0" "sha256-mdunNfOw87uR9BYgy/XILp5KoJRIUHWQvdoYTPY4i0M="; - types-aiobotocore-storagegateway = buildTypesAiobotocorePackage "storagegateway" "2.6.0" "sha256-Umq4Slts9RHPJRJCWRAIAizLxB9Clcz8GomLsUr5gNE="; + types-aiobotocore-storagegateway = buildTypesAiobotocorePackage "storagegateway" "2.9.0" "sha256-Ag1LkXIdiQGyMP5V3c1M5DFtarjcnUX5+UN6oEPf8nk="; - types-aiobotocore-sts = buildTypesAiobotocorePackage "sts" "2.6.0" "sha256-iRwalkojzQCUiAQcxl8hEYFFbnIxhuaJfrATnK18ltI="; + types-aiobotocore-sts = buildTypesAiobotocorePackage "sts" "2.9.0" "sha256-51P6hpVcVTUtLxN9/QGVCAWnv5Lnb9pMNE7WzKq5U9w="; - types-aiobotocore-support = buildTypesAiobotocorePackage "support" "2.6.0" "sha256-+4rnAV2Qr29bvWRO6TnSaRZkUVCoefB3SDXc2Ye9kpE="; + types-aiobotocore-support = buildTypesAiobotocorePackage "support" "2.9.0" "sha256-c1Nip/gBkVabW4oFq4B6fdi9DauiYZfOLHD4LUR9fLw="; - types-aiobotocore-support-app = buildTypesAiobotocorePackage "support-app" "2.6.0" "sha256-CXYfdtO1TdmEz39v2AEeCTJmgiA/EF1gmaBBYGRgYV0="; + types-aiobotocore-support-app = buildTypesAiobotocorePackage "support-app" "2.9.0" "sha256-8A6p38j1R6e/2ptWRfKkvpAnjeZPUWgciHpj7Sg0N60="; - types-aiobotocore-swf = buildTypesAiobotocorePackage "swf" "2.6.0" "sha256-x9cBjUe4LC9uSsFpPciZP1QlUEqfNo3xZFKUqPuVV6E="; + types-aiobotocore-swf = buildTypesAiobotocorePackage "swf" "2.9.0" "sha256-1QtnA3BohFWVLso1DdbNO0ZOOAODhXmfT6r/Espp/vI="; - types-aiobotocore-synthetics = buildTypesAiobotocorePackage "synthetics" "2.6.0" "sha256-Wew0A2xIYOGXzfZf3sBpHnRW/dZD1s6wHveNMwYj1s4="; + types-aiobotocore-synthetics = buildTypesAiobotocorePackage "synthetics" "2.9.0" "sha256-1Cr8kzYLGroxGtHxx9eiyRW3I6sbyNIRweW6pAW6pFQ="; - types-aiobotocore-textract = buildTypesAiobotocorePackage "textract" "2.6.0" "sha256-vWUMopzR+1095nN6POsHShvCKZIcUwfW11oMOJ9R94c="; + types-aiobotocore-textract = buildTypesAiobotocorePackage "textract" "2.9.0" "sha256-hSWUOXPsqVpQ0a6jOMll17W43wEbKv6i4fllIo0xLzw="; - types-aiobotocore-timestream-query = buildTypesAiobotocorePackage "timestream-query" "2.6.0" "sha256-4QpCK14NogeYR9DB877zh760GEXYieiyOgepB9DZd+8="; + types-aiobotocore-timestream-query = buildTypesAiobotocorePackage "timestream-query" "2.9.0" "sha256-a+fTXaX82nlaUvDmkDUIW+t/wsNXWZx7BqQj7H/jnVM="; - types-aiobotocore-timestream-write = buildTypesAiobotocorePackage "timestream-write" "2.6.0" "sha256-bBcMTJOVFq1mJQZtc9M/EMT45Xxxk2DqDgVHfM3qt3A="; + types-aiobotocore-timestream-write = buildTypesAiobotocorePackage "timestream-write" "2.9.0" "sha256-YGZa1FOkq9snM5K1DZQv7efgBvMx8axCKbsoviJWSrE="; - types-aiobotocore-tnb = buildTypesAiobotocorePackage "tnb" "2.6.0" "sha256-c4Y5kilT50Ips16/YhwduNbm89gB4iLHFv8eN8T4NDM="; + types-aiobotocore-tnb = buildTypesAiobotocorePackage "tnb" "2.9.0" "sha256-afMNaqyMd84FTSTTLTpBQ/jfUuCvVmpyg7rdXavOJPQ="; - types-aiobotocore-transcribe = buildTypesAiobotocorePackage "transcribe" "2.6.0" "sha256-HB1CKe9mkD0+0TdFXmdiphDUqc+4xbwBIXSu0PulBE4="; + types-aiobotocore-transcribe = buildTypesAiobotocorePackage "transcribe" "2.9.0" "sha256-jFdJigP2fLlRtw9WzhaSFicg4TBTfD3wVZEV8PeOqcM="; - types-aiobotocore-transfer = buildTypesAiobotocorePackage "transfer" "2.6.0" "sha256-59SvnKQ+WpAKUZNYunFywLLah1aBnF0maZrFbALXcIM="; + types-aiobotocore-transfer = buildTypesAiobotocorePackage "transfer" "2.9.0" "sha256-rXLszhZTZBPCMlGwqZWsdCnoNy2MTyzzH+IrQ75Jxu0="; - types-aiobotocore-translate = buildTypesAiobotocorePackage "translate" "2.6.0" "sha256-cgxE6GYG9c4234RAiyFfF22NPHJ29oytOvLpETnjdS4="; + types-aiobotocore-translate = buildTypesAiobotocorePackage "translate" "2.9.0" "sha256-6CJeDPdwIWQMGBkAtxO8PJclkXGeY5iTbpNlWgGFcKs="; - types-aiobotocore-verifiedpermissions = buildTypesAiobotocorePackage "verifiedpermissions" "2.6.0" "sha256-yg4zDBjgSB7JuuS2DXIUe3PFQq9stIfEJSMF1IP2BWI="; + types-aiobotocore-verifiedpermissions = buildTypesAiobotocorePackage "verifiedpermissions" "2.9.0" "sha256-abQQMTXvqkZ4V/82XnYRA4HXqPqYVDFlyn97stA6/6Y="; - types-aiobotocore-voice-id = buildTypesAiobotocorePackage "voice-id" "2.6.0" "sha256-Pnn3CGL5rr3MtzaakjDXmReVKXnyB76IxSnAPnKU45I="; + types-aiobotocore-voice-id = buildTypesAiobotocorePackage "voice-id" "2.9.0" "sha256-f66AVRU3jXSzWWiDO1CWS+F742WmhcGlf2IXvAOPwjI="; - types-aiobotocore-vpc-lattice = buildTypesAiobotocorePackage "vpc-lattice" "2.6.0" "sha256-kxniFLA2e7aDKulF5z1Ap3z6wbE3eY3QVqhK+CVhrcE="; + types-aiobotocore-vpc-lattice = buildTypesAiobotocorePackage "vpc-lattice" "2.9.0" "sha256-sA6mKo/co3Z9hPha4kHHUud9AO/CLhEijh66wlp2uOk="; - types-aiobotocore-waf = buildTypesAiobotocorePackage "waf" "2.6.0" "sha256-adKf+AbPmeN57r93T36IewoiLZ+05CbpuS7NxCkQgMw="; + types-aiobotocore-waf = buildTypesAiobotocorePackage "waf" "2.9.0" "sha256-Js6x76EgqKu4IJcgG8FpMge4nfhlKj/7HRZjgi/f5tA="; - types-aiobotocore-waf-regional = buildTypesAiobotocorePackage "waf-regional" "2.6.0" "sha256-56SIq8Q6B405aqKU8UMddGHyrJeFaVKZSG4ImBWBZLU="; + types-aiobotocore-waf-regional = buildTypesAiobotocorePackage "waf-regional" "2.9.0" "sha256-YCTW8axxeeDNCH57xUSKsRXNyproIYsUqHN7Kb/c9Lc="; - types-aiobotocore-wafv2 = buildTypesAiobotocorePackage "wafv2" "2.6.0" "sha256-nAGK0tN42UhDUmpztGeAPRS5FuuTt+LugQmcgkR0oLA="; + types-aiobotocore-wafv2 = buildTypesAiobotocorePackage "wafv2" "2.9.0" "sha256-8lZTtK93+IQyfQ/QQ3WSgpD3VlzPq5aQn/Avife21nI="; - types-aiobotocore-wellarchitected = buildTypesAiobotocorePackage "wellarchitected" "2.6.0" "sha256-p/2uqdRwKgsS2EUCr8ZLds6WHUjVQz8mEv35qcyMTYA="; + types-aiobotocore-wellarchitected = buildTypesAiobotocorePackage "wellarchitected" "2.9.0" "sha256-BzafdUAL6TrYMuP1TwPXTS/aOlhjZbM99ZtEQ3wxQV0="; - types-aiobotocore-wisdom = buildTypesAiobotocorePackage "wisdom" "2.6.0" "sha256-EInqI5EqriiI2L/tdQiy3/jY8tnZ6+QOk9PdEyDuSj4="; + types-aiobotocore-wisdom = buildTypesAiobotocorePackage "wisdom" "2.9.0" "sha256-WkpW8vk7U4WkqeX13RhzahEtZrdQ49X2NoeSIpRQMQM="; - types-aiobotocore-workdocs = buildTypesAiobotocorePackage "workdocs" "2.6.0" "sha256-cNegCM7a4QlI+NLzIRIoGHYzQqbFkNRKqDKLOqE3OUY="; + types-aiobotocore-workdocs = buildTypesAiobotocorePackage "workdocs" "2.9.0" "sha256-kLp8nHOB6A47nmAd9jXwr+nXS8xnv10eGkI/zd53wRI="; - types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.6.0" "sha256-hMPU0wmTi0BQ+AWo4T6DIOl6FrAQbzdal8rcPoY3wP0="; + types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.9.0" "sha256-4g39qn3h//b4/Dd+C0zasVvmyENfkvhPIj+EklHf9iY="; - types-aiobotocore-workmail = buildTypesAiobotocorePackage "workmail" "2.6.0" "sha256-W/kHZMLFQ7kv8i/3urxbjdXc7RorMyy5joJNtFPAhVU="; + types-aiobotocore-workmail = buildTypesAiobotocorePackage "workmail" "2.9.0" "sha256-WSAQekT3lmS/2miTbK0eYWde7eDIleY7yP+1HdMcCXM="; - types-aiobotocore-workmailmessageflow = buildTypesAiobotocorePackage "workmailmessageflow" "2.6.0" "sha256-Mc3h0CSmJRoV+ncwhtd4Tu5LSoasWqK8V9hXK5+XYfs="; + types-aiobotocore-workmailmessageflow = buildTypesAiobotocorePackage "workmailmessageflow" "2.9.0" "sha256-Y7scQU1qMyGMrkOdmpJuRKdxR9nlsKsoiDCBT1Qa1F4="; - types-aiobotocore-workspaces = buildTypesAiobotocorePackage "workspaces" "2.6.0" "sha256-xtsxrIzhjJSoGqd1fEgXP55bRtDsJTtdoWn8eooHCmY="; + types-aiobotocore-workspaces = buildTypesAiobotocorePackage "workspaces" "2.9.0" "sha256-AIIU5d6D+hVd36Qo0hpq8tNakoCVpmqjYKVgGUjtVOU="; - types-aiobotocore-workspaces-web = buildTypesAiobotocorePackage "workspaces-web" "2.6.0" "sha256-J3lsLnwcttamV4NroDuXz9EupXrsoN/SumKrykQkwVU="; + types-aiobotocore-workspaces-web = buildTypesAiobotocorePackage "workspaces-web" "2.9.0" "sha256-fchpLQ4yB6LzpzvKJBraHIFEMKsMltWoMzihUkwUedg="; - types-aiobotocore-xray = buildTypesAiobotocorePackage "xray" "2.6.0" "sha256-DPirH1s636ZW6VKyD4wMiJEfM+u9NknH0ODLQagaLrs="; + types-aiobotocore-xray = buildTypesAiobotocorePackage "xray" "2.9.0" "sha256-L+y55NnvYeTgXVp+DJ/dgKPQYBIFsu48qgRjwAX7nBs="; } diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 81be449f7f0c0..4bfe704971758 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,12 +364,12 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.7.0"; + version = "2.9.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-JVtG3t6rkZ5nrttMlryqdcU35DSblNe3MfvlqLqHJp0="; + hash = "sha256-QSZDFXiVEXFHTE7FrLZVUeLOOyPTG96PIMg9lziiwDc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-aiobotocore/update.sh b/pkgs/development/python-modules/types-aiobotocore/update.sh new file mode 100644 index 0000000000000..455488fb793e2 --- /dev/null +++ b/pkgs/development/python-modules/types-aiobotocore/update.sh @@ -0,0 +1,379 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update + +set -eu -o pipefail + +source_file=pkgs/development/python-modules/types-aiobotocore-packages/default.nix + +version="2.9.0" + +nix-update python311Packages.types-aiobotocore --commit --build + +packages=( + 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-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-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 +) + +for package in "${packages[@]}"; do + echo "Updating ${package}" + + url="https://pypi.io/packages/source/t/${package}/${package}-${version}.tar.gz" + hash=$(nix-prefetch-url --type sha256 $url) + sri_hash="$(nix hash to-sri --type sha256 $hash)" + + awk -i inplace -v package="$package" -v new_version="$version" -v new_sha256="$sri_hash" ' + $1 == package { + $5 = "\"" new_version "\""; + $6 = "\"" new_sha256 "\";"; + } + {print} + ' $source_file + +done + +nixpkgs-fmt ${source_file} diff --git a/pkgs/development/python-modules/types-appdirs/default.nix b/pkgs/development/python-modules/types-appdirs/default.nix index f6fe4cf6e1b3c..ce7bb9cd53df9 100644 --- a/pkgs/development/python-modules/types-appdirs/default.nix +++ b/pkgs/development/python-modules/types-appdirs/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "types-appdirs"; version = "1.4.3.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 94810408f0cac..d35cfcc2afe96 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.18"; + version = "0.20.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-T1pZyHwFgraev5lNYU4Pt2zC0KXsPzLk0dscCRhnzdM="; + hash = "sha256-mXeMlS4erhDMelNGhBMAEXcCbJQ0NFvwASC7LqW3kQk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-enum34/default.nix b/pkgs/development/python-modules/types-enum34/default.nix index 6c186f2d8756d..d82c84c5c5da0 100644 --- a/pkgs/development/python-modules/types-enum34/default.nix +++ b/pkgs/development/python-modules/types-enum34/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "types-enum34"; version = "1.1.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/types-futures/default.nix b/pkgs/development/python-modules/types-futures/default.nix index afff438efef1f..9eb4b956d3ebb 100644 --- a/pkgs/development/python-modules/types-futures/default.nix +++ b/pkgs/development/python-modules/types-futures/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "types-futures"; version = "3.3.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/types-ipaddress/default.nix b/pkgs/development/python-modules/types-ipaddress/default.nix index 19e048d1a9f46..3bdffafb34e3e 100644 --- a/pkgs/development/python-modules/types-ipaddress/default.nix +++ b/pkgs/development/python-modules/types-ipaddress/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "types-ipaddress"; version = "1.0.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix index 5e87bd726bf74..eb90a554174e9 100644 --- a/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-s3transfer"; - version = "0.8.2"; + version = "0.10.0"; pyproject = true; src = fetchPypi { pname = "types_s3transfer"; inherit version; - hash = "sha256-LkF1b8+Ud1qZSa+oVkiaxFcDCGCbBJPfvXtNMz60I+Y="; + hash = "sha256-NeSZjCXff4mFrWne3I5IYOivO0O3YV6UDVPADUE73Gk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 123aaa346171e..9aa9fc0f5f67f 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "types-tabulate"; version = "0.9.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/types-ujson/default.nix b/pkgs/development/python-modules/types-ujson/default.nix index 8819dec4220ed..eb46df9c93378 100644 --- a/pkgs/development/python-modules/types-ujson/default.nix +++ b/pkgs/development/python-modules/types-ujson/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-ujson"; - version = "5.8.0.1"; + version = "5.9.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-KxQ4gkirTNH176jEZHYREll8zVfA2EI49zYxq+DiDP0="; + hash = "sha256-fnBCRU3HzX8xsJxCDXyvNrk9ML30uNuTeRvQVhcT0Bc="; }; doCheck = false; diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix index 5aa12fb041ad9..f38947c04677b 100644 --- a/pkgs/development/python-modules/typesentry/default.nix +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -9,6 +9,7 @@ buildPythonPackage { pname = "typesentry"; version = "0.2.7"; + format = "setuptools"; # Only wheel distribution is available on PyPi. src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index 59eb745547882..f88a718c736c3 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "typing-inspect"; version = "0.9.0"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index c306068f7fdbf..2e69e4568f829 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { pname = "uamqp"; version = "1.6.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "Azure"; diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 31f55ebdea794..74ad0eb708a09 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "uarray"; version = "0.8.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "Quansight-Labs"; diff --git a/pkgs/development/python-modules/udatetime/default.nix b/pkgs/development/python-modules/udatetime/default.nix index 9eef1512490d1..6b378f4aa3651 100644 --- a/pkgs/development/python-modules/udatetime/default.nix +++ b/pkgs/development/python-modules/udatetime/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "udatetime"; version = "0.0.17"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ueagle/default.nix b/pkgs/development/python-modules/ueagle/default.nix index fc61123377aa9..d54b18925e900 100644 --- a/pkgs/development/python-modules/ueagle/default.nix +++ b/pkgs/development/python-modules/ueagle/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "ueagle"; version = "0.0.2"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix index 69cc04ee2d9c2..e216bdc714126 100644 --- a/pkgs/development/python-modules/ueberzug/default.nix +++ b/pkgs/development/python-modules/ueberzug/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "ueberzug"; version = "18.1.9"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch b/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch deleted file mode 100644 index 56aba78b5b31a..0000000000000 --- a/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch +++ /dev/null @@ -1,130 +0,0 @@ -From eb63747509b2c18793b95eb12cc0141277520798 Mon Sep 17 00:00:00 2001 -From: Simon Cozens <simon@simon-cozens.org> -Date: Thu, 11 Feb 2021 09:43:41 +0000 -Subject: [PATCH 1/2] Rename cu2qu to fontTools.cu2qu - ---- - Lib/ufo2ft/filters/cubicToQuadratic.py | 4 ++-- - Lib/ufo2ft/preProcessor.py | 4 ++-- - setup.py | 1 - - tests/outlineCompiler_test.py | 2 +- - tests/preProcessor_test.py | 2 +- - 5 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py -index 87d81b1..4b77144 100644 ---- a/Lib/ufo2ft/filters/cubicToQuadratic.py -+++ b/Lib/ufo2ft/filters/cubicToQuadratic.py -@@ -1,7 +1,7 @@ - import logging - --from cu2qu.pens import Cu2QuPointPen --from cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR -+from fontTools.pens.cu2quPen import Cu2QuPointPen -+from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR - - from ufo2ft.filters import BaseFilter - from ufo2ft.fontInfoData import getAttrWithFallback -diff --git a/Lib/ufo2ft/preProcessor.py b/Lib/ufo2ft/preProcessor.py -index e239152..9463aea 100644 ---- a/Lib/ufo2ft/preProcessor.py -+++ b/Lib/ufo2ft/preProcessor.py -@@ -267,7 +267,7 @@ class TTFInterpolatablePreProcessor: - skipExportGlyphs=None, - filters=None, - ): -- from cu2qu.ufo import DEFAULT_MAX_ERR -+ from fontTools.cu2qu.ufo import DEFAULT_MAX_ERR - - self.ufos = ufos - self.inplace = inplace -@@ -304,7 +304,7 @@ class TTFInterpolatablePreProcessor: - self.postFilters = [[f for f in filters if not f.pre] for filters in filterses] - - def process(self): -- from cu2qu.ufo import fonts_to_quadratic -+ from fontTools.cu2qu.ufo import fonts_to_quadratic - - needs_decomposition = set() - -diff --git a/setup.py b/setup.py -index d8d9982..a165ab1 100644 ---- a/setup.py -+++ b/setup.py -@@ -30,7 +30,6 @@ setup( - tests_require=["pytest>=2.8"], - install_requires=[ - "fonttools[ufo]>=4.34.0", -- "cu2qu>=1.6.7", - "cffsubr>=0.2.8", - "booleanOperations>=0.9.0", - ], -diff --git a/tests/outlineCompiler_test.py b/tests/outlineCompiler_test.py -index b31319c..ee51920 100644 ---- a/tests/outlineCompiler_test.py -+++ b/tests/outlineCompiler_test.py -@@ -2,7 +2,7 @@ import logging - import os - - import pytest --from cu2qu.ufo import font_to_quadratic -+from fontTools.cu2qu.ufo import font_to_quadratic - from fontTools.ttLib import TTFont - from fontTools.ttLib.tables._g_l_y_f import USE_MY_METRICS - -diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py -index 11196f8..bc32d55 100644 ---- a/tests/preProcessor_test.py -+++ b/tests/preProcessor_test.py -@@ -2,7 +2,7 @@ import logging - import os - - import pytest --from cu2qu.ufo import CURVE_TYPE_LIB_KEY -+from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY - from fontTools import designspaceLib - - import ufo2ft --- -2.36.1 - -From 58f3ab5e5db8090aba10fefd58ad8df4b507e7c3 Mon Sep 17 00:00:00 2001 -From: Simon Cozens <simon@simon-cozens.org> -Date: Thu, 11 Feb 2021 09:49:28 +0000 -Subject: [PATCH 2/2] Sort the imports - ---- - Lib/ufo2ft/filters/cubicToQuadratic.py | 2 +- - tests/preProcessor_test.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py -index 4b77144..5f28ea4 100644 ---- a/Lib/ufo2ft/filters/cubicToQuadratic.py -+++ b/Lib/ufo2ft/filters/cubicToQuadratic.py -@@ -1,7 +1,7 @@ - import logging - --from fontTools.pens.cu2quPen import Cu2QuPointPen - from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR -+from fontTools.pens.cu2quPen import Cu2QuPointPen - - from ufo2ft.filters import BaseFilter - from ufo2ft.fontInfoData import getAttrWithFallback -diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py -index bc32d55..41c579c 100644 ---- a/tests/preProcessor_test.py -+++ b/tests/preProcessor_test.py -@@ -2,8 +2,8 @@ import logging - import os - - import pytest --from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY - from fontTools import designspaceLib -+from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY - - import ufo2ft - from ufo2ft.constants import ( --- -2.36.1 - diff --git a/pkgs/development/python-modules/ufolint/default.nix b/pkgs/development/python-modules/ufolint/default.nix index c7b666c37fab3..ab997b30097db 100644 --- a/pkgs/development/python-modules/ufolint/default.nix +++ b/pkgs/development/python-modules/ufolint/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "ufolint"; version = "1.2.0"; + format = "setuptools"; # PyPI source tarballs omit tests, fetch from Github instead src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix index dbc02750de9a6..dd1e6bd08a1da 100644 --- a/pkgs/development/python-modules/ufonormalizer/default.nix +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "ufonormalizer"; version = "0.6.1"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 9816c88f3e6b2..7eb4e5e3814b1 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "ujson"; version = "5.8.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/umalqurra/default.nix b/pkgs/development/python-modules/umalqurra/default.nix index 0e1b4c681e5ba..f06f1d4731046 100644 --- a/pkgs/development/python-modules/umalqurra/default.nix +++ b/pkgs/development/python-modules/umalqurra/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "umalqurra"; version = "0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index bf08374ece230..8299effe6f5ea 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "uncertainties"; version = "3.1.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 16be16d443acf..db7972fb51432 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "uncompyle6"; version = "3.9.0"; + format = "setuptools"; disabled = pythonAtLeast "3.9"; # See: https://github.com/rocky/python-uncompyle6/issues/331 src = fetchPypi { diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix new file mode 100644 index 0000000000000..934f51c67ddfd --- /dev/null +++ b/pkgs/development/python-modules/unicode-rbnf/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "unicode-rbnf"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "unicode-rbnf"; + rev = "v${version}"; + hash = "sha256-xwnfqWwQJKCJ4G+8eVaySTJAHxhwKYAqLHaCsxtBIl0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "unicode_rbnf" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/rhasspy/unicode-rbnf/v${version}/master/CHANGELOG.md"; + description = "A pure Python implementation of ICU's rule-based number format engine"; + homepage = "https://github.com/rhasspy/unicode-rbnf"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/unicode-slugify/default.nix b/pkgs/development/python-modules/unicode-slugify/default.nix index 1a4ccb1ee7d98..e967e187d9f1d 100644 --- a/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/pkgs/development/python-modules/unicode-slugify/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "unicode-slugify"; version = "0.1.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/unicodecsv/default.nix b/pkgs/development/python-modules/unicodecsv/default.nix index ede2b0d3f093b..4690590c03fad 100644 --- a/pkgs/development/python-modules/unicodecsv/default.nix +++ b/pkgs/development/python-modules/unicodecsv/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "0.14.1"; + format = "setuptools"; pname = "unicodecsv"; src = fetchPypi { diff --git a/pkgs/development/python-modules/unidata-blocks/default.nix b/pkgs/development/python-modules/unidata-blocks/default.nix new file mode 100644 index 0000000000000..cded041c46b84 --- /dev/null +++ b/pkgs/development/python-modules/unidata-blocks/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, nix-update-script +, hatch-vcs +, hatchling +, langcodes +}: + +buildPythonPackage rec { + pname = "unidata-blocks"; + version = "0.0.8"; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + pname = "unidata_blocks"; + inherit version; + hash = "sha256-Y7OSFuPHgzNc/KtmBWwdVqH7Xy4v4w2UGHBUF9pIuSU="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ langcodes ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/TakWolf/unidata-blocks"; + description = "A library that helps query unicode blocks by Blocks.txt"; + platforms = lib.platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ h7x4 ]; + }; +} diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 85ec596a89121..3dd206d509f57 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "unidiff"; version = "0.7.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix index fc98695dd6fa1..bc868f0ed4f40 100644 --- a/pkgs/development/python-modules/unifi/default.nix +++ b/pkgs/development/python-modules/unifi/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "unifi"; version = "1.2.5"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/unifiled/default.nix b/pkgs/development/python-modules/unifiled/default.nix index 68fa57165df2d..9b3b7274a4957 100644 --- a/pkgs/development/python-modules/unifiled/default.nix +++ b/pkgs/development/python-modules/unifiled/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "unifiled"; version = "1.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "florisvdk"; diff --git a/pkgs/development/python-modules/unify/default.nix b/pkgs/development/python-modules/unify/default.nix index 1935374d37e11..58bee2b6e52e5 100644 --- a/pkgs/development/python-modules/unify/default.nix +++ b/pkgs/development/python-modules/unify/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "unify"; version = "0.5"; + format = "setuptools"; # PyPi release is missing tests (see https://github.com/myint/unify/pull/18) src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/units/default.nix b/pkgs/development/python-modules/units/default.nix index 8e9742d2f6a8f..90e7c73b56a51 100644 --- a/pkgs/development/python-modules/units/default.nix +++ b/pkgs/development/python-modules/units/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "units"; version = "0.07"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/unittest-data-provider/default.nix b/pkgs/development/python-modules/unittest-data-provider/default.nix index 67a3cf313aecf..9d60e7ccaeb66 100644 --- a/pkgs/development/python-modules/unittest-data-provider/default.nix +++ b/pkgs/development/python-modules/unittest-data-provider/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { version = "1.0.1"; + format = "setuptools"; pname = "unittest-data-provider"; src = fetchPypi { diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index be25e21a43f30..36768b0fccb77 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "unittest-xml-reporting"; version = "3.2.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 420b9f078c15f..3872cd5ce2a58 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -6,7 +6,6 @@ # build-system , setuptools , setuptools-git-versioning -, wheel # dependencies , async-timeout @@ -27,20 +26,19 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.14"; - format = "pyproject"; + version = "0.0.15"; + pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; rev = "v${version}"; - hash = "sha256-0c9b571gJXFOAe5ct8O/qy7D6rDosmBHDYEv6odLQ2s="; + hash = "sha256-5hA1i2XzKzQDRrZfOaA6I3X7hU+nSd7HpcHHNIzZO7g="; }; nativeBuildInputs = [ setuptools setuptools-git-versioning - wheel ]; propagatedBuildInputs = [ @@ -65,6 +63,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "universal_silabs_flasher" ]; meta = with lib; { + changelog = "https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/v${version}"; description = "Flashes Silicon Labs radios running EmberZNet or CPC multi-pan firmware"; homepage = "https://github.com/NabuCasa/universal-silabs-flasher"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/unix-ar/default.nix b/pkgs/development/python-modules/unix-ar/default.nix new file mode 100644 index 0000000000000..d77c542b3a9e6 --- /dev/null +++ b/pkgs/development/python-modules/unix-ar/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "unix-ar"; + version = "0.2.1"; + format = "wheel"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit format version; + pname = "unix_ar"; + hash = "sha256-Kstxi8Ewi/gOW52iYU2CQswv475M2LL9Rxm84Ymq/PE="; + }; + + meta = with lib; { + description = "AR file handling for Python (including .deb files)"; + homepage = "https://github.com/getninjas/unix_ar"; + license = licenses.bsd3; + maintainers = with maintainers; [ tirimia ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/python-modules/unrardll/default.nix b/pkgs/development/python-modules/unrardll/default.nix index e6d746165144e..c11cf39546ce8 100644 --- a/pkgs/development/python-modules/unrardll/default.nix +++ b/pkgs/development/python-modules/unrardll/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "unrardll"; version = "0.1.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index 549c0b6dd0f20..fe3ae5d9ccd3e 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "0.7.11"; + version = "0.7.21"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; rev = "refs/tags/${version}"; - hash = "sha256-cUd1umD61xHPehutBh5pUWTLyOdn3vbgerRQmsOpuDM="; + hash = "sha256-EuLzQHtcAPNuKCrUXHPbgF5i3QDvst/XOZ9RcCck+N8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 582d0040e109b..e51a6f8833e3d 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.10.30"; + version = "0.11.6"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-RaVg4XNmh1S5G1CHQiME7t/BmK0MI9M8wI2YTKjpqzM="; + hash = "sha256-ZZVd7WIQA79bzclE8BhDhJJi3RF0ODSj+6mqGSHgKv0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/untangle/default.nix b/pkgs/development/python-modules/untangle/default.nix index 6456bdd3cbd89..253fd6bf9f9a8 100644 --- a/pkgs/development/python-modules/untangle/default.nix +++ b/pkgs/development/python-modules/untangle/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "untangle"; version = "1.2.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "stchris"; diff --git a/pkgs/development/python-modules/untokenize/default.nix b/pkgs/development/python-modules/untokenize/default.nix index 3ee6b53d05866..079a915cee190 100644 --- a/pkgs/development/python-modules/untokenize/default.nix +++ b/pkgs/development/python-modules/untokenize/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "untokenize"; version = "0.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index 092cb5ed50b1a..ea00a6c97e815 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "upb-lib"; version = "0.5.4"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/upcloud-api/default.nix b/pkgs/development/python-modules/upcloud-api/default.nix index 17fec99811e38..304feaf069ffe 100644 --- a/pkgs/development/python-modules/upcloud-api/default.nix +++ b/pkgs/development/python-modules/upcloud-api/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "upcloud-api"; version = "2.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "UpCloudLtd"; diff --git a/pkgs/development/python-modules/update-copyright/default.nix b/pkgs/development/python-modules/update-copyright/default.nix index 169c361e50743..1502e92f9e7b6 100644 --- a/pkgs/development/python-modules/update-copyright/default.nix +++ b/pkgs/development/python-modules/update-copyright/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "update-copyright"; version = "0.6.2"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix index 432232c60f916..d3bd5522d122b 100644 --- a/pkgs/development/python-modules/update_checker/default.nix +++ b/pkgs/development/python-modules/update_checker/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "update_checker"; version = "0.18.0"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/upnpy/default.nix b/pkgs/development/python-modules/upnpy/default.nix index d64ff4b875c8e..62cc708f5cc23 100644 --- a/pkgs/development/python-modules/upnpy/default.nix +++ b/pkgs/development/python-modules/upnpy/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "upnpy"; version = "1.1.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "5kyc0d3r"; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 837d162044734..1fd62b8eb2fc2 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -5,10 +5,12 @@ , awkward , hatchling , numpy +, fsspec , packaging , pytestCheckHook , lz4 , pytest-timeout +, rangehttpserver , scikit-hep-testdata , xxhash , zstandard @@ -16,7 +18,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.1.2"; + version = "5.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +27,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-TMa+j2jdFagJJhlyCx4rNLaxQhrJyq1HdpnA40xiyME="; + hash = "sha256-Oig66OvnmuqT56UkAecSG9qg+qxEQINX/DWS30yq46s="; }; nativeBuildInputs = [ @@ -35,6 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward numpy + fsspec packaging ]; @@ -42,6 +45,7 @@ buildPythonPackage rec { pytestCheckHook lz4 pytest-timeout + rangehttpserver scikit-hep-testdata xxhash zstandard @@ -53,20 +57,32 @@ buildPythonPackage rec { disabledTests = [ # Tests that try to download files + "test_fallback" + "test_file" + "test_fsspec_chunks" + "test_fsspec_globbing_http" + "test_fsspec_writing_memory" "test_http" + "test_http_fallback" + "test_http_multipart" + "test_http_port" + "test_http_size" + "test_http_size_port" + "test_issue_1054_filename_colons" "test_no_multipart" - "test_fallback" + "test_open_fsspec_http" + "test_open_fsspec_github" "test_pickle_roundtrip_http" - "test_open_fsspec_local" ]; disabledTestPaths = [ # Tests that try to download files - "tests/test_0066-fix-http-fallback-freeze.py" - "tests/test_0088-read-with-http.py" - "tests/test_0220-contiguous-byte-ranges-in-http.py" - "tests/test_0916-read-from-s3.py" - "tests/test_0930-expressions-in-pandas.py" + "tests/test_0066_fix_http_fallback_freeze.py" + "tests/test_0088_read_with_http.py" + "tests/test_0220_contiguous_byte_ranges_in_http.py" + + # FileNotFoundError: uproot-issue-1043.root + "tests/test_1043_const_std_string.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix index 640d2a6ed570b..7dd3710b81d36 100644 --- a/pkgs/development/python-modules/uptime/default.nix +++ b/pkgs/development/python-modules/uptime/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "uptime"; version = "3.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix index 363313163d6b2..400d7d54e3265 100644 --- a/pkgs/development/python-modules/uritemplate/default.nix +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -1,15 +1,15 @@ { lib , buildPythonPackage , fetchPypi -, simplejson , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "uritemplate"; version = "4.1.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { hash = "sha256-Q0bt/Fw7efaUvM1tYJmjIrvrYo2/LNhu6lWkVs5RJPA="; }; - propagatedBuildInputs = [ - simplejson + nativeBuildInputs = [ + setuptools ]; nativeCheckInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of RFC 6570 URI templates"; homepage = "https://github.com/python-hyper/uritemplate"; + changelog = "https://github.com/python-hyper/uritemplate/blob/${version}/HISTORY.rst"; license = with licenses; [ asl20 bsd3 ]; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index e78dc9b904dc7..18c7ba59b5841 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "urlgrabber"; version = "4.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/urlpy/default.nix b/pkgs/development/python-modules/urlpy/default.nix index f03b8b564508d..ad793f593969e 100644 --- a/pkgs/development/python-modules/urlpy/default.nix +++ b/pkgs/development/python-modules/urlpy/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "urlpy"; version = "0.5.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "nexB"; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index e9b3556043010..82744984d007c 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "urwidtrees"; + format = "setuptools"; version = "1.0.3"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/usb-devices/default.nix b/pkgs/development/python-modules/usb-devices/default.nix index 8a77fd8597f96..da4abcd5f8f24 100644 --- a/pkgs/development/python-modules/usb-devices/default.nix +++ b/pkgs/development/python-modules/usb-devices/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "usb-devices"; - version = "0.4.1"; + version = "0.4.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9w7YCAEpdptQC0GCnJCEyhZgcHMDIw0alj7q4Y82hmA="; + hash = "sha256-Nfdl5oRIdOfAo5PFAJJpadRyu2zeEkmYzxDQxbvpt6c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix index 57f2819ecc656..62d7b47dea91f 100644 --- a/pkgs/development/python-modules/usbtmc/default.nix +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "usbtmc"; version = "0.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "python-ivi"; diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index d01c601c82a0a..af61caba82c48 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "user-agents"; version = "2.2.0"; + format = "setuptools"; # PyPI is missing devices.json src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix index a2b83bff3b387..db66feca8d949 100644 --- a/pkgs/development/python-modules/ush/default.nix +++ b/pkgs/development/python-modules/ush/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "ush"; version = "3.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "tarruda"; diff --git a/pkgs/development/python-modules/utils/default.nix b/pkgs/development/python-modules/utils/default.nix index c2ad8a87904c2..36b399bed4778 100644 --- a/pkgs/development/python-modules/utils/default.nix +++ b/pkgs/development/python-modules/utils/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "utils"; version = "1.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "haaksmash"; diff --git a/pkgs/development/python-modules/uuid/default.nix b/pkgs/development/python-modules/uuid/default.nix index c7bcb77007017..571e79a862941 100644 --- a/pkgs/development/python-modules/uuid/default.nix +++ b/pkgs/development/python-modules/uuid/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "uuid"; version = "1.30"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix index 61a14b85ebebb..59e6f93aff8d1 100644 --- a/pkgs/development/python-modules/uvcclient/default.nix +++ b/pkgs/development/python-modules/uvcclient/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "uvcclient"; version = "0.11.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "kk7ds"; diff --git a/pkgs/development/python-modules/validate-email/default.nix b/pkgs/development/python-modules/validate-email/default.nix index 2b1fdb4963d56..1c8e8d3c384a0 100644 --- a/pkgs/development/python-modules/validate-email/default.nix +++ b/pkgs/development/python-modules/validate-email/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "validate-email"; version = "1.3"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 48fae161b20c3..21e99902929fa 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -1,4 +1,5 @@ { lib +, aiohttp , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "3.3.0"; + version = "4.0.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-wlkb6aa2UtqjrbNA26TUH+ZKvOM64An+lol+MCdQh3U="; + hash = "sha256-a9cYYRAKX9sY9fQhefLWgyvk0vQl7Ao3zvw0SAtFW/Q="; }; nativeBuildInputs = [ @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiohttp construct websockets ]; @@ -40,6 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "vallox_websocket_api" ]; meta = { + changelog = "https://github.com/yozik04/vallox_websocket_api/releases/tag/${version}"; description = "Async API for Vallox ventilation units"; homepage = "https://github.com/yozik04/vallox_websocket_api"; license = lib.licenses.lgpl3Only; diff --git a/pkgs/development/python-modules/vapoursynth/default.nix b/pkgs/development/python-modules/vapoursynth/default.nix index da75653962efa..2043fb2d4a588 100644 --- a/pkgs/development/python-modules/vapoursynth/default.nix +++ b/pkgs/development/python-modules/vapoursynth/default.nix @@ -2,6 +2,7 @@ buildPythonPackage { pname = "vapoursynth"; + format = "setuptools"; inherit (vapoursynth) version src; diff --git a/pkgs/development/python-modules/varint/default.nix b/pkgs/development/python-modules/varint/default.nix index 143a452344eee..dcc24c8de7029 100644 --- a/pkgs/development/python-modules/varint/default.nix +++ b/pkgs/development/python-modules/varint/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "varint"; version = "1.0.2"; + format = "setuptools"; src = fetchPypi { inherit pname version ; diff --git a/pkgs/development/python-modules/vcard/default.nix b/pkgs/development/python-modules/vcard/default.nix index 5e83f498722b2..1c207387ea852 100644 --- a/pkgs/development/python-modules/vcard/default.nix +++ b/pkgs/development/python-modules/vcard/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "vcard"; version = "0.15.4"; + format = "setuptools"; disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; diff --git a/pkgs/development/python-modules/vcver/default.nix b/pkgs/development/python-modules/vcver/default.nix index 503a8f7df7e01..56afec9127da0 100644 --- a/pkgs/development/python-modules/vcver/default.nix +++ b/pkgs/development/python-modules/vcver/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "vcver"; version = "0.2.12"; + format = "setuptools"; src = fetchFromGitHub { owner = "toumorokoshi"; diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix index 236bb8d149b6f..f3f64015e2a70 100644 --- a/pkgs/development/python-modules/vcversioner/default.nix +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "vcversioner"; version = "2.16.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix index 91c6fe3085f55..d473ded6c24ae 100644 --- a/pkgs/development/python-modules/vdf/default.nix +++ b/pkgs/development/python-modules/vdf/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "vdf"; version = "3.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "ValvePython"; diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index a233b51773ac1..f09e88842bee4 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -3,17 +3,19 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, mashumaro +, orjson , poetry-core -, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder +, syrupy , yarl }: buildPythonPackage rec { pname = "vehicle"; - version = "2.0.0"; + version = "2.2.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -22,16 +24,24 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-vehicle"; rev = "refs/tags/v${version}"; - hash = "sha256-EbjrAfbqVY336RHBWq81KM+oHixen+38aUTnWZQ+nCs="; + hash = "sha256-mu30v4iZoOYfQZc1P45UZaor6hf+i+gOvGcVGcQYzTo="; }; + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - pydantic + mashumaro + orjson yarl ]; @@ -39,15 +49,9 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" - ''; - pythonImportsCheck = [ "vehicle" ]; diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix index 9945c09ea972a..04d632b0a185e 100644 --- a/pkgs/development/python-modules/venstarcolortouch/default.nix +++ b/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "venstarcolortouch"; version = "0.19"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 2e81a9559fc6b..5b48ee52fadc7 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "venusian"; version = "3.0.0"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/versiontag/default.nix b/pkgs/development/python-modules/versiontag/default.nix index 3e250cd5ea4cc..76024a9e8795a 100644 --- a/pkgs/development/python-modules/versiontag/default.nix +++ b/pkgs/development/python-modules/versiontag/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "versiontag"; version = "1.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "thelabnyc"; diff --git a/pkgs/development/python-modules/versiontools/default.nix b/pkgs/development/python-modules/versiontools/default.nix index f74c8610b4ccc..3f7afae09fd79 100644 --- a/pkgs/development/python-modules/versiontools/default.nix +++ b/pkgs/development/python-modules/versiontools/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "versiontools"; version = "1.9.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/veryprettytable/default.nix b/pkgs/development/python-modules/veryprettytable/default.nix index 003fd6db621cf..7d87c67376467 100644 --- a/pkgs/development/python-modules/veryprettytable/default.nix +++ b/pkgs/development/python-modules/veryprettytable/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "veryprettytable"; version = "0.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/vharfbuzz/default.nix b/pkgs/development/python-modules/vharfbuzz/default.nix index fb953a0e7be7d..27ea9d84f2564 100644 --- a/pkgs/development/python-modules/vharfbuzz/default.nix +++ b/pkgs/development/python-modules/vharfbuzz/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "vharfbuzz"; version = "0.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/videocr/default.nix b/pkgs/development/python-modules/videocr/default.nix index 0685b184c4ab8..1f027563d480d 100644 --- a/pkgs/development/python-modules/videocr/default.nix +++ b/pkgs/development/python-modules/videocr/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "videocr"; version = "0.1.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index dbddbe6be0873..b16a5374c10b9 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { version = "1.7.4"; + format = "setuptools"; pname = "vidstab"; src = fetchPypi { diff --git a/pkgs/development/python-modules/viewstate/default.nix b/pkgs/development/python-modules/viewstate/default.nix index 3b1c5e74617d6..aac82239e94e0 100644 --- a/pkgs/development/python-modules/viewstate/default.nix +++ b/pkgs/development/python-modules/viewstate/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "viewstate"; version = "0.4.3"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/vilfo-api-client/default.nix b/pkgs/development/python-modules/vilfo-api-client/default.nix index 6f023b184f16d..5c0d66e7c0cfc 100644 --- a/pkgs/development/python-modules/vilfo-api-client/default.nix +++ b/pkgs/development/python-modules/vilfo-api-client/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "vilfo-api-client"; version = "0.4.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "ManneW"; diff --git a/pkgs/development/python-modules/vincenty/default.nix b/pkgs/development/python-modules/vincenty/default.nix index dbf174bd2a720..8e1022cc5eb7c 100644 --- a/pkgs/development/python-modules/vincenty/default.nix +++ b/pkgs/development/python-modules/vincenty/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "vincenty"; version = "0.1.4"; + format = "setuptools"; src = fetchFromGitHub { owner = "maurycyp"; diff --git a/pkgs/development/python-modules/virt-firmware/default.nix b/pkgs/development/python-modules/virt-firmware/default.nix new file mode 100644 index 0000000000000..aeaca734587d2 --- /dev/null +++ b/pkgs/development/python-modules/virt-firmware/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, cryptography +, pytestCheckHook +, pefile +}: + +buildPythonPackage rec { + pname = "virt-firmware"; + version = "23.10"; + + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-orTIduS4KVH4nTSRcOnn2+Tqeyd4OMnnN2+AK5p1xtM="; + }; + + pythonImportsCheck = [ "virt.firmware.efi" ]; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + pytestFlagsArray = ["tests/tests.py"]; + + propagatedBuildInputs = [ + cryptography + pefile + ]; + + meta = with lib; { + description = "Tools for virtual machine firmware volumes"; + homepage = "https://gitlab.com/kraxel/virt-firmware"; + license = licenses.gpl2; + maintainers = with maintainers; [ lheckemann raitobezarius ]; + }; +} diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix index 27dcffbfea13e..df1d0461e434c 100644 --- a/pkgs/development/python-modules/virtkey/default.nix +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -6,6 +6,7 @@ let in buildPythonPackage rec { pname = "virtkey"; version = "${majorVersion}.${minorVersion}"; + format = "setuptools"; src = fetchurl { url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 087a1a2ca517b..93af1ab0c4acc 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "virtualenvwrapper"; version = "4.8.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/visitor/default.nix b/pkgs/development/python-modules/visitor/default.nix index 1c0d725ac86b6..e0caa64b2b10f 100644 --- a/pkgs/development/python-modules/visitor/default.nix +++ b/pkgs/development/python-modules/visitor/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "visitor"; version = "0.1.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix index e0093f2ef8926..e411a2dd5758c 100644 --- a/pkgs/development/python-modules/viv-utils/default.nix +++ b/pkgs/development/python-modules/viv-utils/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "viv-utils"; version = "0.7.9"; + format = "setuptools"; src = fetchFromGitHub { owner = "williballenthin"; diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index 17af0485c4eed..8ffdf319013dc 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { version = "0.4.15"; + format = "setuptools"; pname = "vmprof"; src = fetchPypi { diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 30f84150283ca..bcf4d016dec29 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -2,6 +2,7 @@ buildPythonPackage rec { version = "0.9.6.1"; + format = "setuptools"; pname = "vobject"; src = fetchPypi { diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index c7e82d193f58f..452d95eede33f 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "voluptuous"; version = "0.13.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "alecthomas"; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index f53971637fb3e..aae1d3fdf2371 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { pname = "vowpalwabbit"; version = "9.9.0"; + format = "setuptools"; src = fetchPypi{ inherit pname version; diff --git a/pkgs/development/python-modules/vpk/default.nix b/pkgs/development/python-modules/vpk/default.nix index 6adf28cebdd36..d61a6107baada 100644 --- a/pkgs/development/python-modules/vpk/default.nix +++ b/pkgs/development/python-modules/vpk/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "vpk"; version = "1.4.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "ValvePython"; diff --git a/pkgs/development/python-modules/vsts-cd-manager/default.nix b/pkgs/development/python-modules/vsts-cd-manager/default.nix index b1de4105668a3..8b4e036ac8f7b 100644 --- a/pkgs/development/python-modules/vsts-cd-manager/default.nix +++ b/pkgs/development/python-modules/vsts-cd-manager/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { version = "1.0.2"; + format = "setuptools"; pname = "vsts-cd-manager"; src = fetchPypi { diff --git a/pkgs/development/python-modules/vsts/default.nix b/pkgs/development/python-modules/vsts/default.nix index a7d676ac2c5db..e91a203d7f14a 100644 --- a/pkgs/development/python-modules/vsts/default.nix +++ b/pkgs/development/python-modules/vsts/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "0.1.25"; + format = "setuptools"; pname = "vsts"; src = fetchPypi { diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index ea44c4b5a165a..2db6ff91f9ed4 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -6,22 +6,32 @@ , pytest-httpserver , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "vt-py"; - version = "0.17.5"; - format = "setuptools"; + version = "0.18.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "VirusTotal"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-O95W/J5y7qcR6PSzNQwOl0W19CyXifbq8okquESFSqM="; + hash = "sha256-QEe/ZoKM0uVH7Yqpgo7V17Odn4xqdEgdQeMVB+57xbA="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp ]; @@ -32,11 +42,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'" "" - ''; - pythonImportsCheck = [ "vt" ]; diff --git a/pkgs/development/python-modules/vultr/default.nix b/pkgs/development/python-modules/vultr/default.nix index b6f8a407b2340..f2150153be3a1 100644 --- a/pkgs/development/python-modules/vultr/default.nix +++ b/pkgs/development/python-modules/vultr/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "1.0.1"; + format = "setuptools"; pname = "vultr"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/wadllib/default.nix b/pkgs/development/python-modules/wadllib/default.nix index b169a93ff87f1..c7bc19ee515d8 100644 --- a/pkgs/development/python-modules/wadllib/default.nix +++ b/pkgs/development/python-modules/wadllib/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "wadllib"; version = "1.3.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/wagtail-factories/default.nix b/pkgs/development/python-modules/wagtail-factories/default.nix index c31993b1e5f39..46a98c39821ab 100644 --- a/pkgs/development/python-modules/wagtail-factories/default.nix +++ b/pkgs/development/python-modules/wagtail-factories/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "wagtail-factories"; version = "4.1.0"; + format = "setuptools"; src = fetchFromGitHub { repo = pname; diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 8fe5ba39ed518..f2f924b5c1243 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "wagtail"; - version = "5.1.3"; + version = "5.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RfrHlOTCDH51sBgGnX+XYfJfqjYZ7zDfJAE8okq/mnQ="; + hash = "sha256-SOTCm3Kw5T60ejF41rDyxpmqKE0/Oiq/0vBPV49EtVo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix index 4e40980d917a2..1d50b312b619f 100644 --- a/pkgs/development/python-modules/waitress-django/default.nix +++ b/pkgs/development/python-modules/waitress-django/default.nix @@ -3,6 +3,7 @@ buildPythonPackage { pname = "waitress-django"; version = "1.0.0"; + format = "setuptools"; src = ./.; pythonPath = [ django waitress ]; diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 898b1093159d8..a79863c1e835e 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "waitress"; version = "2.1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/wand/default.nix b/pkgs/development/python-modules/wand/default.nix index 8436ee9b8c054..0577adf2c91ed 100644 --- a/pkgs/development/python-modules/wand/default.nix +++ b/pkgs/development/python-modules/wand/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "wand"; version = "0.6.13"; + format = "setuptools"; src = fetchPypi { pname = "Wand"; diff --git a/pkgs/development/python-modules/waqiasync/default.nix b/pkgs/development/python-modules/waqiasync/default.nix index 8420ecbaef7fc..dfa51770abbd4 100644 --- a/pkgs/development/python-modules/waqiasync/default.nix +++ b/pkgs/development/python-modules/waqiasync/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "waqiasync"; version = "1.1.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index 6482024a4da3d..33a98da4f2774 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -5,6 +5,7 @@ buildPythonPackage { pname = "warrant"; version = "0.6.1"; + format = "setuptools"; # move to fetchPyPi when https://github.com/capless/warrant/issues/97 is fixed src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/wasserstein/default.nix b/pkgs/development/python-modules/wasserstein/default.nix index 1609e12f20c25..28626cc5dcfc4 100644 --- a/pkgs/development/python-modules/wasserstein/default.nix +++ b/pkgs/development/python-modules/wasserstein/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "wasserstein"; version = "1.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "pkomiske"; diff --git a/pkgs/development/python-modules/watchgod/default.nix b/pkgs/development/python-modules/watchgod/default.nix index ce61747baa0de..fcbddeec2d65e 100644 --- a/pkgs/development/python-modules/watchgod/default.nix +++ b/pkgs/development/python-modules/watchgod/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "watchgod"; version = "0.8.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/wavefile/default.nix b/pkgs/development/python-modules/wavefile/default.nix index 21641008c8261..4ced79638a826 100644 --- a/pkgs/development/python-modules/wavefile/default.nix +++ b/pkgs/development/python-modules/wavefile/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "wavefile"; version = "1.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "vokimon"; diff --git a/pkgs/development/python-modules/wavinsentio/default.nix b/pkgs/development/python-modules/wavinsentio/default.nix index 8e994f8e9952f..22ed0d177a360 100644 --- a/pkgs/development/python-modules/wavinsentio/default.nix +++ b/pkgs/development/python-modules/wavinsentio/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wavinsentio"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-c3MpFoJrT2FBQrNce+zP/bfIZFqu8gSAA9oIa1jKYCo="; + hash = "sha256-Oko3Ivj95vajNWjQTQK18i5B/DIBngjw2HLlzYqLv2Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix index 1a906934a5318..6a047c271658a 100644 --- a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix +++ b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "wcag-contrast-ratio"; version = "0.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index 1d23225c2fd6b..badb09bbef11a 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "wcwidth"; version = "0.2.6"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix index 727ec482c161a..a8137ccd3814d 100644 --- a/pkgs/development/python-modules/weasel/default.nix +++ b/pkgs/development/python-modules/weasel/default.nix @@ -4,22 +4,14 @@ , fetchFromGitHub , setuptools , wheel -, black , cloudpathlib , confection -, isort -, mypy , packaging -, pre-commit , pydantic -, pytest , requests -, ruff , smart-open , srsly , typer -, types-requests -, types-setuptools , wasabi , pytestCheckHook }: @@ -44,22 +36,14 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - black cloudpathlib confection - isort - mypy packaging - pre-commit pydantic - pytest requests - ruff smart-open srsly typer - types-requests - types-setuptools wasabi ]; diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index d1ba11d15ec30..28c3a7547e083 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "3.25.3"; + version = "3.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iU33APwfCpMvo3ACn2RK9AYvhxgCb9pa0HZH01fZUWc="; + hash = "sha256-7oCb8tH1pQDJpoxe3C6xdKtRQqNoAuJ0qySv5nX/sos="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/web-cache/default.nix b/pkgs/development/python-modules/web-cache/default.nix index dba9d91875c2b..18909898c9d87 100644 --- a/pkgs/development/python-modules/web-cache/default.nix +++ b/pkgs/development/python-modules/web-cache/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "web-cache"; version = "1.1.0"; + format = "setuptools"; disabled = !isPy3k; src = fetchPypi { diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix index 91d62cf849b8a..acee1e965f8da 100644 --- a/pkgs/development/python-modules/webargs/default.nix +++ b/pkgs/development/python-modules/webargs/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "webargs"; version = "8.3.0"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix index 081fdc59bbe30..1b1c0f77d4d24 100644 --- a/pkgs/development/python-modules/webassets/default.nix +++ b/pkgs/development/python-modules/webassets/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "webassets"; version = "2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix new file mode 100644 index 0000000000000..786862e44c082 --- /dev/null +++ b/pkgs/development/python-modules/webdataset/default.nix @@ -0,0 +1,83 @@ +{ lib +, stdenv +, buildPythonPackage +, braceexpand +, imageio +, lmdb +, msgpack +, numpy +, pytestCheckHook +, pyyaml +, setuptools +, torch +, torchvision +, wheel +, fetchFromGitHub +}: +buildPythonPackage rec { + pname = "webdataset"; + version = "0.2.86"; + pyproject = true; + + src = fetchFromGitHub { + owner = "webdataset"; + repo = "webdataset"; + rev = "refs/tags/${version}"; + hash = "sha256-aTjxoSoQ9LH4gcFmV+7Aj0HNIpvsFHTrxFUpAtB3nkM="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + braceexpand + numpy + pyyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + imageio + torch + torchvision + msgpack + lmdb + ]; + + pythonImportsCheck = [ "webdataset" ]; + + disabledTests = [ + # requires network + "test_batched" + "test_dataloader" + "test_decode_handlers" + "test_decoder" + "test_decoder" + "test_download" + "test_handlers" + "test_pipe" + "test_shard_syntax" + "test_torchvision" + "test_torchvision" + "test_unbatched" + "test_yaml3" + ] ++ lib.optionals stdenv.isDarwin [ + # pickling error + "test_background_download" + ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + # segfaults on aarch64-linux + "test_webloader" + "test_webloader2" + "test_webloader_repeat" + "test_webloader_unbatched" + ]; + + meta = with lib; { + description = "A high-performance Python-based I/O system for large (and small) deep learning problems, with strong support for PyTorch"; + homepage = "https://github.com/webdataset/webdataset"; + license = licenses.bsd3; + maintainers = with maintainers; [ iynaix ]; + }; +} diff --git a/pkgs/development/python-modules/webdavclient3/default.nix b/pkgs/development/python-modules/webdavclient3/default.nix index d74d7b2e7ab90..e44c1eb292592 100644 --- a/pkgs/development/python-modules/webdavclient3/default.nix +++ b/pkgs/development/python-modules/webdavclient3/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "webdavclient3"; version = "3.14.6"; + format = "setuptools"; disabled = isPy27; diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix index a8686fb7c7ed4..8a805888c4a02 100644 --- a/pkgs/development/python-modules/webencodings/default.nix +++ b/pkgs/development/python-modules/webencodings/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "webencodings"; version = "0.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/webrtcvad/default.nix b/pkgs/development/python-modules/webrtcvad/default.nix index f90d0b97bee6d..c47b32a9d3a3b 100644 --- a/pkgs/development/python-modules/webrtcvad/default.nix +++ b/pkgs/development/python-modules/webrtcvad/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "webrtcvad"; version = "2.0.10"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/wget/default.nix b/pkgs/development/python-modules/wget/default.nix index a86b693affa42..394afc50d41b9 100644 --- a/pkgs/development/python-modules/wget/default.nix +++ b/pkgs/development/python-modules/wget/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "wget"; version = "3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index c68925b46ae3a..a27b8e1660efe 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "whichcraft"; version = "0.6.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index 300465b65474f..28635d04fc1f4 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "whisper"; version = "1.1.10"; + format = "setuptools"; src = fetchFromGitHub { owner = "graphite-project"; diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index 184e5fe4c53dc..9d317c92323fa 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub +, hatchling , inetutils , pythonOlder }: buildPythonPackage rec { pname = "whois"; - version = "0.9.27"; - format = "setuptools"; + version = "0.99.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,15 +17,19 @@ buildPythonPackage rec { owner = "DannyCork"; repo = "python-whois"; rev = "refs/tags/${version}"; - hash = "sha256-hs4iCv2OqwLhTj2H4oijRYIyqXrHmewqgnMtU+3Uup0="; + hash = "sha256-uKAqpxb72fo0DiaChuJvDizq0z/oFSDHWJuK4vuYIzo="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ # whois is needed inetutils ]; - # tests require network access + # Tests require network access doCheck = false; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/widlparser/default.nix b/pkgs/development/python-modules/widlparser/default.nix index 2501d4821f0ff..fcd1e2fe0f125 100644 --- a/pkgs/development/python-modules/widlparser/default.nix +++ b/pkgs/development/python-modules/widlparser/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "widlparser"; version = "1.0.12"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/wifi/default.nix b/pkgs/development/python-modules/wifi/default.nix index 45594c226ef0f..01a867f008f8b 100644 --- a/pkgs/development/python-modules/wifi/default.nix +++ b/pkgs/development/python-modules/wifi/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "wifi"; version = "0.3.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "rockymeza"; diff --git a/pkgs/development/python-modules/withings-sync/default.nix b/pkgs/development/python-modules/withings-sync/default.nix index 60cce387fa626..0e57cd5b7914a 100644 --- a/pkgs/development/python-modules/withings-sync/default.nix +++ b/pkgs/development/python-modules/withings-sync/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "withings-sync"; - version = "4.2.1"; + version = "4.2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jaroslawhartman"; repo = "withings-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-6igjUmgIA077/1SQMt10tRpnLVKxGFNJN1GeLhQLROg="; + hash = "sha256-p1coGTbMQ+zptFKVLW5qgSdoudo2AggGT8Xu+cSCCs4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wn/default.nix b/pkgs/development/python-modules/wn/default.nix index b2540d0b2d689..5b020a58d393b 100644 --- a/pkgs/development/python-modules/wn/default.nix +++ b/pkgs/development/python-modules/wn/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder , flit-core , requests , tomli @@ -9,12 +10,14 @@ buildPythonPackage rec { pname = "wn"; - version = "0.9.4"; - format = "pyproject"; + version = "0.9.5"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-n03hFoGMAqLu57gw52tY2jkE8uuLFAbwTZ63sHG2168="; + hash = "sha256-muYuDmYH9W5j6euDYJMMgzfsxE6eBIhDCqH6P7nFG+Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/woodblock/default.nix b/pkgs/development/python-modules/woodblock/default.nix index c74a6ba788207..8dde484494e82 100644 --- a/pkgs/development/python-modules/woodblock/default.nix +++ b/pkgs/development/python-modules/woodblock/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "woodblock"; version = "0.1.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index 28d25317afa91..aa90798aace2b 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "worldengine"; version = "0.19.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "Mindwerks"; diff --git a/pkgs/development/python-modules/wrapio/default.nix b/pkgs/development/python-modules/wrapio/default.nix index f18bf597be522..9227009647d1a 100644 --- a/pkgs/development/python-modules/wrapio/default.nix +++ b/pkgs/development/python-modules/wrapio/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "wrapio"; version = "2.0.0"; + format = "setuptools"; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 58649de2056e4..6a1cde0a1a909 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "ws4py"; version = "0.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/wsgiprox/default.nix b/pkgs/development/python-modules/wsgiprox/default.nix index ecaef390fab12..2fa81bea6ac47 100644 --- a/pkgs/development/python-modules/wsgiprox/default.nix +++ b/pkgs/development/python-modules/wsgiprox/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "wsgiprox"; version = "1.5.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "webrecorder"; diff --git a/pkgs/development/python-modules/wsgitools/default.nix b/pkgs/development/python-modules/wsgitools/default.nix index ab6f06abac65a..948f932271c18 100644 --- a/pkgs/development/python-modules/wsgitools/default.nix +++ b/pkgs/development/python-modules/wsgitools/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "wsgitools"; version = "0.3.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/wsme/default.nix b/pkgs/development/python-modules/wsme/default.nix index a818b3baf4b43..764977051635d 100644 --- a/pkgs/development/python-modules/wsme/default.nix +++ b/pkgs/development/python-modules/wsme/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { pname = "wsme"; version = "0.11.0"; + format = "setuptools"; disabled = pythonAtLeast "3.9"; diff --git a/pkgs/development/python-modules/wsnsimpy/default.nix b/pkgs/development/python-modules/wsnsimpy/default.nix index febb66605c8a6..fe5ad78b8a297 100644 --- a/pkgs/development/python-modules/wsnsimpy/default.nix +++ b/pkgs/development/python-modules/wsnsimpy/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "wsnsimpy"; version = "0.2.5"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index 2c06d187c35f1..b93de0b924f7b 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "wsproto"; version = "1.2.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix index d4e37b5976812..33cff8e5ee221 100644 --- a/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/pkgs/development/python-modules/wtf-peewee/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "wtf-peewee"; - version = "3.0.4"; + version = "3.0.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-cTbYRdvAUTY86MPR33BH+nA6H/epR8sgHDgOBQ/TUkQ="; + hash = "sha256-LQbOWg65rPTSLRVK5vvqmdsRsXaDgcYZ54oqxgpWGRU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wtforms-bootstrap5/default.nix b/pkgs/development/python-modules/wtforms-bootstrap5/default.nix new file mode 100644 index 0000000000000..0150dcb2d72ae --- /dev/null +++ b/pkgs/development/python-modules/wtforms-bootstrap5/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, wtforms +, poetry-core +, pytestCheckHook +, lxml +}: + +buildPythonPackage rec { + pname = "wtforms-bootstrap5"; + version = "0.3.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "LaunchPlatform"; + repo = "wtforms-bootstrap5"; + rev = version; + hash = "sha256-TJJ3KOeC9JXnxK0YpnfeBNq1KHwaAZ4+t9CXbc+85Ro="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + wtforms + ]; + + nativeCheckInputs = [ + pytestCheckHook + lxml + ]; + + meta = with lib; { + description = "Simple library for rendering WTForms in HTML as Bootstrap 5 form controls"; + homepage = "https://github.com/LaunchPlatform/wtforms-bootstrap5"; + changelog = "https://github.com/LaunchPlatform/wtforms-bootstrap5/releases/tag/${version}"; + license = licenses.mit; + maintainers = teams.wdz.members; + }; +} diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix index b7ae51379cdc5..715c20b842ac2 100644 --- a/pkgs/development/python-modules/wyoming/default.nix +++ b/pkgs/development/python-modules/wyoming/default.nix @@ -1,6 +1,12 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub + +# build-system +, setuptools + +# optional-dependencies +, zeroconf # tests , wyoming-faster-whisper @@ -10,12 +16,24 @@ buildPythonPackage rec { pname = "wyoming"; - version = "1.2.0"; - format = "setuptools"; + version = "1.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "wyoming"; + rev = "refs/tags/${version}"; + hash = "sha256-59/6tRHHAu31VFuKhj2LCEUqkdVi81fu5POuGJmw9bw="; + }; + + nativeBuildInputs = [ + setuptools + ]; - src = fetchPypi { - inherit pname version; - hash = "sha256-mgNhc8PMRrwfvGZEcgIvQ/P2dysdDo2juvZccvb2C/g="; + passthru.optional-dependencies = { + zeroconf = [ + zeroconf + ]; }; pythonImportsCheck = [ @@ -34,8 +52,9 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://github.com/rhasspy/wyoming/releases/tag/${version}"; description = "Protocol for Rhasspy Voice Assistant"; - homepage = "https://pypi.org/project/wyoming/"; + homepage = "https://github.com/rhasspy/wyoming"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/x256/default.nix b/pkgs/development/python-modules/x256/default.nix index 4430fa2e4b8a0..c155b00c51726 100644 --- a/pkgs/development/python-modules/x256/default.nix +++ b/pkgs/development/python-modules/x256/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "x256"; version = "0.0.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index c57f5a4da52cf..9cc0ec2254c7c 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "xattr"; - version = "0.10.1"; + version = "1.0.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wS59gf+qBgWzrIwiwplKjhipzxxZKHobdyKiKJyVLsU="; + hash = "sha256-osfLLvRBv2eeJAtl4gXwij7jFeGQ/qVnPmD9aBLmNKU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix index e4701e806d9dd..c2caa4fb37784 100644 --- a/pkgs/development/python-modules/xbox-webapi/default.nix +++ b/pkgs/development/python-modules/xbox-webapi/default.nix @@ -15,6 +15,7 @@ buildPythonPackage rec { pname = "xbox-webapi"; version = "2.0.11"; + format = "setuptools"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/xboxapi/default.nix b/pkgs/development/python-modules/xboxapi/default.nix index 0f34bec3c8866..e0bb1614e3399 100644 --- a/pkgs/development/python-modules/xboxapi/default.nix +++ b/pkgs/development/python-modules/xboxapi/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "xboxapi"; version = "2.0.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "mKeRix"; diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 3e1ce8b1477af..5f4970f4fd135 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "xdot"; version = "1.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "jrfonseca"; diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 931d08e12c1c7..f1c0d836bf746 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.11"; - format = "setuptools"; + version = "0.2.13"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-L/HCw+O8bidtE5nDdO+cLS54m64dlJL+9Gjcye5gM+w="; + hash = "sha256-K7gsTLYcXmKmEQzOXrJ2kvvLzKaDkZ/NRLRc0USii5M="; }; propagatedBuildInputs = [ @@ -42,8 +42,15 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Tests requires network access + "test_document_cannot_identify_image" + "test_document_with_broken_image" + ]; + pythonImportsCheck = [ "xhtml2pdf" + "xhtml2pdf.pisa" ]; meta = with lib; { @@ -52,5 +59,6 @@ buildPythonPackage rec { changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; + mainProgram = "xhtml2pdf"; }; } diff --git a/pkgs/development/python-modules/xkbcommon/default.nix b/pkgs/development/python-modules/xkbcommon/default.nix index 35556fe32d9c7..f5ac737d27441 100644 --- a/pkgs/development/python-modules/xkbcommon/default.nix +++ b/pkgs/development/python-modules/xkbcommon/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "xkbcommon"; version = "0.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index c9fd70140301e..92a9c5e402639 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "xlib"; version = "0.33"; + format = "setuptools"; src = fetchFromGitHub { owner = "python-xlib"; diff --git a/pkgs/development/python-modules/xlib/fix-no-protocol-specified.patch b/pkgs/development/python-modules/xlib/fix-no-protocol-specified.patch deleted file mode 100644 index 1f3ab927f8405..0000000000000 --- a/pkgs/development/python-modules/xlib/fix-no-protocol-specified.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Xlib/xauth.py b/Xlib/xauth.py -index 2ed7dd5..303bd49 100644 ---- a/Xlib/xauth.py -+++ b/Xlib/xauth.py -@@ -120,6 +120,8 @@ class Xauthority(object): - matches = {} - - for efam, eaddr, enum, ename, edata in self.entries: -+ if enum == b'' and ename not in matches: -+ enum = num - if efam == family and eaddr == address and num == enum: - matches[ename] = edata - diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index 6fa9b6935def8..8b2612f59af2b 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "xlrd"; version = "2.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index 156fbb9d387a5..fec07f101cd88 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "xlsx2csv"; - version = "0.8.1"; + version = "0.8.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-fs1tK8JCby5DL0/awSIR4ZdtPLtl+QM+Htpl7dogReM="; + hash = "sha256-zdJyyC+LMvHO52rq74ey7jVJZh/d+Q9+zyMQlnoW/IQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index efcc4adfda6fa..f1e3a2565b6de 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "xlwt"; version = "1.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/xml-marshaller/default.nix b/pkgs/development/python-modules/xml-marshaller/default.nix index 6e1c6d8c2bfeb..43e08cae24265 100644 --- a/pkgs/development/python-modules/xml-marshaller/default.nix +++ b/pkgs/development/python-modules/xml-marshaller/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "xml-marshaller"; version = "1.0.2"; + format = "setuptools"; src = fetchPypi { pname = "xml_marshaller"; diff --git a/pkgs/development/python-modules/xmldiff/default.nix b/pkgs/development/python-modules/xmldiff/default.nix index 763503ecf20a0..6356b9bff3526 100644 --- a/pkgs/development/python-modules/xmldiff/default.nix +++ b/pkgs/development/python-modules/xmldiff/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "xmldiff"; version = "2.6.3"; + format = "setuptools"; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/xmljson/default.nix b/pkgs/development/python-modules/xmljson/default.nix index 60752537e3396..dee35921e41eb 100644 --- a/pkgs/development/python-modules/xmljson/default.nix +++ b/pkgs/development/python-modules/xmljson/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "xmljson"; version = "0.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index a8e595e497923..c0100480870a3 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.5.0"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-ETWD+i0VJbmfSHFvOsRkuzScKZdEyr6It3+U5Q7cQbQ="; + hash = "sha256-qUc67KdCcnPZszgUiET9T8vpmI1QoM95vzLPAU+4lnI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xmodem/default.nix b/pkgs/development/python-modules/xmodem/default.nix index 652c0f43be401..ea4396d28f30e 100644 --- a/pkgs/development/python-modules/xmodem/default.nix +++ b/pkgs/development/python-modules/xmodem/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "xmodem"; version = "0.4.7"; + format = "setuptools"; src = fetchFromGitHub { owner = "tehmaze"; diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index eac1153b4f50a..93c2c928f86b6 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -11,6 +11,7 @@ buildPythonPackage { pname = "xnd"; + format = "setuptools"; disabled = isPy27; inherit (libxnd) version src meta; diff --git a/pkgs/development/python-modules/xpybutil/default.nix b/pkgs/development/python-modules/xpybutil/default.nix index cc574c5824189..4a3f7681ed582 100644 --- a/pkgs/development/python-modules/xpybutil/default.nix +++ b/pkgs/development/python-modules/xpybutil/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "xpybutil"; version = "0.0.6"; + format = "setuptools"; # Pypi only offers a wheel src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/xtensor-python/default.nix b/pkgs/development/python-modules/xtensor-python/default.nix index 2d652fbd245cc..4b2123162cc16 100644 --- a/pkgs/development/python-modules/xtensor-python/default.nix +++ b/pkgs/development/python-modules/xtensor-python/default.nix @@ -31,7 +31,7 @@ toPythonModule (stdenv.mkDerivation(finalAttrs: { ]; doCheck = true; cmakeFlags = [ - "-DBUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DBUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index 90890677ef9a9..6ace2506afd08 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "xvfbwrapper"; version = "0.2.9"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index 10afcbe837895..4f226e7312959 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "3.3.0"; + format = "setuptools"; pname = "xxhash"; src = fetchPypi { diff --git a/pkgs/development/python-modules/yacs/default.nix b/pkgs/development/python-modules/yacs/default.nix index e5712b240f8cb..de2a27a937977 100644 --- a/pkgs/development/python-modules/yacs/default.nix +++ b/pkgs/development/python-modules/yacs/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "yacs"; version = "0.1.8"; + format = "setuptools"; src = fetchFromGitHub { owner = "rbgirshick"; diff --git a/pkgs/development/python-modules/yahooweather/default.nix b/pkgs/development/python-modules/yahooweather/default.nix index 7bcf637af3276..6f61645b9b22a 100644 --- a/pkgs/development/python-modules/yahooweather/default.nix +++ b/pkgs/development/python-modules/yahooweather/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "yahooweather"; version = "0.10"; + format = "setuptools"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/yamlordereddictloader/default.nix b/pkgs/development/python-modules/yamlordereddictloader/default.nix index 631d61e3f5946..4ae3022f8d7ef 100644 --- a/pkgs/development/python-modules/yamlordereddictloader/default.nix +++ b/pkgs/development/python-modules/yamlordereddictloader/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "yamlordereddictloader"; version = "0.4.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix index dfe590390166a..44ecf960c95ee 100644 --- a/pkgs/development/python-modules/yanc/default.nix +++ b/pkgs/development/python-modules/yanc/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "yanc"; version = "0.3.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 6e402627245b1..0084082c1687f 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "yapf"; version = "0.40.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index 8a0e4211742e4..161620530ab80 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "yapsy"; version = "1.12.2"; + format = "setuptools"; src = fetchPypi { pname = "Yapsy"; diff --git a/pkgs/development/python-modules/yarg/default.nix b/pkgs/development/python-modules/yarg/default.nix index 6368fbc463cd1..f6e08ecd05acb 100644 --- a/pkgs/development/python-modules/yarg/default.nix +++ b/pkgs/development/python-modules/yarg/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "yarg"; version = "0.1.9"; + format = "setuptools"; src = fetchFromGitHub { owner = "kura"; diff --git a/pkgs/development/python-modules/yargy/default.nix b/pkgs/development/python-modules/yargy/default.nix index 30ada41f87b02..73ba35f6c8b5d 100644 --- a/pkgs/development/python-modules/yargy/default.nix +++ b/pkgs/development/python-modules/yargy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pymorphy2 ]; - pythonImportCheck = [ "yargy" ]; + pythonImportsCheck = [ "yargy" ]; nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests" ]; diff --git a/pkgs/development/python-modules/yaswfp/default.nix b/pkgs/development/python-modules/yaswfp/default.nix index 8b7843d91752e..f4f6b8bc22be3 100644 --- a/pkgs/development/python-modules/yaswfp/default.nix +++ b/pkgs/development/python-modules/yaswfp/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "yaswfp"; version = "unstable-20210331"; + format = "setuptools"; src = fetchFromGitHub { owner = "facundobatista"; diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index 46490a098eb8f..46c9f1a3d7a96 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "ydiff"; version = "1.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 500dbcefb1e51..69b193c5b1f4d 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.32"; + version = "0.2.33"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sEEYi2qp3LcgBxN0tlbmOaCpkjiDO80lFIaY0qdbuoo="; + hash = "sha256-dj5ZGmvroUCK43q7cykwdJLQBWlpsN1FpKGcJrman+I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 8b27812166a06..ceff77e4d2b73 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.3.1"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bxaxjUKmhScku9mBjtuwiaT4TLTsRlro3y/XatyAfs0="; + hash = "sha256-wDZlzl178SIXxo5SacbbXWHhF4wOsjBU4a9h0jBYA4c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/youseedee/default.nix b/pkgs/development/python-modules/youseedee/default.nix index 65a98c350b283..e2d9456110ab9 100644 --- a/pkgs/development/python-modules/youseedee/default.nix +++ b/pkgs/development/python-modules/youseedee/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "youseedee"; version = "0.4.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/youtokentome/default.nix b/pkgs/development/python-modules/youtokentome/default.nix new file mode 100644 index 0000000000000..2adb7480f9069 --- /dev/null +++ b/pkgs/development/python-modules/youtokentome/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, click +, cython +, pytestCheckHook +, pythonOlder +, tabulate +}: + +buildPythonPackage rec { + pname = "youtokentome"; + version = "1.0.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "VKCOM"; + repo = "YouTokenToMe"; + rev = "refs/tags/v${version}"; + hash = "sha256-IFZS4jSi4yMzI7VbOPHI3KFZu5tjPjfQDPY7e1qbKAM="; + }; + + nativeBuildInputs = [ + cython + setuptools + ]; + + propagatedBuildInputs = [ + click + tabulate + ]; + + pythonImportsCheck = [ + "youtokentome" + ]; + + meta = with lib; { + description = "Unsupervised text tokenizer"; + homepage = "https://github.com/VKCOM/YouTokenToMe"; + changelog = "https://github.com/VKCOM/YouTokenToMe/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix index 560810323f2d6..79d9c4a174b89 100644 --- a/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "youtube-transcript-api"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jdepoix"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7s2qzmfYkaQ7xAi/U+skOEVTAj2gp+2WnODu9k1ojJY="; + hash = "sha256-xCB1XhXRq4jxyfst/n2wXj2k4dERm+/bVUJwP8b70gQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index b954451924686..1754dab10d36b 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "yowsup"; version = "3.3.0"; + format = "setuptools"; # The Python 2.x support of this package is incompatible with `six==1.11`: # https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486 diff --git a/pkgs/development/python-modules/yoyo-migrations/default.nix b/pkgs/development/python-modules/yoyo-migrations/default.nix index eb79d8ac0c9a2..493d6a77b4c1d 100644 --- a/pkgs/development/python-modules/yoyo-migrations/default.nix +++ b/pkgs/development/python-modules/yoyo-migrations/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "yoyo-migrations"; version = "8.2.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index cae85c51f4db2..16a5ea17c8e96 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "yq"; version = "3.2.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/yte/default.nix b/pkgs/development/python-modules/yte/default.nix index 3280cc76803e4..3056659cacbf0 100644 --- a/pkgs/development/python-modules/yte/default.nix +++ b/pkgs/development/python-modules/yte/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "yte"; - version = "1.5.1"; - format = "pyproject"; + version = "1.5.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "koesterlab"; - repo = pname; + repo = "yte"; rev = "refs/tags/v${version}"; - hash = "sha256-7erT5UpejPMIoyqhpYNEON3YWE2l5SdP2olOVpkbNkY="; + hash = "sha256-Rm3EKxRZCdYErkyWK9+fF2W7C+v5/MXD/LkehmB6UNQ="; }; nativeBuildInputs = [ @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "YAML template engine with Python expressions"; homepage = "https://github.com/koesterlab/yte"; + changelog = "https://github.com/yte-template-engine/yte/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/pkgs/development/python-modules/yubico-client/default.nix index e8457055c1808..3dec1966fdf52 100644 --- a/pkgs/development/python-modules/yubico-client/default.nix +++ b/pkgs/development/python-modules/yubico-client/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "yubico-client"; version = "1.13.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index 67c8c016e3f32..b83525cb1517a 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "z3c-checkversions"; version = "2.1"; + format = "setuptools"; src = fetchPypi { inherit version; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index ab5f7b8147c8d..e94f5f23834ba 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -85,6 +85,5 @@ buildPythonPackage rec { description = "Python SOAP client"; homepage = "http://docs.python-zeep.org"; license = licenses.mit; - maintainers = with maintainers; [ rvl ]; }; } diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 3c1627eb9e1b6..b830634eb52ad 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "zeroc-ice"; version = "3.7.9.1"; + format = "setuptools"; src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 7c2cf10e5dafe..c721259efa432 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,6 +1,5 @@ { lib -, stdenv -, cython +, cython_3 , async-timeout , buildPythonPackage , fetchFromGitHub @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.119.0"; + version = "0.131.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,11 +23,16 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-VaqKk2WrRLZM2tfx3+y9GngEc6rMcw0b12ExFVfDYf4="; + hash = "sha256-l+uz+wj+tgptxEjEN8ZlmxH8I4Nhrg8qAY3yCcOgBfE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "Cython>=3.0.5" "Cython" + ''; + nativeBuildInputs = [ - cython + cython_3 poetry-core setuptools ]; diff --git a/pkgs/development/python-modules/zerorpc/default.nix b/pkgs/development/python-modules/zerorpc/default.nix index 343c7c6e2515a..0cc61ac695e23 100644 --- a/pkgs/development/python-modules/zerorpc/default.nix +++ b/pkgs/development/python-modules/zerorpc/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "zerorpc"; version = "0.6.3"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 4808aa4972701..4417134d4d178 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -11,6 +11,7 @@ buildPythonPackage rec { pname = "zetup"; version = "0.2.64"; + format = "setuptools"; # https://github.com/zimmermanncode/zetup/issues/4 disabled = pythonAtLeast "3.10"; diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index fd5b99448d48b..12253f43d8681 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "zfec"; version = "1.5.7.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index a8959a9e863be..9063ecd02db06 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -5,23 +5,34 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools , zigpy }: buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.106"; - format = "setuptools"; + version = "0.0.109"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-+sL3AbjDg0Kl6eqMwVAN9W85QKJqFR1ANKz1E958KeA="; + hash = "sha256-fkE44j+wXdIJekJJNoO67YzsghalTUpyNx9R/B2Vn1Y="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "setuptools-git-versioning<2"' "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp zigpy diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index a0bc46b09a023..db40bada38244 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -6,13 +6,14 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools , zigpy }: buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.21.1"; - format = "setuptools"; + version = "0.22.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,9 +21,19 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YRJMIpC6Zk5sQjGyzdEbQEeYgFJzIbxe4BReayceu10="; + hash = "sha256-AHAvp/Z3BDqyKEs7liwl+zU7mzAfI03bBnsU3Sfw2rU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "setuptools-git-versioning<2"' "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyserial pyserial-asyncio diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index 92e995c1ec05d..848f253243cf6 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -6,25 +6,35 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools , zigpy }: buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.19.0"; - # 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 + version = "0.20.1"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - hash = "sha256-KUXXOySuPFNKcW3O08FBYIfm4WwVjOuIF+GefmKnwl0="; + hash = "sha256-H0rs4EOzz2Nx5YuwqTZp2FGF1z2phBgSIyraKHHx4RA="; }; - buildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "setuptools-git-versioning<2"' "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 4b11d35b6b7d2..0c11c6ed5c3d8 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -9,13 +9,14 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools , zigpy }: buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.11.0"; - format = "setuptools"; + version = "0.12.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,9 +24,19 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/${version}"; - hash = "sha256-eGN2QvPHZ8gfPPFdUbAP9cs43jzUHDBS/w1tni1shB0="; + hash = "sha256-wziXUFYSUXhzWHM870jphG12h99WVzqiYimtIbkXyM0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "setuptools-git-versioning<2"' "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ gpiozero pyserial diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index cf487cae08949..94fa9cdb0d383 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -10,14 +10,15 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools , voluptuous , zigpy }: buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.11.6"; - format = "setuptools"; + version = "0.12.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,12 +26,18 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-K85AmksP/dXKL4DQKadyvjK7y5x6yEgc6vDJAPfblTw="; + hash = "sha256-Bs/m9Iyr8x+sMUVXt1whk2E4EJ5bpitMsEWZtmCyIf8="; }; + nativeBuildInputs = [ + setuptools + ]; + postPatch = '' substituteInPlace pyproject.toml \ - --replace "timeout = 20" "timeout = 300" + --replace "timeout = 20" "timeout = 300" \ + --replace ', "setuptools-git-versioning<2"' "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 1f6560377ea7f..c3f1c2b5d43e9 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -14,12 +14,11 @@ , pythonOlder , setuptools , voluptuous -, wheel }: buildPythonPackage rec { pname = "zigpy"; - version = "0.58.1"; + version = "0.60.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-i2P9QyhT/UQ8Xu0IfQ2OzAxIiMF4H04Jkz3/6e2FCpY="; + hash = "sha256-3hYgb2uvyFQmtfdVKBorGhTgVt/Dq1roXTu7xvE7SHY="; }; postPatch = '' @@ -39,7 +38,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zipfile2/default.nix b/pkgs/development/python-modules/zipfile2/default.nix index fc733e6cdbd48..304696ae117a8 100644 --- a/pkgs/development/python-modules/zipfile2/default.nix +++ b/pkgs/development/python-modules/zipfile2/default.nix @@ -6,6 +6,7 @@ buildPythonPackage rec { pname = "zipfile2"; version = "0.0.12"; + format = "setuptools"; src = fetchFromGitHub { owner = "cournape"; diff --git a/pkgs/development/python-modules/zipstream/default.nix b/pkgs/development/python-modules/zipstream/default.nix index 3ec6fd24aa59e..bedc0b62267e3 100644 --- a/pkgs/development/python-modules/zipstream/default.nix +++ b/pkgs/development/python-modules/zipstream/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "zipstream"; version = "1.1.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix new file mode 100644 index 0000000000000..4f93df3c692b1 --- /dev/null +++ b/pkgs/development/python-modules/zlib-ng/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, cmake +, setuptools + +# native dependencies +, zlib-ng + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "zlib-ng"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pycompression"; + repo = "python-zlib-ng"; + rev = "v${version}"; + hash = "sha256-bVdt4GYdbzhoT6et+LOycg0Bt6dX9DtusNr8HPpgIFI="; + }; + + nativeBuildInputs = [ + cmake + setuptools + ]; + + dontUseCmakeConfigure = true; + + env.PYTHON_ZLIB_NG_LINK_DYNAMIC = true; + + buildInputs = [ + zlib-ng + ]; + + pythonImportsCheck = [ + "zlib_ng" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + rm -rf src + ''; + + disabledTests = [ + # commandline tests fail to find the built module + "test_compress_fast_best_are_exclusive" + "test_compress_infile_outfile" + "test_compress_infile_outfile_default" + "test_decompress_cannot_have_flags_compression" + "test_decompress_infile_outfile" + "test_decompress_infile_outfile_error" + ]; + + meta = with lib; { + description = "A drop-in replacement for Python's zlib and gzip modules using zlib-ng"; + homepage = "https://github.com/pycompression/python-zlib-ng"; + changelog = "https://github.com/pycompression/python-zlib-ng/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.psfl; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix index ce461a3dffea0..633cf9c15f6bc 100644 --- a/pkgs/development/python-modules/zm-py/default.nix +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -4,6 +4,7 @@ buildPythonPackage rec { pname = "zm-py"; version = "0.5.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 0c0209740332f..cca21b1f8bfc9 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -8,6 +8,7 @@ buildPythonPackage rec { pname = "zope-deferredimport"; version = "5.0"; + format = "setuptools"; src = fetchPypi { pname = "zope.deferredimport"; diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index a1cd30fd54785..0d1e5a7ddb420 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "zope-hookable"; version = "5.4"; + format = "setuptools"; src = fetchPypi { pname = "zope.hookable"; diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index bc233a6555b7c..368d246d9dc64 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -10,6 +10,7 @@ buildPythonPackage rec { pname = "zstd"; version = "1.5.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/zulip/default.nix b/pkgs/development/python-modules/zulip/default.nix index fe889522e5f75..81b068e232124 100644 --- a/pkgs/development/python-modules/zulip/default.nix +++ b/pkgs/development/python-modules/zulip/default.nix @@ -2,38 +2,46 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , requests , matrix-client , distro , click , typing-extensions +, matrix-nio , pytestCheckHook }: buildPythonPackage rec { pname = "zulip"; - version = "0.8.2"; + version = "0.9.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; + + pyproject = true; # no sdist on PyPI src = fetchFromGitHub { owner = "zulip"; repo = "python-zulip-api"; rev = version; - hash = "sha256-Z5WrV/RDQwdKUBF86M5/xWhXn3fGNqJtqO5PTd7s5ME="; + hash = "sha256-YnNXduZ2KOjRHGwhojkqpMP2mwhflk8/f4FVZL8NvHU="; }; sourceRoot = "${src.name}/zulip"; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests - matrix-client distro click typing-extensions - ]; + ] ++ requests.optional-dependencies.security; nativeCheckInputs = [ + matrix-nio pytestCheckHook ]; diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index a8286ef5df9db..576c827e84b08 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -50,13 +50,13 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "4.9.1"; + version = "4.9.2"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - hash = "sha256-tWl16dd0a6pDz+cUZx9Ku2ov+LJZabR2cDso5tPbML4="; + hash = "sha256-StYgnFBnEJUkJDyFluMm01xhgejXc99AEldGGxIvZU0="; }; postPatch = '' diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 4f7bdd92477e9..a7489afd30a03 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1387,6 +1387,13 @@ let ''; }); + tesseract = old.tesseract.overrideAttrs (_: { + preConfigure = '' + substituteInPlace configure \ + --replace 'PKG_CONFIG_NAME="tesseract"' 'PKG_CONFIG_NAME="tesseract lept"' + ''; + }); + ijtiff = old.ijtiff.overrideAttrs (_: { preConfigure = '' patchShebangs configure diff --git a/pkgs/development/rocm-modules/5/clang-ocl/default.nix b/pkgs/development/rocm-modules/5/clang-ocl/default.nix index 7af83bd2e1327..c29223dd8c7fa 100644 --- a/pkgs/development/rocm-modules/5/clang-ocl/default.nix +++ b/pkgs/development/rocm-modules/5/clang-ocl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "clang-ocl"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-uMSvcVJj+me2E+7FsXZ4l4hTcK6uKEegXpkHGcuist0="; @@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "OpenCL compilation with clang compiler"; - homepage = "https://github.com/RadeonOpenCompute/clang-ocl"; + homepage = "https://github.com/ROCm/clang-ocl"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/clr/default.nix b/pkgs/development/rocm-modules/5/clr/default.nix index f12ef2bfc8b5a..1a72a8d7c3fb8 100644 --- a/pkgs/development/rocm-modules/5/clr/default.nix +++ b/pkgs/development/rocm-modules/5/clr/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "clr"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-1gZJhvBbUFdKH9p/7SRfzEV/fM+gIN2Qvlxf2VbmAIw="; @@ -82,7 +82,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DROCM_PATH=${rocminfo}" # Temporarily set variables to work around upstream CMakeLists issue - # Can be removed once https://github.com/ROCm-Developer-Tools/hipamd/issues/55 is fixed + # Can be removed once https://github.com/ROCm/rocm-cmake/issues/121 is fixed "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" @@ -122,7 +122,7 @@ in stdenv.mkDerivation (finalAttrs: { passthru = { # All known and valid general GPU targets # We cannot use this for each ROCm library, as each defines their own supported targets - # See: https://github.com/RadeonOpenCompute/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix + # See: https://github.com/ROCm/ROCm/blob/77cbac4abab13046ee93d8b5bf410684caf91145/README.md#library-target-matrix gpuTargets = lib.forEach [ "803" "900" @@ -161,10 +161,10 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "AMD Common Language Runtime for hipamd, opencl, and rocclr"; - homepage = "https://github.com/ROCm-Developer-Tools/clr"; + homepage = "https://github.com/ROCm/clr"; license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/composable_kernel/default.nix b/pkgs/development/rocm-modules/5/composable_kernel/default.nix index 75039fc7d417a..78416b77a07b1 100644 --- a/pkgs/development/rocm-modules/5/composable_kernel/default.nix +++ b/pkgs/development/rocm-modules/5/composable_kernel/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "composable_kernel"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-Z9X+S2SijGJ8bhr9ghkkWicBUzLzs9fxPpqZxX6BBM4="; @@ -79,10 +79,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Performance portable programming model for machine learning tensor operators"; - homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; + homepage = "https://github.com/ROCm/composable_kernel"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/default.nix b/pkgs/development/rocm-modules/5/default.nix index d5f1c2678c4e1..204e0ee2abbec 100644 --- a/pkgs/development/rocm-modules/5/default.nix +++ b/pkgs/development/rocm-modules/5/default.nix @@ -15,7 +15,7 @@ let rocmUpdateScript = callPackage ./update.nix { }; in rec { - ## RadeonOpenCompute ## + ## ROCm ## llvm = recurseIntoAttrs (callPackage ./llvm/default.nix { inherit rocmUpdateScript rocm-device-libs rocm-runtime rocm-thunk clr; }); rocm-core = callPackage ./rocm-core { @@ -78,7 +78,6 @@ in rec { rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { }; - ## ROCm-Developer-Tools ## hip-common = callPackage ./hip-common { inherit rocmUpdateScript; stdenv = llvm.rocmClangStdenv; @@ -130,7 +129,6 @@ in rec { stdenv = llvm.rocmClangStdenv; }; - ## ROCmSoftwarePlatform ## rocprim = callPackage ./rocprim { inherit rocmUpdateScript rocm-cmake clr; stdenv = llvm.rocmClangStdenv; @@ -275,7 +273,6 @@ in rec { rocmlir = rocmlir-rock; }; - ## GPUOpen-ProfessionalCompute-Libraries ## rpp = callPackage ./rpp { inherit rocmUpdateScript rocm-cmake rocm-docs-core clr half; inherit (llvm) openmp; @@ -306,7 +303,7 @@ in rec { stdenv = llvm.rocmClangStdenv; # Unfortunately, rocAL needs a custom libjpeg-turbo until further notice - # See: https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/issues/1051 + # See: https://github.com/ROCm/MIVisionX/issues/1051 libjpeg_turbo = libjpeg_turbo.overrideAttrs { version = "2.0.6.1"; @@ -342,8 +339,8 @@ in rec { # Emulate common ROCm meta layout # These are mainly for users. I strongly suggest NOT using these in nixpkgs derivations # Don't put these into `propagatedBuildInputs` unless you want PATH/PYTHONPATH issues! - # See: https://rocm.docs.amd.com/en/latest/_images/image.004.png - # See: https://rocm.docs.amd.com/en/latest/deploy/linux/os-native/package_manager_integration.html + # See: https://rocm.docs.amd.com/en/docs-5.7.1/_images/image.004.png + # See: https://rocm.docs.amd.com/en/docs-5.7.1/deploy/linux/os-native/package_manager_integration.html meta = rec { rocm-developer-tools = symlinkJoin { name = "rocm-developer-tools-meta"; @@ -438,7 +435,7 @@ in rec { rocm-core llvm.clang llvm.mlir - llvm.openmp # openmp-extras-devel (https://github.com/ROCm-Developer-Tools/aomp) + llvm.openmp # openmp-extras-devel (https://github.com/ROCm/aomp) rocm-language-runtime ]; }; @@ -502,7 +499,7 @@ in rec { rocm-runtime rocm-core rocm-comgr - llvm.openmp # openmp-extras-runtime (https://github.com/ROCm-Developer-Tools/aomp) + llvm.openmp # openmp-extras-runtime (https://github.com/ROCm/aomp) ]; }; diff --git a/pkgs/development/rocm-modules/5/half/default.nix b/pkgs/development/rocm-modules/5/half/default.nix index 1ddd06b014491..400ab50885986 100644 --- a/pkgs/development/rocm-modules/5/half/default.nix +++ b/pkgs/development/rocm-modules/5/half/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "half"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-82It+/wm8+umBdQYn7lz/fS69h+f0mzwPdGxoJNYUq0="; @@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C++ library for half precision floating point arithmetics"; - homepage = "https://github.com/ROCmSoftwarePlatform/half"; + homepage = "https://github.com/ROCm/half"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.unix; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hip-common/default.nix b/pkgs/development/rocm-modules/5/hip-common/default.nix index 6e2f950c0193f..2687b587dbde0 100644 --- a/pkgs/development/rocm-modules/5/hip-common/default.nix +++ b/pkgs/development/rocm-modules/5/hip-common/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "HIP"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-1Abit9qZCwrCVcnaFT4uMygFB9G6ovRasLmTsOsJ/Fw="; @@ -35,10 +35,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C++ Heterogeneous-Compute Interface for Portability"; - homepage = "https://github.com/ROCm-Developer-Tools/HIP"; + homepage = "https://github.com/ROCm/HIP"; license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipblas/default.nix b/pkgs/development/rocm-modules/5/hipblas/default.nix index c604dda465934..a59543d653a4c 100644 --- a/pkgs/development/rocm-modules/5/hipblas/default.nix +++ b/pkgs/development/rocm-modules/5/hipblas/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "hipBLAS"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-abaEZN82dsoEC5gIF3/6epRDVz5ItUo6CkZsybu/G+g="; @@ -90,10 +90,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm BLAS marshalling library"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipBLAS"; + homepage = "https://github.com/ROCm/hipBLAS"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipcc/default.nix b/pkgs/development/rocm-modules/5/hipcc/default.nix index 20c428bbf8096..63e6e4fb577de 100644 --- a/pkgs/development/rocm-modules/5/hipcc/default.nix +++ b/pkgs/development/rocm-modules/5/hipcc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "HIPCC"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-lJX6nF1V4YmK5ai7jivXlRnG3doIOf6X9CWLHVdRuVg="; @@ -37,10 +37,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Compiler driver utility that calls clang or nvcc"; - homepage = "https://github.com/ROCm-Developer-Tools/HIPCC"; + homepage = "https://github.com/ROCm/HIPCC"; license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipcub/default.nix b/pkgs/development/rocm-modules/5/hipcub/default.nix index 943a14c379a1c..ede46ccfbd57a 100644 --- a/pkgs/development/rocm-modules/5/hipcub/default.nix +++ b/pkgs/development/rocm-modules/5/hipcub/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "hipCUB"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-ygBEA3NuCQ13QrSzGqyWXkx8Dy9WhR3u4syzapRTkFU="; @@ -81,10 +81,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Thin wrapper library on top of rocPRIM or CUB"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB"; + homepage = "https://github.com/ROCm/hipCUB"; license = with licenses; [ bsd3 ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipfft/default.nix b/pkgs/development/rocm-modules/5/hipfft/default.nix index b0c5928a192d9..44d1475f68772 100644 --- a/pkgs/development/rocm-modules/5/hipfft/default.nix +++ b/pkgs/development/rocm-modules/5/hipfft/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "hipFFT"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-fuYRKdlTrRMwxr3cgMeT3YniPzs4nuvF8YCzr3LLPFM="; @@ -101,10 +101,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "FFT marshalling library"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipFFT"; + homepage = "https://github.com/ROCm/hipFFT"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipfort/default.nix b/pkgs/development/rocm-modules/5/hipfort/default.nix index 4b6c7c56af41a..092c6e7581951 100644 --- a/pkgs/development/rocm-modules/5/hipfort/default.nix +++ b/pkgs/development/rocm-modules/5/hipfort/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "hipfort"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-DRjUWhdinDKP7CZgq2SmU3lGmmodCuXvco9aEeMLSZ4="; @@ -57,10 +57,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Fortran interfaces for ROCm libraries"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipfort"; + homepage = "https://github.com/ROCm/hipfort"; license = with licenses; [ mit ]; # mitx11 maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipify/default.nix b/pkgs/development/rocm-modules/5/hipify/default.nix index e553c0e385a5d..281ad02d5dfcf 100644 --- a/pkgs/development/rocm-modules/5/hipify/default.nix +++ b/pkgs/development/rocm-modules/5/hipify/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "HIPIFY"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-lCQ2VTUGmFC90Xu70/tvoeDhFaInGqLT3vC2A1UojNI="; @@ -41,10 +41,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Convert CUDA to Portable C++ Code"; - homepage = "https://github.com/ROCm-Developer-Tools/HIPIFY"; + homepage = "https://github.com/ROCm/HIPIFY"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipsolver/default.nix b/pkgs/development/rocm-modules/5/hipsolver/default.nix index 9c5c1cad2207a..ab4b60ef2c355 100644 --- a/pkgs/development/rocm-modules/5/hipsolver/default.nix +++ b/pkgs/development/rocm-modules/5/hipsolver/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "hipSOLVER"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-5b6kPj9yvXvP7f7AyHDTYRoM/EhQZvwkVCfDflFJugc="; @@ -91,10 +91,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm SOLVER marshalling library"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipSOLVER"; + homepage = "https://github.com/ROCm/hipSOLVER"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hipsparse/default.nix b/pkgs/development/rocm-modules/5/hipsparse/default.nix index 0e77079348b39..9e3046223173d 100644 --- a/pkgs/development/rocm-modules/5/hipsparse/default.nix +++ b/pkgs/development/rocm-modules/5/hipsparse/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "hipSPARSE"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-txigaOoZMI/v+EQLgGlj2O0IHfE7EpgjL0cyv49nKzo="; @@ -127,10 +127,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm SPARSE marshalling library"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE"; + homepage = "https://github.com/ROCm/hipSPARSE"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix index 8bd479c5c245f..c007f2c62260a 100644 --- a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix +++ b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ unfree ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix index 95260a79321d4..bbde07ae9a98b 100644 --- a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix +++ b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix @@ -37,6 +37,12 @@ let extVersion="$(echo $deb | grep -o -P "(?<=\.....).*(?=\..*-)")" version="$(echo $extVersion | sed "s/0/./1" | sed "s/0/./1")" + IFS='.' read -a version_arr <<< "$version" + + if (( ''${version_arr[0]} > 5 )); then + echo "'rocmPackages_5.${prefix}-bin' is already at it's maximum allowed version.''\nAny further upgrades should go into 'rocmPackages_X.${prefix}-bin'." 1>&2 + exit 1 + fi if (( ''${#extVersion} == 5 )); then repoVersion="$version" diff --git a/pkgs/development/rocm-modules/5/llvm/base.nix b/pkgs/development/rocm-modules/5/llvm/base.nix index 82de9e6f3665c..6174963fd998c 100644 --- a/pkgs/development/rocm-modules/5/llvm/base.nix +++ b/pkgs/development/rocm-modules/5/llvm/base.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation (finalAttrs: { patches = extraPatches; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "llvm-project"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-0+lJnDiMntxCYbZBCSWvHOcKXexFfEzRfb49QbfOmK8="; @@ -158,10 +158,10 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm fork of the LLVM compiler infrastructure"; - homepage = "https://github.com/RadeonOpenCompute/llvm-project"; + homepage = "https://github.com/ROCm/llvm-project"; license = with licenses; [ ncsa ] ++ extraLicenses; maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = isBroken; + broken = isBroken || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix b/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix index 51959ec8bc325..6160e34c1b51c 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix @@ -6,5 +6,5 @@ callPackage ../base.nix { inherit rocmUpdateScript; requiredSystemFeatures = [ "big-parallel" ]; - isBroken = stdenv.isAarch64; # https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344 + isBroken = stdenv.isAarch64; # https://github.com/ROCm/ROCm/issues/1831#issuecomment-1278205344 } diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix index 1b0bc29ea62b8..6de685ea27718 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix @@ -18,7 +18,7 @@ callPackage ../base.nix rec { # Fix `DebugTranslation.cpp:139:10: error: no matching function for call to 'get'` # We patch at a different source root, so we modify the patch and include it locally - # https://github.com/RadeonOpenCompute/llvm-project/commit/f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74.patch + # https://github.com/ROCm/llvm-project/commit/f1d1e10ec7e1061bf0b90abbc1e298d9438a5e74.patch extraPatches = [ ./0000-mlir-fix-debugtranslation.patch ]; extraNativeBuildInputs = [ clr ]; diff --git a/pkgs/development/rocm-modules/5/migraphx/default.nix b/pkgs/development/rocm-modules/5/migraphx/default.nix index 3283ffc10cd52..006a5ca9990b0 100644 --- a/pkgs/development/rocm-modules/5/migraphx/default.nix +++ b/pkgs/development/rocm-modules/5/migraphx/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "AMDMIGraphX"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-lg3pxHBpwqxBvdOQgE44YKLuumhkVF6b3Xx4+cw7jNQ="; @@ -123,7 +123,7 @@ in stdenv.mkDerivation (finalAttrs: { --replace "set(MIGRAPHX_TIDY_ERRORS ALL)" "" # JIT library was removed from composable_kernel... - # https://github.com/ROCmSoftwarePlatform/composable_kernel/issues/782 + # https://github.com/ROCm/composable_kernel/issues/782 substituteInPlace src/targets/gpu/CMakeLists.txt \ --replace " COMPONENTS jit_library" "" \ --replace " composable_kernel::jit_library" "" \ @@ -162,10 +162,10 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "AMD's graph optimization engine"; - homepage = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX"; + homepage = "https://github.com/ROCm/AMDMIGraphX"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/miopen/default.nix b/pkgs/development/rocm-modules/5/miopen/default.nix index 4a0cf92188a78..33959efa00ebd 100644 --- a/pkgs/development/rocm-modules/5/miopen/default.nix +++ b/pkgs/development/rocm-modules/5/miopen/default.nix @@ -38,7 +38,7 @@ let version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "MIOpen"; rev = "rocm-${version}"; hash = "sha256-xcKmFI8HcRA9bbh6EQGElKykIQ3RJX/q5f4IxXvM1Is="; @@ -110,11 +110,11 @@ in stdenv.mkDerivation (finalAttrs: { # Find zstd and add to target. Mainly for torch. patches = [ (fetchpatch { - url = "https://github.com/ROCmSoftwarePlatform/MIOpen/commit/e608b4325646afeabb5e52846997b926d2019d19.patch"; + url = "https://github.com/ROCm/MIOpen/commit/e608b4325646afeabb5e52846997b926d2019d19.patch"; hash = "sha256-oxa3qlIC2bzbwGxrQOZXoY/S7CpLsMrnWRB7Og0tk0M="; }) (fetchpatch { - url = "https://github.com/ROCmSoftwarePlatform/MIOpen/commit/3413d2daaeb44b7d6eadcc03033a5954a118491e.patch"; + url = "https://github.com/ROCm/MIOpen/commit/3413d2daaeb44b7d6eadcc03033a5954a118491e.patch"; hash = "sha256-ST4snUcTmmSI1Ogx815KEX9GdMnmubsavDzXCGJkiKs="; }) ]; @@ -230,10 +230,10 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Machine intelligence library for ROCm"; - homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen"; + homepage = "https://github.com/ROCm/MIOpen"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/miopengemm/default.nix b/pkgs/development/rocm-modules/5/miopengemm/default.nix index f56e42da59d2c..342bd950b1fb1 100644 --- a/pkgs/development/rocm-modules/5/miopengemm/default.nix +++ b/pkgs/development/rocm-modules/5/miopengemm/default.nix @@ -43,6 +43,7 @@ in stdenv.mkDerivation (finalAttrs: { "benchmark" ]; + # Deprecated? https://github.com/ROCmSoftwarePlatform/MIOpenGEMM/issues/62 src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "MIOpenGEMM"; @@ -120,6 +121,6 @@ in stdenv.mkDerivation (finalAttrs: { platforms = platforms.linux; # They are not making tags or releases, this may break other derivations in the future # Use version major instead of minor, 6.0 will HOPEFULLY have a release or tag - broken = versions.major finalAttrs.version != versions.major stdenv.cc.version; + broken = versions.major finalAttrs.version != versions.major stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/mivisionx/default.nix b/pkgs/development/rocm-modules/5/mivisionx/default.nix index 7eac2a4ca4979..39fd4f5b76e30 100644 --- a/pkgs/development/rocm-modules/5/mivisionx/default.nix +++ b/pkgs/development/rocm-modules/5/mivisionx/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "GPUOpen-ProfessionalCompute-Libraries"; + owner = "ROCm"; repo = "MIVisionX"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-jmOgwESNALQt7ctmUY9JHgKq47tCwsW1ybynkX9236U="; @@ -136,10 +136,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Set of comprehensive computer vision and machine intelligence libraries, utilities, and applications"; - homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX"; + homepage = "https://github.com/ROCm/MIVisionX"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rccl/default.nix b/pkgs/development/rocm-modules/5/rccl/default.nix index 3f011d3fdfacf..b80b96ac403a7 100644 --- a/pkgs/development/rocm-modules/5/rccl/default.nix +++ b/pkgs/development/rocm-modules/5/rccl/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rccl"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-nFkou/kjGBmImorlPOZNTlCrxbfAYpDhgRveyoAufu8="; @@ -82,10 +82,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm communication collectives library"; - homepage = "https://github.com/ROCmSoftwarePlatform/rccl"; + homepage = "https://github.com/ROCm/rccl"; license = with licenses; [ bsd2 bsd3 ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rdc/default.nix b/pkgs/development/rocm-modules/5/rdc/default.nix index 8b447454fc4b6..3ef5a200ea1a5 100644 --- a/pkgs/development/rocm-modules/5/rdc/default.nix +++ b/pkgs/development/rocm-modules/5/rdc/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "rdc"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-xZD/WI/LfNtKK9j6ZjuU0OTTFZz3G4atyD5mVcSsQ8A="; @@ -115,11 +115,11 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Simplifies administration and addresses infrastructure challenges in cluster and datacenter environments"; - homepage = "https://github.com/RadeonOpenCompute/rdc"; + homepage = "https://github.com/ROCm/rdc"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - # broken = versions.minor finalAttrs.version != versions.minor rocm-smi.version; + # broken = versions.minor finalAttrs.version != versions.minor rocm-smi.version || versionAtLeast finalAttrs.version "6.0.0"; broken = true; # Too many errors, unsure how to fix }; }) diff --git a/pkgs/development/rocm-modules/5/rocalution/default.nix b/pkgs/development/rocm-modules/5/rocalution/default.nix index 2a0e149bb3e92..11f52ea1318c5 100644 --- a/pkgs/development/rocm-modules/5/rocalution/default.nix +++ b/pkgs/development/rocm-modules/5/rocalution/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocALUTION"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-+UGpFuZsC4+kmo8LWZWC2YoFJSdTukjN47e1YqW5Zu4="; @@ -106,10 +106,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Iterative sparse solvers for ROCm"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocALUTION"; + homepage = "https://github.com/ROCm/rocALUTION"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocblas/default.nix b/pkgs/development/rocm-modules/5/rocblas/default.nix index ca6a9e6e723a6..bd8a4ed4e35dd 100644 --- a/pkgs/development/rocm-modules/5/rocblas/default.nix +++ b/pkgs/development/rocm-modules/5/rocblas/default.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocBLAS"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-3wKnwvAra8u9xqlC05wUD+gSoBILTVJFU2cIV6xv3Lk="; @@ -200,10 +200,10 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "BLAS implementation for ROCm platform"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS"; + homepage = "https://github.com/ROCm/rocBLAS"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocdbgapi/default.nix b/pkgs/development/rocm-modules/5/rocdbgapi/default.nix index dbc3f647815ce..fd6797d0d43b4 100644 --- a/pkgs/development/rocm-modules/5/rocdbgapi/default.nix +++ b/pkgs/development/rocm-modules/5/rocdbgapi/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "ROCdbgapi"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-qMXvgcS61lgcylz62ErYq8fhpYIR31skQEeKUryuP1w="; @@ -102,10 +102,10 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Debugger support for control of execution and inspection state"; - homepage = "https://github.com/ROCm-Developer-Tools/ROCdbgapi"; + homepage = "https://github.com/ROCm/ROCdbgapi"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocfft/default.nix b/pkgs/development/rocm-modules/5/rocfft/default.nix index 309a7f2fe2244..48f3264d157f3 100644 --- a/pkgs/development/rocm-modules/5/rocfft/default.nix +++ b/pkgs/development/rocm-modules/5/rocfft/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocFFT"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-GZSi03geTT+NUztBWhGYyghLqJGsFjUQzVAKQ7d03uA="; @@ -160,10 +160,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "FFT implementation for ROCm"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT"; + homepage = "https://github.com/ROCm/rocFFT"; license = with licenses; [ mit ]; maintainers = with maintainers; [ kira-bruneau ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocgdb/default.nix b/pkgs/development/rocm-modules/5/rocgdb/default.nix index facec0cf16d34..a02ad3f9e8f2d 100644 --- a/pkgs/development/rocm-modules/5/rocgdb/default.nix +++ b/pkgs/development/rocm-modules/5/rocgdb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "ROCgdb"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-TlT7vvTrVd7P6ilVnWIG5VIrjTleFgDezK/mudBV+xE="; @@ -50,9 +50,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm source-level debugger for Linux, based on GDB"; - homepage = "https://github.com/ROCm-Developer-Tools/ROCgdb"; + homepage = "https://github.com/ROCm/ROCgdb"; license = with licenses; [ gpl2 gpl3 bsd3 ]; maintainers = teams.rocm.members; platforms = platforms.linux; + broken = versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-cmake/default.nix b/pkgs/development/rocm-modules/5/rocm-cmake/default.nix index d88912154f8bc..c0d7e48ff59f3 100644 --- a/pkgs/development/rocm-modules/5/rocm-cmake/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-cmake/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "rocm-cmake"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-aVjzuJ4BiSfwOdjufFc5CznfnL8di5h992zl+pzD0DU="; @@ -26,10 +26,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "CMake modules for common build tasks for the ROCm stack"; - homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; + homepage = "https://github.com/ROCm/rocm-cmake"; license = licenses.mit; maintainers = teams.rocm.members; platforms = platforms.unix; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix index 8411c4d53cb34..1ef226b338c42 100644 --- a/pkgs/development/rocm-modules/5/rocm-comgr/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-comgr/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "ROCm-CompilerSupport"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-QB3G0V92UTW67hD6+zSuExN1+eMT820iYSlMyZeWSFw="; @@ -46,10 +46,10 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "APIs for compiling and inspecting AMDGPU code objects"; - homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; + homepage = "https://github.com/ROCm/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-core/default.nix b/pkgs/development/rocm-modules/5/rocm-core/default.nix index a29575168b45d..c96bfeb0d2952 100644 --- a/pkgs/development/rocm-modules/5/rocm-core/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-core/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "rocm-core"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-jFAHLqf/AR27Nbuq8aypWiKqApNcTgG5LWESVjVCKIg="; @@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Utility for getting the ROCm release version"; - homepage = "https://github.com/RadeonOpenCompute/rocm-core"; + homepage = "https://github.com/ROCm/rocm-core"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix index 844f38a9a4b21..28af3e9602664 100644 --- a/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-device-libs/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "ROCm-Device-Libs"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-ARxs/yqyVoIUWliJkINzitumF+64/5u3fbB0tHB5hPU="; @@ -41,10 +41,10 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Set of AMD-specific device-side language runtime libraries"; - homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; + homepage = "https://github.com/ROCm/ROCm-Device-Libs"; license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix index 220e89fe71d26..e980c9509a088 100644 --- a/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-docs-core/default.nix @@ -20,6 +20,7 @@ , fastjsonschema }: +# FIXME: Move to rocmPackages_common buildPythonPackage rec { pname = "rocm-docs-core"; version = "0.26.0"; diff --git a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix index 79174c7032f03..f94f49d00bd4c 100644 --- a/pkgs/development/rocm-modules/5/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-runtime/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "ROCR-Runtime"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-D7Ahan5cxDhqPtV5iDDNys0A4FlxQ9oVRa2EeMoY5Qk="; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { --replace 'hsa/include/hsa' 'include/hsa' # We compile clang before rocm-device-libs, so patch it in afterwards - # Replace object version: https://github.com/RadeonOpenCompute/ROCR-Runtime/issues/166 (TODO: Remove on LLVM update?) + # Replace object version: https://github.com/ROCm/ROCR-Runtime/issues/166 (TODO: Remove on LLVM update?) substituteInPlace image/blit_src/CMakeLists.txt \ --replace '-cl-denorms-are-zero' '-cl-denorms-are-zero --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode' \ --replace '-mcode-object-version=4' '-mcode-object-version=5' @@ -69,10 +69,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Platform runtime for ROCm"; - homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; + homepage = "https://github.com/ROCm/ROCR-Runtime"; license = with licenses; [ ncsa ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-smi/default.nix b/pkgs/development/rocm-modules/5/rocm-smi/default.nix index 66c1c765c13f0..91b730f03b37d 100644 --- a/pkgs/development/rocm-modules/5/rocm-smi/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-smi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "rocm_smi_lib"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-NZR4jBgKVfpkRNQFPmav1yCZF872LkcrPBNNcBVTLDU="; @@ -45,10 +45,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "System management interface for AMD GPUs supported by ROCm"; - homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib"; + homepage = "https://github.com/ROCm/rocm_smi_lib"; license = with licenses; [ mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = [ "x86_64-linux" ]; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocm-thunk/default.nix b/pkgs/development/rocm-modules/5/rocm-thunk/default.nix index 98fbc56517f93..f610f8a0d53a8 100644 --- a/pkgs/development/rocm-modules/5/rocm-thunk/default.nix +++ b/pkgs/development/rocm-modules/5/rocm-thunk/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-jAMBks2/JaXiA45B3qvLHY8fPeFcr1GHT5Jieuduqhw="; @@ -45,10 +45,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Radeon open compute thunk interface"; - homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; + homepage = "https://github.com/ROCm/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocminfo/default.nix b/pkgs/development/rocm-modules/5/rocminfo/default.nix index c80dbc4aeacf7..addbad038b94e 100644 --- a/pkgs/development/rocm-modules/5/rocminfo/default.nix +++ b/pkgs/development/rocm-modules/5/rocminfo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocminfo"; src = fetchFromGitHub { - owner = "RadeonOpenCompute"; + owner = "ROCm"; repo = "rocminfo"; rev = "rocm-${finalAttrs.version}"; sha256 = "sha256-UzOo2qDT/uM+vdGdBM4pV5e143mfa+/6sZLBExOO26g="; @@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm Application for Reporting System Info"; - homepage = "https://github.com/RadeonOpenCompute/rocminfo"; + homepage = "https://github.com/ROCm/rocminfo"; license = licenses.ncsa; maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; platforms = platforms.linux; - broken = stdenv.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = stdenv.isAarch64 || versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocmlir/default.nix b/pkgs/development/rocm-modules/5/rocmlir/default.nix index 74fe00e781cc1..73dbbf8f95f85 100644 --- a/pkgs/development/rocm-modules/5/rocmlir/default.nix +++ b/pkgs/development/rocm-modules/5/rocmlir/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocMLIR"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-vPi4UVljohVAfnwDVQqeOVaJPa6v8aV5uBOtqLddTtc="; @@ -121,10 +121,10 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "MLIR-based convolution and GEMM kernel generator"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR"; + homepage = "https://github.com/ROCm/rocMLIR"; license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocprim/default.nix b/pkgs/development/rocm-modules/5/rocprim/default.nix index 10d1f187ba736..398d1d5509cfe 100644 --- a/pkgs/development/rocm-modules/5/rocprim/default.nix +++ b/pkgs/development/rocm-modules/5/rocprim/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocPRIM"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-+ukFWsWv3RhS+Z6tmR4TRT8QTYEDuAEk12F9Gv1eXGU="; @@ -77,10 +77,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm parallel primitives"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM"; + homepage = "https://github.com/ROCm/rocPRIM"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocprofiler/default.nix b/pkgs/development/rocm-modules/5/rocprofiler/default.nix index c66c56a64eb84..c544b3f226bba 100644 --- a/pkgs/development/rocm-modules/5/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/5/rocprofiler/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "rocprofiler"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-1s/7C9y+73ADLF/17Vepw0pZNVtYnKoP24GdwKc9X2Y="; @@ -127,10 +127,10 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Profiling with perf-counters and derived metrics"; - homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler"; + homepage = "https://github.com/ROCm/rocprofiler"; license = with licenses; [ mit ]; # mitx11 maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor clr.version; + broken = versions.minor finalAttrs.version != versions.minor clr.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix b/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix index 6dd0ec45b3b65..67da17304b3d0 100644 --- a/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix +++ b/pkgs/development/rocm-modules/5/rocr-debug-agent/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "rocr_debug_agent"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-AUDbNrFtUQ5Hm+uv5KMovh7P9wXQKLyRNx9gEQFnv6Y="; @@ -50,10 +50,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Library that provides some debugging functionality for ROCr"; - homepage = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent"; + homepage = "https://github.com/ROCm/rocr_debug_agent"; license = with licenses; [ ncsa ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocrand/default.nix b/pkgs/development/rocm-modules/5/rocrand/default.nix index d61b95394cab7..5abdb3fafecb2 100644 --- a/pkgs/development/rocm-modules/5/rocrand/default.nix +++ b/pkgs/development/rocm-modules/5/rocrand/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocRAND"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-VrpiHlZZQH+IOoaEDuDOfRgnMiqm1bpRIuNyrPz2SGY="; @@ -79,10 +79,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Generate pseudo-random and quasi-random numbers"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocRAND"; + homepage = "https://github.com/ROCm/rocRAND"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocsolver/default.nix b/pkgs/development/rocm-modules/5/rocsolver/default.nix index ade9c69e534e7..518aa798d49b4 100644 --- a/pkgs/development/rocm-modules/5/rocsolver/default.nix +++ b/pkgs/development/rocm-modules/5/rocsolver/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocSOLVER"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-qxmjm4tgpCnfJ2SqUXndk6y0MsPJUKHvjv/3Uc0smr4="; @@ -89,12 +89,12 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm LAPACK implementation"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocSOLVER"; + homepage = "https://github.com/ROCm/rocSOLVER"; license = with licenses; [ bsd2 ]; maintainers = teams.rocm.members; platforms = platforms.linux; timeout = 14400; # 4 hours maxSilent = 14400; # 4 hours - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocsparse/default.nix b/pkgs/development/rocm-modules/5/rocsparse/default.nix index e19334df15145..07e2018b0287c 100644 --- a/pkgs/development/rocm-modules/5/rocsparse/default.nix +++ b/pkgs/development/rocm-modules/5/rocsparse/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocSPARSE"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-30q9bqgZJUaNrkMXTAG+Z34yjsQ5DpJP+WBcCiEmF58="; @@ -140,10 +140,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm SPARSE implementation"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE"; + homepage = "https://github.com/ROCm/rocSPARSE"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocthrust/default.nix b/pkgs/development/rocm-modules/5/rocthrust/default.nix index 4fe2e0828a16c..bd03cc11d7807 100644 --- a/pkgs/development/rocm-modules/5/rocthrust/default.nix +++ b/pkgs/development/rocm-modules/5/rocthrust/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocThrust"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-+bcHcA87IToTcII7N/hm81C/JiokJKj0M1yAph/x9Qc="; @@ -78,10 +78,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "ROCm parallel algorithm library"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust"; + homepage = "https://github.com/ROCm/rocThrust"; license = with licenses; [ asl20 ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/roctracer/default.nix b/pkgs/development/rocm-modules/5/roctracer/default.nix index 7be3ea0f7505e..9270a273dcae9 100644 --- a/pkgs/development/rocm-modules/5/roctracer/default.nix +++ b/pkgs/development/rocm-modules/5/roctracer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; + owner = "ROCm"; repo = "roctracer"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-P6QYyAjMRwFFWKF8AhbrYGe+mYVJXdbBW1or6vcobYU="; @@ -94,10 +94,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Tracer callback/activity library"; - homepage = "https://github.com/ROCm-Developer-Tools/roctracer"; + homepage = "https://github.com/ROCm/roctracer"; license = with licenses; [ mit ]; # mitx11 maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor clr.version; + broken = versions.minor finalAttrs.version != versions.minor clr.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rocwmma/default.nix b/pkgs/development/rocm-modules/5/rocwmma/default.nix index e982e036c4778..f02859995bcc1 100644 --- a/pkgs/development/rocm-modules/5/rocwmma/default.nix +++ b/pkgs/development/rocm-modules/5/rocwmma/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "rocWMMA"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-0otJxgVYLwvVYIWT/hjrrpuSj5jslP1dbJRt6GUOrDs="; @@ -96,10 +96,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Mixed precision matrix multiplication and accumulation"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocWMMA"; + homepage = "https://github.com/ROCm/rocWMMA"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/rpp/default.nix b/pkgs/development/rocm-modules/5/rpp/default.nix index a9456587ff3b6..45079c6d62cc9 100644 --- a/pkgs/development/rocm-modules/5/rpp/default.nix +++ b/pkgs/development/rocm-modules/5/rpp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.7.1"; src = fetchFromGitHub { - owner = "GPUOpen-ProfessionalCompute-Libraries"; + owner = "ROCm"; repo = "rpp"; rev = "rocm-${finalAttrs.version}"; hash = "sha256-s6ODmxPBLpR5f8VALaW6F0p0rZSxSd2LH2+60SEfLCk="; @@ -79,10 +79,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Comprehensive high-performance computer vision library for AMD processors"; - homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp"; + homepage = "https://github.com/ROCm/rpp"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; + broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version || versionAtLeast finalAttrs.version "6.0.0"; }; }) diff --git a/pkgs/development/rocm-modules/5/tensile/default.nix b/pkgs/development/rocm-modules/5/tensile/default.nix index fa111c056c5cc..7f1e64422668f 100644 --- a/pkgs/development/rocm-modules/5/tensile/default.nix +++ b/pkgs/development/rocm-modules/5/tensile/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { format = "pyproject"; src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; + owner = "ROCm"; repo = "Tensile"; rev = "rocm-${version}"; hash = "sha256-CyPGiM/53duJc/oNtOsl6JSsl9uOOYm5R7O6YXaVOm4="; @@ -56,10 +56,10 @@ buildPythonPackage rec { meta = with lib; { description = "GEMMs and tensor contractions"; - homepage = "https://github.com/ROCmSoftwarePlatform/Tensile"; + homepage = "https://github.com/ROCm/Tensile"; license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = versions.minor version != versions.minor stdenv.cc.version; + broken = versions.minor version != versions.minor stdenv.cc.version || versionAtLeast version "6.0.0"; }; } diff --git a/pkgs/development/rocm-modules/5/update.nix b/pkgs/development/rocm-modules/5/update.nix index e20697675c11d..ebf21b8f15a73 100644 --- a/pkgs/development/rocm-modules/5/update.nix +++ b/pkgs/development/rocm-modules/5/update.nix @@ -23,6 +23,11 @@ let IFS='.' read -a version_arr <<< "$version" + if (( ''${version_arr[0]} > 5 )); then + echo "'rocmPackages_5.${pname}' is already at it's maximum allowed version.''\nAny further upgrades should go into 'rocmPackages_X.${pname}'." 1>&2 + exit 1 + fi + if [ "''${#version_arr[*]}" == 2 ]; then version="''${version}.0" fi diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 25412b45b40b7..cfdb39e586163 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { doCheck = true; makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + # In procedure bytevector-u8-ref: Argument 2 out of range + dontStrip = stdenv.isDarwin; + meta = with lib; { description = "Structured access to bytevector contents"; homepage = "https://github.com/TaylanUB/scheme-bytestructures"; diff --git a/pkgs/development/skaware-packages/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix index b75a03b65a787..b4229d2c216f9 100644 --- a/pkgs/development/skaware-packages/s6-dns/default.nix +++ b/pkgs/development/skaware-packages/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.7.0"; - sha256 = "rusndssjTpA5enjGqjclkkqgcQwQNcpw3VYouExnAdE="; + version = "2.3.7.1"; + sha256 = "zwJYV07H1itlTgwq14r0x9Z6xMnLN/eBSA9ZflSzD20="; description = "A suite of DNS client programs and libraries for Unix systems"; @@ -28,7 +28,6 @@ buildPackage { rm $(find -type f -mindepth 1 -maxdepth 1 -executable) rm libs6dns.* rm libskadns.* - rm libdcache.* mv doc $doc/share/doc/s6-dns/html ''; diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix index 8c3e753fc2aaa..6e3722ef57722 100644 --- a/pkgs/development/skaware-packages/s6-networking/default.nix +++ b/pkgs/development/skaware-packages/s6-networking/default.nix @@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.7.0.0"; - sha256 = "mf1uP5PW1qlb9+l4lVt9BTYpWReUsGjtogBKuLSQVVI="; + version = "2.7.0.1"; + sha256 = "36SWTU8b2umrX8RQh2n9b+/DOlJ9UVOjd3xrBG7upWQ="; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/development/skaware-packages/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix index e879bf6204d64..f16e3dacc10a7 100644 --- a/pkgs/development/skaware-packages/s6/default.nix +++ b/pkgs/development/skaware-packages/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.12.0.2"; - sha256 = "qpF+/+Eq6XN5CQ91/aSfDV8PZ81lVDaEz/BtyIFyj4w="; + version = "2.12.0.3"; + sha256 = "gA0xIm9sJc3T7AtlJA+AtWzl7BNzQdCo0VTndjjlgQM="; description = "skarnet.org's small & secure supervision software suite"; diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix index a9af0cac6562d..7dc87458b6203 100644 --- a/pkgs/development/skaware-packages/skalibs/default.nix +++ b/pkgs/development/skaware-packages/skalibs/default.nix @@ -8,8 +8,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.14.0.1"; - sha256 = "tD69s2+KjfQPGgjBOwg5O85J+vM05ioNuRmzrkr9FIg="; + version = "2.14.1.0"; + sha256 = "24YTUWEngQ2N/thutCRaX/JCBPHhb6KOiqrTRtlqrug="; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix index 85a8440ef1ede..942d37e525f94 100644 --- a/pkgs/development/skaware-packages/tipidee/default.nix +++ b/pkgs/development/skaware-packages/tipidee/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "tipidee"; - version = "0.0.2.0"; - sha256 = "5I+/gfvN8s4bf6Oi+5kzRndWeLV7movyRfznz0kNMoY="; + version = "0.0.3.0"; + sha256 = "0dk6k86UKgJ2ioX5H2Xoga9S+SwMy9NFrK2KEKoNxCA="; description = "A HTTP 1.1 webserver, serving static files and CGI/NPH"; diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index 0e15bec58def4..75f69e021e1f5 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.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-T7LklR+NUuB5nDwEedG3eD+qSK+mjUiS/EXerqCAroE="; + hash = "sha256-iaqr8/jPYEnOhGoiUC5lmd7l+AAOFh3iYVW+mbBV/V8="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index 30b8a11a420d0..9cbe3cc1034a6 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.24.1"; + version = "2.25.0"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-pUNHE1bJclo8fsHBj6FUHqp6SZtC+RCrmICgn9/PL9c="; + sha256 = "sha256-eR26rvrLla7kcrr/IYKXFlV8jKCwKUjpUj6/oLrz9sA="; }; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 33fed022b0310..d1d214d5c3326 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "5.2.6"; + version = "5.2.13"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-SNXUARAu4szX7otyAKy3F/piNhxlPVNN6Dj2UwevL8A="; + sha256 = "sha256-IKlJy7rH/O4DySYV046hjDu1VWPZNA0Ti/ndVVmYNdk="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/development/tools/analysis/brakeman/Gemfile.lock index af5edc99f2ebf..bb45178f79d41 100644 --- a/pkgs/development/tools/analysis/brakeman/Gemfile.lock +++ b/pkgs/development/tools/analysis/brakeman/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - brakeman (6.0.0) + brakeman (6.1.0) PLATFORMS ruby @@ -10,4 +10,4 @@ DEPENDENCIES brakeman BUNDLED WITH - 2.4.13 + 2.4.22 diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/development/tools/analysis/brakeman/gemset.nix index 8096a825669a8..31705fe31a6df 100644 --- a/pkgs/development/tools/analysis/brakeman/gemset.nix +++ b/pkgs/development/tools/analysis/brakeman/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l2584f7cm7lmwihm1l449rk6vl4wlx3s7x317cm2inapzjhiybg"; + sha256 = "00vlip5z1gc1npj1nxvcy2gvwya4fk01xzyhazkhz3ymdn9nch0d"; type = "gem"; }; - version = "6.0.0"; + version = "6.1.0"; }; } diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index f7bbe7a4650b5..650f584638232 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.20"; + version = "3.1.46"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-begNKHGFTxlDIG3+PNG+/zCw59dU8gvJcjrVsfaPPaE="; + hash = "sha256-scGZtqAdAjRD0bNq9pWp699I9rxPh2CFP4lCz+1yAZ8="; }; patches = [ diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index c23c933e48e0e..8390df0148b39 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.15.1"; + version = "2.15.4"; 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"; - hash = "sha256-ksWf5z0PM5osMxnR5XeEyZw4g7UbHUCqnpw2FB5M6kU="; + hash = "sha256-aFkaylIgryFYPhY5/OGCRHJMR7EJqNg83c34a2+WMX4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 5dc77fff1634e..1a7a1c0f4c957 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.12.1"; + version = "2.13.0"; outputs = [ "out" "man" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "danmar"; repo = "cppcheck"; rev = finalAttrs.version; - hash = "sha256-I1z4OZaWUD1sqPf7Z0ISoRl5mrGTFq0l5u2ct29fOmQ="; + hash = "sha256-+z8mMwI4hHpE3enIriTsxZEocqifppYgjZz3UPGswIo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 3b6b24f327d3c..040e44ea5bc29 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.223.2"; + version = "0.225.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-vjsqQuQxTywSx4c0lnDKrrNr5hfFog9UurhIctq14f4="; + hash = "sha256-tJWq2l5axnukjqJGZwrVF/UDcPdPGDyjol8fs0a777g="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index e1a6b8c341628..4b6cadfcfa82d 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -28,6 +28,7 @@ let sexplib0 parsexp base + unionFind yojson zarith ]; @@ -36,12 +37,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "27.1"; - slang = "Cobalt"; + version = "28.0"; + slang = "Nickel"; src = fetchurl { url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - hash = "sha256-WxNXShaliXHCeQm+6Urn83sX2JeFK0DHaKPU4uCeOdI="; + hash = "sha256-KWEogjMOy27d0LTKOvwEkrcND+szeaG46JMZTG4XOYM="; }; postConfigure = "patchShebangs src/plugins/eva/gen-api.sh"; @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen ppx_deriving ppx_import ppx_deriving_yaml ppx_deriving_yojson gdk-pixbuf + unionFind ]; buildPhase = '' diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 98aade37c2b5b..7266b76a4ad63 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "include-what-you-use"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.19"; + version = "0.21"; src = fetchurl { url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz"; - hash = "sha256-KxAVe2DqCK3AjjiWtJIcc/yt1exOtlKymjQSnVAeXuA="; + hash = "sha256-ajUZGf+JvafJXIlUcmAYaNs9qrlqlYs44DYokNWHYLY="; }; postPatch = '' @@ -17,11 +17,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = with llvmPackages; [ cmake llvm.dev llvm python3 ]; buildInputs = with llvmPackages; [ libclang clang-unwrapped python3 ]; + clang = llvmPackages.clang; + cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${llvmPackages.llvm.dev}" ]; postInstall = '' substituteInPlace $out/bin/iwyu_tool.py \ --replace "'include-what-you-use'" "'$out/bin/include-what-you-use'" + + + mv $out/bin/include-what-you-use $out/bin/.include-what-you-use-unwrapped + mv $out/bin/iwyu_tool.py $out/bin/.iwyu_tool.py-unwrapped + substituteAll ${./wrapper} $out/bin/include-what-you-use + ln -s $out/bin/include-what-you-use $out/bin/iwyu_tool.py + chmod +x $out/bin/include-what-you-use + patchShebangs $out/bin/include-what-you-use ''; meta = with lib; { diff --git a/pkgs/development/tools/analysis/include-what-you-use/wrapper b/pkgs/development/tools/analysis/include-what-you-use/wrapper new file mode 100755 index 0000000000000..3fd37902cf2d1 --- /dev/null +++ b/pkgs/development/tools/analysis/include-what-you-use/wrapper @@ -0,0 +1,26 @@ +#!/bin/sh + +buildcpath() { + local path after + while (( $# )); do + case $1 in + -isystem) + shift + path=$path${path:+':'}$1 + ;; + -idirafter) + shift + after=$after${after:+':'}$1 + ;; + esac + shift + done + echo $path${after:+':'}$after +} + +export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ + $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include +export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \ + $(<@clang@/nix-support/libcxx-cxxflags) \ + $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include +exec -a "$0" @out@/bin/.$(basename $0)-unwrapped "$@" diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index f20f77eca7a22..480f20f04f49d 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,6 +11,7 @@ # Qt , qt5compat , qtbase +, qtwayland , qtsvg , qttools , qtwebengine @@ -61,6 +62,8 @@ let cutter = stdenv.mkDerivation rec { qttools qtwebengine rizin + ] ++ lib.optionals stdenv.isLinux [ + qtwayland ]; cmakeFlags = [ diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index dc60f5ec377bf..a879e0a81153b 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.9.1"; + version = "0.9.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-PfevtQpbJeo2U/qeYcJP4Et/HUASOZssRu2IXtOLWKw="; + sha256 = "sha256-5fPra4kgvykeQnvRtO3enbMIzbh5+nDJ2x0aHYMGiww="; }; - cargoHash = "sha256-1nPXyFzRmum1CvOFdcqNOQzFVcFFKwPdt2qzXxMssf0="; + cargoHash = "sha256-R7jqFgMj4YjUbEObdRxxvataYMXe9wq8B8k+t7+Dv30="; cargoBuildFlags = [ "--bin" "svlint" ]; diff --git a/pkgs/development/tools/analysis/tflint-plugins/default.nix b/pkgs/development/tools/analysis/tflint-plugins/default.nix index 409d7d1e46845..1f4d50a90d107 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/default.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/default.nix @@ -1,3 +1,4 @@ { callPackage, ... }: { tflint-ruleset-aws = callPackage ./tflint-ruleset-aws.nix { }; + tflint-ruleset-google = callPackage ./tflint-ruleset-google.nix { }; } diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix new file mode 100644 index 0000000000000..fefd319523ca1 --- /dev/null +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix @@ -0,0 +1,38 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "tflint-ruleset-google"; + version = "0.24.0"; + + src = fetchFromGitHub { + owner = "terraform-linters"; + repo = pname; + rev = "v${version}"; + hash = "sha256-1eF/uzOYP/gi+ooHN8OfCR2nz+/z98theO0Lr/BBhWM="; + }; + + vendorHash = "sha256-owpNcsxuP+sG27vv9V7ArMK1NLBNbnw11KpdpVyWAD0="; + + # upstream Makefile also does a go test $(go list ./... | grep -v integration) + preCheck = '' + rm integration/integration_test.go + ''; + + subPackages = [ "." ]; + + postInstall = '' + mkdir -p $out/github.com/terraform-linters/${pname}/${version} + mv $out/bin/${pname} $out/github.com/terraform-linters/${pname}/${version}/ + ''; + + meta = with lib; { + homepage = "https://github.com/terraform-linters/tflint-ruleset-google"; + description = "TFLint ruleset plugin for Terraform Google Provider"; + platforms = platforms.unix; + maintainers = with maintainers; [ john-rodewald ]; + license = with licenses; [ mpl20 ]; + }; +} diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index e717c85211208..0a917ac86bbcb 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.49.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-udP11icQp90u8hmDkg9nKQYPvHFDLeylQS6sLS74ErY="; + hash = "sha256-+DTq9gb2zaXT7bSgRCJpco4ppRkTAyrWcxJfBLnwGMI="; }; - vendorHash = "sha256-sSWDy8LsqRP4DNuWI8HhE6ojjnHx2Ltyw55oaGOa1ms="; + vendorHash = "sha256-iyJx5dp+NYbaJhZL67ZjFd28ms3vyF38z9P8qJscryQ="; doCheck = false; diff --git a/pkgs/development/tools/api-linter/default.nix b/pkgs/development/tools/api-linter/default.nix index 5b0e8e7c5928c..940338ece2018 100644 --- a/pkgs/development/tools/api-linter/default.nix +++ b/pkgs/development/tools/api-linter/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "api-linter"; - version = "1.59.1"; + version = "1.60.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-PgDdCcXiy9Dpop2myuRoi8KQROZdJ76ce4ax7wU4bpc="; + hash = "sha256-3uxPHSmIFrkAm82sqQxWKzJwU3cFhTDVsJYp8cENaRg="; }; vendorHash = "sha256-egAZ4CeSSStfkN2mGgzGHTBojHKHoVEf3o0oi+OpMkw="; @@ -23,7 +23,7 @@ buildGoModule rec { "-w" ]; - # reference: https://github.com/googleapis/api-linter/blob/v1.59.1/.github/workflows/release.yaml#L76 + # reference: https://github.com/googleapis/api-linter/blob/v1.60.0/.github/workflows/release.yaml#L76 preBuild = '' cat > cmd/api-linter/version.go <<EOF package main diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 01ec94b850a71..e6b62a8e8417c 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "apktool"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - hash = "sha256-5ez3WSl7hFvmSjpRRczDctuQWxWoAaIuocke4DxMemU="; + hash = "sha256-3nzoqhCay2Sef2nP6RAw/8INvMRu3Yq79sLR42z8zXs="; }; dontUnpack = true; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for reverse engineering Android apk files"; homepage = "https://ibotpeaches.github.io/Apktool/"; + changelog = "https://github.com/iBotPeaches/Apktool/releases/tag/v${version}"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 3c60d0e25e2eb..a6c719611ca9d 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.21.1"; + version = "10.22.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "refs/tags/v${version}"; - hash = "sha256-FdiDxWmCRkSOa+6A9XgKeyFGk/ba+BgFm3/ChERkYvk="; + hash = "sha256-WS8h4WRiCTthZOT3NQE8h7BihpaHFfCe39XoGvnDZ1k="; }; subPackages = [ "." ]; - vendorHash = "sha256-F5YMPwdS2A5FAwuG1gfiAqBKapZ24VIGzJXnwojoDk0="; + vendorHash = "sha256-afqDnrmbTR6yZHT7NysysORci4b0Oh0sjpftgAXJ5Uk="; doCheck = false; diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index cf039c5758f5e..288bcecd3b8d7 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -1,94 +1,50 @@ -{ +{ lib, stdenv, - lib, - config, - fetchurl, - unzip, - makeWrapper, - icu, - libunwind, - curl, - zlib, - libuuid, - openssl, -}: let - platforms = { - "aarch64-darwin" = { - platformStr = "osx-arm64"; - hash = "sha256-yp3VTt5m8KuACjrBIotfQ5ZdgMvfwYIFaqY2475pHRs="; - }; - "x86_64-darwin" = { - platformStr = "osx-x64"; - hash = "sha256-bTHh0mwGbe6JVsR8rDHGpGJ2+AipHb8NIBIW7iiuz6I="; - }; - "x86_64-linux" = { - platformStr = "linux-x64"; - hash = "sha256-5R4/hCxCz6KfBl9Zbei+iFty5S2MOYt9hMvPMjCzL54="; - }; + callPackage, + fetchFromGitHub, + buildDotnetModule, + buildGoModule, + dotnetCorePackages, +}: +let + version = "4.0.5455"; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-functions-core-tools"; + rev = version; + sha256 = "sha256-Ip1m0/l0YWFosYfp8UeREg9DP5pnvRnXyAaAuch7Op4="; + }; + gozip = buildGoModule { + pname = "gozip"; + inherit version; + src = src + "/tools/go/gozip"; + vendorHash = null; }; - - platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms; in - stdenv.mkDerivation rec { - pname = "azure-functions-core-tools"; - version = "4.0.5348"; - - src = fetchurl { - url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.${platformInfo.platformStr}.${version}.zip"; - inherit (platformInfo) hash; - }; +buildDotnetModule rec { + pname = "azure-functions-core-tools"; + inherit src version; - nativeBuildInputs = [ - unzip - makeWrapper - icu - libunwind - curl - zlib - ]; + dotnet-runtime = dotnetCorePackages.sdk_6_0; + nugetDeps = ./deps.nix; + useDotnetFromEnv = true; + executables = [ "func" ]; - libPath = lib.makeLibraryPath [ - libunwind - libuuid - stdenv.cc.cc - curl - zlib - icu - openssl - ]; + postPatch = '' + substituteInPlace src/Azure.Functions.Cli/Common/CommandChecker.cs \ + --replace "CheckExitCode(\"/bin/bash" "CheckExitCode(\"${stdenv.shell}" + ''; - unpackPhase = '' - unzip $src - ''; + postInstall = '' + mkdir -p $out/bin + ln -s ${gozip}/bin/gozip $out/bin/gozip + ''; - installPhase = - '' - mkdir -p $out/bin - cp -prd . $out/bin/azure-functions-core-tools - chmod +x $out/bin/azure-functions-core-tools/{func,gozip} - '' - + lib.optionalString stdenv.isLinux '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}" "$out/bin/azure-functions-core-tools/func" - find $out/bin/azure-functions-core-tools -type f -name "*.so" -exec patchelf --set-rpath "${libPath}" {} \; - wrapProgram "$out/bin/azure-functions-core-tools/func" --prefix LD_LIBRARY_PATH : ${libPath} - '' - + '' - ln -s $out/bin/{azure-functions-core-tools,}/func - ln -s $out/bin/{azure-functions-core-tools,}/gozip - ''; - dontStrip = true; # Causes rpath patching to break if not set - - meta = with lib; { - homepage = "https://github.com/Azure/azure-functions-core-tools"; - description = "Command line tools for Azure Functions"; - sourceProvenance = with sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - license = licenses.mit; - maintainers = with maintainers; [ mdarocha ]; - platforms = ["x86_64-linux" "aarch64-darwin" "x86_64-darwin"]; - }; - } + meta = with lib; { + homepage = "https://github.com/Azure/azure-functions-core-tools"; + description = "Command line tools for Azure Functions"; + license = licenses.mit; + maintainers = with maintainers; [ mdarocha detegr ]; + platforms = ["x86_64-linux" "aarch64-darwin" "x86_64-darwin"]; + }; +} diff --git a/pkgs/development/tools/azure-functions-core-tools/deps.nix b/pkgs/development/tools/azure-functions-core-tools/deps.nix new file mode 100644 index 0000000000000..e9e53a5716bf3 --- /dev/null +++ b/pkgs/development/tools/azure-functions-core-tools/deps.nix @@ -0,0 +1,673 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "AccentedCommandLineParser"; version = "2.0.0"; sha256 = "0s215i49ffbs2jdrfrs045yffp0kcx5cm16nf67xiqp4rs1n51jv"; }) + (fetchNuGet { pname = "Autofac"; version = "4.6.2"; sha256 = "00046qyg8qljhk6krcifyqj6n9xfgpxnwv3rcni5iahbj5xz4kvq"; }) + (fetchNuGet { pname = "Azure.Core"; version = "1.15.0"; sha256 = "0hf7z1nqsw62pxp8iy4nnfz4q9askymj9669iqac8szpzlvwn71l"; }) + (fetchNuGet { pname = "Azure.Core"; version = "1.19.0"; sha256 = "08l7d6cq1gl1g2qvlrc80z754f9amwnmgf33vnr7dywsbrx6qic5"; }) + (fetchNuGet { pname = "Azure.Core"; version = "1.34.0"; sha256 = "1rvzg508kkadkpamkjry4xzid9d7hi8af5ydsc0vnidksm1ppv6x"; }) + (fetchNuGet { pname = "Azure.Identity"; version = "1.10.0"; sha256 = "0lrw7l88y1vqc23y0j2dsn2qbn9h50212c04jn74g4xkq7g2siac"; }) + (fetchNuGet { pname = "Azure.Security.KeyVault.Secrets"; version = "4.2.0"; sha256 = "1l9jjlymccglbngkl9kd18zx70sz5n4d11zbmx6pwadh5nihcmnc"; }) + (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.13.0"; sha256 = "0cpzvn0j8nwndh580rpakp29835mm0fx3yli8wb23wvkaq8y4glh"; }) + (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.9.0"; sha256 = "15f4wwg3dvhpkx323rg3nfyjn7xn01p2aqs0isrgkgyq0hggal9i"; }) + (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.12.0"; sha256 = "1n29vfldnali71jawb2bwwkv3dvflw6zhkgpq96zk9ic6s23zm44"; }) + (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.8.0"; sha256 = "0a1k8xrsqr22fihqqzv289g8rycj6v8kha3ry06b2lvl4pr4vd9l"; }) + (fetchNuGet { pname = "Castle.Core"; version = "4.2.0"; sha256 = "098vn490ivggchn13w23s8bfp9w2f0gp9pc4xjp0p16lxqp44vh7"; }) + (fetchNuGet { pname = "Castle.Core"; version = "4.2.1"; sha256 = "18qbjsaah23jg9r24wjcy4jlggbz1dq6sw621d8314jhyhjxvw0l"; }) + (fetchNuGet { pname = "Colors.Net"; version = "1.1.0"; sha256 = "1jw7iijz9djih518fiiagdnqjppzgivgv4g49pq61v3sh2l0zl87"; }) + (fetchNuGet { pname = "DotNetZip"; version = "1.13.3"; sha256 = "1a62pyalgzvvy5xrqbvif1ia2v3swj1z2m2pijxm6yn3h8dhnlg6"; }) + (fetchNuGet { pname = "Dynamitey"; version = "2.0.9.136"; sha256 = "1wzd4g58bgvlxj2wkx71jgv6yxaikgm2q9b8cvicr2hndr6wl6y1"; }) + (fetchNuGet { pname = "FluentAssertions"; version = "5.2.0"; sha256 = "14bjayrmh5zsipg9m0v8vjvi8ma945nhw7ysfc96d501f5kkcnab"; }) + (fetchNuGet { pname = "FSharp.Core"; version = "3.1.2.5"; sha256 = "0pfvjimrgrffb5rj612gsid044lfpk8g2cxyh9792dc1n8ck5hih"; }) + (fetchNuGet { pname = "Google.Protobuf"; version = "3.23.1"; sha256 = "0kma0srl4qwmlrkkfi2viqf7a7vr70ifx1b8asvhx22j3vf42r8w"; }) + (fetchNuGet { pname = "Grpc.AspNetCore"; version = "2.55.0"; sha256 = "12nrpwf364nvlnkz9f9mjq0j3w3an2ijbfzd4v5bd335c2x1mv99"; }) + (fetchNuGet { pname = "Grpc.AspNetCore.Server"; version = "2.55.0"; sha256 = "1y4xgszrw885nm8xmq6i2i61liihp96a3x4n14306iwki8rd3r3i"; }) + (fetchNuGet { pname = "Grpc.AspNetCore.Server.ClientFactory"; version = "2.55.0"; sha256 = "0ns4f7k5jq0lcgfn3h9g5bxv5cyqjvfb438m5dihmdgqm7lmh4qz"; }) + (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.55.0"; sha256 = "03k2z8s0l39fq7rs7fg6ldn4mnna11hfkb1iswdrcir4ia2djlbi"; }) + (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.55.0"; sha256 = "1q1fhaff80zfchk5f4sflhpgi3sklh81nzdzcdg0r48kiygxsky4"; }) + (fetchNuGet { pname = "Grpc.Net.ClientFactory"; version = "2.55.0"; sha256 = "0bpqs9c144v47l7xp9207mpfs9fga7mw95yig16h393qrm7af0y7"; }) + (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.55.0"; sha256 = "1xc6pf55dnfjaqlx5iz4df2dbpkdlsz478wmnzrvrjblvy3ycisi"; }) + (fetchNuGet { pname = "Grpc.Tools"; version = "2.55.1"; sha256 = "11vx30w0hkkwzd7fd8spyb1iairv5nbicvzpbqpvyg0a2hm2lgfa"; }) + (fetchNuGet { pname = "ImpromptuInterface"; version = "7.0.1"; sha256 = "1kyjp5skhsajvmabz438abcvddaz1w8s3d3csybw3znngpj9hlpb"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights.AspNetCore"; version = "2.21.0"; sha256 = "0dpcik1jlzdp6prwknb3brx4inb8z2qrdvbxvp5am9s799p25611"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights.DependencyCollector"; version = "2.21.0"; sha256 = "1dacz9g5w1f5wx6wdylv1k9h2y3pqqiq75i03jdb4n8df3h02g66"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights.EventCounterCollector"; version = "2.21.0"; sha256 = "0y42jhyh8jzqkdqdkb8a22ca4ay6323f6d71ychybb785d94p8sg"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights.PerfCounterCollector"; version = "2.21.0"; sha256 = "03v8zib3ank49qcxkd31kvi788sh180mplg6q9i2nwsr3yskpic5"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights.SnapshotCollector"; version = "1.4.3"; sha256 = "1mpyjni63i7d22j4qr77nb8kxa2rbjkn0k1hfcz35lr23qgjki2k"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights.WindowsServer"; version = "2.21.0"; sha256 = "0093dpkcijc6j95lcha4d0yyh2zb1ajq4jvs6pdsx1319nvcjqwc"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel"; version = "2.21.0"; sha256 = "15zw2lajm8lx6zz7zi3kd1rjdfjcs6a7xgvsx41s5i7v2ly4ilcr"; }) + (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.8"; sha256 = "1dbwdbxr6npyc82zwl0g9bhifkpcqfzyhx1ihd8rzcmzprw70yfj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Antiforgery"; version = "2.1.0"; sha256 = "00fayhhlrh382a618yb25camxp0k13s7w2gh7bxcq4rjcgs981j6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Abstractions"; version = "2.1.0"; sha256 = "09f99hficsvg15j4xpd1mjvrx5l3j4pc2vikkmsn26h8lk1v716p"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Abstractions"; version = "2.2.0"; sha256 = "0vj7fhpk0d95nkkxz4q0rma6pb4ym96mx6nms4603y0l19h0k5yh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Core"; version = "2.1.0"; sha256 = "146q9zf8xmapxjpa3a84dy8r6b0k3vhm3bl13phnv6snww9hrff5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.Core"; version = "2.2.0"; sha256 = "1wgn45fmdi7dk9cl4cdhzgqc9mdxhfw7zg8zwns3j7qgrhlv6k8h"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "6.0.0"; sha256 = "14hrgi8mmxgxlggmx52gjvfw0ml2danspv6zbjazrjx1g9wyxx8v"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "2.1.0"; sha256 = "0jw5g3c7q8jffnalvmknwrx1h0d68hx359qk8rfcfdzwag8q1p2f"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "2.2.0"; sha256 = "1mpq8pmxlxfa625k2ghv6xcyy2wdpwv56xzya9mvmlnh50h1i8rx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization.Policy"; version = "2.1.0"; sha256 = "1inz9b8y4hn9gsfdp1zmqln4ms5zap44mwb6difvr2skwa78z59v"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization.Policy"; version = "2.2.0"; sha256 = "1d1zh65kfjf81j21ssmhr465vx08bra8424vgnrb22gdx03mhwd2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cors"; version = "2.1.0"; sha256 = "1kfdf4rhrnsclpyk7n87mvl5xszb9i2bixns4v7qmvy41pa74sbc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "2.2.0"; sha256 = "01lg2fx85b47ldgdrhs6clsivj35x54xwc9r5xk3f1v8rr3gycsv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection"; version = "2.2.0"; sha256 = "09lzbp084xxy1xxfbxpqdff8phv2pzd1n5v30xfm03hhl7a038gx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.DataProtection.Abstractions"; version = "2.2.0"; sha256 = "1gi4hpssmrrdf5lm6idkhvqbfy12bx14976y4gbhmx9z8lxaqcfz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Diagnostics.Abstractions"; version = "2.1.0"; sha256 = "18k6a6ppsbsljrsnwhmyvmzzby6pp9cgbzqcr2c9kmv3z09pc745"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting"; version = "2.1.1"; sha256 = "1prlc9qgwqvs0w3sjrbk9q8fhaq0l0pnvwyxa6gqcb0x82vmlhsl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.1.0"; sha256 = "0sdzvjf6bz0krr2bm77zdyxpjcddadq2fqd3b4yybd6my3b5f7j2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.1.1"; sha256 = "1wnlcnaqfv3xpmhi5rpkn1r6bfrpv3pb8rvfz9dk5l87mllpi5mm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.2.0"; sha256 = "043k651vbfshh3s997x42ymj8nb32419m7q3sjw5q2c27anrhfhv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.1.0"; sha256 = "1xm8913slkx0cvk7gcbk1sf9518xmrajjjp3z8qhr5xdhdx1b879"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.1.1"; sha256 = "0zldzvhh7xraps3gg47anva3dm3gssynw3k3gazjvqwb4gblsw6p"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.2.0"; sha256 = "0nz73bwrvhc1n7gd7xxm3p5ww2wx9qr9m9i43y20gh0c54adkygh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Html.Abstractions"; version = "2.1.0"; sha256 = "03pf5k7dm1js14jjn17bddiicjl75bb4jynimy5n5cpx7j56dpsp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.1.0"; sha256 = "1nrhbsr58fh6hpzxq75qvrimh0lk6pdwghs3cbv0f1zk90rar1cq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.1.22"; sha256 = "09hn5j38n9w0b9qz4ka10mkbzrcbkpqc3mcwf7793lh579vw3axg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.2.0"; sha256 = "1fcrafpa57sab3as18idqknzlxkx49n4sxzlzik3sj6pcji5j17q"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http"; version = "2.2.2"; sha256 = "09mgjvpqdyylz9dbngql9arx46lfkiczjdf7aqr9asd5vjqlv2c8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.1.0"; sha256 = "0jz5w1y661cxbh1sakyjh0813sqrc456mj53w3482ilb5xh5zhbf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.1.1"; sha256 = "02jsghkbfjz0rvrnfz5pakv8dpyfcc3wjxmj4rpp0fc2mmpibkys"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.2.0"; sha256 = "13s8cm6jdpydxmr0rgmzrmnp1v2r7i3rs7v9fhabk5spixdgfy6b"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.1.0"; sha256 = "14f1sg4p7zg1p4qj1xs0sjs5xwqidin843xdj9wlzy76sxy3066r"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.1.1"; sha256 = "01nbz8gl12bjcrw52z5w61khlzn02wngdkc68fsy7pl74vrzj69v"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; sha256 = "118gp1mfb8ymcvw87fzgjqwlc1d1b0l0sbfki291ydg414cz3dfn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.1.0"; sha256 = "1mwpvbq0z982f9r5ik6k15h18qviy735i55hld9vfk8694k9zwcj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.1.1"; sha256 = "0vifha5wfynpgg4kvdmbqcgn6ngkxkkdmx1qnvlphmjx0iw7sw3d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; sha256 = "0xrlq8i61vzhzzy25n80m7wh2kn593rfaii3aqnxdsxsg6sfgnx1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "2.1.0"; sha256 = "0jcvihh5nbpkg51bj7rb4svgxcdsn4nzklscqm0qcyvxnk3xy0pf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "2.2.0"; sha256 = "07cihb5sqkavg42nvircdwjp0b67mhrla97jgx285zdjphplg4h2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0"; sha256 = "1hczz9kq3wwhpa8xi1xcalqjf03lhhnlvir2cmhxa51h2f1afx89"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Localization"; version = "2.1.0"; sha256 = "1xwdm6z2fnrbca4r76mj6g8ggrjy5n9frhn2159mhracl0gd1d66"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc"; version = "2.1.0"; sha256 = "0yp24572mnvdq1814wrl29rb9zl2903igdch8sm4y6c6sw3bf4n9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Abstractions"; version = "2.1.0"; sha256 = "0p50d8bly48pv8kwsraw9aklppl9cav0lp1d6xjfpddr7jy2w2w8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Abstractions"; version = "2.2.0"; sha256 = "09p447ipd19517vy8xx9ykvspn6b4fgbm2rskpmzyw41x9wz4k0b"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.ApiExplorer"; version = "2.1.0"; sha256 = "0rvvaa5gsw4q67phayw0k16lhildi8g8qld09rwkyg8521hv6arc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Core"; version = "2.1.0"; sha256 = "1gfaxk6d1k0cqaymv5vx26ifvcrxsizxzl8s1rzw16v47vvyqyxp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Core"; version = "2.2.0"; sha256 = "1k6lkgk9zak5sczvyjbwgqnfcwcg9ks74wznqfzck8c6hns1by0m"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Cors"; version = "2.1.0"; sha256 = "0z8z11wppy1bwfz0wkigsp80gbq2n38yzg9p5p1mbrkf2dapaaz7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.DataAnnotations"; version = "2.1.0"; sha256 = "0gpwyg1ap5pm5yji3wyga1h1kcya6jd0k533jkyl8yx1ijm7l6hg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Formatters.Json"; version = "2.1.0"; sha256 = "0jrfwmw4rqg2m4dqrlpf4j9lc48qw6ymxwcw78bx5lam2qibky58"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Formatters.Json"; version = "2.2.0"; sha256 = "0421fcf2z8a6z81ql123ili32wbr3x25zpq17xjf4s9fmsr0069a"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Localization"; version = "2.1.0"; sha256 = "1z6511nj5r0gpx2y4d61bcp98y5c833zb2kmvhzpv39cd1axmggk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0"; sha256 = "1zxzy4xb0jnnx7pri8pxkc1kwgpz58daxqy9ypyhf3wx1jdqy3w3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor"; version = "2.1.0"; sha256 = "0mvizjv8qvdkb4ycvcvccal1j3yfkhqaxi71hw6j73ylba8va8f2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; version = "2.1.0"; sha256 = "18dr08g27hgmijzp277avzq42004gipnp3h7pacpnyanh2psgp43"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.RazorPages"; version = "2.1.0"; sha256 = "0if759kacp95bmhskmsjq4vb74d9638f4b212ziqnq0fyl67bv8w"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.TagHelpers"; version = "2.1.0"; sha256 = "0vj8yqf29jfpb8kj8djxcfmxfn21ixk1987rjgzcwi1zal1wln1q"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.ViewFeatures"; version = "2.1.0"; sha256 = "0zynjyakzgdmyrcmgk2ahs91nhqavc7kvc804xcbkfl5ai2ypmwp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.WebApiCompatShim"; version = "2.2.0"; sha256 = "1mdj7k58sb9b9gx010dhpavnsfymwxk7izvyqc4vnclqznakfxw8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Razor"; version = "2.1.0"; sha256 = "1yxq7vipswqa01xpw9jl22ngpifqm8ywzqg843mxwwf15kmf27bi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Design"; version = "2.1.0"; sha256 = "06is3ch4g0bdr1pnlil5fq2wpwva2yxbf3iyl7xcd99rw1wfpiga"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Language"; version = "2.1.0"; sha256 = "12b3jp0crshvcwckvk8gd4w72ngd7125qz8zlpgczjv6vyb28wqs"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Runtime"; version = "2.1.0"; sha256 = "0mf19civk8s85yhb3hnpr0gfa4nkxypylwcq2sj15zwx4qpsm8l7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.ResponseCaching.Abstractions"; version = "2.1.0"; sha256 = "097mxkx8sdj35yndwi8q4r4q5g8ds6hwrx7if1694zn9fmzqd424"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.ResponseCaching.Abstractions"; version = "2.2.0"; sha256 = "01sp2i2bgcn6blw1mcvg5nrlc97c9czyawwvgfi6ydzdvs6ang37"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Routing"; version = "2.1.0"; sha256 = "0xs89qbw2whzl46r7b549ys5bs6vrp2qf248cphfhwvjw1lv4bhs"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Routing"; version = "2.2.0"; sha256 = "12kv602j2rxp43l1v3618yz3pdd7hqc3r98ya0bqz6y2ppvhbyws"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Routing"; version = "2.2.2"; sha256 = "1s225v52i2l3496i97jc7jjlrmb4m3vz9q696g88yq5xhcy4d37x"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.1.0"; sha256 = "1f8xixbg749nhv10vaf3jmdv9zjdw822hw7ikwa97h70767d8xz5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.2.0"; sha256 = "0d9wwz1rsh1fslbv1y72jpkvqv2v9n28rl3vslcg0x74lp2678ly"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "2.1.0"; sha256 = "148snpiq4rhm44gzx8wn9ljfb286h7vd1axc9by4r4fxp0gix0kf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "2.1.1"; sha256 = "1744g3c04bz27lafx0q90cg0i17rahymgckbhggn1147pxs3lgpv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.WebUtilities"; version = "2.2.0"; sha256 = "0cs1g4ing4alfbwyngxzgvkrv7z964isv1j9dzflafda4p0wxmsi"; }) + (fetchNuGet { pname = "Microsoft.Azure.AppService.Middleware"; version = "1.5.4"; sha256 = "08bannmsijcz9zbcvykq6gc116q11mgilyg7zcnxi62jh21ip235"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware/1.5.4/microsoft.azure.appservice.middleware.1.5.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.AppService.Middleware.Functions"; version = "1.5.4"; sha256 = "1765lv13nd1wp7ycli1wfx5glp0qryc432awfrv5s1x1wxgl0dc7"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware.functions/1.5.4/microsoft.azure.appservice.middleware.functions.1.5.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.AppService.Middleware.Modules"; version = "1.5.4"; sha256 = "17idpdivdr03j8dqfqim0d2948xm87x6nk1wnzpraj22pa964j3f"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware.modules/1.5.4/microsoft.azure.appservice.middleware.modules.1.5.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.AppService.Middleware.NetCore"; version = "1.5.4"; sha256 = "0k5pn7qi874bhlhcmm813k15kmsd7zc45mgk0ym8qzvvk1s8j7cv"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.appservice.middleware.netcore/1.5.4/microsoft.azure.appservice.middleware.netcore.1.5.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.AppService.Proxy.Client"; version = "2.2.20220831.41"; sha256 = "0qqghqfm8v6zdgkgzr76lwfi88nn5zpbrza318mc2h3xnz3fvf3s"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.appservice.proxy.client/2.2.20220831.41/microsoft.azure.appservice.proxy.client.2.2.20220831.41.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.AppService.Proxy.Common"; version = "2.2.20220831.41"; sha256 = "1rns26wapv8h5sfwbv09cbz1ixzzgqsa95y4q7ikb77arwqcgha3"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.appservice.proxy.common/2.2.20220831.41/microsoft.azure.appservice.proxy.common.2.2.20220831.41.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.AppService.Proxy.Runtime"; version = "2.2.20220831.41"; sha256 = "157ijskdxdc7fmja8rlsizd85bf4znm0yarfjs5wfkyg5227lgm4"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.appservice.proxy.runtime/2.2.20220831.41/microsoft.azure.appservice.proxy.runtime.2.2.20220831.41.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.Cosmos.Table"; version = "1.0.8"; sha256 = "1x590xzsi4dqr210b2cj30c7adxmlzv2fanmqzwghffk29r4paz9"; }) + (fetchNuGet { pname = "Microsoft.Azure.DocumentDB.Core"; version = "2.11.2"; sha256 = "0gwksfc5g2vxkxw662lzg7azmsflpahn677944z7vjrhnlnyizg9"; }) + (fetchNuGet { pname = "Microsoft.Azure.DurableTask.AzureStorage.Internal"; version = "1.4.0"; sha256 = "0pqy7k1lslz0n74qbgp1b5la45qhd68bk02wgsxlabqdhrmbvvvc"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.durabletask.azurestorage.internal/1.4.0/microsoft.azure.durabletask.azurestorage.internal.1.4.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.DurableTask.Core.Internal"; version = "2.0.11"; sha256 = "1f6alhfp8pq0m8n0rxzzwx933iw672k0rw38r91kdddg8m28ly37"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.durabletask.core.internal/2.0.11/microsoft.azure.durabletask.core.internal.2.0.11.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.Functions.DotNetIsolatedNativeHost"; version = "1.0.2"; sha256 = "0r4cjbrdfb1fy5gz42gpvcsxxc8l4xxd550426z2i2k7s4vm94i0"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.dotnetisolatednativehost/1.0.2/microsoft.azure.functions.dotnetisolatednativehost.1.0.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.Functions.JavaWorker"; version = "2.13.0"; sha256 = "08lm6m86fm2ymd67i55rmllxjvi9biz5gdrnlzf6bzvcls6gv66z"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.javaworker/2.13.0/microsoft.azure.functions.javaworker.2.13.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.Functions.NodeJsWorker"; version = "3.8.1"; sha256 = "0kc1dxi774jlmfvy0a8valhin4yvar4ib7ppa8iliq1lzynr3pqn"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/f37f760c-aebd-443e-9714-ce725cd427df/nuget/v3/flat2/microsoft.azure.functions.nodejsworker/3.8.1/microsoft.azure.functions.nodejsworker.3.8.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.Functions.PowerShellWorker.PS7.0"; version = "4.0.2973"; sha256 = "16is04gbrjsayjiv2vnqnw9j3cdn03xi2zsp2406wz4knbi2w2g8"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/c0493cce-bc63-4e11-9fc9-e7c45291f151/nuget/v3/flat2/microsoft.azure.functions.powershellworker.ps7.0/4.0.2973/microsoft.azure.functions.powershellworker.ps7.0.4.0.2973.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.Functions.PowerShellWorker.PS7.2"; version = "4.0.2974"; sha256 = "0ahqvx31ll2y86c6a2dsh6i1y4jlgsivn71zxq7vs8kkb28ab7xx"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/c0493cce-bc63-4e11-9fc9-e7c45291f151/nuget/v3/flat2/microsoft.azure.functions.powershellworker.ps7.2/4.0.2974/microsoft.azure.functions.powershellworker.ps7.2.4.0.2974.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.Functions.PowerShellWorker.PS7.4"; version = "4.0.2975"; sha256 = "1ga4ma5mja1iz1szcsry9m40mms1yfjz81z8s8czs6mngq2f7gj2"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/c0493cce-bc63-4e11-9fc9-e7c45291f151/nuget/v3/flat2/microsoft.azure.functions.powershellworker.ps7.4/4.0.2975/microsoft.azure.functions.powershellworker.ps7.4.4.0.2975.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.Functions.PythonWorker"; version = "4.20.0"; sha256 = "055n0004g6s995ymlb2bhj6i6zl24j5lfpndjfxg61cfb7g4kzyz"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.functions.pythonworker/4.20.0/microsoft.azure.functions.pythonworker.4.20.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.KeyVault.Core"; version = "2.0.4"; sha256 = "0rv7z989zxk5myqd4n2a9ccxx9jr4jb3fslc6b4w3p0570af60hn"; }) + (fetchNuGet { pname = "Microsoft.Azure.Storage.Common"; version = "11.1.7"; sha256 = "0pi31nqz858fir9bw1yv41wc7m2icwvx4pll6wq5r66i1hndw98s"; }) + (fetchNuGet { pname = "Microsoft.Azure.Storage.File"; version = "11.1.7"; sha256 = "11lnxiv2vbfczffa8czr6gaw648mamgsgdh5dikbydlc8m8nhbx4"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebJobs"; version = "3.0.39"; sha256 = "1yyn3ipls8vvhhy06h9kd1sr2ay93vy1f3byn03m413qa7rsdp1m"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Core"; version = "3.0.39"; sha256 = "08ngapfblvgfj8b5x4wi0ghvwnq6yg2d3190ghnygrlli4f8bia7"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Extensions"; version = "5.0.0-beta.2-10879"; sha256 = "09zawvx47x5pv3w81wsl6izf90xkk0hswf318xngnd2bskli4wi1"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.webjobs.extensions/5.0.0-beta.2-10879/microsoft.azure.webjobs.extensions.5.0.0-beta.2-10879.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Extensions.Http"; version = "3.2.0"; sha256 = "0w2006vrvb7b97q3dg8rgldvmpxcnjz939hqhv7vy73xy3dbdp60"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Extensions.Timers.Storage"; version = "1.0.0-beta.1"; sha256 = "03yv9k6ii6chwqhibazqxv1g4y6cjpzi3qz1c0c6z0f4lgmb6qzp"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Host.Storage"; version = "5.0.0-beta.2-11957"; sha256 = "0i0q40v62rlxq58jh0icdwnxiymgmvs6rk9smizml3s7lnsg0dks"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.webjobs.host.storage/5.0.0-beta.2-11957/microsoft.azure.webjobs.host.storage.5.0.0-beta.2-11957.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Logging.ApplicationInsights"; version = "3.0.37"; sha256 = "0mlqz64krpy5w9wilc8nd8qigwhikhm9im8xb9jdzm725naghbhz"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/21e57804-e42a-44f4-a801-493faaf56251/nuget/v3/flat2/microsoft.azure.webjobs.logging.applicationinsights/3.0.37/microsoft.azure.webjobs.logging.applicationinsights.3.0.37.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Rpc.Core"; version = "3.0.37"; sha256 = "1idsghkya7rghlri3pf8y9drh4qq414gvwx2v0ssisqganc3wy31"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Script"; version = "4.27.5"; sha256 = "08mhii9h4z1a6hf556bkxyhll28j8wyd7h058974j4fq17kl5bdj"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script/4.27.5/microsoft.azure.webjobs.script.4.27.5.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Script.Abstractions"; version = "1.0.4-preview"; sha256 = "16k6h7xrg1y272s4rb7mhx16y7aq0s4isvilvgaq8vj3dsiv8blg"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/f37f760c-aebd-443e-9714-ce725cd427df/nuget/v3/flat2/microsoft.azure.webjobs.script.abstractions/1.0.4-preview/microsoft.azure.webjobs.script.abstractions.1.0.4-preview.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Script.Grpc"; version = "4.27.5"; sha256 = "0z9b6g20szfxvpkxh8gfhyb5ngx0zdbzwgizyjbqfwkkha6wd12d"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.grpc/4.27.5/microsoft.azure.webjobs.script.grpc.4.27.5.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebJobs.Script.WebHost"; version = "4.27.5"; sha256 = "0a7z1i0ydaq8z78ym8whgjcw55ijdw4kab4pwckqb104amh750fh"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/eb652719-f36a-4e78-8541-e13a3cd655f9/nuget/v3/flat2/microsoft.azure.webjobs.script.webhost/4.27.5/microsoft.azure.webjobs.script.webhost.4.27.5.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Azure.WebSites.DataProtection"; version = "2.1.91-alpha"; sha256 = "0x7dabqqwajkrpbjb2psxv7rsk2rnd9w1bln2jadb89jg0qld7y3"; url = "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/1e0b47db-42dd-4931-a098-8cb031234dcc/nuget/v3/flat2/microsoft.azure.websites.dataprotection/2.1.91-alpha/microsoft.azure.websites.dataprotection.2.1.91-alpha.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.0.0"; sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) + (fetchNuGet { pname = "Microsoft.Build"; version = "17.0.0"; sha256 = "166brl88y8xn9llc0hmn911k6y74gapmk1mrnfxbv73qj77jxsn1"; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.0.0"; sha256 = "08c257dmfa6n41lq4fxb34khi8jbwlqfy1168x7h7zsbh3wss7yq"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "1.1.0"; sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.4"; sha256 = "1h3n680d3a2m6dcqvzwwipx6gjjcnzxk05dv1jxvxfn62bckq7mv"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "2.8.0"; sha256 = "0g4h41fs0r8lqh9pk9s4mc1090kdpa6sbxq4rc866s8hnq9s1h4j"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.3.1"; sha256 = "1badvp024rwwipy99csx56k8ah192wngq4gb690pz8j0qfvsg9mr"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "2.8.0"; sha256 = "0p1xvw1h2fmnxywv1j4x6p3rgarpc8mfwfgn0vflk5xfnc961f6w"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.3.1"; sha256 = "05fgbs0fny6n338zihzlvvldm2jzc8sril0ndj1iqvgzdc75wplk"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.3.1"; sha256 = "1xkrfg5lplpi9q183f7hc3s7lscali07sz2p8y57pj1md251r6if"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Razor"; version = "2.1.0"; sha256 = "1d5nk0x2bnb0zzdi1ixs2fd53ih4bm91av0g4xvjj3ca17baz65m"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.3.1"; sha256 = "0l047bcdzfpggr329i2ky2iy1zbrb5jw4w95fzj2lbz9wfaxf0xf"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "1.0.3"; sha256 = "0jgxcnaaabmvgdjwxb4ldfm90xbj1mcsjww5ngp8fdchzlk07vdw"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "1.0.3"; sha256 = "1nayc88w80jrmnf3mkq0fk2bjhpgnk59m9yl40d9qfj06bzvckxl"; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Azure"; version = "1.1.1"; sha256 = "0g3nixm0j1clyfij3s3c22k3b6xv8am1cgzz590r2xmsqrvd9kqm"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Azure"; version = "1.7.0"; sha256 = "09ibdbxsvym182aglhiz5vqc6h0zhw3717dyg7rwf0wi5zsc27f8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "1.0.0"; sha256 = "0j2wjgmcpjilvccjq4481x7g8zd2sga29wx902sqfi0ymqacj9jd"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "2.1.0"; sha256 = "009vnlnrvkjki2s45pq3gwp25grkyr9dwsyi87mn4iimfii5c6ck"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "5.0.0"; sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "1.0.0"; sha256 = "0y69cxadbhpv2xabds9ri06hic85ri1mq0qrdmih9inbgx2cwar3"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "2.1.0"; sha256 = "020xm0vhhg9wr133pacjff5qy6dql4dwvj3r4rzyqck2kkdr7xzx"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "5.0.0"; sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.0"; sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.1"; sha256 = "0244czr3jflvzcj6axq61j10dkl0f16ad34rw81ryg57v4cvlwx6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.0.3"; sha256 = "0fiwv35628rzkpixpbqcj8ln4c0hnwhr3is8ha38a9pdzlrs6zx8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.0"; sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "5.0.0"; sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.1"; sha256 = "0b4bn0cf39c6jlc8xnpi1d8f3pz0qhf8ng440yb95y5jv5q4fdyw"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.0.3"; sha256 = "18l6ys6z7j07vf5pa3g0d018dfgk5vb9hf3393cmmh448rpjq41m"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.0"; sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.1.0"; sha256 = "0x1888w5ypavvszfmpja9krgc64527prs75vm8xbf9fv3rgsplql"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.1.1"; sha256 = "0n91s6cjfv8plf5swhr307s849jmq2pa3i1rbpb0cb0grxml0mqm"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.0.3"; sha256 = "0zy90kvlvxinwqz38cwj1jmp06a8gar1crdbycjk5wy8d6w5m0br"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "2.1.0"; sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "2.1.1"; sha256 = "0b7f3fjdnfdm7qzqnbym344rbv8fh9qmngqnz5q1c2rapm9s6si8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "2.1.0"; sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "2.1.1"; sha256 = "0nfydlxvgs7bxqamj0jww1wwxbipzm30ygxabk29zx9q1r0qbnx5"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "3.1.0"; sha256 = "1bg73szp1kyinvfq9ws40w1dsyci66y16av16fr22cpf8113064n"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "2.1.0"; sha256 = "1hpb6c3hqkb9xx1c0psknja4g0zj9290q3rwmsm5qk7iv525zqk4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "3.1.0"; sha256 = "0pg4q2wbhiwd3nan419xwmzgzx9n29bblyxdf6s7rjjx5g9q19pj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.1.0"; sha256 = "1h30yw0fbjkb42jb5n291f3jns1f5g1asjaf9mjlgpy3k6x96gln"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.1.1"; sha256 = "1ll7kmp8csngy27azxh0vcli2w4sgvamqh11c9z5d4spjh6jzxcp"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.0.3"; sha256 = "0nd36n0zfqv5l4w4jlbs2smaw0x7lw49aw1wgk3wsyv69s74p3gj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "1.0.0"; sha256 = "0c4zjjpzvngd06kpy5dmws5ljzwf23g3bklrfxaxbkkvy027svqi"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.0"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.1"; sha256 = "0rn0925aqm1fsbaf0n8jy6ng2fm1cy97lp7yikvx31m6178k9i84"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.0.3"; sha256 = "1hyilp5gr19xz7zcyar6h8jpfksqbn5s9kz0qrfqwvqhq2p7sm5g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "1.0.3"; sha256 = "1vclzbn8aq3wnvib34kr8g86gi37r6hn1ax9nc1sllid3h026irl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.0"; sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.1"; sha256 = "1shldpcczkc7rkxq0xd4zxm1r047bswy8nj1vx27aisni6nyqxys"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; sha256 = "1f83ffb4xjwljg8dgzdsa3pa0582q6b4zm0si467fgkybqzk3c54"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "3.1.0"; sha256 = "16bpzq9mcy4p80yzp2kd9ijrvhmxbrm5x7aljk46n7fpg666g59b"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Composite"; version = "2.1.0"; sha256 = "1yyiqjiz5gb13gr1wfmdg2xvd301zmzf6pj5bg8y9ns0m4pfwixj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "2.1.0"; sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "2.1.1"; sha256 = "13rharvsycfk0056fbcx55npp9py7ng3hgcsasz1inva3q9lcngj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "3.1.0"; sha256 = "0msas2gvpyz43d76pbdlzm40nw2n15xzixjyhapbv08hvb3l4nds"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.1.0"; sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.1.1"; sha256 = "039w2gfvapdy5a1gl1bkajr6glngp29j895cgysy8132vg80jgwb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "3.1.0"; sha256 = "1qvifck5rr6xqnjzqh2gm9vzprsmwp068gkmk44ib65236p1pg6x"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting"; version = "2.1.0"; sha256 = "17dvhs4fbmp3ch6i9ph4yg0b4rq69ax1g4rv946wvwy91wqy7x7k"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.0"; sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.1"; sha256 = "1vgiby2slglmwg4kjxyn6cmb3xksps6i6c9z11za6s8d2czjl90l"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.2.0"; sha256 = "1xc7xr1nq7akfahyl5in9iyxrygap2xi9nxh39rfm37sf8lk55v1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "6.0.0"; sha256 = "1mwjx6li4a82nb589763whpnhf5hfy1bpv1dzqqvczb1lhxhzhlj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "3.0.3"; sha256 = "0glfid82amr4mxjqpq2ar6vhq6wv88sp463yvhg4pravkcrd0611"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Localization"; version = "2.1.0"; sha256 = "1xffy6cfl1apf2fhwzbaf770fiqpnpimv9l8cwg01r6wv6rg4sj2"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Localization.Abstractions"; version = "2.1.0"; sha256 = "077yw87idwrvm80ycyx118w1nby9agvb6pws5spq7gpky54s1zpb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.1.1"; sha256 = "12pag6rf01xfa8x1h30mf4czfhlhg2kgi5q712jicy3h12c02w8y"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.0.3"; sha256 = "0kyh6bk9iywbdvn29zm1770fwmag58y7c8rfpx886anxs6p9rh61"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.1"; sha256 = "1sgpwj0sa0ac7m5fnkb482mnch8fsv8hfbvk53c6lyh47s1xhdjg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.0.3"; sha256 = "1wj871vl1azasbn2lrzzycvzkk72rvaxywnj193xwv11420b0mjh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.ApplicationInsights"; version = "2.21.0"; sha256 = "0f8kz1sc66dmh443zcxkjvf0p5c9w755h0i13m9mvvwz56k6j8d6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "2.1.0"; sha256 = "1ia9nw7p5kx81n1x4l2n3jhwl55c1i12zm8245191d5g3b19f405"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "2.0.0"; sha256 = "0kdl5vh0fpizh48plj7zhmqv15wh74ij4rgi8hpzfk4y5b8nhgh1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "2.1.0"; sha256 = "0i0vmfc3ch7xa3awmbw3byylprfl2d6dp7lgm8k8f215kxzl1wdn"; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "2.1.1"; sha256 = "1rc1f9pqjljgqp670i3a4v8y4bsydcbm6mpmhw2dq753cg90gx4a"; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "2.2.0"; sha256 = "0n1q9lvc24ii1shzy575xldgmz7imnk4dswwwcgmzz93klri9r1z"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "1.0.0"; sha256 = "0gi3rj7hdkk5cq63biil8245mpcjf31l0d8cbl2gv7813h16ckmx"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.1.0"; sha256 = "0w9644sryd1c6r3n4lq2cgd5pn6jl3k5m38a05m7vjffa4m2spd2"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.1.1"; sha256 = "0wgpsi874gzzjj099xbdmmsifslkbdjkxd5xrzpc5xdglpkw08vl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.2.0"; sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.0.3"; sha256 = "0lq433x3z3dhf4w10vrxnqami6xsr6mwasla3qhmfx7yfybgz7y0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.1.0"; sha256 = "19zvypljvd74q50xl75xy1n869kha98slff4q012q7jpl9lfyf57"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "1.0.0"; sha256 = "0gmcvilj80xf5j06icjsg75qn65bdg9qca5a86sg8cs2licbxss1"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.1"; sha256 = "033rkqdffybq5prhc7nn6v68zij393n00s5a82yf2n86whwvdfwx"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.0.3"; sha256 = "08zlr6kl92znj9v2cs1wsjw6s98nxbkwnxk8pccbv0b4c7xhb3pf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.0"; sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) + (fetchNuGet { pname = "Microsoft.Extensions.WebEncoders"; version = "2.1.0"; sha256 = "04dby8szfzmrry3b7vfysbis3yg8q1fbqk82ck8z6zdxga1nv2dj"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.54.1"; sha256 = "1g7bgklz71vwamr4w2rw3k07h6vzwkl0jqlz0cxnp98pfi8k9c17"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "2.31.0"; sha256 = "1x9xbcm1dq7y1mmldqd1ga7ayczz7ydjj1bfbmx65bi46z63am5r"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.22.0"; sha256 = "06495i2i9cabys4s0dkaz0rby8k47gy627v9ivp7aa3k6xmypviz"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.32.0"; sha256 = "01b6kyhk8kv1ys9ynkmlaaif4q4i0hpgrjqfmqg04lbh5g0rl6f4"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.32.0"; sha256 = "1q4qfr4i9jbdsbrbjhxpgj0ikf6xcn5msvq0ms1vxv01ah83r522"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.32.0"; sha256 = "1wn6rylcagvz4sjr8mi707r6c91f931cqyy5ghgn1l6da2hi1d5n"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "6.32.0"; sha256 = "0bziphc91qdqnv4wkzdz9mr9m4sc02qqsjj1m6ak25pg4kp563pm"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "6.32.0"; sha256 = "1c35a1y9lzvygb0v1z73cngw5gr0qshbn2jvrnnx3961g52c17lb"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.32.0"; sha256 = "125c8drkknrbbmy40r5a7n1mnx6chrjlw6m0d2n0gks9qyr30prr"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Validators"; version = "6.32.0"; sha256 = "1h6rpn8pxlbzdwj7sfmgjq0sbz255dg1is62gyg2y8mp9pizwm1n"; }) + (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.1.0"; sha256 = "1a02bll0flsin9grd3jxbi76ycl42qamynalbp7qbqcsprabw3ai"; }) + (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.1.1"; sha256 = "06q4xmxj25ry7gkl51zi7vh2957k9s49vdrlgfy03w9rqk81vnld"; }) + (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "1.0.0"; sha256 = "06yakiyzgss399giivfx6xdrnfxqfsvy5fzm90scjanvandv0sdj"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "15.6.2"; sha256 = "10ii20xm855kj4klvx9rf6q566ay473ip7a8y0cp68z3idq72n32"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.9"; sha256 = "1h5cvi2f8p3khgsidrrlgqyc52vjfrxivakfnpr89b838x2hrii2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; }) + (fetchNuGet { pname = "Microsoft.OData.Core"; version = "7.6.4"; sha256 = "1m85s9zxr84slwxs1xw22ys6yvhrd4qmn31z23q94dhvrqlxdvqa"; }) + (fetchNuGet { pname = "Microsoft.OData.Edm"; version = "7.6.4"; sha256 = "1i7cxijnkpyj612fy58mzk18sxjd81my49hwrhnp2j218lj2303h"; }) + (fetchNuGet { pname = "Microsoft.Security.Utilities"; version = "1.3.0"; sha256 = "188l55zrdcgpc1n46mkiclkg8wi4sf3ksj9i1d514fipmvnl0wpn"; }) + (fetchNuGet { pname = "Microsoft.Spatial"; version = "7.6.4"; sha256 = "1qi03p8ws48hi4lf9vvvxsjisxc3p7i8289jf2q4i611ap3gkczd"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "15.6.2"; sha256 = "1ym6rrnah0mia5v04k1dbhg12sd63vrfn7c1sk243dag213lk09v"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "15.6.2"; sha256 = "1q7snd0smkn1ck1zhczmmly3mg0pdndxq6qv8bmg4qimril2wfv9"; }) + (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.0.0"; sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.7.0"; sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; }) + (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) + (fetchNuGet { pname = "Moq"; version = "4.8.2"; sha256 = "081qp2rk8qgvpvybspjqlgvs933hmlry7bhql076d7iqx5x4klbq"; }) + (fetchNuGet { pname = "NCrontab.Signed"; version = "3.3.2"; sha256 = "1rjlrcbgpbvsiaxavpykxjsmfhazr5338pfawzq5c9f7i3hydl2a"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.1"; sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) + (fetchNuGet { pname = "NSubstitute"; version = "3.1.0"; sha256 = "12cqhkxizsx00hdpagyg9aha9sp3f56447kbb7gf8z7s3armvvk8"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "5.11.5"; sha256 = "0rrkxq114q6gl5biacq15xd7w4cczsry5da2q449i8ahbxw1q6cb"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "5.11.5"; sha256 = "02zffklhk4dzib2wphkpcikh6j758v167759d3pl2b49kivhasib"; }) + (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "5.11.5"; sha256 = "09206r7j2i17mik4vwx3wmpd1mcl769f83brzjl2kk347yd2f6lp"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.5"; sha256 = "1bzgwanmw8gkd9n9v6fnr4k88fg7rl3qjy832ip69qxf921anla5"; }) + (fetchNuGet { pname = "NuGet.LibraryModel"; version = "5.11.5"; sha256 = "127jds09jvn9q1nhbidxas3fzqsr3cxjh4qb2x3yn4z204q07ack"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "5.11.5"; sha256 = "0w53zl8km3slxp2r44brbrs1nzsgpvqyzjwl1k8bq643ppgs0g6w"; }) + (fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.11.5"; sha256 = "16r6n6pjya6bx6kdskz3gdn57xb69nb5xsg60rzpj9ff41scsi5i"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.5"; sha256 = "1s0xfnq23lhr9h71naqkmiqxik9w1bwgiwjvdc7pgsqyn38s0rii"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.5"; sha256 = "17lc6rv9gmmrsnalq4wr71alj5zdvfzfy0kdd0gpckkb6gxfh8al"; }) + (fetchNuGet { pname = "Octokit"; version = "0.29.0"; sha256 = "1q62w95cj95kff0il9lcjaidgpj3xvh9a6mjy4prrb4j4gm694jb"; }) + (fetchNuGet { pname = "protobuf-net"; version = "2.3.3"; sha256 = "0h0fl5wrsjr0i5bpz6cq3fcpzfb8g4a239m69pk8l8hn2cnbksi5"; }) + (fetchNuGet { pname = "RichardSzalay.MockHttp"; version = "5.0.0"; sha256 = "13gvp56xl8vv2wxm0ygld9n2m255la3szgympfh2yx27xx0m80cg"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0"; sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.3.0"; sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.1"; sha256 = "15kfi3761mk2i29zg135ipsvavm50nwm4334cy5m5q7iagzsf73p"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "Suave"; version = "1.1.3"; sha256 = "1a46gknr70p86rcnmm5z9x1gv3wkb67pf926yskp4i76f1mz9gfg"; }) + (fetchNuGet { pname = "SuaveServerWrapper"; version = "0.0.3"; sha256 = "0vpp919irg3vs69jymwrh8y8x0dn3s00mcf4a1dqk8ajnnbndsfz"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.2.0"; sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.3.0"; sha256 = "1fym59ia85x3bjyv59vvjpnd8579alsf790k3i8lfsn0703ny1pq"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.3.1"; sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.0.1"; sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.0.1"; sha256 = "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9"; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.0.1"; sha256 = "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z"; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.4.0"; sha256 = "1c91pgj8vwjf4v0ss90bq63vmw2yr64qinria7blif3ml5c368lf"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { pname = "System.ComponentModel.EventBasedAsync"; version = "4.0.11"; sha256 = "07r5i7xwban347nsfw28hhjwpr78ywksjyhywvhj1yr0s7sr00wh"; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.1.0"; sha256 = "0wb5mnaag0w4fnyc40x19j8v2vshxp266razw64bcqfyj1whb1q0"; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.1.0"; sha256 = "178cva9p1cs043h5n2fry5xkzr3wc9n0hwbxa8m3ymld9m6wcv0y"; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.5.0"; sha256 = "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.7.0"; sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d"; }) + (fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Contracts"; version = "4.0.1"; sha256 = "0y6dkd9n5k98vzhc3w14r2pbhf10qjn2axpghpmfr6rlxx9qrb9j"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.5.0"; sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.6.0"; sha256 = "07pff0y96hj0k0izgmqlxydnx8cpsvfymicwi4m3dix979sdly09"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) + (fetchNuGet { pname = "System.Diagnostics.FileVersionInfo"; version = "4.3.0"; sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; }) + (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "4.5.0"; sha256 = "17gh1ijbjvbq4qk4g3k7izwn0h3xsdbbvgih01id68jxach9f7nb"; }) + (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "4.7.0"; sha256 = "1m00cf40rmfphd5l19wis571yygwbwgyxnhp4ya4bv1130lagil1"; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.1.0"; sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; }) + (fetchNuGet { pname = "System.Diagnostics.StackTrace"; version = "4.3.0"; sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; }) + (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.0.0"; sha256 = "1xigiwkwyxak0dhm0p8i2zb7a9syly9cdb5s9zkr9rbad4f2fqhs"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.0.0"; sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; }) + (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "4.7.0"; sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "4.7.3"; sha256 = "1dcqbm35yx52c7x7sgnnfl6f5nfrj484sgaapnr8dw9x160w64qp"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.32.0"; sha256 = "1xv95ipxp9n3j3bdky9pw7pgkb20zzxbjdnldzxd4x4nsqfsnw1c"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "2.1.0.227"; sha256 = "1dhdv07a06s7b34lpzx3c0n50zzqkhiia9rgi09cbibsbwzpm6b3"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "4.5.0"; sha256 = "1gq4s8w7ds1sp8f9wqzf8nrzal40q5cd2w4pkf4fscrl2ih3hkkj"; }) + (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "4.7.0"; sha256 = "0k0lyhk5dmnpljgw9jr3lgbq4q0h5wmzybllglldbaz7jmm7jazi"; }) + (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; sha256 = "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41"; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "7.0.0"; sha256 = "0vilmb817wnw8w13kkps831p05zzc41dldigpbr3wqi0hsrf8ad9"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Linq.Queryable"; version = "4.0.1"; sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; }) + (fetchNuGet { pname = "System.Linq.Queryable"; version = "4.3.0"; sha256 = "0vidv9cjwy8scabxd33mm4zl5vql695rz56ydc42m9b731xi2ahj"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { pname = "System.Net.NetworkInformation"; version = "4.1.0"; sha256 = "17ia8gyr0aq76z9cv37yjmpna7nx30xfppw0lifvi9s2q3yjspd2"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Requests"; version = "4.0.11"; sha256 = "13mka55sa6dg6nw4zdrih44gnp8hnj5azynz47ljsh2791lz3d9h"; }) + (fetchNuGet { pname = "System.Net.Security"; version = "4.3.2"; sha256 = "1aw1ca1vssqrillrh4qkarx0lxwc8wcaqdkfdima8376wb98j2q8"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.0.1"; sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.1.1"; sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.2"; sha256 = "019s7jz73d236p23mnpfaxxwib019i0v1fbwbkys0hskgddvw7cc"; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) + (fetchNuGet { pname = "System.Reactive.Core"; version = "3.1.1"; sha256 = "15nlyzsccfah5ihrhklr1fjl2mphv4rqbmbvlfbgvijava0czkn9"; }) + (fetchNuGet { pname = "System.Reactive.Core"; version = "5.0.0"; sha256 = "1dx853anp24awwgpw9j91qkgm2ww3n76jxnmg6qkn79vnfnjg0g7"; }) + (fetchNuGet { pname = "System.Reactive.Interfaces"; version = "3.1.1"; sha256 = "1i4zq94cwnk3d5bvkds3garm0gg348yxlpvcybq0jpj4m46nd4ak"; }) + (fetchNuGet { pname = "System.Reactive.Linq"; version = "3.1.1"; sha256 = "1l4844pqbpg2s6cddc5k8a0ff9pc5l7qz9q7zlnk5h0gpjy00wvi"; }) + (fetchNuGet { pname = "System.Reactive.Linq"; version = "5.0.0"; sha256 = "07p05v13yixbxhs84231k5l8jw3nji0j3zcqc6nsbcmh54jpjsrb"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.3.0"; sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.4.2"; sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.WindowsRuntime"; version = "4.0.1"; sha256 = "0r43c2jggyd0bvaal64gfv6iw49xj0378r1zb3ycwb53ff4rdn26"; }) + (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.0.0"; sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; }) + (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Json"; version = "4.0.2"; sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.0.1"; sha256 = "03dw0ls49bvsrffgwycyifjgz0qzr9r85skqhdyhfd51fqf398n6"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.7.0"; sha256 = "00797sqbba8lys486ifxblz9j52m29kidclvmqpk531820k55x9j"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "4.5.0"; sha256 = "16dhiz2qypk289dxiqa9rb7jmslnami6bykalv5dvbd8j91zikpy"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "4.7.0"; sha256 = "1mwvzl5ask8kk0vdgchhqr90nl61kagg47warb7dxrb03cxjd4wm"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.7.0"; sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.1"; sha256 = "06fp9a8zh0qk4g80q1g9m2q90q287nwywxlgfa4wi0v3lybnr9hp"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "4.5.0"; sha256 = "1rk40x0msf9k7sxnjyizagjns1z25dh3cf22bx6hsx6vhf0sk08l"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "4.7.1"; sha256 = "0smi8lv8q59ciba63bf6snxcs0i09awwasbnf5hc26ih7snqvd03"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "4.5.0"; sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "4.7.0"; sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.0.1"; sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.0.0"; sha256 = "1d3vc8i0zss9z8p4qprls4gbh7q4218l9845kclx7wvw41809k6z"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { pname = "System.Security.SecureString"; version = "4.0.0"; sha256 = "026q5f46585hgisz4svhnjc7q0ljprz43v15rybqizlyli5585jz"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.0.1"; sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.3.0"; sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.0"; sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (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.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.6.0"; sha256 = "0ism236hwi0k6axssfq58s1d8lihplwiz058pdvl8al71hagri39"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "5.0.2"; sha256 = "0vd0wd29cdhgcjngl9sw391sn2s8xm974y15zvym0whsdgjwiqfx"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.1"; sha256 = "1hr4qqzrij3y2ayi8jj70yfg0i9imf6fpdam1gr8qgp795kh86qg"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) + (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.0.1"; sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.8.0"; sha256 = "1hdd808x1fliv2j9jjk9hyjadlfl4sdc31vh1bafnz6y614r7m4r"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.9.0"; sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.0"; sha256 = "05mpkdc7aigwadlcc9q3ash88hygkyz5pmkj360jj6c6ffhm91s8"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.2"; sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Parallel"; version = "4.3.0"; sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.0.10"; sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.3.0"; sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.4.0"; sha256 = "1wydfgszs00yxga57sam66vzv9fshk2pw7gim57saplsnkfliaif"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "4.7.0"; sha256 = "11dmyx3j0jafjx5r9mkj1v4w2a4rzrdn8fgwm2d1g7fs1ayqcvy9"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.0.1"; sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.0.11"; sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; }) + (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; }) + (fetchNuGet { pname = "System.Xml.XPath"; version = "4.0.1"; sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; }) + (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) + (fetchNuGet { pname = "System.Xml.XPath.XDocument"; version = "4.3.0"; sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; }) + (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.0.1"; sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; }) + (fetchNuGet { pname = "Validation"; version = "2.4.15"; sha256 = "1wy60zv97q7w5rnrs1c12q4gazjj3a86dn856c8qy3xj9rlgx52j"; }) + (fetchNuGet { pname = "WindowsAzure.Storage"; version = "9.3.1"; sha256 = "1zwkzh2pprqn46bc6rkl1chb2dbpyrnzk0jirsbw29fqafmwdmdl"; }) + (fetchNuGet { pname = "xunit"; version = "2.4.0"; sha256 = "1fqya6mr6864x4kc0bqxzz0i61bl1vz6b4c79ica5vmwxdz50765"; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.1"; sha256 = "0c7zkf3i8n1mhc457q859klk067bw1xbf31lyxlwc5hlx9aqz65z"; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.2"; sha256 = "1cfpdhzrmqywsg8w899w9x5bxbhszipsm4791il1gf7cdq4hz463"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.4.0"; sha256 = "1p96zl0czhsh3im2c39nlc63869nwqia3kllfp5wn0jlaacpr82s"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.4.0"; sha256 = "1lcy8k62pnmsf15pppr7y940289rygxc0ipif1dsk9k3h5m7vpkn"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.2.0"; sha256 = "0l9fl09l709dq671r5yvmcrk9vhxgszmxf3ny1h9ja2sp9xx5pbs"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.0"; sha256 = "0qd834mv1017j13bjz7g0byiiqzpflnnqhm15zvnk309q48rgfrd"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.2.0"; sha256 = "14ia58y98qhswsx61fp046mpfx0kxcq5alhixf3k3vjar6p7naq4"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.0"; sha256 = "0bpy9iw4dkx884ld10dlijlyfp13afxrb3akhprdvazhmh8lj53j"; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.0"; sha256 = "1qgj8rbwd51cparf5kkqvf0zp0w68giz3ryf7265lmv4n14nwd5a"; }) + (fetchNuGet { pname = "Xunit.SkippableFact"; version = "1.3.6"; sha256 = "1g4lwzdv594ldwp4bfj01q2n74wa483z70gms4742v9nsf8119qq"; }) + (fetchNuGet { pname = "YamlDotNet"; version = "6.0.0"; sha256 = "15p23jw0cw7y9lij8n6iiyh85rl2plr2z4clnxjgdh2iz7783v51"; }) + (fetchNuGet { pname = "Yarp.ReverseProxy"; version = "2.0.1"; sha256 = "1bgf4wxn4q64byxs0nwzafan8lj342ffma19gpsxj4yzarad5h8x"; }) +] diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index 55c30a12addfc..76bdb693e4aa8 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.024941", - "publishDate": "2023-10-31T04:54:50.5527205Z", + "buildId": "1.0.025241", + "publishDate": "2023-11-30T02:51:40.8356813Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/linux/StaticSitesClient", - "sha": "bea23499732d615698baf4c9dcafe717fdd4ba8344f2d96740233b0380df79b6" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/linux/StaticSitesClient", + "sha": "e4ccb44c516e03e6dcc2a26a35ffd4c84a61dfea581990dd5c0edb7c12662db0" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/windows/StaticSitesClient.exe", - "sha": "a93aa5ec2a17280f3c9c8252948f8c68050c8852770322758ffa3187b6bce1dd" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/windows/StaticSitesClient.exe", + "sha": "4146ac01a488910d6ea066e1c46505048b0c9af2e74ef273c4236b387796712d" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/macOS/StaticSitesClient", - "sha": "57ea66c930aafbf4dea82216e51128b3315ec2db3ab385d41e8d912a3adab2c0" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/macOS/StaticSitesClient", + "sha": "05b213d7861454368d2c9801b0ccc75cfd13cb48f8e121fffaa2ab7e9b5671cd" } } }, { "version": "stable", - "buildId": "1.0.024941", - "publishDate": "2023-10-31T04:54:50.5527205Z", + "buildId": "1.0.025241", + "publishDate": "2023-11-30T02:51:40.8356813Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/linux/StaticSitesClient", - "sha": "bea23499732d615698baf4c9dcafe717fdd4ba8344f2d96740233b0380df79b6" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/linux/StaticSitesClient", + "sha": "e4ccb44c516e03e6dcc2a26a35ffd4c84a61dfea581990dd5c0edb7c12662db0" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/windows/StaticSitesClient.exe", - "sha": "a93aa5ec2a17280f3c9c8252948f8c68050c8852770322758ffa3187b6bce1dd" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/windows/StaticSitesClient.exe", + "sha": "4146ac01a488910d6ea066e1c46505048b0c9af2e74ef273c4236b387796712d" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/macOS/StaticSitesClient", - "sha": "57ea66c930aafbf4dea82216e51128b3315ec2db3ab385d41e8d912a3adab2c0" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/macOS/StaticSitesClient", + "sha": "05b213d7861454368d2c9801b0ccc75cfd13cb48f8e121fffaa2ab7e9b5671cd" } } }, { "version": "backup", - "buildId": "1.0.024871", - "publishDate": "2023-10-24T04:09:23.7109231Z", + "buildId": "1.0.025142", + "publishDate": "2023-11-20T09:32:48.489649Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/linux/StaticSitesClient", - "sha": "13d1c02e43dec373be04152f7f8e71974f080440cb9480c3ccb4f83c8c6f036a" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025142/linux/StaticSitesClient", + "sha": "f36cce34f04b045e3ea5de5c201ce6663925d9680e3b5986b417534898b995b2" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/windows/StaticSitesClient.exe", - "sha": "868f221ea77b13cea8c6c41edbecea53bf5171d42dc9376f34615e544a3874f0" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025142/windows/StaticSitesClient.exe", + "sha": "1e8932e2c4189d40657db888f82dfb030c2d41951421dd9a68712960e7c7fa7b" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/macOS/StaticSitesClient", - "sha": "63c9027a7b5e597ae9e0ad8311b31a587bd977ed758555784d08cc3ff35e80a4" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025142/macOS/StaticSitesClient", + "sha": "891faef16ae06fc609f787ffce7d6a1816e24fddfcaef9bc10e3b50208fe29aa" } } } diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 3bab2e7bba2f4..e37fd54832c2a 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,14 +1,14 @@ -{ lib, python3Packages, fetchPypi, installShellFiles }: +{ lib, python3Packages, fetchPypi, installShellFiles, testers, backblaze-b2 }: python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "3.9.0"; + version = "3.15.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "b2"; - hash = "sha256-Z9LQapWl0zblcAyMOfKhn5/O1H6+tmgiPQfAB241jqU="; + hash = "sha256-10c2zddALy7+CGxhjUC6tMLQcZ3WmLeRY1bNKWunAys="; }; postPatch = '' @@ -30,11 +30,13 @@ python3Packages.buildPythonApplication rec { arrow b2sdk phx-class-registry - setuptools docutils rst2ansi tabulate tqdm + platformdirs + packaging + setuptools ]; nativeCheckInputs = with python3Packages; [ @@ -63,6 +65,7 @@ python3Packages.buildPythonApplication rec { # it's hard to make it work on nix "test/integration/test_autocomplete.py" + "test/unit/console_tool" ]; postInstall = '' @@ -73,6 +76,15 @@ python3Packages.buildPythonApplication rec { --zsh <(${python3Packages.argcomplete}/bin/register-python-argcomplete backblaze-b2) ''; + passthru.tests.version = (testers.testVersion { + package = backblaze-b2; + command = "backblaze-b2 version --short"; + }).overrideAttrs (old: { + # workaround the error: Permission denied: '/homeless-shelter' + # backblaze-b2 fails to create a 'b2' directory under the XDG config path + HOME = "$(mktemp -d)"; + }); + meta = with lib; { description = "Command-line tool for accessing the Backblaze B2 storage service"; homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"; diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index b7f4f7c5d95cd..92249df9eeca6 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.13.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KFBb5poogtFnYePu9E5XBE0sKKev2Fuxaqj5ypscuqA="; + hash = "sha256-fhAKTZk+51KYjEnVWNLwpUWx+Quj3tmvmIvULQTbGf8="; }; - cargoHash = "sha256-OA8068ISy2WoC34Q0ANrWX27ESErntCfZ5IrO8Lvm10="; + cargoHash = "sha256-eBWmb6YaGZX31K3jKNKXgTGOOQm/WiSupckkpi49dWI="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 448b911151860..78534868d39ba 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.31.1"; + version = "1.33.1"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-GjCb0b8wT1mfk8Od1r5U6+a3yUzliS1ExIYIV6vnUPs="; + hash = "sha256-cdD4LYQZwkS5dRhmvyHkio7TXPDgfDo7kutVAGJCitc="; }; - vendorHash = "sha256-QDtjB1h7mNBEpTwoQfex3c6oba/kztKlgQpbmNHvoz0="; + vendorHash = "sha256-nh2hkwscb4EYEfumBXPFrLgxIxRlkVqBCnQZ4eMZbgg="; subPackages = [ "cmd/bearer" diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index 071bc11c50f8d..57541ceb1760a 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "benthos"; - version = "4.22.0"; + version = "4.24.0"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; rev = "refs/tags/v${version}"; - hash = "sha256-RlwHaLW27Y6yRzlvFLpJhOkPa1dYoX87XxMKecoT/dE="; + hash = "sha256-cZhx/a6bTOMP7JKM7ZnMzUEe5R79TIrVpv+6y/9qR0U="; }; - vendorHash = "sha256-9h7AocnhfYecEQbvesuFwXm+cTSd5lS9kdWjjO0GZP4="; + vendorHash = "sha256-6JEFToCBdfdS9MluApkEOcktWU66PpAD07Y9BKSzGx4="; doCheck = false; diff --git a/pkgs/development/tools/bomber-go/default.nix b/pkgs/development/tools/bomber-go/default.nix index 00424389584bb..7857dff0302a2 100644 --- a/pkgs/development/tools/bomber-go/default.nix +++ b/pkgs/development/tools/bomber-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bomber-go"; - version = "0.4.5"; + version = "0.4.7"; src = fetchFromGitHub { owner = "devops-kung-fu"; repo = "bomber"; rev = "refs/tags/v${version}"; - hash = "sha256-TsN/1ZtxVLJIWa7YkkCBzDF3xTeFKzSPLA7tIVe1oCI="; + hash = "sha256-q3x3duXc2++BvVul2a5fBTcPHWrOHpPOGHBUXL08syg="; }; - vendorHash = "sha256-P2g8KfQ+jNZla5GKONtB4MjDnTGBUtd9kmCi0j1xq7s="; + vendorHash = "sha256-jVdrvc48/Vt240EYk5PtZCjNGipX7M1qF8OJdpu/qI4="; ldflags = [ "-w" diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix deleted file mode 100644 index d4a69067705c0..0000000000000 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ fetchurl, lib, stdenv, coreutils, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "ant"; - version = "1.9.16"; - - nativeBuildInputs = [ makeWrapper ]; - - src = fetchurl { - url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "0rif9kj6njajy951w3aapk27y1mbaxb08whs126v533h96rb1kjp"; - }; - - contrib = fetchurl { - url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2"; - sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1"; - }; - - installPhase = - '' - mkdir -p $out/bin $out/lib/ant - mv * $out/lib/ant/ - - # Get rid of the manual (35 MiB). Maybe we should put this in a - # separate output. Keep the antRun script since it's vanilla sh - # and needed for the <exec/> task (but since we set ANT_HOME to - # a weird value, we have to move antRun to a weird location). - # Get rid of the other Ant scripts since we provide our own. - mv $out/lib/ant/bin/antRun $out/bin/ - rm -rf $out/lib/ant/{manual,bin,WHATSNEW} - mkdir $out/lib/ant/bin - mv $out/bin/antRun $out/lib/ant/bin/ - - # Install ant-contrib. - unpackFile $contrib - cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/ - - cat >> $out/bin/ant <<EOF - #! ${stdenv.shell} -e - - ANT_HOME=$out/lib/ant - - # Find the JDK by looking for javac. As a fall-back, find the - # JRE by looking for java. The latter allows just the JRE to be - # used with (say) ECJ as the compiler. Finally, allow the GNU - # JVM. - if [ -z "\''${JAVA_HOME-}" ]; then - for i in javac java gij; do - if p="\$(type -p \$i)"; then - export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))" - break - fi - done - if [ -z "\''${JAVA_HOME-}" ]; then - echo "\$0: cannot find the JDK or JRE" >&2 - exit 1 - fi - fi - - if [ -z \$NIX_JVM ]; then - if [ -e \$JAVA_HOME/bin/java ]; then - NIX_JVM=\$JAVA_HOME/bin/java - elif [ -e \$JAVA_HOME/bin/gij ]; then - NIX_JVM=\$JAVA_HOME/bin/gij - else - NIX_JVM=java - fi - fi - - LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH" - - exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \ - -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \ - org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \ - -cp "\$CLASSPATH" "\$@" - EOF - - chmod +x $out/bin/ant - ''; # */ - - meta = { - homepage = "https://ant.apache.org/"; - description = "A Java-based build tool"; - - longDescription = '' - Apache Ant is a Java-based build tool. In theory, it is kind of like - Make, but without Make's wrinkles. - - Why another build tool when there is already make, gnumake, nmake, jam, - and others? Because all those tools have limitations that Ant's - original author couldn't live with when developing software across - multiple platforms. Make-like tools are inherently shell-based -- they - evaluate a set of dependencies, then execute commands not unlike what - you would issue in a shell. This means that you can easily extend - these tools by using or writing any program for the OS that you are - working on. However, this also means that you limit yourself to the - OS, or at least the OS type such as Unix, that you are working on. - - Ant is different. Instead of a model where it is extended with - shell-based commands, Ant is extended using Java classes. Instead of - writing shell commands, the configuration files are XML-based, calling - out a target tree where various tasks get executed. Each task is run - by an object that implements a particular Task interface. - ''; - - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/disable_build_file_generation.patch b/pkgs/development/tools/build-managers/bazel/bazel-remote/disable_build_file_generation.patch deleted file mode 100644 index 67df8f559a208..0000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/disable_build_file_generation.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3f5abd591b93ebdbc1ae82e5c29cf26024222f5f Mon Sep 17 00:00:00 2001 -From: Uri Baghin <uri@canva.com> -Date: Thu, 30 Jan 2020 16:47:36 +1100 -Subject: [PATCH] Disable build file generation for remote apis. - ---- - WORKSPACE | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/WORKSPACE b/WORKSPACE -index f9ebafa..52e4e0b 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -208,6 +208,7 @@ http_archive( - - go_repository( - name = "com_github_bazelbuild_remote_apis", -+ build_file_generation = "off", - importpath = "github.com/bazelbuild/remote-apis", - sum = "h1:OPH+hf+ICw8WEp2CV2ncfdyWPC30Cmw8b5NKun0n5IQ=", - version = "v0.0.0-20191119143007-b5123b1bb285", --- -2.25.0 - diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index e662c14fa399d..08944413b7a04 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -287,7 +287,7 @@ stdenv.mkDerivation rec { sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k"; }; - in (lib.optionalSttrs (!stdenv.hostPlatform.isDarwin) { + in (lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { # `extracted` doesn’t work on darwin shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self;}; }) // { diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 5aac94c837035..362fce432ecd0 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.5.11"; + version = "1.5.13"; platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { bloop-binary = fetchurl rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = - if stdenv.isLinux && stdenv.isx86_64 then "sha256-T07t0CTSkCPQfjhg/L0NhyZgMobXL7DCKZZefPxdBJk=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-3GiMFRikru+8J+eDkba9bNNrpmtuAdH9qEjnH55beiQ=" + if stdenv.isLinux && stdenv.isx86_64 then "sha256-OgOkkQ2uv1/mutlajfnbKe9YUtWCilaiWef6fZ7m0Qk=" + else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-Xp0FF8/5NQG14OhZgQ7PZTyDC5hNG9q5Qq5q3JlQxA0=" else throw "unsupported platform"; }; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 9da89e890ce09..1e1b50f142ece 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,13 +1,13 @@ -{ jdk8, jdk11, jdk17 }: +{ jdk11, jdk17, jdk21 }: rec { gen = - { version, nativeVersion, sha256, + { version, nativeVersion, hash, # The default JDK/JRE that will be used for derived Gradle packages. # A current LTS version of a JDK is a good choice. - defaultJava ? jdk8, + defaultJava, # The platforms supported by this Gradle package. # Gradle Native-Platform ships some binaries that @@ -41,7 +41,7 @@ rec { inherit version; src = fetchurl { - inherit sha256; + inherit hash; url = "https://services.gradle.org/distributions/gradle-${version}-bin.zip"; }; @@ -128,23 +128,23 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.4"; + version = "8.5"; nativeVersion = "0.22-milestone-25"; - sha256 = "1bkjxw7i0lm17pdyyvka4xpl6z0cdj0izagphync6839i2pg66iy"; - defaultJava = jdk17; + hash = "sha256-nZJnhwZqCBc56CAIWDOLSmnoN8OoIaM6yp2wndSkECY="; + defaultJava = jdk21; }; gradle_7 = gen { version = "7.6.3"; nativeVersion = "0.22-milestone-25"; - sha256 = "1b6gk0yiyvf86vigd05mz7ryqs8yrpswk9bmpwrnqcp45r3jw33l"; + hash = "sha256-dAwuRy7kMmwzv3WlyfXNHmns8/m1gPbiNshtHz2Yz6w="; defaultJava = jdk17; }; gradle_6 = gen { version = "6.9.4"; nativeVersion = "0.22-milestone-20"; - sha256 = "16iqh4bn7ndch51h2lgkdqyyhnd91fdfjx55fa3z3scdacl0491y"; + hash = "sha256-PiQCKFON6fGHcqV06ZoLqVnoPW7zUQFDgazZYxeBOJo="; defaultJava = jdk11; }; } diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 2a40c59709843..bf06954df4dee 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -7,6 +7,9 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison ]; + # Jam uses c89 conventions + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-std=c89"; + # Jambase expects ar to have flags. preConfigure = '' export AR="$AR rc" diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index e45c5acd713e6..14f4fa806f0c5 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.16.0"; + version = "1.18.5"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-FPhUGFumbO28rPWNDTrUNqMx0ppbotp9z6u8cCEHu/g="; + hash = "sha256-NZiFxcEdNdqR38VDJe4lC5maLTguk3+t78yG1zqXuA0="; }; - cargoHash = "sha256-hak0xMV6MSqM88bNY+2C5B5YlRWlZ+dDYu50pYEDsmI="; + cargoHash = "sha256-BecaYeQYYoP7SubTktYqOejFyCTRolmUTV7rpGwXOGI="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 1b833d6d1f04a..7e70d0c04afa6 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.9.7"; + version = "1.9.8"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-I1Q7xFl7VS6OLCfWlf5nLsI1q4pk92azeCj7aMbZ2RA="; + hash = "sha256-qG//418Ga2XV4C67SiytHPu0GPgwv19z0n8wc+7K/c0="; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 1ea575013bb0d..293607bf3d6b9 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -8,6 +8,8 @@ , makeWrapper , callPackage , jre +, testers +, scala-cli }: let @@ -77,4 +79,9 @@ stdenv.mkDerivation { }; passthru.updateScript = callPackage ./update.nix { } { inherit platforms pname version; }; + + passthru.tests.version = testers.testVersion { + package = scala-cli; + command = "scala-cli version --offline"; + }; } diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 8d1af88a84156..cc342b1feb741 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.0.5", + "version": "1.1.0", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1p2ibii71digdz7qqqyahvdmmxyx19crwgn4bmas0hahl6mz553x" + "sha256": "1w8vxfyn1h5x5jxh4w133w0l566ly3chhkff06jy1gik4hszd97y" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1y9ghb829jz9yg4l7bgwnbl3cm7z7c20cyfc71v9iz8bq5ns9akr" + "sha256": "0k3nsn2zzfqbkibrd5hzrsbg35x08ss4l2f7nwwa59grj5jgpm0f" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "12qjrm979pfbr0j7s59dyn7xkk585av7l0qxf77rz71009kvql0a" + "sha256": "016mdi5bp1x0r2hak4c3j26y8zrhvhsl1w7gvzsbybpbfd5p45hv" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "17x4nv5f8g1kx8l4n8ncxf60zwhwpqg8fh5cl8qy9s5h9h81n0rz" + "sha256": "0q2aqwjldsdbir8s8mix2wqkhiwb4q5d3ljf9gzxqqxgc9h4v78j" } } } diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 01fc3b3aafb7b..80c610eaa32b8 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.5"; + version = "2.8.6"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-GcZ747z8valsqHoY7/rDm/zMRD+7N1THu8AVEd7NJK8="; + hash = "sha256-DmKE6v1RoyNgmCE8CVI39WrK+umoilBAa4gszl6iaz0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index a6761a7350c78..81d00d6304e06 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.32.2"; + version = "1.33.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-Av4wrJ+anVu1pTSFTpaseBhj+7ECsRoKb1bATrUKYuo="; + hash = "sha256-jkUEGaECBNidKreoyezWw7LN38uHqyYo40dOwfuuuI4="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index b768021035cbf..2d39fd93559d2 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pack"; - version = "0.32.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - hash = "sha256-t4//83DD3hCnxsuuw7nB06SWCY4/GcRcIk8Cr3C4bDw="; + hash = "sha256-U3dSGTn9dV0Iiu0DtLCWF/BFHYhRGxirA5T067riA0w="; }; vendorHash = "sha256-42CrWLwBcv2GE+hEgJJOd7hFQu7rjYrXkPhhUykqIQw="; diff --git a/pkgs/development/tools/cbor-diag/Gemfile.lock b/pkgs/development/tools/cbor-diag/Gemfile.lock index 1ca37307426e4..27d74a07d5152 100644 --- a/pkgs/development/tools/cbor-diag/Gemfile.lock +++ b/pkgs/development/tools/cbor-diag/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: cbor-canonical (0.1.2) cbor-deterministic (0.1.3) - cbor-diag (0.8.4) + cbor-diag (0.8.7) cbor-canonical cbor-deterministic cbor-packed @@ -24,4 +24,4 @@ DEPENDENCIES cbor-diag BUNDLED WITH - 2.4.10 + 2.4.20 diff --git a/pkgs/development/tools/cbor-diag/gemset.nix b/pkgs/development/tools/cbor-diag/gemset.nix index 1db6f98229bea..ffb06225bfb23 100644 --- a/pkgs/development/tools/cbor-diag/gemset.nix +++ b/pkgs/development/tools/cbor-diag/gemset.nix @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k57gminnhz5fmnclrixdp1f2mg8d6zjnbbf67glaqpxf08a99j6"; + sha256 = "0rwd88xngbjamgydj9rg3wvgl53pfzhal2n702s9afa1yp8mjm51"; type = "gem"; }; - version = "0.8.4"; + version = "0.8.7"; }; cbor-packed = { groups = ["default"]; diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index 2aca42bbb262d..7b155d4c40bad 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.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${version}"; - hash = "sha256-lFe59ITcPJ69x0COV+WlX500Hl96XqWLCz5gJMqX6qQ="; + hash = "sha256-IS4KKvAi4VutJADSpst56ZdeqoqVkSMQ1TyQR12pqNg="; }; vendorHash = "sha256-JmK7bcS8UYCOUvJGs0PAYPNc8iwvCSFzjLlkBEVUa40="; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index a60de4d83ea88..a0c784d582585 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -3,12 +3,12 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2023.10.20"; + version = "2023.12.15"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-f9u/pk3CEEmiLgnS2biaUHpsMHjVEwZL2jyB/1PiZUY="; + sha256 = "sha256-YVFG7eY0wOB41kKJWydXfil8uyDSHRxPVry9L3u2P4k="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 8b7b39bba1b10..825f076664567 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.6.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-dOiXrHD1ZVhMQNwo7hD/f53Ct5+Lwxq/zbApll5O2qo="; + sha256 = "sha256-iJH2uXlKsq7I94D3/Fe3pB8SzPfO0CodEk3XNdGleMk="; }; - cargoHash = "sha256-oO7xqjxlQg0s40WmWNZpEpqdRia4NGGlYbBO8ejW9BE="; + cargoHash = "sha256-srcAUrPrrZoNUn7OeyzSRpOiEuyEizxTiEUbaNg9llE="; # 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/compass/Gemfile b/pkgs/development/tools/compass/Gemfile index 66a29975e7dd9..de8c23e303df9 100644 --- a/pkgs/development/tools/compass/Gemfile +++ b/pkgs/development/tools/compass/Gemfile @@ -1,3 +1,2 @@ -source "https://rubygems.org" do - gem 'compass' -end +source 'https://rubygems.org' +gem 'compass' diff --git a/pkgs/development/tools/compass/Gemfile.lock b/pkgs/development/tools/compass/Gemfile.lock index f0bf7699df0d8..cc4969e234bbf 100644 --- a/pkgs/development/tools/compass/Gemfile.lock +++ b/pkgs/development/tools/compass/Gemfile.lock @@ -25,7 +25,7 @@ PLATFORMS ruby DEPENDENCIES - compass! + compass BUNDLED WITH - 2.2.24 + 2.4.22 diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix index f8a2aad14f45e..8b8752d1c0d8c 100644 --- a/pkgs/development/tools/compass/default.nix +++ b/pkgs/development/tools/compass/default.nix @@ -1,9 +1,11 @@ -{ lib, bundlerApp, bundlerUpdateScript }: +{ lib, bundlerEnv, bundlerUpdateScript, ruby }: -bundlerApp { +bundlerEnv { pname = "compass"; + version = "1.0.3"; + + inherit ruby; gemdir = ./.; - exes = [ "compass" ]; passthru.updateScript = bundlerUpdateScript "compass"; @@ -12,6 +14,7 @@ bundlerApp { homepage = "https://github.com/Compass/compass"; license = with licenses; mit; maintainers = with maintainers; [ offline manveru nicknovitski ]; + mainProgram = "compass"; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index e48d2d8ae8a22..148959155a86d 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.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-51OGcic3clPYjj4bmiRVmViqJUEuwzkTtNl9U3OPAdI="; + hash = "sha256-nWcwy998ivz6ftr1zkN2JlLxHLMB47OZS/vnaYkoZHI="; }; - vendorHash = "sha256-nDRg1gF6igE2FJ+s39j5EQ5/h9QkuSF2Bo9zxR3WkBE="; + vendorHash = "sha256-puAchYXCLE8yenqcCrclNqCqHP3WyFDQhzWgFv4yFUs="; ldflags = [ "-s" diff --git a/pkgs/development/tools/container2wasm/default.nix b/pkgs/development/tools/container2wasm/default.nix index 633baceb589ad..00e586689ab18 100644 --- a/pkgs/development/tools/container2wasm/default.nix +++ b/pkgs/development/tools/container2wasm/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "container2wasm"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "ktock"; repo = "container2wasm"; rev = "refs/tags/v${version}"; - hash = "sha256-ba40Nu2tVrRSvVeGxlrn0Bw+xQqWeli40lwBWOXSNTA="; + hash = "sha256-P/9RbNEpQTpbbWpfN0AThWfYaXCy8SeFvsFQFqdk+Zo="; }; - vendorHash = "sha256-tyfLWmxAzFc0JuSem8L0HPG4wy9Gxdp8F/J3DyOx6rQ="; + vendorHash = "sha256-aY1/oOCaREXObi6RQ3nhQbYWpzOsJzDiiIRJ6CneB8c="; ldflags = [ "-s" diff --git a/pkgs/development/tools/continuous-integration/buildbot/default.nix b/pkgs/development/tools/continuous-integration/buildbot/default.nix index 71dfe3ef51aa0..7bc06163f2361 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/default.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/default.nix @@ -7,11 +7,11 @@ let python = python3.override { packageOverrides = self: super: { sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "1.4.49"; + version = "1.4.50"; src = fetchPypi { pname = "SQLAlchemy"; inherit version; - hash = "sha256-Bv8ly64ww5bEt3N0ZPKn/Deme32kCZk7GCsCTOyArtk="; + hash = "sha256-O5fd9Qn8IeELCUA7UhmwbFtViyf8JFMVAnT6TnBwfb8="; }; disabledTestPaths = [ "test/aaa_profiling" diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 4195a8453033f..5436d00b0bb0a 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -32,7 +32,10 @@ , git , openssh , setuptools -, pythonRelaxDepsHook +, croniter +, importlib-resources +, packaging +, unidiff , glibcLocales , nixosTests , callPackage @@ -67,14 +70,14 @@ let package = buildPythonApplication rec { pname = "buildbot"; - version = "3.9.2"; + version = "3.10.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7QhIMUpzmxbh8qjz0hgqzibLkWADhTV523neo1wpGSA="; + hash = "sha256-/J4jWoIZEObSZKw04Ib6h4AvJtfNwzwozRu+gFek1Dk="; }; propagatedBuildInputs = [ @@ -91,6 +94,10 @@ let pyjwt pyyaml setuptools + croniter + importlib-resources + packaging + unidiff ] # tls ++ twisted.optional-dependencies.tls; @@ -111,11 +118,8 @@ let git openssh glibcLocales - pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "Twisted" ]; - patches = [ # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index 2af7289000e2c..758a640aa8768 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-HmkJHN81AcQdKrA/XnH3REURCssXnzmoKjcmvinfzFo="; + hash = "sha256-6lJW1XNwKXeTTn0jDOIsVHUrmxSWc4iK3gINvTFX2XU="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 429c19ecfceeb..3c6fa1bbdae9f 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchurl, callPackage, mock, cairosvg, klein, jinja2, buildbot-pkg, unzip, zip }: +{ lib, buildPythonPackage, fetchPypi, callPackage, mock, cairosvg, klein, jinja2, buildbot-pkg }: { # this is exposed for potential plugins to use and for nix-update inherit buildbot-pkg; @@ -8,7 +8,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-fwWzgIf0/+UiKRyiFUKPN4WUbmxQE5sU/ChAOqqLHE4="; + hash = "sha256-W0NRRS0z02/31eyqVRGJUZlUaI77I9WuAI3d3FlWHOQ="; }; # Remove unnecessary circular dependency on buildbot @@ -32,27 +32,18 @@ www-react = buildPythonPackage rec { pname = "buildbot-www-react"; inherit (buildbot-pkg) version; - format = "wheel"; - # fetchpypy returns a 404 for the wheel? - # normal source release doesn't have any assets - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/buildbot_www_react-${version}-py3-none-any.whl"; - hash = "sha256-pEzuMiDhGQtIWQm80lgKIcTjnS7Z8UJhH9plJup5O84="; + src = fetchPypi { + inherit pname version; + hash = "sha256-NfpgTZ0+sP2U8rkf+C4WTpXKVBvO8T+ijs8xIPe49tA="; }; - # Remove unneccessary circular dependency on buildbot + # Remove unnecessary circular dependency on buildbot postPatch = '' - pushd dist - unzip buildbot_www_react-${version}-py3-none-any.whl - sed -i "s/Requires-Dist: buildbot//" buildbot_www_react-${version}.dist-info/METADATA - chmod -R u+w buildbot_www_react-${version}-py3-none-any.whl - zip -r buildbot_www_react-${version}-py3-none-any.whl buildbot_www_react-${version}.dist-info - popd + sed -i "s/'buildbot'//" setup.py ''; buildInputs = [ buildbot-pkg ]; - nativeBuildInputs = [ unzip zip ]; # No tests doCheck = false; @@ -71,7 +62,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-ghCmbUw/Gj23J5X3fDn/FGkVvXUE9QWrPFTRXSsxEZ4="; + hash = "sha256-ykzzvsxP8e0TIHnZJPSnFJoZNNZDvbZ7vZ6hCZyd0iA="; }; buildInputs = [ buildbot-pkg ]; @@ -93,7 +84,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-B+xUsZBQWt4TwiBqukHO6o0R0XbjLxbCxQKLaWW0/Fw="; + hash = "sha256-cu0+66DHf8Hfvfx/IvVyexwl3I0MmLjJrNDBPLxo7Bg="; }; buildInputs = [ buildbot-pkg ]; @@ -115,7 +106,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-LFZ3VquRHAHkRcQbw9apOlGlWCK42WT1tPGhW8zSXyo="; + hash = "sha256-Fd8r2+jV4YSuYu6zUl0fDjEdUGkzuHckR+PTSEyoXio="; }; buildInputs = [ buildbot-pkg ]; @@ -137,7 +128,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-NGI4T0eVV4MxYpD7+BTKbi3r6USt28lXXInrgSd4ASU="; + hash = "sha256-LzsdHTABtHJzEfkyJ6LbmLE0QmKA3DVjY8VP90O3jT4="; }; buildInputs = [ buildbot-pkg ]; @@ -159,7 +150,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-BtKA8zuJEyg3q3GnHS4XSGBLBk3IqCR8NOKui2rIn6Q="; + hash = "sha256-tVMXGYTZlkchfeEcHh3B/wGEZb8xUemtnbFzX65tvb8="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 29d0bcf7fb739..e1e31459ce17c 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , buildbot +, stdenv # patch , coreutils @@ -27,7 +28,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - hash = "sha256-jI38ZhCcHbjah6lST6YtSZAwaeZPBWsgY3VTUf6s2x8="; + hash = "sha256-jihAPEzeegUEa/BZ93De7728IXjL7BkrwfPk5G6rnUw="; }; postPatch = '' @@ -60,5 +61,6 @@ buildPythonPackage (rec { description = "Buildbot Worker Daemon"; maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; + broken = stdenv.isDarwin; # https://hydra.nixos.org/build/243534318/nixlog/6 }; }) diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index a7092f3c1f9a1..6a8826fb83fca 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-YiKULnLSP5wgrYob1t4HssGS9ubSR5dHECIwnAicg8M="; + sha256 = "sha256-ywKRibJxOVYQ7SNef38eUk1QkVnCoFbIMIGPCw2Woek="; }; - vendorHash = "sha256-3GPe76zcyKItYWedmnAnmN4c1AorQePxxWXkRk0vNpk="; + vendorHash = "sha256-nryEdqRKXyum9Vrna3aqhhYekjvNIvct8gqbKEBR9iE="; tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ]; diff --git a/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix b/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix index f32c5b138aba5..dc5ad3708a0ef 100644 --- a/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "forgejo-actions-runner"; - version = "3.0.1"; + version = "3.3.0"; src = fetchFromGitea { - domain = "codeberg.org"; + domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-idA74R6kbI7Bk0XvT7BOyctT0IKymsJoFCWgYrtZstU="; + hash = "sha256-ZpsHytsIp+ZW4DI7X9MmI7nZRnXVHvx905YdZGS6WMY="; }; - vendorHash = "sha256-HE//SD/doMf42y2KF10JAuUe86hpFhCUM61da2NC5CE="; + vendorHash = "sha256-5GnGXpMy1D7KpVAVroX07Vw5QKYYtwdIhQsk23WCLgc="; 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 479f319c5426a..ac8e06cf8570c 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.6.0"; + version = "16.6.1"; in buildGoModule rec { inherit version; @@ -23,7 +23,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-4N00+yO7Ps0+jy7WmHhm4Eh4MXt3beH00ScZ1RWNByE="; + sha256 = "sha256-z/W4mqC6524ocBR0c2UpMrlo5njXoewgBOulPoe2UBY="; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 1de4ffddd0743..0298fe20055a3 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.426.1"; + version = "2.426.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-jYTzzdZDDAmNH084dAlX4/LQrCYbL5xoy/nDBjY/0cg="; + hash = "sha256-NzG59Elz+78+U1+YqAwhqtlxnLTuqKHlnpdMEf6EaEg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://jenkins.io/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; - maintainers = with maintainers; [ coconnor earldouglas nequissimus ajs124 ]; + maintainers = with maintainers; [ coconnor earldouglas nequissimus ] ++ teams.helsinki-systems.members; changelog = "https://www.jenkins.io/changelog-stable/#v${version}"; mainProgram = "jenkins-cli"; platforms = platforms.all; diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix index 899fdc7d82ef6..a3f27e533e7da 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "woodpecker-plugin-git"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "plugin-git"; rev = "refs/tags/${version}"; - hash = "sha256-BQG1+icfV21qZCwgNvLQm8+1f5WF8owKnQKTIF7O80A="; + hash = "sha256-9aK6c2uUBhTzBni6S4XwevdVRxswiMYGJKwmKOGHIbg="; }; vendorHash = "sha256-ol5k37gGFsyeEnGOVcJaerkIejShHyNCBu4RZ8WyHvU="; diff --git a/pkgs/development/tools/cpm-cmake/default.nix b/pkgs/development/tools/cpm-cmake/default.nix index ada4dde0176a2..d0e4247795d24 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.6"; + version = "0.38.7"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-6y3kZyhY1WKHLw3ekZMQeoSGUgxhBu8dPl58ZnCDa+E="; + hash = "sha256-tvqoGLGBvsPtIbPWG/5DH4IMzQTci3sjmF9dpInncWc="; }; dontConfigure = true; diff --git a/pkgs/development/tools/crd2pulumi/default.nix b/pkgs/development/tools/crd2pulumi/default.nix index 7bf85bdb4bfae..b2f43c954b1c2 100644 --- a/pkgs/development/tools/crd2pulumi/default.nix +++ b/pkgs/development/tools/crd2pulumi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "crd2pulumi"; - version = "1.2.5"; + version = "1.3.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "crd2pulumi"; rev = "v${version}"; - sha256 = "sha256-Km9zL9QQgQjmIaAILzJy8oSd9GyZn/MnmBYTRMFtXlE="; + sha256 = "sha256-UBfb6PI+Ivk6JxSBIHw4tN09BHN1J+un04mnR3ByDfc="; }; - vendorHash = "sha256-iWFZ20U4S2utIqhoXgLtT4pp5e9h8IpbveIKHPe0AAw="; + vendorHash = "sha256-Fs43ITqfZYEcuRzm5bTTgmG/tWGIX9k8gdYBHmO4tMQ="; ldflags = [ "-s" "-w" "-X github.com/pulumi/crd2pulumi/gen.Version=${src.rev}" ]; diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 0ff3e90dc0db5..1afee9cd7551c 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -1,6 +1,5 @@ { buildGoModule , fetchFromGitHub -, fetchpatch , lib , installShellFiles , testers @@ -9,31 +8,18 @@ buildGoModule rec { pname = "cue"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-1svWb83xbVZIlI9pviCYfQ6Kkp0QRjZwrauL7PPJLts="; + hash = "sha256-L2KEOnUmQ6K+VtyJEha0LBWPVt+FqNh94gi3cMg82x0="; }; - vendorHash = "sha256-ku4tPTXdnKau0kqnAAEHDdSF4oAC/6SDkTq8cECOiEk="; + vendorHash = "sha256-Eq51sydt2eu3pSCRjepvxpU01T0vr0axx9XEk34db28="; - patches = [ - # Fix tests with go1.21. See https://github.com/cue-lang/cue/issues/2548. - (fetchpatch { - url = "https://github.com/cue-lang/cue/commit/3bf3dbd655284d3628399a83a703f4849b5f9374.patch"; - hash = "sha256-9Zi2mrqB1JTFvadiqWTgzzi1pffZ3gOmTtrDDQWye1Q="; - }) - ]; - - postPatch = '' - # Disable script tests - rm -f cmd/cue/cmd/script_test.go - ''; - - excludedPackages = [ "internal/ci/updatetxtar" "internal/cmd/embedpkg" "internal/cmd/qgo" "pkg/gen" ]; + subPackages = [ "cmd/cue" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index 7afa8b43a855f..30824da948bee 100644 --- a/pkgs/development/tools/database/atlas/default.nix +++ b/pkgs/development/tools/database/atlas/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "atlas"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-qEui+Y7auNFJwLSUT90jJH7IPgNW06phbJel9y3C1bk="; + hash = "sha256-v+LhyuUSKyZtCkNE/IBJs3dk3vkqKHvCNyaW+Wxp8oY="; }; modRoot = "cmd/atlas"; proxyVendor = true; - vendorHash = "sha256-BJB+ZwrfZsYlyVX0G3qNQW8KexxMmc1Y9m2TRbOX6Tc="; + vendorHash = "sha256-vkMZ7yscLg+y3tvU4AGR+L70xwqYsKVvE+Oe4+aUlv8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/database/litefs/default.nix b/pkgs/development/tools/database/litefs/default.nix index 4c941a7609aa7..d4077a2388fff 100644 --- a/pkgs/development/tools/database/litefs/default.nix +++ b/pkgs/development/tools/database/litefs/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "litefs"; - version = "0.5.8"; + version = "0.5.10"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oF69bmWI4I/ok89Rgve4eedMR9MCcaxmQ4bGff831dI="; + sha256 = "sha256-e7RBiUHMndOz1n8gWlx+4ifnueWgPu482KIAXaSEhl0="; }; - vendorHash = "sha256-6Dg1fU4y0eUeiX9uUwJ2IUxBr81vWR6eUuCV+iPBNBk="; + vendorHash = "sha256-FcYPe4arb+jbxj4Tl6bRRAnkEvw0rkECIo8/zC79lOA="; subPackages = [ "cmd/litefs" ]; diff --git a/pkgs/development/tools/database/mermerd/default.nix b/pkgs/development/tools/database/mermerd/default.nix index 6aa4479181f3a..90f274d66113d 100644 --- a/pkgs/development/tools/database/mermerd/default.nix +++ b/pkgs/development/tools/database/mermerd/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "mermerd"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "KarnerTh"; repo = "mermerd"; rev = "refs/tags/v${version}"; - hash = "sha256-oYX1473bfZHwCscIpZSDfkKgIsGMcmkFGfWI400Maao="; + hash = "sha256-SzDwVkV7rV/pctFNWzgCfsDAHqcf/R5UMRJ48o+Iel0="; }; - vendorHash = "sha256-RSCpkQymvUvY2bOkjhsyKnDa3vezUjC33Nwv0+O4OOQ="; + vendorHash = "sha256-rLOYJ/do4HSztnHrQZOUOG0Y3e3BupUGlijP5x8WtZc="; ldflags = [ "-s" diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/development/tools/database/prqlc/default.nix index d8de3dcf6d789..60baffb22a290 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.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "prql"; repo = "prql"; rev = version; - hash = "sha256-E6++xmEzY9Ndq4RCKALEHF9mh1E1NBME1gaJN70O2sE="; + hash = "sha256-XKb19qevscNjFUMtLL1nk7fXJuPOyQYZvZ3/4BHS0jo="; }; - cargoHash = "sha256-WLJ9XrtCXDGfqhSccSdel28EARNxZgoGbC6B+W9CsTc="; + cargoHash = "sha256-cZkXz9sXfFo0OBQDrHKUfYJsTH1RiLEFb4xU6TDaZUQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix index cc68d8b93bbe8..324270ee7c239 100644 --- a/pkgs/development/tools/database/sqlcl/default.nix +++ b/pkgs/development/tools/database/sqlcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlcl"; - version = "23.2.0.178.1027"; + version = "23.3.0.270.1251"; src = fetchurl { url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; - hash = "sha256-wGqLlV88yYJrVblKzeG6VerfsEgCi1JQd49ONZmUB4Y="; + hash = "sha256-TkQkMtCTKUdfVx9sfAJVJP4nAaQmG4SDcduwaFfAEGs="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock b/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock index 3fe77e677418f..a0d486280bc12 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock +++ b/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock @@ -74,9 +74,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", @@ -127,12 +127,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea50b14b7a4b9343f8c627a7a53c52076482bd4bdad0a24fd3ec533ed616cc2c" [[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] name = "approx" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -240,7 +234,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -262,7 +256,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -488,7 +482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "regex-automata", + "regex-automata 0.3.8", "serde", ] @@ -611,9 +605,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[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", @@ -662,23 +656,23 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.3" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", - "clap_derive 4.4.2", + "clap_derive 4.4.7", ] [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.1", + "clap_lex 0.6.0", "strsim", ] @@ -697,14 +691,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -718,9 +712,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cli-table" @@ -746,6 +740,33 @@ dependencies = [ ] [[package]] +name = "color-eyre" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + +[[package]] name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -885,7 +906,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -896,7 +917,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -1099,6 +1120,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "eyre" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] name = "fastrand" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1264,7 +1295,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -1664,6 +1695,12 @@ dependencies = [ ] [[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] name = "indexmap" version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1739,6 +1776,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1769,7 +1815,7 @@ dependencies = [ "petgraph", "pico-args", "regex", - "regex-syntax", + "regex-syntax 0.7.5", "string_cache", "term", "tiny-keccak", @@ -1805,9 +1851,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.148" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libm" @@ -1894,9 +1940,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi", @@ -2058,12 +2104,12 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "ordered-multimap" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" dependencies = [ "dlv-list", - "hashbrown 0.13.2", + "hashbrown 0.14.0", ] [[package]] @@ -2079,6 +2125,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] name = "parking" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2213,7 +2265,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -2343,9 +2395,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2487,19 +2539,19 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -2507,10 +2559,16 @@ name = "regex-automata" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] @@ -2520,6 +2578,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] name = "rend" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2604,7 +2668,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -2720,9 +2784,9 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" dependencies = [ "cfg-if", "ordered-multimap", @@ -2915,29 +2979,29 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "indexmap 2.0.0", "itoa", @@ -2983,7 +3047,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -3008,7 +3072,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -3045,6 +3109,15 @@ dependencies = [ ] [[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] name = "signature" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3120,9 +3193,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys", @@ -3155,9 +3228,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0272b7bb0a225320170c99901b4b5fb3a4384e255a7f2cc228f61e2ba3893e75" +checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7" dependencies = [ "log", ] @@ -3320,21 +3393,21 @@ dependencies = [ [[package]] name = "surrealdb-migrations" -version = "1.0.0-preview.1" +version = "1.0.0" dependencies = [ - "anyhow", "assert_cmd", "assert_fs", "chrono", "chrono-human-duration", - "clap 4.4.3", + "clap 4.4.8", "cli-table", + "color-eyre", "convert_case", "diffy", "dir-diff", "fs_extra", "include_dir", - "itertools 0.11.0", + "itertools 0.12.0", "names", "predicates", "pretty_assertions", @@ -3362,9 +3435,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -3439,7 +3512,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -3506,9 +3579,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes", @@ -3516,20 +3589,20 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -3643,7 +3716,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -3653,6 +3726,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "sharded-slab", + "thread_local", + "tracing-core", ] [[package]] @@ -3821,6 +3916,12 @@ dependencies = [ ] [[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" @@ -3887,7 +3988,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -3921,7 +4022,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index 40d7614033281..0e1497e3369ef 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -10,7 +10,7 @@ let pname = "surrealdb-migrations"; - version = "1.0.0-preview.1"; + version = "1.0.0"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-G3pgUOAkLTcqUP8SLk2Tt38kuHD/2fDY5NLh0BTdNyk="; + hash = "sha256-87lGjGj3qyPe/YDysgR7eiGwwPvErWH2sgg8/jiqq4g="; }; cargoLock = { diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/development/tools/database/trino-cli/default.nix index db4310b543d2a..c42ab0208b320 100644 --- a/pkgs/development/tools/database/trino-cli/default.nix +++ b/pkgs/development/tools/database/trino-cli/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "trino-cli"; - version = "422"; + version = "435"; jarfilename = "${pname}-${version}-executable.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-isOcZDbm4Ykkolmcn4lRMkknZkTYRvMOXVZlGKRnXU8="; + sha256 = "sha256-X+G75KtlQus9mYcGtAMm7MDo7reN2ZTlVvhGhzEu5W4="; }; dontUnpack = true; diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix deleted file mode 100644 index c5074cd037768..0000000000000 --- a/pkgs/development/tools/deadcode/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ buildGoPackage -, lib -, fetchFromGitHub -}: - -# TODO(yl): should we package https://github.com/remyoudompheng/go-misc instead of -# the standalone extract of deadcode from it? -buildGoPackage rec { - pname = "deadcode-unstable"; - version = "2016-07-24"; - rev = "210d2dc333e90c7e3eedf4f2242507a8e83ed4ab"; - - goPackagePath = "github.com/tsenart/deadcode"; - excludedPackages = "cmd/fillswitch/test-fixtures"; - - src = fetchFromGitHub { - inherit rev; - - owner = "tsenart"; - repo = "deadcode"; - sha256 = "05kif593f4wygnrq2fdjhn7kkcpdmgjnykcila85d0gqlb1f36g0"; - }; - - meta = with lib; { - description = "Very simple utility which detects unused declarations in a Go package"; - homepage = "https://github.com/remyoudompheng/go-misc/tree/master/deadcode"; - license = licenses.bsd3; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix deleted file mode 100644 index 2c7345d7cc56c..0000000000000 --- a/pkgs/development/tools/dep/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "dep"; - version = "0.5.4"; - rev = "v${version}"; - - goPackagePath = "github.com/golang/dep"; - subPackages = [ "cmd/dep" ]; - - src = fetchFromGitHub { - inherit rev; - owner = "golang"; - repo = "dep"; - sha256 = "02akzbjar1v01rdal746vk6mklff29yk2mqfyjk1zrs0mlg38ygd"; - }; - - ldflags = [ "-s" "-w" "-X main.commitHash=${rev}" "-X main.version=${version}" ]; - - meta = with lib; { - homepage = "https://github.com/golang/dep"; - description = "Go dependency management tool"; - license = licenses.bsd3; - maintainers = with maintainers; [ carlsverre rvolosatovs ]; - }; -} diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index f6dadecaefa4a..8bfef1ff6303c 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.8.2"; + version = "0.8.5"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-Hh4SfmdR7hujc6Ty+ay8uyl1vkjYuxwa5J5RacqHOAE="; + hash = "sha256-Vgke4CTVU5KW7iDyzk6P1ab5nOyICblvJtUQTISc2jg="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-SVChgkPgqhApWDNA1me41zS0hXd1G2oFrL/SsnFiIsg="; + vendorHash = "sha256-rP3vktCfmUeZhc0DaU2osVryNabsnaWWyfFYFy7W1pc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 6ddb483e03c0c..e4991f04e8eac 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -63,7 +63,8 @@ rec { ''; passthru.tests.version = testers.testVersion { - package = pname; + package = devpod; + command = "devpod version"; version = "v${version}"; }; }; diff --git a/pkgs/development/tools/djlint/default.nix b/pkgs/development/tools/djlint/default.nix index ba3e5606d0950..27d66f6dd42cb 100644 --- a/pkgs/development/tools/djlint/default.nix +++ b/pkgs/development/tools/djlint/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "djlint"; - version = "1.32.1"; - format = "pyproject"; + version = "1.34.1"; + pyproject = true; src = fetchFromGitHub { owner = "Riverside-Healthcare"; repo = "djlint"; rev = "v${version}"; - hash = "sha256-///ZEkVohioloBJn6kxpEK5wmCzMp9ZYeAH1mONOA0E="; + hash = "sha256-p9RIzX9zoZxBrhiNaIeCX9OgfQm/lXNwYsh6IcsnIVk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index d735637cb53d3..3b1a1fa0aa1fb 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "doxygen"; - version = "1.9.7"; + version = "1.9.8"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-ezeMQk+Vyi9qNsYwbaRRruaIYGY8stFf71W7GonXqco="; + sha256 = "sha256-uQ1Fl2kmY7qmzy34NOmZCgPxVGwmqRqDvV6yEab5P4w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 4d64760d39ff3..5b525f3067f21 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "dtools"; - version = "2.105.2"; + version = "2.106.0"; src = fetchFromGitHub { owner = "dlang"; diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index 7cfb93d9b719f..a5dab42219f81 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -30,6 +30,11 @@ rustPlatform.buildRustPackage { cargoSha256 = "sha256-5WiGckh/jq7AHH3JWZL8tIsj1Gqr8iLX7IyppKsW96k="; + # Workaround for https://github.com/nixos/nixpkgs/issues/166205 + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 2248484d217d0..fee62a7fd981b 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.22"; + version = "0.7.23"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-4KZLr5qryaKGJwwtwkiUfoqh01O5ObtHo0Myh8gokYY="; + hash = "sha256-YXfW+O7u97x8YoWLNFSU/OIB9DGsqWEIwUpfvnXySMg="; }; - vendorHash = "sha256-tDA0ciO3Y1o7hfWvBTqf612gWUGLQ0XcNQndGTDo1pY="; + vendorHash = "sha256-Tr9clCUS7T0295Oxe6wvQN0oXCg1G48rzGXBL3R9TYU="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/eask/default.nix b/pkgs/development/tools/eask/default.nix index 799a507fee353..fdd18db0210ee 100644 --- a/pkgs/development/tools/eask/default.nix +++ b/pkgs/development/tools/eask/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "eask"; - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-NoYWRIkJEOUsHsjBYTtCNrCmAGG0pqaAHDOc9VcaRwk="; + hash = "sha256-uQHYVhoa0wkpqV3ScQKT1XnMhJQYs/KiFUMkUG2/ll0="; }; - npmDepsHash = "sha256-ctIVBrx9fagSX3f2/wn5wWkReOYK0nldFoxTJWVsx0g="; + npmDepsHash = "sha256-IfuBxU4CNpMUdbGwqykoG7H9LMzrfNbmTN/8VU83ArM="; dontBuild = true; diff --git a/pkgs/development/tools/electron/binary/default.nix b/pkgs/development/tools/electron/binary/default.nix index eb4c354ba54a0..0cdb42a3a0b80 100644 --- a/pkgs/development/tools/electron/binary/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -175,4 +175,13 @@ rec { aarch64-darwin = "2fc319c53f6dc61e2e424d46712caead7022b5124c9674f3b15b45c556dd0623"; headers = "1pb8xhaarkmgss00ap4jbf693i03z4mwh5ilpkz6dsg1b9fka84q"; }; + + electron_28-bin = mkElectron "28.0.0" { + armv7l-linux = "e41686b6ce7be7efb74d1f3fb4c912be31506b51770ceffa4e66b94164dac5b8"; + aarch64-linux = "32f9f7592359cf8b341946b41d758466533bd7a2bc0dc316072a3a1af4b92d84"; + x86_64-linux = "d66b6774b886bd57519d49b9eb8e6e745b523519414a8819f67aa19f76e2b53c"; + x86_64-darwin = "a5fdc70519b2c17a708920af2b998fc067ff0a18ba9f97d690cfab6bac23bd7a"; + aarch64-darwin = "d64947fee370a3b111f170399969977959848f2a2f544a1ae5dc081fc2df75cf"; + headers = "1lrwc03ffrf4bi2faampkx7yg0iqsrcp86znp9fw6ajwdwgqsc81"; + }; } diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 6e1493528e2b5..8f726b4100004 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -35,12 +35,13 @@ let description = "Cross platform desktop application shell"; homepage = "https://github.com/electron/electron"; license = licenses.mit; - maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; + mainProgram = "electron"; + maintainers = with maintainers; [ travisbhartwell manveru ]; platforms = [ "x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" ] ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - knownVulnerabilities = optional (versionOlder version "25.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "26.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 19725cc8f148a..749aafc449241 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -42,12 +42,16 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { src = null; - patches = base.patches ++ lib.optional (lib.versionOlder info.version "28") + patches = base.patches ++ lib.optional (lib.versionOlder info.version "27") (substituteAll { name = "version.patch"; - src = if lib.versionAtLeast info.version "27" then ./version.patch else ./version-old.patch; + src = ./version.patch; inherit (info) version; }) + + # we remove the web_tests directory in the chromium src FOD to reduce the output size, but this backported patch includes patches on web_tests + ++ lib.optional (lib.versions.major info.version == "26") + ./electron-26-remove-web_tests-patch.patch ; unpackPhase = '' @@ -165,15 +169,17 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { 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; - } // lib.optionalAttrs (lib.versionAtLeast info.version "28") { + } // lib.optionalAttrs (lib.versionAtLeast info.version "27") { override_electron_version = info.version; }; installPhase = '' + runHook preInstall + mkdir -p $libExecPath unzip -d $libExecPath out/Release/dist.zip + + runHook postInstall ''; requiredSystemFeatures = [ "big-parallel" ]; @@ -181,14 +187,18 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { passthru = { inherit info; headers = stdenv.mkDerivation rec { - name = "node-v${info.node}-headers.tar.xz"; + name = "node-v${info.node}-headers.tar.gz"; nativeBuildInputs = [ python3 ]; src = fetchdep info.deps."src/third_party/electron_node"; buildPhase = '' + runHook preBuild make tar-headers + runHook postBuild ''; installPhase = '' + runHook preInstall mv ${name} $out + runHook postInstall ''; }; }; diff --git a/pkgs/development/tools/electron/electron-26-remove-web_tests-patch.patch b/pkgs/development/tools/electron/electron-26-remove-web_tests-patch.patch new file mode 100644 index 0000000000000..f3dfce6f41448 --- /dev/null +++ b/pkgs/development/tools/electron/electron-26-remove-web_tests-patch.patch @@ -0,0 +1,73 @@ +diff --git a/electron/patches/chromium/cherry-pick-80106e31c7ea.patch b/electron/patches/chromium/cherry-pick-80106e31c7ea.patch +index 3f8ae7d1b2..af8859a1a5 100644 +--- a/electron/patches/chromium/cherry-pick-80106e31c7ea.patch ++++ b/electron/patches/chromium/cherry-pick-80106e31c7ea.patch +@@ -361,68 +361,3 @@ index 3d562fa22bd84dc438abfe9fa883eff6f5846b1b..c64c7fb1b15f7f523b37671abca2ab50 + auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>( + script_state, exception_state.GetContext()); + ScriptPromise promise = resolver->Promise(); +-diff --git a/third_party/blink/web_tests/external/wpt/webusb/usbDevice.https.any.js b/third_party/blink/web_tests/external/wpt/webusb/usbDevice.https.any.js +-index b1b0c133ce160a314ea392514ac5b38e4cac136d..804af2afb9db3a0d5fafbeb26aed64f89badb1b3 100644 +---- a/third_party/blink/web_tests/external/wpt/webusb/usbDevice.https.any.js +-+++ b/third_party/blink/web_tests/external/wpt/webusb/usbDevice.https.any.js +-@@ -1247,3 +1247,60 @@ usb_test((t) => { +- .then(() => promise_rejects_dom(t, 'NotFoundError', device.reset())); +- }); +- }, 'resetDevice rejects when called on a disconnected device'); +-+ +-+usb_test(async (t) => { +-+ const PACKET_COUNT = 4; +-+ const PACKET_LENGTH = 8; +-+ const {device, fakeDevice} = await getFakeDevice(); +-+ await device.open(); +-+ await device.selectConfiguration(2); +-+ await device.claimInterface(0); +-+ await device.selectAlternateInterface(0, 1); +-+ const buffer = new Uint8Array(PACKET_COUNT * PACKET_LENGTH); +-+ const packetLengths = new Array(PACKET_COUNT).fill(PACKET_LENGTH); +-+ packetLengths[0] = PACKET_LENGTH - 1; +-+ await promise_rejects_dom( +-+ t, 'DataError', device.isochronousTransferOut(1, buffer, packetLengths)); +-+}, 'isochronousTransferOut rejects when buffer size exceeds packet lengths'); +-+ +-+usb_test(async (t) => { +-+ const PACKET_COUNT = 4; +-+ const PACKET_LENGTH = 8; +-+ const {device, fakeDevice} = await getFakeDevice(); +-+ await device.open(); +-+ await device.selectConfiguration(2); +-+ await device.claimInterface(0); +-+ await device.selectAlternateInterface(0, 1); +-+ const buffer = new Uint8Array(PACKET_COUNT * PACKET_LENGTH); +-+ const packetLengths = new Array(PACKET_COUNT).fill(PACKET_LENGTH); +-+ packetLengths[0] = PACKET_LENGTH + 1; +-+ await promise_rejects_dom( +-+ t, 'DataError', device.isochronousTransferOut(1, buffer, packetLengths)); +-+}, 'isochronousTransferOut rejects when packet lengths exceed buffer size'); +-+ +-+usb_test(async (t) => { +-+ const PACKET_COUNT = 2; +-+ const PACKET_LENGTH = 8; +-+ const {device, fakeDevice} = await getFakeDevice(); +-+ await device.open(); +-+ await device.selectConfiguration(2); +-+ await device.claimInterface(0); +-+ await device.selectAlternateInterface(0, 1); +-+ const packetLengths = [0xffffffff, 1]; +-+ await promise_rejects_dom( +-+ t, 'DataError', device.isochronousTransferIn(1, packetLengths)); +-+}, 'isochronousTransferIn rejects when packet lengths exceed maximum size'); +-+ +-+usb_test(async (t) => { +-+ const PACKET_COUNT = 2; +-+ const PACKET_LENGTH = 8; +-+ const {device, fakeDevice} = await getFakeDevice(); +-+ await device.open(); +-+ await device.selectConfiguration(2); +-+ await device.claimInterface(0); +-+ await device.selectAlternateInterface(0, 1); +-+ const buffer = new Uint8Array(PACKET_LENGTH * PACKET_COUNT); +-+ const packetLengths = [0xffffffff, 1]; +-+ await promise_rejects_dom( +-+ t, 'DataError', device.isochronousTransferOut(1, buffer, packetLengths)); +-+}, 'isochronousTransferOut rejects when packet lengths exceed maximum size'); diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index a3b470f78d7b7..b23af850c471c 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -3,16 +3,16 @@ "deps": { "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-TOsL+5sF65sOCSLx0yamXWC5olYbDUO/Np9HK5sT5DI=", + "hash": "sha256-ms8zX3Ov/du5J6M0qzmQFlbGaR9S9tQHMwQs+AutF0w=", "owner": "electron", "repo": "electron", - "rev": "v28.0.0-alpha.3" + "rev": "v28.1.0" }, "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5lIe6mjAee6DUOPDvPM43QJ7VKRQ960w7UqxbXPRPIA=", + "hash": "sha256-Nt5OpfWc2PoZMQVIaiKfv5uqGSua81zZmV3zOE2Y1Ek=", "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "119.0.6045.21", + "rev": "120.0.6099.109", "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": { @@ -23,21 +23,21 @@ }, "src/third_party/libc++/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6kuGJCCRgOwrV85e2i+UTyzt40u2pTET6cs0/MtI9Hk=", + "hash": "sha256-DVO15xGxatRbUp13EoNslGEZ2QSHn97VbEBHyfMvKfQ=", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "7cf98622abaf832e2d4784889ebc69d5b6fde4d8" + "rev": "a429c26ae25c26a569ff12390d5f9be70c5e286b" }, "src/third_party/libc++abi/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-iFIXi4kq/LhNhFPJG4UJfO08MCxvthpiZ0WT9jg0lHE=", + "hash": "sha256-QjCPRgFU34wZ8GG/dl+6wi2gflje3fG/x+eokb9W02c=", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "e8e4eb8f1c413ea4365256b2b83a6093c95d2d86" + "rev": "2ca9f38714b1465b9f55b5fbd0da5e4342811e2b" }, "src/third_party/libunwind/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ytY/QvFzbqkGbsB+um1Rxo+O5DEOFUxUzRIuKMrC8YE=", + "hash": "sha256-bQHo8CKDpqvJcVv6OzVO7LOGTqL9qHqD4n9TtRK0v5g=", "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "43e5a34c5b7066a7ee15c74f09dc37b4b9b5630e" + "rev": "7686b5d38c69d14932abfb1c1a66ba56c78791ad" }, "src/chrome/test/data/perf/canvas_bench": { "fetcher": "fetchFromGitiles", @@ -59,9 +59,9 @@ }, "src/docs/website": { "fetcher": "fetchFromGitiles", - "hash": "sha256-aYgan6NIIIWDzCplczvU57TZQ6GAluejBoWjfx5FPs4=", + "hash": "sha256-+UawYfW5FAMpv0TbzSR8qITPGUQulLIZ0mUh6ZdnmMI=", "url": "https://chromium.googlesource.com/website.git", - "rev": "98972e05cf600ceefe641ac5d83b661e2792fcb4" + "rev": "07714da3c28b942dc8522affed4487403e971545" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -71,15 +71,15 @@ }, "src/net/third_party/quiche/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-dziuBpghbxrXXH6on6WxYvfHInSaUWyNrWbYwAJeMuA=", + "hash": "sha256-JXWGEsJrXRXs2BrkWIC8cUBD6uvt8ftb9V5Dy2yLc/w=", "url": "https://quiche.googlesource.com/quiche.git", - "rev": "0c75f987990bfb2fe27eeaa8f3cc78f98f3ef42d" + "rev": "a01a131ca6df63e774809d623f47e8cf28c574cc" }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", - "hash": "sha256-2JvDcfRiwFDjiGWlzwsTq6HP/I6lq+NaI6S57ZrCLGY=", + "hash": "sha256-/SnBY/jmj7MSbzBnuq6VVccRNaLsjo6hWhnKiIdAq+w=", "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "5cff2421ef225d14d3a4253b81073389fc840024" + "rev": "4ae5f681dfe60bed7b083296ac97827b751f9226" }, "src/third_party/angle/third_party/glmark2/src": { "fetcher": "fetchFromGitiles", @@ -95,15 +95,15 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-yXo4h4SgMdmHxtT5IeFDzBa5hq/7RZtMRrktaLJkvfs=", + "hash": "sha256-+g1yjF1yETrL1X6Cxu5mhPWXukWygg1dnawU8S9cGkA=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "a55b0930e9db612b25cc67701569931200bc2ee0" + "rev": "7d738783bf286e82937e431c295d4682f3767267" }, "src/third_party/anonymous_tokens/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-/AuMmFWKOaYCsd9cHbZBYUqJUHXJ0xxOuIWe/+lEZ1c=", + "hash": "sha256-2B0j9vNF8nMhmedk+ghz4JJJiDKN6jnVfdqsa4zRWeU=", "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "79562f0175dba82f671046b5bdea0853323445b7" + "rev": "47d423347823088a21b26262ca553eadb8e5b220" }, "src/third_party/content_analysis_sdk/src": { "fetcher": "fetchFromGitiles", @@ -113,15 +113,15 @@ }, "src/third_party/dav1d/libdav1d": { "fetcher": "fetchFromGitiles", - "hash": "sha256-KSo2s3M3S13gY84NlAdnPsjoKfJZy7ipTlWSvUHD9Ak=", + "hash": "sha256-9SrbxiOqXKTFf4qZ4Wqg9aoOMY8zv7NczTqN2+lXwCI=", "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "f8ae94eca0f53502a2cddd29a263c1edea4822a0" + "rev": "47107e384bd1dc25674acf04d000a8cdc6195234" }, "src/third_party/dawn": { "fetcher": "fetchFromGitiles", - "hash": "sha256-PE1LHtfdL9grVxBKaSVoc/kc6eHLaP7LKJFWxx+BByE=", + "hash": "sha256-onIVQBs8fIAhIEnjbwW8nrwAF5KJ2JjEMSK9b0HAheM=", "url": "https://dawn.googlesource.com/dawn.git", - "rev": "e1f1c0135a5eca328a320d4f14d21b24576eea9b" + "rev": "acee31423468efdb650be9dc9172b30cc2015a4e" }, "src/third_party/dawn/third_party/glfw": { "fetcher": "fetchFromGitiles", @@ -131,9 +131,9 @@ }, "src/third_party/dawn/third_party/dxc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uCSypev3Jvy6vfzF0AG3w9DIewV7u4w7TNtw1WVVrXM=", + "hash": "sha256-EAfTm0QZcihcU6ufBHE1QsYRggNWNKHjVZXcrUp/T+c=", "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "6b4b0eb5f2ca9b9039a7dbf7b324a9478fbd6f03" + "rev": "64030a4e01e27c608b6c5f1ab5add43575e086f9" }, "src/third_party/dawn/third_party/dxheaders": { "fetcher": "fetchFromGitiles", @@ -155,9 +155,9 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+pKnhSC7qQf8P5YL7ei1IPJ0ur89IJAiItnXhw6HKLo=", + "hash": "sha256-DqQIyZU6kYYRoouIiJnJBit8l38wPu08zbJhM2BQbs4=", "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "be1210e145e89e7a2943947d983f9592495e0f52" + "rev": "2ef3f322027bec1bb5572f5083d478148d355d79" }, "src/third_party/highway/src": { "fetcher": "fetchFromGitiles", @@ -173,9 +173,9 @@ }, "src/third_party/boringssl/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FBQ7y4N2rCM/Cyd6LBnDUXpSa2O3osUXukECTBjZL6s=", + "hash": "sha256-hxPNJzWS2f4iUsNYwRvxiTL9vRrcZzZT5KpIx3+WuGM=", "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "d24a38200fef19150eef00cad35b138936c08767" + "rev": "c38dc29860a72540eb2c4fdb8a8bfb27ef94ddf3" }, "src/third_party/breakpad/breakpad": { "fetcher": "fetchFromGitiles", @@ -191,9 +191,9 @@ }, "src/third_party/catapult": { "fetcher": "fetchFromGitiles", - "hash": "sha256-j5NFdjcsv3CaAOrUmNkuxodQyudxqWCNPTd6ovW83sg=", + "hash": "sha256-jueHC5YC+WmGRtGZ8yD6QT2pVj21n1THpIz/vI9M334=", "url": "https://chromium.googlesource.com/catapult.git", - "rev": "4f81c1e295978227d83f1b42ceff40b4f9b5b08c" + "rev": "47efdb4b1428e549c58a6d6c2fa79c4a8ceaf9b4" }, "src/third_party/ced/src": { "fetcher": "fetchFromGitiles", @@ -203,9 +203,9 @@ }, "src/third_party/chromium-variations": { "fetcher": "fetchFromGitiles", - "hash": "sha256-mWnpJb5yV30slOvqc543uqxN1t6TEGP2H3MKl7x6mbw=", + "hash": "sha256-cRFzDmGoyrxwPDVvatGm3EutOXtWqqlI7v7BeX5d43s=", "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "990efdd6cf54f2124621d065e2de629856c395e4" + "rev": "cb7fe7e32de8b885ccdd6293444d8e4028b03eca" }, "src/third_party/cld_3/src": { "fetcher": "fetchFromGitiles", @@ -227,9 +227,9 @@ }, "src/third_party/cpuinfo/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-nOSaLZGqmt+8W5Ut9QHDKznh1cekl1jL2ghCM4mgbgc=", + "hash": "sha256-BcSG/1aa/cyT8CCd1Qdsm/yXa5bCrmrtaRxnYjwkspY=", "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "959002f82d7962a473d8bf301845f2af720e0aa4" + "rev": "76d5e8f5b563daa65340a60fce0e9aec73a936df" }, "src/third_party/crc32c/src": { "fetcher": "fetchFromGitiles", @@ -239,9 +239,9 @@ }, "src/third_party/cros_system_api": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uTeouExil2es07n1a4oVa/r6CUraZ0+iu8Q+A1n4kgA=", + "hash": "sha256-wI4rx+oQ6i8yIB8NBp/O471O4pVJL3l+ez0t8I5oD/w=", "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "b7b78587c03de1cd478f31f734498430773adeb3" + "rev": "00c21541508ea2c6863f1cda24ef88ef30309ae8" }, "src/third_party/crossbench": { "fetcher": "fetchFromGitiles", @@ -251,15 +251,15 @@ }, "src/third_party/depot_tools": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Zx8VtOMxysriVmcPb9YkdS84WXV6NsSkfnCSV8OBwbc=", + "hash": "sha256-WtosDcMOV9eh0PhTbB5w3x3AYQs3Ui4h3mV0Ib0CBlc=", "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "90a30a5b5357636fa05bb315c393275be7ca705c" + "rev": "9f3b33a275e7a5b19d8ce4aba7960d2a38858681" }, "src/third_party/devtools-frontend/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-OUmCxucDd8jXbEqqNyt9j0j+9zp2G9s3aaFliFkg45A=", + "hash": "sha256-B/2Qk5LSElBPNImlZHVF3A4g0GFE9OHG/+4QADpK+8w=", "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "fa727c5e31709a4447a79a2270157b7ba86414c4" + "rev": "a6c7f00333881a7ecf7044b725052ab0c8776d6f" }, "src/third_party/dom_distiller_js/dist": { "fetcher": "fetchFromGitiles", @@ -269,9 +269,9 @@ }, "src/third_party/eigen3/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-a7TnzR57VmIBUqAEKmxncgV/22g3z7b1lEHsYnNZjKo=", + "hash": "sha256-mfS/l+V0If3fmXvA1p5gtyrNCU6IqWYrBbzm4jkXC3I=", "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "18018ed013029ca3f28f52a62360999b5a659eac" + "rev": "aa6964bf3a34fd607837dd8123bc42465185c4f8" }, "src/third_party/farmhash/src": { "fetcher": "fetchFromGitiles", @@ -281,9 +281,9 @@ }, "src/third_party/ffmpeg": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uRgHTVaCAEaoqY20SmePQbApPmjimgggm5922KKfnbc=", + "hash": "sha256-lomUDmbbYW95BHEuYmm0pVqf++nYEa2XxeW4ag36tgc=", "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "0ba37733400593b162e5ae9ff26b384cff49c250" + "rev": "e1ca3f06adec15150a171bc38f550058b4bbb23b" }, "src/third_party/flac": { "fetcher": "fetchFromGitiles", @@ -293,9 +293,9 @@ }, "src/third_party/flatbuffers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-yu+bMwlTqT5I+BbJhemGMvs/Yw9TusNnFsHgERXYb2M=", + "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=", "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git", - "rev": "0343396e49d1c0bf4ca1058130efd9585ecb3c8f" + "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5" }, "src/third_party/fontconfig/src": { "fetcher": "fetchFromGitiles", @@ -323,9 +323,9 @@ }, "src/third_party/freetype/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+n7BwWerzg8bMIgZYBOtCibfNkECijNVJKNk7qOQVhU=", + "hash": "sha256-wyaCNPPL2CTZYY6YUUuGnN3TjHxgKeHAYsw+r88ijMI=", "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "7b308a29dd105074eea9c8d5953a182d325f74f1" + "rev": "55d0287cfc31115760cb13caa346b407ef0c0ceb" }, "src/third_party/freetype-testing/src": { "fetcher": "fetchFromGitiles", @@ -341,9 +341,9 @@ }, "src/third_party/harfbuzz-ng/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+fClyD9Rsge9qdGF8WCv8taLTWNL8iManpXZUzDL2LM=", + "hash": "sha256-xCsfgbsWVSiuII5zFspssrqX4NrRuhzufYSq6fdnjKQ=", "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "db700b5670d9475cc8ed4880cc9447b232c5e432" + "rev": "f26fd69d858642d76413b8f4068eaf9b57c40a5f" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -377,9 +377,9 @@ }, "src/third_party/icu": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6do7X9xUCMe2mFQoffazdC5W9UJdHp424QEThqX6P48=", + "hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=", "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "985b9a6f70e13f3db741fed121e4dcc3046ad494" + "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed" }, "src/third_party/jsoncpp/source": { "fetcher": "fetchFromGitiles", @@ -401,9 +401,9 @@ }, "src/third_party/fuzztest/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-53SzbbDlzLl1MTeHxBhLpVGMKICd3ka6qfGcru9AVog=", + "hash": "sha256-wuB/lbkVCbisZvVFuLdE8XNDuiLQcI47/Y0EqvOCytc=", "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "ce460dd7cae252b8505ce0009121bcac17939e3a" + "rev": "b5dbc33890d9586e4f6a213f1bf163ad287e6aa4" }, "src/third_party/libaddressinput/src": { "fetcher": "fetchFromGitiles", @@ -413,15 +413,15 @@ }, "src/third_party/libaom/source/libaom": { "fetcher": "fetchFromGitiles", - "hash": "sha256-76duDNvaq8o7RdswZglifr+gml86fSTdXAEx0nOTybI=", + "hash": "sha256-6oZWYXRTZ1IC5yGvfPI19PwPU9O7mKBsW2wVxBGwU/I=", "url": "https://aomedia.googlesource.com/aom.git", - "rev": "0d59418942412c4176805198f2ab7ff446637c3b" + "rev": "1dbe1c7fae2456f91ccc79fecb919e9ffea0727a" }, "src/third_party/libavif/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-ZAsOy32MHx3YPvEnbBGGT4+iYhFyFPik0+9cLRoVDP4=", + "hash": "sha256-Jd/KwJJ1oeQMLg8CShTTDQhCVHEDpXcQHiA4+NXYOIA=", "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "0d4747af5b3f7b150c3838e6148c49a0bf0e0064" + "rev": "1a78d970b8315e7cc6a8601861ec75189c50c214" }, "src/third_party/libavifinfo/src": { "fetcher": "fetchFromGitiles", @@ -431,9 +431,9 @@ }, "src/third_party/nearby/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-0tTpC11sFIPq+FPlkGFrDNaAK93isQV/Fd2x1lHmtQ8=", + "hash": "sha256-9PT/tuxjREGsvSnYT2wyaL5sB52CcYPpKVKN0ZGldWU=", "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "d477a2d174fc0e31f6dd06264ff3f47ff8da5378" + "rev": "629e7ba7c964a62c97f6a882bffaec3c8490bb1e" }, "src/third_party/beto-core/src": { "fetcher": "fetchFromGitiles", @@ -461,9 +461,9 @@ }, "src/third_party/cros-components/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-grvqHNesTNc3pUkM5YH4P+LaeSWXEKBM8Kw/eRMaB4E=", + "hash": "sha256-ZjLMlNDDN08v9SUFAuroPsu/6ADLHZAAFpv+bmaJA2Y=", "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "10d2e376519e88221117e38cd901054b0153501c" + "rev": "25159cae8d540780cbeb994692ce4a3ea14cc094" }, "src/third_party/libdrm/src": { "fetcher": "fetchFromGitiles", @@ -485,9 +485,9 @@ }, "src/third_party/libjpeg_turbo": { "fetcher": "fetchFromGitiles", - "hash": "sha256-bcmp8RqQYp4lRI9NfdfYgrAJsDLecJEhgRu9oosB9lQ=", + "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "30bdb85e302ecfc52593636b2f44af438e05e784" + "rev": "9b894306ec3b28cea46e84c32b56773a98c483da" }, "src/third_party/liblouis/src": { "fetcher": "fetchFromGitiles", @@ -521,9 +521,9 @@ }, "src/third_party/libvpx/source/libvpx": { "fetcher": "fetchFromGitiles", - "hash": "sha256-5x0Sk8/DXaTCIydK79vWZgIx3IHeQbLUxoNyE7E+Sdo=", + "hash": "sha256-UA/pf35eWFArRM+QdN6i6LK0ePWzXEsviHlf3WUgMoM=", "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "38a707faef72eeff89d669c553e7bfe9e08dba8f" + "rev": "424723dc025ce451dab9568239a46b18d0919b4d" }, "src/third_party/libwebm/source": { "fetcher": "fetchFromGitiles", @@ -533,9 +533,9 @@ }, "src/third_party/libwebp/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-79peh0y3eeiW5cVQqVq0mUgDcGZ9BlY+OXkPZylKARY=", + "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=", "url": "https://chromium.googlesource.com/webm/libwebp.git", - "rev": "2af26267cdfcb63a88e5c74a85927a12d6ca1d76" + "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760" }, "src/third_party/libyuv": { "fetcher": "fetchFromGitiles", @@ -581,9 +581,9 @@ }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-rxNhfd/ujWtLWDjEbx/ZIo9tdILB1gD5q4cwxQ6DPnw=", + "hash": "sha256-TyZ/sZ0gnesWjKUnO2RVM2TTdpVIxsBWueHDgix0/wg=", "url": "https://chromium.googlesource.com/openscreen", - "rev": "934f2462ad01c407a596641dbc611df49e2017b4" + "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665" }, "src/third_party/openscreen/src/third_party/tinycbor/src": { "fetcher": "fetchFromGitiles", @@ -593,15 +593,15 @@ }, "src/third_party/pdfium": { "fetcher": "fetchFromGitiles", - "hash": "sha256-iVOmMH0h0mbHy9m0vy86SzS5Oeyhgd4CC26LgPws9P4=", + "hash": "sha256-U1cScrfKN0F+cy307RT2iwB6RYKeCNDRnkYxzamezoY=", "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "2e2cfb0399db35fbe2e3ef0be62559fe01837ec5" + "rev": "a3895af47f600e3f9677f31fa39e15bd01c18457" }, "src/third_party/perfetto": { "fetcher": "fetchFromGitiles", - "hash": "sha256-qv1fTy/0xUauutP0PFaCwPvr1qptfeB3iqNjHXPDKyc=", + "hash": "sha256-xLx+dnUysm+HS1esu2hAqBKg/GgTJK4SQu1ZINr2aYc=", "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "a3d4c1de9bcf2a0471ab183c45cf111efd29571e" + "rev": "7ce535ddfc62d30166f35a8ed0f121da5eb0437c" }, "src/third_party/pthreadpool/src": { "fetcher": "fetchFromGitiles", @@ -629,9 +629,9 @@ }, "src/third_party/re2/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-zrVjt229SfVipS05zF5glhd7/D1zpojDyiSnYZpGok4=", + "hash": "sha256-m3bJlSyyhmj/7jvy7ExNX/gol7yeu1mnmyAc8u8Pr8s=", "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "26f7d889e1f7e75e95e65490086538edf9f5275c" + "rev": "3d9bdbd0e208d3274a1cb1275c94d8b7626ddde2" }, "src/third_party/ruy/src": { "fetcher": "fetchFromGitiles", @@ -641,9 +641,9 @@ }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-qHJujO+LYJ41zmoP2xSYRd9K8vLp4bCztYcMO8MI9Lo=", + "hash": "sha256-CvoJxsBN1Nyh+RPgU+aptZW5WsfGB4hmSlhyma1wO+E=", "url": "https://skia.googlesource.com/skia.git", - "rev": "ab212df482c8fd5b1c1fb302717876d542549624" + "rev": "349c1179c43ef46f2804404952b9460dc007d76a" }, "src/third_party/smhasher/src": { "fetcher": "fetchFromGitiles", @@ -659,15 +659,15 @@ }, "src/third_party/sqlite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-35rSG+ptFMC62FsprLvAqfXZknKu40Ee6H2qpAcA3wI=", + "hash": "sha256-A3GAYf2hVZqQtEQdbVqP0I0Wh29DPHPf+JhxNLnTQh8=", "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "b7e480172bb2411f9afedefdcc69a57a12f18b7b" + "rev": "ca75d938c18c99dc33b769fbdac8fc4c71befa33" }, "src/third_party/swiftshader": { "fetcher": "fetchFromGitiles", - "hash": "sha256-r7u2WjgPvoVY9Oj2RVqfI/G6PFh/2gWNDVQ5R2qhtLU=", + "hash": "sha256-Im4sdDo4b96YQIKDcAmqUk8PiJzejZgSDPur3hqPPRk=", "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "7f4d495c89c200c1945cce5995d348dd41dadb5a" + "rev": "d9ec9befba05a8dfca09c1e88f3f7be0e4b153c6" }, "src/third_party/text-fragments-polyfill/src": { "fetcher": "fetchFromGitiles", @@ -677,75 +677,75 @@ }, "src/third_party/tflite/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Mpofo5P6WrkA3hN+sjAhHG4GBQ71vEFnuxfdLRf5epw=", + "hash": "sha256-119/isDtopnj6MBRr3bzBvIppXw8M/ejcPx0CmIjXZU=", "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "edf7215123c67d76199d099779137b974b6e1293" + "rev": "21e56c30e480ac67bed48335a5d122c59a6a6805" }, "src/third_party/vulkan-deps": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uJFrlLEjFJJSR0+eCtx7bpIC0z8NaHuk/uLeaFBLKKw=", + "hash": "sha256-lqCUx70IeHZ7YfE9DXia7dFok/JsFu/HSIv2AGi37YI=", "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "7413048934e28b97ae00c37c419e576db8add866" + "rev": "2b783ed328d3a46e6a7a21218ced6b4dd1684114" }, "src/third_party/vulkan-deps/glslang/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-CBA9LlD+Ttki3nc693MSmud0feafxi2/PC2YSn3BX2A=", + "hash": "sha256-+Qs+Q3p11y9oUKyWEbuaQ0vx6hppFZSFbFuU0ve6rRo=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "b0ed4788858157e271779a7726cccc1149a05407" + "rev": "ebb0a8b28e5ea7a13146a24b3ad87b1966dbdfa3" }, "src/third_party/vulkan-deps/spirv-cross/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Wgpdjmes05dMeBr7mrv9UvpabdzJ9lTZ38eO/6Ps60E=", + "hash": "sha256-UIk5hihUPjXNzEeO2laS4dUef/rEExxXAZjMcftx+3A=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", - "rev": "37fee00a71b5a47247c1cf20256a3f794537c6c0" + "rev": "2de1265fca722929785d9acdec4ab728c47a0254" }, "src/third_party/vulkan-deps/spirv-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-yAzbZHLtx+XP34Umkp0CuP/vn7JrW4VPVgVOFi50KHM=", + "hash": "sha256-JLFVzFNdXqxyKmg3NymIqqZmf2GAb7tYetQ6HJPsUIQ=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "79743b899fde5c954897b2694291002626358fac" + "rev": "88bc5e321c2839707df8b1ab534e243e00744177" }, "src/third_party/vulkan-deps/spirv-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-/J1eb6ZYSoYZDE8AR/CeRc5GoQEyIlYiHC+JKvi5I5w=", + "hash": "sha256-+HUDsp0COKlPtKidOVvUk7lN1AiFw01i5ANc3MO+qjs=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "1bc0e6f59abc3c9cd75f93baef47e9612a448045" + "rev": "5084f58e5d187b16f84d2af936ff94ea2f46a00c" }, "src/third_party/vulkan-deps/vulkan-headers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-GAl5xC7PCGsVHHUhLkIuwj2zlTCgyNWaBjk6I0qDkhQ=", + "hash": "sha256-UlaNc1NxTYulrF4Ol0rLysbLwbFR46Evq7WkWncPB8k=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "7e691380166fb1cd9b193ac9db896bc23a4ea9ad" + "rev": "f4bfcd885214675a6a0d7d4df07f52b511e6ea16" }, "src/third_party/vulkan-deps/vulkan-loader/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6iJxI1SwOjN26dyVs6JSYWODZbA25G/M2ZabGLCGRIo=", + "hash": "sha256-GbVr8LmwC6r7a13++5cYJXAq+H4P07quEHpTUV1qfqA=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "9e33cfc66f88c863e9a13492b8045ca28118ebbf" + "rev": "7b7d15bc9f1d782e4d6ea34e61fd9a36a7952208" }, "src/third_party/vulkan-deps/vulkan-tools/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-r2VdG1o2JXbtN14nGjeZ+Ru4Cn1Za/eQd3NU2O6CnkA=", + "hash": "sha256-vnrhYM7tcDTcXH4A+2leio5Wc1+b5H+7CQISEI+SPV8=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "3a19c1973f0e4732b8f3746593aee2ac425ecb78" + "rev": "f7017f23337b90a2b2ceb65a4e1050e8ad89e065" }, "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-Zz8r7zHe3MaEzMIyVx6Walsd5QicQ3MxEAunmgWHZcI=", + "hash": "sha256-buxOdupK/w1sFGGHrEI+On2/mR0q5whvQNKUI8dxJ60=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "2169a0849e3df4e2133b728dec67d3b16bd30263" + "rev": "dcfce25b439a2785f2c90b184e1964898070b4f1" }, "src/third_party/vulkan-deps/vulkan-validation-layers/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-AUeSb7/sgTZGg/VEkdvGDnj88gqjE1t6qGY0oTAcYsY=", + "hash": "sha256-LJd7pkcFd8k4npEv8mJy+47xo/5CXMN75ZAtDp+v6FI=", "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "d82e3c2f34dcf3b849fd7ed6d932ff61dcd838c5" + "rev": "281e1c1c6b51bb6b33f88c18ed4da58ac3024311" }, "src/third_party/vulkan_memory_allocator": { "fetcher": "fetchFromGitiles", - "hash": "sha256-FdRPPdLZHj3RX3YzcmF58JJuIqeWQV3TDiiXPEW2lsc=", + "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", - "rev": "e87036508bb156f9986ea959323de1869e328f58" + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21" }, "src/third_party/wayland/src": { "fetcher": "fetchFromGitiles", @@ -785,15 +785,15 @@ }, "src/third_party/webgpu-cts/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-vkwuibUzHacAh5x/g05cGR+UohZmcATysnnFfldM2zA=", + "hash": "sha256-E39f0wy72TwQ9IM4QquqWxwDiHZOUI8hWkx2QDFcRog=", "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "609645eb5b272668cbfb120d1aa9549eee86e02d" + "rev": "3dbe4ce12983ccc1ad42e228057c7d8adc17cb78" }, "src/third_party/webrtc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-uRRtsEVMn85RfFgo1qzYnwA1eN6LvXRme+FUntvCuYA=", + "hash": "sha256-lhZ6m00IJ7YEhZ2/nyO70aByVk7RBHUpDsKDVOMoVA8=", "url": "https://webrtc.googlesource.com/src.git", - "rev": "71e3fbf5d750e84d181315a663eb5dbc29a5330c" + "rev": "b0cc68e61205fd11a7256a6e85307ec17ad95790" }, "src/third_party/wuffs/src": { "fetcher": "fetchFromGitiles", @@ -809,9 +809,9 @@ }, "src/third_party/xdg-utils": { "fetcher": "fetchFromGitiles", - "hash": "sha256-t3uV9JkkQQIwmezzSoEdTMLSizZdLQB7eLKTRQGH4kQ=", + "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git", - "rev": "d80274d5869b17b8c9067a1022e4416ee7ed5e0d" + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44" }, "src/third_party/xnnpack/src": { "fetcher": "fetchFromGitiles", @@ -833,9 +833,9 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-qP5gRxEEKV+I3Q6wk0H94OTnKVAieo9SJZGLB9Ti5qw=", + "hash": "sha256-IeZ9oCM+toyqqSf8Ip6FqjymbvUiqTmMM2ir+Edzmjc=", "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "f6ebdead2b58e457b923c8121a9267a5d80f59cf" + "rev": "999a2ca2d915d01ff1d889a57f1e26907d6ea842" }, "src/third_party/nan": { "fetcher": "fetchFromGitHub", @@ -846,10 +846,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-feGhB6o14/qgSQvhJ5eMD74KqWrlOoTpaGAlCs486IU=", + "hash": "sha256-yvMU6dXRzHP7l6axo3g4svJ1H2edtFvX2MVMm3K1bEc=", "owner": "nodejs", "repo": "node", - "rev": "v18.18.0" + "rev": "v18.18.2" }, "src/third_party/squirrel.mac": { "fetcher": "fetchFromGitHub", @@ -873,38 +873,38 @@ "rev": "78d3966b3c331292ea29ec38661b25df0a245948" } }, - "version": "28.0.0-alpha.3", + "version": "28.1.0", "modules": "119", - "chrome": "119.0.6045.21", - "node": "18.18.0", + "chrome": "120.0.6099.109", + "node": "18.18.2", "chromium": { - "version": "119.0.6045.21", + "version": "120.0.6099.109", "deps": { "gn": { - "version": "2023-09-12", + "version": "2023-10-23", "url": "https://gn.googlesource.com/gn", - "rev": "991530ce394efb58fcd848195469022fa17ae126", - "hash": "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4=" + "rev": "e4702d7409069c4f12d45ea7b7f0890717ca3f4b", + "hash": "sha256-dwluGOfq05swtBM5gg4a6gY3IpFHaKKkD0TV1XW7c7k=" } } }, - "electron_yarn_hash": "1akq5cxcy7fpn4m5qk5kx94vy30z0ybx6ka5qp8an0p33yx9wg8z", - "chromium_npm_hash": "sha256-10OGEsA0BDrkbTeIbdXLYRyKNwVsb/tP2ryBBuhi+m8=" + "electron_yarn_hash": "0n64fi2s97ly7kl0f8922sgavdm6qh24ms3qwf21663a1igdd4jn", + "chromium_npm_hash": "sha256-zexxXAAJDnhMmh7HfBO1V1z1Yds06C3gSpXacsbjUb4=" }, "27": { "deps": { "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-UIOHCvqMXuCCrduDo6tnxc6qJuHw2LX4Kgmiu/geiR8=", + "hash": "sha256-bafuK4n9UXZqG1NHBzM5eLQ0PPkQx7CBHQLmShmQHWQ=", "owner": "electron", "repo": "electron", - "rev": "v27.0.0" + "rev": "v27.2.0" }, "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-dT23fhZ9RDY2j7YChaK/hUePkHULTXoXyHNpldmh4Gw=", + "hash": "sha256-3yFHjd3LMXVbF4LX6Bi3yJF0CDVug0cDpGFbP8Ibvk4=", "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "118.0.5993.54", + "rev": "118.0.5993.159", "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": { @@ -1011,9 +1011,9 @@ }, "src/third_party/dawn": { "fetcher": "fetchFromGitiles", - "hash": "sha256-iCCvQVwf+MLZR6Zz/ML7H9uQ0FiSSCw1gZZeGC6zRLo=", + "hash": "sha256-7iCJ1h51S/8pxQRMoDtGXzyuP6Dzxnc/1Cu4ALU8NYg=", "url": "https://dawn.googlesource.com/dawn.git", - "rev": "ec2cc40563739fa6e6ff0e12c58ac0fdbe0a132f" + "rev": "deb3b674b26854204c8082ed93926207e42d3cf2" }, "src/third_party/dawn/third_party/glfw": { "fetcher": "fetchFromGitiles", @@ -1269,9 +1269,9 @@ }, "src/third_party/icu": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6do7X9xUCMe2mFQoffazdC5W9UJdHp424QEThqX6P48=", + "hash": "sha256-9yFRBrHdWcYgrZAaigS8XnxNsqJNklGdFkAAgVdHXFU=", "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "985b9a6f70e13f3db741fed121e4dcc3046ad494" + "rev": "a622de35ac311c5ad390a7af80724634e5dc61ed" }, "src/third_party/jsoncpp/source": { "fetcher": "fetchFromGitiles", @@ -1311,9 +1311,9 @@ }, "src/third_party/libavif/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-3zNhKl8REWsRlblXIFD7zn7qvrc/pa4wHZI0oEc3pKE=", + "hash": "sha256-KfRRGTS8kBwi9Z9wafpSwL29RU38THG2xBCvNBXtZtg=", "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "d1c26facaf5a8a97919ceee06814d05d10e25622" + "rev": "b2d36b1c3bfc806694cd4ff0cb188270823fe6d8" }, "src/third_party/libavifinfo/src": { "fetcher": "fetchFromGitiles", @@ -1473,9 +1473,9 @@ }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-CtCGOoKbbyUGUHfqd7n3uPlv9GEExuYgMTCIaU+ypOA=", + "hash": "sha256-TyZ/sZ0gnesWjKUnO2RVM2TTdpVIxsBWueHDgix0/wg=", "url": "https://chromium.googlesource.com/openscreen", - "rev": "fd0e81e558086c30fa91a4af89361cef8d1327e4" + "rev": "971d6055e7b78c474e2e734e55a2991fbb7ab665" }, "src/third_party/openscreen/src/third_party/tinycbor/src": { "fetcher": "fetchFromGitiles", @@ -1485,9 +1485,9 @@ }, "src/third_party/pdfium": { "fetcher": "fetchFromGitiles", - "hash": "sha256-9qxj8TgFVf64aFTx/DwkUVa41682OSfVnBj9eubMafs=", + "hash": "sha256-u+El2jEnvlcQs5j5TthpKj8s255n2AhJPW+Q/s0Ljm0=", "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "d7470394271b6a6856e28ec905b19a12100f2797" + "rev": "6e55da0c45788fdc22fa3aab7ead414fc42b74c1" }, "src/third_party/perfetto": { "fetcher": "fetchFromGitiles", @@ -1533,9 +1533,9 @@ }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-6JN+orZM77HNPDQ9VlZws1Zq8GuwDI83eXXauKknOTc=", + "hash": "sha256-Ck15ddYoo8pVLHcwW5P8Ei1sBQf23EGd/ySGOVSWAFQ=", "url": "https://skia.googlesource.com/skia.git", - "rev": "bd56a010b6941116cd1900276bf5201f9a9c73da" + "rev": "b4f0c1163c955e42489f62d842585720cf0df0ea" }, "src/third_party/smhasher/src": { "fetcher": "fetchFromGitiles", @@ -1725,9 +1725,9 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-+y24A6/c4tl4zu1GcxsiEWvAMMCsat7X0jl2XCmBX6g=", + "hash": "sha256-Fn4HoS7O2J3nGXFyq7r7AheRQzKy80USTQnNnC4rWqM=", "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "6b05d242aae3392bef6b86fbe44428126607b3d0" + "rev": "36e4828ab658b8ad72f80974883c4c94f6e7012c" }, "src/third_party/nan": { "fetcher": "fetchFromGitHub", @@ -1765,12 +1765,12 @@ "rev": "78d3966b3c331292ea29ec38661b25df0a245948" } }, - "version": "27.0.0", + "version": "27.2.0", "modules": "118", - "chrome": "118.0.5993.54", + "chrome": "118.0.5993.159", "node": "18.17.1", "chromium": { - "version": "118.0.5993.54", + "version": "118.0.5993.159", "deps": { "gn": { "version": "2023-08-10", @@ -1780,17 +1780,17 @@ } } }, - "electron_yarn_hash": "039zdwb38982h6qinhipja8abza33ihihb4i5fadpsgh0cl7ldsy", - "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=" + "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=", + "electron_yarn_hash": "1rxijv3fspjfan7mmw4cmxcb231ny7gn72yzsdnqs0225alrjac0" }, "26": { "deps": { "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-sEhO5qSm4etyWEurTGSKtJcheG+JJkC78Fhl3c5WBOE=", + "hash": "sha256-K14NaU0INgNQP4mD6lXeYRd3COoMvMjRUOtsUZB9KiQ=", "owner": "electron", "repo": "electron", - "rev": "v26.4.0" + "rev": "v26.6.3" }, "src": { "fetcher": "fetchFromGitiles", @@ -2609,7 +2609,7 @@ "rev": "78d3966b3c331292ea29ec38661b25df0a245948" } }, - "version": "26.4.0", + "version": "26.6.3", "modules": "116", "chrome": "116.0.5845.228", "node": "18.16.1", @@ -2626,825 +2626,5 @@ }, "electron_yarn_hash": "05wkb1m0yjbai4153y49kwr1v2lj14fg75aqlvmmrhf3bxp9lg5g", "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=" - }, - "25": { - "deps": { - "src/electron": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-Yo/ZvOLOPIktV5gzZK80LKVZb3xMXrzGkdQw9u4djoI=", - "owner": "electron", - "repo": "electron", - "rev": "v25.9.1" - }, - "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.9.1", - "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", - "hash": "sha256-U0rinjJAToVh4zCBd/9I3O4McxW88b7Bp6ibmmqCuQc=" - } - } - }, - "chromium_npm_hash": "sha256-WFkyT1V4jNkWUyyHF68yEe50GhdlNZJBXuQvVVGPk6A=", - "electron_yarn_hash": "0fq44b91ha1lbgakwfz16z0g10y66c7m8gvlkg1ci81rzjrj0qpz" } } diff --git a/pkgs/development/tools/electron/version-old.patch b/pkgs/development/tools/electron/version-old.patch deleted file mode 100644 index 00562225d7677..0000000000000 --- a/pkgs/development/tools/electron/version-old.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 index 6edb64a23eaf0..00562225d7677 100644 --- a/pkgs/development/tools/electron/version.patch +++ b/pkgs/development/tools/electron/version.patch @@ -16,8 +16,8 @@ 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'); +-const { spawnSync } = require('child_process'); +-const path = require('path'); - -module.exports.getElectronVersion = () => { - // Find the nearest tag to the current HEAD diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 889fc04c50703..7d19b59638e5e 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.8"; + version = "0.19.11"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-f13YbgHFQk71g7twwQ2nSOGA0RG0YYM01opv6txRMuw="; + hash = "sha256-NUwjzOpHA0Ijuh0E69KXx8YVS5GTnKmob9HepqugbIU="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix index d1d48796909e5..0e47b8e55658d 100644 --- a/pkgs/development/tools/espup/default.nix +++ b/pkgs/development/tools/espup/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "espup"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espup"; rev = "v${version}"; - hash = "sha256-CNEfqrysSETTJzhVl45Aip04QRxE9Kbqalu6SLQ16i4="; + hash = "sha256-MLr6Fh1KAvGry/fToJuLYOf36MKW2i5W4XiMIEeb52M="; }; - cargoHash = "sha256-9eQm2+p8eXrfbvdjfqQrbQ4oprNJL8rO88gafBe8/RQ="; + cargoHash = "sha256-AIM08tvt1w+TJgjxCxU+zN9eDBvgCv15WM+vQGbTF18="; nativeBuildInputs = [ pkg-config @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { description = "Tool for installing and maintaining Espressif Rust ecosystem."; homepage = "https://github.com/esp-rs/espup/"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ knightpp ]; + maintainers = with maintainers; [ knightpp beeb ]; mainProgram = "espup"; }; } diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 1baa7e9b93e44..8f42ed7250dc2 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.18"; + version = "0.16.21"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-qyMOHdOj47ef1NMBIO31xzopO6gOT96tvHhK/TO+E70="; + sha256 = "sha256-1zdxxd27XXSDcOhQi/um7jQlLZ3x+T09N1p1JJ8qzkk="; }; vendorHash = null; diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix index cf05403e0256e..93757b3cd8e2d 100644 --- a/pkgs/development/tools/fable/default.nix +++ b/pkgs/development/tools/fable/default.nix @@ -2,9 +2,10 @@ buildDotnetGlobalTool { pname = "fable"; - version = "4.5.0"; + version = "4.9.0"; - nugetSha256 = "sha256-KeNkS2fuZFnI8WVqSpIRjo2eA+XKuHLLpMIzDzgqXdg="; + nugetSha256 = "sha256-BB3jCsIz6Y9LjBhoEBzYLXttwLOBb4n1EpqJwImjo9A="; + passthru.updateScript = ./update.sh; meta = with lib; { description = "Fable is an F# to JavaScript compiler"; diff --git a/pkgs/development/tools/fable/update.sh b/pkgs/development/tools/fable/update.sh new file mode 100755 index 0000000000000..9d23084ebd85a --- /dev/null +++ b/pkgs/development/tools/fable/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix-prefetch jq + +set -euo pipefail +URL="https://github.com/fable-compiler/fable" +PKG="Fable" +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 + +TMP="$(mktemp -d)" +clean_up() { + rm -rf "$TMP" +} +trap clean_up EXIT SIGINT SIGTERM +PACKAGES="$TMP/packages" +SRC_RW="$TMP/src" + +mkdir -p $SRC_RW +mkdir -p $PACKAGES + + +VER=$(curl -s "https://api.github.com/repos/fable-compiler/fable/releases/latest" | jq -r .tag_name | grep -oP '\d+\.\d+\.\d+' ) + +CURRENT_VER=$(grep -oP '(?<=version = ")[^"]+' "$NIX_DRV") +if [[ "$CURRENT_VER" == "$VER" ]]; then + echo "$PKG is already up to date: $CURRENT_VER" + exit +fi + + +NUGET_URL="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')$PKG/$VER/$PKG.$VER.nupkg" +HASH=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$NUGET_URL")") + +sed -i "s/version = \".*\"/version = \"$VER\"/" "$NIX_DRV" +sed -i "s#nugetSha256 = \"sha256-.\{44\}\"#nugetSha256 = \"$HASH\"#" "$NIX_DRV" diff --git a/pkgs/development/tools/fastgron/default.nix b/pkgs/development/tools/fastgron/default.nix index 77c09fef99f3d..3e30d87d0ddea 100644 --- a/pkgs/development/tools/fastgron/default.nix +++ b/pkgs/development/tools/fastgron/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastgron"; - version = "0.7.0"; + version = "0.7.7"; src = fetchFromGitHub { owner = "adamritter"; repo = "fastgron"; rev = "v${finalAttrs.version}"; - hash = "sha256-IBs6oC+dbssAkUGk84vXteSlO6j88LZlmlmcV77M2YM="; + hash = "sha256-dAfFSQ/UbAovQQr5AnCsyQtq1JkdQjvlG/SbuFnTx0E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/fblog/default.nix b/pkgs/development/tools/fblog/default.nix index fd3f92d910352..b24981ffc49c0 100644 --- a/pkgs/development/tools/fblog/default.nix +++ b/pkgs/development/tools/fblog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fblog"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "brocode"; repo = pname; rev = "v${version}"; - hash = "sha256-Leg0pd+dy4sWHprjwV61qZvV6t8MnfKifWBGF+Ne0+4="; + hash = "sha256-ByojMOkdE3B9KrApOWPihg6vJHpLQy0gsIlKPd5xJog="; }; - cargoHash = "sha256-JRy4UnTlBV8FcxxJyPJ1lXagnLdUQIIA/CBnVM24Yuk="; + cargoHash = "sha256-R7FLZ+yLvDltETphfqRLrcQZNt+rkJBFdmGL3pY0G04="; meta = with lib; { description = "A small command-line JSON log viewer"; diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index 057f9fcea5194..337de8c263b80 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "12.4.8"; + version = "13.0.2"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-uyw3M6EWRaiDLZg1MH1weiXih5hWh5Kz3HnB1xXISNA="; + hash = "sha256-vR4WvnZjxdbebXWdVbM8vQTCo7pgRMcu9A2KygHZCMk="; }; - npmDepsHash = "sha256-AjUREpqQX9+7tjO68Q9WIWQ71l5O641Oc+3Pr2khP4s="; + npmDepsHash = "sha256-h99Zj+yJJvLKc/B6AbKKQTOdrZCIT3BVlkxrOtOyNA4="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix index b4b226a57cc39..c1a96e1e93817 100644 --- a/pkgs/development/tools/gci/default.nix +++ b/pkgs/development/tools/gci/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "gci"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "daixiang0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1JYmnMXm2ywGZAVhcfzvF1I1h0pBvijbeVmqKzgiz8U="; + sha256 = "sha256-h8vqpqohKQzd2IltHroo/AKnhufJsCC6qpSo8NYyhPI="; }; vendorHash = "sha256-bPRcOvwbWEpcJUlIqQNeoYME4ky0YE5LlyWhSTWCIHQ="; diff --git a/pkgs/development/tools/gi-crystal/default.nix b/pkgs/development/tools/gi-crystal/default.nix index b5d66566a6fff..8b664ee1e00f3 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.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "hugopl"; repo = "gi-crystal"; rev = "v${version}"; - hash = "sha256-SwBzGAgs0cBbBYXtaJSDWjORE+vrvI5aKG9kaC9VA4o="; + hash = "sha256-hL+4MvJn1z9UKCtyvU4zzIxOwRyYQ3Qt4qRb5F0J+sg="; }; # 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 73f0bc8093a43..0edab8933e434 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.13.1"; + version = "2.13.2"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-r2tAYH8E1j/gC+IRwcOv0Frcgd2RKEZjVzmuzOOhR7A="; + sha256 = "sha256-F1hpbNYahv7eCvDAXsAtjaVqpjIGjplgLvR64yxMtjM="; }; vendorHash = "sha256-5dEKb+KnUZTxSSoaOH1GpqMmYdLcXKMs2nq0SvR2pUs="; diff --git a/pkgs/development/tools/github-copilot-intellij-agent/default.nix b/pkgs/development/tools/github-copilot-intellij-agent/default.nix index 128095d671cb7..e6cf7744dd381 100644 --- a/pkgs/development/tools/github-copilot-intellij-agent/default.nix +++ b/pkgs/development/tools/github-copilot-intellij-agent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "github-copilot-intellij-agent"; - version = "1.2.18.2908"; + version = "1.4.5.4049"; src = fetchurl { name = "${pname}-${version}-plugin.zip"; - url = "https://plugins.jetbrains.com/plugin/download?updateId=373346"; - hash = "sha256-ErSj4ckPSaEkOeGTRS27yFKDlj2iZfoPdjbZleSIL1s="; + url = "https://plugins.jetbrains.com/plugin/download?updateId=454005"; + hash = "sha256-ibu3OcmtyLHuumhJQ6QipsNEIdEhvLUS7sb3xmnaR0U="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix index 73c2dab8f342f..1da5c8d03f4b3 100644 --- a/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/pkgs/development/tools/glamoroustoolkit/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.0.6"; + version = "1.0.9"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-263Bl5zd2k5DAPB/Ar8QMpthMiAv7BUSZ5+G03ZL5m0="; + hash = "sha256-Z8gTgQuGChqA6k0GSnIU49FAkRBWygLHeHNBpTlpzYo="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix deleted file mode 100644 index e97feca116722..0000000000000 --- a/pkgs/development/tools/glide/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "glide"; - version = "0.13.3"; - - goPackagePath = "github.com/Masterminds/glide"; - - ldflags = [ - "-X main.version=${version}" - ]; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "Masterminds"; - repo = "glide"; - sha256 = "1wskg1cxqy9sp0738qiiagdw09dbs3swxsk4z6w5hsfiq2h44a54"; - }; - - meta = with lib; { - homepage = "https://glide.sh"; - description = "Package management for Go"; - license = licenses.mit; - maintainers = [ maintainers.rushmorem ]; - }; -} diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix index 51ad526eef7c2..956ded6b6edb0 100644 --- a/pkgs/development/tools/go-containerregistry/default.nix +++ b/pkgs/development/tools/go-containerregistry/default.nix @@ -4,13 +4,13 @@ let bins = [ "crane" "gcrane" ]; in buildGoModule rec { pname = "go-containerregistry"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uqTWeA449MhHFWJwyqJgLsQHvjfk46S1YA+Yss5muSk="; + sha256 = "sha256-spo8iRf3FqX7DyaTqIuiGOVrgv0PRqa05TQcanzB8FY="; }; vendorHash = null; diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 552b71cc7067a..148e814b5568a 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.36.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-lJkxN0FtwfuOMCMGEISkZMMKULE5X5kTltIgDm7Ta0Y="; + sha256 = "sha256-fWS4oF/CWlOX6XgeLxsmEfPDDgp1WBSDC4fx2Aid9p0="; }; preCheck = '' @@ -24,7 +24,7 @@ buildGoModule rec { CGO_ENABLED = false; proxyVendor = true; - vendorHash = "sha256-HxxtKtjc1EuONG4bYTZc9i40X6Q75bQzV1Wi6Qb/Id0="; + vendorHash = "sha256-iAZjWRW2TWKqcs94lepkcIXUPyPl9qlGhxlX84rN3ok="; passthru.tests = { generateMock = runCommand "${pname}-test" { diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 0b21b92da8dc7..b9907280e3872 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-toml"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BEkshlB1Zze4sVo5YDwpj6ENHFLHL4IFmOIYgrWz+gQ="; + sha256 = "sha256-SnSdVBIIir7QSexk//ozpxnbNr92KyWP2sSBg87jGcw="; }; vendorHash = "sha256-XOcCsb3zUChiYLTfOCbRQF71E2khzSt/ApFI8NAS13U="; diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix deleted file mode 100644 index b5a224cb5ae7f..0000000000000 --- a/pkgs/development/tools/go2nix/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper, - fetchFromGitHub }: - -buildGoPackage rec { - pname = "go2nix"; - version = "1.3.0"; - rev = "v${version}"; - - goPackagePath = "github.com/kamilchm/go2nix"; - - src = fetchFromGitHub { - inherit rev; - owner = "kamilchm"; - repo = "go2nix"; - sha256 = "1q61mgngvyl2bnmrqahh3bji402n76c7xwv29lwk007gymzgff0n"; - }; - - goDeps = ./deps.nix; - - outputs = [ "out" "man" ]; - - nativeBuildInputs = [ go-bindata gotools makeWrapper ]; - - preBuild = "go generate ./..."; - - postInstall = '' - wrapProgram $out/bin/go2nix \ - --prefix PATH : ${nix-prefetch-git}/bin \ - --prefix PATH : ${git}/bin - - mkdir -p $man/share/man/man1 - cp $src/go2nix.1 $man/share/man/man1 - ''; - - allowGoReference = true; - - doCheck = false; # tries to access the net - - meta = with lib; { - description = "Go apps packaging for Nix"; - homepage = "https://github.com/kamilchm/go2nix"; - license = licenses.mit; - maintainers = with maintainers; [ kamilchm ]; - }; -} diff --git a/pkgs/development/tools/go2nix/deps.nix b/pkgs/development/tools/go2nix/deps.nix deleted file mode 100644 index 8fc784f4b7f89..0000000000000 --- a/pkgs/development/tools/go2nix/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/Masterminds/vcs"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/vcs"; - rev = "7af28b64c5ec41b1558f5514fd938379822c237c"; - sha256 = "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6"; - }; - } - { - goPackagePath = "github.com/jawher/mow.cli"; - fetch = { - type = "git"; - url = "https://github.com/jawher/mow.cli"; - rev = "772320464101e904cd51198160eb4d489be9cc49"; - sha256 = "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j"; - }; - } -] diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix index 7d0123f00f85f..da4e9e90ef8b5 100644 --- a/pkgs/development/tools/goconst/default.nix +++ b/pkgs/development/tools/goconst/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "goconst"; - version = "1.6.0"; + version = "1.7.0"; excludedPackages = [ "tests" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "jgautheron"; repo = "goconst"; rev = "v${version}"; - sha256 = "sha256-gd+0Gm1qANwgYKWAxpU7759BhyURalJCRxd/P6sczc4="; + sha256 = "sha256-yhvZucbFldjTPVdo0epNPFMgmvz0JFPF7Gra0t11zXU="; }; vendorHash = null; diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 79d11c17cb254..50cdeb857245f 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -43,14 +43,14 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.2.0-stable"; - commitHash = "46dc277917a93cbf601bbcf0d27d00f6feeec0d5"; + version = "4.2.1-stable"; + commitHash = "b09f793f564a6c95dc76acc654b390e68441bd01"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = commitHash; - hash = "sha256-eon9GOmOafOcPjyBqnrAUXwVBUOnYFBQy8o5dnumDDs="; + hash = "sha256-Q6Og1H4H2ygOryMPyjm6kzUB6Su6T9mJIp0alNAxvjQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index 6c6ca492cbe75..0949c1ff9dd6e 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -1,23 +1,47 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +, testVersion +, gofumpt +}: buildGoModule rec { pname = "gofumpt"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uXRYVLFDyRZ83mth8Fh+MG9fNv2lUfE3BTljM9v9rjI="; + hash = "sha256-3buGLgxAaAIwLXWLpX+K7VRx47DuvUI4W8vw4TuXSts="; }; - vendorHash = "sha256-Il1E1yOejLEdKRRMqelGeJbHRjx4qFymf7N98BEdFzg="; + vendorHash = "sha256-W0WKEQgOIFloWsB4E1RTICVKVlj9ChGSpo92X+bjNEk="; + + CGO_ENABLED = "0"; + + ldflags = "-s -w -X main.version=v${version}"; + + checkFlags = [ + # Requires network access (Error: module lookup disabled by GOPROXY=off). + "-skip=^TestScript/diagnose$" + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testVersion { + package = gofumpt; + version = "v${version}"; + }; + }; meta = with lib; { description = "A stricter gofmt"; homepage = "https://github.com/mvdan/gofumpt"; + changelog = "https://github.com/mvdan/gofumpt/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ rvolosatovs ]; + maintainers = with maintainers; [ rvolosatovs katexochen ]; mainProgram = "gofumpt"; }; } diff --git a/pkgs/development/tools/goimports-reviser/default.nix b/pkgs/development/tools/goimports-reviser/default.nix index 7f79d3b5fe33a..ceca2ea407e9c 100644 --- a/pkgs/development/tools/goimports-reviser/default.nix +++ b/pkgs/development/tools/goimports-reviser/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goimports-reviser"; - version = "3.5.6"; + version = "3.6.0"; src = fetchFromGitHub { owner = "incu6us"; repo = "goimports-reviser"; rev = "v${version}"; - hash = "sha256-OMCmW2GhByuVN8+Kuaw9o2oCrdA6C9fK/C7yl7wI2Ls="; + hash = "sha256-bN8bj/JW7Wixv0MUNC43gpjJUndon5twL96axticnIU="; }; vendorHash = "sha256-aYhUsO3Z0uue66XB+/oSVYLG9QGyVcFeZ0ngzhpBZxo="; diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix index f61a318890f60..f5351a816abce 100644 --- a/pkgs/development/tools/google-java-format/default.nix +++ b/pkgs/development/tools/google-java-format/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.18.1"; + version = "1.19.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-vtO61DP330J3AGSPJLeY2zwzjW3LLMXAi8VCtVYQ+RA="; + sha256 = "sha256-ymIuIsjvURcL56YddRcOdcq8gmGJgkPNnsXbcUf3TWU="; }; dontUnpack = true; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 1a75619081f99..bbd77aedef7f7 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gotools"; - version = "0.7.0"; + version = "0.16.1"; # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "v${version}"; - sha256 = "sha256-z5XJ7tflOfDBtv4rp7WEjnHsXIyjNw205PhazEvaYcw="; + hash = "sha256-qFDi+d+2OuI+mMBceZiN+kJ0gPcfgXXRDrDDwqKeDOM="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGoModule rec { rm -r cmd/getgo ''; - vendorHash = "sha256-fp0pb3EcGRDWlSpgel4pYRdsPJGk8/d57EjWJ+fzq7g="; + vendorHash = "sha256-oOBdh4mK3x9HbxD00EDKLjFgd/4NQRlQXrnCigGOwLg="; doCheck = false; diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix deleted file mode 100644 index b24afebb3aa37..0000000000000 --- a/pkgs/development/tools/govendor/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "govendor"; - version = "1.0.9"; - - goPackagePath = "github.com/kardianos/govendor"; - - src = fetchFromGitHub { - owner = "kardianos"; - repo = "govendor"; - rev = "v${version}"; - sha256 = "0g02cd25chyijg0rzab4xr627pkvk5k33mscd6r0gf1v5xvadcfq"; - }; - - meta = with lib; { - homepage = "https://github.com/kardianos/govendor"; - description = "Go vendor tool that works with the standard vendor file"; - license = licenses.bsd3; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index 08452c98c2869..52a4b4295a6ae 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.18.0"; + version = "2.18.1"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-FVb3x/wZ0jLI17lXAT/lcUpJiq3ZcvWjFnORynOvfmY="; + sha256 = "sha256-mbRceXqc7UmrhM2Y6JJIUvMf9YxMFMjRW7VvEa8/xHs="; }; - vendorHash = "sha256-SV2ZO8Y9yt6iyw9VvNY0xpqZIzLrTyHYYpIpzcEVsLY="; + vendorHash = "sha256-zVojs4q8TytJY3myKvLdACnMFJ0iK9Cfn+aZ4d/j34s="; meta = with lib; { description = diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 5286a53342b20..51d3c6f353859 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.40.0"; + version = "1.41.1"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-usHBlfEym39p8S6w2eNeXVKpqxlJxLCn9DwK2J1AqdI="; + hash = "sha256-ZC71++aC0fUkUG0h5aRxU0FpR1eNruFWAB1e2e5c/Vo="; }; - vendorHash = "sha256-vytfRa4eiF53VTR50l/J2Df587u8xx3lj1QhMYSqglk="; + vendorHash = "sha256-T407Y4IZlJnrCGSWpuN1wv8Dng2F7++2cMfLGjYC2vM="; ldflags = [ "-s" diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix index 1adcaf954d04a..6a5015c600fc2 100644 --- a/pkgs/development/tools/htmlq/default.nix +++ b/pkgs/development/tools/htmlq/default.nix @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mgdm/htmlq"; license = licenses.mit; maintainers = with maintainers; [ siraben nerdypepper ]; + mainProgram = "htmlq"; }; } diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index 5c4b4ca9e3e44..bc181390664e0 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -15,7 +15,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.14.3"; + version = "0.16.3"; # the platform-specific, statically linked binary src = diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index 0e79f2a1e00c1..685bb4d1ff687 100644 --- a/pkgs/development/tools/infisical/hashes.json +++ b/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" -, "x86_64-linux": "sha256-sTfwooMN5ckdaxpd4R3yQvDEYT7muYZTyFEm0exM33M=" -, "x86_64-darwin": "sha256-B94+mF5Wu0pHKIo8CuHAbrorzIxK2U64Np3JFlTc1kk=" -, "aarch64-linux": "sha256-eGuKnC6h1YPW0UdY5wcChbiSzATAcSmHZ6mKBI2sR80=" -, "aarch64-darwin": "sha256-s4s1la165cQ5I296ZCeW3ZIyYapTfRxa20QdZmXvido=" +, "x86_64-linux": "sha256-AxTTTX4rp881dJuNGIF9s09e5yLohTEeM0LHnsQ+/eQ=" +, "x86_64-darwin": "sha256-DKZUB84PbueRfwVAUH9z8N4JxNlK+db+fVH4jPIbDtc=" +, "aarch64-linux": "sha256-q62a5Ggw0Rikhzn0MY24sSurEPW1/nNehfqVzwBAq/k=" +, "aarch64-darwin": "sha256-9961CGekF8N0bVgtNQIxOoWKB2HgUJ3kBek1rSBHJNk=" } diff --git a/pkgs/development/tools/java/jextract/default.nix b/pkgs/development/tools/java/jextract/default.nix index ef1611cecce70..d4b514d43fef2 100644 --- a/pkgs/development/tools/java/jextract/default.nix +++ b/pkgs/development/tools/java/jextract/default.nix @@ -5,7 +5,7 @@ , writeText , makeWrapper , gradle -, jdk20 +, jdk21 , llvmPackages }: @@ -38,13 +38,13 @@ in stdenv.mkDerivation { pname = "jextract"; - version = "unstable-2023-04-14"; + version = "unstable-2023-11-27"; src = fetchFromGitHub { owner = "openjdk"; repo = "jextract"; - rev = "cf3afe9ca71592c8ebb32f219707285dd1d5b28a"; - hash = "sha256-8qRD1Xg39vxtFAdguD8XvkQ8u7YzFU55MhyyJozVffo="; + rev = "8730fcf05c229d035b0db52ee6bd82622e9d03e9"; # Update jextract 21 with latest fixes + hash = "sha256-Wct/yx5C0EjDtDyXNYDH5LRmrfq7islXbPVIGBR6x5Y="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation { env = { ORG_GRADLE_PROJECT_llvm_home = llvmPackages.libclang.lib; - ORG_GRADLE_PROJECT_jdk20_home = jdk20; + ORG_GRADLE_PROJECT_jdk21_home = jdk21; }; buildPhase = '' diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 732bd8d43f2b4..424c5f0db2be2 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , rustPlatform , coreutils -, bash , installShellFiles , libiconv , mdbook @@ -12,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.16.0"; + version = "1.20.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-lXZCRoTVIguufyhHn7h4vAajG53qIn8AeDBZuha6be8="; + hash = "sha256-MTfxVUr5rQpu5AXJmP/7rOjeHSsX+iQqfBdYb8YWfiU="; }; - cargoHash = "sha256-+r8fcoG23p7ug3xireAnUvJHiB/PXAUzBAKowGqKN8E="; + cargoHash = "sha256-lvqtt6RCy/SqzZXWRR5u2P9UOlHC5Hjg6UhYjxpS3as="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 525c16a9efcc4..06f8251f0993c 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.47.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-90r6dyesYfa/eC/joUDPDfGU8r8qbPzzhwf0EwnGee0="; + hash = "sha256-6EiHLm69mBhv0ujFPdXUk1wPZwKk9TS250QHrdXfQD8="; }; subPackages = [ "./" ]; diff --git a/pkgs/development/tools/kcat/default.nix b/pkgs/development/tools/kcat/default.nix index 224d18ed2e691..f363e4e51039e 100644 --- a/pkgs/development/tools/kcat/default.nix +++ b/pkgs/development/tools/kcat/default.nix @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib rdkafka yajl avro-c libserdes ]; - preConfigure = '' - patchShebangs ./configure - ''; - meta = with lib; { description = "A generic non-JVM producer and consumer for Apache Kafka"; homepage = "https://github.com/edenhill/kcat"; diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 0b64b59467b78..78d2af75668bb 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "15bvk6sv6fjvfq2a5yyxh3kvpkyws0pxdqbygkkrxxsl8bnr3409"; + sha256 = "sha256-ZyMaiirHJOLvQRq+lQQ+tz+LnugD21WaM4IeU2HgGK8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kubectx/bump-golang-x-sys.patch b/pkgs/development/tools/kubectx/bump-golang-x-sys.patch deleted file mode 100644 index ec838728410a0..0000000000000 --- a/pkgs/development/tools/kubectx/bump-golang-x-sys.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/go.mod b/go.mod -index c523783..1ef8d00 100644 ---- a/go.mod -+++ b/go.mod -@@ -9,6 +9,7 @@ require ( - github.com/imdario/mergo v0.3.9 // indirect - github.com/mattn/go-isatty v0.0.12 - github.com/pkg/errors v0.9.1 -+ golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c - k8s.io/apimachinery v0.21.0-alpha.1 - k8s.io/client-go v0.21.0-alpha.1 -diff --git a/go.sum b/go.sum -index 8f16b5a..7426c68 100644 ---- a/go.sum -+++ b/go.sum -@@ -293,6 +293,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w - golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY= - golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= -+golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index 628f6771899da..839525c30ebaf 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -2,20 +2,16 @@ buildGoModule rec { pname = "kubectx"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WY0zFt76mvdzk/s2Rzqys8n+DVw6qg7V6Y8JncOUVCM="; + hash = "sha256-HVmtUhdMjbkyMpTgbsr5Mm286F9Q7zbc5rOxi7OBZEg="; }; - patches = [ - ./bump-golang-x-sys.patch - ]; - - vendorHash = "sha256-p4KUBmJw6hWG1J2qwg4QBbh6Vo1cr/HQz0IqytIDJjU="; + vendorHash = "sha256-3xetjviMuH+Nev12DB2WN2Wnmw1biIDAckUSGVRHQwM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/kubedock/default.nix b/pkgs/development/tools/kubedock/default.nix index 04c9521b13d5e..17430a3e02626 100644 --- a/pkgs/development/tools/kubedock/default.nix +++ b/pkgs/development/tools/kubedock/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubedock"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "joyrex2001"; repo = "kubedock"; rev = version; - hash = "sha256-xjt/RqvkOHTSTZwNgxmlUeYndPW9jwUE1knLyNXDxaE="; + hash = "sha256-UCoQm/lg8QRwsK2riJyHmCLg+Ash8Pg+6Va1RVemdt0="; }; - vendorHash = "sha256-4X4v40c4J5SPwj53Zk+j+A9k0RkHGwqz128E+FnLr1c="; + vendorHash = "sha256-mkzj+8c1MJgPHohSjSj7OW+xoYvI9Qoj3cXJ1iRDeWc="; # config.Build not defined as it would break r-ryantm ldflags = [ diff --git a/pkgs/development/tools/kubeswitch/default.nix b/pkgs/development/tools/kubeswitch/default.nix index b789be0f0aaa7..76aeeb2e94c89 100644 --- a/pkgs/development/tools/kubeswitch/default.nix +++ b/pkgs/development/tools/kubeswitch/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeswitch"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "danielfoehrKn"; repo = pname; rev = version; - sha256 = "sha256-7BQhkFvOgmLuzBEvAou8KANhxWna5KVokIF4DEIVU2g="; + sha256 = "sha256-zf7o41YYAppRge0EMXgIN8rI5Kco4/n7BJ90b/X6L1M="; }; vendorHash = null; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 5ec6c8abc8257..550e99d97e08b 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-gqCCUK9xJJq+phYBXJ8gSwU0jclRP6RgifPt/py1PG0="; + sha256 = "sha256-3sFtYUFUYYHDqF22XJ+pmg+fW2f03IS5CgIXjWg2+Bo="; }; - cargoHash = "sha256-usS3XZLY4SngEdpvpx+Dxywh7HR8uPgTJabXH5iNsuE="; + cargoHash = "sha256-9eUGGDBoeF6EM3Np95rFHU3luGuVZk5iE4kIYlUnEEw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index a8e90fc7b036a..3906f98510bcf 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.2.1"; + version = "5.3.0"; ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ @@ -15,13 +15,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-NuDg9Vtfxddosi8J7p6+WI2jDM2k16gbWsQcZF27vJo="; + hash = "sha256-TleO28Q6JaOz1OAJKbvLhN99a841FEhHL15NTMhS1Oc="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-pA0B4CA5RXyo2GTyk9Xa/unpU46gnLI6ulCY5vTLTvA="; + vendorHash = "sha256-6+8cwRH37lkQvnHBUlSqyNrZMfDpKbeUNJS4YMflBq0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index d751e0f43fd2f..777a4466e6f96 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "4.2.5"; + version = "4.3.0"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - hash = "sha256-zhu1fBqa6rNO2MoOFUE50I3dtAaOP4Dr9v2rTNB5oro="; + hash = "sha256-fN83o84GbfMVG20c1/ROwxYPgnJ4g1U2wsM6j/VGtMY="; }; - vendorHash = "sha256-GuzBSFENkHTri1FF2Ar6paGId7Yj7HuWSEDirFZrqZM="; + vendorHash = "sha256-3AA7Zn9KYAJrcotiIpwm5eOfiuJuvLb0rl6FrcwGgSA="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index 9222f9d997170..388bb0e92d4b4 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-XTY32B0RkLcZxTuKWUtZlrrUARkoT2+qYkL8Amai2cE="; + hash = "sha256-q9RK7wTEbwptzNrXzifq6vUpOKD3idsG5FZKpQZ1uCc="; }; - vendorHash = "sha256-wMYrgAgAEgwfjMLP81H0cKWm/kh63ppDkSiymfsaj7U="; + vendorHash = "sha256-KyeXVS07+WUV+Q5Z9Q+SFp/q9KLLQBpuBH9kRSAh8qg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix index 9bbd3d5ec804f..4cd17ece484fe 100644 --- a/pkgs/development/tools/language-servers/metals/default.nix +++ b/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.1.0"; + version = "1.2.0"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-9zigJM0xEJSYgohbjc9ZLBKbPa/WGVSv3KVFE3QUzWE="; + outputHash = "sha256-nikQ/GFRWmYYzboc9TWIi9gd5kwgCxOLhvIEQWusFik="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index e8b9d9229b309..9275df8c1c14c 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.14.0" +version = "0.14.2" dependencies = [ "config", "diagnostic", @@ -118,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.14.0" +version = "0.14.2" dependencies = [ "fast-hash", "str-util", @@ -131,7 +131,7 @@ source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fd [[package]] name = "cm-syntax" -version = "0.14.0" +version = "0.14.2" dependencies = [ "lex-util", "paths", @@ -161,7 +161,7 @@ dependencies = [ [[package]] name = "config" -version = "0.14.0" +version = "0.14.2" dependencies = [ "fast-hash", "serde", @@ -189,7 +189,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.14.0" +version = "0.14.2" dependencies = [ "fast-hash", "once_cell", @@ -417,7 +417,7 @@ dependencies = [ [[package]] name = "input" -version = "0.14.0" +version = "0.14.2" dependencies = [ "cm-syntax", "config", @@ -466,7 +466,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.14.0" +version = "0.14.2" dependencies = [ "analysis", "anyhow", @@ -494,7 +494,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.14.0" +version = "0.14.2" [[package]] name = "libc" @@ -566,7 +566,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.14.0" +version = "0.14.2" dependencies = [ "analysis", "codespan-reporting", @@ -584,7 +584,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.14.0" +version = "0.14.2" dependencies = [ "anyhow", "env_logger", @@ -604,7 +604,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.14.0" +version = "0.14.2" dependencies = [ "fast-hash", "paths", @@ -616,7 +616,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.14.0" +version = "0.14.2" dependencies = [ "config", "diagnostic", @@ -641,7 +641,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.14.0" +version = "0.14.2" dependencies = [ "lex-util", "paths", @@ -705,7 +705,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "panic-hook" -version = "0.14.0" +version = "0.14.2" dependencies = [ "better-panic", ] @@ -928,7 +928,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.14.0" +version = "0.14.2" dependencies = [ "fast-hash", "str-util", @@ -936,14 +936,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.14.0" +version = "0.14.2" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.14.0" +version = "0.14.2" dependencies = [ "fast-hash", "fmt-util", @@ -954,7 +954,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.14.0" +version = "0.14.2" dependencies = [ "config", "pretty_assertions", @@ -971,11 +971,11 @@ dependencies = [ [[package]] name = "sml-file" -version = "0.14.0" +version = "0.14.2" [[package]] name = "sml-file-syntax" -version = "0.14.0" +version = "0.14.2" dependencies = [ "config", "elapsed", @@ -990,7 +990,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.14.0" +version = "0.14.2" dependencies = [ "fast-hash", "once_cell", @@ -999,7 +999,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.14.0" +version = "0.14.2" dependencies = [ "la-arena", "sml-lab", @@ -1010,7 +1010,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.14.0" +version = "0.14.2" dependencies = [ "config", "cov-mark", @@ -1022,23 +1022,26 @@ dependencies = [ "sml-path", "sml-syntax", "str-util", + "text-size-util", ] [[package]] name = "sml-lab" -version = "0.14.0" +version = "0.14.2" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.14.0" +version = "0.14.2" dependencies = [ "cov-mark", "diagnostic", "lex-util", "sml-syntax", + "text-size-util", + "token", ] [[package]] @@ -1048,20 +1051,21 @@ source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f7 [[package]] name = "sml-naive-fmt" -version = "0.14.0" +version = "0.14.2" dependencies = [ "fast-hash", "sml-comment", "sml-syntax", + "text-size-util", ] [[package]] name = "sml-namespace" -version = "0.14.0" +version = "0.14.2" [[package]] name = "sml-parse" -version = "0.14.0" +version = "0.14.2" dependencies = [ "diagnostic", "event-parse", @@ -1069,18 +1073,20 @@ dependencies = [ "sml-fixity", "sml-syntax", "str-util", + "text-size-util", + "token", ] [[package]] name = "sml-path" -version = "0.14.0" +version = "0.14.2" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.14.0" +version = "0.14.2" dependencies = [ "num-bigint", "num-traits", @@ -1089,7 +1095,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.14.0" +version = "0.14.2" dependencies = [ "chain-map", "config", @@ -1112,7 +1118,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.14.0" +version = "0.14.2" dependencies = [ "chain-map", "code-h2-md-map", @@ -1131,7 +1137,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.14.0" +version = "0.14.2" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1139,7 +1145,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.14.0" +version = "0.14.2" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1150,7 +1156,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.14.0" +version = "0.14.2" dependencies = [ "fast-hash", "sml-hir", @@ -1223,7 +1229,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.14.0" +version = "0.14.2" dependencies = [ "analysis", "cm-syntax", @@ -1634,7 +1640,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.14.0" +version = "0.14.2" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 9efe4b1f45ad0..42f932c04ef97 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.14.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-dTYnJofXzpkfXfS4RoJHqXEMlPKW5w1z+X39rL+VoQE="; + hash = "sha256-UtdkflM9ftmSVQI4CF0PAlLlbQ9l0EHF5SzJL4sU08Q="; }; cargoLock = { diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index 3cee6dd3b708f..6397dabb1da46 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.6.11"; + version = "0.6.17"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-ZLZGPigZSrW2C909Kc8t0U3+5sWRGkhT820fl+k37x4="; + hash = "sha256-0Rc5oPm6BAjPmoRHUO3gVivbQt2p2y62VbT5NIzHtpI="; }; - cargoHash = "sha256-dONoaLX2nlnJIjnRPSgQ5oHWqWw632nSpoWUOiU0w58="; + cargoHash = "sha256-7ifdmW9JBjz0jxpltn5gFa60oNsB4daA6cXCLnBne7o="; meta = with lib; { description = "A cmake lsp based on tower-lsp and treesitter"; diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/development/tools/language-servers/pylyzer/default.nix index f6cd1d9a1f2b1..3f48b0b9d824b 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.49"; + version = "0.0.51"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; - rev = "v${version}"; - hash = "sha256-1BExqeIL6jaonJVB3aRYDDHRw7xdxHoouH5BlooJDW8="; + rev = "refs/tags/v${version}"; + hash = "sha256-TKAmIy5dP2m1iokxSqfxTj79UDkW00+se/NDGS3euwA="; }; - cargoHash = "sha256-HBRczmEqqH+lMgnHeP/WpqHD05tkovJmR12hXwCrw8k="; + cargoHash = "sha256-035ueF42g6By+6TOGEultc8n350g3mRT00raQgWIcUM="; 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 5b40af17c3305..8d3c49652a1dd 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.45"; + version = "0.0.48"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "astral-sh"; repo = "ruff-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-jTLkex2K/IQTKZp2duM26/EaYhG5E2bGs/QKt5PA7lc="; + hash = "sha256-X0vCIEfwi4UrDwFYZgEy8XkGdrZQyisx0/ae9MDalG0="; }; postPatch = '' diff --git a/pkgs/development/tools/language-servers/svls/default.nix b/pkgs/development/tools/language-servers/svls/default.nix index 4044a8c10d2e9..88cfac40bfb0a 100644 --- a/pkgs/development/tools/language-servers/svls/default.nix +++ b/pkgs/development/tools/language-servers/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-ylTiyqFVdT95a5DP4YYtoAIGThA+TacAE8ft0mcuolI="; + sha256 = "sha256-pvvtJOwb9N7CzCXoLG19iuLQjABABaOUe6wKfYizgQc="; }; - cargoHash = "sha256-+h2lxIbfHCGKCWX8ly9NXskMkeRGIpujkX3Zep1WhrE="; + cargoHash = "sha256-sMprdvBSfCIzoTHyUC447pyZWGgZkKa9t3A9BiGbQvY="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index 1cac59554719d..1bda41e92cd25 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -92,9 +92,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "flate2", "futures-core", @@ -111,7 +111,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -161,13 +161,13 @@ checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "biblatex" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e41df82f0d1c4919d946bb0c7c3d179b6071246243d308a1bdee6cfecee3bc7" +checksum = "1a3638fc10f65e552d53318e042cefa542418633451163228fcbfb1a58a0ca85" dependencies = [ "numerals", "paste", - "strum 0.24.1", + "strum", "unicode-normalization", "unscanny", ] @@ -212,18 +212,6 @@ dependencies = [ ] [[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] name = "bpaf" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -235,9 +223,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -250,28 +238,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] -name = "bytecheck" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "bytemuck" version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -300,9 +266,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" dependencies = [ "serde", ] @@ -344,9 +310,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chinese-number" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9cec9efb10b00914876c7e7b1fdaec572b888443b4046cd11ba91eb8c5a1ccb" +checksum = "b3b2ffc31f235dfd4a5fa440c9b9822144183821be28aeb269e205d5541164dd" dependencies = [ "chinese-variant", "enum-ordinalize", @@ -356,9 +322,9 @@ dependencies = [ [[package]] name = "chinese-variant" -version = "1.0.9" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeea139b89efab957972956e5d3e4efb66a6c261f726abf6911040cc8ef700f7" +checksum = "17df2e16b0704fc5413214165d1bfdd619f18b1044d5991d5c5351b05fee852e" [[package]] name = "chrono" @@ -369,7 +335,7 @@ dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -401,9 +367,9 @@ dependencies = [ [[package]] name = "citationberg" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c857faf24e89710f105b623c174508070a9e11e056a749f251ca4c56f59ad88" +checksum = "c15a0bf8014b266d11f20451dc9202d8d26180ffd8b094d73ecbe74d821f01fb" dependencies = [ "quick-xml 0.28.2", "serde", @@ -423,39 +389,39 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "comemo" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" +checksum = "bf5705468fa80602ee6a5f9318306e6c428bffd53e43209a78bc05e6e667c6f4" dependencies = [ "comemo-macros", - "siphasher 0.3.11", + "siphasher 1.0.0", ] [[package]] name = "comemo-macros" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168cc09917f6a014a4cf6ed166d1b541a20a768c60f9cc348f25203ee8312940" +checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -463,9 +429,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core_maths" @@ -496,6 +462,30 @@ dependencies = [ ] [[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.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -552,7 +542,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -562,7 +552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -570,15 +560,15 @@ dependencies = [ [[package]] name = "data-url" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" dependencies = [ "powerfmt", ] @@ -601,7 +591,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -612,7 +602,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -671,15 +661,24 @@ dependencies = [ [[package]] name = "enum-ordinalize" -version = "3.1.15" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365ed566a2be6c61cb68e4faca9e74687004c5fd9a7291be8bc30992dd9195c" +dependencies = [ + "enum-ordinalize-derive", +] + +[[package]] +name = "enum-ordinalize-derive" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" +checksum = "9ac2fa9cc04a3dec245e68a29ac309a03c1fe638522b0d8c24ec14bbe9c08323" dependencies = [ "num-bigint", "num-traits", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -690,12 +689,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -753,7 +752,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall 0.3.5", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -779,6 +778,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] +name = "fontconfig-parser" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +dependencies = [ + "roxmltree", +] + +[[package]] name = "fontdb" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -787,7 +795,21 @@ dependencies = [ "log", "slotmap", "tinyvec", - "ttf-parser", + "ttf-parser 0.19.2", +] + +[[package]] +name = "fontdb" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98b88c54a38407f7352dd2c4238830115a6377741098ffd1f997c813d0e088a6" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2", + "slotmap", + "tinyvec", + "ttf-parser 0.20.0", ] [[package]] @@ -807,20 +829,14 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] name = "futures" version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -891,7 +907,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -926,9 +942,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -947,9 +963,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globmatch" @@ -964,22 +986,22 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata", + "regex-syntax 0.8.2", ] [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -987,7 +1009,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", @@ -1011,23 +1033,22 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hayagriva" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5af3d464a6b5ae882f15fe1da4e696fd96b77fee78ded933e0ad81d1d87cbc5" +checksum = "f9f97c07366b7f686741521ca63cc14baf18cea53c39b0c09873cd1d4a1b2b8c" dependencies = [ "biblatex", "ciborium", "citationberg", - "indexmap 2.1.0", + "indexmap", "numerals", "paste", - "rkyv", "serde", "serde_yaml", "thiserror", @@ -1051,9 +1072,9 @@ checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1165,9 +1186,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3907b2246e8dd5a29ead8a965e7c0c8a90e9b928e614a4279257d45c5e553e91" +checksum = "137d96353afc8544d437e8a99eceb10ab291352699573b0de5b08bda38c78c60" dependencies = [ "displaydoc", "serde", @@ -1178,9 +1199,9 @@ dependencies = [ [[package]] name = "icu_locid" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c" +checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" dependencies = [ "displaydoc", "litemap", @@ -1191,9 +1212,9 @@ dependencies = [ [[package]] name = "icu_locid_transform" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7" +checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" dependencies = [ "displaydoc", "icu_locid", @@ -1205,15 +1226,15 @@ dependencies = [ [[package]] name = "icu_locid_transform_data" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44" +checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" [[package]] name = "icu_properties" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3477ae70f8ca8dc08ff7574b5398ed0a2f2e4e6b66bdff2558a92ed67e262be1" +checksum = "976e296217453af983efa25f287a4c1da04b9a63bf1ed63719455068e4453eb5" dependencies = [ "displaydoc", "icu_collections", @@ -1227,15 +1248,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "1.3.4" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98507b488098f45eb95ef495612a2012e4d8ad6095dda86cb2f1728aa2204a60" +checksum = "f6a86c0e384532b06b6c104814f9c1b13bcd5b64409001c0d05713a1f3529d99" [[package]] name = "icu_provider" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934" +checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" dependencies = [ "displaydoc", "icu_locid", @@ -1252,9 +1273,9 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b380ef2d3d93b015cd0563d7e0d005cc07f82a5503716dbc191798d0079e1d" +checksum = "a229f978260da7c3aabb68cb7dc7316589936680570fe55e50fdd3f97711a4dd" dependencies = [ "icu_locid", "icu_locid_transform", @@ -1265,33 +1286,34 @@ dependencies = [ [[package]] name = "icu_provider_blob" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31326d28c7f95a964a4f0ee86c24002da5f6db907e3bcb079949b4ff103b6a9" +checksum = "4a7202cddda672db167c6352719959e9b01cb1ca576d32fa79103f61b5a73601" dependencies = [ "icu_provider", "postcard", "serde", "writeable", + "zerotrie", "zerovec", ] [[package]] name = "icu_provider_macros" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" +checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "icu_segmenter" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb3c1981ce2187a745f391a741cb14e77453325acb3b2e014b05da51c0a39f2" +checksum = "b2dc1e8f4ba33a6a4956770ac5c08570f255d6605519fb3a859a0c0a270a2f8f" dependencies = [ "core_maths", "displaydoc", @@ -1306,15 +1328,15 @@ dependencies = [ [[package]] name = "icu_segmenter_data" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9703f6713044d1c0a1335a6d78ffece4c9380582416ace6feeb608e84d279fc7" +checksum = "3673d6698dcffce08cfe8fc5da3c11c3f2c663d5d6137fd58ab2cbf44235ab46" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1350,22 +1372,12 @@ checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[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 = "indexmap" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "serde", ] @@ -1414,7 +1426,7 @@ checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1459,9 +1471,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] @@ -1480,9 +1492,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -1504,9 +1516,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libm" @@ -1515,6 +1527,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] name = "libz-sys" version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1543,9 +1566,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lipsum" @@ -1559,9 +1582,12 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" +checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" +dependencies = [ + "serde", +] [[package]] name = "lock_api" @@ -1608,6 +1634,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 = "mime" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1631,7 +1666,7 @@ checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1726,9 +1761,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -1747,7 +1782,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1758,9 +1793,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" dependencies = [ "cc", "libc", @@ -1770,32 +1805,38 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" +checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", + "futures-core", + "futures-sink", + "indexmap", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", ] [[package]] name = "opentelemetry-http" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" +checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" dependencies = [ "async-trait", "bytes", "http", "isahc", - "opentelemetry_api", + "opentelemetry", ] [[package]] name = "opentelemetry-jaeger" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876958ba9084f390f913fcf04ddf7bbbb822898867bb0a51cc28f2b9e5c1b515" +checksum = "e617c66fd588e40e0dbbd66932fdc87393095b125d4459b1a3a10feb1712f8a1" dependencies = [ "async-trait", "futures-core", @@ -1805,52 +1846,37 @@ dependencies = [ "opentelemetry", "opentelemetry-http", "opentelemetry-semantic-conventions", + "opentelemetry_sdk", "thrift", "tokio", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269" +checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" dependencies = [ "opentelemetry", ] [[package]] -name = "opentelemetry_api" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" -dependencies = [ - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] name = "opentelemetry_sdk" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" +checksum = "968ba3f2ca03e90e5187f5e4f46c791ef7f2c163ae87789c8ce5f5ca3b7b7de5" dependencies = [ "async-trait", "crossbeam-channel", "futures-channel", "futures-executor", "futures-util", + "glob", "once_cell", - "opentelemetry_api", - "ordered-float 3.9.2", + "opentelemetry", + "ordered-float 4.1.1", "percent-encoding", "rand", - "regex", "thiserror", "tokio", "tokio-stream", @@ -1873,9 +1899,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.9.2" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" dependencies = [ "num-traits", ] @@ -1906,7 +1932,7 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1935,7 +1961,7 @@ dependencies = [ "libc", "redox_syscall 0.4.1", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -1946,9 +1972,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pdf-writer" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "690874e8cf95d36ddffbdbdaad6ef8714c88bf8085996b673559389a04e38a02" +checksum = "644b654f2de28457bf1e25a4905a76a563d1128a33ce60cf042f721f6818feaf" dependencies = [ "bitflags 1.3.2", "itoa", @@ -1958,9 +1984,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pico-args" @@ -1985,7 +2011,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2001,15 +2027,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pixglyph" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67591f21f6668e63c1cd85adab066ac8a92bc7b962668dd8042197a6e4b8f8f" -dependencies = [ - "ttf-parser", -] - -[[package]] name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2017,14 +2034,14 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ "base64", - "indexmap 1.9.3", + "indexmap", "line-wrap", - "quick-xml 0.30.0", + "quick-xml 0.31.0", "serde", "time", ] @@ -2055,7 +2072,7 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2107,9 +2124,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -2124,26 +2141,6 @@ dependencies = [ ] [[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "quick-xml" version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2155,9 +2152,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -2172,12 +2169,6 @@ dependencies = [ ] [[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2208,21 +2199,32 @@ dependencies = [ ] [[package]] -name = "rctree" -version = "0.5.0" +name = "rayon" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] [[package]] -name = "redox_syscall" -version = "0.2.16" +name = "rayon-core" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "bitflags 1.3.2", + "crossbeam-deque", + "crossbeam-utils", ] [[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2242,12 +2244,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] @@ -2287,15 +2289,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] -name = "rend" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" -dependencies = [ - "bytecheck", -] - -[[package]] name = "reqwest" version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2341,71 +2334,17 @@ dependencies = [ ] [[package]] -name = "resvg" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7980f653f9a7db31acff916a262c3b78c562919263edea29bf41a056e20497" -dependencies = [ - "gif", - "jpeg-decoder", - "log", - "pico-args", - "png", - "rgb", - "svgtypes", - "tiny-skia", - "usvg", -] - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - -[[package]] name = "ring" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "684d5e6e18f669ccebf64a92236bb7db9a34f07be010e3627368182027180866" dependencies = [ "cc", "getrandom", "libc", "spin", "untrusted", - "windows-sys", -] - -[[package]] -name = "rkyv" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" -dependencies = [ - "bitvec", - "bytecheck", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "windows-sys 0.48.0", ] [[package]] @@ -2425,22 +2364,22 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "log", "ring", @@ -2450,9 +2389,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64", ] @@ -2482,7 +2421,7 @@ dependencies = [ "bitflags 1.3.2", "bytemuck", "smallvec", - "ttf-parser", + "ttf-parser 0.19.2", "unicode-bidi-mirroring", "unicode-ccc", "unicode-properties", @@ -2516,7 +2455,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2536,12 +2475,6 @@ dependencies = [ ] [[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] name = "security-framework" version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2575,22 +2508,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.190" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2612,7 +2545,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2642,7 +2575,7 @@ version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.1.0", + "indexmap", "itoa", "ryu", "serde", @@ -2665,12 +2598,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] name = "simplecss" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2702,9 +2629,9 @@ dependencies = [ [[package]] name = "slotmap" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ "version_check", ] @@ -2722,9 +2649,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" @@ -2743,7 +2670,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2782,33 +2709,11 @@ dependencies = [ [[package]] name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros 0.24.3", -] - -[[package]] -name = "strum" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ - "strum_macros 0.25.3", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", + "strum_macros", ] [[package]] @@ -2821,7 +2726,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2842,12 +2747,13 @@ dependencies = [ [[package]] name = "svg2pdf" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363c5346967da04bf3ebb3d8bafa7f52c53c810167047904df1960eac3fc08b7" +checksum = "a81da66842e426278f20062cd249779565e13f9ab4bfe0ac9e94eb476bc3a0f3" dependencies = [ "image", "miniz_oxide", + "once_cell", "pdf-writer", "usvg", ] @@ -2875,9 +2781,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -2892,7 +2798,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "unicode-xid", ] @@ -2939,12 +2845,6 @@ dependencies = [ ] [[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] name = "temp-dir" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2960,7 +2860,7 @@ dependencies = [ "fastrand 2.0.1", "redox_syscall 0.4.1", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2980,7 +2880,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3045,25 +2945,10 @@ dependencies = [ ] [[package]] -name = "tiny-skia" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b72a92a05db376db09fe6d50b7948d106011761c05a6a45e23e17ee9b556222" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "png", - "tiny-skia-path", -] - -[[package]] name = "tiny-skia-path" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac3865b9708fc7e1961a65c3a4fa55e984272f33092d3c859929f887fceb647" +checksum = "5de35e8a90052baaaf61f171680ac2f8e925a1e43ea9d2e3a00514772250e541" dependencies = [ "arrayref", "bytemuck", @@ -3072,9 +2957,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" dependencies = [ "displaydoc", "serde", @@ -3098,9 +2983,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes", @@ -3110,18 +2995,18 @@ dependencies = [ "pin-project-lite", "socket2 0.5.5", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3198,14 +3083,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.7", + "toml_edit 0.21.0", ] [[package]] @@ -3223,7 +3108,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -3232,11 +3117,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.1.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -3294,7 +3179,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3323,7 +3208,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3348,9 +3233,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", @@ -3359,10 +3244,11 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" +checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" dependencies = [ + "js-sys", "once_cell", "opentelemetry", "opentelemetry_sdk", @@ -3371,13 +3257,14 @@ dependencies = [ "tracing-core", "tracing-log", "tracing-subscriber", + "web-time", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "sharded-slab", "thread_local", @@ -3397,6 +3284,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" [[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] name = "typed-arena" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3404,57 +3297,61 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" -version = "0.9.0" -source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" +version = "0.10.0" +source = "git+https://github.com/typst/typst.git?tag=v0.10.0#70ca0d257bb4ba927f63260e20443f244e0bb58c" dependencies = [ - "base64", + "az", "bitflags 2.4.1", - "bytemuck", + "chinese-number", + "ciborium", "comemo", + "csv", "ecow 0.2.0", - "flate2", - "fontdb", + "fontdb 0.15.0", + "hayagriva", + "hypher", + "icu_properties", + "icu_provider", + "icu_provider_adapters", + "icu_provider_blob", + "icu_segmenter", "image", - "indexmap 2.1.0", + "indexmap", "kurbo", + "lipsum", "log", - "miniz_oxide", "once_cell", "palette", - "pdf-writer", - "pixglyph", + "rayon", "regex", - "resvg", "roxmltree", "rustybuzz", "serde", - "siphasher 0.3.11", + "serde_json", + "serde_yaml", + "siphasher 1.0.0", + "smallvec", "stacker", - "subsetter", - "svg2pdf", + "syntect", "time", - "tiny-skia", - "toml 0.8.6", + "toml 0.8.8", "tracing", - "ttf-parser", + "ttf-parser 0.19.2", + "typed-arena", "typst-macros", - "typst-syntax 0.9.0", - "unicode-ident", + "typst-syntax 0.10.0", + "unicode-bidi", "unicode-math-class", - "unicode-properties", + "unicode-script", "unicode-segmentation", - "unscanny", "usvg", "wasmi", - "xmlparser", - "xmlwriter", - "xmp-writer", ] [[package]] name = "typst-ide" -version = "0.9.0" -source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" +version = "0.10.0" +source = "git+https://github.com/typst/typst.git?tag=v0.10.0#70ca0d257bb4ba927f63260e20443f244e0bb58c" dependencies = [ "comemo", "ecow 0.2.0", @@ -3466,49 +3363,8 @@ dependencies = [ ] [[package]] -name = "typst-library" -version = "0.9.0" -source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" -dependencies = [ - "az", - "chinese-number", - "ciborium", - "comemo", - "csv", - "ecow 0.2.0", - "hayagriva", - "hypher", - "icu_properties", - "icu_provider", - "icu_provider_adapters", - "icu_provider_blob", - "icu_segmenter", - "indexmap 2.1.0", - "kurbo", - "lipsum", - "log", - "once_cell", - "roxmltree", - "rustybuzz", - "serde_json", - "serde_yaml", - "smallvec", - "syntect", - "time", - "toml 0.8.6", - "tracing", - "ttf-parser", - "typed-arena", - "typst", - "unicode-bidi", - "unicode-math-class", - "unicode-script", - "unicode-segmentation", -] - -[[package]] name = "typst-lsp" -version = "0.11.0" +version = "0.12.0" dependencies = [ "anyhow", "async-compression", @@ -3519,13 +3375,13 @@ dependencies = [ "comemo", "dirs", "elsa", + "fontdb 0.16.0", "futures", "if_chain", - "indexmap 2.1.0", + "indexmap", "internment", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", - "memmap2", "once_cell", "opentelemetry", "opentelemetry-jaeger", @@ -3537,7 +3393,7 @@ dependencies = [ "serde", "serde_json", "siphasher 1.0.0", - "strum 0.25.0", + "strum", "temp-dir", "thiserror", "tokio", @@ -3549,20 +3405,43 @@ dependencies = [ "tracing-subscriber", "typst", "typst-ide", - "typst-library", + "typst-pdf", "typstfmt_lib", "walkdir", ] [[package]] name = "typst-macros" -version = "0.9.0" -source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" +version = "0.10.0" +source = "git+https://github.com/typst/typst.git?tag=v0.10.0#70ca0d257bb4ba927f63260e20443f244e0bb58c" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", +] + +[[package]] +name = "typst-pdf" +version = "0.10.0" +source = "git+https://github.com/typst/typst.git?tag=v0.10.0#70ca0d257bb4ba927f63260e20443f244e0bb58c" +dependencies = [ + "base64", + "bytemuck", + "comemo", + "ecow 0.2.0", + "image", + "miniz_oxide", + "once_cell", + "pdf-writer", + "subsetter", + "svg2pdf", + "tracing", + "ttf-parser 0.19.2", + "typst", + "unicode-properties", + "unscanny", + "xmp-writer", ] [[package]] @@ -3583,8 +3462,8 @@ dependencies = [ [[package]] name = "typst-syntax" -version = "0.9.0" -source = "git+https://github.com/typst/typst.git?tag=v0.9.0#7bb4f6df44086b4c1120b227f7ae963e6c2ad5ab" +version = "0.10.0" +source = "git+https://github.com/typst/typst.git?tag=v0.10.0#70ca0d257bb4ba927f63260e20443f244e0bb58c" dependencies = [ "comemo", "ecow 0.2.0", @@ -3593,6 +3472,7 @@ dependencies = [ "tracing", "unicode-ident", "unicode-math-class", + "unicode-script", "unicode-segmentation", "unscanny", ] @@ -3720,9 +3600,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -3775,7 +3655,7 @@ version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593" dependencies = [ - "fontdb", + "fontdb 0.15.0", "kurbo", "log", "rustybuzz", @@ -3799,15 +3679,9 @@ dependencies = [ [[package]] name = "utf8_iter" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33" - -[[package]] -name = "uuid" -version = "1.5.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "valuable" @@ -3860,9 +3734,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3870,24 +3744,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -3897,9 +3771,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3907,22 +3781,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-streams" @@ -3939,9 +3813,9 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" +checksum = "acfc1e384a36ca532d070a315925887247f3c7e23567e23e0ac9b1c5d6b8bf76" dependencies = [ "smallvec", "spin", @@ -3979,9 +3853,19 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" dependencies = [ "js-sys", "wasm-bindgen", @@ -3989,9 +3873,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "weezl" @@ -4036,7 +3920,7 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -4045,7 +3929,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -4054,13 +3947,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "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]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -4070,46 +3978,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -4121,23 +4071,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "writeable" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" - -[[package]] -name = "wyz" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] +checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e" [[package]] name = "xattr" @@ -4177,9 +4118,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" dependencies = [ "serde", "stable_deref_trait", @@ -4189,13 +4130,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "synstructure", ] @@ -4216,15 +4157,27 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "synstructure", ] [[package]] +name = "zerotrie" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0594125a0574fb93059c92c588ab209cc036a23d1baeb3410fa9181bea551a0" +dependencies = [ + "displaydoc", + "litemap", + "serde", + "zerovec", +] + +[[package]] name = "zerovec" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" +checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" dependencies = [ "serde", "yoke", @@ -4234,11 +4187,11 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" +checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index 5cd6b423aa0c3..8952ede201eb4 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -9,19 +9,19 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "nvarner"; repo = "typst-lsp"; rev = "v${version}"; - hash = "sha256-L0d+fDCLxU/XHC99VlIcZdiO3RohtWfoRnUPGIHodcc="; + hash = "sha256-7T5BxAq67mHve2FeYCN0L63e+2LE7agG1LgmKy5y1bc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "typst-0.9.0" = "sha256-LwRB/AQE8TZZyHEQ7kKB10itzEgYjg4R/k+YFqmutDc="; + "typst-0.10.0" = "sha256-qiskc0G/ZdLRZjTicoKIOztRFem59TM4ki23Rl55y9s="; "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; "typstfmt_lib-0.2.6" = "sha256-UUVbnxIj7kQVpZvSbbB11i6wAvdTnXVk5cNSNoGBeRM="; }; diff --git a/pkgs/development/tools/language-servers/verible/default.nix b/pkgs/development/tools/language-servers/verible/default.nix index 2e31b44398bb1..e607713f49f8e 100644 --- a/pkgs/development/tools/language-servers/verible/default.nix +++ b/pkgs/development/tools/language-servers/verible/default.nix @@ -2,7 +2,8 @@ , stdenv , buildBazelPackage , fetchFromGitHub -, bazel_4 +, bazel_5 +, jdk , bison , flex , python3 @@ -17,8 +18,8 @@ buildBazelPackage rec { # These environment variables are read in bazel/build-version.py to create # a build string shown in the tools --version output. # If env variables not set, it would attempt to extract it from .git/. - GIT_DATE = "2023-10-26"; - GIT_VERSION = "v0.0-3428-gcfcbb82b"; + GIT_DATE = "2023-12-23"; + GIT_VERSION = "v0.0-3471-g9cb45092"; # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION))); @@ -27,7 +28,7 @@ buildBazelPackage rec { owner = "chipsalliance"; repo = "verible"; rev = "${GIT_VERSION}"; - hash = "sha256-snWhOuGyAdtdJDMttcbEjlkwPUO1mdR9vuro0tZt+Z8="; + hash = "sha256-nFt5TeFv63Igx8Zer2s/ZLj5DsHeZj5V/+3burnEm9g="; }; patches = [ @@ -37,25 +38,19 @@ buildBazelPackage rec { ./remove-unused-deps.patch ]; - bazel = bazel_4; + bazel = bazel_5; bazelFlags = [ "--//bazel:use_local_flex_bison" - "--javabase=@bazel_tools//tools/jdk:remote_jdk11" - "--host_javabase=@bazel_tools//tools/jdk:remote_jdk11" + "--java_runtime_version=local_jdk" + "--tool_java_runtime_version=local_jdk" ]; fetchAttrs = { - # Fixed output derivation hash after bazel fetch. - # This varies per platform, probably from the JDK pulled in being part - # of the output derivation ? Is there a more robust way to do this ? - # (Hashes extracted from the ofborg build logs) - sha256 = { - aarch64-linux = "sha256-Hf/jF5Y7QS2ZNFmSx2LIb0b6gdjditE97HwWGqQJac8="; - x86_64-linux = "sha256-WBp5Fi5vvKLVgRWvQ3VB7sY6ySpbwCdhU5KqZH9sLy4="; - }.${system} or (throw "No hash for system: ${system}"); + sha256 = "sha256-gZzrgZsHQ9zMoIDooVo9nRQbkJ41igme8wcNFj5EzWc="; }; nativeBuildInputs = [ + jdk # bazel uses that. bison # We use local flex and bison as WORKSPACE sources fail flex # .. to compile with newer glibc python3 diff --git a/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/pkgs/development/tools/language-servers/vhdl-ls/default.nix index 1c71adecebd20..1ca6f8930709e 100644 --- a/pkgs/development/tools/language-servers/vhdl-ls/default.nix +++ b/pkgs/development/tools/language-servers/vhdl-ls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.67.0"; + version = "0.77.0"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-3ixU1OWRgDNG4aFAZTqqTSt1Hw41mB+mScVsozA01gM="; + hash = "sha256-IAe4m/GC6ubCcZZESC6fToWVQT73XrhjJOiGCGzNxnQ="; }; - cargoHash = "sha256-SDXWFb0SDMqAmKrPOUryiMgPxv0yffcrqFVvFt4VPS4="; + cargoHash = "sha256-p7BL8WuQiB1KihwAl5aeO6Fa9INYRTQgoQPHcSMnaiQ="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/pkgs/development/tools/license-scanner/default.nix b/pkgs/development/tools/license-scanner/default.nix index b859f60782ca0..c1ea963f44b15 100644 --- a/pkgs/development/tools/license-scanner/default.nix +++ b/pkgs/development/tools/license-scanner/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "license-scanner"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "license-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-X7omSecbb85dtxPJtgdjLLgJQRJ7dh12DGwzIG0tYcE="; + hash = "sha256-2KUaVDAZxMwZ3AAMEUmRiuvenPSFliUp6rZCZrVTDps="; }; vendorHash = "sha256-7xa2tdCDCXkOZCLL8YPtO7i1VqD61Mow7un0690I8mM="; diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 1a7fb2a91dcc0..8e0b2689984ef 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.10.0"; + version = "1.11.0"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; - repo = pname; - rev = "refs/tags/${version}"; + repo = "memray"; + rev = "refs/tags/v${version}"; hash = "sha256-DaJ1Hhg7q4ckA5feUx0twOsmy28v5aBBCTUAkn43xAo="; }; @@ -63,9 +63,9 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Memory profiler for Python"; homepage = "https://bloomberg.github.io/memray/"; + changelog = "https://github.com/bloomberg/memray/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; platforms = platforms.linux; - changelog = "https://github.com/bloomberg/memray/releases/tag/${version}"; }; } diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index e417bc217f8db..8d62f1a51b7a1 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; - version = "2.7.6"; + version = "2.8.0"; src = fetchFromGitHub { owner = "MiniZinc"; repo = "libminizinc"; rev = finalAttrs.version; - sha256 = "sha256-1+bFF79lYt5RAx5gfNg7J3iB7ExxNgFUmBIcg6/hfQs="; + sha256 = "sha256-l6q9bRreQXn8jA1SSHS4UYN+SlPVCQGtJ1mRiJ3wFMU="; }; nativeBuildInputs = [ bison cmake flex jq ]; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 26337b0dcc7dd..f4540cdacc63b 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.55"; + version = "0.2.56"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OFtzqnXKj03papfBDQlgUonOA7eKGWDJeVZmfFkPUcc="; + hash = "sha256-Lco14Zwnad9AlujmPwhT5zRhsrifbQ3oi0AftjqsUQk="; }; - vendorHash = "sha256-45UPm7ThTSRTgzaD4tXoTaeT4hRlMKn01mvgJS1I7zI="; + vendorHash = "sha256-rQCxRUIzTJtL8gC9nYV+HKzB7hozyR24TCb+1y/qKM4="; doCheck = false; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 5145b3f275219..b6c43956adf70 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -9,45 +9,52 @@ , common-updater-scripts }: +assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions of PHP"; + let phpMajor = lib.versions.majorMinor php.version; - version = "1.92.0"; + version = "1.92.5"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-XXwsX4kJ/ubu8AjGj+baGM6SLJCTeefKCynpZ6UVyQo="; - "8.2" = "sha256-2pScIG8tWLrgd+dzUYWpV9Y4lcIujN4BTX6qzfmaank="; + "8.1" = "sha256-DT1ETsJGOebC0kt4zKiSMu/wF0TG2zUiNNh+Giokjz4="; + "8.2" = "sha256-X/inhHAA34aQSycoSzT28jfntH3QTZgHPId5zYgcWT4="; + "8.3" = "sha256-SHR+J+yFA2YxggdNPq2HtLkh9I3bG01TMk9EUKGkRM0="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-I+LTPimETlKVx6gTOfsxHlgphhkjlMxoGorVQkRWVP0="; - "8.2" = "sha256-Or5qIBDuHVfq7BEfnUtT2PMFNlt5Us1aWqtM+4ExOAA="; + "8.1" = "sha256-7aDO6shHWIAgby8qCwpc7aICnWyYvferqjDgtnYZCeI="; + "8.2" = "sha256-mpHS9zUjgJnxvi3np2sUS0GhtOjhDOzlepRByYbjUCk="; + "8.3" = "sha256-75C9NwMuUTNuAfdPRgtq4XK6bqo/IRa/SXfM7Wz2y90="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-SID/iTmrSBfz41joG8JaVi7zwEb5OHQ3dRp8PpN+HSg="; - "8.2" = "sha256-GveRe/XdY2d6X/m7ofyr+6Ha2GfnDtNL+M/VnZqMcqo="; + "8.1" = "sha256-Vj2rnKik+Fy+9yfbUMSOoiXTGm84YNPo1cfh9hojr9c="; + "8.2" = "sha256-lvWwwKJj3/ZxAQcnbcjv/0CLqDDRiOkFo2rJeMhZLHQ="; + "8.3" = "sha256-yqa5GE/FBINR3oFNTP1IZGnhSDYCfluRiEFiTSySjns="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-iT2oURI7suabC16ti6TQMBigU35TIujWpXSNdXIZDD4="; - "8.2" = "sha256-cmfANcQEn7IIe7uovACBAuqyo7SPZZOhwtdlPMiKTWI="; + "8.1" = "sha256-OcQtr16Qt6TsxPBG3OY/viGXqknKx5GdM/fcCJlFiaY="; + "8.2" = "sha256-ay/6JwB959bT2f18LGMB5560dIPAPSAY5Nby44FGBMc="; + "8.3" = "sha256-7yyhcusin7pLYZqjUgyIkDGmufIPX8cKWqplXetZzMU="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-zGunEfOLm7LmOoQcrkRFX8oZQQJIrXPKct5hNJyOlug="; - "8.2" = "sha256-qzt9NVKZYoJMKaX+u8CbGJR5dfUtSRYjV45mvSWl/P8="; + "8.1" = "sha256-l0xgj0tAjYNI0EwoZhnGpRadg5EJtBlt5WhylmZaGDg="; + "8.2" = "sha256-lD6lE6u9nzHhHPTPLoGKaDsZlvrpbshd+4fr4ua8H8c="; + "8.3" = "sha256-CMPv+pDPJVwQ4gDAnQxyeJXp4YYkwAVoSdS3a+49fDU="; }; }; }; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 77493bd166471..918bd2efab734 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, makeWrapper +{ lib, stdenv, fetchurl, fetchpatch, cmake, makeWrapper , llvm, libclang , flex , zlib @@ -15,6 +15,35 @@ stdenv.mkDerivation rec { sha256 = "2xwPEjln8k1iCwQM69UwAb89zwPkAPeFVqL/LhH+oGM="; }; + patches = [ + # Port to LLVM 15 + (fetchpatch { + url = "https://github.com/csmith-project/creduce/commit/e507cca4ccb32585c5692d49b8d907c1051c826c.patch"; + hash = "sha256-jO5E85AvHcjlErbUhzuQDXwQkhQsXklcTMQfWBd09OU="; + }) + (fetchpatch { + url = "https://github.com/csmith-project/creduce/commit/8d56bee3e1d2577fc8afd2ecc03b1323d6873404.patch"; + hash = "sha256-dRaBaJAYkvMyxKvfriOcg4D+4i6+6orZ85zws1AFx/s="; + }) + # Port to LLVM 16 + (fetchpatch { + url = "https://github.com/csmith-project/creduce/commit/8ab9a69caf13ce24172737e8bfd09de51a1ecb6a.patch"; + hash = "sha256-gPNXxYHnsyUvXmC0CGtsulH2Fu/EMnDE4GdOYc0UbiQ="; + }) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "-std=c++11" "-std=c++17" + '' + # On Linux, c-reduce's preferred way to reason about + # the cpu architecture/topology is to use 'lscpu', + # so let's make sure it knows where to find it: + + lib.optionalString stdenv.isLinux '' + substituteInPlace creduce/creduce_utils.pm --replace \ + lscpu ${util-linux}/bin/lscpu + ''; + nativeBuildInputs = [ cmake makeWrapper llvm.dev ]; buildInputs = [ # Ensure stdenv's CC is on PATH before clang-unwrapped @@ -24,14 +53,6 @@ stdenv.mkDerivation rec { flex zlib ] ++ (with perlPackages; [ perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey ]); - # On Linux, c-reduce's preferred way to reason about - # the cpu architecture/topology is to use 'lscpu', - # so let's make sure it knows where to find it: - postPatch = lib.optionalString stdenv.isLinux '' - substituteInPlace creduce/creduce_utils.pm --replace \ - lscpu ${util-linux}/bin/lscpu - ''; - postInstall = '' wrapProgram $out/bin/creduce --prefix PERL5LIB : "$PERL5LIB" ''; diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index 04c5cb0a83e44..52dc80fd0ac6c 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.3.5"; + version = "6.3.7"; src = fetchFromGitHub { owner = "devspace-sh"; repo = "devspace"; rev = "v${version}"; - hash = "sha256-hfUs+tCu0HW0mqUZVyJFyp9fneTsolpf6BjshA5FHQQ="; + hash = "sha256-pvAN1AbyqVw7zgqjZrNFxdfQLn3lYraQ1o7YZUYy6Y8="; }; vendorHash = null; diff --git a/pkgs/development/tools/misc/fzf-make/default.nix b/pkgs/development/tools/misc/fzf-make/default.nix index 26ff32368dd67..c46419dda732b 100644 --- a/pkgs/development/tools/misc/fzf-make/default.nix +++ b/pkgs/development/tools/misc/fzf-make/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.9.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-nuTy2VhUYgz4OgV3ZI/KcsbTBQOoxumf+IIdM5wDSN4="; + hash = "sha256-0fzc18OWCkGiSNNyZgtkv0J3n8C3L/w8UC7ejqt6efs="; }; - cargoHash = "sha256-/qnIhBJ+Ivrnowv1V+BBhcPLTiQV0tqFLPs0yQbKTXs="; + cargoHash = "sha256-GwqfH5NSJu6kNKg4aa7a+eqZf79JBdF9LxRa207Krwo="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/development/tools/misc/gdb/32-bit-BFD_VMA-format.patch b/pkgs/development/tools/misc/gdb/32-bit-BFD_VMA-format.patch deleted file mode 100644 index 41ce4540d2ddc..0000000000000 --- a/pkgs/development/tools/misc/gdb/32-bit-BFD_VMA-format.patch +++ /dev/null @@ -1,68 +0,0 @@ -Fix iWerror=format build for 32-bit systems. -https://sourceware.org/pipermail/gdb-patches/2022-May/189288.html ---- a/sim/cris/sim-if.c -+++ b/sim/cris/sim-if.c -@@ -257,7 +257,8 @@ cris_load_elf_file (SIM_DESC sd, struct bfd *abfd, sim_write_fn do_write) - - if (verbose) - sim_io_printf (sd, -- "Loading segment at 0x%" BFD_VMA_FMT "x, size 0x%lx\n", -+ "Loading segment at 0x%" BFD_VMA_FMT "x, " -+ "size 0x%" BFD_VMA_FMT "x\n", - lma, phdr[i].p_filesz); - - if (bfd_seek (abfd, phdr[i].p_offset, SEEK_SET) != 0 -@@ -265,7 +266,7 @@ cris_load_elf_file (SIM_DESC sd, struct bfd *abfd, sim_write_fn do_write) - { - sim_io_eprintf (sd, - "%s: could not read segment at 0x%" BFD_VMA_FMT "x, " -- "size 0x%lx\n", -+ "size 0x%" BFD_VMA_FMT "x\n", - STATE_MY_NAME (sd), lma, phdr[i].p_filesz); - free (buf); - return FALSE; -@@ -275,7 +276,7 @@ cris_load_elf_file (SIM_DESC sd, struct bfd *abfd, sim_write_fn do_write) - { - sim_io_eprintf (sd, - "%s: could not load segment at 0x%" BFD_VMA_FMT "x, " -- "size 0x%lx\n", -+ "size 0x%" BFD_VMA_FMT "x\n", - STATE_MY_NAME (sd), lma, phdr[i].p_filesz); - free (buf); - return FALSE; -@@ -572,7 +573,8 @@ cris_handle_interpreter (SIM_DESC sd, struct bfd *abfd) - memory area, so we go via a temporary area. Luckily, the - interpreter is supposed to be small, less than 0x40000 - bytes. */ -- sim_do_commandf (sd, "memory region 0x%" BFD_VMA_FMT "x,0x%lx", -+ sim_do_commandf (sd, "memory region 0x%" BFD_VMA_FMT "x," -+ "0x%" BFD_VMA_FMT "x", - interp_load_addr, interpsiz); - - /* Now that memory for the interpreter is defined, load it. */ ---- a/sim/m32c/syscalls.c -+++ b/sim/m32c/syscalls.c -@@ -299,8 +299,8 @@ m32c_syscall (int id) - - rv = gettimeofday (&tv, 0); - if (trace) -- printf ("gettimeofday: %ld sec %ld usec to 0x%x\n", tv.tv_sec, -- tv.tv_usec, tvaddr); -+ printf ("gettimeofday: %lld sec %lld usec to 0x%x\n", -+ (long long)tv.tv_sec, (long long)tv.tv_usec, tvaddr); - mem_put_si (tvaddr, tv.tv_sec); - mem_put_si (tvaddr + 4, tv.tv_usec); - put_reg (r0, rv); ---- a/sim/rx/syscalls.c -+++ b/sim/rx/syscalls.c -@@ -270,8 +270,8 @@ rx_syscall (int id) - - rv = gettimeofday (&tv, 0); - if (trace) -- printf ("gettimeofday: %ld sec %ld usec to 0x%x\n", tv.tv_sec, -- tv.tv_usec, tvaddr); -+ printf ("gettimeofday: %lld sec %lld usec to 0x%x\n", -+ (long long)tv.tv_sec, (long long)tv.tv_usec, tvaddr); - mem_put_si (tvaddr, tv.tv_sec); - mem_put_si (tvaddr + 4, tv.tv_usec); - put_reg (1, rv); diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 373f80a2f0522..2ded3b9a66c98 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -43,6 +43,7 @@ , cacert , glibcLocales , fetchFromGitHub +, fetchpatch2 , nixosTests }: @@ -123,16 +124,28 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2023-12-01"; + version = "2023-12-04"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "4d1c8505120961f10897b8fe9a070d4e193c9a13"; - hash = "sha256-vXTuE83GL15mgZHegbllVAsVdDFcWWSayPfZxTJN5ys="; + rev = "4dc8fe0b08edc421c251270ccd4be3e5bf9d66b4"; + hash = "sha256-FjyMb5ZbPa2GLrRuFMUP/foKb0KvXFKThvgc9faFIw8="; }; + patches = [ + # hydra-eval-jobs: don't use restrict-eval for Flakes + # https://github.com/NixOS/hydra/pull/1257 + # should be removed when https://github.com/NixOS/nix/pull/9547 + # lands in the nix version used by hydra + (fetchpatch2 { + url = "https://github.com/NixOS/hydra/commit/9370b0ef977bff7e84ac07a81a0e31e75989276b.patch"; + hash = "sha256-BRenC0lpWPgzfx42MPJBQ9VBamh5hZXuuVe6TXYKkdE="; + }) + ]; + buildInputs = [ + unzip libpqxx top-git mercurial @@ -179,7 +192,6 @@ stdenv.mkDerivation rec { makeWrapper pkg-config mdbook - unzip nukeReferences ]; @@ -248,6 +260,6 @@ stdenv.mkDerivation rec { homepage = "https://nixos.org/hydra"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ lheckemann mindavi das_j ]; + maintainers = with maintainers; [ lheckemann mindavi ] ++ teams.helsinki-systems.members; }; } diff --git a/pkgs/development/tools/misc/mdctags/default.nix b/pkgs/development/tools/misc/mdctags/default.nix index 7d8992b4e201c..acd6d39e97f6b 100644 --- a/pkgs/development/tools/misc/mdctags/default.nix +++ b/pkgs/development/tools/misc/mdctags/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/wsdjeg/mdctags.rs"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pacien ]; + mainProgram = "mdctags"; }; } diff --git a/pkgs/development/tools/misc/pest-ide-tools/default.nix b/pkgs/development/tools/misc/pest-ide-tools/default.nix index 3398810dace44..162817c683579 100644 --- a/pkgs/development/tools/misc/pest-ide-tools/default.nix +++ b/pkgs/development/tools/misc/pest-ide-tools/default.nix @@ -1,9 +1,11 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform , nix-update-script , pkg-config , openssl +, darwin }: rustPlatform.buildRustPackage rec { @@ -18,7 +20,11 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-SymtMdj7QVOEiSeTjmVidejFeGK8swnM6nfT7u18URs="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 5da91bccc1205..663f3184b221b 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -35,8 +35,12 @@ stdenv.mkDerivation rec { "ac_cv_func_posix_getgrgid_r=yes" ]; - # Silence "incompatible integer to pointer conversion passing 'gsize'" when building with Clang. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion"; + env.NIX_CFLAGS_COMPILE = toString ( + # Silence "incompatible integer to pointer conversion passing 'gsize'" when building with Clang. + lib.optionals stdenv.cc.isClang ["-Wno-int-conversion"] + # Silence fprintf format errors when building for Windows. + ++ lib.optionals stdenv.hostPlatform.isWindows ["-Wno-error=format"] + ); enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index f2b2561cafdcb..42455639bb571 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-EKDs0Xv38RLC3qDkb8QT3CMWdi7tEPRXxhlZiC/dyZo="; + hash = "sha256-aHxK1Wu6AHTYhhbW67e4Yb/uOArwsiZnW8qHXHFCu2w="; }; - vendorHash = "sha256-IKndnxeLy9hLFzs0SesRQzii9h8MX9FrEcpHaaKIq4k="; + vendorHash = "sha256-htBy+ie1RjlWkr5z3BA9us5z5VxLtl4q1pyiESsyMFY="; doCheck = false; diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 546b52d5e0a50..519a3f4f00913 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "runme"; - version = "2.0.2"; + version = "2.0.5"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-9BXDYcIV31KLDauBzRnMs55jAKu+56WkgSrE/V+gje4="; + hash = "sha256-l1ZTCLy9T+VrmFPzkjXCgIAFkotZ18BA8EYfM0HCCOA="; }; - vendorHash = "sha256-xQuxoizcxut4qjXqgMEWMROiG53goxEXQas5n/2NiaY="; + vendorHash = "sha256-vYSheywz9ZyQ0aNWFpUEn/hrrktKAhV+VLYv74k+/nM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/misc/rustywind/default.nix b/pkgs/development/tools/misc/rustywind/default.nix index c30ace5d8c27c..5fe1e15b8fa52 100644 --- a/pkgs/development/tools/misc/rustywind/default.nix +++ b/pkgs/development/tools/misc/rustywind/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rustywind"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "avencera"; repo = "rustywind"; rev = "v${version}"; - hash = "sha256-3VG3EIcNp1fcNctrQO+mcGkAObHYPZQGdU83mi7WxPs="; + hash = "sha256-gcSpifeOWq9kKmOqyO02DbcvR9tyTlE2kVkezpy7D5k="; }; - cargoHash = "sha256-hqGhh3YZ8Pz0hhC+HNdwc7PZVzGeMZqmctVjbQx7SQo="; + cargoHash = "sha256-m++IeB0XvfeARkh+yO9WQtc7luz+ThGD5niwwOPobKY="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index c15e7f6451be1..ce77855b419e4 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; - version = "2.4.12"; + version = "2.4.13"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-linux-x64.AppImage"; - hash = "sha256-QqGtozLZtrS5UgnLmsKWxqbcTykLhlossVxuN4WNYzo="; + hash = "sha256-0GIZQKQDY3arDUlxjQKWOHDB3j76xVwkx5H+8q+d0Rc="; }; desktopItem = makeDesktopItem { inherit name; diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 36145a05e592c..ac26ead01cff1 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "1.3.0"; + version = "1.3.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ikOKpQHMLPCC2IfqWvW0I1auiCdyIZZMu6nMGle/bE0="; + sha256 = "sha256-zNTel91c1ECg4z7xIu37GcSWHTxTKtxpGjH3TpiFQ1k="; }; - cargoHash = "sha256-tprtlG/M2ItE7Ay/9QWrZQHdVEPYD9hDJ+uPR8pq1Xk="; + cargoHash = "sha256-pT3z6t1W/DitH/GJJIJhQawslodKzIkCyO0yd9OlvAg="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 81ef5745c925a..b97f9b2221853 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.32.3"; + version = "0.32.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-uvSAqk9LE0NbOWn2rcygDu7Hl28Wu3KkM5UhI4aocGo="; + hash = "sha256-+z7Jg55BP9E7fwEYVnLY1lw06tizjaUPguKmqrfJ8jY="; }; - vendorHash = "sha256-xoyassGp//8YXG/B1e3kW96UvltQLa662ZlH9/CMzm0="; + vendorHash = "sha256-v0dESbGsafT+4C6pWhmNb4NT4m+kmtV+ZBld4x2TfJI="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 1948b6f8768a1..515ad042b2df1 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.11.0"; + version = "5.12.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-bN2LvuB/BD21SL5fG9QNPpR9hUk52U2BJJ6TFMhwDBk="; + hash = "sha256-NYtsfHdpkh+gPUF8moNEf4thQ9DliIALRrzcE2NSHsw="; }; - cargoHash = "sha256-V4hANIkReF7EEtFsBv1hA/Ftre6YQPs69LpG/GR0Egc="; + cargoHash = "sha256-J7T4SF2Ksuq7T2GRA/hUFZnrY2jBWmKD/sTjwS9/Kws="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.11.0/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.12.0/.github/workflows/publish.yml#L117-L121 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 0929aa5286b0e..d57010a4bad3c 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.78.0"; + version = "0.78.1"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "sha256-wuwZFTa8XGMN3dlpdaMYiKvyS3DJMUgqRgaDtj/s7vI="; + sha256 = "sha256-L+YEVZC7sIDYuCM3xpSfZLjA3B8XsW5hi+zV2NEgXTs="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/development/tools/misc/yakut/default.nix index 4c993c19cdcf5..c4589eefb4dee 100644 --- a/pkgs/development/tools/misc/yakut/default.nix +++ b/pkgs/development/tools/misc/yakut/default.nix @@ -46,6 +46,6 @@ buildPythonApplication rec { ''; homepage = "https://github.com/OpenCyphal/yakut/"; license = licenses.mit; - maintainers = [ teams.ororatech ]; + maintainers = teams.ororatech.members; }; } diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 074a5853ba281..fb5abd0fe6ad2 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mod"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "sha256-ZFAjiTCmx9o/rUa1vK1Fmz6sE695zzlexTyWJO05M6k="; + sha256 = "sha256-QkLARUN/NiN0D6VEhosdFJSce6DP+sWRWFwAEocZaOQ="; }; vendorHash = "sha256-5A4W99wcuXMWH0s+uykBWuKCxo8wr3GbTpUKj+Ql0os="; diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index a5ac2dd3380cc..9f9599e047dc3 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -114,6 +114,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; mainProgram = "mold"; - maintainers = with maintainers; [ azahi nitsky paveloom ]; + maintainers = with maintainers; [ azahi paveloom ]; }; } diff --git a/pkgs/development/tools/mongosh/package-lock.json b/pkgs/development/tools/mongosh/package-lock.json index 13776023623d3..f4779128f3a02 100644 --- a/pkgs/development/tools/mongosh/package-lock.json +++ b/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.0.1", + "version": "2.1.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.0.1", + "version": "2.1.1", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.0.1" + "@mongosh/cli-repl": "2.1.1" }, "bin": { "mongosh": "bin/mongosh.js" @@ -122,46 +122,48 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-sdk/client-cognito-identity": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.465.0.tgz", + "integrity": "sha512-Ku1034M9jjsXbLBS5DwQfcTwWwu2oxtmdbsxvEm4I7IUA/h1++hKPzZuJ6L9zo7I7GbA+WnCryviUdtbgCqTfA==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@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", + "@aws-sdk/client-sts": "3.465.0", + "@aws-sdk/core": "3.465.0", + "@aws-sdk/credential-provider-node": "3.465.0", + "@aws-sdk/middleware-host-header": "3.465.0", + "@aws-sdk/middleware-logger": "3.465.0", + "@aws-sdk/middleware-recursion-detection": "3.465.0", + "@aws-sdk/middleware-signing": "3.465.0", + "@aws-sdk/middleware-user-agent": "3.465.0", + "@aws-sdk/region-config-resolver": "3.465.0", + "@aws-sdk/types": "3.465.0", + "@aws-sdk/util-endpoints": "3.465.0", + "@aws-sdk/util-user-agent-browser": "3.465.0", + "@aws-sdk/util-user-agent-node": "3.465.0", + "@smithy/config-resolver": "^2.0.18", + "@smithy/fetch-http-handler": "^2.2.6", + "@smithy/hash-node": "^2.0.15", + "@smithy/invalid-dependency": "^2.0.13", + "@smithy/middleware-content-length": "^2.0.15", + "@smithy/middleware-endpoint": "^2.2.0", + "@smithy/middleware-retry": "^2.0.20", + "@smithy/middleware-serde": "^2.0.13", + "@smithy/middleware-stack": "^2.0.7", + "@smithy/node-config-provider": "^2.1.5", + "@smithy/node-http-handler": "^2.1.9", + "@smithy/protocol-http": "^3.0.9", + "@smithy/smithy-client": "^2.1.15", + "@smithy/types": "^2.5.0", + "@smithy/url-parser": "^2.0.13", + "@smithy/util-base64": "^2.0.1", "@smithy/util-body-length-browser": "^2.0.0", "@smithy/util-body-length-node": "^2.1.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", + "@smithy/util-defaults-mode-browser": "^2.0.19", + "@smithy/util-defaults-mode-node": "^2.0.25", + "@smithy/util-endpoints": "^1.0.4", + "@smithy/util-retry": "^2.0.6", + "@smithy/util-utf8": "^2.0.2", "tslib": "^2.5.0" }, "engines": { @@ -169,43 +171,45 @@ } }, "node_modules/@aws-sdk/client-sso": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.465.0.tgz", + "integrity": "sha512-JXDBa3Sl+LS0KEOs0PZoIjpNKEEGfeyFwdnRxi8Y1hMXNEKyJug1cI2Psqu2olpn4KeXwoP1BuITppZYdolOew==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.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-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", + "@aws-sdk/core": "3.465.0", + "@aws-sdk/middleware-host-header": "3.465.0", + "@aws-sdk/middleware-logger": "3.465.0", + "@aws-sdk/middleware-recursion-detection": "3.465.0", + "@aws-sdk/middleware-user-agent": "3.465.0", + "@aws-sdk/region-config-resolver": "3.465.0", + "@aws-sdk/types": "3.465.0", + "@aws-sdk/util-endpoints": "3.465.0", + "@aws-sdk/util-user-agent-browser": "3.465.0", + "@aws-sdk/util-user-agent-node": "3.465.0", + "@smithy/config-resolver": "^2.0.18", + "@smithy/fetch-http-handler": "^2.2.6", + "@smithy/hash-node": "^2.0.15", + "@smithy/invalid-dependency": "^2.0.13", + "@smithy/middleware-content-length": "^2.0.15", + "@smithy/middleware-endpoint": "^2.2.0", + "@smithy/middleware-retry": "^2.0.20", + "@smithy/middleware-serde": "^2.0.13", + "@smithy/middleware-stack": "^2.0.7", + "@smithy/node-config-provider": "^2.1.5", + "@smithy/node-http-handler": "^2.1.9", + "@smithy/protocol-http": "^3.0.9", + "@smithy/smithy-client": "^2.1.15", + "@smithy/types": "^2.5.0", + "@smithy/url-parser": "^2.0.13", + "@smithy/util-base64": "^2.0.1", "@smithy/util-body-length-browser": "^2.0.0", "@smithy/util-body-length-node": "^2.1.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", + "@smithy/util-defaults-mode-browser": "^2.0.19", + "@smithy/util-defaults-mode-node": "^2.0.25", + "@smithy/util-endpoints": "^1.0.4", + "@smithy/util-retry": "^2.0.6", + "@smithy/util-utf8": "^2.0.2", "tslib": "^2.5.0" }, "engines": { @@ -213,46 +217,48 @@ } }, "node_modules/@aws-sdk/client-sts": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.465.0.tgz", + "integrity": "sha512-rHi9ba6ssNbVjlWSdhi4C5newEhGhzkY9UE4KB+/Tj21zXfEP8r6uIltnQXPtun2SdA95Krh/yS1qQ4MRuzqyA==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.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-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", + "@aws-sdk/core": "3.465.0", + "@aws-sdk/credential-provider-node": "3.465.0", + "@aws-sdk/middleware-host-header": "3.465.0", + "@aws-sdk/middleware-logger": "3.465.0", + "@aws-sdk/middleware-recursion-detection": "3.465.0", + "@aws-sdk/middleware-sdk-sts": "3.465.0", + "@aws-sdk/middleware-signing": "3.465.0", + "@aws-sdk/middleware-user-agent": "3.465.0", + "@aws-sdk/region-config-resolver": "3.465.0", + "@aws-sdk/types": "3.465.0", + "@aws-sdk/util-endpoints": "3.465.0", + "@aws-sdk/util-user-agent-browser": "3.465.0", + "@aws-sdk/util-user-agent-node": "3.465.0", + "@smithy/config-resolver": "^2.0.18", + "@smithy/fetch-http-handler": "^2.2.6", + "@smithy/hash-node": "^2.0.15", + "@smithy/invalid-dependency": "^2.0.13", + "@smithy/middleware-content-length": "^2.0.15", + "@smithy/middleware-endpoint": "^2.2.0", + "@smithy/middleware-retry": "^2.0.20", + "@smithy/middleware-serde": "^2.0.13", + "@smithy/middleware-stack": "^2.0.7", + "@smithy/node-config-provider": "^2.1.5", + "@smithy/node-http-handler": "^2.1.9", + "@smithy/protocol-http": "^3.0.9", + "@smithy/smithy-client": "^2.1.15", + "@smithy/types": "^2.5.0", + "@smithy/url-parser": "^2.0.13", + "@smithy/util-base64": "^2.0.1", "@smithy/util-body-length-browser": "^2.0.0", "@smithy/util-body-length-node": "^2.1.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", + "@smithy/util-defaults-mode-browser": "^2.0.19", + "@smithy/util-defaults-mode-node": "^2.0.25", + "@smithy/util-endpoints": "^1.0.4", + "@smithy/util-retry": "^2.0.6", + "@smithy/util-utf8": "^2.0.2", "fast-xml-parser": "4.2.5", "tslib": "^2.5.0" }, @@ -260,15 +266,27 @@ "node": ">=14.0.0" } }, + "node_modules/@aws-sdk/core": { + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.465.0.tgz", + "integrity": "sha512-fHSIw/Rgex3KbrEKn6ZrUc2VcsOTpdBMeyYtfmsTOLSyDDOG9k3jelOvVbCbrK5N6uEUSM8hrnySEKg94UB0cg==", + "dependencies": { + "@smithy/smithy-client": "^2.1.15", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.465.0.tgz", + "integrity": "sha512-bvZNgA2Cx54eTSZm2bXCUbz5rQjcNqTONuvjNIl1CFK9lEj3o3rRU1EqAwX6AIrT1OIstnDr1Z6llxjwvTLqiA==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.418.0", - "@aws-sdk/types": "3.418.0", + "@aws-sdk/client-cognito-identity": "3.465.0", + "@aws-sdk/types": "3.465.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -276,13 +294,32 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.465.0.tgz", + "integrity": "sha512-fku37AgkB9KhCuWHE6mfvbWYU0X84Df6MQ60nYH7s/PiNEhkX2cVI6X6kOKjP1MNIwRcYt+oQDvplVKdHume+A==", "dependencies": { - "@aws-sdk/types": "3.418.0", + "@aws-sdk/types": "3.465.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.5.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-sdk/credential-provider-http": { + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.465.0.tgz", + "integrity": "sha512-Rj/zFgP0i0tpuaO+sm1csGU7NLQa1F9eE9c3VKbYECiXAZwrGJnY1TdG2iSsLpkMtyfOhRrRvAuYAUCUemWg3g==", + "dependencies": { + "@aws-sdk/types": "3.465.0", + "@smithy/fetch-http-handler": "^2.2.6", + "@smithy/node-http-handler": "^2.1.9", + "@smithy/property-provider": "^2.0.0", + "@smithy/protocol-http": "^3.0.9", + "@smithy/smithy-client": "^2.1.15", + "@smithy/types": "^2.5.0", + "@smithy/util-stream": "^2.0.20", "tslib": "^2.5.0" }, "engines": { @@ -290,19 +327,19 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "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", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.465.0.tgz", + "integrity": "sha512-B1MFufvdToAEMtfszilVnKer2S7P/OfMhkCizq2zuu8aU/CquRyHvKEQgWdvqunUDrFnVTc0kUZgsbBY0uPjLg==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.465.0", + "@aws-sdk/credential-provider-process": "3.465.0", + "@aws-sdk/credential-provider-sso": "3.465.0", + "@aws-sdk/credential-provider-web-identity": "3.465.0", + "@aws-sdk/types": "3.465.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.6", - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -310,20 +347,20 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "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", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.465.0.tgz", + "integrity": "sha512-R3VA9yJ0BvezvrDxcgPTv9VHbVPbzchLTrX5jLFSVuW/lPPYLUi/Cjtyg9C9Y7qRfoQS4fNMvSRhwO5/TF68gA==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.465.0", + "@aws-sdk/credential-provider-ini": "3.465.0", + "@aws-sdk/credential-provider-process": "3.465.0", + "@aws-sdk/credential-provider-sso": "3.465.0", + "@aws-sdk/credential-provider-web-identity": "3.465.0", + "@aws-sdk/types": "3.465.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.6", - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -331,14 +368,14 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.465.0.tgz", + "integrity": "sha512-YE6ZrRYwvb8969hWQnr4uvOJ8RU0JrNsk3vWTe/czly37ioZUEhi8jmpQp4f2mX/6U6buoFGWu5Se3VCdw2SFQ==", "dependencies": { - "@aws-sdk/types": "3.418.0", + "@aws-sdk/types": "3.465.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.6", - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -346,16 +383,16 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.465.0.tgz", + "integrity": "sha512-tLIP/4JQIJpn8yIg6RZRQ2nmvj5i4wLZvYvY4RtaFv2JrQUkmmTfyOZJuOBrIFRwJjx0fHmFu8DJjcOhMzllIQ==", "dependencies": { - "@aws-sdk/client-sso": "3.418.0", - "@aws-sdk/token-providers": "3.418.0", - "@aws-sdk/types": "3.418.0", + "@aws-sdk/client-sso": "3.465.0", + "@aws-sdk/token-providers": "3.465.0", + "@aws-sdk/types": "3.465.0", "@smithy/property-provider": "^2.0.0", "@smithy/shared-ini-file-loader": "^2.0.6", - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -363,13 +400,13 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.465.0.tgz", + "integrity": "sha512-B4Y75fMTZIniEU0yyqat+9NsQbYlXdqP5Y3bShkaG3pGLOHzF/xMlWuG+D3kkQ806PLYi+BgfVls4BcO+NyVcA==", "dependencies": { - "@aws-sdk/types": "3.418.0", + "@aws-sdk/types": "3.465.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -377,24 +414,25 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "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", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.465.0.tgz", + "integrity": "sha512-mtndyew33Fnv30zVCQLBkqvUeFvjAlgAe3yM/10U//dxsOW3pfYWZ6sMzDbuXHLCyROQXJqZfnsQKQs0rOaO0Q==", + "dependencies": { + "@aws-sdk/client-cognito-identity": "3.465.0", + "@aws-sdk/client-sso": "3.465.0", + "@aws-sdk/client-sts": "3.465.0", + "@aws-sdk/credential-provider-cognito-identity": "3.465.0", + "@aws-sdk/credential-provider-env": "3.465.0", + "@aws-sdk/credential-provider-http": "3.465.0", + "@aws-sdk/credential-provider-ini": "3.465.0", + "@aws-sdk/credential-provider-node": "3.465.0", + "@aws-sdk/credential-provider-process": "3.465.0", + "@aws-sdk/credential-provider-sso": "3.465.0", + "@aws-sdk/credential-provider-web-identity": "3.465.0", + "@aws-sdk/types": "3.465.0", "@smithy/credential-provider-imds": "^2.0.0", "@smithy/property-provider": "^2.0.0", - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -402,13 +440,13 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.465.0.tgz", + "integrity": "sha512-nnGva8eplwEJqdVzcb+xF2Fwua0PpiwxMEvpnIy73gNbetbJdgFIprryMLYes00xzJEqnew+LWdpcd3YyS34ZA==", "dependencies": { - "@aws-sdk/types": "3.418.0", - "@smithy/protocol-http": "^3.0.5", - "@smithy/types": "^2.3.3", + "@aws-sdk/types": "3.465.0", + "@smithy/protocol-http": "^3.0.9", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -416,12 +454,12 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.418.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.418.0.tgz", - "integrity": "sha512-StKGmyPVfoO/wdNTtKemYwoJsqIl4l7oqarQY7VSf2Mp3mqaa+njLViHsQbirYpyqpgUEusOnuTlH5utxJ1NsQ==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.465.0.tgz", + "integrity": "sha512-aGMx1aSlzDDgjZ7fSxLhGD5rkyCfHwq04TSB5fQAgDBqUjj4IQXZwmNglX0sLRmArXZtDglUVESOfKvTANJTPg==", "dependencies": { - "@aws-sdk/types": "3.418.0", - "@smithy/types": "^2.3.3", + "@aws-sdk/types": "3.465.0", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -429,13 +467,13 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.465.0.tgz", + "integrity": "sha512-ol3dlsTnryBhV5qkUvK5Yg3dRaV1NXIxYJaIkShrl8XAv4wRNcDJDmO5NYq5eVZ3zgV1nv6xIpZ//dDnnf6Z+g==", "dependencies": { - "@aws-sdk/types": "3.418.0", - "@smithy/protocol-http": "^3.0.5", - "@smithy/types": "^2.3.3", + "@aws-sdk/types": "3.465.0", + "@smithy/protocol-http": "^3.0.9", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -443,13 +481,13 @@ } }, "node_modules/@aws-sdk/middleware-sdk-sts": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.465.0.tgz", + "integrity": "sha512-PmTM5ycUe1RLAPrQXLCR8JzKamJuKDB0aIW4rx4/skurzWsEGRI47WHggf9N7sPie41IBGUhRbXcf7sfPjvI3Q==", "dependencies": { - "@aws-sdk/middleware-signing": "3.418.0", - "@aws-sdk/types": "3.418.0", - "@smithy/types": "^2.3.3", + "@aws-sdk/middleware-signing": "3.465.0", + "@aws-sdk/types": "3.465.0", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -457,16 +495,16 @@ } }, "node_modules/@aws-sdk/middleware-signing": { - "version": "3.418.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.418.0.tgz", - "integrity": "sha512-onvs5KoYQE8OlOE740RxWBGtsUyVIgAo0CzRKOQO63ZEYqpL1Os+MS1CGzdNhvQnJgJruE1WW+Ix8fjN30zKPA==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.465.0.tgz", + "integrity": "sha512-d90KONWXSC3jA0kqJ6u8ygS4LoMg1TmSM7bPhHyibJVAEhnrlB4Aq1CWljNbbtphGpdKy5/XRM9O0/XCXWKQ4w==", "dependencies": { - "@aws-sdk/types": "3.418.0", + "@aws-sdk/types": "3.465.0", "@smithy/property-provider": "^2.0.0", - "@smithy/protocol-http": "^3.0.5", + "@smithy/protocol-http": "^3.0.9", "@smithy/signature-v4": "^2.0.0", - "@smithy/types": "^2.3.3", - "@smithy/util-middleware": "^2.0.2", + "@smithy/types": "^2.5.0", + "@smithy/util-middleware": "^2.0.6", "tslib": "^2.5.0" }, "engines": { @@ -474,14 +512,14 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "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", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.465.0.tgz", + "integrity": "sha512-1MvIWMj2nktLOJN8Kh4jiTK28oL85fTeoXHZ+V8xYMzont6C6Y8gQPtg7ka+RotHwqWMrovfnANisnX8EzEP/Q==", + "dependencies": { + "@aws-sdk/types": "3.465.0", + "@aws-sdk/util-endpoints": "3.465.0", + "@smithy/protocol-http": "^3.0.9", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -489,14 +527,14 @@ } }, "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.465.0.tgz", + "integrity": "sha512-h0Phd2Ae873dsPSWuxqxz2yRC5NMeeWxQiJPh4j42HF8g7dZK7tMQPkYznAoA/BzSBsEX87sbr3MmigquSyUTA==", "dependencies": { - "@smithy/node-config-provider": "^2.0.12", - "@smithy/types": "^2.3.3", + "@smithy/node-config-provider": "^2.1.5", + "@smithy/types": "^2.5.0", "@smithy/util-config-provider": "^2.0.0", - "@smithy/util-middleware": "^2.0.2", + "@smithy/util-middleware": "^2.0.6", "tslib": "^2.5.0" }, "engines": { @@ -504,44 +542,46 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.418.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.418.0.tgz", - "integrity": "sha512-9P7Q0VN0hEzTngy3Sz5eya2qEOEf0Q8qf1vB3um0gE6ID6EVAdz/nc/DztfN32MFxk8FeVBrCP5vWdoOzmd72g==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.465.0.tgz", + "integrity": "sha512-NaZbsyLs3whzRHGV27hrRwEdXB/tEK6tqn/aCNBy862LhVzocY1A+eYLKrnrvpraOOd2vyAuOtvvB3RMIdiL6g==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.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-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", + "@aws-sdk/middleware-host-header": "3.465.0", + "@aws-sdk/middleware-logger": "3.465.0", + "@aws-sdk/middleware-recursion-detection": "3.465.0", + "@aws-sdk/middleware-user-agent": "3.465.0", + "@aws-sdk/region-config-resolver": "3.465.0", + "@aws-sdk/types": "3.465.0", + "@aws-sdk/util-endpoints": "3.465.0", + "@aws-sdk/util-user-agent-browser": "3.465.0", + "@aws-sdk/util-user-agent-node": "3.465.0", + "@smithy/config-resolver": "^2.0.18", + "@smithy/fetch-http-handler": "^2.2.6", + "@smithy/hash-node": "^2.0.15", + "@smithy/invalid-dependency": "^2.0.13", + "@smithy/middleware-content-length": "^2.0.15", + "@smithy/middleware-endpoint": "^2.2.0", + "@smithy/middleware-retry": "^2.0.20", + "@smithy/middleware-serde": "^2.0.13", + "@smithy/middleware-stack": "^2.0.7", + "@smithy/node-config-provider": "^2.1.5", + "@smithy/node-http-handler": "^2.1.9", "@smithy/property-provider": "^2.0.0", - "@smithy/protocol-http": "^3.0.5", + "@smithy/protocol-http": "^3.0.9", "@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/smithy-client": "^2.1.15", + "@smithy/types": "^2.5.0", + "@smithy/url-parser": "^2.0.13", + "@smithy/util-base64": "^2.0.1", "@smithy/util-body-length-browser": "^2.0.0", "@smithy/util-body-length-node": "^2.1.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", + "@smithy/util-defaults-mode-browser": "^2.0.19", + "@smithy/util-defaults-mode-node": "^2.0.25", + "@smithy/util-endpoints": "^1.0.4", + "@smithy/util-retry": "^2.0.6", + "@smithy/util-utf8": "^2.0.2", "tslib": "^2.5.0" }, "engines": { @@ -549,11 +589,11 @@ } }, "node_modules/@aws-sdk/types": { - "version": "3.418.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.418.0.tgz", - "integrity": "sha512-y4PQSH+ulfFLY0+FYkaK4qbIaQI9IJNMO2xsxukW6/aNoApNymN1D2FSi2la8Qbp/iPjNDKsG8suNPm9NtsWXQ==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.465.0.tgz", + "integrity": "sha512-Clqu2eD50OOzwSftGpzJrIOGev/7VJhJpc02SeS4cqFgI9EVd+rnFKS/Ux0kcwjLQBMiPcCLtql3KAHApFHAIA==", "dependencies": { - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -561,11 +601,12 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.418.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.418.0.tgz", - "integrity": "sha512-sYSDwRTl7yE7LhHkPzemGzmIXFVHSsi3AQ1KeNEk84eBqxMHHcCc2kqklaBk2roXWe50QDgRMy1ikZUxvtzNHQ==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.465.0.tgz", + "integrity": "sha512-lDpBN1faVw8Udg5hIo+LJaNfllbBF86PCisv628vfcggO8/EArL/v2Eos0KeqVT8yaINXCRSagwfo5TNTuW0KQ==", "dependencies": { - "@aws-sdk/types": "3.418.0", + "@aws-sdk/types": "3.465.0", + "@smithy/util-endpoints": "^1.0.4", "tslib": "^2.5.0" }, "engines": { @@ -573,9 +614,9 @@ } }, "node_modules/@aws-sdk/util-locate-window": { - "version": "3.310.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.310.0.tgz", - "integrity": "sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.465.0.tgz", + "integrity": "sha512-f+QNcWGswredzC1ExNAB/QzODlxwaTdXkNT5cvke2RLX8SFU5pYk6h4uCtWC0vWPELzOfMfloBrJefBzlarhsw==", "dependencies": { "tslib": "^2.5.0" }, @@ -584,24 +625,24 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.465.0.tgz", + "integrity": "sha512-RM+LjkIsmUCBJ4yQeBnkJWJTjPOPqcNaKv8bpZxatIHdvzGhXLnWLNi3qHlBsJB2mKtKRet6nAUmKmzZR1sDzA==", "dependencies": { - "@aws-sdk/types": "3.418.0", - "@smithy/types": "^2.3.3", + "@aws-sdk/types": "3.465.0", + "@smithy/types": "^2.5.0", "bowser": "^2.11.0", "tslib": "^2.5.0" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "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==", + "version": "3.465.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.465.0.tgz", + "integrity": "sha512-XsHbq7gLCiGdy6FQ7/5nGslK0ij3Iuh051djuIICvNurlds5cqKLiBe63gX3IUUwxJcrKh4xBGviQJ52KdVSeg==", "dependencies": { - "@aws-sdk/types": "3.418.0", - "@smithy/node-config-provider": "^2.0.12", - "@smithy/types": "^2.3.3", + "@aws-sdk/types": "3.465.0", + "@smithy/node-config-provider": "^2.1.5", + "@smithy/types": "^2.5.0", "tslib": "^2.5.0" }, "engines": { @@ -625,11 +666,11 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "dependencies": { - "@babel/highlight": "^7.22.13", + "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" }, "engines": { @@ -637,29 +678,29 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", - "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz", + "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz", - "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.5.tgz", + "integrity": "sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.22.15", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.5", "@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/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.23.5", + "@babel/parser": "^7.23.5", "@babel/template": "^7.22.15", - "@babel/traverse": "^7.22.20", - "@babel/types": "^7.22.19", - "convert-source-map": "^1.7.0", + "@babel/traverse": "^7.23.5", + "@babel/types": "^7.23.5", + "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", @@ -682,11 +723,11 @@ } }, "node_modules/@babel/generator": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz", - "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz", + "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==", "dependencies": { - "@babel/types": "^7.22.15", + "@babel/types": "^7.23.5", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -727,12 +768,12 @@ } }, "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==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dependencies": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" @@ -761,9 +802,9 @@ } }, "node_modules/@babel/helper-module-transforms": { - "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==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", + "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-module-imports": "^7.22.15", @@ -809,9 +850,9 @@ } }, "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==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "engines": { "node": ">=6.9.0" } @@ -825,30 +866,30 @@ } }, "node_modules/@babel/helper-validator-option": { - "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==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", + "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz", - "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.5.tgz", + "integrity": "sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==", "dependencies": { "@babel/template": "^7.22.15", - "@babel/traverse": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/traverse": "^7.23.5", + "@babel/types": "^7.23.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", @@ -859,9 +900,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.16", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz", - "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz", + "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==", "bin": { "parser": "bin/babel-parser.js" }, @@ -870,9 +911,9 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "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==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz", + "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -884,9 +925,9 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz", - "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz", + "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -898,9 +939,9 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz", - "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz", + "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -925,18 +966,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.20.tgz", - "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.5.tgz", + "integrity": "sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==", "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.22.15", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.5", "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.22.5", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.16", - "@babel/types": "^7.22.19", + "@babel/parser": "^7.23.5", + "@babel/types": "^7.23.5", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -945,12 +986,12 @@ } }, "node_modules/@babel/types": { - "version": "7.22.19", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz", - "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz", + "integrity": "sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==", "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.19", + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -970,6 +1011,47 @@ "@hapi/hoek": "^9.0.0" } }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", @@ -1005,21 +1087,21 @@ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" }, "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==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@mongodb-js/devtools-connect": { - "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==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-2.4.3.tgz", + "integrity": "sha512-JS288VVm/Mu8+kHL8ybKCpL2/AiA4CWhWun7FR3iRNH5NXbT9c6aovEc2pxjsCbmYUjzuTsRoIo9LTrNoCvNrQ==", "dependencies": { "lodash.merge": "^4.6.2", - "mongodb-connection-string-url": "^2.6.0", + "mongodb-connection-string-url": "^3.0.0", "system-ca": "^1.0.2" }, "optionalDependencies": { @@ -1033,9 +1115,13 @@ } }, "node_modules/@mongodb-js/mongodb-constants": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@mongodb-js/mongodb-constants/-/mongodb-constants-0.2.2.tgz", - "integrity": "sha512-vm1G+/WRWmXGyE9ZnhDv9toe+LRu1x0F/lGEwqWESfBiUUUuVZhj25fS2o4IL7H4pJ31sFxr7/gu+ER8OkmtzA==" + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@mongodb-js/mongodb-constants/-/mongodb-constants-0.7.2.tgz", + "integrity": "sha512-ElaVCCQo80vQTX865RXbJoITaB6kHJmOWqv0ANO5I/S9nP5LaIEfA2QQuBmE4cHOmb3ZGfzLfyCCfwbeSBwE6w==", + "dependencies": { + "dedent": "^1.5.1", + "semver": "^7.5.4" + } }, "node_modules/@mongodb-js/oidc-plugin": { "version": "0.3.0", @@ -1052,30 +1138,30 @@ } }, "node_modules/@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==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.1.tgz", + "integrity": "sha512-t7c5K033joZZMspnHg/gWPE4kandgc2OxE74aYOtGKfgB9VPuVJPix0H6fhmm2erj5PBJ21mqcx34lpIGtUCsQ==", "dependencies": { "sparse-bitfield": "^3.0.3" } }, "node_modules/@mongosh/arg-parser": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.0.1.tgz", - "integrity": "sha512-rPMof8rQXyzoZNG/ZQsQPTArPsPCBEf/fdjbNbebn+Vgq2bsz8AF7vVIr5aF6bwgJlYcNZcoAytdLIK1NOO0XA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-2.1.1.tgz", + "integrity": "sha512-D0+FiUc9lH/LWkyXLM2s1WXI9pzfX6tvafAOwY9Lk73zUITfGzPtmup2tOyH4nI6H2jgVEMFg0GdBnAb2i/m/g==", "dependencies": { - "@mongosh/errors": "2.0.1", - "@mongosh/i18n": "2.0.1", - "mongodb-connection-string-url": "^2.6.0" + "@mongosh/errors": "2.1.1", + "@mongosh/i18n": "2.1.1", + "mongodb-connection-string-url": "^3.0.0" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/async-rewriter2": { - "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==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-2.1.1.tgz", + "integrity": "sha512-fm5s5uiH5oTVpvXZPgovjl/X3ZiL/lKDi2Plj0s1bOAPeWTQ6qaiPD1f/fbrEI2iVU+JyDk8clVMPV4duaOjvw==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1092,12 +1178,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-2.0.1.tgz", - "integrity": "sha512-IJUhc9nVM0Uc7C31L145G0+R3eNDF3uOeX3VZiJm+fJyf1ALbS10dcZ2+/dJ30b6pcluGPv4y6k/3MAd+mdExw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-2.1.1.tgz", + "integrity": "sha512-va1IXrQJ+3OcXbKIdQlBk0LeSgfTYdUbmc8vr/AwnTh+yZP+wd0viHE3l6KzO62H2d3aIfEcthfGReeRuISVHA==", "dependencies": { - "@mongodb-js/mongodb-constants": "^0.2.2", - "@mongosh/shell-api": "2.0.1", + "@mongodb-js/mongodb-constants": "^0.7.1", + "@mongosh/shell-api": "2.1.1", "semver": "^7.5.4" }, "engines": { @@ -1105,31 +1191,31 @@ } }, "node_modules/@mongosh/cli-repl": { - "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", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-2.1.1.tgz", + "integrity": "sha512-uZyFtIWwsoSrpDE5f07Xg0Dz76Gpstqum4GfhIpsKQzAO8i9w2YCTK5P7fozmrkwixN5gNqYvUP+DKHMid+olw==", + "dependencies": { + "@mongosh/arg-parser": "2.1.1", + "@mongosh/autocomplete": "2.1.1", + "@mongosh/editor": "2.1.1", + "@mongosh/errors": "2.1.1", + "@mongosh/history": "2.1.1", + "@mongosh/i18n": "2.1.1", + "@mongosh/js-multiline-to-singleline": "2.1.1", + "@mongosh/logging": "2.1.1", + "@mongosh/service-provider-core": "2.1.1", + "@mongosh/service-provider-server": "2.1.1", + "@mongosh/shell-api": "2.1.1", + "@mongosh/shell-evaluator": "2.1.1", + "@mongosh/snippet-manager": "2.1.1", + "@mongosh/types": "2.1.1", "analytics-node": "^5.1.2", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^1.0.0", "askpassword": "^1.2.4", "is-recoverable-error": "^1.0.3", "js-yaml": "^4.1.0", - "mongodb-connection-string-url": "^2.6.0", + "mongodb-connection-string-url": "^3.0.0", "mongodb-log-writer": "^1.4.0", "numeral": "^2.0.6", "pretty-repl": "^4.0.0", @@ -1152,15 +1238,15 @@ } }, "node_modules/@mongosh/editor": { - "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", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/editor/-/editor-2.1.1.tgz", + "integrity": "sha512-5AYuVbmXaUawa2yN/lUqkre4v5hCXuAj5ss4gVPz9ioOewLwFORO4gEPsnzKkQHXvFrtiolen2aSJDlneRLSKg==", + "dependencies": { + "@mongosh/js-multiline-to-singleline": "2.1.1", + "@mongosh/service-provider-core": "2.1.1", + "@mongosh/shell-api": "2.1.1", + "@mongosh/shell-evaluator": "2.1.1", + "@mongosh/types": "2.1.1", "js-beautify": "^1.14.0" }, "engines": { @@ -1168,19 +1254,19 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.0.1.tgz", - "integrity": "sha512-hr1jvonFgjLz1ZdtIRma69dnNKdGXSOxAoZwj091jGChI4OZfGVvUIqd8pLGdfxnFHil6Rr58MwFRtlL6gQhPA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-2.1.1.tgz", + "integrity": "sha512-Dw0qb+h6QiO8/bhuyTBK0aANMamuQjpcjdA35H+L78CS4c5iog6rSd3x0RISivhRsvGgGxE+JLcOuUyQsu2v4Q==", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.0.1.tgz", - "integrity": "sha512-elOd9I2/QuMc+JORH3VfIQWZ6jCzTIzkZcncHOwMHQ01TxmSf4QTyxzWyM+BjSYXev0XTc71h0WngIoq3Kx1OQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-2.1.1.tgz", + "integrity": "sha512-PFfyq3jGAoxTld/T8CrZpardch1IWtEAJnyOcVVgL+pdspmrowhIPBd8HOyOM5C2wjCjDmqhNtBLaJ5iuOMmPg==", "dependencies": { - "mongodb-connection-string-url": "^2.6.0", + "mongodb-connection-string-url": "^3.0.0", "mongodb-redact": "^0.2.2" }, "engines": { @@ -1188,11 +1274,11 @@ } }, "node_modules/@mongosh/i18n": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.0.1.tgz", - "integrity": "sha512-6PMyQ457E206cYHgXEf1ylkwa/pE/0cV5Os7/lx4sTYAy08AUhBvzQcGOAQ8l6RWDO7my4fB9GfKi0U26MlK7Q==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-2.1.1.tgz", + "integrity": "sha512-i6ff4kdtHSfErGkYrEj8lSh/LBFIiSD3wecppy1FUMuDHBPfqbL42cGNV771yoyNUM7FlYb3CiXMXFDmqma2Vw==", "dependencies": { - "@mongosh/errors": "2.0.1", + "@mongosh/errors": "2.1.1", "mustache": "^4.0.0" }, "engines": { @@ -1200,9 +1286,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "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==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.1.1.tgz", + "integrity": "sha512-hj6fZGOspeMOQVXTbm8ep2Rc+Rm9O6/I1dt5OpUaN4heyAlMLLugdZU+zYWksMo9NEnfNMHjHQUoQo0VBEJXEQ==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1212,14 +1298,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-2.0.1.tgz", - "integrity": "sha512-QmczNhg3VM3O9IOa4si9dcjosAhqyOd2wiulU0AlBZ4e6ZTaj3wSnBbs+c1AD+8pFz1u+GMgI1/0bCVI/Krpnw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-2.1.1.tgz", + "integrity": "sha512-g0ZcfvmukiGll/e06BlNZdUMq5oiQ5HhwNKsLuJADWcV76ebBjAhnyB00pPMhSfqszmn4dri1O3k1IVRDlwmag==", "dependencies": { - "@mongodb-js/devtools-connect": "^2.4.1", - "@mongosh/errors": "2.0.1", - "@mongosh/history": "2.0.1", - "@mongosh/types": "2.0.1", + "@mongodb-js/devtools-connect": "^2.4.3", + "@mongosh/errors": "2.1.1", + "@mongosh/history": "2.1.1", + "@mongosh/types": "2.1.1", "mongodb-log-writer": "^1.4.0", "mongodb-redact": "^0.2.2" }, @@ -1228,15 +1314,15 @@ } }, "node_modules/@mongosh/service-provider-core": { - "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==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-2.1.1.tgz", + "integrity": "sha512-7UMymGS3sQopiR0WJetEp1//7ga10okdEg9c4fOvwjU22k4G8X+/ngnrcZLcTvPnASkYjMjq4puiem+QZY3mVQ==", "dependencies": { "@aws-sdk/credential-providers": "^3.347.1", - "@mongosh/errors": "2.0.1", - "bson": "^6.0.0", - "mongodb": "^6.0.0", - "mongodb-build-info": "^1.6.2" + "@mongosh/errors": "2.1.1", + "bson": "^6.2.0", + "mongodb": "^6.3.0", + "mongodb-build-info": "^1.7.1" }, "engines": { "node": ">=14.15.1" @@ -1246,39 +1332,39 @@ } }, "node_modules/@mongosh/service-provider-server": { - "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==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-2.1.1.tgz", + "integrity": "sha512-pAnz8VdBBEqCUTLztPELSIrWXxC5K9acdSosTg31vYK0fbg7nx5Q55amPXLRxNlXPa3wFHYGt1R9hCD5PwSA+A==", "dependencies": { - "@mongodb-js/devtools-connect": "^2.4.1", + "@mongodb-js/devtools-connect": "^2.4.3", "@mongodb-js/oidc-plugin": "^0.3.0", - "@mongosh/errors": "2.0.1", - "@mongosh/service-provider-core": "2.0.1", - "@mongosh/types": "2.0.1", + "@mongosh/errors": "2.1.1", + "@mongosh/service-provider-core": "2.1.1", + "@mongosh/types": "2.1.1", "@types/sinon-chai": "^3.2.4", "aws4": "^1.11.0", - "mongodb": "^6.0.0", - "mongodb-connection-string-url": "^2.6.0", + "mongodb": "^6.3.0", + "mongodb-connection-string-url": "^3.0.0", "socks": "^2.7.1" }, "engines": { "node": ">=14.15.1" }, "optionalDependencies": { - "kerberos": "2.0.1", + "kerberos": "^2.1.0", "mongodb-client-encryption": "^6.0.0" } }, "node_modules/@mongosh/shell-api": { - "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", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-2.1.1.tgz", + "integrity": "sha512-uOEgd4bNah1QVeN6Sqxq+tCHmxlecul0AzL5829Axv3Aa1cZnERZMgbIPyo4JoMB0wTtsgjsJHngBBaDUdkuUQ==", + "dependencies": { + "@mongosh/arg-parser": "2.1.1", + "@mongosh/errors": "2.1.1", + "@mongosh/history": "2.1.1", + "@mongosh/i18n": "2.1.1", + "@mongosh/service-provider-core": "2.1.1", "mongodb-redact": "^0.2.2" }, "engines": { @@ -1286,27 +1372,27 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-2.0.1.tgz", - "integrity": "sha512-kWkE6uLf3WtWHU/sgqWQjJ7nsDhFdWW9L4wtoiKfGjGgYu8bHY/PM0PI0RUGBGagpx/OXfZ4P95J6T0BTqMdHA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-2.1.1.tgz", + "integrity": "sha512-h3OGG8r2dGt7xRuRwVVDcE8bMgzHe2XROdln8Cps/6Hb5mEDkg1JPT5HlJLmbk5j5IuEnr95dAxAzt/l5+461g==", "dependencies": { - "@mongosh/async-rewriter2": "2.0.1", - "@mongosh/history": "2.0.1", - "@mongosh/shell-api": "2.0.1" + "@mongosh/async-rewriter2": "2.1.1", + "@mongosh/history": "2.1.1", + "@mongosh/shell-api": "2.1.1" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "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==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-2.1.1.tgz", + "integrity": "sha512-1RyauOaXZAeTtbQJM3RaTciF3QWzM60e6gu4LS6uI7pm/l5TQlzFC2SWCu07Qm4Fp5SnLs7yKbW6WvNXj7Q6+w==", "dependencies": { - "@mongosh/errors": "2.0.1", - "@mongosh/shell-api": "2.0.1", - "@mongosh/types": "2.0.1", - "bson": "^6.0.0", + "@mongosh/errors": "2.1.1", + "@mongosh/shell-api": "2.1.1", + "@mongosh/types": "2.1.1", + "bson": "^6.2.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", "joi": "^17.4.0", @@ -1318,11 +1404,11 @@ } }, "node_modules/@mongosh/types": { - "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==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-2.1.1.tgz", + "integrity": "sha512-YcaHfurVlVvlKBMYXkV+JYg24urEJa4cmp/cMF/fqoBi6F+MC6n/2BlG4eqwWyZ3KtUzqCCgocBebt7e61yHKA==", "dependencies": { - "@mongodb-js/devtools-connect": "^2.4.1" + "@mongodb-js/devtools-connect": "^2.4.3" }, "engines": { "node": ">=14.15.1" @@ -1333,6 +1419,15 @@ "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz", "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==" }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true, + "engines": { + "node": ">=14" + } + }, "node_modules/@segment/loosely-validate-event": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz", @@ -1361,11 +1456,11 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "node_modules/@smithy/abort-controller": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.9.tgz", - "integrity": "sha512-8liHOEbx99xcy4VndeQNQhyA0LS+e7UqsuRnDTSIA26IKBv/7vA9w09KOd4fgNULrvX0r3WpA6cwsQTRJpSWkg==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.14.tgz", + "integrity": "sha512-zXtteuYLWbSXnzI3O6xq3FYvigYZFW8mdytGibfarLL2lxHto9L3ILtGVnVGmFZa7SDh62l39EnU5hesLN87Fw==", "dependencies": { - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -1373,14 +1468,14 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.10.tgz", - "integrity": "sha512-MwToDsCltHjumkCuRn883qoNeJUawc2b8sX9caSn5vLz6J5crU1IklklNxWCaMO2z2nDL91Po4b/aI1eHv5PfA==", + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.19.tgz", + "integrity": "sha512-JsghnQ5zjWmjEVY8TFOulLdEOCj09SjRLugrHlkPZTIBBm7PQitCFVLThbsKPZQOP7N3ME1DU1nKUc1UaVnBog==", "dependencies": { - "@smithy/node-config-provider": "^2.0.12", - "@smithy/types": "^2.3.3", + "@smithy/node-config-provider": "^2.1.6", + "@smithy/types": "^2.6.0", "@smithy/util-config-provider": "^2.0.0", - "@smithy/util-middleware": "^2.0.2", + "@smithy/util-middleware": "^2.0.7", "tslib": "^2.5.0" }, "engines": { @@ -1388,14 +1483,14 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "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", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.1.2.tgz", + "integrity": "sha512-Y62jBWdoLPSYjr9fFvJf+KwTa1EunjVr6NryTEWCnwIY93OJxwV4t0qxjwdPl/XMsUkq79ppNJSEQN6Ohnhxjw==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.6", + "@smithy/property-provider": "^2.0.15", + "@smithy/types": "^2.6.0", + "@smithy/url-parser": "^2.0.14", "tslib": "^2.5.0" }, "engines": { @@ -1403,36 +1498,36 @@ } }, "node_modules/@smithy/eventstream-codec": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.9.tgz", - "integrity": "sha512-sy0pcbKnawt1iu+qCoSFbs/h9PAaUgvlJEO3lqkE1HFFj4p5RgL98vH+9CyDoj6YY82cG5XsorFmcLqQJHTOYw==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.14.tgz", + "integrity": "sha512-g/OU/MeWGfHDygoXgMWfG/Xb0QqDnAGcM9t2FRrVAhleXYRddGOEnfanR5cmHgB9ue52MJsyorqFjckzXsylaA==", "dependencies": { "@aws-crypto/crc32": "3.0.0", - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "@smithy/util-hex-encoding": "^2.0.0", "tslib": "^2.5.0" } }, "node_modules/@smithy/fetch-http-handler": { - "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": "^3.0.5", - "@smithy/querystring-builder": "^2.0.9", - "@smithy/types": "^2.3.3", - "@smithy/util-base64": "^2.0.0", + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.7.tgz", + "integrity": "sha512-iSDBjxuH9TgrtMYAr7j5evjvkvgwLY3y+9D547uep+JNkZ1ZT+BaeU20j6I/bO/i26ilCWFImrlXTPsfQtZdIQ==", + "dependencies": { + "@smithy/protocol-http": "^3.0.10", + "@smithy/querystring-builder": "^2.0.14", + "@smithy/types": "^2.6.0", + "@smithy/util-base64": "^2.0.1", "tslib": "^2.5.0" } }, "node_modules/@smithy/hash-node": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.9.tgz", - "integrity": "sha512-XP3yWd5wyCtiVmsY5Nuq/FUwyCEQ6YG7DsvRh7ThldNukGpCzyFdP8eivZJVjn4Fx7oYrrOnVoYZ0WEgpW1AvQ==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.16.tgz", + "integrity": "sha512-Wbi9A0PacMYUOwjAulQP90Wl3mQ6NDwnyrZQzFjDz+UzjXOSyQMgBrTkUBz+pVoYVlX3DUu24gWMZBcit+wOGg==", "dependencies": { - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "@smithy/util-buffer-from": "^2.0.0", - "@smithy/util-utf8": "^2.0.0", + "@smithy/util-utf8": "^2.0.2", "tslib": "^2.5.0" }, "engines": { @@ -1440,11 +1535,11 @@ } }, "node_modules/@smithy/invalid-dependency": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.9.tgz", - "integrity": "sha512-RuJqhYf8nViK96IIO9JbTtjDUuFItVfuuJhWw2yk7fv67yltQ7fZD6IQ2OsHHluoVmstnQJuCg5raXJR696Ubw==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.14.tgz", + "integrity": "sha512-d8ohpwZo9RzTpGlAfsWtfm1SHBSU7+N4iuZ6MzR10xDTujJJWtmXYHK1uzcr7rggbpUTaWyHpPFgnf91q0EFqQ==", "dependencies": { - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" } }, @@ -1460,12 +1555,12 @@ } }, "node_modules/@smithy/middleware-content-length": { - "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==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.16.tgz", + "integrity": "sha512-9ddDia3pp1d3XzLXKcm7QebGxLq9iwKf+J1LapvlSOhpF8EM9SjMeSrMOOFgG+2TfW5K3+qz4IAJYYm7INYCng==", "dependencies": { - "@smithy/protocol-http": "^3.0.5", - "@smithy/types": "^2.3.3", + "@smithy/protocol-http": "^3.0.10", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -1473,14 +1568,16 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "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", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.2.1.tgz", + "integrity": "sha512-dVDS7HNJl/wb0lpByXor6whqDbb1YlLoaoWYoelyYzLHioXOE7y/0iDwJWtDcN36/tVCw9EPBFZ3aans84jLpg==", + "dependencies": { + "@smithy/middleware-serde": "^2.0.14", + "@smithy/node-config-provider": "^2.1.6", + "@smithy/shared-ini-file-loader": "^2.2.5", + "@smithy/types": "^2.6.0", + "@smithy/url-parser": "^2.0.14", + "@smithy/util-middleware": "^2.0.7", "tslib": "^2.5.0" }, "engines": { @@ -1488,16 +1585,16 @@ } }, "node_modules/@smithy/middleware-retry": { - "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", + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.21.tgz", + "integrity": "sha512-EZS1EXv1k6IJX6hyu/0yNQuPcPaXwG8SWljQHYueyRbOxmqYgoWMWPtfZj0xRRQ4YtLawQSpBgAeiJltq8/MPw==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.6", + "@smithy/protocol-http": "^3.0.10", + "@smithy/service-error-classification": "^2.0.7", + "@smithy/types": "^2.6.0", + "@smithy/util-middleware": "^2.0.7", + "@smithy/util-retry": "^2.0.7", "tslib": "^2.5.0", "uuid": "^8.3.2" }, @@ -1506,11 +1603,11 @@ } }, "node_modules/@smithy/middleware-serde": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.9.tgz", - "integrity": "sha512-GVbauxrr6WmtCaesakktg3t5LR/yDbajpC7KkWc8rtCpddMI4ShAVO5Q6DqwX8MDFi4CLaY8H7eTGcxhl3jbLg==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.14.tgz", + "integrity": "sha512-hFi3FqoYWDntCYA2IGY6gJ6FKjq2gye+1tfxF2HnIJB5uW8y2DhpRNBSUMoqP+qvYzRqZ6ntv4kgbG+o3pX57g==", "dependencies": { - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -1518,11 +1615,11 @@ } }, "node_modules/@smithy/middleware-stack": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.3.tgz", - "integrity": "sha512-AlhPmbwpkC4lQBVaVHXczmjFvsAhDHhrakqLt038qFLotnJcvDLhmMzAtu23alBeOSkKxkTQq0LsAt2N0WpAbw==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.8.tgz", + "integrity": "sha512-7/N59j0zWqVEKExJcA14MrLDZ/IeN+d6nbkN8ucs+eURyaDUXWYlZrQmMOd/TyptcQv0+RDlgag/zSTTV62y/Q==", "dependencies": { - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -1530,13 +1627,13 @@ } }, "node_modules/@smithy/node-config-provider": { - "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==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.1.6.tgz", + "integrity": "sha512-HLqTs6O78m3M3z1cPLFxddxhEPv5MkVatfPuxoVO3A+cHZanNd/H5I6btcdHy6N2CB1MJ/lihJC92h30SESsBA==", "dependencies": { - "@smithy/property-provider": "^2.0.10", - "@smithy/shared-ini-file-loader": "^2.0.11", - "@smithy/types": "^2.3.3", + "@smithy/property-provider": "^2.0.15", + "@smithy/shared-ini-file-loader": "^2.2.5", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -1544,14 +1641,14 @@ } }, "node_modules/@smithy/node-http-handler": { - "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", + "version": "2.1.10", + "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.10.tgz", + "integrity": "sha512-lkALAwtN6odygIM4nB8aHDahINM6WXXjNrZmWQAh0RSossySRT2qa31cFv0ZBuAYVWeprskRk13AFvvLmf1WLw==", + "dependencies": { + "@smithy/abort-controller": "^2.0.14", + "@smithy/protocol-http": "^3.0.10", + "@smithy/querystring-builder": "^2.0.14", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -1559,11 +1656,11 @@ } }, "node_modules/@smithy/property-provider": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.10.tgz", - "integrity": "sha512-YMBVfh0ZMmJtbsUn+WfSwR32iRljZPdRN0Tn2GAcdJ+ejX8WrBXD7Z0jIkQDrQZr8fEuuv5x8WxMIj+qVbsPQw==", + "version": "2.0.15", + "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.15.tgz", + "integrity": "sha512-YbRFBn8oiiC3o1Kn3a4KjGa6k47rCM9++5W9cWqYn9WnkyH+hBWgfJAckuxpyA2Hq6Ys4eFrWzXq6fqHEw7iew==", "dependencies": { - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -1571,11 +1668,11 @@ } }, "node_modules/@smithy/protocol-http": { - "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==", + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.10.tgz", + "integrity": "sha512-6+tjNk7rXW7YTeGo9qwxXj/2BFpJTe37kTj3EnZCoX/nH+NP/WLA7O83fz8XhkGqsaAhLUPo/bB12vvd47nsmg==", "dependencies": { - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -1583,11 +1680,11 @@ } }, "node_modules/@smithy/querystring-builder": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.9.tgz", - "integrity": "sha512-Yt6CPF4j3j1cuwod/DRflbuXxBFjJm7gAjy6W1RE21Rz5/kfGFqiZBXWmmXwGtnnhiLThYwoHK4S6/TQtnx0Fg==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.14.tgz", + "integrity": "sha512-lQ4pm9vTv9nIhl5jt6uVMPludr6syE2FyJmHsIJJuOD7QPIJnrf9HhUGf1iHh9KJ4CUv21tpOU3X6s0rB6uJ0g==", "dependencies": { - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "@smithy/util-uri-escape": "^2.0.0", "tslib": "^2.5.0" }, @@ -1596,11 +1693,11 @@ } }, "node_modules/@smithy/querystring-parser": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.9.tgz", - "integrity": "sha512-U6z4N743s4vrcxPW8p8+reLV0PjMCYEyb1/wtMVvv3VnbJ74gshdI8SR1sBnEh95cF8TxonmX5IxY25tS9qGfg==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.14.tgz", + "integrity": "sha512-+cbtXWI9tNtQjlgQg3CA+pvL3zKTAxPnG3Pj6MP89CR3vi3QMmD0SOWoq84tqZDnJCxlsusbgIXk1ngMReXo+A==", "dependencies": { - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -1608,22 +1705,22 @@ } }, "node_modules/@smithy/service-error-classification": { - "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==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.7.tgz", + "integrity": "sha512-LLxgW12qGz8doYto15kZ4x1rHjtXl0BnCG6T6Wb8z2DI4PT9cJfOSvzbuLzy7+5I24PAepKgFeWHRd9GYy3Z9w==", "dependencies": { - "@smithy/types": "^2.3.3" + "@smithy/types": "^2.6.0" }, "engines": { "node": ">=14.0.0" } }, "node_modules/@smithy/shared-ini-file-loader": { - "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==", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.2.5.tgz", + "integrity": "sha512-LHA68Iu7SmNwfAVe8egmjDCy648/7iJR/fK1UnVw+iAOUJoEYhX2DLgVd5pWllqdDiRbQQzgaHLcRokM+UFR1w==", "dependencies": { - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -1631,17 +1728,17 @@ } }, "node_modules/@smithy/signature-v4": { - "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==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.16.tgz", + "integrity": "sha512-ilLY85xS2kZZzTb83diQKYLIYALvart0KnBaKnIRnMBHAGEio5aHSlANQoxVn0VsonwmQ3CnWhnCT0sERD8uTg==", "dependencies": { - "@smithy/eventstream-codec": "^2.0.9", + "@smithy/eventstream-codec": "^2.0.14", "@smithy/is-array-buffer": "^2.0.0", - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "@smithy/util-hex-encoding": "^2.0.0", - "@smithy/util-middleware": "^2.0.2", + "@smithy/util-middleware": "^2.0.7", "@smithy/util-uri-escape": "^2.0.0", - "@smithy/util-utf8": "^2.0.0", + "@smithy/util-utf8": "^2.0.2", "tslib": "^2.5.0" }, "engines": { @@ -1649,13 +1746,13 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.7.tgz", - "integrity": "sha512-r6T/oiBQ8vCbGqObH4/h0YqD0jFB1hAS9KFRmuTfaNJueu/L2hjmjqFjv3PV5lkbNHTgUYraSv4cFQ1naxiELQ==", + "version": "2.1.16", + "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.16.tgz", + "integrity": "sha512-Lw67+yQSpLl4YkDLUzI2KgS8TXclXmbzSeOJUmRFS4ueT56B4pw3RZRF/SRzvgyxM/HxgkUan8oSHXCujPDafQ==", "dependencies": { - "@smithy/middleware-stack": "^2.0.3", - "@smithy/types": "^2.3.3", - "@smithy/util-stream": "^2.0.12", + "@smithy/middleware-stack": "^2.0.8", + "@smithy/types": "^2.6.0", + "@smithy/util-stream": "^2.0.21", "tslib": "^2.5.0" }, "engines": { @@ -1663,9 +1760,9 @@ } }, "node_modules/@smithy/types": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.3.3.tgz", - "integrity": "sha512-zTdIPR9PvFVNRdIKMQu4M5oyTaycIbUqLheQqaOi9rTWPkgjGO2wDBxMA1rBHQB81aqAEv+DbSS4jfKyQMnXRA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.6.0.tgz", + "integrity": "sha512-PgqxJq2IcdMF9iAasxcqZqqoOXBHufEfmbEUdN1pmJrJltT42b0Sc8UiYSWWzKkciIp9/mZDpzYi4qYG1qqg6g==", "dependencies": { "tslib": "^2.5.0" }, @@ -1674,19 +1771,19 @@ } }, "node_modules/@smithy/url-parser": { - "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==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.14.tgz", + "integrity": "sha512-kbu17Y1AFXi5lNlySdDj7ZzmvupyWKCX/0jNZ8ffquRyGdbDZb+eBh0QnWqsSmnZa/ctyWaTf7n4l/pXLExrnw==", "dependencies": { - "@smithy/querystring-parser": "^2.0.9", - "@smithy/types": "^2.3.3", + "@smithy/querystring-parser": "^2.0.14", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" } }, "node_modules/@smithy/util-base64": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.0.0.tgz", - "integrity": "sha512-Zb1E4xx+m5Lud8bbeYi5FkcMJMnn+1WUnJF3qD7rAdXpaL7UjkFQLdmW5fHadoKbdHpwH9vSR8EyTJFHJs++tA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.0.1.tgz", + "integrity": "sha512-DlI6XFYDMsIVN+GH9JtcRp3j02JEVuWIn/QOZisVzpIAprdsxGveFed0bjbMRCqmIFe8uetn5rxzNrBtIGrPIQ==", "dependencies": { "@smithy/util-buffer-from": "^2.0.0", "tslib": "^2.5.0" @@ -1738,13 +1835,13 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "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==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.20.tgz", + "integrity": "sha512-QJtnbTIl0/BbEASkx1MUFf6EaoWqWW1/IM90N++8NNscePvPf77GheYfpoPis6CBQawUWq8QepTP2QUSAdrVkw==", "dependencies": { - "@smithy/property-provider": "^2.0.10", - "@smithy/smithy-client": "^2.1.7", - "@smithy/types": "^2.3.3", + "@smithy/property-provider": "^2.0.15", + "@smithy/smithy-client": "^2.1.16", + "@smithy/types": "^2.6.0", "bowser": "^2.11.0", "tslib": "^2.5.0" }, @@ -1753,22 +1850,35 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "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", + "version": "2.0.26", + "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.26.tgz", + "integrity": "sha512-lGFPOFCHv1ql019oegYqa54BZH7HREw6EBqjDLbAr0wquMX0BDi2sg8TJ6Eq+JGLijkZbJB73m4+aK8OFAapMg==", + "dependencies": { + "@smithy/config-resolver": "^2.0.19", + "@smithy/credential-provider-imds": "^2.1.2", + "@smithy/node-config-provider": "^2.1.6", + "@smithy/property-provider": "^2.0.15", + "@smithy/smithy-client": "^2.1.16", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { "node": ">= 10.0.0" } }, + "node_modules/@smithy/util-endpoints": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-1.0.5.tgz", + "integrity": "sha512-K7qNuCOD5K/90MjHvHm9kJldrfm40UxWYQxNEShMFxV/lCCCRIg8R4uu1PFAxRvPxNpIdcrh1uK6I1ISjDXZJw==", + "dependencies": { + "@smithy/node-config-provider": "^2.1.6", + "@smithy/types": "^2.6.0", + "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 14.0.0" + } + }, "node_modules/@smithy/util-hex-encoding": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.0.0.tgz", @@ -1781,11 +1891,11 @@ } }, "node_modules/@smithy/util-middleware": { - "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==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.7.tgz", + "integrity": "sha512-tRINOTlf1G9B0ECarFQAtTgMhpnrMPSa+5j4ZEwEawCLfTFTavk6757sxhE4RY5RMlD/I3x+DCS8ZUiR8ho9Pw==", "dependencies": { - "@smithy/types": "^2.3.3", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -1793,12 +1903,12 @@ } }, "node_modules/@smithy/util-retry": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.2.tgz", - "integrity": "sha512-ovWiayUB38moZcLhSFFfUgB2IMb7R1JfojU20qSahjxAgfOZvDWme3eOYUMtAVnouZ9kYJiFgHLy27qRH4NeeA==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.7.tgz", + "integrity": "sha512-fIe5yARaF0+xVT1XKcrdnHKTJ1Vc4+3e3tLDjCuIcE9b6fkBzzGFY7AFiX4M+vj6yM98DrwkuZeHf7/hmtVp0Q==", "dependencies": { - "@smithy/service-error-classification": "^2.0.2", - "@smithy/types": "^2.3.3", + "@smithy/service-error-classification": "^2.0.7", + "@smithy/types": "^2.6.0", "tslib": "^2.5.0" }, "engines": { @@ -1806,17 +1916,17 @@ } }, "node_modules/@smithy/util-stream": { - "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.1.5", - "@smithy/node-http-handler": "^2.1.5", - "@smithy/types": "^2.3.3", - "@smithy/util-base64": "^2.0.0", + "version": "2.0.21", + "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.21.tgz", + "integrity": "sha512-0BUE16d7n1x7pi1YluXJdB33jOTyBChT0j/BlOkFa9uxfg6YqXieHxjHNuCdJRARa7AZEj32LLLEPJ1fSa4inA==", + "dependencies": { + "@smithy/fetch-http-handler": "^2.2.7", + "@smithy/node-http-handler": "^2.1.10", + "@smithy/types": "^2.6.0", + "@smithy/util-base64": "^2.0.1", "@smithy/util-buffer-from": "^2.0.0", "@smithy/util-hex-encoding": "^2.0.0", - "@smithy/util-utf8": "^2.0.0", + "@smithy/util-utf8": "^2.0.2", "tslib": "^2.5.0" }, "engines": { @@ -1835,9 +1945,9 @@ } }, "node_modules/@smithy/util-utf8": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.0.0.tgz", - "integrity": "sha512-rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.0.2.tgz", + "integrity": "sha512-qOiVORSPm6Ce4/Yu6hbSgNHABLP2VMv8QOC3tTDNHHlWY19pPyc++fBTbZPtx6egPXi4HQxKDnMxVxpbtX2GoA==", "dependencies": { "@smithy/util-buffer-from": "^2.0.0", "tslib": "^2.5.0" @@ -1847,9 +1957,9 @@ } }, "node_modules/@types/babel__core": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.2.tgz", - "integrity": "sha512-pNpr1T1xLUc2l3xJKuPtsEky3ybxN3m4fJkknfIpTCTfIZCDW57oAg+EfCgIIp2rvCe0Wn++/FfodDS4YXxBwA==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", @@ -1859,80 +1969,77 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.5", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.5.tgz", - "integrity": "sha512-h9yIuWbJKdOPLJTbmSpPzkF67e659PbQDba7ifWm5BJ8xTv+sDmS7rFmywkWOvXedGTivCdeGSIIX8WLcRTz8w==", + "version": "7.6.7", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.7.tgz", + "integrity": "sha512-6Sfsq+EaaLrw4RmdFWE9Onp63TOUue71AWb4Gpa6JxzgTYtimbM086WnYTy2U67AofR++QKCo08ZP6pwx8YFHQ==", "dependencies": { "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__template": { - "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==", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", "dependencies": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__traverse": { - "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==", + "version": "7.20.4", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.4.tgz", + "integrity": "sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==", "dependencies": { "@babel/types": "^7.20.7" } }, "node_modules/@types/chai": { - "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.6.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.4.tgz", - "integrity": "sha512-nU6d9MPY0NBUMiE/nXd2IIoC4OLvsLpwAjheoAeuzgvDZA1Cb10QYg+91AF6zQiKWRN5i1m07x6sMe0niBznoQ==" + "version": "4.3.11", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz", + "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==" }, "node_modules/@types/sinon": { - "version": "10.0.16", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.16.tgz", - "integrity": "sha512-j2Du5SYpXZjJVJtXBokASpPRj+e2z+VUhCPHmM6WMfe3dpHu6iVKJMU6AiBcMp/XTAYnEj6Wc1trJUWwZ0QaAQ==", + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.2.tgz", + "integrity": "sha512-Zt6heIGsdqERkxctIpvN5Pv3edgBrhoeb3yHyxffd4InN0AX2SVNKSrhdDZKGQICVOxWP/q4DyhpfPNMSrpIiA==", "dependencies": { "@types/sinonjs__fake-timers": "*" } }, "node_modules/@types/sinon-chai": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-3.2.9.tgz", - "integrity": "sha512-/19t63pFYU0ikrdbXKBWj9PCdnKyTd0Qkz0X91Ta081cYsq90OxYdcWwK/dwEoDa6dtXgj2HJfmzgq+QZTHdmQ==", + "version": "3.2.12", + "resolved": "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-3.2.12.tgz", + "integrity": "sha512-9y0Gflk3b0+NhQZ/oxGtaAJDvRywCa5sIyaVnounqLvmf93yBF4EgIRspePtkMs3Tr844nCclYMlcCNmLCvjuQ==", "dependencies": { "@types/chai": "*", "@types/sinon": "*" } }, "node_modules/@types/sinonjs__fake-timers": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz", - "integrity": "sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==" + "version": "8.1.5", + "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz", + "integrity": "sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ==" }, "node_modules/@types/webidl-conversions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz", - "integrity": "sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==" + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", + "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" }, "node_modules/@types/whatwg-url": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz", - "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==", + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.3.tgz", + "integrity": "sha512-z1ELvMijRL1QmU7QuzDkeYXSF2+dXI0ITKoQsIoVKcNBOiK5RMmWy+pYYxJTHFt8vkpZe7UsvRErQwcxZkjoUw==", "dependencies": { - "@types/node": "*", "@types/webidl-conversions": "*" } }, "node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } }, "node_modules/abort-controller": { "version": "3.0.0", @@ -1958,9 +2065,9 @@ } }, "node_modules/acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", "bin": { "acorn": "bin/acorn" }, @@ -2163,9 +2270,9 @@ "optional": true }, "node_modules/big-integer": { - "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", + "version": "1.6.52", + "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz", + "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==", "engines": { "node": ">=0.6" } @@ -2251,9 +2358,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.11", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.11.tgz", - "integrity": "sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==", + "version": "4.22.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz", + "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", "funding": [ { "type": "opencollective", @@ -2269,9 +2376,9 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001538", - "electron-to-chromium": "^1.4.526", - "node-releases": "^2.0.13", + "caniuse-lite": "^1.0.30001565", + "electron-to-chromium": "^1.4.601", + "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, "bin": { @@ -2282,9 +2389,9 @@ } }, "node_modules/bson": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.1.0.tgz", - "integrity": "sha512-yiQ3KxvpVoRpx1oD1uPz4Jit9tAVTJgjdmjDKtUErkOoL9VNoF8Dd58qtAOL5E40exx2jvAT9sqdRSK/r+SHlA==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.2.0.tgz", + "integrity": "sha512-ID1cI+7bazPDyL9wYy9GaQ8gEEohWvcUl/Yf0dIdutJxnmInEEyCsb4awy/OiBfall7zBA179Pahi3vCdFze3Q==", "engines": { "node": ">=16.20.1" } @@ -2336,21 +2443,22 @@ } }, "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==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001538", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz", - "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==", + "version": "1.0.30001566", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001566.tgz", + "integrity": "sha512-ggIhCsTxmITBAMmK8yZjEhCO5/47jKXPu6Dha/wuCS4JePVL+3uiDEBuhu2aIoT+bqTOR8L76Ip1ARL9xYsEJA==", "funding": [ { "type": "opencollective", @@ -2425,9 +2533,12 @@ } }, "node_modules/component-type": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz", - "integrity": "sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/component-type/-/component-type-1.2.2.tgz", + "integrity": "sha512-99VUHREHiN5cLeHm3YLq312p6v+HUEcwtLCAtelvUDI6+SH5g5Cr85oNR2S1o6ywzL0ykMbuwLzM2ANocjEOIA==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/config-chain": { "version": "1.1.13", @@ -2458,9 +2569,9 @@ } }, "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==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" }, "node_modules/cookie": { "version": "0.5.0", @@ -2532,6 +2643,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/dedent": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", + "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } + }, "node_modules/deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -2573,6 +2697,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/define-lazy-prop": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", @@ -2610,6 +2747,11 @@ "node": ">=8" } }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + }, "node_modules/editorconfig": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz", @@ -2633,9 +2775,14 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.528", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.528.tgz", - "integrity": "sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==" + "version": "1.4.603", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.603.tgz", + "integrity": "sha512-Dvo5OGjnl7AZTU632dFJtWj0uJK835eeOVQIuRcmBmsFsTNn3cL05FqOyHAfGQDIoHfLhyJ1Tya3PJ0ceMz54g==" + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" }, "node_modules/emphasize": { "version": "4.2.0", @@ -2794,6 +2941,11 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/execa/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==" + }, "node_modules/expand-template": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", @@ -2945,6 +3097,21 @@ } } }, + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/format": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", @@ -3002,15 +3169,13 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, - "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==" - }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/gensync": { "version": "1.0.0-beta.2", @@ -3035,14 +3200,14 @@ } }, "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==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3066,34 +3231,26 @@ "optional": true }, "node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">=12" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/glob/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -3102,22 +3259,22 @@ "node": ">=4" } }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/handle-backspaces": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/handle-backspaces/-/handle-backspaces-1.0.0.tgz", "integrity": "sha512-w11NXUn51gVN50nTW5MOuhKuko9xZonnHDe5LlapaOZvuyxDXVDn9b1ZtG0IJTABGbL/UGeSitqHgo9Bb7nDhQ==" }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "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", @@ -3126,6 +3283,17 @@ "node": ">=4" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "dependencies": { + "get-intrinsic": "^1.2.2" + }, + "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", @@ -3148,6 +3316,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/heap-js": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/heap-js/-/heap-js-2.3.0.tgz", @@ -3223,15 +3402,6 @@ ], "optional": true }, - "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", @@ -3280,6 +3450,14 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, "node_modules/is-inside-container": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", @@ -3358,10 +3536,27 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/joi": { - "version": "17.10.2", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.2.tgz", - "integrity": "sha512-hcVhjBxRNW/is3nNLdGLIjkgXetkeGc2wyhydhz8KumG23Aerk4HPjU5zaPAMRqXQFc0xNqXTC7+zQjxr0GlKA==", + "version": "17.11.0", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz", + "integrity": "sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==", "dependencies": { "@hapi/hoek": "^9.0.0", "@hapi/topo": "^5.0.0", @@ -3376,22 +3571,22 @@ "integrity": "sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==" }, "node_modules/jose": { - "version": "4.14.6", - "resolved": "https://registry.npmjs.org/jose/-/jose-4.14.6.tgz", - "integrity": "sha512-EqJPEUlZD0/CSUMubKtMaYUOtWe91tZXTWMJZoKSbLk+KtdhNdcvppH8lA9XwVu2V4Ailvsj0GBZJ2ZwDjfesQ==", + "version": "4.15.4", + "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.4.tgz", + "integrity": "sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==", "funding": { "url": "https://github.com/sponsors/panva" } }, "node_modules/js-beautify": { - "version": "1.14.9", - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.9.tgz", - "integrity": "sha512-coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg==", + "version": "1.14.11", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.11.tgz", + "integrity": "sha512-rPogWqAfoYh1Ryqqh2agUpVfbxAhbjuN1SmU86dskQUKouRiggUTCO4+2ym9UPXllc2WAp0J+T5qxn7Um3lCdw==", "dependencies": { "config-chain": "^1.1.13", "editorconfig": "^1.0.3", - "glob": "^8.1.0", - "nopt": "^6.0.0" + "glob": "^10.3.3", + "nopt": "^7.2.0" }, "bin": { "css-beautify": "js/bin/css-beautify.js", @@ -3399,7 +3594,7 @@ "js-beautify": "js/bin/js-beautify.js" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/js-tokens": { @@ -3441,20 +3636,26 @@ } }, "node_modules/kerberos": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.0.1.tgz", - "integrity": "sha512-O/jIgbdGK566eUhFwIcgalbqirYU/r76MW7/UFw06Fd9x5bSwgyZWL/Vm26aAmezQww/G9KYkmmJBkEkPk5HLw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.1.0.tgz", + "integrity": "sha512-HvOl6O6cyEN/8Z4CAocHe/sekJtvt5UrxUdCuu7bXDZ2Hnsy6OpsQbISW+lpm03vrbO2ir+1QQ5Sx/vMEhHnog==", "hasInstallScript": true, "optional": true, "dependencies": { "bindings": "^1.5.0", - "node-addon-api": "^4.3.0", + "node-addon-api": "^6.1.0", "prebuild-install": "7.1.1" }, "engines": { "node": ">=12.9.0" } }, + "node_modules/kerberos/node_modules/node-addon-api": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", + "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", + "optional": true + }, "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -3623,11 +3824,11 @@ } }, "node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" } }, "node_modules/minizlib": { @@ -3676,13 +3877,13 @@ "optional": true }, "node_modules/mongodb": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.1.0.tgz", - "integrity": "sha512-AvzNY0zMkpothZ5mJAaIo2bGDjlJQqqAbn9fvtVgwIIUPEfdrqGxqNjjbuKyrgQxg2EvCmfWdjq+4uj96c0YPw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.3.0.tgz", + "integrity": "sha512-tt0KuGjGtLUhLoU263+xvQmPHEGTw5LbcNC73EoFRYgSHwZt5tsoJC110hDyO1kjQzpgNrpdcSza9PknWN4LrA==", "dependencies": { "@mongodb-js/saslprep": "^1.1.0", - "bson": "^6.1.0", - "mongodb-connection-string-url": "^2.6.0" + "bson": "^6.2.0", + "mongodb-connection-string-url": "^3.0.0" }, "engines": { "node": ">=16.20.1" @@ -3721,11 +3922,11 @@ } }, "node_modules/mongodb-build-info": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/mongodb-build-info/-/mongodb-build-info-1.7.0.tgz", - "integrity": "sha512-mKpWHe7VsYJYOgZ9ik4vIu3cOBKsDK5b8zSTqnZI5JG1briTYadB103b0yPGn1mQ+JppxzqH3EbRHW0xeOhkVw==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/mongodb-build-info/-/mongodb-build-info-1.7.1.tgz", + "integrity": "sha512-he4lTotY5AkGSc4Js9Dtqvx4W7x5JSNa9xtvR08y1tUyhglHG1tV+NnuUTrysXA0hNHMMvOd/Hh4Ez9Po84p1g==", "dependencies": { - "mongodb-connection-string-url": "^2.2.0" + "mongodb-connection-string-url": "^3.0.0" } }, "node_modules/mongodb-client-encryption": { @@ -3744,12 +3945,12 @@ } }, "node_modules/mongodb-connection-string-url": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz", - "integrity": "sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.0.tgz", + "integrity": "sha512-t1Vf+m1I5hC2M5RJx/7AtxgABy1cZmIPQRMXw+gEIPn/cZNF3Oiy+l0UIypUwVB5trcWHq3crg2g3uAR9aAwsQ==", "dependencies": { - "@types/whatwg-url": "^8.2.1", - "whatwg-url": "^11.0.0" + "@types/whatwg-url": "^11.0.2", + "whatwg-url": "^13.0.0" } }, "node_modules/mongodb-crypt-library-version": { @@ -3811,9 +4012,9 @@ } }, "node_modules/node-abi": { - "version": "3.47.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz", - "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==", + "version": "3.52.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.52.0.tgz", + "integrity": "sha512-JJ98b02z16ILv7859irtXn4oUaFWADtvkzy2c0IAatNVX2Mc9Yoh8z6hZInn3QwvMEYhHuQloYi+TTQy67SIdQ==", "optional": true, "dependencies": { "semver": "^7.3.5" @@ -3876,22 +4077,22 @@ } }, "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==" + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==" }, "node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.0.tgz", + "integrity": "sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==", "dependencies": { - "abbrev": "^1.0.0" + "abbrev": "^2.0.0" }, "bin": { "nopt": "bin/nopt.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/npm-run-path": { @@ -3936,9 +4137,9 @@ } }, "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==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3966,6 +4167,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "optional": true, "dependencies": { "wrappy": "1" } @@ -4002,11 +4204,11 @@ } }, "node_modules/openid-client": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.5.0.tgz", - "integrity": "sha512-Y7Xl8BgsrkzWLHkVDYuroM67hi96xITyEDSkmWaGUiNX6CkcXC3XyQGdv5aWZ6dukVKBFVQCADi9gCavOmU14w==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.6.1.tgz", + "integrity": "sha512-PtrWsY+dXg6y8mtMPyL/namZSYVz8pjXz3yJiBNZsEdCnu9miHLB4ELVC85WvneMKo2Rg62Ay7NkuCpM0bgiLQ==", "dependencies": { - "jose": "^4.14.4", + "jose": "^4.15.1", "lru-cache": "^6.0.0", "object-hash": "^2.2.0", "oidc-token-hash": "^5.0.3" @@ -4060,6 +4262,29 @@ "node": ">=8" } }, + "node_modules/path-scurry": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "dependencies": { + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "engines": { + "node": "14 || >=16.14" + } + }, "node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -4202,9 +4427,9 @@ } }, "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "engines": { "node": ">=6" } @@ -4280,12 +4505,12 @@ "integrity": "sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==" }, "node_modules/resolve-mongodb-srv": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/resolve-mongodb-srv/-/resolve-mongodb-srv-1.1.2.tgz", - "integrity": "sha512-jCuT9KvycstfAQnS/0KnfL48RVLYHuq4S3NZznQzuPMNyH7dBoMqSRSwWYIHp/UCcAnpXbNLrILEzEoxE8wWKA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/resolve-mongodb-srv/-/resolve-mongodb-srv-1.1.3.tgz", + "integrity": "sha512-TrD4ebxN+1wfGhTl1uEKPSReCK13OscqpatIFKabCivrfQSDeVB4GYxpbm5F7yryyniuCxiEDxyyJO3a0UPQjw==", "optional": true, "dependencies": { - "whatwg-url": "^11.0.0" + "whatwg-url": "^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0" }, "bin": { "resolve-mongodb-srv": "bin/resolve-mongodb-srv.js" @@ -4379,6 +4604,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/run-applescript/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==" + }, "node_modules/run-applescript/node_modules/strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -4491,6 +4721,20 @@ "node": ">= 0.8.0" } }, + "node_modules/set-function-length": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", + "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "dependencies": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -4529,9 +4773,15 @@ } }, "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==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } }, "node_modules/simple-concat": { "version": "1.0.1", @@ -4625,6 +4875,66 @@ "safe-buffer": "~5.2.0" } }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/string-width/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/string-width/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -4636,6 +4946,18 @@ "node": ">=8" } }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/strip-final-newline": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", @@ -4731,6 +5053,14 @@ "node": ">=6" } }, + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "engines": { + "node": ">=8" + } + }, "node_modules/tar/node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -4769,14 +5099,14 @@ } }, "node_modules/tr46": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", - "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", + "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", "dependencies": { - "punycode": "^2.1.1" + "punycode": "^2.3.0" }, "engines": { - "node": ">=12" + "node": ">=14" } }, "node_modules/tslib": { @@ -4892,15 +5222,15 @@ } }, "node_modules/whatwg-url": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", - "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-13.0.0.tgz", + "integrity": "sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==", "dependencies": { - "tr46": "^3.0.0", + "tr46": "^4.1.1", "webidl-conversions": "^7.0.0" }, "engines": { - "node": ">=12" + "node": ">=16" } }, "node_modules/which": { @@ -4932,10 +5262,128 @@ "node-forge": "^1.2.1" } }, + "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/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/wrap-ansi-cjs/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/wrap-ansi-cjs/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/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "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==" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "optional": true }, "node_modules/yallist": { "version": "3.1.1", diff --git a/pkgs/development/tools/mongosh/source.json b/pkgs/development/tools/mongosh/source.json index 3715df3bf3051..091bbd27c998c 100644 --- a/pkgs/development/tools/mongosh/source.json +++ b/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.0.1", - "integrity": "sha512-Xvlzso5vJAYfbO/N/6CCmcEnpHAv/PF4D6RqAvr8BFoPjCmYFwKDjOHEHjaPtrJYY1gWEDN5gaukZfqcAxiDFg==", - "filename": "mongosh-2.0.1.tgz", - "deps": "sha256-wICy0PoMQ6ypiZL/4Yf2l9KNXC9LNNdzy8EmhwK3kws=" + "version": "2.1.1", + "integrity": "sha512-2Gw9fJp2ebK2Gx7QT6sg7FCEpTfFlRib7hJkRhUO92/irGDTDtH6lYU45A4jRRMwgYVyjCfcfeWC11JQCSfsvg==", + "filename": "mongosh-2.1.1.tgz", + "deps": "sha256-F/ACpX5BsnPttrYRabWsTgUN6uABQ6RHdGc2h6qMbp8=" } diff --git a/pkgs/development/tools/mutmut/default.nix b/pkgs/development/tools/mutmut/default.nix index 4b40930c646d1..85d981961d165 100644 --- a/pkgs/development/tools/mutmut/default.nix +++ b/pkgs/development/tools/mutmut/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , python3 +, testers }: let self = with python3.pkgs; buildPythonApplication rec { diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix index bfa390248f32e..96eb34f091704 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.2.62"; + version = "0.2.63"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-zSZ62RMHZLuhIPdde0cfWae+uFpWVjMfHuLAJdRedJA="; + sha256 = "sha256-mcygDOx5yzOW80bv54cPOKl1t443DXFRq4Hb4KYD5e8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index dd3d9cf6faaff..752ec8b701887 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -1,98 +1,147 @@ -{ stdenv, lib, fetchurl, buildEnv, makeWrapper - -, xorg, alsa-lib, at-spi2-core, dbus, glib, gtk3, atk, pango, freetype -, fontconfig , gdk-pixbuf, cairo, mesa, nss, nspr, expat, systemd -, libcap, libdrm, libxkbcommon +{ alsa-lib +, at-spi2-core +, atk +, autoPatchelfHook +, buildEnv +, cairo +, cups +, dbus +, expat +, fetchurl +, ffmpeg +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, lib +, libcap +, libdrm , libnotify -, ffmpeg, libxcb, cups -, sqlite, udev , libuuid +, libxcb +, libxkbcommon +, makeWrapper +, mesa +, nspr +, nss +, pango , sdk ? false +, sqlite +, stdenv +, systemd +, udev +, wrapGAppsHook +, xorg }: + let - bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" - else "ia32"; + bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else "ia32"; nwEnv = buildEnv { name = "nwjs-env"; paths = [ - xorg.libX11 xorg.libXrender glib gtk3 atk at-spi2-core pango cairo gdk-pixbuf - freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage - xorg.libXext xorg.libXfixes mesa nss nspr expat dbus - xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr - xorg.libXScrnSaver xorg.libxshmfence cups - libcap libdrm libnotify + alsa-lib + at-spi2-core + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + libcap + libdrm + libnotify libxkbcommon + mesa + nspr + nss + pango + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxshmfence # libnw-specific (not chromium dependencies) - ffmpeg libxcb + ffmpeg + libxcb # chromium runtime deps (dlopen’d) - sqlite udev libuuid + sqlite + udev ]; extraOutputsToInstall = [ "lib" "out" ]; }; -in stdenv.mkDerivation rec { + version = "0.83.0"; +in +stdenv.mkDerivation { pname = "nwjs"; - version = "0.54.1"; + inherit version; - src = if sdk then fetchurl { - url = "https://dl.nwjs.io/v${version}/nwjs-sdk-v${version}-linux-${bits}.tar.gz"; - sha256 = if bits == "x64" then - "sha256-1qeU4+EIki0M7yJPkRuzFwMdswfDOni5gltdmM6A/ds=" else - "sha256-wDEGePE9lrKa6OAzeiDLhVj992c0TJgiMHb8lJ4PF80="; - } else fetchurl { - url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; - sha256 = if bits == "x64" then - "sha256-TACEM06K2t6dDXRD44lSW7GRi77yzSW4BZJw8gT+fl4=" else - "sha256-yX9knqFV5VQTT3TJDmQoDgt17NqH8fLt+bLQAqKleTU="; - }; + src = + let flavor = if sdk then "sdk-" else ""; + in fetchurl { + url = "https://dl.nwjs.io/v${version}/nwjs-${flavor}v${version}-linux-${bits}.tar.gz"; + hash = { + "sdk-ia32" = "sha256-Sps0XFOnnJIkDRPI+PJSjseF8cyaYvXXs4ZeVI8mcm8="; + "sdk-x64" = "sha256-qsNPfmDQK/BZzMTlX9MDaV7KZsU32YQ1B/Qh/EHIZrQ="; + "ia32" = "sha256-99+EU4Kg8lH8facRmIl2SV3GyWUw46rGYpso5QSP//k="; + "x64" = "sha256-y0oBVvVguRDe391EsQs6qYqkTRPzUfm50m6NDOZh+7o="; + }."${flavor + bits}"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + (wrapGAppsHook.override { inherit makeWrapper; }) + ]; + + buildInputs = [ nwEnv ]; + appendRunpaths = map (pkg: (lib.getLib pkg) + "/lib") [ nwEnv stdenv.cc.libc stdenv.cc.cc ]; - # we have runtime deps like sqlite3 that should remain - dontPatchELF = true; + preFixup = '' + gappsWrapperArgs+=( + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + ) + ''; + + installPhase = '' + runHook preInstall - installPhase = - let ccPath = lib.makeLibraryPath [ stdenv.cc.cc ]; - in '' mkdir -p $out/share/nwjs cp -R * $out/share/nwjs find $out/share/nwjs - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw - ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 - libpath="$out/share/nwjs/lib/" - for f in "$libpath"/*.so; do - patchelf --set-rpath "${nwEnv}/lib:${ccPath}:$libpath" "$f" - done - patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${ccPath}:$libpath" $out/share/nwjs/nw - # check, whether all RPATHs are correct (all dependencies found) - checkfile=$(mktemp) - for f in "$libpath"/*.so "$out/share/nwjs/nw"; do - (echo "$f:"; - ldd "$f" ) > "$checkfile" - done - if <"$checkfile" grep -e "not found"; then - cat "$checkfile" - exit 1 - fi - mkdir -p $out/bin ln -s $out/share/nwjs/nw $out/bin mkdir $out/lib ln -s $out/share/nwjs/lib/libnw.so $out/lib/libnw.so - ''; - nativeBuildInputs = [ makeWrapper ]; + runHook postInstall + ''; meta = with lib; { description = "An app runtime based on Chromium and node.js"; homepage = "https://nwjs.io/"; - platforms = ["i686-linux" "x86_64-linux"]; - maintainers = [ maintainers.offline ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = [ maintainers.mikaelfangel ]; + mainProgram = "nw"; license = licenses.bsd3; }; } diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index ef9330054f359..3bccf4162be6b 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,35 +15,33 @@ }: let - merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.12" else "4.7"; + # Each releases of Merlin support a limited range of versions of OCaml. + merlinVersions = { + "4.12.0" = "4.7-412"; + "4.12.1" = "4.7-412"; + "4.13.0" = "4.7-413"; + "4.13.1" = "4.7-413"; + "4.14.0" = "4.13-414"; + "4.14.1" = "4.13-414"; + "5.0.0" = "4.12-500"; + "5.1.0" = "4.13-501"; + "5.1.1" = "4.13.1-501"; + }; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU="; - "4.8-414" = "sha256-HMXWhcVOXW058y143rNBcfEOmjt2tZJXcXKHmKZ5i68="; - "4.8-500" = "sha256-n5NHKuo0/lZmfe7WskqnW3xm1S0PmXKSS93BDKrpjCI="; - "4.9-414" = "sha256-4j/EeBNZEmn/nSfIIJiOUgpmLIndCvfqZSshUXSZy/0="; - "4.9-500" = "sha256-uQfGazoxTxclHSiTfjji+tKJv8MKqRdHMPD/xfMZlSY="; - "4.10-414" = "sha256-/a1OqASISpb06eh2gsam1rE3wovM4CT8ybPV86XwR2c="; - "4.10-500" = "sha256-m9+Qz8DT94yNSwpamTVLQKISHtRVBWnZD3t/yyujSZ0="; - "4.12-414" = "sha256-tgMUT4KyFeJubYVY1Sdv9ZvPB1JwcqEGcCuwuMqXHRQ="; "4.12-500" = "sha256-j49R7KVzNKlXDL7WibTHxPG4VSOVv0uaz5/yMZZjkH8="; - "4.12-501" = "sha256-zMwzI1SXQDWQ9PaKL4o3J6JlRjmEs7lkXrwauy+QiMA="; + "4.13-414" = "sha256-AlzxqTuh5AkW9dnPIv51abv7r0A/VOS3JOT5IHix2wM="; + "4.13-501" = "sha256-G/VrI+qBVj2wxuB2qE9P1M73IvDmqmTrBFAA6mp+NRE="; + "4.13.1-501" = "sha256-NVfgX3DFsQghApEgWilCgr5O2WSkwKtenZZFSJ1wwa0="; }; - 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}"; + version = lib.getAttr ocaml.version merlinVersions; in -if !lib.hasAttr version hashes -then builtins.throw "merlin ${merlinVersion} is not available for OCaml ${ocaml.version}" +if !lib.hasAttr ocaml.version merlinVersions +then builtins.throw "merlin is not available for OCaml ${ocaml.version}" else buildDunePackage { diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index a60b12667fa7b..4f85fc52343a6 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -122,6 +122,11 @@ in stdenv.mkDerivation { outputs = [ "out" "installer" ]; setOutputFlags = false; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + # change argv0 to "opam" as a workaround for # https://github.com/ocaml/opam/issues/2142 postInstall = '' diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 412a1a30e70d1..77c574cb93218 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -112,6 +112,11 @@ print <<'EOF'; outputs = [ "out" "installer" ]; setOutputFlags = false; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + # change argv0 to "opam" as a workaround for # https://github.com/ocaml/opam/issues/2142 postInstall = '' diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 9b58214895ef8..32eb3ccdaf99e 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.22.3"; + version = "2.23.2"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-XvoWLCM1RWc8/v4BQt5Ik89sGWmZAruIKlu5N/WBim4="; + hash = "sha256-CR3ay54Z/h/mYomWtoOqV0Ynq+iygLR5Zd31gaEQ098="; }; - vendorHash = "sha256-z4ERIfwLPYIMpSetepDx0U2WUA+9RXjoQICMbp+qS3k="; + vendorHash = "sha256-HodvOSuzp57ijaShCJ+fnX5qk4o5LzMLOfPnpDlc2FU="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 0980a7edf27f5..db7ad7d0b2841 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,24 +7,24 @@ , expect }: let - inherit (dotnetCorePackages) sdk_6_0 runtime_6_0; + inherit (dotnetCorePackages) sdk_8_0 runtime_6_0; in let finalPackage = buildDotnetModule rec { pname = "omnisharp-roslyn"; - version = "1.39.10"; + version = "1.39.11"; src = fetchFromGitHub { owner = "OmniSharp"; repo = pname; rev = "v${version}"; - hash = "sha256-3RjRFc+keNLazUS5nLG1ZE7SfVCWoQDti2CCnnSPPQ0="; + hash = "sha256-b7LC3NJyw0ek3y6D3p4bKVH4Od2gXmW5/8fCCY9n3iE="; }; projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = sdk_6_0; - dotnet-runtime = sdk_6_0; + dotnet-sdk = sdk_8_0; + dotnet-runtime = sdk_8_0; dotnetInstallFlags = [ "--framework net6.0" ]; dotnetBuildFlags = [ "--framework net6.0" "--no-self-contained" ]; @@ -62,7 +62,7 @@ let finalPackage = buildDotnetModule rec { send_error "timeout!\n" exit 1 } - expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_6_0.version}" + expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_8_0.version}" expect "{\"Event\":\"started\"," send \x03 expect eof @@ -73,8 +73,9 @@ let finalPackage = buildDotnetModule rec { ''; in { # Make sure we can run OmniSharp with any supported SDK version, as well as without - with-net6-sdk = with-sdk sdk_6_0; + with-net6-sdk = with-sdk dotnetCorePackages.sdk_6_0; with-net7-sdk = with-sdk dotnetCorePackages.sdk_7_0; + with-net8-sdk = with-sdk dotnetCorePackages.sdk_8_0; no-sdk = with-sdk null; }; diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix index 9f7768b7cbf51..480a0c024b90e 100644 --- a/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -2,111 +2,109 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Cake.Scripting.Abstractions"; version = "0.9.0"; sha256 = "15nqr100crclha0lzgil25j1wn45517gb34059qypj05j8psfmjx"; }) - (fetchNuGet { pname = "Cake.Scripting.Transport"; version = "0.9.0"; sha256 = "1gpbvframx4dx4mzfh44cib6dfd26q7878vf073m9gv3y43sws7b"; }) + (fetchNuGet { pname = "Cake.Scripting.Abstractions"; version = "0.15.0"; sha256 = "0nh1954zs6crl3nrgf41b2mvipf3pxda8dxg21bbdf7yysq7izw3"; }) + (fetchNuGet { pname = "Cake.Scripting.Transport"; version = "0.15.0"; sha256 = "0xzlnadascsiibdhmpbqaawqlpyrwridih7y7054zsijlz1lp3am"; }) (fetchNuGet { pname = "Cake.Tool"; version = "3.0.0"; sha256 = "0gjacqdgnh1d40sm9vrdb8vr6jv3vyh6j265gj1aaf9af2569637"; }) - (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.4.0"; sha256 = "08269f79r3a7iwf3i661k6vzi9xk21f0z21997dpyl2qhl5igndg"; }) - (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.4.0"; sha256 = "0mhbxvcf9p48zzc3f2x25ihh1lxzzn63mwld5lkny5m1bx1fp198"; }) + (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.5.0"; sha256 = "00w9r2lv0yy30dafn6gs2qf4f6hhsg48923d2sdkyjdc94bx4kp4"; }) + (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.5.0"; sha256 = "0fy3cww1yclyvlhzla4klamcw7sjy2fg3sr2ihpd4jxlyd8qy60l"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) - (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; }) - (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "3.1.0"; sha256 = "075n1mfsxwz514r94l8i3ax0wp43c3xb4f9w25a96h6xxnj0k2hd"; }) + (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.2.0.7535"; sha256 = "1pvy3kss6s1v60yspfw11y3rs750rbxh735p90zrgxjshp9sq5g0"; }) + (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "4.1.0"; sha256 = "1ppw9nx9s5yyp6j8ljky7l9y5b91yf0sj2lqbakabjvzppr0pw4l"; }) (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.25"; sha256 = "1vrmqn5j6ibwkqasbf7x7n4w5jdclnz3giymiwvym2wa0y5zc59q"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.25"; sha256 = "0mgcs4si7mwd0f555s1vg17pf4nqfaijd1pci359l1pgrmv70rrg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.25"; sha256 = "0wvzhqhlmlbnpa18qp8m3wcrlcgj3ckvp3iv2n7g8vb60c3238aq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.25"; sha256 = "1pywgvb8ck1d5aadmijd5s3z6yclchd9pa6dsahijmm55ibplx36"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.25"; sha256 = "1zlf0w7i6r02719dv3nw4jy14sa0rs53i89an5alz5qmywdy3f1d"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; sha256 = "0z4jq5prnxyb4p3163yxx35znpd2msjd8hw8ysmv4ah90f5sd9gm"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.2"; sha256 = "17g4ka0c28l9v3pmf3i7cvic137h7zg6xqc78qf5j5hj7qbcps5g"; }) (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.2"; sha256 = "1p8ikc91qc2b1h68w44brb64dy5kmkb089hdliwp02gba3dszw67"; }) - (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.4.1"; sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx"; }) + (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.6.10"; sha256 = "18xavj7zii38gkk6bkblif7j1j7y33z7f06xm81ljdl2124lbqc4"; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.3.2"; sha256 = "1mxm6xrq4illg502kjz4l7j0vjcpfv2li9wrvf4ix9m09vdwk2jl"; }) (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.2"; sha256 = "0r82hrjjqpxjp3l7ncy8jdj30p7y0p1hhr1dbfrj5l3i0zxrrcj4"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.9.0-1.23504.3"; sha256 = "06m8z376zr5xipmd1q06sjv6i32rdb9ikacl44ai23i71np2xsxj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.9.0-1.23504.3/microsoft.codeanalysis.common.4.9.0-1.23504.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.9.0-1.23504.3"; sha256 = "1ynssksn4h9s4asr3y68qvs6651lrjd39c3ikswhcns8z2mqdidd"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.9.0-1.23504.3/microsoft.codeanalysis.csharp.4.9.0-1.23504.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.9.0-1.23504.3"; sha256 = "069j0x2cjmwr5lphfnv4lj48sib7avp3pdqkimd2z0cfrvbybzcg"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.9.0-1.23504.3/microsoft.codeanalysis.csharp.features.4.9.0-1.23504.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.9.0-1.23504.3"; sha256 = "00qlccgjvirrq1kx12cr895waj5s0bnws548rrhm13vshpm7diwd"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.9.0-1.23504.3/microsoft.codeanalysis.csharp.scripting.4.9.0-1.23504.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.9.0-1.23504.3"; sha256 = "1zdkgfqhq4hiq8kcylg19r6pcpic3kjhcx80arcvw0nd7x9k8g7a"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.9.0-1.23504.3/microsoft.codeanalysis.csharp.workspaces.4.9.0-1.23504.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.9.0-3.23611.3"; sha256 = "0b3lwd4m3jw7mf56xhzx4d3ziykv8g39a2s1x782c9bagh8i1b1f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.9.0-3.23611.3/microsoft.codeanalysis.common.4.9.0-3.23611.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.9.0-3.23611.3"; sha256 = "0cja5pjhhh33lmc1kfqw9l3x1pb9g2dda6wgn9i92ay51j52l43n"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.9.0-3.23611.3/microsoft.codeanalysis.csharp.4.9.0-3.23611.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.9.0-3.23611.3"; sha256 = "0alnvk5f68glimkqsz590pryg7pa5p0wp6i4aif1k5j1jz0b03v6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.9.0-3.23611.3/microsoft.codeanalysis.csharp.features.4.9.0-3.23611.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.9.0-3.23611.3"; sha256 = "1ai22hjqyc5xx1dpwl3nm4yjqjs9n6iw5whprpvb7vi8kv9zz16q"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.9.0-3.23611.3/microsoft.codeanalysis.csharp.scripting.4.9.0-3.23611.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.9.0-3.23611.3"; sha256 = "0x8xr193zqddmns0xx20hsf08qrb6fjjczgdm9yjr72p2djp14br"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.9.0-3.23611.3/microsoft.codeanalysis.csharp.workspaces.4.9.0-3.23611.3.nupkg"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; sha256 = "1y5r6pm9rp70xyiaj357l3gdl4i4r8xxvqllgdyrwn9gx2aqzzqk"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.9.0-1.23504.3"; sha256 = "16pjc2cdd2bcmh308rxnlmzx9f81swlbdhildmcpysac39qy3p9j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.9.0-1.23504.3/microsoft.codeanalysis.externalaccess.omnisharp.4.9.0-1.23504.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.9.0-1.23504.3"; sha256 = "033pbj95r7pvc5bywkwarrxwm1xgq5prbkyq32abbzbpsc09izr2"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.9.0-1.23504.3/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.9.0-1.23504.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler"; version = "4.9.0-1.23504.3"; sha256 = "0wwlw8fg10ijg8ynnhi1dm9gpjfgm46r325diq7b65im9bsasy1w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razorcompiler/4.9.0-1.23504.3/microsoft.codeanalysis.externalaccess.razorcompiler.4.9.0-1.23504.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.9.0-1.23504.3"; sha256 = "0n34d7697n7w8pjp5zmrh66i2ddjj1yad9mz1wvq4zf7i0br2lv9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.9.0-1.23504.3/microsoft.codeanalysis.features.4.9.0-1.23504.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.9.0-1.23504.3"; sha256 = "057g9g7lqc9pm87ymlw963kzy3kprasai1qqf5ydrp0a3xfm8s1j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.9.0-1.23504.3/microsoft.codeanalysis.scripting.common.4.9.0-1.23504.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.9.0-1.23504.3"; sha256 = "170408wy4kwskl345lgzxgakiavs09wz7insp3phh0aicmc6s80i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.9.0-1.23504.3/microsoft.codeanalysis.workspaces.common.4.9.0-1.23504.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.AspNetCore"; version = "4.9.0-3.23611.3"; sha256 = "13gx7v30jqikms0dh6in8kslgasdpj3j0jk1x3f9x0sgq8864ad9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.aspnetcore/4.9.0-3.23611.3/microsoft.codeanalysis.externalaccess.aspnetcore.4.9.0-3.23611.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.9.0-3.23611.3"; sha256 = "12v6vcwnkdf84hs79ma4dkys7z07cf05k2ca1fnkz55zwaib4n59"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.9.0-3.23611.3/microsoft.codeanalysis.externalaccess.omnisharp.4.9.0-3.23611.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.9.0-3.23611.3"; sha256 = "08c2b63vqwwda34kyrjglj2xgjjhqzgmdcnby8nm09j7jpz4z31y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.9.0-3.23611.3/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.9.0-3.23611.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler"; version = "4.9.0-3.23611.3"; sha256 = "06svd5nhvyrww5prnx0055g0flfdi1x5n89in74i71mqvskqkh38"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razorcompiler/4.9.0-3.23611.3/microsoft.codeanalysis.externalaccess.razorcompiler.4.9.0-3.23611.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.9.0-3.23611.3"; sha256 = "0nz2124hgxrh9k9c5p6xavkw8glmpwiq3qclvbggx9v8bnfl4p9k"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.9.0-3.23611.3/microsoft.codeanalysis.features.4.9.0-3.23611.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.9.0-3.23611.3"; sha256 = "0k37wrw5jy57grbi9i0rx76ig2jplikkmiyzvzrydl0mmrb5ks1k"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.9.0-3.23611.3/microsoft.codeanalysis.scripting.common.4.9.0-3.23611.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.9.0-3.23611.3"; sha256 = "12scgd8bvh1p5hvkfcbm58j77ancn6wy23wdmwy0kqj0wm10n1wy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.9.0-3.23611.3/microsoft.codeanalysis.workspaces.common.4.9.0-3.23611.3.nupkg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; sha256 = "0g4fqxqy68bgsqzxdpz8n1sw0az1zgk33zc0xa8bwibwd1k2s6pj"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "7.0.0"; sha256 = "1hv94kwd4v7969cq3ik2afg5ipn44zbhpsgaga9cd0z47swz4r3a"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "7.0.0"; sha256 = "09mq6g61rqjy5mdhsz2224m0rb0z9rkrxhhqym9zwpn272bbc9df"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "7.0.0"; sha256 = "0n1grglxql9llmrsbbnlz5chx8mxrb5cpvjngm0hfyrkgzcwz90d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "7.0.0"; sha256 = "1qifb1pv7s76lih8wnjk418wdk4qwn87q2n6dx54knfvxai410bl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "7.0.0"; sha256 = "1pmgjrvwdzqrxjb24cg3fd624r64lgywbqc9symd5hyl4175pwk8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "7.0.0"; sha256 = "0nhh7rnh45s39x8sjn88czg7nyfpry85pkm0g619j8b468zj8nb4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "7.0.0"; sha256 = "1fk7dcz6gfhd1k1d8ksz22rnjvj1waqjzk29ym4i3dz73rsq8j1i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "7.0.0"; sha256 = "05zjmrpp99l128wijp1fy8asskc11ls871qaqr4mjnz3gbfycxnj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "7.0.0"; sha256 = "04wb6hw3r7mmhg57215r1mb01q17glyaddjw1j5g1drsws914fj4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "7.0.0"; sha256 = "0ff20yklyjgyjzdyv7sybczgqhgd557m05dbwxzjznr0x41b180d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "7.0.0"; sha256 = "1f1h0l47abw0spssd64qkhgd7b54pyzslyb586zp21milimcfmgv"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "7.0.0"; sha256 = "1812vnkn8n0i4yr3k5azcxcfx1bbpcsmms95rdyxjfrzfksr05ai"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "7.0.0"; sha256 = "1f5fhpvzwyrwxh3g1ry027s4skmklf6mbm2w0p13h0x6fbmxcb24"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "7.0.0"; sha256 = "1m8ri2m3vlv9vzk0068jkrx0vkk4sqmk1kxmn8pc3wys38d38qaf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; sha256 = "04m6ywsf9731z24nfd14z0ah8xl06619ba7mkdb4vg8h5jpllsn4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; sha256 = "0bv8ihd5i2gwr97qljwf56h8mdwspmlw0zs64qyk608fb3ciwi25"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "8.0.0"; sha256 = "026f7f2iv6ph2dc5rnslll0bly8qcx5clmh2nn9hgyqjizzc4qvy"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; sha256 = "13qb8wz3k59ihq0mjcqz1kwrpyzxn5da4dhk2pvcgc42z9kcbf7r"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; sha256 = "1jrmlfzy4h32nzf1nm5q8bhkpx958b0ww9qx1k1zm4pyaf6mqb04"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; sha256 = "1n3ss26v1lq6b69fxk1vz3kqv9ppxq8ypgdqpd7415xrq66y4bqn"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; sha256 = "02jnx23hm1vid3yd9pw4gghzn6qkgdl5xfc5r0zrcxdax70rsh5a"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; sha256 = "05wxjvjbx79ir7vfkri6b28k8zl8fa6bbr0i7gahqrim2ijvkp6v"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; sha256 = "1igf2bqism22fxv7km5yv028r4rg12a4lki2jh4xg3brjkagiv7q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; sha256 = "0xv3sqc1lbx5j4yy6g2w3kakzvrpwqs2ihax6lqasj5sz5map6fk"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; sha256 = "1d9b734vnll935661wqkgl7ry60rlh5p876l2bsa930mvfsaqfcv"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "8.0.0"; sha256 = "1mvp3ipw7k33v2qw2yrvc4vl5yzgpk3yxa94gg0gz7wmcmhzvmkd"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; sha256 = "17d02106ksijzcnh03h8qaijs77xsba5l50chng6gb8nwi7wrbd5"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.2"; sha256 = "1sg1wr7lza5c0xc4cncqr9fbsr30jlzrd1kwszr9744pfqfk1jj3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.25"; sha256 = "052388yjivzkfllkss0nljbzmjx787jqdjsbb6ls855sp6wh9xfd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.25"; sha256 = "103xy6kncjwbbchfnpqvsjpjy92x3dralcg9pw939jp0dwggwarz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.25"; sha256 = "13m14pdx5xfxky07xgxf6hjd7g9l4k6k40wvp9znhvn27pa0wdxv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.25"; sha256 = "132pgjhv42mqzx4007sd59bkds0fwsv5xaz07y2yffbn3lzr228k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.25"; sha256 = "0jfhmfxpx1h4f3axgf60gc8d4cnlvbb853400kag6nk0875hr0x1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.25"; sha256 = "0jpcmva1l8z36r4phz055l7fz9s6z8pv8pqc4ia69mhhgvr0ks7y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.25"; sha256 = "012jml0bqxbspahf1j4bvvd91pz85hsbcyhq00gxczcazhxpkhz4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.25"; sha256 = "0wgwxpyy1n550sw7npjg69zpxknwn0ay30m2qybvqb5mj857qzxi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.25"; sha256 = "08vr7c5bg5x3w35l54z1azif7ysfc2yiyz50ip1dl0mpqywvlswr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.2"; sha256 = "1dny43jksy6dm9zrkdm8j80gb25w6wdvjlxnphj7ngf0fbg3dd2c"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.0"; sha256 = "1rz22chnis11dwjrqrcvvmfw80fi2a7756a7ahwy6jlnr250zr61"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.6.0"; sha256 = "0dz65afvab3bmffwj50gdy4jqi0xrn93yn7f476kz3c7ll6v5ck1"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.SDK.EmbedInteropTypes"; version = "15.0.12"; sha256 = "083pva0a0xxvqqrjv75if25wr3rq034wgjhbax74zhzdb665nzsw"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.14.114"; sha256 = "062mqkmjf4k6zm3wi9ih0lzypfsnv82lgh88r35fj66akihn86gv"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.3"; sha256 = "0z7mpiljkqjw1qi5zapv7mg9pyfyzlgmil34j4wi3y9r19bsb87z"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.8.0"; sha256 = "0395fkyhibrlz672v23rgalbzw3y878aclk6shqvdk9xca6bg4b1"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.6.40"; sha256 = "1iv67ndrvls7qa3wrh7mnswqbhx8ggr0w1hi7md1grfm4f0nqyz4"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.6.40"; sha256 = "0ba9r9y3jsx3s3j190mv4gg47ibyl44s58whwvas9c64hhs4n22s"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; sha256 = "0qx4nzsx28galgzzjkgf541254d433dgxcaf7y2y1qyyxgsfjj1f"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; sha256 = "1klsyly7k1xhbhrpq2s2iwdlmw3xyvh51rcakfazwxkv2hm5fj3b"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "6.8.0-preview.1.69"; sha256 = "02h0g9021lqvfw1kix7pq7m4f2jpkkg15fk9cccd3px7rc7ap8y4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.8.0-preview.1.69/nuget.common.6.8.0-preview.1.69.nupkg"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "6.8.0-preview.1.69"; sha256 = "0y5sm3wab9c57n1h036ldnn2hx35xsxdy8y90j2jvq38hr65bzzp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.8.0-preview.1.69/nuget.configuration.6.8.0-preview.1.69.nupkg"; }) - (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.8.0-preview.1.69"; sha256 = "0bsk5ic664y5n4gagkj8lj3ap24w61203zh437vzvzmmwm9y3knk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.8.0-preview.1.69/nuget.dependencyresolver.core.6.8.0-preview.1.69.nupkg"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.8.0-preview.1.69"; sha256 = "1rynwrxljwnsdlrb7w15jp7my54jnin3wb61nnz1chs26b0p3w3c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.8.0-preview.1.69/nuget.frameworks.6.8.0-preview.1.69.nupkg"; }) - (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.8.0-preview.1.69"; sha256 = "1j8chy4yb9zxm4shpk565sy9c22y2rjh4h3mqf7jr4aqrw5vj82s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.8.0-preview.1.69/nuget.librarymodel.6.8.0-preview.1.69.nupkg"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "6.8.0-preview.1.69"; sha256 = "12i6l6pczmqnsr0xdqzcxrw1w4lyfx6nhrvfsvw0k29qw2i70hk7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.8.0-preview.1.69/nuget.packaging.6.8.0-preview.1.69.nupkg"; }) - (fetchNuGet { pname = "NuGet.Packaging.Core"; version = "6.8.0-preview.1.69"; sha256 = "14i3d12wh61g0n3j7j1xk6qhlh1mxfhk4hzl9nm5103bn5f43i53"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/6.8.0-preview.1.69/nuget.packaging.core.6.8.0-preview.1.69.nupkg"; }) - (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.8.0-preview.1.69"; sha256 = "0k8mlp14g3wnx10sirlf99dlyxd1z19x8fvhd1nmhn3mymkvjpiv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.8.0-preview.1.69/nuget.projectmodel.6.8.0-preview.1.69.nupkg"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "6.8.0-preview.1.69"; sha256 = "0qlk3vg068xm9d8fzllrnzkznmba3g2z47cqdb4f4nxw5hzva9f8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.8.0-preview.1.69/nuget.protocol.6.8.0-preview.1.69.nupkg"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "6.8.0-preview.1.69"; sha256 = "1k2n72fvcixbc4svj6p52gi4yrqsw8ysrsr3b0l3s4rbfslv3h3k"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.8.0-preview.1.69/nuget.versioning.6.8.0-preview.1.69.nupkg"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "6.8.0-rc.122"; sha256 = "0sszc6426749r7dqq1i46pwl92n1dklqd723px57pjs0b1a7ddwc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.8.0-rc.122/nuget.common.6.8.0-rc.122.nupkg"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "6.8.0-rc.122"; sha256 = "06d7r5yxf69d2wagpzkd77cnrbm5cv3z3dfsgj1zy7c2pb9a2rmk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.8.0-rc.122/nuget.configuration.6.8.0-rc.122.nupkg"; }) + (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.8.0-rc.122"; sha256 = "1sarid71h7cs7d2h7zv313rxx1icpwli2lcfpasascsf0ahbf0pv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.8.0-rc.122/nuget.dependencyresolver.core.6.8.0-rc.122.nupkg"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.8.0-rc.122"; sha256 = "07pfykvbm070dyiraillk5h4rzmfm89dr0km7bnflf1hq9l6z5xi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.8.0-rc.122/nuget.frameworks.6.8.0-rc.122.nupkg"; }) + (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.8.0-rc.122"; sha256 = "1kflrd8kmd80190zjll4rzmfvz36ffnnb4w0psm977qpj90vpcgl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.8.0-rc.122/nuget.librarymodel.6.8.0-rc.122.nupkg"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "6.8.0-rc.122"; sha256 = "1bhaclf8x3vgwd1hb05knb1hyq7kdg64l959mgsd9cwqgjy5rksy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.8.0-rc.122/nuget.packaging.6.8.0-rc.122.nupkg"; }) + (fetchNuGet { pname = "NuGet.Packaging.Core"; version = "6.8.0-rc.122"; sha256 = "10c2mfim8hk3jjbclaibh3j4cr9ii9mhg2f9f4pvcwwdd2xwcv0d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/6.8.0-rc.122/nuget.packaging.core.6.8.0-rc.122.nupkg"; }) + (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.8.0-rc.122"; sha256 = "07ddcwbpqj9ki56k26fqr2ya6lh81fx9iacq40gz2jnlfkx5ipa1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.8.0-rc.122/nuget.projectmodel.6.8.0-rc.122.nupkg"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "6.8.0-rc.122"; sha256 = "012zjl6lqv7smgksjiglabnhx5ywqf0pl357kppmhbsifhrk7j6w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.8.0-rc.122/nuget.protocol.6.8.0-rc.122.nupkg"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.8.0-rc.122"; sha256 = "1y1f0kzwzm5nx7bhmqdxfvl367mm0xj9ddiv5bwg7iwjxfz0ga29"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.8.0-rc.122/nuget.versioning.6.8.0-rc.122.nupkg"; }) (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.9"; sha256 = "0r8m36qqddzmnv4wdpxs7qa17f4kbb9r2zwn7n41amy3lp5f7w4z"; }) (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.9"; sha256 = "0g7v185mraq7bvihavagdl46rmfrkv1vr6cyb9jf1agi5i7abkyz"; }) (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.9"; sha256 = "0352bg0g4818y3nbxq8jmmdw60dgyxw4pjpr181sdyi73vmbnlrg"; }) (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.9"; sha256 = "0vb5kmf4hnrbssgj3nwsjdns0671k1llyplagm57m5wliaw12qkh"; }) (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.9"; sha256 = "124af8b6ixra1xm168nz5wfn674xfk0zhpj9dmfaasfi33sdwvjb"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.1.0"; sha256 = "008bnj279y7gxcai69r4bqgxpxwsdb8jvai4kxkd97arlcr1cpjv"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.0"; sha256 = "0kq5x9k5kl6lh7jp1hgjn08wl37zribrykfimhln6mkqbp1myncp"; }) (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.0"; sha256 = "1ibkkz5dsac64nf7alsdsr8r1jm8j87vv6chsi3azkf5zv0rphsy"; }) @@ -114,71 +112,49 @@ (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.0"; sha256 = "1g7gi1kdil8iv67g42xbmfhr1l0pkz645gqnd8lfv3q24449shan"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; sha256 = "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) - (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "7.0.0"; sha256 = "1gkn56gclkn6qnsvaw5fzw6qb45pa7rffxph1gyqhq7ywvmm0nc3"; }) - (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; sha256 = "1cxrp0sk5b2gihhkn503iz8fa99k860js2qyzjpsw9rn547pdkny"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; sha256 = "1nbyn42xys0kv247jf45r748av6fp8kp27f1582lfhnj2n8290rp"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; sha256 = "0wqbjxgggskfn45ilvg86grqci3zx9xj34r5sradca4mqqc90n7f"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; sha256 = "1p9xpqzx42s8cdizv6nh15hcjvl2km0rwby66nfkj4cb472l339s"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; sha256 = "0syz7y6wgnxxgjvfqgymn9mnaa5fjy1qp06qnsvh3agr9mvcv779"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "7.0.0"; sha256 = "149d9kmakzkbw69cip1ny0wjlgcvnhrr7vz5pavpsip36k2mw02a"; }) + (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "8.0.0"; sha256 = "02hmqwrdvqzq4ka4kpf88i7n3qp6lw1xwp7424kg08pa9y69swij"; }) + (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; sha256 = "0y7rp5qwwvh430nr0r15zljw01gny8yvr0gg6w5cmsk3q7q7a3dc"; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; sha256 = "16j61piz1jf8hbh14i1i4m2r9vw79gdqhjr4f4i588h52249fxlz"; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "8.0.0"; sha256 = "10fwp7692a6yyw1p8b923k061zh95a6xs3vzfdmdv5pmf41cxlb7"; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; sha256 = "1gbfimhxx6v6073pblv4rl5shz3kgx8lvfif5db26ak8pl5qj4kb"; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; sha256 = "0snljpgfmg0wlkwilkvn9qjjghq1pjdfgdpnwhvl2qw6vzdij703"; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; sha256 = "0skwla26d8clfz3alr8m42qbzsrbi7dhg74z6ha832b6730mm4pr"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "8.0.0"; sha256 = "08dadpd8lx6x7craw3h3444p7ncz4wk0a3j1681lyhhd56ln66f6"; }) (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; sha256 = "0gk9diqx388qjmbhljsx64b5i0p9cwcaibd4h7f8x901pz84x6ma"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.0"; sha256 = "1jxhvsh5mzdf0sgb4dfmbys1b12ylyr5pcfyj1map354fiq3qsgm"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; sha256 = "1mkvx1fwychpczksy6svfmniqhbm3xqblxqik6178l12xgq7aw45"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.5.1"; sha256 = "0cdnl4i9mfk7kx2ylglayqwqw7kl5k1xr8siaxch45hfyc2cpds8"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; sha256 = "10a8vm0c3n5cili5nix6bdmiaxr69qisvk356pb81f2s8bgq40bm"; }) (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.1"; sha256 = "1m2wnzg3m3c0s11jg4lshcl2a47d78zri8khc21yrz34jjkbyls2"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; }) (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.0"; sha256 = "0aybd4mp9f8d4kgdnrnad7bmdg872044p75nk37f8a4lvkh2sywd"; }) (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; sha256 = "0wkm6bj4abknzj41ygkziifx8mzhj4bix92wjvj6lihaw1gniq8c"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; sha256 = "0ham9l8xrmlq2qwin53n82iz1wanci2h695i3cq83jcw4n28qdr9"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "8.0.0"; sha256 = "02mmqnbd7ybin1yiffrq3ph71rsbrnf6r6m01j98ynydqfscz9s3"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; }) ] diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index 96b540e5fe246..ecd31806cb6d8 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.2.4"; + version = "0.2.8"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-CoTp9IhsG09jZuxxiYgboNDmJ+AAiyw7lIjwL1Jq8u4="; + sha256 = "sha256-JNWI7PCGuZ3uLqglrR08nOumpbX2CxyVBYbUJJwptoU="; }; - vendorHash = "sha256-bsReLqKR1jfu2pU912B/kyBlB6TjM8vY8IfiNEvTwcc="; + vendorHash = "sha256-S4HFIuWWb+7QhwUg28Kt5IEH3j82tzJv8K5EqSYq1eA="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index aa8b4ae20f711..2d5fae3311426 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.58.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-zDTL/kP0ldPiZhLqLQmpIoDaq979KNDVJyXp93sPZAk="; + hash = "sha256-E+94J83IDLuEayrlwIp8TL+GZeUCkQmSyNL8N7mvK6o="; }; vendorHash = null; diff --git a/pkgs/development/tools/package-project-cmake/default.nix b/pkgs/development/tools/package-project-cmake/default.nix index af22ce40a0625..fa40335a18014 100644 --- a/pkgs/development/tools/package-project-cmake/default.nix +++ b/pkgs/development/tools/package-project-cmake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "package-project-cmake"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "TheLartians"; repo = "PackageProject.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-41cJm6eO5Q6xhARJbshi6Tesk/IxEQNsMShmDcjVqzs="; + hash = "sha256-E7WZSYDlss5bidbiWL1uX41Oh6JxBRtfhYsFU19kzIw="; }; dontConfigure = true; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 5d948190ee19e..726aa304a544f 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "packer"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-oGEG9uGjZTpJjQBnVlffFpNc5sb7HyD/ibpnQUhtTH4="; + hash = "sha256-7HoT9B6YpgwJ8Q1TUMS3W919204LiOqyemtT7Ybeeyg="; }; - vendorHash = "sha256-vHVx9vFPvctWNzibfZlN7mEYngYd6q7s9gMIM0FX0Ao="; + vendorHash = "sha256-aalecIoKUUj0siDIBXXeyCjkpsyjlPPX6XohDC6WDoY="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix index 6c004a7b0b379..a4b2034852f2f 100644 --- a/pkgs/development/tools/parsing/antlr/4.nix +++ b/pkgs/development/tools/parsing/antlr/4.nix @@ -15,7 +15,8 @@ let mkAntlr = { version, sourceSha256, jarSha256, extraCppBuildInputs ? [], - extraCppCmakeFlags ? [] + extraCppCmakeFlags ? [], + extraPatches ? [ ] }: rec { source = fetchFromGitHub { owner = "antlr"; @@ -81,7 +82,8 @@ let pname = "antlr-runtime-cpp"; inherit version; src = source; - sourceRoot = "${source.name}/runtime/Cpp"; + + patches = extraPatches; outputs = [ "out" "dev" "doc" ]; @@ -90,6 +92,8 @@ let lib.optional stdenv.isDarwin CoreFoundation ++ extraCppBuildInputs; + cmakeDir = "../runtime/Cpp"; + cmakeFlags = extraCppCmakeFlags; meta = with lib; { @@ -162,6 +166,12 @@ in { jarSha256 = "0dnz2x54kigc58bxnynjhmr5iq49f938vj6p50gdir1xdna41kdg"; extraCppBuildInputs = [ utf8cpp ] ++ lib.optional stdenv.isLinux libuuid; + extraCppCmakeFlags = [ + "-DCMAKE_CXX_FLAGS='-I${lib.getDev utf8cpp}/include/utf8cpp'" + ]; + extraPatches = [ + ./utf8cpp.patch + ]; }).antlr; antlr4_8 = (mkAntlr { diff --git a/pkgs/development/tools/parsing/antlr/utf8cpp.patch b/pkgs/development/tools/parsing/antlr/utf8cpp.patch new file mode 100644 index 0000000000000..aad6b11857e3f --- /dev/null +++ b/pkgs/development/tools/parsing/antlr/utf8cpp.patch @@ -0,0 +1,15 @@ +diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt +index c8b16c6cf..e8da7960d 100644 +--- a/runtime/Cpp/runtime/CMakeLists.txt ++++ b/runtime/Cpp/runtime/CMakeLists.txt +@@ -40,8 +40,8 @@ find_package(utf8cpp QUIET) + set(INSTALL_utf8cpp FALSE) + + if (utf8cpp_FOUND) +- target_link_libraries(antlr4_shared utf8cpp) +- target_link_libraries(antlr4_static utf8cpp) ++ target_link_libraries(antlr4_shared utf8cpp::utf8cpp) ++ target_link_libraries(antlr4_static utf8cpp::utf8cpp) + else() + + # older utf8cpp doesn't define the package above diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix index 04a1a637207d2..977c4bb398c2d 100644 --- a/pkgs/development/tools/parsing/jshon/default.nix +++ b/pkgs/development/tools/parsing/jshon/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ jansson ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=strict-prototypes"; + patches = [ (fetchpatch { # https://github.com/keenerd/jshon/pull/62 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 94a93fbb2bc7f..9e3a8be40c227 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,10 +1,10 @@ { "url": "https://github.com/cstrahan/tree-sitter-nix", - "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=", + "rev": "763168fa916a333a459434f1424b5d30645f015d", + "date": "2023-12-26T15:36:50+13:00", + "path": "/nix/store/wvnrjnrb3dgc5pg5n8nkwxm43478nk2k-tree-sitter-nix", + "sha256": "0nn3ij8k6wkbf3kcvkyyp0vhfjcksi31wyyfwmsbx66maf2xgaii", + "hash": "sha256-MarXhVPVmL505c57HkbUk0kHN7jez83mcGtyM5GMw1o=", "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 32750a9f2da4c..cc31e36aee6b7 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,10 +1,10 @@ { - "url": "https://github.com/LhKipp/tree-sitter-nu", - "rev": "c125aaa83c14f936a20f60c0e86537b81b9f01c9", - "date": "2023-09-19T21:59:06+02:00", - "path": "/nix/store/s0fcpv3w2wkra74y675arsvi3g0xbng2-tree-sitter-nu", - "sha256": "1ckbbzq9rk6iz23xs283rw7j2w7lg8fgp552qkiqa3fc7fmyrfk0", - "hash": "sha256-YLrsqzvMDYXjxKKU+xx69HAhD88DCd2H+NHMnPBfa7I=", + "url": "https://github.com/nushell/tree-sitter-nu", + "rev": "a0b80b2e21e5e39571252dc799e19eb89f1fc912", + "date": "2023-12-21T08:27:09-06:00", + "path": "/nix/store/nlczvz84gk9jjjiijczwyn1isy1rn1k7-tree-sitter-nu", + "sha256": "1y9bsdg9v7znlc1k4xxraaj8f8fn5m3zyc0r2m9fff2if9ijpll1", + "hash": "sha256-gdIrY3JROOdSFRkw/0ct1iGHpFK5dzIDo/afnV7TK/k=", "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 423536dee92a0..b5068b30cf24d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -378,7 +378,7 @@ let repo = "tree-sitter-solidity"; }; "tree-sitter-nu" = { - orga = "LhKipp"; + orga = "nushell"; repo = "tree-sitter-nu"; }; "tree-sitter-cue" = { diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index b68a8908d18da..84131e9fe485c 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.6.1"; + version = "2.6.2"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bB3yaQweXyj4O2TMHBhyMz5tm2Th0cDqRZ1B9lv+ARk="; + hash = "sha256-K3LOoVQS7WM7tJsKDzFwT8Htea1cxfVKTZ2Ml7oiIQc="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 4cab671e64ddb..cf5e0c7102730 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.162.0"; + version = "0.175.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-F+iBO4R+JSOaNHw/+T8X2P+8Q/l0hKN2tu/rRshY/5A="; + sha256 = "sha256-kCWhCPlgc0KPbVayObpDQS9GuXSJ/q/mYQrCLOpIjcM="; }; - vendorHash = "sha256-WNbHnYCC8G0kxsLWOZWDFugBQ7E5YT2pTQy+wczZ1qU="; + vendorHash = "sha256-gNDIXmJxJZuY20Q+MK4uzLMmz+VTUimOtsIblI378kY="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix index 6a611503ff18e..8a18b4424201a 100644 --- a/pkgs/development/tools/pulumictl/default.nix +++ b/pkgs/development/tools/pulumictl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.45"; + version = "0.0.46"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-DDuzJcYfa0zHqLdyoZ/Vi14+0C6ucgkmb5ndrhTlOik="; + sha256 = "sha256-7A6dx/5091FIQ2AB6C+Z2CjhTBx2e6iB21Du2u9EiHY="; }; - vendorHash = "sha256-XOgHvOaHExazQfsu1brYDq1o2fUh6dZeJlpVhCQX9ns="; + vendorHash = "sha256-Wktr3TXSIIzbkiT3Gk5i4K58gahnxySi6ht30li+Z0o="; ldflags = [ "-s" "-w" "-X=github.com/pulumi/pulumictl/pkg/version.Version=${src.rev}" diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index d8d5280908345..c033769c85206 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,19 +6,15 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.3.32"; + version = "2.3.35"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-miJ/WONNDieLryD2J9JmkmSCG5Iesg2N2GT/FI9NGY0="; + hash = "sha256-tNTHRSzYCelByEt8bN7BhUBGQCAJfZVjWIYTr0VhbO4="; }; - postPatch = '' - patchShebangs --build src/configure - ''; - nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index e204a5136d0df..f87bb3d2b1ed4 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 = "12.0.0"; + version = "12.0.1"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-OZrg3O+jvZ4Bo/BouT2r6LOfm1ZGbDidFEblyEyPe58="; + hash = "sha256-ZvuSws7QkoKeMyHFoJEeLemDCdAxDnq5SaOaUCOOA/M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 151c489de6b53..b3119d83a003f 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-XzDxfjXY7Mu6qDZ66r3c0/RDBQF7wCONZTpfQ0j1B1c="; + hash = "sha256-QlynZgmDd7m7m17J5lUTmejkKdQlfjiqcXg4ZMFp0vc="; }; - cargoHash = "sha256-J/ecoC8efv0IfAta7Ug0g7N/2jGV+DOACgbhXVfNK3k="; + cargoHash = "sha256-TOuxJL2UtMA9mZLHZVQDD6lyL9VWy/HBNfezhOGbSG8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index 2943d45e26ac1..a07f09a060c7a 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.6.0"; + version = "1.7.5"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sAqWVGzEQJwf7ioQjOFs+1hAn69LmDCMSu0ym59aDsU="; + sha256 = "sha256-UAh84LM7QbIdxuPGN+lsbjVLd+hk8NXqwDxcRv5FAdY="; }; - vendorHash = "sha256-xmpjoNfz+4d7Un0J6yEhkQG2Ax8hL0dw4OQmwrKq3QI="; + vendorHash = "sha256-kd820Qe/0gN34VnX9Ge4BLeI3yySunJNjOVJXBe/M58="; subPackages = [ "cmd/rain" ]; diff --git a/pkgs/development/tools/redoc-cli/default.nix b/pkgs/development/tools/redoc-cli/default.nix index ed475e08fa44e..de30e43d5eaf9 100644 --- a/pkgs/development/tools/redoc-cli/default.nix +++ b/pkgs/development/tools/redoc-cli/default.nix @@ -30,5 +30,7 @@ buildNpmPackage rec { license = lib.licenses.mit; mainProgram = "redoc-cli"; maintainers = with lib.maintainers; [ veehaitch ]; + # https://github.com/NixOS/nixpkgs/issues/272217 + broken = true; }; } diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index 864e2a8c372c5..1f92a9255327e 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -4,14 +4,14 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.5.4"; + version = "0.5.5"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-xjyzGrcr3yVny70P5BvV9meshOcvbf6BWhuBE1PlK4Q="; + sha256 = "sha256-s1eP1uj5WbHd59AYsm2t3+iOJKMMHZQ7xwjvy/yrICk="; }; vendorHash = "sha256-JIvFHaq9RCqDurKTnoT9/yJevHotuG22AyizTMLtHPc="; diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index 74a3d6b149b52..cdb4737255bd4 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-11-09"; + version = "unstable-2023-12-21"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; - rev = "66460cb9628864e230f6b30adc49c4b848d2e843"; - sha256 = "sha256-pB68YxLHiNFhW+0PZ+UW39V59aE11CXZH7WXyqgyRIk="; + rev = "ef28c77b630c371971f624d14597eacbf90d23f9"; + sha256 = "sha256-6okyRF9y2vjBye2Jbdwx1slyhP6y7syEvwnvLXwQlok="; }; - cargoSha256 = "sha256-iw+7xsVNpIQIxDAmN878v88k1EYe1FnJPVpGBhyVstA="; + cargoSha256 = "sha256-1QCjNIwS9/kQyq5CIqOa+wdKbH6pkZ0Wg5rHaGuZ/nI="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 94f70251e504c..cf9529e69c26e 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -11,16 +11,22 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.1.6"; + version = "0.1.9"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-EX1tXe8KlwjrohzgzKDeJP0PjfKw8+lnQ7eg9PAUAfQ="; + hash = "sha256-Dtzzh4ersTLbAsG06d8dJa1rFgsruicU0bXl5IAUZMg="; }; - cargoHash = "sha256-ueWSBYXcdaxagjFjxfsImulOs0zVVqGHmfXp4pQLaMM="; + # Cargo.lock is outdated + # TODO: remove at next release + preBuild = '' + cargo update --offline + ''; + + cargoHash = "sha256-c6/baQ1o0alKGD7dZDK2udBRq2oRx1l4R97bfqkFlHk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index 75a9fd030e83e..65e429c220d7c 100644 --- a/pkgs/development/tools/rust/cargo-about/default.nix +++ b/pkgs/development/tools/rust/cargo-about/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.5.7"; + version = "0.6.0"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-AROT/Q/C0lbkeoMYmY2Tzt0+yRVA8ESRo5mPM1h0HJs="; + sha256 = "sha256-srJ5NyO+kySFCcqyF0i99Zvh2XsNAyFvTUcks/kt0qs="; }; - cargoSha256 = "sha256-9HkaCUGo6jpzQn851ACM7kcBCkyMJJ/bb/qtV4Hp0lI="; + cargoHash = "sha256-eO4dBXVBjuN68cTvw8LzzJEedu5+dizOMu4QFEOzKK8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 8613b15aa5ca1..d0cb9b4939b25 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.4.6"; + version = "1.4.8"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-zCivxYHhaVqzPe3qBUKXgMgEE6niGqkHJM77rfEUoFo="; + hash = "sha256-TU/jUPfh7c22L19zOccXvE9jq4dXEzXdzzZ1fJxjf2E="; }; - cargoHash = "sha256-O8X+oLKhKeQGeUrsRVeakZjaMKPiXdIns48rV8Q9JA8="; + cargoHash = "sha256-zHP64xx5CGl17+IZpsbVfbhau4ZYhxD0t5HeThMVBVQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix index 844839717b55d..6a8f432ecab76 100644 --- a/pkgs/development/tools/rust/cargo-clone/default.nix +++ b/pkgs/development/tools/rust/cargo-clone/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-clone"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "janlikar"; repo = pname; rev = "v${version}"; - sha256 = "1lfg47kw07k4r795n0iixl5cnrb13g74hqlbp8jzbypr255bc16q"; + sha256 = "sha256-al+C3p9jzPbykflt3WN+SibHm/AN4BdTxuTGmFiGGrE="; }; - cargoSha256 = "sha256-rJcTl5fe3vkNNyLRvm7q5KmzyJXchh1/JuzK0GFhHLk="; + cargoHash = "sha256-sQVjK6i+wXwOfQMvnatl6PQ1S+91I58YEtRjzjSNNo8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index 17d6bb473d23e..e55599ff99783 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-P7gXfACPK63f38KzV6UVQa8MZmxEaMNxl1GZYCDM54M="; + hash = "sha256-x5srXt9xTBkBNfG9r7GsDKVSbxJCKU3Y6HoBLvAHyi0="; }; - cargoHash = "sha256-4PTihulfKwvzzZTwmUfxkvp0XYHBxTUHH0pCwNKSxrM="; + cargoHash = "sha256-/ZzcsC89U+SfyZaANX1rbytVlQ88p4g+HKRd6JerpQc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index c8769abc8a68f..acfd450f209a7 100644 --- a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cyclonedx"; - version = "0.3.8"; + version = "0.4.1"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-rust-cargo"; rev = "${pname}-${version}"; - hash = "sha256-6XW8aCXepbVnTubbM4sfRIC87uYSCEbuj+jJcPayEEU="; + hash = "sha256-JrusJsMjaWAsWAssU+q87BCH2ouLfthIw47ypwBkR9o="; }; - cargoHash = "sha256-BG/vfa5L6Iibfon3A5TP8/K8jbJsWqc+axdvIXc7GmM="; + cargoHash = "sha256-QzEojbwBF7s3C+LlFWle0+8DVtyEljuqAcMAyRJqFcs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index a25f80d561592..bf3a36591d3da 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.74"; + version = "1.0.77"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-3CbI1iv8kSBJ8HFJDfCRPTyMr6KhuuVs7u96d6H5FGE="; + sha256 = "sha256-jaTSbEmqu9xyv9E5VgiHLE5YIBHVNXdVw8B+rSCjaZQ="; }; - cargoHash = "sha256-FekLNZMR3++MTlM8yJ5RmZI4t5B6lyKRxBlupOVzUFM="; + cargoHash = "sha256-WXNfxyD0CpoXEkVI+t30aTrdq/KqPnqeDt3wCEBoyLg="; 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-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 4fb099b3c0b1e..869a0c8bbbc3d 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.18.5"; + version = "0.19.0"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-be0jgjhaboutT+c3rRyp6fjmv8nAkggkcqofWmH83Zc="; + sha256 = "sha256-OT2cjNYcEKk6Thnlq7SZvK2RJ6M1Zn62GrqpKbtrUdM="; }; - cargoHash = "sha256-Sset3+jRm6yOUkvLYxBHdFvVCYOq3bvix9b3pnt7AV8="; + cargoHash = "sha256-DAJsW3uKrSyIju7K13dMQFNOwE9WDuBuPx8imdPAxqk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index 4de6345b9bf64..9d3e0e279c3a4 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.13"; + version = "0.6.15"; src = fetchCrate { inherit pname version; - hash = "sha256-5WwbtubANrLHXvaWzO/u1NeeetVUvl/ujq89BqFZ2ZQ="; + hash = "sha256-yjaX4lqUj9aZPkRuiJC3yBwXvfvd+Okr87Ia2IQvxfM="; }; - cargoHash = "sha256-25I1j0QiyeHtUq6IK7ehRK3JLKygiigtfvEe+N74TgY="; + cargoHash = "sha256-6ogeqVN2V38N7mNBjimjNv/KK2JtV4aa5AorRfYMBx8="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-leptos/Cargo.lock b/pkgs/development/tools/rust/cargo-leptos/Cargo.lock index 7e0abac242a84..9795d382d8b3a 100644 --- a/pkgs/development/tools/rust/cargo-leptos/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-leptos/Cargo.lock @@ -8,7 +8,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli", + "gimli 0.28.1", ] [[package]] @@ -158,7 +158,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -389,7 +389,7 @@ dependencies = [ [[package]] name = "cargo-leptos" -version = "0.2.2" +version = "0.2.5" dependencies = [ "ansi_term", "anyhow", @@ -430,9 +430,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" dependencies = [ "serde", ] @@ -489,9 +489,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" dependencies = [ "clap_builder", "clap_derive", @@ -499,9 +499,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" dependencies = [ "anstream", "anstyle", @@ -518,7 +518,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -686,7 +686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -737,7 +737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -745,9 +745,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "data-url" @@ -889,15 +889,21 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -927,9 +933,9 @@ dependencies = [ [[package]] name = "flexi_logger" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d1984eeb4ccb9a6f3fa5f2a1850d34afed6fd4ffcd1513b691eef9dda0f057" +checksum = "2ac35b454b60e1836602173e2eb7ef531173388c0212e02ec7f9fac086159ee5" dependencies = [ "chrono", "glob", @@ -948,25 +954,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.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1082,9 +1073,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -1095,9 +1086,20 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +dependencies = [ + "fallible-iterator", + "indexmap 1.9.3", + "stable_deref_trait", +] + +[[package]] +name = "gimli" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -1107,9 +1109,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -1117,7 +1119,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -1144,9 +1146,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1180,9 +1182,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1237,16 +1239,17 @@ dependencies = [ ] [[package]] -name = "hyper-tls" -version = "0.5.0" +name = "hyper-rustls" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ - "bytes", + "futures-util", + "http", "hyper", - "native-tls", + "rustls", "tokio", - "tokio-native-tls", + "tokio-rustls", ] [[package]] @@ -1286,9 +1289,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1311,7 +1314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -1400,9 +1403,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -1437,9 +1440,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "leptos_hot_reload" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6902fabee84955a85a6cdebf8ddfbfb134091087b172e32ebb26e571d4640ca" +checksum = "4ea60376eb80a24b3ab082612d62211e3ea0fc4dee132f7ff34d5fa5a5108cd2" dependencies = [ "anyhow", "camino", @@ -1449,15 +1452,15 @@ dependencies = [ "quote", "rstml", "serde", - "syn 2.0.38", + "syn 2.0.39", "walkdir", ] [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libflate" @@ -1484,10 +1487,21 @@ dependencies = [ ] [[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] name = "lightningcss" -version = "1.0.0-alpha.50" +version = "1.0.0-alpha.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2999490cc10a59ad8a87d731791a5d438d2d025e3f137aa7d4c23e1827985b0" +checksum = "99d6ad516c08b24c246b339159dc2ee2144c012e8ebdf4db4bddefb8734b2b69" dependencies = [ "ahash 0.7.7", "bitflags 2.4.1", @@ -1516,9 +1530,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" @@ -1639,24 +1653,6 @@ dependencies = [ ] [[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", -] - -[[package]] name = "net2" version = "0.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1745,50 +1741,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "openssl" -version = "0.10.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dfc0783362704e97ef3bd24261995a699468440099ef95d869b4d9732f829a" -dependencies = [ - "bitflags 2.4.1", - "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.38", -] - -[[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.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f55da20b29f956fb01f0add8683eb26ee13ebe3ebd935e49898717c6b4b2830" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] name = "option-ext" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1870,9 +1822,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" @@ -1933,7 +1885,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1971,7 +1923,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1987,12 +1939,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2029,9 +1975,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -2044,7 +1990,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "version_check", "yansi", ] @@ -2136,15 +2082,6 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" @@ -2163,12 +2100,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] @@ -2225,30 +2162,46 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-tls", + "hyper-rustls", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", + "rustls", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "system-configuration", "tokio", - "tokio-native-tls", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots", "winreg", ] [[package]] +name = "ring" +version = "0.17.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684d5e6e18f669ccebf64a92236bb7db9a34f07be010e3627368182027180866" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] name = "rkyv" version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2291,7 +2244,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.38", + "syn 2.0.39", "syn_derive", "thiserror", ] @@ -2313,9 +2266,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ "bitflags 2.4.1", "errno", @@ -2325,6 +2278,37 @@ dependencies = [ ] [[package]] +name = "rustls" +version = "0.21.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.5", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] name = "rustversion" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2352,48 +2336,26 @@ dependencies = [ ] [[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "security-framework" -version = "2.9.2" +name = "sct" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", + "ring", + "untrusted", ] [[package]] -name = "security-framework-sys" -version = "2.9.1" +name = "seahash" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "semver" @@ -2406,9 +2368,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.190" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -2426,13 +2388,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2526,9 +2488,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" @@ -2551,6 +2513,18 @@ dependencies = [ ] [[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] name = "string_cache" version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2595,9 +2569,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -2613,7 +2587,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2696,7 +2670,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2716,9 +2690,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes", @@ -2735,22 +2709,22 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] -name = "tokio-native-tls" -version = "0.3.1" +name = "tokio-rustls" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "native-tls", + "rustls", "tokio", ] @@ -2887,10 +2861,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -2911,15 +2891,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" [[package]] name = "version_check" @@ -2945,15 +2919,17 @@ dependencies = [ [[package]] name = "walrus" -version = "0.19.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8" +checksum = "2c03529cd0c4400a2449f640d2f27cd1b48c3065226d15e26d98e4429ab0adb7" dependencies = [ "anyhow", + "gimli 0.26.2", "id-arena", "leb128", "log", "walrus-macro", + "wasm-encoder", "wasmparser", ] @@ -2986,9 +2962,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2996,24 +2972,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2252adf46913da7b729caf556b81cedd1335165576e6446d84618e8835d89dd" +checksum = "cf8226e223e2dfbe8f921b7f20b82d1b5d86a6b143e9d6286cca8edd16695583" dependencies = [ "anyhow", "base64 0.9.3", @@ -3033,9 +3009,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f3b73cf8fcb86da78c6649c74acef205723f57af99b9f549b2609c83fe7815" +checksum = "b8a719be856d8b0802c7195ca26ee6eb02cb9639a12b80be32db960ce9640cb8" dependencies = [ "anyhow", "walrus", @@ -3043,9 +3019,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3055,9 +3031,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3065,22 +3041,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930dd8e8226379aebb7d512f31b9241a3c59a1801452932e5a15bebfd3b708fb" +checksum = "a12766255d4b9026700376cc81894eeb62903e4414cbc94675f6f9babd9cfb76" dependencies = [ "anyhow", "walrus", @@ -3088,15 +3064,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759b1e9784f903a7890bcf147aa7c8c529a6318a2db05f88c054194a3e6c6d57" +checksum = "13c2b14c5b9c2c7aa9dd1eb7161857de9783f40e98582e7f41f2d7c04ffdc155" dependencies = [ "anyhow", "walrus", @@ -3105,9 +3081,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc12bc175c837239520b8aa9dcfb68a025fcf56a718a02551a75a972711c816" +checksum = "aaedf88769cb23c6fd2e3bfed65bcbff6c5d92c8336afbd80d2dfcc8eb5cf047" dependencies = [ "anyhow", "walrus", @@ -3115,9 +3091,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5510ab88377b4e3160a7e5d90a876d0a1da2d9b9b67495f437246714c0980f" +checksum = "a8a79039df1e0822e6d66508ec86052993deac201e26060f62abcd85e1daf951" dependencies = [ "anyhow", "log", @@ -3126,22 +3102,37 @@ dependencies = [ ] [[package]] +name = "wasm-encoder" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +dependencies = [ + "leb128", +] + +[[package]] name = "wasmparser" -version = "0.77.1" +version = "0.80.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe3d5405e9ea6c1317a656d6e0820912d8b7b3607823a7596117c8f666daf6f" +checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b" [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] +name = "webpki-roots" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" + +[[package]] name = "which" version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3224,6 +3215,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3254,6 +3254,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3266,6 +3281,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3278,6 +3299,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3290,6 +3317,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3302,6 +3335,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3314,6 +3353,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3326,6 +3371,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3338,6 +3389,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winreg" version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3392,22 +3449,22 @@ checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377" [[package]] name = "zerocopy" -version = "0.7.21" +version = "0.7.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686b7e407015242119c33dab17b8f61ba6843534de936d94368856528eae4dcc" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.21" +version = "0.7.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020f3dfe25dfc38dfea49ce62d5d45ecdd7f0d8a724fa63eb36b6eba4ec76806" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/development/tools/rust/cargo-leptos/default.nix index a1e1ca030711f..fa670ee51e9cd 100644 --- a/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -1,7 +1,6 @@ { darwin , fetchFromGitHub , lib -, openssl , pkg-config , rustPlatform , stdenv @@ -9,30 +8,28 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices + SystemConfiguration Security; inherit (lib) optionals; inherit (stdenv) isDarwin; in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; - version = "0.2.2"; + version = "0.2.5"; src = fetchFromGitHub { owner = "leptos-rs"; repo = pname; - rev = "e98b478b0c82af1469151eff30f4246b9af4a539"; - hash = "sha256-7o/yQanBBSA+MmMiGCYSjar4hZ8TRZoPiUniF5ELzXU="; + rev = version; + hash = "sha256-veRhTruM+Nw2rerzXC/kpi2Jr8mMMBLqOM2YBCpFePU="; }; cargoLock = { lockFile = ./Cargo.lock; }; - nativeBuildInputs = optionals (!isDarwin) [ pkg-config ]; - - buildInputs = optionals (!isDarwin) [ - openssl - ] ++ optionals isDarwin [ + buildInputs = optionals isDarwin [ + SystemConfiguration Security CoreServices ]; diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 0da95637741fd..cf8858271d2d3 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -26,7 +26,7 @@ let pname = "cargo-llvm-cov"; - version = "0.5.37"; + version = "0.5.39"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -37,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-UJXZ7FhbkIcVAv4PymO4sCqhJ0KFORCCO3w0w9W46qQ="; + sha256 = "sha256-iaY4whQ/w6jpQ3utebtV87mCJiawI0G8ud45SVTb39o="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-aJIMG2gaotu1XdNxcE2xJS78qAqlNzF3p2RMvqBraTk="; + sha256 = "sha256-aKUVOaVv3tlWKwPbmGmK0wEAudg6tSnXh4Tty9aGctk="; leaveDotGit = true; }; @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoSha256 = "sha256-dbC8OcH/Ae98SUx9d4rsBdhYQfzsWZpiGqJoIGPDSbY="; + cargoSha256 = "sha256-/x3ZjPJWCsuzyOPPeJ+ZulTTBrftoAkPRDrMqqUOq/8="; # `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-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 505702a23275a..ad01bae6f9d25 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.4"; + version = "0.37.5"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-ZcigUYHNhzLFXA726FqalSt0hIzBVBvmep8jqzaCioc="; + hash = "sha256-2kJdj1Ye6o/GQSWRIi/SvSEz0Yvdx9xDzsYdJm4I0GQ="; }; - cargoHash = "sha256-hmEo5UQlVtgdmb6b/vhK5GHHUCgbEKdnAu2S+xrDpuk="; + cargoHash = "sha256-3Xo1JqqaEIEA18bsrLFOD4HMd/evdSEHL0DdqNNjJL8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix index 3564862e19fc2..b6265429525fb 100644 --- a/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ b/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -12,7 +12,7 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.7.0"; + version = "0.9.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-aJPiPhDbu7Nwnd65kPMxeULrcjdSu0EF34ma3n/NTYI="; + hash = "sha256-gyTA85eLVvDQKWo7D2zO6zFC8910AyNasXGjR1qkI6c="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-Inc+PWJO+PM99YYwQEG1J0/17RkLauraFVzO2CO15rQ="; + cargoHash = "sha256-Zcs+Sm2+xd7OSPXv+QDd7Jh8YvlmVrhWotjVNMqyE60="; preBuild = '' mkdir -p $out/share/ diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index b4b9429997f9d..62a73b5360376 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "23.11.2"; + version = "23.12.2"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-Rx/3U/wSV4OivUzVyjS+sHiPqCHdaoornngvfn59Bbc="; + hash = "sha256-TFVk8uq+wBfCmwU5klqapxp6IeJNnvoH6pDKC8NJuao="; }; - cargoHash = "sha256-8PnxjZIOZ8DPso4Qd29mfiIPpfe3Erjnu5xXHf1eoGk="; + cargoHash = "sha256-cN7mgyKzuYZT+g8j04Ncqb4s2mwyTsNib5RssrEa2F8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index e472c977f5f25..0e808f060823b 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.63"; + version = "0.9.66"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-xAFpTcugAWUmHwWe2Ny1urxrIzRXyfxUMb9kBoGa3SA="; + hash = "sha256-MHXQnOUtFIRak05IX6oge3AyRC6M1XHwjpAPWBc8ByQ="; }; - cargoHash = "sha256-ase0pfcDDkQGnTEtAD2ZTnBP7jdGS9pki1BoFbfUuFk="; + cargoHash = "sha256-AqWySq72teaVv6xFmIgcL7uufBQdaFO5DrAIy8mfh34="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index c7a5cc9574b78..a0d2657702a55 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.11.0"; + version = "0.11.2"; in rustPlatform.buildRustPackage rec { inherit version pname; src = fetchCrate { inherit version pname; - hash = "sha256-GiUjsSqnrUNgiT/d3b8uK9BV7cHFvaDoq6cUGRwPigM="; + hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM="; }; - cargoHash = "sha256-oXOPpK8VWzbFE1xHBQYyM5+YP/pRdLvTVN/fjxrgD/c="; + cargoHash = "sha256-qTb3JV3u42EilaK2jP9oa5D09mkuHyRbGGRs9Rg4TzI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index af5937e328d0a..2b5a83f8d0c18 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.32.0"; + version = "0.33.1"; src = fetchCrate { inherit pname version; - hash = "sha256-etEwMmfwyOTHRb/UfkcHvmnLVVqeSagWJ5HjuJ6gZVo="; + hash = "sha256-poS8s4rfktNKQ0co8G4RLXUJAeUAGcS8YIvb4W0IFNo="; }; - cargoHash = "sha256-7GyPjEit3FEjnegLnZt9TMLBI3BtzcDssrJPj60gpTo="; + cargoHash = "sha256-+tmLUxDxI/W2g7cdQD/Ph5wBpW3QbZzH2M/oRXLzsgU="; 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 91d914422277e..2022a887457a0 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.5.0"; + version = "1.6.1"; src = fetchCrate { inherit pname version; - hash = "sha256-FPkZk5qKHrRR3V8s04yLgOVOKj+Rln3Cu/VW2bnr2fE="; + hash = "sha256-B4tkP2QuL3MFQn3iAPg4TMJfFbn1D8w/C1OX+TbpgSE="; }; - cargoHash = "sha256-aFHuIEDpGCel1FC7D0hTUmzHbEj7wVarsE0wNZ/3Khw="; + cargoHash = "sha256-tn+NqugSK5R/lIQVF1URWoDbdsSCvi5tjdjOlT293tg="; # multiple impurities in tests doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 5fa4d53086743..e1b2f6867e1f6 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.25.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-cy1YgNBxVSxdoVq/2t6Uf4PBQf54degabtEYfIeIBDU="; + hash = "sha256-DN50syZ965MWXKg3lhEhvINeqZUtZgJNjusevf4EIUw="; }; - cargoHash = "sha256-Xl6wneomb5NeqhA9pMyNkCtc6FgYtx7k2zgQ3oBHP/Q="; + cargoHash = "sha256-ulsU/QSSNqyZTjM77PQnr3HVUg2dS8SxHv2y6Lsvths="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index a40f44e5aad76..65bc7de808849 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.31"; + version = "1.0.32"; src = fetchCrate { inherit pname version; - hash = "sha256-2V2JXSlFzYoSidByWGFTGwNHM9c5Go1cdHLp0b7N+hI="; + hash = "sha256-sbSGqVH0pEFhNhIBu/RzrkEViN4ilEJbgYQEtxU986E="; }; - cargoHash = "sha256-mcYAqzfZO0M/UQTeYp4eCD7VVIWhtHi7VxBZtrr/aCk="; + cargoHash = "sha256-VMFPWAdOeAYsr0tdlSxtYsahEm/8K0L25lOfPG0P+uU="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index 6ade17d202739..6da0790107eb4 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -17,20 +17,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - hash = "sha256-HdA7c64ru21DvjhIswRW6r+EH3uYj4ipWzBcfVcc644="; + hash = "sha256-1rhdvTjA53Zxx3qm/Im2uQBWbYU/HlPPUQ3txq0uLps="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-hmig/QKzdt/rIl4gggTygwZ6rEmekw0OlppN6pXvvmw="; + cargoHash = "sha256-CHX4fesnqxoeplqXGFrn4RSfGdrkhKNANvXIwMkWXDs="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index ccbddf3706c16..a4e796381cd98 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-workspaces"; - version = "0.2.44"; + version = "0.3.0"; src = fetchCrate { inherit pname version; - hash = "sha256-5r5XRb/RWHv0Am58VPOxe+QSKn2QT4JZYp5LjTh20KM="; + hash = "sha256-1wNoMVfouuPRGFGB6XIhgeeWgknxMctrBl5Vfco6qug="; }; - cargoHash = "sha256-p+7CWvspYk1LRO2s8Sstlven/2edNe+JYFQHaDFlGkM="; + cargoHash = "sha256-OJGqIo6mYqXjmQb/2CVVTskecYZretw+K46Fvbu/PcQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 1ea339a44dfe4..f454eec74cd32 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-JZZJQGWPqb+jAqofEij/43ZZMOyT/2aU8rxmq72r0E4="; + hash = "sha256-YAp3lH2qEhN6Bd9YyLWnSgmppsQY+ssamopWDE1bhiQ="; }; - cargoHash = "sha256-PKfIQkLXq7gdg3wCqlue2UsaUP/jAz85JyoFjGwqwQY="; + cargoHash = "sha256-g+uHOqHRCklrjv6uW/5wjfwn473GEXjricQa4qXeliY="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix index 5f8b3d2cdc6ec..62084be4b5a87 100644 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ b/pkgs/development/tools/rust/crate2nix/default.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "crate2nix"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = version; - sha256 = "sha256-nyX1lfaA0eBSB/BaxPzCsyD8p/hxCwNIvr4Ru3i/YX0="; + sha256 = "sha256-A9AowkHIjsy1a4LuiPiVP88FMxyCWK41flZEZOUuwQM="; }; sourceRoot = "${src.name}/crate2nix"; - cargoSha256 = "sha256-3+emOr3hh+DDkboJbYyJFZgkzmcdA9jdronz7wM4x28="; + cargoHash = "sha256-85OIOhRdVDu5hZuBzanyqkH1gOuF5IQGubVrLAqt1ak="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/development/tools/rust/dioxus-cli/default.nix index c4ea4ff20c079..5243203f19263 100644 --- a/pkgs/development/tools/rust/dioxus-cli/default.nix +++ b/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "dioxus-cli"; - version = "0.4.1"; + version = "0.4.3"; src = fetchCrate { inherit pname version; - hash = "sha256-h2l6SHty06nLNbdlnSzH7I4XY53yyxNbx663cHYmPG0="; + hash = "sha256-TWcuEobYH2xpuwB1S63HoP/WjH3zHXTnlXXvOcYIZG8="; }; - cargoHash = "sha256-3pFkEC1GAJmTqXAymX4WRIq7EEtY17u1TCg+OhqL3bA="; + cargoHash = "sha256-ozbGK46uq3qXZifyTY7DDX1+vQuDJuSOJZw35vwcuxY="; nativeBuildInputs = [ pkg-config cacert ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ @@ -34,6 +34,16 @@ rustPlatform.buildRustPackage rec { "--skip=server::web::proxy::test::add_proxy_trailing_slash" ]; + # Omitted: --doc + # Can be removed after 0.4.3 or when https://github.com/DioxusLabs/dioxus/pull/1706 is resolved + # Matches upstream package test CI https://github.com/DioxusLabs/dioxus/blob/544ca5559654c8490ce444c3cbd85c1bfb8479da/Makefile.toml#L94-L108 + cargoTestFlags = [ + "--lib" + "--bins" + "--tests" + "--examples" + ]; + passthru.tests.version = testers.testVersion { package = dioxus-cli; command = "${meta.mainProgram} --version"; diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index 1069d81b5b249..4b53eacb096c7 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.9.1"; + version = "0.9.2"; src = fetchCrate { inherit pname version; - hash = "sha256-jpAZpx8VooYapSLApWWMLTj7c3wqw/S1w1zHN3OGzMs="; + hash = "sha256-qvocz/7Fx2YkgPcOYQha5iHQmoU40joGamj/SMiYx+4="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoHash = "sha256-n40V75yIuSC1abq4/cYFqj9JqGj/uJ36ZSz8APovE6o="; + cargoHash = "sha256-SW3Q/+EhdMNLbhGQPpiIXuJv3ttyeCpjjvbVCrJzXlY="; meta = with lib; { description = "Simple, extendable and embeddable scripting language."; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 1c3b15e53ab73..e6836e20d1bcd 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.31.1"; + version = "0.31.2"; src = fetchCrate { inherit pname version; - hash = "sha256-5+nQ7c71fXd0P51DYLBoZ3KWLkQu/dJ6s3Q90GbLQoM="; + hash = "sha256-5ilapONo4/zcNza3EFREAO/e/PMX7lr3EwFWduY6On0="; }; - cargoHash = "sha256-SrtOuzz5re0ptw1XyPSLLGh9jVs2dJVP/0giuQLsc08="; + cargoHash = "sha256-3Uk2qxkzR/0kgjzIXcJb2r27nNuo4cvprbdLb+e0fLM="; # 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 892612190b109..a4a5984a04de9 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -463,9 +463,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.61+curl-8.0.1" +version = "0.4.67+curl-8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79" +checksum = "3cc35d066510b197a0f72de863736641539957628c8a42e70e27c66849e77c34" dependencies = [ "cc", "libc", @@ -473,7 +473,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1772,7 +1772,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.15.2" +version = "0.16.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index 409d7d1723cad..5a40f695419a2 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -5,19 +5,20 @@ , pkg-config , openssl , stdenv +, CoreServices , Libsystem , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-q7/obBE16aKb8BHf5ycXSgXTMLWAFwxSnJ3qV35TdL8="; + hash = "sha256-AIM61JEgWMDjeZVnOVamBiCXTT5LLEktwQpRtnflgcw="; }; cargoLock = { @@ -38,6 +39,7 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.isDarwin [ + CoreServices Libsystem SystemConfiguration ]; @@ -56,7 +58,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A tool to easily manage python dependencies and environments"; homepage = "https://github.com/mitsuhiko/rye"; + changelog = "https://github.com/mitsuhiko/rye/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ GaetanLepage ]; + mainProgram = "rye"; }; } diff --git a/pkgs/development/tools/sass/Gemfile.lock b/pkgs/development/tools/sass/Gemfile.lock index 9882e1efcc4f7..1904c01ecf262 100644 --- a/pkgs/development/tools/sass/Gemfile.lock +++ b/pkgs/development/tools/sass/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - ffi (1.10.0) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + ffi (1.16.3) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) ffi (~> 1.0) sass (3.7.4) sass-listen (~> 4.0.0) diff --git a/pkgs/development/tools/sass/gemset.nix b/pkgs/development/tools/sass/gemset.nix index c0c5937b15a4a..5cadd7870b86d 100644 --- a/pkgs/development/tools/sass/gemset.nix +++ b/pkgs/development/tools/sass/gemset.nix @@ -4,20 +4,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.10.0"; + version = "1.16.3"; }; rb-fsevent = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; type = "gem"; }; - version = "0.10.3"; + version = "0.11.2"; }; rb-inotify = { dependencies = ["ffi"]; @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; type = "gem"; }; - version = "0.10.0"; + version = "0.10.1"; }; sass = { dependencies = ["sass-listen"]; diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index 54f744a1608ef..15995303748f3 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { description = "A front-end for libsass"; homepage = "https://github.com/sass/sassc/"; license = licenses.mit; + mainProgram = "sassc"; maintainers = with maintainers; [ codyopel pjones ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 69a532ccb5c0b..ef47a2e318cde 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -2,20 +2,24 @@ stdenv.mkDerivation rec { pname = "sauce-connect"; - version = "4.5.4"; - - src = fetchurl ( - if stdenv.hostPlatform.system == "x86_64-linux" then { - url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "1w8fw47q4bzpk5jfagmc0cbp69jdd6jcv2xl1gx91cbp7xd8mcbf"; - } else if stdenv.hostPlatform.system == "i686-linux" then { - url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; - sha256 = "1h9n1mzmrmlrbd0921b0sgg7m8z0w71pdb5sif6h1b9f97cp353x"; - } else { - url = "https://saucelabs.com/downloads/sc-${version}-osx.zip"; - sha256 = "0rkyd402f1n92ad3w1460j1a4m46b29nandv4z6wvg2pasyyf2lj"; - } - ); + version = "4.9.1"; + + passthru = { + sources = { + x86_64-linux = fetchurl { + url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; + hash = "sha256-S3vzng6b0giB6Zceaxi62pQOEHysIR/vVQmswkEZ0/M="; + }; + x86_64-darwin = fetchurl { + url = "https://saucelabs.com/downloads/sc-${version}-osx.zip"; + hash = "sha256-6tJayqo+p7PMz8M651ikHz6tEjGjRIffOqQBchkpW5Q="; + }; + aarch64-darwin = passthru.sources.x86_64-darwin; + }; + }; + + src = passthru.sources.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); nativeBuildInputs = [ unzip ]; @@ -38,7 +42,7 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; homepage = "https://docs.saucelabs.com/reference/sauce-connect/"; - maintainers = with maintainers; [offline]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ offline ]; + platforms = builtins.attrNames passthru.sources; }; } diff --git a/pkgs/development/tools/sauce-connect/update.sh b/pkgs/development/tools/sauce-connect/update.sh new file mode 100755 index 0000000000000..d74cbe577b3c9 --- /dev/null +++ b/pkgs/development/tools/sauce-connect/update.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl jq +# API documentation: https://docs.saucelabs.com/dev/api/connect/ + +set -Eeuo pipefail +shopt -s lastpipe +die() { + echo -e "${BASH_SOURCE[0]}:${BASH_LINENO[0]}" ERROR: "$@" >&2 + exit 1 +} +# shellcheck disable=2154 +trap 's=$?; die "$BASH_COMMAND"; exit $s' ERR + +# Versions may not be updated simultaneously across all platforms, so need to figure out the latest +# version that includes both platforms. For example, currently the latest on Linux is 4.9.2 while +# Mac is 4.9.1. +response=$(curl -fsSL 'https://api.us-west-1.saucelabs.com/rest/v1/public/tunnels/info/versions?all=true') +all_versions=$(jq --exit-status --raw-output \ + '.all_downloads | to_entries[] | select(.value | has("linux") and has("osx")) | .key' \ + <<< "$response") +latest_version=$(sort --version-sort <<< "$all_versions" | tail -n 1) +for platform in x86_64-linux x86_64-darwin; do + update-source-version sauce-connect 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" \ + --source-key="passthru.sources.$platform" + update-source-version sauce-connect "$latest_version" \ + --source-key="passthru.sources.$platform" +done diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index bc89ce9c52597..56fff1c2d56b6 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.49"; + version = "1.0.51"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cyu2J7clIyM6j9ELO2Xk/9agQHtvPtr9yHM/gRTzzG0="; + sha256 = "sha256-CKbOgZ9dnQ5ao5fQYMbPhMNS5ww4N54ECHKhhdBEII8="; }; vendorHash = "sha256-uHu8jPPQCJAhXE+Lzw5/9wyw7sL5REQJsPsYII+Nusc="; diff --git a/pkgs/development/tools/sea-orm-cli/default.nix b/pkgs/development/tools/sea-orm-cli/default.nix index 623ad4f9e0250..d70c7b83cb299 100644 --- a/pkgs/development/tools/sea-orm-cli/default.nix +++ b/pkgs/development/tools/sea-orm-cli/default.nix @@ -8,11 +8,11 @@ }: rustPlatform.buildRustPackage rec { pname = "sea-orm-cli"; - version = "0.12.2"; + version = "0.12.10"; src = fetchCrate { inherit pname version; - hash = "sha256-mg0PkWxlfwo4eAtbU1ZOphEUBB1P6VsSpODyJZhvwQs="; + hash = "sha256-BVQbzP/+TJFqhnBeerYiLMpJJ8q9x582DR5X10K027U="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - cargoHash = "sha256-6LXJtY844CyR6H0/IkEJrpSj4UNWcpO/XoTzUthcTUc="; + cargoHash = "sha256-qCcWReo72eHN9MoTVAmSHYVhpqw0kZ9VU/plYRcirVA="; meta = with lib; { homepage = "https://sea-ql.org/SeaORM"; diff --git a/pkgs/development/tools/sem/default.nix b/pkgs/development/tools/sem/default.nix index 36afa5d741962..fc4b32785d39b 100644 --- a/pkgs/development/tools/sem/default.nix +++ b/pkgs/development/tools/sem/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sem"; - version = "0.28.4"; + version = "0.28.5"; src = fetchFromGitHub { owner = "semaphoreci"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-T7f/yfzNITlU03N059y1B/I1H77Pji34EK+x0Qs6XwQ="; + sha256 = "sha256-XprWg6JZBBqHQmbdNyKaNLFyxTGkaGzMPLanISYIjYY="; }; - vendorHash = "sha256-CDjfhnnt4+ml8k/2QPGaSlJFpxDYWNjA5nzLXL2APX4="; + vendorHash = "sha256-p8+M+pRp12P7tYlFpXjU94JcJOugQpD8rFdowhonh74="; subPackages = [ "." ]; ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; diff --git a/pkgs/development/tools/semantic-release/default.nix b/pkgs/development/tools/semantic-release/default.nix index 8dd04d6a1b0e8..87533c0e3359c 100644 --- a/pkgs/development/tools/semantic-release/default.nix +++ b/pkgs/development/tools/semantic-release/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "semantic-release"; - version = "21.0.5"; + version = "22.0.12"; src = fetchFromGitHub { owner = "semantic-release"; repo = "semantic-release"; rev = "v${version}"; - hash = "sha256-QFBYIoOd1htSNj3xKl0HvmD1T068Jv+L/EqCbMrn0lw="; + hash = "sha256-enBfQapJdssMiwu07f3EZO80iTy+/XLot2W+rHfmN4I="; }; - npmDepsHash = "sha256-0GhDXGyVoMwz+vVFdplv7ObTiTRTvQDd9r9e6616iTI="; + npmDepsHash = "sha256-8m6j4OHupcrU21MHvePmqNAAx2ANEu5YVV96WnTxTL4="; dontNpmBuild = true; diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix deleted file mode 100644 index 4cc1ec320ccd1..0000000000000 --- a/pkgs/development/tools/setupcfg2nix/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ buildSetupcfg, fetchFromGitHub, lib }: - -buildSetupcfg rec { - info = import ./info.nix; - src = fetchFromGitHub { - owner = "target"; - repo = "setupcfg2nix"; - rev = info.version; - sha256 = "1rj227vxybwp9acwnpwg9np964b1qcw2av3qmx00isnrw5vcps8m"; - }; - application = true; - meta = { - description = "Generate nix expressions from setup.cfg for a python package"; - homepage = "https://github.com/target/setupcfg2nix"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.shlevy ]; - }; -} diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix deleted file mode 100644 index 17e888fee4163..0000000000000 --- a/pkgs/development/tools/setupcfg2nix/info.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - pname = "setupcfg2nix"; - version = "2.0.1"; - install_requires = [ - "setuptools" - ]; -} diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 8306a05def0d3..fe4780176a674 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.1.5"; + version = "3.2.0"; src = fetchzip { url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip"; - hash = "sha256-5Q6bAuEEBkiRHjX8Ie5FFhPfzwKRdlNIQucTqDEIZuQ="; + hash = "sha256-C9hWIH6lFDa9dzH5iYZlawt+7SSPt3gxcXM62qd0zbo="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index 75e18ba664b39..e440509ead64b 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGo121Module, fetchFromGitHub, installShellFiles, testers, sq }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, sq }: -buildGo121Module rec { +buildGoModule rec { pname = "sq"; - version = "0.42.1"; + version = "0.46.1"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - hash = "sha256-3Hu0vMulGWyNWgNlekYuTRxxxBbRkWj2RE0MWZzNXFk="; + hash = "sha256-TjJ3XDyHHZWMAYV5bJQffH4a9AheZWraov3d4HB/yno="; }; - vendorHash = "sha256-qEwK40BcUetsQOIefdjM/dgjTNuHO1EZgVk53/dfOlc="; + vendorHash = "sha256-DIYSUIUHEiRv+pPZ2hE/2X4GmT3lvdWd/mkl1wbjID4="; proxyVendor = true; diff --git a/pkgs/development/tools/sqlboiler/default.nix b/pkgs/development/tools/sqlboiler/default.nix new file mode 100644 index 0000000000000..432582dbc46e6 --- /dev/null +++ b/pkgs/development/tools/sqlboiler/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "sqlboiler"; + version = "4.15.0"; + + src = fetchFromGitHub { + owner = "volatiletech"; + repo = "sqlboiler"; + rev = "refs/tags/v${version}"; + hash = "sha256-MT1tjVCDaFB9HfjlGGnf6jTiPdKcrDamgp2nTpIarqY="; + }; + + vendorHash = "sha256-tZ1RQGmeDv4rtdF1WTRQV1K4Xy1AgIatLPPexnHJnkA="; + + tags = [ + "mysql" + "go" + "golang" + "postgres" + "orm" + "database" + "postgresql" + "mssql" + "sqlite3" + "sqlboiler" + ]; + + doCheck = false; + + meta = with lib; { + description = "Generate a Go ORM tailored to your database schema"; + homepage = "https://github.com/volatiletech/sqlboiler"; + changelog = "https://github.com/volatiletech/sqlboiler/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ mrityunjaygr8 ]; + mainProgram = "sqlboiler"; + }; +} diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix index 92c1c0037f2b3..bc1bcd0d463e9 100644 --- a/pkgs/development/tools/sqldef/default.nix +++ b/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.16.10"; + version = "0.16.13"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-NwSQLpqgOuVBH+EYjSch3h0BMJZPK3/FcKO4iUnNt+E="; + hash = "sha256-c6ErXWnCoKaM7i7yf4tP3J3k0yhNypFJA+XGwazDDD0="; }; proxyVendor = true; - vendorHash = "sha256-2MwibiWT9rrbNVva61wR1OPrG+fZkxTDznC2pdm3CKE="; + vendorHash = "sha256-oIP8XeaQITdirtBAP5JjcWYiA4En4y2Hwu7thZk//fY="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/development/tools/squawk/default.nix index 417c66ea3a6f2..8699a518137c2 100644 --- a/pkgs/development/tools/squawk/default.nix +++ b/pkgs/development/tools/squawk/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "squawk"; - version = "0.24.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "sbdchd"; repo = pname; rev = "v${version}"; - hash = "sha256-gFJaW7Mb3HKN6D/qnpfNQVxBOKbxIBZOVWJ63wiGoeU="; + hash = "sha256-ibgtgzpdNwQk/X5xz3XOM6Wi9xA8v4DAnj/86UKnXXk="; }; - cargoHash = "sha256-a1kAVIyGnVF3IWkDQbmV3L9cfY+1564RW6eWfBHbTZ8="; + cargoHash = "sha256-d2txSyTVU6CAnItpRttgOcDeH/8mVuPL636h/g67qgg="; nativeBuildInputs = [ pkg-config @@ -39,6 +39,11 @@ rustPlatform.buildRustPackage rec { LIBPG_QUERY_PATH = libpg_query; + checkFlags = [ + # depends on the PostgreSQL version + "--skip=parse::tests::test_parse_sql_query_json" + ]; + meta = with lib; { description = "Linter for PostgreSQL, focused on migrations"; homepage = "https://squawkhq.com/"; diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index 77217a8acda50..541e82c600548 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.112.0"; + version = "1.129.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-2Cw+TQMKWwjWUgsif+Ot9OZ1kIlancoT4TfJ343mnLY="; + hash = "sha256-qbm7ByPZpLx0BB/iZ3UjYFe/g6l7ZuUw4wzrH72Ut7U="; }; - vendorHash = "sha256-vseD7Oov7Gi1lEnF1hEAChoPByFa8T82njWBINC/Ea4="; + vendorHash = "sha256-lFholyFVr6uMcfafM/tb8r1/4ysgWZOW5neoy3uL0Vw="; ldflags = [ "-s" diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index f150ebc0d4509..f663da08b0b00 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -1,26 +1,28 @@ { buildGoModule , fetchFromGitHub , lib +, nix-update-script , testers , symfony-cli }: buildGoModule rec { pname = "symfony-cli"; - version = "5.7.3"; - vendorHash = "sha256-xC5EHP4Zb9lgvbxVkoVBxdQ4+f34zqRf4XapntZMTTc="; + version = "5.7.7"; + vendorHash = "sha256-R0/zJlK9T0iAfquROOWraoBHzd//rIIXNIps3GvGRvA="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-mxyGdyR1yZY+YOyf9ngk6P2oBmUL+IbwLWaCvZziSIM="; + hash = "sha256-ZoBMOArpsmUniVc7cqbB4UZZ6ujnVfHqRos0Mcr+E4Q="; }; ldflags = [ "-s" "-w" "-X main.version=${version}" + "-X main.channel=stable" ]; postInstall = '' @@ -30,10 +32,13 @@ buildGoModule rec { # Tests requires network access doCheck = false; - passthru.tests.version = testers.testVersion { - inherit version; - package = symfony-cli; - command = "symfony version --no-ansi"; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + inherit version; + package = symfony-cli; + command = "symfony version --no-ansi"; + }; }; meta = { diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix index 59564cec7f64f..44328eb46474d 100644 --- a/pkgs/development/tools/tailwindcss/default.nix +++ b/pkgs/development/tools/tailwindcss/default.nix @@ -18,16 +18,16 @@ let }.${system} or throwSystem; hash = { - aarch64-darwin = "sha256-VAJypHejh3ZW2x3fPNvuFw3VkmBbsSTnmBHuqU3hXVY="; - aarch64-linux = "sha256-Yxw6DIP8j3JANgvN870socG0aNX76d3c0z12ePbuFSs="; - armv7l-linux = "sha256-yS8LDmUit5pM4WrMjhqUJD4e0fWKWf8cr4w1PACj+8g="; - x86_64-darwin = "sha256-cTIp7HesR9Ae6yFpUy0H1hrqtHSSReIKZmKE06XCsWU="; - x86_64-linux = "sha256-Z3Co095akfV/11UWvpc0WAp3gdUrpjVskUw1v01Eifs="; + aarch64-darwin = "sha256-ROZVmhdy3vltNeSgV65aAwythgydusYYVB7XQOJ/spw="; + aarch64-linux = "sha256-aX6CTnsWCwf0wDc7wl3skHwC5aJgoBz/2JtgS34eX4s="; + armv7l-linux = "sha256-q1449OZ5wvgdJjxhg1+noQVFcFfHKokHtV6CbR8evgs="; + x86_64-darwin = "sha256-2eVT5TbektDvXYQzaBc0A9bxv8bKY70cmdIA3WN0u68="; + x86_64-linux = "sha256-i0fjaFQbzXL2DIN5Q/+1GRhWTRoaa4tGnDCv6Cl4BhI="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "tailwindcss"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}"; diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 0a9524b0b02e9..51ba191e14a00 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.19.2"; + version = "0.20.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-jTyKz9ZvA9xJlDQXv2LHrSMeSDbh4AJBxi1WtqUhjgE="; + sha256 = "sha256-xOoqMqUFVCTS5gQnX4KEoXoMxVvQX3JRoNgzuA20M6g="; }; - cargoSha256 = "sha256-D0H8vChCzBCRjC/S/ceJbuNNAXISiFMZtgu8TMfic+0="; + cargoHash = "sha256-8eN+O3lygbftXVjIBWCwNfYKAIkmPF/eaUKDa9oVaCA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index 2c003913b3bd8..b5a1c90926fb7 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -1,26 +1,55 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config -, openssl, libiconv, CoreServices, Security }: +{ lib, +stdenv, +rustPlatform, +fetchFromGitHub, +pkg-config, +openssl, +jq, +moreutils, +CoreServices, +SystemConfiguration +}: rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.17.2"; + version = "0.18.0"; src = fetchFromGitHub { owner = "thedodd"; repo = "trunk"; rev = "v${version}"; - sha256 = "sha256-A6h8TmYK5WOcmANk/uM9QO1h767BWASWTwLthtKqrEk="; + hash = "sha256-riebGbDCqkJTkDmvXCuD0ywjSfGfLgxywkHUPlGzCgI="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = if stdenv.isDarwin - then [ libiconv CoreServices Security ] + then [ CoreServices SystemConfiguration ] else [ openssl ]; - # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoHash = "sha256-+jz0J1qFK2fZ4OX089pgNtT2vfiOTf39qQjeXmLoFNs="; + cargoHash = "sha256-O2AKIOvAwDpZDzEyc/x5lF0E0UR+Mj/J///1bYRgoX4="; + + # the dependency css-minify contains both README.md and Readme.md, + # which causes a hash mismatch on systems with a case-insensitive filesystem + # this removes the readme files and updates cargo's checksum file accordingly + depsExtraArgs = { + nativeBuildInputs = [ + jq + moreutils + ]; + + postBuild = '' + pushd $name/css-minify + + rm -f README.md Readme.md + jq 'del(.files."README.md") | del(.files."Readme.md")' \ + .cargo-checksum.json -c \ + | sponge .cargo-checksum.json + + popd + ''; + }; meta = with lib; { homepage = "https://github.com/thedodd/trunk"; diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index d5ad729050ce0..2f1d3b7e72b13 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,13 +8,13 @@ }: buildGo121Module rec { pname = "turso-cli"; - version = "0.87.4"; + version = "0.87.6"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-e5HuDWMmikTlWC2ezZ5zxxKYFlgz9jrpHtNfIwSiiok="; + hash = "sha256-LQBAq7U9+6LCkIsA9mvyBUz3vXN/lYdzKHvca4JdxE0="; }; vendorHash = "sha256-EcWhpx93n+FzkXDOHwAxhn13qR4n9jLFeaKoe49x1x4="; diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 11a2bfe4e24b8..c7711151863e6 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.16.3"; + version = "5.17.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-CaH0NRK0KvR2F8/Fov16uzig5BvwRuUNf4SDFDu/SLs="; + hash = "sha256-7BJ/9dqEKBjH89XDyIonRbfCn8cyjvgtV2PwdzGIUro="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/development/tools/txtpbfmt/default.nix b/pkgs/development/tools/txtpbfmt/default.nix index 757e1e560bef7..384320bb3b95a 100644 --- a/pkgs/development/tools/txtpbfmt/default.nix +++ b/pkgs/development/tools/txtpbfmt/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: -buildGoModule rec { +buildGoModule { pname = "txtpbfmt"; - version = "unstable-2023-03-28"; + version = "unstable-2023-10-25"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "txtpbfmt"; - rev = "3462fbc510c07c0844c2e370719c9c18302f476f"; - hash = "sha256-vvkZWDGrId164K6jhMXNa5BtOxQSgFDhMACGAH+9F08="; + rev = "084445ff1adf0d8a27429bba65dbde5663f02d26"; + hash = "sha256-SoU1GON9avesty6FSZ+z6o2JHInUtwv+PVOzqCu+8L8="; }; vendorHash = "sha256-IdD+R8plU4/e9fQaGSM5hJxyMECb6hED0Qg8afwHKbY="; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index e11473d09e4ce..c1f31c07c6cc9 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.23"; + version = "1.16.25"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-n/R6/wkFApSOG1QmtJ3YDFsotVrgLIYqopHJAlod2GA="; + hash = "sha256-prmMj8tVOm9P5EKkenero4YM9ccVU3JskTiHjup0oeQ="; }; - cargoHash = "sha256-n+OBj54d3EtxKszAC7A5DUlJeS92RRgpfu9VuW+rTAI="; + cargoHash = "sha256-OBbLWsG22Rs4veQRDUgoFKcMnOKNOxK6rqBah8y3CnY="; 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 c8c5105531388..3ef4b44953d15 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.6.1"; + version = "3.7.0"; 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-rpH87aFvbYanthwPw/SlluOH/rtj6owcVetBD4+TJeU="; + sha256 = "sha256-cFHcfpsHSDlR82PtZ0leRDpvCD6nw0Qdb3PsYKMnosA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index 56566230ef492..b3f4987146b8d 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "vala-lint"; - version = "unstable-2023-11-12"; + version = "unstable-2023-12-05"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-lint"; - rev = "95cf9e61a73fe4a0f69fd8c275c9548703f79838"; - sha256 = "sha256-w5jW/JM1sR9gIIVl3WJNK9jpaA4CMr56Wt4AuxUlkW8="; + rev = "8ae2bb65fe66458263d94711ae4ddd978faece00"; + sha256 = "sha256-FZV726ZeNEX4ulEh+IIzwZqpnVRr7IeZb47FV1C7YjU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index 0b0183aef1d8e..bc0edbccf9ac4 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.35.2"; + version = "0.38.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-zoZPAJTEmKHL78wfAHqayBxw8tRANIsMckj+wXtbLTw="; + sha256 = "sha256-H5SeDZzl2KdVp3KsRpsmp6/ZOxLq+3y9Coe1NIEi5YQ="; }; vendorHash = null; diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 43b8206016144..0cd9c6acd05f9 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-3Zd507yAymmQRgybm96VD413kId0/kMxIHbmUh8j6Kk="; + hash = "sha256-sIxAl4mI29RfJbGk/pvCSxUva8O9sXcwEIWBfY+h72Q="; }; - vendorHash = "sha256-OVoOCExAU6cDyWhSpk4hkhBZpWehH+4/vU/X81w9XgA="; + vendorHash = "sha256-d4EK9SLmIyt/N+29a7p7nxHkX0m0pAOMH7+G1tLbJGk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index fec8f6c7ad48d..63d16bb0c7191 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://rustwasm.github.io/docs/wasm-bindgen/"; license = with licenses; [ asl20 /* or */ mit ]; description = "Facilitating high-level interactions between wasm modules and JavaScript"; - maintainers = with maintainers; [ nitsky rizary ]; + maintainers = with maintainers; [ rizary ]; mainProgram = "wasm-bindgen"; }; } diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/development/tools/web-ext/default.nix index acadcd94b57f4..f75f8a66142e0 100644 --- a/pkgs/development/tools/web-ext/default.nix +++ b/pkgs/development/tools/web-ext/default.nix @@ -1,20 +1,29 @@ { lib , buildNpmPackage , fetchFromGitHub +, runCommand +, web-ext }: buildNpmPackage rec { pname = "web-ext"; - version = "7.6.2"; + version = "7.9.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "web-ext"; rev = version; - hash = "sha256-tFMngcoHFA3QmR0AK68elUVpli37PsVlcL978o7DQCs="; + hash = "sha256-7fBUWQFUsIGQnyNhZISvdtAQMAMZ38mbzGuC+6Cwu1Y="; }; - npmDepsHash = "sha256-KPBKUjCxva11w/E+Qhlx+1vikpCL7Hr9MiKenYHEVSU="; + npmDepsHash = "sha256-3Dq4sNPZm9fDxPxOZL+rDxFA/FEs2/+zdz8sF3JFJ3s="; + + npmBuildFlags = [ "--production" ]; + + passthru.tests.help = runCommand "${pname}-tests" { } '' + ${web-ext}/bin/web-ext --help + touch $out + ''; meta = { description = "A command line tool to help build, run, and test web extensions"; diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix index 2f2fe174d14e6..3d7f1b7986339 100644 --- a/pkgs/development/tools/wiiload/default.nix +++ b/pkgs/development/tools/wiiload/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, zlib }: stdenv.mkDerivation rec { - version = "0.5.1"; + version = "0.5.3"; pname = "wiiload"; nativeBuildInputs = [ autoconf automake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "devkitPro"; repo = "wiiload"; rev = "v${version}"; - sha256 = "0dffy603zggkqv7g1a2jninmi64vy519gpgkdfhjnijhdm9gs5m3"; + sha256 = "sha256-pZdZzCAPfAVucuiV/q/ROY3cz/wxQWep6dCTGNn2fSo="; }; preConfigure = "./autogen.sh"; diff --git a/pkgs/development/tools/xc/default.nix b/pkgs/development/tools/xc/default.nix index 5233de5fd6eab..a00744af9f3e7 100644 --- a/pkgs/development/tools/xc/default.nix +++ b/pkgs/development/tools/xc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "xc"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "joerdav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cVTa2ot95Hcm+1V1QXnlxSL9OjmoQNR9nVUgW/rZhl0="; + sha256 = "sha256-0Er8MqAqKCyz928bdbYRO3D9sGZ/JJBrCXhlq9M2dEA="; }; vendorHash = "sha256-J4/a4ujM7A6bDwRlLCYt/PmJf6HZUmdYcJMux/3KyUI="; diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix index 033d18608ac86..342ca426801d7 100644 --- a/pkgs/development/tools/xqilla/default.nix +++ b/pkgs/development/tools/xqilla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, xercesc }: +{ lib, stdenv, fetchurl, fetchpatch, xercesc }: stdenv.mkDerivation rec { pname = "xqilla"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0m9z7diw7pdyb4qycbqyr2x55s13v8310xsi7yz0inpw27q4vzdd"; }; + patches = [ + (fetchpatch { + name = "xqilla-gcc11.patch"; + url = "https://git.pld-linux.org/gitweb.cgi?p=packages/xqilla.git;a=blob_plain;f=xqilla-gcc11.patch;h=c9e28be64097040348f710cb27be5f7dad001112;hb=4efe07397c6fb426a65b2eec6999d3c7e683848a"; + hash = "sha256-enMEF3U+PsbwOQ5SwlRVWc/FpyLS3aK6JgUgOp3ZbiA="; + }) + ]; + configureFlags = [ "--with-xerces=${xercesc}" ]; meta = with lib; { diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index 09476976ecde0..444b0b0017e18 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { homepage = "https://github.com/bronze1man/yaml2json"; description = "Convert yaml to json"; license = with licenses; [ mit ]; - maintainers = [ maintainers.adisbladis ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/development/tools/yarn-berry/default.nix index e9ae6ef416a07..d52d6d27e8801 100644 --- a/pkgs/development/tools/yarn-berry/default.nix +++ b/pkgs/development/tools/yarn-berry/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ ryota-ka thehedgeh0g ]; platforms = platforms.unix; + mainProgram = "yarn"; }; } diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 35066727de98d..350211001ad95 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.40.3"; + version = "4.40.5"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-id8KhHOOpRruANLGxdHIvs86ZEIDzhdbXtgXqWtl5Tc="; + hash = "sha256-CCgertXgnA6q259Ngmy4EBD6GDuvSb0bREDddR2ht8E="; }; - vendorHash = "sha256-9gLtVO4HFra1FaFjTwE02x8q1MkrI/Vo/mYZ2iIa7cU="; + vendorHash = "sha256-SQGJj5syay4LllqmK/cRoZbprgDQhLGdQM3T1m/dZsI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 668fc47fe72d2..1df8887afe68f 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.46.2"; + version = "0.46.3"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-r9LQMQffnc/g1WFJU8m+Oy0hD+DudCNiVAcbAAPy1vI="; + sha256 = "sha256-K2+5NplyQuvc78NnNDiQhfrewqn84jDbiAyN8J9iTm0="; }; vendorHash = null; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index bd2b6e016d4be..125671f9be46d 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.14"; + version = "1.0.18"; 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-15YHmf3hJtkRXV8JO2P6XEx3ySOmaXIXU++pt6xl7fM="; + hash = "sha256-z3C6V8jG/et+CizWHHx6zN56JBe4QBhEKbDQgx67dmc="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-DEsYsn6zuUVFt6LerkMIb8bIPvCL6bW2qtX3fg6QLvw="; + hash = "sha256-xnFN1Kiaerot6ieMqf5fvyq826vE4KpM57r/7wz4C7o="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-kZTp/L/C+8zs7mY9wogM5zRYjXXvLEEW8a1GzyhuQyA="; + hash = "sha256-cNfTiMSdeCINchtRtAA1Lv4vVmrxwhLQNUe+96UFYp4="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-8ixHAN2VpeEdixoq8Aw4KwG+B7bw5u35XVT5TFZzeRE="; + hash = "sha256-qwqgaU3zYiuer4tI4JiSsZd94IO6xn+dSjJZkM70WP4="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 09d266ff97378..ae2d9e9e26c30 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,21 +13,21 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.38.4"; + version = "1.39.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-Jve2aKfnWZotgzfzUJ+ez+9sainmQiUg3x8FIWnr6/o="; + hash = "sha256-Rlt8gRlZlxC/axHsicbQizoMNbQJsv6egZXj4SKUARw="; }; - cargoHash = "sha256-pDDi0Xm1o61Ng308MeTVoVp+cYVFt34Kh4sj2idH+9s="; + cargoHash = "sha256-P0g5rhnSjMd9bD7/FBYaRyXwbeC5nAjDBA2EsQ4gfXA="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds # within nix lld looks for CoreFoundation rather than CoreFoundation.tbd and fails - substituteInPlace .cargo/config.toml --replace '"-C", "link-arg=-fuse-ld=lld"' "" + substituteInPlace .cargo/config.toml --replace "-fuse-ld=lld " "" ''; # uses zlib-ng but can't dynamically link yet @@ -41,7 +41,14 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optionals stdenv.isDarwin ( [ libiconv darwin.libobjc ] ++ - (with darwin.apple_sdk.frameworks; [ Security CoreServices Metal Foundation QuartzCore ]) + (with darwin.apple_sdk_11_0.frameworks; [ + Security + CoreServices + Metal + MetalPerformanceShaders + Foundation + QuartzCore + ]) ); # work around "error: unknown warning group '-Wunused-but-set-parameter'" diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index e4d2a2fec7076..726a04dea4747 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -10,11 +10,11 @@ let }; in fetch_librusty_v8 { - version = "0.81.0"; + version = "0.82.0"; shas = { - x86_64-linux = "sha256-e77LYm/sus7EY4eiRuEp6G25djDaT4wSD4FBCxy4vcE="; - aarch64-linux = "sha256-wPfUcuT2Z2sy5nLf8xR3QjGQKk6OsM/45jnYv/Hw+Zs="; - x86_64-darwin = "sha256-UbnRiywM7b7q3rITZzNeWAuKU+HXXAqVapQ9j5ND6go="; - aarch64-darwin = "sha256-42d3VGBv5lW1InfzYfWr6Xj0GpyJ6GWswVNtUa8ID30="; + x86_64-linux = "sha256-2nWOAUuzc7tr0KieeugIqI3zaRruvnLWBPn+ZdHTXsM="; + aarch64-linux = "sha256-vlc60ZoFtT2Ugp0npT0dep6WWnEBAznR7dYFRaMNAKM="; + x86_64-darwin = "sha256-CqyG/JOJe5kWzFJnnkU2Lz4VS/unWe1iucFxm+1HGsU="; + aarch64-darwin = "sha256-ps19JZqCpO3pEAMQZOO+l/Iz7u0dIXLnpYIsnOyAxYk="; }; } diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 862b7279f7e6d..aeeea998de683 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.127"; + version = "0.1.135"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-ho2dbuejQWU7K4j107fV4Lf5r3grsePifaE+HbRdCys="; + hash = "sha256-eQqYfH/qNlUkqd82h8O7kSa/QTL+Y9vRKd3LDqCnnCI="; }; - vendorHash = "sha256-qo1P2PSiWco3oKqKOCmCuM6QOz6a9ov2d2MpggBU4N8="; + vendorHash = "sha256-IM4xk+KAimBBR1Mq4ptfA9LbC1YZLErP1XtSEPeGi/c="; subPackages = [ "." ]; @@ -57,7 +57,7 @@ buildGoModule rec { downloadPage = "https://github.com/superfly/flyctl"; homepage = "https://fly.io/"; license = licenses.asl20; - maintainers = with maintainers; [ aaronjanse adtya jsierles techknowlogick viraptor ]; + maintainers = with maintainers; [ adtya jsierles techknowlogick ]; mainProgram = "flyctl"; }; } diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/development/web/function-runner/default.nix index bd2ad2862cd7e..7582800e25bd5 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 = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cKlzv9mL6UGXHvYbQR4OcZgdjZLV5Q7EoQbW7Fx8ESo="; + sha256 = "sha256-o+fsIBH/vONlb57m3+upKG2Gss6s7yBNATkbKtSHf/0="; }; - cargoHash = "sha256-/4/zaeNQ45YYBILxm11qD9rPFZxilA8kLoyWG370Knk="; + cargoHash = "sha256-7ACi4orqpmWiaMYmOjICR6/d1kVySzaaCWIoUxqnhpI="; 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/ihp-new/default.nix b/pkgs/development/web/ihp-new/default.nix index 5db350f7c0fb1..a112032384414 100644 --- a/pkgs/development/web/ihp-new/default.nix +++ b/pkgs/development/web/ihp-new/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ihp-new"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "digitallyinduced"; repo = "ihp"; rev = "v${version}"; - sha256 = "sha256-o0ZSDaDFgwbXqozHfcXKxW4FeF7JqaGprAh6r7NhvhE"; + sha256 = "sha256-oQz7ZBrHe6WwYMwnxxUgnYM55CuH5Oxjz6mrLnYbB7U="; }; dontConfigure = true; diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix index f6f403a66d6e2..d5b06686a88d2 100644 --- a/pkgs/development/web/netlify-cli/default.nix +++ b/pkgs/development/web/netlify-cli/default.nix @@ -14,4 +14,5 @@ in reconstructLock = true; passthru.tests.test = callPackage ./test.nix { }; meta.maintainers = with lib.maintainers; [ roberth ]; + meta.mainProgram = "netlify"; } diff --git a/pkgs/development/web/nodejs/node-npm-build-npm-package-logic-node16.patch b/pkgs/development/web/nodejs/node-npm-build-npm-package-logic-node16.patch deleted file mode 100644 index f4d3b0e32b1c6..0000000000000 --- a/pkgs/development/web/nodejs/node-npm-build-npm-package-logic-node16.patch +++ /dev/null @@ -1,95 +0,0 @@ -This patch is based off of npm tag v8.19.4. - -This introduces fixes for 4 issues: - -1. When node-gyp is included as a dependency in a project, any scripts that run it will not use the copy included in Node. This is problematic because we patch node-gyp to work without xcbuild on Darwin, leading to these packages failing to build with a sandbox on Darwin. -2. When a Git dependency contains install scripts, it has to be built just like any other package. Thus, we need to patch shebangs appropriately, just like in npmConfigHook. -3. We get useless warnings that clog up logs when using a v1 lockfile, so we silence them. -4. npm looks at a hidden lockfile to determine if files have binaries to link into `node_modules/.bin`. When using a v1 lockfile offline, this lockfile does not contain enough info, leading to binaries for packages such as Webpack not being available to scripts. We used to work around this by making npm ignore the hidden lockfile by creating a file, but now we just disable the code path entirely. - -To update: -1. Run `git diff` from an npm checkout -2. Run `fix-npm-patch-paths.sh` -3. Include/update this frontmatter, please! - -diff --git a/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js b/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js -index c59c270d9..98785192f 100644 ---- a/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js -+++ b/deps/npm/node_modules/@npmcli/run-script/lib/set-path.js -@@ -12,7 +12,10 @@ const setPATH = (projectPath, binPaths, env) => { - .reduce((set, p) => set.concat(p.filter(concatted => !set.includes(concatted))), []) - .join(delimiter) - -- const pathArr = [] -+ // Ensure when using buildNpmPackage hooks that Node.js' -+ // bundled copy of node-gyp is used, instead of any copy -+ // pulled in as a dependency. -+ const pathArr = process.env['NIX_NODEJS_BUILDNPMPACKAGE'] ? [nodeGypPath, PATH] : []; - if (binPaths) { - pathArr.push(...binPaths) - } -@@ -26,7 +29,8 @@ const setPATH = (projectPath, binPaths, env) => { - pp = p - p = dirname(p) - } while (p !== pp) -- pathArr.push(nodeGypPath, PATH) -+ if (!process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { pathArr.push(nodeGypPath, PATH) } -+ - - const pathVal = pathArr.join(delimiter) - -diff --git a/deps/npm/node_modules/pacote/lib/git.js b/deps/npm/node_modules/pacote/lib/git.js -index c4819b4fd..7efbeef05 100644 ---- a/deps/npm/node_modules/pacote/lib/git.js -+++ b/deps/npm/node_modules/pacote/lib/git.js -@@ -186,6 +186,24 @@ class GitFetcher extends Fetcher { - } - noPrepare.push(this.resolved) - -+ if (process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { -+ const spawn = require('@npmcli/promise-spawn') -+ -+ const npmWithNixFlags = (args, cmd) => spawn('bash', ['-c', 'npm ' + args + ` $npm${cmd}Flags "$\{npm${cmd}FlagsArray[@]}" $npmFlags "$\{npmFlagsArray[@]}"`], { cwd: dir, env: { ...process.env, _PACOTE_NO_PREPARE_: noPrepare.join('\n') } }, { message: `\`npm ${args}\` failed` }) -+ const patchShebangs = () => spawn('bash', ['-c', 'source $stdenv/setup; patchShebangs node_modules'], { cwd: dir }) -+ -+ // the DirFetcher will do its own preparation to run the prepare scripts -+ // All we have to do is put the deps in place so that it can succeed. -+ // -+ // We ignore this.npmConfig to maintain an environment that's as close -+ // to the rest of the build as possible. -+ return spawn('bash', ['-c', '$prefetchNpmDeps --fixup-lockfile package-lock.json'], { cwd: dir }) -+ .then(() => npmWithNixFlags('ci --ignore-scripts', 'Install')) -+ .then(patchShebangs) -+ .then(() => npmWithNixFlags('rebuild', 'Rebuild')) -+ .then(patchShebangs) -+ } -+ - // the DirFetcher will do its own preparation to run the prepare scripts - // All we have to do is put the deps in place so that it can succeed. - return npm( -diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js -index e9a8720d7..b29ad0185 100644 ---- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js -+++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js -@@ -744,7 +744,7 @@ This is a one-time fix-up, please be patient... - node.package = { ...mani, _id: `${mani.name}@${mani.version}` } - } catch (er) { - const warning = `Could not fetch metadata for ${name}@${id}` -- log.warn(heading, warning, er) -+ if (!process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { log.warn(heading, warning, er) } - } - this.finishTracker(t) - }) -diff --git a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js -index 7ab65f5b0..12f563a50 100644 ---- a/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js -+++ b/deps/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js -@@ -143,7 +143,7 @@ module.exports = cls => class ActualLoader extends cls { - this[_actualTree].assertRootOverrides() - - // if forceActual is set, don't even try the hidden lockfile -- if (!forceActual) { -+ if (!forceActual && !process.env['NIX_NODEJS_BUILDNPMPACKAGE']) { - // Note: hidden lockfile will be rejected if it's not the latest thing - // in the folder, or if any of the entries in the hidden lockfile are - // missing. diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix index 47e1abc9b217e..ebe6a74c26967 100644 --- a/pkgs/development/web/nodejs/update.nix +++ b/pkgs/development/web/nodejs/update.nix @@ -25,5 +25,5 @@ writeScript "update-nodejs" '' hash_hex=`gpgv --keyring=$HOME/.gnupg/pubring.kbx --output - $HOME/SHASUMS256.txt.asc | grep -oP "^([0-9a-f]{64})(?=\s+node-v''${version}.tar.xz$)"` hash=`nix-hash --type sha256 --to-base32 ''${hash_hex}` - update-source-version nodejs-${majorVersion}_x "''${version}" "''${hash}" + update-source-version nodejs_${majorVersion} "''${version}" "''${hash}" '' diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index b36e8e3d0f3a2..ef8ea595eb2ce 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -20,8 +20,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.18.2"; - sha256 = "sha256-ckni8K+UPsOFmVBPSyor0x+5OHhykbbMymyLrfAeO1Y="; + version = "18.19.0"; + sha256 = "sha256-9StBryBZapq9jtdSQYN+xDlFRoIhRIu/hBNh4gkYGbY="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/development/web/nodejs/v21.nix b/pkgs/development/web/nodejs/v21.nix index ddcbc75cd24f9..631307f52b4b9 100644 --- a/pkgs/development/web/nodejs/v21.nix +++ b/pkgs/development/web/nodejs/v21.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "21.3.0"; - sha256 = "sha256-q0Fy7IJ/dwxsO0tvMIJBBBN+2kdISOhNVe1Vs0HmdyU="; + version = "21.5.0"; + sha256 = "sha256-r9fUcTVzzYFPfk3zIN6NXI4Ue0EBvJ+74qbVLrX4sHI="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/development/web/playwright/driver.nix b/pkgs/development/web/playwright/driver.nix index 2ced22b559a04..7f755eda21ce7 100644 --- a/pkgs/development/web/playwright/driver.nix +++ b/pkgs/development/web/playwright/driver.nix @@ -11,6 +11,7 @@ , makeWrapper , runCommand , unzip +, cacert }: let inherit (stdenv.hostPlatform) system; @@ -86,6 +87,10 @@ let dontUnpack = true; + nativeBuildInputs = [ + cacert + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/games/0verkill/default.nix b/pkgs/games/0verkill/default.nix index 2c09e5c1eb6f6..22ef6c6b0cc45 100644 --- a/pkgs/games/0verkill/default.nix +++ b/pkgs/games/0verkill/default.nix @@ -1,7 +1,7 @@ { lib , gccStdenv , fetchFromGitHub -, autoreconfHook +, autoreconfHook269 , xorgproto , libX11 , libXpm @@ -18,7 +18,7 @@ gccStdenv.mkDerivation rec { sha256 = "WO7PN192HhcDl6iHIbVbH7MVMi1Tl2KyQbDa9DWRO6M="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook269 ]; buildInputs = [ libX11 xorgproto libXpm ]; configureFlags = [ "--with-x" ]; diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix deleted file mode 100644 index 1bf732e446bfd..0000000000000 --- a/pkgs/games/alephone/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib, stdenv, fetchurl, alsa-lib, boost, curl, ffmpeg_4, icoutils, libGLU -, libmad, libogg, libpng, libsndfile, libvorbis, lua, miniupnpc, pkg-config -, SDL2, SDL2_image, SDL2_net, SDL2_ttf, speex, zziplib, zlib, makeWrapper -, makeDesktopItem, unzip, alephone }: - -let - self = stdenv.mkDerivation rec { - outputs = [ "out" "icons" ]; - pname = "alephone"; - version = "1.6.2"; - - src = fetchurl { - url = let date = "20230529"; - in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2"; - sha256 = "sha256-UqhZvOMOxU4W0eLRRTQvGXaqTpWD5KIdXULClHW7Iyc="; - }; - - nativeBuildInputs = [ pkg-config icoutils ]; - - buildInputs = [ - alsa-lib - boost - curl - ffmpeg_4 - libGLU - libmad - libsndfile - libogg - libpng - libvorbis - lua - miniupnpc - SDL2 - SDL2_image - SDL2_net - SDL2_ttf - speex - zziplib - zlib - ]; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; - makeFlags = [ "AR:=$(AR)" ]; - - enableParallelBuilding = true; - - postInstall = '' - mkdir $icons - icotool -x -i 5 -o $icons Resources/Windows/*.ico - pushd $icons - for x in *_5_48x48x32.png; do - mv $x ''${x%_5_48x48x32.png}.png - done - popd - ''; - - meta = with lib; { - description = - "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine"; - homepage = "https://alephone.lhowon.org/"; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux; - }; - }; - -in self // { - makeWrapper = { pname, desktopName, version, zip, meta - , icon ? alephone.icons + "/alephone.png", ... }@extraArgs: - stdenv.mkDerivation ({ - inherit pname version; - - desktopItem = makeDesktopItem { - name = desktopName; - exec = pname; - genericName = pname; - categories = [ "Game" ]; - comment = meta.description; - inherit desktopName icon; - }; - - src = zip; - - nativeBuildInputs = [ makeWrapper unzip ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out/bin $out/data/$pname $out/share/applications - cp -a * $out/data/$pname - cp $desktopItem/share/applications/* $out/share/applications - makeWrapper ${alephone}/bin/alephone $out/bin/$pname \ - --add-flags $out/data/$pname - ''; - } // extraArgs // { - meta = alephone.meta // { - license = lib.licenses.free; - hydraPlatforms = [ ]; - } // meta; - }); -} diff --git a/pkgs/games/anki/Cargo.lock b/pkgs/games/anki/Cargo.lock index 4318a8b2d8e55..944852d9bd142 100644 --- a/pkgs/games/anki/Cargo.lock +++ b/pkgs/games/anki/Cargo.lock @@ -18,10 +18,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] name = "ahash" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "once_cell", @@ -115,7 +126,7 @@ dependencies = [ "hyper", "id_tree", "inflections", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "nom", "num_cpus", @@ -141,7 +152,7 @@ dependencies = [ "sha1", "snafu", "strum", - "syn 2.0.38", + "syn 2.0.39", "tempfile", "tokio", "tokio-util", @@ -153,10 +164,10 @@ dependencies = [ "unicase", "unicode-normalization", "utime", - "windows", + "windows 0.52.0", "wiremock", "zip", - "zstd", + "zstd 0.13.0", ] [[package]] @@ -177,7 +188,7 @@ dependencies = [ "fluent-syntax", "inflections", "intl-memoizer", - "itertools 0.11.0", + "itertools 0.12.0", "num-format", "phf 0.11.2", "serde", @@ -198,7 +209,7 @@ dependencies = [ name = "anki_process" version = "0.0.0" dependencies = [ - "itertools 0.11.0", + "itertools 0.12.0", "snafu", ] @@ -210,7 +221,7 @@ dependencies = [ "anki_proto_gen", "anyhow", "inflections", - "itertools 0.11.0", + "itertools 0.12.0", "prost", "prost-build", "prost-reflect", @@ -228,7 +239,7 @@ dependencies = [ "anyhow", "camino", "inflections", - "itertools 0.11.0", + "itertools 0.12.0", "once_cell", "prost-reflect", "prost-types", @@ -258,30 +269,30 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -315,6 +326,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] name = "assert-json-diff" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -337,16 +357,16 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "futures-core", "memchr", "pin-project-lite", "tokio", - "zstd", - "zstd-safe", + "zstd 0.13.0", + "zstd-safe 7.0.0", ] [[package]] @@ -368,7 +388,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -379,7 +399,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -460,7 +480,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -491,6 +511,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] name = "bincode" version = "2.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -500,6 +526,27 @@ dependencies = [ ] [[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 = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -521,10 +568,16 @@ dependencies = [ "arrayvec", "cc", "cfg-if", - "constant_time_eq", + "constant_time_eq 0.3.0", ] [[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -544,9 +597,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "regex-automata 0.4.3", @@ -561,9 +614,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "burn" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e06bb3dfa90408228c879224e26a8bbf072aa2a68194c9b512f715624525c7cc" +checksum = "d5008368c07b8ffc5c8bde2ebf31b59bdd263fdd825152bd0a9d333a220ba44f" dependencies = [ "burn-core", "burn-train", @@ -571,9 +624,9 @@ dependencies = [ [[package]] name = "burn-autodiff" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b20c3ba4141da32bbcc48a4ce33a0fbf09742dfb6f17d6e781f27e076bf06d82" +checksum = "176a12ffd413ba2bfafa2b4ed1e2a21d7880b67a1ac3a9bb4919c9c0f102cdd7" dependencies = [ "burn-common", "burn-tensor", @@ -583,36 +636,65 @@ dependencies = [ ] [[package]] +name = "burn-candle" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce2556eb085f2ef1cd8d0d6d932f8a64f529c5d0487ea7e4a868fe6a65e3d892" +dependencies = [ + "burn-tensor", + "candle-core", + "derive-new", + "half 2.3.1", +] + +[[package]] name = "burn-common" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ce227728da80c4c7f932e66900d285ff6e04b815d77d769fd2ade463acb0d52" +checksum = "7dcb7947986d5420a9126959a5f16675f2d7b822bacc60a966fcfcf5a7dbd247" dependencies = [ "async-trait", "derive-new", - "getrandom 0.2.10", + "getrandom 0.2.11", "rand 0.8.5", "spin 0.9.8", "uuid", ] [[package]] +name = "burn-compute" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08dfd31ce4d27c64358991c23a26d8aaa2d9cb0f8517c7e79d01f2fe8d6c1eb0" +dependencies = [ + "burn-common", + "derive-new", + "hashbrown 0.14.3", + "log", + "spin 0.9.8", +] + +[[package]] name = "burn-core" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbeb7c07436e89d3b7e2445198f5d4142255bf74564eb4dc6cb9898f00d2da5" +checksum = "2067024ff50b21e29e6835a7cc8189046024fc7c174f1d2d635a4955c5151fe5" dependencies = [ "bincode", "burn-autodiff", + "burn-candle", "burn-common", "burn-dataset", "burn-derive", + "burn-fusion", "burn-ndarray", + "burn-tch", "burn-tensor", + "burn-wgpu", "derive-new", "flate2", "half 2.3.1", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "libm", "log", "rand 0.8.5", @@ -624,18 +706,24 @@ dependencies = [ [[package]] name = "burn-dataset" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7f12f9a55e82d327384e20c394c79e5a414b245fe59c37346e7a98234d1707" +checksum = "a9f3481ac13ad69279d4922cf17866aa99841b76db49d9a7915a7521d772a345" dependencies = [ "csv", "derive-new", "dirs", + "gix-tempfile", + "image", + "r2d2", + "r2d2_sqlite", "rand 0.8.5", "rmp-serde", + "rusqlite", "sanitize-filename", "serde", "serde_json", + "serde_rusqlite", "strum", "strum_macros", "tempfile", @@ -644,21 +732,34 @@ dependencies = [ [[package]] name = "burn-derive" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0726d6006ab4f1c65b37b079a8663ad168110976fb57234764495ed8c49a94b6" +checksum = "d44415ff69a525b49272a5ed893655441834f9ee6cac3ffe2b2387326042d8fc" dependencies = [ "derive-new", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", +] + +[[package]] +name = "burn-fusion" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "821663ff1f79865d6b0e998230683f72ff4351608770c07f91e39953e89fbec6" +dependencies = [ + "burn-common", + "burn-tensor", + "derive-new", + "hashbrown 0.14.3", + "spin 0.9.8", ] [[package]] name = "burn-ndarray" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cbba6e5180a91a48e2e5da7e74107d82dae9cc94a772a73783eb1381dd71fa2" +checksum = "0448005c7ed6f1636ca0e12a148613fdd4d5739e1db8b241c7940140098f4fe3" dependencies = [ "burn-autodiff", "burn-common", @@ -674,16 +775,29 @@ dependencies = [ ] [[package]] +name = "burn-tch" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197d7276dd95abe3872fdbdfedd091730700aef7d83542ecc9d20a015791d968" +dependencies = [ + "burn-tensor", + "half 2.3.1", + "libc", + "rand 0.8.5", + "tch", +] + +[[package]] name = "burn-tensor" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ddf687c9e2ddf235bb1528530b5e6c04601d4240aca78de6484fd01cc81e9f" +checksum = "60f8cf3d9588047b7d221c718b7208b829fdd1050150a69d069b66e1bb6e6cbb" dependencies = [ "burn-common", "burn-tensor-testgen", "derive-new", "half 2.3.1", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "libm", "num-traits", "rand 0.8.5", @@ -693,20 +807,19 @@ dependencies = [ [[package]] name = "burn-tensor-testgen" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92da000e738bcf20ec873d63c3b46ed4e0afa10fb14ea3133874886c0fb591f" +checksum = "a555a79ab0ab974e61aee15e62e87576ca47e7df768f68145754527d31633f87" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", ] [[package]] name = "burn-train" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b6ae54075e0f4ea7da7d1e6b94fb84854aed912885a2a957e9ce1e18aae12a" +checksum = "eb7defef4e44f0780d25c0aaf4d55efc96fb726b3f5d60902da682a59692359d" dependencies = [ "burn-core", "derive-new", @@ -718,6 +831,49 @@ dependencies = [ ] [[package]] +name = "burn-wgpu" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8676fa583cfa91db6f2ed26d8e42197fd378c15ed1e8a62c07286cb88f1971ec" +dependencies = [ + "burn-common", + "burn-compute", + "burn-tensor", + "bytemuck", + "derive-new", + "futures-intrusive", + "hashbrown 0.14.3", + "log", + "num-traits", + "pollster", + "rand 0.8.5", + "serde", + "spin 0.9.8", + "text_placeholder", + "wgpu", +] + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "byteorder" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -730,12 +886,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[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 = "camino" version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" [[package]] +name = "candle-core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d60d9b91c73bc662dc45aff607f5ffe79724b7cf7d7c8dc12a72b25921683b67" +dependencies = [ + "byteorder", + "gemm", + "half 2.3.1", + "memmap2", + "num-traits", + "num_cpus", + "rand 0.8.5", + "rand_distr", + "rayon", + "safetensors", + "thiserror", + "yoke", + "zip", +] + +[[package]] name = "cast" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -775,7 +973,7 @@ dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -817,9 +1015,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive", @@ -827,9 +1025,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", @@ -856,7 +1054,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -867,9 +1065,9 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "coarsetime" -version = "0.1.29" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a73ef0d00d14301df35d0f13f5ea32344de6b00837485c358458f1e7f2d27db4" +checksum = "71367d3385c716342014ad17e3d19f7788ae514885a1f4c24f500260fb365e1a" dependencies = [ "libc", "once_cell", @@ -899,16 +1097,28 @@ dependencies = [ ] [[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -918,12 +1128,18 @@ name = "configure" version = "0.0.0" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.0", "ninja_gen", ] [[package]] name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "constant_time_eq" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" @@ -939,9 +1155,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -949,15 +1165,26 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics-types" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] [[package]] name = "cpufeatures" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -1088,10 +1315,34 @@ dependencies = [ ] [[package]] +name = "d3d12" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +dependencies = [ + "bitflags 2.4.1", + "libloading 0.8.1", + "winapi", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "deadpool" @@ -1114,9 +1365,9 @@ checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" dependencies = [ "powerfmt", ] @@ -1176,7 +1427,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1187,7 +1438,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1215,6 +1466,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] +name = "dyn-stack" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" +dependencies = [ + "bytemuck", + "reborrow", +] + +[[package]] name = "either" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1243,9 +1504,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -1271,12 +1532,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1286,10 +1547,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume 0.10.14", + "half 2.3.1", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fallible-streaming-iterator" @@ -1298,6 +1575,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[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" @@ -1313,15 +1599,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] +name = "fdeflate" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +dependencies = [ + "simd-adler32", +] + +[[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys", + "redox_syscall", + "windows-sys 0.52.0", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml", ] [[package]] @@ -1372,7 +1676,7 @@ dependencies = [ "intl-memoizer", "intl_pluralrules", "rustc-hash", - "self_cell", + "self_cell 0.10.3", "smallvec", "unic-langid", ] @@ -1396,6 +1700,31 @@ dependencies = [ ] [[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin 0.9.8", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "spin 0.9.8", +] + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1407,7 +1736,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] @@ -1417,10 +1767,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1457,10 +1813,10 @@ dependencies = [ [[package]] name = "fsrs" version = "0.1.0" -source = "git+https://github.com/open-spaced-repetition/fsrs-rs.git?rev=725417fe310b74a719e18c2127f64223be1cb669#725417fe310b74a719e18c2127f64223be1cb669" +source = "git+https://github.com/open-spaced-repetition/fsrs-rs.git?rev=f45f46bdba6625f03677eaeb039dd8a6ffcad688#f45f46bdba6625f03677eaeb039dd8a6ffcad688" dependencies = [ "burn", - "itertools 0.11.0", + "itertools 0.12.0", "log", "ndarray", "ndarray-rand", @@ -1481,7 +1837,7 @@ dependencies = [ "camino", "clap", "fluent-syntax", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "regex", "serde_json", @@ -1501,9 +1857,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1516,9 +1872,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1526,15 +1882,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1542,10 +1898,21 @@ dependencies = [ ] [[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -1564,26 +1931,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-timer" @@ -1593,9 +1960,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1610,6 +1977,123 @@ dependencies = [ ] [[package]] +name = "gemm" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b3afa707040531a7527477fd63a81ea4f6f3d26037a2f96776e57fb843b258e" +dependencies = [ + "dyn-stack", + "gemm-c32", + "gemm-c64", + "gemm-common", + "gemm-f16", + "gemm-f32", + "gemm-f64", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3973a4c30c73f26a099113953d0c772bb17ee2e07976c0a06b8fe1f38a57d" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30362894b93dada374442cb2edf4512ddf19513c9bec88e06a445bcb6b22e64f" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-common" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "988499faa80566b046b4fee2c5f15af55b5a20c1fe8486b112ebb34efa045ad6" +dependencies = [ + "bytemuck", + "dyn-stack", + "half 2.3.1", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f16" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6cf2854a12371684c38d9a865063a27661812a3ff5803454c5742e8f5a388ce" +dependencies = [ + "dyn-stack", + "gemm-common", + "gemm-f32", + "half 2.3.1", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bc84003cf6d950a7c7ca714ad6db281b6cef5c7d462f5cd9ad90ea2409c7227" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35187ef101a71eed0ecd26fb4a6255b4192a12f1c5335f3a795698f2d9b6cf33" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1641,9 +2125,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -1653,10 +2137,83 @@ dependencies = [ ] [[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gix-features" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f77decb545f63a52852578ef5f66ecd71017ffc1983d551d5fa2328d6d9817f" +dependencies = [ + "gix-hash", + "gix-trace", + "libc", +] + +[[package]] +name = "gix-fs" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d5089f3338647776733a75a800a664ab046f56f21c515fa4722e395f877ef8" +dependencies = [ + "gix-features", +] + +[[package]] +name = "gix-hash" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "7d4796bac3aaf0c2f8bea152ca924ae3bdc5f135caefe6431116bcd67e98eab9" +dependencies = [ + "faster-hex", + "thiserror", +] + +[[package]] +name = "gix-tempfile" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cea558d3daf3b1d0001052b12218c66c8f84788852791333b633d7eeb6999db1" +dependencies = [ + "dashmap", + "gix-fs", + "libc", + "once_cell", + "parking_lot", + "signal-hook", + "signal-hook-registry", + "tempfile", +] + +[[package]] +name = "gix-trace" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] [[package]] name = "glob" @@ -1666,22 +2223,96 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "glow" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.4.1", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "gpu-allocator" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" +dependencies = [ + "backtrace", + "log", + "presser", + "thiserror", + "winapi", + "windows 0.51.1", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.1", + "gpu-descriptor-types", + "hashbrown 0.14.3", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.1", ] [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -1689,7 +2320,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", @@ -1708,17 +2339,20 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" dependencies = [ + "bytemuck", "cfg-if", "crunchy", "num-traits", + "rand 0.8.5", + "rand_distr", "serde", ] [[package]] name = "handlebars" -version = "4.4.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39b3bc2a8f715298032cf5087e58573809374b08160aa7d750582bdb82d2683" +checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225" dependencies = [ "log", "pest", @@ -1730,15 +2364,18 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -1751,7 +2388,22 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", ] [[package]] @@ -1797,6 +2449,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1811,7 +2469,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1836,9 +2494,9 @@ checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1927,9 +2585,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http", @@ -1963,7 +2621,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.51.1", ] [[package]] @@ -1986,9 +2644,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1996,39 +2654,47 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" dependencies = [ + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata 0.4.3", "same-file", - "thread_local", "walkdir", "winapi-util", ] [[package]] -name = "indexmap" -version = "1.9.3" +name = "image" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ - "autocfg", - "hashbrown 0.12.3", + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", ] [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -2121,7 +2787,7 @@ checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2143,6 +2809,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2158,10 +2833,19 @@ dependencies = [ ] [[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -2177,6 +2861,23 @@ dependencies = [ ] [[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.1", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] name = "kqueue" version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2203,10 +2904,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "libloading" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] [[package]] name = "libm" @@ -2215,10 +2942,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] + +[[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "pkg-config", @@ -2264,7 +3002,7 @@ version = "0.0.0" dependencies = [ "anki", "futures", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "linkcheck", "regex", @@ -2284,9 +3022,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" @@ -2338,7 +3076,7 @@ dependencies = [ ] [[package]] -name = "makeinstall" +name = "makeexe" version = "0.0.0" dependencies = [ "anyhow", @@ -2349,6 +3087,15 @@ dependencies = [ ] [[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] name = "maplit" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2416,9 +3163,9 @@ dependencies = [ [[package]] name = "mdbook" -version = "0.4.35" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c3f88addd34930bc5f01b9dc19f780447e51c92bf2536e3ded058018271775d" +checksum = "80992cb0e05f22cc052c99f8e883f1593b891014b96a8b4637fd274d7030c85e" dependencies = [ "ammonia", "anyhow", @@ -2436,6 +3183,7 @@ dependencies = [ "notify-debouncer-mini", "once_cell", "opener", + "pathdiff", "pulldown-cmark 0.9.3", "regex", "serde", @@ -2455,6 +3203,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", + "stable_deref_trait", +] + +[[package]] name = "memoffset" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2464,6 +3222,21 @@ dependencies = [ ] [[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.4.1", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] name = "mime" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2505,6 +3278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] @@ -2516,7 +3290,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2544,6 +3318,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] +name = "naga" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cd05939c491da968a42986204b7431678be21fdcd4b10cc84997ba130ada5a4" +dependencies = [ + "bit-set", + "bitflags 2.4.1", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom 0.2.11", +] + +[[package]] name = "native-tls" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2601,7 +3404,7 @@ dependencies = [ "camino", "dunce", "globset", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "maplit", "num_cpus", @@ -2631,7 +3434,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2650,16 +3453,17 @@ dependencies = [ "log", "mio", "walkdir", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "notify-debouncer-mini" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55ee272914f4563a2f8b8553eb6811f3c0caea81c756346bad15b7e3ef969f0" +checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43" dependencies = [ "crossbeam-channel", + "log", "notify", ] @@ -2679,6 +3483,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ + "bytemuck", "num-traits", ] @@ -2703,6 +3508,17 @@ dependencies = [ ] [[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] name = "num-traits" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2724,23 +3540,42 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", ] [[package]] @@ -2777,13 +3612,13 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" dependencies = [ "bitflags 2.4.1", "cfg-if", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -2798,7 +3633,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2809,9 +3644,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" dependencies = [ "cc", "libc", @@ -2832,7 +3667,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2850,7 +3685,7 @@ dependencies = [ "cbc", "cipher", "des", - "getrandom 0.2.10", + "getrandom 0.2.11", "hmac", "lazy_static", "rc2", @@ -2882,9 +3717,20 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", ] [[package]] @@ -2894,6 +3740,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[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" @@ -2904,9 +3768,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "percent-encoding-iri" @@ -2944,7 +3808,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2965,7 +3829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.2", + "indexmap", ] [[package]] @@ -3027,7 +3891,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3065,7 +3929,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3088,12 +3952,12 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ "base64 0.21.5", - "indexmap 1.9.3", + "indexmap", "line-wrap", "quick-xml", "serde", @@ -3129,6 +3993,25 @@ dependencies = [ ] [[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[package]] name = "powerfmt" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3147,45 +4030,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] name = "prettyplease" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" dependencies = [ - "once_cell", "toml_edit", ] [[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.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] [[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" + +[[package]] name = "prost" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", "prost-derive", @@ -3193,13 +4081,13 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" +checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" dependencies = [ "bytes", "heck", - "itertools 0.10.5", + "itertools 0.11.0", "log", "multimap", "once_cell", @@ -3208,22 +4096,22 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.38", + "syn 2.0.39", "tempfile", "which 4.4.2", ] [[package]] name = "prost-derive" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3239,9 +4127,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" +checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ "prost", ] @@ -3271,6 +4159,18 @@ dependencies = [ ] [[package]] +name = "pulp" +version = "0.18.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16785ee69419641c75affff7c9fdbdb7c0ab26dc9a5fb5218c2a2e9e4ef2087d" +dependencies = [ + "bytemuck", + "libm", + "num-complex", + "reborrow", +] + +[[package]] name = "pyo3" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3316,7 +4216,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3328,14 +4228,23 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", ] [[package]] name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -3350,6 +4259,28 @@ dependencies = [ ] [[package]] +name = "r2d2" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" +dependencies = [ + "log", + "parking_lot", + "scheduled-thread-pool", +] + +[[package]] +name = "r2d2_sqlite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc290b669d30e20751e813517bbe13662d020419c5c8818ff10b6e8bb7777f6" +dependencies = [ + "r2d2", + "rusqlite", + "uuid", +] + +[[package]] name = "rand" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3408,7 +4339,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -3431,6 +4362,27 @@ dependencies = [ ] [[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] name = "rawpointer" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3478,22 +4430,10 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.2.16" +name = "reborrow" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "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", -] +checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" [[package]] name = "redox_syscall" @@ -3506,12 +4446,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.11", + "libredox", "thiserror", ] @@ -3560,6 +4500,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] name = "reqwest" version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3630,16 +4576,16 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.10", + "getrandom 0.2.11", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3691,14 +4637,14 @@ dependencies = [ "which 5.0.0", "xz2", "zip", - "zstd", + "zstd 0.13.0", ] [[package]] name = "rusqlite" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ "bitflags 2.4.1", "fallible-iterator", @@ -3722,25 +4668,25 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "log", - "ring 0.17.5", + "ring 0.17.7", "rustls-webpki", "sct", ] @@ -3759,9 +4705,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64 0.21.5", ] @@ -3772,7 +4718,7 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -3795,6 +4741,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" [[package]] +name = "safetensors" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93279b86b3de76f820a8854dd06cbc33cfa57a417b19c47f6a25280112fb1df" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] name = "same-file" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3819,7 +4775,16 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "scheduled-thread-pool" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" +dependencies = [ + "parking_lot", ] [[package]] @@ -3840,7 +4805,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -3869,9 +4834,18 @@ dependencies = [ [[package]] name = "self_cell" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.0.2", +] + +[[package]] +name = "self_cell" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" [[package]] name = "semver" @@ -3880,19 +4854,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] +name = "seq-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" + +[[package]] name = "serde" -version = "1.0.189" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde-aux" -version = "4.2.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3dfe1b7eb6f9dcf011bd6fad169cdeaae75eda0d61b1a99a3f015b41b0cae39" +checksum = "184eba62ebddb71658697c8b08822edee89970bf318c5362189f0de27f85b498" dependencies = [ "chrono", "serde", @@ -3901,20 +4881,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -3944,13 +4924,23 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", +] + +[[package]] +name = "serde_rusqlite" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4600dac14aada464c5584d327baa164e372153309bc4c0fb1498bbfbaa5a028b" +dependencies = [ + "rusqlite", + "serde", ] [[package]] @@ -4034,6 +5024,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] name = "signal-hook-registry" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4043,6 +5043,12 @@ dependencies = [ ] [[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] name = "simple-file-manifest" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4064,10 +5070,19 @@ dependencies = [ ] [[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "snafu" @@ -4115,7 +5130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4134,6 +5149,28 @@ dependencies = [ ] [[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +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 = "string_cache" version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4184,7 +5221,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4206,9 +5243,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -4222,6 +5259,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] +name = "synstructure" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "unicode-xid", +] + +[[package]] name = "system-configuration" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4260,16 +5309,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] +name = "tch" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ed5dddab3812892bf5fb567136e372ea49f31672931e21cec967ca68aec03da" +dependencies = [ + "half 2.3.1", + "lazy_static", + "libc", + "ndarray", + "rand 0.8.5", + "safetensors", + "thiserror", + "torch-sys", + "zip", +] + +[[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall 0.3.5", + "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4285,9 +5351,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -4299,7 +5365,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ "rustix", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "text_placeholder" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512104f982ce6f50def5340f9d7d14cc21f7a859e9ccd251aa19d12e1345c070" +dependencies = [ + "hashbrown 0.13.2", + "serde", + "serde_json", ] [[package]] @@ -4319,7 +5396,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4342,6 +5419,17 @@ dependencies = [ ] [[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] name = "time" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4372,9 +5460,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" dependencies = [ "displaydoc", ] @@ -4406,9 +5494,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes", @@ -4419,18 +5507,18 @@ dependencies = [ "signal-hook-registry", "socket2 0.5.5", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4490,9 +5578,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -4519,11 +5607,11 @@ checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.0.2", + "indexmap", "toml_datetime", "winnow", ] @@ -4535,6 +5623,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" [[package]] +name = "torch-sys" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "803446f89fb877a117503dbfb8375b6a29fa8b0e0f44810fac3863c798ecef22" +dependencies = [ + "anyhow", + "cc", + "libc", + "serde", + "serde_json", + "ureq", + "zip", +] + +[[package]] name = "tower" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4595,11 +5698,12 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", + "thiserror", "time", "tracing-subscriber", ] @@ -4612,7 +5716,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4627,9 +5731,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", @@ -4638,9 +5742,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -4775,9 +5879,9 @@ checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" [[package]] name = "unic-langid" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +checksum = "887622f8e7b723780c5e64b04dcc0c9b8f426ada7cca6790cd3ea3bf0f08037a" dependencies = [ "unic-langid-impl", "unic-langid-macros", @@ -4785,20 +5889,19 @@ dependencies = [ [[package]] name = "unic-langid-impl" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +checksum = "5adeb847e35eed4efbffd9fb2e4d078b91ece56e4d6a3c0d2df55b3a1dac07d5" dependencies = [ "tinystr", ] [[package]] name = "unic-langid-macros" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055e618bf694161ffff0466d95cef3e1a5edc59f6ba1888e97801f2b4ebdc4fe" +checksum = "d4d4589552627b69df7135a17919dc0b62f320be06988b77fcfc69bc89425600" dependencies = [ - "proc-macro-hack", "tinystr", "unic-langid-impl", "unic-langid-macros-impl", @@ -4806,13 +5909,14 @@ dependencies = [ [[package]] name = "unic-langid-macros-impl" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f5cdec05b907f4e2f6843f4354f4ce6a5bebe1a56df320a49134944477ce4d8" +checksum = "fb865515362dca12581b9a4b731acdc9015f4b81e1be9b21fa6d9dbbd2598e5e" dependencies = [ - "proc-macro-hack", + "find-crate", + "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", "unic-langid-impl", ] @@ -4880,6 +5984,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] name = "unindent" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4898,10 +6008,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] +name = "ureq" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" +dependencies = [ + "base64 0.21.5", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-webpki", + "serde", + "serde_json", + "url", + "webpki-roots", +] + +[[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -4933,9 +6061,13 @@ dependencies = [ [[package]] name = "uuid" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +dependencies = [ + "getrandom 0.2.11", + "rand 0.8.5", +] [[package]] name = "valuable" @@ -5024,9 +6156,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5034,24 +6166,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -5061,9 +6193,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5071,22 +6203,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-streams" @@ -5113,9 +6245,117 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wgpu" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24" +dependencies = [ + "arrayvec", + "cfg-if", + "flume 0.11.0", + "js-sys", + "log", + "naga", + "parking_lot", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga", + "parking_lot", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84ecc802da3eb67b4cf3dd9ea6fe45bbb47ef13e6c49c5c3240868a9cc6cdd9" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "once_cell", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] [[package]] name = "which" @@ -5139,10 +6379,16 @@ dependencies = [ "home", "once_cell", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5179,8 +6425,18 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core", - "windows-targets", + "windows-core 0.51.1", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.0", ] [[package]] @@ -5189,7 +6445,16 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -5198,7 +6463,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -5207,13 +6481,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "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]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -5223,46 +6512,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" -version = "0.5.17" +version = "0.5.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" dependencies = [ "memchr", ] @@ -5284,14 +6615,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "wiremock" -version = "0.5.19" +version = "0.5.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f71803d3a1c80377a06221e0530be02035d5b3e854af56c6ece7ac20ac441d" +checksum = "13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9" dependencies = [ "assert-json-diff", "async-trait", @@ -5319,6 +6650,12 @@ dependencies = [ ] [[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] name = "xml5ever" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5348,23 +6685,68 @@ dependencies = [ ] [[package]] +name = "yoke" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "synstructure", +] + +[[package]] name = "zerocopy" -version = "0.7.13" +version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffc046c9f849405a42c87e82e2f2f861d1f0a06b855910c76c2bd1e87be900c" +checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.13" +version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246c000cfc5f942bac7ff99fde24a9ebb589d92e024bc758c6c733c15a02a73e" +checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", +] + +[[package]] +name = "zerofrom" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "synstructure", ] [[package]] @@ -5373,11 +6755,27 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ + "aes", "byteorder", + "bzip2", + "constant_time_eq 0.1.5", "crc32fast", "crossbeam-utils", "flate2", + "hmac", + "pbkdf2", + "sha1", "time", + "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" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe 5.0.2+zstd.1.5.2", ] [[package]] @@ -5386,7 +6784,17 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ - "zstd-safe", + "zstd-safe 7.0.0", +] + +[[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]] @@ -5407,3 +6815,12 @@ dependencies = [ "cc", "pkg-config", ] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 90f2ee9e53bff..6c69056d5e3cf 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -28,21 +28,21 @@ let pname = "anki"; - version = "23.10.1"; - rev = "fac9e0ee1436ba5ac3366c72dd9394a6e692b1cf"; + version = "23.12"; + rev = "55ef11af84151b397f267a2f37d537aad5f1076d"; src = fetchFromGitHub { owner = "ankitects"; repo = "anki"; rev = version; - hash = "sha256-leGdamjCehffv2ByL7JWdaUhxRA4ZEPRKxBphUVzfRw="; + hash = "sha256-KkB0tNjW08XIdpmW2mzwLqhn5DHoPV0AM0ciZOxSKEs="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "fsrs-0.1.0" = "sha256-bnLmJk2aaWBdgdsiasRrDG4NiTDMCDCXotCSoc0ldlk="; + "fsrs-0.1.0" = "sha256-RIT7mbesrju70S4fPNy1N6+pSr78mcenQ6ujPtu4UbE="; "linkcheck-0.4.1" = "sha256-S93J1cDzMlzDjcvz/WABmv8CEC6x78E+f7nzhsN7NkE="; "percent-encoding-iri-2.2.0" = "sha256-kCBeS1PNExyJd4jWfDfctxq6iTdAq69jtxFQgCCQ8kQ="; }; @@ -51,7 +51,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-ckpKxALSpZAu5xyBOYzMcNDQDfCMaYAtSGONHTCBhw4="; + hash = "sha256-tOl+gLBE6SNPQvVWT/N7RKFaaP9SnpCBJf5dq2wCPuM="; }; anki-build-python = python3.withPackages (ps: with ps; [ @@ -150,6 +150,7 @@ python3.pkgs.buildPythonApplication { buildInputs = [ qt6.qtbase + qt6.qtsvg ] ++ lib.optional stdenv.isLinux qt6.qtwayland; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 275b878d26199..fb0117f3e93e2 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -82,7 +82,7 @@ let let # Split the version into the major and minor parts versionParts = lib.splitString "-" version; - splitVersion = lib.splitString "." (builtins.elemAt versionParts 0); + splitVersion = lib.splitVersion (builtins.elemAt versionParts 0); majorVersion = builtins.concatStringsSep "." (lib.lists.take 2 splitVersion); minorVersionPart = parts: sep: expectedSize: diff --git a/pkgs/games/atlauncher/default.nix b/pkgs/games/atlauncher/default.nix index da98159cde9e3..77fcdaaf8721e 100644 --- a/pkgs/games/atlauncher/default.nix +++ b/pkgs/games/atlauncher/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.34.2"; + version = "3.4.35.3"; src = fetchurl { url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-l9OoHunK0xfY6xbNpjs9lfsVd3USM1GHgutTMMVq8S8="; + hash = "sha256-2080rVGBBM3YZmmBVBfMhnCErLzxuRDDi4zmCniJYFY="; }; env.ICON = fetchurl { diff --git a/pkgs/games/clonehero/default.nix b/pkgs/games/clonehero/default.nix index 0f7ae45a6683f..daebe74e30b4a 100644 --- a/pkgs/games/clonehero/default.nix +++ b/pkgs/games/clonehero/default.nix @@ -6,6 +6,7 @@ , zlib , alsa-lib , dbus +, libGL , libXcursor , libXext , libXi @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # Run-time libraries (loaded with dlopen) dbus + libGL libXcursor libXext libXi @@ -92,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: { patchelf \ --add-needed libasound.so.2 \ --add-needed libdbus-1.so.3 \ + --add-needed libGL.so.1 \ --add-needed libpthread.so.0 \ --add-needed libudev.so.1 \ --add-needed libvulkan.so.1 \ diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 6a6fc63e8c409..ddd3538ece50f 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -35,19 +35,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "17.4"; + version = "17.4.2"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-VWn6fbK6f9/MwjZuFMD2LDv9erRhFnU4JEnbpYDBl70="; + hash = "sha256-cu6EmCaT8nMCcXUwvZdWog/4bvHQo9+DZHDHRvun2E4="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-ntAH78BTfPU9nMorsXzZnrZIyNWVCxmQWwwEFIFQB1c="; + hash = "sha256-O4ORWuTlmEMsTpMEhnauNfXOKWfg8hB32rZKRe8Nmp4="; }; nativeBuildInputs = [ diff --git a/pkgs/games/deliantra/0003-swap.patch b/pkgs/games/deliantra/0003-swap.patch new file mode 100644 index 0000000000000..fa4e2bdec425b --- /dev/null +++ b/pkgs/games/deliantra/0003-swap.patch @@ -0,0 +1,14 @@ +--- a/include/util.h ++++ b/include/util.h +@@ -449,6 +449,11 @@ struct slice_allocator + { + p->~Tp (); + } ++ ++ bool operator ==(const slice_allocator &) const ++ { ++ return true; ++ } + }; + + // basically a memory area, but refcounted diff --git a/pkgs/games/deliantra/server.nix b/pkgs/games/deliantra/server.nix index 4185a46120e5a..08889dd2302d7 100644 --- a/pkgs/games/deliantra/server.nix +++ b/pkgs/games/deliantra/server.nix @@ -35,8 +35,11 @@ stdenv.mkDerivation rec { patches = [ ./0001-abs.patch ./0002-datadir.patch + ./0003-swap.patch ]; + env.CXXFLAGS = "-std=c++11"; + postFixup = '' wrapProgram $out/bin/cfutil --prefix PERL5LIB : $PERL5LIB wrapProgram $out/bin/deliantra-server --prefix PERL5LIB : $PERL5LIB diff --git a/pkgs/games/doom-ports/doomretro/default.nix b/pkgs/games/doom-ports/doomretro/default.nix index d73ebf88de70e..5e6fa7ad9d187 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 = "5.0.7"; + version = "5.1.3"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-Jh0NcZRiNrztGTHKKaSXbU2l8zgXsfAVlhBIJ9/sQ3c="; + hash = "sha256-hwjz9nzhasDIeFlmPIwBNhJjrNfZ8ksttx5A7WSomBQ="; }; nativeBuildInputs = [ diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 49721fd2ce1eb..0250208fd48a9 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - preConfigure = '' - patchShebangs ./configure - ''; - env.NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index ac44390faf564..9a3e86117cef4 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -1,22 +1,39 @@ -{ lib, stdenv, fetchFromGitHub -, SDL2, libpng, libjpeg, glew, openal, scons, libmad, libuuid +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, libpng +, libjpeg +, glew +, openal +, scons +, libmad +, libuuid }: stdenv.mkDerivation rec { pname = "endless-sky"; - version = "0.9.16.1"; + version = "0.10.4"; src = fetchFromGitHub { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "sha256-bohljxAtSVqsfnge6t4LF3pC1s1r99v3hNLKTBquC20="; + sha256 = "sha256-VTg8H6umq9yMMP274StIJfEZZvUFDILiMKhioam58QE="; }; patches = [ ./fixes.patch ]; + postPatch = '' + # the trailing slash is important!! + # endless sky naively joins the paths with string concatenation + # so it's essential that there be a trailing slash on the resources path + substituteInPlace source/Files.cpp \ + --replace '%NIXPKGS_RESOURCES_PATH%' "$out/share/games/endless-sky/" + ''; + preBuild = '' export AR="${stdenv.cc.targetPrefix}gcc-ar" ''; @@ -24,7 +41,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - SDL2 libpng libjpeg glew openal scons libmad libuuid + SDL2 + libpng + libjpeg + glew + openal + scons + libmad + libuuid ]; prefixKey = "PREFIX="; @@ -33,9 +57,12 @@ stdenv.mkDerivation rec { description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control"; homepage = "https://endless-sky.github.io/"; license = with licenses; [ - gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain + gpl3Plus + cc-by-sa-30 + cc-by-sa-40 + publicDomain ]; - maintainers = with maintainers; [ lheckemann ]; + maintainers = with maintainers; [ lheckemann _360ied ]; platforms = platforms.linux; # Maybe other non-darwin Unix }; } diff --git a/pkgs/games/endless-sky/fixes.patch b/pkgs/games/endless-sky/fixes.patch index 359e2ee4af3b2..b6f330eca4426 100644 --- a/pkgs/games/endless-sky/fixes.patch +++ b/pkgs/games/endless-sky/fixes.patch @@ -12,13 +12,19 @@ index 48fd080..419b40d 100644 # Install the desktop file: env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop") diff --git a/source/Files.cpp b/source/Files.cpp -index c8c8957..d196459 100644 +index de27023e..4225051f 100644 --- a/source/Files.cpp +++ b/source/Files.cpp -@@ -114,15 +114,9 @@ void Files::Init(const char * const *argv) - if(resources.back() != '/') - resources += '/'; - #if defined __linux__ || defined __FreeBSD__ || defined __DragonFly__ +@@ -108,32 +108,9 @@ void Files::Init(const char * const *argv) + resources = str; + SDL_free(str); + } +-#if defined _WIN32 +- FixWindowsSlashes(resources); +-#endif +- if(resources.back() != '/') +- resources += '/'; +-#if defined __linux__ || defined __FreeBSD__ || defined __DragonFly__ - // Special case, for Linux: the resource files are not in the same place as - // the executable, but are under the same prefix (/usr or /usr/local). - static const string LOCAL_PATH = "/usr/local/"; @@ -28,9 +34,20 @@ index c8c8957..d196459 100644 - resources = LOCAL_PATH + RESOURCE_PATH; - else if(!resources.compare(0, STANDARD_PATH.length(), STANDARD_PATH)) - resources = STANDARD_PATH + RESOURCE_PATH; -+ // Workaround for NixOS. Not sure how to proceed with other OSes, feedback -+ // is welcome. -+ resources += "../share/games/endless-sky/"; - #elif defined __APPLE__ - // Special case for Mac OS X: the resources are in ../Resources relative to - // the folder the binary is in. +-#endif +- // If the resources are not here, search in the directories containing this +- // one. This allows, for example, a Mac app that does not actually have the +- // resources embedded within it. +- while(!Exists(resources + "credits.txt")) +- { +- size_t pos = resources.rfind('/', resources.length() - 2); +- if(pos == string::npos || pos == 0) +- throw runtime_error("Unable to find the resource directories!"); +- resources.erase(pos + 1); +- } ++ ++ resources = "%NIXPKGS_RESOURCES_PATH%"; ++ + dataPath = resources + "data/"; + imagePath = resources + "images/"; + soundPath = resources + "sounds/"; diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 798178e58c163..700dd0f6b315f 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.10"; + version = "1.0.11"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-bh27piX1/HIlbOmTpqQCV7NaHxOMtwMIGrjlXrFvHWE="; + hash = "sha256-R7hl5VzzdRcU9TF6WfiLYgUFpVixuppLobMsan0jKsQ="; }; nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/games/gambatte/fix-scons-paths.patch b/pkgs/games/gambatte/fix-scons-paths.patch deleted file mode 100644 index ea10ee4163b42..0000000000000 --- a/pkgs/games/gambatte/fix-scons-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/libgambatte/SConstruct b/libgambatte/SConstruct -index e882514..87e1eaa 100644 ---- a/libgambatte/SConstruct -+++ b/libgambatte/SConstruct -@@ -5,7 +5,9 @@ vars = Variables() - vars.Add('CC') - vars.Add('CXX') - --env = Environment(CPPPATH = ['src', 'include', '../common'], -+import os -+env = Environment(ENV = os.environ, -+ CPPPATH = ['src', 'include', '../common'], - CFLAGS = global_cflags + global_defines, - CXXFLAGS = global_cxxflags + global_defines, - variables = vars) diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index 212f0af0e8e3f..43e1f3397b8fb 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -11,7 +11,7 @@ }: let - version = "1.5.3"; + version = "1.5.4a"; in stdenv.mkDerivation { pname = "gogui"; inherit version; @@ -20,7 +20,7 @@ in stdenv.mkDerivation { owner = "Remi-Coulom"; repo = "gogui"; rev = "v${version}"; - hash = "sha256-GezFhNYB542JnAIUeUVa188+SR5mCedwj0hZN8L83UQ="; + hash = "sha256-UFhOk2mAnTtxfwEOHquN64YDCRq7nNUqZAPQf77MEEw="; }; nativeBuildInputs = [ diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index 9aacc0856c4f6..239d78f973c86 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -17,18 +17,18 @@ let appName = "heroic"; in stdenv.mkDerivation rec { pname = "heroic-unwrapped"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - hash = "sha256-umPQIxwIahjbO4QbkKEoeSSeYT2UatsTGRPrLgw5KW8="; + hash = "sha256-N+9wNlDARE1zdXW/vka6whFNu5CF240zCJ00EDT1cM0="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-o5ztk4okH21Op1jqHZfranR12M8B1Y/K95aWb10tf5o="; + hash = "sha256-P7Mm9TMNjr2glLQppjJZRMeN9sYKyZWzRaerZIcY3Y8="; }; nativeBuildInputs = [ @@ -45,9 +45,6 @@ in stdenv.mkDerivation rec { ./remove-drm-support.patch # Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic. ./fix-non-steam-shortcuts.patch - # Fix reg add infinite loop - # Submitted upstream: https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/pull/3210 - ./fix-infinite-loop.patch ]; postPatch = '' diff --git a/pkgs/games/heroic/fix-infinite-loop.patch b/pkgs/games/heroic/fix-infinite-loop.patch deleted file mode 100644 index 99aae02c3a1a4..0000000000000 --- a/pkgs/games/heroic/fix-infinite-loop.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b698779053b7ba31bd8e69b230e86515e3019bf6 Mon Sep 17 00:00:00 2001 -From: K900 <me@0upti.me> -Date: Sun, 5 Nov 2023 22:04:32 +0300 -Subject: [PATCH] Force add the registry entry - -Otherwise, newer Wine versions will prompt to overwrite it and loop there forever. ---- - src/backend/storeManagers/legendary/setup.ts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/backend/storeManagers/legendary/setup.ts b/src/backend/storeManagers/legendary/setup.ts -index 1837106621..b5c2432435 100644 ---- a/src/backend/storeManagers/legendary/setup.ts -+++ b/src/backend/storeManagers/legendary/setup.ts -@@ -20,7 +20,7 @@ export const legendarySetup = async (appName: string) => { - - // Fixes games like Fallout New Vegas and Dishonored: Death of the Outsider - await runWineCommandOnGame(appName, { -- commandParts: ['reg', 'add', 'HKEY_CLASSES_ROOT\\com.epicgames.launcher'], -+ commandParts: ['reg', 'add', 'HKEY_CLASSES_ROOT\\com.epicgames.launcher', '/f'], - wait: true, - protonVerb: 'waitforexitandrun' - }) diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 30698016a325d..8ea692587d0ee 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.1y"; + version = "12.1z"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-YCjDqpbb3OxJmek8KesCb3uACVCFYIAsaF3U1jO/CU4="; + sha256 = "sha256-L9T61fyMURlPtUidbwDnkvI7bb7fobNeyYhDleOCU4Y="; }; CXXFLAGS = [ diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 0ca0deb518ffc..4a66f6cc711e7 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -27,14 +27,14 @@ assert lib.assertOneOf "backend" backend [ "opencl" "cuda" "tensorrt" "eigen" ]; # of gcc. If you need to use cuda10, please override stdenv with gcc8Stdenv stdenv.mkDerivation rec { pname = "katago"; - version = "1.13.1"; - githash = "3539a3d410b12f79658bb7a2cdaf1ecb6c95e6c1"; + version = "1.14.0"; + githash = "c6de1bbda837a0717eaeca46102f7326ed0da0d4"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "sha256-A2ZvFcklYQoxfqYrLrazksrJkfdELnn90aAbkm7pJg0="; + sha256 = "sha256-0WB/weQIJkLXedcOJO7D/N85oXTufvbmyfIp8XdrACg="; }; fakegit = writeShellScriptBin "git" "echo ${githash}"; diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index 5fce31eaa837e..355002d716f14 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "unstable-2023-10-14"; + version = "0.20.34"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; - rev = "450784283dd49152dda6322db2fb2ef33e7c382e"; - sha256 = "sha256-iwIaxD35tkOX6NX1SVNmN2OQACwaX/C4xnfgT5YcUvg="; + rev = "56d439ed2d3d9f34e2b08fa23e627c23a487b8d6"; + sha256 = "sha256-yCHeeEGw+9gtRMGyIhbStxJhmSM/1Fqly7HSRDkZILQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/games/maptool/default.nix b/pkgs/games/maptool/default.nix index eed8bac656be0..d5fcbc47529b1 100644 --- a/pkgs/games/maptool/default.nix +++ b/pkgs/games/maptool/default.nix @@ -13,15 +13,10 @@ let pname = "maptool"; version = "1.13.2"; - repoBase = "https://github.com/RPTools/${pname}"; + repoBase = "https://github.com/RPTools/maptool"; src = fetchurl { - url = "${repoBase}/releases/download/${version}/MapTool-${version}.jar"; - hash = "sha256-14ULI1OAk0V4DqiL5IF7DK6pw0NRfmU+omrFP72PblA="; - }; - - icon = fetchurl { - url = "https://raw.githubusercontent.com/RPTools/${pname}/${version}/package/linux/MapTool.png"; - hash = "sha256-xkVYjMprTanHu8r4b9PHORI8E1aJp+9KDSP5mqCE8ew="; + url = "${repoBase}/releases/download/${version}/maptool-${version}-x86_64.pkg.tar.zst"; + hash = "sha256-Ntmro+t4qpP5BXW20t97ki0wt2NKaK5yQarsxDEKbb0="; }; meta = with lib; { @@ -33,17 +28,20 @@ let ]; license = licenses.agpl3; maintainers = with maintainers; [ rhendric ]; + platforms = [ "x86_64-linux" ]; }; javafxModules = [ "base" "controls" "media" "swing" "web" "fxml" "graphics" ]; + appClasspath = "share/${pname}"; + classpath = lib.concatMap (mod: [ "${openjfx}/modules_src/javafx.${mod}/module-info.java" "${openjfx}/modules/javafx.${mod}" "${openjfx}/modules_libs/javafx.${mod}" ]) javafxModules ++ - [ src ]; + [ "$out/${appClasspath}/*" ]; jvmArgs = [ "-cp" (lib.concatStringsSep ":" classpath) @@ -76,6 +74,7 @@ stdenvNoCC.mkDerivation { inherit pname version src meta; dontUnpack = true; + dontConfigure = true; dontBuild = true; dontWrapGApps = true; @@ -99,15 +98,20 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/${binName} \ - "''${gappsWrapperArgs[@]}" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ]} \ - --add-flags '${lib.concatStringsSep " " jvmArgs} net.rptools.maptool.client.LaunchInstructions' + dest=$out/${appClasspath} + install -dm755 "$dest" + bsdtar -xf "$src" -C "$dest" --strip-components 4 opt/maptool/lib/app/{'*.jar',readme} dest=$out/share/icons/hicolor/256x256/apps - mkdir -p "$dest" - ln -s ${icon} "$dest/${rdnsName}.png" + install -dm755 "$dest" + bsdtar -xOf "$src" opt/maptool/lib/MapTool.png > "$dest"/${rdnsName}.png + + dest=$out/bin + install -dm755 "$dest" + makeWrapper ${jre}/bin/java "$dest"/${binName} \ + "''${gappsWrapperArgs[@]}" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ]} \ + --add-flags "${lib.concatStringsSep " " jvmArgs} net.rptools.maptool.client.LaunchInstructions" runHook postInstall ''; diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 2bf239579e4a4..d901fba57af7d 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -40,6 +40,8 @@ let version = "146"; buildVersion = makeBuildVersion version; + gradleWithJdk = gradle.override { java = jdk; }; + selectedGlew = if enableWayland then glew-egl else glew; Mindustry = fetchFromGitHub { @@ -114,7 +116,7 @@ let inherit version unpackPhase patches; postPatch = cleanupMindustrySrc; - nativeBuildInputs = [ gradle perl ]; + nativeBuildInputs = [ gradleWithJdk perl ]; # Here we download dependencies for both the server and the client so # we only have to specify one hash for 'deps'. Deps can be garbage # collected after the build, so this is not really an issue. @@ -149,7 +151,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config - gradle + gradleWithJdk makeWrapper jdk ] ++ lib.optionals enableClient [ diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index 67d2f4cab635a..15dbc82c6d901 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.20": { - "url": "https://piston-data.mojang.com/v1/objects/5b868151bd02b41319f54c8d4061b8cae84e665c/server.jar", - "sha1": "5b868151bd02b41319f54c8d4061b8cae84e665c", - "version": "1.20.2", + "sha1": "8dd1a28015f51b1803213892b50b7b4fc76e594d", + "url": "https://piston-data.mojang.com/v1/objects/8dd1a28015f51b1803213892b50b7b4fc76e594d/server.jar", + "version": "1.20.4", "javaVersion": 17 }, "1.19": { diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/games/minesweep-rs/default.nix index 11950a8f74105..2e430ea34dc9d 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.39"; + version = "6.0.45"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-gV+16gxXfogHFFAXz/aG+D/uaXbZTgVjYK24QQizQ0c="; + hash = "sha256-nD2lDfTT1lm2jN1ORq4PV3ER+RJJJU0ZTvSlvvskCxs="; }; - cargoHash = "sha256-D6HnpXxixmVugbjr5pMYZiVeGLgje41k3n3xic6Ecps="; + cargoHash = "sha256-skzi5lSQSQgBK9RDtiuUwFDEzyV4LYrV5+g+7dmgfMc="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 550f088e8af03..fcea007ff5988 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -38,106 +38,101 @@ , Carbon , Cocoa , withTouchSupport ? false +, buildClient ? true +, buildServer ? true }: -with lib; +stdenv.mkDerivation (finalAttrs: { + pname = "minetest"; + version = "5.8.0"; -let - boolToCMake = b: if b then "ON" else "OFF"; - - irrlichtmtInput = irrlichtmt.override { inherit withTouchSupport; }; - - generic = { version, rev ? version, sha256, dataRev ? version, dataSha256, buildClient ? true, buildServer ? false }: let - sources = { - src = fetchFromGitHub { - owner = "minetest"; - repo = "minetest"; - inherit rev sha256; - }; - data = fetchFromGitHub { - owner = "minetest"; - repo = "minetest_game"; - rev = dataRev; - sha256 = dataSha256; - }; - }; - in stdenv.mkDerivation { - pname = "minetest"; - inherit version; - - src = sources.src; - - cmakeFlags = [ - "-G Ninja" - "-DBUILD_CLIENT=${boolToCMake buildClient}" - "-DBUILD_SERVER=${boolToCMake buildServer}" - "-DENABLE_GETTEXT=1" - "-DENABLE_SPATIAL=1" - "-DENABLE_SYSTEM_JSONCPP=1" - - # Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_DATADIR=share" - "-DCMAKE_INSTALL_DOCDIR=share/doc" - "-DCMAKE_INSTALL_DOCDIR=share/doc" - "-DCMAKE_INSTALL_MANDIR=share/man" - "-DCMAKE_INSTALL_LOCALEDIR=share/locale" - - ] ++ optionals buildServer [ - "-DENABLE_PROMETHEUS=1" - ] ++ optionals withTouchSupport [ - "-DENABLE_TOUCH=TRUE" - ]; - - env.NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 - - nativeBuildInputs = [ cmake doxygen graphviz ninja ]; - - buildInputs = [ - irrlichtmtInput jsoncpp gettext freetype sqlite curl bzip2 ncurses - gmp libspatialindex - ] ++ [ (if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1) ] ++ [ - ] ++ optionals stdenv.isDarwin [ - libiconv OpenGL OpenAL Carbon Cocoa - ] ++ optionals buildClient [ - libpng libjpeg libGLU openal libogg libvorbis xorg.libX11 - ] ++ optionals buildServer [ - leveldb postgresql hiredis prometheus-cpp - ]; - - postPatch = '' - substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm" - '' + lib.optionalString stdenv.isDarwin '' - sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt - ''; - - postInstall = lib.optionalString stdenv.isLinux '' - mkdir -pv $out/share/minetest/games/minetest_game/ - cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ - patchShebangs $out - '' + lib.optionalString stdenv.isDarwin '' - mkdir -p $out/Applications - mv $out/minetest.app $out/Applications - ''; - - meta = with lib; { - homepage = "http://minetest.net/"; - description = "Infinite-world block sandbox game"; - license = licenses.lgpl21Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ pyrolagus fpletz fgaz ]; - }; + src = fetchFromGitHub { + owner = "minetest"; + repo = "minetest"; + rev = finalAttrs.version; + hash = "sha256-Oct8nQORSH8PjYs+gHU9QrKObMfapjAlGvycj+AJnOs="; }; - v5 = { - version = "5.7.0"; - sha256 = "sha256-9AL6gTmy05yTeYfCq3EMK4gqpBWdHwvJ5Flpzj8hFAE="; - dataSha256 = "sha256-wWgeO8513N5jQdWvZrq357fPpAU5ik06mgZraWCQawo="; + cmakeFlags = [ + (lib.cmakeBool "BUILD_CLIENT" buildClient) + (lib.cmakeBool "BUILD_SERVER" buildServer) + (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer) + (lib.cmakeBool "ENABLE_TOUCH" withTouchSupport) + # Ensure we use system libraries + (lib.cmakeBool "ENABLE_SYSTEM_GMP" true) + (lib.cmakeBool "ENABLE_SYSTEM_JSONCPP" true) + # Updates are handled by nix anyway + (lib.cmakeBool "ENABLE_UPDATE_CHECKER" false) + # ...but make it clear that this is a nix package + (lib.cmakeFeature "VERSION_EXTRA" "NixOS") + + # Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "share") + (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/doc/minetest") + (lib.cmakeFeature "CMAKE_INSTALL_MANDIR" "share/man") + (lib.cmakeFeature "CMAKE_INSTALL_LOCALEDIR" "share/locale") + + ]; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + ninja + ]; + + buildInputs = [ + irrlichtmt + jsoncpp + gettext + freetype + sqlite + curl + bzip2 + ncurses + gmp + libspatialindex + ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit + ++ lib.optionals stdenv.isDarwin [ + libiconv + OpenGL + OpenAL + Carbon + Cocoa + ] ++ lib.optionals buildClient [ + libpng + libjpeg + libGLU + openal + libogg + libvorbis + xorg.libX11 + ] ++ lib.optionals buildServer [ + leveldb + postgresql + hiredis + prometheus-cpp + ]; + + postPatch = '' + substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm" + '' + lib.optionalString stdenv.isDarwin '' + sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt + ''; + + postInstall = lib.optionalString stdenv.isLinux '' + patchShebangs $out + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/minetest.app $out/Applications + ''; + + meta = with lib; { + homepage = "https://minetest.net/"; + description = "Infinite-world block sandbox game"; + license = licenses.lgpl21Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ pyrolagus fpletz fgaz ]; }; - - mkClient = version: generic (version // { buildClient = true; buildServer = false; }); - mkServer = version: generic (version // { buildClient = false; buildServer = true; }); -in { - minetestclient_5 = mkClient v5; - minetestserver_5 = mkServer v5; -} +}) diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 1928982952575..fae719b736f5d 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "naev"; - version = "0.10.6"; + version = "0.11.0"; src = fetchFromGitHub { owner = "naev"; repo = "naev"; rev = "v${version}"; - sha256 = "sha256-nUQhpKl1aIsoJZtQGyHuwPhRBeb7nSs6+MfmTtX17mY="; + sha256 = "sha256-JTXZzxjfnD3OKZq1wms9bPwIBXyu9FuZB6hvH7HwvRI="; fetchSubmodules = true; }; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index 4b526975349b1..2249ab213a220 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config +{ lib, stdenv, fetchurl, fetchDebianPatch, fetchpatch, cmake, pkg-config , SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal -, freealut, readline, gcc-unwrapped +, freealut, readline, libb2, gcc-unwrapped , enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther }: @@ -18,6 +18,21 @@ in stdenv.mkDerivation rec { sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik"; }; + patches = [ + (fetchDebianPatch { + pname = "openclonk"; + version = "8.1"; + debianRevision = "3"; + patch = "system-libb2.patch"; + hash = "sha256-zuH6zxSQXRhnt75092Xwb6XYv8UG391E5Arbnr7ApiI="; + }) + (fetchpatch { + name = "fix-gcc-11-build.patch"; + url = "https://github.com/openclonk/openclonk/commit/e304efde2c8643bbc0fc1ad5e85024982744b233.patch"; + hash = "sha256-jfVCgeZuYo4x53zhljKcnMDMIBECTRsUSxkl6JaL6HA="; + }) + ]; + postInstall = '' mv -v $out/games/openclonk $out/bin/ '' + lib.optionalString enableSoundtrack '' @@ -28,7 +43,7 @@ in stdenv.mkDerivation rec { buildInputs = [ SDL2 libvorbis libogg libjpeg libpng freetype glew tinyxml openal freealut - readline + readline libb2 ]; cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ]; @@ -39,8 +54,8 @@ in stdenv.mkDerivation rec { description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings"; homepage = "https://www.openclonk.org"; license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc; + mainProgram = "openclonk"; maintainers = with maintainers; [ lheckemann ]; platforms = [ "x86_64-linux" "i686-linux" ]; - broken = true; }; } diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index 16f1b122ec8df..e042e9d295eb7 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2023.1130.0"; + version = "2023.1229.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-7lQVc517QEtQDdSF5FxR+kgw1TVpr8H3whzURelABIY="; + hash = "sha256-aZp8pVeCxmaAyWYnBg7w8sPMXy+L2UGRk3NvG/VsxYI="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-BOpW8QP4TLKzdTDnjjT/t4k+3Q2w2MWA0IDnXH+/mBU="; + hash = "sha256-Xle/WcWg+lYA+DxQmE4Kzn1pJTa+HrM13utXqdK8ZZY="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-dQuyKjCZaIl3uaI81qRMt5NzBxfmyROVbJrVAqzuZxg="; + hash = "sha256-lRdRPwa6xix5Nvt3szPeposmqU8D826iFmE6S1uPBF8="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); @@ -35,7 +35,7 @@ let unfreeRedistributable # osu-framework contains libbass.so in repository ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ delan spacefault stepbrobd ]; + maintainers = with lib.maintainers; [ delan gepbird spacefault stepbrobd ]; mainProgram = "osu!"; platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index bc206ef014046..9949a2ee9f0fa 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2023.1026.0"; + version = "2023.1229.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-kbi4Um1MRctpwD7ndlcB+K7AxDbWHqAHmkJbEI0fNzI="; + hash = "sha256-2GcPV6UHnNdToXfLs2+i3XNwE6Ymaj2bqNb5EePE3kM="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; @@ -83,7 +83,7 @@ buildDotnetModule rec { cc-by-nc-40 unfreeRedistributable # osu-framework contains libbass.so in repository ]; - maintainers = with maintainers; [ thiagokokada ]; + maintainers = with maintainers; [ gepbird thiagokokada ]; platforms = [ "x86_64-linux" ]; mainProgram = "osu!"; }; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 740a1d289ab78..8a67a1d16171e 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -3,7 +3,7 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AutoMapper"; version = "12.0.1"; sha256 = "0s0wjl4ck3sal8a50x786wxs9mbca7bxaqk3558yx5wpld4h4z3b"; }) - (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.9.42"; sha256 = "1xxrr9jmgn343d467nz40569mkybinnmxaxyc4fhgy6yddvzk1y0"; }) + (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.10.2"; sha256 = "1kkvpflwmsr65blw22i8gn0bjzq7vvlndm4qa3qdiimckjsifa35"; }) (fetchNuGet { pname = "CodeFileSanity"; version = "0.0.37"; sha256 = "03ja3g66lb0smjmkr3yf28h7fy52wwbdnf6p268zfla3azh006pq"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; }) @@ -126,22 +126,23 @@ (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "NVika"; version = "2.2.0"; sha256 = "1lxv5m5nf4hfwfdhcscrl8m0hhjkqxxn555wxwb95x0d5w2czx6x"; }) - (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.3"; sha256 = "1ac4s2422gyfmi5b2znn6i9j5p3w3w2jjng7g9lzh1mfgad3wfc2"; }) - (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.3"; sha256 = "176lj975yz2m34dzhjjawnsca4vviaayvmqinh6vsss6v1084fws"; }) - (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.3"; sha256 = "0dd37qfh6mxsf13bfnywy5ni17wvy6g419ksc4ga3ljv0zhrbpfz"; }) - (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.3"; sha256 = "0pq43y1zlx4a0lidav1w6jsywvwc4z3aaq4w53w68cqf855k4wv9"; }) + (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.4"; sha256 = "14wc2rgnbi2ili6sx9iqnmcbn1zlmbsk49zbiz5cycib6rxkqfdm"; }) + (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.4"; sha256 = "0l7vf607i54y1xilr7bmjy9zlxacm00wz42mfbvzjf9rr54sy2pm"; }) + (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.4"; sha256 = "1jsw2kwxxskwppk65i52yrxjjgbfbhicpmz30iaxlm68d5m6gwz2"; }) + (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.4"; sha256 = "0lbd80yddsy7wqjw014kvj9an49h2rbgd9s86ifq38dyin5r2czn"; }) (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; }) - (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2023.712.0"; sha256 = "064qrrlhhfx18mmrxqhq06d0sdhzzpqxjgc3znpflqh5j1l4j4m1"; }) - (fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2023.712.0"; sha256 = "1zs9ky53faxqhf6hx1pvnnni79dil8m7f8w4yh9if306bnllnwl4"; }) + (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2023.1117.0"; sha256 = "04q65q27nzjq0fmv8p62r5lmhzdbpfk6y65fxqmfmm7qz2wkiy27"; }) + (fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2023.1117.0"; sha256 = "1yr0r628x5aaa1vqxpkr9ys1xnf4qnz6ypggms6v4a336gjz2734"; }) (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.1012.0"; sha256 = "1fx69kqgyb60widy44nyr5clw3y8l33vrivfddchm6ywmpbbdgaw"; }) - (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1004.1-nativelibs"; sha256 = "0kwap1zc26c2p106i4dl724g9kmk1qn0jzi6pvlc9bn348v42nmy"; }) + (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; sha256 = "0h2ncf59sza8whvrwwqi8b6fcrkqrnfgfhd0vnhyw0s98nj74f0z"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.1227.1"; sha256 = "1jx40963xr1wsbx09n7aq9i86wa33qm932159wp0nhbk6iqwafix"; }) + (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1225.0-nativelibs"; sha256 = "008kj91i9486ff2q7fcgb8mmpinskvnmfsqza2m5vafh295y3h7m"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.1023.0"; sha256 = "1q7w5ivi8pyvz3jkm48ddfj738grd4hmynfhp39a9hfmm0i9nnvj"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.1228.0"; sha256 = "09qjfavp71nlzyl6fqgpjfpsilii2fbsjyjggdbq9hf9i49hwz7s"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) - (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.671-alpha"; sha256 = "1yzakyp0wwayd9k2wmmfklmpvhig0skqk6sn98axpfgnq4hxhllm"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.693-alpha"; sha256 = "15fgd3j9cs3adldiscqm0ffixf68h06wqdz1xy1286z4gczhi954"; }) (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g91ce5a6cda"; sha256 = "0m96jkagz1ab3jgmz61d4z7jrxz058nzsamvqz93c90rlw802cvm"; }) (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "14qcrvhpvj3w9nr8fcki0j53qxc8bfgflivr989salh0srnlv764"; }) (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "1gdwk7s9sdvzrqr2rs9j87nvyl7b47b7m6kkhk1mpz6ryq403nsx"; }) @@ -193,8 +194,8 @@ (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "Sentry"; version = "3.40.0"; sha256 = "1vijf4dfv842y2567sgs4bx51g7jyqsrmg689nj4nbbf44aay99a"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.31.0"; sha256 = "01az7amjkxjbya5rdcqwxzrh2d3kybf1gsd3617rsxvvxadyra1r"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.33.0"; sha256 = "1j94hfjvkygpp97svv75jay0rmnx9ygg86d5syyahl9hayns4ig9"; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.34.1"; sha256 = "0m02yk97fxafdqg6s8408vqcg1a0wll483sj4ff2m0dnxajffkii"; }) (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; sha256 = "1250z6sa9ghf84czlkzvaysb29c0n229z1f0vh5qls89akrkl7h8"; }) (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; sha256 = "1lmv3jp2g7mgy9j23pd3j0wr3p89qiq8v6c6qxqf688izyni1166"; }) @@ -252,6 +253,7 @@ (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; }) (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) (fetchNuGet { pname = "System.Net.WebSockets.Client"; version = "4.3.2"; sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; }) + (fetchNuGet { pname = "System.Numerics.Tensors"; version = "8.0.0"; sha256 = "0k5zc5msnixpraqiqk6ysva8jymbdj3k0y5fl0wjj9vav38w6x5d"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) @@ -327,4 +329,5 @@ (fetchNuGet { pname = "Vortice.DirectX"; version = "2.4.2"; sha256 = "11yjyvyz922z1ygl8gxmdym3918df12nl7xxry4pdjpl8is33qic"; }) (fetchNuGet { pname = "Vortice.DXGI"; version = "2.4.2"; sha256 = "17vsnm9ca6nqk3f1dfpfvd6i6fp8x8v41bn65rchrzwcv1zzi6pz"; }) (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.4.25"; sha256 = "0vl6g087disxyzskvkbnwym74s47lkza0ly3nk4y0y88zibcggrj"; }) + (fetchNuGet { pname = "ZstdSharp.Port"; version = "0.7.2"; sha256 = "0ngngpjaxy3dnrz3mrfhkw52bp05n1xg4ckzf07yhc81hwzq1yi1"; }) ] diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 1fa07f92ccee2..a889b6f7ea74c 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -2,13 +2,13 @@ let data = stdenv.mkDerivation(finalAttrs: { pname = "path-of-building-data"; - version = "2.34.1"; + version = "2.38.4"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-i6OCW5Vc9/LfNuiaEeelmXiqP7+WdIklRNRcgWb7L1w="; + hash = "sha256-fCKOmP0PxhK2trBA1lyE6kf128FrsuCmBrXMIGTIt0U="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index 72e3027be6b3e..8c284bece1618 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -12,19 +12,19 @@ , copyDesktopItems }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; version = "3.1.45"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-6o6iPDKKqCzt7H0a64HGTvEvwO6hjRh1Drl8o4x+4ew="; }; offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-CXitb/b2tvTfrkFrFv4KP4WdmMg+1sDtC/s2u5ezDfI="; }; @@ -79,11 +79,11 @@ stdenv.mkDerivation rec { dimensions=''${img#favicon-} dimensions=''${dimensions%.png} mkdir -p $out/share/icons/hicolor/$dimensions/apps - cp $img $out/share/icons/hicolor/$dimensions/apps/${pname}.png + cp $img $out/share/icons/hicolor/$dimensions/apps/r2modman.png done ) - makeWrapper '${electron}/bin/electron' "$out/bin/r2modman" \ + makeWrapper '${lib.getExe electron}' "$out/bin/r2modman" \ --inherit-argv0 \ --add-flags "$out/share/r2modman" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" @@ -93,11 +93,11 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { - name = pname; - exec = pname; - icon = pname; - desktopName = pname; - comment = meta.description; + name = "r2modman"; + exec = "r2modman"; + icon = "r2modman"; + desktopName = "r2modman"; + comment = finalAttrs.meta.description; categories = [ "Game" ]; keywords = [ "launcher" "mod manager" "thunderstore" ]; }) @@ -107,12 +107,13 @@ stdenv.mkDerivation rec { rev-prefix = "v"; }; - meta = with lib; { + meta = { + changelog = "https://github.com/ebkr/r2modmanPlus/releases/tag/v${finalAttrs.version}"; description = "Unofficial Thunderstore mod manager"; homepage = "https://github.com/ebkr/r2modmanPlus"; - changelog = "https://github.com/ebkr/r2modmanPlus/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ aidalgol huantian ]; + license = lib.licenses.mit; + mainProgram = "r2modman"; + maintainers = with lib.maintainers; [ aidalgol huantian ]; inherit (electron.meta) platforms; }; -} +}) diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix index 5253d78be5757..6d46b09626f66 100644 --- a/pkgs/games/rare/default.nix +++ b/pkgs/games/rare/default.nix @@ -3,31 +3,36 @@ , buildPythonApplication , qt5 , legendary-gl +, orjson , pypresence , pyqt5 , python , qtawesome , requests +, setuptools , typing-extensions }: buildPythonApplication rec { pname = "rare"; - version = "1.10.3"; + version = "1.10.11"; + pyproject = true; src = fetchFromGitHub { - owner = "Dummerle"; + owner = "RareDevs"; repo = "Rare"; rev = "refs/tags/${version}"; - hash = "sha256-7KER9gCpqjEKikQTVHsvwX6efCb9L0ut6OBjjLBW2tI="; + hash = "sha256-2DtI5iaK4bYdGfIEhPy52WaEqh+IJMZ6qo/348lMnLY="; }; nativeBuildInputs = [ + setuptools qt5.wrapQtAppsHook ]; propagatedBuildInputs = [ legendary-gl + orjson pypresence pyqt5 qtawesome @@ -35,11 +40,6 @@ buildPythonApplication rec { typing-extensions ]; - patches = [ - # Not able to run pythonRelaxDepsHook because of https://github.com/NixOS/nixpkgs/issues/198342 - ./legendary-gl-version.patch - ]; - dontWrapQtApps = true; postInstall = '' @@ -56,9 +56,10 @@ buildPythonApplication rec { meta = with lib; { description = "GUI for Legendary, an Epic Games Launcher open source alternative"; - homepage = "https://github.com/Dummerle/Rare"; + homepage = "https://github.com/RareDevs/Rare"; maintainers = with maintainers; [ wolfangaukang ]; license = licenses.gpl3Only; platforms = platforms.linux; + mainProgram = "rare"; }; } diff --git a/pkgs/games/rare/legendary-gl-version.patch b/pkgs/games/rare/legendary-gl-version.patch deleted file mode 100644 index 1ed9659d2b258..0000000000000 --- a/pkgs/games/rare/legendary-gl-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 2416360..08de818 100644 ---- a/setup.py -+++ b/setup.py -@@ -7,7 +7,7 @@ with open("README.md", "r") as fh: - - requirements = [ - "requests<3.0", -- "legendary-gl==0.20.32", -+ "legendary-gl~=0.20.32", - "setuptools", - "wheel", - "PyQt5", diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index 39df9615154c7..da5451e213765 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -1,28 +1,24 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeDesktopItem, SDL2, SDL2_image, SDL2_mixer, SDL2_net }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, makeDesktopItem +, SDL2 +, SDL2_image +, SDL2_mixer +, SDL2_net +, zlib +}: stdenv.mkDerivation rec { pname = "rocksndiamonds"; - version = "4.1.1.0"; + version = "4.3.8.0"; src = fetchurl { - url = "https://www.artsoft.org/RELEASES/unix/${pname}/rocksndiamonds-${version}.tar.gz"; - sha256 = "1k0m6l5g886d9mwwh6q0gw75qsb85mpf8i0rglh047app56nsk72"; + url = "https://www.artsoft.org/RELEASES/linux/${pname}/${pname}-${version}-linux.tar.gz"; + hash = "sha256-6RHQEcO9/tngZZqSTin74HkZflnRLh+dfvvxczpdcGU="; }; - patches = [ - # Pull upstream fix for -fno-common toolchain. - (fetchpatch { - name = "fno-common-p1.patch"; - url = "https://git.artsoft.org/?p=rocksndiamonds.git;a=patch;h=b4271393b10b7c664a58f3db7349a3875c1676fe"; - sha256 = "0bdy4d2ril917radmm0c2yh2gqfyh7q1c8kahig5xknn2rkf2iac"; - }) - (fetchpatch { - name = "fno-common-p2.patch"; - url = "https://git.artsoft.org/?p=rocksndiamonds.git;a=patch;h=81dbde8a570a94dd2e938eff2f52dc5a3ecced21"; - sha256 = "1mk5yb8pxrpxvvsxw3pjcbgx2c658baq9vmqqipbj5byhkkw7v2l"; - }) - ]; - desktopItem = makeDesktopItem { name = "rocksndiamonds"; exec = "rocksndiamonds"; @@ -33,11 +29,11 @@ stdenv.mkDerivation rec { categories = [ "Game" "LogicGame" ]; }; - buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net zlib ]; preBuild = '' dataDir="$out/share/rocksndiamonds" - makeFlags+="RO_GAME_DIR=$dataDir" + makeFlags+="BASE_PATH=$dataDir" ''; installPhase = '' @@ -47,7 +43,7 @@ stdenv.mkDerivation rec { cp rocksndiamonds $out/bin/ ln -s ${desktopItem}/share/applications/* $appDir/ ln -s $dataDir/graphics/gfx_classic/RocksIcon32x32.png $iconDir/rocksndiamonds.png - cp -r docs graphics levels music sounds $dataDir + cp -r conf docs graphics levels music sounds $dataDir ''; enableParallelBuilding = true; @@ -57,6 +53,6 @@ stdenv.mkDerivation rec { homepage = "https://www.artsoft.org/rocksndiamonds/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ orivej ]; + maintainers = with maintainers; [ orivej xfix ]; }; } diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 9d390292733fc..5f38c4399aa7e 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -11,13 +11,13 @@ maven.buildMavenPackage rec { pname = "runelite"; - version = "2.6.9"; + version = "2.6.12"; src = fetchFromGitHub { owner = "runelite"; repo = "launcher"; rev = version; - hash = "sha256-wU97uiotKZfui0ir7rmO1WLN3G6lTMxqF6vTyrlax1Q="; + hash = "sha256-lovDkEvzclZCBu/Ha8h0j595NZ4ejefEOX7lNmzb8I8="; }; mvnHash = "sha256-iGnoAZcJvaVoACi9ozG/f+A8tjvDuwn22bMRyuUU5Jg="; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 923b69d31cfa0..4d40dcc7686b8 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "scummvm"; repo = "scummvm"; rev = "v${version}"; - hash = "sha256-GVsvLAjb7pECd7uvPT9ubDFMIkiPWdU5owOafxk5iy0="; + hash = "sha256-W8VZuRVpq0WwaCLH0ODcFmqbE7eKLK6nuyB7qrfqkiY="; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 35f92f1457b39..a6d0bb52fb391 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20231025.35f7965"; + version = "20231120.08365fb"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-c9D8lr5V/1BrKQjBsj931uGpnpR5p80CgP0Y/HNc40E="; + hash = "sha256-V4OHkF0i3dnvRXmo2UKItibr4Dr8vG1CX2L2/9mL7p4="; }; sgt-puzzles-menu = fetchurl { diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/games/shattered-pixel-dungeon/generic.nix index 92427674c18af..fdd87ba2bd19b 100644 --- a/pkgs/games/shattered-pixel-dungeon/generic.nix +++ b/pkgs/games/shattered-pixel-dungeon/generic.nix @@ -13,6 +13,7 @@ , gradle , perl , jre +, libGL , libpulseaudio , makeDesktopItem , copyDesktopItems @@ -104,7 +105,7 @@ in stdenv.mkDerivation (cleanAttrs // { install -Dm644 desktop/build/libs/desktop-*.jar $out/share/${pname}.jar mkdir $out/bin makeWrapper ${jre}/bin/java $out/bin/${pname} \ - --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libpulseaudio ]} \ --add-flags "-jar $out/share/${pname}.jar" for s in 16 32 48 64 128 256; do diff --git a/pkgs/games/shipwright/default.nix b/pkgs/games/shipwright/default.nix index 182e2cf654aef..47487e7f70242 100644 --- a/pkgs/games/shipwright/default.nix +++ b/pkgs/games/shipwright/default.nix @@ -95,13 +95,13 @@ assert (lib.assertMsg (oot.enable || ootMq.enable) "At least one of 'oot.enable' stdenv.mkDerivation rec { pname = "shipwright"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "harbourmasters"; repo = "shipwright"; rev = version; - hash = "sha256-2VCcczGWSvp6hk8FTA1/T1E1KkrrvWyOdkEw8eiYYnY="; + hash = "sha256-zgxJj65wKsQWvVxeCspyHG9YqoYqZxd6GrYptOA8Byk="; fetchSubmodules = true; }; @@ -137,12 +137,6 @@ stdenv.mkDerivation rec { libpng ]; - patches = [ - # These patches make soh look inside the nix store for data files (the controller database and the OTRs) - ./lus-install-paths.patch - ./soh-misc-otr-patches.patch - ]; - cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib" ]; diff --git a/pkgs/games/shipwright/lus-install-paths.patch b/pkgs/games/shipwright/lus-install-paths.patch deleted file mode 100644 index c14ecccfed0f5..0000000000000 --- a/pkgs/games/shipwright/lus-install-paths.patch +++ /dev/null @@ -1,146 +0,0 @@ -Submodule libultraship contains modified content -diff --git a/libultraship/src/CMakeLists.txt b/libultraship/src/CMakeLists.txt -index f95c3c9..5b967b9 100644 ---- a/libultraship/src/CMakeLists.txt -+++ b/libultraship/src/CMakeLists.txt -@@ -74,7 +74,10 @@ target_sources(libultraship PRIVATE ${Source_Files__Controller}) - - #=================== Core =================== - -+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/install_config.h.in ${CMAKE_BINARY_DIR}/install_config.h @ONLY) -+ - set(Source_Files__Core -+ ${CMAKE_BINARY_DIR}/install_config.h - ${CMAKE_CURRENT_SOURCE_DIR}/core/Window.h - ${CMAKE_CURRENT_SOURCE_DIR}/core/Window.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/core/ConsoleVariable.h -@@ -329,7 +332,7 @@ endif() - #=================== Packages & Includes =================== - - target_include_directories(libultraship -- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../extern -+ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../extern ${CMAKE_BINARY_DIR} - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../extern/spdlog/include ${CMAKE_CURRENT_SOURCE_DIR}/../extern/stb - ) - -diff --git a/libultraship/src/core/Context.cpp b/libultraship/src/core/Context.cpp -index 776333e..fa546e6 100644 ---- a/libultraship/src/core/Context.cpp -+++ b/libultraship/src/core/Context.cpp -@@ -14,6 +14,7 @@ - #elif defined(__WIIU__) - #include "port/wiiu/WiiUImpl.h" - #endif -+#include "install_config.h" - - namespace LUS { - std::weak_ptr<Context> Context::mContext; -@@ -281,6 +282,18 @@ std::string Context::GetShortName() { - } - - std::string Context::GetAppBundlePath() { -+#ifdef CMAKE_INSTALL_PREFIX -+ static const std::string fpath = CMAKE_INSTALL_PREFIX; -+ static int exists = -1; -+ -+ if (exists == -1) { -+ exists = fpath.size() > 0 && std::filesystem::is_directory(fpath); -+ } -+ -+ if (exists) { -+ return fpath; -+ } -+#else - #ifdef __APPLE__ - FolderManager folderManager; - return folderManager.getMainBundlePath(); -@@ -291,6 +304,7 @@ std::string Context::GetAppBundlePath() { - if (fpath != NULL) { - return std::string(fpath); - } -+#endif - #endif - - return "."; -@@ -304,6 +318,13 @@ std::string Context::GetAppDirectoryPath() { - } - #endif - -+ char *prefpath = SDL_GetPrefPath(NULL, "soh"); -+ if (prefpath != NULL) { -+ std::string ret(prefpath); -+ SDL_free(prefpath); -+ return ret; -+ } -+ - return "."; - } - -@@ -315,7 +336,24 @@ std::string Context::GetPathRelativeToAppDirectory(const char* path) { - return GetAppDirectoryPath() + "/" + path; - } - -+std::string Context::FindFileFromAllAppDirectories(const char* path) { -+ std::string fpath; -+ -+ // app configuration dir (eg. ~/.local/share) -+ fpath = GetPathRelativeToAppDirectory(path); -+ if (std::filesystem::exists(fpath)) { -+ return fpath; -+ } -+ // app install dir (eg. /usr/) -+ fpath = GetPathRelativeToAppBundle(path); -+ if (std::filesystem::exists(fpath)) { -+ return fpath; -+ } -+ // current dir -+ return "./" + std::string(path); -+} -+ - bool Context::DoesOtrFileExist() { - return mOtrFileExists; - } --} // namespace LUS -\ No newline at end of file -+} // namespace LUS -diff --git a/libultraship/src/core/Context.h b/libultraship/src/core/Context.h -index c32f4dd..a9f1639 100644 ---- a/libultraship/src/core/Context.h -+++ b/libultraship/src/core/Context.h -@@ -26,6 +26,7 @@ class Context { - static std::string GetAppDirectoryPath(); - static std::string GetPathRelativeToAppDirectory(const char* path); - static std::string GetPathRelativeToAppBundle(const char* path); -+ static std::string FindFileFromAllAppDirectories(const char* path); - - Context(std::string name, std::string shortName); - -diff --git a/libultraship/src/core/libultra/os.cpp b/libultraship/src/core/libultra/os.cpp -index 9058fe1..7d9387e 100644 ---- a/libultraship/src/core/libultra/os.cpp -+++ b/libultraship/src/core/libultra/os.cpp -@@ -21,8 +21,8 @@ int32_t osContInit(OSMesgQueue* mq, uint8_t* controllerBits, OSContStatus* statu - } - - #ifndef __SWITCH__ -- const char* controllerDb = "gamecontrollerdb.txt"; -- int mappingsAdded = SDL_GameControllerAddMappingsFromFile(controllerDb); -+ std::string controllerDb = LUS::Context::GetPathRelativeToAppBundle("gamecontrollerdb.txt"); -+ int mappingsAdded = SDL_GameControllerAddMappingsFromFile(controllerDb.c_str()); - if (mappingsAdded >= 0) { - SPDLOG_INFO("Added SDL game controllers from \"{}\" ({})", controllerDb, mappingsAdded); - } else { -@@ -90,4 +90,4 @@ int32_t osRecvMesg(OSMesgQueue* mq, OSMesg* msg, int32_t flag) { - mq->validCount--; - return 0; - } --} -\ No newline at end of file -+} -diff --git a/libultraship/src/install_config.h.in b/libultraship/src/install_config.h.in -new file mode 100644 -index 0000000..029753c ---- /dev/null -+++ b/libultraship/src/install_config.h.in -@@ -0,0 +1 @@ -+#cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" diff --git a/pkgs/games/shipwright/soh-misc-otr-patches.patch b/pkgs/games/shipwright/soh-misc-otr-patches.patch deleted file mode 100644 index 2be31092e2851..0000000000000 --- a/pkgs/games/shipwright/soh-misc-otr-patches.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/soh/soh/Extractor/Extract.cpp b/soh/soh/Extractor/Extract.cpp -index a9ddc4f4..f6d45fe2 100644 ---- a/soh/soh/Extractor/Extract.cpp -+++ b/soh/soh/Extractor/Extract.cpp -@@ -490,28 +490,27 @@ const char* Extractor::GetZapdVerStr() const { - - extern "C" int zapd_main(int argc, char** argv); - --bool Extractor::CallZapd() { -+bool Extractor::CallZapd(std::string &assetPath) { - constexpr int argc = 16; -- char xmlPath[100]; -- char confPath[100]; - std::array<const char*, argc> argv; - const char* version = GetZapdVerStr(); - -- snprintf(xmlPath, 100, "assets/extractor/xmls/%s", version); -- snprintf(confPath, 100, "assets/extractor/Config_%s.xml", version); -+ std::string xmlPath = assetPath + "/assets/extractor/xmls/" + version; -+ std::string confPath = assetPath + "/assets/extractor/Config_" + version + ".xml"; -+ std::string fileListsPath = assetPath + "/assets/extractor/filelists"; - - argv[0] = "ZAPD"; - argv[1] = "ed"; - argv[2] = "-i"; -- argv[3] = xmlPath; -+ argv[3] = xmlPath.c_str(); - argv[4] = "-b"; - argv[5] = mCurrentRomPath.c_str(); - argv[6] = "-fl"; -- argv[7] = "assets/extractor/filelists"; -+ argv[7] = fileListsPath.c_str(); - argv[8] = "-gsf"; -- argv[9] = "1"; -+ argv[9] = "0"; - argv[10] = "-rconf"; -- argv[11] = confPath; -+ argv[11] = confPath.c_str(); - argv[12] = "-se"; - argv[13] = "OTR"; - argv[14] = "--otrfile"; -diff --git a/soh/soh/Extractor/Extract.h b/soh/soh/Extractor/Extract.h -index e4eb2e5b..3c95b025 100644 ---- a/soh/soh/Extractor/Extract.h -+++ b/soh/soh/Extractor/Extract.h -@@ -57,7 +57,7 @@ class Extractor { - bool IsMasterQuest() const; - - bool Run(RomSearchMode searchMode = RomSearchMode::Both); -- bool CallZapd(); -+ bool CallZapd(std::string& assetPath); - const char* GetZapdStr(); - }; - #endif -diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp -index d192de6a..cc516085 100644 ---- a/soh/soh/OTRGlobals.cpp -+++ b/soh/soh/OTRGlobals.cpp -@@ -201,11 +201,11 @@ const char* constCameraStrings[] = { - - OTRGlobals::OTRGlobals() { - std::vector<std::string> OTRFiles; -- std::string mqPath = LUS::Context::GetPathRelativeToAppDirectory("oot-mq.otr"); -+ std::string mqPath = LUS::Context::FindFileFromAllAppDirectories("oot-mq.otr"); - if (std::filesystem::exists(mqPath)) { - OTRFiles.push_back(mqPath); - } -- std::string ootPath = LUS::Context::GetPathRelativeToAppDirectory("oot.otr"); -+ std::string ootPath = LUS::Context::FindFileFromAllAppDirectories("oot.otr"); - if (std::filesystem::exists(ootPath)) { - OTRFiles.push_back(ootPath); - } -@@ -213,7 +213,7 @@ OTRGlobals::OTRGlobals() { - if (std::filesystem::exists(sohOtrPath)) { - OTRFiles.push_back(sohOtrPath); - } -- std::string patchesPath = LUS::Context::GetPathRelativeToAppDirectory("mods"); -+ std::string patchesPath = LUS::Context::FindFileFromAllAppDirectories("mods"); - if (patchesPath.length() > 0 && std::filesystem::exists(patchesPath)) { - if (std::filesystem::is_directory(patchesPath)) { - for (const auto& p : std::filesystem::recursive_directory_iterator(patchesPath)) { -@@ -709,8 +709,10 @@ extern "C" void OTRExtScanner() { - - extern "C" void InitOTR() { - #if not defined (__SWITCH__) && not defined(__WIIU__) -- if (!std::filesystem::exists(LUS::Context::GetPathRelativeToAppDirectory("oot-mq.otr")) && -- !std::filesystem::exists(LUS::Context::GetPathRelativeToAppDirectory("oot.otr"))){ -+ if (!std::filesystem::exists(LUS::Context::FindFileFromAllAppDirectories("oot-mq.otr")) && -+ !std::filesystem::exists(LUS::Context::FindFileFromAllAppDirectories("oot.otr"))){ -+ std::string exporterAssetPath = LUS::Context::GetAppBundlePath(); -+ - bool generatedOtrIsMQ = false; - if (Extractor::ShowYesNoBox("No OTR Files", "No OTR files found. Generate one now?") == IDYES) { - Extractor extract; -@@ -718,7 +720,7 @@ extern "C" void InitOTR() { - Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated. Exiting..."); - exit(1); - } -- extract.CallZapd(); -+ extract.CallZapd(exporterAssetPath); - generatedOtrIsMQ = extract.IsMasterQuest(); - } else { - exit(1); -@@ -728,7 +730,7 @@ extern "C" void InitOTR() { - if (!extract.Run(generatedOtrIsMQ ? RomSearchMode::Vanilla : RomSearchMode::MQ)) { - Extractor::ShowErrorBox("Error", "An error occured, an OTR file may have been generated by a different step. Continuing..."); - } else { -- extract.CallZapd(); -+ extract.CallZapd(exporterAssetPath); - } - } - } -@@ -2018,4 +2020,4 @@ extern "C" void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* repla - - extern "C" void SaveManager_ThreadPoolWait() { - SaveManager::Instance->ThreadPoolWait(); --} -\ No newline at end of file -+} diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 8ba5087ef7fe7..d5b266cece376 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -3,11 +3,17 @@ , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs , extraProfile ? "" # string to append to profile -, extraBwrapArgs ? [ ] # extra arguments to pass to bubblewrap +, extraPreBwrapCmds ? "" # extra commands to run before calling bubblewrap (real default is at usage site) +, extraBwrapArgs ? [ ] # extra arguments to pass to bubblewrap (real default is at usage site) , extraArgs ? "" # arguments to always pass to steam , extraEnv ? { } # Environment variables to pass to Steam + +# steamwebhelper deletes unrelated electron programs' singleton cookies from /tmp on startup: +# https://github.com/ValveSoftware/steam-for-linux/issues/9121 +, privateTmp ? true # Whether to separate steam's /tmp from the host system + , withGameSpecificLibraries ? true # include game specific libraries -}: +}@args: let commonTargetPkgs = pkgs: with pkgs; [ @@ -16,6 +22,8 @@ let lsb-release # Errors in output without those pciutils + # run.sh wants ldconfig + glibc.bin # Games' dependencies xorg.xrandr which @@ -57,7 +65,10 @@ let fi ''; - envScript = lib.toShellVars extraEnv; + envScript = '' + # prevents various error messages + unset GIO_EXTRA_MODULES + '' + lib.toShellVars extraEnv; in buildFHSEnv rec { name = "steam"; @@ -279,7 +290,15 @@ in buildFHSEnv rec { exec steam ${extraArgs} "$@" ''; - inherit extraBwrapArgs; + inherit privateTmp; + + extraPreBwrapCmds = '' + install -m 1777 -d /tmp/dumps + '' + args.extraPreBwrapCmds or ""; + + extraBwrapArgs = [ + "--bind-try /tmp/dumps /tmp/dumps" + ] ++ args.extraBwrapArgs or []; meta = if steam != null diff --git a/pkgs/games/stepmania/0001-fix-build-with-ffmpeg-4.patch b/pkgs/games/stepmania/0001-fix-build-with-ffmpeg-4.patch deleted file mode 100644 index 65686f5546c49..0000000000000 --- a/pkgs/games/stepmania/0001-fix-build-with-ffmpeg-4.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 33d928c54f4b35f8877cacd1e2c77b68b4dddc06 Mon Sep 17 00:00:00 2001 -From: Zane van Iperen <zane@zanevaniperen.com> -Date: Sun, 7 Nov 2021 15:46:37 +1000 -Subject: [PATCH] fix build with ffmpeg 4 - ---- - src/arch/MovieTexture/MovieTexture_FFMpeg.cpp | 5 +---- - src/arch/MovieTexture/MovieTexture_FFMpeg.h | 22 +++++++++---------- - 2 files changed, 12 insertions(+), 15 deletions(-) - -diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp -index bdf2356..f79fea2 100644 ---- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp -+++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp -@@ -445,7 +445,7 @@ RString MovieDecoder_FFMpeg::Open( RString sFile ) - return "Couldn't find any video streams"; - m_pStream = m_fctx->streams[stream_idx]; - -- if( m_pStream->codec->codec_id == avcodec::CODEC_ID_NONE ) -+ if( m_pStream->codec->codec_id == avcodec::AV_CODEC_ID_NONE ) - return ssprintf( "Unsupported codec %08x", m_pStream->codec->codec_tag ); - - RString sError = OpenCodec(); -@@ -474,9 +474,6 @@ RString MovieDecoder_FFMpeg::OpenCodec() - m_pStream->codec->idct_algo = FF_IDCT_AUTO; - m_pStream->codec->error_concealment = 3; - -- if( pCodec->capabilities & CODEC_CAP_DR1 ) -- m_pStream->codec->flags |= CODEC_FLAG_EMU_EDGE; -- - LOG->Trace("Opening codec %s", pCodec->name ); - - int ret = avcodec::avcodec_open2( m_pStream->codec, pCodec, NULL ); -diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.h b/src/arch/MovieTexture/MovieTexture_FFMpeg.h -index f4d25ef..32564e5 100644 ---- a/src/arch/MovieTexture/MovieTexture_FFMpeg.h -+++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.h -@@ -64,7 +64,7 @@ private: - - avcodec::AVStream *m_pStream; - avcodec::AVFrame *m_Frame; -- avcodec::PixelFormat m_AVTexfmt; /* PixelFormat of output surface */ -+ avcodec::AVPixelFormat m_AVTexfmt; /* PixelFormat of output surface */ - avcodec::SwsContext *m_swsctx; - - avcodec::AVFormatContext *m_fctx; -@@ -90,7 +90,7 @@ static struct AVPixelFormat_t - { - int bpp; - uint32_t masks[4]; -- avcodec::PixelFormat pf; -+ avcodec::AVPixelFormat pf; - bool bHighColor; - bool bByteSwapOnLittleEndian; - MovieDecoderPixelFormatYCbCr YUV; -@@ -101,7 +101,7 @@ static struct AVPixelFormat_t - 0x00FF0000, - 0x0000FF00, - 0x000000FF }, -- avcodec::PIX_FMT_YUYV422, -+ avcodec::AV_PIX_FMT_YUYV422, - false, /* N/A */ - true, - PixelFormatYCbCr_YUYV422, -@@ -112,7 +112,7 @@ static struct AVPixelFormat_t - 0x00FF0000, - 0xFF000000, - 0x000000FF }, -- avcodec::PIX_FMT_BGRA, -+ avcodec::AV_PIX_FMT_BGRA, - true, - true, - PixelFormatYCbCr_Invalid, -@@ -123,7 +123,7 @@ static struct AVPixelFormat_t - 0x0000FF00, - 0x000000FF, - 0xFF000000 }, -- avcodec::PIX_FMT_ARGB, -+ avcodec::AV_PIX_FMT_ARGB, - true, - true, - PixelFormatYCbCr_Invalid, -@@ -135,7 +135,7 @@ static struct AVPixelFormat_t - 0x0000FF00, - 0x00FF0000, - 0xFF000000 }, -- avcodec::PIX_FMT_ABGR, -+ avcodec::AV_PIX_FMT_ABGR, - true, - true, - PixelFormatYCbCr_Invalid, -@@ -146,7 +146,7 @@ static struct AVPixelFormat_t - 0x00FF0000, - 0x0000FF00, - 0x000000FF }, -- avcodec::PIX_FMT_RGBA, -+ avcodec::AV_PIX_FMT_RGBA, - true, - true, - PixelFormatYCbCr_Invalid, -@@ -157,7 +157,7 @@ static struct AVPixelFormat_t - 0x00FF00, - 0x0000FF, - 0x000000 }, -- avcodec::PIX_FMT_RGB24, -+ avcodec::AV_PIX_FMT_RGB24, - true, - true, - PixelFormatYCbCr_Invalid, -@@ -168,7 +168,7 @@ static struct AVPixelFormat_t - 0x00FF00, - 0xFF0000, - 0x000000 }, -- avcodec::PIX_FMT_BGR24, -+ avcodec::AV_PIX_FMT_BGR24, - true, - true, - PixelFormatYCbCr_Invalid, -@@ -179,12 +179,12 @@ static struct AVPixelFormat_t - 0x03E0, - 0x001F, - 0x0000 }, -- avcodec::PIX_FMT_RGB555, -+ avcodec::AV_PIX_FMT_RGB555, - false, - false, - PixelFormatYCbCr_Invalid, - }, -- { 0, { 0,0,0,0 }, avcodec::PIX_FMT_NB, true, false, PixelFormatYCbCr_Invalid } -+ { 0, { 0,0,0,0 }, avcodec::AV_PIX_FMT_NB, true, false, PixelFormatYCbCr_Invalid } - }; - - #endif --- -2.31.1 - diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 65b9bfff189e1..bfd871a2a1c14 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,21 +1,40 @@ -{ stdenv, lib, fetchFromGitHub, cmake, nasm -, gtk2, glib, ffmpeg_4, alsa-lib, libmad, libogg, libvorbis -, glew, libpulseaudio, udev +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, nasm +, alsa-lib +, ffmpeg_6 +, glew +, glib +, gtk2 +, libmad +, libogg +, libpulseaudio +, libvorbis +, udev +, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stepmania"; - version = "5.1.0-b2"; + version = "5.1.0-b2-unstable-2022-11-14"; src = fetchFromGitHub { owner = "stepmania"; repo = "stepmania"; - rev = "v${version}"; - sha256 = "0a7y9l7xm510vgnpmj1is7p9m6d6yd0fcaxrjcickz295k5w3rdn"; + rev = "d55acb1ba26f1c5b5e3048d6d6c0bd116625216f"; + hash = "sha256-49H2Q61R4l/G0fWsjCjiAUXeWwG3lcsDpV5XvR3l3QE="; }; patches = [ - ./0001-fix-build-with-ffmpeg-4.patch + # https://github.com/stepmania/stepmania/pull/2247 + (fetchpatch { + name = "fix-building-with-ffmpeg6.patch"; + url = "https://github.com/stepmania/stepmania/commit/3fef5ef60b7674d6431f4e1e4ba8c69b0c21c023.patch"; + hash = "sha256-m+5sP+mIpcSjioRBdzChqja5zwNcwdSNAfvSJ2Lww+g="; + }) ]; postPatch = '' @@ -25,8 +44,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ]; buildInputs = [ - gtk2 glib ffmpeg_4 alsa-lib libmad libogg libvorbis - glew libpulseaudio udev + alsa-lib + ffmpeg_6 + glew + glib + gtk2 + libmad + libogg + libpulseaudio + libvorbis + udev + xorg.libXtst ]; cmakeFlags = [ @@ -38,6 +66,11 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/bin ln -s $out/stepmania-5.1/stepmania $out/bin/stepmania + + mkdir -p $out/share/ + cp -r $src/icons $out/share/ + + install -Dm444 $src/stepmania.desktop -t $out/share/applications ''; meta = with lib; { @@ -45,7 +78,7 @@ stdenv.mkDerivation rec { description = "Free dance and rhythm game for Windows, Mac, and Linux"; platforms = platforms.linux; license = licenses.mit; # expat version - maintainers = [ ]; + maintainers = with maintainers; [ h7x4 ]; # never built on aarch64-linux since first introduction in nixpkgs broken = stdenv.isLinux && stdenv.isAarch64; mainProgram = "stepmania"; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index bec2b9bc7aa79..30e4833d06667 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsa-lib +{ fetchFromGitHub, fetchpatch, lib, stdenv, cmake, pkg-config, python3, alsa-lib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils , nixosTests , Cocoa @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { # Can't use fetchpatch or fetchpatch2 because of https://github.com/NixOS/nixpkgs/issues/32084 # Using fetchurl instead is also not a good idea, see https://github.com/NixOS/nixpkgs/issues/32084#issuecomment-727223713 ./rename-VERSION-to-VERSION.txt.patch + (fetchpatch { + name = "CVE-2021-43518.patch"; + url = "https://salsa.debian.org/games-team/teeworlds/-/raw/a6c4b23c1ce73466e6d89bccbede70e61e8c9cba/debian/patches/CVE-2021-43518.patch"; + hash = "sha256-2MmsucaaYjqLgMww1492gNmHmvBJm/NED+VV5pZDnBY="; + }) ]; postPatch = '' diff --git a/pkgs/games/tennix/fix_FTBFS.patch b/pkgs/games/tennix/fix_FTBFS.patch deleted file mode 100644 index d58aa3a8129f3..0000000000000 --- a/pkgs/games/tennix/fix_FTBFS.patch +++ /dev/null @@ -1,288 +0,0 @@ -From: Thomas Perl <m@thp.io> -Description: Fix FTBFS -Origin: upstream, https://repo.or.cz/w/tennix.git/commitdiff/6144cb7626dfdc0820a0036af83a531e8e68bae6 -Bug-Debian: https://bugs.debian.org/664907 - ---- tennix-1.1.orig/archivetool.cc -+++ tennix-1.1/archivetool.cc -@@ -24,6 +24,7 @@ - #include <assert.h> - #include <stdio.h> - #include <stdlib.h> -+#include <libgen.h> - #include <sys/stat.h> - - #include "archive.hh" ---- tennix-1.1.orig/game.c -+++ tennix-1.1/game.c -@@ -388,6 +388,9 @@ void step(GameState* s) { - s->ball.move_x = 4.0 + 3.0*PLAYER(s, p).power/PLAYER_POWER_MAX; - s->ball.move_z = 1.1*PLAYER(s, p).power/PLAYER_POWER_MAX; - break; -+ default: -+ assert(false); -+ break; - } - s->ball.move_y = get_move_y( s, p); - s->sound_events ^= SOUND_EVENT_RACKET; ---- tennix-1.1.orig/network.h -+++ tennix-1.1/network.h -@@ -103,19 +103,19 @@ void - net_serialize_ball(const Ball* src, NetworkBall* dest); - - void --net_unserialize_ball(const NetworkBall* src, Ball* dest); -+net_unserialize_ball(NetworkBall* src, Ball* dest); - - void - net_serialize_player(const Player* src, NetworkPlayer* dest); - - void --net_unserialize_player(const NetworkPlayer* src, Player* dest); -+net_unserialize_player(NetworkPlayer* src, Player* dest); - - void - net_serialize_gamestate(const GameState* src, NetworkGameState* dest); - - void --net_unserialize_gamestate(const NetworkGameState* src, GameState* dest); -+net_unserialize_gamestate(NetworkGameState* src, GameState* dest); - - #endif - ---- tennix-1.1.orig/locations.h -+++ tennix-1.1/locations.h -@@ -155,7 +155,7 @@ static Location locations[] = { - #endif - - /* End marker */ -- { NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, false } -+ { NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, false, false, 0, 0 } - }; - - unsigned int location_count() ---- tennix-1.1.orig/tennix.cc -+++ tennix-1.1/tennix.cc -@@ -461,7 +461,7 @@ int main( int argc, char** argv) { - start_fade(); - gameloop(current_game, connection); - SDL_Delay(150); -- while(SDL_PollEvent(&e)); -+ while (SDL_PollEvent(&e)) {}; - #ifdef ENABLE_FPS_LIMIT - frames = 0; - ft = SDL_GetTicks(); ---- tennix-1.1.orig/SDL_rotozoom.c -+++ tennix-1.1/SDL_rotozoom.c -@@ -365,6 +365,9 @@ int zoomSurfaceRGBA(SDL_Surface * src, S - - int zoomSurfaceY(SDL_Surface * src, SDL_Surface * dst, int flipx, int flipy) - { -+ (void)flipx; -+ (void)flipy; -+ - Uint32 x, y, sx, sy, *sax, *say, *csax, *csay, csx, csy; - Uint8 *sp, *dp, *csp; - int dgap; -@@ -393,7 +396,7 @@ int zoomSurfaceY(SDL_Surface * src, SDL_ - */ - csx = 0; - csax = sax; -- for (x = 0; x < dst->w; x++) { -+ for (x = 0; x < (Uint32)dst->w; x++) { - csx += sx; - *csax = (csx >> 16); - csx &= 0xffff; -@@ -401,7 +404,7 @@ int zoomSurfaceY(SDL_Surface * src, SDL_ - } - csy = 0; - csay = say; -- for (y = 0; y < dst->h; y++) { -+ for (y = 0; y < (Uint32)dst->h; y++) { - csy += sy; - *csay = (csy >> 16); - csy &= 0xffff; -@@ -410,13 +413,13 @@ int zoomSurfaceY(SDL_Surface * src, SDL_ - - csx = 0; - csax = sax; -- for (x = 0; x < dst->w; x++) { -+ for (x = 0; x < (Uint32)dst->w; x++) { - csx += (*csax); - csax++; - } - csy = 0; - csay = say; -- for (y = 0; y < dst->h; y++) { -+ for (y = 0; y < (Uint32)dst->h; y++) { - csy += (*csay); - csay++; - } -@@ -432,10 +435,10 @@ int zoomSurfaceY(SDL_Surface * src, SDL_ - * Draw - */ - csay = say; -- for (y = 0; y < dst->h; y++) { -+ for (y = 0; y < (Uint32)dst->h; y++) { - csax = sax; - sp = csp; -- for (x = 0; x < dst->w; x++) { -+ for (x = 0; x < (Uint32)dst->w; x++) { - /* - * Draw - */ -@@ -801,6 +804,8 @@ SDL_Surface* rotateSurface90Degrees(SDL_ - void rotozoomSurfaceSizeTrig(int width, int height, double angle, double zoomx, double zoomy, int *dstwidth, int *dstheight, - double *canglezoom, double *sanglezoom) - { -+ (void)zoomy; -+ - double x, y, cx, cy, sx, sy; - double radangle; - int dstwidthhalf, dstheighthalf; ---- tennix-1.1.orig/network.c -+++ tennix-1.1/network.c -@@ -183,7 +183,7 @@ net_serialize_ball(const Ball* src, Netw - } - - void --net_unserialize_ball(const NetworkBall* src, Ball* dest) -+net_unserialize_ball(NetworkBall* src, Ball* dest) - { - assert(src != NULL && dest != NULL); - dest->x = unpack_float(SDLNet_Read32(&(src->x)), -WIDTH, WIDTH*2); -@@ -213,7 +213,7 @@ net_serialize_player(const Player* src, - } - - void --net_unserialize_player(const NetworkPlayer* src, Player* dest) -+net_unserialize_player(NetworkPlayer* src, Player* dest) - { - assert(src != NULL && dest != NULL); - dest->x = unpack_float(SDLNet_Read32(&(src->x)), 0, WIDTH*1.2); -@@ -221,7 +221,7 @@ net_unserialize_player(const NetworkPlay - dest->power = unpack_float(SDLNet_Read32(&(src->power)), 0, 110); - dest->use_power = src->use_power; - dest->score = src->score; -- dest->desire = src->desire; -+ dest->desire = (PlayerDesire)src->desire; - dest->game = src->game; - memcpy(dest->sets, src->sets, sizeof(unsigned char)*(SETS_TO_WIN*2)); - dest->accelerate = unpack_float(SDLNet_Read32(&(src->accelerate)), 0, 200); -@@ -250,7 +250,7 @@ net_serialize_gamestate(const GameState* - } - - void --net_unserialize_gamestate(const NetworkGameState* src, GameState* dest) -+net_unserialize_gamestate(NetworkGameState* src, GameState* dest) - { - int p; - ---- tennix-1.1.orig/makefile -+++ tennix-1.1/makefile -@@ -27,24 +27,23 @@ ifeq ($(MKCALLGRAPH),1) - LD = nccld - endif - --RELEASE = 1.1 -- --UNAME = $(shell uname) -+RELEASE = 1.1.1 - - PREFIX ?= /usr/local - BINDIR ?= $(PREFIX)/bin - DATAROOTDIR ?= $(PREFIX)/share - DATADIR ?= $(DATAROOTDIR)/games - --LIBS = --CFLAGS += -W -Wall -ansi -pedantic -Wcast-qual -Wwrite-strings -DVERSION=\"$(RELEASE)\" -O2 -DPREFIX=\"$(PREFIX)\" -g -+CFLAGS += -W -Wall -DVERSION=\"$(RELEASE)\" -O2 -DPREFIX=\"$(PREFIX)\" - CXXFLAGS += $(CFLAGS) - - USE_PYTHON ?= 1 - - ifeq ($(USE_PYTHON),1) -- CFLAGS += `python-config --includes` -DTENNIX_PYTHON -- LIBS += `python-config --libs` -+ PYTHON_INCLUDES := $(shell python-config --includes) -+ PYTHON_LIBS := $(shell python-config --libs) -+ CFLAGS += $(PYTHON_INCLUDES) -DTENNIX_PYTHON -+ LIBS += $(PYTHON_LIBS) - endif - - ifeq ($(NONFREE_LOCATIONS),1) -@@ -67,17 +66,14 @@ ifeq ($(MAEMO),1) - CFLAGS += -DMAEMO - endif - --ifeq ($(UNAME),Darwin) -- SDLLIBS=$$(sdl-config --prefix)/lib -- LIBS += $$(sdl-config --static-libs) $(SDLLIBS)/libSDL_mixer.a $(SDLLIBS)/libSDL_image.a $(SDLLIBS)/libSDL_ttf.a $(SDLLIBS)/libSDL_net.a $$(freetype-config --prefix)/lib/libfreetype.a -- CFLAGS += $$(sdl-config --cflags) -lz --else -- LIBS += $$(sdl-config --libs) -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -- CFLAGS += $$(sdl-config --cflags) --endif -+SDL_LIBS := $(shell sdl-config --libs) -+SDL_CFLAGS := $(shell sdl-config --cflags) -+ -+LIBS += $(SDL_LIBS) -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -+CFLAGS += $(SDL_CFLAGS) - --SRC = tennix.cc game.c graphics.cc input.c util.c sound.cc animation.c network.c - OBJ = tennix.o game.o graphics.o input.o util.o sound.o animation.o archive.o SDL_rotozoom.o network.o -+ - ifeq ($(MSYSTEM),MINGW32) - OBJ += tennixres.o - endif ---- tennix-1.1.orig/game.h -+++ tennix-1.1/game.h -@@ -98,6 +98,13 @@ typedef struct { - bool inhibit_gravity; - } Ball; - -+enum PlayerDesire { -+ DESIRE_NORMAL, -+ DESIRE_TOPSPIN, -+ DESIRE_SMASH, -+ DESIRE_MAX -+}; -+ - typedef struct { - InputDevice* input; - char input_device_index; -@@ -106,9 +113,9 @@ typedef struct { - float power; - bool use_power; - unsigned char score; -- unsigned char desire; -+ PlayerDesire desire; - bool type; /* is this player ai-controlled or human? */ -- char game; /* score for the current game */ -+ int game; /* score for the current game */ - unsigned char sets[SETS_TO_WIN*2]; /* score for each set */ - float accelerate; /* a value [0..1] how fast the user accelerates */ - } Player; -@@ -118,13 +125,6 @@ enum { - PLAYER_TYPE_AI - }; - --enum { -- DESIRE_NORMAL, -- DESIRE_TOPSPIN, -- DESIRE_SMASH, -- DESIRE_MAX --}; -- - /* wait 2 seconds before we score the game */ - #define SCORING_DELAY 1000 - -@@ -161,7 +161,7 @@ enum { - - typedef struct { - const Location* location; -- char current_location; /* index of loc. in global location table */ -+ int current_location; /* index of loc. in global location table */ - Ball ball; - Player players[MAXPLAYERS]; - unsigned char serving_player; diff --git a/pkgs/games/tetrio-desktop/default.nix b/pkgs/games/tetrio-desktop/default.nix index a48f2b22138a7..e31491e94c90f 100644 --- a/pkgs/games/tetrio-desktop/default.nix +++ b/pkgs/games/tetrio-desktop/default.nix @@ -6,6 +6,7 @@ , wrapGAppsHook , alsa-lib , cups +, libGL , libX11 , libXScrnSaver , libXtst @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { ]; libPath = lib.makeLibraryPath [ + libGL libpulseaudio systemd ]; diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 70971fb1ad371..5a5d611371907 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.8.13"; + version = "4.9.6"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-16TpsKNLcm6lbi4exYxDZWfmRsvfAhT1ktP36zC9Psg="; + hash = "sha256-YF8lnICqTyPJWD0BqJ7GUu+ywGhPOhNUUzTPIq4QpPM="; }; dontUnpack = true; diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index ad5aa48c7c5d3..2cbbaa25ae5af 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -27,14 +27,13 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.3.2"; + version = "1.4.1"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; - fetchSubmodules = true; - hash = "sha256-dwTQRpu+IrKhuiiw/uYBt8i/BYlQ5XCy/jUhDAo6aa4="; + hash = "sha256-5G6qmn2b1/0h7aGNNx4t38Akzg2bZFKubOp3FLqSi+I="; }; nativeBuildInputs = [ @@ -63,10 +62,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_LUA:BOOL=ON" - "-DENABLE_ERM:BOOL=OFF" + "-DENABLE_ERM:BOOL=ON" "-DENABLE_GITVERSION:BOOL=OFF" "-DENABLE_PCH:BOOL=OFF" - "-DENABLE_TEST:BOOL=OFF" + "-DENABLE_TEST:BOOL=OFF" # Tests require HOMM3 data files. "-DFORCE_BUNDLED_MINIZIP:BOOL=OFF" "-DFORCE_BUNDLED_FL:BOOL=OFF" "-DCMAKE_INSTALL_RPATH:STRING=$out/lib/vcmi" @@ -80,12 +79,10 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ innoextract ffmpeg unshield ]}" ''; - doCheck = true; - passthru.tests.version = testers.testVersion { package = vcmi; command = '' - XDG_DATA_HOME=$PWD XDG_CACHE_HOME=$PWD XDG_CONFIG_HOME=$PWD \ + XDG_DATA_HOME="$TMPDIR" XDG_CACHE_HOME="$TMPDIR" XDG_CONFIG_HOME="$TMPDIR" \ vcmiclient --version ''; }; @@ -93,8 +90,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open-source engine for Heroes of Might and Magic III"; homepage = "https://vcmi.eu"; - changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog"; - license = with licenses; [ gpl2Only cc-by-sa-40 ]; + changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog.md"; + license = with licenses; [ gpl2Plus cc-by-sa-40 ]; maintainers = with maintainers; [ azahi ]; platforms = platforms.linux; mainProgram = "vcmilauncher"; diff --git a/pkgs/games/vvvvvv/default.nix b/pkgs/games/vvvvvv/default.nix index 6fc3ab6ecef58..909bfa430d702 100644 --- a/pkgs/games/vvvvvv/default.nix +++ b/pkgs/games/vvvvvv/default.nix @@ -26,7 +26,11 @@ stdenv.mkDerivation rec { rev = version; sha256 = "sha256-sLNO4vkmlirsqJmCV9YWpyNnIiigU1KMls7rOgWgSmQ="; }; - sourceRoot = "${src.name}/desktop_version"; + + patches = [ + ./utf8cpp.patch + ]; + dataZip = fetchurl { url = "https://thelettervsixtim.es/makeandplay/data.zip"; name = "data.zip"; @@ -51,7 +55,12 @@ stdenv.mkDerivation rec { # Help CMake find SDL_mixer.h env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_mixer}/include/SDL2"; - cmakeFlags = [ "-DBUNDLE_DEPENDENCIES=OFF" ] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON"; + cmakeDir = "../desktop_version"; + + cmakeFlags = [ + "-DBUNDLE_DEPENDENCIES=OFF" + "-DCMAKE_CXX_FLAGS='-I${lib.getDev utf8cpp}/include/utf8cpp'" + ] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON"; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/games/vvvvvv/utf8cpp.patch b/pkgs/games/vvvvvv/utf8cpp.patch new file mode 100644 index 0000000000000..fc279564e759b --- /dev/null +++ b/pkgs/games/vvvvvv/utf8cpp.patch @@ -0,0 +1,13 @@ +diff --git a/desktop_version/CMakeLists.txt b/desktop_version/CMakeLists.txt +index 7405c122..68ba40e3 100644 +--- a/desktop_version/CMakeLists.txt ++++ b/desktop_version/CMakeLists.txt +@@ -296,7 +296,7 @@ if(BUNDLE_DEPENDENCIES) + else() + find_package(utf8cpp CONFIG) + +- target_link_libraries(VVVVVV physfs tinyxml2 utf8cpp lodepng-static) ++ target_link_libraries(VVVVVV physfs tinyxml2 utf8cpp::utf8cpp lodepng-static) + endif() + + # SDL2 Dependency (Detection pulled from FAudio) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 9979d16247c02..be2525c987165 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.4.0"; + version = "4.4.2"; src = fetchurl { - url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - hash = "sha256-Ul77OihJWIH9H6FUpibGDjqX1BY4DWDQ3bR4lRDY9+U="; + url = "mirror://sourceforge/project/warzone2100/releases/${version}/warzone2100_src.tar.xz"; + hash = "sha256-O5Yqxqp1vKYr8uvAZ1SdsI/kocOzg0KRCirCqqvLrN4="; }; buildInputs = [ @@ -88,9 +88,6 @@ stdenv.mkDerivation rec { --replace '"which "' '"${which}/bin/which "' substituteInPlace lib/exceptionhandler/exceptionhandler.cpp \ --replace "which %s" "${which}/bin/which %s" - # https://github.com/Warzone2100/warzone2100/pull/3353 - substituteInPlace lib/ivis_opengl/gfx_api_vk.cpp \ - --replace vk::throwResultException vk::detail::throwResultException ''; cmakeFlags = [ diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 444fcebe38fa9..f3025572429e7 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -26,13 +26,13 @@ let stdenv.mkDerivation (rec { pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "ARM-software"; repo = "arm-trusted-firmware"; rev = "v${version}"; - hash = "sha256-F7RNYNLh0ORzl5PmzRX9wGK8dZgUQVLKQg1M9oNd0pk="; + hash = "sha256-CAuftVST9Fje/DWaaoX0K2SfWwlGMaUFG4huuwsTOSU="; }; patches = lib.optionals deleteHDCPBlobBeforeBuild [ diff --git a/pkgs/misc/cups/0001-TargetConditionals.patch b/pkgs/misc/cups/0001-TargetConditionals.patch deleted file mode 100644 index 42cd4c051d4bf..0000000000000 --- a/pkgs/misc/cups/0001-TargetConditionals.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1204c841999808ba27267a0039777dcbccdcd6e3 Mon Sep 17 00:00:00 2001 -From: toonn <toonn@toonn.io> -Date: Sun, 27 Jun 2021 12:30:08 +0200 -Subject: [PATCH] TargetConditionals - ---- - test/ippserver.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/test/ippserver.c b/test/ippserver.c -index 38b304f..68ccab1 100644 ---- a/test/ippserver.c -+++ b/test/ippserver.c -@@ -25,7 +25,11 @@ - * Include necessary headers... - */ - --#include <config.h> /* CUPS configuration header */ -+#ifdef __APPLE__ -+# include <xcode/config.h> /* CUPS configuration header macOS */ -+#else -+# include <config.h> /* CUPS configuration header */ -+#endif /* __APPLE__ */ - #include <cups/cups.h> /* Public API */ - #include <cups/string-private.h> /* CUPS string functions */ - #include <cups/thread-private.h> /* For multithreading functions */ --- -2.17.2 (Apple Git-113) - diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix index 2b7e416eafefb..1a573c032e7fc 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -100,6 +100,10 @@ stdenv.mkDerivation { them, it undoes the --set-rpath. this prevents that. */ dontPatchELF = true; + # fortify hardening makes the filter crash + # https://github.com/NixOS/nixpkgs/issues/276125 + hardeningDisable = [ "fortify3" ]; + meta = with lib; { description = "Canon InkJet printer drivers for the iP5400, MP520, MP210, MP140, iP3500, and MP610 series. (MP520 drivers also work for MX700.)"; homepage = "http://support-asia.canon-asia.com/content/EN/0100084101.html"; diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 40e6c7b3b18b9..7300749235fd0 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation { hostname resolvable: services.avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; };''; license = licenses.gpl3Plus; maintainers = with maintainers; [ artuuge ]; diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 02553d5a9ebf7..4c3b969b425fa 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -1,23 +1,23 @@ -{ lib, stdenv, fetchurl, cups, busybox }: +{ lib, stdenv, fetchurl, cups, rpm, cpio }: stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.49"; + version = "1.2.9"; src = fetchurl { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent # version. - url = "https://download3.ebz.epson.net/dsc/f/03/00/13/76/47/16f624dc1dfad10c3b4eb141c50c651a6360f69a/epson-inkjet-printer-escpr2-1.1.49-1lsb3.2.src.rpm"; - sha256 = "sha256-WKDOpS7YL7J/IaNQcTjcoyXNXJGOuEexopdhYFubf50="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/15/33/94/3bf10a30a1f8b5b91ddbafa4571c073878ec476b/epson-inkjet-printer-escpr2-1.2.9-1.src.rpm"; + sha256 = "sha256-2smNBTMSqoKYsGUoBtIHS3Fwk9ODbiXaP7Dtq69FG9U="; }; unpackPhase = '' runHook preUnpack rpm2cpio $src | cpio -idmv - tar xvf ${pname}-${version}-1lsb3.2.tar.gz + tar xvf ${pname}-${version}-1.tar.gz cd ${pname}-${version} runHook postUnpack @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patches = [ ./cups-filter-ppd-dirs.patch ]; buildInputs = [ cups ]; - nativeBuildInputs = [ busybox ]; + nativeBuildInputs = [ rpm cpio ]; meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { Refer to the description of epson-escpr for usage. ''; license = licenses.gpl2; - maintainers = with maintainers; [ ma9e ma27 ]; + maintainers = with maintainers; [ ma9e ma27 shawn8901 ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 0b4abe265060d..577cb3ecf8e33 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -66,6 +66,8 @@ python3Packages.buildPythonApplication { perl zlib avahi + ] ++ lib.optionals withQt5 [ + qt5.qtwayland ]; nativeBuildInputs = [ @@ -237,6 +239,8 @@ python3Packages.buildPythonApplication { # 1. Calling patchPythonProgram on the original script in $out/share/hplip # 2. Making our own wrapper pointing directly to the original script. dontWrapPythonPrograms = true; + # We also avoid double wrapping in case we add qt5 support + dontWrapQtApps = true; preFixup = '' buildPythonPath "$out $pythonPath" @@ -246,7 +250,7 @@ python3Packages.buildPythonApplication { echo "patching \`$py'..." patchPythonScript "$py" echo "wrapping \`$bin'..." - makeWrapper "$py" "$bin" \ + ${if withQt5 then "makeQtWrapper" else "makeWrapper"} "$py" "$bin" \ --prefix PATH ':' "$program_PATH" \ --set PYTHONNOUSERSITE "true" \ $makeWrapperArgs @@ -264,10 +268,6 @@ python3Packages.buildPythonApplication { --replace {,${util-linux}/bin/}logger \ --replace {/usr,$out}/bin remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so) - '' + lib.optionalString withQt5 '' - for f in $out/bin/hp-*;do - wrapQtApp $f - done ''; # There are some binaries there, which reference gcc-unwrapped otherwise. diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index b85e162efb722..daf7758b11843 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -61,11 +61,11 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; - version = "10.02.0"; + version = "10.02.1"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${lib.replaceStrings ["."] [""] version}/ghostscript-${version}.tar.xz"; - hash = "sha512-xJNEFRBj6RWt1VoKhCwqZF2DYqXLymY70HY49L02maCMreN6nv6QWtWkHgFDU+XhsSaLeSXkMSitMNWwMTlrcQ=="; + hash = "sha512-7g91TBvYoYQorRTqo+rYD/i5YnWvUBLnqDhPHxBJDaBW7smuPMeRp6E6JOFuVN9bzN0QnH1ToUU0u9c2CjALEQ="; }; patches = [ diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index f7168d6d116dc..5f49773abd377 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.7629"; + version = "1.0.7658"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "4D/E/TS1tyIoTOQ23LctBFbUyvFvsrr2ivvfEbMbAfc="; + sha256 = "TCkCtAuzek7qT4udr9edGLderEmZ5ZyYXgRnfUFXgds="; }; dontBuild = true; diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index f1c80ad761b2a..b624498f0920e 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -17,13 +17,17 @@ let local fontsdir="$out/share/lilypond/${lilypond.version}/fonts" install -m755 -d "$fontsdir/otf" - for font in {otf,supplementary-fonts}/**.{o,t}tf; do - install -Dt "$fontsdir/otf" -m755 "$font" + + shopt -s globstar + + for font in {otf,supplementary-fonts,supplementary-files}/**/*.{o,t}tf; do + echo $font + install -Dt "$fontsdir/otf" -m644 "$font" done install -m755 -d "$fontsdir/svg" - for font in svg/**.{svg,woff}; do - install -Dt "$fontsdir/svg" -m755 "$font" + for font in {svg,woff}/**.{svg,woff}; do + install -Dt "$fontsdir/svg" -m644 "$font" done ''; diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index 0285a72393c78..77ac8c3e8d36c 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.10"; + version = "2.25.11"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-j1XeQRkcBtrGMJQaFIbp/XktYREEL6ODGXnKt/RtwSA="; + hash = "sha256-DDvo1LBTnDVSDyRDYF0aEToFsmvW1dlTaMHdpBEOdMI="; }; passthru.updateScript = { diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index d17cbe7c33e53..ed9dae3602303 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -658,7 +658,7 @@ in rec { sha256 = "1jp4jq57cn116b3i34v6yy69izd8s6mp2ijr260cw86g0470k0fn"; }; postInstall = '' - sed -i -e '14,20{s|urlview|${pkgs.urlview}/bin/urlview|g}' $target/urlview.tmux + sed -i -e '14,20{s|extract_url|${pkgs.extract_url}/bin/extract_url|g}' $target/urlview.tmux ''; }; diff --git a/pkgs/misc/translatelocally-models/default.nix b/pkgs/misc/translatelocally-models/default.nix new file mode 100644 index 0000000000000..3c71247d1d9a9 --- /dev/null +++ b/pkgs/misc/translatelocally-models/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenvNoCC, fetchurl }: + +let + modelSpecs = (builtins.fromJSON (builtins.readFile ./models.json)); + withCodeAsKey = f: { code, ... }@attrs: lib.nameValuePair code (f attrs); + mkModelPackage = { name, code, version, url, checksum }: + stdenvNoCC.mkDerivation { + pname = "translatelocally-model-${code}"; + version = toString version; + + src = fetchurl { + inherit url; + sha256 = checksum; + }; + dontUnpack = true; + + installPhase = '' + TARGET="$out/share/translateLocally/models" + mkdir -p "$TARGET" + tar -xzf "$src" -C "$TARGET" + + # avoid patching shebangs in inconsistently executable extra files + find "$out" -type f -exec chmod -x {} + + ''; + + meta = { + description = "translateLocally model - ${name}"; + homepage = "https://translatelocally.com/"; + # https://github.com/browsermt/students/blob/master/LICENSE.md + license = lib.licenses.cc-by-sa-40; + }; + }; + allModelPkgs = + lib.listToAttrs (map (withCodeAsKey mkModelPackage) modelSpecs); + +in allModelPkgs // { + is-en-tiny = allModelPkgs.is-en-tiny.overrideAttrs (super: { + # missing model https://github.com/XapaJIaMnu/translateLocally/issues/147 + meta = super.meta // { broken = true; }; + }); +} // { + passthru.updateScript = ./update.sh; +} diff --git a/pkgs/misc/translatelocally-models/models.json b/pkgs/misc/translatelocally-models/models.json new file mode 100644 index 0000000000000..98529a1a95491 --- /dev/null +++ b/pkgs/misc/translatelocally-models/models.json @@ -0,0 +1,149 @@ +[ + { + "version": 1, + "checksum": "3714539160d5b4dce3ce0d829939315e3daffeaff53647249cc6336d745c09f2", + "url": "https://data.statmt.org/bergamot/models/csen/csen.student.base.tar.gz", + "name": "Czech-English base", + "code": "cs-en-base" + }, + { + "version": 1, + "checksum": "693aa14ecb86275169ad4b01cbca294f3bd38d8d9bc1fad8dd89fa7e937e7d2c", + "url": "https://data.statmt.org/bergamot/models/csen/csen.student.tiny11.tar.gz", + "name": "Czech-English tiny", + "code": "cs-en-tiny" + }, + { + "version": 1, + "checksum": "7a57b4e3a11a2c5e03fc6855ffc2b8f61ce3f1a68aeefa4592577a9eebe25031", + "url": "https://data.statmt.org/bergamot/models/csen/encs.student.base.tar.gz", + "name": "English-Czech base", + "code": "en-cs-base" + }, + { + "version": 1, + "checksum": "f999d6511bdb4f1ff246b0563fdf9b71d836e1c3037fe5306a61836d3b5b8d19", + "url": "https://data.statmt.org/bergamot/models/csen/encs.student.tiny11.tar.gz", + "name": "English-Czech tiny", + "code": "en-cs-tiny" + }, + { + "version": 2, + "checksum": "e7362faa83c4f61e552adf8fbd4bc528fe706746eb9fc1c286ec9af7566e3daf", + "url": "https://data.statmt.org/bergamot/models/deen/deen.student.base.tar.gz", + "name": "German-English base", + "code": "de-en-base" + }, + { + "version": 2, + "checksum": "5c11b6ccfa0533fd5632b3cbccbb054972076266e2d1d989d3babb0ec0b10e28", + "url": "https://data.statmt.org/bergamot/models/deen/deen.student.tiny11.tar.gz", + "name": "German-English tiny", + "code": "de-en-tiny" + }, + { + "version": 2, + "checksum": "cf9ab5a41ce359672ab47579686f9af50fc1fe040552c375ca86912f0fce7827", + "url": "https://data.statmt.org/bergamot/models/deen/ende.student.base.tar.gz", + "name": "English-German base", + "code": "en-de-base" + }, + { + "version": 2, + "checksum": "0e85d1d7ee4f8a3ec12680696ffc11fa97d67a54d068ceafcf390a87df94877f", + "url": "https://data.statmt.org/bergamot/models/deen/ende.student.tiny11.tar.gz", + "name": "English-German tiny", + "code": "en-de-tiny" + }, + { + "version": 1, + "checksum": "adf49d0e2f21b82414bc353ae1f0904d93360caa92203ae9f2fc209a83882d81", + "url": "https://data.statmt.org/bergamot/models/esen/esen.student.tiny11.tar.gz", + "name": "Spanish-English tiny", + "code": "es-en-tiny" + }, + { + "version": 1, + "checksum": "6594dda2a4f5d333969c30f8356f4a9f3fe15a9f8a5fd018b0d85b9d9ad2abb0", + "url": "https://data.statmt.org/bergamot/models/esen/enes.student.tiny11.tar.gz", + "name": "English-Spanish tiny", + "code": "en-es-tiny" + }, + { + "version": 1, + "checksum": "05c6525549c9c621e348f8de74533764ad7696aba8245fc9a504116f8ef4053c", + "url": "https://data.statmt.org/bergamot/models/eten/eten.student.tiny11.tar.gz", + "name": "Estonian-English tiny", + "code": "et-en-tiny" + }, + { + "version": 1, + "checksum": "afce6c566270abdd4db332e8dcf4fe22057ada3b2a1171aab04d0d4817396fb5", + "url": "https://data.statmt.org/bergamot/models/eten/enet.student.tiny11.tar.gz", + "name": "English-Estonian tiny", + "code": "en-et-tiny" + }, + { + "version": 1, + "checksum": "5c1696747590d1a75bef67348dce96bcd3889eb5a06a0f670c3d7232ed79f60e", + "url": "https://data.statmt.org/bergamot/models/isen/isen.student.tiny11.tar.gz", + "name": "Icelandic-English tiny", + "code": "is-en-tiny" + }, + { + "version": 1, + "checksum": "9f5dde2f4f87438c24c9561990636e624c53b527ddc8505f822b22b073069de8", + "url": "https://data.statmt.org/bergamot/models/nben/nben.student.tiny11.tar.gz", + "name": "Norwegian (Bokmål)-English tiny", + "code": "nb-en-tiny" + }, + { + "version": 1, + "checksum": "0bb4b83560caaffae95940574d939999092800a7803fae4c79a97e6481887a4f", + "url": "https://data.statmt.org/bergamot/models/nnen/nnen.student.tiny11.tar.gz", + "name": "Norwegian (Nynorsk)-English tiny", + "code": "nn-en-tiny" + }, + { + "version": 1, + "checksum": "ecfe9c2b0be3406c0205ad2da58f4005893a4ae969e81dd9c523093cf5c7abc3", + "url": "https://data.statmt.org/bergamot/models/bgen/bgen.student.tiny11.tar.gz", + "name": "Bulgarian-English tiny", + "code": "bg-en-tiny" + }, + { + "version": 1, + "checksum": "eb9a7511ae9c89fb91ab6da1e9d5061946ad752e5801351f39c8eddca9705c74", + "url": "https://data.statmt.org/bergamot/models/bgen/enbg.student.tiny11.tar.gz", + "name": "English-Bulgarian tiny", + "code": "en-bg-tiny" + }, + { + "version": 1, + "checksum": "87148203cbda28421d76fffbd7d3cd6c1fc0d6dae2843c248870274d6512a388", + "url": "https://data.statmt.org/bergamot/models/plen/plen.student.tiny11.tar.gz", + "name": "Polish-English tiny", + "code": "pl-en-tiny" + }, + { + "version": 1, + "checksum": "c33219daa12e7872cf7ac8a1b86a2f3e0592ebadd7e756bf11d16d9a7725cf9b", + "url": "https://data.statmt.org/bergamot/models/plen/enpl.student.tiny11.tar.gz", + "name": "English-Polish tiny", + "code": "en-pl-tiny" + }, + { + "version": 1, + "checksum": "817a45ed9ec3228bfb797e5e14781ab7fe9f388fe1e834e280031f05089809f8", + "url": "https://data.statmt.org/bergamot/models/fren/fren.student.tiny11.tar.gz", + "name": "French-English tiny", + "code": "fr-en-tiny" + }, + { + "version": 1, + "checksum": "28deea86d2a02102a7fedf19391a7628386f01f1f532d430306a9728dc5ec2d6", + "url": "https://data.statmt.org/bergamot/models/fren/enfr.student.tiny11.tar.gz", + "name": "English-French tiny", + "code": "en-fr-tiny" + } +] diff --git a/pkgs/misc/translatelocally-models/update.sh b/pkgs/misc/translatelocally-models/update.sh new file mode 100755 index 0000000000000..4c75508211b6f --- /dev/null +++ b/pkgs/misc/translatelocally-models/update.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl -p jq + +set -eu -o pipefail + +curl https://translatelocally.com/models.json \ + | jq '.models | map(with_entries(select([.key] | inside([ + "name", + "code", + "version", + "url", + "checksum" + ]))))' \ + > "$(dirname "$0")/models.json" diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix index a8efd438f0245..7431334b91ceb 100644 --- a/pkgs/misc/vencord/default.nix +++ b/pkgs/misc/vencord/default.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.6.4"; - gitHash = "6bbf562"; + version = "1.6.5"; + gitHash = "d629281"; in buildNpmPackage rec { pname = "vencord"; @@ -16,7 +16,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-JL6UwxI4lSkxWfrps1Z2Q97LrzU4Hp6zs8kK2MdqXs8="; + hash = "sha256-/aZIjHWqk55Lo2fnu8Dx+iERRO8xOo/xjcmMmTPFj50="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { @@ -34,7 +34,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-nb72XkNlMRJL7BcTh3lf7s0jigRj5F5TeY9xuGAdVsk="; + npmDepsHash = "sha256-n9RC1B0VKDQtY3jOH+ZZKD1E6yfszkYSwEnRzzruBjg="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; diff --git a/pkgs/misc/vencord/package-lock.json b/pkgs/misc/vencord/package-lock.json index 52fab2d1dbac4..abc52ec812b7b 100644 --- a/pkgs/misc/vencord/package-lock.json +++ b/pkgs/misc/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.6.4", + "version": "1.6.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.6.4", + "version": "1.6.5", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -46,7 +46,8 @@ "tsx": "^3.12.7", "type-fest": "^3.9.0", "typescript": "^5.0.4", - "zip-local": "^0.3.5" + "zip-local": "^0.3.5", + "zustand": "^3.7.2" }, "engines": { "node": ">=18", @@ -703,9 +704,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", - "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -726,9 +727,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", - "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", + "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -848,9 +849,9 @@ } }, "node_modules/@types/diff": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.8.tgz", - "integrity": "sha512-kR0gRf0wMwpxQq6ME5s+tWk9zVCfJUl98eRkD05HWWRbhPB/eu4V1IbyZAsvzC1Gn4znBJ0HN01M4DGXdBEV8Q==", + "version": "5.0.9", + "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.9.tgz", + "integrity": "sha512-RWVEhh/zGXpAVF/ZChwNnv7r4rvqzJ7lYNSmZSVTxjV0PBLf6Qu7RNg+SUtkpzxmiNkjCx0Xn2tPp7FIkshJwQ==", "dev": true }, "node_modules/@types/filesystem": { @@ -893,9 +894,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.18.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.14.tgz", - "integrity": "sha512-iSOeNeXYNYNLLOMDSVPvIFojclvMZ/HDY2dU17kUlcsOsSQETbWIslJbYLZgA+ox8g2XQwSHKTkght1a5X26lQ==", + "version": "18.19.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.3.tgz", + "integrity": "sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -914,9 +915,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.39", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.39.tgz", - "integrity": "sha512-Oiw+ppED6IremMInLV4HXGbfbG6GyziY3kqAwJYOR0PNbkYDmLWQA3a95EhdSmamsvbkJN96ZNN+YD+fGjzSBA==", + "version": "18.2.45", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.45.tgz", + "integrity": "sha512-TtAxCNrlrBp8GoeEp1npd5g+d/OejJHFxS3OWmrPBMFaVQMSN0OFySozJio5BHxTuTeug00AVXVAjfDSfk+lUg==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -1768,9 +1769,9 @@ } }, "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==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", "dev": true }, "node_modules/debug": { @@ -2326,15 +2327,15 @@ } }, "node_modules/eslint": { - "version": "8.54.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", - "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", + "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.54.0", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.55.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -2929,9 +2930,9 @@ } }, "node_modules/globals": { - "version": "13.23.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", - "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -4051,9 +4052,9 @@ } }, "node_modules/postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "version": "8.4.32", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz", + "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==", "dev": true, "funding": [ { @@ -4070,7 +4071,7 @@ } ], "dependencies": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -5324,9 +5325,9 @@ } }, "node_modules/typescript": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", - "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz", + "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -5652,6 +5653,23 @@ "jszip": "^2.6.1", "q": "^1.4.1" } + }, + "node_modules/zustand": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/zustand/-/zustand-3.7.2.tgz", + "integrity": "sha512-PIJDIZKtokhof+9+60cpockVOq05sJzHCriyvaLBmEJixseQ1a5Kdov6fWZfWOu5SK9c+FhH1jU0tntLxRJYMA==", + "dev": true, + "engines": { + "node": ">=12.7.0" + }, + "peerDependencies": { + "react": ">=16.8" + }, + "peerDependenciesMeta": { + "react": { + "optional": true + } + } } } } diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index c44936ddcb471..79d46732bd6c2 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -766,11 +766,11 @@ in makeScopeWithSplicing' { version = "9.2"; sha256 = "0pd0dggl3w4bv5i5h0s1wrc8hr66n4hkv3zlklarwfdhc692fqal"; buildInputs = with self; [ libterminfo ]; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ "-D__scanflike(a,b)=" "-D__va_list=va_list" "-D__warn_references(a,b)=" - ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; + ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="); propagatedBuildInputs = with self; compatIfNeeded; MKDOC = "no"; # missing vfontedpr makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; diff --git a/pkgs/os-specific/darwin/aldente/default.nix b/pkgs/os-specific/darwin/aldente/default.nix index 245ba81e2914a..a67efd3367d46 100644 --- a/pkgs/os-specific/darwin/aldente/default.nix +++ b/pkgs/os-specific/darwin/aldente/default.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aldente"; - version = "1.24"; + version = "1.24.1"; src = fetchurl { url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg"; - hash = "sha256-5byGKtVgKiE8m0+GXDtUpTwQpuUj4lv0hPOl4jhH9wk="; + hash = "sha256-vOv52SrUki2f9vGzYy8dhVJVxna2ZvhtG6WbKjCv3gA="; }; dontBuild = true; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix index ca23af43229ca..fdc3bd45e55ee 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix @@ -229,8 +229,8 @@ in rec { installPhase = drv.installPhase + '' # When used as a module, complains about a missing import for # Darwin.C.stdint. Apparently fixed in later SDKs. - awk -i inplace '/CFBase.h/ { print "#include <stdint.h>" } { print }' \ - $out/Library/Frameworks/CoreVideo.framework/Headers/CVBase.h + sed -e "/CFBase.h/ i #include <stdint.h>" \ + -i $out/Library/Frameworks/CoreVideo.framework/Headers/CVBase.h ''; }); diff --git a/pkgs/os-specific/darwin/asitop/default.nix b/pkgs/os-specific/darwin/asitop/default.nix index 071b6324df3e3..3ac385ec08ffe 100644 --- a/pkgs/os-specific/darwin/asitop/default.nix +++ b/pkgs/os-specific/darwin/asitop/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "asitop"; - version = "0.0.23"; + version = "0.0.24"; format = "setuptools"; disabled = python3.pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BNncgQRNAd6Pgur5D1xVQi3LSsijSAYIYvhsuiVyi9Q="; + hash = "sha256-Xfe1kwRXKpSPcc+UuHrcYThpqKh6kzWVsbPia/QsPjc="; }; # has no tests diff --git a/pkgs/os-specific/darwin/rectangle/default.nix b/pkgs/os-specific/darwin/rectangle/default.nix index 590e6427d19b7..4366e0aedebfb 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.74"; + version = "0.75"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-ERfzgw8R39dOc9F/dgcgCKbEVFNChC5LqDFBDzbS+Wg="; + hash = "sha256-IjEqT1PHGohuQqgS+IzZKyLoIs0P0V7z42JzNUuzh84="; }; sourceRoot = "."; diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix index f7055d378cbbb..50f84a254dfc2 100644 --- a/pkgs/os-specific/darwin/utm/default.nix +++ b/pkgs/os-specific/darwin/utm/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.4.4"; + version = "4.4.5"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-SyrqkNWRUKQS3D17XYsC/dcCKlPLGNNsG5obEiHE1Lk="; + hash = "sha256-FlIPSWqY2V1akd/InS6BPEBfc8pomJ8jgDns7wvaOm8="; }; nativeBuildInputs = [ undmg makeWrapper ]; diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 417d25400a47d..fd63ee56d98f3 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 = "6.0.1"; + version = "6.0.2"; 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-CXkGVoJcGSkooxe7eIhwaM6FkOI45NVw5jdLJAzgFBM="; + hash = "sha256-aFM0rtHrHsLEziDWhRwqeCy70dSAOAX4HDpqHqvnoWs="; }; nativeBuildInputs = [ @@ -89,7 +89,7 @@ in owner = "koekeishiya"; repo = "yabai"; rev = "v${version}"; - hash = "sha256-u+MkGd/rkT1RVkzC2IcAcFM9eClFdj3WBFnftUVwkwc="; + hash = "sha256-VI7Gu5Y50Ed65ZUrseMXwmW/iovlRbAJGlPD7Ooajqw="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index b5f879c1bd31b..7765ce0aa52a3 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20231124"; + version = "20231207"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - hash = "sha256-pDAAC8RibPtkhVVz5WPj/eUjz0A+8bZt/pjzG8zpaE4="; + hash = "sha256-wNGIDOHbQ4qtKqtGqLOGEopWgnox3cATY77daRNVUFM="; }; installPhase = '' diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index ed1e31cc40eb9..99c1000f0e4c1 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -28,7 +28,7 @@ let homepage = "https://apparmor.net/"; description = "A mandatory access control system - ${component}"; license = with licenses; [ gpl2Only lgpl21Only ]; - maintainers = with maintainers; [ julm thoughtpolice ajs124 ]; + maintainers = with maintainers; [ julm thoughtpolice ] ++ teams.helsinki-systems.members; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 3d22720b96255..4300d576b8d96 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki"; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ fpletz hexa ]; + maintainers = with lib.maintainers; [ fpletz hexa philiptaron ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 53a255fc21575..f78191489d0f9 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,16 @@ { - version = "2023.2"; + version = "2023.3"; + # To get these, run: + # + # ``` + # for tool in alfred batctl batman-adv; do + # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2023.3/$tool-2023.3.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 + # done + # ``` sha256 = { - batman-adv = "sha256-OQfc1X4sW/2dQHE5YLlAK/HaT4DFm1/wN3ifu7vY+iU="; - alfred = "sha256-qSBgKFZPieW/t3FK4piDoWEPYr4+YcCW4f6zYgBxjg4="; - batctl = "sha256-cLX5MfpjYyVpe9829tE0oDxJBvTBfLdlCjxxSQFDbsg="; + alfred = "sha256-rVrUFJ+uz351MCpXeqpnOxz8lAXSAksrSpFjuscMjk8="; + batctl = "sha256-mswxFwkwwXl8OHY7h73/iAVMNNHwEvu4EAaCc/7zEhI="; + batman-adv = "sha256-98bFPlk0PBYmQsubRPEBZ2XUv1E+A5ACvmEremweo2w="; }; } diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index c6c7d9d0f509b..d864f30096d7c 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -36,6 +36,18 @@ in stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/bluez/max-input.patch?id=32b31b484cb13009bd8081c4106e4cf064ec2f1f"; sha256 = "sha256-SczbXtsxBkCO+izH8XOBcrJEO2f7MdtYVT3+2fCV8wU="; }) + # Fix device pairing regression + # FIXME: remove in next release + (fetchpatch { + url = "https://github.com/bluez/bluez/commit/3a9c637010f8dc1ba3e8382abe01065761d4f5bb.patch"; + hash = "sha256-UUmYMHnxYrw663nEEC2mv3zj5e0omkLNejmmPUtgS3c="; + }) + # CVE-2023-45866 / https://github.com/skysafe/reblog/tree/main/cve-2023-45866 + (fetchpatch { + name = "CVE-2023-45866.patch"; + url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/profiles/input?id=25a471a83e02e1effb15d5a488b3f0085eaeb675"; + sha256 = "sha256-IuPQ18yN0EO/PkqdT/JETyOxdZCKewBiDjGN4CG2GLo="; + }) ]; buildInputs = [ diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index a23c4eb7b9e66..9ec4778ca38ce 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://github.com/libbpf/bpftool"; description = "Debugging/program analysis tools for the eBPF subsystem"; license = [ licenses.gpl2 licenses.bsd2 ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/bpftune/default.nix b/pkgs/os-specific/linux/bpftune/default.nix index c2fd9d3f6a5eb..86c706ac2702d 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-09-11"; + version = "unstable-2023-12-20"; src = fetchFromGitHub { owner = "oracle"; repo = "bpftune"; - rev = "22926812a555eac910eac0699100bac0f8776f1b"; - hash = "sha256-BflJc5lYWYFIo9LzKfb34F4V1qOI8ywVjnzOLz605DI="; + rev = "0e6bca2e5880fcbaac6478c4042f5f9314e61463"; + hash = "sha256-y9WQrQb9U5YdzKAR63FzC8V1+jZL027pzAmQPpgM3jM="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 847f76a528ce4..5180917623e93 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -28,28 +28,31 @@ let # # If that changes, we can always break them out, but they are essentially # part of the dbus-broker project, just in separate repositories. - c-dvar = dep { pname = "c-dvar"; version = "1.0.0"; hash = "sha256-P7y7gUHXQn2eyS6IcV7m7yGy4VGtQ2orgBkS7Y729ZY="; buildInputs = [ c-stdaux c-utf8 ]; }; - c-ini = dep { pname = "c-ini"; version = "1.0.0"; hash = "sha256-VKxoGexMcquakMmiH5IJt0382TjkV1FLncTSyEqf4X0="; buildInputs = [ c-list c-rbtree c-stdaux c-utf8 ]; }; + c-dvar = dep { pname = "c-dvar"; version = "1.1.0"; hash = "sha256-p/C+BktclVseCtZJ1Q/YK03vP2ClnYRLB1Vmj2OQJD4="; buildInputs = [ c-stdaux c-utf8 ]; }; + c-ini = dep { pname = "c-ini"; version = "1.1.0"; hash = "sha256-wa7aNl20hkb/83c4AkQ/0YFDdmBs4XGW+WLUtBWIC98="; buildInputs = [ c-list c-rbtree c-stdaux c-utf8 ]; }; c-list = dep { pname = "c-list"; version = "3.1.0"; hash = "sha256-fp3EAqcbFCLaT2EstLSzwP2X13pi2EFpFAullhoCtpw="; }; - c-rbtree = dep { pname = "c-rbtree"; version = "3.1.0"; hash = "sha256-ozVzL6FllAn8eHbso0RZc/+PGWwEp6r/R1MR+r4Bi/4="; buildInputs = [ c-stdaux ]; }; - c-shquote = dep { pname = "c-shquote"; version = "1.0.0"; hash = "sha256-Ze1enX0VJ6Xi5e4EhWzaiHc7PnuaifrUP+JuJnauv5c="; buildInputs = [ c-stdaux ]; }; - c-stdaux = dep { pname = "c-stdaux"; version = "1.4.0"; hash = "sha256-gEqXVBAUE0dHD03ina9QbEP26NU12cHKRpuD7GoPmDs="; }; - c-utf8 = dep { pname = "c-utf8"; version = "1.0.0"; hash = "sha256-QEnjmfQ6kxJdsHfyRgXAlP+oGrKLYQ0m9r+D2L+pizI="; buildInputs = [ c-stdaux ]; }; + c-rbtree = dep { pname = "c-rbtree"; version = "3.2.0"; hash = "sha256-dTMeawhPLRtHvMXfXCrT5iCdoh7qS3v+raC6c+t+X38="; buildInputs = [ c-stdaux ]; }; + c-shquote = dep { pname = "c-shquote"; version = "1.1.0"; hash = "sha256-z6hpQ/kpCYAngMNfxLkfsxaGtvP4yBMigX1lGpIIzMQ="; buildInputs = [ c-stdaux ]; }; + c-stdaux = dep { pname = "c-stdaux"; version = "1.5.0"; hash = "sha256-MsnuEyVCmOIr/q6I1qyPsNXp48jxIEcXoYLHbOAZtW0="; }; + c-utf8 = dep { pname = "c-utf8"; version = "1.1.0"; hash = "sha256-9vBYylbt1ypJwIAQJd/oiAueh+4VYcn/KzofQuhUea0="; buildInputs = [ c-stdaux ]; }; in -stdenv.mkDerivation ( finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "dbus-broker"; - version = "33"; + version = "35"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${finalAttrs.version}"; - hash = "sha256-c5kEUB2k9CCuno9d4QOUUp1wbQfsvraGDLN6Yaa7T2w="; + hash = "sha256-Qwi9X5jXHiQ3TOWefzv/p7x8/JkQW1QgdYji5SpLej0="; }; - patches = [ ./paths.patch ]; + patches = [ + ./paths.patch + ./disable-test.patch + ]; nativeBuildInputs = [ docutils meson ninja pkg-config ]; @@ -93,4 +96,4 @@ stdenv.mkDerivation ( finalAttrs: { maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; }; -} ) +}) diff --git a/pkgs/os-specific/linux/dbus-broker/disable-test.patch b/pkgs/os-specific/linux/dbus-broker/disable-test.patch new file mode 100644 index 0000000000000..487967aea8406 --- /dev/null +++ b/pkgs/os-specific/linux/dbus-broker/disable-test.patch @@ -0,0 +1,11 @@ +--- b/src/meson.build ++++ a/src/meson.build +@@ -196,9 +195,6 @@ + test_fdlist = executable('test-fdlist', ['util/test-fdlist.c'], dependencies: dep_bus) + test('Utility File-Desciptor Lists', test_fdlist) + +-test_fs = executable('test-fs', ['util/test-fs.c'], dependencies: dep_bus) +-test('File System Helpers', test_fs) +- + test_match = executable('test-match', ['bus/test-match.c'], dependencies: dep_bus) + test('D-Bus Match Handling', test_match) diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index e71062e8ac472..408dfa408e1d7 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -8,7 +8,6 @@ , makeWrapper , requireFile , substituteAll -, nixosTests }: let @@ -69,12 +68,6 @@ 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/"; diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/os-specific/linux/dracut/default.nix index c6bf684f7fc88..e5461bddbc8f3 100644 --- a/pkgs/os-specific/linux/dracut/default.nix +++ b/pkgs/os-specific/linux/dracut/default.nix @@ -61,10 +61,6 @@ stdenv.mkDerivation rec { echo 'DRACUT_VERSION=${version}' >dracut-version.sh ''; - preConfigure = '' - patchShebangs ./configure - ''; - postFixup = '' wrapProgram $out/bin/dracut --prefix PATH : ${lib.makeBinPath [ coreutils diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 789a59f751f50..4cbf950cdce48 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.59"; + version = "0.61"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-uJcGYT+JSdz/XTyJb/VUyedmSKJW/4BbTM3fw3ebtIc="; + hash = "sha256-spoZRT/gBCk/e/pn1AujCpCPdEM7hn/ImRyQq4hwctI="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index c77c01df85086..ccab9bda9aaed 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -22,7 +22,6 @@ , valgrind , meson , libuuid -, colord , ninja , gnutls , protobufc @@ -122,7 +121,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.9"; + version = "1.9.10"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -133,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-UUrG3CMCAC5hyy2U5I4zqvJoSP/+zuiq1P+2Pdb3QD0="; + hash = "sha256-qB7SGkjPahZmLax8HrSdLvORAXTBcuN5NohT0KUjCnM="; }; patches = [ @@ -184,7 +183,6 @@ stdenv.mkDerivation (finalAttrs: { curl elfutils libgudev - colord libjcat libuuid json-glib diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index afe371a8887bd..ba042fc8b52fc 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,6 +1,7 @@ +# This file is autogenerated! Run ./update.sh to regenerate. { - version = "20231111"; - revision = "20231111"; - sourceHash = "sha256-S9Xkj2CbamHxqjTDfqRJu91MNrSntxrQ7HYyhvdH6Jo="; - outputHash = "sha256-Qrz9fSHUQf0Gl8pfol4yfe95sD8DQV/+riT1NCFussQ="; + version = "20231211"; + revision = "20231211"; + sourceHash = "sha256-urJog0DDrJVZWsUpE4MHEQpcz7LB2vGJCcpPJKTko6k="; + outputHash = "sha256-slA0gfGR2a7002Kd46blHb9UNnMhMgaHxP91XWm8gOk="; } diff --git a/pkgs/os-specific/linux/framework-laptop-kmod/default.nix b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix new file mode 100644 index 0000000000000..088e30e91f8ca --- /dev/null +++ b/pkgs/os-specific/linux/framework-laptop-kmod/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, linuxPackages +, kernel +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "framework-laptop-kmod"; + version = "unstable-2023-12-03"; + + src = fetchFromGitHub { + owner = "DHowett"; + repo = "framework-laptop-kmod"; + rev = "d5367eb9e5b5542407494d04ac1a0e77f10cc89d"; + hash = "sha256-t8F4XHPkuCjWBrsEjW97ielYtf3V6hlLsrasvyab198="; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + runHook preInstall + install -D framework_laptop.ko -t $out/lib/modules/${kernel.modDirVersion}/extra + runHook postInstall + ''; + + meta = with lib; { + description = "A kernel module that exposes the Framework Laptop (13, 16)'s battery charge limit and LEDs to userspace."; + homepage = "https://github.com/DHowett/framework-laptop-kmod"; + license = licenses.gpl2; + maintainers = with maintainers; [ gaykitty ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index c0790ae6a278b..c1e81dfa9b712 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "gasket"; - version = "1.0-18"; + version = "1.0-18-unstable-2023-09-05"; src = fetchFromGitHub { owner = "google"; repo = "gasket-driver"; - rev = "97aeba584efd18983850c36dcf7384b0185284b3"; - sha256 = "pJwrrI7jVKFts4+bl2xmPIAD01VKFta2SRuElerQnTo="; + rev = "09385d485812088e04a98a6e1227bf92663e0b59"; + sha256 = "fcnqCBh04e+w8g079JyuyY2RPu34M+/X+Q8ObE+42i4="; }; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(PWD)" @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ lib.maintainers.kylehendricks ]; platforms = platforms.linux; + broken = versionOlder kernel.version "5.15"; }; } diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 12938dbac89aa..3e23e3a7da7b0 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,24 +1,25 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hdparm"; version = "9.65"; src = fetchurl { - url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz"; + url = "mirror://sourceforge/hdparm/hdparm-${finalAttrs.version}.tar.gz"; sha256 = "sha256-0Ukp+RDQYJMucX6TgkJdR8LnFEI1pTcT1VqU995TWks="; }; - preBuild = '' - makeFlagsArray=(sbindir=$out/sbin manprefix=$out) - ''; + makeFlags = [ + "sbindir=${placeholder "out"}/sbin" + "manprefix=${placeholder "out"}" + ]; meta = with lib; { description = "A tool to get/set ATA/SATA drive parameters under Linux"; homepage = "https://sourceforge.net/projects/hdparm/"; platforms = platforms.linux; license = licenses.bsd2; + mainProgram = "hdparm"; maintainers = [ ]; }; - -} +}) diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 5bfdf61dff6ba..3332699886c9a 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-M1uBamN09XepOembDAcHXO/UvnM9s/OiN+eNzChF5Tw="; }; - postPatch = '' - patchShebangs ./configure - ''; - configureFlags = [ "--datadir=${placeholder "out"}/share" ]; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) diff --git a/pkgs/os-specific/linux/ipp-usb/default.nix b/pkgs/os-specific/linux/ipp-usb/default.nix index 6dc63a7295b15..38d9afddaca6d 100644 --- a/pkgs/os-specific/linux/ipp-usb/default.nix +++ b/pkgs/os-specific/linux/ipp-usb/default.nix @@ -1,13 +1,13 @@ { buildGoModule, avahi, libusb1, pkg-config, lib, fetchFromGitHub, ronn }: buildGoModule rec { pname = "ipp-usb"; - version = "0.9.23"; + version = "0.9.24"; src = fetchFromGitHub { owner = "openprinting"; repo = "ipp-usb"; rev = version; - sha256 = "sha256-sbPQWKqkTaD3kLNs0noVIzAN9cwDEaULsqO7SMQH2Jo="; + sha256 = "sha256-06Kb4s9oN53llz/Yya45ig5rd86VvlcK+vRh3bL/MAw="; }; postPatch = '' @@ -24,7 +24,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ronn ]; buildInputs = [ libusb1 avahi ]; - vendorHash = "sha256-KwW6KgopjF4tVo8eB4OtpXF5R8jfrJ9nibNmaN8U4l8="; + vendorHash = "sha256-61vCER1yR70Pn+CrfTai1sgiQQLU6msb9jxushus5W4="; postInstall = '' # to accomodate the makefile diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 1b983bb90e1e7..e54916f459014 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchgit +, fetchpatch , autoreconfHook , pkg-config , ell @@ -8,18 +9,28 @@ , readline , openssl , python3Packages +, gitUpdater }: stdenv.mkDerivation rec { pname = "iwd"; - version = "2.8"; + version = "2.11"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-i+2R8smgLXooApj0Z5e03FybhYgw1X/kIsJkrDzW8y4="; + hash = "sha256-kE9GBVTKNpgEuE9jQ7k85OhEAN3VWgjmAgifvZfq46I="; }; + patches = [ + # Fix unit/test-dpp on aarch64. + (fetchpatch { + name = "size_t-vararg.patch"; + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=688d27700833258a139a6fbd5661334bd2c9fa98"; + hash = "sha256-g3gG1c25o6ODFfHL4a0HcnNJBBOKRbdo+ZuVbzoxCLs="; + }) + ]; + outputs = [ "out" "man" "doc" ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test"; @@ -87,6 +98,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; + }; + meta = with lib; { homepage = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; description = "Wireless daemon for Linux"; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index e0a3c4319b8b0..6524680027759 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -111,18 +111,15 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "6.5"; in + linuxHeaders = let version = "6.6"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - hash = "sha256-eldLvCCALqdrUsp/rwcmf3IEXoYbGJFcUnKpjCer+IQ="; + hash = "sha256-2SagbGPdisffP4buH/ws4qO4Gi0WhITna1s4mrqOVtA="; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms - - # Fix regression turning `struct sockaddr_ll` flexible size. - ./revert-af_packet-flex.patch ]; }; } diff --git a/pkgs/os-specific/linux/kernel-headers/revert-af_packet-flex.patch b/pkgs/os-specific/linux/kernel-headers/revert-af_packet-flex.patch deleted file mode 100644 index ed6c8861d2fb4..0000000000000 --- a/pkgs/os-specific/linux/kernel-headers/revert-af_packet-flex.patch +++ /dev/null @@ -1,31 +0,0 @@ -Revert commit https://github.com/torvalds/linux/commit/a0ade8404c3bc2bf2631cb0f20d372eed22d9d96 - -The change caused API regression by turning fixed size struct to -flexible size struct. It was an unintentional change, broke `udp2raw`: - https://github.com/NixOS/nixpkgs/pull/252587#issuecomment-1744427473 ---- a/include/uapi/linux/if_packet.h -+++ b/include/uapi/linux/if_packet.h -@@ -18,11 +18,7 @@ struct sockaddr_ll { - unsigned short sll_hatype; - unsigned char sll_pkttype; - unsigned char sll_halen; -- union { -- unsigned char sll_addr[8]; -- /* Actual length is in sll_halen. */ -- __DECLARE_FLEX_ARRAY(unsigned char, sll_addr_flex); -- }; -+ unsigned char sll_addr[8]; - }; - - /* Packet types */ ---- a/net/packet/af_packet.c -+++ b/net/packet/af_packet.c -@@ -3607,7 +3607,7 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr, - if (dev) { - sll->sll_hatype = dev->type; - sll->sll_halen = dev->addr_len; -- memcpy(sll->sll_addr_flex, dev->dev_addr, dev->addr_len); -+ memcpy(sll->sll_addr, dev->dev_addr, dev->addr_len); - } else { - sll->sll_hatype = 0; /* Bad: we have no ARPHRD_UNSPEC */ - sll->sll_halen = 0; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4b38ffc5069ca..746991c00b7e1 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -678,23 +678,23 @@ let VBOXGUEST = option no; DRM_VBOXVIDEO = option no; - XEN = option yes; - XEN_DOM0 = option yes; - PCI_XEN = option yes; - HVC_XEN = option yes; - HVC_XEN_FRONTEND = option yes; - XEN_SYS_HYPERVISOR = option yes; - SWIOTLB_XEN = option yes; - XEN_BACKEND = option yes; - XEN_BALLOON = option yes; - XEN_BALLOON_MEMORY_HOTPLUG = option yes; - XEN_EFI = option yes; - XEN_HAVE_PVMMU = option yes; - XEN_MCE_LOG = option yes; - XEN_PVH = option yes; - XEN_PVHVM = option yes; - XEN_SAVE_RESTORE = option yes; - XEN_SELFBALLOONING = whenOlder "5.3" yes; + XEN = mkIf stdenv.is64bit (option yes); + XEN_DOM0 = mkIf stdenv.is64bit (option yes); + PCI_XEN = mkIf stdenv.is64bit (option yes); + HVC_XEN = mkIf stdenv.is64bit (option yes); + HVC_XEN_FRONTEND = mkIf stdenv.is64bit (option yes); + XEN_SYS_HYPERVISOR = mkIf stdenv.is64bit (option yes); + SWIOTLB_XEN = mkIf stdenv.is64bit (option yes); + XEN_BACKEND = mkIf stdenv.is64bit (option yes); + XEN_BALLOON = mkIf stdenv.is64bit (option yes); + XEN_BALLOON_MEMORY_HOTPLUG = mkIf stdenv.is64bit (option yes); + XEN_EFI = mkIf stdenv.is64bit (option yes); + XEN_HAVE_PVMMU = mkIf stdenv.is64bit (option yes); + XEN_MCE_LOG = mkIf stdenv.is64bit (option yes); + XEN_PVH = mkIf stdenv.is64bit (option yes); + XEN_PVHVM = mkIf stdenv.is64bit (option yes); + XEN_SAVE_RESTORE = mkIf stdenv.is64bit (option yes); + XEN_SELFBALLOONING = mkIf stdenv.is64bit (whenOlder "5.3" yes); # Enable device detection on virtio-mmio hypervisors VIRTIO_MMIO_CMDLINE_DEVICES = yes; diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 92192eb79f898..7aa9c51173526 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -34,7 +34,7 @@ assert (versionAtLeast version "4.9"); STRICT_KERNEL_RWX = yes; # Perform additional validation of commonly targeted structures. - DEBUG_CREDENTIALS = yes; + DEBUG_CREDENTIALS = whenOlder "6.6" yes; DEBUG_NOTIFIERS = yes; DEBUG_PI_LIST = whenOlder "5.2" yes; # doesn't BUG() DEBUG_PLIST = whenAtLeast "5.2" yes; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d8f8bb2fa73f9..3d95407fbe817 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,82 +1,72 @@ { - "4.14": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-4.14.328-hardened1.patch", - "sha256": "1qq2l4nwhxgl4drx6isc1ly892kffjq4hqb4zadqs6sxvsdm7x57", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.328-hardened1/linux-hardened-4.14.328-hardened1.patch" - }, - "sha256": "1igcpvnhwwrczfdsafmszvi0456k7f6j4cgpfw6v6afw09p95d8x", - "version": "4.14.328" - }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.297-hardened1.patch", - "sha256": "1qj09bynl7ml880xpc2956jn0b1gmm77yf3jc45v3jq3610jhna4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.297-hardened1/linux-hardened-4.19.297-hardened1.patch" + "name": "linux-hardened-4.19.303-hardened1.patch", + "sha256": "0bmf88vid8312rrdy4b1bnq4x2rhkiihp01b2j2jmpjbdsj2qbya", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.303-hardened1/linux-hardened-4.19.303-hardened1.patch" }, - "sha256": "0c9xxqgv2i36hrr06dwz7f3idc04xpv0a5pxg08xdh03cnyf12cx", - "version": "4.19.297" + "sha256": "0dlbl47xs7z4yf9cxbxqzd7zs1f9070jr6ck231wgppa6lwwwb82", + "version": "4.19.303" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.199-hardened1.patch", - "sha256": "10vwd5wygfnxpbz15bq56pjygba3vqqal0d7xry2bch4p444pp5f", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.199-hardened1/linux-hardened-5.10.199-hardened1.patch" + "name": "linux-hardened-5.10.205-hardened1.patch", + "sha256": "0viz1pybmh8vld40s2gh73a63743c3v7g2dbrsbqqjkh8xvn28zk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.205-hardened1/linux-hardened-5.10.205-hardened1.patch" }, - "sha256": "1h944syk7n6c4j1djlx19n77alzwbxcdza77c9ykicgfynhpgsm0", - "version": "5.10.199" + "sha256": "0qw8g0h4k0b4dyvspbj51cwr68ihwjzsi2b2261ipy3l1nl1fln5", + "version": "5.10.205" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.137-hardened1.patch", - "sha256": "19gs1w380qgvazwjwhxypizpfx71faa7hsji0x5cgyw6vxhi6l1b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.137-hardened1/linux-hardened-5.15.137-hardened1.patch" + "name": "linux-hardened-5.15.145-hardened1.patch", + "sha256": "0jip4c7r41a3nzgv6zzrkjg4flb0ri6ar60l246ixzyp9sv19x9r", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.145-hardened1/linux-hardened-5.15.145-hardened1.patch" }, - "sha256": "1xxjbxldrhmnh2q6rykpxyfbj8xqgl82q30n8sfavrzr14bb4jcp", - "version": "5.15.137" + "sha256": "086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j", + "version": "5.15.145" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.259-hardened1.patch", - "sha256": "1w8ipflgisd127gmx6wyz8p5qfi8cfd2a5j2xgibspkf45nzfwi8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.259-hardened1/linux-hardened-5.4.259-hardened1.patch" + "name": "linux-hardened-5.4.265-hardened1.patch", + "sha256": "17bs86fxv5l1dm0knvcnj5940r06pq41gd3fp71rn1p1kwk622y3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.265-hardened1/linux-hardened-5.4.265-hardened1.patch" }, - "sha256": "195v4fidavzm637glj6580006mrcaygnbj4za874imb62bxf9rpz", - "version": "5.4.259" + "sha256": "05cvvwjiznn7hfd02qklklalg0chahvh5v18w64lcva6kzj9kbjd", + "version": "5.4.265" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.61-hardened1.patch", - "sha256": "0d9zhh32dx1q828q50kmznmsa6yinppbklhgg8ix7b7k23857ha6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.61-hardened1/linux-hardened-6.1.61-hardened1.patch" + "name": "linux-hardened-6.1.69-hardened1.patch", + "sha256": "1dbwnf6bsxl9m03cngfpf3yb95j719r46dy9x8al59d9p8k0h9bn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.69-hardened1/linux-hardened-6.1.69-hardened1.patch" }, - "sha256": "1kk4d7ph6pvgdrdmaklg15wf58nw9n7yqgkag7jdvqinzh99sb5d", - "version": "6.1.61" + "sha256": "0hdm28k49kmy9r96hckps0bvvaq9m06l72n8ih305rccs6a2cgby", + "version": "6.1.69" }, - "6.4": { + "6.5": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.4.16-hardened1.patch", - "sha256": "10lydnnhhq9ynng1gfaqh1mncsb0dmr27zzcbygs1xigy2bl70n9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.16-hardened1/linux-hardened-6.4.16-hardened1.patch" + "name": "linux-hardened-6.5.13-hardened1.patch", + "sha256": "1fj6yaq2gdjlj2h19vkm13jrx0yiczj6pvric1kq1r6cprqrkkki", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.13-hardened1/linux-hardened-6.5.13-hardened1.patch" }, - "sha256": "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln", - "version": "6.4.16" + "sha256": "1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq", + "version": "6.5.13" }, - "6.5": { + "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.5.10-hardened1.patch", - "sha256": "0p2lj7ryiizr1sxvm2kgds3l8sg9fns35y2fcyqq61lg7ymzj1fi", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.10-hardened1/linux-hardened-6.5.10-hardened1.patch" + "name": "linux-hardened-6.6.8-hardened1.patch", + "sha256": "0mjrp3bxvb1pprc5v2grxk1r3ifldch35lqsxyky1nvlzhphhgb9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.8-hardened1/linux-hardened-6.6.8-hardened1.patch" }, - "sha256": "12sswml8jvabv6bqx35lg3jj6gq8jjk365rghjngdy5d0j34jpx1", - "version": "6.5.10" + "sha256": "05i4ayj9wyjkd1s8ixx7bxwcyagqyx8rhj1zvbc3cjqyw4sc8djh", + "version": "6.6.8" } } diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index dfbd892615fd7..13fd2ed4d371e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,38 +1,38 @@ { "testing": { - "version": "6.7-rc4", - "hash": "sha256:1igynlm5pv62brfkyjh6w8lzvmmy8c3g8phrn5wgdyy8svc48r8h" + "version": "6.7-rc7", + "hash": "sha256:1w1np05mqyviykj0gyx6z2l9ql4f909dy0ximh0gkcpkgy6zz9qc" }, "6.5": { "version": "6.5.13", "hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq" }, "6.1": { - "version": "6.1.65", - "hash": "sha256:02mj394ina3npp6qqinc4pc6afp5pg1rlbjc90g4p902d29jjwj0" + "version": "6.1.69", + "hash": "sha256:0hdm28k49kmy9r96hckps0bvvaq9m06l72n8ih305rccs6a2cgby" }, "5.15": { - "version": "5.15.141", - "hash": "sha256:1yicgvq413801qrfzr0rdzwgg45dszrvfd6y9dmrhak9bk36lvck" + "version": "5.15.145", + "hash": "sha256:086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j" }, "5.10": { - "version": "5.10.202", - "hash": "sha256:12zs2bz2plps6xp80sdg36zkyr00rf5l5c85jl4dd7b9klly04ij" + "version": "5.10.205", + "hash": "sha256:0qw8g0h4k0b4dyvspbj51cwr68ihwjzsi2b2261ipy3l1nl1fln5" }, "5.4": { - "version": "5.4.262", - "hash": "sha256:1p34x33gkvpv26zcrpx1i6dr7dknyxj8gnp6caqb8sj58h3slgkx" + "version": "5.4.265", + "hash": "sha256:05cvvwjiznn7hfd02qklklalg0chahvh5v18w64lcva6kzj9kbjd" }, "4.19": { - "version": "4.19.300", - "hash": "sha256:0ilksl94gjpc4pzc90swfawsl8lvibpq14nkaxzl0831i219ahd8" + "version": "4.19.303", + "hash": "sha256:0dlbl47xs7z4yf9cxbxqzd7zs1f9070jr6ck231wgppa6lwwwb82" }, "4.14": { - "version": "4.14.331", - "hash": "sha256:03sk82dgvccv70i3hy8gf2hw0n4m305f7rxjw93p7jnjrbpdrp1r" + "version": "4.14.334", + "hash": "sha256:0iaaqdkszmfarvjfszc9rf7y9zsv3w82934xmvmzmsbiz86547ca" }, "6.6": { - "version": "6.6.4", - "hash": "sha256:0i9ym5nqf704iz5674k66kn9a5hkm0y0sdhqy5c6v39xr5h9dr29" + "version": "6.6.8", + "hash": "sha256:05i4ayj9wyjkd1s8ixx7bxwcyagqyx8rhj1zvbc3cjqyw4sc8djh" } } diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 9cf5f46cfb80d..9308cba46f139 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19441"; - sha256 = "1z0x8cw9nr7qf5qh3xjf6rg20q0i79bg71lik847sabyb6vcrk0z"; + rev = "19453"; + sha256 = "12jy0kyhl9dsp20yprbw27kzh1p4qxi5m5zy9j7sglm9ajrbnkar"; } , ... }: 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 ce26a38ed069d..58a1be131962e 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.201-rt98"; # updated by ./update-rt.sh + version = "5.10.204-rt100"; # 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 = "0642y6qj2d4aww6jcki81ba53pvjyfazjxgzgj8brqx8ixchdz3a"; + sha256 = "1vnamiyr378q52xgkg7kvpx80zck729dim77vp06a3q6n580g5gz"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1g7xbjsfrgins3agz9sq9ia13h5k9605gak7s14z5i4vd34y8pk8"; + sha256 = "1zbpkira8wf3w46586af72k43j8xkj15f0dgq86z975vl60hdk68"; }; }; 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 bc45a86905c11..497fb09ab4d1a 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.137-rt71"; # updated by ./update-rt.sh + version = "5.15.141-rt72"; # 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 = "1xxjbxldrhmnh2q6rykpxyfbj8xqgl82q30n8sfavrzr14bb4jcp"; + sha256 = "1yicgvq413801qrfzr0rdzwgg45dszrvfd6y9dmrhak9bk36lvck"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "11zk02ni3b0l1wwrfvyc1q92bd9as61hwgbwlj42xv5gbpd39jlw"; + sha256 = "0qlk43g5c0apspdg56ccb4259903nvadv4pnga07i4lg6xwb5xjw"; }; }; 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 8aaf8c5ecb16d..7f0fa9ff7e2a9 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.64-rt17"; # updated by ./update-rt.sh + version = "6.1.67-rt20"; # 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 = "1ry7dp39010hfja1wial6r6q6ilgygwm7gdz22bg4rzaycwam7b2"; + sha256 = "11cjqll3b7iq3mblwyzjrd5ph8avgk23f4mw4shm8j6ai5rdndvm"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1vvn21bprsqqzmqvcmj1jx3xn1dc6kih5fib9qpcyrh0j1c7s077"; + sha256 = "1s7v4dc5hjl63h0z5nai2jpd0g739nc1573f1rlnc6cqy9y26gqg"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 97e5512e4452d..9a3a2a60c341d 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.1.63"; - hash = "sha256-WBMKJCLYexWJuTpli8vjvdms2ZYPXIS0yUxTgAL00io="; + version = "6.1.69"; + hash = "sha256-/uk2sS7g4REPtR/LSc7djjoc//m6QvrXfHO4OemQcy8="; variant = "lts"; }; mainVariant = { - version = "6.5.12"; - hash = "sha256-zG9+d+hKg0S0qCX2hOc02CowC6s9u82MB45+X1bGYpE="; + version = "6.6.8"; + hash = "sha256-TtWTYuT3GMnQy1shkF+HTgv4Z1OSOLh4RXfG+Xj0n3M="; variant = "main"; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 4a1bd7543b1b9..658dc4a193c3d 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.6.4"; #zen + version = "6.6.8"; #zen suffix = "zen1"; #zen - sha256 = "1zks4fpbw788aaw9rysdpfhmqzr8l5y6afq92md1gizyyl1rjhq1"; #zen + sha256 = "1b7ji0zb0wbpl92zrjrqh69cm8n7vyq7a7smsww01agvr1nd8djc"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.6.4"; #lqx - suffix = "lqx1"; #lqx - sha256 = "049pga9bc5pbnwki5vmnz9pdx0p5r7sssb66b4580h9x9skzi9m2"; #lqx + version = "6.6.8"; #lqx + suffix = "lqx2"; #lqx + sha256 = "1hb6g657ivpnyqw6xsd6b09kwlh4vv11wv68ydcmsd5cg6qmv2zy"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/kexec-tools/default.nix b/pkgs/os-specific/linux/kexec-tools/default.nix index 2df5c0454ddc9..c62f9047fc60b 100644 --- a/pkgs/os-specific/linux/kexec-tools/default.nix +++ b/pkgs/os-specific/linux/kexec-tools/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { description = "Tools related to the kexec Linux feature"; platforms = platforms.linux; badPlatforms = [ + "microblaze-linux" "microblazeel-linux" "riscv64-linux" "riscv32-linux" "sparc-linux" "sparc64-linux" ]; diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index 4762b63eda9bf..2a60864ea6bf5 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -16,6 +16,7 @@ , libxslt , mesa , ninja +, buildPackages }: stdenv.mkDerivation rec { @@ -29,13 +30,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-8owyyzCrZVbWXcCR+RA+m0MOrdzW+efI+rIMWEVEZ1o="; }; + strictDeps = true; + + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + buildInputs = [ libGLU libGL libdrm libtsm libxkbcommon - libxslt pango pixman systemd @@ -47,6 +53,7 @@ stdenv.mkDerivation rec { ninja docbook_xsl pkg-config + libxslt # xsltproc ]; patches = [ diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/os-specific/linux/lenovo-legion/app.nix index a409ad2fbf4d7..6d6c604b1c054 100644 --- a/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -7,8 +7,8 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "johnfanv2"; repo = "LenovoLegionLinux"; - rev = "v${version}-prerelese"; - hash = "sha256-P4vqzNX2nF4LnoQDOV8WEiXAICQCyjj9xPpFNvMu93k="; + rev = "v${version}-prerelease"; + hash = "sha256-PQdxfDfW3sn0wWjmsPoAt3HZ43PS3Tyez3/0KEVVZQg="; }; sourceRoot = "${src.name}/python/legion_linux"; @@ -31,10 +31,8 @@ python3.pkgs.buildPythonApplication rec { --replace "FOLDER=/etc/legion_linux/" "FOLDER=$out/share/legion_linux" substituteInPlace ./legion_linux/legion.py \ --replace "/etc/legion_linux" "$out/share/legion_linux" - ''; - - postInstall = '' - cp ./legion_linux/legion_logo.png $out/${python3.sitePackages}/legion_logo.png + substituteInPlace ./legion_linux/legion_gui{,_user}.desktop \ + --replace "Icon=/usr/share/pixmaps/legion_logo.png" "Icon=legion_logo" ''; dontWrapQtApps = true; diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix index 129bb49e81e9a..321d15ce6c5d0 100644 --- a/pkgs/os-specific/linux/libnvme/default.nix +++ b/pkgs/os-specific/linux/libnvme/default.nix @@ -35,6 +35,16 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/linux-nvme/libnvme/commit/ff742e792725c316ba6de0800188bf36751bd1d1.patch"; hash = "sha256-IUjPUBmGQC4oAKFFlBrjonqD2YdyNPC9siK4t/t2slE="; }) + # included in next release + (fetchpatch { + url = "https://github.com/linux-nvme/libnvme/commit/a2b8e52e46cfd888ac5a48d8ce632bd70a5caa93.patch"; + hash = "sha256-AVSWraFriErfz7dA2CjU8+ehJtAmuLxBZyBALygmrf0="; + }) + # included in next release + (fetchpatch { + url = "https://github.com/linux-nvme/libnvme/commit/68c6ffb11d40a427fc1fd70ac2ac97fd01952913.patch"; + hash = "sha256-dvc1sjgCFU31/LornvJ/aRVYtPOsewkas0jS+/AwFuU="; + }) ]; postPatch = '' @@ -60,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Ddocs=man" - (lib.mesonBool "tests" finalAttrs.doCheck) + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) (lib.mesonBool "docs-build" withDocs) ]; diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index 5b8aa329b7833..25b96fe00a5f9 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libtraceevent"; - version = "1.7.3"; + version = "1.8.0"; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; - sha256 = "sha256-poF+Cqcdj0KIgEJWW7XDAlRLz2/Egi948s1M24ETvBo="; + sha256 = "sha256-l1x9tiHKhfdetlnn9S/EfpcHDzZqiTOrdFhHQtOC6Do="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index e5a1443d32254..27a9ccb3303fc 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "linuxptp"; - version = "4.1"; + version = "4.2"; src = fetchurl { url = "mirror://sourceforge/linuxptp/${pname}-${version}.tgz"; - hash = "sha256-4XQ9RPggiJfjCJXaNXnmcP+Rm5FP60talJ8+Qh3d5TU="; + hash = "sha256-cOOOXSdk4CF0Q9pvFOiEb+QBpHIpOsE42EGcB6ZlRHo="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 27a160033b119..7b9cc10be1672 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -156,6 +156,6 @@ stdenv.mkDerivation rec { description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = platforms.linux; license = with licenses; [ gpl2 bsd2 lgpl21 ]; - maintainers = with maintainers; [ raskin ajs124 ]; + maintainers = with maintainers; [ raskin ] ++ teams.helsinki-systems.members; }; } diff --git a/pkgs/os-specific/linux/lxc/add-meson-options.patch b/pkgs/os-specific/linux/lxc/add-meson-options.patch new file mode 100644 index 0000000000000..01aea4df27473 --- /dev/null +++ b/pkgs/os-specific/linux/lxc/add-meson-options.patch @@ -0,0 +1,153 @@ +diff --git a/meson.build b/meson.build +index 21a8705d0..f12b81442 100644 +--- a/meson.build ++++ b/meson.build +@@ -50,7 +50,7 @@ rootfsmount = get_option('rootfs-mount-path') + user_network_db_opt = get_option('usernet-db-path') + user_network_conf_opt = get_option('usernet-config-path') + +-bashcompletiondir = join_paths('/', 'usr', 'share', 'bash-completion', 'completions') ++bashcompletiondir = join_paths(prefixdir, get_option('datadir'), 'bash-completion', 'completions') + bindir = join_paths(prefixdir, get_option('bindir')) + datadir = join_paths(prefixdir, get_option('datadir')) + mandir = join_paths(prefixdir, get_option('mandir')) +@@ -123,22 +123,6 @@ conf.set('PACKAGE_VERSION', meson.project_version()) + conf.set('RUNTIME_PATH', runtimepath) + conf.set('SYSCONFDIR', sysconfdir) + +-# Set sysconfdir +-fs = import('fs') +-distrosysconfdir = get_option('distrosysconfdir') +-if distrosysconfdir != '' +- distrosysconfdir = join_paths(sysconfdir, distrosysconfdir) +- conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) +-elif fs.is_dir('/etc/sysconfig') +- distrosysconfdir = join_paths(sysconfdir, 'sysconfig') +- conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) +-elif fs.is_dir('/etc/default') +- distrosysconfdir = join_paths(sysconfdir, 'default') +- conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) +-else +- error('"distrosysconfdir" is not set') +-endif +- + # Cross-compile on Android. + srcconf.set10('IS_BIONIC', host_machine.system() == 'android') + +@@ -148,6 +132,7 @@ coverity = get_option('coverity-build') + init_script = get_option('init-script') + sanitize = get_option('b_sanitize') + want_examples = get_option('examples') ++want_install_init = get_option('install-init-files') + want_io_uring = get_option('io-uring-event-loop') + want_pam_cgroup = get_option('pam-cgroup') + want_mans = get_option('man') +@@ -160,10 +145,30 @@ want_openssl = get_option('openssl') + want_selinux = get_option('selinux') + want_oss_fuzz = get_option('oss-fuzz') + want_seccomp = get_option('seccomp') ++want_spec = get_option('specfile') ++want_state_dirs = get_option('install-state-dirs') + want_thread_safety = get_option('thread-safety') + want_memfd_rexec = get_option('memfd-rexec') + want_sd_bus = get_option('sd-bus') + ++# Set sysconfdir ++fs = import('fs') ++if want_install_init ++ distrosysconfdir = get_option('distrosysconfdir') ++ if distrosysconfdir != '' ++ distrosysconfdir = join_paths(sysconfdir, distrosysconfdir) ++ conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) ++ elif fs.is_dir('/etc/sysconfig') ++ distrosysconfdir = join_paths(sysconfdir, 'sysconfig') ++ conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) ++ elif fs.is_dir('/etc/default') ++ distrosysconfdir = join_paths(sysconfdir, 'default') ++ conf.set('LXC_DISTRO_SYSCONF', distrosysconfdir) ++ else ++ error('"distrosysconfdir" is not set') ++ endif ++endif ++ + srcconf.set_quoted('DEFAULT_CGROUP_PATTERN', cgrouppattern) + if coverity + srcconf.set('ENABLE_COVERITY_BUILD', 1) +@@ -926,14 +931,16 @@ if want_apparmor + endif + subdir('config/bash') + subdir('config/etc') +-subdir('config/init/common') +-subdir('config/init/systemd') +-subdir('config/init/sysvinit') +-subdir('config/init/upstart') ++if want_install_init ++ subdir('config/init/common') ++ subdir('config/init/systemd') ++ subdir('config/init/sysvinit') ++ subdir('config/init/upstart') ++ subdir('config/sysconfig') ++endif + if want_selinux + subdir('config/selinux') + endif +-subdir('config/sysconfig') + subdir('config/templates') + subdir('config/templates/common.conf.d') + subdir('config/yum') +@@ -963,21 +970,25 @@ pkg_config_file = pkgconfig.generate(liblxc, + ) + + # Empty dirs. +-install_emptydir(join_paths(localstatedir, 'cache', 'lxc')) +-install_emptydir(join_paths(localstatedir, 'lib', 'lxc')) ++if want_state_dirs ++ install_emptydir(join_paths(localstatedir, 'cache', 'lxc')) ++ install_emptydir(join_paths(localstatedir, 'lib', 'lxc')) ++endif + + # RPM spec file. +-specconf = configuration_data() +-specconf.set('LXC_VERSION_BASE', meson.project_version()) +-specconf.set('LXC_VERSION_BETA', version_data.get('LXC_VERSION_BETA')) +-specconf.set('PACKAGE', meson.project_name()) +-specconf.set('LXC_DISTRO_SYSCONF', conf.get('LXC_DISTRO_SYSCONF')) +- +-configure_file( +- configuration: specconf, +- input: 'lxc.spec.in', +- output: 'lxc.spec', +- install: false) ++if want_spec ++ specconf = configuration_data() ++ specconf.set('LXC_VERSION_BASE', meson.project_version()) ++ specconf.set('LXC_VERSION_BETA', version_data.get('LXC_VERSION_BETA')) ++ specconf.set('PACKAGE', meson.project_name()) ++ specconf.set('LXC_DISTRO_SYSCONF', conf.get('LXC_DISTRO_SYSCONF')) ++ ++ configure_file( ++ configuration: specconf, ++ input: 'lxc.spec.in', ++ output: 'lxc.spec', ++ install: false) ++endif + + # Build overview. + status = [ +diff --git a/meson_options.txt b/meson_options.txt +index 9803473d2..84a6d45b5 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -120,3 +120,12 @@ option('memfd-rexec', type : 'boolean', value : 'true', + + option('distrosysconfdir', type : 'string', value: '', + description: 'relative path to sysconfdir for distro default configuration') ++ ++option('specfile', type : 'boolean', value: true, ++ description: 'whether to prepare RPM spec') ++ ++option('install-init-files', type : 'boolean', value: true, ++ description: 'whether to install init files for local init (e.g. systemd, sysvinit)') ++ ++option('install-state-dirs', type : 'boolean', value: true, ++ description: 'whether to create state directories on install') diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 49f16db002f3b..4caf5b9aa943d 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,106 +1,84 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, perl, docbook2x -, docbook_xml_dtd_45, python3Packages, pam, fetchpatch - -# Optional Dependencies -, libapparmor ? null, gnutls ? null, libselinux ? null, libseccomp ? null -, libcap ? null, systemd ? null +{ + lib, + stdenv, + fetchFromGitHub, + docbook2x, + libapparmor, + libcap, + libseccomp, + libselinux, + meson, + ninja, + nix-update-script, + nixosTests, + openssl, + pam, + pkg-config, + systemd, }: -with lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.12"; + version = "5.0.3"; - src = fetchurl { - url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1vyk2j5w9gfyh23w3ar09cycyws16mxh3clbb33yhqzwcs1jy96v"; + src = fetchFromGitHub { + owner = "lxc"; + repo = "lxc"; + rev = "refs/tags/lxc-${version}"; + hash = "sha256-lnLmLgWXt3pI2S+4OeHRlPP5gui7S7ZXXClFt+n/8sY="; }; nativeBuildInputs = [ - autoreconfHook pkg-config perl docbook2x python3Packages.wrapPython + docbook2x + meson + ninja + pkg-config ]; + buildInputs = [ - pam libapparmor gnutls libselinux libseccomp libcap - python3Packages.python python3Packages.setuptools systemd + libapparmor + libcap + libseccomp + libselinux + openssl + pam + systemd ]; - patches = [ - ./support-db2x.patch + patches = [ ./add-meson-options.patch ]; - # Backport of https://github.com/lxc/lxc/pull/4179 for glibc-2.36 build - (fetchpatch { - url = "https://github.com/lxc/lxc/commit/c1115e1503bf955c97f4cf3b925a6a9f619764c3.patch"; - sha256 = "sha256-aC1XQesRJfkyQnloB3NvR4p/1WITrqkGYzw50PDxDrs="; - excludes = [ "meson.build" ]; - }) + mesonFlags = [ + "-Dinstall-init-files=false" + "-Dinstall-state-dirs=false" + "-Dspecfile=false" ]; - postPatch = '' - sed -i '/chmod u+s/d' src/lxc/Makefile.am - ''; - - XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; - - configureFlags = [ - "--enable-pam" - "--localstatedir=/var" - "--sysconfdir=/etc" - "--disable-api-docs" - "--with-init-script=none" - "--with-distro=nixos" # just to be sure it is "unknown" - ] ++ optional (libapparmor != null) "--enable-apparmor" - ++ optional (libselinux != null) "--enable-selinux" - ++ optional (libseccomp != null) "--enable-seccomp" - ++ optional (libcap != null) "--enable-capabilities" - ++ [ - "--disable-examples" - "--enable-python" - "--disable-lua" - "--enable-bash" - (if doCheck then "--enable-tests" else "--disable-tests") - "--with-rootfs-path=/var/lib/lxc/rootfs" - ]; + enableParallelBuilding = true; - doCheck = false; + doCheck = true; - installFlags = [ - "localstatedir=\${TMPDIR}" - "sysconfdir=\${out}/etc" - "sysconfigdir=\${out}/etc/default" - "bashcompdir=\${out}/share/bash-completion/completions" - "READMEdir=\${TMPDIR}/var/lib/lxc/rootfs" - "LXCPATH=\${TMPDIR}/var/lib/lxc" - ]; - - postInstall = '' - wrapPythonPrograms - - completions=( - lxc-attach lxc-cgroup lxc-console lxc-destroy lxc-device lxc-execute - lxc-freeze lxc-info lxc-monitor lxc-snapshot lxc-stop lxc-unfreeze - ) - pushd $out/share/bash-completion/completions/ - mv lxc lxc-start - for completion in ''${completions[@]}; do - ln -sfn lxc-start $completion - done - popd - ''; + passthru = { + tests.incus = nixosTests.incus.container; + updateScript = nix-update-script { + extraArgs = [ + "-vr" + "lxc-(.*)" + ]; + }; + }; meta = { homepage = "https://linuxcontainers.org/"; description = "Userspace tools for Linux Containers, a lightweight virtualization system"; - license = licenses.lgpl21Plus; + license = lib.licenses.gpl2; longDescription = '' - LXC is the userspace control package for Linux Containers, a - lightweight virtual system mechanism sometimes described as - "chroot on steroids". LXC builds up from chroot to implement - complete virtual systems, adding resource management and isolation - mechanisms to Linux’s existing process management infrastructure. + LXC containers are often considered as something in the middle between a chroot and a + full fledged virtual machine. The goal of LXC is to create an environment as close as + possible to a standard Linux installation but without the need for a separate kernel. ''; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = lib.platforms.linux; + maintainers = lib.teams.lxc.members; }; } diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 96477c5f44268..ee923786c2952 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -1,42 +1,58 @@ -{ config, lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, fuse -, util-linux, makeWrapper -, enableDebugBuild ? config.lxcfs.enableDebugBuild or false }: +{ + lib, + stdenv, + fetchFromGitHub, + fuse3, + help2man, + makeWrapper, + meson, + ninja, + nixosTests, + pkg-config, + python3, + util-linux, +}: -with lib; stdenv.mkDerivation rec { pname = "lxcfs"; - version = "4.0.12"; + version = "5.0.4"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "lxcfs-${version}"; - sha256 = "sha256-+wp29GD+toXGfQbPGYbDJ7/P+FY1uQY4uK3OQxTE9GM="; + sha256 = "sha256-vusxbFV7cnQVBOOo7E+fSyaE63f5QiE2xZhYavc8jJU="; }; - postPatch = '' - sed -i -e '1i #include <sys/pidfd.h>' src/bindings.c - ''; + patches = [ + # skip RPM spec generation + ./no-spec.patch - nativeBuildInputs = [ pkg-config help2man autoreconfHook makeWrapper ]; - buildInputs = [ fuse ]; + # skip installing systemd files + ./skip-init.patch + + # fix pidfd checks and include + ./pidfd.patch + ]; - preConfigure = lib.optionalString enableDebugBuild '' - sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am - ''; - configureFlags = [ - "--with-init-script=systemd" - "--sysconfdir=/etc" - "--localstatedir=/var" + nativeBuildInputs = [ + meson + help2man + makeWrapper + ninja + (python3.withPackages (p: [ p.jinja2 ])) + pkg-config ]; + buildInputs = [ fuse3 ]; - installFlags = [ "SYSTEMD_UNIT_DIR=\${out}/lib/systemd" ]; + preConfigure = '' + patchShebangs tools/ + ''; postInstall = '' # `mount` hook requires access to the `mount` command from `util-linux`: - wrapProgram "$out/share/lxcfs/lxc.mount.hook" \ - --prefix PATH : "${util-linux}/bin" + wrapProgram "$out/share/lxcfs/lxc.mount.hook" --prefix PATH : "${util-linux}/bin" ''; postFixup = '' @@ -44,12 +60,16 @@ stdenv.mkDerivation rec { patchelf --set-rpath "$(patchelf --print-rpath "$out/bin/lxcfs"):$out/lib" "$out/bin/lxcfs" ''; + passthru.tests = { + incus-container = nixosTests.incus.container; + }; + meta = { description = "FUSE filesystem for LXC"; homepage = "https://linuxcontainers.org/lxcfs"; changelog = "https://linuxcontainers.org/lxcfs/news/"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = lib.teams.lxc.members; }; } diff --git a/pkgs/os-specific/linux/lxcfs/no-spec.patch b/pkgs/os-specific/linux/lxcfs/no-spec.patch new file mode 100644 index 0000000000000..ead4bfcf80f75 --- /dev/null +++ b/pkgs/os-specific/linux/lxcfs/no-spec.patch @@ -0,0 +1,24 @@ +diff --git a/meson.build b/meson.build +index a0289ad..93fc61a 100644 +--- a/meson.build ++++ b/meson.build +@@ -253,19 +253,6 @@ if want_tests == true + c_args: '-DRELOADTEST -DDEBUG') + endif + +-# RPM spec. +-lxcfs_spec = custom_target( +- 'lxcfs.spec', +- build_by_default: true, +- input: 'lxcfs.spec.in', +- output: 'lxcfs.spec', +- command: [ +- meson_render_jinja2, +- config_h, +- '@INPUT@', +- '@OUTPUT@', +- ]) +- + # Man pages + if want_docs == true + help2man = find_program('help2man') diff --git a/pkgs/os-specific/linux/lxcfs/pidfd.patch b/pkgs/os-specific/linux/lxcfs/pidfd.patch new file mode 100644 index 0000000000000..3d9b6faa57f9e --- /dev/null +++ b/pkgs/os-specific/linux/lxcfs/pidfd.patch @@ -0,0 +1,29 @@ +diff --git a/meson.build b/meson.build +index a0289ad..211b01b 100644 +--- a/meson.build ++++ b/meson.build +@@ -134,11 +134,13 @@ foreach ident: [ + '''#include <stdlib.h> + #include <unistd.h> + #include <signal.h> ++ #include <sys/pidfd.h> + #include <sys/wait.h>'''], + ['pidfd_open', + '''#include <stdlib.h> + #include <unistd.h> + #include <signal.h> ++ #include <sys/pidfd.h> + #include <sys/wait.h>'''], + ] + have = cc.has_function(ident[0], prefix: ident[1], args: '-D_GNU_SOURCE') +diff --git a/src/bindings.c b/src/bindings.c +index 13259c1..e760330 100644 +--- a/src/bindings.c ++++ b/src/bindings.c +@@ -1,5 +1,6 @@ + /* SPDX-License-Identifier: LGPL-2.1+ */ + ++#include <sys/pidfd.h> + #include "config.h" + + #include <dirent.h> diff --git a/pkgs/os-specific/linux/lxcfs/skip-init.patch b/pkgs/os-specific/linux/lxcfs/skip-init.patch new file mode 100644 index 0000000000000..6e7cdc90d706f --- /dev/null +++ b/pkgs/os-specific/linux/lxcfs/skip-init.patch @@ -0,0 +1,12 @@ +diff --git a/meson.build b/meson.build +index a0289ad..10c0a28 100644 +--- a/meson.build ++++ b/meson.build +@@ -285,7 +285,6 @@ endif + + + # Include sub-directories. +-subdir('config/init') + subdir('share') + subdir('tests') + diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 4482170d346ba..3680cd43efb77 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -35,6 +35,13 @@ stdenv.mkDerivation rec { python3.pkgs.setuptools ]; + patches = [ ./fix-py-libnftables.patch ]; + + postPatch = '' + substituteInPlace "py/src/nftables.py" \ + --subst-var-by "out" "$out" + ''; + configureFlags = [ "--with-json" (lib.withFeatureAs withCli "cli" "editline") @@ -54,7 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://netfilter.org/projects/nftables/"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ izorkin ajs124 ]; + maintainers = with maintainers; [ izorkin ] ++ teams.helsinki-systems.members; mainProgram = "nft"; }; } diff --git a/pkgs/os-specific/linux/nftables/fix-py-libnftables.patch b/pkgs/os-specific/linux/nftables/fix-py-libnftables.patch new file mode 100644 index 0000000000000..3ab1e5363019a --- /dev/null +++ b/pkgs/os-specific/linux/nftables/fix-py-libnftables.patch @@ -0,0 +1,13 @@ +diff --git a/py/src/nftables.py b/py/src/nftables.py +index f1e43ade..9adcd1be 100644 +--- a/py/src/nftables.py ++++ b/py/src/nftables.py +@@ -69,7 +69,7 @@ class Nftables: + + validator = None + +- def __init__(self, sofile="libnftables.so.1"): ++ def __init__(self, sofile="@out@/lib/libnftables.so.1"): + """Instantiate a new Nftables class object. + + Accepts a shared object file to open, by default standard search path diff --git a/pkgs/os-specific/linux/nix-ld/default.nix b/pkgs/os-specific/linux/nix-ld/default.nix index 5eebe67731476..208c59ab7576e 100644 --- a/pkgs/os-specific/linux/nix-ld/default.nix +++ b/pkgs/os-specific/linux/nix-ld/default.nix @@ -5,20 +5,16 @@ , ninja , nixosTests }: -let - libDir = if builtins.elem stdenv.system [ "x86_64-linux" "mips64-linux" "powerpc64le-linux" ] - then "/lib64" - else "/lib"; -in + stdenv.mkDerivation rec { pname = "nix-ld"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "mic92"; repo = "nix-ld"; rev = version; - hash = "sha256-+z9t7BLugZO1WhyYEq6FI38TMh2EwfgfAv3RDFSjwtc="; + hash = "sha256-h+odOVyiGmEERMECoFOj5P7FPiMR8IPRzroFA4sKivg="; }; doCheck = true; @@ -36,7 +32,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/nix-support - ldpath=${libDir}/$(basename $(< ${stdenv.cc}/nix-support/dynamic-linker)) + ldpath=/${stdenv.hostPlatform.libDir}/$(basename $(< ${stdenv.cc}/nix-support/dynamic-linker)) echo "$ldpath" > $out/nix-support/ldpath mkdir -p $out/lib/tmpfiles.d/ cat > $out/lib/tmpfiles.d/nix-ld.conf <<EOF @@ -52,9 +48,5 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ mic92 ]; platforms = platforms.linux; - - # 32 bit builds are broken due to a missing #define value: - # https://github.com/Mic92/nix-ld/issues/64 - broken = stdenv.is32bit; }; } diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 index 124c01046ea30..9eca8163feda6 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 @@ -10,7 +10,7 @@ .Sh SYNOPSIS .Nm .Bro -.Cm switch | boot | test | build | dry-build | dry-activate | edit | build-vm | build-vm-with-bootloader | list-generations Op Fl -json +.Cm switch | boot | test | build | dry-build | dry-activate | edit | repl | build-vm | build-vm-with-bootloader | list-generations Op Fl -json .Brc .br .Op Fl -upgrade | -upgrade-all @@ -34,6 +34,7 @@ .Op Fl -show-trace .Op Fl I Va NIX_PATH .Op Fl -verbose | v +.Op Fl -accept-flake-config .Op Fl -impure .Op Fl -max-jobs | j Va number .Op Fl -keep-failed | K @@ -143,6 +144,10 @@ Opens .Pa configuration.nix in the default editor. . +.It Cm repl +Opens the configuration in +.Ic nix repl Ns . +. .It Cm build-vm Build a script that starts a NixOS virtual machine with the desired configuration. It leaves a symlink @@ -391,6 +396,7 @@ accepts various Nix-related flags, including .Fl -max-jobs Ns , .Fl j Ns , .Fl I Ns , +.Fl -accept-flake-config Ns , .Fl -show-trace Ns , .Fl -keep-failed Ns , .Fl -keep-going Ns , diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index dddae8da20680..f9bda1a64b622 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -49,7 +49,7 @@ while [ "$#" -gt 0 ]; do --help) showSyntax ;; - switch|boot|test|build|edit|dry-build|dry-run|dry-activate|build-vm|build-vm-with-bootloader|list-generations) + switch|boot|test|build|edit|repl|dry-build|dry-run|dry-activate|build-vm|build-vm-with-bootloader|list-generations) if [ "$i" = dry-run ]; then i=dry-build; fi # exactly one action mandatory, bail out if multiple are given if [ -n "$action" ]; then showSyntax; fi @@ -82,7 +82,7 @@ while [ "$#" -gt 0 ]; do j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - -j*|--quiet|--print-build-logs|-L|--no-build-output|-Q| --show-trace|--keep-going|-k|--keep-failed|-K|--fallback|--refresh|--repair|--impure|--offline|--no-net) + --accept-flake-config|-j*|--quiet|--print-build-logs|-L|--no-build-output|-Q| --show-trace|--keep-going|-k|--keep-failed|-K|--fallback|--refresh|--repair|--impure|--offline|--no-net) extraBuildFlags+=("$i") ;; --verbose|-v|-vv|-vvv|-vvvv|-vvvvv) @@ -511,6 +511,68 @@ if [ "$action" = dry-build ]; then extraBuildFlags+=(--dry-run) fi +if [ "$action" = repl ]; then + # This is a very end user command, implemented using sub-optimal means. + # You should feel free to improve its behavior, as well as resolve tech + # debt in "breaking" ways. Humans adapt quite well. + if [[ -z $flake ]]; then + exec nix repl '<nixpkgs/nixos>' "${extraBuildFlags[@]}" + else + if [[ -n "${lockFlags[0]}" ]]; then + # nix repl itself does not support locking flags + log "nixos-rebuild repl does not support locking flags yet" + exit 1 + fi + d='$' + q='"' + bold="$(echo -e '\033[1m')" + blue="$(echo -e '\033[34;1m')" + attention="$(echo -e '\033[35;1m')" + reset="$(echo -e '\033[0m')" + # This nix repl invocation is impure, because usually the flakeref is. + # For a solution that preserves the motd and custom scope, we need + # something like https://github.com/NixOS/nix/issues/8679. + exec nix repl --impure --expr " + let flake = builtins.getFlake ''$flake''; + configuration = flake.$flakeAttr; + motd = '' + $d{$q\n$q} + Hello and welcome to the NixOS configuration + $flakeAttr + in $flake + + The following is loaded into nix repl's scope: + + - ${blue}config${reset} All option values + - ${blue}options${reset} Option data and metadata + - ${blue}pkgs${reset} Nixpkgs package set + - other module arguments + + - ${blue}flake${reset} Flake outputs, inputs and source info of $flake + + Use tab completion to browse around ${blue}config${reset}. + + Use ${bold}:r${reset} to ${bold}reload${reset} everything after making a change in the flake. + (assuming $flake is a mutable flake ref) + + See ${bold}:?${reset} for more repl commands. + + ${attention}warning:${reset} nixos-rebuild repl does not currently enforce pure evaluation. + ''; + scope = + assert configuration._type or null == ''configuration''; + assert configuration.class or ''nixos'' == ''nixos''; + configuration._module.args // + configuration._module.specialArgs // + { + inherit (configuration) config options; + inherit flake; + }; + in builtins.seq scope builtins.trace motd scope + " "${extraBuildFlags[@]}" + fi +fi + if [ "$action" = list-generations ]; then if [ ! -L "$profile" ]; then log "No profile \`$(basename "$profile")' found" diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d9caae7f457fc..1a776a036ed40 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.129.03"; - sha256_64bit = "sha256-5tylYmomCMa7KgRs/LfBrzOLnpYafdkKwJu4oSb/AC4="; - sha256_aarch64 = "sha256-i6jZYUV6JBvN+Rt21v4vNstHPIu9sC+2ZQpiLOLoWzM="; - openSha256 = "sha256-/Hxod/LQ4CGZN1B1GRpgE/xgoYlkPpMh+n8L7tmxwjs="; - settingsSha256 = "sha256-QKN/gLGlT+/hAdYKlkIjZTgvubzQTt4/ki5Y+2Zj3pk="; - persistencedSha256 = "sha256-FRMqY5uAJzq3o+YdM2Mdjj8Df6/cuUUAnh52Ne4koME="; + version = "535.146.02"; + sha256_64bit = "sha256-Sf0cyeRFyYspP3xm82vs/hLMwd6WDf/z8dyWujqcv3A="; + sha256_aarch64 = "sha256-8G0oNdaVWxIGwVaQSw/cojy4TIAuiUBF3B98BI4hEec="; + openSha256 = "sha256-Oyllcy3uYYK912CIusMwjKKHtMgoyOxpZWQQ8hIycuk="; + settingsSha256 = "sha256-IrN2NaPrZSN0sCZqYNJ43iCicX3ziwUgyLLSRzp9sHQ="; + persistencedSha256 = "sha256-trIddaTgKXszEJunK+t6D+e3HbLDTfAsitdEYRgwRNQ="; }; latest = selectHighestVersion production (generic { @@ -59,14 +59,14 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "535.43.19"; + version = "535.43.22"; persistencedVersion = "535.98"; settingsVersion = "535.98"; - sha256_64bit = "sha256-zxyZnXpNQuYJ17NDm3s8P/7GzQ4xD4Q4oCZA0ei+Wqs="; - openSha256 = "sha256-K14Av5fCda1J9o5pkQBhmwW34d2hgqrF3J99FWPsNjM="; + sha256_64bit = "sha256-emam5bfYJeFi1+Z0Z1//luaY1JTKcQNYUP8GmG9480Q="; + openSha256 = "sha256-8Nz6LfEdAsm7d6Leqs+ikN0BpOPkLCcd7bckK0MOIFU="; settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; - url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; + url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; }; # data center driver compatible with current default cudaPackages @@ -81,6 +81,17 @@ rec { useFabricmanager = true; }; + dc_535 = generic rec { + version = "535.129.03"; + url = "https://us.download.nvidia.com/tesla/${version}/NVIDIA-Linux-x86_64-${version}.run"; + sha256_64bit = "sha256-5tylYmomCMa7KgRs/LfBrzOLnpYafdkKwJu4oSb/AC4="; + persistencedSha256 = "sha256-FRMqY5uAJzq3o+YdM2Mdjj8Df6/cuUUAnh52Ne4koME="; + fabricmanagerSha256 = "sha256-5KRYS+JLVAhDkBn8Z7e0uJvULQy6dSpwnYsbBxw7Mxg="; + useSettings = false; + usePersistenced = true; + useFabricmanager = true; + }; + # Update note: # If you add a legacy driver here, also update `top-level/linux-kernels.nix`, # adding to the `nvidia_x11_legacy*` entries. diff --git a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix index 58cf8c0e3557c..d9865f00d22cc 100644 --- a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix +++ b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "fabricmanager"; version = fmver; src = fetchurl { - url = "https://developer.download.nvidia.com/compute/cuda/redist/fabricmanager/" + + url = "https://developer.download.nvidia.com/compute/nvidia-driver/redist/fabricmanager/" + "${sys}/${pname}-${sys}-${fmver}-archive.tar.xz"; inherit sha256; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index c8957d6193a5d..e05400aec2763 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -63,7 +63,7 @@ assert versionOlder version "391" -> sha256_32bit != null; assert useSettings -> settingsSha256 != null; assert usePersistenced -> persistencedSha256 != null; assert useFabricmanager -> fabricmanagerSha256 != null; -assert useFabricmanager -> !(useSettings || usePersistenced); +assert useFabricmanager -> !useSettings; let nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 03ad03a472d42..dcdd22044e2a6 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; maintainers = with maintainers; [ abbradar ]; - mainProgram = pname; + mainProgram = "nvidia-persistenced"; }; } diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 664adfdc164c6..b1944778237d8 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.1.1"; - hash = "sha256-YEiRg6RNO5WlUiQHIhfF9tN6oRvhKnV2JRDO25Ok4gQ="; + version = "3.2.1"; + hash = "sha256-nXdyDJIU60Lx9cvpLuUp3E7MUnaZvvGDm+UKbXJRH0o="; } diff --git a/pkgs/os-specific/linux/openvswitch/generic.nix b/pkgs/os-specific/linux/openvswitch/generic.nix index be4bc90fe4280..ce800a7ba9923 100644 --- a/pkgs/os-specific/linux/openvswitch/generic.nix +++ b/pkgs/os-specific/linux/openvswitch/generic.nix @@ -1,5 +1,6 @@ { version , hash +, updateScriptArgs ? "" }: { lib @@ -20,6 +21,7 @@ , sphinxHook , util-linux , which +, writeScript }: let @@ -94,6 +96,9 @@ in stdenv.mkDerivation rec { doCheck = true; preCheck = '' + export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" + export RECHECK=yes + patchShebangs tests/ ''; @@ -105,6 +110,10 @@ in stdenv.mkDerivation rec { pytest ]); + passthru.updateScript = writeScript "ovs-update.nu" '' + ${./update.nu} ${updateScriptArgs} + ''; + meta = with lib; { changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt"; description = "A multilayer virtual switch"; diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index 9fb9977c2017e..d52aae987085e 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,4 +1,5 @@ import ./generic.nix { - version = "2.17.6"; - hash = "sha256-dNqvK+c0iuXdQBe6RbjaxlNB8Vn0+0paecVC/tQQENk="; + version = "2.17.8"; + hash = "sha256-DWAwepAxl90ay7MXPCz++BicaeSHYuZ06O8VeFZac+U="; + updateScriptArgs = "--lts=true --regex '2\.17.*'"; } diff --git a/pkgs/os-specific/linux/openvswitch/update.nu b/pkgs/os-specific/linux/openvswitch/update.nu new file mode 100755 index 0000000000000..5d457dda5f3e9 --- /dev/null +++ b/pkgs/os-specific/linux/openvswitch/update.nu @@ -0,0 +1,19 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i nu -p nushell common-updater-scripts + +def main [--lts: bool = false, --regex: string] { + let tags = list-git-tags --url=https://github.com/openvswitch/ovs | lines | sort --natural | str replace v '' + + let latest_tag = if $regex == null { $tags } else { $tags | find --regex $regex } | last + let current_version = nix eval --raw -f default.nix $"openvswitch(if $lts {"-lts"}).version" | str trim + + if $latest_tag != $current_version { + if $lts { + update-source-version openvswitch-lts $latest_tag $"--file=(pwd)/pkgs/os-specific/linux/openvswitch/lts.nix" + } else { + update-source-version openvswitch $latest_tag $"--file=(pwd)/pkgs/os-specific/linux/openvswitch/default.nix" + } + } + + {"lts?": $lts, before: $current_version, after: $latest_tag} +} diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index fc5902e719ba1..15f54fb360a47 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pcm"; - version = "202307"; + version = "202311"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - hash = "sha256-GeLiJT5AwsMWw0ErdwD6C1jtUZjUxGw5GRSvenu3W18="; + hash = "sha256-lWE7Gz/+LLMr3UyqfwBWEwpSvtdjMgdxVqc9hrZAYfk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index d5d46e5de7ed7..90f400defc2da 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "plymouth"; - version = "unstable-2023-06-17"; + version = "23.360.11"; outputs = [ "out" "dev" ]; @@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "plymouth"; repo = "plymouth"; - rev = "b1d5aa9d2a6033bba52cf63643e5878f8a9b68a0"; - hash = "sha256-8DXcwt8CZTni5Ma+I63LzNejlIB0Cr1ATA7Nl3z9z6I="; + rev = finalAttrs.version; + hash = "sha256-Uun4KtrbkFCiGq3WpZlZ8NKKCOnM+jcgYa8qoqAYdaw="; }; patches = [ diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 314a95bd55483..195d6ba7651d4 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "19.1.1-54734"; + version = "19.2.0-54827"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-02YxBkV9pZGfXuK6GvUDTgE9U5H2MOMk24h9qGJdFTM="; + hash = "sha256-iVrI7ZM/tY5ZumTnQHhGizmdNDJ9I8sP/EOVFcpCQ48="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 38fec65b33344..f52342f5af366 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "shadow"; - version = "4.14.1"; + version = "4.14.2"; src = fetchFromGitHub { owner = "shadow-maint"; repo = pname; rev = version; - hash = "sha256-DzPPnttnJSOMQwXWyFcz6fEtjwBC3p2PpZpBAQ/Ew18="; + hash = "sha256-8sFXxP4MPFzKfBHzlKlsibj0lVQKJbC/Z7pWCy3WEuc="; }; outputs = [ "out" "su" "dev" "man" ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e6872782b832a..f57e4039d203d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -105,6 +105,8 @@ , withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" && (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") # assumes hard floats && !stdenv.hostPlatform.isMips64 # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211 + # can't find gnu/stubs-32.h + && (stdenv.hostPlatform.isPower64 -> stdenv.hostPlatform.isBigEndian) # buildPackages.targetPackages.llvmPackages is the same as llvmPackages, # but we do it this way to avoid taking llvmPackages as an input, and # risking making it too easy to ignore the above comment about llvmPackages. @@ -151,7 +153,7 @@ assert withImportd -> withCompression; assert withCoredump -> withCompression; assert withHomed -> withCryptsetup; assert withHomed -> withPam; -assert withUkify -> withEfi; +assert withUkify -> (withEfi && withBootloader); assert withRepart -> withCryptsetup; assert withBootloader -> withEfi; # passwdqc is not packaged in nixpkgs yet, if you want to fix this, please submit a PR. @@ -160,7 +162,7 @@ assert !withPasswordQuality; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "254.3"; + version = "254.6"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: @@ -177,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - hash = "sha256-ObnsAiKwhwEb4ti611eS/wGpg3Sss/pUy/gANPAbXbs="; + hash = "sha256-Ku24ecDeQt0t7A8/adR3Jm47QZ19+wdMPyJRzCxU4uU="; }; # On major changes, or when otherwise required, you *must* reformat the patches, @@ -205,14 +207,6 @@ stdenv.mkDerivation (finalAttrs: { ./0017-core-don-t-taint-on-unmerged-usr.patch ./0018-tpm2_context_init-fix-driver-name-checking.patch ./0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch - - # Fix for `RuntimeError: ELF .dynamic section is missing.` - # https://github.com/systemd/systemd/issues/29381 - # https://github.com/systemd/systemd/pull/29392 - (fetchpatch { - url = "https://github.com/systemd/systemd/commit/cecbb162a3134b43d2ca160e13198c73ff34c3ef.patch"; - hash = "sha256-hWpUosTDA18mYm5nIb9KnjwOlnzbEHgzha/WpyHoC54="; - }) ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -254,7 +248,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/ukify/ukify.py \ --replace \ "'readelf'" \ - "'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'" + "'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'" \ + --replace \ + "/usr/lib/systemd/boot/efi" \ + "$out/lib/systemd/boot/efi" '' + ( let # The following patches references to dynamic libraries to ensure that diff --git a/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch b/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch deleted file mode 100644 index 328a4a1026189..0000000000000 --- a/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch +++ /dev/null @@ -1,295 +0,0 @@ ---- a/options.c -+++ b/options.c -@@ -34,6 +34,8 @@ - - /* System libraries. */ - -+#include <unistd.h> -+#include <stdlib.h> - #include <sys/types.h> - #include <sys/param.h> - #include <sys/socket.h> ---- a/safe_finger.c -+++ b/safe_finger.c -@@ -20,6 +20,11 @@ - - /* System libraries */ - -+#include <unistd.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <sys/wait.h> -+#include <grp.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <signal.h> -@@ -27,7 +31,7 @@ - #include <ctype.h> - #include <pwd.h> - --extern void exit(); -+int pipe_stdin(char **argv); - - /* Local stuff */ - ---- a/scaffold.c -+++ b/scaffold.c -@@ -10,6 +10,7 @@ - - /* System libraries. */ - -+#include <stdlib.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/socket.h> -@@ -27,7 +27,4 @@ - #endif - --#ifndef INET6 --extern char *malloc(); --#endif - - /* Application-specific. */ ---- a/shell_cmd.c -+++ b/shell_cmd.c -@@ -14,6 +14,10 @@ - - /* System libraries. */ - -+#include <unistd.h> -+#include <stdlib.h> -+#include <fcntl.h> -+#include <sys/wait.h> - #include <sys/types.h> - #include <sys/param.h> - #include <signal.h> -@@ -25,8 +25,6 @@ - #include <syslog.h> - #include <string.h> - --extern void exit(); -- - /* Local stuff. */ - - #include "tcpd.h" ---- a/tcpdchk.c -+++ b/tcpdchk.c -@@ -20,6 +20,8 @@ - - /* System libraries. */ - -+#include <unistd.h> -+#include <stdlib.h> - #include <sys/types.h> - #include <sys/stat.h> - #ifdef INET6 -@@ -35,10 +36,7 @@ - #include <netdb.h> - #include <string.h> - --extern int errno; --extern void exit(); --extern int optind; --extern char *optarg; -+int cidr_mask_addr(char *str); - - #ifndef INADDR_NONE - #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ ---- a/clean_exit.c -+++ b/clean_exit.c -@@ -13,8 +13,8 @@ - #endif - - #include <stdio.h> -- --extern void exit(); -+#include <unistd.h> -+#include <stdlib.h> - - #include "tcpd.h" - ---- a/hosts_access.c -+++ b/hosts_access.c -@@ -23,6 +23,7 @@ - - /* System libraries. */ - -+#include <stdlib.h> - #include <sys/types.h> - #ifdef INT32_T - typedef uint32_t u_int32_t; -@@ -43,8 +44,8 @@ - #include <netdb.h> - #endif - --extern char *fgets(); --extern int errno; -+static int match_pattern_ylo(const char *s, const char *pattern); -+int cidr_mask_addr(char *str); - - #ifndef INADDR_NONE - #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ ---- a/inetcf.c -+++ b/inetcf.c -@@ -9,15 +9,14 @@ - static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23"; - #endif - -+#include <stdlib.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <stdio.h> - #include <errno.h> - #include <string.h> - --extern int errno; --extern void exit(); -- -+#include "scaffold.h" - #include "tcpd.h" - #include "inetcf.h" - ---- a/percent_x.c -+++ b/percent_x.c -@@ -16,12 +16,12 @@ - - /* System libraries. */ - -+#include <unistd.h> -+#include <stdlib.h> - #include <stdio.h> - #include <syslog.h> - #include <string.h> - --extern void exit(); -- - /* Local stuff. */ - - #include "tcpd.h" ---- a/rfc931.c -+++ b/rfc931.c -@@ -15,6 +15,7 @@ - - /* System libraries. */ - -+#include <unistd.h> - #include <stdio.h> - #include <syslog.h> - #include <sys/types.h> ---- a/tcpd.c -+++ b/tcpd.c -@@ -16,6 +16,7 @@ - - /* System libraries. */ - -+#include <unistd.h> - #include <sys/types.h> - #include <sys/param.h> - #include <sys/stat.h> -@@ -39,6 +39,8 @@ - #include "patchlevel.h" - #include "tcpd.h" - -+void fix_options(struct request_info *request); -+ - int allow_severity = SEVERITY; /* run-time adjustable */ - int deny_severity = LOG_WARNING; /* ditto */ - ---- a/tcpdmatch.c -+++ b/tcpdmatch.c -@@ -19,6 +19,8 @@ - - /* System libraries. */ - -+#include <unistd.h> -+#include <stdlib.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/socket.h> -@@ -30,9 +32,6 @@ - #include <setjmp.h> - #include <string.h> - --extern void exit(); --extern int optind; --extern char *optarg; - - #ifndef INADDR_NONE - #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ ---- a/update.c -+++ b/update.c -@@ -19,6 +19,7 @@ - - /* System libraries */ - -+#include <unistd.h> - #include <stdio.h> - #include <syslog.h> - #include <string.h> ---- a/misc.c -+++ b/misc.c -@@ -14,11 +14,10 @@ - #include <arpa/inet.h> - #include <stdio.h> - #include <string.h> -+#include <stdlib.h> - - #include "tcpd.h" - --extern char *fgets(); -- - #ifndef INADDR_NONE - #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ - #endif ---- a/fix_options.c -+++ b/fix_options.c -@@ -32,6 +32,7 @@ - - /* fix_options - get rid of IP-level socket options */ - -+void - fix_options(request) - struct request_info *request; - { -@@ -38,11 +38,8 @@ - #ifdef IP_OPTIONS - unsigned char optbuf[BUFFER_SIZE / 3], *cp; - char lbuf[BUFFER_SIZE], *lp; --#ifdef __GLIBC__ -- size_t optsize = sizeof(optbuf), ipproto; --#else -- int optsize = sizeof(optbuf), ipproto; --#endif -+ socklen_t optsize = sizeof(optbuf); -+ int ipproto; - struct protoent *ip; - int fd = request->fd; - unsigned int opt; ---- a/socket.c -+++ b/socket.c -@@ -95,11 +95,7 @@ - static struct sockaddr_in client; - static struct sockaddr_in server; - #endif --#ifdef __GLIBC__ -- size_t len; --#else -- int len; --#endif -+ socklen_t len; - char buf[BUFSIZ]; - int fd = request->fd; - -@@ -430,11 +426,7 @@ - #else - struct sockaddr_in sin; - #endif --#ifdef __GLIBC__ -- size_t size = sizeof(sin); --#else -- int size = sizeof(sin); --#endif -+ socklen_t size; - - /* - * Eat up the not-yet received datagram. Some systems insist on a diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index 5ee485b09cf8a..c8af2563d6224 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -11,12 +11,12 @@ let pname = "uhk-agent"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-qAZ92/iN5E+1KGPs6u9Bb6vLfi0Keog/yOcLtnRD7yc="; + sha256 = "sha256-0kNcpdYktgzIPVvfSitJ5aIuhJvCEcbubumHhW00QUE="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 36d8a3b9c45f8..b0b7b4f6776c0 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -3,7 +3,6 @@ , fetchFromGitLab , makeWrapper , pkg-config -, rsync , libxslt , meson , ninja @@ -69,7 +68,6 @@ stdenv.mkDerivation (finalAttrs: { libxslt makeWrapper pkg-config - rsync glib ] ++ lib.optionals withIntrospection [ gobject-introspection @@ -138,7 +136,6 @@ stdenv.mkDerivation (finalAttrs: { # Our gobject-introspection patches make the shared library paths absolute # in the GIR files. When running tests, the library is not yet installed, # though, so we need to replace the absolute path with a local one during build. - # We are using a symlink that will be overwitten during installation. mkdir -p "$out/lib" ln -s "$PWD/libupower-glib/libupower-glib.so" "$out/lib/libupower-glib.so.3" ''; @@ -159,21 +156,28 @@ stdenv.mkDerivation (finalAttrs: { # meson rebuild during install and it is not used at runtime anyway. sed -Ei 's~#!.+/bin/python3~#!/usr/bin/python3~' \ ../src/linux/integration-test.py + + # Undo preCheck installation since DESTDIR hack expects outputs to not exist. + rm "$out/lib/libupower-glib.so.3" + rmdir "$out/lib" "$out" ''; postInstall = '' # Move stuff from DESTDIR to proper location. - # We use rsync to merge the directories. - for dir in etc var; do - rsync --archive "$DESTDIR/$dir" "$out" - rm --recursive "$DESTDIR/$dir" - done - for o in out dev installedTests; do - rsync --archive "$DESTDIR/''${!o}" "$(dirname "''${!o}")" - rm --recursive "$DESTDIR/''${!o}" + for o in $(getAllOutputNames); do + # devdoc is created later by _multioutDocs hook. + if [[ "$o" = "devdoc" ]]; then continue; fi + mv "$DESTDIR''${!o}" "$(dirname "''${!o}")" done - # Ensure the DESTDIR is removed. - rmdir "$DESTDIR/nix/store" "$DESTDIR/nix" "$DESTDIR" + + mv "$DESTDIR/var" "$out" + # The /etc already exist so we need to merge it. + cp --recursive "$DESTDIR/etc" "$out" + rm --recursive "$DESTDIR/etc" + + # Ensure we did not forget to install anything. + rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}" + ! test -e "$DESTDIR" ''; postFixup = '' @@ -194,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { # at install time but Meson does not support this # so we need to convince it to install all files to a temporary # location using DESTDIR and then move it to proper one in postInstall. - DESTDIR = "${placeholder "out"}/dest"; + DESTDIR = "dest"; }; passthru = { diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix index 11597c9ed6537..625aa232cc66a 100644 --- a/pkgs/os-specific/linux/vdo/default.nix +++ b/pkgs/os-specific/linux/vdo/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { # platforms are defined in https://github.com/dm-vdo/vdo/blob/master/utils/uds/atomicDefs.h platforms = [ "x86_64-linux" "aarch64-linux" "s390-linux" "powerpc64-linux" "powerpc64le-linux" ]; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ ajs124 ]; + maintainers = teams.helsinki-systems.members; }; } diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index e8e0727b8dbfa..97818ba9c4d49 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3Packages , dnsmasq , gawk @@ -12,24 +13,28 @@ , iptables , util-linux , wrapGAppsHook -, xclip +, wl-clipboard , runtimeShell }: python3Packages.buildPythonApplication rec { pname = "waydroid"; - version = "1.4.1"; + version = "1.4.2"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-0AkNzMIumvgnVcLKX72E2+Eg54Y9j7tdIYPsroOTLWA="; + sha256 = "sha256-/dFvhiK3nCOOmAtrYkQEB8Ge8Rf1ea5cDO7puTwS5bI="; }; - buildInputs = [ - gtk3 + patches = [ + # https://github.com/waydroid/waydroid/pull/1218 + (fetchpatch { + url = "https://github.com/waydroid/waydroid/commit/595e0e5b309a79fedaa07d90b9073ddcb156314c.patch"; + hash = "sha256-A+rUmJbFFhMZ5WpT+QBCTEcn82wJuvmi8Wbcsio41Nk="; + }) ]; nativeBuildInputs = [ @@ -37,6 +42,10 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook ]; + buildInputs = [ + gtk3 + ]; + propagatedBuildInputs = with python3Packages; [ dbus-python gbinder-python @@ -61,18 +70,15 @@ python3Packages.buildPythonApplication rec { wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \ --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 iptables ]} - wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " [ + wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " ([ "$out" - python3Packages.dbus-python - python3Packages.gbinder-python - python3Packages.pygobject3 - python3Packages.pyclip + ] ++ propagatedBuildInputs ++ [ gawk kmod lxc util-linux - xclip - ]}" + wl-clipboard + ])}" substituteInPlace $out/lib/waydroid/tools/helpers/*.py \ --replace '"sh"' '"${runtimeShell}"' diff --git a/pkgs/os-specific/linux/zsa-udev-rules/default.nix b/pkgs/os-specific/linux/zsa-udev-rules/default.nix index c015da7456a0b..66485ab51dd82 100644 --- a/pkgs/os-specific/linux/zsa-udev-rules/default.nix +++ b/pkgs/os-specific/linux/zsa-udev-rules/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsa-udev-rules"; - version = "unstable-2022-10-26"; + version = "unstable-2023-11-30"; src = fetchFromGitHub { owner = "zsa"; repo = "wally"; - rev = "623a50d0e0b90486e42ad8ad42b0a7313f7a37b3"; - hash = "sha256-meR2V7T4hrJFXFPLENHoAgmOILxxynDBk0BLqzsAZvQ="; + rev = "a6648f6b543b703e3902faf5c08e997e0d58c909"; + hash = "sha256-j9n3VoX+UngX12DF28rtNh+oy80Th1BINPQqk053lvE="; }; # Only copies udevs rules diff --git a/pkgs/servers/aeron/default.nix b/pkgs/servers/aeron/default.nix index 5ce49660f4af3..202f2748c4e80 100644 --- a/pkgs/servers/aeron/default.nix +++ b/pkgs/servers/aeron/default.nix @@ -1,138 +1,151 @@ { lib, stdenv, - fetchFromGitHub, + fetchMavenArtifact, jdk11, - gradle, - makeWrapper, - perl, - writeText + makeWrapper }: let pname = "aeron"; - version = "1.40.0"; + version = "1.42.1"; + groupId = "io.aeron"; + + aeronAll_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-all"; + hash = "sha512-NyhYaQqOWcSBwzwpje6DMAp36CEgGSNXBSdaRrDyP+Fn2Z0nvh5o2czog6GKKtbjH9inYfyyF/21gehfgLF6qA=="; + }; - src = fetchFromGitHub { - owner = "real-logic"; - repo = pname; - rev = version; - sha256 = "sha256-4C5YofA/wxwa7bfc6IqsDrw8CLQWKoVBCIe8Ec7ifAg="; + aeronAgent_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-agent"; + hash = "sha512-3XZ6XxPwlNchMe4p4MuDNTWntGokFPnetN7AUMlhXzIgeXBExXvn+BdxI2crfq/xgVGrF/hjHD2shwu2NBa0Tg=="; }; - deps = stdenv.mkDerivation { - name = "${pname}-deps"; - inherit src; + aeronArchive_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-archive"; + hash = "sha512-tmH+/020d1iNkGb8nvenDG9YU+H4PLuO2hSm2dULUIjSXX5AHLDkkrQ3uVQADV9koRNMtC4UXloqtqncay18kQ=="; + }; - nativeBuildInputs = [ - gradle - jdk11 - perl - ]; + aeronClient_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-client"; + hash = "sha512-y3/8Lu2EgMICRNPEWe0hrKpVhF35pDjCO6ip/Af9nPZ70ZRqGmlfEG7OzWVok11DuI8pYJ64jv6bEtUfSHTYXQ=="; + }; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d); - gradle \ - --console plain \ - --no-daemon \ - --system-prop org.gradle.java.home="${jdk11.home}" \ - --exclude-task javadoc \ - build - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - find "$GRADLE_USER_HOME/caches/modules-2" -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ln -s "$out/com/squareup/okio/okio/2.10.0/okio-jvm-2.10.0.jar" "$out/com/squareup/okio/okio/2.10.0/okio-2.10.0.jar" - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-1hvQyEiCMfIw6wv9GOEehX0wrtBnAilVuTGUWAGoH6k="; - }; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - clear() - maven { url '${deps}' } - } - } - } - gradle.projectsLoaded { - rootProject.allprojects { - repositories { - clear() - maven { url '${deps}' } - } - } - } - ''; + aeronCluster_1_40_0 =fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-cluster"; + hash = "sha512-28m14Etjse3MVKBLvaQONujMfvdRQZG0ArezzVcjPEqVqTGd33mrqjPngALV8CG2nJTtcrJmsieRGLEosaXqTw=="; + }; - # replace buildSrc - buildSrc = writeText "build.gradle" '' - repositories { - clear() - maven { url '${deps}' } - } + aeronDriver_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-driver"; + hash = "sha512-SRWHMHR6J1YEtCbSHqSLYm3vo8XgkVXGK3cFQbONT60TZvawP5UlZs7e3eFNpu3qQSA4prqEjjWO9Xc9M/sjKw=="; + }; - dependencies { - implementation 'org.asciidoctor:asciidoctorj:2.5.5' - implementation 'org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r' - } - ''; + aeronSamples_1_40_0 = fetchMavenArtifact { + inherit groupId; + version = "1.40.0"; + artifactId = "aeron-samples"; + hash = "sha512-vyAq4mfLDDyaVk7wcIpPvPcxSt92Ek8mxfuuZwaX+0Wu9oJCpwbnjvS9+bvzcE4qSGxzY6eJIIX6nMdw0LkACg=="; + }; + + aeronAll_1_42_1 = fetchMavenArtifact { + inherit groupId; + artifactId = "aeron-all"; + inherit version; + hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA=="; + }; + + aeronAgent_1_42_1 = fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-agent"; + hash = "sha512-3XZ6XvPwlNdiMe4p4MuDNTWntGokFPnetN7AUMlhXzIgeXBExXvn+BdxI2crfq/xgVGrF/hjHD2shwu2NBa0Tg=="; + }; -in stdenv.mkDerivation rec { + aeronArchive_1_42_1 = fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-archive"; + hash = "sha512-1DmeI9flgfzanbP4jSNUSAQAv2SGBvnlb3G4LbO1m+BN/gPn/nahvVHzotvGJjJA5b65DE1Sc5tqPnItRTK0zQ=="; + }; + + aeronClient_1_42_1 = fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-client"; + hash = "sha512-td2k2WNpaD3+2PNvlCCJ8cZRr615sFjngiQDKzuY2e9/de1OUwvER3zzVAFOonEIV+s5EhwVeQvWq3Wj5Uhadg=="; + }; + + aeronCluster_1_42_1 =fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-cluster"; + hash = "sha512-RiqGeY3pRqN6wWpeJqbeB1SCxrZWnQghrJlCGhew2M/GZAaWHkhhJs5haJqRvR5oOAbaI4RfIWvi5U7TiUo88g=="; + }; + + aeronDriver_1_42_1 = fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-driver"; + hash = "sha512-fKEN5oQCxD1h3qPODKkqFwYbKW6L03RFHNylpsYaNlztNODlCJd0CS5dBR6K8rbOdb2dVIXK/dW/IPBvOi5q/g=="; + }; + aeronSamples_1_42_1 = fetchMavenArtifact { + inherit groupId; + version = "1.42.1"; + artifactId = "aeron-samples"; + hash = "sha512-4JnHn22vJf2lmOg6ev5PD+/YiaL3KgfuyWAK92djX3KBVXO7ERMY2kH79dveVCJG1rbekvE1j1pnjaAIxwJcqg=="; + }; + + aeronAll = aeronAll_1_42_1; + aeronArchive = aeronArchive_1_42_1; + aeronClient = aeronClient_1_42_1; + aeronCluster = aeronCluster_1_42_1; + aeronDriver= aeronDriver_1_42_1; + aeronSamples = aeronSamples_1_42_1; - inherit pname src version; +in stdenv.mkDerivation { + + inherit pname version; buildInputs = [ - jdk11 + aeronAll + aeronArchive + aeronClient + aeronCluster + aeronDriver + aeronSamples ]; nativeBuildInputs = [ - gradle makeWrapper ]; - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - cp ${buildSrc} ./buildSrc/build.gradle - - gradle \ - --console plain \ - --exclude-task checkstyleMain \ - --exclude-task checkstyleGenerated \ - --exclude-task checkstyleGeneratedTest \ - --exclude-task checkstyleMain \ - --exclude-task checkstyleTest \ - --exclude-task javadoc \ - --exclude-task test \ - --init-script "${gradleInit}" \ - --no-daemon \ - --offline \ - --project-prop VERSION=${version} \ - --system-prop org.gradle.java.home="${jdk11.home}" \ - assemble - - runHook postBuild - ''; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; installPhase = '' runHook preInstall - install -D --mode=0444 --target-directory="$out/share/java" \ - "./aeron-all/build/libs/aeron-all-${version}.jar" \ - "./aeron-agent/build/libs/aeron-agent-${version}.jar" \ - "./aeron-archive/build/libs/aeron-archive-${version}.jar" \ - "./aeron-client/build/libs/aeron-client-${version}.jar" + mkdir --parents "$out/share/java" + ln --symbolic "${aeronAll.jar}" "$out/share/java/${pname}-all.jar" + ln --symbolic "${aeronArchive.jar}" "$out/share/java/${pname}-archive.jar" + ln --symbolic "${aeronClient.jar}" "$out/share/java/${pname}-client.jar" + ln --symbolic "${aeronCluster.jar}" "$out/share/java/${pname}-cluster.jar" + ln --symbolic "${aeronDriver.jar}" "$out/share/java/${pname}-driver.jar" + ln --symbolic "${aeronSamples.jar}" "$out/share/java/${pname}-samples.jar" runHook postInstall ''; @@ -141,7 +154,7 @@ in stdenv.mkDerivation rec { function wrap { makeWrapper "${jdk11}/bin/java" "$out/bin/$1" \ --add-flags "--add-opens java.base/sun.nio.ch=ALL-UNNAMED" \ - --add-flags "--class-path $out/share/java/aeron-all-${version}.jar" \ + --add-flags "--class-path ${aeronAll.jar}" \ --add-flags "$2" } @@ -150,30 +163,22 @@ in stdenv.mkDerivation rec { wrap "${pname}-archiving-media-driver" io.aeron.archive.ArchivingMediaDriver wrap "${pname}-archive-tool" io.aeron.archive.ArchiveTool wrap "${pname}-logging-agent" io.aeron.agent.DynamicLoggingAgent + wrap "${pname}-clustered-media-driver" io.aeron.cluster.ClusteredMediaDriver wrap "${pname}-cluster-tool" io.aeron.cluster.ClusterTool ''; - doCheck = true; - - checkPhase = '' - runHook preCheck - - gradle \ - --console plain \ - --init-script "${gradleInit}" \ - --no-daemon \ - --offline \ - --project-prop VERSION=${version} \ - --system-prop org.gradle.java.home="${jdk11.home}" \ - test - - runHook postCheck - ''; + passthru = { + jar = aeronAll.jar; + }; meta = with lib; { description = "Low-latency messaging library"; homepage = "https://aeron.io/"; license = licenses.asl20; + mainProgram = "${pname}-media-driver"; maintainers = [ maintainers.vaci ]; + sourceProvenance = [ + sourceTypes.binaryBytecode + ]; }; } diff --git a/pkgs/servers/apache-airflow/0001-Revert-fix-yarn-warning-from-d3-color-27139.patch b/pkgs/servers/apache-airflow/0001-Revert-fix-yarn-warning-from-d3-color-27139.patch deleted file mode 100644 index 4e6f56a7cf121..0000000000000 --- a/pkgs/servers/apache-airflow/0001-Revert-fix-yarn-warning-from-d3-color-27139.patch +++ /dev/null @@ -1,51 +0,0 @@ -From eca202d2893c9f2f91628ad6244b52cf7880bfcf Mon Sep 17 00:00:00 2001 -From: Graham Bennett <graham@grahambennett.org> -Date: Mon, 21 Nov 2022 15:39:54 +0000 -Subject: [PATCH] Revert "fix yarn warning from d3-color (#27139)" - -This reverts commit b9e133e40c2848b0d555051a99bf8d2816fd28a7. ---- - airflow/www/package.json | 3 --- - airflow/www/yarn.lock | 13 +++++++++---- - 2 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/airflow/www/package.json b/airflow/www/package.json -index f694089ee6..3d37ad4c46 100644 ---- a/airflow/www/package.json -+++ b/airflow/www/package.json -@@ -120,8 +120,5 @@ - "redoc": "^2.0.0-rc.72", - "type-fest": "^2.17.0", - "url-search-params-polyfill": "^8.1.0" -- }, -- "resolutions": { -- "d3-color": "^3.1.0" - } - } -diff --git a/airflow/www/yarn.lock b/airflow/www/yarn.lock -index bafd63a368..dad0ebabab 100644 ---- a/airflow/www/yarn.lock -+++ b/airflow/www/yarn.lock -@@ -4518,10 +4518,15 @@ d3-collection@1, d3-collection@^1.0.4: - resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e" - integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A== - --d3-color@1, "d3-color@1 - 2", d3-color@^3.1.0: -- version "3.1.0" -- resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2" -- integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA== -+d3-color@1: -+ version "1.4.1" -+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" -+ integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q== -+ -+"d3-color@1 - 2": -+ version "2.0.0" -+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e" -+ integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ== - - d3-contour@1: - version "1.3.2" --- -2.37.3 - diff --git a/pkgs/servers/ariang/default.nix b/pkgs/servers/ariang/default.nix index bb0058833e4f7..fc2618ab058ee 100644 --- a/pkgs/servers/ariang/default.nix +++ b/pkgs/servers/ariang/default.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "ariang"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "mayswind"; repo = "AriaNg"; rev = version; - hash = "sha256-+wwtBEZgU83FNQ5f9oQh5G4RQdCODzoqcV1XfwWKUKg="; + hash = "sha256-p9EwlmI/xO3dX5ZpbDVVxajQySGYcJj5G57F84zYAD0="; }; - npmDepsHash = "sha256-KfzD8g6eAWvNjrGaVNt5x4I9o2E273S02o4nkn7BFSs="; + npmDepsHash = "sha256-xX8hD303CWlpsYoCfwHWgOuEFSp1A+M1S53H+4pyAUQ="; makeCacheWritable = true; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 15dbfc4cba999..4102f60c716f4 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -36,25 +36,6 @@ }: let - # remove when upgrading to pjsip >2.13 - pjsip_2_13_patches = [ - (fetchpatch { - name = "CVE-2022-23537.patch"; - url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch"; - sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA="; - }) - (fetchpatch { - name = "CVE-2022-23547.patch"; - url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch"; - sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k="; - }) - (fetchpatch { - name = "CVE-2023-27585.patch"; - url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch"; - hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg="; - }) - ]; - common = { version, sha256, externals, pjsip_patches ? [ ] }: stdenv.mkDerivation { inherit version; pname = "asterisk" @@ -161,12 +142,12 @@ let }; }; - pjproject_2_13 = fetchurl + pjproject_2_13_1 = fetchurl { - url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.13/pjproject-2.13.tar.bz2"; - hash = "sha256-Zj93PUAct13KVR5taOWEbQdKq76wicaBTNHpHC0rICY="; + url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.13.1/pjproject-2.13.1.tar.bz2"; + hash = "sha256-cOBRvO+B9fGt4UVYAHQQwBsc2cUF7Pu1GRsjAF7BE1g="; } // { - pjsip_patches = pjsip_2_13_patches; + pjsip_patches = [ ]; }; mp3-202 = fetchsvn { @@ -187,7 +168,7 @@ let versions = lib.mapAttrs (_: { version, sha256 }: let - pjsip = pjproject_2_13; + pjsip = pjproject_2_13_1; in common { inherit version sha256; diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json index 1e6e4e4417efe..db902df9a412f 100644 --- a/pkgs/servers/asterisk/versions.json +++ b/pkgs/servers/asterisk/versions.json @@ -1,18 +1,14 @@ { - "asterisk_16": { - "sha256": "f8448e8784df7fac019e459bf7c82529d80afe64ae97d73d40e6aa0e4fb39724", - "version": "16.30.0" - }, "asterisk_18": { - "sha256": "66f0e55d84f9e5bf4e79a56255d35a034448acce00d219c3bf4930b1ebb0e88e", - "version": "18.17.1" - }, - "asterisk_19": { - "sha256": "f0c56d1f8e39e0427455edfe25d24ff088c756bdc32dd1278c9f7a320815cbaa", - "version": "19.8.0" + "sha256": "ad7d01f58e5c5266e5b23cc385e6a3d32a656b93c1d4b4fb0082f3300012bd02", + "version": "18.20.1" }, "asterisk_20": { - "sha256": "df12e47000fbac42bb780bb06172aa8bb8ac26faf77cc9f95184695b0cec69c3", - "version": "20.2.1" + "sha256": "7d128f2a164e36fae4875058120ff026e7cd73f7701429fee4fa293f4fba4336", + "version": "20.5.1" + }, + "asterisk_21": { + "sha256": "8e7db886b70e808ade38ad060ccbbb49353031e4c2fa6dc4435bfbd79f082956", + "version": "21.0.1" } } diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index 5ed446b8bbad4..127abe161a64c 100644 --- a/pkgs/servers/audiobookshelf/default.nix +++ b/pkgs/servers/audiobookshelf/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - pkgs, fetchFromGitHub, runCommand, buildNpmPackage, @@ -17,13 +16,13 @@ let nodejs = nodejs_18; pname = "audiobookshelf"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "advplyr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lifvfh9dF3Hbgm5NHrzS9zQdv+INSByNkqMWTxTpUMo="; + sha256 = "sha256-bRQ/GbUe+vsgYjSVf3jssoxGzgNeKG4BCDIhNJovAN8="; }; client = buildNpmPackage { @@ -37,7 +36,7 @@ let NODE_OPTIONS = "--openssl-legacy-provider"; npmBuildScript = "generate"; - npmDepsHash = "sha256-FxP1Kysx3ngk3napZ5uvKSabeOypBtA0kjhyAKpcdo8="; + npmDepsHash = "sha256-2E7Qy3Yew+j+eKKYJMV0SQ/LlJaIfOGm4MpxwP5Dn3Q="; }; wrapper = import ./wrapper.nix { @@ -52,7 +51,7 @@ in buildNpmPackage { dontNpmBuild = true; npmInstallFlags = [ "--only-production" ]; - npmDepsHash = "sha256-NcurZee1Z8Rvm2UcjvckbdirfgiIkXMx9GKbr4x/HqE="; + npmDepsHash = "sha256-BZSRa/27oKm2rJoHFq8TpPzkX2CDO9zk5twtcMeo0cQ="; installPhase = '' mkdir -p $out/opt/client @@ -69,6 +68,7 @@ in buildNpmPackage { meta = with lib; { homepage = "https://www.audiobookshelf.org/"; description = "Self-hosted audiobook and podcast server"; + changelog = "https://github.com/advplyr/audiobookshelf/releases/tag/v${version}"; license = licenses.gpl3; maintainers = [ maintainers.jvanbruegge ]; platforms = platforms.linux; diff --git a/pkgs/servers/authelia/change-web-out-dir.patch b/pkgs/servers/authelia/change-web-out-dir.patch deleted file mode 100644 index 56e73d64fbc41..0000000000000 --- a/pkgs/servers/authelia/change-web-out-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vite.config.ts b/vite.config.ts -index 659ba3e1..1f0afa5c 100644 ---- a/vite.config.ts -+++ b/vite.config.ts -@@ -37,7 +37,7 @@ export default defineConfig(({ mode }) => { - base: "./", - build: { - sourcemap, -- outDir: "../internal/server/public_html", -+ outDir: "dist", - emptyOutDir: true, - assetsDir: "static", - rollupOptions: { diff --git a/pkgs/servers/authelia/update.sh b/pkgs/servers/authelia/update.sh index c51272ea9193d..17eb997a94c81 100755 --- a/pkgs/servers/authelia/update.sh +++ b/pkgs/servers/authelia/update.sh @@ -10,10 +10,16 @@ NIXPKGS_ROOT=$(realpath "$NIXPKGS_ROOT") instantiateClean() { nix-instantiate --eval --strict -E "with import ./. {}; $1" | cut -d\" -f2 } -fetchNewSha() { +fetchNewHash() { set +eo pipefail - nix-build -A "$1" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g' + HASH="$(nix-build -A "$1" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')" set -eo pipefail + if [ -z "$HASH" ]; then + echo "Could not generate hash" >&2 + exit 1 + else + echo "$HASH" + fi } replace() { sed -i "s@$1@$2@g" "$3" @@ -49,7 +55,7 @@ replace "$OLD_VERSION" "$NEW_VERSION" "$DRV_DIR/sources.nix" OLD_SRC_HASH="$(instantiateClean authelia.src.outputHash)" echo "Old src hash $OLD_SRC_HASH" replace "$OLD_SRC_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix" -NEW_SRC_HASH="$(fetchNewSha authelia.src)" +NEW_SRC_HASH="$(fetchNewHash authelia.src)" echo "New src hash $NEW_SRC_HASH" replace "$TMP_HASH" "$NEW_SRC_HASH" "$DRV_DIR/sources.nix" @@ -61,18 +67,18 @@ clean_up() { } trap clean_up EXIT -# OLD_PWD=$PWD -# cd $WEB_DIR -# OUT=$(nix-build -E "with import $NIXPKGS_ROOT {}; authelia.src" --no-out-link) -# cp -r $OUT/web/package.json . -# npm install --package-lock-only --legacy-peer-deps --ignore-scripts -# mv package-lock.json "$DRV_DIR/" +OLD_PWD=$PWD +cd $WEB_DIR +OUT=$(nix-build -E "with import $NIXPKGS_ROOT {}; authelia.src" --no-out-link) +cp -r $OUT/web/package.json . +npm install --package-lock-only --legacy-peer-deps --ignore-scripts +mv package-lock.json "$DRV_DIR/" +cd $OLD_PWD -# cd $OLD_PWD OLD_NPM_DEPS_HASH="$(instantiateClean authelia.web.npmDepsHash)" echo "Old npm deps hash $OLD_NPM_DEPS_HASH" replace "$OLD_NPM_DEPS_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix" -NEW_NPM_DEPS_HASH="$(fetchNewSha authelia.web)" +NEW_NPM_DEPS_HASH="$(fetchNewHash authelia.web)" echo "New npm deps hash $NEW_NPM_DEPS_HASH" replace "$TMP_HASH" "$NEW_NPM_DEPS_HASH" "$DRV_DIR/sources.nix" clean_up @@ -80,6 +86,6 @@ clean_up OLD_GO_VENDOR_HASH="$(instantiateClean authelia.vendorHash)" echo "Old go vendor hash $OLD_GO_VENDOR_HASH" replace "$OLD_GO_VENDOR_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix" -NEW_GO_VENDOR_HASH="$(fetchNewSha authelia.goModules)" +NEW_GO_VENDOR_HASH="$(fetchNewHash authelia.goModules)" echo "New go vendor hash $NEW_GO_VENDOR_HASH" replace "$TMP_HASH" "$NEW_GO_VENDOR_HASH" "$DRV_DIR/sources.nix" diff --git a/pkgs/servers/authelia/web.nix b/pkgs/servers/authelia/web.nix index 0153358ea07f5..74ba11325f87d 100644 --- a/pkgs/servers/authelia/web.nix +++ b/pkgs/servers/authelia/web.nix @@ -9,11 +9,9 @@ buildNpmPackage { sourceRoot = "${src.name}/web"; - patches = [ - ./change-web-out-dir.patch - ]; - postPatch = '' + substituteInPlace ./vite.config.ts \ + --replace 'outDir: "../internal/server/public_html"' 'outDir: "dist"' cp ${./package-lock.json} ./package-lock.json ''; diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 21904dc615a12..7e6d8f500a101 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.3.1"; + version = "1.4.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-AhUMrvnZoo0XMfJ6F9Bi4mC0hk5T3EkQPX/s4tHWcic="; + sha256 = "sha256-sCP1I57FSXTf5iQlmUIQHMrSGNOxG/R2aahU3D8x5Ww="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 26140404cc55b..399ce426d9dc6 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -7,7 +7,7 @@ , installShellFiles }: let - version = "2.7.5"; + version = "2.7.6"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; @@ -23,10 +23,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - hash = "sha256-0IZZ7mkEzZI2Y8ed//m0tbBQZ0YcCXA0/b10ntNIXUk="; + hash = "sha256-th0R3Q1nGT0q5PGOygtD1/CpJmrT5TYagrwQR4t/Fvg="; }; - vendorHash = "sha256-YNcQtjPGQ0XMSog+sWlH4lG/QdbdI0Lyh/fUGqQUFaY="; + vendorHash = "sha256-ebnSehuhbCY58ctM8IRVMfNxxbJBp6ht9cbuLdGFNek="; subPackages = [ "cmd/caddy" ]; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 19a0b5e923408..629842669388e 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -28,7 +28,7 @@ let else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { pname = "clickhouse"; - version = "23.10.3.5"; + version = "23.11.1.2711"; src = fetchFromGitHub rec { owner = "ClickHouse"; @@ -36,7 +36,7 @@ in mkDerivation rec { rev = "v${version}-stable"; fetchSubmodules = true; name = "clickhouse-${rev}.tar.gz"; - hash = "sha256-H3nIhBydLBxSesGrvqmwHmBoQGCGQlWgVVUudKLLkIY="; + hash = "sha256-xRg9NzUkjTbR2Lp6DgDzcUp2Hrc4sfgkot7KxPw2Uy8="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test @@ -61,6 +61,20 @@ in mkDerivation rec { ''; }; + patches = [ + # They updated the Cargo.toml without updating the Cargo.lock :/ + (fetchpatch { + url = "https://github.com/ClickHouse/ClickHouse/commit/bccd33932b5fe17ced2dc2f27813da0b1c034afa.patch"; + revert = true; + hash = "sha256-4idwr+G8WGuT/VILKtDIJIvbCvi6pZokJFze4dP6ExE="; + }) + (fetchpatch { + url = "https://github.com/ClickHouse/ClickHouse/commit/b6bd5ecb199ef8a10e3008a4ea3d96087db8a8c1.patch"; + revert = true; + hash = "sha256-nbb/GV2qWEZ+BEfT6/9//yZf4VWdhOdJCI3PLeh6o0M="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ cmake diff --git a/pkgs/servers/code-server/build-vscode-nogit.patch b/pkgs/servers/code-server/build-vscode-nogit.patch new file mode 100644 index 0000000000000..ec726c68d438d --- /dev/null +++ b/pkgs/servers/code-server/build-vscode-nogit.patch @@ -0,0 +1,20 @@ +diff --git a/ci/build/build-vscode.sh b/ci/build/build-vscode.sh +index a72549fb..3aed1ad5 100755 +--- a/ci/build/build-vscode.sh ++++ b/ci/build/build-vscode.sh +@@ -58,7 +58,6 @@ main() { + # telemetry available; telemetry can still be disabled by flag or setting). + # This needs to be done before building as Code will read this file and embed + # it into the client-side code. +- git checkout product.json # Reset in case the script exited early. + cp product.json product.original.json # Since jq has no inline edit. + jq --slurp '.[0] * .[1]' product.original.json <( + cat << EOF +@@ -105,7 +104,6 @@ EOF + # Reset so if you develop after building you will not be stuck with the wrong + # commit (the dev client will use `oss-dev` but the dev server will still use + # product.json which will have `stable-$commit`). +- git checkout product.json + + popd + diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix new file mode 100644 index 0000000000000..7c038451b7c7a --- /dev/null +++ b/pkgs/servers/code-server/default.nix @@ -0,0 +1,327 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +, makeWrapper +, cacert +, moreutils +, jq +, git +, rsync +, pkg-config +, yarn +, python3 +, esbuild +, nodejs +, node-gyp +, libsecret +, xorg +, ripgrep +, AppKit +, Cocoa +, CoreServices +, Security +, cctools +, xcbuild +, quilt +, nixosTests +}: + +let + system = stdenv.hostPlatform.system; + + python = python3; + yarn' = yarn.override { inherit nodejs; }; + defaultYarnOpts = [ ]; + + esbuild' = esbuild.override { + buildGoModule = args: buildGoModule (args // rec { + version = "0.16.17"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }; + + # replaces esbuild's download script with a binary from nixpkgs + patchEsbuild = path: version: '' + mkdir -p ${path}/node_modules/esbuild/bin + jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json + sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js + ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild + ''; + + # Comment from @code-asher, the code-server maintainer + # See https://github.com/NixOS/nixpkgs/pull/240001#discussion_r1244303617 + # + # If the commit is missing it will break display languages (Japanese, Spanish, + # etc). For some reason VS Code has a hard dependency on the commit being set + # for that functionality. + # The commit is also used in cache busting. Without the commit you could run + # into issues where the browser is loading old versions of assets from the + # cache. + # Lastly, it can be helpful for the commit to be accurate in bug reports + # especially when they are built outside of our CI as sometimes the version + # numbers can be unreliable (since they are arbitrarily provided). + # + # To compute the commit when upgrading this derivation, do: + # `$ git rev-parse <git-rev>` where <git-rev> is the git revision of the `src` + # Example: `$ git rev-parse v4.16.1` + commit = "0c98611e6b43803a9d5dba222d7023b569abfb49"; +in +stdenv.mkDerivation (finalAttrs: { + pname = "code-server"; + version = "4.19.1"; + + src = fetchFromGitHub { + owner = "coder"; + repo = "code-server"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-J+6zuqVf1YKQjiRiqO4867DEwYzZsgQYgbsRXPo2hwY="; + }; + + yarnCache = stdenv.mkDerivation { + name = "${finalAttrs.pname}-${finalAttrs.version}-${system}-yarn-cache"; + inherit (finalAttrs) src; + + nativeBuildInputs = [ yarn' git cacert ]; + + buildPhase = '' + runHook preBuild + + export HOME=$PWD + export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" + + yarn --cwd "./vendor" install --modules-folder modules --ignore-scripts --frozen-lockfile + + yarn config set yarn-offline-mirror $out + find "$PWD" -name "yarn.lock" -printf "%h\n" | \ + xargs -I {} yarn --cwd {} \ + --frozen-lockfile --ignore-scripts --ignore-platform \ + --ignore-engines --no-progress --non-interactive + + find ./lib/vscode -name "yarn.lock" -printf "%h\n" | \ + xargs -I {} yarn --cwd {} \ + --ignore-scripts --ignore-engines + + runHook postBuild + ''; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "sha256-g2rwB+PuWuYgrzIuW0ngia7cdPMC8s7ffBEkbmPPzB4="; + }; + + nativeBuildInputs = [ + nodejs + yarn' + python + pkg-config + makeWrapper + git + rsync + jq + moreutils + quilt + ]; + + buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] + ++ (with xorg; [ libX11 libxkbfile ]) + ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + CoreServices + Security + cctools + xcbuild + ]; + + patches = [ + # Remove all git calls from the VS Code build script except `git rev-parse + # HEAD` which is replaced in postPatch with the commit. + ./build-vscode-nogit.patch + ]; + + postPatch = '' + export HOME=$PWD + + patchShebangs ./ci + + # inject git commit + substituteInPlace ./ci/build/build-vscode.sh \ + --replace '$(git rev-parse HEAD)' "${commit}" + substituteInPlace ./ci/build/build-release.sh \ + --replace '$(git rev-parse HEAD)' "${commit}" + ''; + + configurePhase = '' + runHook preConfigure + + # run yarn offline by default + echo '--install.offline true' >> .yarnrc + + # set default yarn opts + ${lib.concatMapStrings (option: '' + yarn --offline config set ${option} + '') defaultYarnOpts} + + # set offline mirror to yarn cache we created in previous steps + yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}" + + # skip unnecessary electron download + export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + + # set nodedir to prevent node-gyp from downloading headers + # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific + mkdir -p $HOME/.node-gyp/${nodejs.version} + echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion + ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} + export npm_config_nodedir=${nodejs} + + # use updated node-gyp. fixes the following error on Darwin: + # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil' + export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + # install code-server dependencies + yarn --offline --ignore-scripts + + # apply patches + quilt push -a + + # patch shebangs of everything to allow binary packages to build + patchShebangs . + + export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 + export SKIP_SUBMODULE_DEPS=1 + export NODE_OPTIONS=--openssl-legacy-provider + + # rebuild binary packages now that scripts have been patched + echo "----- NPM rebuild" + npm rebuild --prefer-offline + + # Replicate ci/dev/postinstall.sh + echo "----- Replicate ci/dev/postinstall.sh" + yarn --cwd "./vendor" install --modules-folder modules --offline --ignore-scripts --frozen-lockfile + + # remove all built-in extensions, as these are 3rd party extensions that + # get downloaded from vscode marketplace + jq --slurp '.[0] * .[1]' "./lib/vscode/product.json" <( + cat << EOF + { + "builtInExtensions": [] + } + EOF + ) | sponge ./lib/vscode/product.json + + # disable automatic updates + sed -i '/update.mode/,/\}/{s/default:.*/default: "none",/g}' \ + lib/vscode/src/vs/platform/update/common/update.config.contribution.ts + + # Patch out remote download of nodejs from build script + patch -p1 -i ${./remove-node-download.patch} + + # Fetch packages for vscode + find ./lib/vscode -name "yarn.lock" -printf "%h\n" | \ + xargs -I {} yarn --cwd {} \ + --frozen-lockfile --ignore-scripts --ignore-engines + + # patch shebangs of everything to allow binary packages to build + patchShebangs . + + ${patchEsbuild "./lib/vscode/build" "0.12.6"} + ${patchEsbuild "./lib/vscode/extensions" "0.11.23"} + '' + lib.optionalString stdenv.isDarwin '' + # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+ + # (see issue #101229) + pushd ./lib/vscode/remote/node_modules/@parcel/watcher + mkdir -p ./build/Release + mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node + jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json + popd + '' + '' + + # put ripgrep binary into bin, so postinstall does not try to download it + find -name ripgrep -type d \ + -execdir mkdir -p {}/bin \; \ + -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; + + # run postinstall scripts after patching + find ./lib/vscode \( -path "*/node_modules/*" -or -path "*/extensions/*" \) \ + -and -type f -name "yarn.lock" -printf "%h\n" | \ + xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true' + + # build code-server + yarn build + + # build vscode + VERSION=${finalAttrs.version} yarn build:vscode + + # inject version into package.json + jq --slurp '.[0] * .[1]' ./package.json <( + cat << EOF + { + "version": "${finalAttrs.version}" + } + EOF + ) | sponge ./package.json + + # create release + yarn release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/libexec/code-server $out/bin + + # copy release to libexec path + cp -R -T release "$out/libexec/code-server" + + # install only production dependencies + yarn --offline --cwd "$out/libexec/code-server" --production + + # create wrapper + makeWrapper "${nodejs}/bin/node" "$out/bin/code-server" \ + --add-flags "$out/libexec/code-server/out/node/entry.js" + + runHook postInstall + ''; + + passthru = { + prefetchYarnCache = lib.overrideDerivation finalAttrs.yarnCache (d: { + outputHash = lib.fakeSha256; + }); + tests = { + inherit (nixosTests) code-server; + }; + # vscode-with-extensions compatibility + executableName = "code-server"; + longName = "Visual Studio Code Server"; + }; + + meta = { + description = "Run VS Code on a remote server"; + longDescription = '' + code-server is VS Code running on a remote server, accessible through the + browser. + ''; + homepage = "https://github.com/coder/code-server"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ offline henkery code-asher ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + mainProgram = "code-server"; + }; +}) diff --git a/pkgs/servers/code-server/playwright.patch b/pkgs/servers/code-server/playwright.patch new file mode 100644 index 0000000000000..95a74748189d9 --- /dev/null +++ b/pkgs/servers/code-server/playwright.patch @@ -0,0 +1,10 @@ +--- ./vendor/modules/code-oss-dev/node_modules/playwright/install.js ++++ ./vendor/modules/code-oss-dev/node_modules/playwright/install.js +@@ -14,6 +14,4 @@ + * limitations under the License. + */ + +-const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry'); +- +-installDefaultBrowsersForNpmInstall(); ++process.stdout.write('Browser install disabled by Nix build script\n'); diff --git a/pkgs/servers/code-server/remove-node-download.patch b/pkgs/servers/code-server/remove-node-download.patch new file mode 100644 index 0000000000000..d19d4a2b5bf78 --- /dev/null +++ b/pkgs/servers/code-server/remove-node-download.patch @@ -0,0 +1,28 @@ +--- ./lib/vscode/build/gulpfile.reh.js ++++ ./lib/vscode/build/gulpfile.reh.js +@@ -268,9 +268,6 @@ + .pipe(util.stripSourceMappingURL()) + .pipe(jsFilter.restore); + +- const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`; +- const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); +- + let web = []; + if (type === 'reh-web') { + web = [ +@@ -287,7 +284,6 @@ + license, + sources, + deps, +- node, + ...web + ); + +@@ -385,7 +381,6 @@ + const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; + + const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( +- gulp.task(`node-${platform}-${arch}`), + util.rimraf(path.join(BUILD_ROOT, destinationFolderName)), + packageTask(type, platform, arch, sourceFolderName, destinationFolderName) + )); diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index fe8f95ecdf36c..21fd28f299237 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "23.02.6.1"; + version = "23.02.7.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-azgGM4qfS0xtUaiGfXtu8MNYdgpZRUfx+zBgAAlmt6g="; + sha256 = "sha256-0u96KnEahx7noA8vQEkC1f+hv4d3NGPmnof9G7bA7Oc="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 2d449c531cc8b..bb90a3a26f899 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.16.3"; + version = "1.17.1"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - hash = "sha256-XxT+66CNuDeVBoaNhlgET5bJYB/KDCjcO0RDmyI6S9o="; + hash = "sha256-z6pO9+fQ+0jeYM3wCG8T/1C5aSeSZITj+f8TmGxR+Gw="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorHash = "sha256-WNvdHT915GSTFhZZfoi/MCHAjzBVYkhUiPNPw5GDT4s="; + vendorHash = "sha256-Xt7azJS65B53jYPWLytNaGQv3Poy+3j4ak1Jq68vZRI="; doCheck = false; @@ -40,7 +40,7 @@ buildGoModule rec { description = "Tool for service discovery, monitoring and configuration"; homepage = "https://www.consul.io/"; platforms = platforms.linux ++ platforms.darwin; - license = licenses.mpl20; + license = licenses.bsl11; maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 techknowlogick]; mainProgram = "consul"; }; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 12cf26db2b2ac..f1d81aae92faf 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -4,6 +4,7 @@ , enableInfiniBandRdma ? false , enableMonitoring ? false , enableSnmp ? false +, nixosTests }: with lib; diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 4dfe4b33318c5..720b41a9350ca 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-Hy3QuwAHmZSsjy5A/1mrmrxdtle466HsQtDat3tYS8s="; + hash = "sha256-tKywmFSSWc538i7raCrZnFpMDnFMT23hYVoYndnIKJ4="; }; - vendorHash = "sha256-M7ogR1ya+sqlWVQpaXlvJy9YwhdM4XBDw8e2ZBPvEGY="; + vendorHash = "sha256-eFoXUroJgrstNYjSYsP6o0vTEW2k/+6JjyVn6bb4um8="; subPackages = [ # The server diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index e372ffe9bad8f..658d477a483d5 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { strictDeps = true; - doCheck = true; + # ERROR: All 188 tests were run, 90 failed unexpectedly. + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Flexible dictionary server and client implementing RFC 2229"; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index bc18c91ef7fe5..41da27f2baa1d 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "0d65d4b59f5df69b78c6295ade0a2ea7931831de7ef5eeee3e00f8a20af679e4"; + sha256 = "aab40aab2acd735c500f296bacaa5c84ff0488221a4068ce9946e973beacc5ae"; }; outputs = [ "bin" "out" "dev" ]; @@ -46,7 +46,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - CFLAGS = [ "-O2" "-DNDEBUG" ]; + CFLAGS = [ "-O2" "-DNDEBUG" ] + # https://gitlab.nic.cz/knot/knot-dns/-/issues/909 + ++ lib.optional stdenv.isDarwin "-D__APPLE_USE_RFC_3542"; doCheck = true; checkFlags = [ "V=1" ]; # verbose output in case some test fails diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index aa995a9f4843e..1f82bde0384c2 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-j6ykTima0pFfoACIerFjJjHqaHCcYs418RC/5yHs8hQ="; + sha256 = "sha256-gg2k44RyGRX0vK9/K+2YUZ2lY8bkwTDHQsckdg7AKgo="; }; prePatch = '' diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index e20a7caccaef0..4c379717ebe2a 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "4.8.3"; + version = "4.8.4"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-d7kRmb33GHQzRQHGfiZGnCZno3PYQjgD/mV0Fylcd7o="; + hash = "sha256-f0DIy8RlDQb+Sau6eZAuurs4Q2Pau9XO8nGWSgfDZFw="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; diff --git a/pkgs/servers/ebusd/default.nix b/pkgs/servers/ebusd/default.nix index 318c274cf2700..3e0b24c42c86d 100644 --- a/pkgs/servers/ebusd/default.nix +++ b/pkgs/servers/ebusd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ebusd"; - version = "23.2"; + version = "23.3"; src = fetchFromGitHub { owner = "john30"; repo = "ebusd"; rev = version; - sha256 = "2CkcTTxEzVrEPtUVVDxXPPkYqZT6+gsCcfTrt83sFv8="; + sha256 = "sha256-K3gZ5OudNA92S38U1+HndxjA7OVfh2ymYf8OetB646M="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index 6066fb718ef7d..2ebe8ad9d844f 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.4.5"; + version = "1.5.2"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar"; - sha256 = "sha256-ep/Je83rUE2mcRqIBbgNH+7uFYf0EoHuRo7JOgT2aIs="; + sha256 = "sha256-YpMVmRzY9Ik7n43WXZy6xOoF5qM13F5LADn091WIuN4="; }; # don't do anything? diff --git a/pkgs/servers/etcd/3.5.nix b/pkgs/servers/etcd/3.5.nix index e5d9a677f950b..2265470874126 100644 --- a/pkgs/servers/etcd/3.5.nix +++ b/pkgs/servers/etcd/3.5.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests }: let - version = "3.5.10"; + version = "3.5.11"; src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - hash = "sha256-X/de8YA55SZ6p8r/pV8CGxfDKN8voJlyA0r4ckan6ZE="; + hash = "sha256-OjAWi5EXy1d1O6HLBzHcSfeCNmZZLNtrQXpTJ075B0I="; }; CGO_ENABLED = 0; @@ -25,7 +25,7 @@ let inherit CGO_ENABLED meta src version; - vendorHash = "sha256-kFR6RvHoNM4SZOgJd7inUuw5GfRLM+3WsKU73We8UzU="; + vendorHash = "sha256-1/ma737hGdek+263w5OuO5iN5DTA8fpb6m0Fefyww20="; modRoot = "./server"; @@ -45,7 +45,7 @@ let inherit CGO_ENABLED meta src version; - vendorHash = "sha256-oVabZ2JZlLKHFCuAeeWRTrcSCxzz05HlvDu/YSMKuCs="; + vendorHash = "sha256-AMN8iWTIFeT0HLqxYrp7sieT0nEKBNwFXV9mZG3xG5I="; modRoot = "./etcdutl"; }; @@ -55,7 +55,7 @@ let inherit CGO_ENABLED meta src version; - vendorHash = "sha256-0j35caQfLh7kwDKgmTe1novqKfz/3JlQLbUk3+GFPhk="; + vendorHash = "sha256-zwafVpNBvrRUbL0qkDK9TOyo8KCiGjpZhvdUrgklG5Y="; modRoot = "./etcdctl"; }; diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 57004b66b03a5..45311b60232e3 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -1,5 +1,4 @@ { lib -, buildGoPackage , fetchFromGitHub , buildGoModule , sqlite diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index 5e7de83467263..33927bd1ef0c7 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.12.2"; + version = "0.13.0"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-vEjL9pZFBSt32ZqWZGvG112HA5nqkwY6uOQY3hBUWN4="; + hash = "sha256-aPxjfe+0f4hUBfwBH67LsR1/Kv/42sPhlHwmVmDfp30="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; rev = "refs/tags/v${version}"; - hash = "sha256-ufxedg3SSHqYf5g1GXXSWA0pmb305kpjkjyjwCX126A="; + hash = "sha256-+/x3CAGF/cjK1/7fHgC8EzlGR/Xmq3aFL5Ogc/QZCpA="; }; vendorHash = null; diff --git a/pkgs/servers/guacamole-client/default.nix b/pkgs/servers/guacamole-client/default.nix index d4e94dea0dade..23c56df62a46a 100644 --- a/pkgs/servers/guacamole-client/default.nix +++ b/pkgs/servers/guacamole-client/default.nix @@ -1,16 +1,15 @@ { lib , stdenvNoCC , fetchurl -, nixosTests }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "guacamole-client"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { url = "https://archive.apache.org/dist/guacamole/${finalAttrs.version}/binary/guacamole-${finalAttrs.version}.war"; - hash = "sha256-FaNObtbPbwP+IPkPZ9LWCXE6ic08syT4nt8edpbm7WE="; + hash = "sha256-Vyi1Y5Eb1kvOCguBx06ozLIZDReFv/NAMPxohagnPT4="; }; dontUnpack = true; @@ -25,10 +24,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = { - inherit (nixosTests) guacamole-client; - }; - meta = { description = "Clientless remote desktop gateway"; homepage = "https://guacamole.apache.org/"; diff --git a/pkgs/servers/guacamole-server/default.nix b/pkgs/servers/guacamole-server/default.nix index 8f14e7d9545c8..58628b48a5b85 100644 --- a/pkgs/servers/guacamole-server/default.nix +++ b/pkgs/servers/guacamole-server/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "guacamole-server"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "apache"; repo = "guacamole-server"; rev = finalAttrs.version; - hash = "sha256-8VPhaZ+XnbDElF5MOpbA8MDDTUkou9O2z4NUdWwW4FM="; + hash = "sha256-Jke9Sp/T/GyamTq7lyu8JakJHqEwSrer0v1DugSg7JY="; }; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index b104bb15997d4..89515fa265d34 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -5,53 +5,47 @@ python3.pkgs.buildPythonApplication rec { pname = "appdaemon"; - version = "4.2.1"; - format = "setuptools"; + version = "4.4.2"; + pyproject = true; - disabled = python3.pythonOlder "3.7"; + disabled = python3.pythonOlder "3.8"; src = fetchFromGitHub { owner = "AppDaemon"; repo = "appdaemon"; rev = "refs/tags/${version}"; - hash = "sha256-4sN0optkMmyWb5Cd3F7AhcXYHh7aidJE/bieYMEKgSY="; + hash = "sha256-T3InE4J4qYeFJTq6nrW8y5BOA7Z0n3t9eVpl641r/xk="; }; postPatch = '' # relax dependencies - sed -i 's/==/>=/' requirements.txt + sed -i 's/~=/>=/' pyproject.toml ''; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ - aiodns aiohttp aiohttp-jinja2 astral - azure-keyvault-secrets - azure-mgmt-compute - azure-mgmt-resource - azure-mgmt-storage - azure-storage-blob bcrypt - faust-cchardet deepdiff feedparser iso8601 - jinja2 paho-mqtt pid - pygments python-dateutil - python-engineio python-socketio pytz pyyaml requests sockjs uvloop - voluptuous websocket-client - yarl + tomli + tomli-w ]; # no tests implemented @@ -62,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Sandboxed Python execution environment for writing automation apps for Home Assistant"; homepage = "https://github.com/AppDaemon/appdaemon"; - changelog = "https://github.com/AppDaemon/appdaemon/blob/${version}/docs/HISTORY.rst"; + changelog = "https://github.com/AppDaemon/appdaemon/blob/${version}/docs/HISTORY.md"; license = licenses.mit; maintainers = teams.home-assistant.members; }; diff --git a/pkgs/servers/home-assistant/build-custom-component/check_manifest.py b/pkgs/servers/home-assistant/build-custom-component/check_manifest.py index bbe9535824e72..463a7579763d4 100644 --- a/pkgs/servers/home-assistant/build-custom-component/check_manifest.py +++ b/pkgs/servers/home-assistant/build-custom-component/check_manifest.py @@ -1,28 +1,31 @@ #!/usr/bin/env python3 import json -import importlib_metadata +import os import sys +import importlib_metadata from packaging.requirements import Requirement +def error(msg: str) -> None: + print(f" - {msg}", file=sys.stderr) + return False + + def check_requirement(req: str): # https://packaging.pypa.io/en/stable/requirements.html requirement = Requirement(req) try: version = importlib_metadata.distribution(requirement.name).version except importlib_metadata.PackageNotFoundError: - print(f" - Dependency {requirement.name} is missing", file=sys.stderr) - return False + return error(f"{requirement.name}{requirement.specifier} not present") # https://packaging.pypa.io/en/stable/specifiers.html - if not version in requirement.specifier: - print( - f" - {requirement.name}{requirement.specifier} expected, but got {version}", - file=sys.stderr, + if version not in requirement.specifier: + return error( + f"{requirement.name}{requirement.specifier} expected, but got {version}" ) - return False return True @@ -30,13 +33,24 @@ def check_requirement(req: str): def check_manifest(manifest_file: str): with open(manifest_file) as fd: manifest = json.load(fd) + + ok = True + + derivation_domain = os.environ.get("domain") + manifest_domain = manifest["domain"] + if derivation_domain != manifest_domain: + ok = False + error( + f"Derivation attribute domain ({derivation_domain}) must match manifest domain ({manifest_domain})" + ) + if "requirements" in manifest: - ok = True for requirement in manifest["requirements"]: ok &= check_requirement(requirement) - if not ok: - print("Manifest requirements are not met", file=sys.stderr) - sys.exit(1) + + if not ok: + error("Manifest check failed.") + sys.exit(1) if __name__ == "__main__": diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index 05b7c2d4b0392..2948d15bb8144 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -3,7 +3,8 @@ , makeSetupHook }: -{ pname +{ owner +, domain , version , format ? "other" , ... @@ -17,13 +18,14 @@ let in home-assistant.python.pkgs.buildPythonPackage ( { + pname = "${owner}/${domain}"; inherit format; installPhase = '' runHook preInstall mkdir $out - cp -r $src/custom_components/ $out/ + cp -r ./custom_components/ $out/ runHook postInstall ''; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0ed97c596724c..6c8157496d45a 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.11.3"; + version = "2023.12.4"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -60,10 +60,11 @@ "airthings_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly airthings-ble - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -72,6 +73,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -110,6 +112,8 @@ ]; "alexa" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "alpha_vantage" = ps: with ps; [ @@ -123,6 +127,8 @@ ]; "ambiclimate" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ambiclimate ]; "ambient_station" = ps: with ps; [ @@ -139,6 +145,8 @@ ]; "analytics" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -161,7 +169,8 @@ anel-pwrctrl-homeassistant ]; "anova" = ps: with ps; [ - ]; # missing inputs: anova-wifi + anova-wifi + ]; "anthemav" = ps: with ps; [ anthemav ]; @@ -175,9 +184,13 @@ ]; "api" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "apple_tv" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -187,6 +200,8 @@ ]; "application_credentials" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -206,10 +221,11 @@ "aranet" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly aranet4 - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -218,6 +234,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -242,6 +259,8 @@ ]; "arwn" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; @@ -250,6 +269,9 @@ ]; "assist_pipeline" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ha-ffmpeg hassil home-assistant-intents mutagen @@ -263,6 +285,7 @@ ]; "asuswrt" = ps: with ps; [ aioasuswrt + pyasuswrt ]; "atag" = ps: with ps; [ pyatag @@ -292,9 +315,13 @@ ]; "auth" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "automation" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "avea" = ps: with ps; [ avea @@ -310,6 +337,8 @@ ]; "axis" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng axis janus paho-mqtt @@ -325,6 +354,8 @@ ]; "backup" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant securetar @@ -377,9 +408,10 @@ "bluemaestro" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluemaestro-ble @@ -389,6 +421,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -407,6 +440,8 @@ ]; "bluetooth" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bleak bleak-retry-connector bluetooth-adapters @@ -422,9 +457,10 @@ "bluetooth_adapters" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -433,6 +469,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -447,9 +484,10 @@ "bluetooth_le_tracker" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -458,6 +496,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -475,12 +514,15 @@ ]; "bmw_connected_drive" = ps: with ps; [ bimmer-connected - ]; + ] + ++ bimmer-connected.optional-dependencies.china; "bond" = ps: with ps; [ bond-async ]; "bosch_shc" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng boschshcpy fnv-hash-fast ifaddr @@ -522,9 +564,10 @@ "bthome" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -534,6 +577,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -559,9 +603,13 @@ ]; "calendar" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "camera" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "canary" = ps: with ps; [ @@ -570,7 +618,10 @@ ]; "cast" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents @@ -581,6 +632,7 @@ plexwebsocket psutil-home-assistant pychromecast + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -617,11 +669,18 @@ ]; "cloud" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "cloudflare" = ps: with ps; [ @@ -630,7 +689,7 @@ "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ - co2signal + aioelectricitymaps ]; "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase @@ -658,6 +717,8 @@ ]; "config" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "configurator" = ps: with ps; [ ]; @@ -666,6 +727,8 @@ ]; "conversation" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng hassil home-assistant-intents ]; @@ -687,6 +750,8 @@ ]; "crownstone" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng crownstone-cloud crownstone-sse crownstone-uart @@ -732,6 +797,8 @@ "default_config" = ps: with ps; [ aiodiscover aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client bleak bleak-retry-connector @@ -741,6 +808,7 @@ dbus-fast fnv-hash-fast ha-av + ha-ffmpeg hass-nabucasa hassil home-assistant-frontend @@ -753,6 +821,7 @@ psutil-home-assistant pynacl pyserial + python-matter-server pyturbojpeg pyudev scapy @@ -771,6 +840,8 @@ ]; "demo" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng hassil home-assistant-intents ]; @@ -781,16 +852,31 @@ ]; "derivative" = ps: with ps; [ ]; + "devialet" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + devialet + fnv-hash-fast + ifaddr + psutil-home-assistant + sqlalchemy + zeroconf + ]; "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pillow ]; "device_tracker" = ps: with ps; [ ]; "devolo_home_control" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng devolo-home-control-api fnv-hash-fast ifaddr @@ -810,9 +896,13 @@ ]; "diagnostics" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "dialogflow" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "diaz" = ps: with ps; [ ]; @@ -843,6 +933,8 @@ ]; # missing inputs: pyW215 "dlna_dmr" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast getmac @@ -853,6 +945,8 @@ ]; "dlna_dms" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -865,6 +959,8 @@ ]; "dominos" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow @@ -872,6 +968,8 @@ ]; "doorbird" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng doorbirdpy ]; "dooya" = ps: with ps; [ @@ -879,9 +977,10 @@ "dormakaba_dkey" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -890,6 +989,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -914,6 +1014,8 @@ ]; "dsmr_reader" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; @@ -936,14 +1038,17 @@ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng dynalite-devices + dynalite-panel fnv-hash-fast home-assistant-frontend janus pillow psutil-home-assistant sqlalchemy - ]; # missing inputs: dynalite-panel + ]; "eafm" = ps: with ps; [ aioeafm ]; @@ -973,6 +1078,8 @@ "ecowitt" = ps: with ps; [ aioecowitt aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "eddystone_temperature" = ps: with ps; [ ]; # missing inputs: beacontools @@ -994,6 +1101,8 @@ ]; # missing inputs: pyElectra "electric_kiwi" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1006,6 +1115,8 @@ ]; "elkm1" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng elkm1-lib fnv-hash-fast ifaddr @@ -1030,6 +1141,8 @@ ]; "emulated_hue" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -1040,6 +1153,8 @@ ]; "emulated_roku" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng emulated-roku fnv-hash-fast ifaddr @@ -1050,6 +1165,8 @@ ]; "energy" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1085,32 +1202,6 @@ ]; "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter - "eq3btsmart" = ps: with ps; [ - aioesphomeapi - aiohttp-cors - aioruuvigateway - aioshelly - async-interrupt - bleak - bleak-retry-connector - bluetooth-adapters - bluetooth-auto-recovery - bluetooth-data-tools - construct - 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: python-eq3bt "escea" = ps: with ps; [ pescea ]; @@ -1119,7 +1210,8 @@ "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors - async-interrupt + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bleak bleak-retry-connector bluetooth-adapters @@ -1128,6 +1220,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1147,9 +1240,10 @@ "eufylife_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1159,6 +1253,7 @@ esphome-dashboard-api eufylife-ble-client fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1226,6 +1321,8 @@ ]; "file_upload" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus ]; "filesize" = ps: with ps; [ @@ -1248,6 +1345,8 @@ ]; "fitbit" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fitbit fnv-hash-fast psutil-home-assistant @@ -1262,9 +1361,10 @@ "fjaraskupan" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1274,6 +1374,7 @@ esphome-dashboard-api fjaraskupan fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1314,6 +1415,8 @@ ]; "flux_led" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng flux-led fnv-hash-fast ifaddr @@ -1333,6 +1436,8 @@ ]; "forked_daapd" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant spotipy @@ -1346,6 +1451,8 @@ ]; "foursquare" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms @@ -1360,6 +1467,8 @@ ]; "fritz" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast fritzconnection ifaddr @@ -1380,6 +1489,8 @@ ]; "frontend" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -1391,6 +1502,11 @@ afsapi ]; "fully_kiosk" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + janus + paho-mqtt python-fullykiosk ]; "futurenow" = ps: with ps; [ @@ -1404,9 +1520,10 @@ "gardena_bluetooth" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1415,6 +1532,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1435,6 +1553,8 @@ ]; "generic" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ha-av pillow ]; @@ -1458,6 +1578,8 @@ ]; "geocaching" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast geocachingapi psutil-home-assistant @@ -1465,6 +1587,8 @@ ]; "geofency" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes @@ -1497,6 +1621,8 @@ ]; "google" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast gcal-sync oauth2client @@ -1505,10 +1631,18 @@ ]; "google_assistant" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy ]; "google_assistant_sdk" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast gassist-text psutil-home-assistant @@ -1521,12 +1655,16 @@ ]; "google_generative_ai_conversation" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng google-generativeai hassil home-assistant-intents ]; "google_mail" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast google-api-python-client psutil-home-assistant @@ -1540,6 +1678,8 @@ ]; "google_sheets" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast gspread psutil-home-assistant @@ -1547,6 +1687,8 @@ ]; "google_tasks" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast google-api-python-client psutil-home-assistant @@ -1563,9 +1705,10 @@ "govee_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1575,6 +1718,7 @@ esphome-dashboard-api fnv-hash-fast govee-ble + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1591,11 +1735,15 @@ ]; "gpslogger" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "graphite" = ps: with ps; [ ]; "gree" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast greeclimate ifaddr @@ -1625,6 +1773,8 @@ ]; "hardkernel" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng psutil-home-assistant ]; "hardware" = ps: with ps; [ @@ -1638,6 +1788,8 @@ ]; "hassio" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "havana_shade" = ps: with ps; [ ]; @@ -1673,6 +1825,8 @@ ]; "history" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -1692,6 +1846,8 @@ ]; "home_connect" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast homeconnect psutil-home-assistant @@ -1699,6 +1855,8 @@ ]; "home_plus_control" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng homepluscontrol ]; "homeassistant" = ps: with ps; [ @@ -1707,6 +1865,8 @@ ]; "homeassistant_green" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -1727,6 +1887,8 @@ ]; "homeassistant_hardware" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -1747,6 +1909,8 @@ ]; "homeassistant_sky_connect" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -1767,6 +1931,8 @@ ]; "homeassistant_yellow" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -1787,6 +1953,8 @@ ]; "homekit" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng base36 fnv-hash-fast ha-ffmpeg @@ -1802,9 +1970,10 @@ aioesphomeapi aiohomekit aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1813,6 +1982,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1848,10 +2018,14 @@ ]; "html5" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pywebpush ]; "http" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "huawei_lte" = ps: with ps; [ huawei-lte-api @@ -1893,9 +2067,10 @@ "ibeacon" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1904,6 +2079,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ibeacon-ble @@ -1922,9 +2098,10 @@ "idasen_desk" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1933,6 +2110,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -1948,6 +2126,8 @@ ]; # missing inputs: rfk101py "ifttt" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyfttt ]; "iglo" = ps: with ps; [ @@ -1960,25 +2140,34 @@ ]; # missing inputs: ihcsdk "image" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "image_processing" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "image_upload" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pillow ]; "imap" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioimaplib ]; "improv_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -1987,6 +2176,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2008,9 +2198,10 @@ "inkbird" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2019,6 +2210,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2047,6 +2239,8 @@ ]; "insteon" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend insteon-frontend-home-assistant @@ -2065,6 +2259,8 @@ ]; "intent" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "intent_script" = ps: with ps; [ ]; @@ -2073,6 +2269,8 @@ ]; "ios" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -2148,9 +2346,10 @@ "kegtron" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2159,6 +2358,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2180,9 +2380,10 @@ "keymitt_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2191,6 +2392,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2219,6 +2421,8 @@ ]; "knx" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -2231,10 +2435,14 @@ ]; "kodi" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pykodi ]; "konnected" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng konnected ]; "kostal_plenticore" = ps: with ps; [ @@ -2257,6 +2465,8 @@ ]; # missing inputs: lacrosse-view "lametric" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng demetriek fnv-hash-fast psutil-home-assistant @@ -2264,6 +2474,8 @@ ]; "landisgyr_heat_meter" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -2290,9 +2502,10 @@ "ld2410_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2301,6 +2514,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2316,9 +2530,10 @@ "led_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2327,6 +2542,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2355,6 +2571,8 @@ ]; "lifx" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiolifx aiolifx-effects aiolifx-themes @@ -2373,6 +2591,8 @@ "limitlessled" = ps: with ps; [ limitlessled ]; + "linear_garage_door" = ps: with ps; [ + ]; # missing inputs: linear-garage-door "linksys_smart" = ps: with ps; [ ]; "linode" = ps: with ps; [ @@ -2400,6 +2620,8 @@ ]; "local_ip" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -2410,11 +2632,15 @@ ]; "locative" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "lock" = ps: with ps; [ ]; "logbook" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -2428,6 +2654,8 @@ ]; "logi_circle" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ha-ffmpeg logi-circle ]; @@ -2440,12 +2668,19 @@ ]; "loqed" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents loqedapi mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "lovelace" = ps: with ps; [ @@ -2471,6 +2706,8 @@ ]; # missing inputs: lw12 "lyric" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiolyric fnv-hash-fast psutil-home-assistant @@ -2478,20 +2715,28 @@ ]; "mailbox" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "mailgun" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pymailgunner ]; "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "map" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -2514,6 +2759,8 @@ ]; "matter" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant python-matter-server @@ -2530,9 +2777,10 @@ "medcom_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2541,6 +2789,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2554,13 +2803,19 @@ ]; # missing inputs: medcom-ble "media_extractor" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng yt-dlp ]; "media_player" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "media_source" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "mediaroom" = ps: with ps; [ pymediaroom @@ -2573,9 +2828,10 @@ "melnor" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2584,6 +2840,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2597,6 +2854,8 @@ ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "message_bird" = ps: with ps; [ messagebird @@ -2625,14 +2884,20 @@ ]; # missing inputs: pycsspeechtts "microsoft_face" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "microsoft_face_detect" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "microsoft_face_identify" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg ]; "mijndomein_energie" = ps: with ps; [ @@ -2657,9 +2922,10 @@ "moat" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2668,6 +2934,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2682,7 +2949,10 @@ ]; "mobile_app" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents @@ -2690,6 +2960,7 @@ pillow psutil-home-assistant pynacl + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -2701,6 +2972,8 @@ ]; "modem_callerid" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast phone-modem psutil-home-assistant @@ -2724,9 +2997,10 @@ "mopeka" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -2735,6 +3009,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -2749,6 +3024,8 @@ ]; "motion_blinds" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr motionblinds @@ -2757,6 +3034,8 @@ ]; "motioneye" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng motioneye-client ]; "mpd" = ps: with ps; [ @@ -2764,26 +3043,36 @@ ]; "mqtt" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "mqtt_json" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "mqtt_room" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; @@ -2801,6 +3090,8 @@ ]; "my" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -2809,16 +3100,19 @@ sqlalchemy ]; "myq" = ps: with ps; [ - python-myq ]; "mysensors" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ @@ -2838,6 +3132,8 @@ ]; "neato" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pybotvac @@ -2851,6 +3147,8 @@ ]; "nest" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast google-nest-sdm ha-ffmpeg @@ -2859,13 +3157,17 @@ ]; "netatmo" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen psutil-home-assistant pyatmo + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -2881,9 +3183,13 @@ ]; "netio" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; # missing inputs: pynetio "network" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -2928,6 +3234,8 @@ ]; "nmap_tracker" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast getmac ifaddr @@ -2966,6 +3274,8 @@ ]; "nuki" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pynuki ]; "numato" = ps: with ps; [ @@ -3008,6 +3318,8 @@ ]; "onboarding" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast pillow psutil-home-assistant @@ -3018,6 +3330,8 @@ ]; "ondilo_ico" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ondilo ]; "onewire" = ps: with ps; [ @@ -3036,6 +3350,8 @@ ]; "openai_conversation" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng hassil home-assistant-intents openai @@ -3091,9 +3407,10 @@ "oralb" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3102,6 +3419,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3125,6 +3443,8 @@ ]; # missing inputs: lightify "otbr" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast ifaddr @@ -3150,6 +3470,8 @@ "otp" = ps: with ps; [ pyotp ]; + "ourgroceries" = ps: with ps; [ + ]; # missing inputs: ourgroceries "overkiz" = ps: with ps; [ pyoverkiz ]; @@ -3158,14 +3480,21 @@ ]; "owntracks" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents janus mutagen paho-mqtt + psutil-home-assistant pynacl + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "p1_monitor" = ps: with ps; [ @@ -3182,6 +3511,8 @@ ]; "panel_custom" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -3191,6 +3522,8 @@ ]; "panel_iframe" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast home-assistant-frontend janus @@ -3213,10 +3546,14 @@ ]; "pepco" = ps: with ps; [ ]; + "permobil" = ps: with ps; [ + ]; # missing inputs: mypermobil "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pillow ]; "pge" = ps: with ps; [ @@ -3245,12 +3582,19 @@ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant pyplaato + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "plant" = ps: with ps; [ @@ -3260,6 +3604,8 @@ ]; "plex" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng plexapi plexauth plexwebsocket @@ -3274,6 +3620,8 @@ ]; "point" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pypoint ]; "poolsense" = ps: with ps; [ @@ -3287,9 +3635,10 @@ "private_ble_device" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3298,6 +3647,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3320,6 +3670,8 @@ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng prometheus-client ]; "prosegur" = ps: with ps; [ @@ -3353,6 +3705,8 @@ ]; "push" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "pushbullet" = ps: with ps; [ pushbullet-py @@ -3372,16 +3726,16 @@ ]; "python_script" = ps: with ps; [ restrictedpython - restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent "qingping" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3390,6 +3744,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3428,12 +3783,19 @@ ]; "rachio" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg rachiopy + sqlalchemy webrtc-noise-gain ]; "radarr" = ps: with ps; [ @@ -3463,9 +3825,10 @@ "rapt_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3474,6 +3837,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3488,6 +3852,8 @@ ]; "raspberry_pi" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng psutil-home-assistant ]; "raspyrfm" = ps: with ps; [ @@ -3507,7 +3873,10 @@ ]; "recovery_mode" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-frontend @@ -3516,6 +3885,7 @@ mutagen pillow psutil-home-assistant + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain @@ -3540,13 +3910,18 @@ renault-api ]; "renson" = ps: with ps; [ - ]; # missing inputs: renson-endura-delta + renson-endura-delta + ]; "reolink" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng reolink-aio ]; "repairs" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetierng @@ -3566,6 +3941,8 @@ ]; "rhasspy" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "ridwell" = ps: with ps; [ aioridwell @@ -3573,7 +3950,8 @@ "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell - ]; + ] + ++ ring-doorbell.optional-dependencies.listen; "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "risco" = ps: with ps; [ @@ -3587,7 +3965,7 @@ ]; "roborock" = ps: with ps; [ python-roborock - ]; + ]; # missing inputs: vacuum-map-parser-roborock "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ @@ -3612,11 +3990,15 @@ ]; "rss_feed_template" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "rtorrent" = ps: with ps; [ ]; "rtsp_to_webrtc" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyturbojpeg rtsp-to-webrtc ]; @@ -3629,6 +4011,8 @@ ]; # missing inputs: russound "ruuvi_gateway" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway bleak bleak-retry-connector @@ -3645,9 +4029,10 @@ "ruuvitag_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3656,6 +4041,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3678,6 +4064,8 @@ ]; "samsungtv" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast getmac @@ -3720,6 +4108,8 @@ ]; # missing inputs: scsgate "search" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -3741,9 +4131,10 @@ "sensirion_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3752,6 +4143,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3774,9 +4166,10 @@ "sensorpro" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3785,6 +4178,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3800,9 +4194,10 @@ "sensorpush" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3811,6 +4206,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -3828,6 +4224,8 @@ ]; "senz" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiosenz fnv-hash-fast psutil-home-assistant @@ -3857,6 +4255,8 @@ ]; "shelly" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioshelly bleak bleak-retry-connector @@ -3875,6 +4275,8 @@ ]; "shopping_list" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "sia" = ps: with ps; [ pysiaalarm @@ -3928,6 +4330,8 @@ ]; # missing inputs: goslide-api "slimproto" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioslimproto ]; "sma" = ps: with ps; [ @@ -3935,6 +4339,8 @@ ]; "smappee" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pysmappee ]; "smart_blinds" = ps: with ps; [ @@ -3948,13 +4354,20 @@ ]; "smartthings" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant pysmartapp pysmartthings + python-matter-server pyturbojpeg + sqlalchemy webrtc-noise-gain ]; "smarttub" = ps: with ps; [ @@ -3973,6 +4386,8 @@ ]; "snips" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng janus paho-mqtt ]; @@ -3982,9 +4397,10 @@ "snooz" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -3993,6 +4409,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4033,6 +4450,8 @@ ]; "sonos" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -4054,6 +4473,8 @@ ]; "spaceapi" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "spc" = ps: with ps; [ pyspcwebgw @@ -4068,6 +4489,8 @@ ]; # missing inputs: hass-splunk "spotify" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant spotipy @@ -4084,6 +4507,8 @@ ]; "ssdp" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -4114,6 +4539,8 @@ ]; "steamist" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiosteamist discovery30303 fnv-hash-fast @@ -4131,6 +4558,8 @@ ]; # missing inputs: stookwijzer "stream" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ha-av numpy pyturbojpeg @@ -4140,6 +4569,8 @@ ]; "stt" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "subaru" = ps: with ps; [ subarulink @@ -4174,9 +4605,10 @@ "switchbot" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4185,6 +4617,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4217,6 +4650,8 @@ ]; "synology_dsm" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng py-synologydsm-api ]; "synology_srm" = ps: with ps; [ @@ -4225,6 +4660,8 @@ ]; "system_bridge" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4233,6 +4670,8 @@ ]; # missing inputs: systembridgeconnector "system_health" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "system_log" = ps: with ps; [ ]; @@ -4259,6 +4698,8 @@ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng hatasmota janus paho-mqtt @@ -4273,11 +4714,15 @@ ]; "telegram" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pysocks python-telegram-bot ]; "telegram_bot" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pysocks python-telegram-bot ]; @@ -4309,9 +4754,10 @@ "thermobeacon" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4320,6 +4766,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4337,9 +4784,10 @@ "thermopro" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4348,6 +4796,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4373,6 +4822,8 @@ ]; "thread" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4397,9 +4848,10 @@ "tilt_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4408,6 +4860,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4433,6 +4886,8 @@ ]; "todo" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "todoist" = ps: with ps; [ todoist-api-python @@ -4447,16 +4902,25 @@ ]; "toon" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen + psutil-home-assistant + python-matter-server pyturbojpeg + sqlalchemy toonapi webrtc-noise-gain ]; "torque" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "totalconnect" = ps: with ps; [ total-connect-client @@ -4465,6 +4929,8 @@ ]; # missing inputs: pytouchline "tplink" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4478,6 +4944,8 @@ ]; "traccar" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pytraccar stringcase ]; @@ -4515,6 +4983,9 @@ ]; "tts" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ha-ffmpeg mutagen ]; "tuya" = ps: with ps; [ @@ -4526,14 +4997,20 @@ ]; "twilio" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng twilio ]; "twinkly" = ps: with ps; [ @@ -4541,6 +5018,8 @@ ]; "twitch" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4574,6 +5053,8 @@ ]; "unifiprotect" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng pyunifiprotect unifi-discovery ]; @@ -4592,6 +5073,8 @@ ]; "upnp" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast getmac @@ -4609,6 +5092,8 @@ ]; "usb" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -4624,6 +5109,9 @@ "uvc" = ps: with ps; [ uvcclient ]; + "v2c" = ps: with ps; [ + pytrydan + ]; "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ @@ -4633,6 +5121,8 @@ ]; # missing inputs: vtjp "velbus" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -4690,6 +5180,9 @@ ]; "voip" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ha-ffmpeg hassil home-assistant-intents mutagen @@ -4746,12 +5239,16 @@ ]; "webhook" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng ]; "webostv" = ps: with ps; [ aiowebostv ]; "websocket_api" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4777,19 +5274,25 @@ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiowithings fnv-hash-fast + ha-ffmpeg hass-nabucasa hassil home-assistant-intents mutagen psutil-home-assistant + python-matter-server pyturbojpeg sqlalchemy webrtc-noise-gain ]; "wiz" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4816,12 +5319,22 @@ "wsdot" = ps: with ps; [ ]; "wyoming" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + ha-ffmpeg + hassil + home-assistant-intents + mutagen + webrtc-noise-gain wyoming ]; "x10" = ps: with ps; [ ]; "xbox" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4839,9 +5352,10 @@ "xiaomi_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4850,6 +5364,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4884,9 +5399,10 @@ "yalexs_ble" = ps: with ps; [ aioesphomeapi aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aioruuvigateway aioshelly - async-interrupt bleak bleak-retry-connector bluetooth-adapters @@ -4895,6 +5411,7 @@ dbus-fast esphome-dashboard-api fnv-hash-fast + ha-ffmpeg hassil home-assistant-intents ifaddr @@ -4912,6 +5429,8 @@ ]; "yamaha_musiccast" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng aiomusiccast async-upnp-client fnv-hash-fast @@ -4930,6 +5449,8 @@ ]; "yeelight" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng async-upnp-client fnv-hash-fast ifaddr @@ -4946,6 +5467,8 @@ ]; "yolink" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4956,6 +5479,8 @@ ]; "youtube" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant sqlalchemy @@ -4971,6 +5496,8 @@ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -4987,6 +5514,8 @@ ]; # missing inputs: zeversolar "zha" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng bellows fnv-hash-fast janus @@ -5018,6 +5547,8 @@ ]; "zwave_js" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast psutil-home-assistant pyserial @@ -5027,6 +5558,8 @@ ]; "zwave_me" = ps: with ps; [ aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng fnv-hash-fast ifaddr psutil-home-assistant @@ -5070,6 +5603,7 @@ "android_ip_webcam" "androidtv" "androidtv_remote" + "anova" "anthemav" "apache_kafka" "apcupsd" @@ -5156,6 +5690,7 @@ "demo" "denonavr" "derivative" + "devialet" "device_automation" "device_sun_light_trigger" "device_tracker" @@ -5181,6 +5716,7 @@ "dunehd" "duotecno" "dwd_weather_warnings" + "dynalite" "eafm" "easyenergy" "ecobee" @@ -5568,6 +6104,7 @@ "reddit" "remote" "renault" + "renson" "reolink" "repairs" "rest" @@ -5580,7 +6117,6 @@ "risco" "rituals_perfume_genie" "rmvtransport" - "roborock" "roku" "roomba" "roon" @@ -5744,6 +6280,7 @@ "usgs_earthquakes_feed" "utility_meter" "uvc" + "v2c" "vacuum" "vallox" "velbus" diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md index a7244b25c173b..d7137e5c62f7f 100644 --- a/pkgs/servers/home-assistant/custom-components/README.md +++ b/pkgs/servers/home-assistant/custom-components/README.md @@ -25,7 +25,7 @@ versions into the Python environment. }: buildHomeAssistantComponent { - # pname, version + # owner, domain, version src = fetchFromGithub { # owner, repo, rev, hash @@ -40,18 +40,34 @@ buildHomeAssistantComponent { } } -## Package name normalization +## Package attribute -Apply the same normalization rules as defined for python packages in -[PEP503](https://peps.python.org/pep-0503/#normalized-names). -The name should be lowercased and dots, underlines or multiple -dashes should all be replaced by a single dash. +The attribute name must reflect the domain as seen in the +`manifest.json`, which in turn will match the python module name below +in the `custom_components/` directory. + +**Example:** + +The project [mweinelt/ha-prometheus-sensor](https://github.com/mweinelt/ha-prometheus-sensor/blob/1.0.0/custom_components/prometheus_sensor/manifest.json#L2) +would receive the attribute name `"prometheus_sensor"`, because both +domain in the `manifest.json` as well as the module name are +`prometheus_sensor`. + +## Package name + +The `pname` attribute is a composition of both `owner` and `domain`. + +Don't set `pname`, set `owner and `domain` instead. + +Exposing the `domain` attribute separately allows checking for +conflicting components at eval time. ## Manifest check The `buildHomeAssistantComponent` builder uses a hook to check whether the dependencies specified in the `manifest.json` are present and -inside the specified version range. +inside the specified version range. It also makes sure derivation +and manifest agree about the domain name. There shouldn't be a need to disable this hook, but you can set `dontCheckManifest` to `true` in the derivation to achieve that. diff --git a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix new file mode 100644 index 0000000000000..1d2ae2228a5b2 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, buildHomeAssistantComponent +, ulid-transform +}: + +buildHomeAssistantComponent rec { + owner = "basnijholt"; + domain = "adaptive_lighting"; + version = "1.19.1"; + + src = fetchFromGitHub { + owner = "basnijholt"; + repo = "adaptive-lighting"; + rev = "refs/tags/${version}"; + hash = "sha256-AZsloE1vNQ9o2pg878J6I5qYXyI4fqYEvr18SrTocWo="; + }; + + propagatedBuildInputs = [ + ulid-transform + ]; + + meta = with lib; { + changelog = "https://github.com/basnijholt/adaptive-lighting/releases/tag/${version}"; + description = "Home Assistant Adaptive Lighting Plugin - Sun Synchronized Lighting"; + homepage = "https://github.com/basnijholt/adaptive-lighting"; + maintainers = with maintainers; [ mindstorms6 ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 4a96b305964ae..310b4592b20f0 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -2,5 +2,13 @@ }: { - prometheus-sensor = callPackage ./prometheus-sensor {}; + adaptive_lighting = callPackage ./adaptive_lighting {}; + + govee-lan = callPackage ./govee-lan {}; + + miele = callPackage ./miele {}; + + prometheus_sensor = callPackage ./prometheus_sensor {}; + + waste_collection_schedule = callPackage ./waste_collection_schedule {}; } diff --git a/pkgs/servers/home-assistant/custom-components/govee-lan/default.nix b/pkgs/servers/home-assistant/custom-components/govee-lan/default.nix new file mode 100644 index 0000000000000..60c58bb85850d --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/govee-lan/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildHomeAssistantComponent +, fetchFromGitHub +, govee-led-wez +}: + +buildHomeAssistantComponent { + owner = "wez"; + domain = "govee_lan"; + version = "unstable-2023-06-10"; + + src = fetchFromGitHub { + owner = "wez"; + repo = "govee-lan-hass"; + rev = "18d8455510d158496f7e5d4f0286f58bd61042bb"; + hash = "sha256-ZhrxEPBEi+Z+2ZOAQ1amhO0tqvhM6tyFQgoRIVNDtXY="; + }; + + dontBuild = true; + + propagatedBuildInputs = [ + govee-led-wez + ]; + + # enable when pytest-homeassistant-custom-component is packaged + doCheck = false; + + # nativeCheckInputs = [ + # pytest-homeassistant-custom-component + # pytestCheckHook + # ]; + + meta = with lib; { + description = "Control Govee lights via the LAN API from Home Assistant"; + homepage = "https://github.com/wez/govee-lan-hass"; + maintainers = with maintainers; [ SuperSandro2000 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/miele/default.nix b/pkgs/servers/home-assistant/custom-components/miele/default.nix new file mode 100644 index 0000000000000..71624f674b4d7 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/miele/default.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + flatdict, + pymiele, +}: +buildHomeAssistantComponent rec { + owner = "astrandb"; + domain = "miele"; + version = "0.1.19"; + + src = fetchFromGitHub { + inherit owner; + repo = domain; + rev = "refs/tags/v${version}"; + hash = "sha256-od7DV10/rkIw9eFMsTRw4bMmhQo9BAmw2rCbKKySeIk="; + }; + + propagatedBuildInputs = [ + flatdict + pymiele + ]; + + # Makefile only used for bumping the version + dontBuild = true; + + meta = with lib; { + changelog = "https://github.com/astrandb/miele/releases/tag/v${version}"; + description = "A modern integration for Miele devices in Home Assistant"; + homepage = "https://github.com/astrandb/miele"; + maintainers = with maintainers; [jamiemagee]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/prometheus-sensor/default.nix b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/default.nix index 07bcd9abec1ca..2368d85552b25 100644 --- a/pkgs/servers/home-assistant/custom-components/prometheus-sensor/default.nix +++ b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/default.nix @@ -4,7 +4,8 @@ }: buildHomeAssistantComponent rec { - pname = "prometheus-sensor"; + owner = "mweinelt"; + domain = "prometheus_sensor"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix new file mode 100644 index 0000000000000..513d593ce51d3 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildHomeAssistantComponent +, fetchFromGitHub +, fetchpatch +, beautifulsoup4 +, icalendar +, icalevents +, lxml +, recurring-ical-events +}: + +buildHomeAssistantComponent rec { + owner = "mampfes"; + domain = "waste_collection_schedule"; + version = "1.44.0"; + + src = fetchFromGitHub { + inherit owner; + repo = "hacs_${domain}"; + rev = "refs/tags/${version}"; + hash = "sha256-G1x7HtgdtK+IaPAfxT+7xsDJi5FnXN4Pg3q7T5Xr8lA="; + }; + + patches = [ + # Corrects a dependency on beautifulsoup4 + (fetchpatch { + url = "https://github.com/mampfes/hacs_waste_collection_schedule/pull/1515.patch"; + hash = "sha256-dvmicKTjolEcCrKRtZfpN0M/9RQCEQkFk+M6E+qCqfQ="; + }) + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + icalendar + icalevents + lxml + recurring-ical-events + ]; + + meta = with lib; { + changelog = "https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/${version}"; + description = "Home Assistant integration framework for (garbage collection) schedules"; + homepage = "https://github.com/mampfes/hacs_waste_collection_schedule"; + maintainers = with maintainers; [jamiemagee]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix index 4bb1e63b5f7f1..38bfeed576d46 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix @@ -2,7 +2,11 @@ }: { + light-entity-card = callPackage ./light-entity-card { }; + mini-graph-card = callPackage ./mini-graph-card {}; mini-media-player = callPackage ./mini-media-player {}; + + zigbee2mqtt-networkmap = callPackage ./zigbee2mqtt-networkmap { }; } diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix new file mode 100644 index 0000000000000..38b071f165648 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/light-entity-card/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "light-entity-card"; + version = "6.1.1"; + + src = fetchFromGitHub { + owner = "ljmerza"; + repo = "light-entity-card"; + rev = "refs/tags/${version}"; + hash = "sha256-LoZt65oAw52NxVFgV9kVDr65CX5G6Xek2zDafDIxXmw="; + }; + + npmDepsHash = "sha256-EZDTWtn3joikwiC5Kfn94+tXRDpBhMDHqHozfIkfbJ0="; + + env.NODE_OPTIONS = "--openssl-legacy-provider"; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -v dist/light-entity-card.js* $out/ + + runHook postInstall + ''; + + passthru.entrypoint = "light-entity-card.js"; + + meta = with lib; { + description = "Control any light or switch entity"; + homepage = "https://github.com/ljmerza/light-entity-card"; + changelog = "https://github.com/ljmerza/light-entity-card/releases/tag/${version}"; + maintainers = with maintainers; [ SuperSandro2000 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix index 6945b18bde20b..96decc53eeb42 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mini-media-player"; - version = "1.16.5"; + version = "1.16.8"; src = fetchFromGitHub { owner = "kalkih"; repo = "mini-media-player"; rev = "v${version}"; - hash = "sha256-ydkY7Qx2GMh4CpvvBAQubJ7PlxSscDZRJayn82bOczM="; + hash = "sha256-mBxK/Y+gesaJwPYHB4P8FCkyfoV9lwC8jAzPZJV+B+M="; }; - npmDepsHash = "sha256-v9NvZOrQPMOoG3LKACnu79jKgZtcnGiopWad+dFbplw="; + npmDepsHash = "sha256-kuEgX5PX7RKhaJPzx+GW37TiSISvz+51tKGacvAMlfg="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix new file mode 100644 index 0000000000000..f8e75ede01568 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/default.nix @@ -0,0 +1,59 @@ +{ lib +, fetchFromGitHub +, fetchYarnDeps +, mkYarnPackage +}: + +mkYarnPackage rec { + pname = "zigbee2mqtt-networkmap"; + version = "unstable-2023-12-16"; + + src = fetchFromGitHub { + owner = "azuwis"; + repo = "zigbee2mqtt-networkmap"; + rev = "7851357d78ebc0d1cc3cb5c661267a1e8b4c09e3"; + hash = "sha256-x7RVy0stWT6+8f0/0VORVBgGpBbsbyJBC38xIxXhzos="; + }; + + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-s+vnyUeJKkkA5G0AmsfIG0Zh4bYdDc2B5MSNvdwhjgs="; + }; + + configurePhase = '' + cp -r $node_modules node_modules + chmod +w node_modules + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -v dist/zigbee2mqtt-networkmap.js $out/ + + runHook postInstall + ''; + + dontFixup = true; + + doDist = false; + + passthru.entrypoint = "zigbee2mqtt-networkmap.js"; + + meta = with lib; { + description = "Home Assistant Custom Card to show Zigbee2mqtt network map"; + homepage = "https://github.com/azuwis/zigbee2mqtt-networkmap"; + maintainers = with maintainers; [ azuwis ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json new file mode 100644 index 0000000000000..3ab2dbb933ae7 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/zigbee2mqtt-networkmap/package.json @@ -0,0 +1,25 @@ +{ + "name": "zigbee2mqtt-networkmap", + "version": "0.1.0", + "private": true, + "scripts": { + "serve": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint" + }, + "dependencies": { + "vue": "^2.7.15" + }, + "devDependencies": { + "@material/mwc-button": "^0.27.0", + "@vue/cli-plugin-eslint": "^5.0.8", + "@vue/cli-service": "^5.0.8", + "@vue/eslint-config-standard": "^8.0.1", + "@babel/core": "^7.0.0", + "@babel/eslint-parser": "^7.0.0", + "eslint": "^8.42.0", + "eslint-plugin-vue": "^9.14.1", + "lodash.isequal": "^4.5.0", + "vue-d3-network": "^0.1.28" + } +} diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7f6fca8a090b1..6b492197d7aba 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -31,22 +31,44 @@ let (self: super: { aioairq = super.aioairq.overridePythonAttrs (oldAttrs: rec { - version = "0.2.4"; + version = "0.3.1"; src = fetchFromGitHub { owner = "CorantGmbH"; repo = "aioairq"; rev = "refs/tags/v${version}"; - hash = "sha256-+5FyBfsB3kjyX/V9CdZ072mZ3THyvALyym+uk7/kZLo="; + hash = "sha256-SRsDSHTZkkygaQZjHENKNLx3ZWMi/PubS1m/MonEKNk="; + }; + }); + + aioesphomeapi = super.aioesphomeapi.overridePythonAttrs (oldAttrs: rec { + version = "19.2.1"; + src = fetchFromGitHub { + owner = "esphome"; + repo = "aioesphomeapi"; + rev = "refs/tags/v${version}"; + hash = "sha256-WSWGO0kI1m6oaImUYZ6m5WKJ+xPs/rtn5wVq1bDr+bE="; }; }); # https://github.com/home-assistant/core/pull/101913 aiohttp = super.aiohttp.overridePythonAttrs (old: rec { - version = "3.8.5"; + version = "3.9.1"; src = fetchPypi { inherit (old) pname; inherit version; - hash = "sha256-uVUuxSzBR9vxlErHrJivdgLlHqLc0HbtGUyjwNHH0Lw="; + hash = "sha256-j8Sah6wmnUUp2kWHHi/7aHTod3nD0OLM2BPAiZIhI50="; + }; + patches = []; + doCheck = false; + }); + + aiohttp-zlib-ng = super.aiohttp-zlib-ng.overridePythonAttrs (oldAttrs: rec { + version = "0.1.1"; + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiohttp-zlib-ng"; + rev = "refs/tags/v${version}"; + hash = "sha256-dTNwt4eX6ZQ8ySK2/9ziVbc3KFg2aL/EsiBWaJRC4x8="; }; }); @@ -60,6 +82,15 @@ let }; }); + aioresponses = super.aioresponses.overridePythonAttrs (oldAttrs: rec { + pname = "aioresponses"; + version = "0.7.6"; + src = fetchPypi { + inherit pname version; + hash = "sha256-95XZ29otYXdIQOfjL1Nm9FdS0a3Bt0yTYq/QFylsfuE="; + }; + }); + astral = super.astral.overridePythonAttrs (oldAttrs: rec { pname = "astral"; version = "2.2"; @@ -105,10 +136,10 @@ let rev = "refs/tags/${version}"; hash = "sha256-iqlKfpnETLqQwy5sNcK2x/TgmuN2hCfYoHEFK2WWVXI="; }; - nativeBuildInputs = with super; [ + nativeBuildInputs = with self; [ setuptools ]; - propagatedBuildInputs = with super; [ + propagatedBuildInputs = with self; [ aenum aiohttp pydantic @@ -135,11 +166,6 @@ let }; }); - # moto tests are a nuissance - moto = super.moto.overridePythonAttrs (_: { - doCheck = false; - }); - notifications-android-tv = super.notifications-android-tv.overridePythonAttrs (oldAttrs: rec { version = "0.1.5"; format = "setuptools"; @@ -151,17 +177,43 @@ let hash = "sha256-adkcUuPl0jdJjkBINCTW4Kmc16C/HzL+jaRZB/Qr09A="; }; - nativeBuildInputs = with super; [ + nativeBuildInputs = with self; [ setuptools ]; - propagatedBuildInputs = with super; [ + propagatedBuildInputs = with self; [ requests ]; doCheck = false; # no tests }); + openai = super.openai.overridePythonAttrs (oldAttrs: rec { + version = "0.28.1"; + src = fetchFromGitHub { + owner = "openai"; + repo = "openai-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-liJyeGxnYIC/jUQKdeATHpVJb/12KGbeM94Y2YQphfY="; + }; + nativeBuildInputs = with self; [ + setuptools + ]; + propagatedBuildInputs = with self; [ + aiohttp + requests + tqdm + ]; + disabledTestPaths = [ + # Requires a real API key + "openai/tests/test_endpoints.py" + "openai/tests/asyncio/test_endpoints.py" + # openai: command not found + "openai/tests/test_file_cli.py" + "openai/tests/test_long_examples_validator.py" + ]; + }); + # Pinned due to API changes in 1.3.0 ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec { version = "1.2.0"; @@ -183,15 +235,6 @@ let }; }); - p1monitor = super.p1monitor.overridePythonAttrs (oldAttrs: rec { - version = "2.1.1"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-VHY5AWxt5BZd1NQKzsgubEZBLKAlDNm8toyEazPUnDU="; - }; - }); - psutil = super.psutil.overridePythonAttrs (oldAttrs: rec { version = "5.9.6"; src = fetchPypi { @@ -241,6 +284,16 @@ let }; }); + pydrawise = super.pydrawise.overridePythonAttrs (oldAttrs: rec { + version = "2023.11.0"; + src = fetchFromGitHub { + owner = "dknowles2"; + repo = "pydrawise"; + rev = "refs/tags/${version}"; + hash = "sha256-gKOyTvdETGzKlpU67UKaHYTIvnAX9znHIynP3BiVbt4="; + }; + }); + pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { version = "1.0.1"; src = fetchFromGitHub { @@ -324,7 +377,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.11.3"; + hassVersion = "2023.12.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -332,23 +385,23 @@ in python.pkgs.buildPythonApplication rec { format = "pyproject"; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = python.pythonOlder "3.10"; + disabled = python.pythonOlder "3.11"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; - # Primary source is the pypi sdist, because it contains translations - src = fetchPypi { - inherit pname version; - hash = "sha256-llGHI6LVpTo9m2RMtcDSkW2wWraje2OkVFx5P7lzZ30="; - }; - - # Secondary source is git for tests - gitSrc = fetchFromGitHub { + # Primary source is the git, which has the tests and allows bisecting the core + src = fetchFromGitHub { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-KD53O+UlAjGfVGp4kbLgpgU7j0A+KqZZT492WmeCOnQ="; + hash = "sha256-XzjsSM0xKxLeuP30u8LReJtmJMbJq+yQ2Pp5xWmNLFw="; + }; + + # Secondary source is pypi sdist for translations + sdist = fetchPypi { + inherit pname version; + hash = "sha256-dea0PacCzCWhMh2gw/kVJHwYCoT7zJ52qTQbHmqcwU8="; }; nativeBuildInputs = with python.pkgs; [ @@ -378,10 +431,9 @@ in python.pkgs.buildPythonApplication rec { "yarl" ]; - # copy tests early, so patches apply as they would to the git repo + # extract translations from pypi sdist prePatch = '' - cp --no-preserve=mode --recursive ${gitSrc}/tests ./ - chmod u+x tests/auth/providers/test_command_line_cmd.sh + tar --extract --gzip --file $sdist --strip-components 1 --wildcards "**/translations" ''; # leave this in, so users don't have to constantly update their downstream patch handling @@ -481,6 +533,8 @@ in python.pkgs.buildPythonApplication rec { "--deselect tests/test_config.py::test_merge" # AssertionError: assert 'WARNING' not in '2023-11-10 ...nt abc[L]>\n'" "--deselect=tests/helpers/test_script.py::test_multiple_runs_repeat_choose" + # SystemError: PyThreadState_SetAsyncExc failed + "--deselect=tests/helpers/test_template.py::test_template_timeout" # tests are located in tests/ "tests" ]; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 1c7bc02172b28..367db0bad9006 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 = "20231030.2"; + version = "20231208.2"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-qzodzqWpAXZjwBJkiCyBi5zzfpEqqtauJn2PKZ5UtJ0="; + hash = "sha256-JTYZPku5UdnMOllnzyI9tbYgxcewx5tklDooQKJA6p8="; }; # 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 26fe812366d3a..e88520bb883b4 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.10.16"; + version = "2023.12.05"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-qW5KzABEEBw2tu5+fAoWd8nCxuvTzEU14M8iaSo2WzE="; + hash = "sha256-BVcvlmX5+w7b9uNHA4ZP6Ebj+7ROUgEaAmXAGQrby+s="; fetchSubmodules = true; }; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index b6d6d1517af8f..0bdac4977ab41 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.11.3"; + version = "2023.12.4"; 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-x3FcUmbUYAUKGAPb85SqJk1kTWFKxpJSX2J+rTRj1KY="; + hash = "sha256-a27PeLEArT87+DOrKZ5rLM5o2T3swzLwY+mBhOtd9dQ="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/update.py b/pkgs/servers/home-assistant/update.py index c914979e28bd3..30b371e0686dd 100755 --- a/pkgs/servers/home-assistant/update.py +++ b/pkgs/servers/home-assistant/update.py @@ -192,11 +192,11 @@ class HomeAssistant: async def update_core(self, old_version: str, new_version: str) -> None: - old_sdist_hash = str(await Nix.eval("home-assistant.src.outputHash")) + old_sdist_hash = str(await Nix.eval("home-assistant.sdist.outputHash")) new_sdist_hash = await Nurl.prefetch("https://pypi.org/project/homeassistant/", new_version) print(f"sdist: {old_sdist_hash} -> {new_sdist_hash}") - old_git_hash = str(await Nix.eval("home-assistant.gitSrc.outputHash")) + old_git_hash = str(await Nix.eval("home-assistant.src.outputHash")) new_git_hash = await Nurl.prefetch("https://github.com/home-assistant/core/", new_version) print(f"git: {old_git_hash} -> {new_git_hash}") diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 650b0c0c6c535..a2652b1cb575e 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGoModule rec { pname = "evcc"; - version = "0.122.1"; + version = "0.123.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-mD4D2DVai9KV7/RYFmcY7iOGVQGRpwg+rTfNsP8OpCY="; + hash = "sha256-iGt3j8q8dpQLUIHHnGHCgraPETk9GL9t/ygBZtPG7yM="; }; - vendorHash = "sha256-B4gR9sXpGuVv3x6sktFSPlbhq5n5aD5d7ksz67X5nY8="; + vendorHash = "sha256-rhGMN5v+JzNg1p2GptomDDtqS7M4EafROXXy185qtmU="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-KTMUZOW56vPGoJviKRJWM9UL28gXL0L3j4ZmUzSeavU="; + hash = "sha256-a3AyqQ8GYP3g9KGbjtLHjHBrJGHg2sNjAQlMUa26pOY="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index 39ff152d62c64..ca35f31fc1fa3 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-JhvtGkg59vt4GIkpRnf3ipgenUoki7iM43GFM51VmaI="; + hash = "sha256-WjyOpR8DcjlJJgUkWortc0ApgpusknTSeVQlSa5rCRQ="; }; - npmDepsHash = "sha256-tsAUPb7RFW7HSV1bS8ZBCL1xLEhvgvTZSDfS8DlcUgg="; + npmDepsHash = "sha256-RC2Y4XZqO+mLEKQxq+j2ukZYi/uu9XIjYadxek9P+SM="; preBuild = '' mkdir -p config @@ -79,5 +79,6 @@ buildNpmPackage rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ jnsgruk ]; platforms = lib.platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/honk/default.nix b/pkgs/servers/honk/default.nix index 63b2fb5b09840..cbe1d6d240e14 100644 --- a/pkgs/servers/honk/default.nix +++ b/pkgs/servers/honk/default.nix @@ -8,11 +8,11 @@ buildGoModule rec { pname = "honk"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { url = "https://humungus.tedunangst.com/r/honk/d/honk-${version}.tgz"; - hash = "sha256-kfoSVGm1QKVjDiWvjK4QzAoA/iiU9j6DS3SYFSM+AaA="; + hash = "sha256-kcrEg0KBdCaA4g8ivIgOWIGJVDCtY5rI4P7cp/ZyXe4="; }; vendorHash = null; diff --git a/pkgs/servers/http/angie/console-light.nix b/pkgs/servers/http/angie/console-light.nix new file mode 100644 index 0000000000000..c39a2001c16c8 --- /dev/null +++ b/pkgs/servers/http/angie/console-light.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchurl +, gzip +, brotli +}: + +stdenv.mkDerivation rec { + version = "1.1.1"; + pname = "angie-console-light"; + + src = fetchurl { + url = "https://download.angie.software/files/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-Teg+EPl4IvmScTTX3F3rdM6qZ3ztFkMks9oo2B1xHTs="; + }; + + outputs = [ "out" "doc" ]; + + nativeBuildInputs = [ brotli ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/angie-console-light + mv ./html $out/share/angie-console-light + + mkdir -p $doc/share/doc/angie-console-light + mv ./LICENSE $doc/share/doc/angie-console-light + + # Create static gzip and brotli files + find -L $out -type f -regextype posix-extended -iregex '.*\.(html|js|txt)' \ + -exec gzip --best --keep --force {} ';' \ + -exec brotli --best --keep --no-copy-stat {} ';' + + runHook postInstall + ''; + + meta = { + description = "Console Light is a lightweight, real-time activity monitoring interface."; + homepage = "https://angie.software/en/console/"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix new file mode 100644 index 0000000000000..5c8f2ad7c699d --- /dev/null +++ b/pkgs/servers/http/angie/default.nix @@ -0,0 +1,47 @@ +{ callPackage +, runCommand +, lib +, fetchurl +, nixosTests +, withQuic ? false +, fetchpatch +, ... +}@args: + +callPackage ../nginx/generic.nix args rec { + version = "1.4.0"; + pname = if withQuic then "angieQuic" else "angie"; + + src = fetchurl { + url = "https://download.angie.software/files/angie-${version}.tar.gz"; + hash = "sha256-gaQsPwoxtt6oVSDX1JCWvyUwDQaNprya79CCwu4z8b4="; + }; + + configureFlags = lib.optional withQuic [ + "--with-http_v3_module" + ]; + + preInstall = '' + if [[ -e man/angie.8 ]]; then + installManPage man/angie.8 + fi + ''; + + postInstall = '' + ln -s $out/bin/nginx $out/bin/angie + ''; + + passthru.tests = { + angie = nixosTests.nginx-variants.angie; + angie-api = nixosTests.angie-api; + angie-http3 = nixosTests.nginx-http3.angieQuic; + }; + + meta = { + description = "Angie is an efficient, powerful, and scalable web server that was forked from nginx"; + homepage = "https://angie.software/en/"; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/servers/http/bozohttpd/0001-include-stdint.h.patch b/pkgs/servers/http/bozohttpd/0001-include-stdint.h.patch deleted file mode 100644 index 1d0d716290dd6..0000000000000 --- a/pkgs/servers/http/bozohttpd/0001-include-stdint.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libexec/httpd/bozohttpd.c b/libexec/httpd/bozohttpd.c -index 67083b2c6782..273cb5f5a42b 100644 ---- a/libexec/httpd/bozohttpd.c -+++ b/libexec/httpd/bozohttpd.c -@@ -138,6 +138,7 @@ - #include <grp.h> - #include <stdarg.h> - #include <stdlib.h> -+#include <stdint.h> - #include <strings.h> - #include <string.h> - #include <syslog.h> diff --git a/pkgs/servers/http/bozohttpd/0002-dont-use-host-BUFSIZ.patch b/pkgs/servers/http/bozohttpd/0002-dont-use-host-BUFSIZ.patch deleted file mode 100644 index 9a01a4adce7fc..0000000000000 --- a/pkgs/servers/http/bozohttpd/0002-dont-use-host-BUFSIZ.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/libexec/httpd/auth-bozo.c b/libexec/httpd/auth-bozo.c -index a2f2ee4304c1..c9eefe3313dd 100644 ---- a/libexec/httpd/auth-bozo.c -+++ b/libexec/httpd/auth-bozo.c -@@ -54,7 +54,7 @@ bozo_auth_check(bozo_httpreq_t *request, const char *file) - bozohttpd_t *httpd = request->hr_httpd; - struct stat sb; - char dir[MAXPATHLEN], authfile[MAXPATHLEN], *basename; -- char user[BUFSIZ], *pass; -+ char user[BOZO_MINBUFSIZE], *pass; - FILE *fp; - int len; - -@@ -144,7 +144,7 @@ bozo_auth_check_headers(bozo_httpreq_t *request, char *val, char *str, - - if (strcasecmp(val, "authorization") == 0 && - strncasecmp(str, "Basic ", 6) == 0) { -- char authbuf[BUFSIZ]; -+ char authbuf[BOZO_MINBUFSIZE]; - char *pass = NULL; - ssize_t alen; - -diff --git a/libexec/httpd/bozohttpd.c b/libexec/httpd/bozohttpd.c -index 273cb5f5a42b..f619567ba822 100644 ---- a/libexec/httpd/bozohttpd.c -+++ b/libexec/httpd/bozohttpd.c -@@ -2275,7 +2275,7 @@ bozo_http_error(bozohttpd_t *httpd, int code, bozo_httpreq_t *request, - } - #endif /* !NO_USER_SUPPORT */ - -- size = snprintf(httpd->errorbuf, BUFSIZ, -+ size = snprintf(httpd->errorbuf, BOZO_MINBUFSIZE, - "<html><head><title>%s</title></head>\n" - "<body><h1>%s</h1>\n" - "%s%s: <pre>%s</pre>\n" -@@ -2285,10 +2285,10 @@ bozo_http_error(bozohttpd_t *httpd, int code, bozo_httpreq_t *request, - user ? user : "", file, - reason, hostname, portbuf, hostname, portbuf); - free(user); -- if (size >= (int)BUFSIZ) { -+ if (size >= (int)BOZO_MINBUFSIZE) { - bozowarn(httpd, - "bozo_http_error buffer too small, truncated"); -- size = (int)BUFSIZ; -+ size = (int)BOZO_MINBUFSIZE; - } - - if (file_alloc) -@@ -2515,7 +2515,7 @@ bozo_init_httpd(bozohttpd_t *httpd) - httpd->mmapsz = BOZO_MMAPSZ; - - /* error buffer for bozo_http_error() */ -- if ((httpd->errorbuf = malloc(BUFSIZ)) == NULL) { -+ if ((httpd->errorbuf = malloc(BOZO_MINBUFSIZE)) == NULL) { - fprintf(stderr, - "bozohttpd: memory_allocation failure\n"); - return 0; -diff --git a/libexec/httpd/bozohttpd.h b/libexec/httpd/bozohttpd.h -index c83bd112d9d7..7b19494cf5ad 100644 ---- a/libexec/httpd/bozohttpd.h -+++ b/libexec/httpd/bozohttpd.h -@@ -227,6 +227,8 @@ typedef struct bozoprefs_t { - /* only allow this many total headers bytes */ - #define BOZO_HEADERS_MAX_SIZE (16 * 1024) - -+#define BOZO_MINBUFSIZE (4 * 1024) -+ - /* debug flags */ - #define DEBUG_NORMAL 1 - #define DEBUG_FAT 2 -diff --git a/libexec/httpd/testsuite/t10.out b/libexec/httpd/testsuite/t10.out -index cf410110627c..b3ab88f94fb9 100644 ---- a/libexec/httpd/testsuite/t10.out -+++ b/libexec/httpd/testsuite/t10.out -@@ -1,8 +1,8 @@ - HTTP/1.0 404 Not Found - Content-Type: text/html --Content-Length: 1024 --Server: bozohttpd/20140708 -+Content-Length: 4096 -+Server: bozohttpd/20210403 - - <html><head><title>404 Not Found</title></head> - <body><h1>404 Not Found</h1> --/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -\ No newline at end of file -+/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -\ No newline at end of file diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index 5fd9f350b1176..038548bb16fa0 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at: # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo src = fetchurl { - url = "http://www.eterna.com.au/${pname}/${pname}-${version}.tar.bz2"; + url = "http://eterna23.net/${pname}/${pname}-${version}.tar.bz2"; hash = "sha512-J1uPqzzy5sWXIWgsrpUtuV2lvTsfIGgCQMbPEClGNpP2/soEf77146PnUotAt7LoeypW/YALYS5nmhbySJDltg=="; }; diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index 8913dae50be43..6e625dbdb7203 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "couchdb"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; - hash = "sha256-PWgj1C0Qzw1PhsnE/lnJkyyJ1oV4/LbEtCeNx2kwjao="; + hash = "sha256-eiAHtfZz1L4iolyaER2QZpGdhy3bkTWn3OwBIimb054="; }; postPatch = '' diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 7a5d6f5e556d1..7f457108f8e6a 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor brecht ]; + mainProgram = "lighttpd"; }; } diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 4ca4bd75d6b6f..b3ce65abf5f1e 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -25,6 +25,7 @@ outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt , fixPatch ? p: p , postPatch ? "" , preConfigure ? "" +, preInstall ? "" , postInstall ? "" , meta ? null , nginx-doc ? outer.nginx-doc @@ -68,6 +69,7 @@ stdenv.mkDerivation { ++ mapModules "inputs"; configureFlags = [ + "--sbin-path=bin/nginx" "--with-http_ssl_module" "--with-http_v2_module" "--with-http_realip_module" @@ -178,13 +180,13 @@ stdenv.mkDerivation { if [[ -e man/nginx.8 ]]; then installManPage man/nginx.8 fi - ''; + '' + preInstall; disallowedReferences = map (m: m.src) modules; postInstall = let - noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $out/sbin/nginx\n") modules; + noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $out/bin/nginx\n") modules; in noSourceRefs + postInstall; passthru = { @@ -202,6 +204,6 @@ stdenv.mkDerivation { license = [ licenses.bsd2 ] ++ concatMap (m: m.meta.license) modules; platforms = platforms.all; - maintainers = with maintainers; [ fpletz ajs124 raitobezarius ]; + maintainers = with maintainers; [ fpletz raitobezarius ] ++ teams.helsinki-systems.members; }; } diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index e1ef395f9d926..a1e9eabdb3d9c 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -1029,8 +1029,8 @@ let self = { name = "zstd"; owner = "tokers"; repo = "zstd-nginx-module"; - rev = "0.1.0"; - hash = "sha256-8SBU9hJnKtNrwbpioy+Z/mfiVuqAx+U1t64m5tfEy6o="; + rev = "0.1.1"; + hash = "sha256-1gCV7uUsuYnZfb9e8VfjWkUloVINOUH5qzeJ03kIHgs="; }; inputs = [ zstd ]; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 433d8fd3969b8..971c1e28cdb0c 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -41,7 +41,7 @@ callPackage ../nginx/generic.nix args rec { postInstall = '' ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty - ln -s $out/nginx/sbin/nginx $out/bin/nginx + ln -s $out/nginx/bin/nginx $out/bin/nginx ln -s $out/nginx/conf $out/conf ln -s $out/nginx/html $out/html ''; diff --git a/pkgs/servers/http/router/default.nix b/pkgs/servers/http/router/default.nix index b7b33c1d176c1..01f1415d0af86 100644 --- a/pkgs/servers/http/router/default.nix +++ b/pkgs/servers/http/router/default.nix @@ -42,5 +42,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.apollographql.com/docs/router/"; license = licenses.elastic20; maintainers = [ maintainers.bbigras ]; + knownVulnerabilities = [ "CVE-2023-45812" ]; }; } diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 98c0b30faa986..24177680d770e 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "9ce9c543992243737516750bf08f5d073e899715", - "sha256": "sha256-yyNtMvHaN3hNxTafhQivN39NzEylrm+FG7S5DNkCtWU=", - "version": "unstable-2023-11-21" + "rev": "9e8baa35397671aabfc77f6b912c9f1829be52b6", + "sha256": "sha256-Mbdh/YMTOamYLZcQ8afKREMC/wTutVnkx8Q0ON8wovQ=", + "version": "unstable-2023-12-06" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/servers/irc/inspircd/default.nix index d554b17542e93..68dbbeacb07f3 100644 --- a/pkgs/servers/irc/inspircd/default.nix +++ b/pkgs/servers/irc/inspircd/default.nix @@ -145,13 +145,13 @@ in stdenv.mkDerivation rec { pname = "inspircd"; - version = "3.16.1"; + version = "3.17.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-UpDjxF4zRrtiY4Z1tRML1uWQdklfgCeLsJtxCKfHOdw="; + sha256 = "sha256-isLZKYf32+va66FGYMq4mWIEHNpqUWCcVhYWLA5lRwk="; }; outputs = [ "bin" "lib" "man" "doc" "out" ]; diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index d62be801a4ca1..a8af63754277a 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YbY7wcd8YHcPo5w4n54gjOtepYLbboLsrLij7oYzhco="; + sha256 = "sha256-Bqb4UO4R5CnV8+2OthGrEVORzH+k+zgzI4UsvwRHgk8="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/jibri/default.nix b/pkgs/servers/jibri/default.nix index 8ac17d930ffc8..1c97d18d98c39 100644 --- a/pkgs/servers/jibri/default.nix +++ b/pkgs/servers/jibri/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { pname = "jibri"; - version = "8.0-145-g1a4bb8e"; + version = "8.0-160-g5af7dd7"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "Qemr2108R/Lg1C5UvWQbK7PSbrKvBkfATNpvFDqJ3bI="; + sha256 = "UuRGGbga7Yo/rp5PobOxhyUQ8FaZWnMsLL89vt9hKcA="; }; dontBuild = true; diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix index bdae8d3f32e39..3ace911102d40 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-1050"; + version = "1.0-1057"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "fenxq6syLoKV9jgj8qN7JrkWFeFWSk1QmK7o2hLhwyA="; + sha256 = "TdLPpwgULubzqyhD8PZhUMJG+AZnPT8xgjS3mUnToEo="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/jigasi/default.nix b/pkgs/servers/jigasi/default.nix new file mode 100644 index 0000000000000..d9f8ed60c09be --- /dev/null +++ b/pkgs/servers/jigasi/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchurl, dpkg, jdk11, nixosTests }: + +let + pname = "jigasi"; + version = "1.1-311-g3de47d0"; + src = fetchurl { + url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; + hash = "sha256-pwUgkId7AHFjbqYo02fBgm0gsiMqEz+wvwkdy6sgTD0="; + }; +in +stdenv.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ dpkg ]; + + dontBuild = true; + + unpackCmd = "dpkg-deb -x $src debcontents"; + + installPhase = '' + runHook preInstall + substituteInPlace usr/share/${pname}/${pname}.sh \ + --replace "exec java" "exec ${jdk11}/bin/java" + + mkdir -p $out/{share,bin} + mv usr/share/${pname} $out/share/ + mv etc $out/ + ln -s $out/share/${pname}/${pname}.sh $out/bin/${pname} + runHook postInstall + ''; + + passthru.tests = { + single-node-smoke-test = nixosTests.jitsi-meet; + }; + + meta = with lib; { + description = "A server-side application that allows regular SIP clients to join Jitsi Meet conferences"; + longDescription = '' + Jitsi Gateway to SIP: a server-side application that allows regular SIP clients to join Jitsi Meet conferences hosted by Jitsi Videobridge. + ''; + homepage = "https://github.com/jitsi/jigasi"; + license = licenses.asl20; + maintainers = teams.jitsi.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 855aaa05d1251..3d0f399e49520 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.3-59-g5c48e421"; + version = "2.3-61-g814bffd6"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "yFFvdDOdG6/VloQV4VWBr2rv7dh7dNiL6D4cep2QIxE="; + sha256 = "EzYD6x4CSv8lJRbBCR7Irfh8oaOl8qw+vw6YRfBh6nk="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index a9f2e8e239f11..14c38c848f252 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 = "23.0.0"; + version = "23.0.3"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-PlOlrWWIBE4wdGp6yVBYj4Ju1QRd/aCMrSv8+LffvFo="; + hash = "sha256-5K8+pfn1zoXzBWJevZBx+9kZmefs1AvPoshOKP/dkNY="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 13fa39fe828c8..4726c63e1448f 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-11-16"; + version = "unstable-2023-12-13"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "187cc2f1b89e3870d694f8db6a64b116992106b7"; - sha256 = "sha256-CmnWgX8MvQs/5jQuAR8+1bKM4VsFXF2pV/jme75WJLY="; + rev = "f0753bd3381a86826082d5bf7a349c1f0b9f7e48"; + sha256 = "sha256-4xaee/7tXmR4/249lxHocana0KoesdH22/7HXWq1xwk="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index daad39ee1cfb6..aba1c766ce501 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/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-qiI6+uiDBwY+UkqWyYqySfdOilJ87GyAojY6a5NrHNY="; - arm64-linux_hash = "sha256-CXbZjVIF8JL+bOzUvnaDzpDn+DK9D1g6HnmdvEDR/S8="; - x64-osx_hash = "sha256-t58xYrootKjavdyZp37KByyQa0CwSkl+DLxZuGYV9qs="; + x64-linux_hash = "sha256-TqwVWV3kfBTqGYf6PT9H0E9YiG/AfLWEViKocVrhZuU="; + arm64-linux_hash = "sha256-aCaUZgnk4rnhEV3hDVZx1Bfz+PteefGeGvEdoKXGxxg="; + x64-osx_hash = "sha256-4O3H2gsH2Q3V9xY1fIMzkaU0qSEg3CF89chnrMdCmdk="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "1.4.5.3639"; + version = "2.0.7.3849"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/lidarr/update.sh b/pkgs/servers/lidarr/update.sh index cff608e7ebf0f..0da098f89bed3 100755 --- a/pkgs/servers/lidarr/update.sh +++ b/pkgs/servers/lidarr/update.sh @@ -25,7 +25,7 @@ updateVersion() sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" } -currentVersion=$(cd $dirname && nix eval --raw -f ../../.. radarr.version) +currentVersion=$(cd $dirname && nix eval --raw -f ../../.. lidarr.version) latestTag=$(curl https://api.github.com/repos/Lidarr/Lidarr/releases/latest | jq -r ".tag_name") latestVersion="$(expr $latestTag : 'v\(.*\)')" diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 04c1f7031bba1..185f38d2e0be8 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { description = "Open source IMAP and POP3 email server written with security primarily in mind"; license = with licenses; [ mit publicDomain lgpl21Only bsd3 bsdOriginal ]; mainProgram = "dovecot"; - maintainers = with maintainers; [ fpletz globin ajs124 ]; + maintainers = with maintainers; [ fpletz globin ] ++ teams.helsinki-systems.members; platforms = platforms.unix; }; passthru.tests = { diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index a8cfeb9eb7490..25be75b2b9604 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { homepage = "https://pigeonhole.dovecot.org/"; description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ globin ajs124 ]; + maintainers = with maintainers; [ globin ] ++ teams.helsinki-systems.members; platforms = platforms.unix; }; } diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index dc8d0dd648a10..b3f19cec8fbd4 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus bsd3 ]; mainProgram = "exim"; platforms = platforms.linux; - maintainers = with maintainers; [ tv ajs124 das_j ]; + maintainers = with maintainers; [ tv ] ++ teams.helsinki-systems.members; changelog = "https://github.com/Exim/exim/blob/exim-${version}/doc/doc-txt/ChangeLog"; }; } diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/servers/mail/mailpit/default.nix index c2e33e74d6a46..5aa5ae67e988e 100644 --- a/pkgs/servers/mail/mailpit/default.nix +++ b/pkgs/servers/mail/mailpit/default.nix @@ -12,13 +12,13 @@ }: let - version = "1.10.2"; + version = "1.11.1"; src = fetchFromGitHub { owner = "axllent"; repo = "mailpit"; rev = "v${version}"; - hash = "sha256-CEF80/fP3qkR50fX59nrLb4QR60uPWLp8aNtIRD18+Q="; + hash = "sha256-K/B2FRzAtVdXa+lTi0bhkHjBe0rbAc4yFNv9uNDvB4Y="; }; # Separate derivation, because if we mix this in buildGoModule, the separate @@ -30,7 +30,7 @@ let npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-E7RVxlX3N37Lr9FlmkN44cUyX8SnrTTj7a1+dUExQKg="; + hash = "sha256-2WA4mqY/bO/K3m19T5/xGbUbcR95DXQnywkjjzstmd4="; }; env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { @@ -56,7 +56,7 @@ buildGoModule { pname = "mailpit"; inherit src version; - vendorHash = "sha256-F9FWRye0oOU4pjgNha2MlPHhP/V7CU84zy3QU6FVK0Y="; + vendorHash = "sha256-1go3lkNaar9HSjJxKqqR+RII7V7Ufj1gYLalxyvJaVE="; CGO_ENABLED = 0; @@ -67,7 +67,6 @@ buildGoModule { ''; passthru.tests.version = testers.testVersion { - inherit version; package = mailpit; command = "mailpit version"; }; diff --git a/pkgs/servers/mail/mox/default.nix b/pkgs/servers/mail/mox/default.nix index 17d34d368f6dc..22f95c436375a 100644 --- a/pkgs/servers/mail/mox/default.nix +++ b/pkgs/servers/mail/mox/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mox"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "mjl-"; repo = "mox"; rev = "v${version}"; - hash = "sha256-zFPgMVQQUnEKIgt35KxcRUxuBNSmTM8ZfAZvP22iKgg="; + hash = "sha256-mr07nn0fy19j/Yv46Rxzt2qlqDHfnSkt3bjQvMQ7zsE="; }; # set the version during buildtime diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index ca8d54d6006d6..4278abfb8248f 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { - url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz"; - hash = "sha256-FpRsmHSnhqCfU7F9HIPcH6rjXL+AurNKsBeYtwQglos="; + url = "https://de.postfix.org/ftpmirror/official/${pname}-${version}.tar.gz"; + hash = "sha256-b1hIxdi2p9LFrwqfdbC9PxA0UekSWRRkq4Z/3gheYjY="; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch b/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch deleted file mode 100644 index bac048892fe83..0000000000000 --- a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 60abf3ee8864980a95b32e2d6cf60e26b49654c0 Mon Sep 17 00:00:00 2001 -From: joachim schiele <js@lastlog.de> -Date: Wed, 7 Jun 2017 22:15:39 +0200 -Subject: [PATCH 2/2] Adding --siteconfigpath to not be forced to use global /etc/spamasassin configuration directory but to provide an alternative location. - ---- - sa-update.raw | 5 +++++ - lib/Mail/SpamAssassin/PerMsgStatus.pm | 2 + - 2 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/sa-update.raw b/sa-update.raw -index bb7396d..39f681f 100755 ---- a/sa-update.raw -+++ b/sa-update.raw -@@ -196,6 +196,7 @@ GetOptions( - 'gpgkeyfile=s' => \$opt{'gpgkeyfile'}, - 'channelfile=s' => \$opt{'channelfile'}, - 'updatedir=s' => \$opt{'updatedir'}, -+ 'siteconfigpath=s' => \$opt{'siteconfigpath'}, - 'gpg!' => \$GPG_ENABLED, - - '4' => sub { $opt{'force_pf'} = 'inet' }, -@@ -267,6 +268,9 @@ else { - $opt{'updatedir'} = $SA->sed_path('__local_state_dir__/__version__'); - } - -+if (defined $opt{'siteconfigpath'}) { -+ $LOCAL_RULES_DIR = untaint_file_path($opt{'siteconfigpath'}); -+} - - # check only disabled gpg - # https://issues.apache.org/SpamAssassin/show_bug.cgi?id=5854 -@@ -1808,7 +1812,7 @@ Options: - --updatedir path Directory to place updates, defaults to the - SpamAssassin site rules directory - (default: @@LOCAL_STATE_DIR@@/@@VERSION@@) -+ --siteconfigpath=path Path for site configs - --refreshmirrors Force the MIRRORED.BY file to be updated - -D, --debug [area=n,...] Print debugging messages - -v, --verbose Be verbose, like print updated channel names; --- - -2.12.2 - diff --git a/pkgs/servers/mail/vsmtp/default.nix b/pkgs/servers/mail/vsmtp/default.nix deleted file mode 100644 index a6fc770cf5e05..0000000000000 --- a/pkgs/servers/mail/vsmtp/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, testers -, vsmtp -}: - -rustPlatform.buildRustPackage rec { - pname = "vsmtp"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "viridIT"; - repo = "vsmtp"; - rev = "v${version}"; - hash = "sha256-dRw5Q6bejaAJCnoR9j2wBU+L+p1pk1Tnxtm0WcRyOaY="; - }; - - cargoHash = "sha256-RYHn9kZZApgXWTExAHl9ZnCsuvqnnb67unmvd4Pnwz0="; - - nativeBuildInputs = [ installShellFiles ]; - - buildFeatures = [ - "telemetry" - "journald" - "syslog" - ]; - - # tests do not run well in the nix sandbox - doCheck = false; - - postInstall = '' - installManPage tools/install/man/*.1 - ''; - - passthru = { - tests.version = testers.testVersion { package = vsmtp; version = "v${version}"; }; - }; - - meta = with lib; { - description = "A next-gen mail transfer agent (MTA) written in Rust"; - homepage = "https://viridit.com"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ nickcao ]; - }; -} diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index ac4083fd9be73..25b6fc41a07b9 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, nodejs-slim, bundlerEnv, nixosTests -, yarn, callPackage, imagemagick, ffmpeg, file, ruby, writeShellScript +, yarn, callPackage, ruby, writeShellScript , fetchYarnDeps, prefetch-yarn-deps , brotli @@ -96,7 +96,8 @@ stdenv.mkDerivation rec { ''; }; - propagatedBuildInputs = [ imagemagick ffmpeg file mastodonGems.wrappedRuby ]; + propagatedBuildInputs = [ mastodonGems.wrappedRuby ]; + nativeBuildInputs = [ brotli ]; buildInputs = [ mastodonGems nodejs-slim ]; buildPhase = '' diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 384302458470c..ba743e6e37c76 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -321,6 +321,16 @@ }; version = "0.1.1"; }; + bcp47_spec = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "043qld01c163yc7fxlar3046dac2833rlcg44jbbs9n1jvgjxmiz"; + type = "gem"; + }; + version = "0.2.1"; + }; bcrypt = { groups = ["default" "pam_authentication"]; platforms = []; @@ -1395,10 +1405,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rvsalsrs8njk2gqxgq0ydg5cd02jqdawskbq2ccz663qxz8wwq5"; + sha256 = "0illsmkly0hhi24lm1l6jjjdr6jykvydkwi1cxf4ad3mra68m16l"; type = "gem"; }; - version = "0.3.2"; + version = "1.0.0"; }; json-jwt = { dependencies = ["activesupport" "aes_key_wrap" "bindata" "httpclient"]; @@ -1417,10 +1427,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z3kqacjmqs02vwwqm9di7sw7f7nchxx99v84myrrzmh64c6zfcq"; + sha256 = "1carfj87p6cpd0xnysg5sj653rqmmwnnacsmjk42xdy40j15gp88"; type = "gem"; }; - version = "3.2.5"; + version = "3.3.1"; }; json-ld-preloaded = { dependencies = ["json-ld" "rdf"]; @@ -2341,15 +2351,15 @@ version = "13.0.6"; }; rdf = { - dependencies = ["link_header"]; + dependencies = ["bcp47_spec" "link_header"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx4xyip4inrhr099zac8ah5232g70rv39mm19p85sgpwg80a6ip"; + sha256 = "0l515w395kbyz4n7lx102x1nv9yl6l72gvk67p35z4cqa74s59nx"; type = "gem"; }; - version = "3.2.11"; + version = "3.3.1"; }; rdf-normalize = { dependencies = ["rdf"]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 4f39e350a0f03..989bcaa6b3c68 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.2.1"; + version = "4.2.3"; in ( applyPatches { @@ -9,7 +9,7 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-SM9WdD+xpxo+gfBft9DARV6QjwNbF2Y9McVrrdDT3fw="; + hash = "sha256-e8O4kxsrHf+wEtl4S57xIL1VEvhUSjyCbmz4r9p8Zhw="; }; patches = patches ++ []; }) // { diff --git a/pkgs/servers/matrix-appservice-discord/default.nix b/pkgs/servers/matrix-appservice-discord/default.nix index b1d14319638d9..605df82b5771d 100644 --- a/pkgs/servers/matrix-appservice-discord/default.nix +++ b/pkgs/servers/matrix-appservice-discord/default.nix @@ -103,5 +103,6 @@ in mkYarnPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pacien ]; platforms = lib.platforms.linux; + mainProgram = "matrix-appservice-discord"; }; } diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 56f9b6c7af8f8..95973c8bcae0d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -17,25 +17,25 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.97.0"; + version = "1.98.0"; format = "pyproject"; src = fetchFromGitHub { - owner = "matrix-org"; + owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-KusCJj5MVmRbniI9aTjRInPMpIDZKWs5w+TImVKHrPc="; + hash = "sha256-irPExb8rwQjkPp0b3x5hJG4Ay6OnITWIGRPxBSoP/Dk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-SImgV47EfKy70VmcBREu1aiZFvX0+h0Ezw+/rUZufAg="; + hash = "sha256-DHKhEFXquWfHfk54mTehjchg3KsB4CfzElXMt5Mp+Vg="; }; postPatch = '' # Remove setuptools_rust from runtime dependencies - # https://github.com/matrix-org/synapse/blob/v1.69.0/pyproject.toml#L177-L185 + # https://github.com/element-hq/synapse/blob/v1.69.0/pyproject.toml#L177-L185 sed -i '/^setuptools_rust =/d' pyproject.toml # Remove version pin on build dependencies. Upstream does this on purpose to @@ -149,7 +149,7 @@ python3.pkgs.buildPythonApplication rec { # high parallelisem makes test suite unstable # upstream uses 2 cores but 4 seems to be also stable - # https://github.com/matrix-org/synapse/blob/develop/.github/workflows/latest_deps.yml#L103 + # https://github.com/element-hq/synapse/blob/develop/.github/workflows/latest_deps.yml#L103 if (( $NIX_BUILD_CORES > 4)); then NIX_BUILD_CORES=4 fi @@ -167,9 +167,9 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://matrix.org"; - changelog = "https://github.com/matrix-org/synapse/releases/tag/v${version}"; + changelog = "https://github.com/element-hq/synapse/releases/tag/v${version}"; description = "Matrix reference homeserver"; - license = licenses.asl20; + license = licenses.agpl3Plus; maintainers = teams.matrix.members; }; } diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index 1fc99bb203369..bbfc36ad42688 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -11,6 +11,8 @@ let data = lib.importJSON ./pin.json; in mkYarnPackage rec { + inherit nodejs; + pname = "matrix-appservice-slack"; version = data.version; diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json index 5f4e0c309f09f..0ff87211985ff 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.5.1", + "version": "4.7.0", "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", @@ -48,7 +48,7 @@ "@octokit/webhooks": "^9.1.2", "@sentry/node": "^7.52.1", "ajv": "^8.11.0", - "axios": "^0.24.0", + "axios": "^1.6.2", "cors": "^2.8.5", "express": "^4.17.3", "figma-js": "^1.14.0", diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json index e27f39681c78e..64b40c341cc9d 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.5.1", - "srcHash": "sha256-uqLpwgVEfwcMTeGMDn3lDUD91GHPNyWHmCSPxuV/VC0=", - "yarnHash": "08dw9vbhlmqwj2nah6fv1b2sf15ibl5kg38ghkxkbccs4j7adans", - "cargoHash": "sha256-bIpsQni3kaoYCGLz01YdauYM8ybpx+BvVTiB6N72rIA=" + "version": "4.7.0", + "srcHash": "sha256-27PBuLyk/1ER26pus5tbe9CxeYEZgZrYBYy5l3B/19c=", + "yarnHash": "05mh3q5zw1aiznvbkhp7spb1bgcv32ncdb4zpyvhhv74pyhjnsn2", + "cargoHash": "sha256-cAjsNVQfXfZbM1/MoiEh/Qp0uW/iXsxBVx7cRZY3tN0=" } diff --git a/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/pkgs/servers/matrix-synapse/sliding-sync/default.nix index aca863ed2da99..28a788c9c3283 100644 --- a/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.12"; + version = "0.99.13"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "refs/tags/v${version}"; - hash = "sha256-7M+Ti1SfurRngXg2oCdLveG6QyjM2BjKnoovJxz7ZOY="; + hash = "sha256-jrsMPFUSdtUs6qG902+oRBGUvFGmhR8/NHCUwB9oVnE="; }; - vendorHash = "sha256-li5kEF7U7KyyMLMhVBqvnLuLXI6QrJl1KeusKrQXo8w="; + vendorHash = "sha256-THjvc0TepIBFOTte7t63Dmadf3HMuZ9m0YzQMI5e5Pw="; subPackages = [ "cmd/syncv3" ]; diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index 5ae3077060caa..e693194774939 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "synadm"; - version = "0.44"; + version = "0.45"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-BNmdyEITSZJb+wwyLU+zZi70kmfuYOqVDhKi8xFCf2E="; + hash = "sha256-KstWVSU0IE1ncfIkIH1QsaQc/Yfs2lF+6+5x9zw9cA8="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { longDescription = '' A CLI tool to help admins of Matrix Synapse homeservers conveniently issue commands available via its admin API's - (matrix-org/synapse@master/docs/admin_api) + (element-hq/synapse@master/docs/admin_api) ''; changelog = "https://github.com/JOJ0/synadm/releases/tag/v${version}"; homepage = "https://github.com/JOJ0/synadm"; diff --git a/pkgs/servers/matrix-synapse/wrapper.nix b/pkgs/servers/matrix-synapse/wrapper.nix index 930142c5f55e2..5b7ce47b367c6 100644 --- a/pkgs/servers/matrix-synapse/wrapper.nix +++ b/pkgs/servers/matrix-synapse/wrapper.nix @@ -14,11 +14,11 @@ let extraPackages = lib.concatMap (extra: matrix-synapse-unwrapped.optional-dependencies.${extra}) (lib.unique extras); - pluginsEnv = matrix-synapse-unwrapped.python.buildEnv.override { - extraLibs = plugins; + pythonEnv = matrix-synapse-unwrapped.python.buildEnv.override { + extraLibs = extraPackages ++ plugins; }; - searchPath = lib.makeSearchPathOutput "lib" matrix-synapse-unwrapped.python.sitePackages (extraPackages ++ [ pluginsEnv ]); + searchPath = "${pythonEnv}/${matrix-synapse-unwrapped.python.sitePackages}"; in stdenv.mkDerivation { name = (lib.appendToName "wrapped" matrix-synapse-unwrapped).name; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index f8e94264858ba..3423985f65840 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-uouxOXvVbUNRHM83JearPhMTZQtMPEBfWvsVb7QJSO8="; + hash = "sha256-bn9nUTtpaEkzF2SEdCcKG27WQDL7xsgfgA/72wElQqA="; }; buildInputs = [ olm ]; - vendorHash = "sha256-dgaI/gpngCcVRVK8SK6ac1hmc7/aYLJCnW2CCYRDXy0="; + vendorHash = "sha256-PDUSjza+0SDanQwKYQRuLzsiA/sHjRnG0xpzlzhkm+U="; doCheck = false; diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 29397ad3c8555..b7a7688fef5ee 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mediamtx"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-Upm/fiW3hXzBS+IpwzE3C6h6Z7ZpA2k+j2UqAWT8hF0="; + hash = "sha256-HdFq48+jpkl3UkfTyyrYllK5WM4ij4Qwqmf1bNstLAY="; }; - vendorHash = "sha256-uaOfULtZ+BdbX1TmDyZtYnoXV8579RSW6eocmPsXyP8="; + vendorHash = "sha256-Z9lm6Gw8q/6kK3AjF1A6zMryUJaKAO9bhXvBoBdlTaM="; # Tests need docker doCheck = false; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index e71a8fa4c577d..21c754ed90a9a 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,29 +1,17 @@ -{ lib, buildGo121Module, fetchFromGitHub, fetchpatch, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: -let +buildGoModule rec { pname = "miniflux"; - version = "2.0.50"; - -in buildGo121Module { - inherit pname version; + version = "2.0.51"; src = fetchFromGitHub { - owner = pname; + owner = "miniflux"; repo = "v2"; - rev = version; - sha256 = "sha256-+oNF/Zwc1Z/cu3SQC/ZTekAW5Qef9RKrdszunLomGII="; + rev = "refs/tags/${version}"; + hash = "sha256-gffiZOsHUYTDEjIdKUPyKbsdRKX890aG6GY72LYESkA="; }; - patches = [ - (fetchpatch { - # https://github.com/miniflux/v2/pull/2193, remove after 2.0.50 - name = "miniflux-user-agent-regression.patch"; - url = "https://github.com/miniflux/v2/commit/7a03291442a4e35572c73a2fcfe809fa8e03063e.patch"; - hash = "sha256-tJ1l5rqD0x0xtQs+tDwpFHOY+7k6X02bkwVJo6RAdb8="; - }) - ]; - - vendorHash = "sha256-jLyjQ+w/QS9uA0pGWF2X6dEfOifcI2gC2sgi1STEzpU="; + vendorHash = "sha256-yO4sNOkEDnM9eETE68C++dPnAfcoSMXznf5Nq4/iQmA="; nativeBuildInputs = [ installShellFiles ]; @@ -44,7 +32,7 @@ in buildGo121Module { description = "Minimalist and opinionated feed reader"; homepage = "https://miniflux.app/"; license = licenses.asl20; - maintainers = with maintainers; [ rvolosatovs benpye ]; + maintainers = with maintainers; [ rvolosatovs benpye emilylange ]; mainProgram = "miniflux"; }; } diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index bc61b99f0453f..53fe4a2fc4c21 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2023-09-20T22-49-55Z"; + version = "2023-12-23T07-19-11Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-JX+bxFAxTmOjpY6HAVVhdZftFx9HlniX+3zKY7Qui9w="; + sha256 = "sha256-1tgJraaF40GSBAnczzf0tdJMH8AXORmhpnEpVxe5yjc="; }; - vendorHash = "sha256-fcaMYm7Tw5zqtHhPzmUS/5E7AYI8P2fuxT2sDQwNttc="; + vendorHash = "sha256-TGdMKzpMRAEE1TpEU6IJKu3A6A1uC2BtifDxCfH9Fd0="; doCheck = false; diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 078125016bf0e..ed28e3be41818 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config (python3.withPackages (ps: with ps; [ pillow - ] ++ lib.optionals finalAttrs.doCheck [ + ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ pygobject3 python-dbusmock ])) @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DBUILD_DOXYGEN=OFF" "-DMIR_PLATFORM='gbm-kms;x11;eglstream-kms;wayland'" - "-DMIR_ENABLE_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + "-DMIR_ENABLE_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" # BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such # https://github.com/MirServer/mir/pull/1947#issuecomment-811810872 "-DMIR_SIGBUS_HANDLER_ENVIRONMENT_BROKEN=ON" diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 0098317d06215..8a9ff3dbfa06a 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.20.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-kdeDV8IWbfeC6KDgJtOl1NX6jwvxiaIdGAYtrDuYFdI="; + hash = "sha256-npPwAh7ReGVDGRi0cCs0/x2xCBCrUMsZl205BhEjxq4="; }; vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; diff --git a/pkgs/servers/misc/irrd/default.nix b/pkgs/servers/misc/irrd/default.nix index aef559d4e227e..e6cc723ab4dc0 100644 --- a/pkgs/servers/misc/irrd/default.nix +++ b/pkgs/servers/misc/irrd/default.nix @@ -1,6 +1,8 @@ { lib , python3 , fetchPypi +, fetchFromGitHub +, fetchpatch , git , postgresql , postgresqlTestHook @@ -10,6 +12,7 @@ let py = python3.override { packageOverrides = final: prev: { + # sqlalchemy 1.4.x or 2.x are not supported sqlalchemy = prev.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.3.24"; src = fetchPypi { @@ -19,31 +22,10 @@ let }; doCheck = false; }); - starlette = prev.starlette.overridePythonAttrs (oldAttrs: rec { - version = "0.20.4"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-QvzzEi+Zj+/OPixa1+Xtvw8Cz2hdZGqDoI1ARyavUIQ="; - }; - nativeBuildInputs = with final; [ - setuptools - ]; - doCheck = false; - }); - ariadne = prev.ariadne.overridePythonAttrs (oldAttrs: rec { - version = "0.17.1"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-B98wl/NkNOyq99AKsVQem9TZ0meOnvg7IdWIEAI2vy8="; - }; - nativeBuildInputs = with final; [ - setuptools - ]; + alembic = prev.alembic.overridePythonAttrs (lib.const { doCheck = false; }); - alembic = prev.alembic.overridePythonAttrs (lib.const { + factory-boy = prev.factory-boy.overridePythonAttrs (lib.const { doCheck = false; }); beautifultable = prev.beautifultable.overridePythonAttrs (oldAttrs: rec { @@ -61,25 +43,27 @@ in py.pkgs.buildPythonPackage rec { pname = "irrd"; - version = "4.3.0.post1"; - format = "setuptools"; + version = "4.4.2"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-hayfdcYAgIopfUiAR/AUWMuTzwpXvXuq6iPp9uhWN1M="; + src = fetchFromGitHub { + owner = "irrdnet"; + repo = "irrd"; + rev = "v${version}"; + hash = "sha256-vZSuBP44ZvN0mu2frcaQNZN/ilvKWIY9ETnrStzSnG0="; }; - patches = [ - ./irrd-asgiref-3.8.0.diff + # replace poetry dependency with poetry-core + # https://github.com/irrdnet/irrd/pull/884 + (fetchpatch { + url = "https://github.com/irrdnet/irrd/commit/4fb6e9b50d65729aff2d0a94c2e9b4e2daadea85.patch"; + hash = "sha256-DcE6VZfJkbHnPiEdYDpXea7S/8P0SmdvvJ42hywnpf0="; + }) ]; - pythonRelaxDeps = true; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook + poetry-core ]; - postPatch = '' - substituteInPlace setup.py --replace psycopg2-binary psycopg2 - ''; nativeCheckInputs = [ git @@ -90,6 +74,7 @@ py.pkgs.buildPythonPackage rec { pytest-asyncio pytest-freezegun pytestCheckHook + smtpdfix ]); propagatedBuildInputs = with py.pkgs; [ @@ -123,6 +108,17 @@ py.pkgs.buildPythonPackage rec { ujson wheel websockets + limits + factory-boy + webauthn + wtforms + imia + starlette-wtf + zxcvbn + pyotp + asgi-logger + wtforms-bootstrap5 + email-validator ] ++ py.pkgs.uvicorn.optional-dependencies.standard; preCheck = '' @@ -134,10 +130,17 @@ py.pkgs.buildPythonPackage rec { sleep 1 done + export SMTPD_HOST=127.0.0.1 export IRRD_DATABASE_URL="postgres:///$PGDATABASE" export IRRD_REDIS_URL="redis://localhost/1" ''; + # required for test_object_writing_and_status_checking + postgresqlTestSetupPost = '' + echo "track_commit_timestamp=on" >> $PGDATA/postgresql.conf + pg_ctl restart + ''; + postCheck = '' kill $REDIS_PID ''; diff --git a/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff b/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff deleted file mode 100644 index 0b81cbc6613dc..0000000000000 --- a/pkgs/servers/misc/irrd/irrd-asgiref-3.8.0.diff +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/irrd/server/graphql/schema_builder.py b/irrd/server/graphql/schema_builder.py -index 65ddf5d..b3b385a 100644 ---- a/irrd/server/graphql/schema_builder.py -+++ b/irrd/server/graphql/schema_builder.py -@@ -31,32 +31,32 @@ def build_executable_schema(): - """ - schema = SchemaGenerator() - -- schema.rpsl_object_type.set_type_resolver(sta(resolve_rpsl_object_type, False)) -- schema.rpsl_contact_union_type.set_type_resolver(sta(resolve_rpsl_object_type, False)) -+ schema.rpsl_object_type.set_type_resolver(sta(resolve_rpsl_object_type, thread_sensitive=False)) -+ schema.rpsl_contact_union_type.set_type_resolver(sta(resolve_rpsl_object_type, thread_sensitive=False)) - -- schema.query_type.set_field("rpslObjects", sta(resolve_rpsl_objects, False)) -- schema.query_type.set_field("databaseStatus", sta(resolve_database_status, False)) -- schema.query_type.set_field("asnPrefixes", sta(resolve_asn_prefixes, False)) -- schema.query_type.set_field("asSetPrefixes", sta(resolve_as_set_prefixes, False)) -- schema.query_type.set_field("recursiveSetMembers", sta(resolve_recursive_set_members, False)) -+ schema.query_type.set_field("rpslObjects", sta(resolve_rpsl_objects, thread_sensitive=False)) -+ schema.query_type.set_field("databaseStatus", sta(resolve_database_status, thread_sensitive=False)) -+ schema.query_type.set_field("asnPrefixes", sta(resolve_asn_prefixes, thread_sensitive=False)) -+ schema.query_type.set_field("asSetPrefixes", sta(resolve_as_set_prefixes, thread_sensitive=False)) -+ schema.query_type.set_field("recursiveSetMembers", sta(resolve_recursive_set_members, thread_sensitive=False)) - -- schema.rpsl_object_type.set_field("mntByObjs", sta(resolve_rpsl_object_mnt_by_objs, False)) -- schema.rpsl_object_type.set_field("journal", sta(resolve_rpsl_object_journal, False)) -+ schema.rpsl_object_type.set_field("mntByObjs", sta(resolve_rpsl_object_mnt_by_objs, thread_sensitive=False)) -+ schema.rpsl_object_type.set_field("journal", sta(resolve_rpsl_object_journal, thread_sensitive=False)) - for object_type in schema.object_types: - if "adminCObjs" in schema.graphql_types[object_type.name]: -- object_type.set_field("adminCObjs", sta(resolve_rpsl_object_adminc_objs, False)) -+ object_type.set_field("adminCObjs", sta(resolve_rpsl_object_adminc_objs, thread_sensitive=False)) - for object_type in schema.object_types: - if "techCObjs" in schema.graphql_types[object_type.name]: -- object_type.set_field("techCObjs", sta(resolve_rpsl_object_techc_objs, False)) -+ object_type.set_field("techCObjs", sta(resolve_rpsl_object_techc_objs, thread_sensitive=False)) - for object_type in schema.object_types: - if "mbrsByRefObjs" in schema.graphql_types[object_type.name]: -- object_type.set_field("mbrsByRefObjs", sta(resolve_rpsl_object_members_by_ref_objs, False)) -+ object_type.set_field("mbrsByRefObjs", sta(resolve_rpsl_object_members_by_ref_objs, thread_sensitive=False)) - for object_type in schema.object_types: - if "memberOfObjs" in schema.graphql_types[object_type.name]: -- object_type.set_field("memberOfObjs", sta(resolve_rpsl_object_member_of_objs, False)) -+ object_type.set_field("memberOfObjs", sta(resolve_rpsl_object_member_of_objs, thread_sensitive=False)) - for object_type in schema.object_types: - if "membersObjs" in schema.graphql_types[object_type.name]: -- object_type.set_field("membersObjs", sta(resolve_rpsl_object_members_objs, False)) -+ object_type.set_field("membersObjs", sta(resolve_rpsl_object_members_objs, thread_sensitive=False)) - - @schema.asn_scalar_type.value_parser - def parse_asn_scalar(value): diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 8c3b00857b4c4..8c18b6769a13a 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -1,4 +1,5 @@ { buildGoModule +, buildPackages , fetchFromGitHub , fetchNpmDeps , lib @@ -17,13 +18,13 @@ buildGoModule rec { pname = "navidrome"; - version = "0.50.1"; + version = "0.50.2"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${version}"; - hash = "sha256-mbjc5fznJZmZrY1Rd+57ABN55Hyzg1XqZR/qwtesRIg="; + hash = "sha256-SZ9wVOHtmkrWfYGA0hNCXag2Yp17glOQpBsEQRK6Npg="; }; vendorHash = "sha256-PKj2zJhGR1yETLZ4as35cuwil3vfyFKfkKF/32YdAt8="; @@ -37,7 +38,7 @@ buildGoModule rec { }; nativeBuildInputs = [ - makeWrapper + buildPackages.makeWrapper nodejs npmHooks.npmConfigHook pkg-config diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index db725261dbc3d..72b931092d3a5 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-tbM2JWoub789s3YanT/lqCKl6JkY+FahSYb+lHvF7W8="; + sha256 = "sha256-wbfx6Ennyl4qWODRAtJ3eydSRFfE/ANCSl2GA9oq90A="; }; separateDebugInfo = true; - cargoHash = "sha256-l2rWR9HAXTuNEarj2hWaZxpTdUNGoCnNfsZs8Y+of+s="; + cargoHash = "sha256-Vdvk700NjjCTSD0Lscr5ckxsYa4pDJdmV7Kgr++0GFY="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index 7a4707322b653..4a97ae7bfa1d1 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -1,26 +1,13 @@ -{ fetchFromGitLab, applyPatches, fetchpatch }: rec { +{ fetchFromGitLab }: rec { pname = "mobilizon"; - version = "3.2.0"; + version = "4.0.2"; - src = applyPatches { - src = fetchFromGitLab { - domain = "framagit.org"; - owner = "framasoft"; - repo = pname; - rev = version; - sha256 = "sha256-zgHR0taMMMwAoJEJr5s1rmSwJh31+qAfPQW9DSDuC8A="; - }; - patches = [ - # See https://framagit.org/framasoft/mobilizon/-/merge_requests/1452 - (fetchpatch { - url = "https://framagit.org/framasoft/mobilizon/-/commit/856d236b141c96705e1211e780e3f0e8950bb48e.patch"; - sha256 = "sha256-uEPvoTPVWHdg/KPWMG/Ck2qUjC+EUO3hyZnzpFxuoL0="; - }) - (fetchpatch { - url = "https://framagit.org/framasoft/mobilizon/-/commit/3936eb4cc5125b838b73adc7e49ca6ce3b2f73ce.patch"; - sha256 = "sha256-Srq691J1DbG3d26AKYZxkiMg0DfM33o3AllZpCjG2PQ="; - }) - ]; + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "framasoft"; + repo = pname; + rev = version; + sha256 = "sha256-Ri1qCiQaKlSTSSGWHzFqYBCoTEMtOtwe0Kli466dv4M="; }; } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index a4dca53c0802d..191952f646813 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -18,10 +18,6 @@ in mixRelease rec { inherit (common) pname version src; - # See https://github.com/whitfin/cachex/issues/205 - # This circumvents a startup error for now - stripDebug = false; - nativeBuildInputs = [ git cmake ]; mixNixDeps = import ./mix.nix { @@ -35,15 +31,15 @@ mixRelease rec { fast_html = prev.fast_html.override { nativeBuildInputs = [ cmake ]; }; - ex_cldr = prev.ex_cldr.overrideAttrs (old: rec { - version = "2.37.2"; + ex_cldr = prev.ex_cldr.overrideAttrs (old: { # We have to use the GitHub sources, as it otherwise tries to download # the locales at build time. src = fetchFromGitHub { owner = "elixir-cldr"; repo = "cldr"; - rev = "v${version}"; - sha256 = "sha256-dDOQzLIi3zjb9xPyR7Baul96i9Mb3CFHUA+AWSexrk4="; + rev = "v${old.version}"; + sha256 = assert old.version == "2.37.5"; + "sha256-T5Qvuo+xPwpgBsqHNZYnTCA4loToeBn1LKTMsDcCdYs="; }; postInstall = '' cp $src/priv/cldr/locales/* $out/lib/erlang/lib/ex_cldr-${old.version}/priv/cldr/locales/ @@ -55,7 +51,7 @@ mixRelease rec { }); # The remainder are Git dependencies (and their deps) that are not supported by mix2nix currently. - web_push_encryption = buildMix { + web_push_encryption = buildMix rec { name = "web_push_encryption"; version = "0.3.1"; src = fetchFromGitHub { @@ -77,40 +73,36 @@ mixRelease rec { }; beamDeps = with final; [ mix_test_watch ex_doc timex ]; }; - exkismet = buildMix rec { - name = "exkismet"; - version = "0.0.1"; + rajska = buildMix rec { + name = "rajska"; + version = "1.3.3"; src = fetchFromGitHub { owner = "tcitworld"; repo = name; - rev = "8b5485fde00fafbde20f315bec387a77f7358334"; - sha256 = "sha256-ttgCWoBKU7VTjZJBhZNtqVF4kN7psBr/qOeR65MbTqw="; + rev = "0c036448e261e8be6a512581c592fadf48982d84"; + sha256 = "sha256-4pfply1vTAIT2Xvm3kONmrCK05xKfXFvcb8EKoSCXBE="; }; - beamDeps = with final; [ httpoison ]; + beamDeps = with final; [ ex_doc credo absinthe excoveralls hammer mock ]; }; - rajska = buildMix rec { - name = "rajska"; - version = "0.0.1"; + exkismet = buildMix rec { + name = "exkismet"; + version = "0.0.3"; src = fetchFromGitHub { owner = "tcitworld"; repo = name; - rev = "0c036448e261e8be6a512581c592fadf48982d84"; - sha256 = "sha256-4pfply1vTAIT2Xvm3kONmrCK05xKfXFvcb8EKoSCXBE="; + rev = "8b5485fde00fafbde20f315bec387a77f7358334"; + sha256 = "sha256-ttgCWoBKU7VTjZJBhZNtqVF4kN7psBr/qOeR65MbTqw="; }; - beamDeps = with final; [ httpoison absinthe ]; + beamDeps = with final; [ httpoison ex_doc credo doctor dialyxir ]; }; }); }; - preConfigure = '' - export LANG=C.UTF-8 # fix elixir locale warning - ''; - # Install the compiled js part preBuild = '' - cp -a "${mobilizon-frontend}/libexec/mobilizon/deps/priv/static" ./priv + cp -a "${mobilizon-frontend}/static" ./priv chmod 770 -R ./priv ''; @@ -123,9 +115,7 @@ mixRelease rec { updateScript = writeShellScriptBin "update.sh" '' set -eou pipefail - SRC=$(nix path-info .#mobilizon.src) - ${mix2nix}/bin/mix2nix $SRC/mix.lock > pkgs/servers/mobilizon/mix.nix - cat $SRC/js/package.json > pkgs/servers/mobilizon/package.json + ${mix2nix}/bin/mix2nix '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix ''; elixirPackage = beamPackages.elixir; }; diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix index 220138c33406a..5ea6242c5bdcf 100644 --- a/pkgs/servers/mobilizon/frontend.nix +++ b/pkgs/servers/mobilizon/frontend.nix @@ -1,38 +1,19 @@ -{ lib, callPackage, mkYarnPackage, fetchYarnDeps, imagemagick }: +{ lib, callPackage, buildNpmPackage, imagemagick }: let common = callPackage ./common.nix { }; in -mkYarnPackage rec { - src = "${common.src}/js"; +buildNpmPackage { + inherit (common) pname version src; - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = "sha256-VkJ6vBt9EFoQVMWMV8FhPJBHcLJDDfOxd+NLb+DZy3U="; - }; - - packageJSON = ./package.json; - - # Somehow $out/deps/mobilizon/node_modules ends up only containing nothing - # more than a .bin directory otherwise. - yarnPostBuild = '' - rm -rf $out/deps/mobilizon/node_modules - ln -s $out/node_modules $out/deps/mobilizon/node_modules - ''; - - buildPhase = '' - runHook preBuild + npmDepsHash = "sha256-z/xWumL1wri63cGGMHMBq6WVDe81bp8tILsZa53a7FM="; - yarn run build + nativeBuildInputs = [ imagemagick ]; - runHook postBuild + postInstall = '' + cp -r priv/static $out/static ''; - doCheck = true; - checkPhase = "yarn run test"; - - nativeBuildInputs = [ imagemagick ]; - meta = with lib; { description = "Frontend for the Mobilizon server"; homepage = "https://joinmobilizon.org/"; diff --git a/pkgs/servers/mobilizon/mix.nix b/pkgs/servers/mobilizon/mix.nix index c6707e62494b1..60d212d7fa072 100644 --- a/pkgs/servers/mobilizon/mix.nix +++ b/pkgs/servers/mobilizon/mix.nix @@ -10,12 +10,12 @@ let packages = with beamPackages; with self; { absinthe = buildMix rec { name = "absinthe"; - version = "1.7.5"; + version = "1.7.6"; src = fetchHex { pkg = "absinthe"; version = "${version}"; - sha256 = "22a9a38adca26294ad0ee91226168f5d215b401efd770b8a1b8fd9c9b21ec316"; + sha256 = "e7626951ca5eec627da960615b51009f3a774765406ff02722b1d818f17e5778"; }; beamDeps = [ dataloader decimal nimble_parsec telemetry ]; @@ -49,12 +49,12 @@ let argon2_elixir = buildMix rec { name = "argon2_elixir"; - version = "3.2.1"; + version = "4.0.0"; src = fetchHex { pkg = "argon2_elixir"; version = "${version}"; - sha256 = "a813b78217394530b5fcf4c8070feee43df03ffef938d044019169c766315690"; + sha256 = "f9da27cf060c9ea61b1bd47837a28d7e48a8f6fa13a745e252556c14f9132c7f"; }; beamDeps = [ comeonin elixir_make ]; @@ -101,12 +101,12 @@ let castore = buildMix rec { name = "castore"; - version = "1.0.3"; + version = "1.0.4"; src = fetchHex { pkg = "castore"; version = "${version}"; - sha256 = "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b"; + sha256 = "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8"; }; beamDeps = []; @@ -127,12 +127,12 @@ let cldr_utils = buildMix rec { name = "cldr_utils"; - version = "2.24.1"; + version = "2.24.2"; src = fetchHex { pkg = "cldr_utils"; version = "${version}"; - sha256 = "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780"; + sha256 = "3362b838836a9f0fa309de09a7127e36e67310e797d556db92f71b548832c7cf"; }; beamDeps = [ castore certifi decimal ]; @@ -244,12 +244,12 @@ let credo = buildMix rec { name = "credo"; - version = "1.7.0"; + version = "1.7.1"; src = fetchHex { pkg = "credo"; version = "${version}"; - sha256 = "6839fcf63d1f0d1c0f450abc8564a57c43d644077ab96f2934563e68b8a769d7"; + sha256 = "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2"; }; beamDeps = [ bunt file_system jason ]; @@ -309,12 +309,12 @@ let dialyxir = buildMix rec { name = "dialyxir"; - version = "1.4.1"; + version = "1.4.2"; src = fetchHex { pkg = "dialyxir"; version = "${version}"; - sha256 = "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801"; + sha256 = "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"; }; beamDeps = [ erlex ]; @@ -348,12 +348,12 @@ let earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.33"; + version = "1.4.38"; src = fetchHex { pkg = "earmark_parser"; version = "${version}"; - sha256 = "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"; + sha256 = "2cd0907795aaef0c7e8442e376633c5b3bd6edc8dbbdc539b22f095501c1cdb6"; }; beamDeps = []; @@ -374,12 +374,12 @@ let ecto = buildMix rec { name = "ecto"; - version = "3.10.3"; + version = "3.11.0"; src = fetchHex { pkg = "ecto"; version = "${version}"; - sha256 = "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"; + sha256 = "7769dad267ef967310d6e988e92d772659b11b09a0c015f101ce0fff81ce1f81"; }; beamDeps = [ decimal jason telemetry ]; @@ -439,12 +439,12 @@ let ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.10.2"; + version = "3.11.0"; src = fetchHex { pkg = "ecto_sql"; version = "${version}"; - sha256 = "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"; + sha256 = "77aa3677169f55c2714dda7352d563002d180eb33c0dc29cd36d39c0a1a971f5"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -517,12 +517,12 @@ let ex_cldr = buildMix rec { name = "ex_cldr"; - version = "2.37.2"; + version = "2.37.5"; src = fetchHex { pkg = "ex_cldr"; version = "${version}"; - sha256 = "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba"; + sha256 = "74ad5ddff791112ce4156382e171a5f5d3766af9d5c4675e0571f081fe136479"; }; beamDeps = [ cldr_utils decimal gettext jason nimble_parsec ]; @@ -543,12 +543,12 @@ let ex_cldr_currencies = buildMix rec { name = "ex_cldr_currencies"; - version = "2.15.0"; + version = "2.15.1"; src = fetchHex { pkg = "ex_cldr_currencies"; version = "${version}"; - sha256 = "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8"; + sha256 = "31df8bd37688340f8819bdd770eb17d659652078d34db632b85d4a32864d6a25"; }; beamDeps = [ ex_cldr jason ]; @@ -556,12 +556,12 @@ let ex_cldr_dates_times = buildMix rec { name = "ex_cldr_dates_times"; - version = "2.14.0"; + version = "2.16.0"; src = fetchHex { pkg = "ex_cldr_dates_times"; version = "${version}"; - sha256 = "f85a8b00546f6aecc2df7a97f15b9de66662d81578653128699c839f7a40bf94"; + sha256 = "0f2f250d479cadda4e0ef3a5e3d936ae7ba1a3f1199db6791e284e86203495b1"; }; beamDeps = [ ex_cldr_calendars ex_cldr_numbers jason ]; @@ -582,12 +582,12 @@ let ex_cldr_numbers = buildMix rec { name = "ex_cldr_numbers"; - version = "2.32.0"; + version = "2.32.3"; src = fetchHex { pkg = "ex_cldr_numbers"; version = "${version}"; - sha256 = "08c43c26b8605b56b5856bb9277d2a0282f2e29b43c57dfbfd7bf9c28b4a504a"; + sha256 = "7b626ff1e59a0ec9c3c5db5ce9ca91a6995e2ab56426b71f3cbf67181ea225f5"; }; beamDeps = [ decimal digital_token ex_cldr ex_cldr_currencies jason ]; @@ -595,12 +595,12 @@ let ex_cldr_plugs = buildMix rec { name = "ex_cldr_plugs"; - version = "1.3.0"; + version = "1.3.1"; src = fetchHex { pkg = "ex_cldr_plugs"; version = "${version}"; - sha256 = "699a98543ea14a7c849fae768041c40f49aa611aa55866025d227796e4858bff"; + sha256 = "4f7b4a5fe061734cef7b62ff29118ed6ac72698cdd7bcfc97495db73611fe0fe"; }; beamDeps = [ ex_cldr gettext jason plug ]; @@ -608,12 +608,12 @@ let ex_doc = buildMix rec { name = "ex_doc"; - version = "0.30.6"; + version = "0.30.9"; src = fetchHex { pkg = "ex_doc"; version = "${version}"; - sha256 = "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"; + sha256 = "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -673,12 +673,12 @@ let excoveralls = buildMix rec { name = "excoveralls"; - version = "0.17.1"; + version = "0.18.0"; src = fetchHex { pkg = "excoveralls"; version = "${version}"; - sha256 = "95bc6fda953e84c60f14da4a198880336205464e75383ec0f570180567985ae0"; + sha256 = "1109bb911f3cb583401760be49c02cbbd16aed66ea9509fc5479335d284da60b"; }; beamDeps = [ castore jason ]; @@ -699,12 +699,12 @@ let expo = buildMix rec { name = "expo"; - version = "0.1.0"; + version = "0.4.1"; src = fetchHex { pkg = "expo"; version = "${version}"; - sha256 = "c22c536021c56de058aaeedeabb4744eb5d48137bacf8c29f04d25b6c6bbbf45"; + sha256 = "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"; }; beamDeps = []; @@ -777,12 +777,12 @@ let floki = buildMix rec { name = "floki"; - version = "0.34.3"; + version = "0.35.2"; src = fetchHex { pkg = "floki"; version = "${version}"; - sha256 = "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"; + sha256 = "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"; }; beamDeps = []; @@ -868,25 +868,25 @@ let gettext = buildMix rec { name = "gettext"; - version = "0.20.0"; + version = "0.23.1"; src = fetchHex { pkg = "gettext"; version = "${version}"; - sha256 = "1c03b177435e93a47441d7f681a7040bd2a816ece9e2666d1c9001035121eb3d"; + sha256 = "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"; }; - beamDeps = []; + beamDeps = [ expo ]; }; guardian = buildMix rec { name = "guardian"; - version = "2.3.1"; + version = "2.3.2"; src = fetchHex { pkg = "guardian"; version = "${version}"; - sha256 = "bbe241f9ca1b09fad916ad42d6049d2600bbc688aba5b3c4a6c82592a54274c3"; + sha256 = "b189ff38cd46a22a8a824866a6867ca8722942347f13c33f7d23126af8821b52"; }; beamDeps = [ jose plug ]; @@ -894,12 +894,12 @@ let guardian_db = buildMix rec { name = "guardian_db"; - version = "2.1.0"; + version = "3.0.0"; src = fetchHex { pkg = "guardian_db"; version = "${version}"; - sha256 = "f8e7d543ac92c395f3a7fd5acbe6829faeade57d688f7562e2f0fca8f94a0d70"; + sha256 = "9c2ec4278efa34f9f1cc6ba795e552d41fdc7ffba5319d67eeb533b89392d183"; }; beamDeps = [ ecto ecto_sql guardian postgrex ]; @@ -920,12 +920,12 @@ let hackney = buildRebar3 rec { name = "hackney"; - version = "1.18.2"; + version = "1.20.1"; src = fetchHex { pkg = "hackney"; version = "${version}"; - sha256 = "af94d5c9f97857db257090a4a10e5426ecb6f4918aa5cc666798566ae14b65fd"; + sha256 = "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; @@ -1102,12 +1102,12 @@ let makeup = buildMix rec { name = "makeup"; - version = "1.1.0"; + version = "1.1.1"; src = fetchHex { pkg = "makeup"; version = "${version}"; - sha256 = "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"; + sha256 = "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"; }; beamDeps = [ nimble_parsec ]; @@ -1258,12 +1258,12 @@ let mox = buildMix rec { name = "mox"; - version = "1.0.2"; + version = "1.1.0"; src = fetchHex { pkg = "mox"; version = "${version}"; - sha256 = "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2"; + sha256 = "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13"; }; beamDeps = []; @@ -1284,12 +1284,12 @@ let nimble_parsec = buildMix rec { name = "nimble_parsec"; - version = "1.3.1"; + version = "1.4.0"; src = fetchHex { pkg = "nimble_parsec"; version = "${version}"; - sha256 = "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"; + sha256 = "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"; }; beamDeps = []; @@ -1336,12 +1336,12 @@ let oban = buildMix rec { name = "oban"; - version = "2.15.4"; + version = "2.16.3"; src = fetchHex { pkg = "oban"; version = "${version}"; - sha256 = "5fce611fdfffb13e9148df883116e5201adf1e731eb302cc88cde0588510079c"; + sha256 = "4d8a7fb62f63cf2f2080c78954425f5fd8916ef57196b7f79b5bc657abb2ac5f"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1375,12 +1375,12 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.7.7"; + version = "1.7.10"; src = fetchHex { pkg = "phoenix"; version = "${version}"; - sha256 = "8966e15c395e5e37591b6ed0bd2ae7f48e961f0f60ac4c733f9566b519453085"; + sha256 = "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0"; }; beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter ]; @@ -1388,12 +1388,12 @@ let phoenix_ecto = buildMix rec { name = "phoenix_ecto"; - version = "4.4.2"; + version = "4.4.3"; src = fetchHex { pkg = "phoenix_ecto"; version = "${version}"; - sha256 = "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"; + sha256 = "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"; }; beamDeps = [ ecto phoenix_html plug ]; @@ -1401,12 +1401,12 @@ let phoenix_html = buildMix rec { name = "phoenix_html"; - version = "3.3.2"; + version = "3.3.3"; src = fetchHex { pkg = "phoenix_html"; version = "${version}"; - sha256 = "44adaf8e667c1c20fb9d284b6b0fa8dc7946ce29e81ce621860aa7e96de9a11d"; + sha256 = "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"; }; beamDeps = [ plug ]; @@ -1427,15 +1427,15 @@ let phoenix_live_view = buildMix rec { name = "phoenix_live_view"; - version = "0.19.5"; + version = "0.20.1"; src = fetchHex { pkg = "phoenix_live_view"; version = "${version}"; - sha256 = "b2eaa0dd3cfb9bd7fb949b88217df9f25aed915e986a28ad5c8a0d054e7ca9d3"; + sha256 = "be494fd1215052729298b0e97d5c2ce8e719c00854b82cd8cf15c1cd7fcf6294"; }; - beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ]; + beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view plug telemetry ]; }; phoenix_pubsub = buildMix rec { @@ -1479,12 +1479,12 @@ let phoenix_view = buildMix rec { name = "phoenix_view"; - version = "2.0.2"; + version = "2.0.3"; src = fetchHex { pkg = "phoenix_view"; version = "${version}"; - sha256 = "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"; + sha256 = "cd34049af41be2c627df99cd4eaa71fc52a328c0c3d8e7d4aa28f880c30e7f64"; }; beamDeps = [ phoenix_html phoenix_template ]; @@ -1492,12 +1492,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.14.2"; + version = "1.15.2"; src = fetchHex { pkg = "plug"; version = "${version}"; - sha256 = "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"; + sha256 = "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1518,12 +1518,12 @@ let plug_crypto = buildMix rec { name = "plug_crypto"; - version = "1.2.5"; + version = "2.0.0"; src = fetchHex { pkg = "plug_crypto"; version = "${version}"; - sha256 = "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"; + sha256 = "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"; }; beamDeps = []; @@ -1739,15 +1739,15 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.11.5"; + version = "1.14.1"; src = fetchHex { pkg = "swoosh"; version = "${version}"; - sha256 = "21ee57dcd68d2f56d3bbe11e76d56d142b221bb12b6018c551cc68442b800040"; + sha256 = "87da72260b4351678f96aec61db5c2acc8a88cda2cf2c4f534eb4c9c461350c7"; }; - beamDeps = [ cowboy gen_smtp hackney jason mime plug_cowboy telemetry ]; + beamDeps = [ cowboy gen_smtp hackney jason mime plug plug_cowboy telemetry ]; }; telemetry = buildRebar3 rec { @@ -1765,12 +1765,12 @@ let tesla = buildMix rec { name = "tesla"; - version = "1.7.0"; + version = "1.8.0"; src = fetchHex { pkg = "tesla"; version = "${version}"; - sha256 = "2e64f01ebfdb026209b47bc651a0e65203fcff4ae79c11efb73c4852b00dc313"; + sha256 = "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"; }; beamDeps = [ castore hackney jason mime telemetry ]; @@ -1789,14 +1789,27 @@ let beamDeps = [ combine gettext tzdata ]; }; + tls_certificate_check = buildRebar3 rec { + name = "tls_certificate_check"; + version = "1.20.0"; + + src = fetchHex { + pkg = "tls_certificate_check"; + version = "${version}"; + sha256 = "ab57b74b1a63dc5775650699a3ec032ec0065005eff1f020818742b7312a8426"; + }; + + beamDeps = [ ssl_verify_fun ]; + }; + tz_world = buildMix rec { name = "tz_world"; - version = "1.3.0"; + version = "1.3.1"; src = fetchHex { pkg = "tz_world"; version = "${version}"; - sha256 = "78b565aa0899b48ce34686319119dfdadff07a255ec43fd9ed6e7d60cc8d1390"; + sha256 = "901ed2b4a4430ecab3765244da4a19e6f19141867c2ab3753924919b87ed2224"; }; beamDeps = [ castore certifi geo jason ]; @@ -1895,12 +1908,12 @@ let ueberauth_google = buildMix rec { name = "ueberauth_google"; - version = "0.10.3"; + version = "0.12.1"; src = fetchHex { pkg = "ueberauth_google"; version = "${version}"; - sha256 = "2462ca9652acc936e0738691869d024e3e262f83ba9f6b4e874b961812290038"; + sha256 = "7f7deacd679b2b66e3bffb68ecc77aa1b5396a0cbac2941815f253128e458c38"; }; beamDeps = [ oauth2 ueberauth ]; @@ -1999,12 +2012,12 @@ let websock_adapter = buildMix rec { name = "websock_adapter"; - version = "0.5.4"; + version = "0.5.5"; src = fetchHex { pkg = "websock_adapter"; version = "${version}"; - sha256 = "d2c238c79c52cbe223fcdae22ca0bb5007a735b9e933870e241fce66afb4f4ab"; + sha256 = "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9"; }; beamDeps = [ plug plug_cowboy websock ]; diff --git a/pkgs/servers/mobilizon/package.json b/pkgs/servers/mobilizon/package.json deleted file mode 100644 index 662bcfa0daf25..0000000000000 --- a/pkgs/servers/mobilizon/package.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "name": "mobilizon", - "version": "3.2.0", - "private": true, - "scripts": { - "dev": "vite", - "preview": "vite preview", - "build": "yarn run build:assets && yarn run build:pictures", - "lint": "eslint --ext .ts,.vue --ignore-path .gitignore --fix src", - "format": "prettier . --write", - "build:assets": "vite build", - "build:pictures": "bash ./scripts/build/pictures.sh", - "story:dev": "histoire dev", - "story:build": "histoire build", - "story:preview": "histoire preview", - "test": "vitest", - "coverage": "vitest run --coverage", - "prepare": "cd ../ && husky install" - }, - "lint-staged": { - "**/*.{js,ts,vue}": [ - "eslint --fix", - "prettier --write" - ] - }, - "dependencies": { - "@absinthe/socket": "^0.2.1", - "@absinthe/socket-apollo-link": "^0.2.1", - "@apollo/client": "^3.3.16", - "@oruga-ui/oruga-next": "^0.6.0", - "@sentry/tracing": "^7.1", - "@sentry/vue": "^7.1", - "@tiptap/core": "^2.0.0-beta.41", - "@tiptap/extension-blockquote": "^2.0.0-beta.25", - "@tiptap/extension-bold": "^2.0.0-beta.24", - "@tiptap/extension-bubble-menu": "^2.0.0-beta.9", - "@tiptap/extension-bullet-list": "^2.0.0-beta.23", - "@tiptap/extension-document": "^2.0.0-beta.15", - "@tiptap/extension-dropcursor": "^2.0.0-beta.25", - "@tiptap/extension-gapcursor": "^2.0.0-beta.33", - "@tiptap/extension-heading": "^2.0.0-beta.23", - "@tiptap/extension-history": "^2.0.0-beta.21", - "@tiptap/extension-image": "^2.0.0-beta.6", - "@tiptap/extension-italic": "^2.0.0-beta.24", - "@tiptap/extension-link": "^2.0.0-beta.8", - "@tiptap/extension-list-item": "^2.0.0-beta.19", - "@tiptap/extension-mention": "^2.0.0-beta.42", - "@tiptap/extension-ordered-list": "^2.0.0-beta.24", - "@tiptap/extension-paragraph": "^2.0.0-beta.22", - "@tiptap/extension-placeholder": "^2.0.0-beta.199", - "@tiptap/extension-strike": "^2.0.0-beta.26", - "@tiptap/extension-text": "^2.0.0-beta.15", - "@tiptap/extension-underline": "^2.0.0-beta.7", - "@tiptap/pm": "^2.0.0-beta.220", - "@tiptap/suggestion": "^2.0.0-beta.195", - "@tiptap/vue-3": "^2.0.0-beta.96", - "@vue-a11y/announcer": "^2.1.0", - "@vue-a11y/skip-to": "^2.1.2", - "@vue-leaflet/vue-leaflet": "^0.10.1", - "@vue/apollo-composable": "^4.0.0-beta.9", - "@vue/compiler-sfc": "^3.2.37", - "@vueuse/core": "^10.0.2", - "@vueuse/head": "^1.0", - "@vueuse/router": "^10.0.2", - "apollo-absinthe-upload-link": "^1.5.0", - "autoprefixer": "^10", - "blurhash": "^2.0.0", - "date-fns": "^2.16.0", - "date-fns-tz": "^2.0.0", - "floating-vue": "^2.0.0-beta.24", - "graphql": "^15.8.0", - "graphql-tag": "^2.10.3", - "hammerjs": "^2.0.8", - "intersection-observer": "^0.12.0", - "jwt-decode": "^3.1.2", - "leaflet": "^1.4.0", - "leaflet.locatecontrol": "^0.79", - "leaflet.markercluster": "^1.5.3", - "lodash": "^4.17.11", - "ngeohash": "^0.6.3", - "p-debounce": "^4.0.0", - "phoenix": "^1.6", - "postcss": "^8", - "register-service-worker": "^1.7.2", - "sanitize-html": "^2.5.3", - "tailwindcss": "^3", - "tippy.js": "^6.2.3", - "unfetch": "^5.0.0", - "vue": "^3.2.37", - "vue-i18n": "9", - "vue-material-design-icons": "^5.1.2", - "vue-matomo": "^4.1.0", - "vue-plausible": "^1.3.1", - "vue-router": "4", - "vue-scrollto": "^2.17.1", - "vue-use-route-query": "^1.1.0", - "zhyswan-vuedraggable": "^4.1.3" - }, - "devDependencies": { - "@histoire/plugin-vue": "^0.17.1", - "@playwright/test": "^1.25.1", - "@rushstack/eslint-patch": "^1.1.4", - "@tailwindcss/forms": "^0.5.2", - "@tailwindcss/typography": "^0.5.4", - "@types/hammerjs": "^2.0.41", - "@types/leaflet": "^1.5.2", - "@types/leaflet.locatecontrol": "^0.74", - "@types/leaflet.markercluster": "^1.5.1", - "@types/lodash": "^4.14.141", - "@types/ngeohash": "^0.6.2", - "@types/phoenix": "^1.5.2", - "@types/sanitize-html": "^2.5.0", - "@vitejs/plugin-vue": "^4.0.0", - "@vitest/coverage-v8": "^0.34.1", - "@vitest/ui": "^0.34.1", - "@vue/eslint-config-prettier": "^8.0.0", - "@vue/eslint-config-typescript": "^11.0.0", - "@vue/test-utils": "^2.0.2", - "eslint": "^8.21.0", - "eslint-config-prettier": "^9.0.0", - "eslint-plugin-import": "^2.20.2", - "eslint-plugin-prettier": "^5.0.0", - "eslint-plugin-vue": "^9.3.0", - "flush-promises": "^1.0.2", - "histoire": "^0.17.0", - "husky": "^8.0.3", - "jsdom": "^22.0.0", - "lint-staged": "^14.0.1", - "mock-apollo-client": "^1.1.0", - "prettier": "^3.0.0", - "prettier-eslint": "^15.0.1", - "rollup-plugin-visualizer": "^5.7.1", - "sass": "^1.34.1", - "typescript": "~5.1.3", - "vite": "^4.0.4", - "vite-plugin-pwa": "^0.16.4", - "vitest": "^0.34.1", - "vue-i18n-extract": "^2.0.4" - } -} diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix index 10bf273497dd9..bf1af9e944d7a 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.8.0"; + version = "5.9.3"; outputs = [ "out" "lambda" ]; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "buildkite"; repo = "buildkite-agent-metrics"; rev = "v${version}"; - hash = "sha256-QPtjKjUGKlqgklZ0wUOJ1lXuXHhWVC83cEJ4QVtgdl4="; + hash = "sha256-DepIptvR4i0+/45stCMErJtDeAFIDiNbhioitQ8gYBs="; }; - vendorHash = "sha256-KgTzaF8dFD4VwcuSqmOy2CSfLuA0rjFwtCqGNYHFFlc="; + vendorHash = "sha256-YEvVGtfhe/RBeuD87C2BNOFEeK40JDidX4loSLdBwhs="; postInstall = '' mkdir -p $lambda/bin diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index e988bc7f0ba77..639e4a0b0bc34 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,18 +7,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.8.4"; + version = "3.9.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-YfqIWPciFyPIpQypSDNEK2yXV1Ah9TiLiEzEFA/KcMw="; + hash = "sha256-MFMAfjvP7FQRG71xbgwhreDIBdQ4Qho/msdmDLiRetg="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-HgUHxfFchqarVMmxbEg1gRN9vSkEx48aSy1yreux9fs="; + hash = "sha256-hrDsgZlfLJTO3ROJ/Zb3OyF2QQTjsSJIt+2TesyXYUA="; }; packageJSON = ./package.json; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index 8e32a849b69b3..ca8fec206830b 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -52,7 +52,7 @@ "@types/node": "^18.7.18", "@typescript-eslint/eslint-plugin": "5.37.0", "@typescript-eslint/parser": "5.37.0", - "axios": "0.27.2", + "axios": "1.6.0", "cross-env": "7.0.3", "eslint": "8.23.1", "eslint-config-prettier": "8.5.0", diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 2cc7042068d49..9dc861c758664 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "10.2.2"; + version = "10.2.3"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" "modowners" ]; @@ -10,19 +10,19 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-MlrGBa/ZQwfETr5vt7CyJxtvZC021aeWsgKtfuc8wAc="; + hash = "sha256-F61RtPEjQ4uFVcJLG04CD4//w8X7uJinxzYyoW/MosA="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - hash = "sha256-Mt0si5TxkXGQp5vmVD37fl3WKXuuIcJNtiTcEYCroZ8="; + hash = "sha256-xoZgaml1SB9PEI3kTE3zRlJR5O4tog58bua2blvc8to="; }; - vendorHash = "sha256-z2eDbnezG9TWrqLPxAXHBgdtXvaEf8ccUQUe9MnhjtQ="; + vendorHash = "sha256-rQOnuh6t+cUqyAAnUhGgxMaW88pawnauAGQd6w0T57Q="; nativeBuildInputs = [ wire ]; - preBuild = let + postConfigure = let skipTest = lineOffset: testCase: file: let jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]); diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index f1381f954c2e4..b1b00a32b4d6d 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { homepage = "https://www.icinga.com"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ das_j ]; + maintainers = lib.teams.helsinki-systems.members; }; } diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 72ffed83f37c6..00f6fbe7da9fd 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.9.2"; + version = "2.9.3"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-CYF0cse8NyHEnSZPRI9LNI09vr7kWPXHNibiEbW484E="; + hash = "sha256-9EUlznnZczgHXUy784830FvUS6OwaFf7FmUJGeWeXP0="; }; vendorHash = null; @@ -55,6 +55,6 @@ buildGoModule rec { license = with licenses; [ agpl3Only asl20 ]; homepage = "https://grafana.com/oss/loki/"; changelog = "https://github.com/grafana/loki/releases/tag/v${version}"; - maintainers = with maintainers; [ willibutz globin mmahut emilylange ajs124 ]; + maintainers = with maintainers; [ willibutz globin mmahut emilylange ] ++ teams.helsinki-systems.members; }; } diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 47237a3eeb161..8d65f992432fa 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.78.0"; + version = "0.78.3"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L8kYbJ9RmCoec9keBHv61K94rjnH+Q4dRkn6PCtjgJI="; + sha256 = "sha256-9PahaZlHtD4p3C8CvXF2ceNuSOqyApJaZWhFNffNlVA="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-A3e6qd6yjKsNUaXiltbS9G4WEMd3F1FxaxqMMVuBCUI="; + vendorHash = "sha256-lcK1rofTKPpEu/tK8XpS9EhOA30R/8J3o57YlU1/+0k="; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index b52ca5a2f1c22..8516d40fdeb40 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = "2.10.4"; + version = "2.10.5"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - hash = "sha256-0OFuMWoYgo8qCxWk93wOy45diLb2JIBsoxptLKTeOC4="; + hash = "sha256-+Xlejvdpum1UMUhELUzcF9bJOXx4tIkDA8wHrE88U5w="; }; vendorHash = null; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index bc99ae1f8f695..ad5c6e36a62e3 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { perlPackages.Socket6 perlPackages.URI perlPackages.DBFile - perlPackages.DateManip + perlPackages.TimeDate perlPackages.FileCopyRecursive perlPackages.FCGI perlPackages.NetSNMP @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { esac wrapProgram "$file" \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [ - LogLog4perl IOSocketINET6 Socket6 URI DBFile DateManip + LogLog4perl IOSocketINET6 Socket6 URI DBFile TimeDate HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer ListMoreUtils DBDPg LWP rrdtool ]}" diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 16c8992ee0392..8f1d6579158f3 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.77.0"; + version = "2.78.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-xU/1Bs3uIFomy6w2Vf50O3VbwoGfJMng88J1NXfg1pQ="; + hash = "sha256-5a9mrRd3YqKuz/VG7/CheMWpy99PpnyPaA5/VFEvj3Y="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 638d7fad330ca..8961bc5495359 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, removeReferencesTo +{ lib, stdenv, fetchurl, fetchpatch , file, openssl, perl, perlPackages, nettools , withPerlTools ? false }: let @@ -45,7 +45,14 @@ in stdenv.mkDerivation rec { substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" ''; - nativeBuildInputs = [ nettools removeReferencesTo file ]; + postConfigure = '' + # libraries contain configure options. Mangle store paths out from + # ./configure-generated file. + sed -i include/net-snmp/net-snmp-config.h \ + -e "/NETSNMP_CONFIGURE_OPTIONS/ s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" + ''; + + nativeBuildInputs = [ nettools file ]; buildInputs = [ openssl ] ++ lib.optional withPerlTools perlWithPkgs; @@ -61,9 +68,6 @@ in stdenv.mkDerivation rec { done mkdir $dev/bin mv $bin/bin/net-snmp-config $dev/bin - # libraries contain configure options - find $lib/lib -type f -exec remove-references-to -t $bin '{}' + - find $lib/lib -type f -exec remove-references-to -t $dev '{}' + ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/atlas-exporter.nix b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix new file mode 100644 index 0000000000000..ce40a93e66f84 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/atlas-exporter.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "atlas-exporter"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "czerwonk"; + repo = "atlas_exporter"; + rev = version; + sha256 = "sha256-vhUhWO7fQpUHT5nyxbT8AylgUqDNZRSb+EGRNGZJ14E="; + }; + + vendorHash = "sha256-tR+OHxj/97AixuAp0Kx9xQsKPAxpvF6hDha5BgMBha0="; + + meta = with lib; { + description = "Prometheus exporter for RIPE Atlas measurement results "; + homepage = "https://github.com/czerwonk/atlas_exporter"; + license = licenses.lgpl3; + maintainers = with maintainers; [ clerie ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 8b842b7ce3dac..1ff0ad38f47a1 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "collectd-exporter"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "collectd_exporter"; rev = "v${version}"; - sha256 = "0vb6vnd2j87iqxdl86j30dk65vrv4scprv200xb83203aprngqgh"; + sha256 = "sha256-8oibunEHPtNdbhVgF3CL6D/xE7bR8hee6+D2IJMzaqY="; }; - vendorHash = null; + vendorHash = "sha256-fQO2fiotqv18xewXVyh6sA4zx5ZNUR6mCebYenryrKI="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index ef6cd07e9f0e3..a365bda5202a1 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "consul_exporter"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "consul_exporter"; rev = "refs/tags/v${version}"; - hash = "sha256-Y3H4lFRoOLs8BBWUqfQOl9ny7HoRGqKIiq/ONcnzMW0="; + hash = "sha256-3aPLpTV+xuotpBYmRDfU3ewRRlmf7VUdh/u9/SLQDeE="; }; - vendorHash = "sha256-V3IWhVm47Uwgk3Mcu4JcYYGAdCrHDhkXYXCTXQr1BDE="; + vendorHash = "sha256-fsST29HGwJVLVSoAr8tNukW81iJtpb/oypwp5cH7oLQ="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index b24c86cefb306..76a0155e7dfd2 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.48.0"; + version = "2.48.1"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-B7BXjzTbIEEOYxgy0uvnbHPMV8WD9sRAW9yQd0h6vVc="; + hash = "sha256-8by9sz0EtiVuyoXR32h4++Fy01CyO8DfcsqPK3pSWHc="; }; in buildGoModule rec { @@ -47,7 +47,7 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-4mQcfYk+DwhVADVQ1JuNn4ZDq2xDyzcDZHMozFrSLyo="; + hash = "sha256-9vdbjqmIaomg0acWguWELIxmEZ9jVXYvFlAF+Uo3dMw="; }; vendorHash = "sha256-OHTmAfhN+aPOJAIweW+GuvN2lNn2A+JeVU8chT1hqLU="; diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/servers/monitoring/prometheus/domain-exporter.nix index 8cd81146010c5..e1b3200e4f0d1 100644 --- a/pkgs/servers/monitoring/prometheus/domain-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "domain-exporter"; - version = "1.21.1"; + version = "1.22.0"; src = fetchFromGitHub { owner = "caarlos0"; repo = "domain_exporter"; rev = "v${version}"; - hash = "sha256-qZle54BxKdPuVFNEGmXBNU93yF/MESUnW1a24BRxlZ8="; + hash = "sha256-tdAU4BY2jT3l/VMIthrJOPhPYi9UMYD7ZUVhwbO1oUA="; }; - vendorHash = "sha256-UO4fCJD3PldU2wQ9264OLKHP10c0pKPsOc/8gP5ddW4="; + vendorHash = "sha256-6C1LfWF4tjCGW3iiEhD+qBJ+CjAv4A9KYKH/owTAYJ8="; doCheck = false; # needs internet connection diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index df3bb356cd3f9..ddcc080983df3 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-ci-pipelines-exporter"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "mvisonneau"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TeXEfcmDHKgy5mGdixrIecxKO1rrg7+EWRIqzMYh3sU="; + sha256 = "sha256-SbFaB808Xa7XvHR8ruu9wADVPUVwe5ogA+L+PSYb7kQ="; }; subPackages = [ "cmd/${pname}" ]; @@ -17,7 +17,7 @@ buildGoModule rec { "-X main.version=v${version}" ]; - vendorHash = "sha256-TXFwfqyvCAEn24vtUBcFABzIg0KaYlstiFwS7y6WbKo="; + vendorHash = "sha256-qZ9Ph8YZBBGS3dFlk3zTynU9WuRUHl2fVSPtd7hUB8E="; doCheck = true; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix index fa0998b31772b..3c27d018d781e 100644 --- a/pkgs/servers/monitoring/prometheus/graphite-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/graphite-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "graphite-exporter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "graphite_exporter"; rev = "v${version}"; - hash = "sha256-UaflfU27GR8VK6AduPDBcQyO3u1uX6YlGP9O4LFwn9A="; + hash = "sha256-2u8grG5n0XkBS6zNxYrPyL+HP5/jEe/bXLt/1l759o4="; }; - vendorHash = "sha256-cIl35wbdPCQJLudXphMbjO2Ztd/H1clI43xaMU6T0D4="; + vendorHash = "sha256-wt2eDCNZAss3zSqvXeKTlsrPfj8pMXKWa3Yb33uuW0M="; preCheck = let skippedTests = [ diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index 2951530d22596..9eccbd666ca75 100644 --- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "influxdb_exporter"; - version = "0.11.4"; + version = "0.11.5"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "influxdb_exporter"; - hash = "sha256-q6Pe7rw5BP1IUdokwlTqjiz2nB8+pC6u9al164EgAbM="; + hash = "sha256-5jKwUuM3JL0zzXFesXTUBNMkA7bhd37BhqxZ/RzG20Q="; }; - vendorHash = "sha256-sU2jxmXuSN5D+btjzUU51WXWxmj+2Qqp28NQvEyIUbM="; + vendorHash = "sha256-VQ8MkzT8caPR1gpLXvNzWD5/pO0IKw8d+bT8gohAiJo="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index f0d2ac078274f..2e2bead90b358 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mysqld_exporter"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "mysqld_exporter"; rev = "v${version}"; - sha256 = "sha256-LW9vH//TjnKbZGMF3owDSUx/Mu0TUuWxMtmdeKM/q7k="; + sha256 = "sha256-P7EoWa0BWuAr3sjtrUxzofwlklhRLpzwpGVe31hFo7Q="; }; - vendorHash = "sha256-8zoiYSW8/z1Ch5W1WJHbWAPKFUOhUT8YcjrvyhwI+8w="; + vendorHash = "sha256-GEL9sMwwdGqpklm4yKNqzSOM6I/JzZjg3+ZB2ix2M8w="; ldflags = let t = "github.com/prometheus/common/version"; in [ "-s" "-w" diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 0104811349410..b846cc336bfcd 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nginx_exporter"; - version = "0.11.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "nginxinc"; repo = "nginx-prometheus-exporter"; rev = "v${version}"; - sha256 = "sha256-glKjScJoJnFEm7Z9LAVF51haeyHB3wQ946U8RzJXs3k="; + sha256 = "sha256-fnYZmJxXY1RaPJX8KiKxFmMauP5Jh5H72FWjIwgoIio="; }; - vendorHash = "sha256-YyMySHnrjBHm3hRNJDwWBs86Ih4S5DONYuwlQ3FBjkA="; + vendorHash = "sha256-VkatDZerLKnfbNFtnjklkE3TLY57uO1WUGa/p5tAXSQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix index fee6bd1f4dbb0..7b1ea2087bedf 100644 --- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nut-exporter"; - version = "3.0.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "DRuggeri"; repo = "nut_exporter"; rev = "v${version}"; - sha256 = "sha256-Y8G8nFhZ9Onxx40DJSTi0rnef8ulNTkj4bsPfqylOjQ="; + sha256 = "sha256-izD2Ks29/4/FBsZoH0raFzqb0DgPR8hXRYBZQEvET+s="; }; vendorHash = "sha256-DGCNYklINPPzC7kCdEUS7TqVvg2SnKFqe0qHs5RSmzY="; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 3450ea73c68af..42db8a165a556 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.55.0"; + version = "1.56.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-KF3tbMgcmZHn8u2wPVidH35vi/Aj7xXUvXPXUci6qrM="; + sha256 = "sha256-7tnl8iItGegfRXLF3f+tmNxgJWkai6n8EOP00zyqyYs="; }; - vendorHash = "sha256-zwWiUXexGI9noHSRC+h9/IT0qdNwPMDZyP3AIKtnRn0="; + vendorHash = "sha256-r+VJ2+4F3BQ0tmNTVHDOxKaKAPSIvgu7ZcQZ6BXt2kA="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/monitoring/prometheus/smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch b/pkgs/servers/monitoring/prometheus/smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch deleted file mode 100644 index 28616251f37ef..0000000000000 --- a/pkgs/servers/monitoring/prometheus/smartctl-exporter/0001-Return-the-cached-value-if-it-s-not-time-to-scan-aga.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e81b06df67b1d42ef915615fafa0b56ef956673b Mon Sep 17 00:00:00 2001 -From: Andreas Fuchs <asf@boinkor.net> -Date: Thu, 11 Feb 2021 17:30:44 -0500 -Subject: [PATCH] Return the cached value if it's not time to scan again yet - -This should ensure that if we have a valid value cached (which ought -to be every time after the first scan), we return it as metrics. - -This fixes the crashes that would happen if queries happened earlier -than the re-scan interval allowed. - -Address review feedback: Shorten the time-to-scan logic - -We can express this in a single if statement, so it takes fewer lines -to do the "should we check again" check. ---- - readjson.go | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -diff --git a/readjson.go b/readjson.go -index da35448..c9996fd 100644 ---- a/readjson.go -+++ b/readjson.go -@@ -78,14 +78,7 @@ func readData(device string) (gjson.Result, error) { - - if _, err := os.Stat(device); err == nil { - cacheValue, cacheOk := jsonCache[device] -- timeToScan := false -- if cacheOk { -- timeToScan = time.Now().After(cacheValue.LastCollect.Add(options.SMARTctl.CollectPeriodDuration)) -- } else { -- timeToScan = true -- } -- -- if timeToScan { -+ if !cacheOk || time.Now().After(cacheValue.LastCollect.Add(options.SMARTctl.CollectPeriodDuration)) { - json, ok := readSMARTctl(device) - if ok { - jsonCache[device] = JSONCache{JSON: json, LastCollect: time.Now()} -@@ -93,7 +86,7 @@ func readData(device string) (gjson.Result, error) { - } - return gjson.Parse(DEFAULT_EMPTY_JSON), fmt.Errorf("smartctl returned bad data for device %s", device) - } -- return gjson.Parse(DEFAULT_EMPTY_JSON), fmt.Errorf("Too early collect called for device %s", device) -+ return cacheValue.JSON, nil - } - return gjson.Parse(DEFAULT_EMPTY_JSON), fmt.Errorf("Device %s unavialable", device) - } --- -2.33.1 - diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 666b8ed9bdc7d..ca650c53475db 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "statsd_exporter"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "statsd_exporter"; rev = "v${version}"; - hash = "sha256-H5ckrDAs9gwQCkVe4TKF4yuqLh2S/+dPaaRH+5aoj+o="; + hash = "sha256-C7+4v40T667KJHEQ3ebLDg2wJNrxD/nossfT6rMlER8="; }; - vendorHash = "sha256-LhPfOc83/IWkTk3C1DZggWngPJWobZFeCl4cum/aIQo="; + vendorHash = "sha256-scBpRZeECgAtpu9lnkIk1I2c8UmAkEL8LYNPUeUNYto="; meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index f9d9ce499b5f2..da6013b9b5ec4 100644 --- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -9,27 +9,18 @@ python3Packages.buildPythonApplication rec { pname = "prometheus-xmpp-alerts"; - version = "0.5.6"; + version = "0.5.8"; + format = "pyproject"; src = fetchFromGitHub { owner = "jelmer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PwShGS1rbfZCK5OS6Cnn+mduOpWAD4fC69mcGB5GB1c="; + sha256 = "sha256-iwqcowwJktZQfdxykpsw/MweAPY0KF7ojVwvk1LP8a4="; }; - patches = [ - # Required until https://github.com/jelmer/prometheus-xmpp-alerts/pull/33 is merged - # and contained in a release - (fetchpatch { - name = "Fix-outdated-entrypoint-definiton.patch"; - url = "https://github.com/jelmer/prometheus-xmpp-alerts/commit/c41dd41dbd3c781b874bcf0708f6976e6252b621.patch"; - hash = "sha256-G7fRLSXbkI5EDgGf4n9xSVs54IPD0ev8rTEFffRvLY0="; - }) - ]; - postPatch = '' - substituteInPlace setup.cfg \ + substituteInPlace pyproject.toml \ --replace "bs4" "beautifulsoup4" ''; @@ -46,6 +37,7 @@ python3Packages.buildPythonApplication rec { ]); nativeCheckInputs = with python3Packages; [ + setuptools unittestCheckHook pytz ]; diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index 3e5ec75a29221..d229daa14b81a 100644 --- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -16,6 +16,16 @@ buildGoModule rec { vendorHash = "sha256-uIilESEmAxANxFOy7qvYxlF/bId/Kqh4jUspNknlhlc="; + 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" + ]; + postInstall = '' install -Dm444 -t $out/share/doc/${pname} *.md ''; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 8dcee384d6da8..c90ae14d0871b 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.28.5"; + version = "1.29.1"; subPackages = [ "cmd/telegraf" ]; @@ -16,10 +16,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-dmePzJ10VgzN6CxFAz7QloIsPULuTZH+Pjkd/kIQUmU="; + hash = "sha256-iEVVMARdt3gibahxU9snwo13yi6gINWWdhFkTHLYAuU="; }; - vendorHash = "sha256-3buC6N/tHTf6FMEXU3+XlJVGntLe86Hx3eNpn7w0yMs="; + vendorHash = "sha256-R6+GKyGD7tUulOA6qEPUlSMj2/zXdLmmrX1HubLNCEc="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index b9435de2aeba9..a706477247784 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -23,13 +23,13 @@ let ); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2023-08-03"; + version = "unstable-2023-12-16"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "fe120952ee06607d039af8f461028e9f5b817395"; - sha256 = "sha256-TyhpMHu06YoaV5tZGBcYulUrABW6OFYZLyCoZLRmaUU="; + rev = "42357891a3716cd332ef60b28af09f8732dbf67a"; + sha256 = "sha256-5w336GaHUkbmhAPvhOO3kNW5q7qTFVw3p0Q+Rv+YdYM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index f586b606f1d2a..824dcdf62f885 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -12,6 +12,7 @@ , openssl , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd +, uthash , fetchpatch , nixosTests }: @@ -52,11 +53,6 @@ stdenv.mkDerivation rec { substituteInPlace man/$f.xsl \ --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl done - - # the manpages are not generated when using cmake - pushd man - make - popd ''; outputs = [ "out" "dev" "lib" ]; @@ -70,12 +66,18 @@ stdenv.mkDerivation rec { libuv libwebsockets' openssl + uthash ] ++ lib.optional withSystemd systemd; cmakeFlags = [ - "-DWITH_THREADING=ON" - "-DWITH_WEBSOCKETS=ON" - ] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON"; + (lib.cmakeBool "WITH_BUNDLED_DEPS" false) + (lib.cmakeBool "WITH_WEBSOCKETS" true) + (lib.cmakeBool "WITH_SYSTEMD" withSystemd) + ]; + + postFixup = '' + sed -i "s|^prefix=.*|prefix=$lib|g" $dev/lib/pkgconfig/*.pc + ''; passthru.tests = { inherit (nixosTests) mosquitto; diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/servers/mqtt/nanomq/default.nix index 902b5369df07c..eb4bdf325e913 100644 --- a/pkgs/servers/mqtt/nanomq/default.nix +++ b/pkgs/servers/mqtt/nanomq/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.18.2"; + version = "0.20.8"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; rev = finalAttrs.version; - hash = "sha256-XGJBBuRSL3InXUMGxOttdbt0zmI1APFlc4IvwC2up8g="; + hash = "sha256-VCKlXQ7qvBab+wRDnJ6EUA5qaQ36gTFfuerN1GU6sW0="; fetchSubmodules = true; }; @@ -71,7 +71,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DNNG_ENABLE_TLS=ON" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type -Wno-implicit-function-declaration -Wno-error=implicit-int"; # disabled by default - not 100% reliable and making nanomq depend on # mosquitto would annoy people diff --git a/pkgs/servers/mxisd/0001-gradle.patch b/pkgs/servers/mxisd/0001-gradle.patch deleted file mode 100644 index 8a9f5a81180bb..0000000000000 --- a/pkgs/servers/mxisd/0001-gradle.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/build.gradle 2019-05-16 21:09:08.373112953 +0200 -+++ b/build.gradle 2019-05-16 21:09:37.093114427 +0200 -@@ -72,7 +72,7 @@ - - buildscript { - repositories { -- jcenter() -+REPLACE - } - - dependencies { -@@ -81,9 +81,7 @@ - } - - repositories { -- jcenter() -- maven { url "https://kamax.io/maven/releases/" } -- maven { url "https://kamax.io/maven/snapshots/" } -+REPLACE - } - - dependencies { diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index b65d97a156f62..60073aef2a1dd 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.10.4"; + version = "2.10.7"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-jcN/ycRj8DksBj/Qy0IhoVwQsKuMF+sBkaKM1rZYJPc="; + hash = "sha256-DZ0a4gptTjuSVBlhDEWKTmU6Dgt36xulfjVK1kJtXhI="; }; - vendorHash = "sha256-5p23qIWN7+nL+NKbKpBqov7+isNXKmJQRzzojTqKIU4="; + vendorHash = "sha256-Q2wc4esu2H81ct9TUPs+ysT3LrW698+9JllbvdDa5Yc="; doCheck = false; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index b5e1a94b129ec..d4301258dc846 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -1,5 +1,6 @@ { lib, stdenvNoCC, fetchurl, nixosTests , nextcloud27Packages +, nextcloud28Packages , nextcloud26Packages }: @@ -54,17 +55,23 @@ in { ''; nextcloud26 = generic { - version = "26.0.9"; - hash = "sha256-nVD8a+jjZXyfXrhEj6Fleofh2p5uq0DvYlXSNTMNiIE="; + version = "26.0.10"; + hash = "sha256-yArkYMxOmvfQsJd6TJJX+t22a/V5OW9nwHfgLZsmlIw="; packages = nextcloud26Packages; }; nextcloud27 = generic { - version = "27.1.4"; - hash = "sha256-vsZfIWa4LJMDuvR2weQk9xqhltrQEP/kwMOdA5kNWUw="; + version = "27.1.5"; + hash = "sha256-O1NMmOdrf+2Mo5NMrUGbEK9YViWfMTvsIs06e/pu+WE="; packages = nextcloud27Packages; }; + nextcloud28 = generic { + version = "28.0.1"; + hash = "sha256-L4BzW0Qwgicv5qO14yE3lX8fxEjHU0K5S1IAspcl86Q="; + packages = nextcloud28Packages; + }; + # tip: get the sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index 51be1e026adf8..c29547e57563c 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "notify_push"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "nextcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-go41ZIUBj1nj8rDI/c4Pk5cnDbM8Y2+bCZIab4XdhUY="; + hash = "sha256-9wVH+msUh0t0PKz+5044PhT9lGsbfp4u44gX0O70Pbo="; }; - cargoHash = "sha256-EuYwPQo2TucAaQw63pESkJGAtyuMhk3JT6mBg6E84Xs="; + cargoHash = "sha256-Q4KA+mc48OfmxYY7vDJ2ZU/Wd+101kbimwAw6ag3d+w="; passthru = rec { test_client = rustPlatform.buildRustPackage { @@ -24,10 +24,13 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "test_client"; - cargoHash = "sha256-m4FHCrVGAmGIrgnMMleiTRgYGYh+b7EIH1ORE0tiBkY="; + cargoHash = "sha256-XiaeCVgVjre7NmH/B+dNw0u2HV0vJwlgDjhLXXgJS+Y="; }; tests = { - inherit (nixosTests.nextcloud) with-postgresql-and-redis26; + inherit (nixosTests.nextcloud) + with-postgresql-and-redis26 + with-postgresql-and-redis27 + with-postgresql-and-redis28; inherit test_client; }; }; @@ -36,6 +39,6 @@ rustPlatform.buildRustPackage rec { description = "Update notifications for nextcloud clients"; homepage = "https://github.com/nextcloud/notify_push"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ ajs124 ]; + maintainers = teams.helsinki-systems.members; }; } diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index 2226ca99f8c7a..279ab29934ad7 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -1,8 +1,8 @@ { "bookmarks": { - "sha256": "14dkyqm04d4ix114jbcgbx10zvkv4qlx4n56chpqz0w1y7x8idpd", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz", - "version": "13.1.1", + "sha256": "04yngkmsjq6zj5qih86ybfr2cybqsz3gb5dasm6yhmkvd1ar5s39", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.2/bookmarks-13.1.2.tar.gz", + "version": "13.1.2", "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": "1iq8np72pjw2bn4zmbp2rmrh12n4z62rwrz2bb94xjza1fws7b2v", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.3/calendar-v4.5.3.tar.gz", - "version": "4.5.3", + "sha256": "0d6mfqwq44z9kn8nh3zmfzr05zi2rwnw3nhd9wc12dy6npynkcpm", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.0/calendar-v4.6.0.tar.gz", + "version": "4.6.0", "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": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz", - "version": "5.4.2", + "sha256": "0pbl4fmpg1jxwjj141gqnmwzgm3ji1z686kr11rmldfkjvhjss2x", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.0/contacts-v5.5.0.tar.gz", + "version": "5.5.0", "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": [ @@ -30,19 +30,19 @@ ] }, "cookbook": { - "sha256": "18rzvdqd99nlkk3p0y9y8b17ihw5c4c9wsx8psq6xadspm97002y", - "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz", - "version": "0.10.2", + "sha256": "06d1rhvcwxzi8hl99nz3hg32fznv0q5m06cwjy3gc81j53qz0ksc", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.10.5/cookbook-0.10.5.tar.gz", + "version": "0.10.5", "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", - "homepage": "", + "homepage": "https://github.com/nextcloud/cookbook/", "licenses": [ "agpl" ] }, "cospend": { - "sha256": "1rg9k33yapbl8chpxx3bjyzc9h4krjavksbxsvw14kpm01rss3j9", - "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.10/cospend-1.5.10.tar.gz", - "version": "1.5.10", + "sha256": "0v61wdrf4wxjx2xv81599k9k855iyhazxnh4shqvglfb01fi8qhn", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.12/cospend-1.5.12.tar.gz", + "version": "1.5.12", "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share money with others.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be accessed and modified by people without a Nextcloud account. Each project has an ID and a password for guest access.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently being developped!\n\n## Features\n\n* ✎ create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ check member balances\n* 🗠 display project statistics\n* ♻ display settlement plan\n* 🎇 automatically create reimbursement bills from settlement plan\n* 🗓 create recurring bills (daily/weekly/monthly/yearly)\n* 📊 optionally provide custom amount for each member in new bills\n* 🔗 link bills with personal files (picture of physical bill for example)\n* 👩 guest access for people outside Nextcloud\n* 👫 share projects with Nextcloud users/groups/circles\n* 🖫 import/export projects as csv (compatible with csv files from IHateMoney)\n* 🔗 generate link/QRCode to easily import projects in MoneyBuster\n* 🗲 implement Nextcloud notifications and activity stream\n\nThis app is tested on Nextcloud 20+ with Firefox 57+ and Chromium.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/eneiluj/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/eneiluj/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* it does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ](https://liberapay.com/eneiluj/donate)", "homepage": "https://github.com/julien-nc/cospend-nc", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "sha256": "15hir3fssvzyysazbaad8qiz0bv00x73c2wfdj5aviz9h0gp4x4v", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.4/deck-v1.9.4.tar.gz", - "version": "1.9.4", + "sha256": "1dkvvk7n120hgk3pf03g2ixlylp7nxmi3wh9qsp8b0fimclpd5hz", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.5/deck-v1.9.5.tar.gz", + "version": "1.9.5", "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 @@ ] }, "forms": { - "sha256": "155z87wyv2p06c3kpy9zaw6qf5s7s0ah4wfw022s4cc21i3rcwxv", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.1/forms-v3.3.1.tar.gz", - "version": "3.3.1", + "sha256": "1mipdri1flhkdwknsp72k87y7xfis72bzsnw1alzr1cbp8d6ardm", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.3/forms-v3.4.3.tar.gz", + "version": "3.4.3", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -120,9 +120,9 @@ ] }, "mail": { - "sha256": "0ascail3vfkv3mm5s4s3ma74d6qxai76kdqxknmljnw56xb19qfv", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.4/mail-v3.4.4.tar.gz", - "version": "3.4.4", + "sha256": "0ycyj5ydnvnf5cjnxkpxd489rymlag8df67n5lawp43cvgg2jn2d", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.0/mail-v3.5.0.tar.gz", + "version": "3.5.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": [ @@ -140,9 +140,9 @@ ] }, "memories": { - "sha256": "1yn1wkv4jxpc8faf4rl46yfddyplnryrkws3jz0x1wcr9zlxdkng", - "url": "https://github.com/pulsejet/memories/releases/download/v6.1.0/memories.tar.gz", - "version": "6.1.0", + "sha256": "1rz0pkis0vz6hjyj53jbz7dcmd9yxbh1h9p4nhg4a2p7yyd5092m", + "url": "https://github.com/pulsejet/memories/releases/download/v6.1.5/memories.tar.gz", + "version": "6.1.5", "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": [ @@ -170,9 +170,9 @@ ] }, "notes": { - "sha256": "1g4ibrymsfd2bcvmyfyrl23z2kh4bgkwrgyacvdx1glk44di6sgc", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.1/notes.tar.gz", - "version": "4.8.1", + "sha256": "19p5qg94ch72y4lym6s8f6x3dly5v3mm97dx29swnkqplflas3zz", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.0/notes-v4.9.0.tar.gz", + "version": "4.9.0", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -180,9 +180,9 @@ ] }, "notify_push": { - "sha256": "0lwyy1pnyfw464vab1v5k8q0rgarrj5w12cf1nsywjaafb8y1ym0", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.5/notify_push-v0.6.5.tar.gz", - "version": "0.6.5", + "sha256": "1by9qw9bsf48cyczhfxpz9ifrg2dayvcn26m309dicqgjqkz91hd", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.6/notify_push-v0.6.6.tar.gz", + "version": "0.6.6", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -199,6 +199,16 @@ "apache" ] }, + "phonetrack": { + "sha256": "1p15vw7c5c1h08czyxi1r6svjd5hjmnc0i6is4vl3xq2kfjmcyyx", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.7.6/phonetrack-0.7.6.tar.gz", + "version": "0.7.6", + "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* 📍 Display location history\n* ⛛ Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* ⛶ Define geofencing zones for devices\n* ⚇ Define proximity alerts for device pairs\n* 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n* 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n* 🗠 Display sessions statistics\n* 🔒 [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n* ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ](https://liberapay.com/eneiluj/donate)", + "homepage": "https://github.com/julien-nc/phonetrack-oc", + "licenses": [ + "agpl" + ] + }, "polls": { "sha256": "1dmws4ybv3pzxz5g9c7ghblx0nfal2ssmsg7hjcs1n4xcjc6585p", "url": "https://github.com/nextcloud/polls/releases/download/v5.4.2/polls.tar.gz", @@ -210,9 +220,9 @@ ] }, "previewgenerator": { - "sha256": "0ziyl7kqgivk9xvkd12byps6bb3fvcvdgprfa9ffy1zrgpl9syhk", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.3.0/previewgenerator-v5.3.0.tar.gz", - "version": "5.3.0", + "sha256": "08f0ivxqa2b54w2q4lycb3p5ngqyk92n2qll54pmpj54pfn1sj3m", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.4.0/previewgenerator-v5.4.0.tar.gz", + "version": "5.4.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -220,9 +230,9 @@ ] }, "qownnotesapi": { - "sha256": "1hkcqcc6y7x0zrc88qqmsf7mz0dl1kk06gsl6la3kr33fxr0cp0k", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.6.0/qownnotesapi-nc.tar.gz", - "version": "23.6.0", + "sha256": "1pyr4b3w6gsy83ci6cy0wfv870qm2v957nl4w6xk989iyknk4ana", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.12.0/qownnotesapi-nc.tar.gz", + "version": "23.12.0", "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", "homepage": "https://github.com/pbek/qownnotesapi", "licenses": [ @@ -270,9 +280,9 @@ ] }, "twofactor_webauthn": { - "sha256": "0z6m2chq5kxc8f10g6n1lh51yi10svy2qp5gp0v8xs71apqcc2wx", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.0/twofactor_webauthn-v1.3.0.tar.gz", - "version": "1.3.0", + "sha256": "1p4ng7nprlcgw7sdfd7wqx5az86a856f1v470lahg2nfbx3fg296", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.2/twofactor_webauthn-v1.3.2.tar.gz", + "version": "1.3.2", "description": "A two-factor provider for WebAuthn devices", "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", "licenses": [ @@ -290,9 +300,9 @@ ] }, "user_saml": { - "sha256": "04ivgqdls72p6x5yrh5p5ycbbfmxhzd0dqin1grblm6cbl7b4s2k", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.4/user_saml-v5.2.4.tar.gz", - "version": "5.2.4", + "sha256": "0q189wkh0nh5y4z9j4bpgn4xnwwn8y8m8y34bp5nbzfz05xpgr9f", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.5/user_saml-v5.2.5.tar.gz", + "version": "5.2.5", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index a16881240b422..939aa9088ce68 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -1,8 +1,8 @@ { "bookmarks": { - "sha256": "14dkyqm04d4ix114jbcgbx10zvkv4qlx4n56chpqz0w1y7x8idpd", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz", - "version": "13.1.1", + "sha256": "04yngkmsjq6zj5qih86ybfr2cybqsz3gb5dasm6yhmkvd1ar5s39", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.2/bookmarks-13.1.2.tar.gz", + "version": "13.1.2", "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": "1iq8np72pjw2bn4zmbp2rmrh12n4z62rwrz2bb94xjza1fws7b2v", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.3/calendar-v4.5.3.tar.gz", - "version": "4.5.3", + "sha256": "0d6mfqwq44z9kn8nh3zmfzr05zi2rwnw3nhd9wc12dy6npynkcpm", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.0/calendar-v4.6.0.tar.gz", + "version": "4.6.0", "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": "1pz2px5amk3byn4pq86cyyjv4hrqhsjz61xfm7cl7z8qfckqfhi2", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.2/contacts-v5.4.2.tar.gz", - "version": "5.4.2", + "sha256": "0pbl4fmpg1jxwjj141gqnmwzgm3ji1z686kr11rmldfkjvhjss2x", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.0/contacts-v5.5.0.tar.gz", + "version": "5.5.0", "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": [ @@ -30,19 +30,19 @@ ] }, "cookbook": { - "sha256": "18rzvdqd99nlkk3p0y9y8b17ihw5c4c9wsx8psq6xadspm97002y", - "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz", - "version": "0.10.2", + "sha256": "06d1rhvcwxzi8hl99nz3hg32fznv0q5m06cwjy3gc81j53qz0ksc", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.10.5/cookbook-0.10.5.tar.gz", + "version": "0.10.5", "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", - "homepage": "", + "homepage": "https://github.com/nextcloud/cookbook/", "licenses": [ "agpl" ] }, "cospend": { - "sha256": "1rg9k33yapbl8chpxx3bjyzc9h4krjavksbxsvw14kpm01rss3j9", - "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.10/cospend-1.5.10.tar.gz", - "version": "1.5.10", + "sha256": "0v61wdrf4wxjx2xv81599k9k855iyhazxnh4shqvglfb01fi8qhn", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.12/cospend-1.5.12.tar.gz", + "version": "1.5.12", "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share money with others.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be accessed and modified by people without a Nextcloud account. Each project has an ID and a password for guest access.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently being developped!\n\n## Features\n\n* ✎ create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ check member balances\n* 🗠 display project statistics\n* ♻ display settlement plan\n* 🎇 automatically create reimbursement bills from settlement plan\n* 🗓 create recurring bills (daily/weekly/monthly/yearly)\n* 📊 optionally provide custom amount for each member in new bills\n* 🔗 link bills with personal files (picture of physical bill for example)\n* 👩 guest access for people outside Nextcloud\n* 👫 share projects with Nextcloud users/groups/circles\n* 🖫 import/export projects as csv (compatible with csv files from IHateMoney)\n* 🔗 generate link/QRCode to easily import projects in MoneyBuster\n* 🗲 implement Nextcloud notifications and activity stream\n\nThis app is tested on Nextcloud 20+ with Firefox 57+ and Chromium.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/eneiluj/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/eneiluj/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* it does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ](https://liberapay.com/eneiluj/donate)", "homepage": "https://github.com/julien-nc/cospend-nc", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "sha256": "18gscc95zay7nrzdm1h5b52r4bpmpzc1h1xb00214qnb59mydiwr", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.1/deck-v1.11.1.tar.gz", - "version": "1.11.1", + "sha256": "0ykxfw9v89k4a3g6lbl75d0hwri85kf6jqx1n5v2jxibfr5n4bcp", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.2/deck-v1.11.2.tar.gz", + "version": "1.11.2", "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 @@ ] }, "forms": { - "sha256": "155z87wyv2p06c3kpy9zaw6qf5s7s0ah4wfw022s4cc21i3rcwxv", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.3.1/forms-v3.3.1.tar.gz", - "version": "3.3.1", + "sha256": "1mipdri1flhkdwknsp72k87y7xfis72bzsnw1alzr1cbp8d6ardm", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.3/forms-v3.4.3.tar.gz", + "version": "3.4.3", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -120,9 +120,9 @@ ] }, "mail": { - "sha256": "0ascail3vfkv3mm5s4s3ma74d6qxai76kdqxknmljnw56xb19qfv", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.4/mail-v3.4.4.tar.gz", - "version": "3.4.4", + "sha256": "0ycyj5ydnvnf5cjnxkpxd489rymlag8df67n5lawp43cvgg2jn2d", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.0/mail-v3.5.0.tar.gz", + "version": "3.5.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": [ @@ -140,9 +140,9 @@ ] }, "memories": { - "sha256": "1yn1wkv4jxpc8faf4rl46yfddyplnryrkws3jz0x1wcr9zlxdkng", - "url": "https://github.com/pulsejet/memories/releases/download/v6.1.0/memories.tar.gz", - "version": "6.1.0", + "sha256": "1rz0pkis0vz6hjyj53jbz7dcmd9yxbh1h9p4nhg4a2p7yyd5092m", + "url": "https://github.com/pulsejet/memories/releases/download/v6.1.5/memories.tar.gz", + "version": "6.1.5", "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": [ @@ -170,9 +170,9 @@ ] }, "notes": { - "sha256": "1g4ibrymsfd2bcvmyfyrl23z2kh4bgkwrgyacvdx1glk44di6sgc", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.8.1/notes.tar.gz", - "version": "4.8.1", + "sha256": "19p5qg94ch72y4lym6s8f6x3dly5v3mm97dx29swnkqplflas3zz", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.0/notes-v4.9.0.tar.gz", + "version": "4.9.0", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -180,9 +180,9 @@ ] }, "notify_push": { - "sha256": "0lwyy1pnyfw464vab1v5k8q0rgarrj5w12cf1nsywjaafb8y1ym0", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.5/notify_push-v0.6.5.tar.gz", - "version": "0.6.5", + "sha256": "1by9qw9bsf48cyczhfxpz9ifrg2dayvcn26m309dicqgjqkz91hd", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.6/notify_push-v0.6.6.tar.gz", + "version": "0.6.6", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -199,6 +199,16 @@ "apache" ] }, + "phonetrack": { + "sha256": "1xvdmb2wlcldv8lk4jb8akhi80w26m2jpazfcz641frjm333kxch", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.7.7/phonetrack-0.7.7.tar.gz", + "version": "0.7.7", + "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* 📍 Display location history\n* ⛛ Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* ⛶ Define geofencing zones for devices\n* ⚇ Define proximity alerts for device pairs\n* 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n* 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n* 🗠 Display sessions statistics\n* 🔒 [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n* ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ](https://liberapay.com/eneiluj/donate)", + "homepage": "https://github.com/julien-nc/phonetrack-oc", + "licenses": [ + "agpl" + ] + }, "polls": { "sha256": "1dmws4ybv3pzxz5g9c7ghblx0nfal2ssmsg7hjcs1n4xcjc6585p", "url": "https://github.com/nextcloud/polls/releases/download/v5.4.2/polls.tar.gz", @@ -210,9 +220,9 @@ ] }, "previewgenerator": { - "sha256": "0ziyl7kqgivk9xvkd12byps6bb3fvcvdgprfa9ffy1zrgpl9syhk", - "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.3.0/previewgenerator-v5.3.0.tar.gz", - "version": "5.3.0", + "sha256": "08f0ivxqa2b54w2q4lycb3p5ngqyk92n2qll54pmpj54pfn1sj3m", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.4.0/previewgenerator-v5.4.0.tar.gz", + "version": "5.4.0", "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", "homepage": "https://github.com/nextcloud/previewgenerator", "licenses": [ @@ -220,9 +230,9 @@ ] }, "qownnotesapi": { - "sha256": "1hkcqcc6y7x0zrc88qqmsf7mz0dl1kk06gsl6la3kr33fxr0cp0k", - "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.6.0/qownnotesapi-nc.tar.gz", - "version": "23.6.0", + "sha256": "1pyr4b3w6gsy83ci6cy0wfv870qm2v957nl4w6xk989iyknk4ana", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.12.0/qownnotesapi-nc.tar.gz", + "version": "23.12.0", "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", "homepage": "https://github.com/pbek/qownnotesapi", "licenses": [ @@ -270,9 +280,9 @@ ] }, "twofactor_webauthn": { - "sha256": "0z6m2chq5kxc8f10g6n1lh51yi10svy2qp5gp0v8xs71apqcc2wx", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.0/twofactor_webauthn-v1.3.0.tar.gz", - "version": "1.3.0", + "sha256": "1p4ng7nprlcgw7sdfd7wqx5az86a856f1v470lahg2nfbx3fg296", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.2/twofactor_webauthn-v1.3.2.tar.gz", + "version": "1.3.2", "description": "A two-factor provider for WebAuthn devices", "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", "licenses": [ @@ -290,9 +300,9 @@ ] }, "user_saml": { - "sha256": "04ivgqdls72p6x5yrh5p5ycbbfmxhzd0dqin1grblm6cbl7b4s2k", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.4/user_saml-v5.2.4.tar.gz", - "version": "5.2.4", + "sha256": "0q189wkh0nh5y4z9j4bpgn4xnwwn8y8m8y34bp5nbzfz05xpgr9f", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.5/user_saml-v5.2.5.tar.gz", + "version": "5.2.5", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json new file mode 100644 index 0000000000000..75fb6778d6da2 --- /dev/null +++ b/pkgs/servers/nextcloud/packages/28.json @@ -0,0 +1,232 @@ +{ + "bookmarks": { + "sha256": "04yngkmsjq6zj5qih86ybfr2cybqsz3gb5dasm6yhmkvd1ar5s39", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.2/bookmarks-13.1.2.tar.gz", + "version": "13.1.2", + "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": [ + "agpl" + ] + }, + "calendar": { + "sha256": "0d6mfqwq44z9kn8nh3zmfzr05zi2rwnw3nhd9wc12dy6npynkcpm", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.0/calendar-v4.6.0.tar.gz", + "version": "4.6.0", + "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": [ + "agpl" + ] + }, + "contacts": { + "sha256": "0pbl4fmpg1jxwjj141gqnmwzgm3ji1z686kr11rmldfkjvhjss2x", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.0/contacts-v5.5.0.tar.gz", + "version": "5.5.0", + "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": [ + "agpl" + ] + }, + "cookbook": { + "sha256": "0wd4vwfp4i8hfrlqfzac517iqfhzxy1sv0ryb96489q9fvbcvlnp", + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz", + "version": "0.11.0", + "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", + "homepage": "https://github.com/nextcloud/cookbook/", + "licenses": [ + "agpl" + ] + }, + "cospend": { + "sha256": "0v61wdrf4wxjx2xv81599k9k855iyhazxnh4shqvglfb01fi8qhn", + "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.12/cospend-1.5.12.tar.gz", + "version": "1.5.12", + "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share money with others.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be accessed and modified by people without a Nextcloud account. Each project has an ID and a password for guest access.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently being developped!\n\n## Features\n\n* ✎ create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ check member balances\n* 🗠 display project statistics\n* ♻ display settlement plan\n* 🎇 automatically create reimbursement bills from settlement plan\n* 🗓 create recurring bills (daily/weekly/monthly/yearly)\n* 📊 optionally provide custom amount for each member in new bills\n* 🔗 link bills with personal files (picture of physical bill for example)\n* 👩 guest access for people outside Nextcloud\n* 👫 share projects with Nextcloud users/groups/circles\n* 🖫 import/export projects as csv (compatible with csv files from IHateMoney)\n* 🔗 generate link/QRCode to easily import projects in MoneyBuster\n* 🗲 implement Nextcloud notifications and activity stream\n\nThis app is tested on Nextcloud 20+ with Firefox 57+ and Chromium.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/eneiluj/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/eneiluj/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/eneiluj/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* it does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ](https://liberapay.com/eneiluj/donate)", + "homepage": "https://github.com/julien-nc/cospend-nc", + "licenses": [ + "agpl" + ] + }, + "deck": { + "sha256": "0dkw59pv3yj21fs87sw2y4z1qplsgbfnr0nk9cjsb8vb3xjzd0rx", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.0/deck-v1.12.0.tar.gz", + "version": "1.12.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": [ + "agpl" + ] + }, + "forms": { + "sha256": "1ffga26v01d14rh4mjwyjqp7slh7h7d07vs3yldb8csi826ynji4", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.0.0/forms-v4.0.0.tar.gz", + "version": "4.0.0", + "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", + "homepage": "https://github.com/nextcloud/forms", + "licenses": [ + "agpl" + ] + }, + "groupfolders": { + "sha256": "024qll51hdsky6iad0acf3c00ny9k9mc303r2v4g4h53qx2gksys", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.1/groupfolders-v16.0.1.tar.gz", + "version": "16.0.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": [ + "agpl" + ] + }, + "impersonate": { + "sha256": "0l1wmsiycwnn5py1mdc87paqlciclndrk72yf0ff7k11vidgb7mp", + "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.15.0/impersonate-v1.15.0.tar.gz", + "version": "1.15.0", + "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.\n- You can limit which users/groups can use impersonation in Administration settings > Additional settings.", + "homepage": "https://github.com/nextcloud/impersonate", + "licenses": [ + "agpl" + ] + }, + "mail": { + "sha256": "0ycyj5ydnvnf5cjnxkpxd489rymlag8df67n5lawp43cvgg2jn2d", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.0/mail-v3.5.0.tar.gz", + "version": "3.5.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": "0rs5cqn2saip7fmj71ww879iqsmmigf0fi6fdbqmdxmrmvsnl9l6", + "url": "https://github.com/nextcloud/maps/releases/download/v1.3.1/maps-1.3.1.tar.gz", + "version": "1.3.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": [ + "agpl" + ] + }, + "notes": { + "sha256": "19p5qg94ch72y4lym6s8f6x3dly5v3mm97dx29swnkqplflas3zz", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.0/notes-v4.9.0.tar.gz", + "version": "4.9.0", + "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", + "homepage": "https://github.com/nextcloud/notes", + "licenses": [ + "agpl" + ] + }, + "notify_push": { + "sha256": "1by9qw9bsf48cyczhfxpz9ifrg2dayvcn26m309dicqgjqkz91hd", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.6/notify_push-v0.6.6.tar.gz", + "version": "0.6.6", + "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", + "homepage": "", + "licenses": [ + "agpl" + ] + }, + "onlyoffice": { + "sha256": "14vqyr7yq95kiwkb2q25qa5kxfx0mri12bbyy2fpm94kk2y2km37", + "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.0.0/onlyoffice.tar.gz", + "version": "9.0.0", + "description": "ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.", + "homepage": "https://www.onlyoffice.com", + "licenses": [ + "agpl" + ] + }, + "phonetrack": { + "sha256": "1xvdmb2wlcldv8lk4jb8akhi80w26m2jpazfcz641frjm333kxch", + "url": "https://github.com/julien-nc/phonetrack/releases/download/v0.7.7/phonetrack-0.7.7.tar.gz", + "version": "0.7.7", + "description": "# PhoneTrack Nextcloud application\n\n📱 PhoneTrack is a Nextcloud application to track and store mobile device's locations.\n\n🗺 It receives information from mobile phone's logging apps and displays it dynamically on a map.\n\n🌍 Help us to translate this app on [PhoneTrack Crowdin project](https://crowdin.com/project/phonetrack).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CONTRIBUTING.md).\n\nHow to use PhoneTrack :\n\n* Create a tracking session.\n* Give the logging link\\* to the mobile devices. Choose the [logging method](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#logging-methods) you prefer.\n* Watch the session's devices location in real time (or not) in PhoneTrack or share it with public pages.\n\n(\\*) Don't forget to set the device name in the link (rather than in the logging app settings). Replace \"yourname\" with the desired device name. Setting the device name in logging app settings only works with Owntracks, Traccar and OpenGTS.\n\nOn PhoneTrack main page, while watching a session, you can :\n\n* 📍 Display location history\n* ⛛ Filter points\n* ✎ Manually edit/add/delete points\n* ✎ Edit devices (rename, change colour/shape, move to another session)\n* ⛶ Define geofencing zones for devices\n* ⚇ Define proximity alerts for device pairs\n* 🖧 Share a session to other Nextcloud users or with a public link (read-only)\n* 🔗 Generate public share links with optional restrictions (filters, device name, last positions only, geofencing simplification)\n* 🖫 Import/export a session in GPX format (one file with one track per device or one file per device)\n* 🗠 Display sessions statistics\n* 🔒 [Reserve a device name](https://gitlab.com/eneiluj/phonetrack-oc/wikis/userdoc#device-name-reservation) to make sure only authorised user can log with this name\n* 🗓 Toggle session auto export and auto purge (daily/weekly/monthly)\n* ◔ Choose what to do when point number quota is reached (block logging or delete oldest point)\n\nPublic page and public filtered page work like main page except there is only one session displayed, everything is read-only and there is no need to be logged in.\n\nThis app is tested on Nextcloud 17 with Firefox 57+ and Chromium.\n\nThis app is compatible with theming colours and accessibility themes !\n\nThis app is under development.\n\n## Install\n\nSee the [AdminDoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc) for installation details.\n\nCheck [CHANGELOG](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/CHANGELOG.md#change-log) file to see what's new and what's coming in next release.\n\nCheck [AUTHORS](https://gitlab.com/eneiluj/phonetrack-oc/blob/master/AUTHORS.md#authors) file to see complete list of authors.\n\n## Known issues\n\n* PhoneTrack **now works** with Nextcloud group restriction activated. See [admindoc](https://gitlab.com/eneiluj/phonetrack-oc/wikis/admindoc#issue-with-phonetrack-restricted-to-some-groups-in-nextcloud).\n\nAny feedback will be appreciated.\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ](https://liberapay.com/eneiluj/donate)", + "homepage": "https://github.com/julien-nc/phonetrack-oc", + "licenses": [ + "agpl" + ] + }, + "polls": { + "sha256": "1jsxgnn6vvbn1v0x8k2zf95pdqlrg6pxrvn32sms8sfzgq3lbn7m", + "url": "https://github.com/nextcloud/polls/releases/download/v6.0.1/polls.tar.gz", + "version": "6.0.1", + "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": [ + "agpl" + ] + }, + "previewgenerator": { + "sha256": "08f0ivxqa2b54w2q4lycb3p5ngqyk92n2qll54pmpj54pfn1sj3m", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.4.0/previewgenerator-v5.4.0.tar.gz", + "version": "5.4.0", + "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", + "homepage": "https://github.com/nextcloud/previewgenerator", + "licenses": [ + "agpl" + ] + }, + "qownnotesapi": { + "sha256": "1pyr4b3w6gsy83ci6cy0wfv870qm2v957nl4w6xk989iyknk4ana", + "url": "https://github.com/pbek/qownnotesapi/releases/download/v23.12.0/qownnotesapi-nc.tar.gz", + "version": "23.12.0", + "description": "QOwnNotesAPI is the Nextcloud/ownCloud API for [QOwnNotes](http://www.qownnotes.org), the open source notepad for Linux, macOS and Windows, that works together with the notes application of Nextcloud/ownCloud.\n\nThe only purpose of this App is to provide API access to your Nextcloud/ownCloud server for your QOwnNotes desktop installation, you cannot use this App for anything else, if you don't have QOwnNotes installed on your desktop computer!", + "homepage": "https://github.com/pbek/qownnotesapi", + "licenses": [ + "agpl" + ] + }, + "spreed": { + "sha256": "1aa0pr9r3md04q8anih25kg6b77zfzdf6y8fz2miyfbwd8n6j21p", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.0/spreed-v18.0.0.tar.gz", + "version": "18.0.0", + "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": [ + "agpl" + ] + }, + "tasks": { + "sha256": "0a1wpb9f08iqxl9vjp0slxwzn0w67ilpk21dsi0nhpm28ns2mhyc", + "url": "https://github.com/nextcloud/tasks/releases/download/v0.15.0/tasks.tar.gz", + "version": "0.15.0", + "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", + "homepage": "https://github.com/nextcloud/tasks/", + "licenses": [ + "agpl" + ] + }, + "twofactor_nextcloud_notification": { + "sha256": "0gaqgzbryim580dxarak7p4g3wd8wp3w6lw9jhl84jh46wrsbrj8", + "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.8.0/twofactor_nextcloud_notification-v3.8.0.tar.gz", + "version": "3.8.0", + "description": "Allows using any of your logged in devices as second factor", + "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", + "licenses": [ + "agpl" + ] + }, + "twofactor_webauthn": { + "sha256": "1p4ng7nprlcgw7sdfd7wqx5az86a856f1v470lahg2nfbx3fg296", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.2/twofactor_webauthn-v1.3.2.tar.gz", + "version": "1.3.2", + "description": "A two-factor provider for WebAuthn devices", + "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", + "licenses": [ + "agpl" + ] + }, + "user_saml": { + "sha256": "0y5l66ig38202mg5zhy6yi72fz8fbsr7410q6qclxivna3gvyzrc", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.0.1/user_saml-v6.0.1.tar.gz", + "version": "6.0.1", + "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", + "homepage": "https://github.com/nextcloud/user_saml", + "licenses": [ + "agpl" + ] + } +} diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index 8b6f49c524c5c..6b5fa0c04446e 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -19,6 +19,7 @@ , "notes": "agpl3Plus" , "notify_push": "agpl3Plus" , "onlyoffice": "asl20" +, "phonetrack": "agpl3Plus" , "polls": "agpl3Plus" , "previewgenerator": "agpl3Plus" , "qownnotesapi": "agpl3Plus" diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index b6b9b4e5922b6..6628eb48c1478 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nginx-sso"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "Luzifer"; repo = "nginx-sso"; rev = "v${version}"; - hash = "sha256-Lpaqcxw1q609rYuEd1zrAKXE0GDEi72wl2eoFezvrV8="; + hash = "sha256-8ZfNHjf5sbcBasu3o3AHCL0tGROixdNZkDF9yd/uPbs="; }; - vendorHash = "sha256-XReXxugMfR2l2LMTvXpSJa7Z9BX7LytwYdYNijPtciE="; + vendorHash = "sha256-bquK6/xT+xhEGBDeNN3U1qwSxrHWQhdHNuw9RXoqM+8="; postInstall = '' mkdir -p $out/share diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index ba678355033ee..b1f4584161e77 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -1,18 +1,18 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub , nixosTests }: -buildGo121Module rec { +buildGoModule rec { pname = "ferretdb"; - version = "1.15.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-J9pY84jaVsi31XdoAh3+fNgFNS88Nxxcs+hRV+bPn/M="; + hash = "sha256-GHUIr43rcA+H9FLQrrnTKLggyujGE0Is0VisLkL/EQI="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGo121Module rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-NDLxf8aobamtR5/xn7YPgWQid4NZvj7v249tP1VGXfs="; + vendorHash = "sha256-Mgc+TpK7XnRCT/CLDyW7fIs6jB2LbYlTceiytErIj+U="; CGO_ENABLED = 0; diff --git a/pkgs/servers/nosql/influxdb2/cli.nix b/pkgs/servers/nosql/influxdb2/cli.nix index dc7395a7eb7ff..10a3278c101b0 100644 --- a/pkgs/servers/nosql/influxdb2/cli.nix +++ b/pkgs/servers/nosql/influxdb2/cli.nix @@ -1,5 +1,4 @@ { buildGoModule -, buildGoPackage , fetchFromGitHub , lib }: diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index a9b5aa97a64ea..688d2867a8fdc 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.4"; + version = "7.3.7"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-Y3ymL0THOXfNbEDZhXjLtjWnM5bODDSNgSzpTYL2Qsc="; + hash = "sha256-RvEYnPllmK7ZFJ5l4cmnVrRYr/EFpu5wSqsGzR2Y2K4="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/nosql/surrealdb/default.nix b/pkgs/servers/nosql/surrealdb/default.nix index 22903725a5edc..be00acb6a529e 100644 --- a/pkgs/servers/nosql/surrealdb/default.nix +++ b/pkgs/servers/nosql/surrealdb/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-rBqg8tMcdc9VavYQDiKQwNp2IxYvpDNB/Qb74uiMmO4="; + hash = "sha256-/+GAnACNzGxMDSO1BGc9dA13hZnNKDia0KBlyujEe04="; }; - cargoHash = "sha256-qbKc9/n4bOvdP2iXg6IF3jAwxx6Wj17Uxlj3F/gx+1g="; + cargoHash = "sha256-9wvgj00GAWRP9sWOgugelizB6xbPNs0h13bGGxWtA+s="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/servers/nostr-rs-relay/default.nix b/pkgs/servers/nostr-rs-relay/default.nix index 80707431a0a70..f52e8ff16e238 100644 --- a/pkgs/servers/nostr-rs-relay/default.nix +++ b/pkgs/servers/nostr-rs-relay/default.nix @@ -11,15 +11,15 @@ rustPlatform.buildRustPackage rec { pname = "nostr-rs-relay"; - version = "0.8.12"; + version = "0.8.13"; src = fetchFromGitHub { owner = "scsibug"; repo = "nostr-rs-relay"; rev = version; - hash = "sha256-3/hd3w06bILcgd7gmmpzky4Sj3exHX5xn3XGrueGDbE="; + hash = "sha256-YgYi387b1qlGpjupqgGuLx8muHJ1iMx1sH82UW3TsQg="; }; - cargoHash = "sha256-ulCUJ59LSYxzSbMBZcv2/7wDTwTGGGXoHPAZO4rudDE="; + cargoHash = "sha256-CwyX8VlzH/y5LZtaMDd/4yWGCZLczc9bW4AqUzQFFKU="; buildInputs = [ openssl.dev ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/servers/onlyoffice-documentserver/default.nix index ea5a35eeb78ff..bc5a41750f55b 100644 --- a/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/pkgs/servers/onlyoffice-documentserver/default.nix @@ -15,11 +15,11 @@ let # var/www/onlyoffice/documentserver/server/DocService/docservice onlyoffice-documentserver = stdenv.mkDerivation rec { pname = "onlyoffice-documentserver"; - version = "7.5.0"; + version = "7.5.1"; src = fetchurl { url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb"; - sha256 = "sha256-0rtxKSVIyCzYnhRneLOEu1e1qtAO6dGBAUr/oKq95Hw="; + sha256 = "sha256-191PYpxs/TbVXoBPHvuyTp81ZMtw1YaFznY1hUSbh+0="; }; preferLocalBuild = true; diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index 35148cb0932a0..879f65454816c 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "oxigraph"; - version = "0.3.20"; + version = "0.3.22"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-gV7Yo14oGFzuO1b/JGXeuqn4k+9aNTwngEJHoD9+NMI="; + sha256 = "sha256-zwUiUDWdrmLF+Qj9Jy6JGXHaBskRnm+pMKW2GKGGeN8="; fetchSubmodules = true; }; - cargoHash = "sha256-bXf7PZm2l1hwnFVbfEJWLyRaVY3cZFaDSe8b77JtyaU="; + cargoHash = "sha256-O9/YvvFOaZ1F7HYO/AplWLz1vw0hysJEvGketk8zb9w="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 93cd01950d6b4..0f3055277efd2 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.7.7621-871adbd44"; + version = "1.32.8.7639-fb6452ebf"; 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 = "0894hwbl05rsv80p3k0wjs1hv5jwn2zakv758kzx1dvqcmjzhy2w"; + sha256 = "sha256-v9Fb5dlgIWqXfL9a4GkbGDEzYueyHs8P8R6TSyXDLrc="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0r2i4y00pcd6hkrypzmgd03w4vj2hchhicgdy3zdwjmfk3aqs4jf"; + sha256 = "sha256-jdGVAdvm7kjxTP3CQ5w6dKZbfCRwSy9TrtxRHaV0/cs="; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 56287e66bbb6d..c5ed1ff169f4b 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.19.4"; + version = "0.20.1"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-P8EbVw+BWz5lHZiK7T+Z/VQ3MTzPdJaBvmJKSNQyxgY="; + hash = "sha256-dJfQ/y5pMhQZfGLUUpsBZ0tZ1BBjBeIgzcOpyR7We64="; }; - vendorHash = "sha256-iONh/X5x4C76OXIl/+CdmmWZ8rLIfk/IHQf4JKUR2xs="; + vendorHash = "sha256-Y70GNXThSZdG+28/ZQgxXhyZWAtMu0OM97Yhmo0Eigc="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/servers/portunus/default.nix b/pkgs/servers/portunus/default.nix index b2cd17f016d25..f42888cbd32a9 100644 --- a/pkgs/servers/portunus/default.nix +++ b/pkgs/servers/portunus/default.nix @@ -1,19 +1,22 @@ { lib , buildGoModule , fetchFromGitHub +, libxcrypt-legacy # TODO: switch to libxcrypt for NixOS 24.11 (cf. same note on nixos/modules/services/misc/portunus.nix) }: buildGoModule rec { pname = "portunus"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "majewsky"; repo = "portunus"; rev = "v${version}"; - sha256 = "sha256-+sq5Wja0tVkPZ0Z++K2A6my9LfLJ4twxtoEAS6LHqzE="; + sha256 = "sha256-jicqH31Q+kDkOvtCg+HStQ4LUUzKm5ZO4utnAkCOLvY="; }; + buildInputs = [ libxcrypt-legacy ]; + vendorHash = null; postInstall = '' diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index e0a66d136db49..f43ffd3a4e1ce 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-XWKslumO6o0kn9JMFTTuDTDALX6r4rzEyFFj2w13cYc="; - arm64-linux_hash = "sha256-rsgyTgSW1w/zrXbOvwbJ8KTRK6HheKpACoR3Tjw5z+k="; - x64-osx_hash = "sha256-tJkYWvJfxF2zMl1TEG5qhoV2qKya0bzIitNVIaeRLSI="; + x64-linux_hash = "sha256-shJ0sPspsj8WYkpmNyuS0SEDiAmQ3Uh+88HmXGd9clo="; + arm64-linux_hash = "sha256-jODocQYhwT1FtOYF0C4BWJtmvFlRI4mhd8JjH+WcIUM="; + x64-osx_hash = "sha256-WRa6GNWRvNIzgU4UoedtQjy06psZmD328yP6982Z8F4="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.10.2287"; + version = "0.3.12.2327"; 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/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 3387ef3c6f118..0d293dbf1f0f2 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.2.14"; + version = "23.3.1"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-VvbyVAcNPe1UOEfX+HSY4OaOBS78YZuFgpIYo2s1kXo="; + sha256 = "sha256-xYUL681Ek3eJw5SPdMjlIjt7T87d09+xfJNCcC9tTpE="; }; server = callPackage ./server.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-mLMMw48d1FOvIIjDNza0rZSWP55lP1AItR/hT3lYXDg="; + vendorHash = "sha256-nXAjtRhiLmzgb6OVerX2liCinstsnxeBBpxSAQoLrjg="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/servers/rmfakecloud/default.nix b/pkgs/servers/rmfakecloud/default.nix index ada0ba0f03cfc..46a6e4723a594 100644 --- a/pkgs/servers/rmfakecloud/default.nix +++ b/pkgs/servers/rmfakecloud/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://ddvk.github.io/rmfakecloud/"; license = licenses.agpl3Only; maintainers = with maintainers; [ pacien martinetd ]; + mainProgram = "rmfakecloud"; }; } diff --git a/pkgs/servers/roadrunner/default.nix b/pkgs/servers/roadrunner/default.nix index 25f34346285e9..de632ad763acd 100644 --- a/pkgs/servers/roadrunner/default.nix +++ b/pkgs/servers/roadrunner/default.nix @@ -6,12 +6,12 @@ buildGoModule rec { pname = "roadrunner"; - version = "2023.3.4"; + version = "2023.3.8"; src = fetchFromGitHub { repo = "roadrunner"; owner = "roadrunner-server"; rev = "v${version}"; - hash = "sha256-khG0T88TR7hg9OO7E9eCGTB3q3c5r94nANSZ1J6vCj0="; + hash = "sha256-wz7heYKiLJKfIYZhzxKAZX7oM4iFTAmvmokjcjxj6PY="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ buildGoModule rec { --replace "127.0.0.1:0" "127.0.0.1:55554" ''; - vendorHash = "sha256-UP+a47EALxFTxMl9yxinF4QiifQXAgAZ6ZOt9ebhlDc="; + vendorHash = "sha256-ODjgELnT47jyvATMOtfc3RkhHaHc0kpVbz47kNM0lZU="; meta = { changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index 0986abe374ca3..e00d59648e030 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.14.1"; + version = "0.14.4"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9qP0/PGXRbQzSIsxUoGzbtc2KNg6SKrqGYcg/K6SuKo="; + sha256 = "sha256-7CZi76IQR6CIf3EnoysaTrVf2kIDP9sOBXL4kqFFHtY="; }; - cargoHash = "sha256-76s3cWAKS6aeIG1ctHU6uCMWHDKsMcf5HWhUWzEuAkI="; + cargoHash = "sha256-fAj/z21do0GV41MIn5hifEZyZPgrb288TRz55BFsdz8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 37e98de2591bf..89889ee7b3a21 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -61,11 +61,11 @@ let in stdenv.mkDerivation rec { pname = "samba"; - version = "4.19.2"; + version = "4.19.3"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-nmPwUF4cYx8dsLepNJpR6SXAJsoDrz/V2BIii7WX05M="; + hash = "sha256-KAVTuQ8TGxlAWA3yk2U8npvYkGIB9d725ejBYPC/rJY="; }; outputs = [ "out" "dev" "man" ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - python + python3Packages.python wafHook pkg-config bison @@ -223,7 +223,7 @@ stdenv.mkDerivation rec { ''; disallowedReferences = - lib.optionals (buildPackages.python3Packages.python != python) + lib.optionals (buildPackages.python3Packages.python != python3Packages.python) [ buildPackages.python3Packages.python ]; passthru = { diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 49cc74bafc2a6..0acb6e1cb5642 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, cmake, fetchurl, kytea, mecab, pkg-config, rapidjson, testers, xxHash, zstd, postgresqlPackages -, suggestSupport ? false, zeromq, libevent, msgpack, openssl +{ lib, stdenv, cmake, fetchurl, kytea, msgpack-c, mecab, pkg-config, rapidjson, testers, xxHash, zstd, postgresqlPackages +, suggestSupport ? false, zeromq, libevent, openssl , lz4Support ? false, lz4 , zlibSupport ? true, zlib }: @@ -29,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { zstd mecab kytea + msgpack-c ] ++ lib.optionals lz4Support [ lz4 ] ++ lib.optional zlibSupport [ @@ -36,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals suggestSupport [ zeromq libevent - msgpack ]; env.NIX_CFLAGS_COMPILE = lib.optionalString zlibSupport "-I${zlib.dev}/include"; diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index 3c09530d17905..8e71e14671b54 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -41,7 +41,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/opensearch-plugin --set JAVA_HOME "${jre_headless}" - wrapProgram $out/bin/opensearch-cli --set JAVA_HOME "${jre_headless}" + + rm $out/bin/opensearch-cli runHook postInstall ''; diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index f63805cd36e45..307cccf0c2115 100644 --- a/pkgs/servers/search/weaviate/default.nix +++ b/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.21.7"; + version = "1.23.0"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-fhBjKmWtbivntgBFmxfG4bQNUvCdP5uWtysOvsSqFuw="; + hash = "sha256-gm8PNNRnfnpLR5dS7nFfbvbZSSvTxbC4lUma2HI/+ZM="; }; - vendorHash = "sha256-/ylYXwgJKtkAIvYgSsl8MzBxuxp0Nco3ZR4ZBdmmS+w="; + vendorHash = "sha256-UEdGoXKq7ewNszahgcomjjuO2uzRZpiwkvvnXyFc9Og="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index 95e55c0edbb5d..ee6d8c8d15b50 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/pkgs/servers/sftpgo/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-SW+8Lp2NNW2I1BoOGVRzIx+1+DsffxlmHf8xFCxTyNw="; + hash = "sha256-ea4DbPwi2tcRgmbNsZKKUOVkp6vjRbr679yAP7znNUc="; }; - vendorHash = "sha256-IQg50z+X0dUOk2zEiGejywEE+8SCtS3mdgUAxIddcQs="; + vendorHash = "sha256-8TBDaDBLy+82BwsaLncDknVIrauF0eop9e2ZhwcLmIs="; ldflags = [ "-s" diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index e75dc72a13540..1a97e606caf0e 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.30.4"; + version = "3.30.5"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-me52Ji+IWPN6IEDWsAlIoGPS45uA22+dxHJjqnYPniE="; + hash = "sha256-PWoQQjzpG3Wm/5G9oexZclUj+mkizJsimHD+zPGf/CU="; }; patches = [ diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 55721a38cd8bd..8174e85c3a439 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -104,12 +104,12 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.10"; + version = "1.10.11"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3Mm/hbMwnlwbtiOFlODtKItVyj34O3beZDlV8YoJmts="; + hash = "sha256-LzGqrXzPED3PoCDnrwUmmSQsvlAucYo2gTkwFausM7A="; }; postPatch = '' @@ -126,20 +126,6 @@ stdenv.mkDerivation rec { done ''; - ## TODO Validate with the next upstream release - patches = [ - (fetchpatch { - name = "CVE-2023-44488.patch"; - url = "https://github.com/signalwire/freeswitch/commit/f1fb05214e4f427dcf922f531431ab649cf0622b.patch"; - hash = "sha256-6GMebE6O2EBx60NE2LSRVljaiLm9T4zTrkIpwGvaB08="; - }) - (fetchpatch { - name = "CVE-2023-5217.patch"; - url = "https://github.com/signalwire/freeswitch/commit/6f9e72c585265d8def8a613b36cd4f524c201980.patch"; - hash = "sha256-l64mBpyq/TzRM78n73kbuD0UNsk5zIH5QNJlMKdPfr4="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ pkg-config autoreconfHook perl which yasm ]; buildInputs = [ @@ -181,7 +167,7 @@ stdenv.mkDerivation rec { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = "https://freeswitch.org/"; license = lib.licenses.mpl11; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ mikaelfangel ]; platforms = with lib.platforms; unix; broken = stdenv.isDarwin; }; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 08d9dbe97e6f7..c340ee1d9d215 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -16,6 +16,9 @@ let perlPackages = perl538Packages; + + binPath = lib.makeBinPath ([ lame flac faad2 sox wavpack ] ++ (lib.optional stdenv.isLinux monkeysAudio)); + libPath = lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ]; in perlPackages.buildPerlPackage rec { pname = "slimserver"; @@ -118,6 +121,9 @@ perlPackages.buildPerlPackage rec { rm -r CPAN mv CPAN_used CPAN + # another set of vendored/modified modules exist in lib, more selectively cleaned for now + rm -rf lib/Audio + ${lib.optionalString (!enableUnfreeFirmware) '' # remove unfree firmware rm -rf Firmware @@ -130,9 +136,8 @@ perlPackages.buildPerlPackage rec { installPhase = '' cp -r . $out - wrapProgram $out/slimserver.pl \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ]}" \ - --prefix PATH : "${lib.makeBinPath ([ lame flac faad2 sox wavpack ] ++ (lib.optional stdenv.isLinux monkeysAudio))}" + wrapProgram $out/slimserver.pl --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}" + wrapProgram $out/scanner.pl --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}" mkdir $out/bin ln -s $out/slimserver.pl $out/bin/slimserver ''; diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index 49c2c27890ff0..55cbcede0c893 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.42"; + version = "2.43"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-cLSbmEZj5lyMtZMM2vaWqdrXFk1/VPws9yBPhSUka2E="; + hash = "sha256-253uibzgo5p3DtODrZelZeULcd16lR7ueEOWidm6zOE="; }; buildInputs = [ curl openssl ]; diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 1c53154d924d0..d6de696d691d8 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.29.4"; + version = "2.32.0"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-dWWwBee7pfYMo8trX9KnqNaMw+CZe8svj/pjmZnl/qo="; + sha256 = "sha256-y77oFvVCE7eQoJbBWeyi+kldDDhAhAkoTNZ9CGWMvb8="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 63f94093a84cf..0735e6d85f257 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.15"; + version = "0.15.18"; src = fetchFromGitHub { owner = "sozu-proxy"; repo = pname; rev = version; - hash = "sha256-zxGP2SWrq8beb+mJpgB39T7B1HpE76YP6se01vMewuw="; + hash = "sha256-tmQgihbE4Ga2NXKwTQTaMP2ZKyL9G1zTojHG2mwFn0o="; }; - cargoHash = "sha256-KqCDOWCMRYpBMsESTdhMEgTu6qAxcg4RHe252JBggqs="; + cargoHash = "sha256-93I9HcGCnli8gK7BkS4h4pecmN/yRpwbjFzqlMLMbM0="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 9095335d1b80d..3f4d9ec470532 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.25.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-+/0raANdWXPnme/l82wzbhf+kYggBvs4iYswDUPFjlI="; + hash = "sha256-Zbg5rcgOSgTeVDuZpvzXuo0DWx5PH+9xPxHZZJjqpKs="; }; - vendorHash = "sha256-r0crxfE3XtsT4+5lWNY6R/bcuxq2WeongK9l7ABXQo8="; + vendorHash = "sha256-jzH9f/hN2S9MUtomIjPQ/VErDWyVjNN9G4W7hHiFRJs="; subPackages = [ "cmd/spicedb" ]; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 07c81ec1007c2..6cd3e2c7a0147 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -136,7 +136,7 @@ let description = "An enhanced, drop-in replacement for MySQL"; homepage = "https://mariadb.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ thoughtpolice ajs124 das_j ]; + maintainers = with maintainers; [ thoughtpolice ] ++ teams.helsinki-systems.members; platforms = platforms.all; }; }; diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 150e6edb66ac8..720bb050be250 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Galera 3 wsrep provider library"; homepage = "https://galeracluster.com/"; license = licenses.lgpl2Only; - maintainers = with maintainers; [ ajs124 izorkin ]; + maintainers = with maintainers; [ izorkin ] ++ teams.helsinki-systems.members; platforms = platforms.all; broken = stdenv.isDarwin; }; diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix new file mode 100644 index 0000000000000..91437de345859 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +, h3_4 +, postgresql +, postgresqlTestHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "h3-pg"; + version = "4.1.3"; + + src = fetchFromGitHub { + owner = "zachasme"; + repo = "h3-pg"; + rev = "v${finalAttrs.version}"; + hash = "sha256-nkaDZ+JuMtsGUJVx70DD2coLrmc/T8/cNov7pfNF1Eg="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory(cmake/h3)" "include_directories(${lib.getDev h3_4}/include/h3)" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/AddPostgreSQLExtension.cmake \ + --replace "INTERPROCEDURAL_OPTIMIZATION TRUE" "" + ''; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + h3_4 + postgresql + ]; + + installPhase = '' + install -D -t $out/lib h3/h3.so + install -D -t $out/share/postgresql/extension h3/h3-*.sql h3/h3.control + install -D -t $out/lib h3_postgis/h3_postgis.so + install -D -t $out/share/postgresql/extension h3_postgis/h3_postgis-*.sql h3_postgis/h3_postgis.control + ''; + + passthru.tests.extension = stdenv.mkDerivation { + name = "h3-pg-test"; + dontUnpack = true; + doCheck = true; + buildInputs = [ postgresqlTestHook ]; + nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.h3-pg ps.postgis ])) ]; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + passAsFile = [ "sql" ]; + sql = '' + CREATE EXTENSION h3; + CREATE EXTENSION h3_postgis CASCADE; + + SELECT h3_lat_lng_to_cell(POINT('37.3615593,-122.0553238'), 5); + SELECT ST_NPoints(h3_cell_to_boundary_geometry('8a63a9a99047fff')); + ''; + failureHook = "postgresqlStop"; + checkPhase = '' + runHook preCheck + psql -a -v ON_ERROR_STOP=1 -f $sqlPath + runHook postCheck + ''; + installPhase = "touch $out"; + }; + + meta = with lib; { + description = "PostgreSQL bindings for H3, a hierarchical hexagonal geospatial indexing system"; + homepage = "https://github.com/zachasme/h3-pg"; + license = licenses.asl20; + maintainers = with maintainers; [ marsam ]; + inherit (postgresql.meta) platforms; + }; +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index fd07b4e105448..e29918373c77b 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -1,24 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: +{ lib +, stdenv +, fetchFromGitHub +, openssl +, postgresql +, postgresqlTestHook +, readline +, testers +, zlib +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pg_repack"; - version = "1.4.8"; + version = "1.5.0"; buildInputs = [ postgresql openssl zlib readline ]; src = fetchFromGitHub { - owner = "reorg"; - repo = "pg_repack"; - rev = "ver_${version}"; - sha256 = "sha256-Et8aMRzG7ez0uy9wG6qsg57/kPPZdUhb+/gFxW86D08="; + owner = "reorg"; + repo = "pg_repack"; + rev = "ver_${finalAttrs.version}"; + sha256 = "sha256-do80phyMxwcRIkYyUt9z02z7byNQhK+pbSaCUmzG+4c="; }; installPhase = '' install -D bin/pg_repack -t $out/bin/ install -D lib/pg_repack${postgresql.dlSuffix} -t $out/lib/ - install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/postgresql/extension + install -D lib/{pg_repack--${finalAttrs.version}.sql,pg_repack.control} -t $out/share/postgresql/extension ''; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + extension = stdenv.mkDerivation { + name = "plpgsql-check-test"; + dontUnpack = true; + doCheck = true; + buildInputs = [ postgresqlTestHook ]; + nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.pg_repack ])) ]; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + failureHook = "postgresqlStop"; + checkPhase = '' + runHook preCheck + psql -a -v ON_ERROR_STOP=1 -c "CREATE EXTENSION pg_repack;" + runHook postCheck + ''; + installPhase = "touch $out"; + }; + }; + meta = with lib; { description = "Reorganize tables in PostgreSQL databases with minimal locks"; longDescription = '' @@ -31,5 +61,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ danbst ]; inherit (postgresql.meta) platforms; + mainProgram = "pg_repack"; }; -} +}) diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix index a405a1c764d60..7abeba5adda18 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "pg_uuidv7"; - version = "1.4.0"; + version = "1.4.1"; buildInputs = [ postgresql ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "fboulnois"; repo = "pg_uuidv7"; rev = "v${version}"; - hash = "sha256-GwjaFEXlJI72V07ukWPB3LeRBWAL6STq866f/rRCVoo="; + hash = "sha256-1qEsDCcULceMqvR3DIC5rOfpzn2PYbFGq0H8p2+9GR4="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 3e8ba36994ce5..c51de681a3cca 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, perl, perlPackages, which }: +{ lib +, stdenv +, fetchFromGitHub +, perl +, perlPackages +, postgresql +, postgresqlTestHook +, which +}: stdenv.mkDerivation rec { pname = "pgtap"; @@ -14,9 +22,36 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ]; installPhase = '' + install -D src/pgtap.so -t $out/lib install -D {sql/pgtap--${version}.sql,pgtap.control} -t $out/share/postgresql/extension ''; + passthru.tests.extension = stdenv.mkDerivation { + name = "pgtap-test"; + dontUnpack = true; + doCheck = true; + buildInputs = [ postgresqlTestHook ]; + nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.pgtap ])) ]; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + passAsFile = [ "sql" ]; + sql = '' + CREATE EXTENSION pgtap; + + BEGIN; + SELECT plan(1); + SELECT pass('Test passed'); + SELECT * FROM finish(); + ROLLBACK; + ''; + failureHook = "postgresqlStop"; + checkPhase = '' + runHook preCheck + psql -a -v ON_ERROR_STOP=1 -f $sqlPath + runHook postCheck + ''; + installPhase = "touch $out"; + }; + meta = with lib; { description = "A unit testing framework for PostgreSQL"; longDescription = '' diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index c3aaa5e9e740c..3d3461dbd0c07 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestHook }: stdenv.mkDerivation rec { - pname = "plpgsql_check"; - version = "2.6.2"; + pname = "plpgsql-check"; + version = "2.7.1"; src = fetchFromGitHub { owner = "okbob"; - repo = pname; + repo = "plpgsql_check"; rev = "v${version}"; - hash = "sha256-JYlcd4VveSoQM/PIRRCeCLfJTDRGRl3zrc6iAd1V3aE="; + hash = "sha256-2SOBisIElNqqg5NwFk+pp7sE/+OvTifJUKMWOaOvO3k="; }; buildInputs = [ postgresql ]; @@ -19,6 +19,22 @@ stdenv.mkDerivation rec { install -D -t $out/share/postgresql/extension *.control ''; + passthru.tests.extension = stdenv.mkDerivation { + name = "plpgsql-check-test"; + dontUnpack = true; + doCheck = true; + buildInputs = [ postgresqlTestHook ]; + nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.plpgsql_check ])) ]; + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + failureHook = "postgresqlStop"; + checkPhase = '' + runHook preCheck + psql -a -v ON_ERROR_STOP=1 -c "CREATE EXTENSION plpgsql_check;" + runHook postCheck + ''; + installPhase = "touch $out"; + }; + meta = with lib; { description = "Linter tool for language PL/pgSQL"; homepage = "https://github.com/okbob/plpgsql_check"; diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 7eec155435a27..82f82e65f8c97 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation rec { pname = "tds_fdw"; # Move to stable version when it's released. - version = "unstable-2023-09-28"; + version = "unstable-2023-12-04"; buildInputs = [ postgresql freetds ]; src = fetchFromGitHub { owner = "tds-fdw"; repo = "tds_fdw"; - rev = "22ee5d3f46909b35efb2600b44ec19a35179630e"; - hash = "sha256-MmaLN1OWUJMWJhPUXBevSyBmMgZqeEFPGuxuLPSp4Pk="; + rev = "14b147fde8d99f3946fbd7b84aaaf5fc00af90e2"; + hash = "sha256-h1kTcm796ibfcrkRRs+yi1TRpcyZog95Genw8hMh0cg="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index 827fc57af62bb..4f0e02059adf2 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -10,7 +10,6 @@ }: let - cargo-pgrx_0_10_2 = cargo-pgrx.overrideAttrs (old: rec { name = "cargo-pgrx-${version}"; version = "0.10.2"; @@ -23,7 +22,7 @@ let cargoDeps = old.cargoDeps.overrideAttrs (_: { inherit src; - outputHash = "sha256-itU000vyVGnDUUZx6qOLJqiPdyNHikW2KNFzBmJPqv0="; + outputHash = "sha256-XyI3RaPI3Edm/tCP2xoZemib2d2n2cAhobgk9Oafg6s="; }); }); diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 6685602ec3a18..52e4fc700c948 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -4,6 +4,8 @@ self: super: { apache_datasketches = super.callPackage ./ext/apache_datasketches.nix { }; + h3-pg = super.callPackage ./ext/h3-pg.nix { }; + hypopg = super.callPackage ./ext/hypopg.nix { }; jsonb_deep_sum = super.callPackage ./ext/jsonb_deep_sum.nix { }; diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index 9c8087887ea36..f75defb333fdb 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -163,12 +163,12 @@ stdenv.mkDerivation (finalAttrs: { sed -i s_/usr/bin/proxysql_$out/bin/proxysql_ $out/lib/systemd/system/*.service ''; - meta = { + meta = with lib; { broken = stdenv.isDarwin; description = "High-performance MySQL proxy"; homepage = "https://proxysql.com/"; - license = with lib.licenses; [ gpl3Only ]; - maintainers = with lib.maintainers; [ ajs124 ]; - platforms = lib.platforms.unix; + license = with licenses; [ gpl3Only ]; + maintainers = teams.helsinki-systems.members; + platforms = platforms.unix; }; }) diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index 0eff264210a81..f3d966ed17027 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "7.6.1"; + version = "8.13.2"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WvEnMAz3dKG8xMlQzm7E0TmAgvsrRED50bb4Ved1+4U="; + sha256 = "sha256-YwwA9oqMJuHWaJ7zcSLJjbq3urIyUe6aZZS4kEeq7/8="; }; - vendorHash = "sha256-qirt5g7dcjAnceejrBnfhDpA4LSEj7eOuznSlfUBUgo="; + vendorHash = "sha256-qNI3SJdgaBi78Tvsd+RJ52vKZrbUQdEaEG/zTDKX0J4="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 5205115f83494..5968c7e1e340b 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -3,13 +3,13 @@ , cppunit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "squid"; - version = "5.9"; + version = "6.6"; src = fetchurl { - url = "http://www.squid-cache.org/Versions/v5/${pname}-${version}.tar.xz"; - hash = "sha256-P+XCAH2idXRGr5G275dPFUsggSCpo5OW6mgeXEq7BLU="; + url = "http://www.squid-cache.org/Versions/v6/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + hash = "sha256-Vb1/n0iYFTFh6hIomYrLVRv4QIMrnluQ/I7NKUJCAxg="; }; nativeBuildInputs = [ pkg-config ]; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; knownVulnerabilities = [ "Squid has multiple unresolved security vulnerabilities, for more information see https://megamansec.github.io/Squid-Security-Audit/" ]; }; -} +}) diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index 4c7b8d46638ce..824c56584e2bf 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.24.1"; + version = "2.24.2"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - hash = "sha256-U+B/k/stwjJw+mxUCb4A3yUtc/+Tg0PsWhVnovLLX4A="; + hash = "sha256-5Axqn3sYLM4yjGkN8d0ZUe8KrjYszaZmTg5GqmamNtc="; }; - cargoHash = "sha256-ZDrRjIM8187nr72MlzFr0NAqH2f8qkF1sGAT9+NvfhA="; + cargoHash = "sha256-xS2XARqXXcQ2J1k3jC5St19RdcK2korbEia4koUxG5s="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix index 1767b544f21ac..331770a565d5c 100644 --- a/pkgs/servers/sunshine/default.nix +++ b/pkgs/servers/sunshine/default.nix @@ -171,6 +171,7 @@ stdenv.mkDerivation rec { description = "Sunshine is a Game stream host for Moonlight"; homepage = "https://github.com/LizardByte/Sunshine"; license = licenses.gpl3Only; + mainProgram = "sunshine"; maintainers = with maintainers; [ devusb ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 60f82bf57e88d..ac8a5b833e1de 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.54.1"; + version = "1.56.1"; in buildGoModule { pname = "tailscale"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-dYYmqz1o3+FhdHmQ3KzUkAoSfEHNQhQt6neV3rFI+QE="; + hash = "sha256-kMk5Q/KvNcsohHNLDMmpBm+gUxQEOeO8o/odukcJi0A="; }; - vendorHash = "sha256-/kuu7DKPklMZOvYqJpsOp3TeDG9KDEET4U0G+sq+4qY="; + vendorHash = "sha256-bG/ydsJf2UncOcDo8/BXdvQJO3Mk0tl8JGje1b6kto4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/tracing/honeycomb/refinery/default.nix b/pkgs/servers/tracing/honeycomb/refinery/default.nix index a44be19b35aba..d1c7f9d909587 100644 --- a/pkgs/servers/tracing/honeycomb/refinery/default.nix +++ b/pkgs/servers/tracing/honeycomb/refinery/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { doCheck = true; meta = with lib; { - homepage = "https://github.com/honeycomb/refinery"; + homepage = "https://github.com/honeycombio/refinery"; description = "A tail-sampling proxy for OpenTelemetry"; license = licenses.asl20; maintainers = with maintainers; [ lf- ]; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 99a2e56ee7434..f1c40b707350c 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "traefik"; - version = "2.10.6"; + version = "2.10.7"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-9pv4x11GVkdNjs1IFESeB7k3qJisXcoK+QLp8LpbhDw="; + hash = "sha256-I+jmMtqWadWfT7nk2D9im6C2BGpPLts/7cdJ3NHsIks="; stripRoot = false; }; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 7c7b3124cebac..499a046663aef 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -102,8 +102,6 @@ in stdenv.mkDerivation { ]; preConfigure = '' - patchShebangs ./configure - substituteInPlace src/config.c \ --replace /usr/bin/tar ${gnutar}/bin/tar diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 0da5257aee983..e2251e1a20c8f 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "uftp"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "sha256-V8EqauWZQlNfteYgOBrt6xfVAAnucfI2QnziN6RsCxQ="; + sha256 = "sha256-y4ZowZsfELxjoW/6iT4gXcPshjYQN9R32AAyYOvEAIA="; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/unstructured-api/default.nix b/pkgs/servers/unstructured-api/default.nix index 7fb028de5fc92..a2f32b9418b00 100644 --- a/pkgs/servers/unstructured-api/default.nix +++ b/pkgs/servers/unstructured-api/default.nix @@ -21,7 +21,7 @@ let safetensors uvicorn ] ++ packages.unstructured.optional-dependencies.local-inference); - version = "0.0.57"; + version = "0.0.59"; unstructured_api_nltk_data = symlinkJoin { name = "unstructured_api_nltk_data"; @@ -35,7 +35,7 @@ in stdenvNoCC.mkDerivation { owner = "Unstructured-IO"; repo = "unstructured-api"; rev = version; - hash = "sha256-FdRrGqF1cJImFVNs/tZo1457f9yhhpwxGGmpAdZUWso="; + hash = "sha256-AYccSOPY3tW6ho1SNSYYDhKJXKtE3sUaT4g1toOfHSw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index a3521fe073fa8..93b17c219a3ea 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -45,7 +45,7 @@ let description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; license = licenses.bsd2; - maintainers = with maintainers; [ ajs124 ]; + maintainers = teams.helsinki-systems.members; platforms = platforms.unix; }; }; diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index be97cf838e703..a162448e637e9 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.8.1"; + version = "0.45.9"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = version; - hash = "sha256-DRbqWcbk9fwFp/gSCbAqEv8ZhWsOOnBBXCK8jXT5HdY="; + hash = "sha256-xiKXp9DBaiSteqZwQLZ4zLwT5MeETJx01rKRrWGYioc="; }; postPatch = '' diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 893404a6084f3..320eac3bc8ce6 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -279,6 +279,7 @@ let popd &>/dev/null redis-server >/dev/null & + REDIS_PID=$! initdb -A trust $NIX_BUILD_TOP/postgres >/dev/null postgres -D $NIX_BUILD_TOP/postgres -k $NIX_BUILD_TOP >/dev/null & @@ -304,6 +305,8 @@ let bundle exec rake db:migrate >/dev/null chmod -R +w tmp + + kill $REDIS_PID ''; buildPhase = '' diff --git a/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch b/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch deleted file mode 100644 index 30493b543e38c..0000000000000 --- a/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/discourse.rb b/lib/discourse.rb -index ea2a3cbafd..66454d9157 100644 ---- a/lib/discourse.rb -+++ b/lib/discourse.rb -@@ -62,7 +62,7 @@ module Discourse - fd.fsync() - end - -- File.rename(temp_destination, destination) -+ FileUtils.mv(temp_destination, destination) - - nil - end -@@ -76,7 +76,7 @@ module Discourse - FileUtils.mkdir_p(File.join(Rails.root, 'tmp')) - temp_destination = File.join(Rails.root, 'tmp', SecureRandom.hex) - execute_command('ln', '-s', source, temp_destination) -- File.rename(temp_destination, destination) -+ FileUtils.mv(temp_destination, destination) - - nil - end diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix index a1042c8e59c31..3f96b78391bdc 100644 --- a/pkgs/servers/web-apps/dolibarr/default.nix +++ b/pkgs/servers/web-apps/dolibarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "18.0.3"; + version = "18.0.4"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; rev = version; - sha256 = "sha256-8RZqzuMjy83WNvIBpNxjJpfuILCXIuwP0mrs+/cSTns="; + sha256 = "sha256-VHLkd8WAyPcfDzmzZl4G1pSTaklC2k0ez/YaZ+ci/1Q="; }; dontBuild = true; diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index ee92f58a2121b..9b9cf0ff3bfe5 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.4.0"; + version = "3.4.1"; src = fetchzip { url = "https://github.com/engelsystem/engelsystem/releases/download/v${version}/engelsystem-v${version}.zip"; - hash = "sha256-Z0p+6QlMrj5OtiwFKBfWxkkd/kbL2dxDSKvljcTXWo0="; + hash = "sha256-5KniP1nrLfmWHruXnUJmlvgL95U+EsDmCs4tg/YLWtw="; }; buildInputs = [ phpExt ]; diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 8a8502ad823b4..3c2c27a9e9569 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -3,18 +3,17 @@ , fetchFromGitHub , nixosTests , php -, pkgs }: stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-e4+ZkhncgDIWE5NH2eYun2FeWxz1suM//6T6P3V4nQU="; + hash = "sha256-X7MYPn1OFmzMWGGlZZ67EHEaRJRKGrdnw6nCzuUfbgU="; }; passthru.tests = { @@ -31,8 +30,10 @@ stdenvNoCC.mkDerivation rec { ''; installPhase = '' + runHook preInstall mkdir -p $out cp -vr * $out/ + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index c8172940576a3..34c2621847b1b 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.7629"; + version = "1.0.7658"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "v2KCpq/x8Zo3+KvhC4t8YnxPtBMP6vS4JeXmXZc62zc="; + sha256 = "5NzIN0T/7Y9WrCLA7CXAbBOOPIl4BuVHdz15jKf7fQo="; }; dontBuild = true; diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index c8229c02cd4d0..1f5d3b8b4cea1 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { description = "🐀 Building a federated alternative to reddit in rust"; homepage = "https://join-lemmy.org/"; license = licenses.agpl3Only; - maintainers = with maintainers; [ happysalada billewanick adisbladis ]; + maintainers = with maintainers; [ happysalada billewanick ]; mainProgram = "lemmy_server"; }; } diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix index 4f219ae21abaf..2bb1ccaeb8428 100644 --- a/pkgs/servers/web-apps/lemmy/ui.nix +++ b/pkgs/servers/web-apps/lemmy/ui.nix @@ -92,7 +92,7 @@ mkYarnPackage { description = "Building a federated alternative to reddit in rust"; homepage = "https://join-lemmy.org/"; license = licenses.agpl3Only; - maintainers = with maintainers; [ happysalada billewanick adisbladis ]; + maintainers = with maintainers; [ happysalada billewanick ]; inherit (nodejs.meta) platforms; }; } diff --git a/pkgs/servers/web-apps/livebook/default.nix b/pkgs/servers/web-apps/livebook/default.nix index dee6017624dc1..7c544ed7ee8f4 100644 --- a/pkgs/servers/web-apps/livebook/default.nix +++ b/pkgs/servers/web-apps/livebook/default.nix @@ -1,7 +1,7 @@ { lib, beamPackages, makeWrapper, rebar3, elixir, erlang, fetchFromGitHub, nixosTests }: beamPackages.mixRelease rec { pname = "livebook"; - version = "0.11.3"; + version = "0.12.0"; inherit elixir; @@ -13,13 +13,13 @@ beamPackages.mixRelease rec { owner = "livebook-dev"; repo = "livebook"; rev = "v${version}"; - hash = "sha256-zUJM6OcXhHW8e09h2EKnfI9voF2k4AZ75ulQErNqjD0="; + hash = "sha256-ONNl88ZUjeAjYV8kdk4Tf6noQ7YSp/UN9OHEJHk7+5s="; }; mixFodDeps = beamPackages.fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - hash = "sha256-7GvtxEIEbC0QZEYIoARaX9uIsf/CoGE6dX60/mCvkYI="; + hash = "sha256-JA0890hGShavn60khnevt4L0qEWKZnTmafImU4dkCr8="; }; installPhase = '' diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 4f0d02b670053..f4946809a6a99 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,15 +3,15 @@ let versions = { matomo = { - version = "4.15.1"; - hash = "sha256-XnfiprGLqFQqPk30gcAVLdBZ3pYMSdBPfnicm7V1PSc="; + version = "4.16.0"; + hash = "sha256-OFZT4195WTWw2XNAyGiNixW6hSNKC3IyBpa5kM9PCVk="; }; matomo-beta = { version = "5.0.0"; # `beta` examples: "b1", "rc1", null # when updating: use null if stable version is >= latest beta or release candidate - beta = "rc3"; - hash = "sha256-Q5GB4i0ew6+tr8Bsm9PYkzJ8U6DmVPwG2QCi8CTge5E="; + beta = "rc9"; + hash = "sha256-OXxJCEXcrl6UXYh+jbNqLQGYphrSjxaOAZg3AZVPAqs="; }; }; common = pname: { version, hash, beta ? null }: diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 8ba18acf9cac5..23f0e6c2153c7 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "mediawiki"; - version = "1.40.1"; + version = "1.41.0"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-4F1BneQMatAxRaygfgjPmV0coWZ9l3k7tzlw4sEbCgQ="; + hash = "sha256-84Qrcqp6JYiPHsYyMj3YkEF3OaEg2VHEhfhQ4MzLQhs="; }; postPatch = '' diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 293a0a0c72598..4bec37ec655dc 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: let - version = "4.3"; + version = "4.3.1"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz"; - hash = "sha256-zLBFUyadpsqGeEhBCPrh3KKWn6f3zCy64YxTBMLIGsk="; + hash = "sha256-4AFKD6lIir8VGgS+ZTifFHHrjtraxZlp6X143W9eEkM="; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/servers/web-apps/netbox/config_3_3.patch b/pkgs/servers/web-apps/netbox/config_3_3.patch deleted file mode 100644 index 1adc0b537a4ef..0000000000000 --- a/pkgs/servers/web-apps/netbox/config_3_3.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py -index d5a7bfaec..68754a8c5 100644 ---- a/netbox/netbox/settings.py -+++ b/netbox/netbox/settings.py -@@ -222,6 +222,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get('PASSWORD', '') - TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0) - TASKS_REDIS_SSL = TASKS_REDIS.get('SSL', False) - TASKS_REDIS_SKIP_TLS_VERIFY = TASKS_REDIS.get('INSECURE_SKIP_TLS_VERIFY', False) -+TASKS_REDIS_URL = TASKS_REDIS.get('URL') - - # Caching - if 'caching' not in REDIS: -@@ -236,11 +237,12 @@ CACHING_REDIS_SENTINELS = REDIS['caching'].get('SENTINELS', []) - CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'default') - CACHING_REDIS_PROTO = 'rediss' if REDIS['caching'].get('SSL', False) else 'redis' - CACHING_REDIS_SKIP_TLS_VERIFY = REDIS['caching'].get('INSECURE_SKIP_TLS_VERIFY', False) -+CACHING_REDIS_URL = REDIS['caching'].get('URL', f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}') - - CACHES = { - 'default': { - 'BACKEND': 'django_redis.cache.RedisCache', -- 'LOCATION': f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}', -+ 'LOCATION': CACHING_REDIS_URL, - 'OPTIONS': { - 'CLIENT_CLASS': 'django_redis.client.DefaultClient', - 'PASSWORD': CACHING_REDIS_PASSWORD, -@@ -383,7 +385,7 @@ USE_X_FORWARDED_HOST = True - X_FRAME_OPTIONS = 'SAMEORIGIN' - - # Static files (CSS, JavaScript, Images) --STATIC_ROOT = BASE_DIR + '/static' -+STATIC_ROOT = getattr(configuration, 'STATIC_ROOT', os.path.join(BASE_DIR, 'static')).rstrip('/') - STATIC_URL = f'/{BASE_PATH}static/' - STATICFILES_DIRS = ( - os.path.join(BASE_DIR, 'project-static', 'dist'), -@@ -562,6 +564,14 @@ if TASKS_REDIS_USING_SENTINEL: - 'socket_connect_timeout': TASKS_REDIS_SENTINEL_TIMEOUT - }, - } -+elif TASKS_REDIS_URL: -+ RQ_PARAMS = { -+ 'URL': TASKS_REDIS_URL, -+ 'PASSWORD': TASKS_REDIS_PASSWORD, -+ 'SSL': TASKS_REDIS_SSL, -+ 'SSL_CERT_REQS': None if TASKS_REDIS_SKIP_TLS_VERIFY else 'required', -+ 'DEFAULT_TIMEOUT': RQ_DEFAULT_TIMEOUT, -+ } - else: - RQ_PARAMS = { - 'HOST': TASKS_REDIS_HOST, diff --git a/pkgs/servers/web-apps/netbox/graphql-3_2_0.patch b/pkgs/servers/web-apps/netbox/graphql-3_2_0.patch deleted file mode 100644 index 1e97b7d85ce01..0000000000000 --- a/pkgs/servers/web-apps/netbox/graphql-3_2_0.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/netbox/netbox/graphql/scalars.py b/netbox/netbox/graphql/scalars.py -index 7d14189dd..0a18e79d2 100644 ---- a/netbox/netbox/graphql/scalars.py -+++ b/netbox/netbox/graphql/scalars.py -@@ -1,6 +1,6 @@ - from graphene import Scalar - from graphql.language import ast --from graphql.type.scalars import MAX_INT, MIN_INT -+from graphql.type.scalars import GRAPHQL_MAX_INT, GRAPHQL_MIN_INT - - - class BigInt(Scalar): -@@ -10,7 +10,7 @@ class BigInt(Scalar): - @staticmethod - def to_float(value): - num = int(value) -- if num > MAX_INT or num < MIN_INT: -+ if num > GRAPHQL_MAX_INT or num < GRAPHQL_MIN_INT: - return float(num) - return num - diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index c2acf17036748..f659802dd88fc 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.5"; + version = "0.4.7"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kCWzje3tGfSn3gSdS4AFsoWFOLV9DhWKmzJltZs1KqY="; + sha256 = "sha256-s870SjFFjjugqNDEAPMvwZ8Q1QT+9RKwujs4zDPVYGc="; }; - cargoHash = "sha256-PiKkCiMNMbgBN8qJvzHnZBC782uKsS9aGyKEzG0cEec="; + cargoHash = "sha256-lLE8N3IuSEoohjtENNc0ixMq80cWIsy6Vd8/sEiwQFw="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index 44065af46d4fd..e3aa30e322165 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -77,7 +77,7 @@ gnustep.stdenv.mkDerivation rec { license = with licenses; [ gpl2Only lgpl21Only ]; homepage = "https://sogo.nu/"; platforms = platforms.linux; - maintainers = with maintainers; [ ajs124 das_j ]; + maintainers = with maintainers; []; }; } diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix index a38983032fd5d..4658c6ece29fa 100644 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ b/pkgs/servers/web-apps/vikunja/api.nix @@ -1,30 +1,30 @@ -{ lib, buildGoModule, fetchFromGitea, mage, writeShellScriptBin, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, mage, writeShellScriptBin, nixosTests }: buildGoModule rec { pname = "vikunja-api"; - version = "0.20.4"; + version = "0.22.0"; - src = fetchFromGitea { - domain = "kolaente.dev"; - owner = "vikunja"; + src = fetchFromGitHub { + owner = "go-vikunja"; repo = "api"; rev = "v${version}"; - hash = "sha256-SkZf8LFU4/HFEWVEEj7Gl2jVwIL834GRwyua4cw9nh4="; + hash = "sha256-hqyopIV/cLLC8An+ELN0a/cFAq6BoCZZjBRviaJ5ygI="; }; nativeBuildInputs = - let - fakeGit = writeShellScriptBin "git" '' - if [[ $@ = "describe --tags --always --abbrev=10" ]]; then - echo "${version}" - else - >&2 echo "Unknown command: $@" - exit 1 - fi - ''; - in [ fakeGit mage ]; - - vendorHash = "sha256-TY6xJnz6phIrybZ2Ix7xwuMzGQ1f0xk0KwgPnaTaKYw="; + let + fakeGit = writeShellScriptBin "git" '' + if [[ $@ = "describe --tags --always --abbrev=10" ]]; then + echo "${version}" + else + >&2 echo "Unknown command: $@" + exit 1 + fi + ''; + in + [ fakeGit mage ]; + + vendorHash = "sha256-+V6a6h5pg8FU87pA4JxZo07HGBXIgCv4FjmtjIpQUP4="; # checks need to be disabled because of needed internet for some checks doCheck = false; diff --git a/pkgs/servers/web-apps/vikunja/frontend.nix b/pkgs/servers/web-apps/vikunja/frontend.nix index 40dbca76cc185..65e3df5b47a71 100644 --- a/pkgs/servers/web-apps/vikunja/frontend.nix +++ b/pkgs/servers/web-apps/vikunja/frontend.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vikunja-frontend"; - version = "0.20.5"; + version = "0.22.0"; src = fetchurl { url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - hash = "sha256-fUWMlayE8pxVBGloLrywVAFCXF/3vlrz/CHjHNBa7U8="; + hash = "sha256-LYU1IGAhSZOwMI44HW5IfcBKs9RkU/IXGVgPGDKnKAs="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 77d85bc81ef4a..f4a9d05e8d94c 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -1,11 +1,11 @@ { callPackage }: builtins.mapAttrs (_: callPackage ./generic.nix) rec { - wordpress = wordpress6_3; + wordpress = wordpress6_4; wordpress6_3 = { version = "6.3.2"; hash = "sha256-Jo2/Vlm4Ml24ucPI6ZHs2mkbpY2rZB1dofmGXNPweA8="; }; wordpress6_4 = { - version = "6.4.1"; - hash = "sha256-NF3tvVNUYlKPvtvJZzM7djGflOUT4VUlm4AyHPFzfdw="; + version = "6.4.2"; + hash = "sha256-m4KJELf5zs3gwAQPmAhoPe2rhopZFsYN6OzAv6Wzo6c="; }; } diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json index 66a2f6c1ba11b..6a9d4361f2260 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": "1238966", - "sha256": "1qrizj0smwlxzv70l2f4dz737qggij2saqx4dc0vfrp4pn0qxw56", - "version": "6.3" + "rev": "1286009", + "sha256": "1w6q2ja1y77yagg73zhrw94f2vpgd521zahwhvxqxa8isphbrybj", + "version": "6.4" }, "fr_FR": { "path": "fr_FR", - "rev": "1263147", - "sha256": "0rgypx5z7pi88da7ll0aby6hlvahja6wqjl8iacabwsnqawqbbx6", - "version": "6.3" + "rev": "1285884", + "sha256": "1qlq7p9pmspizbgjp895jldb6cbsvfal6h02p44r87ag356cjk6j", + "version": "6.4" }, "ro_RO": { "path": "ro_RO", - "rev": "1255832", - "sha256": "0c6hp40rgxg8ai3f35k2bgh4q66qf1g8qgv3jgbq6dcxr090fia2", - "version": "6.3" + "rev": "1296680", + "sha256": "0m98iaai240yn4lx4lhqgzi2wlxkz67v1cg86jhfi72n0rhr4l46", + "version": "6.4" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 346c459530a58..e85bf69310c1c 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -1,9 +1,9 @@ { "add-widget-after-content": { - "path": "add-widget-after-content/tags/2.4.5", - "rev": "2844985", - "sha256": "17h55fzmssaqv5k2s2a2n5rz49flhzg9gflnps1qpr62apki5156", - "version": "2.4.5" + "path": "add-widget-after-content/tags/2.4.6", + "rev": "3003516", + "sha256": "1nqhx66fy82mwcnfg0r9v2mb6q2nnmhxy9j2451rphxhlxxjf1bf", + "version": "2.4.6" }, "akismet": { "path": "akismet/tags/5.3", @@ -24,10 +24,10 @@ "version": "2.21.08.31" }, "breeze": { - "path": "breeze/tags/2.0.32", - "rev": "2995658", - "sha256": "0c0sh7l6cwz6hbc54gjaasdldrv8h6ynx4b75zzkj2arrmyhjjxg", - "version": "2.0.32" + "path": "breeze/tags/2.1.2", + "rev": "3011880", + "sha256": "164sf180j99icn39215s997qqmqddyqnkf7k29fwpkgz5ww0zkkd", + "version": "2.1.2" }, "co-authors-plus": { "path": "co-authors-plus/tags/3.5.15", @@ -42,10 +42,10 @@ "version": "3.1.1" }, "cookie-notice": { - "path": "cookie-notice/tags/2.4.11.1", - "rev": "2974733", - "sha256": "0bq6i4s7zkx0x5qb65d93h0sdkd17vka10k8xicfin7qdy5fdcf6", - "version": "2.4.11.1" + "path": "cookie-notice/tags/2.4.13", + "rev": "3002920", + "sha256": "0rw511zygmg1i8zp388s4fc526wr4pgszsqxw0bmwia6sjz0a9pn", + "version": "2.4.13" }, "disable-xml-rpc": { "path": "disable-xml-rpc/tags/1.0.1", @@ -60,10 +60,10 @@ "version": "1.4.0" }, "gutenberg": { - "path": "gutenberg/tags/17.0.2", - "rev": "2995211", - "sha256": "07c1smvapzm0gzkjzjk5irnp47x6hl2d4zcmlfprzj17igdqwa5s", - "version": "17.0.2" + "path": "gutenberg/tags/17.3.0", + "rev": "3012944", + "sha256": "0n51lldbbk0sfzcjk8mcjnaj6dmhhbg45kc9a03igl6cnppw6g53", + "version": "17.3.0" }, "hello-dolly": { "path": "hello-dolly/tags/1.7.2", @@ -72,16 +72,16 @@ "version": "1.7.2" }, "hkdev-maintenance-mode": { - "path": "hkdev-maintenance-mode/tags/2.4.5", - "rev": "2971903", - "sha256": "1nq3f0qv8zkws490h86m57972wp7vcngr62x90m8bcq4v6r110wd", - "version": "2.4.5" + "path": "hkdev-maintenance-mode/trunk", + "rev": "3003933", + "sha256": "1mfn9njy7sp23hgpd597y74gs52gi9lm8qajv7xbgza82920mlgd", + "version": "2.5.0" }, "jetpack": { - "path": "jetpack/tags/12.8.1", - "rev": "2995420", - "sha256": "1i59npwwk29rsq5myl0axr1vsyfw19dyx22ckc2szkc3a4my8h40", - "version": "12.8.1" + "path": "jetpack/tags/12.9.3", + "rev": "3013460", + "sha256": "1lgkd3bgaqf155a39zfxx7ikmfxpzfsfak71mrlga12sfmyrrw74", + "version": "12.9.3" }, "jetpack-lite": { "path": "jetpack-lite/tags/3.0.3", @@ -90,28 +90,28 @@ "version": "3.0.3" }, "lightbox-photoswipe": { - "path": "lightbox-photoswipe/tags/5.0.44", - "rev": "2968868", - "sha256": "0nbs05lxdf85ig373l3k558ncw0li1zrqnajq5mw9vkw15mxgy90", - "version": "5.0.44" + "path": "lightbox-photoswipe/tags/5.1.0", + "rev": "3001652", + "sha256": "1mdrxc15skbg8gm18b88hj97mps668in7xvyvymfn5sgpf843glz", + "version": "5.1.0" }, "login-lockdown": { - "path": "login-lockdown/tags/2.06", - "rev": "2951219", - "sha256": "0sl1pydylz1xpp3404nv2rdw8y2ccjvwglncj8flhjmgiwkjf47x", - "version": "2.06" + "path": "login-lockdown/tags/2.08", + "rev": "3007562", + "sha256": "0s9ahqbqcl0rlbbszrbdggyhnqw8k60xzlwq3nzsh2dxaphnmbi5", + "version": "2.08" }, "mailpoet": { - "path": "mailpoet/tags/4.36.0", - "rev": "2995974", - "sha256": "1782z2b1bwg7mx9qzvyzpiymmkqiafd5ymb31q11i7ks19gxlmbw", - "version": "4.36.0" + "path": "mailpoet/tags/4.40.0", + "rev": "3008786", + "sha256": "18604065zjwdrr63ad0a8zqy0cdfh8f5i3jyq5na5iayspgmy0lz", + "version": "4.40.0" }, "merge-minify-refresh": { "path": "merge-minify-refresh/trunk", - "rev": "2997367", - "sha256": "158i9pqn4qqa5mzn57pg4m9gsln35c0gfb8v7sg1y02hp9876shg", - "version": "2.2" + "rev": "3007859", + "sha256": "1f9ppjkpza5h6z23ma7x9lrpqsq5qxc0n8zfffs44njf086n7k4f", + "version": "2.7" }, "opengraph": { "path": "opengraph/tags/1.11.2", @@ -125,6 +125,12 @@ "sha256": "1byq8f5qkxxnhjc4dk1ab7h8vzcr01y1nid81wwj2k1i03z9llqa", "version": "1.3.5" }, + "simple-mastodon-verification": { + "path": "simple-mastodon-verification/tags/1.1.3", + "rev": "2998678", + "sha256": "0ikymrf21l86gpdcjfawadqg1nbfsm6gggcc1g2g553pjg277grz", + "version": "1.1.3" + }, "static-mail-sender-configurator": { "path": "static-mail-sender-configurator/tags/0.10.0", "rev": "2941521", @@ -138,10 +144,10 @@ "version": "1.2.3" }, "webp-converter-for-media": { - "path": "webp-converter-for-media/tags/5.11.4", - "rev": "2995294", - "sha256": "0grlszp00rw63psv21n70alapkw1pgaq8cp9c0b1klk50jcnnx8q", - "version": "5.11.4" + "path": "webp-converter-for-media/tags/5.11.5", + "rev": "3006520", + "sha256": "1mkfki9148w43r3h8afp1j8vkrljsch68y8l4m6i8w5jsjvb5c18", + "version": "5.11.5" }, "webp-express": { "path": "webp-express/tags/0.25.8", @@ -150,16 +156,16 @@ "version": "0.25.8" }, "wordpress-seo": { - "path": "wordpress-seo/tags/21.5", - "rev": "2986840", - "sha256": "1a1mnsh4imy7ab0b7hp0nis46ixwvj47wgibifa90qndbkv2mwsn", - "version": "21.5" + "path": "wordpress-seo/tags/21.7", + "rev": "3008568", + "sha256": "1iigdycbxhdzrprnajw54b1jjmp8akig72z9v78infaf2sjawmgh", + "version": "21.7" }, "worker": { - "path": "worker/tags/4.9.17", - "rev": "2894123", - "sha256": "067zx6b8fl87g901vglci870z38kg8igrdxlrcra4xwrll2c01si", - "version": "4.9.17" + "path": "worker/tags/4.9.18", + "rev": "3010154", + "sha256": "1wkkabw0g2c9bfqwqddjqrc13wwf39h508bb25cxwz2yi5fdhp9v", + "version": "4.9.18" }, "wp-change-email-sender": { "path": "wp-change-email-sender/trunk", @@ -180,22 +186,22 @@ "version": "2.0.22" }, "wp-mail-smtp": { - "path": "wp-mail-smtp/tags/3.10.0", - "rev": "2992136", - "sha256": "0py4ns4vsy9rpqq5gjyfc2p1lvf2gy28klw9ixkm6gdiim8pvl61", - "version": "3.10.0" + "path": "wp-mail-smtp/tags/3.11.0", + "rev": "3009463", + "sha256": "1vk6bdchqka5nmiakq9s8kj7psk2nq2yxln377bidqyqj0q9kqmk", + "version": "3.11.0" }, "wp-statistics": { - "path": "wp-statistics/tags/14.2", - "rev": "2976338", - "sha256": "0vcw6qp5w2whbpwcd9m0dpxf4ah0i7snygszp211lqg4g53qbyyv", - "version": "14.2" + "path": "wp-statistics/tags/14.3.2", + "rev": "3013471", + "sha256": "03iahbjnyyy1lxvxmfgzzzin0sfng0dyagx0q0bvfa9bqx4pi37h", + "version": "14.3.2" }, "wp-swiper": { "path": "wp-swiper/trunk", - "rev": "2978937", - "sha256": "0pn3l5v43hc572bym15pcdirq9n64mdgshacnr92hryq4vagyvzb", - "version": "1.0.34" + "rev": "3013138", + "sha256": "1h5l99m73z7fn0l5sa4qbdpi3r8nanvrbciix5756qj4qbzb51li", + "version": "1.1.0" }, "wp-user-avatars": { "path": "wp-user-avatars/trunk", @@ -204,9 +210,9 @@ "version": "1.4.1" }, "wpforms-lite": { - "path": "wpforms-lite/tags/1.8.4.1", - "rev": "2982999", - "sha256": "08yl41kxxdq36wcrypjrrbmckkpx464sqcarbk7pkzz83933z2pv", - "version": "1.8.4.1" + "path": "wpforms-lite/tags/1.8.5.3", + "rev": "3009465", + "sha256": "1xj4wn1zfdjqxh1h6k9xa316276k8n26nmgjfcapwss452qajwkm", + "version": "1.8.5.3" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index ebcf43c24b067..1850171243431 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -20,6 +20,7 @@ , "merge-minify-refresh" , "opengraph" , "simple-login-captcha" +, "simple-mastodon-verification" , "static-mail-sender-configurator" , "tc-custom-javascript" , "webp-converter-for-media" diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e561e854a7102..ec79b05c4f659 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4159,11 +4159,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.9"; + version = "21.1.10"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.9.tar.xz"; - sha256 = "0fjk9ggcrn96blq0bm80739yj23s3gjjjsc0nxk4jk0v07i7nsgz"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.10.tar.xz"; + sha256 = "1l0iaq83vbl9jr34sa7v7630c5bnp64drlw8yg6c6yn5xyib7c6f"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 6a2cfd52886ee..c7f54a0c0eccf 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.4.tar.xz mirror://xorg/individual/util/makedepend-1.0.8.tar.xz mirror://xorg/individual/util/util-macros-1.20.0.tar.xz mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz -mirror://xorg/individual/xserver/xorg-server-21.1.9.tar.xz +mirror://xorg/individual/xserver/xorg-server-21.1.10.tar.xz diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 9bfc745ff51a4..facde16677478 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "23.2.2"; + version = "23.2.3"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-n3wJONKkHpQf+gT5nDXl2yvNPuwDSv6NNdXIEKIusKg="; + sha256 = "sha256-652apyMsR0EsiDXsFal8V18DVjcmx4d1T/DAGb0H4wI="; }; depsBuildBuild = [ diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 6b655c63cd867..a215b7d771b85 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -1,7 +1,7 @@ { lib , buildNpmPackage , fetchFromGitHub -, python3 +, nodejs_18 , nixosTests , nix-update-script }: @@ -19,9 +19,7 @@ buildNpmPackage rec { npmDepsHash = "sha256-MXTKZNERxryt7L42dHxKx7XfXByNQ67oU+4FKTd0u4U="; - nativeBuildInputs = [ - python3 - ]; + nodejs = nodejs_18; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/shells/bash/bash-5.2-patches.nix b/pkgs/shells/bash/bash-5.2-patches.nix index e118f03e03000..3aa9f331d8bb1 100644 --- a/pkgs/shells/bash/bash-5.2-patches.nix +++ b/pkgs/shells/bash/bash-5.2-patches.nix @@ -16,4 +16,10 @@ patch: [ (patch "013" "1rkwpibd6j2ghppfhqsva2jm4kdni6b7jpdsxdps52643gc4yjq9") (patch "014" "09766vqqw4ffnmysm725v35qkhp1g9j4qgqag941xvq655pj9y9y") (patch "015" "12im449abnq5gaqjmdxr5i38kmp02fa8l8wffad3jryvd58r0wzg") +(patch "016" "05arb0hzmng03cr357lf6p8af0x2a1pznsd3psll03nibfy56n0m") +(patch "017" "129cvx4gfz8n23iw1lhbknbw86fyw6vh60jqj1wj3d5pr75wwj0w") +(patch "018" "105am94qxjc27gga4a8asvsi01090xwjfim3s16lafwjvm4xsha6") +(patch "019" "10njgv5mrc5rhsp5lvxcbm0pnzn59a8spi2nhdasifyl1a32cp1j") +(patch "020" "07f0wlmqjdfarp44w3gj9gdqbqm5x20rvlhpn34ngklmxcm2bz5n") +(patch "021" "1kahfqqalcwi4m73pg3ssz6lh0kcqsqax09myac7a15d2y0vhd43") ] diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 819e59d62dfc9..c90096ca5a3c1 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.28.4"; + version = "0.28.5"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-Yl/eRp+KRh9whSYjB3IK6vwtknWAicpYQ8/Rjjeef4s="; + hash = "sha256-mprwDx1SvvT96MR1YgLwIJaEHCknCkbJ9zq0HfNJy/Y="; }; - vendorHash = "sha256-pcvxIPyJwptYx5964NzR9LUJTld2JVA0zaSjGH5sz4E="; + vendorHash = "sha256-rR0mLO8jjhTPySQ/BTegNe9kd2DudULOuYBBB/P9K1s="; ldflags = [ "-s" diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 1fa5b9c6151ab..b756da0754ebc 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -135,7 +135,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.6.1"; + version = "3.6.4"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -145,7 +145,7 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-VUArtHymc52KuiXkF4CQW1zhvOCl4N0X3KkItbwLSbI="; + hash = "sha256-Dz9hDlgN4JL76ILIqnZiPs+Ruxb98FQyQebpDV1Lw5M="; }; # Fix FHS paths in tests @@ -156,6 +156,8 @@ let sed -i 's|L"/bin/echo"|L"${coreutils}/bin/echo"|' src/fish_tests.cpp sed -i 's|L"/bin/c"|L"${coreutils}/bin/c"|' src/fish_tests.cpp sed -i 's|L"/bin/ca"|L"${coreutils}/bin/ca"|' src/fish_tests.cpp + # disable flakey test + sed -i '/{TEST_GROUP("history_races"), history_tests_t::test_history_races},/d' src/fish_tests.cpp # tests/checks/cd.fish sed -i 's|/bin/pwd|${coreutils}/bin/pwd|' tests/checks/cd.fish diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index 52c4725114fa1..a9557d70c36c0 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -5,13 +5,13 @@ let in buildFishPlugin rec { pname = "fzf.fish"; - version = "10.1"; + version = "10.2"; src = fetchFromGitHub { owner = "PatrickF1"; repo = "fzf.fish"; rev = "v${version}"; - hash = "sha256-ivXa1S/HrXFzESsV0d9zIwQiuCOYNpa1tUrvA/b15yY="; + hash = "sha256-1/MLKkUHe4c9YLDrH+cnL+pLiSOSERbIZSM4FTG3wF0="; }; nativeCheckInputs = [ fzf fd unixtools.script procps ]; diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index e5b1bfb7c5436..9a7beef3968ff 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "5.2.7610"; + version = "5.3.5000"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YyMt1V9Utar849+HPGLGJc25PvV7Q2pJehpFOOxlraY="; + sha256 = "sha256-2TX1HgbW2C8Yvrk4fnv43SRxYoCxYMrgLgsut4lj7NY="; }; vendorHash = "sha256-qOItRqCIxoHigufI6b7j2VdBDo50qGDe+LAaccgDh5w="; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index bace4b422edfc..901ac8fc27466 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -22,7 +22,7 @@ }: let - version = "0.87.1"; + version = "0.88.1"; in rustPlatform.buildRustPackage { @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-lPfP0bnMTb+IQoWdf7oHaj96/l68Ic6OmB/Ur9Q65g8="; + hash = "sha256-UuKXonAEMX57pZwP37N1FuUtkRE+3xB6Oj30yxSpJk4="; }; - cargoHash = "sha256-2xc0IiPCmhFtVXWEpDpRny27/bJZAh/Ke9+LVsrcWF0="; + cargoHash = "sha256-oc2Coo5bwX6ASRhXJ4KtzDKhPLBe+ApIpTwsOznOASs="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 279edd1f6bcaa..571077a8d23ba 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -5,14 +5,18 @@ , pkg-config , IOKit , Foundation +, libclang , nix-update-script }: rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-rryKNRCf8i/jlqN5O6+UDvV5tDNxcVxS+KewCaIlZVM="; + cargoHash = "sha256-eGRaYbYB+zHT8rXm6aCrnPVgyDA8ltsg0GOYgghmov0="; + env = lib.optionalAttrs stdenv.cc.isClang { + LIBCLANG_PATH = "${libclang.lib}/lib"; + }; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ]; cargoBuildFlags = [ "--package nu_plugin_formats" ]; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 5e3a8186245fa..378a1a273ca88 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -5,14 +5,18 @@ , nushell , pkg-config , Security +, libclang , nix-update-script }: rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-9wUOKj6kMfXEFdYvVBqxme4MRkR6HORx+spTVT9t9VM="; + cargoHash = "sha256-Ar5rFPHf+ugZuugVKVRFACYhh3F0JvQtfp6KibPIByw="; + env = lib.optionalAttrs stdenv.cc.isClang { + LIBCLANG_PATH = "${libclang.lib}/lib"; + }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; cargoBuildFlags = [ "--package nu_plugin_gstat" ]; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 0994182305c47..f5f0bbd0acca0 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -4,14 +4,18 @@ , nushell , IOKit , CoreFoundation +, libclang , nix-update-script }: rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-HCGq0tvSNvWlZBD0Kn9H9qKFW+VgGON3z2ly3qaURSE="; + cargoHash = "sha256-NVdXbpmGBAcv47jbel2cccoe0m2FInSSOnMWofqtpiM="; + env = lib.optionalAttrs stdenv.cc.isClang { + LIBCLANG_PATH = "${libclang.lib}/lib"; + }; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; cargoBuildFlags = [ "--package nu_plugin_query" ]; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index fe4c25396845e..0160fc29b3be7 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { pname = "oil"; - version = "0.18.0"; + version = "0.19.0"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-ll4YmmP9A9EpnIyd4Pv8Ot8lrK/grsWzqgn6am9PIRE="; + hash = "sha256-iCoEFudFqxjYZerhOe7u6bPzN5EUOpwSpWCbTzUmF8U="; }; postPatch = '' diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index be67c6e14e35c..863265d27a73a 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,14 +5,14 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2023-06-26"; + version = "2023-11-29"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "8cbe98469d9862d37d43ca4229dc8e915ec377a9"; - sha256 = "sha256-/bFD1z/icQe4OfVcudMjIbkCh7MU6pEZiKBOYOFiCXs="; + rev = "418046e9583f635b0303e4b8cf31c356b175cec3"; + sha256 = "sha256-r36vF37J+3rLGg0QzmT4U8Lp5nqRhAs8We0aDtBJKJM="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index be1d69e3e2e3b..bc357be79bb81 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -1,10 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, pkgs, bash }: +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, gitstatus +, bash +}: let # match gitstatus version with given `gitstatus_version`: # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info - gitstatus = pkgs.gitstatus.overrideAttrs (oldAtttrs: rec { + gitstatus' = gitstatus.overrideAttrs (oldAtttrs: rec { version = "1.5.4"; src = fetchFromGitHub { @@ -32,7 +38,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./gitstatusd.patch; - gitstatusdPath = "${gitstatus}/bin/gitstatusd"; + gitstatusdPath = "${gitstatus'}/bin/gitstatusd"; }) ]; diff --git a/pkgs/shells/zsh/zsh-vi-mode/default.nix b/pkgs/shells/zsh/zsh-vi-mode/default.nix index 372dedcf5d876..42472625f13e8 100644 --- a/pkgs/shells/zsh/zsh-vi-mode/default.nix +++ b/pkgs/shells/zsh/zsh-vi-mode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-vi-mode"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "jeffreytse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QE6ZwwM2X0aPqNnbVrj0y7w9hmuRf0H1j8nXYwyoLo4="; + sha256 = "sha256-xbchXJTFWeABTwq6h4KWLh+EvydDrDzcY9AQVK65RS8="; }; strictDeps = true; @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.mit; description = "A better and friendly vi(vim) mode plugin for ZSH."; maintainers = with maintainers; [ kyleondy ]; + platforms = platforms.all; }; } diff --git a/pkgs/stdenv/darwin/fixed-xnu-python3.patch b/pkgs/stdenv/darwin/fixed-xnu-python3.patch deleted file mode 100644 index 9f29376187f4c..0000000000000 --- a/pkgs/stdenv/darwin/fixed-xnu-python3.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/bsd/kern/makekdebugevents.py b/bsd/kern/makekdebugevents.py -index 73b2db4..d354ba0 100755 ---- a/bsd/kern/makekdebugevents.py -+++ b/bsd/kern/makekdebugevents.py -@@ -5,7 +5,7 @@ - # named kd_events[] or these mappings. - # Required to generate a header file used by DEVELOPMENT and DEBUG kernels. - # -- -+ - import sys - import re - -@@ -21,18 +21,18 @@ code_table = [] - # scan file to generate internal table - with open(trace_code_file, 'rt') as codes: - for line in codes: -- m = id_name_pattern.match(line) -- if m: -+ m = id_name_pattern.match(line) -+ if m: - code_table += [(int(m.group(1),base=16), m.group(2))] - - # emit typedef: --print "typedef struct {" --print " uint32_t id;" --print " const char *name;" --print "} kd_event_t;" -+print("typedef struct {") -+print(" uint32_t id;") -+print(" const char *name;") -+print("} kd_event_t;") - # emit structure declaration and sorted initialization: --print "kd_event_t kd_events[] = {" -+print("kd_event_t kd_events[] = {") - for mapping in sorted(code_table, key=lambda x: x[0]): -- print " {0x%x, \"%s\"}," % mapping --print "};" -+ print(" {0x%x, \"%s\"}," % mapping) -+print("};") - diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 1324c78c5fd64..384567739d0e8 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -32,11 +32,16 @@ let cross = if crossSystem != null in with import pkgspath ({ inherit localSystem overlays; } // cross // custom-bootstrap); rec { - coreutils_ = coreutils.override (args: { + coreutils_ = (coreutils.override (args: { # We want coreutils without ACL support. aclSupport = false; # Cannot use a single binary build, or it gets dynamically linked against gmp. singleBinary = false; + })).overrideAttrs (oa: { + # Increase header size to be able to inject extra RPATHs. Otherwise + # x86_64-darwin build fails as: + # https://cache.nixos.org/log/g5wyq9xqshan6m3kl21bjn1z88hx48rh-stdenv-bootstrap-tools.drv + NIX_LDFLAGS = (oa.NIX_LDFLAGS or "") + " -headerpad_max_install_names"; }); cctools_ = darwin.cctools; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index f2d9233b6fddf..62a6cd8ef02e9 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -22,11 +22,15 @@ let optionals remove unknownModule + isAttrs + isString ; inherit (lib.lists) any toList + isList + elem ; # If we're in hydra, we can dispense with the more verbose error @@ -59,11 +63,15 @@ let hasLicense = attrs: attrs ? meta.license; - hasAllowlistedLicense = assert areLicenseListsValid; attrs: - hasLicense attrs && any (l: builtins.elem l allowlist) (toList attrs.meta.license); + hasListedLicense = assert areLicenseListsValid; list: attrs: + length list > 0 && hasLicense attrs && ( + if isList attrs.meta.license then any (l: elem l list) attrs.meta.license + else elem attrs.meta.license list + ); - hasBlocklistedLicense = assert areLicenseListsValid; attrs: - hasLicense attrs && any (l: builtins.elem l blocklist) (toList attrs.meta.license); + hasAllowlistedLicense = attrs: hasListedLicense allowlist attrs; + + hasBlocklistedLicense = attrs: hasListedLicense blocklist attrs; allowBroken = config.allowBroken || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; @@ -71,11 +79,16 @@ let allowUnsupportedSystem = config.allowUnsupportedSystem || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1"; - isUnfree = licenses: any (l: !l.free or true) licenses; + isUnfree = licenses: + if isAttrs licenses then !licenses.free or true + # TODO: Returning false in the case of a string is a bug that should be fixed. + # In a previous implementation of this function the function body + # was `licenses: lib.lists.any (l: !l.free or true) licenses;` + # which always evaluates to `!true` for strings. + else if isString licenses then false + else lib.lists.any (l: !l.free or true) licenses; - hasUnfreeLicense = attrs: - hasLicense attrs && - isUnfree (toList attrs.meta.license); + hasUnfreeLicense = attrs: hasLicense attrs && isUnfree attrs.meta.license; hasNoMaintainers = attrs: attrs ? meta.maintainers && (length attrs.meta.maintainers) == 0; @@ -479,16 +492,21 @@ let assertValidity = { meta, attrs }: let validity = checkValidity attrs; - in validity // { + inherit (validity) valid; + in validity // { # Throw an error if trying to evaluate a non-valid derivation # or, alternatively, just output a warning message. handled = - { - no = handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; }; - warn = handleEvalWarning { inherit meta attrs; } { inherit (validity) reason errormsg; }; - yes = true; - }.${validity.valid}; - + ( + if valid == "yes" then true + else if valid == "no" then ( + handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; } + ) + else if valid == "warn" then ( + handleEvalWarning { inherit meta attrs; } { inherit (validity) reason errormsg; } + ) + else throw "Unknown validitiy: '${valid}'" + ); }; in { inherit assertValidity commonMeta; } diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 37c10fb2957b1..081024781eeff 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1260,6 +1260,10 @@ configurePhase() { prependToVar configureFlags --disable-static fi fi + + if [ -z "${dontPatchShebangsInConfigure:-}" ]; then + patchShebangs --build "$configureScript" + fi fi if [ -n "$configureScript" ]; then @@ -1495,17 +1499,7 @@ distPhase() { showPhaseHeader() { local phase="$1" - case "$phase" in - unpackPhase) echo "unpacking sources";; - patchPhase) echo "patching sources";; - configurePhase) echo "configuring";; - buildPhase) echo "building";; - checkPhase) echo "running tests";; - installPhase) echo "installing";; - fixupPhase) echo "post-installation fixup";; - installCheckPhase) echo "running install tests";; - *) echo "$phase";; - esac + echo "Running phase: $phase" } diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 35cdb6311df32..d2f3cc31ca08a 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -89,9 +89,9 @@ else null) null (lib.attrNames archLookupTable); archLookupTable = table.${localSystem.libc} - or (abort "unsupported libc for the pure Linux stdenv"); + or (throw "unsupported libc for the pure Linux stdenv"); files = archLookupTable.${localSystem.system} or (if getCompatibleTools != null then getCompatibleTools - else (abort "unsupported platform for the pure Linux stdenv")); + else (throw "unsupported platform for the pure Linux stdenv")); in files }: diff --git a/pkgs/test/checkpointBuild/default.nix b/pkgs/test/checkpointBuild/default.nix new file mode 100644 index 0000000000000..4a59760230a6e --- /dev/null +++ b/pkgs/test/checkpointBuild/default.nix @@ -0,0 +1,57 @@ +{ hello, checkpointBuildTools, runCommandNoCC, texinfo, stdenv, rsync }: +let + baseHelloArtifacts = checkpointBuildTools.prepareCheckpointBuild hello; + patchedHello = hello.overrideAttrs (old: { + buildInputs = [ texinfo ]; + src = runCommandNoCC "patch-hello-src" { } '' + mkdir -p $out + cd $out + tar xf ${hello.src} --strip-components=1 + patch -p1 < ${./hello.patch} + ''; + }); + checkpointBuiltHello = checkpointBuildTools.mkCheckpointedBuild patchedHello baseHelloArtifacts; + + checkpointBuiltHelloWithCheck = checkpointBuiltHello.overrideAttrs (old: { + doCheck = true; + checkPhase = '' + echo "checking if unchanged source file is not recompiled" + [ "$(stat --format="%Y" lib/exitfail.o)" = "$(stat --format="%Y" ${baseHelloArtifacts}/outputs/lib/exitfail.o)" ] + ''; + }); + + baseHelloRemoveFileArtifacts = checkpointBuildTools.prepareCheckpointBuild (hello.overrideAttrs (old: { + patches = [ ./hello-additionalFile.patch ]; + })); + + preparedHelloRemoveFileSrc = runCommandNoCC "patch-hello-src" { } '' + mkdir -p $out + cd $out + tar xf ${hello.src} --strip-components=1 + patch -p1 < ${./hello-additionalFile.patch} + ''; + + patchedHelloRemoveFile = hello.overrideAttrs (old: { + buildInputs = [ texinfo ]; + src = runCommandNoCC "patch-hello-src" { } '' + mkdir -p $out + cd $out + ${rsync}/bin/rsync -cutU --chown=$USER:$USER --chmod=+w -r ${preparedHelloRemoveFileSrc}/* . + patch -p1 < ${./hello-removeFile.patch} + ''; + }); + + checkpointBuiltHelloWithRemovedFile = checkpointBuildTools.mkCheckpointedBuild patchedHelloRemoveFile baseHelloRemoveFileArtifacts; +in +stdenv.mkDerivation { + name = "patched-hello-returns-correct-output"; + buildCommand = '' + touch $out + + echo "testing output of hello binary" + [ "$(${checkpointBuiltHelloWithCheck}/bin/hello)" = "Hello, incremental world!" ] + echo "testing output of hello with removed file" + [ "$(${checkpointBuiltHelloWithRemovedFile}/bin/hello)" = "Hello, incremental world!" ] + ''; +} + diff --git a/pkgs/test/checkpointBuild/hello-additionalFile.patch b/pkgs/test/checkpointBuild/hello-additionalFile.patch new file mode 100644 index 0000000000000..345bc10ee49e5 --- /dev/null +++ b/pkgs/test/checkpointBuild/hello-additionalFile.patch @@ -0,0 +1,67 @@ +:100644 100644 0000000 0000000 M Makefile.in +:000000 100644 0000000 0000000 A src/additionalFile.c +:100644 100644 0000000 0000000 M src/hello.c +:100644 100644 0000000 0000000 M src/system.h + +diff --git a/Makefile.in b/Makefile.in +index 1597d39..f63f830 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -312,7 +312,7 @@ am_lib_libhello_a_OBJECTS = lib/basename-lgpl.$(OBJEXT) \ + lib/version-etc.$(OBJEXT) lib/version-etc-fsf.$(OBJEXT) \ + lib/wctype-h.$(OBJEXT) lib/xmalloc.$(OBJEXT) \ + lib/xalloc-die.$(OBJEXT) lib/xstriconv.$(OBJEXT) \ +- lib/xstrndup.$(OBJEXT) ++ lib/xstrndup.$(OBJEXT) src/additionalFile.$(OBJEXT) + lib_libhello_a_OBJECTS = $(am_lib_libhello_a_OBJECTS) + am_hello_OBJECTS = src/hello.$(OBJEXT) + hello_OBJECTS = $(am_hello_OBJECTS) +@@ -1842,7 +1842,7 @@ lib_libhello_a_SOURCES = lib/basename-lgpl.c lib/c-ctype.h \ + $(am__append_4) $(am__append_5) lib/version-etc.h \ + lib/version-etc.c lib/version-etc-fsf.c lib/wctype-h.c \ + lib/xmalloc.c lib/xalloc-die.c lib/xstriconv.h lib/xstriconv.c \ +- lib/xstrndup.h lib/xstrndup.c ++ lib/xstrndup.h lib/xstrndup.c src/additionalFile.c + lib_libhello_a_LIBADD = $(gl_LIBOBJS) + lib_libhello_a_DEPENDENCIES = $(gl_LIBOBJS) + EXTRA_lib_libhello_a_SOURCES = lib/close.c lib/stripslash.c lib/dup2.c \ +diff --git a/src/additionalFile.c b/src/additionalFile.c +new file mode 100644 +index 0000000..34d683d +--- /dev/null ++++ b/src/additionalFile.c +@@ -0,0 +1,6 @@ ++#include "config.h" ++#include "system.h" ++ ++int somefunc() { ++ return 0; ++} +diff --git a/src/hello.c b/src/hello.c +index 2e7d38e..a8e36dc 100644 +--- a/src/hello.c ++++ b/src/hello.c +@@ -146,7 +146,11 @@ main (int argc, char *argv[]) + #endif + + /* Having initialized gettext, get the default message. */ +- greeting_msg = _("Hello, world!"); ++ if (somefunc() == 0) { ++ greeting_msg = _("Hello, world!"); ++ } else { ++ greeting_msg = _("Hello, incremental world!"); ++ } + + /* Even exiting has subtleties. On exit, if any writes failed, change + the exit status. The /dev/full device on GNU/Linux can be used for +diff --git a/src/system.h b/src/system.h +index d39cdb9..dc425d2 100644 +--- a/src/system.h ++++ b/src/system.h +@@ -59,4 +59,6 @@ + } \ + while (0) + ++int somefunc(); ++ + #endif /* HELLO_SYSTEM_H */ diff --git a/pkgs/test/checkpointBuild/hello-removeFile.patch b/pkgs/test/checkpointBuild/hello-removeFile.patch new file mode 100644 index 0000000000000..2939790dabce1 --- /dev/null +++ b/pkgs/test/checkpointBuild/hello-removeFile.patch @@ -0,0 +1,67 @@ +:100644 100644 0000000 0000000 M Makefile.in +:100644 000000 0000000 0000000 D src/additionalFile.c +:100644 100644 0000000 0000000 M src/hello.c +:100755 100755 0000000 0000000 M tests/hello-1 + +diff --git a/Makefile.in b/Makefile.in +index f63f830..1597d39 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -312,7 +312,7 @@ am_lib_libhello_a_OBJECTS = lib/basename-lgpl.$(OBJEXT) \ + lib/version-etc.$(OBJEXT) lib/version-etc-fsf.$(OBJEXT) \ + lib/wctype-h.$(OBJEXT) lib/xmalloc.$(OBJEXT) \ + lib/xalloc-die.$(OBJEXT) lib/xstriconv.$(OBJEXT) \ +- lib/xstrndup.$(OBJEXT) src/additionalFile.$(OBJEXT) ++ lib/xstrndup.$(OBJEXT) + lib_libhello_a_OBJECTS = $(am_lib_libhello_a_OBJECTS) + am_hello_OBJECTS = src/hello.$(OBJEXT) + hello_OBJECTS = $(am_hello_OBJECTS) +@@ -1842,7 +1842,7 @@ lib_libhello_a_SOURCES = lib/basename-lgpl.c lib/c-ctype.h \ + $(am__append_4) $(am__append_5) lib/version-etc.h \ + lib/version-etc.c lib/version-etc-fsf.c lib/wctype-h.c \ + lib/xmalloc.c lib/xalloc-die.c lib/xstriconv.h lib/xstriconv.c \ +- lib/xstrndup.h lib/xstrndup.c src/additionalFile.c ++ lib/xstrndup.h lib/xstrndup.c + lib_libhello_a_LIBADD = $(gl_LIBOBJS) + lib_libhello_a_DEPENDENCIES = $(gl_LIBOBJS) + EXTRA_lib_libhello_a_SOURCES = lib/close.c lib/stripslash.c lib/dup2.c \ +diff --git a/src/additionalFile.c b/src/additionalFile.c +deleted file mode 100644 +index 34d683d..0000000 +--- a/src/additionalFile.c ++++ /dev/null +@@ -1,6 +0,0 @@ +-#include "config.h" +-#include "system.h" +- +-int somefunc() { +- return 0; +-} +diff --git a/src/hello.c b/src/hello.c +index a8e36dc..53722d9 100644 +--- a/src/hello.c ++++ b/src/hello.c +@@ -126,6 +126,10 @@ parse_options (int argc, char *argv[], const char **greeting_msg) + } + } + ++int somefunc() { ++ return 1; ++} ++ + int + main (int argc, char *argv[]) + { +diff --git a/tests/hello-1 b/tests/hello-1 +index 96ffef8..f0b9f8d 100755 +--- a/tests/hello-1 ++++ b/tests/hello-1 +@@ -21,7 +21,7 @@ export LANGUAGE LC_ALL LC_MESSAGES LANG + + tmpfiles="hello-test1.ok" + cat <<EOF > hello-test1.ok +-Hello, world! ++Hello, incremental world! + EOF + + tmpfiles="$tmpfiles hello-test1.out" diff --git a/pkgs/test/checkpointBuild/hello.patch b/pkgs/test/checkpointBuild/hello.patch new file mode 100644 index 0000000000000..3d0d50c2f20e4 --- /dev/null +++ b/pkgs/test/checkpointBuild/hello.patch @@ -0,0 +1,26 @@ +diff --git a/src/hello.c b/src/hello.c +index 182303c..453962f 100644 +--- a/src/hello.c ++++ b/src/hello.c +@@ -57,7 +57,7 @@ main (int argc, char *argv[]) + #endif + + /* Having initialized gettext, get the default message. */ +- greeting_msg = _("Hello, world!"); ++ greeting_msg = _("Hello, incremental world!"); + + /* Even exiting has subtleties. On exit, if any writes failed, change + the exit status. The /dev/full device on GNU/Linux can be used for +diff --git a/tests/hello-1 b/tests/hello-1 +index 3b7a815..e15fa95 100755 +--- a/tests/hello-1 ++++ b/tests/hello-1 +@@ -21,7 +21,7 @@ export LANGUAGE LC_ALL LC_MESSAGES LANG + + tmpfiles="hello-test1.ok" + cat <<EOF > hello-test1.ok +-Hello, world! ++Hello, incremental world! + EOF + + tmpfiles="$tmpfiles hello-test1.out" diff --git a/pkgs/test/cuda/cuda-library-samples/extension.nix b/pkgs/test/cuda/cuda-library-samples/extension.nix index 4c721a9e9e1bc..62de715fd0b4f 100644 --- a/pkgs/test/cuda/cuda-library-samples/extension.nix +++ b/pkgs/test/cuda/cuda-library-samples/extension.nix @@ -1,3 +1,14 @@ -final: prev: { - cuda-library-samples = final.callPackage ./generic.nix { }; -} +{hostPlatform, lib}: +let + # Samples are built around the CUDA Toolkit, which is not available for + # aarch64. Check for both CUDA version and platform. + platformIsSupported = hostPlatform.isx86_64; + + # Build our extension + extension = + final: _: + lib.attrsets.optionalAttrs platformIsSupported { + cuda-library-samples = final.callPackage ./generic.nix {}; + }; +in +extension diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix index e9a481c94a7a4..d4182536654e1 100644 --- a/pkgs/test/cuda/cuda-library-samples/generic.nix +++ b/pkgs/test/cuda/cuda-library-samples/generic.nix @@ -1,7 +1,11 @@ -{ lib, backendStdenv, fetchFromGitHub -, cmake, addOpenGLRunpath -, cudatoolkit -, cutensor +{ + lib, + backendStdenv, + fetchFromGitHub, + cmake, + addOpenGLRunpath, + cudatoolkit, + cutensor, }: let @@ -14,8 +18,11 @@ let }; commonAttrs = { version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version; - nativeBuildInputs = [ cmake addOpenGLRunpath ]; - buildInputs = [ cudatoolkit ]; + nativeBuildInputs = [ + cmake + addOpenGLRunpath + ]; + buildInputs = [cudatoolkit]; postFixup = '' for exe in $out/bin/*; do addOpenGLRunpath $exe @@ -29,43 +36,50 @@ let cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG. ''; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; + maintainers = with lib.maintainers; [obsidian-systems-maintenance] ++ lib.teams.cuda.members; }; }; in { - cublas = backendStdenv.mkDerivation (commonAttrs // { - pname = "cuda-library-samples-cublas"; + cublas = backendStdenv.mkDerivation ( + commonAttrs + // { + pname = "cuda-library-samples-cublas"; - src = "${src}/cuBLASLt"; - }); + src = "${src}/cuBLASLt"; + } + ); - cusolver = backendStdenv.mkDerivation (commonAttrs // { - pname = "cuda-library-samples-cusolver"; + cusolver = backendStdenv.mkDerivation ( + commonAttrs + // { + pname = "cuda-library-samples-cusolver"; - src = "${src}/cuSOLVER"; + src = "${src}/cuSOLVER"; - sourceRoot = "cuSOLVER/gesv"; - }); + sourceRoot = "cuSOLVER/gesv"; + } + ); - cutensor = backendStdenv.mkDerivation (commonAttrs // { - pname = "cuda-library-samples-cutensor"; + cutensor = backendStdenv.mkDerivation ( + commonAttrs + // { + pname = "cuda-library-samples-cutensor"; - src = "${src}/cuTENSOR"; + src = "${src}/cuTENSOR"; - buildInputs = [ cutensor ]; + buildInputs = [cutensor]; - cmakeFlags = [ - "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin" - ]; + cmakeFlags = ["-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin"]; - # CUTENSOR_ROOT is double escaped - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "\''${CUTENSOR_ROOT}/include" "${cutensor.dev}/include" - ''; + # CUTENSOR_ROOT is double escaped + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${CUTENSOR_ROOT}/include" "${cutensor.dev}/include" + ''; - CUTENSOR_ROOT = cutensor; - }); + CUTENSOR_ROOT = cutensor; + } + ); } diff --git a/pkgs/test/cuda/cuda-samples/extension.nix b/pkgs/test/cuda/cuda-samples/extension.nix index 664349416b713..d41da90cd5d0e 100644 --- a/pkgs/test/cuda/cuda-samples/extension.nix +++ b/pkgs/test/cuda/cuda-samples/extension.nix @@ -1,14 +1,18 @@ -final: prev: let - - sha256 = { - "10.0" = "1zvh4xsdyc59m87brpcmssxsjlp9dkynh4asnkcmc3g94f53l0jw"; - "10.1" = "1s8ka0hznrni36ajhzf2gqpdrl8kd8fi047qijxks5l2abc093qd"; - "10.2" = "01p1innzgh9siacpld6nsqimj8jkg93rk4gj8q4crn62pa5vhd94"; - "11.0" = "1n3vjc8c7zdig2xgl5fppavrphqzhdiv9m9nk6smh4f99fwi0705"; - "11.1" = "1kjixk50i8y1bkiwbdn5lkv342crvkmbvy1xl5j3lsa1ica21kwh"; - "11.2" = "1p1qjvfbm28l933mmnln02rqrf0cy9kbpsyb488d1haiqzvrazl1"; - "11.3" = "0kbibb6pgz8j5iq6284axcnmycaha9bw8qlmdp6yfwmnahq1v0yz"; - "11.4" = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk"; +{ + cudaVersion, + hostPlatform, + lib, +}: +let + cudaVersionToHash = { + "10.0" = "sha256-XAI6iiPpDVbZtFoRaP1s6VKpu9aV3bwOqqkw33QncP8="; + "10.1" = "sha256-DY8E2FKCFj27jPgQEB1qE9HcLn7CfSiVGdFm+yFQE+k="; + "10.2" = "sha256-JDW4i7rC2MwIRvKRmUd6UyJZI9bWNHqZijrB962N4QY="; + "11.0" = "sha256-BRwQuUvJEVi1mTbVtGODH8Obt7rXFfq6eLH9wxCTe9g="; + "11.1" = "sha256-kM8gFItBaTpkoT34vercmQky9qTFtsXjXMGjCMrsUc4="; + "11.2" = "sha256-gX6V98dRwdAQIsvru2byDLiMswCW2lrHSBSJutyWONw="; + "11.3" = "sha256-34MdMFS2cufNbZVixFdSUDFfLeuKIGFwLBL9d81acU0="; + "11.4" = "sha256-Ewu+Qk6GtGXC37CCn1ZXHc0MQAuyXCGf3J6T4cucTSA="; "11.5" = "sha256-AKRZbke0K59lakhTi8dX2cR2aBuWPZkiQxyKaZTvHrI="; "11.6" = "sha256-AsLNmAplfuQbXg9zt09tXAuFJ524EtTYsQuUlV1tPkE="; # The tag 11.7 of cuda-samples does not exist @@ -16,10 +20,23 @@ final: prev: let "12.0" = "sha256-Lj2kbdVFrJo5xPYPMiE4BS7Z8gpU5JLKXVJhZABUe/g="; "12.1" = "sha256-xE0luOMq46zVsIEWwK4xjLs7NorcTIi9gbfZPVjIlqo="; "12.2" = "sha256-pOy0qfDjA/Nr0T9PNKKefK/63gQnJV2MQsN2g3S2yng="; + "12.3" = "sha256-fjVp0G6uRCWxsfe+gOwWTN+esZfk0O5uxS623u0REAk="; }; -in prev.lib.attrsets.optionalAttrs (builtins.hasAttr prev.cudaVersion sha256) { - cuda-samples = final.callPackage ./generic.nix { - sha256 = sha256.${prev.cudaVersion}; - }; -} + # Samples are built around the CUDA Toolkit, which is not available for + # aarch64. Check for both CUDA version and platform. + cudaVersionIsSupported = cudaVersionToHash ? ${cudaVersion}; + platformIsSupported = hostPlatform.isx86_64; + isSupported = cudaVersionIsSupported && platformIsSupported; + + # Build our extension + extension = + final: _: + lib.attrsets.optionalAttrs isSupported { + cuda-samples = final.callPackage ./generic.nix { + inherit cudaVersion; + hash = cudaVersionToHash.${cudaVersion}; + }; + }; +in +extension diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index e690f32959f2a..fb3d7cc99da95 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -1,70 +1,79 @@ -{ autoAddOpenGLRunpathHook -, backendStdenv -, cmake -, cudatoolkit -, cudaVersion -, fetchFromGitHub -, fetchpatch -, freeimage -, glfw3 -, lib -, pkg-config -, sha256 +{ + autoAddOpenGLRunpathHook, + backendStdenv, + cmake, + cudatoolkit, + cudaVersion, + fetchFromGitHub, + fetchpatch, + freeimage, + glfw3, + hash, + lib, + pkg-config, }: -backendStdenv.mkDerivation (finalAttrs: { - pname = "cuda-samples"; - version = cudaVersion; +let + inherit (lib) lists strings; +in +backendStdenv.mkDerivation ( + finalAttrs: { + strictDeps = true; - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = finalAttrs.pname; - rev = "v${finalAttrs.version}"; - inherit sha256; - }; + pname = "cuda-samples"; + version = cudaVersion; - nativeBuildInputs = [ - pkg-config - autoAddOpenGLRunpathHook - glfw3 - freeimage - ] - # CMake has to run as a native, build-time dependency for libNVVM samples. - ++ lib.lists.optionals (lib.strings.versionAtLeast finalAttrs.version "12.2") [ - cmake - ]; + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + inherit hash; + }; - # CMake is not the primary build tool -- that's still make. - # As such, we disable CMake's build system. - dontUseCmakeConfigure = true; + nativeBuildInputs = + [ + autoAddOpenGLRunpathHook + pkg-config + ] + # CMake has to run as a native, build-time dependency for libNVVM samples. + # However, it's not the primary build tool -- that's still make. + # As such, we disable CMake's build system. + ++ lists.optionals (strings.versionAtLeast finalAttrs.version "12.2") [cmake]; - buildInputs = [ cudatoolkit ]; + dontUseCmakeConfigure = true; - # See https://github.com/NVIDIA/cuda-samples/issues/75. - patches = lib.optionals (finalAttrs.version == "11.3") [ - (fetchpatch { - url = "https://github.com/NVIDIA/cuda-samples/commit/5c3ec60faeb7a3c4ad9372c99114d7bb922fda8d.patch"; - sha256 = "sha256-0XxdmNK9MPpHwv8+qECJTvXGlFxc+fIbta4ynYprfpU="; - }) - ]; + buildInputs = [ + cudatoolkit + freeimage + glfw3 + ]; - enableParallelBuilding = true; + # See https://github.com/NVIDIA/cuda-samples/issues/75. + patches = lib.optionals (finalAttrs.version == "11.3") [ + (fetchpatch { + url = "https://github.com/NVIDIA/cuda-samples/commit/5c3ec60faeb7a3c4ad9372c99114d7bb922fda8d.patch"; + hash = "sha256-0XxdmNK9MPpHwv8+qECJTvXGlFxc+fIbta4ynYprfpU="; + }) + ]; - preConfigure = '' - export CUDA_PATH=${cudatoolkit} - ''; + enableParallelBuilding = true; - installPhase = '' - runHook preInstall + preConfigure = '' + export CUDA_PATH=${cudatoolkit} + ''; - install -Dm755 -t $out/bin bin/${backendStdenv.hostPlatform.parsed.cpu.name}/${backendStdenv.hostPlatform.parsed.kernel.name}/release/* + installPhase = '' + runHook preInstall - runHook postInstall - ''; + install -Dm755 -t $out/bin bin/${backendStdenv.hostPlatform.parsed.cpu.name}/${backendStdenv.hostPlatform.parsed.kernel.name}/release/* - meta = { - description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit"; - # CUDA itself is proprietary, but these sample apps are not. - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members; - }; -}) + runHook postInstall + ''; + + meta = { + description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit"; + # CUDA itself is proprietary, but these sample apps are not. + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [obsidian-systems-maintenance] ++ lib.teams.cuda.members; + }; + } +) diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix index c7b790e35e259..8431e4b9207db 100644 --- a/pkgs/test/cuda/default.nix +++ b/pkgs/test/cuda/default.nix @@ -1,7 +1,7 @@ -{ callPackage }: +{callPackage}: rec { - cuda-samplesPackages = callPackage ./cuda-samples/generic.nix { }; + cuda-samplesPackages = callPackage ./cuda-samples/generic.nix {}; inherit (cuda-samplesPackages) cuda-samples_cudatoolkit_10 cuda-samples_cudatoolkit_10_0 @@ -12,9 +12,10 @@ rec { cuda-samples_cudatoolkit_11_1 cuda-samples_cudatoolkit_11_2 cuda-samples_cudatoolkit_11_3 - cuda-samples_cudatoolkit_11_4; + cuda-samples_cudatoolkit_11_4 + ; - cuda-library-samplesPackages = callPackage ./cuda-library-samples/generic.nix { }; + cuda-library-samplesPackages = callPackage ./cuda-library-samples/generic.nix {}; inherit (cuda-library-samplesPackages) cuda-library-samples_cudatoolkit_10 cuda-library-samples_cudatoolkit_10_1 @@ -24,5 +25,8 @@ rec { cuda-library-samples_cudatoolkit_11_1 cuda-library-samples_cudatoolkit_11_2 cuda-library-samples_cudatoolkit_11_3 - cuda-library-samples_cudatoolkit_11_4; + cuda-library-samples_cudatoolkit_11_4 + ; + + __attrsFailEvaluation = true; } diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 9543e165a8053..1459e9c310da9 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -63,12 +63,8 @@ with pkgs; # libcxxStdenv broken # fix in https://github.com/NixOS/nixpkgs/pull/216273 - ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ - # libcxx does not build for some reason on aarch64-linux - (filterAttrs (n: _: n != "llvmPackages_7")) ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ (filterAttrs (n: _: n != "llvmPackages_6")) - (filterAttrs (n: _: n != "llvmPackages_7")) (filterAttrs (n: _: n != "llvmPackages_8")) (filterAttrs (n: _: n != "llvmPackages_9")) (filterAttrs (n: _: n != "llvmPackages_10")) @@ -117,17 +113,19 @@ with pkgs; install-shell-files = callPackage ./install-shell-files {}; + checkpoint-build = callPackage ./checkpointBuild {}; + kernel-config = callPackage ./kernel.nix {}; ld-library-path = callPackage ./ld-library-path {}; macOSSierraShared = callPackage ./macos-sierra-shared {}; - cross = callPackage ./cross {}; + cross = callPackage ./cross {} // { __attrsFailEvaluation = true; }; php = recurseIntoAttrs (callPackages ./php {}); - pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { }); + pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { }) // { __recurseIntoDerivationForReleaseJobs = true; }; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { }; diff --git a/pkgs/test/nixpkgs-check-by-name/README.md b/pkgs/test/nixpkgs-check-by-name/README.md index 146cea0a64ba1..19865ca0952b5 100644 --- a/pkgs/test/nixpkgs-check-by-name/README.md +++ b/pkgs/test/nixpkgs-check-by-name/README.md @@ -4,27 +4,14 @@ This directory implements a program to check the [validity](#validity-checks) of It is being used by [this GitHub Actions workflow](../../../.github/workflows/check-by-name.yml). This is part of the implementation of [RFC 140](https://github.com/NixOS/rfcs/pull/140). -## API +## Interface -This API may be changed over time if the CI workflow making use of it is adjusted to deal with the change appropriately. - -- Command line: `nixpkgs-check-by-name <NIXPKGS>` -- Arguments: - - `<NIXPKGS>`: The path to the Nixpkgs to check - - `--version <VERSION>`: The version of the checks to perform. - - Possible values: - - `v0` (default) - - `v1` +The interface of the tool is shown with `--help`: +``` +cargo run -- --help +``` - See [validation](#validity-checks) for the differences. -- Exit code: - - `0`: If the [validation](#validity-checks) is successful - - `1`: If the [validation](#validity-checks) is not successful - - `2`: If an unexpected I/O error occurs -- Standard error: - - Informative messages - - Detected problems if validation is not successful +The interface may be changed over time only if the CI workflow making use of it is adjusted to deal with the change appropriately. ## Validity checks @@ -32,7 +19,7 @@ These checks are performed by this tool: ### File structure checks - `pkgs/by-name` must only contain subdirectories of the form `${shard}/${name}`, called _package directories_. -- The `name`'s of package directories must be unique when lowercased +- The `name`'s of package directories must be unique when lowercased. - `name` is a string only consisting of the ASCII characters `a-z`, `A-Z`, `0-9`, `-` or `_`. - `shard` is the lowercased first two letters of `name`, expressed in Nix: `shard = toLower (substring 0 2 name)`. - Each package directory must contain a `package.nix` file and may contain arbitrary other files. @@ -41,9 +28,21 @@ These checks are performed by this tool: - Each package directory must not refer to files outside itself using symlinks or Nix path expressions. ### Nix evaluation checks -- `pkgs.${name}` is defined as `callPackage pkgs/by-name/${shard}/${name}/package.nix args` for some `args`. - - **Only after --version v1**: If `pkgs.${name}` is not auto-called from `pkgs/by-name`, `args` must not be empty -- `pkgs.lib.isDerivation pkgs.${name}` is `true`. +- For each package directory, the `pkgs.${name}` attribute must be defined as `callPackage pkgs/by-name/${shard}/${name}/package.nix args` for some `args`. +- For each package directory, `pkgs.lib.isDerivation pkgs.${name}` must be `true`. + +### Ratchet checks + +Furthermore, this tool implements certain [ratchet](https://qntm.org/ratchet) checks. +This allows gradually phasing out deprecated patterns without breaking the base branch or having to migrate it all at once. +It works by not allowing new instances of the pattern to be introduced, but allowing already existing instances. +The existing instances are coming from `<BASE_NIXPKGS>`, which is then checked against `<NIXPKGS>` for new instances. +Ratchets should be removed eventually once the pattern is not used anymore. + +The current ratchets are: + +- New manual definitions of `pkgs.${name}` (e.g. in `pkgs/top-level/all-packages.nix`) with `args = { }` + (see [nix evaluation checks](#nix-evaluation-checks)) must not be introduced. ## Development @@ -86,6 +85,10 @@ Tests are declared in [`./tests`](./tests) as subdirectories imitating Nixpkgs w allowing the simulation of package overrides to the real [`pkgs/top-level/all-packages.nix`](../../top-level/all-packages.nix`). The default is an empty overlay. +- `base` (optional): + Contains another subdirectory imitating Nixpkgs with potentially any of the above structures. + This is used for [ratchet checks](#ratchet-checks). + - `expected` (optional): A file containing the expected standard output. The default is expecting an empty standard output. diff --git a/pkgs/test/nixpkgs-check-by-name/scripts/README.md b/pkgs/test/nixpkgs-check-by-name/scripts/README.md new file mode 100644 index 0000000000000..41b3012b7d953 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/scripts/README.md @@ -0,0 +1,26 @@ +# CI-related Scripts + +This directory contains scripts used and related to the CI running the `pkgs/by-name` checks in Nixpkgs. See also the [CI GitHub Action](../../../../.github/workflows/check-by-name.yml). + +## `./run-local.sh BASE_BRANCH [REPOSITORY]` + +Runs the `pkgs/by-name` check on the HEAD commit, closely matching what CI does. + +Note that this can't do exactly the same as CI, +because CI needs to rely on GitHub's server-side Git history to compute the mergeability of PRs before the check can be started. +In turn when running locally, we don't want to have to push commits to test them, +and we can also rely on the local Git history to do the mergeability check. + +Arguments: +- `BASE_BRANCH`: The base branch to use, e.g. master or release-23.11 +- `REPOSITORY`: The repository to fetch the base branch from, defaults to https://github.com/NixOS/nixpkgs.git + +## `./fetch-tool.sh BASE_BRANCH OUTPUT_PATH` + +Fetches the Hydra-prebuilt nixpkgs-check-by-name to use from the NixOS channel corresponding to the given base branch. + +This script is used both by [`./run-local.sh`](#run-local-sh-base-branch-repository) and CI. + +Arguments: +- `BASE_BRANCH`: The base branch to use, e.g. master or release-23.11 +- `OUTPUT_PATH`: The output symlink path for the tool diff --git a/pkgs/test/nixpkgs-check-by-name/scripts/fetch-tool.sh b/pkgs/test/nixpkgs-check-by-name/scripts/fetch-tool.sh new file mode 100755 index 0000000000000..19a48b6fb1fd5 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/scripts/fetch-tool.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env bash +# Fetches the prebuilt nixpkgs-check-by-name to use from +# the NixOS channel corresponding to the given base branch + +set -o pipefail -o errexit -o nounset + +trace() { echo >&2 "$@"; } + +if (( $# < 2 )); then + trace "Usage: $0 BASE_BRANCH OUTPUT_PATH" + trace "BASE_BRANCH: The base branch to use, e.g. master or release-23.11" + trace "OUTPUT_PATH: The output symlink path for the tool" + exit 1 +fi +baseBranch=$1 +output=$2 + +trace -n "Determining the channel to use for PR base branch $baseBranch.. " +if [[ "$baseBranch" =~ ^(release|staging|staging-next)-([0-9][0-9]\.[0-9][0-9])$ ]]; then + # Use the release channel for all PRs to release-XX.YY, staging-XX.YY and staging-next-XX.YY + preferredChannel=nixos-${BASH_REMATCH[2]} +else + # Use the nixos-unstable channel for all other PRs + preferredChannel=nixos-unstable +fi + +# Check that the channel exists. It doesn't exist for fresh release branches +if curl -fSs "https://channels.nixos.org/$preferredChannel"; then + channel=$preferredChannel + trace "$channel" +else + # Fall back to nixos-unstable, makes sense for fresh release branches + channel=nixos-unstable + trace -e "\e[33mWarning: Preferred channel $preferredChannel could not be fetched, using fallback: $channel\e[0m" +fi + +trace -n "Fetching latest version of channel $channel.. " +# This is probably the easiest way to get Nix to output the path to a downloaded channel! +nixpkgs=$(nix-instantiate --find-file nixpkgs -I nixpkgs=channel:"$channel") +trace "$nixpkgs" + +# This file only exists in channels +trace -e "Git revision of channel $channel is \e[34m$(<"$nixpkgs/.git-revision")\e[0m" + +trace -n "Fetching the prebuilt version of nixpkgs-check-by-name.. " +nix-build -o "$output" "$nixpkgs" -A tests.nixpkgs-check-by-name -j 0 >/dev/null +realpath "$output" >&2 diff --git a/pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh b/pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh new file mode 100755 index 0000000000000..72d3e8dc3de39 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh @@ -0,0 +1,67 @@ +#!/usr/bin/env bash + +set -o pipefail -o errexit -o nounset + +trace() { echo >&2 "$@"; } + +tmp=$(mktemp -d) +cleanup() { + # Don't exit early if anything fails to cleanup + set +o errexit + + trace -n "Cleaning up.. " + + [[ -e "$tmp/base" ]] && git worktree remove --force "$tmp/base" + [[ -e "$tmp/merged" ]] && git worktree remove --force "$tmp/merged" + + rm -rf "$tmp" + + trace "Done" +} +trap cleanup exit + + +repo=https://github.com/NixOS/nixpkgs.git + +if (( $# != 0 )); then + baseBranch=$1 + shift +else + trace "Usage: $0 BASE_BRANCH [REPOSITORY]" + trace "BASE_BRANCH: The base branch to use, e.g. master or release-23.11" + trace "REPOSITORY: The repository to fetch the base branch from, defaults to $repo" + exit 1 +fi + +if (( $# != 0 )); then + repo=$1 + shift +fi + +if [[ -n "$(git status --porcelain)" ]]; then + trace -e "\e[33mWarning: Dirty tree, uncommitted changes won't be taken into account\e[0m" +fi +headSha=$(git rev-parse HEAD) +trace -e "Using HEAD commit \e[34m$headSha\e[0m" + +trace -n "Creating Git worktree for the HEAD commit in $tmp/merged.. " +git worktree add --detach -q "$tmp/merged" HEAD +trace "Done" + +trace -n "Fetching base branch $baseBranch to compare against.. " +git fetch -q "$repo" refs/heads/"$baseBranch" +baseSha=$(git rev-parse FETCH_HEAD) +trace -e "\e[34m$baseSha\e[0m" + +trace -n "Creating Git worktree for the base branch in $tmp/base.. " +git worktree add -q "$tmp/base" "$baseSha" +trace "Done" + +trace -n "Merging base branch into the HEAD commit in $tmp/merged.. " +git -C "$tmp/merged" merge -q --no-edit "$baseSha" +trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m" + +"$tmp/merged/pkgs/test/nixpkgs-check-by-name/scripts/fetch-tool.sh" "$baseBranch" "$tmp/tool" + +trace "Running nixpkgs-check-by-name.." +"$tmp/tool/bin/nixpkgs-check-by-name" --base "$tmp/base" "$tmp/merged" diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.rs b/pkgs/test/nixpkgs-check-by-name/src/eval.rs index 161d013374e7f..cd8c70472cf25 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.rs @@ -1,7 +1,7 @@ use crate::nixpkgs_problem::NixpkgsProblem; +use crate::ratchet; use crate::structure; use crate::validation::{self, Validation::Success}; -use crate::Version; use std::path::Path; use anyhow::Context; @@ -39,11 +39,10 @@ enum AttributeVariant { /// of the form `callPackage <package_file> { ... }`. /// See the `eval.nix` file for how this is achieved on the Nix side pub fn check_values( - version: Version, nixpkgs_path: &Path, package_names: Vec<String>, - eval_accessible_paths: Vec<&Path>, -) -> validation::Result<()> { + eval_accessible_paths: &[&Path], +) -> validation::Result<ratchet::Nixpkgs> { // Write the list of packages we need to check into a temporary JSON file. // This can then get read by the Nix evaluation. let attrs_file = NamedTempFile::new().context("Failed to create a temporary file")?; @@ -110,47 +109,58 @@ pub fn check_values( String::from_utf8_lossy(&result.stdout) ))?; - Ok(validation::sequence_(package_names.iter().map( - |package_name| { - let relative_package_file = structure::relative_file_for_package(package_name); + Ok( + validation::sequence(package_names.into_iter().map(|package_name| { + let relative_package_file = structure::relative_file_for_package(&package_name); let absolute_package_file = nixpkgs_path.join(&relative_package_file); - if let Some(attribute_info) = actual_files.get(package_name) { - let valid = match &attribute_info.variant { - AttributeVariant::AutoCalled => true, + if let Some(attribute_info) = actual_files.get(&package_name) { + let check_result = if !attribute_info.is_derivation { + NixpkgsProblem::NonDerivation { + relative_package_file: relative_package_file.clone(), + package_name: package_name.clone(), + } + .into() + } else { + Success(()) + }; + + let check_result = check_result.and(match &attribute_info.variant { + AttributeVariant::AutoCalled => Success(ratchet::Package { + empty_non_auto_called: ratchet::EmptyNonAutoCalled::Valid, + }), AttributeVariant::CallPackage { path, empty_arg } => { let correct_file = if let Some(call_package_path) = path { absolute_package_file == *call_package_path } else { false }; - // Only check for the argument to be non-empty if the version is V1 or - // higher - let non_empty = if version >= Version::V1 { - !empty_arg - } else { - true - }; - correct_file && non_empty - } - AttributeVariant::Other => false, - }; - if !valid { - NixpkgsProblem::WrongCallPackage { - relative_package_file: relative_package_file.clone(), - package_name: package_name.clone(), + if correct_file { + Success(ratchet::Package { + // Empty arguments for non-auto-called packages are not allowed anymore. + empty_non_auto_called: if *empty_arg { + ratchet::EmptyNonAutoCalled::Invalid + } else { + ratchet::EmptyNonAutoCalled::Valid + }, + }) + } else { + NixpkgsProblem::WrongCallPackage { + relative_package_file: relative_package_file.clone(), + package_name: package_name.clone(), + } + .into() + } } - .into() - } else if !attribute_info.is_derivation { - NixpkgsProblem::NonDerivation { + AttributeVariant::Other => NixpkgsProblem::WrongCallPackage { relative_package_file: relative_package_file.clone(), package_name: package_name.clone(), } - .into() - } else { - Success(()) - } + .into(), + }); + + check_result.map(|value| (package_name.clone(), value)) } else { NixpkgsProblem::UndefinedAttr { relative_package_file: relative_package_file.clone(), @@ -158,6 +168,9 @@ pub fn check_values( } .into() } - }, - ))) + })) + .map(|elems| ratchet::Nixpkgs { + packages: elems.into_iter().collect(), + }), + ) } diff --git a/pkgs/test/nixpkgs-check-by-name/src/main.rs b/pkgs/test/nixpkgs-check-by-name/src/main.rs index 4cabf8f446f56..18c950d0a6eb0 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/main.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/main.rs @@ -1,5 +1,6 @@ mod eval; mod nixpkgs_problem; +mod ratchet; mod references; mod structure; mod utils; @@ -9,37 +10,43 @@ use crate::structure::check_structure; use crate::validation::Validation::Failure; use crate::validation::Validation::Success; use anyhow::Context; -use clap::{Parser, ValueEnum}; +use clap::Parser; use colored::Colorize; use std::io; use std::path::{Path, PathBuf}; use std::process::ExitCode; /// Program to check the validity of pkgs/by-name +/// +/// This CLI interface may be changed over time if the CI workflow making use of +/// it is adjusted to deal with the change appropriately. +/// +/// Exit code: +/// - `0`: If the validation is successful +/// - `1`: If the validation is not successful +/// - `2`: If an unexpected I/O error occurs +/// +/// Standard error: +/// - Informative messages +/// - Detected problems if validation is not successful #[derive(Parser, Debug)] -#[command(about)] +#[command(about, verbatim_doc_comment)] pub struct Args { - /// Path to nixpkgs + /// Path to the main Nixpkgs to check. + /// For PRs, this should be set to a checkout of the PR branch. nixpkgs: PathBuf, - /// The version of the checks - /// Increasing this may cause failures for a Nixpkgs that succeeded before - /// TODO: Remove default once Nixpkgs CI passes this argument - #[arg(long, value_enum, default_value_t = Version::V0)] - version: Version, -} -/// The version of the checks -#[derive(Debug, Clone, PartialEq, PartialOrd, ValueEnum)] -pub enum Version { - /// Initial version - V0, - /// Empty argument check - V1, + /// Path to the base Nixpkgs to run ratchet checks against. + /// For PRs, this should be set to a checkout of the PRs base branch. + /// If not specified, no ratchet checks will be performed. + /// However, this flag will become required once CI uses it. + #[arg(long)] + base: Option<PathBuf>, } fn main() -> ExitCode { let args = Args::parse(); - match check_nixpkgs(&args.nixpkgs, args.version, vec![], &mut io::stderr()) { + match process(args.base.as_deref(), &args.nixpkgs, &[], &mut io::stderr()) { Ok(true) => { eprintln!("{}", "Validated successfully".green()); ExitCode::SUCCESS @@ -55,10 +62,11 @@ fn main() -> ExitCode { } } -/// Checks whether the pkgs/by-name structure in Nixpkgs is valid. +/// Does the actual work. This is the abstraction used both by `main` and the tests. /// /// # Arguments -/// - `nixpkgs_path`: The path to the Nixpkgs to check +/// - `base_nixpkgs`: Path to the base Nixpkgs to run ratchet checks against. +/// - `main_nixpkgs`: Path to the main Nixpkgs to check. /// - `eval_accessible_paths`: /// Extra paths that need to be accessible to evaluate Nixpkgs using `restrict-eval`. /// This is used to allow the tests to access the mock-nixpkgs.nix file @@ -68,33 +76,30 @@ fn main() -> ExitCode { /// - `Err(e)` if an I/O-related error `e` occurred. /// - `Ok(false)` if there are problems, all of which will be written to `error_writer`. /// - `Ok(true)` if there are no problems -pub fn check_nixpkgs<W: io::Write>( - nixpkgs_path: &Path, - version: Version, - eval_accessible_paths: Vec<&Path>, +pub fn process<W: io::Write>( + base_nixpkgs: Option<&Path>, + main_nixpkgs: &Path, + eval_accessible_paths: &[&Path], error_writer: &mut W, ) -> anyhow::Result<bool> { - let nixpkgs_path = nixpkgs_path.canonicalize().context(format!( - "Nixpkgs path {} could not be resolved", - nixpkgs_path.display() - ))?; - - let check_result = if !nixpkgs_path.join(utils::BASE_SUBPATH).exists() { - eprintln!( - "Given Nixpkgs path does not contain a {} subdirectory, no check necessary.", - utils::BASE_SUBPATH - ); - Success(()) - } else { - match check_structure(&nixpkgs_path)? { - Failure(errors) => Failure(errors), - Success(package_names) => - // Only if we could successfully parse the structure, we do the evaluation checks - { - eval::check_values(version, &nixpkgs_path, package_names, eval_accessible_paths)? - } + // Check the main Nixpkgs first + let main_result = check_nixpkgs(main_nixpkgs, eval_accessible_paths, error_writer)?; + let check_result = main_result.result_map(|nixpkgs_version| { + // If the main Nixpkgs doesn't have any problems, run the ratchet checks against the base + // Nixpkgs + if let Some(base) = base_nixpkgs { + check_nixpkgs(base, eval_accessible_paths, error_writer)?.result_map( + |base_nixpkgs_version| { + Ok(ratchet::Nixpkgs::compare( + Some(base_nixpkgs_version), + nixpkgs_version, + )) + }, + ) + } else { + Ok(ratchet::Nixpkgs::compare(None, nixpkgs_version)) } - }; + })?; match check_result { Failure(errors) => { @@ -103,15 +108,45 @@ pub fn check_nixpkgs<W: io::Write>( } Ok(false) } - Success(_) => Ok(true), + Success(()) => Ok(true), } } +/// Checks whether the pkgs/by-name structure in Nixpkgs is valid. +/// +/// This does not include ratchet checks, see ../README.md#ratchet-checks +/// Instead a `ratchet::Nixpkgs` value is returned, whose `compare` method allows performing the +/// ratchet check against another result. +pub fn check_nixpkgs<W: io::Write>( + nixpkgs_path: &Path, + eval_accessible_paths: &[&Path], + error_writer: &mut W, +) -> validation::Result<ratchet::Nixpkgs> { + Ok({ + let nixpkgs_path = nixpkgs_path.canonicalize().context(format!( + "Nixpkgs path {} could not be resolved", + nixpkgs_path.display() + ))?; + + if !nixpkgs_path.join(utils::BASE_SUBPATH).exists() { + writeln!( + error_writer, + "Given Nixpkgs path does not contain a {} subdirectory, no check necessary.", + utils::BASE_SUBPATH + )?; + Success(ratchet::Nixpkgs::default()) + } else { + check_structure(&nixpkgs_path)?.result_map(|package_names| + // Only if we could successfully parse the structure, we do the evaluation checks + eval::check_values(&nixpkgs_path, package_names, eval_accessible_paths))? + } + }) +} + #[cfg(test)] mod tests { - use crate::check_nixpkgs; + use crate::process; use crate::utils; - use crate::Version; use anyhow::Context; use std::fs; use std::path::Path; @@ -197,10 +232,17 @@ mod tests { fn test_nixpkgs(name: &str, path: &Path, expected_errors: &str) -> anyhow::Result<()> { let extra_nix_path = Path::new("tests/mock-nixpkgs.nix"); + let base_path = path.join("base"); + let base_nixpkgs = if base_path.exists() { + Some(base_path.as_path()) + } else { + None + }; + // We don't want coloring to mess up the tests let writer = temp_env::with_var("NO_COLOR", Some("1"), || -> anyhow::Result<_> { let mut writer = vec![]; - check_nixpkgs(&path, Version::V1, vec![&extra_nix_path], &mut writer) + process(base_nixpkgs, &path, &[&extra_nix_path], &mut writer) .context(format!("Failed test case {name}"))?; Ok(writer) })?; diff --git a/pkgs/test/nixpkgs-check-by-name/src/ratchet.rs b/pkgs/test/nixpkgs-check-by-name/src/ratchet.rs new file mode 100644 index 0000000000000..c12f1ead25402 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/src/ratchet.rs @@ -0,0 +1,85 @@ +//! This module implements the ratchet checks, see ../README.md#ratchet-checks +//! +//! Each type has a `compare` method that validates the ratchet checks for that item. + +use crate::nixpkgs_problem::NixpkgsProblem; +use crate::structure; +use crate::validation::{self, Validation, Validation::Success}; +use std::collections::HashMap; + +/// The ratchet value for the entirety of Nixpkgs. +#[derive(Default)] +pub struct Nixpkgs { + /// The ratchet values for each package in `pkgs/by-name` + pub packages: HashMap<String, Package>, +} + +impl Nixpkgs { + /// Validates the ratchet checks for Nixpkgs + pub fn compare(optional_from: Option<Self>, to: Self) -> Validation<()> { + validation::sequence_( + // We only loop over the current attributes, + // we don't need to check ones that were removed + to.packages.into_iter().map(|(name, attr_to)| { + let attr_from = if let Some(from) = &optional_from { + from.packages.get(&name) + } else { + // This pretends that if there's no base version to compare against, all + // attributes existed without conforming to the new strictness check for + // backwards compatibility. + // TODO: Remove this case. This is only needed because the `--base` + // argument is still optional, which doesn't need to be once CI is updated + // to pass it. + Some(&Package { + empty_non_auto_called: EmptyNonAutoCalled::Invalid, + }) + }; + Package::compare(&name, attr_from, &attr_to) + }), + ) + } +} + +/// The ratchet value for a single package in `pkgs/by-name` +pub struct Package { + /// The ratchet value for the check for non-auto-called empty arguments + pub empty_non_auto_called: EmptyNonAutoCalled, +} + +impl Package { + /// Validates the ratchet checks for a single package defined in `pkgs/by-name` + pub fn compare(name: &str, optional_from: Option<&Self>, to: &Self) -> Validation<()> { + EmptyNonAutoCalled::compare( + name, + optional_from.map(|x| &x.empty_non_auto_called), + &to.empty_non_auto_called, + ) + } +} + +/// The ratchet value of a single package in `pkgs/by-name` +/// for the non-auto-called empty argument check of a single. +/// +/// This checks that packages defined in `pkgs/by-name` cannot be overridden +/// with an empty second argument like `callPackage ... { }`. +#[derive(PartialEq, PartialOrd)] +pub enum EmptyNonAutoCalled { + Invalid, + Valid, +} + +impl EmptyNonAutoCalled { + /// Validates the non-auto-called empty argument ratchet check for a single package defined in `pkgs/by-name` + fn compare(name: &str, optional_from: Option<&Self>, to: &Self) -> Validation<()> { + let from = optional_from.unwrap_or(&Self::Valid); + if to >= from { + Success(()) + } else { + NixpkgsProblem::WrongCallPackage { + relative_package_file: structure::relative_file_for_package(name), + package_name: name.to_owned(), + } + .into() + } + } +} diff --git a/pkgs/test/nixpkgs-check-by-name/src/validation.rs b/pkgs/test/nixpkgs-check-by-name/src/validation.rs index e727938515218..b14bfb92eb2e3 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/validation.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/validation.rs @@ -58,6 +58,15 @@ impl<A> Validation<A> { Success(value) => Success(f(value)), } } + + /// Map a `Validation<A>` to a `Result<B>` by applying a function `A -> Result<B>` + /// only if there is a `Success` value + pub fn result_map<B>(self, f: impl FnOnce(A) -> Result<B>) -> Result<B> { + match self { + Failure(err) => Ok(Failure(err)), + Success(value) => f(value), + } + } } impl Validation<()> { diff --git a/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/expected b/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/expected new file mode 100644 index 0000000000000..ddcb2df46e5fb --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/expected @@ -0,0 +1 @@ +Given Nixpkgs path does not contain a pkgs/by-name subdirectory, no check necessary. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/all-packages.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/all-packages.nix new file mode 100644 index 0000000000000..d369dd7228dca --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/all-packages.nix @@ -0,0 +1,3 @@ +self: super: { + nonDerivation = self.callPackage ./pkgs/by-name/no/nonDerivation/package.nix { }; +} diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/base/all-packages.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/base/all-packages.nix new file mode 100644 index 0000000000000..d369dd7228dca --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/base/all-packages.nix @@ -0,0 +1,3 @@ +self: super: { + nonDerivation = self.callPackage ./pkgs/by-name/no/nonDerivation/package.nix { }; +} diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/base/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/base/default.nix new file mode 100644 index 0000000000000..2875ea6327ef2 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/base/default.nix @@ -0,0 +1 @@ +import ../../mock-nixpkgs.nix { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/base/pkgs/by-name/no/nonDerivation/package.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/base/pkgs/by-name/no/nonDerivation/package.nix new file mode 100644 index 0000000000000..a1b92efbbadb9 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/base/pkgs/by-name/no/nonDerivation/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/default.nix new file mode 100644 index 0000000000000..af25d1450122b --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/expected new file mode 100644 index 0000000000000..e69de29bb2d1d --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/expected diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/pkgs/by-name/no/nonDerivation/package.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/pkgs/by-name/no/nonDerivation/package.nix new file mode 100644 index 0000000000000..a1b92efbbadb9 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/pkgs/by-name/no/nonDerivation/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/base/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/base/default.nix new file mode 100644 index 0000000000000..2875ea6327ef2 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/base/default.nix @@ -0,0 +1 @@ +import ../../mock-nixpkgs.nix { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/base/pkgs/by-name/README.md b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/base/pkgs/by-name/README.md new file mode 100644 index 0000000000000..b0d2b34e338a8 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/base/pkgs/by-name/README.md @@ -0,0 +1 @@ +(this is just here so the directory can get tracked by git) diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/all-packages.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/all-packages.nix index 4fad280ae1c73..853c3a87db561 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/all-packages.nix +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/all-packages.nix @@ -1,3 +1,3 @@ self: super: { - nonDerivation = null; + nonDerivation = self.someDrv; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/all-packages.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/all-packages.nix index 4c521d2d44684..dc07f69b40ee4 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/all-packages.nix +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/all-packages.nix @@ -1,3 +1,3 @@ self: super: { - nonDerivation = self.callPackage ({ }: { }) { }; + nonDerivation = self.callPackage ({ someDrv }: someDrv) { }; } diff --git a/pkgs/test/release/default.nix b/pkgs/test/release/default.nix new file mode 100644 index 0000000000000..f112ee6b92124 --- /dev/null +++ b/pkgs/test/release/default.nix @@ -0,0 +1,46 @@ +# Adapted from lib/tests/release.nix +{ pkgs-path ? ../../.. +, pkgs ? import pkgs-path {} +, lib ? pkgs.lib +, nix ? pkgs.nix +}: + +# +# This verifies that release-attrpaths-superset.nix does not encounter +# infinite recursion or non-tryEval-able failures. +# +pkgs.runCommand "all-attrs-eval-under-tryEval" { + nativeBuildInputs = [ + nix + pkgs.gitMinimal + ] ++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools; + strictDeps = true; +} +'' + datadir="${nix}/share" + export TEST_ROOT=$(pwd)/test-tmp + export HOME=$(mktemp -d) + export NIX_BUILD_HOOK= + export NIX_CONF_DIR=$TEST_ROOT/etc + export NIX_LOCALSTATE_DIR=$TEST_ROOT/var + export NIX_LOG_DIR=$TEST_ROOT/var/log/nix + export NIX_STATE_DIR=$TEST_ROOT/var/nix + export NIX_STORE_DIR=$TEST_ROOT/store + export PAGER=cat + cacheDir=$TEST_ROOT/binary-cache + + nix-store --init + + cp -r ${pkgs-path + "/lib"} lib + cp -r ${pkgs-path + "/pkgs"} pkgs + cp -r ${pkgs-path + "/default.nix"} default.nix + cp -r ${pkgs-path + "/nixos"} nixos + cp -r ${pkgs-path + "/maintainers"} maintainers + cp -r ${pkgs-path + "/.version"} .version + cp -r ${pkgs-path + "/doc"} doc + echo "Running pkgs/top-level/release-attrpaths-superset.nix" + nix-instantiate --eval --strict --json pkgs/top-level/release-attrpaths-superset.nix -A names > /dev/null + + mkdir $out + echo success > $out/${nix.version} +'' diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 82d9a6d65a31e..9f39fb7fb5c0a 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -1,7 +1,6 @@ { lib , buildDotnetModule , fetchFromGitHub -, fetchurl , gtk3 , libX11 , libXrandr @@ -13,24 +12,24 @@ , makeDesktopItem , nixosTests , wrapGAppsHook -, dpkg +, jq +, coreutils }: buildDotnetModule rec { pname = "OpenTabletDriver"; - version = "0.6.3.0"; + version = "0.6.4.0"; src = fetchFromGitHub { owner = "OpenTabletDriver"; repo = "OpenTabletDriver"; rev = "v${version}"; - hash = "sha256-v41qYNBgOXcFnDOJpQYitql1IZP3p8b3may5Pr04dbg="; + hash = "sha256-zK+feU96JOXjmkTndM9VyUid3z+MZFxJGH+MXaB6kzk="; }; - debPkg = fetchurl { - url = "https://github.com/OpenTabletDriver/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; - hash = "sha256-zWSJlkn7K/meTycWNTinC0hp0JubF22dJNOJeEIfGtI="; - }; + patches = [ + ./remove-git-from-generate-rules.patch + ]; dotnetInstallFlags = [ "--framework=net6.0" ]; @@ -42,7 +41,8 @@ buildDotnetModule rec { nativeBuildInputs = [ copyDesktopItems wrapGAppsHook - dpkg + # Dependency of generate-rules.sh + jq ]; runtimeDeps = [ @@ -76,8 +76,14 @@ buildDotnetModule rec { "OpenTabletDriver.Tests.ConfigurationTest.Configurations_DeviceIdentifier_IsNotConflicting" # Depends on processor load "OpenTabletDriver.Tests.TimerTests.TimerAccuracy" + # Can't find Configurations directory + "OpenTabletDriver.Tests.ConfigurationTest.Configurations_Verify_Configs_With_Schema" ]; + preBuild = '' + patchShebangs generate-rules.sh + ''; + postFixup = '' # Give a more "*nix" name to the binaries mv $out/bin/OpenTabletDriver.Console $out/bin/otd @@ -86,9 +92,10 @@ buildDotnetModule rec { install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps - # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead - dpkg-deb --fsys-tarfile ${debPkg} | tar xf - ./usr/lib/udev/rules.d/99-opentabletdriver.rules - install -Dm644 ./usr/lib/udev/rules.d/99-opentabletdriver.rules -t $out/lib/udev/rules.d + mkdir -p $out/lib/udev/rules.d + ./generate-rules.sh \ + | sed 's@/usr/bin/env rm@${lib.getExe' coreutils "rm"}@' \ + > $out/lib/udev/rules.d/70-opentabletdriver.rules ''; desktopItems = [ @@ -113,7 +120,7 @@ buildDotnetModule rec { description = "Open source, cross-platform, user-mode tablet driver"; homepage = "https://github.com/OpenTabletDriver/OpenTabletDriver"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ thiagokokada ]; + maintainers = with maintainers; [ gepbird thiagokokada ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "otd"; }; diff --git a/pkgs/tools/X11/opentabletdriver/deps.nix b/pkgs/tools/X11/opentabletdriver/deps.nix index fe821bf70a9c0..76674680d09cd 100644 --- a/pkgs/tools/X11/opentabletdriver/deps.nix +++ b/pkgs/tools/X11/opentabletdriver/deps.nix @@ -40,7 +40,9 @@ (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "Newtonsoft.Json.Schema"; version = "3.0.15"; sha256 = "1nmc9zxpcyyf3f2ypxw6vnjwlw5sxjv13r65p2dy8xrx8jkgaslp"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) (fetchNuGet { pname = "Octokit"; version = "0.50.0"; sha256 = "1ignj5i6a1c19qqrw00wlr9fdjmwrxkxz7gdxj0x653w84gbv7qq"; }) (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.34"; sha256 = "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw"; }) @@ -109,6 +111,7 @@ (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.7.0"; sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) diff --git a/pkgs/tools/X11/opentabletdriver/remove-git-from-generate-rules.patch b/pkgs/tools/X11/opentabletdriver/remove-git-from-generate-rules.patch new file mode 100644 index 0000000000000..6881cc7773702 --- /dev/null +++ b/pkgs/tools/X11/opentabletdriver/remove-git-from-generate-rules.patch @@ -0,0 +1,22 @@ +diff --git a/generate-rules.sh b/generate-rules.sh +index ce6c3f3d..a0266612 100755 +--- a/generate-rules.sh ++++ b/generate-rules.sh +@@ -8,7 +8,7 @@ print_help() { + echo " -h, --help Print this help message" + } + +-for c in git jq tr awk sed; do ++for c in jq tr awk sed; do + command -v $c > /dev/null + if [[ $? > 0 ]]; then + echo "Error: Command $c not found in \$PATH." >&2 +@@ -23,7 +23,7 @@ tohex() { + shopt -s globstar + set -eu + +-OTD_CONFIGURATIONS="${OTD_CONFIGURATIONS:="$(git rev-parse --show-toplevel)/OpenTabletDriver.Configurations/Configurations"}" ++OTD_CONFIGURATIONS="${OTD_CONFIGURATIONS:="$src/OpenTabletDriver.Configurations/Configurations"}" + + while [ $# -gt 0 ]; do + case "$1" in diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index ed8b1363d5f8c..3be7b2fd0ee60 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/xdg-open \ --replace "/usr/bin/printf" "${coreutils}/bin/printf" \ - --replace "gdbus" "${glib}/bin/gdbus" + --replace "gdbus" "${glib}/bin/gdbus" \ + --replace "mimeopen" "${perlPackages.FileMimeInfo}/bin/mimeopen" substituteInPlace $out/bin/xdg-mime \ --replace "/usr/bin/file" "${file}/bin/file" @@ -84,7 +85,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/"; description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; - license = if mimiSupport then licenses.gpl2 else licenses.free; + license = if mimiSupport then licenses.gpl2 else licenses.mit; maintainers = [ maintainers.eelco ]; platforms = platforms.all; }; diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 25cd8cc24cedf..c011aa8aa4991 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xsecurelock"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "google"; repo = "xsecurelock"; rev = "v${version}"; - sha256 = "sha256-sK3KrtZzrV2jkQveZnSHDR5I4v7baL/sARje2mDpIMI="; + sha256 = "sha256-OPasi5zmvmcWnVCj/dU2KprzNmar51zDElD23750yk4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index eb713b56a050a..970d7f8933dcb 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.186"; + version = "3.0.190"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-Uz34+Z9JH9clAFwbTn8RXxokv0yMD05lrYGexUQwmjo="; + sha256 = "sha256-16mHIvrXtFHmH6Uc2qcBTSltuHDs5jfZ2+hHvUpOjOQ="; }; - vendorHash = "sha256-9vrfctA1r0eheCBU0CeTgjs/JVt4CB3o3n5KVeFuaRI="; + vendorHash = "sha256-ZcW0Ab7uPx8XUpo3tSSt2eKjUlRlbiMvrLGJK2StKf8="; subPackages = [ "main" ]; diff --git a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix index 526730e72228e..2bc331cc18741 100644 --- a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix +++ b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix @@ -1,12 +1,29 @@ { lib -, python3Packages +, python3 , fetchPypi , nix-update-script , testers , aws-encryption-sdk-cli }: -python3Packages.buildPythonApplication rec { +let + localPython = python3.override { + self = localPython; + packageOverrides = final: prev: { + urllib3 = prev.urllib3.overridePythonAttrs (prev: rec { + pyproject = true; + version = "1.26.18"; + nativeBuildInputs = with final; [ setuptools ]; + src = prev.src.override { + inherit version; + hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; + }; + }); + }; + }; +in + +localPython.pkgs.buildPythonApplication rec { pname = "aws-encryption-sdk-cli"; version = "4.1.0"; @@ -15,15 +32,16 @@ python3Packages.buildPythonApplication rec { hash = "sha256-OCbt0OkDVfpzUIogbsKzaPAle2L6l6N3cmZoS2hEaSM="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with localPython.pkgs; [ attrs aws-encryption-sdk base64io + urllib3 ]; doCheck = true; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with localPython.pkgs; [ mock pytest-mock pytestCheckHook diff --git a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix index 79873296237c1..351355bed9971 100644 --- a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix +++ b/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "aws-lambda-runtime-interface-emulator"; - version = "1.12"; + version = "1.15"; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-runtime-interface-emulator"; rev = "v${version}"; - sha256 = "sha256-4uUyrPLDmmPv2Z6M3czwKe8BXe5BWJbfgf5FC/74pog="; + sha256 = "sha256-ogsWAAm/rEol+UFBqgMSowb78BbQKeGyeJ7UVp/p4js="; }; - vendorHash = "sha256-0b4yjyPnE7xPmW5N1Zu/tH50gHj46TnHkycNFDzIjy8="; + vendorHash = "sha256-8HRYGpMNZuPBzhp73lGvbJgA5WivMNrBa2wUw/+LX5M="; # disabled because I lack the skill doCheck = false; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 3a0b72a158de3..6a9d9396df179 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -41,14 +41,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.14.2"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.15.0"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-ECP22D4lQzJ/13/oXkOgn97EhRRuXv4vW0FtlwugrNs="; + hash = "sha256-02KGaYMVlNFPhWBhRIgwhm7FcwT7cBxKv6HDXjqpn5s="; }; postPatch = '' diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 657ce55e400bb..0c447be4e7f21 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -5,14 +5,14 @@ }: let - version = "2.54.0"; + version = "2.55.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-LbGDPZe4AWl6wnZ5GtiiM4O5EsCHEHX420lBIJJ0+Kk="; + hash = "sha256-+4ju+KOQ9LG1nzYnHOZ4mvXf6SazcrIgw/Q2mvetPMc="; }; # put packages that needs to be overridden in the py package scope @@ -288,4 +288,3 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { platforms = platforms.all; }; }) - diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index ab77600387328..9893e9e1e29cb 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -106,7 +106,6 @@ let azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "30.3.0" "tar.gz" "sha256-5Sl4Y0D4YqpqIYp61qW+trn7VYM8XKoIUcwzFNBJO2M="; azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "10.1.0" "zip" "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4="; azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.1.0" "zip" "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc="; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "27.0.0" "tar.gz" "sha256-IdGo2A65YiMJJ8S18Ji+FfnnylNhs8vFOQpfA91wgNM="; azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.3.2" "zip" "sha256-B/Sv6COlXXBLBI1h7f3BMYwFHtWfJEAyEmNQvpXp1QE="; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.3.0" "tar.gz" "sha256-02DisUN2/auBDhPgE9aUvEvYwoQUQC4NYGD/PQZOl/Y="; azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip" "sha256-BAkAYrwejwDC9FMVo7zrD7OzR57BR01xuINC4TSZsIc="; @@ -164,8 +163,10 @@ let azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "10.0.0b1" "zip" "sha256-1CiZuTXYhIb74eGQZUJHHzovYNnnVd3Ydu1UCy2Bu00="; - azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" - "sha256-nri3eB/UQQ7p4gfNDDmDuvnlhBS1tKGISdCYVuNrrN4="; + azure-mgmt-kusto = (overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" + "sha256-nri3eB/UQQ7p4gfNDDmDuvnlhBS1tKGISdCYVuNrrN4=").overridePythonAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest self.msrestazure ]; + }); azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40=r"; diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index bb674a83f3221..862fcf7aa0eb8 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildNpmPackage +, overrideSDK , fetchFromGitHub , testers , balena-cli @@ -10,18 +11,23 @@ , darwin }: -buildNpmPackage rec { +let + # Fix for: https://github.com/NixOS/nixpkgs/issues/272156 + buildNpmPackage' = buildNpmPackage.override { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; +in buildNpmPackage' rec { pname = "balena-cli"; - version = "17.0.0"; + version = "17.4.9"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-sNpxjSumiP+4fX6b3j+HEl/lr4pvudrhfTzr2TYastE="; + hash = "sha256-0TWG90OB7tovfj4PB0qAiwdOtMss5ZqjSycAb4Vz5+A="; }; - npmDepsHash = "sha256-q2Yc6e5dEiP2Q4tFIeqj4mswM1/pX1pdGeoagyiupvs="; + npmDepsHash = "sha256-LSw/cNJ6kWYh477NAqLOx5bVZ6/qPoUM0V1Cksn7iDI="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/tools/admin/cf-vault/default.nix b/pkgs/tools/admin/cf-vault/default.nix index 3dd693b13d593..13d3ea13d9f40 100644 --- a/pkgs/tools/admin/cf-vault/default.nix +++ b/pkgs/tools/admin/cf-vault/default.nix @@ -1,16 +1,16 @@ {buildGoModule, fetchFromGitHub, lib}: buildGoModule rec { pname = "cf-vault"; - version = "0.0.16"; + version = "0.0.17"; src = fetchFromGitHub { owner = "jacobbednarz"; repo = pname; rev = version; - sha256 = "sha256-puuP7L8KJ3MvlWz5tOeov8HZad+Lvo64DqTbaKPfg6o="; + sha256 = "sha256-wSTbg+dQrTbfL4M4XdwZXS04mjIFtD0RY1vK0CUHkso="; }; - vendorHash = "sha256-cnv3vustgougdfU9RlyP4O3e7kx9nNzzJm1Q2d+sCDo="; + vendorHash = "sha256-b9Ni4H2sk2gU+0zLOBg0P4ssqSJYTHnAvnmMHXha5us="; meta = with lib; { description = '' diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 0dca98037997a..efc49bfde1aaa 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chamber"; - version = "2.13.4"; + version = "2.13.6"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J6sLDalvUl4SgSyr5DK/tW7DyRa/qdKw6zornz1R2ck="; + sha256 = "sha256-jaD93q8s2uLb8jIvUBAnT76brDos46Wk06UKXAgHQGs="; }; CGO_ENABLED = 0; diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/tools/admin/colmena/default.nix index ceb544753b21a..6cb763c88d1eb 100644 --- a/pkgs/tools/admin/colmena/default.nix +++ b/pkgs/tools/admin/colmena/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { passthru = { # We guarantee CLI and Nix API stability for the same minor version - apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version)); + apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); tests.version = testers.testVersion { package = colmena; }; }; diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index 331d83292bf49..2c78ce3ed9ad6 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.32.0"; + version = "1.32.1"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-w63mNGDUc5YrlBrqsXRyy4SPC35kNKWhiHe6Sfc30tI="; + hash = "sha256-OdzycH+52F6lfCErKlsVFiPE2gxU22ySV5uPA6zBXUg="; }; - vendorHash = "sha256-8hZFsYMZQ8RxImEG2t0kfukbRjAJMEDSYF+ryLOZelc="; + vendorHash = "sha256-5Nlo5Ol4YdO3XI5RhpFfBgprVUV5DUkySvCXeFZqulk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 5b7aed1f125f5..7b1bd3cd24a73 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.22"; + version = "2.9.24"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-snQLZ/bHYDdC62Ti1E4zUmBHR8TtrKCx0BC2i6GAfdE="; + sha256 = "sha256-9SEdMK9KECte9QEfosju0PHxlDWwbQkn4QKi/XgFVuY="; }; # these tests require network access that we're not going to give them diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index d27e5eb7386d2..e6207b4402529 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.38"; + version = "0.40"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-MA7mMGZyRbQ4165qB+Q6/gQZP/yaUoZmMCVrPCPZoj4="; + sha256 = "sha256-G1CHm5z2D7l3NDmUMhubJsrXYUHb6FJ70EsYQShhsDE="; }; - vendorHash = "sha256-OmukK6ecaiCRnK6fL238GhkxW4A4yrcR/xelBZzVwqI="; + vendorHash = "sha256-j0tdFvOEp9VGx8OCfUruCzwVSB8thcenpvVNn7Rf0dA="; ldflags = [ "-s" "-w" diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 0e4b614891731..3c2a524c004d0 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.12.6"; + version = "0.12.12"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-WecKgLnfasqNp4G9e24EPjSeA9dqiEhl8KjVQ/KbmKk="; + sha256 = "sha256-jNs1I6aVmyHbVghO30r6+gVg0vVLqHpddX1KVX1Xh+s="; }; - vendorHash = "sha256-f9KJyMu4WD96IPTWSuGfQDZvayEbZ+1KeQj/99Ck/I4="; + vendorHash = "sha256-NR5Jw4zCYRg6xc9priCVNH+9wOVWx3bmstc3nkQDmv8="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index 65084dcedeb43..f2ecbeeb35277 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.19.2"; + version = "0.20.5"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z8j44WFLzPDpnmQ/vG8DfpjpxnNd942mPUxoXSEJDeI="; + sha256 = "sha256-s1hPyvpk78MgEK+t5r9iFNHBXDnnNLNoAy0jUB9X8wU="; }; - vendorHash = "sha256-cn1rGmjrmPSo6v4TD72I01VbQjwt6dT7ZEijPOjp+kc="; + vendorHash = "sha256-HRZKvs3q79Q94TYvdIx2NQU49MmS2PD1lRndcV0Ys/o="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 13589edd6bdc8..4a70d22765735 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.19"; + version = "5.20"; src = fetchurl { url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-Ttw3Hox+GfoI8dE2KpZ2HUTblOPFBUs63IBRI18lAiM="; + hash = "sha256-L5WLdX9M3mTQ81eNoL2p7lllo6cOwJVu3fgofRKQFn8="; }; vendorHash = null; @@ -86,8 +86,8 @@ buildGoModule rec { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = "https://ubuntu.com/lxd"; changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ marsam adamcstephens ]; + license = with licenses; [ asl20 agpl3 ]; + maintainers = teams.lxc.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/lxd/ui.nix b/pkgs/tools/admin/lxd/ui.nix index 7e3f1427008e7..16fdb4c331759 100644 --- a/pkgs/tools/admin/lxd/ui.nix +++ b/pkgs/tools/admin/lxd/ui.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { description = "Web user interface for LXD."; homepage = "https://github.com/canonical/lxd-ui"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 0deb3d05b9064..0a7f90dd662ab 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -9,79 +9,24 @@ , yarn , prefetch-yarn-deps , nodejs -, fetchpatch , server-mode ? true }: let pname = "pgadmin"; - version = "7.7"; - yarnHash = "sha256-8EbbyZHodrYz4a2IYuIWYGutqvrjauSv34o9KFvR/6c="; + version = "8.1"; + yarnHash = "sha256-KAiY5TX2O8mxP7PjIJstYEzCBbqDgT+CpEhreuAGW/U="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-+KD05hzghNFpuw2xW3NUVyKwspCUO9fyJgMPzYk1Xt8="; + hash = "sha256-zzS/fydNOXpIWdyLtWQhY+hVpneca+3wD88DmZEkS8s="; }; # keep the scope, as it is used throughout the derivation and tests # this also makes potential future overrides easier - pythonPackages = python3.pkgs.overrideScope (final: prev: rec { - # pgadmin 7.8 is incompatible with Flask >= 2.3 - flask = prev.flask.overridePythonAttrs (oldAttrs: rec { - version = "2.2.5"; - src = oldAttrs.src.override { - pname = "Flask"; - inherit version; - hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; - }; - format = "setuptools"; - }); - # downgrade needed for older Flask - httpbin = prev.httpbin.overridePythonAttrs (oldAttrs: rec { - version = "0.7.0"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-y7N3kMkVdfTxV1f0KtQdn3KesifV7b6J5OwXVIbbjfo="; - }; - format = "setuptools"; - patches = [ - (fetchpatch { - # Replaces BaseResponse class with Response class for Werkezug 2.1.0 compatibility - # https://github.com/postmanlabs/httpbin/pull/674 - url = "https://github.com/postmanlabs/httpbin/commit/5cc81ce87a3c447a127e4a1a707faf9f3b1c9b6b.patch"; - hash = "sha256-SbEWjiqayMFYrbgAPZtSsXqSyCDUz3z127XgcKOcrkE="; - }) - ]; - pytestFlagsArray = [ - "test_httpbin.py" - ]; - propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ final.pythonPackages.brotlipy ]; - }); - # downgrade needed for older httpbin - werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { - version = "2.2.3"; - format = "setuptools"; - src = oldAttrs.src.override { - pname = "Werkzeug"; - inherit version; - hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; - }; - }); - # Downgrade needed for older Flask - flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec { - version = "5.1.2"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc="; - }; - postPatch = '' - # This should be removed after updating to version 5.3.0. - sed -i '/filterwarnings =/a ignore:pkg_resources is deprecated:DeprecationWarning' pytest.ini - ''; - }); - }); + pythonPackages = python3.pkgs.overrideScope (final: prev: rec { }); offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; @@ -114,17 +59,8 @@ pythonPackages.buildPythonApplication rec { # fix document which refers a non-existing document and fails substituteInPlace docs/en_US/contributions.rst \ --replace "code_snippets" "" - patchShebangs . - # relax dependencies sed 's|==|>=|g' -i requirements.txt - #TODO: Can be removed once boto3>=1.28.0 and cryptography>=41 has been merged to master - substituteInPlace requirements.txt \ - --replace "boto3>=1.28.*" "boto3>=1.26.*" - substituteInPlace requirements.txt \ - --replace "botocore>=1.31.*" "botocore>=1.29.*" - substituteInPlace requirements.txt \ - --replace "cryptography>=41.0.*" "cryptography>=40.0.*" # fix extra_require error with "*" in match sed 's|*|0|g' -i requirements.txt substituteInPlace pkg/pip/setup_pip.py \ diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index 8ced96dcb781f..abf896fa98918 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@adobe/css-tools@^4.3.0": + version "4.3.1" + resolved "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28" + integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg== + "@ampproject/remapping@^2.2.0": version "2.2.1" resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" @@ -17,12 +22,30 @@ dependencies: "@babel/highlight" "^7.22.5" +"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13": + version "7.22.13" + resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" + integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== + dependencies: + "@babel/highlight" "^7.22.13" + chalk "^2.4.2" + "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255" integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA== -"@babel/core@^7.10.2", "@babel/core@^7.12.3", "@babel/core@^7.19.6": +"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9": + version "7.22.9" + resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730" + integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ== + +"@babel/compat-data@^7.23.2": + version "7.23.2" + resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc" + integrity sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ== + +"@babel/core@^7.10.2", "@babel/core@^7.12.3": version "7.22.5" resolved "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89" integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg== @@ -43,6 +66,48 @@ json5 "^2.2.2" semver "^6.3.0" +"@babel/core@^7.11.6": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.22.15.tgz#15d4fd03f478a459015a4b94cfbb3bd42c48d2f4" + integrity sha512-PtZqMmgRrvj8ruoEOIwVA3yoF91O+Hgw9o7DAUTNBA6Mo2jpu31clx9a7Nz/9JznqetTR6zwfC4L3LAjKQXUwA== + dependencies: + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.22.13" + "@babel/generator" "^7.22.15" + "@babel/helper-compilation-targets" "^7.22.15" + "@babel/helper-module-transforms" "^7.22.15" + "@babel/helpers" "^7.22.15" + "@babel/parser" "^7.22.15" + "@babel/template" "^7.22.15" + "@babel/traverse" "^7.22.15" + "@babel/types" "^7.22.15" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.3" + semver "^6.3.1" + +"@babel/core@^7.21.3": + version "7.23.2" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94" + integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ== + dependencies: + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.22.13" + "@babel/generator" "^7.23.0" + "@babel/helper-compilation-targets" "^7.22.15" + "@babel/helper-module-transforms" "^7.23.0" + "@babel/helpers" "^7.23.2" + "@babel/parser" "^7.23.0" + "@babel/template" "^7.22.15" + "@babel/traverse" "^7.23.2" + "@babel/types" "^7.23.0" + convert-source-map "^2.0.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.3" + semver "^6.3.1" + "@babel/eslint-parser@^7.21.3": version "7.22.5" resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz#fa032503b9e2d188e25b1b95d29e8b8431042d78" @@ -59,6 +124,16 @@ dependencies: eslint-rule-composer "^0.3.0" +"@babel/generator@^7.22.15", "@babel/generator@^7.7.2": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz#1564189c7ec94cb8f77b5e8a90c4d200d21b2339" + integrity sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA== + dependencies: + "@babel/types" "^7.22.15" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/generator@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7" @@ -69,6 +144,16 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" +"@babel/generator@^7.23.0": + version "7.23.0" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420" + integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g== + dependencies: + "@babel/types" "^7.23.0" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" @@ -94,6 +179,17 @@ lru-cache "^5.1.1" semver "^6.3.0" +"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52" + integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw== + dependencies: + "@babel/compat-data" "^7.22.9" + "@babel/helper-validator-option" "^7.22.15" + browserslist "^4.21.9" + lru-cache "^5.1.1" + semver "^6.3.1" + "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz#2192a1970ece4685fbff85b48da2c32fcb130b7c" @@ -109,6 +205,21 @@ "@babel/helper-split-export-declaration" "^7.22.5" semver "^6.3.0" +"@babel/helper-create-class-features-plugin@^7.22.11", "@babel/helper-create-class-features-plugin@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz#97a61b385e57fe458496fad19f8e63b63c867de4" + integrity sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" + "@babel/helper-member-expression-to-functions" "^7.22.15" + "@babel/helper-optimise-call-expression" "^7.22.5" + "@babel/helper-replace-supers" "^7.22.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + semver "^6.3.1" + "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz#bb2bf0debfe39b831986a4efbf4066586819c6e4" @@ -130,6 +241,33 @@ resolve "^1.14.2" semver "^6.1.2" +"@babel/helper-define-polyfill-provider@^0.4.2": + version "0.4.2" + resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz#82c825cadeeeee7aad237618ebbe8fa1710015d7" + integrity sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw== + dependencies: + "@babel/helper-compilation-targets" "^7.22.6" + "@babel/helper-plugin-utils" "^7.22.5" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + +"@babel/helper-define-polyfill-provider@^0.4.3": + version "0.4.3" + resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz#a71c10f7146d809f4a256c373f462d9bba8cf6ba" + integrity sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug== + dependencies: + "@babel/helper-compilation-targets" "^7.22.6" + "@babel/helper-plugin-utils" "^7.22.5" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + +"@babel/helper-environment-visitor@^7.22.20": + version "7.22.20" + resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" + integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== + "@babel/helper-environment-visitor@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98" @@ -143,6 +281,14 @@ "@babel/template" "^7.22.5" "@babel/types" "^7.22.5" +"@babel/helper-function-name@^7.23.0": + version "7.23.0" + resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" + integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== + dependencies: + "@babel/template" "^7.22.15" + "@babel/types" "^7.23.0" + "@babel/helper-hoist-variables@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" @@ -150,6 +296,13 @@ dependencies: "@babel/types" "^7.22.5" +"@babel/helper-member-expression-to-functions@^7.22.15": + version "7.23.0" + resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366" + integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA== + dependencies: + "@babel/types" "^7.23.0" + "@babel/helper-member-expression-to-functions@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2" @@ -164,6 +317,24 @@ dependencies: "@babel/types" "^7.22.5" +"@babel/helper-module-imports@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" + integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== + dependencies: + "@babel/types" "^7.22.15" + +"@babel/helper-module-transforms@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.15.tgz#40ad2f6950f143900e9c1c72363c0b431a606082" + integrity sha512-l1UiX4UyHSFsYt17iQ3Se5pQQZZHa22zyIXURmvkmLCD4t/aU+dvNWHatKac/D9Vm9UES7nvIqHs4jZqKviUmQ== + dependencies: + "@babel/helper-environment-visitor" "^7.22.5" + "@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.15" + "@babel/helper-module-transforms@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef" @@ -178,6 +349,17 @@ "@babel/traverse" "^7.22.5" "@babel/types" "^7.22.5" +"@babel/helper-module-transforms@^7.23.0": + version "7.23.0" + resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e" + integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw== + dependencies: + "@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.20" + "@babel/helper-optimise-call-expression@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e" @@ -190,6 +372,15 @@ resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== +"@babel/helper-remap-async-to-generator@^7.22.20": + version "7.22.20" + resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0" + integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-wrap-function" "^7.22.20" + "@babel/helper-remap-async-to-generator@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2" @@ -212,6 +403,15 @@ "@babel/traverse" "^7.22.5" "@babel/types" "^7.22.5" +"@babel/helper-replace-supers@^7.22.9": + version "7.22.20" + resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793" + integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw== + dependencies: + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-member-expression-to-functions" "^7.22.15" + "@babel/helper-optimise-call-expression" "^7.22.5" + "@babel/helper-simple-access@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" @@ -233,21 +433,52 @@ dependencies: "@babel/types" "^7.22.5" +"@babel/helper-split-export-declaration@^7.22.6": + version "7.22.6" + resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" + integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== + dependencies: + "@babel/types" "^7.22.5" + "@babel/helper-string-parser@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== +"@babel/helper-validator-identifier@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz#601fa28e4cc06786c18912dca138cec73b882044" + integrity sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ== + +"@babel/helper-validator-identifier@^7.22.20": + version "7.22.20" + resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" + integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== + "@babel/helper-validator-identifier@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== +"@babel/helper-validator-option@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040" + integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA== + "@babel/helper-validator-option@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== +"@babel/helper-wrap-function@^7.22.20": + version "7.22.20" + resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569" + integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw== + dependencies: + "@babel/helper-function-name" "^7.22.5" + "@babel/template" "^7.22.15" + "@babel/types" "^7.22.19" + "@babel/helper-wrap-function@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06" @@ -258,6 +489,15 @@ "@babel/traverse" "^7.22.5" "@babel/types" "^7.22.5" +"@babel/helpers@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz#f09c3df31e86e3ea0b7ff7556d85cdebd47ea6f1" + integrity sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw== + dependencies: + "@babel/template" "^7.22.15" + "@babel/traverse" "^7.22.15" + "@babel/types" "^7.22.15" + "@babel/helpers@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz#74bb4373eb390d1ceed74a15ef97767e63120820" @@ -267,6 +507,24 @@ "@babel/traverse" "^7.22.5" "@babel/types" "^7.22.5" +"@babel/helpers@^7.23.2": + version "7.23.2" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz#2832549a6e37d484286e15ba36a5330483cac767" + integrity sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ== + dependencies: + "@babel/template" "^7.22.15" + "@babel/traverse" "^7.23.2" + "@babel/types" "^7.23.0" + +"@babel/highlight@^7.22.13": + version "7.22.13" + resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz#9cda839e5d3be9ca9e8c26b6dd69e7548f0cbf16" + integrity sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ== + dependencies: + "@babel/helper-validator-identifier" "^7.22.5" + chalk "^2.4.2" + js-tokens "^4.0.0" + "@babel/highlight@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" @@ -276,11 +534,28 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.22.15.tgz#d34592bfe288a32e741aa0663dbc4829fcd55160" + integrity sha512-RWmQ/sklUN9BvGGpCDgSubhHWfAx24XDTDObup4ffvxaYsptOg2P3KG0j+1eWKLxpkX0j0uHxmpq2Z1SP/VhxA== + "@babel/parser@^7.14.7", "@babel/parser@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea" integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q== +"@babel/parser@^7.23.0": + version "7.23.0" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719" + integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== + +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz#02dc8a03f613ed5fdc29fb2f728397c78146c962" + integrity sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e" @@ -288,6 +563,15 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz#2aeb91d337d4e1a1e7ce85b76a37f5301781200f" + integrity sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/plugin-transform-optional-chaining" "^7.22.15" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca" @@ -336,7 +620,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-class-properties@^7.12.13": +"@babel/plugin-syntax-bigint@^7.8.3": + version "7.8.3" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" + integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3": version "7.12.13" resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== @@ -378,7 +669,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-syntax-import-meta@^7.10.4": +"@babel/plugin-syntax-import-meta@^7.10.4", "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== @@ -392,14 +683,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.16.0", "@babel/plugin-syntax-jsx@^7.22.5": +"@babel/plugin-syntax-jsx@^7.16.0", "@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.7.2": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918" integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg== dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": +"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== @@ -413,7 +704,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-numeric-separator@^7.10.4": +"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3": version "7.10.4" resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== @@ -448,14 +739,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-top-level-await@^7.14.5": +"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3": version "7.14.5" resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.22.5": +"@babel/plugin-syntax-typescript@^7.22.5", "@babel/plugin-syntax-typescript@^7.7.2": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272" integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ== @@ -487,6 +778,16 @@ "@babel/helper-remap-async-to-generator" "^7.22.5" "@babel/plugin-syntax-async-generators" "^7.8.4" +"@babel/plugin-transform-async-generator-functions@^7.23.2": + version "7.23.2" + resolved "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz#054afe290d64c6f576f371ccc321772c8ea87ebb" + integrity sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ== + dependencies: + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-remap-async-to-generator" "^7.22.20" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-transform-async-to-generator@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775" @@ -510,6 +811,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-block-scoping@^7.23.0": + version "7.23.0" + resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz#8744d02c6c264d82e1a4bc5d2d501fd8aff6f022" + integrity sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-transform-class-properties@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77" @@ -518,6 +826,15 @@ "@babel/helper-create-class-features-plugin" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-class-static-block@^7.22.11": + version "7.22.11" + resolved "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz#dc8cc6e498f55692ac6b4b89e56d87cec766c974" + integrity sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.22.11" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-transform-class-static-block@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz#3e40c46f048403472d6f4183116d5e46b1bff5ba" @@ -527,6 +844,21 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-class-static-block" "^7.14.5" +"@babel/plugin-transform-classes@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz#aaf4753aee262a232bbc95451b4bdf9599c65a0b" + integrity sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-compilation-targets" "^7.22.15" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" + "@babel/helper-optimise-call-expression" "^7.22.5" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-replace-supers" "^7.22.9" + "@babel/helper-split-export-declaration" "^7.22.6" + globals "^11.1.0" + "@babel/plugin-transform-classes@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz#635d4e98da741fad814984639f4c0149eb0135e1" @@ -557,6 +889,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-destructuring@^7.23.0": + version "7.23.0" + resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz#6447aa686be48b32eaf65a73e0e2c0bd010a266c" + integrity sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-transform-dotall-regex@^7.22.5", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165" @@ -572,6 +911,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-dynamic-import@^7.22.11": + version "7.22.11" + resolved "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz#2c7722d2a5c01839eaf31518c6ff96d408e447aa" + integrity sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-transform-dynamic-import@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz#d6908a8916a810468c4edff73b5b75bda6ad393e" @@ -588,6 +935,14 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-export-namespace-from@^7.22.11": + version "7.22.11" + resolved "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz#b3c84c8f19880b6c7440108f8929caf6056db26c" + integrity sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-transform-export-namespace-from@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz#57c41cb1d0613d22f548fddd8b288eedb9973a5b" @@ -596,6 +951,13 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" +"@babel/plugin-transform-for-of@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz#f64b4ccc3a4f131a996388fae7680b472b306b29" + integrity sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-transform-for-of@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f" @@ -612,6 +974,14 @@ "@babel/helper-function-name" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-json-strings@^7.22.11": + version "7.22.11" + resolved "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz#689a34e1eed1928a40954e37f74509f48af67835" + integrity sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-transform-json-strings@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz#14b64352fdf7e1f737eed68de1a1468bd2a77ec0" @@ -627,6 +997,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-logical-assignment-operators@^7.22.11": + version "7.22.11" + resolved "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz#24c522a61688bde045b7d9bc3c2597a4d948fc9c" + integrity sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-transform-logical-assignment-operators@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz#66ae5f068fd5a9a5dc570df16f56c2a8462a9d6c" @@ -650,6 +1028,14 @@ "@babel/helper-module-transforms" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-modules-amd@^7.23.0": + version "7.23.0" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz#05b2bc43373faa6d30ca89214731f76f966f3b88" + integrity sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw== + dependencies: + "@babel/helper-module-transforms" "^7.23.0" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-transform-modules-commonjs@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa" @@ -659,6 +1045,15 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-simple-access" "^7.22.5" +"@babel/plugin-transform-modules-commonjs@^7.23.0": + version "7.23.0" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz#b3dba4757133b2762c00f4f94590cf6d52602481" + integrity sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ== + dependencies: + "@babel/helper-module-transforms" "^7.23.0" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-simple-access" "^7.22.5" + "@babel/plugin-transform-modules-systemjs@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496" @@ -669,6 +1064,16 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-validator-identifier" "^7.22.5" +"@babel/plugin-transform-modules-systemjs@^7.23.0": + version "7.23.0" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz#77591e126f3ff4132a40595a6cccd00a6b60d160" + integrity sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg== + dependencies: + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-module-transforms" "^7.23.0" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.20" + "@babel/plugin-transform-modules-umd@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98" @@ -692,6 +1097,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11": + version "7.22.11" + resolved "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz#debef6c8ba795f5ac67cd861a81b744c5d38d9fc" + integrity sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-transform-nullish-coalescing-operator@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz#f8872c65776e0b552e0849d7596cddd416c3e381" @@ -700,6 +1113,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" +"@babel/plugin-transform-numeric-separator@^7.22.11": + version "7.22.11" + resolved "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz#498d77dc45a6c6db74bb829c02a01c1d719cbfbd" + integrity sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-transform-numeric-separator@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz#57226a2ed9e512b9b446517ab6fa2d17abb83f58" @@ -708,6 +1129,17 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-numeric-separator" "^7.10.4" +"@babel/plugin-transform-object-rest-spread@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz#21a95db166be59b91cde48775310c0df6e1da56f" + integrity sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q== + dependencies: + "@babel/compat-data" "^7.22.9" + "@babel/helper-compilation-targets" "^7.22.15" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.22.15" + "@babel/plugin-transform-object-rest-spread@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz#9686dc3447df4753b0b2a2fae7e8bc33cdc1f2e1" @@ -727,6 +1159,14 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-replace-supers" "^7.22.5" +"@babel/plugin-transform-optional-catch-binding@^7.22.11": + version "7.22.11" + resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz#461cc4f578a127bb055527b3e77404cad38c08e0" + integrity sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-transform-optional-catch-binding@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz#842080be3076703be0eaf32ead6ac8174edee333" @@ -735,6 +1175,15 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" +"@babel/plugin-transform-optional-chaining@^7.22.15", "@babel/plugin-transform-optional-chaining@^7.23.0": + version "7.23.0" + resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz#73ff5fc1cf98f542f09f29c0631647d8ad0be158" + integrity sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-transform-optional-chaining@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz#1003762b9c14295501beb41be72426736bedd1e0" @@ -751,6 +1200,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-parameters@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz#719ca82a01d177af358df64a514d64c2e3edb114" + integrity sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-transform-private-methods@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722" @@ -759,6 +1215,16 @@ "@babel/helper-create-class-features-plugin" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-private-property-in-object@^7.22.11": + version "7.22.11" + resolved "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz#ad45c4fc440e9cb84c718ed0906d96cf40f9a4e1" + integrity sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-create-class-features-plugin" "^7.22.11" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-transform-private-property-in-object@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz#07a77f28cbb251546a43d175a1dda4cf3ef83e32" @@ -776,7 +1242,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-react-constant-elements@^7.18.12": +"@babel/plugin-transform-react-constant-elements@^7.21.3": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.22.5.tgz#6dfa7c1c37f7d7279e417ceddf5a04abb8bb9c29" integrity sha512-BF5SXoO+nX3h5OhlN78XbbDrBOffv+AxPP2ENaJOVqjWCgBDeOY3WcaUcddutGSfoap+5NEQ/q/4I3WZIvgkXA== @@ -816,6 +1282,14 @@ "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-regenerator@^7.22.10": + version "7.22.10" + resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz#8ceef3bd7375c4db7652878b0241b2be5d0c3cca" + integrity sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + regenerator-transform "^0.15.2" + "@babel/plugin-transform-regenerator@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz#cd8a68b228a5f75fa01420e8cc2fc400f0fc32aa" @@ -831,6 +1305,18 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-runtime@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.15.tgz#3a625c4c05a39e932d7d34f5d4895cdd0172fdc9" + integrity sha512-tEVLhk8NRZSmwQ0DJtxxhTrCht1HVo8VaMzYT4w6lwyKBuHsgoioAUA7/6eT2fRfc5/23fuGdlwIxXhRVgWr4g== + dependencies: + "@babel/helper-module-imports" "^7.22.15" + "@babel/helper-plugin-utils" "^7.22.5" + babel-plugin-polyfill-corejs2 "^0.4.5" + babel-plugin-polyfill-corejs3 "^0.8.3" + babel-plugin-polyfill-regenerator "^0.5.2" + semver "^6.3.1" + "@babel/plugin-transform-shorthand-properties@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624" @@ -867,6 +1353,16 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" +"@babel/plugin-transform-typescript@^7.22.15": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.15.tgz#15adef906451d86349eb4b8764865c960eb54127" + integrity sha512-1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-create-class-features-plugin" "^7.22.15" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-syntax-typescript" "^7.22.5" + "@babel/plugin-transform-typescript@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz#5c0f7adfc1b5f38c4dbc8f79b1f0f8074134bd7d" @@ -877,6 +1373,13 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-syntax-typescript" "^7.22.5" +"@babel/plugin-transform-unicode-escapes@^7.22.10": + version "7.22.10" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz#c723f380f40a2b2f57a62df24c9005834c8616d9" + integrity sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/plugin-transform-unicode-escapes@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz#ce0c248522b1cb22c7c992d88301a5ead70e806c" @@ -908,7 +1411,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.5" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.19.4": +"@babel/preset-env@^7.10.2": version "7.22.5" resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.5.tgz#3da66078b181f3d62512c51cf7014392c511504e" integrity sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A== @@ -994,6 +1497,101 @@ core-js-compat "^3.30.2" semver "^6.3.0" +"@babel/preset-env@^7.20.2": + version "7.23.2" + resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz#1f22be0ff0e121113260337dbc3e58fafce8d059" + integrity sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ== + dependencies: + "@babel/compat-data" "^7.23.2" + "@babel/helper-compilation-targets" "^7.22.15" + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-validator-option" "^7.22.15" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.15" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.15" + "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-syntax-import-assertions" "^7.22.5" + "@babel/plugin-syntax-import-attributes" "^7.22.5" + "@babel/plugin-syntax-import-meta" "^7.10.4" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-syntax-top-level-await" "^7.14.5" + "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" + "@babel/plugin-transform-arrow-functions" "^7.22.5" + "@babel/plugin-transform-async-generator-functions" "^7.23.2" + "@babel/plugin-transform-async-to-generator" "^7.22.5" + "@babel/plugin-transform-block-scoped-functions" "^7.22.5" + "@babel/plugin-transform-block-scoping" "^7.23.0" + "@babel/plugin-transform-class-properties" "^7.22.5" + "@babel/plugin-transform-class-static-block" "^7.22.11" + "@babel/plugin-transform-classes" "^7.22.15" + "@babel/plugin-transform-computed-properties" "^7.22.5" + "@babel/plugin-transform-destructuring" "^7.23.0" + "@babel/plugin-transform-dotall-regex" "^7.22.5" + "@babel/plugin-transform-duplicate-keys" "^7.22.5" + "@babel/plugin-transform-dynamic-import" "^7.22.11" + "@babel/plugin-transform-exponentiation-operator" "^7.22.5" + "@babel/plugin-transform-export-namespace-from" "^7.22.11" + "@babel/plugin-transform-for-of" "^7.22.15" + "@babel/plugin-transform-function-name" "^7.22.5" + "@babel/plugin-transform-json-strings" "^7.22.11" + "@babel/plugin-transform-literals" "^7.22.5" + "@babel/plugin-transform-logical-assignment-operators" "^7.22.11" + "@babel/plugin-transform-member-expression-literals" "^7.22.5" + "@babel/plugin-transform-modules-amd" "^7.23.0" + "@babel/plugin-transform-modules-commonjs" "^7.23.0" + "@babel/plugin-transform-modules-systemjs" "^7.23.0" + "@babel/plugin-transform-modules-umd" "^7.22.5" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5" + "@babel/plugin-transform-new-target" "^7.22.5" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.11" + "@babel/plugin-transform-numeric-separator" "^7.22.11" + "@babel/plugin-transform-object-rest-spread" "^7.22.15" + "@babel/plugin-transform-object-super" "^7.22.5" + "@babel/plugin-transform-optional-catch-binding" "^7.22.11" + "@babel/plugin-transform-optional-chaining" "^7.23.0" + "@babel/plugin-transform-parameters" "^7.22.15" + "@babel/plugin-transform-private-methods" "^7.22.5" + "@babel/plugin-transform-private-property-in-object" "^7.22.11" + "@babel/plugin-transform-property-literals" "^7.22.5" + "@babel/plugin-transform-regenerator" "^7.22.10" + "@babel/plugin-transform-reserved-words" "^7.22.5" + "@babel/plugin-transform-shorthand-properties" "^7.22.5" + "@babel/plugin-transform-spread" "^7.22.5" + "@babel/plugin-transform-sticky-regex" "^7.22.5" + "@babel/plugin-transform-template-literals" "^7.22.5" + "@babel/plugin-transform-typeof-symbol" "^7.22.5" + "@babel/plugin-transform-unicode-escapes" "^7.22.10" + "@babel/plugin-transform-unicode-property-regex" "^7.22.5" + "@babel/plugin-transform-unicode-regex" "^7.22.5" + "@babel/plugin-transform-unicode-sets-regex" "^7.22.5" + "@babel/preset-modules" "0.1.6-no-external-plugins" + "@babel/types" "^7.23.0" + babel-plugin-polyfill-corejs2 "^0.4.6" + babel-plugin-polyfill-corejs3 "^0.8.5" + babel-plugin-polyfill-regenerator "^0.5.3" + core-js-compat "^3.31.0" + semver "^6.3.1" + +"@babel/preset-modules@0.1.6-no-external-plugins": + version "0.1.6-no-external-plugins" + resolved "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a" + integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/types" "^7.4.4" + esutils "^2.0.2" + "@babel/preset-modules@^0.1.5": version "0.1.5" resolved "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" @@ -1017,7 +1615,18 @@ "@babel/plugin-transform-react-jsx-development" "^7.22.5" "@babel/plugin-transform-react-pure-annotations" "^7.22.5" -"@babel/preset-typescript@^7.18.6", "@babel/preset-typescript@^7.22.5": +"@babel/preset-typescript@^7.21.0": + version "7.23.2" + resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.2.tgz#c8de488130b7081f7e1482936ad3de5b018beef4" + integrity sha512-u4UJc1XsS1GhIGteM8rnGiIvf9rJpiVgMEeCnwlLA7WJPC+jcXWJAGxYmeqs5hOZD8BbAfnV5ezBOxQbb4OUxA== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-validator-option" "^7.22.15" + "@babel/plugin-syntax-jsx" "^7.22.5" + "@babel/plugin-transform-modules-commonjs" "^7.23.0" + "@babel/plugin-transform-typescript" "^7.22.15" + +"@babel/preset-typescript@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz#16367d8b01d640e9a507577ed4ee54e0101e51c8" integrity sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ== @@ -1040,6 +1649,15 @@ dependencies: regenerator-runtime "^0.13.11" +"@babel/template@^7.22.15", "@babel/template@^7.3.3": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" + integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + "@babel/template@^7.22.5": version "7.22.5" resolved "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec" @@ -1049,23 +1667,41 @@ "@babel/parser" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/traverse@^7.22.5", "@babel/traverse@^7.4.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1" - integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ== +"@babel/traverse@^7.22.15", "@babel/traverse@^7.22.5", "@babel/traverse@^7.23.2", "@babel/traverse@^7.4.5": + version "7.23.2" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8" + integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw== dependencies: - "@babel/code-frame" "^7.22.5" - "@babel/generator" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-function-name" "^7.22.5" + "@babel/code-frame" "^7.22.13" + "@babel/generator" "^7.23.0" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.5" - "@babel/parser" "^7.22.5" - "@babel/types" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.23.0" + "@babel/types" "^7.23.0" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.20.0", "@babel/types@^7.22.5", "@babel/types@^7.4.4", "@babel/types@^7.8.3": +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.3.3": + version "7.22.15" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.22.15.tgz#266cb21d2c5fd0b3931e7a91b6dd72d2f617d282" + integrity sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.15" + to-fast-properties "^2.0.0" + +"@babel/types@^7.21.3", "@babel/types@^7.22.19", "@babel/types@^7.23.0": + version "7.23.0" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb" + integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" + +"@babel/types@^7.22.5", "@babel/types@^7.4.4", "@babel/types@^7.8.3": version "7.22.5" resolved "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe" integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA== @@ -1074,10 +1710,10 @@ "@babel/helper-validator-identifier" "^7.22.5" to-fast-properties "^2.0.0" -"@colors/colors@1.5.0": - version "1.5.0" - resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" - integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== +"@bcoe/v8-coverage@^0.2.3": + version "0.2.3" + resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" + integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== "@date-io/core@1.x", "@date-io/core@^1.3.13", "@date-io/core@^1.3.6": version "1.3.13" @@ -1329,10 +1965,10 @@ dependencies: "@floating-ui/core" "^1.3.1" -"@fortawesome/fontawesome-free@^5.14.0": - version "5.15.4" - resolved "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5" - integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg== +"@fortawesome/fontawesome-free@latest": + version "6.4.2" + resolved "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz#36b6a9cb5ffbecdf89815c94d0c0ffa489ac5ecb" + integrity sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg== "@humanwhocodes/config-array@^0.11.10": version "0.11.10" @@ -1365,11 +2001,145 @@ wrap-ansi "^8.1.0" wrap-ansi-cjs "wrap-ansi@^7.0.0" +"@istanbuljs/load-nyc-config@^1.0.0": + version "1.1.0" + resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" + integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== + dependencies: + camelcase "^5.3.1" + find-up "^4.1.0" + get-package-type "^0.1.0" + js-yaml "^3.13.1" + resolve-from "^5.0.0" + "@istanbuljs/schema@^0.1.2": version "0.1.3" resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== +"@jest/console@^29.6.4": + version "29.6.4" + resolved "https://registry.npmjs.org/@jest/console/-/console-29.6.4.tgz#a7e2d84516301f986bba0dd55af9d5fe37f46527" + integrity sha512-wNK6gC0Ha9QeEPSkeJedQuTQqxZYnDPuDcDhVuVatRvMkL4D0VTvFVZj+Yuh6caG2aOfzkUZ36KtCmLNtR02hw== + dependencies: + "@jest/types" "^29.6.3" + "@types/node" "*" + chalk "^4.0.0" + jest-message-util "^29.6.3" + jest-util "^29.6.3" + slash "^3.0.0" + +"@jest/core@^29.6.4": + version "29.6.4" + resolved "https://registry.npmjs.org/@jest/core/-/core-29.6.4.tgz#265ebee05ec1ff3567757e7a327155c8d6bdb126" + integrity sha512-U/vq5ccNTSVgYH7mHnodHmCffGWHJnz/E1BEWlLuK5pM4FZmGfBn/nrJGLjUsSmyx3otCeqc1T31F4y08AMDLg== + dependencies: + "@jest/console" "^29.6.4" + "@jest/reporters" "^29.6.4" + "@jest/test-result" "^29.6.4" + "@jest/transform" "^29.6.4" + "@jest/types" "^29.6.3" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + ci-info "^3.2.0" + exit "^0.1.2" + graceful-fs "^4.2.9" + jest-changed-files "^29.6.3" + jest-config "^29.6.4" + jest-haste-map "^29.6.4" + jest-message-util "^29.6.3" + jest-regex-util "^29.6.3" + jest-resolve "^29.6.4" + jest-resolve-dependencies "^29.6.4" + jest-runner "^29.6.4" + jest-runtime "^29.6.4" + jest-snapshot "^29.6.4" + jest-util "^29.6.3" + jest-validate "^29.6.3" + jest-watcher "^29.6.4" + micromatch "^4.0.4" + pretty-format "^29.6.3" + slash "^3.0.0" + strip-ansi "^6.0.0" + +"@jest/environment@^29.6.4": + version "29.6.4" + resolved "https://registry.npmjs.org/@jest/environment/-/environment-29.6.4.tgz#78ec2c9f8c8829a37616934ff4fea0c028c79f4f" + integrity sha512-sQ0SULEjA1XUTHmkBRl7A1dyITM9yb1yb3ZNKPX3KlTd6IG7mWUe3e2yfExtC2Zz1Q+mMckOLHmL/qLiuQJrBQ== + dependencies: + "@jest/fake-timers" "^29.6.4" + "@jest/types" "^29.6.3" + "@types/node" "*" + jest-mock "^29.6.3" + +"@jest/expect-utils@^29.6.4": + version "29.6.4" + resolved "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.4.tgz#17c7dfe6cec106441f218b0aff4b295f98346679" + integrity sha512-FEhkJhqtvBwgSpiTrocquJCdXPsyvNKcl/n7A3u7X4pVoF4bswm11c9d4AV+kfq2Gpv/mM8x7E7DsRvH+djkrg== + dependencies: + jest-get-type "^29.6.3" + +"@jest/expect@^29.6.4": + version "29.6.4" + resolved "https://registry.npmjs.org/@jest/expect/-/expect-29.6.4.tgz#1d6ae17dc68d906776198389427ab7ce6179dba6" + integrity sha512-Warhsa7d23+3X5bLbrbYvaehcgX5TLYhI03JKoedTiI8uJU4IhqYBWF7OSSgUyz4IgLpUYPkK0AehA5/fRclAA== + dependencies: + expect "^29.6.4" + jest-snapshot "^29.6.4" + +"@jest/fake-timers@^29.6.4": + version "29.6.4" + resolved "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.4.tgz#45a27f093c43d5d989362a3e7a8c70c83188b4f6" + integrity sha512-6UkCwzoBK60edXIIWb0/KWkuj7R7Qq91vVInOe3De6DSpaEiqjKcJw4F7XUet24Wupahj9J6PlR09JqJ5ySDHw== + dependencies: + "@jest/types" "^29.6.3" + "@sinonjs/fake-timers" "^10.0.2" + "@types/node" "*" + jest-message-util "^29.6.3" + jest-mock "^29.6.3" + jest-util "^29.6.3" + +"@jest/globals@^29.6.4": + version "29.6.4" + resolved "https://registry.npmjs.org/@jest/globals/-/globals-29.6.4.tgz#4f04f58731b062b44ef23036b79bdb31f40c7f63" + integrity sha512-wVIn5bdtjlChhXAzVXavcY/3PEjf4VqM174BM3eGL5kMxLiZD5CLnbmkEyA1Dwh9q8XjP6E8RwjBsY/iCWrWsA== + dependencies: + "@jest/environment" "^29.6.4" + "@jest/expect" "^29.6.4" + "@jest/types" "^29.6.3" + jest-mock "^29.6.3" + +"@jest/reporters@^29.6.4": + version "29.6.4" + resolved "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.4.tgz#9d6350c8a2761ece91f7946e97ab0dabc06deab7" + integrity sha512-sxUjWxm7QdchdrD3NfWKrL8FBsortZeibSJv4XLjESOOjSUOkjQcb0ZHJwfhEGIvBvTluTzfG2yZWZhkrXJu8g== + dependencies: + "@bcoe/v8-coverage" "^0.2.3" + "@jest/console" "^29.6.4" + "@jest/test-result" "^29.6.4" + "@jest/transform" "^29.6.4" + "@jest/types" "^29.6.3" + "@jridgewell/trace-mapping" "^0.3.18" + "@types/node" "*" + chalk "^4.0.0" + collect-v8-coverage "^1.0.0" + exit "^0.1.2" + glob "^7.1.3" + graceful-fs "^4.2.9" + istanbul-lib-coverage "^3.0.0" + istanbul-lib-instrument "^6.0.0" + istanbul-lib-report "^3.0.0" + istanbul-lib-source-maps "^4.0.0" + istanbul-reports "^3.1.3" + jest-message-util "^29.6.3" + jest-util "^29.6.3" + jest-worker "^29.6.4" + slash "^3.0.0" + string-length "^4.0.1" + strip-ansi "^6.0.0" + v8-to-istanbul "^9.0.1" + "@jest/schemas@^29.4.3": version "29.4.3" resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788" @@ -1377,6 +2147,63 @@ dependencies: "@sinclair/typebox" "^0.25.16" +"@jest/schemas@^29.6.3": + version "29.6.3" + resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03" + integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA== + dependencies: + "@sinclair/typebox" "^0.27.8" + +"@jest/source-map@^29.6.3": + version "29.6.3" + resolved "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4" + integrity sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw== + dependencies: + "@jridgewell/trace-mapping" "^0.3.18" + callsites "^3.0.0" + graceful-fs "^4.2.9" + +"@jest/test-result@^29.6.4": + version "29.6.4" + resolved "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.4.tgz#adf5c79f6e1fb7405ad13d67d9e2b6ff54b54c6b" + integrity sha512-uQ1C0AUEN90/dsyEirgMLlouROgSY+Wc/JanVVk0OiUKa5UFh7sJpMEM3aoUBAz2BRNvUJ8j3d294WFuRxSyOQ== + dependencies: + "@jest/console" "^29.6.4" + "@jest/types" "^29.6.3" + "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" + +"@jest/test-sequencer@^29.6.4": + version "29.6.4" + resolved "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.4.tgz#86aef66aaa22b181307ed06c26c82802fb836d7b" + integrity sha512-E84M6LbpcRq3fT4ckfKs9ryVanwkaIB0Ws9bw3/yP4seRLg/VaCZ/LgW0MCq5wwk4/iP/qnilD41aj2fsw2RMg== + dependencies: + "@jest/test-result" "^29.6.4" + graceful-fs "^4.2.9" + jest-haste-map "^29.6.4" + slash "^3.0.0" + +"@jest/transform@^29.6.4": + version "29.6.4" + resolved "https://registry.npmjs.org/@jest/transform/-/transform-29.6.4.tgz#a6bc799ef597c5d85b2e65a11fd96b6b239bab5a" + integrity sha512-8thgRSiXUqtr/pPGY/OsyHuMjGyhVnWrFAwoxmIemlBuiMyU1WFs0tXoNxzcr4A4uErs/ABre76SGmrr5ab/AA== + dependencies: + "@babel/core" "^7.11.6" + "@jest/types" "^29.6.3" + "@jridgewell/trace-mapping" "^0.3.18" + babel-plugin-istanbul "^6.1.1" + chalk "^4.0.0" + convert-source-map "^2.0.0" + fast-json-stable-stringify "^2.1.0" + graceful-fs "^4.2.9" + jest-haste-map "^29.6.4" + jest-regex-util "^29.6.3" + jest-util "^29.6.3" + micromatch "^4.0.4" + pirates "^4.0.4" + slash "^3.0.0" + write-file-atomic "^4.0.2" + "@jest/types@^29.5.0": version "29.5.0" resolved "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593" @@ -1389,6 +2216,18 @@ "@types/yargs" "^17.0.8" chalk "^4.0.0" +"@jest/types@^29.6.3": + version "29.6.3" + resolved "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59" + integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw== + dependencies: + "@jest/schemas" "^29.6.3" + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^17.0.8" + chalk "^4.0.0" + "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.3" resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" @@ -1403,6 +2242,11 @@ resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== +"@jridgewell/resolve-uri@^3.1.0": + version "3.1.1" + resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" + integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== + "@jridgewell/set-array@^1.0.1": version "1.1.2" resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" @@ -1421,11 +2265,19 @@ resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== -"@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14": version "1.4.15" resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== +"@jridgewell/trace-mapping@^0.3.12": + version "0.3.19" + resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811" + integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.9": version "0.3.18" resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" @@ -1675,11 +2527,6 @@ resolved "https://registry.npmjs.org/@react-leaflet/core/-/core-1.1.1.tgz#827fd05bb542cf874116176d8ef48d5b12163f81" integrity sha512-7PGLWa9MZ5x/cWy8EH2VzI4T8q5WpuHbixzCDXqixP/WyqwIrg5NDUPgYuFnB4IEIZF+6nA265mYzswFo/h1Pw== -"@remix-run/router@1.6.3": - version "1.6.3" - resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.6.3.tgz#8205baf6e17ef93be35bf62c37d2d594e9be0dad" - integrity sha512-EXJysQ7J3veRECd0kZFQwYYd5sJMcq2O/m60zu1W2l3oVQ9xtub8jTOtYRE0+M2iomyG/W3Ps7+vp2kna0C27Q== - "@simonwep/pickr@^1.5.1": version "1.8.2" resolved "https://registry.npmjs.org/@simonwep/pickr/-/pickr-1.8.2.tgz#96dc86675940d7cad63d69c22083dd1cbb9797cb" @@ -1693,11 +2540,30 @@ resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718" integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ== +"@sinclair/typebox@^0.27.8": + version "0.27.8" + resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" + integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== + "@sindresorhus/is@^0.7.0": version "0.7.0" resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== +"@sinonjs/commons@^3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72" + integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^10.0.2": + version "10.3.0" + resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66" + integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA== + dependencies: + "@sinonjs/commons" "^3.0.0" + "@socket.io/component-emitter@~3.1.0": version "3.1.0" resolved "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" @@ -1708,111 +2574,111 @@ resolved "https://registry.npmjs.org/@sphinxxxx/color-conversion/-/color-conversion-2.2.2.tgz#03ecc29279e3c0c832f6185a5bfa3497858ac8ca" integrity sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw== -"@svgr/babel-plugin-add-jsx-attribute@^6.5.1": - version "6.5.1" - resolved "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.1.tgz#74a5d648bd0347bda99d82409d87b8ca80b9a1ba" - integrity sha512-9PYGcXrAxitycIjRmZB+Q0JaN07GZIWaTBIGQzfaZv+qr1n8X1XUEJ5rZ/vx6OVD9RRYlrNnXWExQXcmZeD/BQ== +"@svgr/babel-plugin-add-jsx-attribute@8.0.0": + version "8.0.0" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz#4001f5d5dd87fa13303e36ee106e3ff3a7eb8b22" + integrity sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g== -"@svgr/babel-plugin-remove-jsx-attribute@*": +"@svgr/babel-plugin-remove-jsx-attribute@8.0.0": version "8.0.0" resolved "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz#69177f7937233caca3a1afb051906698f2f59186" integrity sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA== -"@svgr/babel-plugin-remove-jsx-empty-expression@*": +"@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0": version "8.0.0" resolved "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz#c2c48104cfd7dcd557f373b70a56e9e3bdae1d44" integrity sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA== -"@svgr/babel-plugin-replace-jsx-attribute-value@^6.5.1": - version "6.5.1" - resolved "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.1.tgz#fb9d22ea26d2bc5e0a44b763d4c46d5d3f596c60" - integrity sha512-8DPaVVE3fd5JKuIC29dqyMB54sA6mfgki2H2+swh+zNJoynC8pMPzOkidqHOSc6Wj032fhl8Z0TVn1GiPpAiJg== - -"@svgr/babel-plugin-svg-dynamic-title@^6.5.1": - version "6.5.1" - resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.1.tgz#01b2024a2b53ffaa5efceaa0bf3e1d5a4c520ce4" - integrity sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw== - -"@svgr/babel-plugin-svg-em-dimensions@^6.5.1": - version "6.5.1" - resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.5.1.tgz#dd3fa9f5b24eb4f93bcf121c3d40ff5facecb217" - integrity sha512-gWGsiwjb4tw+ITOJ86ndY/DZZ6cuXMNE/SjcDRg+HLuCmwpcjOktwRF9WgAiycTqJD/QXqL2f8IzE2Rzh7aVXA== - -"@svgr/babel-plugin-transform-react-native-svg@^6.5.1": - version "6.5.1" - resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.5.1.tgz#1d8e945a03df65b601551097d8f5e34351d3d305" - integrity sha512-2jT3nTayyYP7kI6aGutkyfJ7UMGtuguD72OjeGLwVNyfPRBD8zQthlvL+fAbAKk5n9ZNcvFkp/b1lZ7VsYqVJg== - -"@svgr/babel-plugin-transform-svg-component@^6.5.1": - version "6.5.1" - resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.5.1.tgz#48620b9e590e25ff95a80f811544218d27f8a250" - integrity sha512-a1p6LF5Jt33O3rZoVRBqdxL350oge54iZWHNI6LJB5tQ7EelvD/Mb1mfBiZNAan0dt4i3VArkFRjA4iObuNykQ== - -"@svgr/babel-preset@^6.5.1": - version "6.5.1" - resolved "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-6.5.1.tgz#b90de7979c8843c5c580c7e2ec71f024b49eb828" - integrity sha512-6127fvO/FF2oi5EzSQOAjo1LE3OtNVh11R+/8FXa+mHx1ptAaS4cknIjnUA7e6j6fwGGJ17NzaTJFUwOV2zwCw== - dependencies: - "@svgr/babel-plugin-add-jsx-attribute" "^6.5.1" - "@svgr/babel-plugin-remove-jsx-attribute" "*" - "@svgr/babel-plugin-remove-jsx-empty-expression" "*" - "@svgr/babel-plugin-replace-jsx-attribute-value" "^6.5.1" - "@svgr/babel-plugin-svg-dynamic-title" "^6.5.1" - "@svgr/babel-plugin-svg-em-dimensions" "^6.5.1" - "@svgr/babel-plugin-transform-react-native-svg" "^6.5.1" - "@svgr/babel-plugin-transform-svg-component" "^6.5.1" - -"@svgr/core@^6.5.1": - version "6.5.1" - resolved "https://registry.npmjs.org/@svgr/core/-/core-6.5.1.tgz#d3e8aa9dbe3fbd747f9ee4282c1c77a27410488a" - integrity sha512-/xdLSWxK5QkqG524ONSjvg3V/FkNyCv538OIBdQqPNaAta3AsXj/Bd2FbvR87yMbXO2hFSWiAe/Q6IkVPDw+mw== - dependencies: - "@babel/core" "^7.19.6" - "@svgr/babel-preset" "^6.5.1" - "@svgr/plugin-jsx" "^6.5.1" +"@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0": + version "8.0.0" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz#8fbb6b2e91fa26ac5d4aa25c6b6e4f20f9c0ae27" + integrity sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ== + +"@svgr/babel-plugin-svg-dynamic-title@8.0.0": + version "8.0.0" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz#1d5ba1d281363fc0f2f29a60d6d936f9bbc657b0" + integrity sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og== + +"@svgr/babel-plugin-svg-em-dimensions@8.0.0": + version "8.0.0" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz#35e08df300ea8b1d41cb8f62309c241b0369e501" + integrity sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g== + +"@svgr/babel-plugin-transform-react-native-svg@8.1.0": + version "8.1.0" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.1.0.tgz#90a8b63998b688b284f255c6a5248abd5b28d754" + integrity sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q== + +"@svgr/babel-plugin-transform-svg-component@8.0.0": + version "8.0.0" + resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz#013b4bfca88779711f0ed2739f3f7efcefcf4f7e" + integrity sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw== + +"@svgr/babel-preset@8.1.0": + version "8.1.0" + resolved "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-8.1.0.tgz#0e87119aecdf1c424840b9d4565b7137cabf9ece" + integrity sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug== + dependencies: + "@svgr/babel-plugin-add-jsx-attribute" "8.0.0" + "@svgr/babel-plugin-remove-jsx-attribute" "8.0.0" + "@svgr/babel-plugin-remove-jsx-empty-expression" "8.0.0" + "@svgr/babel-plugin-replace-jsx-attribute-value" "8.0.0" + "@svgr/babel-plugin-svg-dynamic-title" "8.0.0" + "@svgr/babel-plugin-svg-em-dimensions" "8.0.0" + "@svgr/babel-plugin-transform-react-native-svg" "8.1.0" + "@svgr/babel-plugin-transform-svg-component" "8.0.0" + +"@svgr/core@8.1.0": + version "8.1.0" + resolved "https://registry.npmjs.org/@svgr/core/-/core-8.1.0.tgz#41146f9b40b1a10beaf5cc4f361a16a3c1885e88" + integrity sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA== + dependencies: + "@babel/core" "^7.21.3" + "@svgr/babel-preset" "8.1.0" camelcase "^6.2.0" - cosmiconfig "^7.0.1" + cosmiconfig "^8.1.3" + snake-case "^3.0.4" -"@svgr/hast-util-to-babel-ast@^6.5.1": - version "6.5.1" - resolved "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.5.1.tgz#81800bd09b5bcdb968bf6ee7c863d2288fdb80d2" - integrity sha512-1hnUxxjd83EAxbL4a0JDJoD3Dao3hmjvyvyEV8PzWmLK3B9m9NPlW7GKjFyoWE8nM7HnXzPcmmSyOW8yOddSXw== +"@svgr/hast-util-to-babel-ast@8.0.0": + version "8.0.0" + resolved "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz#6952fd9ce0f470e1aded293b792a2705faf4ffd4" + integrity sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q== dependencies: - "@babel/types" "^7.20.0" + "@babel/types" "^7.21.3" entities "^4.4.0" -"@svgr/plugin-jsx@^6.5.1": - version "6.5.1" - resolved "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-6.5.1.tgz#0e30d1878e771ca753c94e69581c7971542a7072" - integrity sha512-+UdQxI3jgtSjCykNSlEMuy1jSRQlGC7pqBCPvkG/2dATdWo082zHTTK3uhnAju2/6XpE6B5mZ3z4Z8Ns01S8Gw== +"@svgr/plugin-jsx@8.1.0": + version "8.1.0" + resolved "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-8.1.0.tgz#96969f04a24b58b174ee4cd974c60475acbd6928" + integrity sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA== dependencies: - "@babel/core" "^7.19.6" - "@svgr/babel-preset" "^6.5.1" - "@svgr/hast-util-to-babel-ast" "^6.5.1" + "@babel/core" "^7.21.3" + "@svgr/babel-preset" "8.1.0" + "@svgr/hast-util-to-babel-ast" "8.0.0" svg-parser "^2.0.4" -"@svgr/plugin-svgo@^6.5.1": - version "6.5.1" - resolved "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-6.5.1.tgz#0f91910e988fc0b842f88e0960c2862e022abe84" - integrity sha512-omvZKf8ixP9z6GWgwbtmP9qQMPX4ODXi+wzbVZgomNFsUIlHA1sf4fThdwTWSsZGgvGAG6yE+b/F5gWUkcZ/iQ== +"@svgr/plugin-svgo@8.1.0": + version "8.1.0" + resolved "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-8.1.0.tgz#b115b7b967b564f89ac58feae89b88c3decd0f00" + integrity sha512-Ywtl837OGO9pTLIN/onoWLmDQ4zFUycI1g76vuKGEz6evR/ZTJlJuz3G/fIkb6OVBJ2g0o6CGJzaEjfmEo3AHA== dependencies: - cosmiconfig "^7.0.1" - deepmerge "^4.2.2" - svgo "^2.8.0" + cosmiconfig "^8.1.3" + deepmerge "^4.3.1" + svgo "^3.0.2" -"@svgr/webpack@^6.2.1": - version "6.5.1" - resolved "https://registry.npmjs.org/@svgr/webpack/-/webpack-6.5.1.tgz#ecf027814fc1cb2decc29dc92f39c3cf691e40e8" - integrity sha512-cQ/AsnBkXPkEK8cLbv4Dm7JGXq2XrumKnL1dRpJD9rIO2fTIlJI9a1uCciYG1F2aUsox/hJQyNGbt3soDxSRkA== +"@svgr/webpack@^8.1.0": + version "8.1.0" + resolved "https://registry.npmjs.org/@svgr/webpack/-/webpack-8.1.0.tgz#16f1b5346f102f89fda6ec7338b96a701d8be0c2" + integrity sha512-LnhVjMWyMQV9ZmeEy26maJk+8HTIbd59cH4F2MJ439k9DqejRisfFNGAPvRYlKETuh9LrImlS8aKsBgKjMA8WA== dependencies: - "@babel/core" "^7.19.6" - "@babel/plugin-transform-react-constant-elements" "^7.18.12" - "@babel/preset-env" "^7.19.4" + "@babel/core" "^7.21.3" + "@babel/plugin-transform-react-constant-elements" "^7.21.3" + "@babel/preset-env" "^7.20.2" "@babel/preset-react" "^7.18.6" - "@babel/preset-typescript" "^7.18.6" - "@svgr/core" "^6.5.1" - "@svgr/plugin-jsx" "^6.5.1" - "@svgr/plugin-svgo" "^6.5.1" + "@babel/preset-typescript" "^7.21.0" + "@svgr/core" "8.1.0" + "@svgr/plugin-jsx" "8.1.0" + "@svgr/plugin-svgo" "8.1.0" "@szhsin/react-menu@^2.2.0": version "2.3.4" @@ -1822,6 +2688,48 @@ prop-types "^15.7.2" react-transition-state "^1.1.3" +"@testing-library/dom@^8.0.0": + version "8.20.1" + resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.1.tgz#2e52a32e46fc88369eef7eef634ac2a192decd9f" + integrity sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/runtime" "^7.12.5" + "@types/aria-query" "^5.0.1" + aria-query "5.1.3" + chalk "^4.1.0" + dom-accessibility-api "^0.5.9" + lz-string "^1.5.0" + pretty-format "^27.0.2" + +"@testing-library/jest-dom@^6.1.2": + version "6.1.2" + resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.1.2.tgz#3e7422904349223cb1e04968adada63f65f40d5b" + integrity sha512-NP9jl1Q2qDDtx+cqogowtQtmgD2OVs37iMSIsTv5eN5ETRkf26Kj6ugVwA93/gZzzFWQAsgkKkcftDe91BJCkQ== + dependencies: + "@adobe/css-tools" "^4.3.0" + "@babel/runtime" "^7.9.2" + aria-query "^5.0.0" + chalk "^3.0.0" + css.escape "^1.5.1" + dom-accessibility-api "^0.5.6" + lodash "^4.17.15" + redent "^3.0.0" + +"@testing-library/react@12": + version "12.1.5" + resolved "https://registry.npmjs.org/@testing-library/react/-/react-12.1.5.tgz#bb248f72f02a5ac9d949dea07279095fa577963b" + integrity sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg== + dependencies: + "@babel/runtime" "^7.12.5" + "@testing-library/dom" "^8.0.0" + "@types/react-dom" "<18.0.0" + +"@testing-library/user-event@^14.4.3": + version "14.4.3" + resolved "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.4.3.tgz#af975e367743fa91989cd666666aec31a8f50591" + integrity sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q== + "@tokenizer/token@^0.3.0": version "0.3.0" resolved "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276" @@ -1837,6 +2745,44 @@ resolved "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== +"@types/aria-query@^5.0.1": + version "5.0.1" + resolved "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc" + integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q== + +"@types/babel__core@^7.1.14": + version "7.20.1" + resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b" + integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw== + dependencies: + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" + "@types/babel__generator" "*" + "@types/babel__template" "*" + "@types/babel__traverse" "*" + +"@types/babel__generator@*": + version "7.6.4" + resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7" + integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg== + dependencies: + "@babel/types" "^7.0.0" + +"@types/babel__template@*": + version "7.4.1" + resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969" + integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": + version "7.20.1" + resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz#dd6f1d2411ae677dcb2db008c962598be31d6acf" + integrity sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg== + dependencies: + "@babel/types" "^7.20.7" + "@types/classnames@^2.2.6": version "2.3.1" resolved "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.1.tgz#3c2467aa0f1a93f1f021e3b9bcf938bd5dfdc0dd" @@ -1844,18 +2790,6 @@ dependencies: classnames "*" -"@types/cookie@^0.4.1": - version "0.4.1" - resolved "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d" - integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q== - -"@types/cors@^2.8.12": - version "2.8.13" - resolved "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz#b8ade22ba455a1b8cb3b5d3f35910fd204f84f94" - integrity sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA== - dependencies: - "@types/node" "*" - "@types/eslint-scope@^3.7.3": version "3.7.4" resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" @@ -1877,7 +2811,14 @@ resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": +"@types/graceful-fs@^4.1.3": + version "4.1.6" + resolved "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae" + integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw== + dependencies: + "@types/node" "*" + +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.4" resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== @@ -1896,6 +2837,23 @@ dependencies: "@types/istanbul-lib-report" "*" +"@types/jest@^29.5.4": + version "29.5.4" + resolved "https://registry.npmjs.org/@types/jest/-/jest-29.5.4.tgz#9d0a16edaa009a71e6a71a999acd582514dab566" + integrity sha512-PhglGmhWeD46FYOVLt3X7TiWjzwuVGW9wG/4qocPevXMjCmrIc5b6db9WjeGE4QYVpUAWMDv3v0IiBwObY289A== + dependencies: + expect "^29.0.0" + pretty-format "^29.0.0" + +"@types/jsdom@^20.0.0": + version "20.0.1" + resolved "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808" + integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ== + dependencies: + "@types/node" "*" + "@types/tough-cookie" "*" + parse5 "^7.0.0" + "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.12" resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" @@ -1913,7 +2871,7 @@ resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== -"@types/node@*", "@types/node@>=10.0.0": +"@types/node@*": version "20.3.1" resolved "https://registry.npmjs.org/@types/node/-/node-20.3.1.tgz#e8a83f1aa8b649377bb1fb5d7bac5cb90e784dfe" integrity sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg== @@ -1933,7 +2891,7 @@ resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== -"@types/react-dom@^17.0.11": +"@types/react-dom@<18.0.0", "@types/react-dom@^17.0.11": version "17.0.20" resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.20.tgz#e0c8901469d732b36d8473b40b679ad899da1b53" integrity sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA== @@ -1991,6 +2949,11 @@ resolved "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a" integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw== +"@types/stack-utils@^2.0.0": + version "2.0.1" + resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" + integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== + "@types/styled-jsx@^2.2.8": version "2.2.9" resolved "https://registry.npmjs.org/@types/styled-jsx/-/styled-jsx-2.2.9.tgz#e50b3f868c055bcbf9bc353eca6c10fdad32a53f" @@ -1998,6 +2961,11 @@ dependencies: "@types/react" "*" +"@types/tough-cookie@*": + version "4.0.2" + resolved "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" + integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== + "@types/yargs-parser@*": version "21.0.0" resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" @@ -2044,6 +3012,14 @@ "@typescript-eslint/types" "5.60.0" "@typescript-eslint/visitor-keys" "5.60.0" +"@typescript-eslint/scope-manager@5.62.0": + version "5.62.0" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c" + integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w== + dependencies: + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/visitor-keys" "5.62.0" + "@typescript-eslint/type-utils@5.60.0": version "5.60.0" resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.60.0.tgz#69b09087eb12d7513d5b07747e7d47f5533aa228" @@ -2059,6 +3035,11 @@ resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.0.tgz#3179962b28b4790de70e2344465ec97582ce2558" integrity sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA== +"@typescript-eslint/types@5.62.0": + version "5.62.0" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f" + integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== + "@typescript-eslint/typescript-estree@5.60.0": version "5.60.0" resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.0.tgz#4ddf1a81d32a850de66642d9b3ad1e3254fb1600" @@ -2072,6 +3053,19 @@ semver "^7.3.7" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@5.62.0": + version "5.62.0" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b" + integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA== + dependencies: + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/visitor-keys" "5.62.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.3.7" + tsutils "^3.21.0" + "@typescript-eslint/utils@5.60.0": version "5.60.0" resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.60.0.tgz#4667c5aece82f9d4f24a667602f0f300864b554c" @@ -2086,6 +3080,20 @@ eslint-scope "^5.1.1" semver "^7.3.7" +"@typescript-eslint/utils@^5.10.0": + version "5.62.0" + resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86" + integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@types/json-schema" "^7.0.9" + "@types/semver" "^7.3.12" + "@typescript-eslint/scope-manager" "5.62.0" + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/typescript-estree" "5.62.0" + eslint-scope "^5.1.1" + semver "^7.3.7" + "@typescript-eslint/visitor-keys@5.60.0": version "5.60.0" resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.0.tgz#b48b29da3f5f31dd1656281727004589d2722a66" @@ -2094,6 +3102,14 @@ "@typescript-eslint/types" "5.60.0" eslint-visitor-keys "^3.3.0" +"@typescript-eslint/visitor-keys@5.62.0": + version "5.62.0" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e" + integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw== + dependencies: + "@typescript-eslint/types" "5.62.0" + eslint-visitor-keys "^3.3.0" + "@vusion/webfonts-generator@^0.8.0": version "0.8.0" resolved "https://registry.npmjs.org/@vusion/webfonts-generator/-/webfonts-generator-0.8.0.tgz#3ff41b9ec4b83decd87650637ee050741741e794" @@ -2248,28 +3264,6 @@ resolved "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== -"@wojtekmaj/enzyme-adapter-react-17@^0.8.0": - version "0.8.0" - resolved "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.8.0.tgz#138f404f82f502d152242c049e87d9621dcda4bd" - integrity sha512-zeUGfQRziXW7R7skzNuJyi01ZwuKCH8WiBNnTgUJwdS/CURrJwAhWsfW7nG7E30ak8Pu3ZwD9PlK9skBfAoOBw== - dependencies: - "@wojtekmaj/enzyme-adapter-utils" "^0.2.0" - enzyme-shallow-equal "^1.0.0" - has "^1.0.0" - prop-types "^15.7.0" - react-is "^17.0.0" - react-test-renderer "^17.0.0" - -"@wojtekmaj/enzyme-adapter-utils@^0.2.0": - version "0.2.0" - resolved "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-utils/-/enzyme-adapter-utils-0.2.0.tgz#dc2a8c14f92e502da28ea6b3fad96a082076d028" - integrity sha512-ZvZm9kZxZEKAbw+M1/Q3iDuqQndVoN8uLnxZ8bzxm7KgGTBejrGRoJAp8f1EN8eoO3iAjBNEQnTDW/H4Ekb0FQ== - dependencies: - function.prototype.name "^1.1.0" - has "^1.0.0" - object.fromentries "^2.0.0" - prop-types "^15.7.0" - "@xmldom/xmldom@^0.7.2": version "0.7.11" resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.11.tgz#adecc134521274711d071d5b0200907cc83b38ee" @@ -2285,11 +3279,6 @@ resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -FileSaver@^0.10.0: - version "0.10.0" - resolved "https://registry.npmjs.org/FileSaver/-/FileSaver-0.10.0.tgz#7def3889944458042ef5df2e9064c88e3d2281c7" - integrity sha512-W+syaSPuxeh8yRPinETA4RlBO0ZuyM8IQIln8Y/pYZ136+pxqr64/JRx8rDm3uVqvgQ4xIHgAmZoepujBT1mvg== - JSONStream@^1.0.3: version "1.3.5" resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" @@ -2298,24 +3287,29 @@ JSONStream@^1.0.3: jsonparse "^1.2.0" through ">=2.2.7 <3" +abab@^2.0.6: + version "2.0.6" + resolved "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== + abbrev@^1.0.0: version "1.1.1" resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -accepts@~1.3.4: - version "1.3.8" - resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== - dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" - ace-builds@^1.20.0: version "1.23.0" resolved "https://registry.npmjs.org/ace-builds/-/ace-builds-1.23.0.tgz#971bba11ba99cefaa38cf9443d7e9a68ddb3a400" integrity sha512-PKRuQaQkjIhg1zeqJPW1QFtJO2fx13Nlv7N/VLhQS/kIQ/2aGAgWvYVcE9X64gbSiLzPdY3jcxv5wJJpLj1gLw== +acorn-globals@^7.0.0: + version "7.0.1" + resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3" + integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q== + dependencies: + acorn "^8.1.0" + acorn-walk "^8.0.2" + acorn-import-assertions@^1.9.0: version "1.9.0" resolved "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" @@ -2340,7 +3334,7 @@ acorn-walk@^7.0.0: resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn-walk@^8.0.0: +"acorn-walk@^8.0.0", "acorn-walk@^8.0.2": version "8.2.0" resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== @@ -2355,6 +3349,11 @@ acorn@^7.0.0: resolved "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59" integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ== +"acorn@^8.1.0", "acorn@^8.8.1": + version "8.10.0" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" + integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== + "agent-base@6", "agent-base@^6.0.2": version "6.0.2" resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -2398,16 +3397,6 @@ ajv-keywords@^5.1.0: dependencies: fast-deep-equal "^3.1.3" -ajv@^5.0.0: - version "5.5.2" - resolved "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - integrity sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw== - dependencies: - co "^4.6.0" - fast-deep-equal "^1.0.0" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.3.0" - "ajv@^6.10.0", "ajv@^6.12.4", "ajv@^6.12.5", "ajv@^6.12.6": version "6.12.6" resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -2428,10 +3417,12 @@ ajv@^5.0.0: require-from-string "^2.0.2" uri-js "^4.2.2" -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== +ansi-escapes@^4.2.1: + version "4.3.2" + resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== + dependencies: + type-fest "^0.21.3" ansi-regex@^5.0.1: version "5.0.1" @@ -2443,11 +3434,6 @@ ansi-regex@^6.0.1: resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA== - ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -2462,6 +3448,11 @@ ansi-styles@^3.2.1: dependencies: color-convert "^2.0.1" +ansi-styles@^5.0.0: + version "5.2.0" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" + integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== + ansi-styles@^6.1.0: version "6.2.1" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" @@ -2475,7 +3466,7 @@ anti-trojan-source@^1.4.0: globby "^12.0.2" meow "^10.1.1" -anymatch@~3.1.2: +"anymatch@^3.0.3", "anymatch@~3.1.2": version "3.1.3" resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== @@ -2520,6 +3511,20 @@ argparse@^2.0.1: resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== +aria-query@5.1.3: + version "5.1.3" + resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e" + integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ== + dependencies: + deep-equal "^2.0.5" + +aria-query@^5.0.0: + version "5.3.0" + resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e" + integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A== + dependencies: + dequal "^2.0.3" + array-buffer-byte-length@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" @@ -2549,27 +3554,6 @@ array-union@^3.0.1: resolved "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975" integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw== -array.prototype.filter@^1.0.0: - version "1.0.2" - resolved "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.2.tgz#5f90ca6e3d01c31ea8db24c147665541db28bb4c" - integrity sha512-us+UrmGOilqttSOgoWZTpOvHu68vZT2YCjc/H4vhu56vzZpaDFBhB+Se2UwqWzMKbDv7Myq5M5pcZLAtUvTQdQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - es-array-method-boxes-properly "^1.0.0" - is-string "^1.0.7" - -array.prototype.flat@^1.2.3: - version "1.3.1" - resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" - integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - es-shim-unscopables "^1.0.0" - array.prototype.flatmap@^1.3.1: version "1.3.1" resolved "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183" @@ -2591,6 +3575,18 @@ array.prototype.tosorted@^1.1.1: es-shim-unscopables "^1.0.0" get-intrinsic "^1.1.3" +arraybuffer.prototype.slice@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb" + integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw== + 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" + arrify@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -2650,6 +3646,13 @@ async@^3.2.3: resolved "https://registry.npmjs.org/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== +asynciterator.prototype@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz#8c5df0514936cdd133604dfcc9d3fb93f09b2b62" + integrity sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg== + dependencies: + has-symbols "^1.0.3" + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -2678,9 +3681,9 @@ available-typed-arrays@^1.0.5: integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== axios-mock-adapter@^1.17.0: - version "1.21.5" - resolved "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-1.21.5.tgz#dd85081717a759f88509c20515082dc09c1cedd7" - integrity sha512-5NI1V/VK+8+JeTF8niqOowuysA4b8mGzdlMN/QnTnoXbYh4HZSNiopsDclN2g/m85+G++IrEtUdZaQ3GnaMsSA== + version "1.22.0" + resolved "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-1.22.0.tgz#0f3e6be0fc9b55baab06f2d49c0b71157e7c053d" + integrity sha512-dmI0KbkyAhntUR05YY96qg2H6gg0XMl2+qTW0xmYg6Up+BFBAJYRLROMXRdDEL06/Wqwa0TJThAYvFtSFdRCZw== dependencies: fast-deep-equal "^3.1.3" is-buffer "^2.0.5" @@ -2694,28 +3697,18 @@ axios@^1.4.0: form-data "^4.0.0" proxy-from-env "^1.1.0" -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g== +babel-jest@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.4.tgz#98dbc45d1c93319c82a8ab4a478b670655dd2585" + integrity sha512-meLj23UlSLddj6PC+YTOFRgDAtjnZom8w/ACsrx0gtPtv5cJZk0A5Unk5bV4wixD7XaPCN1fQvpww8czkZURmw== dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-generator@^6.18.0: - version "6.26.1" - resolved "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" + "@jest/transform" "^29.6.4" + "@types/babel__core" "^7.1.14" + babel-plugin-istanbul "^6.1.1" + babel-preset-jest "^29.6.3" + chalk "^4.0.0" + graceful-fs "^4.2.9" + slash "^3.0.0" babel-loader@^8.1.0: version "8.3.0" @@ -2727,13 +3720,6 @@ babel-loader@^8.1.0: make-dir "^3.1.0" schema-utils "^2.6.5" -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - integrity sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w== - dependencies: - babel-runtime "^6.22.0" - babel-plugin-emotion@^10.0.27: version "10.2.2" resolved "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz#a1fe3503cff80abfd0bdda14abd2e8e57a79d17d" @@ -2750,6 +3736,27 @@ babel-plugin-emotion@^10.0.27: find-root "^1.1.0" source-map "^0.5.7" +babel-plugin-istanbul@^6.1.1: + version "6.1.1" + resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" + integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@istanbuljs/load-nyc-config" "^1.0.0" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-instrument "^5.0.4" + test-exclude "^6.0.0" + +babel-plugin-jest-hoist@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626" + integrity sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg== + dependencies: + "@babel/template" "^7.3.3" + "@babel/types" "^7.3.3" + "@types/babel__core" "^7.1.14" + "@types/babel__traverse" "^7.0.6" + babel-plugin-macros@^2.0.0: version "2.8.0" resolved "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" @@ -2777,6 +3784,24 @@ babel-plugin-polyfill-corejs2@^0.4.3: "@babel/helper-define-polyfill-provider" "^0.4.0" semver "^6.1.1" +babel-plugin-polyfill-corejs2@^0.4.5: + version "0.4.5" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz#8097b4cb4af5b64a1d11332b6fb72ef5e64a054c" + integrity sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg== + dependencies: + "@babel/compat-data" "^7.22.6" + "@babel/helper-define-polyfill-provider" "^0.4.2" + semver "^6.3.1" + +babel-plugin-polyfill-corejs2@^0.4.6: + version "0.4.6" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz#b2df0251d8e99f229a8e60fc4efa9a68b41c8313" + integrity sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q== + dependencies: + "@babel/compat-data" "^7.22.6" + "@babel/helper-define-polyfill-provider" "^0.4.3" + semver "^6.3.1" + babel-plugin-polyfill-corejs3@^0.8.1: version "0.8.1" resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz#39248263c38191f0d226f928d666e6db1b4b3a8a" @@ -2785,6 +3810,22 @@ babel-plugin-polyfill-corejs3@^0.8.1: "@babel/helper-define-polyfill-provider" "^0.4.0" core-js-compat "^3.30.1" +babel-plugin-polyfill-corejs3@^0.8.3: + version "0.8.3" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz#b4f719d0ad9bb8e0c23e3e630c0c8ec6dd7a1c52" + integrity sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.4.2" + core-js-compat "^3.31.0" + +babel-plugin-polyfill-corejs3@^0.8.5: + version "0.8.6" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz#25c2d20002da91fe328ff89095c85a391d6856cf" + integrity sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.4.3" + core-js-compat "^3.33.1" + babel-plugin-polyfill-regenerator@^0.5.0: version "0.5.0" resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz#e7344d88d9ef18a3c47ded99362ae4a757609380" @@ -2792,6 +3833,20 @@ babel-plugin-polyfill-regenerator@^0.5.0: dependencies: "@babel/helper-define-polyfill-provider" "^0.4.0" +babel-plugin-polyfill-regenerator@^0.5.2: + version "0.5.2" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz#80d0f3e1098c080c8b5a65f41e9427af692dc326" + integrity sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.4.2" + +babel-plugin-polyfill-regenerator@^0.5.3: + version "0.5.3" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz#d4c49e4b44614607c13fb769bcd85c72bb26a4a5" + integrity sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.4.3" + "babel-plugin-styled-components@>= 1.12.0": version "2.1.3" resolved "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.3.tgz#f5616bee99efca6685e500fe45db87f26cb42ba7" @@ -2808,80 +3863,47 @@ babel-plugin-syntax-jsx@^6.18.0: resolved "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" integrity sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw== -"babel-runtime@^6.22.0", "babel-runtime@^6.26.0": - version "6.26.0" - resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-template@^6.16.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - integrity sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg== - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -"babel-traverse@^6.18.0", "babel-traverse@^6.26.0": - version "6.26.0" - resolved "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - integrity sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA== - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -"babel-types@^6.18.0", "babel-types@^6.26.0": - version "6.26.0" - resolved "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - integrity sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g== - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" +babel-preset-current-node-syntax@^1.0.0: + version "1.0.1" + resolved "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" + integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== + dependencies: + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-bigint" "^7.8.3" + "@babel/plugin-syntax-class-properties" "^7.8.3" + "@babel/plugin-syntax-import-meta" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-top-level-await" "^7.8.3" + +babel-preset-jest@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c" + integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA== + dependencies: + babel-plugin-jest-hoist "^29.6.3" + babel-preset-current-node-syntax "^1.0.0" babelify@~10.0.0: version "10.0.0" resolved "https://registry.npmjs.org/babelify/-/babelify-10.0.0.tgz#fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5" integrity sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg== -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64-arraybuffer@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc" - integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ== - "base64-js@^1.0.2", "base64-js@^1.3.1": version "1.5.1" resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -"base64id@2.0.0", "base64id@~2.0.0": - version "2.0.0" - resolved "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" - integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== - big.js@^5.2.2: version "5.2.2" resolved "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -2965,39 +3987,16 @@ bl@^1.0.0: resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -"bn.js@^5.0.0", "bn.js@^5.1.1": +"bn.js@^5.0.0", "bn.js@^5.2.1": version "5.2.1" resolved "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== -body-parser@^1.19.0: - version "1.20.2" - resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" - integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== - dependencies: - bytes "3.1.2" - content-type "~1.0.5" - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - http-errors "2.0.0" - iconv-lite "0.4.24" - on-finished "2.4.1" - qs "6.11.0" - raw-body "2.5.2" - type-is "~1.6.18" - unpipe "1.0.0" - boolbase@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== -bootstrap@^4.3.1: - version "4.6.2" - resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479" - integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ== - bowser@^2.11.0: version "2.11.0" resolved "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f" @@ -3093,7 +4092,7 @@ browserify-des@^1.0.0: inherits "^2.0.1" safe-buffer "^5.1.2" -"browserify-rsa@^4.0.0", "browserify-rsa@^4.0.1": +"browserify-rsa@^4.0.0", "browserify-rsa@^4.1.0": version "4.1.0" resolved "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== @@ -3102,19 +4101,19 @@ browserify-des@^1.0.0: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.2.1" - resolved "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" - integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== + version "4.2.2" + resolved "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz#e78d4b69816d6e3dd1c747e64e9947f9ad79bc7e" + integrity sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg== dependencies: - bn.js "^5.1.1" - browserify-rsa "^4.0.1" + bn.js "^5.2.1" + browserify-rsa "^4.1.0" create-hash "^1.2.0" create-hmac "^1.1.7" - elliptic "^6.5.3" + elliptic "^6.5.4" inherits "^2.0.4" - parse-asn1 "^5.1.5" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" + parse-asn1 "^5.1.6" + readable-stream "^3.6.2" + safe-buffer "^5.2.1" browserify-zlib@~0.2.0: version "0.2.0" @@ -3187,6 +4186,33 @@ browserify@^17.0.0: node-releases "^2.0.12" update-browserslist-db "^1.0.11" +"browserslist@^4.21.10", "browserslist@^4.21.9": + version "4.21.10" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0" + integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ== + dependencies: + caniuse-lite "^1.0.30001517" + electron-to-chromium "^1.4.477" + node-releases "^2.0.13" + update-browserslist-db "^1.0.11" + +browserslist@^4.22.1: + version "4.22.1" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619" + integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ== + dependencies: + caniuse-lite "^1.0.30001541" + electron-to-chromium "^1.4.535" + node-releases "^2.0.13" + update-browserslist-db "^1.0.13" + +bser@2.1.1: + version "2.1.1" + resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" + integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== + dependencies: + node-int64 "^0.4.0" + buffer-alloc-unsafe@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" @@ -3256,11 +4282,6 @@ builtin-status-codes@^3.0.0: resolved "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ== -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" - integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== - cacache@^17.0.0: version "17.1.3" resolved "https://registry.npmjs.org/cacache/-/cacache-17.1.3.tgz#c6ac23bec56516a7c0c52020fd48b4909d7c7044" @@ -3320,6 +4341,11 @@ camelcase-keys@^7.0.0: quick-lru "^5.1.1" type-fest "^1.2.1" +camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + "camelcase@^6.2.0", "camelcase@^6.3.0": version "6.3.0" resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" @@ -3345,6 +4371,16 @@ caniuse-api@^3.0.0: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001506.tgz#35bd814b310a487970c585430e9e80ee23faf14b" integrity sha512-6XNEcpygZMCKaufIcgpQNZNf00GEqc7VQON+9Rd0K1bMYo8xhMZRAo5zpbnbMNizi4YNgIDAFrdykWsvY3H4Hw== +caniuse-lite@^1.0.30001517: + version "1.0.30001527" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001527.tgz#813826554828245ccee776c850566dce12bdeaba" + integrity sha512-YkJi7RwPgWtXVSgK4lG9AHH57nSzvvOp9MesgXmw4Q7n0C3H04L0foHqfxcmSAm5AcWb8dW9AYj2tR7/5GnddQ== + +caniuse-lite@^1.0.30001541: + version "1.0.30001554" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001554.tgz#ba80d88dff9acbc0cd4b7535fc30e0191c5e2e2a" + integrity sha512-A2E3U//MBwbJVzebddm1YfNp7Nud5Ip+IPn4BozBmn4KqVX7AvluoIDFWjsv5OkGnKUXQVmMSoMKLa3ScCblcQ== + "caw@^2.0.0", "caw@^2.0.1": version "2.0.1" resolved "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95" @@ -3355,18 +4391,7 @@ caniuse-api@^3.0.0: tunnel-agent "^0.6.0" url-to-options "^1.0.1" -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.0.0: +"chalk@^2.0.0", "chalk@^2.4.2": version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3375,6 +4400,14 @@ chalk@^2.0.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + "chalk@^4.0.0", "chalk@^4.0.2", "chalk@^4.1.0": version "4.1.2" resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" @@ -3383,6 +4416,11 @@ chalk@^2.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +char-regex@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" + integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== + chart.js@^3.0.0: version "3.9.1" resolved "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz#3abf2c775169c4c71217a107163ac708515924b8" @@ -3395,32 +4433,7 @@ chartjs-plugin-zoom@^2.0.1: dependencies: hammerjs "^2.0.8" -cheerio-select@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4" - integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g== - dependencies: - boolbase "^1.0.0" - css-select "^5.1.0" - css-what "^6.1.0" - domelementtype "^2.3.0" - domhandler "^5.0.3" - domutils "^3.0.1" - -cheerio@^1.0.0-rc.3: - version "1.0.0-rc.12" - resolved "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683" - integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q== - dependencies: - cheerio-select "^2.1.0" - dom-serializer "^2.0.0" - domhandler "^5.0.3" - domutils "^3.0.1" - htmlparser2 "^8.0.1" - parse5 "^7.0.0" - parse5-htmlparser2-tree-adapter "^7.0.0" - -"chokidar@>=3.0.0 <4.0.0", "chokidar@^3.5.1": +"chokidar@>=3.0.0 <4.0.0": version "3.5.3" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -3457,10 +4470,10 @@ ci-info@^3.2.0: inherits "^2.0.1" safe-buffer "^5.0.1" -circular-json-es6@^2.0.1: - version "2.0.2" - resolved "https://registry.npmjs.org/circular-json-es6/-/circular-json-es6-2.0.2.tgz#e4f4a093e49fb4b6aba1157365746112a78bd344" - integrity sha512-ODYONMMNb3p658Zv+Pp+/XPa5s6q7afhz3Tzyvo+VRh9WIrJ64J76ZC4GQxnlye/NesTn09jvOiuE8+xxfpwhQ== +cjs-module-lexer@^1.0.0: + version "1.2.3" + resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107" + integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ== "classnames@*", "classnames@2.x", "classnames@^2.2.1", "classnames@^2.2.5", "classnames@^2.2.6", "classnames@^2.3.1", "classnames@^2.3.2": version "2.3.2" @@ -3472,13 +4485,13 @@ clean-stack@^2.0.0: resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== dependencies: string-width "^4.2.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" wrap-ansi "^7.0.0" clone-deep@^4.0.1: @@ -3519,6 +4532,11 @@ codemirror@^5.59.2: resolved "https://registry.npmjs.org/codemirror/-/codemirror-5.65.13.tgz#c098a6f409db8b5a7c5722788bd9fa3bb2367f2e" integrity sha512-SVWEzKXmbHmTQQWaz03Shrh4nybG0wXx2MEu3FO4ezbPW8IbnZEd5iGHGEffSUaitKYa3i+pHpBsSvw8sPHtzg== +collect-v8-coverage@^1.0.0: + version "1.0.2" + resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9" + integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q== + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -3575,7 +4593,7 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -"commander@^2.19.0", "commander@^2.20.0", "commander@^2.8.1": +"commander@^2.20.0", "commander@^2.8.1": version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -3618,16 +4636,6 @@ config-chain@^1.1.11: ini "^1.3.4" proto-list "~1.2.1" -connect@^3.7.0: - version "3.7.0" - resolved "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" - integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== - dependencies: - debug "2.6.9" - finalhandler "1.1.2" - parseurl "~1.3.3" - utils-merge "1.0.1" - console-browserify@^1.1.0: version "1.2.0" resolved "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" @@ -3650,16 +4658,16 @@ content-disposition@^0.5.2: dependencies: safe-buffer "5.2.1" -content-type@~1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" - integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== - -"convert-source-map@^1.5.0", "convert-source-map@^1.7.0", "convert-source-map@^1.8.0": +"convert-source-map@^1.5.0", "convert-source-map@^1.6.0", "convert-source-map@^1.7.0": version "1.9.0" resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== +convert-source-map@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" + integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== + convert-source-map@~1.1.0: version "1.1.3" resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860" @@ -3673,11 +4681,6 @@ convert-units@^2.3.4: lodash.foreach "2.3.x" lodash.keys "2.3.x" -cookie@~0.4.1: - version "0.4.2" - resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" - integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== - copy-webpack-plugin@^11.0.0: version "11.0.0" resolved "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz#96d4dbdb5f73d02dd72d0528d1958721ab72e04a" @@ -3697,12 +4700,21 @@ copy-webpack-plugin@^11.0.0: dependencies: browserslist "^4.21.5" -core-js@^2.4.0: - version "2.6.12" - resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" - integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== +core-js-compat@^3.31.0: + version "3.32.1" + resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.1.tgz#55f9a7d297c0761a8eb1d31b593e0f5b6ffae964" + integrity sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA== + dependencies: + browserslist "^4.21.10" -"core-js@^3.15.1", "core-js@^3.2.1": +core-js-compat@^3.33.1: + version "3.33.1" + resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.1.tgz#debe80464107d75419e00c2ee29f35982118ff84" + integrity sha512-6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ== + dependencies: + browserslist "^4.22.1" + +core-js@^3.15.1: version "3.31.0" resolved "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz#4471dd33e366c79d8c0977ed2d940821719db344" integrity sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ== @@ -3712,14 +4724,6 @@ core-util-is@~1.0.0: resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== -cors@~2.8.5: - version "2.8.5" - resolved "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" - integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== - dependencies: - object-assign "^4" - vary "^1" - cosmiconfig@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" @@ -3731,7 +4735,7 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.7.2" -"cosmiconfig@^7.0.0", "cosmiconfig@^7.0.1": +cosmiconfig@^7.0.0: version "7.1.0" resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== @@ -3742,6 +4746,16 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.10.0" +cosmiconfig@^8.1.3: + version "8.3.6" + resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3" + integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA== + dependencies: + import-fresh "^3.3.0" + js-yaml "^4.1.0" + parse-json "^5.2.0" + path-type "^4.0.0" + cosmiconfig@^8.2.0: version "8.2.0" resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd" @@ -3846,13 +4860,6 @@ css-declaration-sorter@^6.3.1: resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz#630618adc21724484b3e9505bce812def44000ad" integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew== -css-line-break@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz#bfef660dfa6f5397ea54116bb3cb4873edbc4fa0" - integrity sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w== - dependencies: - utrie "^1.0.2" - css-loader@^6.7.2: version "6.8.1" resolved "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz#0f8f52699f60f5e679eab4ec0fcd68b8e8a50a88" @@ -3947,6 +4954,11 @@ css-vendor@^2.0.8: resolved "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== +css.escape@^1.5.1: + version "1.5.1" + resolved "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb" + integrity sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg== + cssesc@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" @@ -4063,6 +5075,23 @@ csso@^5.0.5: dependencies: css-tree "~2.2.0" +cssom@^0.5.0: + version "0.5.0" + resolved "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" + integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw== + +cssom@~0.3.6: + version "0.3.8" + resolved "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== + +cssstyle@^2.3.0: + version "2.3.0" + resolved "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" + integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== + dependencies: + cssom "~0.3.6" + "csstype@^2.5.2", "csstype@^2.5.7": version "2.6.21" resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e" @@ -4078,11 +5107,6 @@ cubic2quad@^1.2.1: resolved "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.2.1.tgz#2442260b72c02ee4b6a2fe998fcc1c4073622286" integrity sha512-wT5Y7mO8abrV16gnssKdmIhIbA9wSkeMzhh27jAguKrV82i24wER0vL5TGhUJ9dbJNDcigoRZ0IAHFEEEI4THQ== -custom-event@~1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" - integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg== - dagre@^0.8.4: version "0.8.5" resolved "https://registry.npmjs.org/dagre/-/dagre-0.8.5.tgz#ba30b0055dac12b6c1fcc247817442777d06afee" @@ -4096,6 +5120,15 @@ dash-ast@^1.0.0: resolved "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz#12029ba5fb2f8aa6f0a861795b23c1b4b6c27d37" integrity sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA== +data-urls@^3.0.2: + version "3.0.2" + resolved "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" + integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ== + dependencies: + abab "^2.0.6" + whatwg-mimetype "^3.0.0" + whatwg-url "^11.0.0" + date-fns@^2.24.0: version "2.30.0" resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0" @@ -4103,18 +5136,6 @@ date-fns@^2.24.0: dependencies: "@babel/runtime" "^7.21.0" -date-format@^4.0.14: - version "4.0.14" - resolved "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400" - integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg== - -"debug@2.6.9", "debug@^2.6.8": - version "2.6.9" - resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - "debug@4", "debug@^4.1.0", "debug@^4.1.1", "debug@^4.3.2", "debug@^4.3.3", "debug@^4.3.4", "debug@~4.3.1", "debug@~4.3.2": version "4.3.4" resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -4140,6 +5161,11 @@ decamelize@^5.0.0: resolved "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9" integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA== +decimal.js@^10.4.2: + version "10.4.3" + resolved "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" + integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== + decode-uri-component@^0.2.0: version "0.2.2" resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" @@ -4205,24 +5231,46 @@ decompress-unzip@^4.0.1: pify "^2.3.0" strip-dirs "^2.0.0" +dedent@^1.0.0: + version "1.5.1" + resolved "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff" + integrity sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg== + deep-diff@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/deep-diff/-/deep-diff-1.0.2.tgz#afd3d1f749115be965e89c63edc7abb1506b9c26" integrity sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg== -deep-equal-ident@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/deep-equal-ident/-/deep-equal-ident-1.1.1.tgz#06f4b89e53710cd6cea4a7781c7a956642de8dc9" - integrity sha512-aWv7VhTl/Lju1zenOD3E1w8PpUVrTDbwXCHtbSNr+p/uadr49Y1P1ld0W3Pl6gbvIbiRjoCVsqw70UupCNGh6g== +deep-equal@^2.0.5: + version "2.2.2" + resolved "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz#9b2635da569a13ba8e1cc159c2f744071b115daa" + integrity sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA== dependencies: - lodash.isequal "^3.0" + array-buffer-byte-length "^1.0.0" + call-bind "^1.0.2" + es-get-iterator "^1.1.3" + get-intrinsic "^1.2.1" + is-arguments "^1.1.1" + is-array-buffer "^3.0.2" + is-date-object "^1.0.5" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.2" + isarray "^2.0.5" + object-is "^1.1.5" + object-keys "^1.1.1" + object.assign "^4.1.4" + regexp.prototype.flags "^1.5.0" + side-channel "^1.0.4" + which-boxed-primitive "^1.0.2" + which-collection "^1.0.1" + which-typed-array "^1.1.9" deep-is@^0.1.3: version "0.1.4" resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== -deepmerge@^4.2.2: +"deepmerge@^4.2.2", "deepmerge@^4.3.1": version "4.3.1" resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== @@ -4250,7 +5298,7 @@ delegates@^1.0.0: resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== -"depd@2.0.0", "depd@^2.0.0": +depd@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== @@ -4265,6 +5313,11 @@ deps-sort@^2.0.1: subarg "^1.0.0" through2 "^2.0.0" +dequal@^2.0.3: + version "2.0.3" + resolved "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" + integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== + des.js@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz#1d37f5766f3bbff4ee9638e871a8768c173b81da" @@ -4273,17 +5326,10 @@ des.js@^1.0.0: inherits "^2.0.1" minimalistic-assert "^1.0.0" -destroy@1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" - integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== - -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - integrity sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A== - dependencies: - repeating "^2.0.0" +detect-newline@^3.0.0: + version "3.1.0" + resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== detective@^5.2.0: version "5.2.1" @@ -4294,11 +5340,6 @@ detective@^5.2.0: defined "^1.0.0" minimist "^1.2.6" -di@^0.0.1: - version "0.0.1" - resolved "https://registry.npmjs.org/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" - integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA== - diff-arrays-of-objects@^1.1.8: version "1.1.9" resolved "https://registry.npmjs.org/diff-arrays-of-objects/-/diff-arrays-of-objects-1.1.9.tgz#b1f00485684c1bb2ac6610d2f604b51f9679064d" @@ -4307,6 +5348,11 @@ diff-arrays-of-objects@^1.1.8: deep-diff "^1.0.2" lodash 4 +diff-sequences@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921" + integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q== + diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" @@ -4323,11 +5369,6 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -discontinuous-range@1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" - integrity sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ== - dnd-core@14.0.1: version "14.0.1" resolved "https://registry.npmjs.org/dnd-core/-/dnd-core-14.0.1.tgz#76d000e41c494983210fb20a48b835f81a203c2e" @@ -4360,6 +5401,11 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" +"dom-accessibility-api@^0.5.6", "dom-accessibility-api@^0.5.9": + version "0.5.16" + resolved "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz#5a7429e6066eb3664d911e33fb0e45de8eb08453" + integrity sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg== + dom-align@^1.7.0: version "1.12.4" resolved "https://registry.npmjs.org/dom-align/-/dom-align-1.12.4.tgz#3503992eb2a7cfcb2ed3b2a6d21e0b9c00d54511" @@ -4373,16 +5419,6 @@ dom-helpers@^5.0.1: "@babel/runtime" "^7.8.7" csstype "^3.0.2" -dom-serialize@^2.2.1: - version "2.2.1" - resolved "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b" - integrity sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ== - dependencies: - custom-event "~1.0.0" - ent "~2.2.0" - extend "^3.0.0" - void-elements "^2.0.0" - dom-serializer@^1.0.1: version "1.4.1" resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" @@ -4411,6 +5447,13 @@ domain-browser@^1.2.0: resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== +domexception@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" + integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== + dependencies: + webidl-conversions "^7.0.0" + "domhandler@5.0.3", "domhandler@^5.0.2", "domhandler@^5.0.3": version "5.0.3" resolved "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" @@ -4443,6 +5486,14 @@ domutils@^2.8.0: domelementtype "^2.3.0" domhandler "^5.0.3" +dot-case@^3.0.4: + version "3.0.4" + resolved "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" + integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" + download@^6.2.2: version "6.2.5" resolved "https://registry.npmjs.org/download/-/download-6.2.5.tgz#acd6a542e4cd0bb42ca70cfc98c9e43b07039714" @@ -4500,11 +5551,6 @@ eastasianwidth@^0.2.0: resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== - ejs@~3.1.8: version "3.1.9" resolved "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" @@ -4517,7 +5563,17 @@ electron-to-chromium@^1.4.431: resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.437.tgz#d0e73a431a9ade4467f73d48a59d752d91909316" integrity sha512-ZFekRuBOHUXp21wrR5lshT6pZa/KmjkhKBAtmZz4NN5sCWlHOk3kdhiwFINrDBsRLX6FjyBAb1TRN+KBeNlyzQ== -elliptic@^6.5.3: +electron-to-chromium@^1.4.477: + version "1.4.508" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.508.tgz#5641ff2f5ba11df4bd960fe6a2f9f70aa8b9af96" + integrity sha512-FFa8QKjQK/A5QuFr2167myhMesGrhlOBD+3cYNxO9/S4XzHEXesyTD/1/xF644gC8buFPz3ca6G1LOQD0tZrrg== + +electron-to-chromium@^1.4.535: + version "1.4.567" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.567.tgz#c92e8fbc2bd15df3068d92571733a218a5413add" + integrity sha512-8KR114CAYQ4/r5EIEsOmOMqQ9j0MRbJZR3aXD/KFA8RuKzyoUB4XrUCg+l8RUGqTVQgKNIgTpjaG8YHRPAbX2w== + +"elliptic@^6.5.3", "elliptic@^6.5.4": version "6.5.4" resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== @@ -4530,6 +5586,11 @@ elliptic@^6.5.3: minimalistic-assert "^1.0.1" minimalistic-crypto-utils "^1.0.1" +emittery@^0.13.1: + version "0.13.1" + resolved "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad" + integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ== + emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -4545,11 +5606,6 @@ emojis-list@^3.0.0: resolved "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== - encoding@^0.1.13: version "0.1.13" resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" @@ -4580,22 +5636,6 @@ engine.io-parser@~5.1.0: resolved "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.1.0.tgz#d593d6372d7f79212df48f807b8cace1ea1cb1b8" integrity sha512-enySgNiK5tyZFynt3z7iqBR+Bto9EVVVvDFuTT0ioHCGbzirZVGDGiQjZzEp8hWl6hd5FSVytJGuScX1C1C35w== -engine.io@~6.5.0: - version "6.5.0" - resolved "https://registry.npmjs.org/engine.io/-/engine.io-6.5.0.tgz#02b9d9941c0d3ab2d46628e98ac3331dd533dff0" - integrity sha512-UlfoK1iD62Hkedw2TmuHdhDsZCGaAyp+LZ/AvnImjYBeWagA3qIEETum90d6shMeFZiDuGT66zVCdx1wKYKGGg== - dependencies: - "@types/cookie" "^0.4.1" - "@types/cors" "^2.8.12" - "@types/node" ">=10.0.0" - accepts "~1.3.4" - base64id "2.0.0" - cookie "~0.4.1" - cors "~2.8.5" - debug "~4.3.1" - engine.io-parser "~5.1.0" - ws "~8.11.0" - enhanced-resolve@^5.15.0: version "5.15.0" resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" @@ -4604,11 +5644,6 @@ enhanced-resolve@^5.15.0: graceful-fs "^4.2.4" tapable "^2.2.0" -ent@~2.2.0: - version "2.2.0" - resolved "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== - entities@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" @@ -4629,50 +5664,6 @@ envinfo@^7.7.3: resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.9.0.tgz#47594a13081be0d9be6e513534e8c58dbb26c7a1" integrity sha512-RODB4txU+xImYDemN5DqaKC0CHk05XSVkOX4pq0hK26Qx+1LChkuOyUDlGEjYb3ACr0n9qBhFjg37hQuJvpkRQ== -enzyme-matchers@^7.1.2: - version "7.1.2" - resolved "https://registry.npmjs.org/enzyme-matchers/-/enzyme-matchers-7.1.2.tgz#d80530a61f22d28bb993dd7588abba38bd4de282" - integrity sha512-03WqAg2XDl7id9rARIO97HQ1JIw9F2heJ3R4meGu/13hx0ULTDEgl0E67MGl2Uq1jq1DyRnJfto1/VSzskdV5A== - dependencies: - circular-json-es6 "^2.0.1" - deep-equal-ident "^1.1.1" - -"enzyme-shallow-equal@^1.0.0", "enzyme-shallow-equal@^1.0.1": - version "1.0.5" - resolved "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.5.tgz#5528a897a6ad2bdc417c7221a7db682cd01711ba" - integrity sha512-i6cwm7hN630JXenxxJFBKzgLC3hMTafFQXflvzHgPmDhOBhxUWDe8AeRv1qp2/uWJ2Y8z5yLWMzmAfkTOiOCZg== - dependencies: - has "^1.0.3" - object-is "^1.1.5" - -enzyme@^3.11.0: - version "3.11.0" - resolved "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28" - integrity sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw== - dependencies: - array.prototype.flat "^1.2.3" - cheerio "^1.0.0-rc.3" - enzyme-shallow-equal "^1.0.1" - function.prototype.name "^1.1.2" - has "^1.0.3" - html-element-map "^1.2.0" - is-boolean-object "^1.0.1" - is-callable "^1.1.5" - is-number-object "^1.0.4" - is-regex "^1.0.5" - is-string "^1.0.5" - is-subset "^0.1.1" - lodash.escape "^4.0.1" - lodash.isequal "^4.5.0" - object-inspect "^1.7.0" - object-is "^1.0.2" - object.assign "^4.1.0" - object.entries "^1.1.1" - object.values "^1.1.1" - raf "^3.4.1" - rst-selector-parser "^2.2.3" - string.prototype.trim "^1.2.1" - err-code@^2.0.2: version "2.0.3" resolved "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" @@ -4725,10 +5716,81 @@ error-ex@^1.3.1: unbox-primitive "^1.0.2" which-typed-array "^1.1.9" -es-array-method-boxes-properly@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" - integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== +es-abstract@^1.21.3: + version "1.22.1" + resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc" + integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw== + 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" + +es-get-iterator@^1.1.3: + version "1.1.3" + resolved "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6" + integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.3" + has-symbols "^1.0.3" + is-arguments "^1.1.1" + is-map "^2.0.2" + is-set "^2.0.2" + is-string "^1.0.7" + isarray "^2.0.5" + stop-iteration-iterator "^1.0.0" + +es-iterator-helpers@^1.0.12: + version "1.0.12" + resolved "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.12.tgz#272f7270f270f4d63dd8aa718228ffa901fd086e" + integrity sha512-T6Ldv67RYULYtZ1k1omngDTVQSTVNX/ZSjDiwlw0PMokhy8kq2LFElleaEjpvlSaXh9ugJ4zrBgbQ7L+Bjdm3Q== + dependencies: + asynciterator.prototype "^1.0.0" + es-abstract "^1.21.3" + es-set-tostringtag "^2.0.1" + function-bind "^1.1.1" + globalthis "^1.0.3" + 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" es-module-lexer@^1.2.1: version "1.3.0" @@ -4765,35 +5827,53 @@ escalade@^3.1.1: resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== - "escape-string-regexp@^1.0.2", "escape-string-regexp@^1.0.5": version "1.0.5" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== +escodegen@^2.0.0: + version "2.1.0" + resolved "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17" + integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w== + dependencies: + esprima "^4.0.1" + estraverse "^5.2.0" + esutils "^2.0.2" + source-map "~0.6.1" + +eslint-plugin-jest@^27.4.0: + version "27.4.0" + resolved "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.4.0.tgz#3926cca723c40c3d7a3fe0e1fd911eff5e681f50" + integrity sha512-ukVeKmMPAUA5SWjHenvyyXnirKfHKMdOsTZdn5tZx5EW05HGVQwBohigjFZGGj3zuv1cV6hc82FvWv6LdIbkgg== + dependencies: + "@typescript-eslint/utils" "^5.10.0" + eslint-plugin-react-hooks@^4.3.0: version "4.6.0" resolved "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3" integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== -eslint-plugin-react@^7.32.2: - version "7.32.2" - resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz#e71f21c7c265ebce01bcbc9d0955170c55571f10" - integrity sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg== +eslint-plugin-react@^7.33.2: + version "7.33.2" + resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz#69ee09443ffc583927eafe86ffebb470ee737608" + integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw== 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" @@ -4803,7 +5883,7 @@ eslint-plugin-react@^7.32.2: object.values "^1.1.6" prop-types "^15.8.1" resolve "^2.0.0-next.4" - semver "^6.3.0" + semver "^6.3.1" string.prototype.matchall "^4.0.8" eslint-rule-composer@^0.3.0: @@ -4891,7 +5971,7 @@ espree@^9.5.2: acorn-jsx "^5.3.2" eslint-visitor-keys "^3.4.1" -esprima@^4.0.0: +"esprima@^4.0.0", "esprima@^4.0.1": version "4.0.1" resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== @@ -4930,11 +6010,6 @@ eve@~0.5.1: resolved "https://registry.npmjs.org/eve/-/eve-0.5.4.tgz#67d080b9725291d7e389e34c26860dd97f1debaa" integrity sha512-aqprQ9MAOh1t66PrHxDFmMXPlgNO6Uv1uqvxmwjprQV50jaQ2RqO7O1neY4PJwC+hMnkyMDphu2AQPOPZdjQog== -eventemitter3@^4.0.0: - version "4.0.7" - resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" - integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== - "events@^3.0.0", "events@^3.2.0": version "3.3.0" resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" @@ -4986,6 +6061,21 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + execa@^6.0.0: version "6.1.0" resolved "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz#cea16dee211ff011246556388effa0818394fb20" @@ -5008,6 +6098,22 @@ executable@^4.1.0: dependencies: pify "^2.2.0" +exit@^0.1.2: + version "0.1.2" + resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" + integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== + +"expect@^29.0.0", "expect@^29.6.4": + version "29.6.4" + resolved "https://registry.npmjs.org/expect/-/expect-29.6.4.tgz#a6e6f66d4613717859b2fe3da98a739437b6f4b8" + integrity sha512-F2W2UyQ8XYyftHT57dtfg8Ue3X5qLgm2sSug0ivvLRH/VKNRL/pDxg/TH7zVzbQB0tu80clNFy6LU7OS/VSEKA== + dependencies: + "@jest/expect-utils" "^29.6.4" + jest-get-type "^29.6.3" + jest-matcher-utils "^29.6.4" + jest-message-util "^29.6.3" + jest-util "^29.6.3" + exponential-backoff@^3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6" @@ -5035,16 +6141,6 @@ ext-name@^5.0.0: ext-list "^2.0.0" sort-keys-length "^1.0.0" -extend@^3.0.0: - version "3.0.2" - resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -fast-deep-equal@^1.0.0: - version "1.1.0" - resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" - integrity sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw== - "fast-deep-equal@^3.1.1", "fast-deep-equal@^3.1.3": version "3.1.3" resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -5061,7 +6157,7 @@ fast-deep-equal@^1.0.0: merge2 "^1.3.0" micromatch "^4.0.4" -fast-json-stable-stringify@^2.0.0: +"fast-json-stable-stringify@^2.0.0", "fast-json-stable-stringify@^2.1.0": version "2.1.0" resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== @@ -5093,6 +6189,13 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" +fb-watchman@^2.0.0: + version "2.0.2" + resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c" + integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA== + dependencies: + bser "2.1.1" + fd-slicer@~1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" @@ -5181,19 +6284,6 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -finalhandler@1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - find-cache-dir@^3.3.1: version "3.3.2" resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" @@ -5208,7 +6298,7 @@ find-root@^1.1.0: resolved "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== -find-up@^4.0.0: +"find-up@^4.0.0", "find-up@^4.1.0": version "4.1.0" resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== @@ -5239,12 +6329,12 @@ flat-cache@^3.0.4: flatted "^3.1.0" rimraf "^3.0.2" -"flatted@^3.1.0", "flatted@^3.2.7": +flatted@^3.1.0: version "3.2.7" resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== -"follow-redirects@^1.0.0", "follow-redirects@^1.15.0": +follow-redirects@^1.15.0: version "1.15.2" resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== @@ -5291,15 +6381,6 @@ fs-constants@^1.0.0: resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -5319,6 +6400,13 @@ fs.realpath@^1.0.0: resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== +fsevents@^2.3.2: + version "2.3.3" + resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + dependencies: + node-gyp latest + fsevents@~2.3.2: version "2.3.2" resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" @@ -5331,7 +6419,7 @@ function-bind@^1.1.1: resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -"function.prototype.name@^1.1.0", "function.prototype.name@^1.1.2", "function.prototype.name@^1.1.5": +function.prototype.name@^1.1.5: version "1.1.5" resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== @@ -5380,7 +6468,7 @@ get-caller-file@^2.0.5: resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -"get-intrinsic@^1.0.2", "get-intrinsic@^1.1.1", "get-intrinsic@^1.1.3", "get-intrinsic@^1.2.0": +"get-intrinsic@^1.0.2", "get-intrinsic@^1.1.1", "get-intrinsic@^1.1.3", "get-intrinsic@^1.2.0", "get-intrinsic@^1.2.1": version "1.2.1" resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== @@ -5390,6 +6478,11 @@ get-caller-file@^2.0.5: has-proto "^1.0.1" has-symbols "^1.0.3" +get-package-type@^0.1.0: + version "0.1.0" + resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" + integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== + get-proxy@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz#349f2b4d91d44c4d4d4e9cba2ad90143fac5ef93" @@ -5417,7 +6510,7 @@ get-stream@^4.0.0: dependencies: pump "^3.0.0" -get-stream@^6.0.1: +"get-stream@^6.0.0", "get-stream@^6.0.1": version "6.0.1" resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== @@ -5460,7 +6553,7 @@ glob@^10.2.2: minipass "^5.0.0 || ^6.0.2" path-scurry "^1.7.0" -"glob@^7.1.0", "glob@^7.1.3", "glob@^7.1.4", "glob@^7.1.6", "glob@^7.1.7": +"glob@^7.1.0", "glob@^7.1.3", "glob@^7.1.4", "glob@^7.1.6": version "7.2.3" resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -5484,11 +6577,6 @@ globals@^13.19.0: dependencies: type-fest "^0.20.2" -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== - globalthis@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" @@ -5581,7 +6669,7 @@ got@^8.3.1: url-parse-lax "^3.0.0" url-to-options "^1.0.1" -"graceful-fs@^4.1.10", "graceful-fs@^4.1.2", "graceful-fs@^4.1.6", "graceful-fs@^4.2.0", "graceful-fs@^4.2.10", "graceful-fs@^4.2.4", "graceful-fs@^4.2.6", "graceful-fs@^4.2.8", "graceful-fs@^4.2.9": +"graceful-fs@^4.1.10", "graceful-fs@^4.1.2", "graceful-fs@^4.2.4", "graceful-fs@^4.2.6", "graceful-fs@^4.2.8", "graceful-fs@^4.2.9": version "4.2.11" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -5631,13 +6719,6 @@ hard-rejection@^2.1.0: resolved "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg== - dependencies: - ansi-regex "^2.0.0" - "has-bigints@^1.0.1", "has-bigints@^1.0.2": version "1.0.2" resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" @@ -5718,11 +6799,6 @@ hash-base@^3.0.0: inherits "^2.0.3" minimalistic-assert "^1.0.1" -hat@^0.0.3: - version "0.0.3" - resolved "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a" - integrity sha512-zpImx2GoKXy42fVDSEad2BPKuSQdLcqsCYa48K3zHSzM/ugWuYjLDr8IXxpVuL7uCLHw56eaiLxCRthhOzf5ug== - heap@0.2.5: version "0.2.5" resolved "https://registry.npmjs.org/heap/-/heap-0.2.5.tgz#713b65590ebcc40fcbeeaf55e851694092b39af1" @@ -5751,44 +6827,40 @@ hosted-git-info@^4.0.1: dependencies: lru-cache "^6.0.0" -html-dom-parser@4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-4.0.0.tgz#dc382fbbc9306f8c9b5aae4e3f2822e113a48709" - integrity sha512-TUa3wIwi80f5NF8CVWzkopBVqVAtlawUzJoLwVLHns0XSJGynss4jiY0mTWpiDOsuyw+afP+ujjMgRh9CoZcXw== +html-dom-parser@5.0.4: + version "5.0.4" + resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-5.0.4.tgz#2941a762317d088e747db31c8cf290987ec30a55" + integrity sha512-azy8THLKd4Ar0OVJpEgX+MSjYvKdNDWlGiRBIlovMqEQYMAnLLXBhhiSwjylDD3RDdcCYT8Utg6uoRDeLHUyHg== dependencies: domhandler "5.0.3" htmlparser2 "9.0.0" -html-element-map@^1.2.0: - version "1.3.1" - resolved "https://registry.npmjs.org/html-element-map/-/html-element-map-1.3.1.tgz#44b2cbcfa7be7aa4ff59779e47e51012e1c73c08" - integrity sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg== +html-encoding-sniffer@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" + integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== dependencies: - array.prototype.filter "^1.0.0" - call-bind "^1.0.2" + whatwg-encoding "^2.0.0" html-escaper@^2.0.0: version "2.0.2" resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-react-parser@^4.2.0: - version "4.2.0" - resolved "https://registry.npmjs.org/html-react-parser/-/html-react-parser-4.2.0.tgz#9168eda80dbfe0335a87fde3fb3ed6c2e91b1188" - integrity sha512-gzU55AS+FI6qD7XaKe5BLuLFM2Xw0/LodfMWZlxV9uOHe7LCD5Lukx/EgYuBI3c0kLu0XlgFXnSzO0qUUn3Vrg== +html-react-parser@^5.0.6: + version "5.0.6" + resolved "https://registry.npmjs.org/html-react-parser/-/html-react-parser-5.0.6.tgz#ee9e8ae404aa38cfbaf3825cb26fabced46024a1" + integrity sha512-aPSzFhO2bK/L/mYQbMwFz+1QG8nhxozbwENt/52HTApasrBvDX87MFD5uSQIjq7Io0bnKzH4uh7PM42zZ4ag9A== dependencies: domhandler "5.0.3" - html-dom-parser "4.0.0" - react-property "2.0.0" - style-to-js "1.1.3" + html-dom-parser "5.0.4" + react-property "2.0.2" + style-to-js "1.1.9" -html2canvas@^1.0.0-rc.7: - version "1.4.1" - resolved "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz#7cef1888311b5011d507794a066041b14669a543" - integrity sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA== - dependencies: - css-line-break "^2.1.0" - text-segmentation "^1.0.3" +html-to-image@^1.11.11: + version "1.11.11" + resolved "https://registry.npmjs.org/html-to-image/-/html-to-image-1.11.11.tgz#c0f8a34dc9e4b97b93ff7ea286eb8562642ebbea" + integrity sha512-9gux8QhvjRO/erSnDPv28noDZcPZmYE7e1vFsBLKLlRlKDSqNJYebj6Qz1TGd5lsRV+X+xYyjCKjuZdABinWjA== htmlescape@^1.1.0: version "1.1.1" @@ -5805,16 +6877,6 @@ htmlparser2@9.0.0: domutils "^3.1.0" entities "^4.5.0" -htmlparser2@^8.0.1: - version "8.0.2" - resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21" - integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.3" - domutils "^3.0.1" - entities "^4.4.0" - http-cache-semantics@3.8.1: version "3.8.1" resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" @@ -5825,17 +6887,6 @@ http-cache-semantics@^4.1.1: resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== -http-errors@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" - integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== - dependencies: - depd "2.0.0" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses "2.0.1" - toidentifier "1.0.1" - http-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" @@ -5845,21 +6896,12 @@ http-proxy-agent@^5.0.0: agent-base 6 debug 4 -http-proxy@^1.18.1: - version "1.18.1" - resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" - integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== - dependencies: - eventemitter3 "^4.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" - https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg== -https-proxy-agent@^5.0.0: +"https-proxy-agent@^5.0.0", "https-proxy-agent@^5.0.1": version "5.0.1" resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== @@ -5867,6 +6909,11 @@ https-proxy-agent@^5.0.0: agent-base 6 debug 4 +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + human-signals@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz#c740920859dafa50e5a3222da9d3bf4bb0e5eef5" @@ -5884,14 +6931,7 @@ hyphenate-style-name@^1.0.3: resolved "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -iconv-lite@^0.6.2: +"iconv-lite@0.6.3", "iconv-lite@^0.6.2": version "0.6.3" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== @@ -5962,7 +7002,7 @@ immutable@^4.0.0: resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be" integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg== -"import-fresh@^3.0.0", "import-fresh@^3.1.0", "import-fresh@^3.2.1": +"import-fresh@^3.0.0", "import-fresh@^3.1.0", "import-fresh@^3.2.1", "import-fresh@^3.3.0": version "3.3.0" resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -6014,7 +7054,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy 1 -"inherits@2", "inherits@2.0.4", "inherits@^2.0.1", "inherits@^2.0.3", "inherits@^2.0.4", "inherits@~2.0.1", "inherits@~2.0.3", "inherits@~2.0.4": +"inherits@2", "inherits@^2.0.1", "inherits@^2.0.3", "inherits@^2.0.4", "inherits@~2.0.1", "inherits@~2.0.3", "inherits@~2.0.4": version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -6036,10 +7076,10 @@ inline-source-map@~0.6.0: dependencies: source-map "~0.5.3" -inline-style-parser@0.1.1: - version "0.1.1" - resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1" - integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q== +inline-style-parser@0.2.2: + version "0.2.2" + resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.2.tgz#d498b4e6de0373458fc610ff793f6b14ebf45633" + integrity sha512-EcKzdTHVe8wFVOGEYXiW9WmJXPjqi1T+234YpJr98RiFYKHV3cdy1+3mkTE+KHTHxFFLH51SfaGOoUdW+v7ViQ== insert-if@^1.1.0: version "1.2.0" @@ -6062,7 +7102,7 @@ insert-module-globals@^7.2.1: undeclared-identifiers "^1.1.2" xtend "^4.0.0" -"internal-slot@^1.0.3", "internal-slot@^1.0.5": +"internal-slot@^1.0.3", "internal-slot@^1.0.4", "internal-slot@^1.0.5": version "1.0.5" resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== @@ -6084,13 +7124,6 @@ into-stream@^3.1.0: from2 "^2.1.1" p-is-promise "^1.1.0" -invariant@^2.2.2: - version "2.2.4" - resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" - integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== - dependencies: - loose-envify "^1.0.0" - ip-address@^7.1.0: version "7.1.0" resolved "https://registry.npmjs.org/ip-address/-/ip-address-7.1.0.tgz#4a9c699e75b51cbeb18b38de8ed216efa1a490c5" @@ -6109,7 +7142,7 @@ is-any-array@^2.0.0: resolved "https://registry.npmjs.org/is-any-array/-/is-any-array-2.0.1.tgz#9233242a9c098220290aa2ec28f82ca7fa79899e" integrity sha512-UtilS7hLRu++wb/WBAw9bNuP1Eg04Ivn1vERJck8zJthEvXCBEBpGR/33u/xLKWEQf95803oalHrVDptcAvFdQ== -is-arguments@^1.0.4: +"is-arguments@^1.0.4", "is-arguments@^1.1.1": version "1.1.1" resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== @@ -6131,6 +7164,13 @@ is-arrayish@^0.2.1: resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== +is-async-function@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646" + integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA== + dependencies: + has-tostringtag "^1.0.0" + is-bigint@^1.0.1: version "1.0.4" resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" @@ -6145,7 +7185,7 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -"is-boolean-object@^1.0.1", "is-boolean-object@^1.1.0": +is-boolean-object@^1.1.0: version "1.1.2" resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== @@ -6163,7 +7203,7 @@ is-buffer@^2.0.5: resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== -"is-callable@^1.1.3", "is-callable@^1.1.4", "is-callable@^1.1.5", "is-callable@^1.2.7": +"is-callable@^1.1.3", "is-callable@^1.1.4", "is-callable@^1.2.7": version "1.2.7" resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== @@ -6175,7 +7215,14 @@ is-buffer@^2.0.5: dependencies: has "^1.0.3" -is-date-object@^1.0.1: +is-core-module@^2.13.0: + version "2.13.0" + resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db" + integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ== + dependencies: + has "^1.0.3" + +"is-date-object@^1.0.1", "is-date-object@^1.0.5": version "1.0.5" resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== @@ -6192,17 +7239,24 @@ is-extglob@^2.1.1: resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== -is-finite@^1.0.0: - version "1.1.0" - resolved "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" - integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== +is-finalizationregistry@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6" + integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw== + dependencies: + call-bind "^1.0.2" is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-generator-function@^1.0.7: +is-generator-fn@^2.0.0: + version "2.1.0" + resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" + integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== + +"is-generator-function@^1.0.10", "is-generator-function@^1.0.7": version "1.0.10" resolved "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== @@ -6231,6 +7285,11 @@ is-lambda@^1.0.1: resolved "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== +"is-map@^2.0.1", "is-map@^2.0.2": + version "2.0.2" + resolved "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" + integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== + is-natural-number@^4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" @@ -6280,7 +7339,12 @@ is-png@^2.0.0: resolved "https://registry.npmjs.org/is-png/-/is-png-2.0.0.tgz#ee8cbc9e9b050425cedeeb4a6fb74a649b0a4a8d" integrity sha512-4KPGizaVGj2LK7xwJIz8o5B2ubu1D/vcQsgOGFEDlpcvgZHto4gBnyd0ig7Ws+67ixmwKoNmu0hYnpo6AaKb5g== -"is-regex@^1.0.5", "is-regex@^1.1.4": +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== + +is-regex@^1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== @@ -6300,6 +7364,11 @@ is-relative@^1.0.0: resolved "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== +"is-set@^2.0.1", "is-set@^2.0.2": + version "2.0.2" + resolved "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" + integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== + is-shared-array-buffer@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" @@ -6312,6 +7381,11 @@ is-shared-array-buffer@^1.0.2: resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + is-stream@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" @@ -6324,11 +7398,6 @@ is-stream@^3.0.0: dependencies: has-tostringtag "^1.0.0" -is-subset@^0.1.1: - version "0.1.1" - resolved "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" - integrity sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw== - "is-symbol@^1.0.2", "is-symbol@^1.0.3": version "1.0.4" resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" @@ -6354,6 +7423,11 @@ is-unc-path@^1.0.0: dependencies: unc-path-regex "^0.1.2" +is-weakmap@^2.0.1: + version "2.0.1" + resolved "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" + integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== + is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" @@ -6361,21 +7435,29 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" +is-weakset@^2.0.1: + version "2.0.2" + resolved "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" + integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + isarray@0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== +isarray@^2.0.5: + version "2.0.5" + resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" + integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== + isarray@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== -isbinaryfile@^4.0.8: - version "4.0.10" - resolved "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" - integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== - isexe@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -6386,40 +7468,12 @@ isobject@^3.0.1: resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== -istanbul-instrumenter-loader@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz#9957bd59252b373fae5c52b7b5188e6fde2a0949" - integrity sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w== - dependencies: - convert-source-map "^1.5.0" - istanbul-lib-instrument "^1.7.3" - loader-utils "^1.1.0" - schema-utils "^0.3.0" - -istanbul-lib-coverage@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0" - integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ== - "istanbul-lib-coverage@^3.0.0", "istanbul-lib-coverage@^3.2.0": version "3.2.0" resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== -istanbul-lib-instrument@^1.7.3: - version "1.10.2" - resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca" - integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A== - dependencies: - babel-generator "^6.18.0" - babel-template "^6.16.0" - babel-traverse "^6.18.0" - babel-types "^6.18.0" - babylon "^6.18.0" - istanbul-lib-coverage "^1.2.1" - semver "^5.3.0" - -istanbul-lib-instrument@^5.1.0: +istanbul-lib-instrument@^5.0.4: version "5.2.1" resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== @@ -6430,6 +7484,17 @@ istanbul-lib-instrument@^5.1.0: istanbul-lib-coverage "^3.2.0" semver "^6.3.0" +istanbul-lib-instrument@^6.0.0: + version "6.0.0" + resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.0.tgz#7a8af094cbfff1d5bb280f62ce043695ae8dd5b8" + integrity sha512-x58orMzEVfzPUKqlbLd1hXCnySCxKdDKa6Rjg97CwuLLRI4g3FHTdnExu1OqffVFay6zeMW+T6/DowFLndWnIw== + dependencies: + "@babel/core" "^7.12.3" + "@babel/parser" "^7.14.7" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.2.0" + semver "^7.5.4" + istanbul-lib-report@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" @@ -6439,7 +7504,7 @@ istanbul-lib-report@^3.0.0: make-dir "^3.0.0" supports-color "^7.1.0" -istanbul-lib-source-maps@^4.0.1: +istanbul-lib-source-maps@^4.0.0: version "4.0.1" resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551" integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw== @@ -6448,10 +7513,10 @@ istanbul-lib-source-maps@^4.0.1: istanbul-lib-coverage "^3.0.0" source-map "^0.6.1" -istanbul-reports@^3.0.5: - version "3.1.5" - resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae" - integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w== +istanbul-reports@^3.1.3: + version "3.1.6" + resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a" + integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" @@ -6464,6 +7529,17 @@ isurl@^1.0.0-alpha5: has-to-string-tag-x "^1.2.0" is-object "^1.0.1" +iterator.prototype@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.0.tgz#690c88b043d821f783843aaf725d7ac3b62e3b46" + integrity sha512-rjuhAk1AJ1fssphHD0IFV6TWL40CwRZ53FrztKx43yk2v6rguBYsY4Bj1VU4HmoMmKwZUlx7mfnhDf9cOp4YTw== + 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" + jackspeak@^2.0.3: version "2.2.1" resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.1.tgz#655e8cf025d872c9c03d3eb63e8f0c024fef16a6" @@ -6482,23 +7558,325 @@ jake@^10.8.5: filelist "^1.0.4" minimatch "^3.1.2" -"jasmine-core@3.10.1", "jasmine-core@^3.6.0": - version "3.10.1" - resolved "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.10.1.tgz#7aa6fa2b834a522315c651a128d940eca553989a" - integrity sha512-ooZWSDVAdh79Rrj4/nnfklL3NQVra0BcuhcuWoAwwi+znLDoUeH87AFfeX8s+YeYi6xlv5nveRyaA1v7CintfA== - -jasmine-enzyme@^7.1.2: - version "7.1.2" - resolved "https://registry.npmjs.org/jasmine-enzyme/-/jasmine-enzyme-7.1.2.tgz#a09ad4644841b2e402046dee5526253b961efa0f" - integrity sha512-4C9GeKgcJerRWBOt3nu9MAjjm5DK8kRbCBKLNWvDjbSfLWodomfjZA2lIpRcJkmof9tIfff2ZWa7DD53WLhyGA== - dependencies: - enzyme-matchers "^7.1.2" - javascript-natural-sort@^0.7.1: version "0.7.1" resolved "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" integrity sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw== +jest-changed-files@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.6.3.tgz#97cfdc93f74fb8af2a1acb0b78f836f1fb40c449" + integrity sha512-G5wDnElqLa4/c66ma5PG9eRjE342lIbF6SUnTJi26C3J28Fv2TVY2rOyKB9YGbSA5ogwevgmxc4j4aVjrEK6Yg== + dependencies: + execa "^5.0.0" + jest-util "^29.6.3" + p-limit "^3.1.0" + +jest-circus@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.4.tgz#f074c8d795e0cc0f2ebf0705086b1be6a9a8722f" + integrity sha512-YXNrRyntVUgDfZbjXWBMPslX1mQ8MrSG0oM/Y06j9EYubODIyHWP8hMUbjbZ19M3M+zamqEur7O80HODwACoJw== + dependencies: + "@jest/environment" "^29.6.4" + "@jest/expect" "^29.6.4" + "@jest/test-result" "^29.6.4" + "@jest/types" "^29.6.3" + "@types/node" "*" + chalk "^4.0.0" + co "^4.6.0" + dedent "^1.0.0" + is-generator-fn "^2.0.0" + jest-each "^29.6.3" + jest-matcher-utils "^29.6.4" + jest-message-util "^29.6.3" + jest-runtime "^29.6.4" + jest-snapshot "^29.6.4" + jest-util "^29.6.3" + p-limit "^3.1.0" + pretty-format "^29.6.3" + pure-rand "^6.0.0" + slash "^3.0.0" + stack-utils "^2.0.3" + +jest-cli@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.4.tgz#ad52f2dfa1b0291de7ec7f8d7c81ac435521ede0" + integrity sha512-+uMCQ7oizMmh8ZwRfZzKIEszFY9ksjjEQnTEMTaL7fYiL3Kw4XhqT9bYh+A4DQKUb67hZn2KbtEnDuHvcgK4pQ== + dependencies: + "@jest/core" "^29.6.4" + "@jest/test-result" "^29.6.4" + "@jest/types" "^29.6.3" + chalk "^4.0.0" + exit "^0.1.2" + graceful-fs "^4.2.9" + import-local "^3.0.2" + jest-config "^29.6.4" + jest-util "^29.6.3" + jest-validate "^29.6.3" + prompts "^2.0.1" + yargs "^17.3.1" + +jest-config@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-config/-/jest-config-29.6.4.tgz#eff958ee41d4e1ee7a6106d02b74ad9fc427d79e" + integrity sha512-JWohr3i9m2cVpBumQFv2akMEnFEPVOh+9L2xIBJhJ0zOaci2ZXuKJj0tgMKQCBZAKA09H049IR4HVS/43Qb19A== + dependencies: + "@babel/core" "^7.11.6" + "@jest/test-sequencer" "^29.6.4" + "@jest/types" "^29.6.3" + babel-jest "^29.6.4" + chalk "^4.0.0" + ci-info "^3.2.0" + deepmerge "^4.2.2" + glob "^7.1.3" + graceful-fs "^4.2.9" + jest-circus "^29.6.4" + jest-environment-node "^29.6.4" + jest-get-type "^29.6.3" + jest-regex-util "^29.6.3" + jest-resolve "^29.6.4" + jest-runner "^29.6.4" + jest-util "^29.6.3" + jest-validate "^29.6.3" + micromatch "^4.0.4" + parse-json "^5.2.0" + pretty-format "^29.6.3" + slash "^3.0.0" + strip-json-comments "^3.1.1" + +jest-diff@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.4.tgz#85aaa6c92a79ae8cd9a54ebae8d5b6d9a513314a" + integrity sha512-9F48UxR9e4XOEZvoUXEHSWY4qC4zERJaOfrbBg9JpbJOO43R1vN76REt/aMGZoY6GD5g84nnJiBIVlscegefpw== + dependencies: + chalk "^4.0.0" + diff-sequences "^29.6.3" + jest-get-type "^29.6.3" + pretty-format "^29.6.3" + +jest-docblock@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.6.3.tgz#293dca5188846c9f7c0c2b1bb33e5b11f21645f2" + integrity sha512-2+H+GOTQBEm2+qFSQ7Ma+BvyV+waiIFxmZF5LdpBsAEjWX8QYjSCa4FrkIYtbfXUJJJnFCYrOtt6TZ+IAiTjBQ== + dependencies: + detect-newline "^3.0.0" + +jest-each@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/jest-each/-/jest-each-29.6.3.tgz#1956f14f5f0cb8ae0b2e7cabc10bb03ec817c142" + integrity sha512-KoXfJ42k8cqbkfshW7sSHcdfnv5agDdHCPA87ZBdmHP+zJstTJc0ttQaJ/x7zK6noAL76hOuTIJ6ZkQRS5dcyg== + dependencies: + "@jest/types" "^29.6.3" + chalk "^4.0.0" + jest-get-type "^29.6.3" + jest-util "^29.6.3" + pretty-format "^29.6.3" + +jest-environment-jsdom@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.4.tgz#0daf44454041f9e1ef7fa82eb1bd43426a82eb1c" + integrity sha512-K6wfgUJ16DoMs02JYFid9lOsqfpoVtyJxpRlnTxUHzvZWBnnh2VNGRB9EC1Cro96TQdq5TtSjb3qUjNaJP9IyA== + dependencies: + "@jest/environment" "^29.6.4" + "@jest/fake-timers" "^29.6.4" + "@jest/types" "^29.6.3" + "@types/jsdom" "^20.0.0" + "@types/node" "*" + jest-mock "^29.6.3" + jest-util "^29.6.3" + jsdom "^20.0.0" + +jest-environment-node@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.4.tgz#4ce311549afd815d3cafb49e60a1e4b25f06d29f" + integrity sha512-i7SbpH2dEIFGNmxGCpSc2w9cA4qVD+wfvg2ZnfQ7XVrKL0NA5uDVBIiGH8SR4F0dKEv/0qI5r+aDomDf04DpEQ== + dependencies: + "@jest/environment" "^29.6.4" + "@jest/fake-timers" "^29.6.4" + "@jest/types" "^29.6.3" + "@types/node" "*" + jest-mock "^29.6.3" + jest-util "^29.6.3" + +jest-get-type@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1" + integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw== + +jest-haste-map@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.4.tgz#97143ce833829157ea7025204b08f9ace609b96a" + integrity sha512-12Ad+VNTDHxKf7k+M65sviyynRoZYuL1/GTuhEVb8RYsNSNln71nANRb/faSyWvx0j+gHcivChXHIoMJrGYjog== + dependencies: + "@jest/types" "^29.6.3" + "@types/graceful-fs" "^4.1.3" + "@types/node" "*" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + fsevents "^2.3.2" + graceful-fs "^4.2.9" + jest-regex-util "^29.6.3" + jest-util "^29.6.3" + jest-worker "^29.6.4" + micromatch "^4.0.4" + walker "^1.0.8" + +jest-leak-detector@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.3.tgz#b9661bc3aec8874e59aff361fa0c6d7cd507ea01" + integrity sha512-0kfbESIHXYdhAdpLsW7xdwmYhLf1BRu4AA118/OxFm0Ho1b2RcTmO4oF6aAMaxpxdxnJ3zve2rgwzNBD4Zbm7Q== + dependencies: + jest-get-type "^29.6.3" + pretty-format "^29.6.3" + +jest-matcher-utils@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.4.tgz#327db7ababea49455df3b23e5d6109fe0c709d24" + integrity sha512-KSzwyzGvK4HcfnserYqJHYi7sZVqdREJ9DMPAKVbS98JsIAvumihaNUbjrWw0St7p9IY7A9UskCW5MYlGmBQFQ== + dependencies: + chalk "^4.0.0" + jest-diff "^29.6.4" + jest-get-type "^29.6.3" + pretty-format "^29.6.3" + +jest-message-util@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.3.tgz#bce16050d86801b165f20cfde34dc01d3cf85fbf" + integrity sha512-FtzaEEHzjDpQp51HX4UMkPZjy46ati4T5pEMyM6Ik48ztu4T9LQplZ6OsimHx7EuM9dfEh5HJa6D3trEftu3dA== + dependencies: + "@babel/code-frame" "^7.12.13" + "@jest/types" "^29.6.3" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + micromatch "^4.0.4" + pretty-format "^29.6.3" + slash "^3.0.0" + stack-utils "^2.0.3" + +jest-mock@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.3.tgz#433f3fd528c8ec5a76860177484940628bdf5e0a" + integrity sha512-Z7Gs/mOyTSR4yPsaZ72a/MtuK6RnC3JYqWONe48oLaoEcYwEDxqvbXz85G4SJrm2Z5Ar9zp6MiHF4AlFlRM4Pg== + dependencies: + "@jest/types" "^29.6.3" + "@types/node" "*" + jest-util "^29.6.3" + +jest-pnp-resolver@^1.2.2: + version "1.2.3" + resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e" + integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w== + +jest-regex-util@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52" + integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg== + +jest-resolve-dependencies@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.4.tgz#20156b33c7eacbb6bb77aeba4bed0eab4a3f8734" + integrity sha512-7+6eAmr1ZBF3vOAJVsfLj1QdqeXG+WYhidfLHBRZqGN24MFRIiKG20ItpLw2qRAsW/D2ZUUmCNf6irUr/v6KHA== + dependencies: + jest-regex-util "^29.6.3" + jest-snapshot "^29.6.4" + +jest-resolve@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.4.tgz#e34cb06f2178b429c38455d98d1a07572ac9faa3" + integrity sha512-fPRq+0vcxsuGlG0O3gyoqGTAxasagOxEuyoxHeyxaZbc9QNek0AmJWSkhjlMG+mTsj+8knc/mWb3fXlRNVih7Q== + dependencies: + chalk "^4.0.0" + graceful-fs "^4.2.9" + jest-haste-map "^29.6.4" + jest-pnp-resolver "^1.2.2" + jest-util "^29.6.3" + jest-validate "^29.6.3" + resolve "^1.20.0" + resolve.exports "^2.0.0" + slash "^3.0.0" + +jest-runner@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.4.tgz#b3b8ccb85970fde0fae40c73ee11eb75adccfacf" + integrity sha512-SDaLrMmtVlQYDuG0iSPYLycG8P9jLI+fRm8AF/xPKhYDB2g6xDWjXBrR5M8gEWsK6KVFlebpZ4QsrxdyIX1Jaw== + dependencies: + "@jest/console" "^29.6.4" + "@jest/environment" "^29.6.4" + "@jest/test-result" "^29.6.4" + "@jest/transform" "^29.6.4" + "@jest/types" "^29.6.3" + "@types/node" "*" + chalk "^4.0.0" + emittery "^0.13.1" + graceful-fs "^4.2.9" + jest-docblock "^29.6.3" + jest-environment-node "^29.6.4" + jest-haste-map "^29.6.4" + jest-leak-detector "^29.6.3" + jest-message-util "^29.6.3" + jest-resolve "^29.6.4" + jest-runtime "^29.6.4" + jest-util "^29.6.3" + jest-watcher "^29.6.4" + jest-worker "^29.6.4" + p-limit "^3.1.0" + source-map-support "0.5.13" + +jest-runtime@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.4.tgz#b0bc495c9b6b12a0a7042ac34ca9bb85f8cd0ded" + integrity sha512-s/QxMBLvmwLdchKEjcLfwzP7h+jsHvNEtxGP5P+Fl1FMaJX2jMiIqe4rJw4tFprzCwuSvVUo9bn0uj4gNRXsbA== + dependencies: + "@jest/environment" "^29.6.4" + "@jest/fake-timers" "^29.6.4" + "@jest/globals" "^29.6.4" + "@jest/source-map" "^29.6.3" + "@jest/test-result" "^29.6.4" + "@jest/transform" "^29.6.4" + "@jest/types" "^29.6.3" + "@types/node" "*" + chalk "^4.0.0" + cjs-module-lexer "^1.0.0" + collect-v8-coverage "^1.0.0" + glob "^7.1.3" + graceful-fs "^4.2.9" + jest-haste-map "^29.6.4" + jest-message-util "^29.6.3" + jest-mock "^29.6.3" + jest-regex-util "^29.6.3" + jest-resolve "^29.6.4" + jest-snapshot "^29.6.4" + jest-util "^29.6.3" + slash "^3.0.0" + strip-bom "^4.0.0" + +jest-snapshot@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.4.tgz#9833eb6b66ff1541c7fd8ceaa42d541f407b4876" + integrity sha512-VC1N8ED7+4uboUKGIDsbvNAZb6LakgIPgAF4RSpF13dN6YaMokfRqO+BaqK4zIh6X3JffgwbzuGqDEjHm/MrvA== + dependencies: + "@babel/core" "^7.11.6" + "@babel/generator" "^7.7.2" + "@babel/plugin-syntax-jsx" "^7.7.2" + "@babel/plugin-syntax-typescript" "^7.7.2" + "@babel/types" "^7.3.3" + "@jest/expect-utils" "^29.6.4" + "@jest/transform" "^29.6.4" + "@jest/types" "^29.6.3" + babel-preset-current-node-syntax "^1.0.0" + chalk "^4.0.0" + expect "^29.6.4" + graceful-fs "^4.2.9" + jest-diff "^29.6.4" + jest-get-type "^29.6.3" + jest-matcher-utils "^29.6.4" + jest-message-util "^29.6.3" + jest-util "^29.6.3" + natural-compare "^1.4.0" + pretty-format "^29.6.3" + semver "^7.5.3" + jest-util@^29.5.0: version "29.5.0" resolved "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f" @@ -6511,6 +7889,44 @@ jest-util@^29.5.0: graceful-fs "^4.2.9" picomatch "^2.2.3" +jest-util@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/jest-util/-/jest-util-29.6.3.tgz#e15c3eac8716440d1ed076f09bc63ace1aebca63" + integrity sha512-QUjna/xSy4B32fzcKTSz1w7YYzgiHrjjJjevdRf61HYk998R5vVMMNmrHESYZVDS5DSWs+1srPLPKxXPkeSDOA== + dependencies: + "@jest/types" "^29.6.3" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" + +jest-validate@^29.6.3: + version "29.6.3" + resolved "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.3.tgz#a75fca774cfb1c5758c70d035d30a1f9c2784b4d" + integrity sha512-e7KWZcAIX+2W1o3cHfnqpGajdCs1jSM3DkXjGeLSNmCazv1EeI1ggTeK5wdZhF+7N+g44JI2Od3veojoaumlfg== + dependencies: + "@jest/types" "^29.6.3" + camelcase "^6.2.0" + chalk "^4.0.0" + jest-get-type "^29.6.3" + leven "^3.1.0" + pretty-format "^29.6.3" + +jest-watcher@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.4.tgz#633eb515ae284aa67fd6831f1c9d1b534cf0e0ba" + integrity sha512-oqUWvx6+On04ShsT00Ir9T4/FvBeEh2M9PTubgITPxDa739p4hoQweWPRGyYeaojgT0xTpZKF0Y/rSY1UgMxvQ== + dependencies: + "@jest/test-result" "^29.6.4" + "@jest/types" "^29.6.3" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + emittery "^0.13.1" + jest-util "^29.6.3" + string-length "^4.0.1" + jest-worker@^27.4.5: version "27.5.1" resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" @@ -6530,6 +7946,26 @@ jest-worker@^29.4.3: merge-stream "^2.0.0" supports-color "^8.0.0" +jest-worker@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.4.tgz#f34279f4afc33c872b470d4af21b281ac616abd3" + integrity sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q== + dependencies: + "@types/node" "*" + jest-util "^29.6.3" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jest@^29.6.4: + version "29.6.4" + resolved "https://registry.npmjs.org/jest/-/jest-29.6.4.tgz#7c48e67a445ba264b778253b5d78d4ebc9d0a622" + integrity sha512-tEFhVQFF/bzoYV1YuGyzLPZ6vlPrdfvDmmAxudA1dLEuiztqg2Rkx20vkKY32xiDROcD2KXlgZ7Cu8RPeEHRKw== + dependencies: + "@jest/core" "^29.6.4" + "@jest/types" "^29.6.3" + import-local "^3.0.2" + jest-cli "^29.6.4" + jiti@^1.18.2: version "1.18.2" resolved "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd" @@ -6540,33 +7976,11 @@ jmespath@^0.16.0: resolved "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076" integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw== -"jquery-contextmenu@^2.6.4", "jquery-contextmenu@^2.9.2": - version "2.9.2" - resolved "https://registry.npmjs.org/jquery-contextmenu/-/jquery-contextmenu-2.9.2.tgz#f9dc362e45871dda2e50fa45de2243e917446ced" - integrity sha512-6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw== - dependencies: - jquery "^3.5.0" - -"jquery@^3.3.1", "jquery@^3.5.0", "jquery@^3.6.0": - version "3.7.0" - resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz#fe2c01a05da500709006d8790fe21c8a39d75612" - integrity sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ== - -js-string-escape@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" - integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg== - "js-tokens@^3.0.0 || ^4.0.0", "js-tokens@^4.0.0": version "4.0.0" resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg== - js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" @@ -6587,10 +8001,37 @@ jsbn@1.1.0: resolved "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A== -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA== +jsdom@^20.0.0: + version "20.0.3" + resolved "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" + integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== + dependencies: + abab "^2.0.6" + acorn "^8.8.1" + acorn-globals "^7.0.0" + cssom "^0.5.0" + cssstyle "^2.3.0" + data-urls "^3.0.2" + decimal.js "^10.4.2" + domexception "^4.0.0" + escodegen "^2.0.0" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.2" + parse5 "^7.1.1" + saxes "^6.0.0" + symbol-tree "^3.2.4" + tough-cookie "^4.1.2" + w3c-xmlserializer "^4.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^11.0.0" + ws "^8.11.0" + xml-name-validator "^4.0.0" jsesc@^2.5.1: version "2.5.2" @@ -6619,11 +8060,6 @@ json-buffer@3.0.0: resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - integrity sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA== - json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -6651,7 +8087,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -"json5@^2.1.2", "json5@^2.2.2": +"json5@^2.1.2", "json5@^2.2.2", "json5@^2.2.3": version "2.2.3" resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -6671,13 +8107,6 @@ jsoneditor@^9.5.4: picomodal "^3.0.0" vanilla-picker "^2.12.1" -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== - dependencies: - graceful-fs "^4.1.6" - jsonparse@^1.2.0: version "1.3.1" resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" @@ -6771,112 +8200,6 @@ junk@^3.1.0: resolved "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1" integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ== -karma-babel-preprocessor@^8.0.0: - version "8.0.2" - resolved "https://registry.npmjs.org/karma-babel-preprocessor/-/karma-babel-preprocessor-8.0.2.tgz#4daff4cfbfcd58c635bf321e135525f608d2d621" - integrity sha512-6ZUnHwaK2EyhgxbgeSJW6n6WZUYSEdekHIV/qDUnPgMkVzQBHEvd07d2mTL5AQjV8uTUgH6XslhaPrp+fHWH2A== - -karma-browserify@^8.0.0: - version "8.1.0" - resolved "https://registry.npmjs.org/karma-browserify/-/karma-browserify-8.1.0.tgz#a200b15e2d93863cc704efe730722a5078b7d45b" - integrity sha512-q5OWuCfdXMfyhkRrH8XP5LiixD4lx0uCmlf6yQmGeQNHLH4Hoofur3tBJtSEhOXmY0mOdBe8ek2UUxicjmGqFQ== - dependencies: - convert-source-map "^1.8.0" - hat "^0.0.3" - js-string-escape "^1.0.0" - lodash "^4.17.21" - minimatch "^3.0.0" - os-shim "^0.1.3" - -karma-chrome-launcher@^3.1.0: - version "3.2.0" - resolved "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.2.0.tgz#eb9c95024f2d6dfbb3748d3415ac9b381906b9a9" - integrity sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q== - dependencies: - which "^1.2.1" - -karma-coverage@^2.0.3: - version "2.2.0" - resolved "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.2.0.tgz#64f838b66b71327802e7f6f6c39d569b7024e40c" - integrity sha512-gPVdoZBNDZ08UCzdMHHhEImKrw1+PAOQOIiffv1YsvxFhBjqvo/SVXNk4tqn1SYqX0BJZT6S/59zgxiBe+9OuA== - dependencies: - istanbul-lib-coverage "^3.2.0" - istanbul-lib-instrument "^5.1.0" - istanbul-lib-report "^3.0.0" - istanbul-lib-source-maps "^4.0.1" - istanbul-reports "^3.0.5" - minimatch "^3.0.4" - -karma-jasmine-html-reporter@^1.4.0: - version "1.7.0" - resolved "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz#52c489a74d760934a1089bfa5ea4a8fcb84cc28b" - integrity sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ== - -karma-jasmine@^4.0.1: - version "4.0.2" - resolved "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.2.tgz#386db2a3e1acc0af5265c711f673f78f1e4938de" - integrity sha512-ggi84RMNQffSDmWSyyt4zxzh2CQGwsxvYYsprgyR1j8ikzIduEdOlcLvXjZGwXG/0j41KUXOWsUCBfbEHPWP9g== - dependencies: - jasmine-core "^3.6.0" - -karma-requirejs@~1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/karma-requirejs/-/karma-requirejs-1.1.0.tgz#fddae2cb87d7ebc16fb0222893564d7fee578798" - integrity sha512-MHTOYKdwwJBkvYid0TaYvBzOnFH3TDtzo6ie5E4o9SaUSXXsfMRLa/whUz6efVIgTxj1xnKYasNn/XwEgJeB/Q== - -karma-source-map-support@^1.4.0: - version "1.4.0" - resolved "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b" - integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A== - dependencies: - source-map-support "^0.5.5" - -karma-sourcemap-loader@^0.4.0: - version "0.4.0" - resolved "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.4.0.tgz#b01d73f8f688f533bcc8f5d273d43458e13b5488" - integrity sha512-xCRL3/pmhAYF3I6qOrcn0uhbQevitc2DERMPH82FMnG+4WReoGcGFZb1pURf2a5apyrOHRdvD+O6K7NljqKHyA== - dependencies: - graceful-fs "^4.2.10" - -karma-webpack@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.0.tgz#2a2c7b80163fe7ffd1010f83f5507f95ef39f840" - integrity sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA== - dependencies: - glob "^7.1.3" - minimatch "^3.0.4" - webpack-merge "^4.1.5" - -karma@^6.3.15: - version "6.4.2" - resolved "https://registry.npmjs.org/karma/-/karma-6.4.2.tgz#a983f874cee6f35990c4b2dcc3d274653714de8e" - integrity sha512-C6SU/53LB31BEgRg+omznBEMY4SjHU3ricV6zBcAe1EeILKkeScr+fZXtaI5WyDbkVowJxxAI6h73NcFPmXolQ== - dependencies: - "@colors/colors" "1.5.0" - body-parser "^1.19.0" - braces "^3.0.2" - chokidar "^3.5.1" - connect "^3.7.0" - di "^0.0.1" - dom-serialize "^2.2.1" - glob "^7.1.7" - graceful-fs "^4.2.6" - http-proxy "^1.18.1" - isbinaryfile "^4.0.8" - lodash "^4.17.21" - log4js "^6.4.1" - mime "^2.5.2" - minimatch "^3.0.4" - mkdirp "^0.5.5" - qjobs "^1.2.0" - range-parser "^1.2.1" - rimraf "^3.0.2" - socket.io "^4.4.1" - source-map "^0.6.1" - tmp "^0.2.1" - ua-parser-js "^0.7.30" - yargs "^16.1.1" - keyv@3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373" @@ -6889,6 +8212,11 @@ keyv@3.0.0: resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== +kleur@^3.0.3: + version "3.0.3" + resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" + integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== + klona@^2.0.4: version "2.0.6" resolved "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" @@ -6907,6 +8235,11 @@ leaflet@^1.5.1: resolved "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d" integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA== +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== + levn@^0.4.1: version "0.4.1" resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" @@ -7005,20 +8338,6 @@ lodash._basecreatewrapper@~2.3.0: lodash._slice "~2.3.0" lodash.isobject "~2.3.0" -lodash._baseisequal@^3.0.0: - version "3.0.7" - resolved "https://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz#d8025f76339d29342767dcc887ce5cb95a5b51f1" - integrity sha512-U+3GsNEZj9ebI03ncLC2pLmYVjgtYZEwdkAPO7UGgtGvAz36JVFPAQUufpSaVL93Cz5arc6JGRKZRhaOhyVJYA== - dependencies: - lodash.isarray "^3.0.0" - lodash.istypedarray "^3.0.0" - lodash.keys "^3.0.0" - -lodash._bindcallback@^3.0.0: - version "3.0.1" - resolved "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ== - lodash._createwrapper@~2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/lodash._createwrapper/-/lodash._createwrapper-2.3.0.tgz#d1aae1102dadf440e8e06fc133a6edd7fe146075" @@ -7028,11 +8347,6 @@ lodash._createwrapper@~2.3.0: lodash._basecreatewrapper "~2.3.0" lodash.isfunction "~2.3.0" -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA== - lodash._objecttypes@~2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.3.0.tgz#6a3ea3987dd6eeb8021b2d5c9c303549cc2bae1e" @@ -7077,16 +8391,6 @@ lodash.debounce@^4.0.8: resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== -lodash.escape@^4.0.1: - version "4.0.1" - resolved "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98" - integrity sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw== - -lodash.flattendeep@^4.4.0: - version "4.4.0" - resolved "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" - integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ== - lodash.foreach@2.3.x: version "2.3.0" resolved "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-2.3.0.tgz#083404c91e846ee77245fdf9d76519c68b2af168" @@ -7109,29 +8413,6 @@ lodash.identity@~2.3.0: resolved "https://registry.npmjs.org/lodash.identity/-/lodash.identity-2.3.0.tgz#6b01a210c9485355c2a913b48b6711219a173ded" integrity sha512-NYJ2r2cwy3tkx/saqbIZEX6oQUzjWTnGRu7d/zmBjMCZos3eHBxCpbvWFWSetv8jFVrptsp6EbWjzNgBKhUoOA== -lodash.isarguments@^3.0.0: - version "3.1.0" - resolved "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg== - -lodash.isarray@^3.0.0: - version "3.0.4" - resolved "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - integrity sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ== - -lodash.isequal@^3.0: - version "3.0.4" - resolved "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-3.0.4.tgz#1c35eb3b6ef0cd1ff51743e3ea3cf7fdffdacb64" - integrity sha512-Bsu5fP9Omd+HBk2Dz8qp4BHbC+83DBykZ87Lz1JmPKTVNy4Q0XQVtUrbfXVAK/udQrWNcGStcKSA9yj/Zkm3TQ== - dependencies: - lodash._baseisequal "^3.0.0" - lodash._bindcallback "^3.0.0" - -lodash.isequal@^4.5.0: - version "4.5.0" - resolved "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== - lodash.isfunction@~2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.3.0.tgz#6b2973e47a647cf12e70d676aea13643706e5267" @@ -7144,11 +8425,6 @@ lodash.isobject@~2.3.0: dependencies: lodash._objecttypes "~2.3.0" -lodash.istypedarray@^3.0.0: - version "3.0.6" - resolved "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62" - integrity sha512-lGWJ6N8AA3KSv+ZZxlTdn4f6A7kMfpJboeyvbFdE7IU9YAgweODqmOgdUHOA+c6lVWeVLysdaxciFXi+foVsWw== - "lodash.keys@2.3.x", "lodash.keys@~2.3.0": version "2.3.0" resolved "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.3.0.tgz#b350f4f92caa9f45a4a2ecf018454cf2f28ae253" @@ -7158,15 +8434,6 @@ lodash.istypedarray@^3.0.0: lodash._shimkeys "~2.3.0" lodash.isobject "~2.3.0" -lodash.keys@^3.0.0: - version "3.1.2" - resolved "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - integrity sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ== - dependencies: - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" @@ -7199,29 +8466,25 @@ lodash.uniq@^4.5.0: resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== -"lodash@4", "lodash@4.*", "lodash@^4.14.1", "lodash@^4.17.10", "lodash@^4.17.14", "lodash@^4.17.15", "lodash@^4.17.20", "lodash@^4.17.21", "lodash@^4.17.4": +"lodash@4", "lodash@4.*", "lodash@^4.14.1", "lodash@^4.17.10", "lodash@^4.17.14", "lodash@^4.17.15", "lodash@^4.17.20", "lodash@^4.17.21": version "4.17.21" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log4js@^6.4.1: - version "6.9.1" - resolved "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz#aba5a3ff4e7872ae34f8b4c533706753709e38b6" - integrity sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g== - dependencies: - date-format "^4.0.14" - debug "^4.3.4" - flatted "^3.2.7" - rfdc "^1.3.0" - streamroller "^3.1.5" - -"loose-envify@^1.0.0", "loose-envify@^1.1.0", "loose-envify@^1.4.0": +"loose-envify@^1.1.0", "loose-envify@^1.4.0": version "1.4.0" resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== dependencies: js-tokens "^3.0.0 || ^4.0.0" +lower-case@^2.0.2: + version "2.0.2" + resolved "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== + dependencies: + tslib "^2.0.3" + lowercase-keys@1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" @@ -7264,6 +8527,11 @@ lru-cache@^9.1.1: resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.2.tgz#255fdbc14b75589d6d0e73644ca167a8db506835" integrity sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ== +lz-string@^1.5.0: + version "1.5.0" + resolved "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941" + integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ== + "make-dir@^1.0.0", "make-dir@^1.2.0": version "1.3.0" resolved "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -7299,6 +8567,13 @@ make-fetch-happen@^11.0.3: socks-proxy-agent "^7.0.0" ssri "^10.0.0" +makeerror@1.0.12: + version "1.0.12" + resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" + integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg== + dependencies: + tmpl "1.0.5" + map-obj@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" @@ -7343,11 +8618,6 @@ mdn-data@2.0.30: resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== - "memoize-one@>=3.1.1 <6": version "5.2.1" resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e" @@ -7412,17 +8682,17 @@ miller-rabin@^4.0.0: resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -"mime-types@^2.1.12", "mime-types@^2.1.27", "mime-types@~2.1.24", "mime-types@~2.1.34": +"mime-types@^2.1.12", "mime-types@^2.1.27": version "2.1.35" resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: mime-db "1.52.0" -mime@^2.5.2: - version "2.6.0" - resolved "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" - integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== mimic-fn@^4.0.0: version "4.0.0" @@ -7434,7 +8704,7 @@ mimic-response@^1.0.0: resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -min-indent@^1.0.1: +"min-indent@^1.0.0", "min-indent@^1.0.1": version "1.0.1" resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== @@ -7456,7 +8726,7 @@ minimalistic-crypto-utils@^1.0.1: resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg== -"minimatch@^3.0.0", "minimatch@^3.0.4", "minimatch@^3.0.5", "minimatch@^3.1.1", "minimatch@^3.1.2": +"minimatch@^3.0.4", "minimatch@^3.0.5", "minimatch@^3.1.1", "minimatch@^3.1.2": version "3.1.2" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -7559,13 +8829,6 @@ mkdirp-classic@^0.5.2: resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp@^0.5.5: - version "0.5.6" - resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== - dependencies: - minimist "^1.2.6" - "mkdirp@^1.0.3", "mkdirp@^1.0.4": version "1.0.4" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" @@ -7635,16 +8898,11 @@ moment-timezone@^0.5.34: dependencies: moment "^2.29.4" -"moment@^2.29.4", "moment@~2.29.2": +moment@^2.29.4: version "2.29.4" resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== -moo@^0.5.0: - version "0.5.2" - resolved "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c" - integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q== - mousetrap@^1.6.3: version "1.6.5" resolved "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9" @@ -7663,11 +8921,6 @@ mrmime@^1.0.0: resolved "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27" integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw== -ms@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - ms@2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -7705,16 +8958,6 @@ natural-compare@^1.4.0: resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== -nearley@^2.7.10: - version "2.20.1" - resolved "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz#246cd33eff0d012faf197ff6774d7ac78acdd474" - integrity sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ== - dependencies: - commander "^2.19.0" - moo "^0.5.0" - railroad-diagrams "^1.0.0" - randexp "0.4.6" - neatequal@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/neatequal/-/neatequal-1.0.0.tgz#2ee1211bc9fa6e4c55715fd210bb05602eb1ae3b" @@ -7722,7 +8965,7 @@ neatequal@^1.0.0: dependencies: varstream "^0.3.2" -"negotiator@0.6.3", "negotiator@^0.6.3": +negotiator@^0.6.3: version "0.6.3" resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== @@ -7737,6 +8980,14 @@ nice-try@^1.0.4: resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +no-case@^3.0.4: + version "3.0.4" + resolved "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" + integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== + dependencies: + lower-case "^2.0.2" + tslib "^2.0.3" + "node-gyp@^9.0.0", "node-gyp@latest": version "9.4.0" resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz#2a7a91c7cba4eccfd95e949369f27c9ba704f369" @@ -7754,11 +9005,21 @@ nice-try@^1.0.4: tar "^6.1.2" which "^2.0.2" +node-int64@^0.4.0: + version "0.4.0" + resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" + integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== + node-releases@^2.0.12: version "2.0.12" resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039" integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ== +node-releases@^2.0.13: + version "2.0.13" + resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" + integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== + nopt@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" @@ -7828,6 +9089,13 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + npm-run-path@^5.1.0: version "5.1.0" resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00" @@ -7852,17 +9120,22 @@ nth-check@^2.0.1: dependencies: boolbase "^1.0.0" -"object-assign@^4", "object-assign@^4.0.1", "object-assign@^4.1.0", "object-assign@^4.1.1": +nwsapi@^2.2.2: + version "2.2.7" + resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" + integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== + +"object-assign@^4.0.1", "object-assign@^4.1.0", "object-assign@^4.1.1": version "4.1.1" resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -"object-inspect@^1.12.3", "object-inspect@^1.7.0", "object-inspect@^1.9.0": +"object-inspect@^1.12.3", "object-inspect@^1.9.0": version "1.12.3" resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== -"object-is@^1.0.2", "object-is@^1.1.5": +object-is@^1.1.5: version "1.1.5" resolved "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== @@ -7875,7 +9148,7 @@ object-keys@^1.1.1: resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -"object.assign@^4.1.0", "object.assign@^4.1.3", "object.assign@^4.1.4": +"object.assign@^4.1.3", "object.assign@^4.1.4": version "4.1.4" resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== @@ -7885,7 +9158,7 @@ object-keys@^1.1.1: has-symbols "^1.0.3" object-keys "^1.1.1" -"object.entries@^1.1.1", "object.entries@^1.1.6": +object.entries@^1.1.6: version "1.1.6" resolved "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23" integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w== @@ -7894,7 +9167,7 @@ object-keys@^1.1.1: define-properties "^1.1.4" es-abstract "^1.20.4" -"object.fromentries@^2.0.0", "object.fromentries@^2.0.6": +object.fromentries@^2.0.6: version "2.0.6" resolved "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73" integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg== @@ -7911,7 +9184,7 @@ object.hasown@^1.1.2: define-properties "^1.1.4" es-abstract "^1.20.4" -"object.values@^1.1.1", "object.values@^1.1.6": +object.values@^1.1.6: version "1.1.6" resolved "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d" integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== @@ -7920,20 +9193,6 @@ object.hasown@^1.1.2: define-properties "^1.1.4" es-abstract "^1.20.4" -on-finished@2.4.1: - version "2.4.1" - resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" - integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== - dependencies: - ee-first "1.1.1" - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww== - dependencies: - ee-first "1.1.1" - "once@^1.3.0", "once@^1.3.1", "once@^1.4.0": version "1.4.0" resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -7941,6 +9200,13 @@ on-finished@~2.3.0: dependencies: wrappy 1 +onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + onetime@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4" @@ -7985,11 +9251,6 @@ os-filter-obj@^2.0.0: dependencies: arch "^2.1.0" -os-shim@^0.1.3: - version "0.1.3" - resolved "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" - integrity sha512-jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A== - p-cancelable@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" @@ -8031,7 +9292,7 @@ p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2: +"p-limit@^3.0.2", "p-limit@^3.1.0": version "3.1.0" resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -8122,7 +9383,7 @@ parent-module@^1.0.0: dependencies: path-platform "~0.11.15" -"parse-asn1@^5.0.0", "parse-asn1@^5.1.5": +"parse-asn1@^5.0.0", "parse-asn1@^5.1.6": version "5.1.6" resolved "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== @@ -8143,26 +9404,13 @@ parent-module@^1.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse5-htmlparser2-tree-adapter@^7.0.0: - version "7.0.0" - resolved "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz#23c2cc233bcf09bb7beba8b8a69d46b08c62c2f1" - integrity sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g== - dependencies: - domhandler "^5.0.2" - parse5 "^7.0.0" - -parse5@^7.0.0: +"parse5@^7.0.0", "parse5@^7.1.1": version "7.1.2" resolved "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== dependencies: entities "^4.4.0" -parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - path-browserify@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" @@ -8190,7 +9438,7 @@ path-exists@^4.0.0: resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== -path-key@^3.1.0: +"path-key@^3.0.0", "path-key@^3.1.0": version "3.1.1" resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== @@ -8303,6 +9551,11 @@ pinkie@^2.0.0: resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg== +pirates@^4.0.4: + version "4.0.6" + resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" + integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== + "pkg-dir@^4.1.0", "pkg-dir@^4.2.0": version "4.2.0" resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" @@ -8763,7 +10016,7 @@ postcss-unique-selectors@^6.0.0: resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -"postcss@^8.2.15", "postcss@^8.4.21", "postcss@^8.4.24": +"postcss@^8.4.21", "postcss@^8.4.24": version "8.4.24" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df" integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg== @@ -8772,6 +10025,15 @@ postcss-unique-selectors@^6.0.0: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@^8.4.31: + version "8.4.31" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" + integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== + dependencies: + nanoid "^3.3.6" + picocolors "^1.0.0" + source-map-js "^1.0.2" + precond@^0.2.3: version "0.2.3" resolved "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" @@ -8792,6 +10054,24 @@ prepend-http@^2.0.0: resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== +pretty-format@^27.0.2: + version "27.5.1" + resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" + integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ== + dependencies: + ansi-regex "^5.0.1" + ansi-styles "^5.0.0" + react-is "^17.0.1" + +"pretty-format@^29.0.0", "pretty-format@^29.6.3": + version "29.6.3" + resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.3.tgz#d432bb4f1ca6f9463410c3fb25a0ba88e594ace7" + integrity sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw== + dependencies: + "@jest/schemas" "^29.6.3" + ansi-styles "^5.0.0" + react-is "^18.0.0" + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -8810,7 +10090,15 @@ promise-retry@^2.0.1: err-code "^2.0.2" retry "^0.12.0" -"prop-types@^15.5.8", "prop-types@^15.6.0", "prop-types@^15.6.2", "prop-types@^15.7.0", "prop-types@^15.7.2", "prop-types@^15.8.1": +prompts@^2.0.1: + version "2.4.2" + resolved "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q== + dependencies: + kleur "^3.0.3" + sisteransi "^1.0.5" + +"prop-types@^15.5.8", "prop-types@^15.6.0", "prop-types@^15.6.2", "prop-types@^15.7.2", "prop-types@^15.8.1": version "15.8.1" resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -8834,6 +10122,11 @@ pseudomap@^1.0.2: resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== +psl@^1.1.33: + version "1.9.0" + resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" + integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== + public-encrypt@^4.0.0: version "4.0.3" resolved "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" @@ -8859,28 +10152,21 @@ pump@^3.0.0: resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== -punycode@^2.1.0: +"punycode@^2.1.0", "punycode@^2.1.1": version "2.3.0" resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== +pure-rand@^6.0.0: + version "6.0.3" + resolved "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.3.tgz#3c9e6b53c09e52ac3cedffc85ab7c1c7094b38cb" + integrity sha512-KddyFewCsO0j3+np81IQ+SweXLDnDQTs5s67BOnrYmYe/yNmUhttQyGsYzy8yUnoljGAQ9sl38YB4vH8ur7Y+w== + q@^1.1.2: version "1.5.1" resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== -qjobs@^1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071" - integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg== - -qs@6.11.0: - version "6.11.0" - resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - qs@^6.11.0: version "6.11.2" resolved "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" @@ -8902,6 +10188,11 @@ querystring-es3@~0.2.0: resolved "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA== +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -8919,19 +10210,6 @@ raf@^3.4.1: dependencies: performance-now "^2.1.0" -railroad-diagrams@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" - integrity sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A== - -randexp@0.4.6: - version "0.4.6" - resolved "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3" - integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ== - dependencies: - discontinuous-range "1.0.0" - ret "~0.1.10" - "randombytes@^2.0.0", "randombytes@^2.0.1", "randombytes@^2.0.5", "randombytes@^2.1.0": version "2.1.0" resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -8947,21 +10225,6 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" -range-parser@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== - -raw-body@2.5.2: - version "2.5.2" - resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" - integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== - dependencies: - bytes "3.1.2" - http-errors "2.0.0" - iconv-lite "0.4.24" - unpipe "1.0.0" - rc-align@^4.0.0: version "4.0.15" resolved "https://registry.npmjs.org/rc-align/-/rc-align-4.0.15.tgz#2bbd665cf85dfd0b0244c5a752b07565e9098577" @@ -9184,7 +10447,7 @@ react-dom@^17.0.1: object-assign "^4.1.1" scheduler "^0.20.2" -"react-draggable@4.4.5", "react-draggable@^4.4.4": +react-draggable@4.4.5: version "4.4.5" resolved "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.5.tgz#9e37fe7ce1a4cf843030f521a0a4cc41886d7e7c" integrity sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g== @@ -9192,6 +10455,14 @@ react-dom@^17.0.1: clsx "^1.1.1" prop-types "^15.8.1" +react-draggable@^4.4.6: + version "4.4.6" + resolved "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.6.tgz#63343ee945770881ca1256a5b6fa5c9f5983fe1e" + integrity sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw== + dependencies: + clsx "^1.1.1" + prop-types "^15.8.1" + react-dropzone@^14.2.1: version "14.2.3" resolved "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.2.3.tgz#0acab68308fda2d54d1273a1e626264e13d4e84b" @@ -9201,21 +10472,26 @@ react-dropzone@^14.2.1: file-selector "^0.6.0" prop-types "^15.8.1" -"react-is@^16.12.0 || ^17.0.0 || ^18.0.0": - version "18.2.0" - resolved "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" - integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== +react-frame-component@^5.2.6: + version "5.2.6" + resolved "https://registry.npmjs.org/react-frame-component/-/react-frame-component-5.2.6.tgz#0d9991d251ff1f7177479d8f370deea06b824b79" + integrity sha512-CwkEM5VSt6nFwZ1Op8hi3JB5rPseZlmnp5CGiismVTauE6S4Jsc4TNMlT0O7Cts4WgIC3ZBAQ2p1Mm9XgLbj+w== "react-is@^16.12.0", "react-is@^16.13.1", "react-is@^16.7.0": version "16.13.1" resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -"react-is@^16.8.0 || ^17.0.0", "react-is@^17.0.0", "react-is@^17.0.2": +"react-is@^16.8.0 || ^17.0.0", "react-is@^17.0.1": version "17.0.2" resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== +react-is@^18.0.0: + version "18.2.0" + resolved "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" + integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== + react-leaflet@^3.2.2: version "3.2.5" resolved "https://registry.npmjs.org/react-leaflet/-/react-leaflet-3.2.5.tgz#bec0bfab9dd8c2b030ea630f7a0687a60322ca7d" @@ -9223,10 +10499,17 @@ react-leaflet@^3.2.2: dependencies: "@react-leaflet/core" "^1.1.1" -react-property@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/react-property/-/react-property-2.0.0.tgz#2156ba9d85fa4741faf1918b38efc1eae3c6a136" - integrity sha512-kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw== +react-new-window@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/react-new-window/-/react-new-window-1.0.1.tgz#38f97ac5a38a14d2ac8263e2427fcbd5f84e1d64" + integrity sha512-pLQlq5NzMxNocXKPIwkXfAxSOZmbpWSbP8QrxCbunpHcx4k249YChkk7l/7P4jjwxq3dI/xwL3nVHLp6h5zM3w== + dependencies: + prop-types "^15.7.2" + +react-property@2.0.2: + version "2.0.2" + resolved "https://registry.npmjs.org/react-property/-/react-property-2.0.2.tgz#d5ac9e244cef564880a610bc8d868bd6f60fdda6" + integrity sha512-+PbtI3VuDV0l6CleQMsx2gtK0JZbZKbpdu5ynr+lbsuvtmgbNcS3VM0tuY2QjFNOcWxvXeHjDpy42RO+4U2rug== react-resize-detector@^9.1.0: version "9.1.0" @@ -9244,21 +10527,6 @@ react-rnd@^10.3.5: react-draggable "4.4.5" tslib "2.3.1" -react-router-dom@^6.2.2: - version "6.13.0" - resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.13.0.tgz#6651f456bb2af42ef14f6880123b1f575539e81f" - integrity sha512-6Nqoqd7fgwxxVGdbiMHTpDHCYPq62d7Wk1Of7B82vH7ZPwwsRaIa22zRZKPPg413R5REVNiyuQPKDG1bubcOFA== - dependencies: - "@remix-run/router" "1.6.3" - react-router "6.13.0" - -react-router@6.13.0: - version "6.13.0" - resolved "https://registry.npmjs.org/react-router/-/react-router-6.13.0.tgz#7e4427a271dae0cafbdb88c56ccbd9b1434ee93f" - integrity sha512-Si6KnfEnJw7gUQkNa70dlpI1bul46FuSxX5t5WwlUBxE25DAz2BjVkwaK8Y2s242bQrZPXCpmwLPtIO5pv4tXg== - dependencies: - "@remix-run/router" "1.6.3" - react-select@^5.7.2: version "5.7.3" resolved "https://registry.npmjs.org/react-select/-/react-select-5.7.3.tgz#fa0dc9a23cad6ff3871ad3829f6083a4b54961a2" @@ -9274,29 +10542,11 @@ react-select@^5.7.2: react-transition-group "^4.3.0" use-isomorphic-layout-effect "^1.1.2" -react-shallow-renderer@^16.13.1: - version "16.15.0" - resolved "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457" - integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA== - dependencies: - object-assign "^4.1.1" - react-is "^16.12.0 || ^17.0.0 || ^18.0.0" - react-table@^7.6.3: version "7.8.0" resolved "https://registry.npmjs.org/react-table/-/react-table-7.8.0.tgz#07858c01c1718c09f7f1aed7034fcfd7bda907d2" integrity sha512-hNaz4ygkZO4bESeFfnfOft73iBUj8K5oKi1EcSHPAibEydfsX2MyU6Z8KCr3mv3C9Kqqh71U+DhZkFvibbnPbA== -react-test-renderer@^17.0.0: - version "17.0.2" - resolved "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-17.0.2.tgz#4cd4ae5ef1ad5670fc0ef776e8cc7e1231d9866c" - integrity sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ== - dependencies: - object-assign "^4.1.1" - react-is "^17.0.2" - react-shallow-renderer "^16.13.1" - scheduler "^0.20.2" - react-timer-hook@^3.0.5: version "3.0.6" resolved "https://registry.npmjs.org/react-timer-hook/-/react-timer-hook-3.0.6.tgz#61aca331378ad53058519c579de50c244e66972f" @@ -9387,7 +10637,7 @@ readable-stream@^1.0.33: string_decoder "~1.1.1" util-deprecate "~1.0.1" -"readable-stream@^3.4.0", "readable-stream@^3.5.0", "readable-stream@^3.6.0": +"readable-stream@^3.4.0", "readable-stream@^3.5.0", "readable-stream@^3.6.0", "readable-stream@^3.6.2": version "3.6.2" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -9417,6 +10667,14 @@ rechoir@^0.7.0: dependencies: resolve "^1.9.0" +redent@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" + integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== + dependencies: + indent-string "^4.0.0" + strip-indent "^3.0.0" + redent@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz#0c0ba7caabb24257ab3bb7a4fd95dd1d5c5681f9" @@ -9432,6 +10690,18 @@ redent@^4.0.0: dependencies: "@babel/runtime" "^7.9.2" +reflect.getprototypeof@^1.0.3: + version "1.0.3" + resolved "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.3.tgz#2738fd896fcc3477ffbd4190b40c2458026b6928" + integrity sha512-TTAOZpkJ2YLxl7mVHWrNo3iDMEkYlva/kgFcXndqMgbo/AZUmmavEkdXV+hXtE4P8xdyEKRzalaFqZVuwIk/Nw== + 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" + regenerate-unicode-properties@^10.1.0: version "10.1.0" resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c" @@ -9444,11 +10714,6 @@ regenerate@^1.4.2: resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - regenerator-runtime@^0.13.11: version "0.13.11" resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" @@ -9461,7 +10726,14 @@ regenerator-transform@^0.15.1: dependencies: "@babel/runtime" "^7.8.4" -regexp.prototype.flags@^1.4.3: +regenerator-transform@^0.15.2: + version "0.15.2" + resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4" + integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg== + dependencies: + "@babel/runtime" "^7.8.4" + +"regexp.prototype.flags@^1.4.3", "regexp.prototype.flags@^1.5.0": version "1.5.0" resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== @@ -9489,13 +10761,6 @@ regjsparser@^0.9.1: dependencies: jsesc "~0.5.0" -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A== - dependencies: - is-finite "^1.0.0" - replace-ext@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz#9471c213d22e1bcc26717cd6e50881d88f812b06" @@ -9538,6 +10803,11 @@ resolve-from@^5.0.0: resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== +resolve.exports@^2.0.0: + version "2.0.2" + resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" + integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== + "resolve@^1.1.4", "resolve@^1.12.0", "resolve@^1.14.2", "resolve@^1.17.0", "resolve@^1.19.0", "resolve@^1.4.0", "resolve@^1.9.0": version "1.22.2" resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" @@ -9547,6 +10817,15 @@ resolve-from@^5.0.0: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@^1.20.0: + version "1.22.4" + resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34" + integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + resolve@^2.0.0-next.4: version "2.0.0-next.4" resolved "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660" @@ -9563,11 +10842,6 @@ responselike@1.0.2: dependencies: lowercase-keys "^1.0.0" -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== - retry@^0.12.0: version "0.12.0" resolved "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" @@ -9578,11 +10852,6 @@ reusify@^1.0.4: resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rfdc@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" - integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== - rifm@^0.7.0: version "0.7.0" resolved "https://registry.npmjs.org/rifm/-/rifm-0.7.0.tgz#debe951a9c83549ca6b33e5919f716044c2230be" @@ -9597,7 +10866,7 @@ rimraf@^2.5.4: dependencies: glob "^7.1.3" -"rimraf@^3.0.0", "rimraf@^3.0.2": +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -9612,14 +10881,6 @@ rimraf@^2.5.4: hash-base "^3.0.0" inherits "^2.0.1" -rst-selector-parser@^2.2.3: - version "2.2.3" - resolved "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91" - integrity sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA== - dependencies: - lodash.flattendeep "^4.4.0" - nearley "^2.7.10" - run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -9627,7 +10888,17 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -"safe-buffer@5.2.1", "safe-buffer@^5.0.1", "safe-buffer@^5.1.0", "safe-buffer@^5.1.1", "safe-buffer@^5.1.2", "safe-buffer@^5.2.0", "safe-buffer@~5.2.0": +safe-array-concat@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060" + integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.0" + has-symbols "^1.0.3" + isarray "^2.0.5" + +"safe-buffer@5.2.1", "safe-buffer@^5.0.1", "safe-buffer@^5.1.0", "safe-buffer@^5.1.1", "safe-buffer@^5.1.2", "safe-buffer@^5.2.0", "safe-buffer@^5.2.1", "safe-buffer@~5.2.0": version "5.2.1" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -9646,7 +10917,7 @@ safe-regex-test@^1.0.0: get-intrinsic "^1.1.3" is-regex "^1.1.4" -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", "safer-buffer@^2.1.0": +"safer-buffer@>= 2.1.2 < 3.0.0", "safer-buffer@^2.1.0": version "2.1.2" resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -9683,6 +10954,13 @@ sax@^1.2.4: resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +saxes@^6.0.0: + version "6.0.0" + resolved "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" + integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== + dependencies: + xmlchars "^2.2.0" + scheduler@^0.20.2: version "0.20.2" resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" @@ -9691,13 +10969,6 @@ scheduler@^0.20.2: loose-envify "^1.1.0" object-assign "^4.1.1" -schema-utils@^0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" - integrity sha512-QaVYBaD9U8scJw2EBWnCBY+LJ0AD+/2edTaigDs0XLDLBfJmSUK9KGqktg1rb32U3z4j/XwvFwHHH1YfbYFd7Q== - dependencies: - ajv "^5.0.0" - schema-utils@^2.6.5: version "2.7.1" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" @@ -9755,6 +11026,11 @@ semver-truncate@^1.1.2: resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^6.3.1: + version "6.3.1" + resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + "semver@^7.3.4", "semver@^7.3.5", "semver@^7.3.7", "semver@^7.3.8": version "7.5.2" resolved "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb" @@ -9762,6 +11038,13 @@ semver-truncate@^1.1.2: dependencies: lru-cache "^6.0.0" +"semver@^7.5.3", "semver@^7.5.4": + version "7.5.4" + resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + "serialize-javascript@^6.0.0", "serialize-javascript@^6.0.1": version "6.0.1" resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" @@ -9774,11 +11057,6 @@ set-blocking@^2.0.0: resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - "sha.js@^2.4.0", "sha.js@^2.4.8": version "2.4.11" resolved "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" @@ -9854,7 +11132,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -"signal-exit@^3.0.0", "signal-exit@^3.0.7": +"signal-exit@^3.0.0", "signal-exit@^3.0.3", "signal-exit@^3.0.7": version "3.0.7" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -9878,6 +11156,11 @@ sirv@^1.0.7: mrmime "^1.0.0" totalist "^1.0.0" +sisteransi@^1.0.5: + version "1.0.5" + resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== + slash@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" @@ -9893,6 +11176,14 @@ smart-buffer@^4.2.0: resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== +snake-case@^3.0.4: + version "3.0.4" + resolved "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c" + integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg== + dependencies: + dot-case "^3.0.4" + tslib "^2.0.3" + snapsvg-cjs@^0.0.6: version "0.0.6" resolved "https://registry.npmjs.org/snapsvg-cjs/-/snapsvg-cjs-0.0.6.tgz#3b2f56af2573d3d364c3ed5bf8885745f4d2dde1" @@ -9907,13 +11198,6 @@ snapsvg@0.5.1: dependencies: eve "~0.5.1" -socket.io-adapter@~2.5.2: - version "2.5.2" - resolved "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz#5de9477c9182fdc171cd8c8364b9a8894ec75d12" - integrity sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA== - dependencies: - ws "~8.11.0" - socket.io-client@^4.5.0: version "4.7.0" resolved "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.0.tgz#f869a41a2593bc36f058f3b46175024491d997b5" @@ -9932,19 +11216,6 @@ socket.io-parser@~4.2.4: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" -socket.io@^4.4.1: - version "4.7.0" - resolved "https://registry.npmjs.org/socket.io/-/socket.io-4.7.0.tgz#ae21460d5aef23b152d38de64d7c1798cd2d23fc" - integrity sha512-eOpu7oCNiPGBHn9Falg0cAGivp6TpDI3Yt596fbsf+vln8kRLFWxXKrecFrybn/xNYVn9HcdJNAkYToCmTjsyg== - dependencies: - accepts "~1.3.4" - base64id "~2.0.0" - cors "~2.8.5" - debug "~4.3.2" - engine.io "~6.5.0" - socket.io-adapter "~2.5.2" - socket.io-parser "~4.2.4" - socks-proxy-agent@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" @@ -9993,7 +11264,15 @@ source-list-map@^1.1.1: resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -"source-map-support@^0.5.5", "source-map-support@~0.5.20": +source-map-support@0.5.13: + version "0.5.13" + resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -10006,7 +11285,7 @@ source-list-map@^1.1.1: resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== -"source-map@^0.6.0", "source-map@^0.6.1": +"source-map@^0.6.0", "source-map@^0.6.1", "source-map@~0.6.1": version "0.6.1" resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== @@ -10064,15 +11343,19 @@ stable@^0.1.8: resolved "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== +stack-utils@^2.0.3: + version "2.0.6" + resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" + integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== + dependencies: + escape-string-regexp "^2.0.0" -statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== +stop-iteration-iterator@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4" + integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ== + dependencies: + internal-slot "^1.0.4" stream-browserify@^3.0.0: version "3.0.0" @@ -10108,20 +11391,19 @@ stream-splicer@^2.0.0: inherits "^2.0.1" readable-stream "^2.0.2" -streamroller@^3.1.5: - version "3.1.5" - resolved "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz#1263182329a45def1ffaef58d31b15d13d2ee7ff" - integrity sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw== - dependencies: - date-format "^4.0.14" - debug "^4.3.4" - fs-extra "^8.1.0" - strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ== +string-length@^4.0.1: + version "4.0.2" + resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" + integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== + dependencies: + char-regex "^1.0.2" + strip-ansi "^6.0.0" + "string-width-cjs@string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", "string-width@^4.1.0", "string-width@^4.2.0", "string-width@^4.2.3": version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" @@ -10154,7 +11436,7 @@ string.prototype.matchall@^4.0.8: regexp.prototype.flags "^1.4.3" side-channel "^1.0.4" -"string.prototype.trim@^1.2.1", "string.prototype.trim@^1.2.7": +string.prototype.trim@^1.2.7: version "1.2.7" resolved "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== @@ -10207,13 +11489,6 @@ string_decoder@~1.1.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== - dependencies: - ansi-regex "^2.0.0" - strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -10221,6 +11496,11 @@ strip-ansi@^7.0.1: dependencies: ansi-regex "^6.0.1" +strip-bom@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" + integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== + strip-comments@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" @@ -10238,11 +11518,23 @@ strip-eof@^1.0.0: resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q== +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + strip-final-newline@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw== +strip-indent@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" + integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== + dependencies: + min-indent "^1.0.0" + strip-indent@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz#b41379433dd06f5eae805e21d631e07ee670d853" @@ -10275,19 +11567,19 @@ style-loader@^3.3.2: resolved "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz#bba8daac19930169c0c9c96706749a597ae3acff" integrity sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw== -style-to-js@1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.3.tgz#2012d75dc89bf400edc29c545ed61c8626b00184" - integrity sha512-zKI5gN/zb7LS/Vm0eUwjmjrXWw8IMtyA8aPBJZdYiQTXj4+wQ3IucOLIOnF7zCHxvW8UhIGh/uZh/t9zEHXNTQ== +style-to-js@1.1.9: + version "1.1.9" + resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.9.tgz#5bdc23ba7624016094a19d6ea90fa3f98bee34c4" + integrity sha512-6bkwhOlPOx+wKiHVlPTHjUqM4zDKv9pyccehB8zetZL0hhQ7MVp7UEWUsohjiMdxwhSsEdjMrEve+8qzUVmY4w== dependencies: - style-to-object "0.4.1" + style-to-object "1.0.4" -style-to-object@0.4.1: - version "0.4.1" - resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.1.tgz#53cf856f7cf7f172d72939d9679556469ba5de37" - integrity sha512-HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw== +style-to-object@1.0.4: + version "1.0.4" + resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.4.tgz#496fded508ce520eca13e738e8af33b8b5af98f2" + integrity sha512-KyNO6mfijxSnypdvEjeXlhvbGPSh0l1zBJp80n+ncBQvrEbSwBHwZCpo0xz6Q4AKSPfXowWwypCBAUAdfz3rFQ== dependencies: - inline-style-parser "0.1.1" + inline-style-parser "0.2.2" styled-components@^5.2.1: version "5.3.11" @@ -10333,11 +11625,6 @@ subarg@^1.0.0: dependencies: minimist "^1.1.0" -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g== - "supports-color@^5.3.0", "supports-color@^5.5.0": version "5.5.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -10407,7 +11694,7 @@ svgo-loader@^2.2.0: js-yaml "^3.13.1" loader-utils "^1.0.3" -"svgo@^2.7.0", "svgo@^2.8.0": +svgo@^2.7.0: version "2.8.0" resolved "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== @@ -10437,6 +11724,11 @@ svgpath@^2.1.5: resolved "https://registry.npmjs.org/svgpath/-/svgpath-2.6.0.tgz#5b160ef3d742b7dfd2d721bf90588d3450d7a90d" integrity sha512-OIWR6bKzXvdXYyO4DK/UWa1VA1JeKq8E+0ug2DG98Y/vOmMpfZNj+TIG988HjfYSqtcy/hFOtZq/n/j5GSESNg== +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + syntax-error@^1.1.1: version "1.4.0" resolved "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c" @@ -10487,15 +11779,6 @@ tempfile@^2.0.0: temp-dir "^1.0.0" uuid "^3.0.1" -tempusdominus-core@^5.19.3: - version "5.19.3" - resolved "https://registry.npmjs.org/tempusdominus-core/-/tempusdominus-core-5.19.3.tgz#7dba3e9d40f9d9753b92361619532425813c40b8" - integrity sha512-WXBVXcBG/hErB6u9gdUs+vzANvCU1kd1ykzL4kolPB3h1OEv20OKUW5qz1iynxyqRFPa1NWY9gwRu5d+MjXEuQ== - dependencies: - jquery "^3.6.0" - moment "~2.29.2" - moment-timezone "^0.5.34" - "terser-webpack-plugin@^5.1.1", "terser-webpack-plugin@^5.3.7": version "5.3.9" resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" @@ -10517,12 +11800,14 @@ terser@^5.16.8: commander "^2.20.0" source-map-support "~0.5.20" -text-segmentation@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz#52a388159efffe746b24a63ba311b6ac9f2d7943" - integrity sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw== +test-exclude@^6.0.0: + version "6.0.0" + resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" + integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== dependencies: - utrie "^1.0.2" + "@istanbuljs/schema" "^0.1.2" + glob "^7.1.4" + minimatch "^3.0.4" text-table@^0.2.0: version "0.2.0" @@ -10559,23 +11844,16 @@ tiny-warning@^1.0.2: resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== -tmp@^0.2.1: - version "0.2.1" - resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" +tmpl@1.0.5: + version "1.0.5" + resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== to-buffer@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - integrity sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og== - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" @@ -10588,11 +11866,6 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -toidentifier@1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" - integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== - token-types@^4.1.1: version "4.2.1" resolved "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz#0f897f03665846982806e138977dbe72d44df753" @@ -10606,6 +11879,23 @@ totalist@^1.0.0: resolved "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df" integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g== +tough-cookie@^4.1.2: + version "4.1.3" + resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + +tr46@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" + integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA== + dependencies: + punycode "^2.1.1" + trim-newlines@^4.0.2: version "4.1.1" resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125" @@ -10618,11 +11908,6 @@ trim-repeated@^1.0.0: dependencies: escape-string-regexp "^1.0.2" -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw== - tslib@2.3.1: version "2.3.1" resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" @@ -10633,6 +11918,11 @@ tslib@^1.8.1: resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2.0.3: + version "2.6.2" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + tslib@^2.4.0: version "2.5.3" resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz#24944ba2d990940e6e982c4bea147aba80209913" @@ -10689,23 +11979,55 @@ tunnel-agent@^0.6.0: dependencies: prelude-ls "^1.2.1" +type-detect@4.0.8: + version "4.0.8" + resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + type-fest@^0.20.2: version "0.20.2" resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + "type-fest@^1.0.1", "type-fest@^1.2.1", "type-fest@^1.2.2": version "1.4.0" resolved "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== -type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== +typed-array-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60" + integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.1" + is-typed-array "^1.1.10" + +typed-array-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" + integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== + dependencies: + call-bind "^1.0.2" + for-each "^0.3.3" + has-proto "^1.0.1" + is-typed-array "^1.1.10" + +typed-array-byte-offset@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" + integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" + 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" typed-array-length@^1.0.4: version "1.0.4" @@ -10726,11 +12048,6 @@ typescript@^3.2.2: resolved "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== -ua-parser-js@^0.7.30: - version "0.7.35" - resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.35.tgz#8bda4827be4f0b1dda91699a29499575a1f1d307" - integrity sha512-veRf7dawaj9xaWEu9HoTVn5Pggtc/qj+kqTOFvNiN1l0YdxwC1kvel57UCjThjGa3BHBihE8/UJAHI+uQHmd/g== - uglify-js@^3.1.4: version "3.17.4" resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" @@ -10817,15 +12134,10 @@ unique-slug@^4.0.0: dependencies: imurmurhash "^0.1.4" -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -"unpipe@1.0.0", "unpipe@~1.0.0": - version "1.0.0" - resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== update-browserslist-db@^1.0.11: version "1.0.11" @@ -10835,6 +12147,14 @@ update-browserslist-db@^1.0.11: escalade "^3.1.1" picocolors "^1.0.0" +update-browserslist-db@^1.0.13: + version "1.0.13" + resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" + integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + uplot-react@^1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/uplot-react/-/uplot-react-1.1.4.tgz#02b9918a199da9983fc0d375fb44e443749e2ac0" @@ -10880,6 +12200,14 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" @@ -10898,7 +12226,7 @@ use-isomorphic-layout-effect@^1.1.2: resolved "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb" integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA== -use-sync-external-store@^1.2.0: +"use-sync-external-store@1.2.0", "use-sync-external-store@^1.2.0": version "1.2.0" resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== @@ -10926,23 +12254,20 @@ util@~0.12.0: is-typed-array "^1.1.3" which-typed-array "^1.1.2" -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== - -utrie@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz#d42fe44de9bc0119c25de7f564a6ed1b2c87a645" - integrity sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw== - dependencies: - base64-arraybuffer "^1.0.2" - uuid@^3.0.1: version "3.4.0" resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +v8-to-istanbul@^9.0.1: + version "9.1.0" + resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265" + integrity sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA== + dependencies: + "@jridgewell/trace-mapping" "^0.3.12" + "@types/istanbul-lib-coverage" "^2.0.1" + convert-source-map "^1.6.0" + valid-filename@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/valid-filename/-/valid-filename-2.0.1.tgz#0768d6f364b1ed3bdf68f0d15abffb0d9d6cecaf" @@ -10972,20 +12297,24 @@ varstream@^0.3.2: dependencies: readable-stream "^1.0.33" -vary@^1: - version "1.1.2" - resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== - vm-browserify@^1.0.0: version "1.1.2" resolved "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -void-elements@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" - integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung== +w3c-xmlserializer@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" + integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== + dependencies: + xml-name-validator "^4.0.0" + +walker@^1.0.8: + version "1.0.8" + resolved "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" + integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== + dependencies: + makeerror "1.0.12" watchpack@^2.4.0: version "2.4.0" @@ -11004,6 +12333,11 @@ webfonts-loader@^8.0.1: glob "^7.1.6" loader-utils "^2.0.0" +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + webpack-bundle-analyzer@^4.8.0: version "4.9.0" resolved "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.0.tgz#fc093c4ab174fd3dcbd1c30b763f56d10141209d" @@ -11038,13 +12372,6 @@ webpack-cli@^4.5.0: rechoir "^0.7.0" webpack-merge "^5.7.3" -webpack-merge@^4.1.5: - version "4.2.2" - resolved "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" - integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== - dependencies: - lodash "^4.17.15" - webpack-merge@^5.7.3: version "5.9.0" resolved "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826" @@ -11066,10 +12393,10 @@ webpack-sources@^3.2.3: resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5.76.3: - version "5.88.0" - resolved "https://registry.npmjs.org/webpack/-/webpack-5.88.0.tgz#a07aa2f8e7a64a8f1cec0c6c2e180e3cb34440c8" - integrity sha512-O3jDhG5e44qIBSi/P6KpcCcH7HD+nYIHVBhdWFxcLOcIGN8zGo5nqF3BjyNCxIh4p1vFdNnreZv2h2KkoAw3lw== +webpack@^5.88.2: + version "5.88.2" + resolved "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e" + integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.0" @@ -11096,6 +12423,26 @@ webpack@^5.76.3: watchpack "^2.4.0" webpack-sources "^3.2.3" +whatwg-encoding@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" + integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== + dependencies: + iconv-lite "0.6.3" + +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== + +whatwg-url@^11.0.0: + version "11.0.0" + resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" + integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ== + dependencies: + tr46 "^3.0.0" + webidl-conversions "^7.0.0" + which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -11107,6 +12454,45 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" +which-builtin-type@^1.1.3: + version "1.1.3" + resolved "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz#b1b8443707cc58b6e9bf98d32110ff0c2cbd029b" + integrity sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw== + 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" + +which-collection@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" + integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== + dependencies: + is-map "^2.0.1" + is-set "^2.0.1" + is-weakmap "^2.0.1" + is-weakset "^2.0.1" + +which-typed-array@^1.1.10: + version "1.1.11" + resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a" + integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew== + 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" + "which-typed-array@^1.1.2", "which-typed-array@^1.1.9": version "1.1.9" resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" @@ -11119,7 +12505,7 @@ which-boxed-primitive@^1.0.2: has-tostringtag "^1.0.0" is-typed-array "^1.1.10" -"which@^1.2.1", "which@^1.2.9": +which@^1.2.9: version "1.3.1" resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -11185,16 +12571,39 @@ wrappy@1: resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== +write-file-atomic@^4.0.2: + version "4.0.2" + resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" + integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg== + dependencies: + imurmurhash "^0.1.4" + signal-exit "^3.0.7" + ws@^7.3.1: version "7.5.9" resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== +ws@^8.11.0: + version "8.13.0" + resolved "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== + ws@~8.11.0: version "8.11.0" resolved "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== +xml-name-validator@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" + integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== + +xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + xmlhttprequest-ssl@~2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" @@ -11250,23 +12659,28 @@ yallist@^4.0.0: resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -"yargs-parser@^20.2.2", "yargs-parser@^20.2.9": +yargs-parser@^20.2.9: version "20.2.9" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs@^16.1.1: - version "16.2.0" - resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + +yargs@^17.3.1: + version "17.7.2" + resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== dependencies: - cliui "^7.0.2" + cliui "^8.0.1" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" - string-width "^4.2.0" + string-width "^4.2.3" y18n "^5.0.5" - yargs-parser "^20.2.2" + yargs-parser "^21.1.1" yarn-audit-html@4.0.0: version "4.0.0" @@ -11290,17 +12704,15 @@ yocto-queue@^0.1.0: resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +zustand@^4.4.1: + version "4.4.1" + resolved "https://registry.npmjs.org/zustand/-/zustand-4.4.1.tgz#0cd3a3e4756f21811bd956418fdc686877e8b3b0" + integrity sha512-QCPfstAS4EBiTQzlaGP1gmorkh/UL1Leaj2tdj+zZCZ/9bm0WS7sI2wnfD5lpOszFqWJ1DcPnGoY8RDL61uokw== + dependencies: + use-sync-external-store "1.2.0" + "react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8": version "7.0.0-beta.14" resolved "https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8" dependencies: "clsx" "^1.1.1" -"webcabin-docker@https://github.com/pgadmin-org/wcdocker#460fc6d90ba170bb177faaa8277f5fbb8279522a": - version "2.2.5" - resolved "https://github.com/pgadmin-org/wcdocker#460fc6d90ba170bb177faaa8277f5fbb8279522a" - dependencies: - "@fortawesome/fontawesome-free" "^5.14.0" - "FileSaver" "^0.10.0" - "bootstrap" "^4.3.1" - "jquery" "^3.3.1" - "jquery-contextmenu" "^2.6.4" diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 67f863198d097..1aaad9c4ee8cd 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.74.4"; + version = "0.77.0"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-QWXb4JBT/MgAsUyn4zaeSaauUDjV1b9mb7JYaoS2oqg="; + hash = "sha256-247YXfZHxnH3IrCpM/BOmJclKdsC561R2m5seqEknaE="; }; - vendorHash = "sha256-ilEG1relXYEFPR++oq35qcvnIcXkP4HRAjqxYr3U3XM="; + vendorHash = "sha256-uYmA6dYdCTf/oon202s6RBGNfOaXLllX+mPM8fRkCh0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 38fd3fc1e12fa..c33f720ebad05 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.24.0"; + version = "2.26.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-Q65X2lsR5jyWXxxmkvUA0yG4miD+KUSBGRFXvH4KBGY="; + sha256 = "sha256-RfXNwuynlELT7gVWjlhjaX5nKuBJM+v6eAD/JCuRyck="; }; - vendorHash = "sha256-mZ2XFZS5tqtRUhdo6AOCY4xSaYgxUEy1OFbyzsbCEnU="; + vendorHash = "sha256-hBfEQtuBkU2fKoCd78dpp+I19lTOycItqjlcA6KByLY="; ldflags = [ "-w" @@ -23,13 +23,39 @@ buildGoModule rec { "-X main.BuildDate=unknown" ]; - # some tests require network access to scaleway's API, failing when sandboxed - doCheck = false; + doCheck = true; + + # Some tests require access to scaleway's API, failing when sandboxed + preCheck = '' + substituteInPlace internal/core/bootstrap_test.go \ + --replace "TestInterruptError" "SkipInterruptError" + substituteInPlace internal/e2e/errors_test.go \ + --replace "TestStandardErrors" "SkipStandardErrors" + substituteInPlace internal/e2e/human_test.go \ + --replace "TestTestCommand" "SkipTestCommand" \ + --replace "TestHumanCreate" "SkipHumanCreate" \ + --replace "TestHumanList" "SkipHumanList" \ + --replace "TestHumanUpdate" "SkipHumanUpdate" \ + --replace "TestHumanGet" "SkipHumanGet" \ + --replace "TestHumanDelete" "SkipHumanDelete" + substituteInPlace internal/e2e/sdk_errors_test.go \ + --replace "TestSdkStandardErrors" "SkipSdkStandardErrors" + ''; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/scw --help + + runHook postInstallCheck + ''; meta = with lib; { description = "Interact with Scaleway API from the command line"; homepage = "https://github.com/scaleway/scaleway-cli"; license = licenses.mit; - maintainers = with maintainers; [ nickhu techknowlogick ]; + maintainers = with maintainers; [ nickhu techknowlogick kashw2 ]; }; } diff --git a/pkgs/tools/admin/scalr-cli/default.nix b/pkgs/tools/admin/scalr-cli/default.nix index 7adbaf7f6689c..8c05709c27b6e 100644 --- a/pkgs/tools/admin/scalr-cli/default.nix +++ b/pkgs/tools/admin/scalr-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "scalr-cli"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${version}"; - hash = "sha256-ciretC6z2NcLffSkK78DFIUqbRHgVTA7OEyNk6qdAgI="; + hash = "sha256-Z+V+qD9vXlWGJg/fgjfici1Sa4NZhsQXkY8uBiee0aQ="; }; - vendorHash = "sha256-zyshSluHq5f+DQV4K7qxHNsZ4nKzL8J5A25rdg9fHeM="; + vendorHash = "sha256-mfxdodwZXzmGzh3Tk8WnjW74YXRlAzImGLqzKM5OkGw="; ldflags = [ "-s" "-w" diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 3fc6a6dba776e..3dcf7d8557154 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.18.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-1AdR0PHAhrMbeCD5zNsU9JoXInQD+qUIYfveBD60wR0="; + hash = "sha256-4xyJZKFkijgemNwGC8pi7zF9MgtwgSKIvDRZ8jJ2h8o="; }; vendorHash = "sha256-DYA6cu2KzEBZ4wsT7wjcdY1endQQOZlj2aOwu6iGLew="; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 32d46c15f3321..802c7a46215be 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.98.0"; + version = "0.99.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-9RHh5wMtJ0QUjrKBTp+4IGKmiNkiz3SWp08aT3DWHzA="; + hash = "sha256-1Fw/1OVSKW+sIfVD4rodtTwu7JUhIsLEvIpYP49SqKQ="; # 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-ht768PXHchgR4sxMDtQc1IEYpd0lflIe0aCQhX6ppZ4="; + vendorHash = "sha256-y6tw/umiEgwdoafa/CTg78naMWvr+DBOtXT/rMs1agQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 6a0d93483b77e..1af050640726a 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -1,25 +1,28 @@ { lib +, stdenv +, buildPackages , buildGoModule , fetchFromGitHub +, installShellFiles , testers , trivy }: buildGoModule rec { pname = "trivy"; - version = "0.47.0"; + version = "0.48.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ahy6wiBoOwS3MIrAIg2gIk2gkmphkCJUYAUtqVydA2Q="; + hash = "sha256-BljAzfTm/POxshj34mSjXQl64vxBkQZc8T3cTe95eVA="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-qG4z52oVa3sgu8QKX8UbHsk/aSfacgZShX298WUu2oU="; + vendorHash = "sha256-L+UGAg3UERhty3kwksgFojXchr5GzHqULcxJw6Gy2WM="; subPackages = [ "cmd/trivy" ]; @@ -29,9 +32,22 @@ buildGoModule rec { "-X=github.com/aquasecurity/trivy/pkg/version.ver=v${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + # Tests require network access doCheck = false; + postInstall = + let + trivy = if stdenv.buildPlatform.canExecute stdenv.hostPlatform then placeholder "out" else buildPackages.trivy; + in + '' + installShellCompletion --cmd trivy \ + --bash <(${trivy}/bin/trivy completion bash) \ + --fish <(${trivy}/bin/trivy completion fish) \ + --zsh <(${trivy}/bin/trivy completion zsh) + ''; + doInstallCheck = true; passthru.tests.version = testers.testVersion { @@ -51,6 +67,7 @@ buildGoModule rec { vulnerabilities of OS packages (Alpine, RHEL, CentOS, etc.) and application dependencies (Bundler, Composer, npm, yarn, etc.). ''; + mainProgram = "trivy"; license = licenses.asl20; maintainers = with maintainers; [ fab jk ]; }; diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix index 801fe1ba4a147..aaba4768a9243 100644 --- a/pkgs/tools/admin/turbovnc/default.nix +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "turbovnc"; - version = "3.0.3"; + version = "3.1"; src = fetchFromGitHub { owner = "TurboVNC"; repo = "turbovnc"; rev = finalAttrs.version; - hash = "sha256-akkkbDb5ZHTG5GEEeDm1ns60GedQ+DnFXgVMZumRQHc="; + hash = "sha256-nMqH/jhw4GhffGYR+WGcUnF6EOFSS6HDuSKvjoCtGkk="; }; # TODO: diff --git a/pkgs/tools/admin/wander/default.nix b/pkgs/tools/admin/wander/default.nix index fa7ddbd832e0b..43d3400ccf55d 100644 --- a/pkgs/tools/admin/wander/default.nix +++ b/pkgs/tools/admin/wander/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wander"; - version = "0.12.6"; + version = "0.14.1"; src = fetchFromGitHub { owner = "robinovitch61"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DYlbMdh5vgf3PjHVRU7F31upOe4QX5t2D3YdR3e736I="; + sha256 = "sha256-ULttOJcP3LHQAlyJKGEKT3B3PqYOP5+IxDej673020M="; }; - vendorHash = "sha256-SqDGXV8MpvEQFAkcE1NWvWjdzYsvbO5vA6k+hpY0js0="; + vendorHash = "sha256-0S8tzP5yNUrH6fp+v7nbUPTMWzYXyGw+ZNcXkSN+tWY="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 899640d90c455..b775eb1561ef0 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse perl ]; + makeFlags = [ "CXXFLAGS=-std=c++03" ]; + meta = with lib; { description = "FUSE Compressed ROM filesystem with lzma"; homepage = "https://bisqwit.iki.fi/source/cromfs.html"; diff --git a/pkgs/tools/archivers/peazip/default.nix b/pkgs/tools/archivers/peazip/default.nix index b00f7b9d665c7..4070c58d46c2e 100644 --- a/pkgs/tools/archivers/peazip/default.nix +++ b/pkgs/tools/archivers/peazip/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "peazip"; - version = "9.4.0"; + version = "9.6.0"; src = fetchFromGitHub { owner = "peazip"; repo = pname; rev = version; - hash = "sha256-to5VhuTomw33WRWrtSIMF/SD+KVXsUKmSrJ84BNatqw="; + hash = "sha256-75EkVRx6bX1ZZzeNSR7IvKNjTA5NvzFzUJdORiAVHBo="; }; sourceRoot = "${src.name}/peazip-sources"; diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index ab37ef98c0bde..9860817cf3e15 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.info-zip.org"; description = "An extraction utility for archives compressed in .zip format"; - license = lib.licenses.free; # http://www.info-zip.org/license.html + license = lib.licenses.info-zip; platforms = lib.platforms.all; mainProgram = "unzip"; }; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 7c394e27d178f..6a03b825e902d 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "http://mattmahoney.net/dc/zpaq.html"; license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "zpaq"; }; } diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index b44f53fce10a2..a75daf7bff553 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2023.11.17"; + version = "2023.12.23"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-yWCHK7bi1kCZNWBhaLqilm/ZUv5YXUGi7W3PaRKA7ww="; + hash = "sha256-j7gww8T3wHMtec/Nvqxys2dSQCTJOw/7OQ8gwpc3mxo="; }; meta = with lib; { diff --git a/pkgs/tools/audio/fmtoy/default.nix b/pkgs/tools/audio/fmtoy/default.nix deleted file mode 100644 index 69a0f570d3bc0..0000000000000 --- a/pkgs/tools/audio/fmtoy/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, unstableGitUpdater -, dos2unix -, pkg-config -, zlib -, alsa-lib -, libjack2 -}: - -stdenv.mkDerivation rec { - pname = "fmtoy"; - version = "unstable-2022-12-23"; - - src = fetchFromGitHub { - owner = "vampirefrog"; - repo = "fmtoy"; - rev = "78b61b5e9bc0c6874962dc4040456581c9999b36"; - sha256 = "r5zbr6TCxzDiQvDsLQu/QwNfem1K4Ahaji0yIz/2yl0="; - }; - - postPatch = '' - dos2unix Makefile - # Don't hardcode compilers - sed -i -e '/CC=/d' -e '/CXX=/d' Makefile - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Remove Linux-only program & its dependencies - sed -i -e '/PROGS/ s/fmtoy_jack//' Makefile - substituteInPlace Makefile \ - --replace '$(shell pkg-config alsa jack --cflags)' "" - ''; - - nativeBuildInputs = [ - dos2unix - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - pkg-config - ]; - - buildInputs = [ - zlib - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - libjack2 - ]; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - for prog in $(grep 'PROGS=' Makefile | cut -d= -f2-); do - install -Dm755 $prog $out/bin/$prog - done - - runHook postInstall - ''; - - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/vampirefrog/fmtoy.git"; - }; - - meta = with lib; { - homepage = "https://github.com/vampirefrog/fmtoy"; - description = "Tools for FM voices for Yamaha YM chips (OPL, OPM and OPN series)"; - # Unclear if gpl3Only or gpl3Plus - # https://github.com/vampirefrog/fmtoy/issues/1 - license = licenses.gpl3; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 22925dce99fa8..87914436fd49d 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -7,7 +7,7 @@ let pname = "liquidsoap"; - version = "2.2.2"; + version = "2.2.3"; in stdenv.mkDerivation { inherit pname version; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "savonet"; repo = "liquidsoap"; rev = "refs/tags/v${version}"; - hash = "sha256-t7rkWHSAd3DaTCXaGfL9NcIQYT+f4Od9D6huuZlwhWk="; + hash = "sha256-oCMSdmdU3oHrq3QFEDQLdb3CLFYcWylxTqKWtGOoQW8="; }; postPatch = '' diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index f19425201cde2..eac34e30b08c0 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "whisper-cpp"; - version = "1.4.2"; + version = "1.5.2"; src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; rev = "refs/tags/v${version}" ; - hash = "sha256-Qea9zGLJ41D+l8h1Sg/KJI6Ou02jtbRIxYPGoabM8nY="; + hash = "sha256-7pJbROifDajBJUE07Nz8tARB901fWCB+TS4okcnEsvc="; }; # The upstream download script tries to download the models to the @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { WHISPER_COREML_ALLOW_FALLBACK = "1"; }; - makeFlags = [ "main" "stream" ]; + makeFlags = [ "main" "stream" "command" ]; installPhase = '' runHook preInstall @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp ./main $out/bin/whisper-cpp cp ./stream $out/bin/whisper-cpp-stream + cp ./command $out/bin/whisper-cpp-command cp models/download-ggml-model.sh $out/bin/whisper-cpp-download-ggml-model diff --git a/pkgs/tools/audio/openai-whisper-cpp/download-models.patch b/pkgs/tools/audio/openai-whisper-cpp/download-models.patch index 39cb00c3a0c39..c470231b59e89 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/download-models.patch +++ b/pkgs/tools/audio/openai-whisper-cpp/download-models.patch @@ -19,18 +19,18 @@ index 749b409..831f4c0 100755 -models_path="$(get_script_path)" - # Whisper models - models=( "tiny.en" "tiny" "base.en" "base" "small.en" "small" "medium.en" "medium" "large-v1" "large" ) - -@@ -54,8 +42,6 @@ fi + models=( + "tiny.en" +@@ -82,8 +70,6 @@ fi printf "Downloading ggml model $model from '$src' ...\n" --cd $models_path +-cd "$models_path" - if [ -f "ggml-$model.bin" ]; then printf "Model $model already exists. Skipping download.\n" exit 0 -@@ -77,7 +63,7 @@ if [ $? -ne 0 ]; then +@@ -105,7 +91,7 @@ if [ $? -ne 0 ]; then exit 1 fi diff --git a/pkgs/tools/audio/piper/fix-compilation-with-newer-onnxruntime.patch b/pkgs/tools/audio/piper/fix-compilation-with-newer-onnxruntime.patch deleted file mode 100644 index 9d2e46bb4e912..0000000000000 --- a/pkgs/tools/audio/piper/fix-compilation-with-newer-onnxruntime.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/cpp/synthesize.hpp b/src/cpp/synthesize.hpp -index ef61aef..4c7db7a 100644 ---- a/synthesize.hpp -+++ b/synthesize.hpp -@@ -119,11 +119,11 @@ void synthesize(SynthesisConfig &synthesisConfig, ModelSession &session, - - // Clean up - for (size_t i = 0; i < outputTensors.size(); i++) { -- Ort::OrtRelease(outputTensors[i].release()); -+ Ort::detail::OrtRelease(outputTensors[i].release()); - } - - for (size_t i = 0; i < inputTensors.size(); i++) { -- Ort::OrtRelease(inputTensors[i].release()); -+ Ort::detail::OrtRelease(inputTensors[i].release()); - } - } - } // namespace larynx diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 9bbceae0b6883..a825fd2e1e399 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -9,14 +9,14 @@ let python = python3; in python.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "4.2.2"; + version = "4.2.4"; pyproject = true; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "refs/tags/v${version}"; - hash = "sha256-pJr0OGUI3OcFsmvn9eqkvpFeF1EkHDdNoWc91s8h9O8="; + hash = "sha256-U0UA94t7WdCeU9Y86rcnT8BzXVx8ryhD3MTJxmNBYcc="; }; nativeBuildInputs = with python.pkgs; [ @@ -79,8 +79,10 @@ in python.pkgs.buildPythonApplication rec { "test_download_ffmpeg" "test_download_song" "test_preload_song" - "test_ytm_get_results" + "test_yt_get_results" + "test_yt_search" "test_ytm_search" + "test_ytm_get_results" ]; makeWrapperArgs = [ diff --git a/pkgs/tools/audio/unflac/default.nix b/pkgs/tools/audio/unflac/default.nix index 41068d4797064..b0d1d62c1807f 100644 --- a/pkgs/tools/audio/unflac/default.nix +++ b/pkgs/tools/audio/unflac/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "unflac"; - version = "1.1"; + version = "1.2"; src = fetchFromSourcehut { owner = "~ft"; repo = pname; rev = version; - sha256 = "sha256-gDgmEEOvsudSYdLUodTuE50+2hZpMqlnaVGanv/rg+U="; + sha256 = "sha256-BgXuPAXrw28axfTEh10Yh8dQc27M1/lSmCo2eAeNnjE="; }; - vendorHash = "sha256-X3cMhzaf1t+x7D8BVBfQy00rAACDEPmIOezIhKzqOZ8="; + vendorHash = "sha256-IQHxEYv6l8ORoX+a3Szox9tS2fyBk0tpK+Q1AsWohX0="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/tools/audio/whisper-ctranslate2/default.nix b/pkgs/tools/audio/whisper-ctranslate2/default.nix index 452af0a18b402..c8121e8ffbaf3 100644 --- a/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/pkgs/tools/audio/whisper-ctranslate2/default.nix @@ -5,7 +5,7 @@ }: let pname = "whisper-ctranslate2"; - version = "0.3.2"; + version = "0.3.4"; in python3.pkgs.buildPythonApplication { inherit pname version; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication { owner = "Softcatala"; repo = "whisper-ctranslate2"; rev = version; - hash = "sha256-9Y9y7DihDnbREaeARCGC7ctwwBAoZPpIWDAOdeDnB6E="; + hash = "sha256-6tbCEvoOd97/rWC8XwKUS2FJXaB7PKReCctWRaYqUGU="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index e11f3f1ad498a..33c5aa5272188 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -16,12 +16,12 @@ python3Packages.buildPythonApplication rec { pname = "borgbackup"; - version = "1.2.6"; + version = "1.2.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-t6b48IYDnu7HkHC5FPPGUe1/NhLJZTdK+RDSd8eiE50="; + hash = "sha256-9j8oozg8BBlxzsh7BhyjmoFbX9RF2ySqgXLKxBfZQRo="; }; postPatch = '' diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 4b9951f2e2eaf..c2b7b048bce27 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -6,7 +6,7 @@ assert par2Support -> par2cmdline != null; let - version = "0.33.2"; + version = "0.33.3"; pythonDeps = with python3.pkgs; [ setuptools tornado ] ++ lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation { repo = "bup"; owner = "bup"; rev = version; - hash = "sha256-DDVCrY4SFqzKukXm8rIq90xAW2U+yYyhyPmUhslMMWI="; + hash = "sha256-w7yPs7hG4v0Kd9i2tYhWH7vW95MAMfI/8g61MB6bfps="; }; buildInputs = [ git python3 ]; diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/tools/backup/pgbackrest/default.nix index f4c9fba781fa7..50ab894de89e9 100644 --- a/pkgs/tools/backup/pgbackrest/default.nix +++ b/pkgs/tools/backup/pgbackrest/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.48"; + version = "2.49"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-RaNF5ufQafZjE2MfOlFOXkot/JEJCQOuiuIYgJolkbU="; + sha256 = "sha256-i1IcBNrobhgu+B/ezKFknTiqiZe6LktBxf9YU8JS2Wc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index a3223c04e2972..72220f17d26e9 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -48,5 +48,6 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; maintainers = [ maintainers.mbrgm maintainers.dotlambda ]; + mainProgram = "restic"; }; } diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/tools/backup/zrepl/default.nix index 0a45c8c2aef19..b0e0f75fe8c6d 100644 --- a/pkgs/tools/backup/zrepl/default.nix +++ b/pkgs/tools/backup/zrepl/default.nix @@ -45,5 +45,6 @@ buildGoModule rec { platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ cole-h danderson mdlayher ]; + mainProgram = "zrepl"; }; } diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/tools/cd-dvd/mkcue/default.nix index 575adecbd5215..34893b9f68a54 100644 --- a/pkgs/tools/cd-dvd/mkcue/default.nix +++ b/pkgs/tools/cd-dvd/mkcue/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0rs897wp08z4hd904bjb5sl4lb8qxj82x5ayklr28bhg9pd5gbra"; }; + env.CXXFLAGS = "-std=c++98"; + preInstall = "mkdir -pv $out/bin"; postInstall = "chmod -v +w $out/bin/mkcue"; diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index 6e21a352d06f1..135b253229ad1 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "bzip3"; - version = "1.3.2"; + version = "1.4.0"; outputs = [ "bin" "dev" "out" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "kspalaiologos"; repo = "bzip3"; rev = finalAttrs.version; - hash = "sha256-nSmKpOwlbxbUN2TJwsS2CFP5UV2ODOKXFHAUsCje7mc="; + hash = "sha256-UVCZWcjlueKSGYqdm7oiJ5i7/irkWv7IOyeCWT2r4sk="; }; postPatch = '' diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/tools/compression/ouch/default.nix index a1b4131ca7032..07a5302b5a178 100644 --- a/pkgs/tools/compression/ouch/default.nix +++ b/pkgs/tools/compression/ouch/default.nix @@ -7,20 +7,21 @@ , xz , zlib , zstd +, stdenv }: rustPlatform.buildRustPackage rec { pname = "ouch"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "ouch-org"; repo = "ouch"; rev = version; - hash = "sha256-WqV04GhX7lIla5BEdHRgRZsAWBSweb1HFAC9XZYqpYo="; + hash = "sha256-WO1fetu39fcLGcrbzFh+toHpnyxWuDVHtmjuH203hzQ="; }; - cargoHash = "sha256-A3YcgHed5mp7//FMoC/02KAU7Y+7YiG50eWE9tP5mF8="; + cargoHash = "sha256-OdAu7fStTJCF1JGJG9TRE1Qosy6yjKsWq01MYpbXZcg="; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -28,12 +29,19 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "zstd/pkg-config" ]; + preCheck = '' + substituteInPlace tests/ui.rs \ + --replace 'format!(r"/private{path}")' 'path.to_string()' + ''; + postInstall = '' installManPage artifacts/*.1 installShellCompletion artifacts/ouch.{bash,fish} --zsh artifacts/_ouch ''; - env.OUCH_ARTIFACTS_FOLDER = "artifacts"; + env = { OUCH_ARTIFACTS_FOLDER = "artifacts"; } // + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + lib.optionalAttrs stdenv.cc.isClang { NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; meta = with lib; { description = "A command-line utility for easily compressing and decompressing files and directories"; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 9af509100e009..6c22984b3641c 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,18 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, nix-update-script +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "upx"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "upx"; - repo = pname; - rev = "v${version}"; + repo = "upx"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-PRfIJSjmeXjbslqWnKrHUPdOJfZU08nr4wXoAnP9qm0="; + sha256 = "sha256-s4cZAb0rhCJrHI//IXLNYLhOzX1NRmN/t5IFgurwI30="; }; nativeBuildInputs = [ cmake ]; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; + meta = with lib; { homepage = "https://upx.github.io/"; description = "The Ultimate Packer for eXecutables"; @@ -20,4 +31,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "upx"; }; -} +}) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index adc73d926c905..e8e0ae2439f23 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xz"; - version = "5.4.4"; + version = "5.4.5"; src = fetchurl { url = "https://tukaani.org/xz/xz-${version}.tar.bz2"; - sha256 = "sha256-C2/N4aw46QQzolVvUAwGWVC5vNLWAgBu/DNHgr3+YpY="; + sha256 = "sha256-jM9f/4aMAG8pUi44b7TGobZkY/vKZaTPw8S9WW6JXnk="; }; strictDeps = true; diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix index 145f33a1cf8e4..8df75d48eb567 100644 --- a/pkgs/tools/compression/zfp/default.nix +++ b/pkgs/tools/compression/zfp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "zfp"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "LLNL"; repo = "zfp"; rev = version; - sha256 = "sha256-E2LI1rWo1HO5O/sxPHAmLDs3Z5xouzlgMj11rQFPNYQ="; + sha256 = "sha256-iZxA4lIviZQgaeHj6tEQzEFSKocfgpUyf4WvUykb9qk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index b92112a4816ef..0de21cb9c7364 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://zsync.moria.org.uk/"; description = "File distribution system using the rsync algorithm"; - license = licenses.free; + license = licenses.artistic2; maintainers = with maintainers; [ viric ]; platforms = with platforms; all; }; diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index b355b0eb68641..b5fe1a4e85eae 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "android-file-transfer"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b"; + sha256 = "sha256-UOARMtOnG6tekmOsIWRZbl2y32mR0kPD6w7IHRG8VsU="; }; patches = [ ./darwin-dont-vendor-dependencies.patch ]; diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index f6dfdd84d8c4f..58f6a05992e90 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -35,10 +35,6 @@ stdenv.mkDerivation rec { "UDEVLIBDIR=${placeholder "out"}/lib/udev/" ]; - preBuild = '' - sed -e "s|/bin/sh|${bash}/bin/sh|" -i *.rules - ''; - preInstall = '' mkdir -p "$out/sbin" "$out/lib/udev/rules.d" "$out/share/man/man8" ''; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 8614c03ed9066..f7d5ce61d81cf 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.17.5"; + version = "1.17.6"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/bindfs-${finalAttrs.version}.tar.gz"; - hash = "sha256-Wj2xu7soSOtDqzapI8mVgx0xmAd/2J6VHbXQt55i2mQ="; + hash = "sha256-076zzGm7K2gCzFOViOkh/qlz7WGRsTPyAkcZMR0cwYs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/blobfuse/install-adls.patch b/pkgs/tools/filesystems/blobfuse/install-adls.patch deleted file mode 100644 index e48f4d592f683..0000000000000 --- a/pkgs/tools/filesystems/blobfuse/install-adls.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/adls/CMakeLists.txt b/adls/CMakeLists.txt -index 1fb7146..22e663a 100644 ---- a/adls/CMakeLists.txt -+++ b/adls/CMakeLists.txt -@@ -50,3 +50,9 @@ if(BUILD_TESTS) - string(REGEX REPLACE "([^;]+)" "${CMAKE_CURRENT_SOURCE_DIR}/\\1" AZURE_STORAGE_ADLS_TEST_SOURCES "${AZURE_STORAGE_ADLS_TEST_SOURCES}") - set(AZURE_STORAGE_ADLS_TEST_SOURCES ${AZURE_STORAGE_ADLS_TEST_SOURCES} PARENT_SCOPE) - endif() -+ -+install(TARGETS azure-storage-adls -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib -+ RUNTIME DESTINATION bin) -+ diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index 429617e5eae2f..a2f1c51e7e123 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, perl }: +{ lib +, stdenv +, fetchurl +, fetchpatch +}: stdenv.mkDerivation rec { pname = "bonnie++"; @@ -6,17 +10,25 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.coker.com.au/bonnie++/bonnie++-${version}.tgz"; - sha256 = "sha256-qNM7vYG8frVZzlv25YS5tT+uo5zPtK6S5Y8nJX5Gjw4="; + hash = "sha256-qNM7vYG8frVZzlv25YS5tT+uo5zPtK6S5Y8nJX5Gjw4="; }; - enableParallelBuilding = true; + patches = [ + (fetchpatch { + name = "bonnie++-2.00a-gcc11.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-benchmarks/bonnie++/files/bonnie++-2.00a-gcc11.patch?id=d0f29755e969c805fbd6240905e3925671340666"; + hash = "sha256-/cIC4HYQco5Nv1UoTELl2OGD5hdWhbz3L0+GjN/vcdE="; + }) + ]; - buildInputs = [ perl ]; + enableParallelBuilding = true; meta = { - homepage = "http://www.coker.com.au/bonnie++/"; description = "Hard drive and file system benchmark suite"; - license = lib.licenses.gpl2; + homepage = "http://www.coker.com.au/bonnie++/"; + license = lib.licenses.gpl2Only; + mainProgram = "bonnie++"; + maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 6761947367315..dc9f8a0a27d6f 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl -, pkg-config, sphinx +, buildPackages +, pkg-config , zstd , acl, attr, e2fsprogs, libuuid, lzo, udev, zlib , runCommand, btrfs-progs @@ -9,17 +10,20 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-tCZzbclOKwS2mD6ZjE3EJ9wWbWbd6iRsiQ7ZwqRQBE8="; + hash = "sha256-9BzlP2Zz/1Ue5KP+fclgHloN3mttCRd9H6ticYq8bZo="; }; nativeBuildInputs = [ pkg-config ] ++ [ - sphinx + (buildPackages.python3.withPackages (ps: with ps; [ + sphinx + sphinx-rtd-theme + ])) ]; buildInputs = [ acl attr e2fsprogs libuuid lzo udev zlib zstd ]; diff --git a/pkgs/tools/filesystems/ceph-csi/default.nix b/pkgs/tools/filesystems/ceph-csi/default.nix index 5ca2e416a1d43..d6b39ef68e4f0 100644 --- a/pkgs/tools/filesystems/ceph-csi/default.nix +++ b/pkgs/tools/filesystems/ceph-csi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ceph-csi"; - version = "3.9.0"; + version = "3.10.1"; nativeBuildInputs = [ go ]; buildInputs = [ ceph ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - sha256 = "sha256-dKn79EIveepeMzFPweQ3BE3YMCg7mj8EycMbBH8J8PQ="; + sha256 = "sha256-S5jv9l/Oozv0NrEEf+Bik0jnaK4AYIChFm2pU2/DQow="; }; preConfigure = '' diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 241bf71985a09..f38cd4be880c0 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -28,8 +28,10 @@ , doxygen , gperf , graphviz +, gnugrep , gtest , icu +, kmod , libcap , libcap_ng , libnl @@ -294,10 +296,14 @@ in rec { pythonPath = [ ceph-python-env "${placeholder "out"}/${ceph-python-env.sitePackages}" ]; + # replace /sbin and /bin based paths with direct nix store paths + # increase the `command` buffer size since 2 nix store paths cannot fit within 128 characters preConfigure ='' - substituteInPlace src/common/module.c --replace "/sbin/modinfo" "modinfo" - substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe" - substituteInPlace src/common/module.c --replace "/bin/grep" "grep" + substituteInPlace src/common/module.c \ + --replace "char command[128];" "char command[256];" \ + --replace "/sbin/modinfo" "${kmod}/bin/modinfo" \ + --replace "/sbin/modprobe" "${kmod}/bin/modprobe" \ + --replace "/bin/grep" "${gnugrep}/bin/grep" # install target needs to be in PYTHONPATH for "*.pth support" check to succeed # set PYTHONPATH, so the build system doesn't silently skip installing ceph-volume and others diff --git a/pkgs/tools/filesystems/davfs2/isdir.patch b/pkgs/tools/filesystems/davfs2/isdir.patch deleted file mode 100644 index ae69b4460f5a2..0000000000000 --- a/pkgs/tools/filesystems/davfs2/isdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur davfs2-1.4.5-old/src/dav_coda.c davfs2-1.4.5-new/src/dav_coda.c ---- davfs2-1.4.5-old/src/dav_coda.c 2009-06-04 20:30:32.000000000 +0200 -+++ davfs2-1.4.5-new/src/dav_coda.c 2011-02-09 19:51:22.260530572 +0100 -@@ -52,6 +52,10 @@ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif -+#ifdef HAVE_SYS_STAT_H -+#include <sys/stat.h> -+#endif -+ - - #include "defaults.h" - #include "mount_davfs.h" -diff -ur davfs2-1.4.5-old/src/dav_fuse.c davfs2-1.4.5-new/src/dav_fuse.c ---- davfs2-1.4.5-old/src/dav_fuse.c 2009-06-30 20:06:44.000000000 +0200 -+++ davfs2-1.4.5-new/src/dav_fuse.c 2011-02-09 19:52:23.938220524 +0100 -@@ -41,6 +41,12 @@ - #ifdef HAVE_UNISTD_H - #include <unistd.h> - #endif -+#ifdef HAVE_SYS_TYPES_H -+#include <sys/types.h> -+#endif -+#ifdef HAVE_SYS_STAT_H -+#include <sys/stat.h> -+#endif - - #include "defaults.h" - #include "mount_davfs.h" diff --git a/pkgs/tools/filesystems/dwarfs/default.nix b/pkgs/tools/filesystems/dwarfs/default.nix index e5804f3785296..8703c11bf3c73 100644 --- a/pkgs/tools/filesystems/dwarfs/default.nix +++ b/pkgs/tools/filesystems/dwarfs/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "dwarfs"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "mhx"; repo = "dwarfs"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-DcPRrATI2cpLZWAL+sSCoXvJ1R0O3yHqhlJW1aEpDpA="; + hash = "sha256-wclUyATUZmF7EEkrK9nWASmfiB+MBrvEzc73ngOrhZ0="; }; patches = [ diff --git a/pkgs/tools/filesystems/envfs/default.nix b/pkgs/tools/filesystems/envfs/default.nix index ab47aeb550dee..e91df03f7da1e 100644 --- a/pkgs/tools/filesystems/envfs/default.nix +++ b/pkgs/tools/filesystems/envfs/default.nix @@ -1,14 +1,14 @@ { rustPlatform, lib, fetchFromGitHub, nixosTests }: rustPlatform.buildRustPackage rec { pname = "envfs"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Mic92"; repo = "envfs"; rev = version; - hash = "sha256-MfKOfI21sRNEBX+v0Wto1YhzrPu3JI7Q4AU333utGpk="; + hash = "sha256-WbMqh/MzEMfZmKl/DNBGnzG3l8unFmAYbG6feSiMz+Y="; }; - cargoHash = "sha256-vMXmv8p839EPLCwX6So5ebgr5Z68AqdSaLiWqDoBAt4="; + cargoHash = "sha256-RoreNBZvTsVY87nbVibJBy4gsafFwAMctVncAhhiaP8="; passthru.tests = { envfs = nixosTests.envfs; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { ln -s envfs $out/bin/mount.fuse.envfs ''; meta = with lib; { - description = "Fuse filesystem that returns symlinks to executables based on the PATH of the requesting process."; + description = "Fuse filesystem that returns symlinks to executables based on the PATH of the requesting process"; homepage = "https://github.com/Mic92/envfs"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix deleted file mode 100644 index 5e78a1266873d..0000000000000 --- a/pkgs/tools/filesystems/idsk/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - - pname = "idsk"; - version = "0.20"; - - src = fetchFromGitHub { - repo = "idsk"; - owner = "cpcsdk"; - rev = "v${version}"; - sha256 = "05zbdkb9s6sfkni6k927795w2fqdhnf3i7kgl27715sdmmdab05d"; - }; - - nativeBuildInputs = [ cmake ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - # Needed with GCC 12 but breaks on darwin (with clang) - "-std=c++14" - ]); - - installPhase = '' - mkdir -p $out/bin - cp iDSK $out/bin - ''; - - meta = with lib; { - description = "Manipulating CPC dsk images and files"; - homepage = "https://github.com/cpcsdk/idsk" ; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "iDSK"; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 5df6986380b78..00f45c332cbe1 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.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UtERYOjAKOTK+A1qPdD1PajOkf/t5vqWRBvEuxkZmdg="; + sha256 = "sha256-dMzBgwd5tVxE6OFHf6QTZfoqgL/t2pX+OgI6Pki6PG8="; }; - vendorHash = "sha256-BpqxCCuWyUgzPyh7sq3/HyQ29qm/PWD7mQFh1nkkAkA="; + vendorHash = "sha256-orq03bwN1cbwHoZFXz92tcA2F0oivGR/C5EJDAPA+pk="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/filesystems/mount-zip/default.nix b/pkgs/tools/filesystems/mount-zip/default.nix index c3fea94f42f58..bda3381080511 100644 --- a/pkgs/tools/filesystems/mount-zip/default.nix +++ b/pkgs/tools/filesystems/mount-zip/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mount-zip"; - version = "1.0.11"; + version = "1.0.12"; src = fetchFromGitHub { owner = "google"; repo = "mount-zip"; rev = "v${finalAttrs.version}"; - hash = "sha256-67GaZdmDuUc8ixeRP86xA/+n1PRqwwIEe7JK9OZGUC8="; + hash = "sha256-bsuGEgCrU7Gxd9oAiI39AYT9aiXufrI9CniTCfa6LCY="; }; nativeBuildInputs = [ boost gcc icu pandoc pkg-config ]; diff --git a/pkgs/tools/filesystems/rmfuse/default.nix b/pkgs/tools/filesystems/rmfuse/default.nix index 5d3a6a340dbb0..a75ed9429c134 100644 --- a/pkgs/tools/filesystems/rmfuse/default.nix +++ b/pkgs/tools/filesystems/rmfuse/default.nix @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { in the reMarkable Cloud using the same tools you use on your local system. ''; - maintainers = with lib.maintainers; [ adisbladis ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "rmfuse"; }; } diff --git a/pkgs/tools/filesystems/stuffbin/default.nix b/pkgs/tools/filesystems/stuffbin/default.nix index 2640ba8b85197..b955aa870c0fa 100644 --- a/pkgs/tools/filesystems/stuffbin/default.nix +++ b/pkgs/tools/filesystems/stuffbin/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "stuffbin"; - version = "1.1.0"; + version = "1.2.0"; vendorHash = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "knadh"; repo = "stuffbin"; rev = "v${version}"; - sha256 = "sha256-M72xNh7bKUMLzA+M8bJB++kJ5KCrkboQm1v8BasP3Yo="; + sha256 = "sha256-roXjE0t4iwrL2y/G2oePYL2AbTwd9uzQPtgdY14WeZk="; }; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index ee9177e37c2d6..c8c80e5ff777b 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { description = "SGI XFS utilities"; license = with licenses; [ gpl2Only lgpl21 gpl3Plus ]; # see https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/debian/copyright platforms = platforms.linux; - maintainers = with maintainers; [ dezgeg ajs124 ]; + maintainers = with maintainers; [ dezgeg ] ++ teams.helsinki-systems.members; }; } diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index bf783c7f47767..0f90a794987e6 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -70,6 +70,12 @@ in rustPlatform.buildRustPackage rec { libxkbcommon ]; + postInstall = '' + mkdir -p $out/share + cp -r resources/logo $out/share/icons + install -Dm444 resources/linux/ajour.desktop -t $out/share/applications + ''; + fixupPhase = '' patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $out/bin/ajour)" $out/bin/ajour wrapProgram $out/bin/ajour --prefix PATH ":" ${lib.makeBinPath [ zenity kdialog ]} diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index 25acf8cebb1eb..928b9233bccde 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -1,8 +1,8 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , libgamemode32 +, makeWrapper , meson , ninja , pkg-config @@ -10,36 +10,28 @@ , inih , systemd , appstream -, makeWrapper , findutils , gawk , procps +, nix-update-script }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gamemode"; - version = "1.7"; + version = "1.8.1"; src = fetchFromGitHub { owner = "FeralInteractive"; - repo = pname; - rev = version; - sha256 = "sha256-DIFcmWFkoZOklo1keYcCl6n2GJgzWKC8usHFcJmfarU="; + repo = "gamemode"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-kusb58nGxYA3U9GbZdW3hLjA3NmHc+af0VT4iGRewBw="; }; - outputs = [ "out" "dev" "lib" "man" "static" ]; + outputs = [ "out" "dev" "lib" "man" ]; patches = [ # Add @libraryPath@ template variable to fix loading the PRELOAD library ./preload-nix-workaround.patch - # Do not install systemd sysusers configuration - ./no-install-systemd-sysusers.patch - - # fix build with glibc >=2.36 (declaration of pidfd_open) - (fetchpatch { - url = "https://github.com/FeralInteractive/gamemode/commit/4934191b1928ef695c3e8af21e75781f8591745f.patch"; - sha256 = "sha256-pWf2NGbd3gEJFwVP/EIJRbTD29V7keTQHy388enktsY="; - }) ]; postPatch = '' @@ -66,12 +58,15 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # libexec is just a way to package binaries without including them - # in PATH. It doesn't make sense to install them to $lib - # (the default behaviour in the meson hook). - "--libexecdir=${placeholder "out"}/libexec" - + "-Dwith-pam-limits-dir=etc/security/limits.d" "-Dwith-systemd-user-unit-dir=lib/systemd/user" + "-Dwith-systemd-group-dir=lib/sysusers.d" + + # The meson builder installs internal executables to $lib/lib by + # default, but they should be installed to "$out". It's also more + # appropriate to install these executables under a libexec + # directory instead of lib. + "--libexecdir=libexec" ]; doCheck = true; @@ -79,11 +74,6 @@ stdenv.mkDerivation rec { appstream ]; - # Move static libraries to $static so $lib only contains dynamic libraries. - postInstall = '' - moveToOutput lib/*.a "$static" - ''; - postFixup = '' # Add $lib/lib to gamemoded & gamemode-simulate-game's rpath since # they use dlopen to load libgamemode. Can't use makeWrapper since @@ -100,11 +90,15 @@ stdenv.mkDerivation rec { ]} ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Optimise Linux system performance on demand"; - homepage = "https://github.com/FeralInteractive/GameMode"; + homepage = "https://github.com/FeralInteractive/gamemode"; + changelog = "https://github.com/FeralInteractive/gamemode/blob/${finalAttrs.version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; + mainProgram = "gamemoderun"; # Requires NixOS module to run }; -} +}) diff --git a/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch b/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch deleted file mode 100644 index 27aa1d4d710c9..0000000000000 --- a/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git i/data/meson.build w/data/meson.build -index 6fb82d8..2e9e170 100644 ---- i/data/meson.build -+++ w/data/meson.build -@@ -21,11 +21,6 @@ if sd_bus_provider == 'systemd' - configuration: data_conf, - install_dir: path_systemd_unit_dir, - ) -- # Install the sysusers.d file -- install_data( -- files('gamemode.conf'), -- install_dir: path_systemd_sysusers_dir, -- ) - endif - - # Install the D-BUS service file diff --git a/pkgs/tools/games/gamemode/preload-nix-workaround.patch b/pkgs/tools/games/gamemode/preload-nix-workaround.patch index 9c8db37f5d91e..06989ff984abd 100644 --- a/pkgs/tools/games/gamemode/preload-nix-workaround.patch +++ b/pkgs/tools/games/gamemode/preload-nix-workaround.patch @@ -6,7 +6,7 @@ index 573b3e4..6f2799e 100755 # ld will find the right path to load the library, including for 32-bit apps. LD_PRELOAD="${GAMEMODEAUTO_NAME}${LD_PRELOAD:+:$LD_PRELOAD}" -+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ++LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" -exec env LD_PRELOAD="${LD_PRELOAD}" $GAMEMODERUNEXEC "$@" +exec env LD_PRELOAD="${LD_PRELOAD}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" $GAMEMODERUNEXEC "$@" diff --git a/pkgs/tools/games/igir/default.nix b/pkgs/tools/games/igir/default.nix new file mode 100644 index 0000000000000..6776f894dd70d --- /dev/null +++ b/pkgs/tools/games/igir/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "igir"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "emmercm"; + repo = "igir"; + rev = "v${version}"; + hash = "sha256-RHMsLiet3O/4aYLKWtxr1oJDU6sy5kHxr422AUqLzMA="; + }; + + npmDepsHash = "sha256-MvXhSSqHHI3Ofgx+EnKwR5LuHl33h6sjTZ+ErBfjb6s="; + + # I have no clue why I have to do this + postPatch = '' + patchShebangs scripts/update-readme-help.sh + ''; + + meta = with lib; { + description = "A video game ROM collection manager to help filter, sort, patch, archive, and report on collections on any OS"; + homepage = "https://igir.io"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ TheBrainScrambler ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/games/pocket-updater-utility/default.nix b/pkgs/tools/games/pocket-updater-utility/default.nix index 3fb5acb27aae4..ded1180d472e7 100644 --- a/pkgs/tools/games/pocket-updater-utility/default.nix +++ b/pkgs/tools/games/pocket-updater-utility/default.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "pocket-updater-utility"; - version = "2.37.0"; + version = "2.38.1"; src = fetchFromGitHub { owner = "mattpannella"; repo = "${pname}"; rev = "${version}"; - hash = "sha256-J9FYmoUNkMhLWsRCf64qBDAJaP8AIWGcuH0UjWx90ls="; + hash = "sha256-Lk5YHouQSHSWWoqTiZPjaROGM0aV7FQUvnQV/NCWV/E="; }; buildInputs = [ diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index dd7ebc6f3b434..eb0222ba84483 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -29,13 +29,13 @@ with rec { stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-COZO4LTrM/kZp85uNGwB9eaF27Xf7NVg4hcshaCJBwI="; + sha256 = "sha256-7/GBzqgXh8sU3Pl30eH9Mi24PPIqayQqNuhkMnn5Lq0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index fa4cb75d174b3..9332b25babfb1 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, cmake, imagemagick }: +{ lib, stdenv, fetchurl, cmake, imagemagick, testers }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "cuneiform"; version = "1.1.0"; @@ -30,10 +30,23 @@ stdenv.mkDerivation { rm cuneiform_src/Kern/hhh/tigerh/h/strings.h ''; + # make the install path match the rpath + postInstall = '' + if [[ -d ''${!outputLib}/lib64 ]]; then + mv ''${!outputLib}/lib64 ''${!outputLib}/lib + ln -s lib ''${!outputLib}/lib64 + fi + ''; + buildInputs = [ imagemagick ]; nativeBuildInputs = [ cmake ]; + passthru.tests = testers.testVersion { + package = finalAttrs.finalPackage; + command = "cuneiform"; + }; + meta = with lib; { description = "Multi-language OCR system"; homepage = "https://launchpad.net/cuneiform-linux"; @@ -42,4 +55,4 @@ stdenv.mkDerivation { maintainers = [ maintainers.raskin ]; mainProgram = "cuneiform"; }; -} +}) diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index e42ca26cfb08b..5dc243ec2d7ec 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { # Unpack subproject sources postUnpack = ''( cd "$sourceRoot/subprojects" - ${lib.optionalString finalAttrs.doCheck '' + ${lib.optionalString finalAttrs.finalPackage.doCheck '' cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka ''} cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} @@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dwith_wayland=enabled" "-Duse_system_spdlog=enabled" - "-Dtests=${if finalAttrs.doCheck then "enabled" else "disabled"}" + "-Dtests=${if finalAttrs.finalPackage.doCheck then "enabled" else "disabled"}" ] ++ lib.optionals gamescopeSupport [ "-Dmangoapp=true" "-Dmangoapp_layer=true" @@ -215,7 +215,7 @@ stdenv.mkDerivation (finalAttrs: { addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so" '' + lib.optionalString gamescopeSupport '' addOpenGLRunpath "$out/bin/mangoapp" - '' + lib.optionalString finalAttrs.doCheck '' + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' # libcmocka.so is only used for tests rm "$out/lib/libcmocka.so" ''; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 105169c5e0305..79194304dc62e 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.4.4"; + version = "11.4.5"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4784"; - sha256 = "GoO32AWu2s/s1IzehPynCJctc1F98dQhz5cQSXQhu2A="; + rev = "4800"; + sha256 = "ftMw2N63iEsf8GPuuXLe/hw+LN0lAUKyhk7wGZMboHY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index c480f99651dc2..a537e16d96aec 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libpng }: +{ lib, stdenv, fetchurl, libpng, fetchpatch }: stdenv.mkDerivation rec { pname = "pngtoico"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph"; }; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch"; + hash = "sha256-MeRV4FL37Wq7aFRnjbxPokcBKmPM+h94cnFJmdvHAt0="; + }) + ]; + configurePhase = '' sed -i s,/usr/local,$out, Makefile ''; diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 539e3faebfdc8..734ac97fdc737 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.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-KxEeC9E1XG5ascIWzSAoNXtdJyPiEsXcQGebmhs/qkE="; + hash = "sha256-IRIyxQk0BqFufZafq7klUHAW1lculqbcH67kf3jtjwo="; }; - cargoHash = "sha256-iiPtf1xEBB80Cs31uUEbxG9YgKItdZCNGS6TTgrj4uM="; + cargoHash = "sha256-yKQRjY+aEXU5C3LhAyavtX8PazbAvAHQ7fykmK7LAQ8="; cargoBuildFlags = [ "--package=resvg" diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index b4f298fadce2e..c59353af5a11c 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.flameeyes.eu/projects/unpaper"; + changelog = "https://github.com/unpaper/unpaper/blob/unpaper-${version}/NEWS"; description = "Post-processing tool for scanned sheets of paper"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/tools/graphics/vulkan-helper/default.nix b/pkgs/tools/graphics/vulkan-helper/default.nix index 404ce734b5b31..93e6d7be0f046 100644 --- a/pkgs/tools/graphics/vulkan-helper/default.nix +++ b/pkgs/tools/graphics/vulkan-helper/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "vulkan-helper"; - version = "unstable-2023-09-16"; + version = "unstable-2023-12-22"; src = fetchFromGitHub { owner = "imLinguin"; repo = "vulkan-helper-rs"; - rev = "d65b1a17a11ec20670c77d8da02e68d388ed0888"; - hash = "sha256-usbYNalA0r09LXR6eV2e/T1eMNV4LnhzYLzPJQ6XNKQ="; + rev = "04b290c92febcfd6293fcf4730ce3bba55cd9ce0"; + hash = "sha256-2pLHnTn0gJKz4gfrR6h85LHOaZPrhIGYzQeci4Dzz2E="; }; - cargoSha256 = "sha256-fgB0vlbOhzGV1Sj180GCuTGZlVpAUlBUMAfsrG2FiuA="; + cargoSha256 = "sha256-OXMz1qu4/LDeQbwe7shhn2Eee15xKmBpWSsP0IbjoGM="; nativeBuildInputs = [ addOpenGLRunpath diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index ab593a9bc4de7..0db3cf1597713 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -21,6 +21,7 @@ , vulkan-loader , vulkan-utility-libraries , writeText +, libsForQt5 }: stdenv.mkDerivation rec { @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { hash = "sha256-2ZUD+RBsl35QV3250JOPCIoJb4sJcBsiRE4SZaS6ROs="; }; - nativeBuildInputs = [ cmake python3 jq which pkg-config ]; + nativeBuildInputs = [ cmake python3 jq which pkg-config libsForQt5.qt5.wrapQtAppsHook ]; buildInputs = [ expat @@ -51,6 +52,8 @@ stdenv.mkDerivation rec { wayland xcbutilkeysyms xcbutilwm + libsForQt5.qt5.qtbase + libsForQt5.qt5.qtwayland ]; cmakeFlags = [ diff --git a/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40889.patch b/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40889.patch deleted file mode 100644 index 7b7ca5a0befa5..0000000000000 --- a/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40889.patch +++ /dev/null @@ -1,17 +0,0 @@ -Simple bounds checks for CVE-2023-40889, based on third-party -fix by Remi Meier @ -https://github.com/Raemi/zbar/commit/5e8acc6974f17e56c3ddaa5509870beb8d7a599c - ---- a/zbar/qrcode/qrdec.c -+++ b/zbar/qrcode/qrdec.c -@@ -3900,8 +3900,8 @@ void qr_reader_match_centers(qr_reader *_reader,qr_code_data_list *_qrlist, - /*TODO: We might be able to accelerate this step significantly by - considering the remaining finder centers in a more intelligent order, - based on the first finder center we just chose.*/ -- for(j=i+1;!mark[i]&&j<_ncenters;j++){ -- for(k=j+1;!mark[j]&&k<_ncenters;k++)if(!mark[k]){ -+ for(j=i+1; i < _ncenters && !mark[i]&&j<_ncenters;j++){ -+ for(k=j+1; j < _ncenters && !mark[j]&&k<_ncenters;k++)if(!mark[k]){ - qr_finder_center *c[3]; - qr_code_data qrdata; - int version; diff --git a/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40890.patch b/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40890.patch deleted file mode 100644 index 3576df214ae1a..0000000000000 --- a/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40890.patch +++ /dev/null @@ -1,26 +0,0 @@ -Simple bounds checks for CVE-2023-40890 - ---- a/zbar/decoder/databar.c -+++ b/zbar/decoder/databar.c -@@ -23,6 +23,8 @@ - - #include <config.h> - #include <zbar.h> -+#include <stdlib.h> -+#include <stdio.h> - - #ifdef DEBUG_DATABAR - # define DEBUG_LEVEL (DEBUG_DATABAR) -@@ -691,6 +693,12 @@ lookup_sequence (databar_segment_t *seg, - fixed = -1; - s <<= 1; - dbprintf(2, "%x", s); -+ -+ if (i > 20) { -+ fprintf(stderr, "Bug: Out-of-bounds condition detected\n"); -+ exit(99); -+ } -+ - seq[i++] = s++; - seq[i++] = s; - } diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 5a1d7e94fdf6c..fe398bf533140 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -44,8 +44,16 @@ stdenv.mkDerivation rec { }; patches = [ - ./0.23.92-CVE-2023-40889.patch - ./0.23.92-CVE-2023-40890.patch + (fetchpatch { + name = "CVE-2023-40889.patch"; + url = "https://salsa.debian.org/debian/zbar/-/raw/debian/0.23.92-9/debian/patches/0003-CVE-2023-40889-qrdec.c-Fix-array-out-of-bounds-acces.patch"; + hash = "sha256-z0IADJwUt9PBoox5xJJN//5vrcRbIrWB9H7wtxNVUZU="; + }) + (fetchpatch { + name = "CVE-2023-40890.patch"; + url = "https://salsa.debian.org/debian/zbar/-/raw/debian/0.23.92-9/debian/patches/0004-Add-bounds-check-for-CVE-2023-40890.patch"; + hash = "sha256-YgiptwXpRpz0qIcXBpARfIzSB8KYmksZR58o5yFPahs="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix new file mode 100644 index 0000000000000..b8e34332e8ae8 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, fcitx5 +, gettext +, go +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fcitx5-bamboo"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-bamboo"; + rev = finalAttrs.version; + hash = "sha256-EcpuZN2JU6HSuiQgBPBsoYftdHypiyFlrUxDBlVW6eo="; + fetchSubmodules = true; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + go + ]; + + buildInputs = [ + fcitx5 + extra-cmake-modules + ]; + + preConfigure = '' + export GOCACHE=$TMPDIR/go-cache + ''; + + meta = { + description = "Vietnamese input method engine support for Fcitx"; + homepage = "https://github.com/fcitx/fcitx5-bamboo"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ eclairevoyant ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index 0cb7d845ed45e..95ad99ca8fd57 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ibus-bamboo"; - version = "0.7.8"; + version = "0.8.2-rc18"; src = fetchFromGitHub { owner = "BambooEngine"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-H7me34KfhDD7BNEEKkhYXo9DLeclO7N19e961BOh1Ho="; + rev = "v" + lib.toUpper version; + sha256 = "sha256-5FSGPUJtUdYyeqJenvKaMIJcvon91I//62fnTCXcdig="; }; nativeBuildInputs = [ 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 52b50b7cbb414..3ca3eba56840c 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.4"; + version = "2.24.5"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-f/KtHm8R1MJORWKmv487hm80MeX2l0Ybd1ZjKHGFq0A="; + hash = "sha256-GMkudpQ91Qwyj7wJIl7LTx+v+goCUccxJggCAvEtL30="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 848758b541464..417b1be605d5a 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -14,7 +14,6 @@ , glib , gdk-pixbuf , gobject-introspection -, gtk2 , gtk3 , gtk4 , gtk-doc @@ -84,6 +83,11 @@ stdenv.mkDerivation rec { url = "https://github.com/ibus/ibus/commit/8f706d160631f1ffdbfa16543a38b9d5f91c16ad.patch"; hash = "sha256-YzS9TmUWW0OmheDeCeU00kFK2U2QEmKYMSRJAbu14ec="; }) + # fix missing key releases in Wine https://github.com/ibus/ibus/issues/2480 + (fetchpatch { + url = "https://github.com/ibus/ibus/commit/497f0c74230a65309e22ce5569060ce48310406b.patch"; + hash = "sha256-PAZcUxmzjChs1/K8hXgOcytyS4LYoNL1dtU6X5Tx8ic="; + }) ]; outputs = [ "out" "dev" "installedTests" ]; @@ -103,6 +107,7 @@ stdenv.mkDerivation rec { (lib.enableFeature (libnotify != null) "libnotify") (lib.enableFeature withWayland "wayland") (lib.enableFeature enableUI "ui") + "--disable-gtk2" "--enable-gtk4" "--enable-install-tests" "--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji" @@ -144,7 +149,6 @@ stdenv.mkDerivation rec { dconf gdk-pixbuf python3.pkgs.pygobject3 # for pygobject overrides - gtk2 gtk3 gtk4 isocodes diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/tools/inputmethods/keyd/default.nix index 810ade71bb32a..a059be9a0f9dd 100644 --- a/pkgs/tools/inputmethods/keyd/default.nix +++ b/pkgs/tools/inputmethods/keyd/default.nix @@ -8,13 +8,13 @@ }: let - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "rvaiya"; repo = "keyd"; rev = "v" + version; - hash = "sha256-QWr+xog16MmybhQlEWbskYa/dypb9Ld54MOdobTbyMo="; + hash = "sha256-NhZnFIdK0yHgFR+rJm4cW+uEhuQkOpCSLwlXNQy6jas="; }; pypkgs = python3.pkgs; @@ -37,7 +37,7 @@ let install -Dm555 -t $out/bin scripts/${pname} ''; - meta.mainProgram = pname; + meta.mainProgram = "keyd-application-mapper"; }; in @@ -47,13 +47,14 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace Makefile \ - --replace DESTDIR= DESTDIR=${placeholder "out"} \ --replace /usr "" substituteInPlace keyd.service \ --replace /usr/bin $out/bin ''; + installFlags = [ "DESTDIR=${placeholder "out"}" ]; + buildInputs = [ systemd ]; enableParallelBuilding = true; diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix index a8bffd9989a96..dc0ed25a3efe0 100644 --- a/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "m17n-db"; - version = "1.8.2"; + version = "1.8.5"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/m17n/m17n-db-${version}.tar.gz"; - sha256 = "sha256-vHR+J9ct9YoH9DG3JdeuQJIyLbxGEUykBTgoIbK6XGk="; + sha256 = "sha256-to//QiwKKGTuVuLEUXOCEzuYG7S6ObU/R4lc2LHApzY="; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/tools/llm/heygpt/default.nix b/pkgs/tools/llm/heygpt/default.nix index db11d391d7a14..e371673739fad 100644 --- a/pkgs/tools/llm/heygpt/default.nix +++ b/pkgs/tools/llm/heygpt/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { description = "A simple command-line interface for ChatGPT API."; homepage = "https://github.com/fuyufjh/heygpt"; license = licenses.mit; - mainProgram = pname; + mainProgram = "heygpt"; maintainers = with maintainers; [aldoborrero]; }; } diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 2643cdd474b30..ff8d6cd4b1e50 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -40,6 +40,6 @@ python3Packages.buildPythonApplication rec { license = with lib.licenses; [ gpl3Plus ]; maintainers = with lib.maintainers; [ eclairevoyant ]; platforms = lib.platforms.all; - mainProgram = pname; + mainProgram = "asciinema"; }; } diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix index 2722512992d57..b91880e067f48 100644 --- a/pkgs/tools/misc/atuin/default.nix +++ b/pkgs/tools/misc/atuin/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "atuin"; - version = "17.0.1"; + version = "17.1.0"; src = fetchFromGitHub { owner = "atuinsh"; repo = "atuin"; rev = "v${version}"; - hash = "sha256-HJRlZwvBra2D7TzVKvMWJ0Hf17QgIEcBDQEHhxdVLIM="; + hash = "sha256-srFHVUZerxPmOQXVMoSgeLsylvILcOP7m62s4NCFDJE="; }; # TODO: unify this to one hash because updater do not support this cargoHash = if stdenv.isLinux - then "sha256-AhoXmEjXsi/OgFX3htOA6A/lWegUFlsywdotX3PDwcs=" - else "sha256-/nCnZ64pM8oWVX9a4JCeCZRyuo7aVc8YaBVEMbiRsqE="; + then "sha256-FyKcR6H3/2cra9VYJbW37cSCvOpAiC8UJYXnseNQlt4=" + else "sha256-NfoAjTshmb1L4bIkBctk90bZL93hsyAyIE9AEFUGcGQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index 66a518407025e..c454e8cfa1d8b 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -18,13 +18,22 @@ stdenv.mkDerivation rec { --replace '-Wl,-soname,$(SONAME)' "" ''; + # the configure script is not generated by autoconf + # and do not recognize --build/--host cross compilation flags + configurePlatforms = [ ]; + configureFlags = [ (if static then "--static" else "--dynamic") "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ]; + dontAddPrefix = true; + makeFlags = [ + "CC:=$(CC)" + ]; + doCheck = true; checkTarget = "test"; preCheck = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/misc/blahaj/default.nix b/pkgs/tools/misc/blahaj/default.nix index 01a1de06a870e..c0e591515cdf5 100644 --- a/pkgs/tools/misc/blahaj/default.nix +++ b/pkgs/tools/misc/blahaj/default.nix @@ -5,13 +5,13 @@ crystal.buildCrystalPackage rec { pname = "blahaj"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "GeopJr"; repo = "BLAHAJ"; rev = "v${version}"; - hash = "sha256-rX6isAIlpNDBOGLmtvRXmqY90ByFfXeYI0HAAPIMXf8="; + hash = "sha256-CmMF9jDKUo+c8dYc2UEHKdBDE4dgwExcRS5sSUsUJik="; }; meta = with lib; { diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 0446a58efbc45..df78108e43e20 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,21 +1,31 @@ -{fetchurl, lib, stdenv, flex, db}: +{ lib +, stdenv +, fetchurl +, flex +, db +, makeWrapper +, pax +}: stdenv.mkDerivation rec { pname = "bogofilter"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "mirror://sourceforge/bogofilter/bogofilter-${version}.tar.bz2"; - sha256 = "1d56n2m9inm8gnzm88aa27xl2a7sp7aff3484vmflpqkinjqf0p1"; + url = "mirror://sourceforge/bogofilter/bogofilter-${version}.tar.xz"; + hash = "sha256-MkihNzv/VSxQCDStvqS2yu4EIkUWrlgfslpMam3uieo="; }; - # FIXME: We would need `pax' as a "propagated build input" (for use - # by the `bf_tar' script) but we don't have it currently. + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ flex db ]; doCheck = false; # needs "y" tool + postInstall = '' + wrapProgram "$out/bin/bf_tar" --prefix PATH : "${lib.makeBinPath [ pax ]}" + ''; + meta = { homepage = "http://bogofilter.sourceforge.net/"; longDescription = '' diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix index 52a0b94abeda5..ac723e9590223 100644 --- a/pkgs/tools/misc/boxxy/default.nix +++ b/pkgs/tools/misc/boxxy/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-BxI2Ju1I1IytCjx6vUoIy1jzebSeRmoObDEtN/sBEDg="; + hash = "sha256-euIecFMDktL0gDkso83T1qZfVdfYAAC+WBMsfZaarAQ="; }; - cargoHash = "sha256-ZEQsCm13MoFtpIjjtD5UANH5zrPDX4IjEmqJLwnftps="; + cargoHash = "sha256-8aIuMRjZHLlP3x+C9S9WX21/i98RAUvGGwzptzCpRR4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index afa31e2feaf13..2e56f5b28cea6 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -8,6 +8,7 @@ , libgit2 , oniguruma , libiconv +, Foundation , Security , xorg , zlib @@ -17,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.29.0"; + version = "1.30.2"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-Wx+hUm0y7w0+IYtaRE5X/5Ra37mMEMEliYFbl7c03Ww="; + hash = "sha256-sWy5Ekq4Jx0JTJgp2xYtfRjPokDsqP5n+pHSyCBzo30="; }; - cargoHash = "sha256-7B5Uxr1SsAx+mRpvQPSW7pemxp11WngEIK6vF2cbzh4="; + cargoHash = "sha256-jc3tg+Xs3z7neGx1iyMENXy5s4eAC/9KtsQcal45RoI="; nativeBuildInputs = [ installShellFiles @@ -35,6 +36,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [ + Foundation libiconv Security zlib diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix index 916f349dc5088..d3c1490d528e7 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.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-4thb0AFlSYQ90SkdyTSiFUc6vTRpt6KX2nH/thMuv4o="; + sha256 = "sha256-XFL9BfTpZaIsNeJLT3wEPFBvyO/VxvFjpApjjxvaGKw="; }; - vendorHash = "sha256-bfxF0qlEbZDczEuFhckqsG00/IzuM18ut/AQ9EMwdh0="; + vendorHash = "sha256-j4J6VAXT+CdU4WkISBunJn6B25CDdaarhFnnLaC4cBE="; 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/changelogger/default.nix b/pkgs/tools/misc/changelogger/default.nix index 165f63c468ad6..bae346ca37c5b 100644 --- a/pkgs/tools/misc/changelogger/default.nix +++ b/pkgs/tools/misc/changelogger/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "changelogger"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "MarkusFreitag"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g3d4BEVMQGBEKx+YVPjPrypWQNtEun/pSRgAsJY/RT4="; + sha256 = "sha256-XDiO8r1HpdsfBKzFLnsWdxte2EqL1blPH21137fNm5M="; }; vendorHash = "sha256-E6J+0tZriskBnXdhQOQA240c3z+laXM5honoREjHPfM="; diff --git a/pkgs/tools/misc/charasay/default.nix b/pkgs/tools/misc/charasay/default.nix index 9051638a8c2c9..7e79c6479b40d 100644 --- a/pkgs/tools/misc/charasay/default.nix +++ b/pkgs/tools/misc/charasay/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "charasay"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "latipun7"; repo = pname; rev = "v${version}"; - hash = "sha256-ijr6AvhoiYWHYTPUxSdBds9jBW1HEy1n7h6zH1VGP1c="; + hash = "sha256-7z5+7yrx5X5rdBMNj9oWBZ2IX0s88c1SLhgz2IDDEn8="; }; - cargoHash = "sha256-HCHdiCeb4dqxQMWfYZV2k8Yq963vWfmL05BRpVYmIcg="; + cargoHash = "sha256-5htNU8l+amh+C8EL1K4UcXzf5Pbhhjd5RhxrucJoj/M="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/clipboard-jh/default.nix b/pkgs/tools/misc/clipboard-jh/default.nix index 1c9ccfe41b1bb..abd52a5d012e1 100644 --- a/pkgs/tools/misc/clipboard-jh/default.nix +++ b/pkgs/tools/misc/clipboard-jh/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "clipboard-jh"; - version = "0.8.3"; + version = "0.9.0.1"; src = fetchFromGitHub { owner = "Slackadays"; repo = "clipboard"; rev = version; - hash = "sha256-G0zOr56dR9rmymQ9MwPNnMZ2LZuuz4NiswRQIvdS9MY="; + hash = "sha256-iILtyURYCshicgAV3MWkgMQsXHe7Unj1A08W7tUMU2o="; }; postPatch = '' diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 08ba484f51ee4..175b7a9ed2476 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation { hash = "sha256-Li/c5uf9rfpuU+hduuSm7EmhVwIIkS72dqzmN+0cE3A="; }; + postPatch = '' + substituteInPlace contacts.m \ + --replace "int peopleSort" "long peopleSort" + ''; + nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ Foundation AddressBook ]; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index beee4241c5418..c1279a69ccf79 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -32,11 +32,11 @@ let in stdenv.mkDerivation rec { pname = "coreutils" + (optionalString (!minimal) "-full"); - version = "9.3"; + version = "9.4"; src = fetchurl { url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz"; - hash = "sha256-rbz8/omSNbceh2jc8HzVMlILf1T5qAZIQ/jRmakEu6o="; + hash = "sha256-6mE6TPRGEjJukXIBu7zfvTAd4h/8O1m25cB+BAsnXlI="; }; postPatch = '' @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { # Some target platforms, especially when building inside a container have # issues with the inotify test. - sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail-2/inotify-dir-recreate.sh + sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail/inotify-dir-recreate.sh # sandbox does not allow setgid sed '2i echo Skipping chmod setgid test && exit 77' -i ./tests/chmod/setgid.sh @@ -77,10 +77,8 @@ stdenv.mkDerivation rec { echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c '' ])) + (optionalString stdenv.isAarch64 '' - sed '2i print "Skipping tail assert test"; exit 77' -i ./tests/tail-2/assert.sh - # Sometimes fails: https://github.com/NixOS/nixpkgs/pull/143097#issuecomment-954462584 - sed '2i echo Skipping cut huge range test && exit 77' -i ./tests/misc/cut-huge-range.sh + sed '2i echo Skipping cut huge range test && exit 77' -i ./tests/cut/cut-huge-range.sh ''); outputs = [ "out" "info" ]; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index b58a7d819bad0..ae17b51025dcf 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , pkg-config , meson , ninja @@ -11,26 +10,13 @@ stdenv.mkDerivation rec { pname = "desktop-file-utils"; - version = "0.26"; + version = "0.27"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "02bkfi6fyk4c0gh2avd897882ww5zl7qg7bzzf28qb57kvkvsvdj"; + hash = "sha256-oIF985zjhbZiGIBAfFbx8pgWjAQMIDLO34jVt2r/6DY="; }; - patches = [ - # Support Desktop Entry Specification v1.5. - # https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/merge_requests/11 - (fetchpatch { - url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/425177a28b6215e0745f95100160a08e810fd47c.patch"; - sha256 = "zu9EqTnQQGi5HqKh431JqigtJi+b16RuXSWQYbuuyxA="; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/56d220dd679c7c3a8f995a41a27a7d6f3df49dea.patch"; - sha256 = "p4kamGIm2QBHfIbvDnx+qu5Gi7OU3Z0nQKr39SsEKqk="; - }) - ]; - nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/tools/misc/diffoci/default.nix b/pkgs/tools/misc/diffoci/default.nix index df7cc71140aab..3c7de46e01e86 100644 --- a/pkgs/tools/misc/diffoci/default.nix +++ b/pkgs/tools/misc/diffoci/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "diffoci"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "reproducible-containers"; repo = "diffoci"; rev = "v${version}"; - hash = "sha256-Rrwwo1OCE2gn6MGt5XVddb8bJtoN7iAtxzr2MxyHcwk="; + hash = "sha256-BTggky5behIxbVxyDZ09uobw0FBopboE9uUBEVgCgR4="; }; - vendorHash = "sha256-18rsa91PiqZv70EK3K6K1l6N2mIpoVpkX29amKCo5cg="; + vendorHash = "sha256-4C35LBxSm6EkcOznQY1hT2vX9bwFfps/q76VqqPKBfI="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 61617044792b9..4636266e02795 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , abootimg +, acl , apksigcopier , apksigner , apktool @@ -78,11 +79,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "252"; + version = "253"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-NmYv5htZT2v04vVksIWGuaPI1rXfNmrVSmErT/faBbQ="; + hash = "sha256-xI+SIEUPKFxz7sk9qqE1ibSJX0WRPnJEpco0Mqv7Wp8="; }; outputs = [ @@ -112,16 +113,20 @@ python3.pkgs.buildPythonApplication rec { # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # # Still missing these tools: + # Android-specific tools: # aapt2 # dexdump - # docx2txt - # getfacl + # Darwin-specific tools: # lipo # otool - # r2pipe + # Other tools: + # docx2txt <- makes tests broken: + # > FAILED tests/comparators/test_docx.py::test_diff - IndexError: list index out of range + # > FAILED tests/comparators/test_docx.py::test_compare_non_existing - AssertionError # # We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.). pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([ + acl binutils-unwrapped-all-targets bzip2 cdrkit @@ -209,6 +214,7 @@ python3.pkgs.buildPythonApplication rec { guestfs h5py pdfminer-six + # docx2txt, breaks the tests. ]) # oggvideotools is broken on Darwin, please put it back when it will be fixed? ++ lib.optionals stdenv.isLinux [ oggvideotools ] diff --git a/pkgs/tools/misc/dotter/default.nix b/pkgs/tools/misc/dotter/default.nix index 2abe844531b50..bcabb2ef8aac6 100644 --- a/pkgs/tools/misc/dotter/default.nix +++ b/pkgs/tools/misc/dotter/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${version}"; - hash = "sha256-mAvTy/11a9RGSQpElhpKMzsMC7vA7cbeHsNRy9MnIjw="; + hash = "sha256-Xmdg5ITKWhL5AxTS7z4f9ecigQpBqna+kZclA+mDJhA="; }; - cargoHash = "sha256-XsDp/ssoNVdTHDTPm2ucgBeYmFgbeBIxQ/NsGjCl5Qg="; + cargoHash = "sha256-W8khm9E5f/PROVJDAUr57nAiTEXV4a0fepzV00HoT8c="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 6ed80c30b740b..ffc3b7bececea 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.20.3"; + version = "2.24.1"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - hash = "sha256-9Qt6/LH30nz4oyP+kXhExzKpPcHRRGYkG43Mjl/ZBoc="; + hash = "sha256-CezZ0Nse1s1jSwPoaY5Gvpfg3ztM5e8OjvW+WsMMrDM="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-xBuc+nh3koLn4/wgrvVjWVc9mjX/6ElAN4n9dWxs5fs="; + cargoHash = "sha256-oDDQPN2bLHJFMmdKoB+0qbcVOMVnamF23Phzq7eLFJ4="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 2b683e73ed0f8..a8ab91f8f3296 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -3,7 +3,7 @@ , python3Packages , fetchFromGitHub , platformio -, esptool_3 +, esptool , git }: @@ -16,16 +16,20 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.11.6"; - format = "setuptools"; + version = "2023.12.5"; + pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9LqZlhCt+7p6tnSHFhbnUzkEOJQDsg/Pd/hgd/Il0ZQ="; + hash = "sha256-ajpYwquVyznIngZKcWxI9Pyiqf4VYcWtGFRZSpi6+3I="; }; + nativeBuildInputs = with python.pkgs; [ + setuptools + ]; + postPatch = '' # remove all version pinning (E.g tornado==5.1.1 -> tornado) sed -i -e "s/==[0-9.]*//" requirements.txt @@ -70,7 +74,8 @@ python.pkgs.buildPythonApplication rec { # platformio is used in esphomeyaml/platformio_api.py # esptool is used in esphomeyaml/__main__.py # git is used in esphomeyaml/writer.py - "--prefix PATH : ${lib.makeBinPath [ platformio esptool_3 git ]}" + "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}" + "--prefix PYTHONPATH : $PYTHONPATH" # will show better error messages "--set ESPHOME_USE_SUBPROCESS ''" ]; diff --git a/pkgs/tools/misc/esptool/3.nix b/pkgs/tools/misc/esptool/3.nix deleted file mode 100644 index a0b13ece16468..0000000000000 --- a/pkgs/tools/misc/esptool/3.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, fetchFromGitHub, fetchpatch, python3 }: - -python3.pkgs.buildPythonApplication rec { - pname = "esptool"; - version = "3.3.2"; - - src = fetchFromGitHub { - owner = "espressif"; - repo = "esptool"; - rev = "v${version}"; - hash = "sha256-hpPL9KNPA+S57SJoKnQewBCOybDbKep0t5RKw9a9GjM="; - }; - - patches = [ - # https://github.com/espressif/esptool/pull/802 - (fetchpatch { - name = "bitstring-4-compatibility.patch"; - url = "https://github.com/espressif/esptool/commit/16fa58415be2a7ff059ece40d4545288565d0a23.patch"; - hash = "sha256-FYa9EvyET4P8VkdyMzJBkdxVYm0tFt2GPnfsjzBnevE="; - excludes = [ "setup.py" ]; - }) - ]; - - postPatch = '' - substituteInPlace test/test_imagegen.py \ - --replace "sys.executable, ESPTOOL_PY" "ESPTOOL_PY" - ''; - - propagatedBuildInputs = with python3.pkgs; [ - bitstring - cryptography - ecdsa - pyserial - reedsolo - ]; - - # wrapPythonPrograms will overwrite esptool.py with a bash script, - # but espefuse.py tries to import it. Since we don't add any binary paths, - # use patchPythonScript directly. - dontWrapPythonPrograms = true; - postFixup = '' - buildPythonPath "$out $pythonPath" - for f in $out/bin/*.py; do - echo "Patching $f" - patchPythonScript "$f" - done - ''; - - nativeCheckInputs = with python3.pkgs; [ - pyelftools - ]; - - # tests mentioned in `.github/workflows/test_esptool.yml` - checkPhase = '' - runHook preCheck - - export ESPTOOL_PY=$out/bin/esptool.py - ${python3.interpreter} test/test_imagegen.py - ${python3.interpreter} test/test_espsecure.py - ${python3.interpreter} test/test_merge_bin.py - ${python3.interpreter} test/test_modules.py - - runHook postCheck - ''; - - meta = with lib; { - description = "ESP8266 and ESP32 serial bootloader utility"; - homepage = "https://github.com/espressif/esptool"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ hexa ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index af9d5d6470d27..4b27f35cf53c9 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { description = "Flash OS images to SD cards and USB drives, safely and easily"; homepage = "https://etcher.io/"; license = licenses.asl20; - mainProgram = pname; + mainProgram = "etcher"; maintainers = with maintainers; [ wegank ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/tools/misc/faketty/default.nix index 4515f83d1f83c..815eb5a631c9e 100644 --- a/pkgs/tools/misc/faketty/default.nix +++ b/pkgs/tools/misc/faketty/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "faketty"; - version = "1.0.13"; + version = "1.0.14"; src = fetchCrate { inherit pname version; - hash = "sha256-jV5b6mB81Nz0Q+Toj5DTQq2QcM+EoQ7jRYV/OXgtemA="; + hash = "sha256-oma8Vmp1AMmEGyZG8i/ztiyYH0RrLZ/l/vXgPJs+5o0="; }; - cargoHash = "sha256-9t1Km/ZXzxyO72CaWM81fWGcFkri7F+wMAVom0GV/YM="; + cargoHash = "sha256-+gojthIR5WMSjN1gCUyN0cKHWYBKBezsckVZJD7JncM="; postPatch = '' patchShebangs tests/test.sh diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index adab3390de1d2..53be29dcfa3c1 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.2.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-JaD0R1vfHoWMhipMtTW0dlggR7RbD2evHfHrjoZJBmk="; + hash = "sha256-jZeecymhjbXYE05zRF2dWHBS3hhRm1BmLB906YAlp+A="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 84da1044f1a46..32d0d1b271244 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.7.1"; + version = "9.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - hash = "sha256-euQiMVPKE1/YG04VKMFUA27OtoGENNhqeE0iiF/X7uc="; + hash = "sha256-xcrvAWbSvUUtbFXyENy3eQimxt5aXzFrHnL6VptyydA="; }; - cargoHash = "sha256-doeZTjFPXmxIPYX3IBtetePoNkIHnl6oPJFtXD1tgZY="; + cargoHash = "sha256-z4PV8k6avaLwo58yJq47WEUJGw3JCW1GZGviBaPTs+8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 7abb37592c6ad..82c99628e1b04 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-An1biuaqPeRniJZroxoT2o9IEA4XFf5l6ut4nmOsQJI="; + sha256 = "sha256-4N2MSs4Uhd0NcS57b6qIJd8ovnUVjLiLniMsHTdZHCo="; }; - cargoHash = "sha256-gnFu0JsMt1wMfifF6EnjDwwydFnVyqpkHV0cyR5Qt3Y="; + cargoHash = "sha256-Y8LfkFPM4MKxwW6xk93+vCASkVfsMp3GugjH/kIAvQ8="; nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/findup/default.nix b/pkgs/tools/misc/findup/default.nix index 9cffd61f20116..eaba884d79d9d 100644 --- a/pkgs/tools/misc/findup/default.nix +++ b/pkgs/tools/misc/findup/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ zig_0_10.hook ]; - passthru.tests.version = testers.testVersion { package = finalAttrs.findup; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { homepage = "https://github.com/booniepepper/findup"; diff --git a/pkgs/tools/misc/fw/default.nix b/pkgs/tools/misc/fw/default.nix index e43c6ef31be10..54d263fc112fb 100644 --- a/pkgs/tools/misc/fw/default.nix +++ b/pkgs/tools/misc/fw/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fw"; - version = "2.19.0"; + version = "2.19.1"; src = fetchFromGitHub { owner = "brocode"; repo = "fw"; rev = "v${version}"; - hash = "sha256-6+sB/jGkVrpeqfgFdmUdU1/gOapD6fXFG5E3Rsu9rC0="; + hash = "sha256-fG1N/3Er7BvXOJTMGooaIMa5I9iNwnH+1om2jcWkI68="; }; - cargoHash = "sha256-0/CtJyWr2TbEUOlHLqgPIKwInForcT9x5agw7O/6TYU="; + cargoHash = "sha256-1d2uX/A1HZAmAI3d0iet1NkG0IFuJpVnhWxpY0jVVUI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/fx-cast-bridge/default.nix b/pkgs/tools/misc/fx-cast-bridge/default.nix index 7af4f5dac48df..722905df951f7 100644 --- a/pkgs/tools/misc/fx-cast-bridge/default.nix +++ b/pkgs/tools/misc/fx-cast-bridge/default.nix @@ -1,9 +1,11 @@ -{ lib, buildNpmPackage, fetchFromGitHub, avahi-compat, nodejs, python3 }: +{ lib, buildNpmPackage, fetchFromGitHub, avahi-compat, nodejs_18, python3 }: buildNpmPackage rec { pname = "fx-cast-bridge"; version = "0.3.1"; + nodejs = nodejs_18; + src = fetchFromGitHub { owner = "hensm"; repo = "fx_cast"; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index df10755f14c9d..0fd40b8732bd0 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -8,7 +8,6 @@ , bc , ncurses , perl -, glibcLocales , testers , fzf }: @@ -19,7 +18,7 @@ let # warnings on non-nixos machines ourPerl = if !stdenv.isLinux then perl else ( writeShellScriptBin "perl" '' - export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + export PERL_BADLANG=0 exec ${perl}/bin/perl "$@" ''); in diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/tools/misc/github-backup/default.nix index ce16e2b788c13..0e4953ca6bc8f 100644 --- a/pkgs/tools/misc/github-backup/default.nix +++ b/pkgs/tools/misc/github-backup/default.nix @@ -7,14 +7,18 @@ python3.pkgs.buildPythonApplication rec { pname = "github-backup"; - version = "0.43.1"; - format = "setuptools"; + version = "0.44.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-S0674oTUsXftXlbP8fbF09FIWnWwq/Mgbv960tg3FNg="; + hash = "sha256-tOCIrquhBS7aNeFocu8M9JV19vfFwrfIsaaePCp2vPw="; }; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + makeWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ git git-lfs ]) ]; diff --git a/pkgs/tools/misc/glasgow/0001-Relax-Amaranth-git-dependency.patch b/pkgs/tools/misc/glasgow/0001-Relax-Amaranth-git-dependency.patch deleted file mode 100644 index 3d4f674ff2c41..0000000000000 --- a/pkgs/tools/misc/glasgow/0001-Relax-Amaranth-git-dependency.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 95d86c080a559d9c9f0498fb93d43d3fef377080 Mon Sep 17 00:00:00 2001 -From: Jack Leightcap <jack@leightcap.com> -Date: Sat, 13 May 2023 17:28:54 -0400 -Subject: [PATCH] Relax Amaranth git dependency - -Signed-off-by: Jack Leightcap <jack@leightcap.com> ---- - software/pyproject.toml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/software/pyproject.toml b/software/pyproject.toml -index 6d1e2f1..6dfcc9e 100644 ---- a/software/pyproject.toml -+++ b/software/pyproject.toml -@@ -20,8 +20,8 @@ classifiers = [ - ] - - dependencies = [ -- "amaranth @ git+https://github.com/amaranth-lang/amaranth.git", -- "fx2>=0.11", -+ "amaranth", -+ "fx2", - "libusb1>=1.8.1", - "aiohttp~=3.8", - "pyvcd", --- -2.38.4 - diff --git a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix index de5f49aca256a..4b4cb64181bbf 100644 --- a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "google-cloud-sql-proxy"; - version = "2.7.2"; + version = "2.8.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-mfPh9cdsn9Jq9a1gkF5f/24inxuwcITrp7KfSfp0pMQ="; + hash = "sha256-7BkzDfAXc06pEDz2gHwlJ2HKmWWkqbVwyre8NrQHY6M="; }; subPackages = [ "." ]; - vendorHash = "sha256-GfvEurTX5r2ZIOwaDJA4ncd8SNMusoqXuhcMGYvaVwQ="; + vendorHash = "sha256-9xe/4yMkCSD7Tfm3CWvN940odeT67HPGbBAimNOGgIc="; preCheck = '' buildFlagsArray+="-short" diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index a3833e1a4f83d..104141f8097b5 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -9,16 +9,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "1.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-Okuiicq1CAVrE3YPe/aF/HZbf23p6ulz//BRGX77cnw="; + hash = "sha256-b3yXabHqpw0npkTlO4eKy41agtDV1QnpfctBYv4BV/Q="; }; - vendorHash = "sha256-+ac4q820gETsNRVpW2u0MXU6HfoztLdsWK2HYqJ4mqo="; + vendorHash = "sha256-c9fygb6ywTUwcF1jbgr8YQ0SR7u36C0bRDljakQRdGA="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 52ccfa8ccaaa9..8f1ff2625d366 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -49,8 +49,8 @@ let src = fetchFromSavannah { repo = "grub"; - rev = "grub-2.12-rc1"; - hash = "sha256-DrNFzi2o7ZUfL3bMdG63xivZIjcTgv8RODJz7hLJ3WY="; + rev = "grub-2.12"; + hash = "sha256-lathsBb2f7urh8R86ihpTdwo3h1hAHnRiHd5gCLVpBc="; }; # HACK: the translations are stored on a different server, @@ -61,7 +61,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-XpQ4tu5eNRARdbg95LOjqp+2RCVRj1qZWe+Sc0O5zNg="; + outputHash = "sha256-XzW2e7Xe7Pi297eV/fD2B/6uONEz9UjL2EHDCY0huTA="; } '' mkdir -p po @@ -77,20 +77,12 @@ assert !(efiSupport && xenSupport); stdenv.mkDerivation rec { pname = "grub"; - version = "2.12-rc1"; + version = "2.12"; inherit src; patches = [ ./fix-bash-completion.patch ./add-hidden-menu-entries.patch - - # Revert upstream commit that breaks reading XFS filesystems - # FIXME: remove when fixed upstream - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ef7850c757fb3dd2462a512cfa0ff19c89fcc0b1"; - revert = true; - hash = "sha256-p8Kcv9d7ri4eJU6Fgqyzdj0hV5MHSe50AF02FPDJx2Y="; - }) ]; postPatch = if kbdcompSupport then '' diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index b60abc97e92c7..9e396f33e6a1e 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gti"; - version = "1.8.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "rwos"; repo = "gti"; rev = "v${version}"; - sha256 = "sha256-x6ncvnZPPrVcQYwtwkSenW+ri0L6FpuDa7U7uYUqiyk="; + sha256 = "sha256-DUDCFcaB38Xkp3lLfEhjGC0j430dphXFBVhGzm7/Bp0="; }; postPatch = '' diff --git a/pkgs/tools/misc/hdf5/bin-mv.patch b/pkgs/tools/misc/hdf5/bin-mv.patch deleted file mode 100644 index 45649977e5669..0000000000000 --- a/pkgs/tools/misc/hdf5/bin-mv.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rc hdf5-1.8.5/configure hdf5-1.8.5-new/configure -*** hdf5-1.8.5/configure 2010-06-04 20:26:04.000000000 +0200 ---- hdf5-1.8.5-new/configure 2010-08-02 10:30:26.000000000 +0200 -*************** -*** 30587,30598 **** - sed 's/#define /#define H5_/' <src/H5config.h |\ - sed 's/#undef /#undef H5_/' >pubconf - if test ! -f src/H5pubconf.h; then -! /bin/mv -f pubconf src/H5pubconf.h - elif (diff pubconf src/H5pubconf.h >/dev/null); then - rm -f pubconf - echo "src/H5pubconf.h is unchanged" - else -! /bin/mv -f pubconf src/H5pubconf.h - fi - echo "Post process src/libhdf5.settings" - sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP ---- 30587,30598 ---- - sed 's/#define /#define H5_/' <src/H5config.h |\ - sed 's/#undef /#undef H5_/' >pubconf - if test ! -f src/H5pubconf.h; then -! mv -f pubconf src/H5pubconf.h - elif (diff pubconf src/H5pubconf.h >/dev/null); then - rm -f pubconf - echo "src/H5pubconf.h is unchanged" - else -! mv -f pubconf src/H5pubconf.h - fi - echo "Post process src/libhdf5.settings" - sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index d502e84e56073..fa68fb4a2d439 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hexyl"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - hash = "sha256-+jmMy5Hi4EfMh/rBzBs5b+f48OZcR/Tw7IU1uTbwiCo="; + hash = "sha256-di7SBuB4LsnqlP3BdMcsSLj4zpyKA/ninVpRyR9AJaI="; }; - cargoHash = "sha256-TjJ0645TRlNzduQgxYLZWz+rLFfRv12GuwXBcmNr/h8="; + cargoHash = "sha256-fXrdOiCmRgMPJxZIS/SkTkZZkag8ZUhNnMlU4k1m/+0="; meta = with lib; { description = "A command-line hex viewer"; diff --git a/pkgs/tools/misc/hsd/default.nix b/pkgs/tools/misc/hsd/default.nix index ebbba1de07d85..a1e82076cca4e 100644 --- a/pkgs/tools/misc/hsd/default.nix +++ b/pkgs/tools/misc/hsd/default.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "hsd"; - version = "6.0.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "handshake-org"; repo = "hsd"; rev = "v${version}"; - hash = "sha256-4dWCCybhcdrkLFqUVTajRMnhzNgjpXUN2a+TNIi+Dqo="; + hash = "sha256-T57kDEQwHIyW7xVXrzjJdUcocST9ks4x3JR8yytH8P4="; }; - npmDepsHash = "sha256-ZbBu9hnRsC9LrHozny3OlHhgcDbp6ACjXRV4UHneHQc="; + npmDepsHash = "sha256-EBrCuRckBg42k6ZUoB25xObv3lULnSPNJ2nO9l/TWvA="; nativeBuildInputs = [ python3 diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/tools/misc/hyfetch/default.nix index 3621ad675b242..2e906541bda13 100644 --- a/pkgs/tools/misc/hyfetch/default.nix +++ b/pkgs/tools/misc/hyfetch/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "hyfetch"; - version = "1.4.10"; + version = "1.4.11"; format = "setuptools"; src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; rev = "refs/tags/${version}"; - hash = "sha256-B8FAMXot+QV7Q2bJuTsRsrxHSr/2f+WNTKrZqFXewdE="; + hash = "sha256-xzN/tbS5BUvpKeozesE99gNp3NRDjvf4Qx7BHLc4svo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 6b0f4edd5a778..ce555facf410a 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.30"; + version = "0.10.31"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-YHhaOf2MNrFHv29pEnhkOjFH30Mi5Oi6gYkSH6PZhU4="; + sha256 = "sha256-slZFZu+NEOLy4oxdcZwW2OhabGxE/RPsfEhO0W6+gT0="; }; - vendorHash = "sha256-yjPtNTfkL8+fkmXW98SnpboMqdsjQYCif65sn0jjLgc="; + vendorHash = "sha256-o8CMISBU5C/SDexeEiwnxTC9hvbCWUrm6a/2TOE9Bmw="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index bbb456eaaa8c0..e31c6603e4296 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -11,6 +11,7 @@ let "bin-x86_64-efi/ipxe.efi" = null; "bin-x86_64-efi/ipxe.efirom" = null; "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb"; + "bin-x86_64-efi/snp.efi" = null; } // lib.optionalAttrs stdenv.hostPlatform.isx86 { "bin/ipxe.dsk" = null; "bin/ipxe.usb" = null; @@ -21,10 +22,12 @@ let "bin-arm32-efi/ipxe.efi" = null; "bin-arm32-efi/ipxe.efirom" = null; "bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb"; + "bin-arm32-efi/snp.efi" = null; } // lib.optionalAttrs stdenv.isAarch64 { "bin-arm64-efi/ipxe.efi" = null; "bin-arm64-efi/ipxe.efirom" = null; "bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb"; + "bin-arm64-efi/snp.efi" = null; }; in diff --git a/pkgs/tools/misc/kak-lsp/0001-Use-full-Perl-path.patch b/pkgs/tools/misc/kak-lsp/0001-Use-full-Perl-path.patch new file mode 100644 index 0000000000000..38f0d38cb2156 --- /dev/null +++ b/pkgs/tools/misc/kak-lsp/0001-Use-full-Perl-path.patch @@ -0,0 +1,37 @@ +From b93660cfa8a80a5e5bf72e1f06fb7bf95272c7e4 Mon Sep 17 00:00:00 2001 +From: PoweredByPie <poweredbypie@users.noreply.github.com> +Date: Fri, 8 Dec 2023 04:39:01 -0800 +Subject: [PATCH] Use full Perl path + +--- + rc/lsp.kak | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/rc/lsp.kak b/rc/lsp.kak +index d695a2e..7c6a436 100644 +--- a/rc/lsp.kak ++++ b/rc/lsp.kak +@@ -2339,11 +2339,6 @@ define-command -hidden lsp-snippets-insert-completion -params 1 %{ evaluate-comm + }} + + define-command lsp-snippets-insert -hidden -params 1 %[ +- evaluate-commands %sh{ +- if ! command -v perl > /dev/null 2>&1; then +- printf "fail '''perl'' must be installed to use the ''snippets-insert'' command'" +- fi +- } + evaluate-commands -draft -save-regs '^"' %[ + set-register '"' %arg{1} + execute-keys <a-P> +@@ -2397,7 +2392,7 @@ define-command lsp-snippets-insert -hidden -params 1 %[ + + define-command -hidden lsp-snippets-insert-perl-impl %[ + evaluate-commands %sh[ # $kak_quoted_selections +- perl -e ' ++ @perlPath@/bin/perl -e ' + use strict; + use warnings; + use Text::ParseWords(); +-- +2.42.0 + diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 1f494dea84387..9a19d40bed235 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, CoreServices, Security, SystemConfiguration }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, perl, CoreServices, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "kak-lsp"; @@ -13,13 +13,20 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+3cpAL+8X8L833kmZapUoGSwHOj+hnDN6oDNJZ6y24Q="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; + buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; + + patches = [ ./0001-Use-full-Perl-path.patch ]; + + postPatch = '' + substituteInPlace rc/lsp.kak \ + --subst-var-by perlPath ${lib.getBin perl} + ''; meta = with lib; { description = "Kakoune Language Server Protocol Client"; homepage = "https://github.com/kak-lsp/kak-lsp"; license = with licenses; [ unlicense /* or */ mit ]; - maintainers = [ maintainers.spacekookie ]; + maintainers = with maintainers; [ spacekookie poweredbypie ]; mainProgram = "kak-lsp"; }; } diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index fcd46e0e85fd3..c7978485c7e47 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, procps, file, gnused, bash }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, procps, file, gnused, bash, binutils }: stdenv.mkDerivation rec { pname = "lesspipe"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "wofr06"; repo = "lesspipe"; rev = "v${version}"; - sha256 = "sha256-fLDB0rUo1kfPs0Xy2s1gG5ZsRjk1h1yYqjXkQC4qPf0="; + hash = "sha256-jJrKiRdrargk0JzcPWxBZGyOpMfTIONHG8HNRecazVo="; }; nativeBuildInputs = [ perl makeWrapper ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postInstall = '' for f in lesspipe.sh lesscomplete; do - wrapProgram "$out/bin/$f" --prefix-each PATH : "${lib.makeBinPath [ file gnused procps ]}" + wrapProgram "$out/bin/$f" --prefix-each PATH : "${lib.makeBinPath [ binutils file gnused procps ]}" done ''; diff --git a/pkgs/tools/misc/libbitcoin/fix-gcc11-compilation.patch b/pkgs/tools/misc/libbitcoin/fix-gcc11-compilation.patch deleted file mode 100644 index fe1b9777275e2..0000000000000 --- a/pkgs/tools/misc/libbitcoin/fix-gcc11-compilation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/bitcoin/bitcoin/wallet/dictionary.hpp b/include/bitcoin/bitcoin/wallet/dictionary.hpp -index 632f1afc..63a51764 100644 ---- a/include/bitcoin/bitcoin/wallet/dictionary.hpp -+++ b/include/bitcoin/bitcoin/wallet/dictionary.hpp -@@ -19,6 +19,7 @@ - #ifndef LIBBITCOIN_WALLET_DICTIONARY_HPP - #define LIBBITCOIN_WALLET_DICTIONARY_HPP - -+#include <cstddef> - #include <array> - #include <vector> - #include <bitcoin/bitcoin/compat.hpp> diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index a940fba29676b..266ef9accca6b 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -1,18 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, libbitcoin-protocol }: -let +stdenv.mkDerivation rec { pname = "libbitcoin-client"; - version = "3.5.0"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.8.0"; src = fetchFromGitHub { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "0a9c00f1pfi8wczbfd1djkvr7di3iw1ynak6if910w01dkhbm6v4"; + hash = "sha256-5qbxixaozHFsOcBxnuGEfNJyGL8UaYCOPwPakfc0bAg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index 7d00e4c09adda..48c8e9a4f7213 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -1,18 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin-client, libbitcoin-network }: -let +stdenv.mkDerivation rec { pname = "libbitcoin-explorer"; - version = "3.5.0"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.8.0"; src = fetchFromGitHub { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "033nrdzrha4kypxk4biixjsbjd16r4m2mjvpid4gdj5hzbbj1p93"; + hash = "sha256-NUAtjrfRbZg5ewQo4PZ1HEoG8GRrsPcNb78UYMHqdyo="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index 5d330ee3cacc8..ee9cb1da687f0 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -1,18 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, zeromq }: -let +stdenv.mkDerivation rec { pname = "libbitcoin-network"; - version = "3.5.0"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.8.0"; src = fetchFromGitHub { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "0vqg3i40kwmbys4lyp82xvg2nx3ik4qhc66gcm8k66a86wpj9ji6"; + hash = "sha256-zDT92bvA779mzTodpKugCoxapB6vY2jCMSGZEkJLTXQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 06f6546e964d8..57e55400aa273 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -1,18 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, secp256k1, zeromq }: -let +stdenv.mkDerivation rec { pname = "libbitcoin-protocol"; - version = "3.5.0"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.8.0"; src = fetchFromGitHub { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "1ln9r04hlnc7qmv17rakyhrnzw1a541pg5jc1sw3ccn90a5x6cfv"; + hash = "sha256-xf0qQQnZ8h6ent1sgkVTo55+9drZM8Zbx0deYZnLBho="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 347d6eae7ce42..70a0f9bff6ef6 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libbitcoin"; - version = "3.6.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1rppyp3zpb6ymwangjpblwf6qh4y3d1hczrjx8aavmrq7hznnrhq"; + hash = "sha256-7fxj2hnuGRUS4QSQ1w0s3looe9pMvE2U50/yhNyBMf0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./fix-gcc11-compilation.patch ]; - configureFlags = [ "--with-tests=no" "--with-boost=${boost.dev}" diff --git a/pkgs/tools/misc/libgen-cli/default.nix b/pkgs/tools/misc/libgen-cli/default.nix index 5ef65e1370361..45192447bdca7 100644 --- a/pkgs/tools/misc/libgen-cli/default.nix +++ b/pkgs/tools/misc/libgen-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "libgen-cli"; - version = "1.0.11"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ciehanski"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EscXn+di1BXJSoc1Eml654/ieRuIOfryd5b7f+vcAOA="; + sha256 = "sha256-EicXsxAvVe/umpcOn4dVlTexaAol1qYPg/h5MU5dysM="; }; - vendorHash = "sha256-WAGFZ2HKnhS5gStJW8orF45vsrHaTmUomzbHqFuAsFE="; + vendorHash = "sha256-q1EPjnVq382gEKVmGKWYgKRcU6Y0rm1Et5ExzOmyeo4="; doCheck = false; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index b52628373594f..e5829a56a8b43 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,7 +1,6 @@ { buildPackages , db , fetchurl -, fetchpatch , groff , gzip , lib @@ -17,11 +16,11 @@ stdenv.mkDerivation rec { pname = "man-db"; - version = "2.11.2"; + version = "2.12.0"; src = fetchurl { url = "mirror://savannah/man-db/man-db-${version}.tar.xz"; - hash = "sha256-z/oe5Ol0vnhkbEZQjm3S8358WJqqspOMwQZPBY/vn40="; + hash = "sha256-QVpihKInZK0i/w9mcQ2FO+d5DdRRzXFDbj0lx02ZapU="; }; outputs = [ "out" "doc" ]; @@ -34,32 +33,6 @@ stdenv.mkDerivation rec { patches = [ ./systemwide-man-db-conf.patch - # Remove the patches below when updating to the next man-db release. - # Patches addressing https://gitlab.com/man-db/man-db/-/issues/25 ... - (fetchpatch { - name = "update-warning-regex"; - url = "https://gitlab.com/man-db/man-db/-/commit/b12ffb9df7.patch"; - hash = "sha256-F+whRppaMZwgmGPKTXu2j1vZMNAm3vGNzNZcz9pg8Jc="; - }) - (fetchpatch { - name = "fix-test-failures-when-iconv-not-available"; - url = "https://gitlab.com/man-db/man-db/-/commit/26f46a60e5.patch"; - hash = "sha256-W1a6GkYn4J3py7GLZc37xmQBQR18Xvcvj4fJoZ21+0k="; - # The following files are excluded from the patch as they fail to apply - # cleanly on the 2.11.2 sources and are deemed irrelevant for building man-db. - excludes = [ "NEWS.md" ]; - }) - # ... and https://gitlab.com/man-db/man-db/-/issues/26. - (fetchpatch { - name = "improve-lexgrog-portability"; - url = "https://gitlab.com/man-db/man-db/-/commit/bbf7701c4f.patch"; - hash = "sha256-QLOVgV0S2NxxTBObD8bJFR1QDH0p2RGMJXLVNagfddc="; - }) - (fetchpatch { - name = "avoid-translation-fallout-from-lexgrog-fix"; - url = "https://gitlab.com/man-db/man-db/-/commit/043c3cb83c.patch"; - hash = "sha256-w12/LOGN9gO85zmqX7zookA55w3WUxBMJgWInpH5wms="; - }) ]; postPatch = '' diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 127dd142a9f1a..675639a032941 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.8.1"; + version = "0.8.4"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - hash = "sha256-9muBKJXsXiSxSmLRygGATEbwpiz6B8oTFQIkVMJMWAk="; + hash = "sha256-beoXLTy3XikdZBS0Lh3cugHflNJ51PbqsCE3xtCHpj0="; }; postPatch = '' @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoHash = "sha256-LhIAJ3JI7cp+vzEH5vthefgExPORF6Xnjj3cQkIkhSA="; + cargoHash = "sha256-wWYpDU6oXT+sDCzX8VWJ6GfNPOi7T02LK0JKcWHFGi8="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index c4508d4424786..232972d35ac02 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.18.5"; + version = "1.18.6"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-3s95PjuHIQ0qeTtVOXqsrWFrCeuUUaaA9Lgab4ATetg="; + hash = "sha256-QQapWDTJkP0YuyNR8J1N2IEETG1BfkdWv40SPD/JKYg="; }; vendorHash = "sha256-x6BeU6JDayCOi8T8+NvXZe59QmTaO9RAYwSiFlDPL/c="; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index cc5858c16fb78..6c1c2b81f90c3 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.40.4"; + version = "1.41.0"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-PETvcHlR11hdi/KirPXKkH4mrLUyVpyQDtxf3SMx9tw="; + sha256 = "sha256-uVIN2oSpaRSeJK1bhjzMqSMmnQm+1i6xsw1RWjmsvGY="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 0f0d92c59fa00..e714861c1aa64 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mongo-tools"; - version = "100.9.1"; + version = "100.9.3"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-tools"; rev = version; - sha256 = "sha256-c+pzpDUDx6xqpELLM32z0T5mGlF0qk6wqyS1OU9NkRs="; + sha256 = "sha256-l3A7ykkQCkT34EdgpcSJpFsZq1gE9GII9gzaXJaUwEk="; }; vendorHash = null; diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix index a98f8c770bb14..a9ecae787b952 100644 --- a/pkgs/tools/misc/mutagen-compose/default.nix +++ b/pkgs/tools/misc/mutagen-compose/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen-compose"; - version = "0.17.2"; + version = "0.17.4"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - hash = "sha256-FEUVRDGVYYpgNSOSSR9hyUyz9mP8B8qWy3MnTtuE3fQ="; + hash = "sha256-arvDV1AlhrXfndoXGd7jn6O9ZAc1+7hq30QpYPLhpJw="; }; - vendorHash = "sha256-u4vRQjqBSsugEcBzteV7yOTizbXGpCH+M/zAvdWusK0="; + vendorHash = "sha256-wqenEPTRsZvQscXv+/eVEFVk8Fd1/Aj3QcBSZzpkmGA="; doCheck = false; diff --git a/pkgs/tools/misc/nb/default.nix b/pkgs/tools/misc/nb/default.nix index 56513d35c7791..d9d7110e77ce4 100644 --- a/pkgs/tools/misc/nb/default.nix +++ b/pkgs/tools/misc/nb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.8.0"; + version = "7.9.0"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - sha256 = "sha256-8TOEPPtwxbTlm5nGMjOmH8lvsDu0vNgvxaUOgKS1l/g="; + sha256 = "sha256-5pKRZfLEFoB9abQdUTETMJhhgDFqlH/URipUv3cLnxQ="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix deleted file mode 100644 index d4e461bb77e18..0000000000000 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix -}: -stdenv.mkDerivation (finalAttrs:{ - pname = "nix-direnv"; - version = "2.5.1"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = "nix-direnv"; - rev = finalAttrs.version; - hash = "sha256-rMQ+Nb6WqXm66g2TpF8E0Io9WBR0ve06MW8I759gl2M="; - }; - - # Substitute instead of wrapping because the resulting file is - # getting sourced, not executed: - postPatch = '' - sed -i "1a NIX_BIN_PREFIX=${nix}/bin/" direnvrc - ''; - - installPhase = '' - runHook preInstall - install -m500 -D direnvrc $out/share/nix-direnv/direnvrc - runHook postInstall - ''; - - meta = { - description = "A fast, persistent use_nix implementation for direnv"; - homepage = "https://github.com/nix-community/nix-direnv"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ mic92 bbenne10 ]; - }; -}) diff --git a/pkgs/tools/misc/ollama/default.nix b/pkgs/tools/misc/ollama/default.nix index c0ac7f415f95c..2176582e1fe9f 100644 --- a/pkgs/tools/misc/ollama/default.nix +++ b/pkgs/tools/misc/ollama/default.nix @@ -2,18 +2,17 @@ , buildGoModule , fetchFromGitHub , llama-cpp -, stdenv }: buildGoModule rec { pname = "ollama"; - version = "0.1.11"; + version = "0.1.17"; src = fetchFromGitHub { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-Jc6w+zQS/L3GKbfCaJO281LAgVdxNrseT0GX04N9MMY="; + hash = "sha256-eXukNn9Lu1hF19GEi7S7a96qktsjnmXCUp38gw+3MzY="; }; patches = [ @@ -28,9 +27,10 @@ buildGoModule rec { postPatch = '' substituteInPlace llm/llama.go \ --subst-var-by llamaCppServer "${llama-cpp}/bin/llama-cpp-server" + substituteInPlace server/routes_test.go --replace "0.0.0" "${version}" ''; - vendorHash = "sha256-fuSHaDDpkuQThYVNoEjnHgWkgh/LFLNHNss5Gezlv5w="; + vendorHash = "sha256-yGdCsTJtvdwHw21v0Ot6I8gxtccAvNzZyRu1T0vaius="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 092d591b88a82..b078361bf0574 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.90.0"; + version = "0.90.1"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-FL0lNlofXHTdn5o6g4FHNYauzJkjCKTrspSXP9slp/A="; + hash = "sha256-JKcYvJtuN38VrhcVFHRc0CKTH+x8HShs1/Ui0iN1jNo="; }; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-6Vr4Nk4mp505H3oAznAQ2mJl6qYFbHyO5MqgYeinnf8="; + vendorHash = "sha256-vaWOUc4CwiCDqe1szrBcgbHXQH/OkGTN0iqh+3CKPLQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index c8485d4a2fa45..dcb4065a02c0e 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -119,6 +119,10 @@ in stdenv.mkDerivation rec { makeFlags = [ "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/libostree" "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree" + # Setting this flag was required as workaround for a clang bug, but seems not relevant anymore. + # https://github.com/ostreedev/ostree/commit/fd8795f3874d623db7a82bec56904648fe2c1eb7 + # See also Makefile-libostree.am + "INTROSPECTION_SCANNER_ENV=" ]; preConfigure = '' diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index a2aee41eff758..8a724c0b8698f 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20231022"; + version = "20231122"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-k/K5TxhQeYpLXdoiva6G2ramVl41JYYOCORvJWPzJow="; + sha256 = "sha256-giyc+KoXFSCthn2xPvE0Jmab0WTIG5AKPby1VmEb6uI="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index 6fa60d1aa0f7d..70404d0a0ae3f 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.15.0"; + version = "2.19.1"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-/gNDuZ19uC7UjOFaPfNntQQ6H5e7VgxBHPD6eD4nSEM="; + sha256 = "sha256-lBAht2r48+nlCrJTUPzcJK2Nd5pPqStTv27jghtF8e4="; }; - vendorHash = "sha256-XBk4x3L6GJz1v6g46ODEOJN2J565O4IA8pOlhUD3bRE="; + vendorHash = "sha256-0oepdfm+MWA/F+B/Ayl2PiBvOL4bA9iUNV+zculIaN8="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index dc7fe1627a1ce..689a502efde1c 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, nixosTests }: let - version = "1.2023.12"; + version = "1.2023.13"; in stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-RHlv0kVJvAInLAd70001OTcJuh3Qg2C9o+//zR37zxc="; + sha256 = "sha256-8MfInkDJ57Usm4KTESwEig/X9xfoxXTf+oA9F3bgMT0="; }; dontUnpack = true; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 411b76d0205ae..57bcbb1ad0612 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2023.12"; + version = "1.2023.13"; pname = "plantuml"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; - sha256 = "sha256-mR17BU5rc0ONnPfhOTppUI1T7v5W//6FHUYXFt5QrdU="; + sha256 = "sha256-/oMjre0fFwV+DYysg20z2PhJXAH/qjAOFl2hgZyBGuY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pls/default.nix b/pkgs/tools/misc/pls/default.nix deleted file mode 100644 index c6d6d2e52835f..0000000000000 --- a/pkgs/tools/misc/pls/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, python3, fetchFromGitHub }: - -python3.pkgs.buildPythonApplication rec { - pname = "pls"; - version = "5.4.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "dhruvkb"; - repo = "pls"; - rev = version; - sha256 = "sha256-h93Kz+ETdHfnzypa8JjMvbzA1o/KS1UuTG8/vhEt7Vo="; - }; - - nativeBuildInputs = [ python3.pkgs.poetry-core ]; - - propagatedBuildInputs = with python3.pkgs; [ - pyyaml - requests - rich - ]; - - nativeCheckInputs = with python3.pkgs; [ - freezegun - jsonschema - pytestCheckHook - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'rich = "^12.5.1"' 'rich = "*"' \ - ''; - - pytestFlagsArray = [ "tests/" "--ignore=tests/e2e" ]; - - pythonImportsCheck = [ "pls" ]; - - meta = with lib; { - homepage = "https://dhruvkb.github.io/pls/"; - description = "Prettier and powerful ls"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ arjan-s ]; - }; -} diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix index 43a803dfa3e5f..6f11a2b3f3b57 100644 --- a/pkgs/tools/misc/pmbootstrap/default.nix +++ b/pkgs/tools/misc/pmbootstrap/default.nix @@ -1,21 +1,20 @@ { stdenv, lib, git, openssl, buildPythonApplication, pytestCheckHook, ps -, fetchPypi, fetchFromGitLab, sudo }: +, fetchPypi, fetchFromSourcehut, sudo }: buildPythonApplication rec { pname = "pmbootstrap"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - hash = "sha256-nN4KUP9l3g5Q+QeWr4Fju2GiOyu2f7u94hz/VJlCYdw="; + hash = "sha256-buCfQsi10LezDzYeplArmFRSc3vbjtl+FuTm/VUS2us="; }; - repo = fetchFromGitLab { - domain = "gitlab.com"; - owner = "postmarketOS"; + repo = fetchFromSourcehut { + owner = "~postmarketos"; repo = pname; rev = version; - hash = "sha256-UkgCNob4nazFO8xXyosV+11Sj4yveYBfgh7aw+/6Rlg="; + hash = "sha256-3GZ4PeMnG/a46WwvWPQFeYbJPp+NGU7A98QasnlMIL0="; }; pmb_test = "${repo}/test"; @@ -45,6 +44,7 @@ buildPythonApplication rec { "test_chroot_arguments" "test_chroot_interactive_shell" "test_chroot_interactive_shell_user" + "test_chroot_mount" "test_clean_worktree" "test_config_user" "test_cross_compile_distcc" diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 78042489ff9d4..afeb6cdbbba29 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -10,6 +10,7 @@ , go , nodejs , perl +, cabal-install , testers , pre-commit }: @@ -17,16 +18,16 @@ with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "3.3.3"; + version = "3.6.0"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pre-commit"; repo = "pre-commit"; rev = "v${version}"; - hash = "sha256-6FKf4jLHUt2c7LSxFcq53IsfHOWeUSI+P9To0eh48+o="; + hash = "sha256-OTduVg8uhMdXs2gQ7KaMVOO1zQK4m489W9SU7PWIvcM="; }; patches = [ @@ -58,6 +59,7 @@ buildPythonApplication rec { pytest-xdist pytestCheckHook re-assert + cabal-install ]; # i686-linux: dotnet-sdk not available @@ -156,6 +158,8 @@ buildPythonApplication rec { "test_run_versioned_node_hook" "test_rust_cli_additional_dependencies" "test_swift_language" + "test_run_example_executable" + "test_run_dep" # i don't know why these fail "test_install_existing_hooks_no_overwrite" diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 4c52b9b239b46..b02aeb8aefb6a 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -7,11 +7,12 @@ python3.pkgs.buildPythonApplication rec { pname = "pubs"; version = "0.9.0"; + pyproject = true; src = fetchFromGitHub { owner = "pubs"; repo = "pubs"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-U/9MLqfXrzYVGttFSafw4pYDy26WgdsJMCxciZzO1pw="; }; @@ -28,22 +29,26 @@ python3.pkgs.buildPythonApplication rec { }) ]; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ - pyyaml + argcomplete + beautifulsoup4 bibtexparser - python-dateutil - six - requests configobj - beautifulsoup4 feedparser - argcomplete + python-dateutil + pyyaml + requests + six ]; nativeCheckInputs = with python3.pkgs; [ - pyfakefs - mock ddt + mock + pyfakefs pytestCheckHook ]; @@ -57,11 +62,18 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # https://github.com/pubs/pubs/issues/276 "test_readme" + # AssertionError: Lists differ: ['Ini[112 chars]d to... + "test_add_non_standard" + ]; + + pythonImportsCheck = [ + "pubs" ]; meta = with lib; { description = "Command-line bibliography manager"; homepage = "https://github.com/pubs/pubs"; + changelog = "https://github.com/pubs/pubs/blob/v${version}/changelog.md"; license = licenses.lgpl3Only; maintainers = with maintainers; [ gebner dotlambda ]; }; diff --git a/pkgs/tools/misc/rot8/default.nix b/pkgs/tools/misc/rot8/default.nix index aa4d925f5aedb..6a62d05b5a5d5 100644 --- a/pkgs/tools/misc/rot8/default.nix +++ b/pkgs/tools/misc/rot8/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/efernau/rot8"; license = licenses.mit; maintainers = [ maintainers.smona ]; - mainProgram = pname; + mainProgram = "rot8"; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index 455113c45e68e..6049efe04f802 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rpi-imager"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "raspberrypi"; - repo = finalAttrs.pname; + repo = "rpi-imager"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-+8jSKYy3w+S7BP7q+K5UYXa8Fp6uNEya47ssYkVCHH4="; + sha256 = "sha256-ZuS/fhPpVlLSdaD+t+qIw6fdEbi7c82X+BxcgWlPntg="; }; nativeBuildInputs = [ @@ -72,9 +72,8 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Raspberry Pi Imaging Utility"; - homepage = "https://www.raspberrypi.com/software/"; + homepage = "https://github.com/raspberrypi/rpi-imager/"; changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${finalAttrs.version}"; - downloadPage = "https://github.com/raspberrypi/rpi-imager/"; license = licenses.asl20; mainProgram = "rpi-imager"; maintainers = with maintainers; [ ymarkus anthonyroussel ]; diff --git a/pkgs/tools/misc/rtx/default.nix b/pkgs/tools/misc/rtx/default.nix index 51cba8e4b3758..038c08eabb42f 100644 --- a/pkgs/tools/misc/rtx/default.nix +++ b/pkgs/tools/misc/rtx/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "rtx"; - version = "2023.11.2"; + version = "2023.12.35"; src = fetchFromGitHub { owner = "jdx"; repo = "rtx"; rev = "v${version}"; - hash = "sha256-OdqHyxqufJJTfP7frjLKf5R0WNySDyZc7Sh0Mpdord0="; + hash = "sha256-vzMjC6qIPhZm80hzYQRpF3j+s85B0nwTcgSGRATQEIg="; }; - cargoHash = "sha256-KOte3zmJllrMp6OaKuFtUsRjdRKlSAxdJp1iJEOPcF0="; + cargoHash = "sha256-LvW5xGVggzuXlFPhbrc93Dht3S9zaQyx9Nm+Mx/Mjh0="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix index 68ee19e6c6820..08da05b8205b1 100644 --- a/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -4,13 +4,12 @@ , nixosTests , testers , sqlite3-to-mysql -, fetchPypi , mysql80 }: python3Packages.buildPythonApplication rec { pname = "sqlite3-to-mysql"; - version = "2.1.1"; + version = "2.1.6"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.8"; @@ -19,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "techouse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g3W6ts5Mk//l6E4Yg49rf9dmu+yzgH+mCjz+vPW9ZRQ="; + hash = "sha256-RIe4If7R8snbNN2yIPxAh39EQplVyhMF2c0G06Zipds="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index 113280617cb01..3395cacf4ef3e 100644 --- a/pkgs/tools/misc/star-history/default.nix +++ b/pkgs/tools/misc/star-history/default.nix @@ -1,27 +1,27 @@ { lib , rustPlatform +, darwin , fetchCrate , pkg-config , openssl , stdenv -, Security }: rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.15"; + version = "1.0.16"; src = fetchCrate { inherit pname version; - sha256 = "sha256-9/r01j/47rbgmXQy9qVOeY1E3LDMe9A/1SOB2l9zpJU="; + sha256 = "sha256-ChUZf8aohDOmNKPgn9+i0NNZ4rKJsXQPK6IMqWf0NQc="; }; - cargoSha256 = "sha256-kUpGBtgircX8/fACed4WO7rHTCah+3BFuQQV/A5pivg="; + cargoHash = "sha256-RsBWmEe4D+m3hxE1ryQ5aZb2uDax519qjQoIK7xStPw="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; meta = with lib; { diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index f1e9a0246c5cc..5608d64d9d571 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - hash = "sha256-CrD65nHE40n83HO+4QM1sLHvdFaqTvOb96hPBgXKuwk="; + hash = "sha256-Hf9tW1oBAw8/1KIRZpIpyVaEitLkVr2v6ilTHREzwvU="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { cp docs/.vuepress/public/presets/toml/*.toml $presetdir ''; - cargoHash = "sha256-ZHHrpepKZnSGufyEAjNDozaIKAt2GFRt+hU2ej7LceA="; + cargoHash = "sha256-OENey+brI3B2CThNm1KOxuX/OO8tHb7i5X0jXit7FrU="; nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 44f0cb5f17da0..238d6bb2a6237 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "steampipe"; - version = "0.20.12"; + version = "0.21.1"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-/vcxK/tX4kvDnQCqO8olHZodAbPDDvz1domJZ1WJqPU="; + hash = "sha256-UTKonirf27C3q3tYznMfNtAQ3S7T1Vzlwz05jAoLfoI="; }; - vendorHash = "sha256-VuUzo+afUazXH7jaR4Qm5Kfr6qiyHqdGLJWS3MX8oOA="; + vendorHash = "sha256-zzXAAxN2PRqAx4LDJjVAoLm1HnhVdBe/Mzyuai8CEXg="; proxyVendor = true; patchPhase = '' @@ -27,6 +27,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + # panic: could not create backups directory: mkdir /var/empty/.steampipe: operation not permitted + doCheck = !stdenv.isDarwin; + postInstall = '' INSTALL_DIR=$(mktemp -d) installShellCompletion --cmd steampipe \ diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index c9e4664c63719..f777c73e0bebc 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -15,7 +15,7 @@ let python pytest nose3 cryptography pyyaml requests mock requests-mock python-dateutil setuptools; - version = "4.28.1"; + version = "4.69"; in @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "spaam"; repo = "svtplay-dl"; rev = version; - hash = "sha256-z9DFtKTvnivY5D2EUHfrmndlUBTfico8o9G3J017f90="; + hash = "sha256-F8VyeIj9I7oDpHTyGw1T8ZvC6kxYf15soY9ni0Zg7u4="; }; pythonPaths = [ cryptography pyyaml requests ]; diff --git a/pkgs/tools/misc/svu/default.nix b/pkgs/tools/misc/svu/default.nix index 352f4d0ab721e..0fafaffc153b4 100644 --- a/pkgs/tools/misc/svu/default.nix +++ b/pkgs/tools/misc/svu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "svu"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "caarlos0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FmSBh2XxwxmIbX2TILnk+YUYbMQQbOb89uvnpl4b+7Y="; + sha256 = "sha256-MztFramrNqxYmdTRf857HOC7H66dLvezG6LL9njxWUs="; }; vendorHash = "sha256-+e1oL08KvBSNaRepGR2SBBrEDJaGxl5V9rOBysGEfQs="; diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 3d9655f114dcb..0d4df99a952d8 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tldr"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "tldr-pages"; repo = "tldr-c-client"; rev = "v${version}"; - sha256 = "sha256-9pBMo+t/44tuT/CisS0w60KaKXjPfNTMr2v6Ftjaf1k="; + sha256 = "sha256-1L9frURnzfq0XvPBs8D+hBikybAw8qkb0DyZZtkZleY="; }; buildInputs = [ curl libzip ]; diff --git a/pkgs/tools/misc/tmux-sessionizer/default.nix b/pkgs/tools/misc/tmux-sessionizer/default.nix index e0e8dd9efb4b2..a9aa41a9d9923 100644 --- a/pkgs/tools/misc/tmux-sessionizer/default.nix +++ b/pkgs/tools/misc/tmux-sessionizer/default.nix @@ -5,20 +5,29 @@ , openssl , pkg-config , Security -}: +, testers +, tmux-sessionizer +}: let -rustPlatform.buildRustPackage rec { - pname = "tmux-sessionizer"; - version = "0.2.3"; + name = "tmux-sessionizer"; + version = "0.3.0"; + +in rustPlatform.buildRustPackage { + pname = name; + inherit version; src = fetchFromGitHub { owner = "jrmoulton"; - repo = pname; + repo = name; rev = "v${version}"; - sha256 = "sha256-TTt4pEWlt1cL9SBM6C5dX88MqhBqr4Qt8INnWny8WL4="; + hash = "sha256-ZascTDIV9MqPPtK0CHSXUW5gIk/zjRhUB0xATcu7ICM="; }; - cargoHash = "sha256-Jq4wpSKo5kq6xSr/qRPlMy9QREUHQ33oQgXrvKi25lM="; + cargoHash = "sha256-lZi72OJ+AnnLxf/zxwAERfy1oW8dE8bGF8hFwwrUXqE="; + + passthru.tests.version = testers.testVersion { + package = tmux-sessionizer; + }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; @@ -27,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "The fastest way to manage projects as tmux sessions"; homepage = "https://github.com/jrmoulton/tmux-sessionizer"; license = licenses.mit; - maintainers = with maintainers; [ vinnymeller ]; + maintainers = with maintainers; [ vinnymeller mrcjkb ]; mainProgram = "tms"; }; } diff --git a/pkgs/tools/misc/traefik-certs-dumper/default.nix b/pkgs/tools/misc/traefik-certs-dumper/default.nix index 18ed06c630ede..60cc47969afa0 100644 --- a/pkgs/tools/misc/traefik-certs-dumper/default.nix +++ b/pkgs/tools/misc/traefik-certs-dumper/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik-certs-dumper"; - version = "2.8.1"; + version = "2.8.3"; src = fetchFromGitHub { owner = "ldez"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o5nTxTyLuKtWcJvcWZuVwK970DMJfEaJw8vDcShulr0="; + sha256 = "sha256-dSVtowebmDA0X/PtLKktvb1+FhQ+evMoxFBXIXqZujw="; }; - vendorHash = "sha256-rBSRZ7gKUx3tBXqhkTOmAyEx9pLw41/Bt3O+AiHqXpw="; + vendorHash = "sha256-a23kTtjIaMYs3+S9rYZ6ttyCyyK6Wm2wUZQw+In/hG4="; excludedPackages = "integrationtest"; meta = with lib; { diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index 594c6de654afc..4e8d7ca8f9fee 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ttyplot"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - sha256 = "sha256-lZLjTmSKxGJhUMELcIPjycpuRR3m9oz/Vh1/FEUzMOQ="; + sha256 = "sha256-BYMdGNDl8HUin1Hu4Fqgx305a/tTt1fztqlT2vDeTh8="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/twm/default.nix b/pkgs/tools/misc/twm/default.nix index 79c3584ca9ca8..8e79293477c98 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.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "vinnymeller"; repo = pname; rev = "v${version}"; - sha256 = "sha256-icJQSPt3733H5pIdnpC/Vx+u6LgwokCdbvE3wvDkIlw="; + sha256 = "sha256-4+1+9SdaYxqFmXB3F1vEfVq8bGiR6s8bVLrnjQNf/DY="; }; - cargoHash = "sha256-DxT3Wsiy4zVlTSJwHqV/McSi/pc9pB0wyWY54fj1zVE="; + cargoHash = "sha256-5F3jjNv1oJeYoGEuu2IC/7yiWWigVvxsjmHKcs1mESE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/ugs/default.nix b/pkgs/tools/misc/ugs/default.nix index 395a9e42009c6..58c221ee9e84b 100644 --- a/pkgs/tools/misc/ugs/default.nix +++ b/pkgs/tools/misc/ugs/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "ugs"; - version = "2.1.0"; + version = "2.1.4"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; - hash = "sha256-BH4oka2Ht4fGMD6/xy/MLBXNkJRggs4VQVG0UqmYQoI="; + hash = "sha256-2WGRHdxmGa2b8ca20xNJoA0NAY9a0pngzdf94ROfirk="; }; dontUnpack = true; diff --git a/pkgs/tools/misc/url-parser/default.nix b/pkgs/tools/misc/url-parser/default.nix index ae74dc7396f2b..8a4e34c8187a4 100644 --- a/pkgs/tools/misc/url-parser/default.nix +++ b/pkgs/tools/misc/url-parser/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "url-parser"; - version = "1.0.6"; + version = "2.0.1"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "url-parser"; rev = "refs/tags/v${version}"; - hash = "sha256-YZAcu1TDPTE2vLA9vQNWHhGIRQs4hkGAmz/zi27n0H0="; + hash = "sha256-g4fpyzDgIf/4kBAfNxLst0KKa+vNSCryljFAW1j8wmc="; }; - vendorHash = "sha256-8doDVHyhQKsBeN1H73KV/rxhpumDLIzjahdjtW79Bek="; + vendorHash = "sha256-HOlX8oHktbgnbPkRf9iUMCUpGlbcQwusMMcHJJl2nOs="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/usbmuxd2/default.nix b/pkgs/tools/misc/usbmuxd2/default.nix index fae54b4ec18ce..2eee1bb71324c 100644 --- a/pkgs/tools/misc/usbmuxd2/default.nix +++ b/pkgs/tools/misc/usbmuxd2/default.nix @@ -1,30 +1,29 @@ { lib , clangStdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , libimobiledevice , libusb1 , avahi , clang +, git }: let libgeneral = clangStdenv.mkDerivation rec { pname = "libgeneral"; - version = "unstable-2021-12-12"; + version = "74"; src = fetchFromGitHub { owner = "tihmstar"; repo = pname; - rev = "017d71edb0a12ff4fa01a39d12cd297d8b3d8d34"; - hash = "sha256-NrSl/BeKe3wahiYTHGRVSq3PLgQfu76kHCC5ziY7cgQ="; + rev = "refs/tags/${version}"; + hash = "sha256-6aowcIYssc1xqH6kTi/cpH2F7rgc8+lGC8HgZWYH2w0="; + # Leave DotGit so that autoconfigure can read version from git tags + leaveDotGit = true; }; - postPatch = '' - # Set package version so we don't require git - sed -i '/AC_INIT/s/m4_esyscmd.*/${version})/' configure.ac - ''; nativeBuildInputs = [ autoreconfHook + git pkg-config ]; meta = with lib; { @@ -38,33 +37,26 @@ in clangStdenv.mkDerivation rec { pname = "usbmuxd2"; - version = "unstable-2022-02-07"; + version = "unstable-2023-12-12"; src = fetchFromGitHub { owner = "tihmstar"; repo = pname; - rev = "753b79eaf317c56df6c8b1fb6da5847cc54a0bb0"; - hash = "sha256-T9bt3KOJwFpdPeFuXfBhkBZNaNzix3Q3D47vASR+fVg="; + rev = "2ce399ddbacb110bd5a83a6b8232d42c9a9b6e84"; + hash = "sha256-UVLLE73XuWTgGlpTMxUDykFmiBDqz6NCRO2rpRAYfow="; + # Leave DotGit so that autoconfigure can read version from git tags + leaveDotGit = true; }; - patches = [ - (fetchpatch { - name = "libplist-2.3.0-compatibility.patch"; - url = "https://github.com/tihmstar/usbmuxd2/commit/e527bce2360afc22c95542f1252f94c994f45c72.patch"; - hash = "sha256-ig4j4z2HH8gitXxZYW9fm74Ix9XmJeX2Lz9HBCuDsuk="; - }) - ]; - postPatch = '' - # Set package version so we don't require git - sed -i '/AC_INIT/s/m4_esyscmd.*/${version})/' configure.ac - # Do not check libgeneral version - sed -i 's/libgeneral >= 39/libgeneral/' configure.ac + # Checking for libgeneral version still fails + sed -i 's/libgeneral >= $LIBGENERAL_MINVERS_STR/libgeneral/' configure.ac ''; nativeBuildInputs = [ autoreconfHook clang + git pkg-config ]; diff --git a/pkgs/tools/misc/usbview/default.nix b/pkgs/tools/misc/usbview/default.nix index 71a4ddeefd8d8..17402fe76120c 100644 --- a/pkgs/tools/misc/usbview/default.nix +++ b/pkgs/tools/misc/usbview/default.nix @@ -3,23 +3,25 @@ , fetchFromGitHub , autoreconfHook , pkg-config +, imagemagick , gtk3 }: stdenv.mkDerivation rec { pname = "usbview"; - version = "2.0"; + version = "3.1"; src = fetchFromGitHub { owner = "gregkh"; repo = "usbview"; rev = "v${version}"; - sha256 = "1cw5jjpidjn34rxdjslpdlj99k4dqaq1kz6mplv5hgjdddijvn5p"; + hash = "sha256-h+sB83BYsrB2VxwtatPWNiM0WdTCMY289nh+/0o8GOw="; }; nativeBuildInputs = [ autoreconfHook pkg-config + imagemagick ]; buildInputs = [ @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { description = "USB viewer for Linux"; license = licenses.gpl2Only; homepage = "http://www.kroah.com/linux-usb/"; - maintainers = with maintainers; [ shamilton ]; + maintainers = with maintainers; [ shamilton h7x4 ]; platforms = platforms.linux; mainProgram = "usbview"; }; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index ddd6e32e16d44..14048bc4845c3 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -13,6 +13,7 @@ , libiconv , coreutils , CoreServices +, SystemConfiguration , tzdata , cmake , perl @@ -62,8 +63,9 @@ rustPlatform.buildRustPackage { }; }; nativeBuildInputs = [ pkg-config cmake perl git rustPlatform.bindgenHook ]; - buildInputs = [ oniguruma openssl protobuf rdkafka zstd rust-jemalloc-sys ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; + buildInputs = + [ oniguruma openssl protobuf rdkafka zstd rust-jemalloc-sys ] + ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices SystemConfiguration ]; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index ee7b301df8615..47a78ea41ef64 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -4,27 +4,29 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vtm"; - version = "0.9.16"; + version = "0.9.27"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; - rev = "v${version}"; - sha256 = "sha256-nX7T3TAGgxAB65X8D2HlI+3T6p7aH3bwG3N1pScX/4g="; + rev = "v${finalAttrs.version}"; + hash = "sha256-BiXKwFZDi0boE1kCqbIn6uFjQ/oliyNbqmamyAwnqdM="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; cmakeFlags = [ "../src" ]; - meta = with lib; { + meta = { description = "Terminal multiplexer with window manager and session sharing"; homepage = "https://vtm.netxs.online/"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ ahuzik ]; + license = lib.licenses.mit; mainProgram = "vtm"; + maintainers = with lib.maintainers; [ ahuzik ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix index 9cf4efb0df339..4602f5ba35bc1 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.9.2"; + version = "2.10.2"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-BRIcStqRzwoFG9HkWBpfumeCzbrSI0Hg//a0iDQtNw8="; + sha256 = "sha256-ecbWP6WnFCMCnk8o3A0UUdMj8cSmKm5KD/gVN/AVvIY="; }; - vendorHash = "sha256-SqkE4vTT+QoLhKrQcGa2L5WmD+fCX7vli4FjgwLnqjg="; + vendorHash = "sha256-RG6lc2axeAAPHLS1xRh8gpV/bcnyTWzYcb1YPLpQ0uQ="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index 26d3d34e58c45..443cfa85f808f 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.52"; + version = "1.0.54"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-6x2H+WY23XxBWmAqD2Lsc4TdCY76XiR/BhSU++XuIFY="; + hash = "sha256-ZiOuD7aiBI1virfcXzxHnX5/uPZRc+Nntg24K2b9Mbo="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-1YnoHL+FKXhopcW0Scya22sRBwantRH9gF7w/rxU0H8="; + cargoHash = "sha256-OPNxs5WSQEatIJQ48GYjCzwM4twvQd38W/xsFgU9dB0="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index 3c686c3093748..e8d8098ad95c6 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://ipxe.org/wimboot"; description = "Windows Imaging Format bootloader"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ das_j ajs124 ]; + maintainers = teams.helsinki-systems.members; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/misc/ytmdl/default.nix b/pkgs/tools/misc/ytmdl/default.nix index 73c7ce2aae7ac..9baf2888d78b4 100644 --- a/pkgs/tools/misc/ytmdl/default.nix +++ b/pkgs/tools/misc/ytmdl/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "ytmdl"; - version = "2023.07.27"; + version = "2023.11.26"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-sBRzbUR+zqS8Zzg/uU4bjJUr/n1/tb0K6u/FVTEIRsk="; + sha256 = "sha256-Im3rQAs/TYookv6FeGpU6tJxUGBMb6/UW1ZMDg9FW4s="; }; postPatch = '' diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index eee35ea8c9d48..61d76205a6d68 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,38 +1,53 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , pkg-config , openssl , check , pcsclite , PCSC , gengetopt +, help2man , cmake +, zlib , withApplePCSC ? stdenv.isDarwin -, gitUpdater +, nix-update-script , testers -, yubico-piv-tool }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yubico-piv-tool"; - version = "2.3.1"; + version = "2.4.1"; - src = fetchurl { - url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz"; - hash = "sha256-2ona/YthhapjU0Z1P53bKa8pvEq9kt2B832dZWC11k4="; + outputs = [ "out" "dev" "man" ]; + + src = fetchFromGitHub { + owner = "Yubico"; + repo = "yubico-piv-tool"; + rev = "refs/tags/yubico-piv-tool-${finalAttrs.version}"; + hash = "sha256-KprY5BX7Fi/qWRT1pda9g8fqnmDB1Bh7oFM7sCwViuw="; }; postPatch = '' substituteInPlace CMakeLists.txt --replace "-Werror" "" ''; - nativeBuildInputs = [ pkg-config cmake gengetopt ]; - buildInputs = [ openssl check ] - ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); + nativeBuildInputs = [ + pkg-config + cmake + gengetopt + help2man + ]; + + buildInputs = [ + openssl + check + zlib.dev + ] + ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); cmakeFlags = [ - "-DGENERATE_MAN_PAGES=OFF" # Use the man page generated at release time + "-DGENERATE_MAN_PAGES=ON" "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_MANDIR=share/man" @@ -42,13 +57,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ]; passthru = { - updateScript = gitUpdater { - url = "https://github.com/Yubico/yubico-piv-tool.git"; - rev-prefix = "yubico-piv-tool-"; + updateScript = nix-update-script { + extraArgs = [ "--version-regex" "yubico-piv-tool-([0-9.]+)$" ]; }; tests.version = testers.testVersion { - inherit version; - package = yubico-piv-tool; + package = finalAttrs.finalPackage; command = "yubico-piv-tool --version"; }; }; @@ -72,4 +85,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ viraptor anthonyroussel ]; mainProgram = "yubico-piv-tool"; }; -} +}) diff --git a/pkgs/tools/misc/yutto/default.nix b/pkgs/tools/misc/yutto/default.nix index a9b5e224e07a2..1b98c2a38fbd1 100644 --- a/pkgs/tools/misc/yutto/default.nix +++ b/pkgs/tools/misc/yutto/default.nix @@ -9,14 +9,14 @@ with python3.pkgs; buildPythonApplication rec { pname = "yutto"; - version = "2.0.0b30"; + version = "2.0.0b31"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-QQExmnpn+CgNRyV/cQbYpgGCM2r8DzOMdNzgN+DvSos="; + hash = "sha256-PWUZ4adH6uaNRIXVMGN3Yun7muYljQC8xDeEes0MB2U="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 2489a21a19253..44863361a088e 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.9.2"; + version = "unstable-2023-11-20"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; - rev = "v${version}"; - sha256 = "sha256-h/T3McaKKASwQt+0SBBxFXMnYyt+0Xl+5i8IulUAdnU="; + rev = "3022cf3686b85288e6fbecb2bd23ad113fd83f3b"; + sha256 = "sha256-ut+/F7cQ5Xamb7T45a78i0mjqnNG9/73jPNaDLxzAx8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-uu7zi6prnfbi4EQ0+0QcTEo/t5CIwNEQgJkIgxSk5u4="; + cargoSha256 = "sha256-JRWlHwPFqNC/IIKQqRQszx4HHW1XsmROA67KmnxkmWQ="; postInstall = '' installManPage man/man*/* @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; - changelog = "https://github.com/ajeetdsouza/zoxide/raw/v${version}/CHANGELOG.md"; + # changelog = "https://github.com/ajeetdsouza/zoxide/raw/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ]; mainProgram = "zoxide"; diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index e867f2f8ac8fa..3d58e38bbbe92 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.14.2"; + version = "0.14.3"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-UR34PX3GChOTM4ROcvlghXOv4M8CYgiCvQaR/BRRvzs="; - aarch64-linux = "sha256-5q5Zz+/klgwbBvE40aMCw+ulv+g9Yhpcsn31PPCp9S4="; - x86_64-darwin = "sha256-NH1/QKqmaKGL35verE2sRXUwXePJoQk5kiUEIA5Xxn8="; - aarch64-darwin = "sha256-PpZ1dbT57+cdmLTvxo0/HY0lKoa+/N4cSfTNhbE6LLo="; + x86_64-linux = "sha256-iKKpZ/5BrX+b7/r/Q6zQ0Qo51/8v4jekDDWmJ1x4dqQ="; + aarch64-linux = "sha256-JYfgeiBUG4rk1fh89d3wiYkoiy4e41wHIphj1no/TS8="; + x86_64-darwin = "sha256-4dEP7Gx7h1OT6eyQR4fUFed3jUbVxqHmsFzvrSvTLe0="; + aarch64-darwin = "sha256-am/GX2NPOzWT0s+UQ2FYGapa9aOSxmbJ9X80xvnbaiQ="; }; in fetchzip { diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index 48e64b202c6ef..9d4c0267c76ab 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { else "Remote user information server"; platforms = platforms.linux; license = licenses.bsdOriginal; + mainProgram = "finger"; }; } # TODO: multiple outputs (manpage) diff --git a/pkgs/tools/networking/cfspeedtest/default.nix b/pkgs/tools/networking/cfspeedtest/default.nix index ed015ef4f5d24..72c62053ac46d 100644 --- a/pkgs/tools/networking/cfspeedtest/default.nix +++ b/pkgs/tools/networking/cfspeedtest/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cfspeedtest"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "code-inflation"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZbE8/mh9hb81cGz0Wxq3gTa9BueKfQApeq5z2DGUak0="; + hash = "sha256-/Msm5odr0K4yxkfc54nVrVxtaBhoerBymFrfOP8zigU="; }; - cargoHash = "sha256-+cKQkogZc4iIIVMyHtbS44DNkCKD2cWkVN2o9m+WFbM="; + cargoHash = "sha256-JqFX9RbyjZqp9rp2ZNA1XlOCUQ5I4aGvv4UsWVtsvQ0="; meta = with lib; { description = "Unofficial CLI for speed.cloudflare.com"; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index c188fbb7ccd8b..74132e7924471 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "chrony"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; - hash = "sha256-6vsH5tr5KxQiAPR4hW3+1u/J6i0Ubu3tXtywm5MScIg="; + hash = "sha256-Gf4dn0Zk1EWmmpbHHo/bYLzY3yTHPROG4CKH9zZq1CI="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index 856a21cb9679b..43b938ac4a133 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.48.1"; + version = "0.49.0"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-k166J9algbbwGMG65Sr0sshwhLwo5M7JDtGnG4AKZJM="; + hash = "sha256-dSy+4hsuigBSULDfsUW/kArcQByrtUeF3InMRuqFtu4="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-w5lwZTSG6OI85P/swjK3NtovMqfgttr9DC+CPSKlpKQ="; + vendorHash = "sha256-mm3D8WQtgWT9LCWlTZIV5GJ9rIyd3iX8b6zWIpqEwnk="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix index 3aacb0da6a2e5..757a07c919896 100644 --- a/pkgs/tools/networking/corkscrew/default.nix +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -1,23 +1,22 @@ -{ lib, stdenv, fetchurl, automake }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "corkscrew"; version = "2.0"; - - src = fetchurl { - url = "http://agroman.net/corkscrew/corkscrew-${version}.tar.gz"; - sha256 = "0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be"; + src = fetchFromGitHub { + owner = "bryanpkc"; + repo = pname; + rev = "v${version}"; + hash = "sha256-JiddvTbuOysenrVWGUEyKSzpCF1PJaYWQUdz3FuLCdw="; }; - preConfigure = '' - ln -sf ${automake}/share/automake-*/config.sub config.sub - ln -sf ${automake}/share/automake-*/config.guess config.guess - ''; + nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { - homepage = "http://agroman.net/corkscrew/"; + homepage = "https://github.com/bryanpkc/corkscrew"; description = "A tool for tunneling SSH through HTTP proxies"; license = lib.licenses.gpl2; platforms = platforms.unix; }; } + 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 deleted file mode 100644 index 088f9b4032d27..0000000000000 --- a/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch +++ /dev/null @@ -1,53 +0,0 @@ -On darwin, providing SystemConfiguration to curl currently results in a -reference loop, so we have to disable the check for it and the feature -which requires it (NAT64). - -Patching actual configure script here as we also don't want to require -autoconf in the bootstrap loop just to regenerate a patched configure.ac. - ---- a/configure 2021-10-16 00:51:59.000000000 +0100 -+++ b/configure 2021-10-16 01:06:46.000000000 +0100 -@@ -21556,7 +221556,7 @@ - if test "x$build_for_macos" != xno; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - printf "%s\n" "yes" >&6; } -- LDFLAGS="$LDFLAGS -framework CoreFoundation -framework CoreServices -framework SystemConfiguration" -+ LDFLAGS="$LDFLAGS -framework CoreFoundation" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 - printf "%s\n" "no" >&6; } -@@ -22211,9 +22211,6 @@ - fi - - --if test "$HAVE_GETHOSTBYNAME" != "1"; then -- as_fn_error $? "couldn't find libraries for gethostbyname()" "$LINENO" 5 --fi - - - curl_includes_winsock2="\ -diff --git a/lib/curl_setup.h b/lib/curl_setup.h -index b43714da7..7674778b7 100644 ---- a/lib/curl_setup.h -+++ b/lib/curl_setup.h -@@ -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, -- * performing this task will result in a synthesized IPv6 address. -- */ --#if defined(__APPLE__) && !defined(USE_ARES) --#include <TargetConditionals.h> --#define USE_RESOLVE_ON_IPS 1 --# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \ -- defined(ENABLE_IPV6) --# define CURL_MACOS_CALL_COPYPROXIES 1 --# endif --#endif -- - #ifdef USE_LWIPSOCK - # include <lwip/init.h> - # include <lwip/sockets.h> diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index cc95bb4dc826b..18856ca5f0e35 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -5,17 +5,17 @@ }: buildGoModule rec { pname = "dae"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; rev = "v${version}"; - hash = "sha256-WiJqhXYehuUCLEuVbsQkmTntuH1srtePtZgYBSTbxiw="; + hash = "sha256-hvAuWCacaWxXwxx5ktj57hnWt8fcnwD6rUuRj1+ZtFA="; fetchSubmodules = true; }; - vendorHash = "sha256-fb4PEMhV8+5zaRJyl+nYi2BHcOUDUVAwxce2xaRt5JA="; + vendorHash = "sha256-qK+x6ciAebwIWHRjRpNXCAqsfnmEx37evS4+7kwcFIs="; proxyVendor = true; diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 68a9a8c19ff28..159fd0f154104 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -26,7 +26,7 @@ let boolToUpper = b: lib.toUpper (lib.boolToString b); in stdenv.mkDerivation rec { - version = "0.8.4"; + version = "0.8.5"; pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy"; nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # https://github.com/cern-fts/davix/releases/tag/R_0_8_0 src = fetchurl { url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz"; - sha256 = "sha256-UZ1W90bobqP9YVvEnlWbUg3wfgUeHKPYwJIGeVjzsrc="; + sha256 = "sha256-+c4hvMLtJI94JQWdF1d4dmFiWMNRd9dPrY+FSoGKh/k="; }; preConfigure = '' diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index aac49a7b83b2c..5df3e658e8b4e 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -118,7 +118,7 @@ in buildGoModule rec { ''; homepage = "https://www.datadoghq.com"; license = licenses.bsd3; - maintainers = with maintainers; [ thoughtpolice domenkozar rvl viraptor ]; + maintainers = with maintainers; [ thoughtpolice domenkozar ]; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin && stdenv.isAarch64; }; diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index 1dbedea502322..4d1334505f32b 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -4,7 +4,7 @@ datadog-agent.overrideAttrs (attrs: { meta = with lib; attrs.meta // { description = "Live process collector for the DataDog Agent v7"; - maintainers = with maintainers; [ domenkozar rvl ]; + maintainers = with maintainers; [ domenkozar ]; }; subPackages = [ "cmd/process-agent" ]; postInstall = null; diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix index 84f63e579e62a..e54a0e5f3e1eb 100644 --- a/pkgs/tools/networking/ddns-go/default.nix +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ddns-go"; - version = "5.6.6"; + version = "5.6.7"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-4OBY2Bj23uOBOAHKmOpecFXu0Lr8sLrwiU3/BdHpGOQ="; + hash = "sha256-s6DA7AKtJe1cXkskcXpZT1clJutyoU/fzopuPLOjg5M="; }; - vendorHash = "sha256-e4mmUneFZCsteSrxfSeeky/pFc0sgNs0eRVnZQuG1ZI="; + vendorHash = "sha256-jlRY5FECeYZEndwd6JukGBTnYka1yxy666Oh9Z35nSo="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 40cfa4077227b..2d7a646299ad6 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -40,8 +40,6 @@ stdenv.mkDerivation rec { substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell} ''; - preConfigure = "patchShebangs ./configure"; - configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" diff --git a/pkgs/tools/networking/driftnet/libwebsockets-4.3.0.patch b/pkgs/tools/networking/driftnet/libwebsockets-4.3.0.patch deleted file mode 100644 index 5e5cfd50af3e7..0000000000000 --- a/pkgs/tools/networking/driftnet/libwebsockets-4.3.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/http_display/httpd.c b/src/http_display/httpd.c -index f4709ef..7921d23 100644 ---- a/src/http_display/httpd.c -+++ b/src/http_display/httpd.c -@@ -191,7 +191,6 @@ static void * http_server_dispatch(void *arg) - LWSMPRO_FILE, /* mount type is a directory in a filesystem */ - 1, /* strlen("/"), ie length of the mountpoint */ - NULL, -- { NULL, NULL } // sentinel - }; - - memset(&info, 0, sizeof info); diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index d44b6b73f54f6..3f81a72831706 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.52.0"; + version = "0.53.2"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8cpNKXEQI+3VaP1qwXTd5L9y0EKR2LfxrCU5i+K2ptY="; + sha256 = "sha256-/z/pZgB4PepJXXjOBuuq1wHXI2pn/KCxY9cdfANdWGQ="; }; - vendorHash = "sha256-4+qzaSdku6qSqF0eT45sJ1zxw/zXYhxhNgq3WwrBIY0="; + vendorHash = "sha256-mcgHbwdqcIu4BceuQg+Es0dsIpWG0bsIpd056IOxuiY="; doCheck = false; diff --git a/pkgs/tools/networking/gen6dns/default.nix b/pkgs/tools/networking/gen6dns/default.nix index 6f020c2a66365..92d33d55da98b 100644 --- a/pkgs/tools/networking/gen6dns/default.nix +++ b/pkgs/tools/networking/gen6dns/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { installManPage gen6dns.1 ''; + configureFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + ]; + makeFlags = [ "INSTALL_DIR=$(out)/bin" ]; meta = with lib; { diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index a1db32558aab3..41c6a2f9c9a0a 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "3.20.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-kdeDV8IWbfeC6KDgJtOl1NX6jwvxiaIdGAYtrDuYFdI="; + sha256 = "sha256-npPwAh7ReGVDGRi0cCs0/x2xCBCrUMsZl205BhEjxq4="; }; vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 158b2cb275bc1..4a31bb1494b79 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "gping-v${version}"; - hash = "sha256-22Nio6yfkL9HWNrI+kk5dGfojTtB/h0sizCWH9w9so8="; + hash = "sha256-t9USry3I6tc8EKsfkq28/hPJMbaf0BqqOdzCl3oXd60="; }; - cargoHash = "sha256-YfvcCnFXDoZXp/Aug0jVQkilsvSzS+JF90U0QvVFksE="; + cargoHash = "sha256-QERmZOyC4U6ZpCkL7ap5MRvPEE2vqK/tD+CrBLg07J0="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index 33663a44d2a96..11a8cad05b9cd 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -28,6 +28,13 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' sed -i -e 's|#include <net/bpf.h>|#include <pcap/bpf.h>|' \ libpcap_stuff.c script.c + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace configure --replace 'BYTEORDER=`./byteorder -m`' BYTEORDER=${ + { + littleEndian = "__LITTLE_ENDIAN_BITFIELD"; + bigEndian = "__BIG_ENDIAN_BITFIELD"; + }.${stdenv.hostPlatform.parsed.cpu.significantByte.name}} + substituteInPlace Makefile.in --replace './hping3 -v' "" ''; configureFlags = [ (if withTcl then "TCLSH=${tcl}/bin/tclsh" else "--no-tcl") ]; diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index 5345d96eb1e61..088bd74b45e7e 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kail"; - version = "0.17.0"; + version = "0.17.2"; ldflags = [ "-s" @@ -14,10 +14,10 @@ buildGoModule rec { owner = "boz"; repo = "kail"; rev = "v${version}"; - sha256 = "sha256-i53pW2YcmHDrRPhRI3iUD+YvGCReNgEeSltv4ZNIObo="; + sha256 = "sha256-mUdb3f5GaD+3GceUOpIFHKgGqqollzCJ8/oUj/37xAU="; }; - vendorHash = "sha256-haF136u6CmbWGuOlCpnGf9lBEeN92PYM6KBvWVOZ8Ws="; + vendorHash = "sha256-GOrw/5nDMTg2FKkzii7FkyzCxfBurnnQbfBF4nfSaJI="; meta = with lib; { description = "Kubernetes log viewer"; diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix index d1b0ad03c303e..ad430b9163e68 100644 --- a/pkgs/tools/networking/kapp/default.nix +++ b/pkgs/tools/networking/kapp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kapp"; - version = "0.59.1"; + version = "0.59.2"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "kapp"; rev = "v${version}"; - sha256 = "sha256-0fvcBJzJB3o9gQiFfm9+qGTWcoJY2X4AR2XR8RRjerg="; + sha256 = "sha256-fDGQQo5REKtBlyBDZ4FTLGeayc14cppMmfLsXZtUJpA="; }; vendorHash = null; diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index d4b4dca3326f7..63e2d450ad102 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; rev = "v${version}"; - hash = "sha256-bv611kvjyXvWVkWpymQn4NLtDAYuXnNi1c3yT3t3p+8="; + hash = "sha256-T+SBGAE+hzHzrYLTm6t7NGh78B1/84TMiT1odGSPtKo="; }; - vendorHash = "sha256-MEG1p8PJinFOPIU9+9cxtU9FweCgVMYX8KojQ3ZhKKs="; + vendorHash = "sha256-QEGF12yJ+CQjIHx6kOwsykVhelp5npnglk7mIbOeIpI="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/tools/networking/magic-wormhole-rs/default.nix b/pkgs/tools/networking/magic-wormhole-rs/default.nix index 530ac45ab2b3f..5cdf5150b6830 100644 --- a/pkgs/tools/networking/magic-wormhole-rs/default.nix +++ b/pkgs/tools/networking/magic-wormhole-rs/default.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "magic-wormhole-rs"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole.rs"; rev = version; - sha256 = "sha256-gNHtlbYWQvgboIG++N1680a4ql66PTF45DJGz521zzk="; + sha256 = "sha256-6dRnOAclHcPayY0e5guhWR5CLaKzp5TlEU5esLvYQg8="; }; - cargoSha256 = "sha256-powJrbVVBWtIg0CV7ZdhaVIQA+VhEPtPCts7f8Sl1VY="; + cargoHash = "sha256-SPhTvj2DYNzuAtWamDhsgtCTUpQXtnhoRRSE745tB/k="; buildInputs = [ libxcb ] ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; diff --git a/pkgs/tools/networking/maubot/wrapper.nix b/pkgs/tools/networking/maubot/wrapper.nix index baa0c29052e90..6f4c577110be3 100644 --- a/pkgs/tools/networking/maubot/wrapper.nix +++ b/pkgs/tools/networking/maubot/wrapper.nix @@ -39,7 +39,7 @@ let wrapper = { pythonPackages ? (_: [ ]), plugins ? (_: [ ]), baseConfig ? null if builtins.isNull (baseConfig.server.override_resource_path or null) then "${unwrapped}/${python3.sitePackages}/maubot/management/frontend/build" else baseConfig.server.override_resource_path; - })})} $out/${python3.sitePackages}/maubot/example-config.yaml + })} $out/${python3.sitePackages}/maubot/example-config.yaml rm -rf $out/bin ''} mkdir -p $out/bin diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 21183437c02aa..b40ba824be1bb 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2023-09-07T22-48-55Z"; + version = "2023-10-30T18-43-32Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-DW6G37SLYzXkh8EHXhczloIZxNQS2+ON2kXe5VsQSZg="; + sha256 = "sha256-4WYJaFVB/+ERMNKvfDZvJGEiImwISM8fXLbi+Y986AM="; }; - vendorHash = "sha256-NbqqvV34Bzv2AmMYlN133RI7jNh96Jmo8065D3RxClI="; + vendorHash = "sha256-YDXkJVFK09I/Ic3ZBlO2AtybH6+RfwLmBCldX4i41Po="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/mockoon/default.nix b/pkgs/tools/networking/mockoon/default.nix index 63e4e3c28030f..2fbcffe5b09ba 100644 --- a/pkgs/tools/networking/mockoon/default.nix +++ b/pkgs/tools/networking/mockoon/default.nix @@ -5,11 +5,11 @@ let pname = "mockoon"; - version = "5.1.0"; + version = "6.0.1"; src = fetchurl { url = "https://github.com/mockoon/mockoon/releases/download/v${version}/mockoon-${version}.AppImage"; - hash = "sha256-FF2F16ulKerNnwgumaz2Theff7pRN4Up3FooCNW8kbg="; + hash = "sha256-aV+jM/XxXbjkStSZE4x8qtrtYX/yKbye4WjO9PiaNQ4="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index 6888b5aa4ab2b..1812dc690e180 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -26,13 +26,13 @@ let pname = "mozillavpn"; - version = "2.16.1"; + version = "2.19.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-UMWBn3DoEU1fG7qh6F0GOhOqod+grPwp15wSSdP0eCo="; + hash = "sha256-aXfxUtGm+vq8U3jYTxYhOP7UXL6ukCJgmGQO2Wsqobo="; }; patches = [ ]; @@ -46,19 +46,19 @@ let inherit src patches; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-1wYTRc+NehiHwAd/2CmsJNv/TV6wH5wXwNiUdjzEUIk="; + hash = "sha256-23GTXsbjL8qfGA5NdPlrbdaA8rg8vOZsZCXvevi7Chc="; }; signatureDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-oaKkQWMYkAy1c2biVt+GyjHBeYb2XkuRvFrWQJJIdPw="; + hash = "sha256-TB172hVIilDTl+y0shNp55if+FhrXjWSaGNF7K6GSH8="; }; qtgleanDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}-qtglean"; preBuild = "cd qtglean"; - hash = "sha256-cqfiOBS8xFC2BbYp6BJWK6NHIU0tILSgu4eo3Ik4YqY="; + hash = "sha256-tfQ2ogSDDXNPeygBy+el+71iwcafSfY78hvYPHurKPE="; }; in @@ -110,7 +110,7 @@ stdenv.mkDerivation { dontCargoSetupPostUnpack = true; postPatch = '' - substituteInPlace src/apps/vpn/cmake/linux.cmake \ + substituteInPlace src/cmake/linux.cmake \ --replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \ --replace '/usr/share/dbus-1' "$out/share/dbus-1" \ --replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index e0efbe31f8ebb..c7cb5632dfe4b 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, which, bison, nixosTests, linuxHeaders, gnutls }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, which +, bison +, nixosTests +, libnl +, linuxHeaders +, gnutls +}: stdenv.mkDerivation rec { pname = "nbd"; @@ -9,15 +20,23 @@ stdenv.mkDerivation rec { hash = "sha256-9cj9D8tXsckmWU0OV/NWQy7ghni+8dQNCI8IMPDL3Qo="; }; - buildInputs = [ glib gnutls ] - ++ lib.optionals stdenv.isLinux [ linuxHeaders ]; + nativeBuildInputs = [ + pkg-config + which + bison + ]; - nativeBuildInputs = [ pkg-config which bison ]; + buildInputs = [ + glib + gnutls + ] ++ lib.optionals stdenv.isLinux [ + libnl + linuxHeaders + ]; - postInstall = '' - mkdir -p "$out/share/doc/nbd-${version}" - cp README.md "$out/share/doc/nbd-${version}/" - ''; + configureFlags = [ + "--sysconfdir=/etc" + ]; doCheck = !stdenv.isDarwin; @@ -30,5 +49,6 @@ stdenv.mkDerivation rec { description = "Map arbitrary files as block devices over the network"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ nickcao ]; }; } diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 4147adf50749b..2be42d891466d 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nebula"; - version = "1.7.2"; + version = "1.8.1"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/kEXrcMFnrnnD+6754EDoOvn4czh0rJGEjlXkmCzb1w="; + hash = "sha256-lLDoAR3n3V0hJWvvSqz0nWXSsiXK+kjJJo7okv4KX8c="; }; - vendorHash = "sha256-VZzSdl8R1y7rCF2vz7e+5nAkb3wlJymNWCXwZZUvg4A="; + vendorHash = "sha256-amOveyxXGyQVV6yQspExXfj0JTN9yLs6+bcKYRst1tU="; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; diff --git a/pkgs/tools/networking/netassert/default.nix b/pkgs/tools/networking/netassert/default.nix index ac7f2f3630d53..1351c255e9436 100644 --- a/pkgs/tools/networking/netassert/default.nix +++ b/pkgs/tools/networking/netassert/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "netassert"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "controlplaneio"; repo = "netassert"; rev = "v${version}"; - hash = "sha256-UWiPjLvMuEc12HJ5ZiwKGeD0hh/y9j4P6FKu0uynUGA="; + hash = "sha256-mRKjo0AfnM+XTl7sQoGDyQoquXpD3xPJ6i3/3Dj2rhE="; }; - vendorHash = "sha256-nDnSJOfEn9KieDwdNeIGFcI4m8rVU+Yaxwa+dKyNSHM="; + vendorHash = "sha256-9mvSfAd1m95eRwljGG68+tjiFObgt1EuakjwFfn9Obo="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index c74d080299868..5b5eaee20dc7c 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -17,6 +17,7 @@ , UserNotifications , WebKit , ui ? false +, netbird-ui }: let modules = @@ -30,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.24.3"; + version = "0.25.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-r/2P0QeILO0t5GIXD6yrqdUdOpPzNfBIniPhKdlJ+0g="; + hash = "sha256-308t/yaFFabFC9nr1eN/SMF+uBBnpGaaWiWD0wm/dtI="; }; - vendorHash = "sha256-FTr36gndWTrpEKo7KXdZJIR7aM0jrEOTFm1JlxokRaw="; + vendorHash = "sha256-3jjCAsqbD5HUM8972jGBxCiewSLh2aIRE68rpV03KqQ="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; @@ -100,6 +101,7 @@ buildGoModule rec { passthru = { tests.netbird = nixosTests.netbird; + tests.netbird-ui = netbird-ui; updateScript = nix-update-script { }; }; diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix index c4f033184ebed..6db79ab5ceac3 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.2.3.1"; + version = "1.2.6"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-uY3Cjemv+iFOrWm7lXzRprIljqHCLWOF6DyDURrH39g="; + sha256 = "sha256-UD6+oFXYk5VWD9MZdE3ECnyYJSe7v88D9gkIAj+e7Bw="; }; - vendorHash = "sha256-sugEN7sKBwEKsfX1MBwOiyH1aq1995HL+Yv7Q8XaPAo="; + vendorHash = "sha256-2lDkNbsAgEMSKK7ODpjJEL0ZM4N1khzGuio1645Xxqo="; doCheck = false; # Tests require a network connection. diff --git a/pkgs/tools/networking/ngrok/versions.json b/pkgs/tools/networking/ngrok/versions.json index ef2b4e3d235d8..3b52e8f92372e 100644 --- a/pkgs/tools/networking/ngrok/versions.json +++ b/pkgs/tools/networking/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/3ndXunLZxr9/ngrok-v3-3.4.0-linux-386", - "sha256": "96b00658e46ce78226f426642999aec1c5593532ef975ada7b3a88550d5fd462", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/4gMs8FHXopG/ngrok-v3-3.5.0-linux-386", + "sha256": "2ab242193e01222d1c5cbfe85389200b97fc3af91374bd4b9c8d86812db7d589", + "version": "3.5.0" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/8U3NahKrMb7/ngrok-v3-3.4.0-linux-amd64", - "sha256": "f84e8e7b22ed5ee07f7256c5811ab154fcc6f4a75607af87fad214cf5d4cc850", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/7qHLVJPrTcc/ngrok-v3-3.5.0-linux-amd64", + "sha256": "bd44f722df4435daf61c4bef4fe45d8abdbbf5ccd6c371b6ab405a07fb469c06", + "version": "3.5.0" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/jcENzdnK9si/ngrok-v3-3.4.0-linux-arm", - "sha256": "dc56d43e353dcea410f30593c858e0240c22c9db1a803e436f8f2540143f9c10", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/ciuckTnS7RJ/ngrok-v3-3.5.0-linux-arm", + "sha256": "ba0ab1d956a0b05e35da6901691bd18166acc6a833c993e8f6b80f6d608e1d8c", + "version": "3.5.0" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/hmadqCe6Lnv/ngrok-v3-3.4.0-linux-arm64", - "sha256": "203ac71b0af764438ad6b0fc27df71e2e8c10204eec88d670dc78f4b92dc9116", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/iutMKiLdVzF/ngrok-v3-3.5.0-linux-arm64", + "sha256": "85b5ecc96a56a1d19324acb3ca3a38e11a9075be8cb97ee466a1538f8711a69d", + "version": "3.5.0" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/3GTEBnkQhkx/ngrok-v3-3.4.0-darwin-amd64", - "sha256": "562384f2eeaa4d1ffedd17599f7ddb7968acd6267b6b06e2a3664e2e61a4dd92", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/hrb7DpXGSDS/ngrok-v3-3.5.0-darwin-amd64", + "sha256": "3380a2e742600fcef21e390291c4224e3e23fb31e832b695f922a24899125808", + "version": "3.5.0" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/eFiJHNHzRfi/ngrok-v3-3.4.0-darwin-arm64", - "sha256": "9fb23648c449a773eea5c0edf7c35b42b4f6432ad0bae5d7fa7321c71cd0f545", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/aH6hGnhtNbT/ngrok-v3-3.5.0-darwin-arm64", + "sha256": "cbfd0bcd1d53aa1bc3b6afa54e0c8f01d77f6a369727f4f6eb1451b3a1eab3df", + "version": "3.5.0" } } diff --git a/pkgs/tools/networking/nikto/default.nix b/pkgs/tools/networking/nikto/default.nix index e1abcb6c140d0..df03cc8c3ce77 100644 --- a/pkgs/tools/networking/nikto/default.nix +++ b/pkgs/tools/networking/nikto/default.nix @@ -6,20 +6,23 @@ , installShellFiles }: +let + version = "2.5.0"; +in stdenv.mkDerivation rec { pname = "nikto"; - version = "2.2.0"; + inherit version; src = fetchFromGitHub { owner = "sullo"; repo = "nikto"; - rev = "c83d0461edd75c02677dea53da2896644f35ecab"; - sha256 = "0vwq2zdxir67cn78ls11qf1smd54nppy266v7ajm5rqdc47q7fy2"; + rev = version; + sha256 = "sha256-lWiDbWc2BWAUgyaIm0tvZytja02WogYRoc7na4sHiNM="; }; # Nikto searches its configuration file based on its current path # This fixes the current path regex for the wrapped executable. - patches = [ ./NIKTODIR-nix-wrapper-fix.patch ]; + patches = [ ./nix-wrapper-fix.patch ]; postPatch = '' # EXECDIR needs to be changed to the path where we copy the programs stuff @@ -31,10 +34,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; - propagatedBuildInputs = [ perlPackages.NetSSLeay ]; - buildInputs = [ perlPackages.perl + perlPackages.NetSSLeay ]; installPhase = '' @@ -44,7 +46,6 @@ stdenv.mkDerivation rec { install -Dm 755 "program/nikto.pl" "$out/bin/nikto" install -Dm 644 program/nikto.conf.default "$out/etc/nikto.conf" installManPage documentation/nikto.1 - install -Dm 644 program/docs/nikto_manual.html "$out/share/doc/${pname}/manual.html" install -Dm 644 README.md "$out/share/doc/${pname}/README" runHook postInstall ''; @@ -58,6 +59,7 @@ stdenv.mkDerivation rec { description = "Web server scanner"; license = licenses.gpl2Plus; homepage = "https://cirt.net/Nikto2"; + changelog = "https://github.com/sullo/nikto/releases/tag/${version}"; maintainers = with maintainers; [ shamilton ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/nikto/NIKTODIR-nix-wrapper-fix.patch b/pkgs/tools/networking/nikto/nix-wrapper-fix.patch index d3caea1b26fdd..bc05d774577e7 100644 --- a/pkgs/tools/networking/nikto/NIKTODIR-nix-wrapper-fix.patch +++ b/pkgs/tools/networking/nikto/nix-wrapper-fix.patch @@ -1,26 +1,26 @@ -diff --color -ur a/program/nikto.pl b/program/nikto.pl ---- a/program/nikto.pl 2021-01-30 12:05:54.915072538 +0100 -+++ b/program/nikto.pl 2021-01-30 12:36:42.877729231 +0100 -@@ -223,7 +223,8 @@ +diff --git a/program/nikto.pl b/program/nikto.pl +index 2cb07f9..323e666 100755 +--- a/program/nikto.pl ++++ b/program/nikto.pl +@@ -243,7 +243,7 @@ sub config_init { # Guess Nikto current directory my $NIKTODIR = abs_path($0); chomp($NIKTODIR); - $NIKTODIR =~ s#[\\/]nikto.pl$##; + $NIKTODIR =~ s#[\\/]bin[\\/]\.nikto-wrapped$##; -+ # Guess user's home directory -- to support Windows foreach my $var (split(/ /, "HOME USERPROFILE")) { -@@ -231,10 +232,10 @@ +@@ -251,10 +251,10 @@ sub config_init { } # Read the conf files in order (previous values are over-written with each, if multiple found) -- push(@CF,"$NIKTODIR/nikto.conf.default"); +- push(@CF, "$NIKTODIR/nikto.conf.default"); + push(@CF,"$NIKTODIR/etc/nikto.conf.default"); - push(@CF,"/etc/nikto.conf"); - push(@CF,"$home/nikto.conf"); -- push(@CF,"$NIKTODIR/nikto.conf"); + push(@CF, "/etc/nikto.conf"); + push(@CF, "$home/nikto.conf"); +- push(@CF, "$NIKTODIR/nikto.conf"); + push(@CF,"$NIKTODIR/etc/nikto.conf"); - push(@CF,"nikto.conf"); - push(@CF,"$VARIABLES{'configfile'}"); + push(@CF, "nikto.conf"); + push(@CF, "$VARIABLES{'configfile'}"); diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index fe0bbf374635d..8b8d8dd60ecab 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -12,7 +12,7 @@ let pname = "ockam"; - version = "0.105.0"; + version = "0.114.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - sha256 = "sha256-YS98elkf1iIslC1dAf+Os2VoA0pmHmkQN0//PtBRBcM="; + sha256 = "sha256-oR5SzLPJ4I87bMyHTwd+Vjm7pR+modBGIEqls9s6hVI="; }; - cargoHash = "sha256-aW+Pc2C7vohUAByrzBiOaJlBPfSLAv0FrOxRiB1AM9k="; + cargoHash = "sha256-m86NT3O1PbTWxc0Q5pqkLECHHKtF4w8Vl5eDpvxjDHs="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/networking/octodns/default.nix b/pkgs/tools/networking/octodns/default.nix new file mode 100644 index 0000000000000..56226c29d0e9f --- /dev/null +++ b/pkgs/tools/networking/octodns/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, wheel +, pytestCheckHook +, dnspython +, fqdn +, idna +, natsort +, python-dateutil +, pyyaml +, python +, runCommand +}: + +buildPythonPackage rec { + pname = "octodns"; + version = "1.4.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns"; + rev = "v${version}"; + hash = "sha256-l4JGodbUmFxHFeEaxgClEozHcbyYP0F2yj5gDqV88IA="; + }; + + nativeBuildInputs = [ + setuptools + wheel + pytestCheckHook + ]; + + propagatedBuildInputs = [ + dnspython + fqdn + idna + natsort + python-dateutil + pyyaml + ]; + + pythonImportsCheck = [ "octodns" ]; + + passthru.withProviders = ps: let + pyEnv = python.withPackages ps; + in runCommand "octodns-with-providers" { } '' + mkdir -p $out/bin + ln -st $out/bin ${pyEnv}/bin/octodns-* + ''; + + meta = with lib; { + description = "Tools for managing DNS across multiple providers"; + homepage = "https://github.com/octodns/octodns"; + changelog = "https://github.com/octodns/octodns/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/pkgs/tools/networking/octodns/providers/bind/default.nix b/pkgs/tools/networking/octodns/providers/bind/default.nix new file mode 100644 index 0000000000000..46631ebd8e155 --- /dev/null +++ b/pkgs/tools/networking/octodns/providers/bind/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, octodns +, pytestCheckHook +, pythonOlder +, dnspython +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "octodns-bind"; + version = "0.0.5"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-bind"; + rev = "v${version}"; + hash = "sha256-0ia/xYarrOiLZa8KU0s5wtCGtXIyxSl6OcwNkSJb/rA="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + octodns + dnspython + ]; + + env.OCTODNS_RELEASE = 1; + + pythonImportsCheck = [ "octodns_bind" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = " RFC compliant (Bind9) provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-bind"; + changelog = "https://github.com/octodns/octodns-bind/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/pkgs/tools/networking/octodns/providers/hetzner/default.nix b/pkgs/tools/networking/octodns/providers/hetzner/default.nix new file mode 100644 index 0000000000000..eb0903964b71c --- /dev/null +++ b/pkgs/tools/networking/octodns/providers/hetzner/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, octodns +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "octodns-hetzner"; + # the latest release tag is over a year behind. + version = "0.0.2-unstable-2023-09-29"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-hetzner"; + rev = "620840593a520dac9e365240b3ab361ded309c8e"; + hash = "sha256-WdYy8tc0+PYsKuyp3uqOzbxwhLSZ+06L3JVaTSATEKM="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + octodns + requests + ]; + + pythonImportsCheck = [ "octodns_hetzner" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + meta = with lib; { + description = "Hetzner DNS provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-hetzner/"; + changelog = "https://github.com/octodns/octodns-hetzner/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/pkgs/tools/networking/octodns/providers/powerdns/default.nix new file mode 100644 index 0000000000000..68ddc56112b25 --- /dev/null +++ b/pkgs/tools/networking/octodns/providers/powerdns/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, octodns +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "octodns-powerdns"; + version = "0.0.5"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-powerdns"; + rev = "v${version}"; + hash = "sha256-jt0+JnpCgvsoqMcC9mANX7uq2WPTiI2JQjwQi7LGWj0="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + octodns + requests + ]; + + env.OCTODNS_RELEASE = 1; + + pythonImportsCheck = [ "octodns_powerdns" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + meta = with lib; { + description = "PowerDNS API provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-powerdns/"; + changelog = "https://github.com/octodns/octodns-powerdns/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 4872900b0fb72..b52912d5e9a08 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "ofono"; - version = "2.1"; + version = "2.2"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; - sha256 = "sha256-GxQfh/ps5oM9G6B1EVgnjo8LqHD1hMqdnju1PCQq3kA="; + sha256 = "sha256-mnh0qzmgPDfimN/M33HntYj90Xcgc/uF8tKbzeQV1Yg="; }; patches = [ diff --git a/pkgs/tools/networking/onetun/default.nix b/pkgs/tools/networking/onetun/default.nix index 46b040f513ead..5200cff7076f7 100644 --- a/pkgs/tools/networking/onetun/default.nix +++ b/pkgs/tools/networking/onetun/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "onetun"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "aramperes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-svf30eFldfbhi8L44linHccGApYFuEWZOjzyqM+tjw4="; + sha256 = "sha256-GVIRCMeuuhUA8lqQ1oI/Xcuf90QIlwhqYeU+HhbGWXQ="; }; - cargoHash = "sha256-KcixaVNZEpGeMg/sh3dua3D7vqzlBvf+Zh3MKk6LJac="; + cargoHash = "sha256-TRfr4riMzR/MbsV2RiQNlPoPLhHK5EScNBCeyyamfgE="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index b677b1d1ca01f..c7f00061382d5 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.19.1"; + version = "3.20.1"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-sYIp5zl49waERfTYPfNjbyzep7p4sRlweDVcuTtWB28="; + hash = "sha256-XjIrae4HPFB1Rv8yIAUh6Xj9UVU55Wx7SuyKJ0BvmXY="; }; - vendorHash = "sha256-6RyK0oy9Lcuh2TXpQqAqmrA+bS9hug6+il7L1z+kYvs="; + vendorHash = "sha256-HYU+oS+iqdl2jQJc3h9T+MSc/Hq2W6UqP+oPSEyfcOU="; subPackages = [ "cmd/ooniprobe" ]; diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index bf645edec391c..5bae2050fbfca 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -13,7 +13,6 @@ # package without splicing See: https://github.com/NixOS/nixpkgs/pull/107606 , pkgs , fetchurl -, fetchpatch , autoreconfHook , zlib , openssl diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index d701ac7b4ae8a..e13e9cb927315 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -5,15 +5,15 @@ in { openssh = common rec { pname = "openssh"; - version = "9.5p1"; + version = "9.6p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-8Cbnt5un+1QPdRgq+W3IqPHbOV+SK7yfbKYDZyaGCGs="; + hash = "sha256-kQIRwHJVqMWtZUORtA7lmABxDdgRndU2LeCThap6d3w="; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; - extraMeta.maintainers = with lib.maintainers; [ das_j ]; + extraMeta.maintainers = lib.teams.helsinki-systems.members; }; openssh_hpn = common rec { diff --git a/pkgs/tools/networking/openvpn/auth-ldap-fix-conftest.patch b/pkgs/tools/networking/openvpn/auth-ldap-fix-conftest.patch new file mode 100644 index 0000000000000..c571fda5d3c19 --- /dev/null +++ b/pkgs/tools/networking/openvpn/auth-ldap-fix-conftest.patch @@ -0,0 +1,36 @@ +diff --git a/aclocal.m4 b/aclocal.m4 +index e5b7dbf..01cecf1 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -73,6 +73,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + AC_LANG_PROGRAM([ + #include <objc/objc.h> + #include <objc/Object.h> ++ #include <stdio.h> + ], [ + Object *obj = @<:@Object alloc@:>@; + puts(@<:@obj name@:>@); +@@ -94,6 +95,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + AC_LANG_PROGRAM([ + #include <objc/objc.h> + #include <objc/Object.h> ++ #include <stdio.h> + ], [ + Object *obj = @<:@Object alloc@:>@; + puts(@<:@obj name@:>@); +@@ -131,6 +133,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + AC_LANG_PROGRAM([ + #include <objc/objc.h> + #include <objc/objc-api.h> ++ #include <stdio.h> + ], [ + id class = objc_lookUpClass("Object"); + id obj = @<:@class alloc@:>@; +@@ -162,6 +165,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + #else + #include <objc/objc-api.h> + #endif ++ #include <stdio.h> + ], [ + #ifdef __GNU_LIBOBJC_ + Class class = objc_lookUpClass("Object"); diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 87cbd6881e27b..6aedcbbcbb3ee 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -3,6 +3,9 @@ , fetchurl , pkg-config , iproute2 +, libcap_ng +, libnl +, lz4 , lzo , openssl , pam @@ -11,12 +14,13 @@ , update-systemd-resolved , pkcs11Support ? false , pkcs11helper +, nixosTests }: let inherit (lib) versionOlder optional optionals optionalString; - generic = { version, sha256, extraBuildInputs ? [] }: + generic = { version, sha256, extraBuildInputs ? [ ] }: let withIpRoute = stdenv.isLinux && (versionOlder version "2.5.4"); in @@ -32,8 +36,8 @@ let nativeBuildInputs = [ pkg-config ]; - buildInputs = [ lzo ] - ++ optional stdenv.isLinux pam + buildInputs = [ lz4 lzo ] + ++ optionals stdenv.isLinux [ libcap_ng libnl pam ] ++ optional withIpRoute iproute2 ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper @@ -72,9 +76,14 @@ let in { - openvpn = generic { - version = "2.5.8"; - sha256 = "1cixqm4gn2d1v8qkbww75j30fzvxz13gc7whcmz54i0x4fvibwx6"; + openvpn = (generic { + version = "2.6.8"; + sha256 = "sha256-Xt4VZcim2IAQD38jUxen7p7qg9UFLbVUfxOp52r3gF0="; extraBuildInputs = [ openssl ]; - }; + }).overrideAttrs + (_: { + passthru.tests = { + inherit (nixosTests) initrd-network-openvpn systemd-initrd-networkd-openvpn; + }; + }); } diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix index 70dacddafc373..df93dacb47110 100644 --- a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { sha256 = "1j30sygj8nm8wjqxzpb7pfzr3dxqxggswzxd7z5yk7y04c0yp1hb"; }; + patches = [ + ./auth-ldap-fix-conftest.patch + ]; + nativeBuildInputs = [ autoreconfHook gnustep.base diff --git a/pkgs/tools/networking/photon/destdir.patch b/pkgs/tools/networking/photon/destdir.patch deleted file mode 100644 index e6cf997f2e7c4..0000000000000 --- a/pkgs/tools/networking/photon/destdir.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/photon.py.old b/photon.py -index 92498e4..f7e2c3d 100644 ---- a/photon.py.old -+++ b/photon.py -@@ -185,7 +185,7 @@ if args.user_agent: - user_agents = args.user_agent.split(',') - else: - user_agents = [] -- with open(os.getcwd() + '/core/user-agents.txt', 'r') as uas: -+ with open('DESTDIR/core/user-agents.txt', 'r') as uas: - for agent in uas: - user_agents.append(agent.strip('\n')) - -@@ -534,4 +534,4 @@ if args.export: - if not colors: # if colors are disabled - print ('%s Results saved in %s directory' % (good, output_dir)) - else: -- print ('%s Results saved in \033[;1m%s\033[0m directory' % (good, output_dir)) -\ No newline at end of file -+ print ('%s Results saved in \033[;1m%s\033[0m directory' % (good, output_dir)) diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index b997aad0c2d60..2c1799387df85 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libsodium }: +{ lib, stdenv, fetchFromGitHub, libsodium, nixosTests }: stdenv.mkDerivation { pname = "quicktun"; @@ -22,11 +22,13 @@ stdenv.mkDerivation { install -vD out/quicktun* -t $out/bin ''; + passthru.tests.quicktun = nixosTests.quicktun; + meta = with lib; { broken = stdenv.isDarwin; description = "Very simple, yet secure VPN software"; homepage = "http://wiki.ucis.nl/QuickTun"; - maintainers = [ ]; + maintainers = with maintainers; [ h7x4 ]; platforms = platforms.unix; license = licenses.bsd2; }; diff --git a/pkgs/tools/networking/rabtap/default.nix b/pkgs/tools/networking/rabtap/default.nix index 06aacddbcf6bd..2e9fff0dd1e92 100644 --- a/pkgs/tools/networking/rabtap/default.nix +++ b/pkgs/tools/networking/rabtap/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rabtap"; - version = "1.39.0"; + version = "1.39.1"; src = fetchFromGitHub { owner = "jandelgado"; repo = "rabtap"; rev = "v${version}"; - sha256 = "sha256-/inclOpKYlEGSEH390+GtRiHXotaH+VxqWVAWSf61Xs="; + sha256 = "sha256-R0OZNmOgklhiljsYTVoqpbMMMaPHICC/qVJNUgkUsfU="; }; vendorHash = "sha256-BrpDafEFDrH243zDHY9EtkVjPvwrmbJVu5TQMHHOWfA="; diff --git a/pkgs/tools/networking/ratman/default.nix b/pkgs/tools/networking/ratman/default.nix index ce017731bd4af..a78840095d880 100644 --- a/pkgs/tools/networking/ratman/default.nix +++ b/pkgs/tools/networking/ratman/default.nix @@ -6,7 +6,7 @@ , protobuf , rustPlatform , fetchYarnDeps -, fixup_yarn_lock +, prefetch-yarn-deps , stdenv , yarn , nodejs @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pWjKL41r/bTvWv+5qCgCFVL9+o64BiV2/ISdLeKEOqE="; }; - nativeBuildInputs = [ yarn nodejs ]; + nativeBuildInputs = [ yarn nodejs prefetch-yarn-deps ]; outputs = [ "out" "dist" ]; @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { yarn config --offline set yarn-offline-mirror ${yarnDeps} # Fixup "resolved"-entries in yarn.lock to match our offline cache - ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive diff --git a/pkgs/tools/networking/requestly/default.nix b/pkgs/tools/networking/requestly/default.nix index b23336e6d0e97..e833b0a7e7f14 100644 --- a/pkgs/tools/networking/requestly/default.nix +++ b/pkgs/tools/networking/requestly/default.nix @@ -5,11 +5,11 @@ let pname = "requestly"; - version = "1.5.13"; + version = "1.5.15"; src = fetchurl { url = "https://github.com/requestly/requestly-desktop-app/releases/download/v${version}/Requestly-${version}.AppImage"; - hash = "sha256-DSOZBVBjIYO8BG3o7AUsH7h2KvSPlp9Lj9d3OwvBhfQ="; + hash = "sha256-GTc4VikXsyiEfgN6oY/YQPBqNLia4cFz1aYS65+SboI="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/tools/networking/restish/default.nix b/pkgs/tools/networking/restish/default.nix index 303d88b235f2b..807b8e4a9bdf7 100644 --- a/pkgs/tools/networking/restish/default.nix +++ b/pkgs/tools/networking/restish/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "restish"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "danielgtaylor"; repo = "restish"; rev = "refs/tags/v${version}"; - hash = "sha256-zAWlbfZywL8jepgmXBM5lacRv1N/+dBd+9vIavWAyNs="; + hash = "sha256-a0ObgFgWEsLYjGmCCi/py2PADAWJ0By+AZ4wh+Yeam4="; }; - vendorHash = "sha256-sUBqeLhpWUu1NfAmFQCKFHm8DQaB8LYRrFexvuF8vC8="; + vendorHash = "sha256-qeArar0WnMACUnKBlC+PcFeJPzofwbK440A4M/rQ04U="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index d75a49f6c9e6e..5ba7917de049f 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.7.1"; + version = "1.7.6"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-5n5AnuJQvw/26X3UWdLvegFhwYzjtS7o0d4cN3c3bfQ="; + hash = "sha256-ZrZ2mqf1/D4L+1SlTx3rwkmk9+RcqH/yuMZie6jtpmc="; }; - vendorHash = "sha256-UvLZY4vMS6dI6z9kPcSzbB/cW/7rfbrlhcWh51q5sak="; + vendorHash = "sha256-nIVm2+F+5rXTiode240zZXxIAQA4VkNynYnmdvSwEHw="; tags = [ "with_quic" diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index c4d26ae53d962..137e2f3087c00 100644 --- a/pkgs/tools/networking/snowflake/default.nix +++ b/pkgs/tools/networking/snowflake/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "snowflake"; - version = "2.7.0"; + version = "2.8.1"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "anti-censorship/pluggable-transports"; repo = "snowflake"; rev = "v${version}"; - sha256 = "sha256-vurNOJuu9bKmyLM3Agr8wHwMybLrtrJFSrlrc+lWiWQ="; + sha256 = "sha256-DSXzw/7aBfh4uqLV2JrbrLitNgXcgEdcwxyIMolGEsE="; }; - vendorHash = "sha256-Bjd3HIVEQgrcBffcZPQhQygN/ZOPWTbN9oimmX4B1oQ="; + vendorHash = "sha256-+f7gxswHCzBT5wqJNYdR1/uDZJNpEyHMWchA4X0aK+M="; meta = with lib; { description = "System to defeat internet censorship"; diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/tools/networking/speedtest-go/default.nix index f258a207db16d..39c92fcb40d18 100644 --- a/pkgs/tools/networking/speedtest-go/default.nix +++ b/pkgs/tools/networking/speedtest-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "speedtest-go"; - version = "1.6.9"; + version = "1.6.10"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VaaUFUkPXAMzT+wyLOrOw85sgJzWCYx5k6oTfRcIHuU="; + hash = "sha256-Uk7ZKGxyK4b7P87qN7rGgj4oXJgYhH4NzZa+4fOkh14="; }; vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 64c01b0ffe4f4..a2094802712cf 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "strongswan"; - version = "5.9.11"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading! + version = "5.9.12"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading! src = fetchFromGitHub { owner = "strongswan"; repo = "strongswan"; rev = version; - hash = "sha256-DjVmDUEEJnf5kaia1f+Yow9g4+l3itOmoXR8/vVSssU="; + hash = "sha256-0s6I+ukA5XFAC0aJFKl9hjHDml2gMzXDn977EDxsZZ4="; }; dontPatchELF = true; diff --git a/pkgs/tools/networking/subnetcalc/default.nix b/pkgs/tools/networking/subnetcalc/default.nix index b5aa064f73909..e2d74a586d81a 100644 --- a/pkgs/tools/networking/subnetcalc/default.nix +++ b/pkgs/tools/networking/subnetcalc/default.nix @@ -1,20 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "subnetcalc"; - version = "2.4.22"; + version = "2.4.23"; src = fetchFromGitHub { owner = "dreibh"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-5sDEMS4RgHdGQZAT2MVF/Ls0KXwdKzX+05uQpHhCZn8="; + repo = "subnetcalc"; + rev = "subnetcalc-${finalAttrs.version}"; + hash = "sha256-uX/roOWjeuuuEFpBbF+hEPDOo0RTR79WpyNvr9U7wR4="; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; - meta = with lib; { + meta = { description = "SubNetCalc is an IPv4/IPv6 subnet address calculator"; + homepage = "https://www.uni-due.de/~be0001/subnetcalc/"; + license = lib.licenses.gpl3Plus; longDescription = '' SubNetCalc is an IPv4/IPv6 subnet address calculator. For given IPv4 or IPv6 address and netmask or prefix length, it calculates network address, @@ -23,9 +33,8 @@ stdenv.mkDerivation rec { Furthermore, it prints useful information on specific address types (e.g. type, scope, interface ID, etc.). ''; - homepage = "https://www.uni-due.de/~be0001/subnetcalc/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ atila ]; - platforms = platforms.unix; + mainProgram = "subnetcalc"; + maintainers = with lib.maintainers; [ atila ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 8b6db1044b64c..996466901201d 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libpcap, perl }: +{ lib, stdenv, fetchurl, libpcap, pkg-config, perl }: stdenv.mkDerivation rec { pname = "tcpdump"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { patchShebangs tests ''; + nativeBuildInputs = lib.optional (stdenv.hostPlatform.isStatic) [ pkg-config ]; + nativeCheckInputs = [ perl ]; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index 8778b90b2b026..855c559448a21 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.all; maintainers = [ maintainers.carlosdagos ]; + mainProgram = "tinyproxy"; }; } diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 33bb443e3710a..dce1fc5320469 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -37,8 +37,11 @@ stdenv.mkDerivation rec { "--with-libpcap=yes" ]; - PCAPLIB="-lpcap"; - LUA_LIB="-llua"; + env = { + CXXFLAGS = "-std=c++14"; + LUA_LIB = "-llua"; + PCAPLIB = "-lpcap"; + }; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index c0171ea5880d9..90e53b184a56c 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "traceroute"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz"; - sha256 = "sha256-BevHq6KKkQD5u65Uzuy/dcgsz0a9/Oi11kgGRZp+BBI="; + sha256 = "sha256-nGwmDZbqq1HjzkYbCoT+hxI+vG3WyaWfq4A/lbNahZ4="; }; makeFlags = [ diff --git a/pkgs/tools/networking/trippy/default.nix b/pkgs/tools/networking/trippy/default.nix index 9b88ee4b799d1..933150aebb9fe 100644 --- a/pkgs/tools/networking/trippy/default.nix +++ b/pkgs/tools/networking/trippy/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "trippy"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "fujiapple852"; repo = "trippy"; rev = version; - hash = "sha256-2bh4wNP8sQcojjjbx5DQctlkwCTYcPdSkpW4OCOyp9k="; + hash = "sha256-Q5WPpCm1RNLlNX8G1U160O2wJz+y+KMScApjx6gIBCg="; }; - cargoHash = "sha256-C8SUceX9RwUyiCknmuRfBqG0vjesS54bZQHwi7krwKo="; + cargoHash = "sha256-brvfAZZ3L0loZQowcRfkS7o7ZYQB9hr5o1rgMSWaljU="; meta = with lib; { description = "A network diagnostic tool"; diff --git a/pkgs/tools/networking/tun2socks/default.nix b/pkgs/tools/networking/tun2socks/default.nix index a1336a257fcb7..9296b0df0068e 100644 --- a/pkgs/tools/networking/tun2socks/default.nix +++ b/pkgs/tools/networking/tun2socks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tun2socks"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "xjasonlyu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qRjVZF15CjFohv9PQO0bLAjS8ip//S7yncXOn9oS2XM="; + sha256 = "sha256-siAengVJXusQ5o9cTaADeRn5eW4IoCHkMMf6Bx8iWws="; }; vendorHash = "sha256-zeiOcn33PnyoseYb0wynkn7MfGp3rHEYBStY98C6aR8="; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index a1a908340003b..d71353658e56e 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -47,24 +47,15 @@ , gnutls }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unbound"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; - hash = "sha256-PalUkKhc/2Qg8m+uC4Skn1ES3xvxt/w0+HJPAggstxI="; + url = "https://nlnetlabs.nl/downloads/unbound/unbound-${finalAttrs.version}.tar.gz"; + hash = "sha256-qXUyRohUxhwt5IykFw3oVP07yVyAQ7sM+w/iZgWWZiQ="; }; - patches = [ - # Backport: fix libunbound with nettle. - (fetchpatch { - url = "https://github.com/NLnetLabs/unbound/commit/654a7eab62cbd1844d483cc4a0f2cf2fbcbaf00a.patch"; - excludes = [ "doc/Changelog" ]; - hash = "sha256-n3FCeZESFrrn6Wcf28Hb8WZs1eMHWjbsf2WCFOXU3lI="; - }) - ]; - outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB nativeBuildInputs = [ makeWrapper pkg-config ] @@ -157,7 +148,7 @@ stdenv.mkDerivation rec { + ''substituteInPlace "$lib/lib/libunbound.la" '' + lib.concatMapStrings (pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") - (builtins.filter (p: p != null) buildInputs); + (builtins.filter (p: p != null) finalAttrs.buildInputs); passthru.tests = { inherit gnutls; @@ -169,7 +160,7 @@ stdenv.mkDerivation rec { description = "Validating, recursive, and caching DNS resolver"; license = licenses.bsd3; homepage = "https://www.unbound.net"; - maintainers = with maintainers; [ ajs124 ]; + maintainers = lib.teams.helsinki-systems.members; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 7e9bcc1a70caf..3416b33281d3a 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { hash = "sha256-PfXrj4d2SHmatiPPFxjsxvhusML1HTRNjoYEQtzFzW8="; }; + # code predates c99 + env.CFLAGS = "-std=c89"; + preInstall = '' mkdir -p $out/man/man1 $out/bin ''; diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index 6d810aaee62e5..bb317055dc041 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "xray"; - version = "1.8.4"; + version = "1.8.6"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - hash = "sha256-Hu0BP4BzoELRjJ8WdF3JS/ffxd3bpH+kauWqaMh/o1I="; + hash = "sha256-M1iu/93eOBIk9VxYKNJm/TPx9G35yO5SpcQm/lAJ1Q8="; }; - vendorHash = "sha256-ihTOKtppOTYdulzwIwD8oWaS2OPs+QCdqPTvqucw7xY="; + vendorHash = "sha256-zLnYjZmrsWd/WwtkkLiA8Eoh7aDJz+TsvK0yvIrSr8c="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 7b49b4a26b973..74fb313d9fc7d 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchzip }: +{ lib +, stdenv +, fetchzip +}: let inherit (stdenv.hostPlatform) system; @@ -10,20 +13,20 @@ let armv7l-linux = "linux_armv7"; }.${system} or throwSystem; - sha256 = { - x86_64-linux = "sha256-6oYZY1Ry4U/nR99DNsr7ZqTd/AAot+yrOHY75UXEuWY="; - aarch64-linux = "sha256-/XAv/ptvUsWLF/iIOiqm/PoCLhVTL3Cnmd0YdqLBthk="; - armv7l-linux = "sha256-CbtzY2q7HnqCcolTFyTphWbHN/VdSt/rs8q3tjHHNqc="; + hash = { + x86_64-linux = "sha256-vAX7vx13eHyPuDe4q5b8dQD90l5bbnncMGlXnegumxM="; + aarch64-linux = "sha256-6x/E0uAPFOsuoJ/ePLV483M07Rqj5pkcpETOVq9RXKU="; + armv7l-linux = "sha256-UlpqoKfjyGLNKvSrXqqsiiq/wTlfmBmPfynDoFT/nuQ="; }.${system} or throwSystem; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zrok"; - version = "0.4.15"; + version = "0.4.18"; src = fetchzip { - url = "https://github.com/openziti/zrok/releases/download/v${version}/zrok_${version}_${plat}.tar.gz"; + url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; stripRoot = false; - inherit sha256; + inherit hash; }; updateScript = ./update.sh; @@ -31,19 +34,23 @@ stdenv.mkDerivation rec { installPhase = let interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; in '' + runHook preInstall + mkdir -p $out/bin cp zrok $out/bin/ chmod +x $out/bin/zrok patchelf --set-interpreter "${interpreter}" "$out/bin/zrok" + + runHook postInstall ''; meta = { description = "Geo-scale, next-generation sharing platform built on top of OpenZiti"; homepage = "https://zrok.io"; + license = lib.licenses.asl20; + mainProgram = "zrok"; maintainers = [ lib.maintainers.bandresen ]; platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.asl20; }; - -} +}) diff --git a/pkgs/tools/nix/fh/default.nix b/pkgs/tools/nix/fh/default.nix index 3ffeeaf230339..16df9471e6940 100644 --- a/pkgs/tools/nix/fh/default.nix +++ b/pkgs/tools/nix/fh/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fh"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "fh"; rev = "v${version}"; - hash = "sha256-O0WcLEtbb5m3RA3LyWbD++fFt0Bk/pP16yhxRb+cGkM="; + hash = "sha256-G2bLYand61E/s652Q+5XSfXdM6XUWixiXRRMd3HvfM4="; }; - cargoHash = "sha256-cGBYDwrw4NsbtE5bhETQ+YuBXMy1i7vNQaoTiuHYBXQ="; + cargoHash = "sha256-c3XxJQf2uHvj1X/djKyQg2AtrXdROyIVwLeYxFgHDNI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 183e7f019e628..e757e79f46847 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-g1PBPpvK3kg0bJEDXsifVgcl3+v54q08Ae3nZ4cJ+Xs="; + sha256 = "sha256-0cyKI8KHFsMXYca3hzbqxmBpxGdhl4/i183kfUQr8pg="; }; - cargoHash = "sha256-E5SJfwGfy1DcLC0cF/5FTbVEJs/WYb2KO+OdOo2fgQk="; + cargoHash = "sha256-9dqjNExxLDgVsu14yDQOJP1qxKy2ACiUH+pbX77iT70="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; diff --git a/pkgs/tools/nix/nixpkgs-hammering/default.nix b/pkgs/tools/nix/nixpkgs-hammering/default.nix index 3ce8bd1fc23e2..b5f1e51dd232c 100644 --- a/pkgs/tools/nix/nixpkgs-hammering/default.nix +++ b/pkgs/tools/nix/nixpkgs-hammering/default.nix @@ -8,13 +8,13 @@ }: let - version = "unstable-2023-03-09"; + version = "unstable-2023-11-06"; src = fetchFromGitHub { owner = "jtojnar"; repo = "nixpkgs-hammering"; - rev = "243b81c687aac33d6716957c0cd2235c81631044"; - hash = "sha256-a57Ux6W2EvJBEHL6Op9Pz6Tvw/LRRk7uCMRvneXggEo="; + rev = "8e33fc1e7b3b311ce3ba9c5c8c9e7cf89041b893"; + hash = "sha256-D9c6EZMHy0aldzMxj4Ivw1YXNuG6MzyoEQlehEcxMBI="; }; meta = with lib; { @@ -28,7 +28,7 @@ let pname = "nixpkgs-hammering-rust-checks"; inherit version src meta; sourceRoot = "${src.name}/rust-checks"; - cargoHash = "sha256-MFYMP6eQS0wJbHmTRKaKajSborzaW6dEfshtAZcP+xs="; + cargoHash = "sha256-GIheha/AYH0uD61ck6TcpDz1gh1o5UxL/ojeZ/kHI8E="; }; in @@ -60,4 +60,3 @@ stdenv.mkDerivation { mainProgram = "nixpkgs-hammer"; }; } - diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix index 20f77dbfe442e..7482679210757 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/tools/package-management/apx/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "apx"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "Vanilla-OS"; repo = pname; rev = "v${version}"; - hash = "sha256-3CelqEntpfld0n+Ewg7NCkowVjgCf5b6StfSkYbgV5k="; + hash = "sha256-TXGfJHe4dOOpP7iJFbjL5WnqcxHeOn5naKjnBQ3c5dE="; }; vendorHash = null; @@ -21,7 +21,7 @@ buildGoModule rec { postPatch = '' substituteInPlace config/apx.json \ - --replace "/usr/share/apx/distrobox" "${distrobox}/bin/distrobox" \ + --replace "/usr/share/apx/distrobox/distrobox" "${distrobox}/bin/distrobox" \ --replace "/usr/share/apx" "$out/bin/apx" substituteInPlace settings/config.go \ --replace "/usr/share/apx/" "$out/share/apx/" diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index f9a44a8a70b5a..41e7fe04480e6 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.8"; + version = "5.1.9"; outputs = [ "out" "man" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-1g3g+6EborZd2ppPMZcy0Wjv07zetATHb/sCkuZz5UM="; + hash = "sha256-H8zbxNsGkuKIDPwGWfKJEy5gTo2Mm13VKwce+h9NEro="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/harmonia/default.nix b/pkgs/tools/package-management/harmonia/default.nix index fd1ce1063245b..9830570a07fde 100644 --- a/pkgs/tools/package-management/harmonia/default.nix +++ b/pkgs/tools/package-management/harmonia/default.nix @@ -2,36 +2,42 @@ , boost , fetchFromGitHub , libsodium -, nix +, nixVersions , pkg-config , rustPlatform +, stdenv , nix-update-script , nixosTests }: rustPlatform.buildRustPackage rec { pname = "harmonia"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-XtnK54HvZMKZGSCrVD0FO5PQLMo3Vkj8ezUlsfqStq0="; + hash = "sha256-72JMrXmxw/FuGjqXXxMIGiAbUUOqXEERdQwch+s3iwU="; }; - cargoHash = "sha256-oQVHrfNPhslYk6APB/bhW+h+vk/gNTW/ZypoGGb5zPk="; + cargoHash = "sha256-Q5Y5v7mmJpfZFGRgurTcRBRtbApFRrwqOBHdZTJbyzc="; nativeBuildInputs = [ - pkg-config nix + pkg-config nixVersions.nix_2_19 ]; buildInputs = [ boost libsodium - nix + nixVersions.nix_2_19 ]; + # Workaround for https://github.com/NixOS/nixpkgs/issues/166205 + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + passthru = { updateScript = nix-update-script { extraArgs = [ "--version-regex" "harmonia-v(.*)" ]; diff --git a/pkgs/tools/package-management/libcomps/default.nix b/pkgs/tools/package-management/libcomps/default.nix new file mode 100644 index 0000000000000..89c2982497df4 --- /dev/null +++ b/pkgs/tools/package-management/libcomps/default.nix @@ -0,0 +1,65 @@ +{ lib +, check +, cmake +, doxygen +, expat +, fetchFromGitHub +, libxml2 +, python +, sphinx +, stdenv +, zlib +}: + +stdenv.mkDerivation rec { + pname = "libcomps"; + version = "0.1.20"; + + outputs = [ "out" "dev" "py" ]; + + src = fetchFromGitHub { + owner = "rpm-software-management"; + repo = "libcomps"; + rev = version; + hash = "sha256-IX4du1+G7lwWrGnllydnBDap2aqK5pzos1Mdyu4MzOU="; + }; + + patches = [ + ./fix-python-install-dir.patch + ]; + + postPatch = '' + substituteInPlace libcomps/src/python/src/CMakeLists.txt \ + --replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}" + ''; + + nativeBuildInputs = [ + check + cmake + doxygen + python + sphinx + ]; + + buildInputs = [ + expat + libxml2 + zlib + ]; + + dontUseCmakeBuildDir = true; + cmakeDir = "libcomps"; + + postFixup = '' + ls $out/lib + moveToOutput "lib/${python.libPrefix}" "$py" + ''; + + meta = with lib; { + description = "Comps XML file manipulation library"; + homepage = "https://github.com/rpm-software-management/libcomps"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ katexochen ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/package-management/libcomps/fix-python-install-dir.patch b/pkgs/tools/package-management/libcomps/fix-python-install-dir.patch new file mode 100644 index 0000000000000..958b4c80843c5 --- /dev/null +++ b/pkgs/tools/package-management/libcomps/fix-python-install-dir.patch @@ -0,0 +1,13 @@ +diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt +index d22b84e..57bd1c2 100644 +--- a/libcomps/src/python/src/CMakeLists.txt ++++ b/libcomps/src/python/src/CMakeLists.txt +@@ -85,7 +85,7 @@ IF (SKBUILD) + INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps) + INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps) + ELSE () +- EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++ SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@") + + INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps) + #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 739210ce92408..e7ecfc9c94db3 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -15,12 +15,19 @@ , libyaml , rpm , zchunk +, cppunit +, python +, swig +, glib +, sphinx }: stdenv.mkDerivation rec { pname = "libdnf"; version = "0.72.0"; + outputs = [ "out" "dev" "py" ]; + src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; @@ -36,12 +43,16 @@ stdenv.mkDerivation rec { buildInputs = [ check + cppunit openssl json_c libsmartcols libyaml libmodulemd zchunk + python + swig + sphinx ]; propagatedBuildInputs = [ @@ -56,29 +67,38 @@ stdenv.mkDerivation rec { cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake cmake/modules/ ''; - postPatch = '' - # See https://github.com/NixOS/nixpkgs/issues/107428 - substituteInPlace CMakeLists.txt \ - --replace "enable_testing()" "" \ - --replace "add_subdirectory(tests)" "" + patches = [ + ./fix-python-install-dir.patch + ]; + postPatch = '' # https://github.com/rpm-software-management/libdnf/issues/1518 substituteInPlace libdnf/libdnf.pc.in \ --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + substituteInPlace cmake/modules/FindPythonInstDir.cmake \ + --replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}" ''; cmakeFlags = [ "-DWITH_GTKDOC=OFF" "-DWITH_HTML=OFF" - "-DWITH_BINDINGS=OFF" + "-DPYTHON_DESIRED=${lib.head (lib.splitString ["."] python.version)}" ]; + postInstall = '' + rm -r $out/${python.sitePackages}/hawkey/test + ''; + + postFixup = '' + moveToOutput "lib/${python.libPrefix}" "$py" + ''; + meta = with lib; { description = "Package management library"; homepage = "https://github.com/rpm-software-management/libdnf"; changelog = "https://github.com/rpm-software-management/libdnf/releases/tag/${version}"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ rb2k ]; + maintainers = with maintainers; [ rb2k katexochen ]; }; } diff --git a/pkgs/tools/package-management/libdnf/fix-python-install-dir.patch b/pkgs/tools/package-management/libdnf/fix-python-install-dir.patch new file mode 100644 index 0000000000000..d08ec9deec025 --- /dev/null +++ b/pkgs/tools/package-management/libdnf/fix-python-install-dir.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/modules/FindPythonInstDir.cmake b/cmake/modules/FindPythonInstDir.cmake +index ed098ded..2a2e1543 100644 +--- a/cmake/modules/FindPythonInstDir.cmake ++++ b/cmake/modules/FindPythonInstDir.cmake +@@ -1,6 +1 @@ +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " +-from sys import stdout +-from sysconfig import get_path +-path=get_path(name='platlib', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'}) +-stdout.write(path)" +-OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@") diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 182f58ea9da81..5ff23ec7188d6 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "micromamba"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "micromamba-" + version; - hash = "sha256-/9CzcnPd1D8jSl/pfl54+8/728r+GCqWFXahl47MJ3g="; + hash = "sha256-29SuR4RDW0+yNR1RHlm3I4avy0CjBTGxv1FKxMDZxO0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index f61d49f493b6e..0f4782af66891 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.34.0"; + version = "2.35.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-O7qxJ2TE62XDYljqvNsO3ssD/YhfOLfy9zF0W++T0Hw="; + hash = "sha256-ew0iXtOKQIYxpyeNFBHD2F7KflTEQ7qHQMHYaL35Rvw="; }; - vendorHash = "sha256-qihPtpygHoIfGf2wj+klDWwL4sTHqDxi1jxjv57vUx4="; + vendorHash = "sha256-P9jSQG6EyVGMZKtThy8Q7Y/pV7mbMl2eGrylea0VHRc="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index b5cc15704c32d..8a4e523e98b58 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "sha256-H81U0gR/7oWjP1z7JC8tTek+tqzTwyJWgaJQOSyNn5M="; + sha256 = "sha256-yL0oG0NiQ7OdGQ/kZxQbSbNphKapu5HBFNP5E2fVe+Y="; }; doCheck = true; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { RUSTFLAGS = "-Z relro-level=partial"; }; - cargoSha256 = "sha256-yYVDToPLhGUYLrPNyyKwsYXe3QOTR26wtl3SCw4Za5s="; + cargoSha256 = "sha256-4bzLZt45ZLTZyZPZ4Nkvz7mNe4oqOIoaZUbCbNWBKG0="; meta = with lib; { description = "An interactive Nix documentation tool"; diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index defc680968d41..bf2d48e4adfb1 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.18.0"; + version = "2.19.4"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-k/yMWbtMHpiNHeR0ihNPV/idOUSRJuhf0RSCodxmOhc="; + hash = "sha256-97ZqhTMqnAr1rzEy96faceWzFyWexnYbH1aTfc1y0JE="; }; buildInputs = [ boost diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index d61384ec10554..0ea47dd7e17cf 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -182,8 +182,6 @@ self = stdenv.mkDerivation { "--enable-gc" ] ++ lib.optionals (!enableDocumentation) [ "--disable-doc-gen" - ] ++ lib.optionals atLeast214 [ - "CXXFLAGS=-I${lib.getDev rapidcheck}/extras/gtest/include" ] ++ lib.optionals stdenv.isLinux [ "--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox" ] ++ lib.optionals (atLeast210 && stdenv.isLinux && stdenv.hostPlatform.isStatic) [ diff --git a/pkgs/tools/package-management/npm-check-updates/default.nix b/pkgs/tools/package-management/npm-check-updates/default.nix index 93585593a4940..6e01d4415efcc 100644 --- a/pkgs/tools/package-management/npm-check-updates/default.nix +++ b/pkgs/tools/package-management/npm-check-updates/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "npm-check-updates"; - version = "16.13.0"; + version = "16.14.0"; src = fetchFromGitHub { owner = "raineorshine"; repo = "npm-check-updates"; rev = "v${version}"; - hash = "sha256-RrNO1TAPNFB/6JWY8xZjNCZ+FDgM0MCn7vaDXoCSIfI="; + hash = "sha256-X8Mu4Fd650H7eA2nfoefmr4jW974qLBLurmj2H4t7xY="; }; - npmDepsHash = "sha256-aghW4d3/8cJmwpmI5PcHioCnc91Yu4N5EfwuoaB5Xqw="; + npmDepsHash = "sha256-wm7/WlzqfE7DOT0jUTXBivlC9J8dyHa/OVSgi2SdO5w="; meta = { changelog = "https://github.com/raineorshine/npm-check-updates/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index bbadd0d9e5d69..d1390253e63a5 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -19,13 +19,13 @@ let libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "4.08c"; + version = "4.09c"; src = fetchFromGitHub { owner = "AFLplusplus"; repo = "AFLplusplus"; rev = "v${version}"; - sha256 = "sha256-r1elJlvGuVrMFLECYCfMsZVEJcCPYRdkljMbF4uRHQY="; + sha256 = "sha256-SQQJpR3+thi4iyrowkOD878nRHNgBJqqUdRFhtqld4k="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch b/pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch deleted file mode 100644 index 5dfbfd780f1ca..0000000000000 --- a/pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index d6b9dc1..ce7c493 100644 ---- a/Makefile -+++ b/Makefile -@@ -601,7 +601,7 @@ install-localstatedir: - endif - - --install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir -+install: all $(if $(BUILD_DOCS),install-doc) install-datadir - ifneq ($(TOOLS),) - $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) - endif diff --git a/pkgs/tools/security/amoco/default.nix b/pkgs/tools/security/amoco/default.nix index a9c182ca4cbc6..fe16ad9596dd5 100644 --- a/pkgs/tools/security/amoco/default.nix +++ b/pkgs/tools/security/amoco/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { prompt-toolkit pygments # pyside6 - z3 + z3-solver ]; }; diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index 8d198520d2637..47e5ded8581f5 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.10"; + version = "1.1.11"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-/O13n9YPY0RhSnSM9vJzLTXNuXT6iWrPo7S8EnnKIkw="; + sha256 = "sha256-4/qlO+/GY5/U+jEMCuinqAZPyqtBiyaJ4TGkz8JV5AI="; }; - cargoHash = "sha256-LfqieUMWRL+86p0DyitxdfUGVwPtfhcwiwKYMqOZtdc="; + cargoHash = "sha256-NNf2iQyqZvBo6yVJo1Co67ivnILqfynjy5HCQxRJNKM="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index f186c43721f4f..8ea3c543b4ea1 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.12"; + version = "0.6.16"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IIlAsxxEYjR7+wdWExdsQAH0x4yOXZ+bVQWwn7mrhRw="; + hash = "sha256-E/DkCDtnzI6yBEYemlLqxc1r8ZEuX+6jDefaZTRFRek="; }; - vendorHash = "sha256-RcZqnyZtonE4qeu+llL1OPGPG93/Rx8ESWM5wapZ1BM="; + vendorHash = "sha256-TDsY05jnutNIKx0z6/8vGvsgYCIKBkTxh9mXqk4IR38="; ldflags = let PKG = "sigs.k8s.io/aws-iam-authenticator"; in [ "-s" diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index 1f0f2a2bf0cbc..581feb28ce087 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openmp ]; buildFlags = [ (lib.optional (openmp == null) "NO_OPENMP=1") ]; + + # clang builds require at least C99 or the build fails with: + # error: unknown type name 'inline' + env.NIX_CFLAGS_COMPILE = "-std=c99"; + installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/tools/security/bitwarden/cli.nix b/pkgs/tools/security/bitwarden/cli.nix index dd35294ba34a8..b51dd1e9e8c2a 100644 --- a/pkgs/tools/security/bitwarden/cli.nix +++ b/pkgs/tools/security/bitwarden/cli.nix @@ -10,18 +10,18 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2023.10.0"; + version = "2023.12.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ="; + hash = "sha256-WHI1AfliJa1wAbN1Heto28WlM7uX51SSV4YndAZii1Y="; }; nodejs = nodejs_18; - npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o="; + npmDepsHash = "sha256-18OaRCys+HaCZ5/ZLeugqW0jWKSQkfvnBGx8aVAdezQ="; nativeBuildInputs = [ python3 diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index f3c836fd38600..c08da90f59b41 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -3,7 +3,7 @@ , cargo , copyDesktopItems , dbus -, electron_25 +, electron_27 , fetchFromGitHub , fetchpatch2 , glib @@ -25,16 +25,16 @@ let description = "A secure and free password manager for all of your devices"; icon = "bitwarden"; - electron = electron_25; + electron = electron_27; in buildNpmPackage rec { pname = "bitwarden"; - version = "2023.10.1"; + version = "2023.12.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-cwSIMN40d1ySUSxBl8jXLVndnJJvPnLiTxkYnA3Pqws="; + hash = "sha256-WYhLKV3j3Ktite5u1H4fSku38hCCrMzKoxtjq6aT9yo="; }; patches = [ @@ -43,20 +43,22 @@ in buildNpmPackage rec { url = "https://github.com/solopasha/bitwarden_flatpak/raw/daec07b067b9cec5e260b44a53216fc65866ba1d/wayland-clipboard.patch"; hash = "sha256-hcaRa9Nl7MYaTNwmB5Qdm65Mtufv3z+IPwLDPiO3pcw="; }) + # Workaround Electron 25 EOL and 26 has https://github.com/bitwarden/clients/issues/6560 + ./electron-27.patch ]; nodejs = nodejs_18; makeCacheWritable = true; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-KN8C9Y0tfhHVagk+CUMpI/bIRChhzxC9M27HkU4aTEc="; + npmDepsHash = "sha256-QwG+D0M94HN1AyQlmzKeScZyksiUr5A9igEaox9DYN4="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit patches src; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-AmtdmOR3aZJTZiFbkwRXjeTOJdcN40bTmWx4Ss3JNJ8="; + hash = "sha256-pCy3hGhI3mXm4uTOaFMykOzJqK2PC0t0hE8MrJKtA/k="; }; cargoRoot = "apps/desktop/desktop_native"; diff --git a/pkgs/tools/security/bitwarden/electron-27.patch b/pkgs/tools/security/bitwarden/electron-27.patch new file mode 100644 index 0000000000000..5b2af2ce30f41 --- /dev/null +++ b/pkgs/tools/security/bitwarden/electron-27.patch @@ -0,0 +1,69 @@ +From e2c15e826fe9d4d2d12868ef5409e423e3191b58 Mon Sep 17 00:00:00 2001 +From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com> +Date: Fri, 8 Dec 2023 13:07:46 +0100 +Subject: [PATCH] Bump electron to v27.1.3 (#7134) + +Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> + +(cherry picked from commit d76602343f36d8e17a9b0204e0290488456c96d5) +--- + apps/desktop/electron-builder.json | 2 +- + package-lock.json | 8 ++++---- + package.json | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json +index 69d1c0074f..a12870bd96 100644 +--- a/apps/desktop/electron-builder.json ++++ b/apps/desktop/electron-builder.json +@@ -19,7 +19,7 @@ + "**/node_modules/@bitwarden/desktop-native/index.js", + "**/node_modules/@bitwarden/desktop-native/desktop_native.${platform}-${arch}*.node" + ], +- "electronVersion": "25.9.1", ++ "electronVersion": "27.1.3", + "generateUpdatesFilesForAllChannels": true, + "publish": { + "provider": "generic", +diff --git a/package-lock.json b/package-lock.json +index 3f0afde95b..9b7b2dbcd9 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -125,7 +125,7 @@ + "cross-env": "7.0.3", + "css-loader": "6.8.1", + "del": "6.1.1", +- "electron": "25.9.1", ++ "electron": "27.1.3", + "electron-builder": "23.6.0", + "electron-log": "5.0.0", + "electron-reload": "2.0.0-alpha.1", +@@ -20173,9 +20173,9 @@ + } + }, + "node_modules/electron": { +- "version": "25.9.1", +- "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.1.tgz", +- "integrity": "sha512-Uo/Fh7igjoUXA/f90iTATZJesQEArVL1uLA672JefNWTLymdKSZkJKiCciu/Xnd0TS6qvdIOUGuJFSTQnKskXQ==", ++ "version": "27.1.3", ++ "resolved": "https://registry.npmjs.org/electron/-/electron-27.1.3.tgz", ++ "integrity": "sha512-7eD8VMhhlL5J531OOawn00eMthUkX1e3qN5Nqd7eMK8bg5HxQBrn8bdPlvUEnCano9KhrVwaDnGeuzWoDOGpjQ==", + "dev": true, + "hasInstallScript": true, + "dependencies": { +diff --git a/package.json b/package.json +index 9ee884b31d..4a5c3513fd 100644 +--- a/package.json ++++ b/package.json +@@ -88,7 +88,7 @@ + "cross-env": "7.0.3", + "css-loader": "6.8.1", + "del": "6.1.1", +- "electron": "25.9.1", ++ "electron": "27.1.3", + "electron-builder": "23.6.0", + "electron-log": "5.0.0", + "electron-reload": "2.0.0-alpha.1", +-- +2.42.0 + diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index 43220d0ccabc9..a3eb00d3fe45a 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "buttercup-desktop"; - version = "2.21.0"; + version = "2.24.4"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-OFqaxrYk1vyZigr2FN6okMjBdb2SIevENF49ubbHD8c="; + sha256 = "sha256-c5MLj/1OSjGsySCENeJqEhubxl2y7uDhnOBAtLGy92I="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 5006007035eeb..c13ec56c4b6a3 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,22 @@ -{ lib, stdenv, fetchurl, pcsclite, pkg-config, libusb1, perl }: +{ lib +, stdenv +, fetchurl +, flex +, pcsclite +, pkg-config +, libusb1 +, perl +, zlib +, gitUpdater +}: stdenv.mkDerivation rec { pname = "ccid"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-E5NEh+b4tI9pmhbTZ8x6GvejyodN5yGsbpYzvrhuchk="; + hash = "sha256-boMq3Bcuzc/e4rVvMxRGhIgsvpctr/GTjnqcc6ZPiL8="; }; postPatch = '' @@ -14,21 +24,50 @@ stdenv.mkDerivation rec { substituteInPlace src/Makefile.in --replace /bin/echo echo ''; - preConfigure = '' - configureFlagsArray+=("--enable-usbdropdir=$out/pcsc/drivers") - ''; + configureFlags = [ + "--enable-twinserial" + "--enable-serialconfdir=${placeholder "out"}/etc/reader.conf.d" + "--enable-ccidtwindir=${placeholder "out"}/pcsc/drivers/serial" + "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers" + ]; + + # error: call to undeclared function 'InterruptRead'; + # ISO C99 and later do not support implicit function declarations + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + + nativeBuildInputs = [ + flex + pkg-config + perl + ]; - nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ pcsclite libusb1 ]; + buildInputs = [ + pcsclite + libusb1 + zlib + ]; + + postInstall = '' + install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules + substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \ + --replace "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd" + ''; # The resulting shared object ends up outside of the default paths which are # usually getting stripped. stripDebugList = ["pcsc"]; + passthru.updateScript = gitUpdater { + url = "https://salsa.debian.org/rousseau/CCID.git"; + }; + meta = with lib; { - description = "ccid drivers for pcsclite"; + description = "PC/SC driver for USB CCID smart card readers"; homepage = "https://ccid.apdu.fr/"; - license = licenses.gpl2Plus; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.anthonyroussel ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix index ffdd977da4163..4c4a7292ac56a 100644 --- a/pkgs/tools/security/cdxgen/default.nix +++ b/pkgs/tools/security/cdxgen/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "cdxgen"; - version = "6.0.14"; + version = "9.10.1"; src = fetchFromGitHub { owner = "AppThreat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ddeX2EwA2g6wgfsNxf/5ZVsQOHlINGhxif/y6368wCw="; + sha256 = "sha256-FkOWkjf/TXjmSOMSTHvf/MhRtuIPFwGwMt1IUJdvKM0="; }; - npmDepsHash = "sha256-CJ939wT9dKUzMDH2yHKgT056F2AVBevJlS/NhUBjx0E="; + npmDepsHash = "sha256-2DDLogGXT9G8tKJYxVtS7oa5szlaaQTs1kJcgq9GA7k="; dontNpmBuild = true; diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index 440ca40ec68df..080fc8ae3e320 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Gtg4zoMTOW/nrFm7PF4/96VGcMALg2msVZ3E7lGm5KA="; + hash = "sha256-SmD3Dq5LicPRe3lWFsq4zqM/yDZ1LsgRwSUA5/RbN9I="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/tools/security/cloudfox/default.nix index df34f3e18bf74..6b1d7870c699a 100644 --- a/pkgs/tools/security/cloudfox/default.nix +++ b/pkgs/tools/security/cloudfox/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cloudfox"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "BishopFox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-r9YIJ+PRUA1stKTL39+/T+m1WMkocpjfzG8Y9knnFU4="; + hash = "sha256-4donwh7yG7R4+k+ydGto2CZclnM95qodQuL1Huu4GDo="; }; - vendorHash = "sha256-nSisRurpareGI4EHENayMhsYOKL1hE1wVw2Ueiqii4U="; + vendorHash = "sha256-RdcfAZVqCp+egLbgx1c/A/zk0YlBY6aeeq0Lv4cLivY="; # Some tests are failing because of wrong filename/path doCheck = false; diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix new file mode 100644 index 0000000000000..925195bb13539 --- /dev/null +++ b/pkgs/tools/security/cnquery/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "cnquery"; + version = "9.12.1"; + + src = fetchFromGitHub { + owner = "mondoohq"; + repo = "cnquery"; + rev = "v${version}"; + hash = "sha256-ezk9HgNf4FBW/PEaNUhsb3/l1ChTC42F3slXXa8ZJp4="; + }; + + subPackages = [ "apps/cnquery" ]; + + vendorHash = "sha256-iycKyidVpdWeccK4RxENUxEFUmQKkIyyW1c3JFZ3gx4="; + + meta = with lib; { + description = "cloud-native, graph-based asset inventory"; + longDescription = '' + cnquery is a cloud-native tool for querying your entire fleet. It answers thousands of questions about your infrastructure and integrates with over 300 resources across cloud accounts, Kubernetes, containers, services, VMs, APIs, and more. + ''; + homepage = "https://mondoo.com/cnquery"; + changelog = "https://github.com/mondoohq/cnquery/releases/tag/v${version}"; + license = licenses.bsl11; + maintainers = with maintainers; [ mariuskimmina ]; + }; +} diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index b1f8cbb81b2a5..58250f5320a7e 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "9.9.3"; + version = "9.12.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-OlM/gcwHQWfXmKLcDDHh3okvqHIELRL+dRQJ6dOcItc="; + hash = "sha256-U3iEiKIb9lTNM4GK75a8khsjeZzYaMafoBfdpNiiwHQ="; }; proxyVendor = true; - vendorHash = "sha256-yhPixXldWUhJURZ/lIScIAbhsw/b/JCjYi1+Y5UOnnQ="; + vendorHash = "sha256-RRE0DsBkpI9hvo7k04eIadOKO3YE0g0DDjFj40ya1ZM="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 3e8acc96f29ee..0cdf5b0839ea7 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -13,13 +13,13 @@ }: buildGoModule rec { pname = "cosign"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-J/CQonW/ICrNUSQXVZPMR+WACZYJH0eH6bXhdXE27TY="; + hash = "sha256-QZWF0ysZFu3rt8dIXb5uddyDhT2FfWUyder8YR2BtQc="; }; buildInputs = @@ -28,7 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorHash = "sha256-RPwU6W6a9mnfriyz3ASvamZ3jEG6C2ug/MTp1Pahc/Q="; + vendorHash = "sha256-WeNRg3Nw2b6NiV8z7tGZIlWUHZxXuTG7MPF9DgfdmUQ="; subPackages = [ "cmd/cosign" diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index f910cf8467ed8..c80be56319f14 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -2,6 +2,7 @@ , autoPatchelfHook , fuse3 , maven, jdk, makeShellWrapper, glib, wrapGAppsHook +, libayatana-appindicator }: @@ -22,15 +23,14 @@ mavenJdk.buildMavenPackage rec { hash = "sha256-NMNlDEUpwKUywzhXhxlNX7NiE+6wOov2Yt8nTfbKTNI="; }; - mvnParameters = "-Dmaven.test.skip=true"; - mvnHash = "sha256-jIHMUj7ZQFu4XAvWUywj4f0PbmLHGtU5VRG0ZuKm3mA="; + mvnParameters = "-Dmaven.test.skip=true -Plinux"; + mvnHash = "sha256-cmwU9k7TRRJ07bT1EmY3pIBkvvqmFyE7WJeVL7VFDyc="; preBuild = '' VERSION=${version} SEMVER_STR=${version} ''; - # This is based on the instructins in https://github.com/cryptomator/cryptomator/blob/develop/dist/linux/appimage/build.sh installPhase = '' mkdir -p $out/bin/ $out/share/cryptomator/libs/ $out/share/cryptomator/mods/ @@ -38,8 +38,9 @@ mavenJdk.buildMavenPackage rec { cp target/libs/* $out/share/cryptomator/libs/ cp target/mods/* target/cryptomator-*.jar $out/share/cryptomator/mods/ - makeShellWrapper ${jdk}/bin/java $out/bin/cryptomator \ + makeShellWrapper ${jdk}/bin/java $out/bin/${pname} \ --add-flags "--enable-preview" \ + --add-flags "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.purejava.appindicator" \ --add-flags "--class-path '$out/share/cryptomator/libs/*'" \ --add-flags "--module-path '$out/share/cryptomator/mods'" \ --add-flags "-Dfile.encoding='utf-8'" \ @@ -49,17 +50,17 @@ mavenJdk.buildMavenPackage rec { --add-flags "-Dcryptomator.p12Path='@{userhome}/.config/Cryptomator/key.p12'" \ --add-flags "-Dcryptomator.ipcSocketPath='@{userhome}/.config/Cryptomator/ipc.socket'" \ --add-flags "-Dcryptomator.mountPointsDir='@{userhome}/.local/share/Cryptomator/mnt'" \ - --add-flags "-Dcryptomator.showTrayIcon=false" \ - --add-flags "-Dcryptomator.buildNumber='nix'" \ + --add-flags "-Dcryptomator.showTrayIcon=true" \ + --add-flags "-Dcryptomator.buildNumber='nix-${src.rev}'" \ --add-flags "-Dcryptomator.appVersion='${version}'" \ - --add-flags "-Djdk.gtk.version=3" \ + --add-flags "-Djava.net.useSystemProxies=true" \ --add-flags "-Xss20m" \ --add-flags "-Xmx512m" \ - --add-flags "-Djavafx.embed.singleThread=true " \ - --add-flags "-Dawt.useSystemAAFontSettings=on" \ + --add-flags "-Dcryptomator.disableUpdateCheck=true" \ + --add-flags "-Dcryptomator.integrationsLinux.trayIconsDir='$out/share/icons/hicolor/symbolic/apps'" \ --add-flags "--module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator" \ --prefix PATH : "$out/share/cryptomator/libs/:${lib.makeBinPath [ jdk glib ]}" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse3 ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse3 libayatana-appindicator ]}" \ --set JAVA_HOME "${jdk.home}" # install desktop entry and icons @@ -80,7 +81,7 @@ mavenJdk.buildMavenPackage rec { wrapGAppsHook jdk ]; - buildInputs = [ fuse3 jdk glib ]; + buildInputs = [ fuse3 jdk glib libayatana-appindicator ]; meta = with lib; { description = "Free client-side encryption for your cloud files"; diff --git a/pkgs/tools/security/cyclonedx-gomod/default.nix b/pkgs/tools/security/cyclonedx-gomod/default.nix index d9e740fcf644c..d4c9a4b6b465e 100644 --- a/pkgs/tools/security/cyclonedx-gomod/default.nix +++ b/pkgs/tools/security/cyclonedx-gomod/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cyclonedx-gomod"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - hash = "sha256-JczDfNBYT/Ap2lDucEvuT8NAwuQgmavOUvtznI6Q+Zc="; + hash = "sha256-whAHZDUQBJaYu+OZiqcYzWxOru1GXDQ4FMDCj+ngCDs="; }; - vendorHash = "sha256-5Mn+f+oVwbn2qGaZct5+9f6tOBXfsB/I72yD7fHUrC8="; + vendorHash = "sha256-FpsZonGJSzbAsnM00qq/qiTJLUN4q08dR+6rhTKvX0I="; # Tests require network access and cyclonedx executable doCheck = false; diff --git a/pkgs/tools/security/dalfox/default.nix b/pkgs/tools/security/dalfox/default.nix index b6d21b801efca..8c72a93d340f2 100644 --- a/pkgs/tools/security/dalfox/default.nix +++ b/pkgs/tools/security/dalfox/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dalfox"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "hahwul"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-AG5CNqkxPQJQ+HN3JGUIgSYxgFigmUqVGn1yAHmo7Mo="; + sha256 = "sha256-7wSmPmS8m+rYhYlREzKlPUiUfDvru9zwFFvSCDq6JY8="; }; - vendorHash = "sha256-OLT85GOcTnWmU+ZRem2+vY29nzvzXhnmIN2W+U6phPk="; + vendorHash = "sha256-W+37EL3e7G+U0EZUDuVqjZpfIf5+HcirH8NVsC+1NvA="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 272caf42e90e7..92b964ad2c95f 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.66.3"; + version = "3.66.5"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-zS5nIULnzoOG43nNcVb6MdmKNDcDK75mh3SOMB5BXIY="; + sha256 = "sha256-/kcGfTDthm4gp1M4lSeY1x8Q7EWVX2pZVjF2rAbz+Es="; }; vendorHash = "sha256-FOmaK6S61fkzybpDx6qfi6m4e2IaqBpavaFhEgIvmqw="; diff --git a/pkgs/tools/security/earlybird/default.nix b/pkgs/tools/security/earlybird/default.nix index c7c16ab47d382..c7cb35fe335c7 100644 --- a/pkgs/tools/security/earlybird/default.nix +++ b/pkgs/tools/security/earlybird/default.nix @@ -5,20 +5,16 @@ buildGoModule rec { pname = "earlybird"; - version = "3.16.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "americanexpress"; repo = "earlybird"; rev = "v${version}"; - hash = "sha256-qSW8O13UW5L2eVsqIuqOguhCyZBPqevZ9fJ7qkraa7M="; + hash = "sha256-guSm/ha4ICaOcoynvAwFeojE6ikaCykMcdfskD/ehTw="; }; - patches = [ - ./fix-go.mod-dependency.patch - ]; - - vendorHash = "sha256-ktsQvWc0CTnqOer+9cc0BddrQp0F3Xk7YJP3jxfuw1w="; + vendorHash = "sha256-39jXqCXAwg/C+9gEXiS1X58OD61nMNQifnhgVGEF6ck="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/security/earlybird/fix-go.mod-dependency.patch b/pkgs/tools/security/earlybird/fix-go.mod-dependency.patch deleted file mode 100644 index fb1cf4afdabc8..0000000000000 --- a/pkgs/tools/security/earlybird/fix-go.mod-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/go.mod -+++ b/go.mod -@@ -42,8 +42,9 @@ require ( - github.com/src-d/gcfg v1.4.0 // indirect - github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect - github.com/xanzy/ssh-agent v0.2.1 // indirect -- golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect -+ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect - golang.org/x/sys v0.0.0-20220906165534-d0df966e6959 // indirect -+ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - google.golang.org/protobuf v1.23.0 // indirect - gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect - gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index acfbad10cd55d..0e2e74d0787fb 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-12-02"; + version = "2023-12-22"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rITeDc1PQFjV4ZlBK97T+hvIzuWMIoPxBLscqkXiMwc="; + hash = "sha256-NuukzG+l83YhIgVASLKCkE3FrS6+z8uURTxZyhT/RuA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/fingerprintx/default.nix b/pkgs/tools/security/fingerprintx/default.nix index 9055f9002391b..940195b4e2b51 100644 --- a/pkgs/tools/security/fingerprintx/default.nix +++ b/pkgs/tools/security/fingerprintx/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "fingerprintx"; - version = "1.1.10"; + version = "1.1.13"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "fingerprintx"; rev = "refs/tags/v${version}"; - hash = "sha256-WwIIZlO310519aEPpvi3pY2Jn3HRNUZNiwoAyZ4VP1A="; + hash = "sha256-kWMwadE3ZJTqwEgtrXvXlyc/2+cf1NGhubwZuYpDMBQ="; }; vendorHash = "sha256-TMy6FwAFlo+ARvm+RiRqly0xIk4lBCXuZrtdnNSMSxw="; diff --git a/pkgs/tools/security/flare-floss/default.nix b/pkgs/tools/security/flare-floss/default.nix index b049ea1661083..212d0a74ebb1e 100644 --- a/pkgs/tools/security/flare-floss/default.nix +++ b/pkgs/tools/security/flare-floss/default.nix @@ -5,15 +5,15 @@ python3.pkgs.buildPythonPackage rec { pname = "flare-floss"; - version = "2.3.0"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "mandiant"; repo = "flare-floss"; rev = "refs/tags/v${version}"; fetchSubmodules = true; # for tests - hash = "sha256-tOLnve5XBc3TtSgucPIddBHD0YJhsRpRduXsKrtJ/eQ="; + hash = "sha256-bmOWOFqyvOvSrNTbwLqo0WMq4IAZxZ0YYaWCdCrpziU="; }; postPatch = '' @@ -24,7 +24,12 @@ python3.pkgs.buildPythonPackage rec { --replace 'sigs_path = os.path.join(get_default_root(), "sigs")' 'sigs_path = "'"$out"'/share/flare-floss/sigs"' ''; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ + binary2strings halo networkx pefile @@ -47,6 +52,10 @@ python3.pkgs.buildPythonPackage rec { cp -r floss/sigs $out/share/flare-floss/ ''; + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = with lib; { description = "Automatically extract obfuscated strings from malware"; homepage = "https://github.com/mandiant/flare-floss"; diff --git a/pkgs/tools/security/fscan/default.nix b/pkgs/tools/security/fscan/default.nix index cda7fb968d3dc..00ce9d8ec78e3 100644 --- a/pkgs/tools/security/fscan/default.nix +++ b/pkgs/tools/security/fscan/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fscan"; - version = "1.8.3"; + version = "1.8.3-build3"; src = fetchFromGitHub { owner = "shadow1ng"; repo = "fscan"; rev = version; - hash = "sha256-uoM/nMtgIqyzpOoSQKD5k4LXAXoA8G5N4In8tZlngqs="; + hash = "sha256-GtOCd8JaR6tx8hoB+P9QXrEnN7Wvmv7jddhc2/8hjvQ="; }; vendorHash = "sha256-hvb2IfypwYauF3ubE36u0bTU+l/FWP/CZt6dFd9zc6s="; @@ -18,7 +18,6 @@ buildGoModule rec { homepage = "https://github.com/shadow1ng/fscan"; license = licenses.mit; maintainers = with maintainers; [ Misaka13514 ]; - platforms = with platforms; unix ++ windows; mainProgram = "fscan"; }; } diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index 5625ab47058d4..6c4ce6507657d 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { url = "https://github.com/mrash/fwknop/commit/a8214fd58bc46d23b64b3a55db023c7f5a5ea6af.patch"; sha256 = "0cp1350q66n455hpd3rdydb9anx66bcirza5gyyyy5232zgg58bi"; }) + + # Pull patch pending upstream inclusion for `autoconf-2.72` support: + # https://github.com/mrash/fwknop/pull/357 + (fetchpatch { + name = "autoconf-2.72.patch"; + url = "https://github.com/mrash/fwknop/commit/bee7958532338499e35c19e75937891c8113f7de.patch"; + hash = "sha256-lrro5dSDR0Zz9aO3bV5vFFADNJjoDR9z6P5lFYWyLW8="; + }) ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 78f4af894a306..59e7bcc13d669 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -5,6 +5,7 @@ , enableMinimal ? false , withPcsc ? !enableMinimal, pcsclite , guiSupport ? stdenv.isDarwin, pinentry +, nixosTests }: assert guiSupport -> enableMinimal == false; @@ -80,7 +81,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.tests = lib.nixosTests.gnupg; + passthru.tests = nixosTests.gnupg; meta = with lib; { homepage = "https://gnupg.org"; diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch deleted file mode 100644 index 65804bac76425..0000000000000 --- a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c -index 903fb5b..d5611dc 100644 ---- a/tools/gpgkey2ssh.c -+++ b/tools/gpgkey2ssh.c -@@ -268,7 +268,7 @@ main (int argc, char **argv) - keyid = argv[1]; - - ret = asprintf (&command, -- "gpg --list-keys --with-colons --with-key-data '%s'", -+ "@out@/bin/gpg --list-keys --with-colons --with-key-data '%s'", - keyid); - assert (ret > 0); - - diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 8f9d8776687fa..78ba5e06e4b92 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "wallarm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5cvyKCzisfuoMPuQpiRnIBCTw2yMdA1yavKNS9OwW58="; + hash = "sha256-fBmn+p5uVGnI4lyL12cX4S8eda79k2Y0RPQG9iZQs2Q="; }; vendorHash = null; diff --git a/pkgs/tools/security/goverview/default.nix b/pkgs/tools/security/goverview/default.nix index 77f46526d95d6..02038bf27b99a 100644 --- a/pkgs/tools/security/goverview/default.nix +++ b/pkgs/tools/security/goverview/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { @@ -20,6 +21,15 @@ buildGoModule rec { "-w" "-s" ]; + nativeBuildInputs = [ + installShellFiles + ]; + postInstall = '' + installShellCompletion --cmd goverview \ + --bash <($out/bin/goverview completion bash) \ + --fish <($out/bin/goverview completion fish) \ + --zsh <($out/bin/goverview completion zsh) + ''; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index ff996562572b3..e3f43157f614d 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.69.1"; + version = "0.73.5"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AXw2mtN4FC6EKWN8dObrU04+WSHDWLY19FSWqQlkq/Q="; + hash = "sha256-a5Kna1axfA3uBHoTdT/B/6PA/Tr+w0bK6GeKcGIPRsQ="; # 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-iitWThvWVfeJMLcJLgmFnVguFVF4DejObZPZ3qB5cY0="; + vendorHash = "sha256-eO0/kE0XPqsnoCBKxcwJjHoBhQlXlxVPcg6w1fHfWGs="; nativeBuildInputs = [ installShellFiles @@ -73,6 +73,8 @@ buildGoModule rec { --replace "TestCmd" "SkipCmd" substituteInPlace grype/pkg/provider_test.go \ --replace "TestSyftLocationExcludes" "SkipSyftLocationExcludes" + substituteInPlace test/cli/cmd_test.go \ + --replace "Test_descriptorNameAndVersionSet" "Skip_descriptorNameAndVersionSet" # remove tests that depend on git substituteInPlace test/cli/db_validations_test.go \ --replace "TestDBValidations" "SkipDBValidations" @@ -83,6 +85,8 @@ buildGoModule rec { --replace "TestSBOMInput_AsArgument" "SkipSBOMInput_AsArgument" substituteInPlace test/cli/subprocess_test.go \ --replace "TestSubprocessStdin" "SkipSubprocessStdin" + substituteInPlace grype/internal/packagemetadata/names_test.go \ + --replace "TestAllNames" "SkipAllNames" # segfault rm grype/db/v5/namespace/cpe/namespace_test.go diff --git a/pkgs/tools/security/himitsu/default.nix b/pkgs/tools/security/himitsu/default.nix index 2dc1ba5ba9bba..ae647768c7f41 100644 --- a/pkgs/tools/security/himitsu/default.nix +++ b/pkgs/tools/security/himitsu/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "himitsu"; - version = "0.4"; + version = "0.5"; src = fetchFromSourcehut { name = pname + "-src"; owner = "~sircmpwn"; repo = pname; rev = version; - hash = "sha256-Y2QSzYfG1F9Z8MjeVvQ3+Snff+nqSjeK6VNzRaRDLYo="; + hash = "sha256-rZ3gzVz7V3psHAMxTCaJXZh4uP4gIeyb9Bf23kzCBWg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index 10f67d5f0b356..a1fbd44b02320 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , gradle , jdk +, quark-engine , makeWrapper , perl , imagemagick @@ -114,7 +115,9 @@ in stdenv.mkDerivation (finalAttrs: { cp -R build/jadx/lib $out for prog in jadx jadx-gui; do cp build/jadx/bin/$prog $out/bin - wrapProgram $out/bin/$prog --set JAVA_HOME ${jdk.home} + wrapProgram $out/bin/$prog \ + --set JAVA_HOME ${jdk.home} \ + --prefix PATH : "${lib.makeBinPath [ quark-engine ]}" done for size in 16 32 48; do @@ -153,6 +156,6 @@ in stdenv.mkDerivation (finalAttrs: { ]; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ delroth emilytrau ]; }; }) diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/tools/security/jwx/default.nix index 7fa8abfeb5ffd..85dc62743b6aa 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.16"; + version = "2.0.18"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-5IO9CoW9KBpgVxpnH1HEC5O4MJjCPERsmiV/cHcnmAc="; + hash = "sha256-HQJu22bMgL4UbJx0+JLgGDYnyT9lO2De04tZibAcVdM="; }; vendorHash = "sha256-o3EHPIXGLz/io0d8jhl9cxzctP3CeOjEDMQl1SY9lXg="; diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/tools/security/kube-bench/default.nix index e9094ce7103c1..f4cb389eb16ec 100644 --- a/pkgs/tools/security/kube-bench/default.nix +++ b/pkgs/tools/security/kube-bench/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.6.19"; + version = "0.7.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-owpmQ/APTUu1V8au2UE48SIIZnVI93tlv5bhkS/2kgQ="; + hash = "sha256-yJJEWxz8EWdLi2rhw42QVdG9AcGO0OWnihg153hALNE="; }; - vendorHash = "sha256-dBN6Yi8HtS9LzXr08jhw1hqDwS8a4UqrYaRpM+RzvVM="; + vendorHash = "sha256-zKw6d3UWs2kb+DCXmLZ09Lw3m8wMhm9QJYkeXJYcFA8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/kubeclarity/default.nix b/pkgs/tools/security/kubeclarity/default.nix index 4ad4044adbaa6..709ba817c5853 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.22.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "openclarity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VpTLf4Z2l9Ix92GzcyJvj4j2j+aff8nc2qW9+2uaPBs="; + hash = "sha256-GtShdcBSa7QAwjPUPMXDrFBgNqvJEf8XQw3HbqWEieo="; }; - vendorHash = "sha256-kYdKCHqzDbfCGMlTMPSHAQkSLyhkCl/OvV7CF5jdyaY="; + vendorHash = "sha256-rYUbXkf0wOPehXvAzcww0WVycATWdK72LOqbQolqoWc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/ldapnomnom/default.nix b/pkgs/tools/security/ldapnomnom/default.nix index 65e874d066918..59daa142856bb 100644 --- a/pkgs/tools/security/ldapnomnom/default.nix +++ b/pkgs/tools/security/ldapnomnom/default.nix @@ -5,17 +5,22 @@ buildGoModule rec { pname = "ldapnomnom"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "lkarlslund"; - repo = pname; + repo = "ldapnomnom"; rev = "refs/tags/v${version}"; - hash = "sha256-o29vcPKRX8TWRCpa20DVsh/4K7d3IbaLS3B+jJGBEmo="; + hash = "sha256-3s2mLNqnJ+wZ17gy8Yr2Ze0S62A1bmE91E2ciLNO14E="; }; vendorHash = "sha256-3ucnLD+qhBSWY2wLtBcsOcuEf1woqHP17qQg7LlERA8="; + ldflags = [ + "-w" + "-s" + ]; + meta = with lib; { description = "Tool to anonymously bruteforce usernames from Domain controllers"; homepage = "https://github.com/lkarlslund/ldapnomnom"; diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 8a3b38de92761..623acf50f3b8c 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.49"; + version = "1.0.51"; format = "setuptools"; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-R94N9ZvgumxhSf3QBSwh0wHUKuLAuyTDTzcof6JRSkE="; + hash = "sha256-UbZotbq97ehVj8dF0vXM2Z61IG1H+21xk14DXKmWirA="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index c44733034b5ad..66a8c3c130613 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libmodsecurity"; - version = "3.0.10"; + version = "3.0.11"; src = fetchFromGitHub { owner = "SpiderLabs"; repo = "ModSecurity"; rev = "v${version}"; - sha256 = "sha256-VaoPpJ0twuGWU7G9AvKK4kq9Ed0BeG2J7B81sOuJVrE="; + sha256 = "sha256-dbAX4lokmiUc+glhTG0PPaD/WEXcoQX0AQ/WZwJQYPY="; fetchSubmodules = true; }; diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix deleted file mode 100644 index a39d226aac575..0000000000000 --- a/pkgs/tools/security/mbox/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, openssl, which }: - -stdenv.mkDerivation { - pname = "mbox"; - version = "unstable-2014-05-26"; - - src = fetchFromGitHub { - owner = "tsgates"; - repo = "mbox"; - rev = "a131424b6cb577e1c916bd0e8ffb2084a5f73048"; - sha256 = "06qggqxnzcxnc34m6sbafxwr2p64x65m9zm5wp7pwyarcckhh2hd"; - }; - - buildInputs = [ openssl which ]; - - preConfigure = '' - cd src - cp {.,}configsbox.h - ''; - - doCheck = true; - checkPhase = '' - rm tests/test-*vim.sh tests/test-pip.sh - - patchShebangs ./; dontPatchShebags=1 - sed -i 's|^/bin/||' tests/test-fileops.sh - - ./testall.sh - ''; - - meta = with lib; { - description = "Lightweight sandboxing mechanism that any user can use without special privileges"; - homepage = "http://pdos.csail.mit.edu/mbox/"; - maintainers = with maintainers; [ ehmry ]; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - broken = true; - }; -} diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index b16aa8a0ddb32..3d10bb0bb51c8 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.45" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.48" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index bdef38c32aadd..899a80b109665 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: dd2f4b923912fc2ffc84d4a1d5e3bbccd5a8efc1 - ref: refs/tags/6.3.45 + revision: 261eca342915db81d67cdfe7f2ef7b3788fd508f + ref: refs/tags/6.3.48 specs: - metasploit-framework (6.3.45) + metasploit-framework (6.3.48) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -35,7 +35,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.159) + metasploit-payloads (= 2.0.161) metasploit_data_models metasploit_payloads-mettle (= 1.0.26) mqtt @@ -82,7 +82,7 @@ GIT rex-zip ruby-macho ruby-mysql - ruby_smb (~> 3.2.0) + ruby_smb (~> 3.3.0) rubyntlm rubyzip sinatra @@ -105,66 +105,67 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (7.0.7.2) - actionview (= 7.0.7.2) - activesupport (= 7.0.7.2) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) 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.7.2) - activesupport (= 7.0.7.2) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.7.2) - activesupport (= 7.0.7.2) - activerecord (7.0.7.2) - activemodel (= 7.0.7.2) - activesupport (= 7.0.7.2) - activesupport (7.0.7.2) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) afm (0.2.2) arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) - aws-eventstream (1.2.0) - aws-partitions (1.811.0) - aws-sdk-core (3.181.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.872.0) + aws-sdk-core (3.190.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.402.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-ec2 (1.431.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2instanceconnect (1.32.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-ec2instanceconnect (1.36.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.86.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-iam (1.92.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.71.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-kms (1.75.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.134.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.141.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sdk-ssm (1.156.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sigv4 (~> 1.8) + aws-sdk-ssm (1.162.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.6.0) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) - bcrypt (3.1.19) + base64 (0.2.0) + bcrypt (3.1.20) bcrypt_pbkdf (1.1.0) bindata (2.4.15) - bootsnap (1.16.0) + bootsnap (1.17.0) msgpack (~> 1.2) bson (4.15.0) builder (3.2.4) @@ -173,11 +174,10 @@ GEM cookiejar (0.3.3) crass (1.0.6) daemons (1.4.1) - date (3.3.3) + date (3.3.4) dnsruby (1.70.0) simpleidn (~> 0.2.1) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20231109) ed25519 (1.3.0) em-http-request (1.1.7) addressable (>= 2.3.4) @@ -189,9 +189,10 @@ GEM eventmachine (>= 1.0.0.beta.4) erubi (1.12.0) eventmachine (1.2.7) - faker (3.2.1) + faker (3.2.2) i18n (>= 1.8.11, < 2) - faraday (2.7.10) + faraday (2.8.1) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -200,7 +201,7 @@ GEM faye-websocket (0.11.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) - ffi (1.15.5) + ffi (1.16.3) filesize (0.2.0) gssapi (1.3.1) ffi (>= 1.0.1) @@ -218,27 +219,27 @@ GEM httpclient (2.8.3) i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.6.0) + io-console (0.7.1) irb (1.7.4) reline (>= 0.3.6) jmespath (1.6.2) jsobfu (0.4.2) rkelly-remix - json (2.6.3) + json (2.7.1) little-plugger (1.1.4) logging (2.3.1) little-plugger (~> 1.1) multi_json (~> 1.14) - loofah (2.21.3) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) metasm (1.0.5) - metasploit-concern (5.0.1) + metasploit-concern (5.0.2) activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) zeitwerk - metasploit-credential (6.0.5) + metasploit-credential (6.0.6) metasploit-concern metasploit-model metasploit_data_models (>= 5.0.0) @@ -248,12 +249,12 @@ GEM rex-socket rubyntlm rubyzip - metasploit-model (5.0.1) + metasploit-model (5.0.2) activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) - metasploit-payloads (2.0.159) - metasploit_data_models (6.0.2) + metasploit-payloads (2.0.161) + metasploit_data_models (6.0.3) activerecord (~> 7.0) activesupport (~> 7.0) arel-helpers @@ -265,26 +266,26 @@ GEM webrick metasploit_payloads-mettle (1.0.26) method_source (1.0.0) - mini_portile2 (2.8.4) - minitest (5.19.0) + mini_portile2 (2.8.5) + minitest (5.20.0) mqtt (0.6.0) msgpack (1.6.1) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) - net-imap (0.3.7) + net-imap (0.4.8) date net-protocol net-ldap (0.18.0) - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.4.0) net-protocol - net-ssh (7.2.0) + net-ssh (7.2.1) network_interface (0.0.4) nexpose (7.3.0) - nio4r (2.5.9) + nio4r (2.7.0) nokogiri (1.14.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -305,11 +306,11 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.5.3) - public_suffix (5.0.3) - puma (6.3.1) + pg (1.5.4) + public_suffix (5.0.4) + puma (6.4.0) nio4r (~> 2.0) - racc (1.7.1) + racc (1.7.3) rack (2.2.8) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) @@ -322,77 +323,77 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.7.2) - actionpack (= 7.0.7.2) - activesupport (= 7.0.7.2) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) - rake (13.0.6) + rake (13.1.0) rasn1 (0.12.1) strptime (~> 0.2.5) rb-readline (0.5.5) - recog (3.1.2) + recog (3.1.4) nokogiri redcarpet (3.6.0) - reline (0.3.8) + reline (0.4.1) io-console (~> 0.5) - rex-arch (0.1.14) + rex-arch (0.1.15) rex-text - rex-bin_tools (0.1.8) + rex-bin_tools (0.1.9) metasm rex-arch rex-core rex-struct2 rex-text rex-core (0.1.31) - rex-encoder (0.1.6) + rex-encoder (0.1.7) metasm rex-arch rex-text - rex-exploitation (0.1.38) + rex-exploitation (0.1.39) jsobfu metasm rex-arch rex-encoder rex-text rexml - rex-java (0.1.6) - rex-mime (0.1.7) + rex-java (0.1.7) + rex-mime (0.1.8) rex-text - rex-nop (0.1.2) + rex-nop (0.1.3) rex-arch - rex-ole (0.1.7) + rex-ole (0.1.8) rex-text - rex-powershell (0.1.98) + rex-powershell (0.1.99) rex-random_identifier rex-text ruby-rc4 - rex-random_identifier (0.1.10) + rex-random_identifier (0.1.11) rex-text - rex-registry (0.1.4) - rex-rop_builder (0.1.4) + rex-registry (0.1.5) + rex-rop_builder (0.1.5) metasm rex-core rex-text - rex-socket (0.1.52) + rex-socket (0.1.55) rex-core - rex-sslscan (0.1.9) + rex-sslscan (0.1.10) rex-core rex-socket rex-text - rex-struct2 (0.1.3) - rex-text (0.2.52) - rex-zip (0.1.4) + rex-struct2 (0.1.4) + rex-text (0.2.55) + rex-zip (0.1.5) rex-text rexml (3.2.6) rkelly-remix (0.0.7) ruby-macho (4.0.0) - ruby-mysql (4.0.0) + ruby-mysql (4.1.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.2.5) + ruby_smb (3.3.1) bindata openssl-ccm openssl-cmac @@ -410,7 +411,7 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.1.0) tilt (~> 2.0) - sqlite3 (1.6.3) + sqlite3 (1.6.9) mini_portile2 (~> 2.8.0) sshkey (3.0.0) strptime (0.2.5) @@ -419,9 +420,9 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.2.2) - tilt (2.2.0) - timeout (0.4.0) + thor (1.3.0) + tilt (2.3.0) + timeout (0.4.1) ttfunk (1.7.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -429,7 +430,7 @@ GEM tzinfo (>= 1.0.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.2) + unf_ext (0.0.9.1) unix-crypt (1.3.1) warden (1.2.9) rack (>= 2.0.9) @@ -453,7 +454,7 @@ GEM activesupport (>= 4.2, < 8.0) xmlrpc (0.3.3) webrick - zeitwerk (2.6.11) + zeitwerk (2.6.12) PLATFORMS ruby @@ -462,4 +463,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.4.22 + 2.4.13 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 842fc64b64400..935374a09ad48 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.45"; + version = "6.3.48"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-vDTbuvMkudwV3rCEEwE62emXNSMgXR1XHyVB3sDN56Y="; + hash = "sha256-AY0k44/gYXP4h3SoRVF9aK2L2skZ03Azd5V9hSRDoHQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index d6d0ced8a5d1e..a439c6380641b 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,60 +4,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qamc5ly521wk9i1658h9jv7avmyyp92kffa1da2fn5zk0wgyhf4"; + sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "151zxb61bb6q7g0sn34qz79k8bg02vmb8mmnsn0fr15lxw92dfhm"; + sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1crjq1dznlbsrwd5yijxraz1591xmg4vdcwwnmrw4nh6hrwq5fj5"; + sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03vrssdqaqm41w27s21r37skdfxa41midvjy37i2zh3rnbnq8ps2"; + sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vlzcnyqlbchaq85phmdv73ydlc18xpvxy1cbsk191cwd29i7q32"; + sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; addressable = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.6"; }; afm = { groups = ["default"]; @@ -94,110 +94,120 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0082fsywglghvam55i4jz7cj2vyd8hb8b7658cr9yqlwna9j1sp3"; + sha256 = "1ddbcz8p3abbw8d8pn796z1ry1mbapl6ayhh37ziwal6bd047kvm"; type = "gem"; }; - version = "1.811.0"; + version = "1.872.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjw9cf6ldbw50xi5ric8d63r8kybpsvaqxh2v6n7374hfady73i"; + sha256 = "1ansagfl5irx1y6b9xf4xpi9j6q6k5pbd2aw80hn0p4m3ycafamh"; type = "gem"; }; - version = "3.181.0"; + version = "3.190.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl5b8m0ad2dxj2r0f5wkphfwhnpq820jbzrdmxyh20kivckv33c"; + sha256 = "04lg4g6aivkf6zvvcc1clw0dqdlpkn3c87kiz5mfc7m2jr0m0ljx"; type = "gem"; }; - version = "1.402.0"; + version = "1.431.0"; }; aws-sdk-ec2instanceconnect = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jbvh6v2kbybk1qjzhzrl82d7advh6hf3va9zyaxlrcijkz6jjg4"; + sha256 = "1iifrmdls17a3hniq43iyj9q4mr8iy0danqmy65xbh05bnqq2ca9"; type = "gem"; }; - version = "1.32.0"; + version = "1.36.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bp18pi29zncznkzkjzlg5j1cl99q41xvw0z5qx9q55mcwaj7i8"; + sha256 = "0whclpcvbdy7gzvqpk8734nxjfxs3362k197xl1wnrpixklkacyz"; type = "gem"; }; - version = "1.86.0"; + version = "1.92.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zr5w2cjd895abyn7y5gifhq37bxcinssvdx2l1qmlkllbdxbwq0"; + sha256 = "1qzxqfgrhnl5rdc39a1gl2pgrdxgnsj12zycpxnsx8lg6arfmnr1"; type = "gem"; }; - version = "1.71.0"; + version = "1.75.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; + sha256 = "0bnhpmi0iiaj88rqc5lhhnp2gyrk4fs8xz51lj36wwzng94qinya"; type = "gem"; }; - version = "1.134.0"; + version = "1.141.0"; }; aws-sdk-ssm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178nnrlpz5ihx5615i1mml7ymg2pklvfxxakhhwcjbys52cz6jsk"; + sha256 = "0xz10344dwm4pj8qnl19bnh99arxp7cd9mn2alslrnw7y2gipzz1"; type = "gem"; }; - version = "1.156.0"; + version = "1.162.0"; }; aws-sigv4 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; + sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.0"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; }; bcrypt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14crcsmcsyiskr9xzgzcfz2dr74zg1jvavrrxpf5vnn9q75fakz9"; + sha256 = "16a0g2q40biv93i1hch3gw8rbmhp77qnnifj1k0a6m7dng3zh444"; type = "gem"; }; - version = "3.1.19"; + version = "3.1.20"; }; bcrypt_pbkdf = { groups = ["default"]; @@ -224,10 +234,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q"; + sha256 = "0iqkzby0fdgi786m873nm0ckmc847wy9a4ydinb29m7hd3fs83kb"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; bson = { groups = ["default"]; @@ -304,10 +314,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; type = "gem"; }; - version = "3.3.3"; + version = "3.3.4"; }; dnsruby = { groups = ["default"]; @@ -324,10 +334,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si"; type = "gem"; }; - version = "0.5.20190701"; + version = "0.6.20231109"; }; ed25519 = { groups = ["default"]; @@ -384,20 +394,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ysiqlvyy1351bzx7h92r93a35s32l8giyf9bac6sgr142sh3cnn"; + sha256 = "1ic47k6f0q6xl9g2yxa3x60gfbwx98wnx75qnbhhgk0zc7a5ijhy"; type = "gem"; }; - version = "3.2.1"; + version = "3.2.2"; }; faraday = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; + sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8"; type = "gem"; }; - version = "2.7.10"; + version = "2.8.1"; }; faraday-net_http = { groups = ["default"]; @@ -434,10 +444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; filesize = { groups = ["default"]; @@ -544,10 +554,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff"; + sha256 = "1fmwbcapyhla84xhwj3gfws6rb4lw3928ybz6g3lr372dgxakzx5"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.1"; }; irb = { groups = ["default"]; @@ -584,10 +594,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; + sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; type = "gem"; }; - version = "2.6.3"; + version = "2.7.1"; }; little-plugger = { groups = ["default"]; @@ -614,10 +624,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; + sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh"; type = "gem"; }; - version = "2.21.3"; + version = "2.22.0"; }; metasm = { groups = ["default"]; @@ -634,62 +644,62 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12qhihgrhlxcr8pss42blf9jx6sdwp85kg0790n6lf6knz9yi7yc"; + sha256 = "1w06rcr3fa4lq4dhq49b5wh6pd3lj6daf3mq3wmx5zzi4gv0mlic"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.2"; }; metasploit-credential = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pdfrbw8442aspvf4h691p542sgm6rj2xfl3bfc6rplmz82j1ay5"; + sha256 = "1nmh37pss5bsxjasl52pi9jxnzv75wacpnhrif5cprg6jxwn8dzl"; type = "gem"; }; - version = "6.0.5"; + version = "6.0.6"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "dd2f4b923912fc2ffc84d4a1d5e3bbccd5a8efc1"; - sha256 = "19p7rp0dwh953xbisp904csrgsfr780i715hvqaxrf94yfxdnd5w"; + rev = "261eca342915db81d67cdfe7f2ef7b3788fd508f"; + sha256 = "0x508cj8azcmfwrp1lqrr7d8pbb8gm8lba3lhzw76qg0izij9381"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.45"; + version = "6.3.48"; }; metasploit-model = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01i35h3wl7qly2kx20f5r1x00grmfd5vnarjvi3qjjyy380qw793"; + sha256 = "0vn50jnvdanmqbjm9xmp0i4xwzc9g3c6g2c4b59i2bz47kwp1pi7"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.2"; }; metasploit-payloads = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4jg0wqqqnyk5ba8rpxdz1hd980qmdwpi4fankr036rpm4b79m1"; + sha256 = "1naxfj3jcr5gfsr5lbkis9ww2mw6c2i97k1zdidajpr91dyj2314"; type = "gem"; }; - version = "2.0.159"; + version = "2.0.161"; }; metasploit_data_models = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07k32bv9qnxg9vcq29p0r6qcfrhwby3aydpir3z8a7h8iz17lz9i"; + sha256 = "1h22d30aviskjg1jm7a65jy5ynjpw92wg8hzv5mknhlbsv4dhzkm"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; metasploit_payloads-mettle = { groups = ["default"]; @@ -716,20 +726,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.19.0"; + version = "5.20.0"; }; mqtt = { groups = ["default"]; @@ -786,10 +796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; + sha256 = "1wnmxcrpv7zaf8wli5nvfnz5ybmw7f3r06s05p3d96idc61193mv"; type = "gem"; }; - version = "0.3.7"; + version = "0.4.8"; }; net-ldap = { groups = ["default"]; @@ -806,30 +816,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; type = "gem"; }; - version = "0.2.1"; + version = "0.2.2"; }; net-smtp = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + sha256 = "1rx3758w0bmbr21s2nsc6llflsrnp50fwdnly3ixra4v53gbhzid"; type = "gem"; }; - version = "0.3.3"; + version = "0.4.0"; }; net-ssh = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jyj6j7w9zpj2zhp4dyhdjiwsn9rqwksj7s7fzpnn7rx2xvz2a1a"; + sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; type = "gem"; }; - version = "7.2.0"; + version = "7.2.1"; }; network_interface = { groups = ["default"]; @@ -856,10 +866,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; + sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm"; type = "gem"; }; - version = "2.5.9"; + version = "2.7.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -967,40 +977,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zcvxmfa8hxkhpp59fhxyxy1arp70f11zi1jh9c7bsdfspifb7kb"; + sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.4"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "5.0.3"; + version = "5.0.4"; }; puma = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; + sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; type = "gem"; }; - version = "6.3.1"; + version = "6.4.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.3"; }; rack = { groups = ["default"]; @@ -1057,20 +1067,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01pdn9sn7kawwrvrbr3vz44j287xbka8mm7nrv9cl510y8gzxi2x"; + sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; rake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; type = "gem"; }; - version = "13.0.6"; + version = "13.1.0"; }; rasn1 = { groups = ["default"]; @@ -1097,10 +1107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15633qvzbgsigx55dxb9b07xh0spwr9njd5y2f454kc5zrrapp1a"; + sha256 = "1a9m9ngmcgvgzg8m8ahdhjvfm65k6hp8r7dqmrsh3zcphim4x71k"; type = "gem"; }; - version = "3.1.2"; + version = "3.1.4"; }; redcarpet = { groups = ["default"]; @@ -1117,30 +1127,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb"; + sha256 = "1hi6zfj6zqzxcbamhjm9w9cswv62f76l8gsdfcnmhpw35cyxphh8"; type = "gem"; }; - version = "0.3.8"; + version = "0.4.1"; }; rex-arch = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gi9641869pg30ij7ba3r2z89flvdqsma4spbpww6c8ph62iy4bp"; + sha256 = "1gxjhiqdbh4ix76rqhaghzy1vsz22gcdfdwj9lqnfifibk7wabpa"; type = "gem"; }; - version = "0.1.14"; + version = "0.1.15"; }; rex-bin_tools = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p5r2h0zaixdjhp9k0jq0vgsvbhifx2jh3p9pr2w80qda1hkgqgj"; + sha256 = "0hdkjv9g04d9k6mq1j9fxg9l6ifzym5i204majhzb9hqkfgslw5p"; type = "gem"; }; - version = "0.1.8"; + version = "0.1.9"; }; rex-core = { groups = ["default"]; @@ -1157,150 +1167,150 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15c2yqrvn3hxf6gn4cqrz2l65rdh68gbk2a7lwdq43nchfjnsnvg"; + sha256 = "1rlpxmw4amqf04vn14my6aim5iya0wh5gpi1hrvnqq9xnhkpk2qs"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; rex-exploitation = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1afz3qvdmaav542klxz2jwwgrayhw1lyrivmpfv5jk2c613cky3n"; + sha256 = "1pdr7zz9hm7bihq6055jjzdrklp7qn1m50ddr63ilr32wlgldjvh"; type = "gem"; }; - version = "0.1.38"; + version = "0.1.39"; }; rex-java = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g8xdj7ij4y51wgh6l29al6i107bqn6pwql6za7ahms75m8s9dys"; + sha256 = "1ynqlq1xqnw9asqnkszbjds972xm98fz92yq5ywrxz7p3x66ybbp"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; rex-mime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00qpd5i8naw601q6aij652gw8x6my5d5drf63lq9fridjrqj0nja"; + sha256 = "0gi2xidygk6j7zwml6225d221bc3s7n2if5g1v1w45ksl19499b3"; type = "gem"; }; - version = "0.1.7"; + version = "0.1.8"; }; rex-nop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yjlmgmaaa65lkd6jrm71g8yfn8xy91jl07nd1v90xp9jrzrrl92"; + sha256 = "1vavmdzv5aw20izhrbf2f180dwvrraw8i9bh4yz5gsapjizcqrhy"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; rex-ole = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rlsy1a4lig7iqvb4zn60fpf125v8k4bjrjzakks74prjb2qmqnp"; + sha256 = "0vbiqg120gqd0kfa7kw2jg4jy4y2favsm6kqvysxfjfwp6vfycl6"; type = "gem"; }; - version = "0.1.7"; + version = "0.1.8"; }; rex-powershell = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bsf88faglr04ag71cplyhhmy7drp1cqs2dqq77m7q8w1ibk8rj"; + sha256 = "0kvzw1fnj05cwbczajclwnpv60zky48hjc5svckapfgx8c5mi69f"; type = "gem"; }; - version = "0.1.98"; + version = "0.1.99"; }; rex-random_identifier = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11gdz9n44jlhq1w5swq63705gliwjc7jg7avgprgw2j4sscnypjp"; + sha256 = "1qxc05f0xvradyp50vz8s1h9lzgh9c31nz8yq7r22bph03v71f0c"; type = "gem"; }; - version = "0.1.10"; + version = "0.1.11"; }; rex-registry = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09b6jhcih4srrh0j52v49vbffqz8ngki6qpmq9b2wdabqnw63d1v"; + sha256 = "1sbcs0lkl8b57d5xdlfffrpwxpvvwfcfbgzqc9p7xgmqb1xl2s62"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rex-rop_builder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ssynxq3kc86v3xnc6jx8pg5zh13q61wl2klqbi9hzn2n8lhdgvj"; + sha256 = "1gbc9sssyzbq1s2nk0ajc9y0x4v10cp4za4f4gbssrjw4d3zf9dl"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rex-socket = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b8pymg7c6yjb2jc73sky917rdq2kmn9cwxlhm7703yc3y1fyj2x"; + sha256 = "0qs8fq14ivhnhssq966ikxdis864gw80pfbxllbs35v0njw46nj3"; type = "gem"; }; - version = "0.1.52"; + version = "0.1.55"; }; rex-sslscan = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lgwadsmdwdkv9irxlvrc2x0wh1c1r1b9254blpc797ksh5qm4l1"; + sha256 = "0plcz9jwpg1yw206ljky3mk6dk31j24jdmcpnky5k9m2npsp0jlf"; type = "gem"; }; - version = "0.1.9"; + version = "0.1.10"; }; rex-struct2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hp8yv55j995dl587hismwa7ydyprs03c75gia6rwp7v5bhshy4n"; + sha256 = "1p6afmicm1adlngp196604rrgb1nsly10y8nphva5h5vncismscz"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; rex-text = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xibdr82pr0p4h7jixf4r56y70rqzda5287bv3mw43r9vwsi949f"; + sha256 = "1finkvvmxa654mldx1vqpnl9w1xvjp0s7lyb7qjymlphvbj3mi40"; type = "gem"; }; - version = "0.2.52"; + version = "0.2.55"; }; rex-zip = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azm4g4dm9k6vrav769vn0gffrv7pgxknlj4dr9yav632920cvqj"; + sha256 = "15jjb3ldndi9p5x7pb3dllkrm4cy3p7dccy4rxz0vh5m4vlqbhsd"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rexml = { groups = ["default"]; @@ -1337,10 +1347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sh12qscqrc1ihgy7734r4vrg9kzd9lifwsfk4n1r5i4gv5q0jd2"; + sha256 = "1g6wcnzqsbqg2q1lfbhlz4z9rq306az2xx8kk8dnr60dziy1a5b5"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.0"; }; ruby-rc4 = { groups = ["default"]; @@ -1367,10 +1377,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "075ib787qp2g0ghx0pww76ff843l09y5d5h1x63zbnxzm3q3v4dz"; + sha256 = "04m366ldi33h79k7f35dvyhq0jyh762v8360zf8ss5jbax3bzlkk"; type = "gem"; }; - version = "3.2.5"; + version = "3.3.1"; }; rubyntlm = { groups = ["default"]; @@ -1423,15 +1433,14 @@ version = "3.1.0"; }; sqlite3 = { - dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37"; + sha256 = "08irz5llz31im8pmkk5k0kw433jyyji1qa98xkdmpphncdjr38am"; type = "gem"; }; - version = "1.6.3"; + version = "1.6.9"; }; sshkey = { groups = ["default"]; @@ -1478,30 +1487,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; + sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.0"; }; tilt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; + sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; + sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.1"; }; ttfunk = { groups = ["default"]; @@ -1548,10 +1557,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; + sha256 = "1sf6bxvf6x8gihv6j63iakixmdddgls58cpxpg32chckb2l18qcj"; type = "gem"; }; - version = "0.0.8.2"; + version = "0.0.9.1"; }; unix-crypt = { groups = ["default"]; @@ -1658,9 +1667,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd"; + sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; type = "gem"; }; - version = "2.6.11"; + version = "2.6.12"; }; } diff --git a/pkgs/tools/security/metasploit/update.sh b/pkgs/tools/security/metasploit/update.sh index ba41b78c0e8d8..45f820d7870a9 100755 --- a/pkgs/tools/security/metasploit/update.sh +++ b/pkgs/tools/security/metasploit/update.sh @@ -13,5 +13,8 @@ bundler install bundix sed -i '/[ ]*dependencies =/d' gemset.nix +# Hacks +sed -i 's/nokogiri = {/nokogiri = {\n dependencies = ["mini_portile2" "racc"];/g' gemset.nix + cd "../../../../" nix-update metasploit --version "$latest" diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix index a3e3a82ec2347..15e756a7053b1 100644 --- a/pkgs/tools/security/nitrokey-app2/default.nix +++ b/pkgs/tools/security/nitrokey-app2/default.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, pynitrokey , wrapQtAppsHook }: diff --git a/pkgs/tools/security/nmap-formatter/default.nix b/pkgs/tools/security/nmap-formatter/default.nix index 9af9b30710411..b78cb2e075d24 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.4"; + version = "2.1.6"; src = fetchFromGitHub { owner = "vdjagilev"; repo = pname; rev = "v${version}"; - hash = "sha256-M0IV7pgJyCxwfWRnJeMevFFsvaXTRfjXoGRsMngt7Pk="; + hash = "sha256-40ix4D/f63Q5cqVmBvpSmbK2KNXiYLdv/xXBNPJXfac="; }; - vendorHash = "sha256-Wx07tSHr5LKPdO3BQ3tGMxzxYP9jBnH3JQ8/yrvwX1U="; + vendorHash = "sha256-OUhvQwC7EJF7CIM7NHCs0TqRTZHTiDupkfYREPaxpXo="; meta = with lib; { description = "Tool that allows you to convert nmap output"; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 013b18a36d2bd..c0c0fdef6fb95 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.1.0"; + version = "3.1.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Bx/ryoftrhDExugtvviRU4f4pIlerV2ehJWAJUGizvs="; + hash = "sha256-XTKJq7bq6iNzZ4LnxQxqzbNDdNh0ixFclB3kniNvg2I="; }; - vendorHash = "sha256-r5m9yvdy7Bnh9QvcrAwwO6od2C7JCcxwFx4p+W8qlMY="; + vendorHash = "sha256-C/CDMj+R7p0wkjHSQX6GMRDU1PEDHi8574JS/A2zrzk="; subPackages = [ "cmd/nuclei/" diff --git a/pkgs/tools/security/oauth2c/default.nix b/pkgs/tools/security/oauth2c/default.nix index b36eebea7b5f7..15d8f45299078 100644 --- a/pkgs/tools/security/oauth2c/default.nix +++ b/pkgs/tools/security/oauth2c/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "oauth2c"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "cloudentity"; repo = pname; rev = "v${version}"; - hash = "sha256-iFYKAdoeCvyhAeZ5K3CHSsHG0Uq+Ok0C8ACe9RztDmY="; + hash = "sha256-4ZCb8BXrKGXJ8d06fxAuFkGRxcK7PwuPFuCBc9EIXZY="; }; vendorHash = "sha256-olDtsLoslxOsbAq60RnLp9MGZOt17/BPo9E9SgWOqoQ="; diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 9b5b6fba8b24f..856921edbf18f 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -8,23 +8,15 @@ stdenv.mkDerivation rec { pname = "opensc"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; - sha256 = "sha256-Yo8dwk7+d6q+hi7DmJ0GJM6/pmiDOiyEm/tEBSbCU8k="; + sha256 = "sha256-1mm0b4AAtX0AgjShpU1FR6e7pUkea5TOJdIGkNQgjuE="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-2977.patch"; - url = "https://github.com/OpenSC/OpenSC/commit/81944d1529202bd28359bede57c0a15deb65ba8a.patch"; - hash = "sha256-rCeYYKPtv3pii5zgDP5x9Kl2r98p3uxyBSCYlPJZR/s="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ zlib readline openssl libassuan diff --git a/pkgs/tools/security/ossec/agent.nix b/pkgs/tools/security/ossec/agent.nix new file mode 100644 index 0000000000000..003d2141c567c --- /dev/null +++ b/pkgs/tools/security/ossec/agent.nix @@ -0,0 +1,69 @@ +{ lib, stdenv, fetchFromGitHub, which, pcre2, zlib, ncurses, openssl }: +let + version = "unstable-2023-08-09"; +in +stdenv.mkDerivation { + pname = "ossec-agent"; + inherit version; + + src = fetchFromGitHub { + owner = "ossec"; + repo = "ossec-hids"; + rev = "c8a36b0af3d4ee5252855b90236407cbfb996eb2"; + sha256 = "sha256-AZ8iubyhNHXGR/l+hA61ifNDUoan7AQ42l/uRTt5GmE="; + }; + + # clear is used during the build process + nativeBuildInputs = [ ncurses ]; + + buildInputs = [ which pcre2 zlib openssl ]; + + # patch to remove root manipulation, install phase which tries to add users to the system, and init phase which tries to modify the system to launch files + patches = [ ./no-root.patch ]; + + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of + # `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here + env.NIX_CFLAGS_COMPILE = "-fcommon"; + + buildPhase = '' + mkdir $out + export USER_DIR="$out" # just to satisy the script + ./install.sh <<EOF +en + +agent +127.0.0.1 +yes +yes +yes +EOF + + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + mv $out/active-response/bin/* $out/bin + mv $out/etc $out/share + mv $out/queue $out/share + mv $out/var $out/share + mv $out/agentless $out/share + mv $out/.ssh $out/share + rm -r $out/active-response + rm -r $out/tmp + + runHook postInstall + ''; + + meta = with lib; { + description = "Open source host-based instrusion detection system"; + homepage = "https://www.ossec.net"; + license = licenses.gpl2; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix deleted file mode 100644 index 1aa606f592742..0000000000000 --- a/pkgs/tools/security/ossec/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchurl, which }: - -stdenv.mkDerivation rec { - pname = "ossec-client"; - version = "2.6"; - - src = fetchurl { - url = "https://www.ossec.net/files/ossec-hids-${version}.tar.gz"; - sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip"; - }; - - buildInputs = [ which ]; - - patches = [ ./no-root.patch ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of - # `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - buildPhase = '' - echo "en - -agent -$out -no -127.0.0.1 -yes -yes -yes - - -" | ./install.sh - ''; - - meta = with lib; { - description = "Open source host-based instrusion detection system"; - homepage = "https://www.ossec.net"; - license = licenses.gpl2; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/tools/security/ossec/no-root.patch b/pkgs/tools/security/ossec/no-root.patch index ea6e9c54a9ae5..ef2f28560070f 100644 --- a/pkgs/tools/security/ossec/no-root.patch +++ b/pkgs/tools/security/ossec/no-root.patch @@ -1,7 +1,8 @@ -diff -Naur ossec-hids-2.6-orig/install.sh ossec-hids-2.6/install.sh ---- ossec-hids-2.6-orig/install.sh 2011-07-11 15:36:58.000000000 -0400 -+++ ossec-hids-2.6/install.sh 2012-07-09 09:58:57.970692818 -0400 -@@ -119,14 +119,14 @@ +diff --git a/install.sh b/install.sh +index 387bde1a..cb6dcbf2 100755 +--- a/install.sh ++++ b/install.sh +@@ -126,14 +126,14 @@ Install() # Generate the /etc/ossec-init.conf VERSION_FILE="./src/VERSION" VERSION=`cat ${VERSION_FILE}` @@ -12,19 +13,38 @@ diff -Naur ossec-hids-2.6-orig/install.sh ossec-hids-2.6/install.sh - echo "TYPE=\"${INSTYPE}\"" >> ${OSSEC_INIT} - chmod 600 ${OSSEC_INIT} - cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT} -- chmod 644 ${INSTALLDIR}${OSSEC_INIT} -+ echo chmod 700 ${OSSEC_INIT} > /dev/null 2>&1 -+ echo "DIRECTORY=\"${INSTALLDIR}\"" > ${INSTALLDIR}${OSSEC_INIT} -+ echo "VERSION=\"${VERSION}\"" >> ${INSTALLDIR}${OSSEC_INIT} -+ echo "DATE=\"`date`\"" >> ${INSTALLDIR}${OSSEC_INIT} -+ echo "TYPE=\"${INSTYPE}\"" >> ${INSTALLDIR}${OSSEC_INIT} -+ echo chmod 600 ${OSSEC_INIT} -+ echo cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT} -+ echo chmod 644 ${INSTALLDIR}${OSSEC_INIT} +- chmod 640 ${INSTALLDIR}${OSSEC_INIT} ++ # chmod 700 ${OSSEC_INIT} > /dev/null 2>&1 ++ # echo "DIRECTORY=\"${INSTALLDIR}\"" > ${OSSEC_INIT} ++ # echo "VERSION=\"${VERSION}\"" >> ${OSSEC_INIT} ++ # echo "DATE=\"`date`\"" >> ${OSSEC_INIT} ++ # echo "TYPE=\"${INSTYPE}\"" >> ${OSSEC_INIT} ++ # chmod 600 ${OSSEC_INIT} ++ # cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT} ++ # chmod 640 ${INSTALLDIR}${OSSEC_INIT} # If update_rules is set, we need to tweak -@@ -926,11 +926,6 @@ +@@ -148,12 +148,12 @@ Install() + fi + + # Calling the init script to start ossec hids during boot +- if [ "X${update_only}" = "X" ]; then +- runInit +- if [ $? = 1 ]; then +- notmodified="yes" +- fi +- fi ++ # if [ "X${update_only}" = "X" ]; then ++ # runInit ++ # if [ $? = 1 ]; then ++ # notmodified="yes" ++ # fi ++ # fi + + } + +@@ -965,10 +965,10 @@ main() catError "0x1-location"; fi @@ -32,145 +52,246 @@ diff -Naur ossec-hids-2.6-orig/install.sh ossec-hids-2.6/install.sh - if [ ! "X$ME" = "Xroot" ]; then - catError "0x2-beroot"; - fi -- ++ # # Must be root ++ # if [ ! "X$ME" = "Xroot" ]; then ++ # catError "0x2-beroot"; ++ # fi + # Checking dependencies checkDependencies - -diff -Naur ossec-hids-2.6-orig/src/InstallAgent.sh ossec-hids-2.6/src/InstallAgent.sh ---- ossec-hids-2.6-orig/src/InstallAgent.sh 2011-07-11 15:36:58.000000000 -0400 -+++ ossec-hids-2.6/src/InstallAgent.sh 2012-07-09 09:56:12.061870552 -0400 -@@ -80,7 +80,7 @@ +diff --git a/src/Makefile b/src/Makefile +index 7fc04c0b..0eb27a0a 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -144,7 +144,7 @@ endif + ifeq (${uname_S},AIX) + INSTALL_CMD?=./install-shim-aix.ksh -m $(1) -o $(2) -g $(3) else - grep "^${USER}" /etc/passwd > /dev/null 2>&1 - if [ ! $? = 0 ]; then -- /usr/sbin/groupadd ${GROUP} -+ echo /usr/sbin/groupadd ${GROUP} - - # We first check if /sbin/nologin is present. If it is not, - # we look for bin/false. If none of them is present, we -@@ -93,7 +93,7 @@ - OSMYSHELL="/bin/false" - fi - fi -- /usr/sbin/useradd -d ${DIR} -s ${OSMYSHELL} -g ${GROUP} ${USER} -+ echo /usr/sbin/useradd -d ${DIR} -s ${OSMYSHELL} -g ${GROUP} ${USER} - fi - fi - -@@ -105,31 +105,31 @@ - done - - # Default for all directories --chmod -R 550 ${DIR} --chown -R root:${GROUP} ${DIR} -+echo chmod -R 550 ${DIR} -+echo chown -R root:${GROUP} ${DIR} - - # To the ossec queue (default for agentd to read) --chown -R ${USER}:${GROUP} ${DIR}/queue/ossec --chmod -R 770 ${DIR}/queue/ossec -+echo chown -R ${USER}:${GROUP} ${DIR}/queue/ossec -+echo chmod -R 770 ${DIR}/queue/ossec - - # For the logging user --chown -R ${USER}:${GROUP} ${DIR}/logs --chmod -R 750 ${DIR}/logs --chmod -R 775 ${DIR}/queue/rids --touch ${DIR}/logs/ossec.log --chown ${USER}:${GROUP} ${DIR}/logs/ossec.log --chmod 664 ${DIR}/logs/ossec.log +- INSTALL_CMD?=install -m $(1) -o $(2) -g $(3) ++ INSTALL_CMD?=install + endif + + ifdef DEBUGAD +@@ -404,10 +404,10 @@ endif + install: install-${TARGET} + + install-agent: install-common +- $(call INSTALL_CMD,0550,root,0) ossec-agentd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) agent-auth ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-agentd ${PREFIX}/bin ++ $(call INSTALL_CMD) agent-auth ${PREFIX}/bin + +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/rids + + install-local: install-server-generic + +@@ -416,133 +416,126 @@ install-hybrid: install-server-generic + install-server: install-server-generic + + install-common: build +- ./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM} ${OSSEC_GROUP} ${PREFIX} +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/ +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs +- $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/ossec.log - --chown -R ${USER}:${GROUP} ${DIR}/queue/diff --chmod -R 750 ${DIR}/queue/diff --chmod 740 ${DIR}/queue/diff/* > /dev/null 2>&1 -+echo chown -R ${USER}:${GROUP} ${DIR}/logs -+echo chmod -R 750 ${DIR}/logs -+echo chmod -R 775 ${DIR}/queue/rids -+echo touch ${DIR}/logs/ossec.log -+echo chown ${USER}:${GROUP} ${DIR}/logs/ossec.log -+echo chmod 664 ${DIR}/logs/ossec.log -+ -+echo chown -R ${USER}:${GROUP} ${DIR}/queue/diff -+echo chmod -R 750 ${DIR}/queue/diff -+echo chmod 740 ${DIR}/queue/diff/* "> /dev/null 2>&1" +- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-logcollector ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-syscheckd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-execd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) manage_agents ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ../contrib/util.sh ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control ++ $(call INSTALL_CMD) -d ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-logcollector ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-syscheckd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-execd ${PREFIX}/bin ++ $(call INSTALL_CMD) manage_agents ${PREFIX}/bin ++ $(call INSTALL_CMD) ../contrib/util.sh ${PREFIX}/bin/ ++ $(call INSTALL_CMD) ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control + ifeq (${LUA_ENABLE},yes) +- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua +- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/native +- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/compiled +- $(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/ ++ $(call INSTALL_CMD) -d ${PREFIX}/lua ++ $(call INSTALL_CMD) -d ${PREFIX}/lua/native ++ $(call INSTALL_CMD) -d ${PREFIX}/lua/compiled ++ $(call INSTALL_CMD) ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/ ++ $(call INSTALL_CMD) ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/ + endif +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/queue +- $(call INSTALL_CMD,0770,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/alerts +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/ossec +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/syscheck +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/diff ++ $(call INSTALL_CMD) -d ${PREFIX}/queue ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/alerts ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/ossec ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/syscheck ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/diff +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/etc ++ $(call INSTALL_CMD) -d ${PREFIX}/etc + ifeq (${INSTALL_LOCALTIME},yes) +- $(call INSTALL_CMD,0440,root,${OSSEC_GROUP}) /etc/localtime ${PREFIX}/etc ++ $(call INSTALL_CMD) /etc/localtime ${PREFIX}/etc + endif + ifeq (${INSTALL_RESOLVCONF},yes) +- $(call INSTALL_CMD,0440,root,${OSSEC_GROUP}) /etc/resolv.conf ${PREFIX}/etc ++ $(call INSTALL_CMD) /etc/resolv.conf ${PREFIX}/etc + endif - # For the etc dir --chmod 550 ${DIR}/etc --chown -R root:${GROUP} ${DIR}/etc -+echo chmod 550 ${DIR}/etc -+echo chown -R root:${GROUP} ${DIR}/etc +- $(call INSTALL_CMD,1550,root,${OSSEC_GROUP}) -d ${PREFIX}/tmp ++ $(call INSTALL_CMD) -d ${PREFIX}/tmp + + ifneq (,$(wildcard /etc/TIMEZONE)) +- $(call INSTALL_CMD,440,root,${OSSEC_GROUP}) /etc/TIMEZONE ${PREFIX}/etc/ ++ $(call INSTALL_CMD) /etc/TIMEZONE ${PREFIX}/etc/ + endif + # Solaris Needs some extra files + ifeq (${uname_S},SunOS) +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/usr/share/lib/zoneinfo/ ++ $(call INSTALL_CMD) -d ${PREFIX}/usr/share/lib/zoneinfo/ + cp -r /usr/share/lib/zoneinfo/* ${PREFIX}/usr/share/lib/zoneinfo/ + endif +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/internal_options.conf ${PREFIX}/etc/ ++ $(call INSTALL_CMD) -b ../etc/internal_options.conf ${PREFIX}/etc/ + ifeq (,$(wildcard ${PREFIX}/etc/local_internal_options.conf)) +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf ++ $(call INSTALL_CMD) ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf + endif + ifeq (,$(wildcard ${PREFIX}/etc/client.keys)) +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) /dev/null ${PREFIX}/etc/client.keys ++ $(call INSTALL_CMD) /dev/null ${PREFIX}/etc/client.keys + endif + ifeq (,$(wildcard ${PREFIX}/etc/ossec.conf)) + ifneq (,$(wildcard ../etc/ossec.mc)) +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/ossec.mc ${PREFIX}/etc/ossec.conf ++ $(call INSTALL_CMD) ../etc/ossec.mc ${PREFIX}/etc/ossec.conf + else +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf ++ $(call INSTALL_CMD) ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf + endif + endif + +- $(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/etc/shared +- $(call INSTALL_CMD,0640,${OSSEC_USER},${OSSEC_GROUP}) rootcheck/db/*.txt ${PREFIX}/etc/shared/ ++ $(call INSTALL_CMD) -d ${PREFIX}/etc/shared ++ $(call INSTALL_CMD) rootcheck/db/*.txt ${PREFIX}/etc/shared/ + +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response/bin +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/agentless +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) agentlessd/scripts/* ${PREFIX}/agentless/ ++ $(call INSTALL_CMD) -d ${PREFIX}/active-response ++ $(call INSTALL_CMD) -d ${PREFIX}/active-response/bin ++ $(call INSTALL_CMD) -d ${PREFIX}/agentless ++ $(call INSTALL_CMD) agentlessd/scripts/* ${PREFIX}/agentless/ + +- $(call INSTALL_CMD,0700,root,${OSSEC_GROUP}) -d ${PREFIX}/.ssh ++ $(call INSTALL_CMD) -d ${PREFIX}/.ssh + +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/*.sh ${PREFIX}/active-response/bin/ +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/ ++ $(call INSTALL_CMD) ../active-response/*.sh ${PREFIX}/active-response/bin/ ++ $(call INSTALL_CMD) ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/ + +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/var +- $(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/var/run +- +- ./init/fw-check.sh execute ++ $(call INSTALL_CMD) -d ${PREFIX}/var ++ $(call INSTALL_CMD) -d ${PREFIX}/var/run - ls /etc/localtime > /dev/null 2>&1 - if [ $? = 0 ]; then -@@ -167,25 +167,25 @@ - cp -pr ../etc/client.keys ${DIR}/etc/ > /dev/null 2>&1 - cp -pr agentlessd/scripts/* ${DIR}/agentless/ --chown root:${GROUP} ${DIR}/etc/internal_options.conf --chown root:${GROUP} ${DIR}/etc/local_internal_options.conf > /dev/null 2>&1 --chown root:${GROUP} ${DIR}/etc/client.keys > /dev/null 2>&1 --chown root:${GROUP} ${DIR}/agentless/* --chown ${USER}:${GROUP} ${DIR}/.ssh --chown -R root:${GROUP} ${DIR}/etc/shared + + install-server-generic: install-common +- $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/active-responses.log +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/archives +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/alerts +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/firewall +- +- $(call INSTALL_CMD,0550,root,0) ossec-agentlessd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-analysisd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-monitord ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-reportd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-maild ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-remoted ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-logtest ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-csyslogd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-authd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-dbd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-makelists ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) verify-agent-conf ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) clear_stats ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) list_agents ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) ossec-regex ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) syscheck_update ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) agent_control ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) syscheck_control ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) rootcheck_control ${PREFIX}/bin/ - --chmod 550 ${DIR}/etc --chmod 440 ${DIR}/etc/internal_options.conf --chmod 440 ${DIR}/etc/local_internal_options.conf > /dev/null 2>&1 --chmod 440 ${DIR}/etc/client.keys > /dev/null 2>&1 --chmod -R 770 ${DIR}/etc/shared # ossec must be able to write to it --chmod 550 ${DIR}/agentless/* --chmod 700 ${DIR}/.ssh -+echo chown root:${GROUP} ${DIR}/etc/internal_options.conf -+echo chown root:${GROUP} ${DIR}/etc/local_internal_options.conf "> /dev/null 2>&1" -+echo chown root:${GROUP} ${DIR}/etc/client.keys "> /dev/null 2>&1" -+echo chown root:${GROUP} ${DIR}/agentless/* -+echo chown ${USER}:${GROUP} ${DIR}/.ssh -+echo chown -R root:${GROUP} ${DIR}/etc/shared +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/stats +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/rules ++ $(call INSTALL_CMD) /dev/null ${PREFIX}/logs/active-responses.log ++ $(call INSTALL_CMD) -d ${PREFIX}/logs/archives ++ $(call INSTALL_CMD) -d ${PREFIX}/logs/alerts ++ $(call INSTALL_CMD) -d ${PREFIX}/logs/firewall + -+echo chmod 550 ${DIR}/etc -+echo chmod 440 ${DIR}/etc/internal_options.conf -+echo chmod 440 ${DIR}/etc/local_internal_options.conf > /dev/null 2>&1 -+echo chmod 440 ${DIR}/etc/client.keys > /dev/null 2>&1 -+echo chmod -R 770 ${DIR}/etc/shared # ossec must be able to write to it -+echo chmod 550 ${DIR}/agentless/* -+echo chmod 700 ${DIR}/.ssh - - - # For the /var/run --chmod 770 ${DIR}/var/run --chown root:${GROUP} ${DIR}/var/run -+echo chmod 770 ${DIR}/var/run -+echo chown root:${GROUP} ${DIR}/var/run - - - # Moving the binary files -@@ -201,11 +201,11 @@ - sh ./init/fw-check.sh execute > /dev/null - cp -pr ../active-response/*.sh ${DIR}/active-response/bin/ - cp -pr ../active-response/firewalls/*.sh ${DIR}/active-response/bin/ --chmod 755 ${DIR}/active-response/bin/* --chown root:${GROUP} ${DIR}/active-response/bin/* -+echo chmod 755 ${DIR}/active-response/bin/* -+echo chown root:${GROUP} ${DIR}/active-response/bin/* - --chown root:${GROUP} ${DIR}/bin/* --chmod 550 ${DIR}/bin/* -+echo chown root:${GROUP} ${DIR}/bin/* -+echo chmod 550 ${DIR}/bin/* - - - # Moving the config file -@@ -221,8 +221,8 @@ - else - cp -pr ../etc/ossec-agent.conf ${DIR}/etc/ossec.conf - fi --chown root:${GROUP} ${DIR}/etc/ossec.conf --chmod 440 ${DIR}/etc/ossec.conf -+echo chown root:${GROUP} ${DIR}/etc/ossec.conf -+echo chmod 440 ${DIR}/etc/ossec.conf ++ $(call INSTALL_CMD) ossec-agentlessd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-analysisd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-monitord ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-reportd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-maild ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-remoted ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-logtest ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-csyslogd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-authd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-dbd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-makelists ${PREFIX}/bin ++ $(call INSTALL_CMD) verify-agent-conf ${PREFIX}/bin/ ++ $(call INSTALL_CMD) clear_stats ${PREFIX}/bin/ ++ $(call INSTALL_CMD) list_agents ${PREFIX}/bin/ ++ $(call INSTALL_CMD) ossec-regex ${PREFIX}/bin/ ++ $(call INSTALL_CMD) syscheck_update ${PREFIX}/bin/ ++ $(call INSTALL_CMD) agent_control ${PREFIX}/bin/ ++ $(call INSTALL_CMD) syscheck_control ${PREFIX}/bin/ ++ $(call INSTALL_CMD) rootcheck_control ${PREFIX}/bin/ ++ ++ $(call INSTALL_CMD) -d ${PREFIX}/stats ++ $(call INSTALL_CMD) -d ${PREFIX}/rules + ifneq (,$(wildcard ${PREFIX}/rules/local_rules.xml)) + cp ${PREFIX}/rules/local_rules.xml ${PREFIX}/rules/local_rules.xml.installbackup +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml ++ $(call INSTALL_CMD) -b ../etc/rules/*.xml ${PREFIX}/rules ++ $(call INSTALL_CMD) ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml + rm ${PREFIX}/rules/local_rules.xml.installbackup + else +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules ++ $(call INSTALL_CMD) -b ../etc/rules/*.xml ${PREFIX}/rules + endif + +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/fts ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/fts + +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rootcheck ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/rootcheck + +- $(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/agent-info +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/agentless ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/agent-info ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/agentless + +- $(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/rids +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/decoder.xml ${PREFIX}/etc/ ++ $(call INSTALL_CMD) ../etc/decoder.xml ${PREFIX}/etc/ + rm -f ${PREFIX}/etc/shared/merged.mg diff --git a/pkgs/tools/security/ossec/server.nix b/pkgs/tools/security/ossec/server.nix new file mode 100644 index 0000000000000..1a7a3e8136758 --- /dev/null +++ b/pkgs/tools/security/ossec/server.nix @@ -0,0 +1,70 @@ +{ lib, stdenv, fetchFromGitHub, which, pcre2, zlib, ncurses, openssl }: +let + version = "unstable-2023-08-09"; +in +stdenv.mkDerivation { + pname = "ossec-server"; + inherit version; + + src = fetchFromGitHub { + owner = "ossec"; + repo = "ossec-hids"; + rev = "c8a36b0af3d4ee5252855b90236407cbfb996eb2"; + sha256 = "sha256-AZ8iubyhNHXGR/l+hA61ifNDUoan7AQ42l/uRTt5GmE="; + }; + + # clear is used during the build process + nativeBuildInputs = [ ncurses ]; + + buildInputs = [ which pcre2 zlib openssl ]; + + # patch to remove root manipulation, install phase which tries to add users to the system, and init phase which tries to modify the system to launch files + patches = [ ./no-root.patch ]; + + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of + # `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here + env.NIX_CFLAGS_COMPILE = "-fcommon"; + + buildPhase = '' + mkdir -p $out/logs + export USER_DIR="$out" # just to satisy the script + ./install.sh <<EOF +en + +server +n +n +EOF + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + mv $out/active-response/bin/* $out/bin + mv $out/etc $out/share + mv $out/queue $out/share + mv $out/var $out/share + mv $out/agentless $out/share + mv $out/.ssh $out/share + mv $out/logs $out/share + mv $out/rules $out/share + mv $out/stats $out/share + rm -r $out/active-response + rm -r $out/tmp + ls -lah $out + + runHook postInstall + ''; + + meta = with lib; { + description = "Open source host-based instrusion detection system"; + homepage = "https://www.ossec.net"; + license = licenses.gpl2; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/tools/security/otpauth/default.nix b/pkgs/tools/security/otpauth/default.nix index 032372d87e92c..e4ffadef63e00 100644 --- a/pkgs/tools/security/otpauth/default.nix +++ b/pkgs/tools/security/otpauth/default.nix @@ -5,17 +5,16 @@ buildGoModule rec { pname = "otpauth"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "dim13"; repo = "otpauth"; rev = "v${version}"; - sha256 = "sha256-jeKxCuE3cA/oTEKwdrCGPchsrtaMyirTzv8oLl9gxtA="; + sha256 = "sha256-1+A1oXY5sKMr9dVa/4vB+ZkfZSDdhag5y5LfM7OJmKo="; }; - vendorHash = "sha256-jnIq7Zc2MauJReJ9a8TeqXXsvHixsBB+znmXAxcpqUQ="; - doCheck = true; + vendorHash = "sha256-ZRCwZGlWzlWh+E3KUH83639Tfck7bwE36wXVnG7EQIE="; meta = with lib; { description = "Google Authenticator migration decoder"; diff --git a/pkgs/tools/security/pass/wofi-pass.nix b/pkgs/tools/security/pass/wofi-pass.nix index f205d8881e516..b6edce34d20c9 100644 --- a/pkgs/tools/security/pass/wofi-pass.nix +++ b/pkgs/tools/security/pass/wofi-pass.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "wofi-pass"; - version = "23.1.2"; + version = "23.1.4"; src = fetchFromGitHub { owner = "schmidtandreas"; repo = "wofi-pass"; rev = "v${version}"; - sha256 = "sha256-Z1a+nfnL6NXhufpCU7VIkwuifoS88Pf9qI8GCuP/Zqc="; + sha256 = "sha256-Ycu1NFHoglJdOzGuJ7yfmDo1+f+FMPkpQXJuz6nvtig="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/passage/default.nix b/pkgs/tools/security/passage/default.nix index ba7717771c004..1d6bdfa225aab 100644 --- a/pkgs/tools/security/passage/default.nix +++ b/pkgs/tools/security/passage/default.nix @@ -5,6 +5,12 @@ , substituteAll , age , getopt +, coreutils +, findutils +, gnugrep +, gnused +, qrencode ? null +, wl-clipboard ? null , git ? null , xclip ? null # Used to pretty-print list of all stored passwords, but is not needed to fetch @@ -32,7 +38,18 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeBinaryWrapper ]; - extraPath = lib.makeBinPath [ age git xclip tree ]; + extraPath = lib.makeBinPath [ + age + coreutils + findutils + git + gnugrep + gnused + qrencode + tree + wl-clipboard + xclip + ]; # Using $0 is bad, it causes --help to mention ".passage-wrapped". postInstall = '' @@ -46,7 +63,7 @@ stdenv.mkDerivation { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://github.com/FiloSottile/passage"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ kaction ]; + maintainers = with maintainers; [ kaction ma27 ]; platforms = platforms.unix; mainProgram = "passage"; diff --git a/pkgs/tools/security/pcsc-tools/default.nix b/pkgs/tools/security/pcsc-tools/default.nix new file mode 100644 index 0000000000000..9e63572fd4919 --- /dev/null +++ b/pkgs/tools/security/pcsc-tools/default.nix @@ -0,0 +1,96 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoconf-archive +, autoreconfHook +, gobject-introspection +, makeWrapper +, pkg-config +, wrapGAppsHook +, systemd +, dbus +, pcsclite +, PCSC +, wget +, coreutils +, perlPackages +, testers +, nix-update-script +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pcsc-tools"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "LudovicRousseau"; + repo = "pcsc-tools"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-tTeSlS1ncpdIaoJsSVgm3zSCogP6S8zlA9hRFocZ/R4="; + }; + + configureFlags = [ + "--datarootdir=${placeholder "out"}/share" + ]; + + buildInputs = [ dbus perlPackages.perl pcsclite ] + ++ lib.optional stdenv.isDarwin PCSC + ++ lib.optional stdenv.isLinux systemd; + + nativeBuildInputs = [ + autoconf-archive + autoreconfHook + gobject-introspection + makeWrapper + pkg-config + wrapGAppsHook + ]; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postInstall = '' + wrapProgram $out/bin/scriptor \ + --set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC libintl-perl ]}" + + wrapProgram $out/bin/gscriptor \ + ''${makeWrapperArgs[@]} \ + --set PERL5LIB "${with perlPackages; makePerlPath [ + ChipcardPCSC + libintl-perl + GlibObjectIntrospection + Glib + Gtk3 + Pango + Cairo + CairoGObject + ]}" + + wrapProgram $out/bin/ATR_analysis \ + --set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC libintl-perl ]}" + + wrapProgram $out/bin/pcsc_scan \ + --prefix PATH : "$out/bin:${lib.makeBinPath [ coreutils wget ]}" + + install -Dm444 -t $out/share/pcsc smartcard_list.txt + ''; + + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "pcsc_scan -V"; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Tools used to test a PC/SC driver, card or reader"; + homepage = "https://pcsc-tools.apdu.fr/"; + changelog = "https://github.com/LudovicRousseau/pcsc-tools/releases/tag/${finalAttrs.version}"; + license = licenses.gpl2Plus; + mainProgram = "pcsc_scan"; + maintainers = with maintainers; [ peterhoeg anthonyroussel ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix deleted file mode 100644 index ec2a5f3fb3058..0000000000000 --- a/pkgs/tools/security/pcsctools/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, autoreconfHook -, makeWrapper -, pkg-config -, systemd -, dbus -, pcsclite -, wget -, coreutils -, perlPackages -}: - -stdenv.mkDerivation rec { - pname = "pcsc-tools"; - version = "1.6.2"; - - src = fetchFromGitHub { - owner = "LudovicRousseau"; - repo = pname; - rev = version; - sha256 = "sha256-c7md8m1llvz0EQqA0qY4aGb3guGFoj+8uS4hUTzie5o="; - }; - - postPatch = '' - substituteInPlace ATR_analysis \ - --replace /usr/local/pcsc /etc/pcsc \ - --replace /usr/share/pcsc $out/share/pcsc - ''; - - buildInputs = [ dbus perlPackages.perl pcsclite ] - ++ lib.optional stdenv.isLinux systemd; - - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - - postInstall = '' - wrapProgram $out/bin/scriptor \ - --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl ]}" - wrapProgram $out/bin/gscriptor \ - --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl GlibObjectIntrospection Glib Gtk3 Pango Cairo CairoGObject ]}" - wrapProgram $out/bin/ATR_analysis \ - --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl ]}" - wrapProgram $out/bin/pcsc_scan \ - --prefix PATH : "$out/bin:${lib.makeBinPath [ coreutils wget ]}" - - install -Dm444 -t $out/share/pcsc smartcard_list.txt - ''; - - meta = with lib; { - description = "Tools used to test a PC/SC driver, card or reader"; - homepage = "https://pcsc-tools.apdu.fr/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/security/pinentry-rofi/default.nix b/pkgs/tools/security/pinentry-rofi/default.nix index 67b23697525cf..a7f92818b8b7c 100644 --- a/pkgs/tools/security/pinentry-rofi/default.nix +++ b/pkgs/tools/security/pinentry-rofi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pinentry-rofi"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "plattfot"; repo = pname; rev = version; - sha256 = "sha256-H9Y7oPLpDuKtIy80HLS8/iXpOq8ZKiy8ZIH2NwguetY="; + sha256 = "sha256-6dhzzxjE3GE5JZTirMLeMh91BS2wzDZoubgf4Wefe1o="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index baa78521f3456..dca48f4e21087 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -2,7 +2,7 @@ , libgpg-error, libassuan, qtbase, wrapQtAppsHook , ncurses, gtk2, gcr , withLibsecret ? true, libsecret -, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] +, enabledFlavors ? [ "curses" "tty" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] ++ lib.optionals (!stdenv.isDarwin) [ "qt" ] }: diff --git a/pkgs/tools/security/rblake2sum/default.nix b/pkgs/tools/security/rblake2sum/default.nix index a5a4a1bce76c3..8f2a868363560 100644 --- a/pkgs/tools/security/rblake2sum/default.nix +++ b/pkgs/tools/security/rblake2sum/default.nix @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/crev-dev/rblake2sum"; license = [ licenses.mit ]; maintainers = with maintainers; [ dpc ]; + mainProgram = "rblake2sum"; }; } diff --git a/pkgs/tools/security/rblake3sum/default.nix b/pkgs/tools/security/rblake3sum/default.nix new file mode 100644 index 0000000000000..341dcd06fb6a7 --- /dev/null +++ b/pkgs/tools/security/rblake3sum/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, Security +}: +rustPlatform.buildRustPackage { + pname = "rblake3sum"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "rustshop"; + repo = "rblake3sum"; + rev = "6a8e2576ccc05214eacb75b75a9d4cfdf272161c"; + hash = "sha256-UFk6SJVA58WXhH1CIuT48MEF19yPUe1HD+ekn4LDj8g="; + }; + + cargoHash = "sha256-SE/Zg/UEV/vhB/VDcn8Y70OUIoxbJBh6H2QgFMkWPc4="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "A recursive blake3 digest (hash) of a file-system path"; + homepage = "https://github.com/rustshop/rblake3sum"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ dpc ]; + mainProgram = "rblake3sum"; + }; +} diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index d8a48cf65abc7..afc07a63d6038 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,13 +4,13 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - hash = "sha256-CFavEtv6wL6jiUayjyU27OkdToXIM4EP7v5ONFdAJ5w="; + hash = "sha256-vU/qxCMCC2XWH79Z7cGhMlqMeQOMghTPDfROWdusKX4="; # 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; @@ -23,7 +23,7 @@ let ''; }; - vendorHash = "sha256-BLK8IJWL2sZ5bdnJU48/XhplSGUOL8gE7pY8rL+rVFk="; + vendorHash = "sha256-qhBbzYYayRktBQi9HtzuxBIlSdNIOD/agCFFNEvlcBc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index e6eff66bb60f8..a4246f3c4df40 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.12"; + version = "2.36.13"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-egsAUaGYe06hlPUE4J4acdrfMlDEY/8g0g9KPPJyMlI="; + sha256 = "sha256-cLH1GcMgTPnPJVpHOQkW71hf0MKusL8NRc1YQsNSW2I="; }; - vendorHash = "sha256-hdt/XhxMuR6YlvY/Qu2AjY5F75YvYLlv0LfuMwJQkl4="; + vendorHash = "sha256-E3WYExtV4VsrBZ0uEQZ36CUCK+qf8LTPlNwcdO0eEzA="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/tools/security/sbctl/default.nix b/pkgs/tools/security/sbctl/default.nix index 0778406b40cb5..a5fe6cf6548c6 100644 --- a/pkgs/tools/security/sbctl/default.nix +++ b/pkgs/tools/security/sbctl/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "sbctl"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "Foxboron"; repo = pname; rev = version; - hash = "sha256-1dA+a8GS4teaLmclatJNKt+OjhabLO4j/+p4Q95yG/s="; + hash = "sha256-vxPYWoBU4k2fKWXGaMzIkUdj+EmPWTtCvMwAVmsgKaE="; }; vendorHash = "sha256-kVXzHTONPCE1UeAnUiULjubJeZFD0DAxIk+w8/Dqs6c="; diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index d0dc599edd8c1..817f459956433 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "0.7.10"; + version = "0.7.11"; pyproject = true; src = fetchFromGitHub { owner = "SigmaHQ"; repo = "sigma-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Sy9adkmR7Vu7kI75XG0PXihFogPaNwzHH2U5uSz9mZA="; + hash = "sha256-cNrI+YWwLK9sgvVYPOcTXW29omVRqnhh/458FuaoODo="; }; postPatch = '' diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 4533ad33da68f..abebc4e3e1243 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.8.3"; + version = "1.8.7"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xfSOmUfBoIQSI9u2YD3CxBIOiT7QxMi3fJZUVeZo39o="; + sha256 = "sha256-D6NNG//1rM7EIzawKdMA/8nloqMNAkF75YyFpHvxUkI="; }; - vendorHash = "sha256-9j/EZntVW40QHYJi9NvAKX/4uGxLolk75GNennQ6ymY="; + vendorHash = "sha256-bSQitqXTY1LMnpGkXAmDiDsMd0xZHrcr/Ms1F6avBKM="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/pkgs/tools/security/ssb/default.nix b/pkgs/tools/security/ssb/default.nix deleted file mode 100644 index 725f72e6c7cf8..0000000000000 --- a/pkgs/tools/security/ssb/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "ssb"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "kitabisa"; - repo = pname; - rev = "v${version}"; - sha256 = "0dkd02l30461cwn5hsssnjyb9s8ww179wll3l7z5hy1hv3x6h9g1"; - }; - - vendorHash = null; - - meta = with lib; { - description = "Tool to bruteforce SSH server"; - homepage = "https://github.com/kitabisa/ssb"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check - }; -} diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/tools/security/ssh-audit/default.nix index 668f3c206f611..54ec4e8f4ee1e 100644 --- a/pkgs/tools/security/ssh-audit/default.nix +++ b/pkgs/tools/security/ssh-audit/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "ssh-audit"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; src = fetchFromGitHub { owner = "jtesta"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+v+DLZPDC5uffTIJPzMvY/nLoy7BGiAsTddjNZZhTpo="; + sha256 = "sha256-pO6qpY1gqE40bb7q8J/35Dd0XckoFAaIBwWjFsxFO3c="; }; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/tools/security/sss-cli/default.nix b/pkgs/tools/security/sss-cli/default.nix new file mode 100644 index 0000000000000..80daa4a6627ea --- /dev/null +++ b/pkgs/tools/security/sss-cli/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "sss-cli"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "dsprenkels"; + repo = "sss-cli"; + rev = "v${version}"; + hash = "sha256-9Wht+t48SsWpj1z2yY6P7G+h9StmuqfMdODtyPffhak="; + }; + + cargoPatches = [ ./fix-cargo-lock.patch ]; + + cargoHash = "sha256-nKb0J9ym3ZYC80KemwQwT5vVtQUngYD4/091hAIYAiU="; + + meta = with lib; { + homepage = "https://github.com/dsprenkels/sss-cli"; + description = "Command line program for secret-sharing strings"; + license = licenses.mit; + maintainers = with maintainers; [ laalsaas ]; + }; +} diff --git a/pkgs/tools/security/sss-cli/fix-cargo-lock.patch b/pkgs/tools/security/sss-cli/fix-cargo-lock.patch new file mode 100644 index 0000000000000..4af581c4962d8 --- /dev/null +++ b/pkgs/tools/security/sss-cli/fix-cargo-lock.patch @@ -0,0 +1,21 @@ +diff --git a/Cargo.lock b/Cargo.lock +index a57c5d8..27278d9 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,5 +1,7 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "aho-corasick" + version = "0.7.15" +@@ -253,7 +255,7 @@ dependencies = [ + + [[package]] + name = "shamirsecretsharing-cli" +-version = "0.1.0" ++version = "0.1.1" + dependencies = [ + "atty", + "clap", diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 7e149ad143bfe..5c1463ec117b8 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -12,20 +12,24 @@ buildGoModule rec { pname = "step-ca"; - version = "0.25.0"; + version = "0.25.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "refs/tags/v${version}"; - hash = "sha256-CO9Qjx4D6qNGjOdva88KRCJOQq85r5U5nwmXC1G94dY="; + hash = "sha256-cP3QypBNWGbr7R7lJLfaoBh6C37ubGuaxnxWlZ1Z000="; }; - vendorHash = "sha256-Weq8sS+8gsfdoVSBDm8E2DCrngfNsolqQR2/yd9etPo="; + vendorHash = "sha256-AXMMpzXEhdKSGeVg/KK2NEgalxIXP6DUTcoxOQVqow4="; - ldflags = [ "-buildid=" ]; + ldflags = [ + "-buildid=" + ]; - nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; + nativeBuildInputs = lib.optionals hsmSupport [ + pkg-config + ]; buildInputs = lib.optionals (hsmSupport && stdenv.isLinux) [ pcsclite ] @@ -43,9 +47,14 @@ buildGoModule rec { install -Dm444 -t $out/lib/systemd/system systemd/step-ca.service ''; + preCheck = '' + export HOME=$(mktemp -d) + ''; + # Tests start http servers which need to bind to local addresses: # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted __darwinAllowLocalNetworking = true; + # Tests need to run in a reproducible order, otherwise they run unreliably on # (at least) x86_64-linux. checkFlags = [ "-p 1" ]; diff --git a/pkgs/tools/security/step-kms-plugin/default.nix b/pkgs/tools/security/step-kms-plugin/default.nix index 66413b1798aca..9e948bf52dd6f 100644 --- a/pkgs/tools/security/step-kms-plugin/default.nix +++ b/pkgs/tools/security/step-kms-plugin/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-pbSv3qTQkeYWtg5HKu9kUIWYw6t6yKKA4GQuiwGEPD8="; + hash = "sha256-l0MMcLghhqVVQAdhk0a0nDqYvJbXCV2PFbRtiGQcDn0="; }; - vendorHash = "sha256-hb1Nn/+PVhhBByQ8I9MuUEd5di5jEZVMtSpm0+qBXQk="; + vendorHash = "sha256-3du8KlM08N5hKmzZWYZdfPOL5R+BspbK6ABF+RSJzHg="; proxyVendor = true; diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 526caf44d6792..455310c202b8c 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -5,7 +5,7 @@ , pkg-config , libxml2 , nettle -, withGTK3 ? true +, withGTK3 ? !stdenv.hostPlatform.isStatic , gtk3 }: diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 40056ec72eb89..0f1cc974b4b3b 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.15p2"; + version = "1.9.15p4"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - hash = "sha256-GZwM2/p+/P/6nIhoSo4vsgamK3CjFlB+SpHInIc7vMg="; + hash = "sha256-LiDsmGXu7qExbG9J7GrEZ4hptonU2QtEJDv0iH1t1TI="; }; prePatch = '' diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 9bff2f0679e4b..91470205666b0 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terrascan"; - version = "1.18.5"; + version = "1.18.11"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RDKy588qUvs0SGysz4DnQMliKiTJn4GA53kDyMZhzQE="; + hash = "sha256-BICXMSkfGDXOqBH+4UlJmqkUSV+oZa1wg7c20EtJ3WI="; }; vendorHash = "sha256-9zD81p/UjH43B0aeqlItP9vrGMaT/zhVYv60ot153Gc="; diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index 5280036646973..7628e14e3d0f5 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -5,16 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "theharvester"; - version = "4.4.4"; - format = "setuptools"; + version = "4.5.0"; + pyproject = true; src = fetchFromGitHub { owner = "laramies"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-L0WbPZE2alregOvWc+0nuMvsD17ayCw3JtahGhf4B1o="; + hash = "sha256-tnCiI4bte2RSWSkEL2rwFz6WFjfRMMFiEBOvv3QMyos="; }; + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + propagatedBuildInputs = with python3.pkgs; [ aiodns aiofiles diff --git a/pkgs/tools/security/threatest/default.nix b/pkgs/tools/security/threatest/default.nix index cfae26aaa034e..faa5977986fca 100644 --- a/pkgs/tools/security/threatest/default.nix +++ b/pkgs/tools/security/threatest/default.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "threatest"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "DataDog"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pCSSAEeVxi3/yK7B2g9ZZRU5TjdNd8qp+52Yc1HmxT8="; + hash = "sha256-rVRBrf/RTcHvKOLHNASzvij3fV+uQEuIVKb07CZ/cT0="; }; proxyVendor = true; - vendorHash = "sha256-nHA+UJP6gYWdbTKFcxw1gI6X2ueTUIsHVBIlaprPwsQ="; + vendorHash = "sha256-zwHcGy7wjy2yx7nMi88R+z+Is+YcqGRMK0czeBNlcdA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 34088e3afbc67..5fc68c0a1c292 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.9"; + version = "0.4.8.10"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-Wbt9iJD2ExtM5TRPPc6l3rIYK39PEP8MtOTYHxGyz2U="; + sha256 = "sha256-5ii0+rcO20cncVsjzykxN1qfdoWsCPLFnqSYoXhGOoY="; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index 4e8fd919f9ae5..d622ab5b93da6 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "5.5"; + version = "5.6"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-H9tJxzBTe/2u0IiISIGmHjv9Eh6VfsC9zu7AJhI2wSM="; + sha256 = "sha256-Usi8uq3KCCq/5et+5JZ9LWMthLFndnXy8HG20uwizsM="; }; patches = [ diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index fcaf193e32613..ac6577ceed928 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.63.1"; + version = "3.63.7"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-YZH3f5m/7RFf8acmDCw4wQY6LgI98I+5kTIwEFkTwiI="; + hash = "sha256-RI2lNlPlc49E2Z88hEAQzvuXzz62ROsFpp1a9YjNd6I="; }; - vendorHash = "sha256-+Boe/bzCsmihspGqmiJ3jOcRJ9KPjkzu6MBmgtAgwjE="; + vendorHash = "sha256-oZkrRaThXwBORoib1GIW7CUF5RGZJ5d/Jd6YM4z3ZIA="; ldflags = [ "-s" diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index 9282bf7bb9cec..8f25dc1a211aa 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.28.0"; + version = "0.32.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "variantdev"; repo = pname; - sha256 = "sha256-6sKwRYbWaKrnMLU+G4/s3CTjUYeovsWttAvk1MnIFPI="; + sha256 = "sha256-UBN0QMrYyYm7O1MrduGmXOSLZ5Qwjq0LMgvWhoVwzGI="; }; - vendorHash = "sha256-CwRhtC+Ome/oyTSd8rPpQ3TgBkFb9CM3XRc0k2g2lHU="; + vendorHash = "sha256-2gS4m+eQSrXcMtT/7AzPW5KcGww8gSJm2doyBa6pLHQ="; ldflags = [ "-s" diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index fb9ce6fd6d5a6..e86c160dbd4bb 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.14.4"; + version = "1.14.8"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-E7lEKsbl2L6KhLgAZbemCaTIjbsvl3wg3oCURn/Judc="; + sha256 = "sha256-sGCODCBgsxyr96zu9ntPmMM/gHVBBO+oo5+XsdbCK4E="; }; - vendorHash = "sha256-8ytAT7qVXAIfoeMyTBMJ6DiWn74sRM1WrrOYaKTlKMo="; + vendorHash = "sha256-zpHjZjgCgf4b2FAJQ22eVgq0YGoVvxGYJ3h/3ZRiyrQ="; proxyVendor = true; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index ca392d68a96d7..abb548e687757 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.15.2"; + version = "1.15.4"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-aawDrQu8wEZqJ/uyCJjtWcgy8Ut34B5P+odqddE5P3M="; - aarch64-linux = "sha256-thLVw//yIgPCAV9CdrRlINLg+cO5aB279I2aboZMF6w="; - i686-linux = "sha256-bUhtnQB5YZdDuB4uondln0D3itoTr+1FaqjgTiT76WA="; - x86_64-darwin = "sha256-+wZrWwbpibtCla1ydhDnLJsHrVymLzEXVE1KftZ+pOs="; - aarch64-darwin = "sha256-2FGiCzIAEyXTqRaKEDZK5d/PWl4EmvJl9NieiOdgOeY="; + x86_64-linux = "sha256-E1tNqPkaZVnJXtV+ENt2Ajpdq0AYMPZSFMLAFiSxknY="; + aarch64-linux = "sha256-p+pYU4WenDHZmQQQFTm2ttHjxL+63NWy8G+cbAZLJEI="; + i686-linux = "sha256-FoClSgz/QAD7uktFcYmKsCXnS8kIm8a7BLd2N29Z/fE="; + x86_64-darwin = "sha256-Lykhs/tTFDBqk8SJ26k712oMUAhXlmBeNNi3Ve/M1B4="; + aarch64-darwin = "sha256-r9OamlIgFUGgIFX1baQCdBsDGmPwZoTVu+Zab99KnhM="; }; in fetchzip { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "A tool for managing secrets, this binary includes the UI"; homepage = "https://www.vaultproject.io"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mpl20; + license = licenses.bsl11; maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick mkaito ]; mainProgram = "vault"; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index 52f153b6a30d3..3981366448be2 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -7,13 +7,13 @@ }: let - version = "2023.10.0"; + version = "2023.12.0"; bw_web_builds = fetchFromGitHub { owner = "dani-garcia"; repo = "bw_web_builds"; rev = "v${version}"; - hash = "sha256-5vfmMJIGKyZlTQDi/t1YKAALbW/6BFAcWODfkypk/eA="; + hash = "sha256-S98Yqi0PEpMF+enP/J3x/kPEe0VhErY8BNphOXmsijg="; }; in buildNpmPackage rec { pname = "vaultwarden-webvault"; @@ -23,10 +23,10 @@ in buildNpmPackage rec { owner = "bitwarden"; repo = "clients"; rev = "web-v${lib.removeSuffix "b" version}"; - hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ="; + hash = "sha256-eAwj7cWR/ojAMAvYg2/vtNWYTwVBCOnBJPy9mC5Td40="; }; - npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o="; + npmDepsHash = "sha256-VW1pGG/pc2tdSs5+HfypZv9fnQu04qkoFBTJxaYvBZo="; postPatch = '' ln -s ${bw_web_builds}/{patches,resources} .. diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix deleted file mode 100644 index 9a4f27a0debc4..0000000000000 --- a/pkgs/tools/security/volatility/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, python2Packages }: - -python2Packages.buildPythonApplication rec { - pname = "volatility"; - version = "2.6.1"; - - src = fetchFromGitHub { - owner = "volatilityfoundation"; - repo = pname; - rev = version; - sha256 = "1v92allp3cv3akk71kljcwxr27h1k067dsq7j9h8jnlwk9jxh6rf"; - }; - - doCheck = false; - - propagatedBuildInputs = with python2Packages; [ pycrypto distorm3 pillow ]; - - meta = with lib; { - homepage = "https://www.volatilityfoundation.org/"; - description = "Advanced memory forensics framework"; - maintainers = with maintainers; [ bosu ]; - license = licenses.gpl2Plus; - broken = true; - }; -} diff --git a/pkgs/tools/security/webanalyze/default.nix b/pkgs/tools/security/webanalyze/default.nix index 7c043c0d0a187..427d84c5282db 100644 --- a/pkgs/tools/security/webanalyze/default.nix +++ b/pkgs/tools/security/webanalyze/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "webanalyze"; - version = "0.3.9"; + version = "0.4.1"; src = fetchFromGitHub { owner = "rverton"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uDf0p4zw23+AVftMmrKfno+FbMZfGC1B5zvutj8qnPg="; + hash = "sha256-rnNbEPlbye0gjUamwq1xjFM/4g0eEHsGOAZWziEqxwM="; }; vendorHash = "sha256-XPOsC+HoLytgv1fhAaO5HYSvuOP6OhjLyOYTfiD64QI="; diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index d16f74940d3b0..42e6455ae7dd7 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -1,17 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles + +# testing +, testers +, witness +}: buildGoModule rec { pname = "witness"; - version = "0.1.14"; + version = "0.2.0"; src = fetchFromGitHub { - owner = "testifysec"; - repo = pname; + owner = "in-toto"; + repo = "witness"; rev = "v${version}"; - sha256 = "sha256-TUEbFkrS0OztTiY0OXiZsqraq3TINtC/DQEyCGPNXpE="; + sha256 = "sha256-U+dcaPi9Drg4I2SZlZPaR3Ryb+Dz27nyPI2XJPG/LWc="; }; - proxyVendor = true; - vendorHash = "sha256-L2NaEt64mgFZVta/F8/uUQ4djlra59JPcHJLGbFCQJs="; + vendorHash = "sha256-pjcyAGdR8TsU9YBy5zd6u575vDKPwy8s85TXUsuxZiU="; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +28,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/testifysec/witness/cmd.Version=v${version}" + "-X github.com/in-toto/witness/cmd.Version=v${version}" ]; # Feed in all tests for testing @@ -38,13 +45,11 @@ buildGoModule rec { --zsh <($out/bin/witness completion zsh) ''; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/witness --help - $out/bin/witness version | grep "v${version}" - runHook postInstallCheck - ''; + passthru.tests.version = testers.testVersion { + package = witness; + command = "witness version"; + version = "v${version}"; + }; meta = with lib; { description = "A pluggable framework for software supply chain security. Witness prevents tampering of build materials and verifies the integrity of the build process from source to target"; @@ -57,6 +62,7 @@ buildGoModule rec { PKI distribution system will mitigate against many software supply chain attack vectors and can be used as a framework for automated governance. ''; + mainProgram = "witness"; homepage = "https://github.com/testifysec/witness"; changelog = "https://github.com/testifysec/witness/releases/tag/v${version}"; license = licenses.asl20; diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock index b233f57a58179..186144a3b1a91 100644 --- a/pkgs/tools/security/wpscan/Gemfile.lock +++ b/pkgs/tools/security/wpscan/Gemfile.lock @@ -1,57 +1,57 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.7.4) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - cms_scanner (0.13.8) - ethon (>= 0.14, < 0.16) + cms_scanner (0.13.9) + ethon (>= 0.14, < 0.17) get_process_mem (~> 0.2.5) - nokogiri (>= 1.11.4, < 1.14.0) + nokogiri (>= 1.11.4, < 1.16.0) opt_parse_validator (~> 1.9.5) - public_suffix (~> 4.0.3) - ruby-progressbar (>= 1.10, < 1.12) - sys-proctable (~> 1.2.2) + public_suffix (>= 4.0.3, < 5.1.0) + ruby-progressbar (>= 1.10, < 1.14) + sys-proctable (>= 1.2.2, < 1.4.0) typhoeus (>= 1.3, < 1.5) xmlrpc (~> 0.3) yajl-ruby (~> 1.4.1) concurrent-ruby (1.2.2) - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.15.5) + ffi (1.16.3) get_process_mem (0.2.7) ffi (~> 1.0) i18n (1.14.1) concurrent-ruby (~> 1.0) - mini_portile2 (2.8.2) - minitest (5.18.1) - nokogiri (1.13.10) - mini_portile2 (~> 2.8.0) + mini_portile2 (2.8.5) + minitest (5.20.0) + nokogiri (1.15.5) + mini_portile2 (~> 2.8.2) racc (~> 1.4) opt_parse_validator (1.9.5) activesupport (>= 5.2, < 6.2.0) addressable (>= 2.5, < 2.9) - public_suffix (4.0.7) - racc (1.7.1) - ruby-progressbar (1.11.0) - sys-proctable (1.2.7) + public_suffix (5.0.4) + racc (1.7.3) + ruby-progressbar (1.13.0) + sys-proctable (1.3.0) ffi (~> 1.1) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) webrick (1.8.1) - wpscan (3.8.24) - cms_scanner (~> 0.13.8) - xmlrpc (0.3.2) + wpscan (3.8.25) + cms_scanner (~> 0.13.9) + xmlrpc (0.3.3) webrick yajl-ruby (1.4.3) - zeitwerk (2.6.8) + zeitwerk (2.6.12) PLATFORMS ruby @@ -60,4 +60,4 @@ DEPENDENCIES wpscan BUNDLED WITH - 2.4.13 + 2.4.22 diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/tools/security/wpscan/gemset.nix index 5cae455dd0143..abe19a29bf8f4 100644 --- a/pkgs/tools/security/wpscan/gemset.nix +++ b/pkgs/tools/security/wpscan/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s465919p6fcgcsqin8w8hay2m598dvnzks490hbsb0p68sdz69m"; + sha256 = "1nhrdih0rk46i0s6x7nqhbypmj1hf23zl5gfl9xasb6k4r2a1dxk"; type = "gem"; }; - version = "6.1.7.4"; + version = "6.1.7.6"; }; 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"; }; cms_scanner = { dependencies = ["ethon" "get_process_mem" "nokogiri" "opt_parse_validator" "public_suffix" "ruby-progressbar" "sys-proctable" "typhoeus" "xmlrpc" "yajl-ruby"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15d7djrrkrcwznglgkr4y80jbsbxaf071qhjnn4i1c4n7nszwwfj"; + sha256 = "0p3vdkkd04r31d503z5v0480xlq1fhiw77icbk5s17y6dwfacydy"; type = "gem"; }; - version = "0.13.8"; + version = "0.13.9"; }; concurrent-ruby = { groups = ["default"]; @@ -48,20 +48,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288"; + sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; get_process_mem = { dependencies = ["ffi"]; @@ -90,20 +90,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.5"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.18.1"; + version = "5.20.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -111,10 +111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; + sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12"; type = "gem"; }; - version = "1.13.10"; + version = "1.15.5"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -132,30 +132,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.4"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.3"; }; ruby-progressbar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; sys-proctable = { dependencies = ["ffi"]; @@ -163,10 +163,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121ix0bl19pawhljs17sfgddkd0hgxlhchsz9kxw14ipmskjq9ah"; + sha256 = "0m3fj6j1qpfszqnsvr6wpak0d9vw5ggylaqkalhl3m50kbbimxii"; type = "gem"; }; - version = "1.2.7"; + version = "1.3.0"; }; typhoeus = { dependencies = ["ethon"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; + sha256 = "0z7gamf6s83wy0yqms3bi4srirn3fc0lc7n65lqanidxcj1xn5qw"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -206,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qh7x5sjx1i9h8zrp86qz126brxbqx0c3wxc8vn7fpln0y78nw9q"; + sha256 = "1x04asq0aznbm6m79jlsv7mjbhq755759s4bi3qbyrv5rwpy7hji"; type = "gem"; }; - version = "3.8.24"; + version = "3.8.25"; }; xmlrpc = { dependencies = ["webrick"]; @@ -217,10 +217,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xa79ry3976ylap38cr5g6q3m81plm611flqd3dwgnmgbkycb6jp"; + sha256 = "0fwfnccagsjrbvrav5nbk3zracj9zncr7i375nn20jd4cfy4cggc"; type = "gem"; }; - version = "0.3.2"; + version = "0.3.3"; }; yajl-ruby = { groups = ["default"]; @@ -237,9 +237,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; type = "gem"; }; - version = "2.6.8"; + version = "2.6.12"; }; } diff --git a/pkgs/tools/security/xsubfind3r/default.nix b/pkgs/tools/security/xsubfind3r/default.nix index 6ec445696bf9f..7c5470a0715ae 100644 --- a/pkgs/tools/security/xsubfind3r/default.nix +++ b/pkgs/tools/security/xsubfind3r/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "xsubfind3r"; - version = "0.4.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hueristiq"; repo = "xsubfind3r"; rev = "refs/tags/${version}"; - hash = "sha256-Xlxn9IZ9TTDzkEkyBoBwrS9AdQX21mmHngm03w+c4UM="; + hash = "sha256-tukynKPcIwDwpH0/SFyif6OGVZrmLVdXfhrFaaVd1d8="; }; - vendorHash = "sha256-DkYQkuhBAYnGx9gxi2X/Coh0FYV+z5/4IX1zTfUM6uI="; + vendorHash = "sha256-0tX/s5a6PPQuEw3BTs6uW9c5OHqXryzIfDNPnQH5sS8="; ldflags = [ "-s" diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index f6bfe6db6958c..52102fcb1872f 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.131"; + version = "1.0.138"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-92OpvUt+0iN+UdEGjDdVCjUUlbuOjUgOjc+DGMUnx9U="; + sha256 = "sha256-QygghEMpIoYaIIzINHXKUQmkCdoZdScZLHlIW9sObWk="; }; - cargoHash = "sha256-FaQwxt3XcDOXlzcKEdMyE9TpmGykQOnJdxtM3EqMpfU="; + cargoHash = "sha256-HLqONTd+8kn6nUWEEJTGevJxntnfYEu5e41/wvENZAw="; 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 dd6ab9868aa85..9a24f59099093 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { version = testers.testVersion { - package = finalAttrs; + package = finalAttrs.finalPackage; }; # A lightweight *unit* test that exercises fakeroot and fakechroot together: nixos-etc = nixosTests.etc.test-etc-fakeroot; diff --git a/pkgs/tools/system/gnome-resources/default.nix b/pkgs/tools/system/gnome-resources/default.nix new file mode 100644 index 0000000000000..4a6bdbcf95dea --- /dev/null +++ b/pkgs/tools/system/gnome-resources/default.nix @@ -0,0 +1,71 @@ +{ fetchFromGitHub +, stdenv +, lib +, appstream-glib +, cargo +, desktop-file-utils +, meson +, pkg-config +, rustPlatform +, rustc +, glib +, wrapGAppsHook4 +, systemd +, polkit +, dmidecode +, gtk4 +, libadwaita +, ninja +}: +stdenv.mkDerivation rec { + pname = "gnome-resources"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "nokyan"; + repo = "resources"; + rev = "v${version}"; + hash = "sha256-OVz1vsmOtH/5sEuyl2BfDqG2/9D1HGtHA0FtPntKQT0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-SkCEA9CKqzy0wSIUj0DG6asIysD7G9i3nJ9jwhwAUqY="; + }; + + nativeBuildInputs = [ + pkg-config + desktop-file-utils + appstream-glib + meson + ninja + rustc + cargo + rustPlatform.cargoSetupHook + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + polkit + systemd + ]; + + postPatch = '' + substituteInPlace src/utils/memory.rs \ + --replace '"dmidecode"' '"${dmidecode}/bin/dmidecode"' + ''; + + mesonFlags = [ "-Dprofile=default" ]; + + meta = with lib; { + homepage = "https://github.com/nokyan/resources"; + description = "Monitor your system resources and processes"; + license = licenses.gpl3Plus; + mainProgram = "resources"; + maintainers = with maintainers; [ ewuuwe ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/gtop/default.nix b/pkgs/tools/system/gtop/default.nix index 327f09a91fb30..5d882740e1a0e 100644 --- a/pkgs/tools/system/gtop/default.nix +++ b/pkgs/tools/system/gtop/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "gtop"; - version = "1.1.3"; + version = "1.1.5"; src = fetchFromGitHub { owner = "aksakalli"; repo = "gtop"; rev = "v${version}"; - hash = "sha256-7jcfJOdy3PKT6+07iaZnjWnlPLk9BhPn8LApk23E8l4="; + hash = "sha256-FKbaUV28d0JH9tmTSJBFYQrM5iensnIpcXUFFvXDMe4="; }; - npmDepsHash = "sha256-CUfoVkG74C7HpcO3T9HmwbxHsYAgW1vYBAgNvx2av0k="; + npmDepsHash = "sha256-QKMLFalaOQjhgVkv8lIDnKyH7+GOqOKIl3zoLwrHIF4="; dontNpmBuild = true; diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index 6e86812ece449..706382d3dd04e 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "kanata"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "jtroo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tenh2LARajYAFHJ5gddeozY7rfySSvqFhudc/7b9cGg="; + sha256 = "sha256-ci/0Ksmi0uNHIvpZlihWvGeNabzmk+k3fUeuMDVpFeE="; }; - cargoHash = "sha256-oJVGZhKJVK8q5lgK+G+KhVupOF05u37B7Nmv4rrI28I="; + cargoHash = "sha256-IzgVF6SHJjOB48VehQ5taD5iWQXFKLcVBWTEl3ArkGQ="; buildFeatures = lib.optional withCmd "cmd"; diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 9878f82b9d092..5a6318ea4c21a 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { buildFlags = [ "all" ] ++ lib.optional withGUI "gui"; + hardeningDisable = lib.optionals stdenv.hostPlatform.isStatic [ "fortify" ]; + installTargets = [ "install" ] ++ lib.optional withGUI "install-gui"; enableParallelBuilding = true; diff --git a/pkgs/tools/system/mediawriter/default.nix b/pkgs/tools/system/mediawriter/default.nix index f0b8305bc8e83..bf2b4ce27ff47 100644 --- a/pkgs/tools/system/mediawriter/default.nix +++ b/pkgs/tools/system/mediawriter/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "mediawriter"; - version = "5.0.8"; + version = "5.0.9"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "MediaWriter"; rev = "refs/tags/${version}"; - hash = "sha256-6c2RXBIsJiW/xk+Q89RGibh6CIqIWHlBDBLb5o/mIGQ="; + hash = "sha256-FmMiv78r95shCpqN5PV6Oxms/hQY9ycqRn9L61aR8n4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index e6f65a8c0f5e1..4248b00003ec9 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # Don't forget to update go.d.plugin.nix as well - version = "1.43.2"; + version = "1.44.0"; pname = "netdata"; src = fetchFromGitHub { @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { repo = "netdata"; rev = "v${version}"; hash = if withCloudUi - then "sha256-ZhSuU2VTJPFJ3ja5eHx5uTuR19LleoID8Efr9FTyg74=" - else "sha256-t2awo118mYbuoNiKiAxM5xpRmQSha+/NR5G+shsotek="; + then "sha256-8kkOpMfcYPcHI3GuevZ2NYjJjlZvrvBgIs883Zsztgw=" + else "sha256-Kui3sV8OzBri4h47qD10snQgdvdi6yi/2z4cXWREcxE="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 6e64d33f7fb9e..71af680b238cf 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -2,16 +2,16 @@ buildGo121Module rec { pname = "netdata-go-plugins"; - version = "0.56.4"; + version = "0.57.2"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - hash = "sha256-7dR1TL2Ycb+7yHoFklrKdXXxIG4Tx+fAG5ScAAtbVRw="; + hash = "sha256-Qtk1/sQxWAGPHid6tPlwylyHvhxwWTJMT8TwCd/gazk="; }; - vendorHash = "sha256-Faa+7tT3sPxlT6eQEmFotOJnt9b49ffDPEHt5V7tQa0="; + vendorHash = "sha256-SFXf99cSA8sncAzZqj2eiiJFhyD4TXQipGAeM2Hivak="; doCheck = false; diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index 6e24d707d0ae8..039376fe4e3a7 100644 --- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -1,8 +1,8 @@ -diff --git a/collectors/Makefile.am b/collectors/Makefile.am -index 2aec3dd3e..27385ec28 100644 ---- a/collectors/Makefile.am -+++ b/collectors/Makefile.am -@@ -31,7 +31,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d +diff --git c/collectors/Makefile.am i/collectors/Makefile.am +index 1bbb2e0ef..96c400d33 100644 +--- c/collectors/Makefile.am ++++ i/collectors/Makefile.am +@@ -33,7 +33,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d # Explicitly install directories to avoid permission issues due to umask @@ -11,10 +11,10 @@ index 2aec3dd3e..27385ec28 100644 $(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir) $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) -diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am -index 03c7f0a94..01985db01 100644 ---- a/collectors/charts.d.plugin/Makefile.am -+++ b/collectors/charts.d.plugin/Makefile.am +diff --git c/collectors/charts.d.plugin/Makefile.am i/collectors/charts.d.plugin/Makefile.am +index f82992fd4..4cac1ae4f 100644 +--- c/collectors/charts.d.plugin/Makefile.am ++++ i/collectors/charts.d.plugin/Makefile.am @@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \ $(NULL) @@ -24,10 +24,10 @@ index 03c7f0a94..01985db01 100644 $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) chartsconfigdir=$(libconfigdir)/charts.d -diff --git a/collectors/ebpf.plugin/Makefile.am b/collectors/ebpf.plugin/Makefile.am +diff --git c/collectors/ebpf.plugin/Makefile.am i/collectors/ebpf.plugin/Makefile.am index 2d5f92a6b..8b11c7502 100644 ---- a/collectors/ebpf.plugin/Makefile.am -+++ b/collectors/ebpf.plugin/Makefile.am +--- c/collectors/ebpf.plugin/Makefile.am ++++ i/collectors/ebpf.plugin/Makefile.am @@ -9,7 +9,7 @@ SUFFIXES = .in userebpfconfigdir=$(configdir)/ebpf.d @@ -37,10 +37,10 @@ index 2d5f92a6b..8b11c7502 100644 $(INSTALL) -d $(DESTDIR)$(userebpfconfigdir) dist_noinst_DATA = \ -diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am +diff --git c/collectors/python.d.plugin/Makefile.am i/collectors/python.d.plugin/Makefile.am index ca49c1c02..1b9bcc446 100644 ---- a/collectors/python.d.plugin/Makefile.am -+++ b/collectors/python.d.plugin/Makefile.am +--- c/collectors/python.d.plugin/Makefile.am ++++ i/collectors/python.d.plugin/Makefile.am @@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \ $(NULL) @@ -50,10 +50,10 @@ index ca49c1c02..1b9bcc446 100644 $(INSTALL) -d $(DESTDIR)$(userpythonconfigdir) pythonconfigdir=$(libconfigdir)/python.d -diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am +diff --git c/collectors/statsd.plugin/Makefile.am i/collectors/statsd.plugin/Makefile.am index c8144c137..f8aaa89b6 100644 ---- a/collectors/statsd.plugin/Makefile.am -+++ b/collectors/statsd.plugin/Makefile.am +--- c/collectors/statsd.plugin/Makefile.am ++++ i/collectors/statsd.plugin/Makefile.am @@ -19,5 +19,5 @@ dist_userstatsdconfig_DATA = \ $(NULL) @@ -61,10 +61,10 @@ index c8144c137..f8aaa89b6 100644 -install-exec-local: +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) -diff --git a/health/Makefile.am b/health/Makefile.am -index 20e000860..add0137b3 100644 ---- a/health/Makefile.am -+++ b/health/Makefile.am +diff --git c/health/Makefile.am i/health/Makefile.am +index 7d7bca4cc..3086876dd 100644 +--- c/health/Makefile.am ++++ i/health/Makefile.am @@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ $(NULL) @@ -74,11 +74,24 @@ index 20e000860..add0137b3 100644 $(INSTALL) -d $(DESTDIR)$(userhealthconfigdir) healthconfigdir=$(libconfigdir)/health.d -diff --git a/system/Makefile.am b/system/Makefile.am -index 54e9278c8..e7cc7acea 100644 ---- a/system/Makefile.am -+++ b/system/Makefile.am -@@ -21,12 +21,9 @@ include $(top_srcdir)/build/subst.inc +diff --git c/logsmanagement/Makefile.am i/logsmanagement/Makefile.am +index 33f08d556..1f08cbae9 100644 +--- c/logsmanagement/Makefile.am ++++ i/logsmanagement/Makefile.am +@@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in + userlogsmanagconfigdir=$(configdir)/logsmanagement.d + + # Explicitly install directories to avoid permission issues due to umask +-install-exec-local: ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(userlogsmanagconfigdir) + + dist_libconfig_DATA = \ +diff --git c/system/Makefile.am i/system/Makefile.am +index 1e96f6f4f..98122ecdc 100644 +--- c/system/Makefile.am ++++ i/system/Makefile.am +@@ -22,12 +22,9 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in dist_config_SCRIPTS = \ @@ -91,7 +104,7 @@ index 54e9278c8..e7cc7acea 100644 $(NULL) libconfigvnodesdir=$(libconfigdir)/vnodes -@@ -46,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit +@@ -47,7 +44,7 @@ libsysrunitdir=$(libsysdir)/runit libsyssystemddir=$(libsysdir)/systemd # Explicitly install directories to avoid permission issues due to umask @@ -100,10 +113,10 @@ index 54e9278c8..e7cc7acea 100644 $(INSTALL) -d $(DESTDIR)$(configdir) $(INSTALL) -d $(DESTDIR)$(libsysdir) $(INSTALL) -d $(DESTDIR)$(libsyscrondir) -diff --git a/web/Makefile.am b/web/Makefile.am +diff --git c/web/Makefile.am i/web/Makefile.am index be2c545c3..55f373114 100644 ---- a/web/Makefile.am -+++ b/web/Makefile.am +--- c/web/Makefile.am ++++ i/web/Makefile.am @@ -13,7 +13,7 @@ SUBDIRS = \ usersslconfigdir=$(configdir)/ssl diff --git a/pkgs/tools/system/nkeys/default.nix b/pkgs/tools/system/nkeys/default.nix index a9328067463a5..54a02a9065764 100644 --- a/pkgs/tools/system/nkeys/default.nix +++ b/pkgs/tools/system/nkeys/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nkeys"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Sgj4+akOs/3fnpP0YDoRY9WwSk4uwtIPyPilutDXOlE="; + hash = "sha256-ui/vSa2TGe6Pe2aAzitBa1Pd2vKgTMuHoBhYYy2p6Rw="; }; - vendorHash = "sha256-8EfOtCiYCGmhGtZdPiFyNzBj+QsPx67vwFDMZ6ATidc="; + vendorHash = "sha256-SiSqmj6ktfiGsJOSu/pBY53e3vnN+RBfTkGwUuW52uo="; meta = with lib; { description = "Public-key signature system for NATS"; diff --git a/pkgs/tools/system/nvitop/default.nix b/pkgs/tools/system/nvitop/default.nix index 9cfe26de37326..af53911c8862b 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.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "XuehaiPan"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DPdKdIqFUozTt5Go3+c7oSv9tZSio486QeSlSfIrBZ4="; + hash = "sha256-TunGtNe+lgx/hk8kNtB8yaCdbkiJ3d4JJ8NKB+6urJA="; }; pythonRelaxDeps = [ "nvidia-ml-py" ]; @@ -32,6 +32,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "An interactive NVIDIA-GPU process viewer, the one-stop solution for GPU process management"; homepage = "https://github.com/XuehaiPan/nvitop"; + changelog = "https://github.com/XuehaiPan/nvitop/releases/tag/v${version}"; license = licenses.gpl3; maintainers = with maintainers; [ GaetanLepage ]; platforms = with platforms; linux; diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix index 1d5c7c4886a9c..38d6c4d1f75a7 100644 --- a/pkgs/tools/system/skeema/default.nix +++ b/pkgs/tools/system/skeema/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skeema"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "skeema"; repo = "skeema"; rev = "v${version}"; - hash = "sha256-BXjcn9oakTvaWPYIsAsjYRwQ1aKhZ4PAV2AkxSVOF/I="; + hash = "sha256-S7eMqaz8BZ80AwIrVmX+rnEgIwEdy8q65FIy6Mac4CY="; }; vendorHash = null; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 40211cb4e71b4..ecef593219d33 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.17.01"; + version = "0.17.02"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-hTwA0BT8r54Gnyf/itP2onQE6zhNEoejseuIEwvx4D8="; + hash = "sha256-9pdTxGH9Oghg0Brxi6v/3ghsuT2aX/bAGVQPNjik3Zk="; }; postPatch = '' diff --git a/pkgs/tools/system/supercronic/default.nix b/pkgs/tools/system/supercronic/default.nix index 6b2b4ef5c43ab..745202ce15c52 100644 --- a/pkgs/tools/system/supercronic/default.nix +++ b/pkgs/tools/system/supercronic/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "supercronic"; - version = "0.2.27"; + version = "0.2.29"; src = fetchFromGitHub { owner = "aptible"; repo = pname; rev = "v${version}"; - hash = "sha256-sgKvE8Ze2qKPgdaAwN1sB0wX7k5VRx8+llkT54xXvrM="; + hash = "sha256-cYKVeWZEjWV5j68aTpBOE/z+5QcMBh5ovyXoV/u80o4="; }; - vendorHash = "sha256-j1iduvu+dKmhvPN8pe50fGQU5cC9N3gfoMh9gSQDbf8="; + vendorHash = "sha256-uQFceysbRdcSaFvdfdFcJX6yzPWE26YYiVzAEISQeCc="; excludedPackages = [ "cronexpr/cronexpr" ]; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index cb52cbdccb386..191f9466f3394 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://mama.indstate.edu/users/ice/tree/"; + homepage = "https://oldmanprogrammer.net/source.php?dir=projects/tree"; description = "Command to produce a depth indented directory listing"; license = licenses.gpl2; longDescription = '' diff --git a/pkgs/tools/system/zenith/Cargo.lock b/pkgs/tools/system/zenith/Cargo.lock index 401042eea3260..0c7828d6a445d 100644 --- a/pkgs/tools/system/zenith/Cargo.lock +++ b/pkgs/tools/system/zenith/Cargo.lock @@ -9,13 +9,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "aho-corasick" -version = "0.7.15" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" -dependencies = [ - "memchr", -] +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] name = "android_system_properties" @@ -27,36 +24,27 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] name = "async-channel" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-executor" -version = "1.4.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" dependencies = [ + "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 2.0.1", "futures-lite", - "once_cell", "slab", ] @@ -74,97 +62,101 @@ dependencies = [ [[package]] name = "async-io" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", "autocfg", + "cfg-if 1.0.0", "concurrent-queue", "futures-lite", - "libc", "log", "parking", "polling", + "rustix 0.37.25", "slab", "socket2", "waker-fn", - "winapi", ] [[package]] name = "async-lock" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", - "futures-lite", + "event-listener 2.5.3", ] [[package]] name = "async-net" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f" +checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" dependencies = [ "async-io", - "autocfg", "blocking", "futures-lite", ] [[package]] name = "async-process" -version = "1.5.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ "async-io", - "autocfg", + "async-lock", + "async-signal", "blocking", "cfg-if 1.0.0", - "event-listener", + "event-listener 3.0.0", "futures-lite", - "libc", - "once_cell", - "signal-hook", - "winapi", + "rustix 0.38.19", + "windows-sys", +] + +[[package]] +name = "async-signal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if 1.0.0", + "futures-core", + "futures-io", + "rustix 0.38.19", + "signal-hook-registry", + "slab", + "windows-sys", ] [[package]] name = "async-task" -version = "4.3.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" [[package]] name = "async-trait" -version = "0.1.58" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -183,15 +175,13 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", - "clap", - "env_logger 0.9.1", "lazy_static", "lazycell", "log", @@ -201,6 +191,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn 1.0.109", "which", ] @@ -211,30 +202,38 @@ 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 = "blocking" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", + "async-lock", "async-task", - "atomic-waker", - "fastrand", + "fastrand 2.0.1", + "futures-io", "futures-lite", - "once_cell", + "piper", + "tracing", ] [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byte-unit" -version = "4.0.17" +version = "4.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581ad4b3d627b0c09a0ccb2912148f839acaca0b93cf54cbe42b6c674e86079c" +checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" dependencies = [ "serde", "utf8-width", @@ -242,15 +241,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" - -[[package]] -name = "cache-padded" -version = "1.2.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cassowary" @@ -260,9 +253,12 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.74" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cexpr" @@ -287,24 +283,23 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", - "time", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] name = "clang-sys" -version = "1.4.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -312,47 +307,12 @@ dependencies = [ ] [[package]] -name = "clap" -version = "2.34.0" -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 = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] name = "concurrent-queue" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - -[[package]] -name = "core-foundation" -version = "0.7.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ - "core-foundation-sys 0.7.0", - "libc", + "crossbeam-utils", ] [[package]] @@ -361,21 +321,15 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys 0.8.3", + "core-foundation-sys", "libc", ] [[package]] name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[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 = "crc32fast" @@ -387,20 +341,10 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -409,33 +353,33 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "memoffset", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossterm" -version = "0.25.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags", + "bitflags 2.4.0", "crossterm_winapi", "libc", "mio", @@ -447,58 +391,14 @@ 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", ] [[package]] -name = "cxx" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] name = "darling" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -518,8 +418,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.9.3", - "syn", + "strsim", + "syn 1.0.109", ] [[package]] @@ -530,7 +430,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -582,30 +482,27 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "either" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "env_logger" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", - "humantime", "log", - "regex", - "termcolor", ] [[package]] -name = "env_logger" -version = "0.10.0" +name = "errno" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "log", + "libc", + "windows-sys", ] [[package]] @@ -615,19 +512,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] [[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] name = "flate2" -version = "1.0.24" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -641,9 +555,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -656,9 +570,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -666,15 +580,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -683,17 +597,17 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +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", @@ -704,26 +618,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-timer" @@ -733,9 +647,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -751,20 +665,20 @@ 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 1.0.0", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[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 = "gumdrop" @@ -783,10 +697,16 @@ checksum = "729f9bd3449d77e7831a18abfb7ba2f99ee813dfd15b8c2167c9a54ba20aa99d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] name = "heim" version = "0.1.0-rc.1" source = "git+https://github.com/bvaisvil/heim.git?branch=zenith_changes#509c858dce58e2de0b1b772170ee2be21a58149b" @@ -809,13 +729,13 @@ version = "0.1.0-rc.1" source = "git+https://github.com/bvaisvil/heim.git?branch=zenith_changes#509c858dce58e2de0b1b772170ee2be21a58149b" dependencies = [ "cfg-if 1.0.0", - "core-foundation 0.9.3", + "core-foundation", "futures-core", "futures-util", "lazy_static", "libc", "mach", - "nix", + "nix 0.23.2", "pin-utils", "uom 0.31.1", "winapi", @@ -844,9 +764,9 @@ name = "heim-disk" version = "0.1.0-rc.1" source = "git+https://github.com/bvaisvil/heim.git?branch=zenith_changes#509c858dce58e2de0b1b772170ee2be21a58149b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", - "core-foundation 0.9.3", + "core-foundation", "heim-common", "heim-runtime", "libc", @@ -891,13 +811,13 @@ name = "heim-net" version = "0.1.0-rc.1" source = "git+https://github.com/bvaisvil/heim.git?branch=zenith_changes#509c858dce58e2de0b1b772170ee2be21a58149b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "heim-common", "heim-runtime", "libc", "macaddr", - "nix", + "nix 0.23.2", "widestring", "winapi", ] @@ -961,41 +881,40 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] -name = "humantime" -version = "2.1.0" +name = "home" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.3", + "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -1005,6 +924,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1014,10 +939,30 @@ dependencies = [ ] [[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1036,34 +981,37 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if 1.0.0", "winapi", ] [[package]] -name = "link-cplusplus" -version = "1.0.7" +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" -dependencies = [ - "cc", -] +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "linux-taskstats" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5fe0070f80bc563d4fc21f2b064eb314a944ad167edb64dc76eb37fa8826401" +checksum = "60fdd14efd42f7d3383f76d5da9cbc1056ac6497be7352eadfabef14a5d699c0" dependencies = [ "bindgen", "libc", @@ -1074,9 +1022,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", @@ -1084,12 +1032,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 1.0.0", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "macaddr" @@ -1107,6 +1052,15 @@ dependencies = [ ] [[package]] +name = "mach2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +dependencies = [ + "libc", +] + +[[package]] name = "memchr" version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1122,6 +1076,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 = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1129,30 +1092,30 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +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", + "wasi", "windows-sys", ] [[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", "libc", @@ -1161,22 +1124,33 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 1.0.0", "libc", - "memoffset", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", ] [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -1193,13 +1167,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -1225,30 +1199,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] name = "nvml-wrapper" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "288bd66a5a56d8c97b178412b328419b3fdec261c0cbc4628ddc49cc16db8fc6" +checksum = "7cd21b9f5a1cce3c3515c9ffa85f5c7443e07162dae0ccf4339bb7ca38ad3454" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libloading", "nvml-wrapper-sys", "static_assertions", @@ -1258,33 +1222,33 @@ dependencies = [ [[package]] name = "nvml-wrapper-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d606d4edf766969f16828ec047ca9aa96652a17bd353dc0613bfaca49b61d6" +checksum = "c961a2ea9e91c59a69b78e69090f6f5b867bb46c0c56de9482da232437c4987e" dependencies = [ "libloading", ] [[package]] name = "once_cell" -version = "1.16.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "ordered-float" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ "num-traits", ] [[package]] name = "parking" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "parking_lot" @@ -1298,18 +1262,24 @@ 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 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.3.5", "smallvec", - "windows-sys", + "windows-targets", ] [[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] name = "peeking_take_while" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1317,9 +1287,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[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" @@ -1328,6 +1298,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] name = "platforms" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1335,67 +1316,82 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polling" -version = "2.4.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", + "bitflags 1.3.2", "cfg-if 1.0.0", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "winapi", + "pin-project-lite", + "windows-sys", ] [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.21" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[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", + "paste", + "strum", + "unicode-segmentation", + "unicode-width", +] + +[[package]] name = "raw-cpuid" version = "9.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1733f6f80c9c24268736a501cd00d41a9849b4faa7a9f9334c096e5d10553206" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "rayon" -version = "1.5.3" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -1404,7 +1400,16 @@ 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]] @@ -1414,26 +1419,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.4.6" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ - "aho-corasick", - "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustc-hash" @@ -1442,48 +1445,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "scopeguard" -version = "1.1.0" +name = "rustix" +version = "0.37.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] [[package]] -name = "scratch" -version = "1.0.2" +name = "rustix" +version = "0.38.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys", +] + +[[package]] +name = "rustversion" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[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.147" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[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" -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", @@ -1502,33 +1532,33 @@ 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", ] [[package]] name = "slab" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[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" [[package]] name = "smol" -version = "1.2.5" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cf3b5351f3e783c1d79ab5fc604eeed8b8ae9abd36b166e8b87a089efd85e4" +checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" dependencies = [ "async-channel", "async-executor", @@ -1539,14 +1569,13 @@ dependencies = [ "async-process", "blocking", "futures-lite", - "once_cell", ] [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -1554,18 +1583,18 @@ dependencies = [ [[package]] name = "starship-battery" -version = "0.7.9" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3336198ad004af4447ae69be4f4e562c26814570f8f0c1e37858405a294e015d" +checksum = "36335b5b5ba5328b4ad2024807423010b7f533a7e5315dfd9df0acbc9d2c550e" dependencies = [ "cfg-if 1.0.0", - "core-foundation 0.7.0", + "core-foundation", "lazycell", "libc", - "mach", - "nix", + "mach2", + "nix 0.26.4", "num-traits", - "uom 0.30.0", + "uom 0.35.0", "winapi", ] @@ -1577,21 +1606,48 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.8.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] -name = "strsim" -version = "0.9.3" +name = "strum" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.38", +] [[package]] name = "syn" -version = "1.0.103" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -1613,108 +1669,82 @@ dependencies = [ ] [[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[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.37" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] -name = "time" -version = "0.1.44" +name = "tracing" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "pin-project-lite", + "tracing-core", ] [[package]] -name = "tui" -version = "0.19.0" +name = "tracing-core" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" -dependencies = [ - "bitflags", - "cassowary", - "crossterm", - "unicode-segmentation", - "unicode-width", -] +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" [[package]] name = "typenum" -version = "1.15.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[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 = "uom" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e76503e636584f1e10b9b3b9498538279561adcef5412927ba00c2b32c4ce5ed" +checksum = "b1ee6bfd0a27bf614353809a035cf6880b74239ec6c5e39a7b2860ca16809137" dependencies = [ + "num-rational", "num-traits", "typenum", ] [[package]] name = "uom" -version = "0.31.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1ee6bfd0a27bf614353809a035cf6880b74239ec6c5e39a7b2860ca16809137" +checksum = "8362194c7a9845a7a7f3562173d6e1da3f24f7132018cb78fe77a5b4474187b2" dependencies = [ - "num-rational", "num-traits", "typenum", ] @@ -1736,22 +1766,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" [[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "wasi" @@ -1761,9 +1779,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -1771,24 +1789,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1796,41 +1814,33 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[package]] -name = "wepoll-ffi" -version = "0.1.2" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[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.19", ] [[package]] @@ -1856,25 +1866,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] -name = "winapi-util" -version = "0.1.5" +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "winapi", + "windows-targets", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows-sys" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1887,45 +1906,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "wrapcenum-derive" @@ -1936,7 +1955,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1948,7 +1967,7 @@ dependencies = [ "chrono", "crossterm", "dirs-next", - "env_logger 0.10.0", + "env_logger", "flate2", "futures", "gumdrop", @@ -1959,12 +1978,12 @@ dependencies = [ "num-derive", "num-traits", "nvml-wrapper", + "ratatui", "serde", "serde_derive", "signal-hook", "starship-battery", "sysinfo", - "tui", "unicode-width", "users", ] diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 52ad79fab689a..af8231e96c6d6 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -11,13 +11,13 @@ assert nvidiaSupport -> stdenv.isLinux; rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.14.0"; + version = "0.14.0-unstable-2023-11-21"; src = fetchFromGitHub { owner = "bvaisvil"; repo = pname; - rev = version; - sha256 = "sha256-GrrdE9Ih8x8N2HN+1NfxfthfHbufLAT/Ac+ZZWW5Zg8="; + rev = "0ed09e6a68c1517b4d050f5e3163421718226040"; + hash = "sha256-vw/ar2Qi06HxPfPsfcxtfRhMTqY4FCE+7tCfe9sLEv0="; }; # remove cargo config so it can find the linker on aarch64-linux @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { + lib.optionalString nvidiaSupport ", and NVIDIA GPU usage"; homepage = "https://github.com/bvaisvil/zenith"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ wegank ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/zram-generator/Cargo.lock b/pkgs/tools/system/zram-generator/Cargo.lock index 29c643c10bd4a..68ccd9d23b5f6 100644 --- a/pkgs/tools/system/zram-generator/Cargo.lock +++ b/pkgs/tools/system/zram-generator/Cargo.lock @@ -79,12 +79,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -142,9 +142,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "log" @@ -192,9 +192,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -259,15 +259,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.24" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -291,7 +291,7 @@ dependencies = [ "fastrand", "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -327,7 +327,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -336,13 +345,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "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]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -352,42 +376,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "zram-generator" version = "1.1.2" dependencies = [ diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 1cd9e74f1943b..e4158b4bfc2d4 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "amber"; - version = "0.5.9"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mmgJCD7kJjvpxyagsoe5CSzqIEZcIiYMAMP3axRphv4="; + sha256 = "sha256-q0o2PQngbDLumck27V0bIiB35zesn55Y+MwK2GjNVWo="; }; - cargoSha256 = "sha256-opRinhTmhZxpAwHNiVOLXL8boQf09Y1NXrWQ6HWQYQ0="; + cargoHash = "sha256-nBSgP30Izskq9RbhVIyqWzZgG5ZWHVdiukldw+Q0rco="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index af5241de7a05a..2b59831529dbd 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -33,5 +33,6 @@ buildGoModule rec { description = "A general purpose syntax highlighter in pure Go"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; + mainProgram = "chroma"; }; } diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 4146429e28397..69473bd2c6f6f 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ SuperSandro2000 ]; + mainProgram = "colordiff"; }; } diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index bca032d6ddf96..77c5de696f126 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.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-bp45tkV7f6rGDAmhle/e3cHIqa7nPakANvk4QxetLts="; + hash = "sha256-GImv4OJHanj6dKtAJpTaGLrR4AaVTboiYHwRdh/gXaU="; }; - vendorHash = "sha256-QMptNFCoJouI555WkA+4TJhaEzQgJJmca3jVpM3neeI="; + vendorHash = "sha256-T7eki06fQuGvYIJKvBJsIkFS1fQ9Jbv+ieUSr2vupqg="; excludedPackages = [ "./e2etests" ]; diff --git a/pkgs/tools/text/enscript/0001-use-system-getopt.patch b/pkgs/tools/text/enscript/0001-use-system-getopt.patch new file mode 100644 index 0000000000000..0ae8776f361e8 --- /dev/null +++ b/pkgs/tools/text/enscript/0001-use-system-getopt.patch @@ -0,0 +1,68 @@ +From 4c5cbf6db71cf2981fc836ed370c82149748d8ea Mon Sep 17 00:00:00 2001 +From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> +Date: Wed, 6 Dec 2023 22:57:19 +0000 +Subject: [PATCH] use system getopt + +the file compat/getopt.h also needs to be removed otherwise it will +create conflicts with the system includes +--- + compat/Makefile.am | 4 ++-- + compat/Makefile.in | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/compat/Makefile.am b/compat/Makefile.am +index aefc06f..23aaf81 100644 +--- a/compat/Makefile.am ++++ b/compat/Makefile.am +@@ -25,7 +25,7 @@ + AUTOMAKE_OPTIONS = no-dependencies + + noinst_LIBRARIES = libcompat.a +-libcompat_a_SOURCES = getopt.c getopt1.c xalloc.c regex.c ++libcompat_a_SOURCES = xalloc.c regex.c + libcompat_a_LIBADD = @LIBOBJS@ @ALLOCA@ + libcompat_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@ + +@@ -34,7 +34,7 @@ libcompat_a_SOURCES_windelta = \ + +../w32/getpwd.c \ + +../w32/getuid.c + +-noinst_HEADERS = getopt.h regex.h xalloc.h ++noinst_HEADERS = regex.h xalloc.h + + EXTRA_DIST = ChangeLog.old strerror.c memmove.c memcpy.c strtol.c \ + strtoul.c gettext.h +diff --git a/compat/Makefile.in b/compat/Makefile.in +index edfc620..dee05d7 100644 +--- a/compat/Makefile.in ++++ b/compat/Makefile.in +@@ -137,7 +137,7 @@ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) + am__v_AR_0 = @echo " AR " $@; + am__v_AR_1 = + libcompat_a_AR = $(AR) $(ARFLAGS) +-am_libcompat_a_OBJECTS = getopt.$(OBJEXT) getopt1.$(OBJEXT) \ ++am_libcompat_a_OBJECTS = \ + xalloc.$(OBJEXT) regex.$(OBJEXT) + libcompat_a_OBJECTS = $(am_libcompat_a_OBJECTS) + AM_V_P = $(am__v_P_@AM_V@) +@@ -326,7 +326,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = no-dependencies + noinst_LIBRARIES = libcompat.a +-libcompat_a_SOURCES = getopt.c getopt1.c xalloc.c regex.c ++libcompat_a_SOURCES = xalloc.c regex.c + libcompat_a_LIBADD = @LIBOBJS@ @ALLOCA@ + libcompat_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@ + libcompat_a_SOURCES_windelta = \ +@@ -334,7 +334,7 @@ libcompat_a_SOURCES_windelta = \ + +../w32/getpwd.c \ + +../w32/getuid.c + +-noinst_HEADERS = getopt.h regex.h xalloc.h ++noinst_HEADERS = regex.h xalloc.h + EXTRA_DIST = ChangeLog.old strerror.c memmove.c memcpy.c strtol.c \ + strtoul.c gettext.h + +-- +2.42.0 + diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index 1299ef78679c1..e5aeb75ca6266 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -9,12 +9,20 @@ stdenv.mkDerivation rec { sha256 = "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd"; }; - preBuild = - '' - # Fix building on Darwin with GCC. - substituteInPlace compat/regex.c --replace \ - __private_extern__ '__attribute__ ((visibility ("hidden")))' - ''; + patches = [ + # fix compile failure on macos. use system getopt like linux + # requires that compat/getopt.h is also removed + # https://savannah.gnu.org/bugs/?64307 + ./0001-use-system-getopt.patch + ]; + + postPatch = '' + # the delete component of 0001-use-system-getopt.patch + rm compat/getopt.h + # Fix building on Darwin with GCC. + substituteInPlace compat/regex.c --replace \ + __private_extern__ '__attribute__ ((visibility ("hidden")))' + ''; buildInputs = [ gettext ]; diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix index a9f1b79c474a8..f8317d70d7782 100644 --- a/pkgs/tools/text/fastmod/default.nix +++ b/pkgs/tools/text/fastmod/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fastmod"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j5+6ijJ04/Non7AUSN35OhfZ04MiPUDU4V1HLwZaM9k="; + sha256 = "sha256-A/3vzfwaStoQ9gdNM8yjmL2J/pQjj6yb68WThiTF+1E="; }; - cargoSha256 = "sha256-RNTnP3RKRZXo3+L54y/8nBunGbsxVY72sbl+ZrqfeMI="; + cargoHash = "sha256-sFrABp4oYhel+GONFsTbunq+4We2DicvF9A3FT/ZArc="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index e151a1467446a..19f53e5f0e0a5 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-KFEYkhCLMcJ4NkHu0kkuG70EvJQ3HYDvicmomcMJZjc="; + hash = "sha256-2x84nPSXNPM6MtHa90rg9V5aQIplBDW4WTzRyYUqT8A="; }; vendorHash = "sha256-rvVrVv73gW26UUy1MyxKDjUgX1mrMMii+l8qU2hLOek="; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index fc6c21551fe87..5afca943d26a6 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.10.6"; + version = "1.10.7"; src = fetchurl { url = "mirror://kde/stable/kdiff3/kdiff3-${version}.tar.xz"; - hash = "sha256-EzOu+dZjbGs0ZqF/0sXZbpGdTrUh6isjUoJUETau+zE="; + hash = "sha256-/otpnRJM1NJjKzwnqgas7Fyqj8v4t2SM8MANektqzlA="; }; buildInputs = [ boost ]; diff --git a/pkgs/tools/text/markdownlint-cli/default.nix b/pkgs/tools/text/markdownlint-cli/default.nix index 6916999cb42ef..73718d121e078 100644 --- a/pkgs/tools/text/markdownlint-cli/default.nix +++ b/pkgs/tools/text/markdownlint-cli/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "markdownlint-cli"; - version = "0.35.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "igorshubovych"; repo = "markdownlint-cli"; rev = "v${version}"; - hash = "sha256-PkvgZn7cQafKO7p5i1fYYZrWjNcFuX700r223qUMN5I="; + hash = "sha256-3PiienQjyJQ/ElY4j0Ccu+r6KtIu1kuPlobHqXE0GY4="; }; - npmDepsHash = "sha256-hh8T2MRjUJQVibd+cY7vkJvBgNDueWuluGE3HxWOCU8="; + npmDepsHash = "sha256-WoXyWn58E4+Lj3LWqr/8JbvAo5IcjLgnzhIt59bSqV4="; dontNpmBuild = true; diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index dcea374bffe71..1a99d42163292 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.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "tommilligan"; repo = pname; rev = "v${version}"; - hash = "sha256-wRRBasHnTelLCiHjjrMmXv/2V3P91n4kZ1aAt1tZx/Y="; + hash = "sha256-M9qHiUIrah4gjxGzaD5tWBa54+ajWpS/dW0whC9YRyE="; }; - cargoHash = "sha256-KAcZyHanmbOKK+55dkINss9uOxk6P+r38M6qftYQwpw="; + cargoHash = "sha256-SD8aEVgpadpCu2Ex1ugDbJyHpNO3jGeSF7O0eJ4oc3c="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 7be47c0c8d4d7..9469c63faefba 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.5.8"; + version = "0.5.9"; src = fetchCrate { inherit pname version; - hash = "sha256-YFrl0YR/+lDJW8GjLF0wk0D6Bx9zUxAoAXd9twaxrmM="; + hash = "sha256-IecCEXoWkjCgIHlhmtF2H+FM/0B8yK4XmHuBHv/yGk8="; }; - cargoHash = "sha256-wBaek9AQKwPsg9TzBmS0yBtn1G0KCnmxfmGCGCFNWxc="; + cargoHash = "sha256-vHbTL62Z4UdU77VePN2HSRzS9amn33smw1Yy6I2Btcc="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix index 9ca9669fa2014..f5bf827cfd7f7 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-mermaid"; - version = "0.12.6"; + version = "0.13.0"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1mSSnAfsg9AEnDAgINrSLIeu9O2vLqchZPSH12cjATk="; + hash = "sha256-Qyt5N6Fito++5lpjDXlzupmguue9kc409IpaDkIRgxw="; }; - cargoHash = "sha256-9PMBHVpf8bDuSIYKrIFZjmBE2icejPTML+hhZ4DLq/Y="; + cargoHash = "sha256-ji38ZNOZ+SDL7+9dvaRIA38EsqMqYWpSmZntexJqcMU="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/tools/text/mdbook-open-on-gh/default.nix b/pkgs/tools/text/mdbook-open-on-gh/default.nix index a570d68059287..8ce422340ed05 100644 --- a/pkgs/tools/text/mdbook-open-on-gh/default.nix +++ b/pkgs/tools/text/mdbook-open-on-gh/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-open-on-gh"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = version; - hash = "sha256-d+8/7lli6iyzAWHIi0ahwPBwGhXrQrCKQisD2+jPHQ0="; + hash = "sha256-ZExmOHvQApGZaepOuf3yXYe8NV3FpMtCqCR1KE6q4no="; }; - cargoHash = "sha256-WbPYrjDMJEwle+Pev5nr9ZhnycbXUjdrx8XAqQ0OpaM="; + cargoHash = "sha256-WLCcYgkrH5fZvv3LZNEolBQUcTZC2URs6bIgzf4BtWU="; meta = with lib; { description = "mdbook preprocessor to add a open-on-github link on every page"; diff --git a/pkgs/tools/text/mdbook-toc/default.nix b/pkgs/tools/text/mdbook-toc/default.nix index 52e8070e0794a..b9bf0ca208c8d 100644 --- a/pkgs/tools/text/mdbook-toc/default.nix +++ b/pkgs/tools/text/mdbook-toc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-toc"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = version; - sha256 = "sha256-F0dIqtDEOVUXlWhmXKPOaJTEuA3Tl3h0vaEu7VsBo7s="; + sha256 = "sha256-OFNp+kFDafYbzqb7xfPTO885cAjgWfNeDvUPDKq5GJU="; }; - cargoHash = "sha256-gbBX6Hj+271BA9FWmkZdyR0tMP2Lny7UgW0o+kZe9bU="; + cargoHash = "sha256-95W0gERjwL9r0+DOgxQu+sjSFSThWeShLAqlDQiGxFw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdhtml/default.nix b/pkgs/tools/text/mdhtml/default.nix index 4c9f6e5da28b2..4c68eb32d9dde 100644 --- a/pkgs/tools/text/mdhtml/default.nix +++ b/pkgs/tools/text/mdhtml/default.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "mdhtml"; - version = "0.3.1"; + version = "1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Tomkoid"; repo = pname; rev = version; - hash = "sha256-ISZUadJZOWwUygLnGYvuMUNCmTNGZLYq+q/FeK++kWE="; + hash = "sha256-Fv5XpWA2ebqXdA+46gZQouuZ3XxH4WDj/W6xJ0ETg8E="; }; vendorHash = null; diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index 3a4198fa630eb..e2c5fac26f7d6 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -11,8 +11,15 @@ buildGoModule rec { sha256 = "sha256-g2Jnqo3U9acyqohGpcEEogq871qJQTc7k0/oIawAQW8="; }; + outputs = [ "out" "man" ]; + vendorHash = "sha256-/1/FTQL3Ki8QzL+1J4Ah8kwiJyGPd024di/1MC8gtkE="; + postInstall = '' + mkdir -p $man/share/man/man1 + mv ./man/mlr.1 $man/share/man/man1 + ''; + subPackages = [ "cmd/mlr" ]; meta = with lib; { diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix index 2a70d7cdaa54d..c68d51b1e21ce 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.32.1"; + version = "0.33.0"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-S84CMC02KJ5eevLxVkapCdjZh4PH95u/0AK4tpkOx2k="; + hash = "sha256-UD8YKhdoMAtKTC2KEMEamjgOZb3rv1SU9eXZg/zjYTY="; }; - vendorHash = "sha256-1NdvUdPPr0Twx0hyve4/vvDR2cU+mGyws3UIf8jHfbw="; + vendorHash = "sha256-T40hnlYhJ3lhrQW7iFBQCGUNblSSYtL8jNw0rPRy/Aw="; ldflags = [ "-s" diff --git a/pkgs/tools/text/percollate/default.nix b/pkgs/tools/text/percollate/default.nix index 6c1ce360da20e..be38866e5bdc0 100644 --- a/pkgs/tools/text/percollate/default.nix +++ b/pkgs/tools/text/percollate/default.nix @@ -2,21 +2,21 @@ buildNpmPackage rec { pname = "percollate"; - version = "4.0.2"; + version = "4.0.4"; src = fetchFromGitHub { owner = "danburzo"; repo = pname; rev = "v${version}"; - hash = "sha256-QLbLg/zdDCZsRKgC4vR0OT//JHaapGmX33l7jIqUc1M="; + hash = "sha256-Gl9v8WdntiatgxIvH1PZe3U9imGqdm5iYUx8gCwJhLw="; }; - npmDepsHash = "sha256-Hxhgjdiz0zC/UlFXK8vvKZFI963Wi2Wx6iHWegr6f10="; + npmDepsHash = "sha256-/HYnoMd+rriZ4WYGyM7g62Yii7lc/+ZKkc5QfPpFAQU="; dontNpmBuild = true; # Dev dependencies include an unnecessary Java dependency (epubchecker) - # https://github.com/danburzo/percollate/blob/v4.0.2/package.json#L40 + # https://github.com/danburzo/percollate/blob/v4.0.4/package.json#L40 npmInstallFlags = [ "--omit=dev" ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index ff034c853a7a0..224d358ecb511 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.3.4"; + version = "4.4.1"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-rA6qgjzlR7a7bf5v2q1vMx1QXcKgnK5wK1Ix9CfbPro="; + hash = "sha256-Bbt20XE+PNIxl2qDzxpIh4yjU93JgXF4gn1kb4bvdBw="; }; buildInputs = [ diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 7ae0de13ed9f7..b001a7fd6c3d8 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.29.7"; + version = "2.30.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-5fOEZG+ucp9EpizNHvKzqksnDzV8x0miGSKnTelxmzs="; + hash = "sha256-XTbm1wWm8+nBDN2G1Bm+FUFDV/21deGptMN5XrckMHA="; }; vendorHash = "sha256-FnzuumOIvjpoDr+yBaRc8UjMDNW8mgrJiz1ZyzNW0Ts="; diff --git a/pkgs/tools/text/yx/default.nix b/pkgs/tools/text/yx/default.nix index bff2b955fb42a..629cf442c48bb 100644 --- a/pkgs/tools/text/yx/default.nix +++ b/pkgs/tools/text/yx/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ twz123 ]; - mainProgram = pname; + mainProgram = "yx"; }; } diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index f2005f491a17c..b82704fc12b19 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "sile"; - version = "0.14.13"; + version = "0.14.14"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-PU9Yfanmyr4nAQMQu/unBQSQCvV2hyo0i8lR0MnuFcA="; + sha256 = "sha256-xGcbD43yfJ6Ru7mU7R+NxfK1YXnIDwcYMjB++gcNqYg="; }; configureFlags = [ diff --git a/pkgs/tools/typesetting/tectonic/biber.nix b/pkgs/tools/typesetting/tectonic/biber.nix new file mode 100644 index 0000000000000..9798c14716679 --- /dev/null +++ b/pkgs/tools/typesetting/tectonic/biber.nix @@ -0,0 +1,54 @@ +/* + This package, `biber-for-tectonic`, provides a compatible version of `biber` + as an optional runtime dependency of `tectonic`. + + The development of tectonic is slowing down recently, such that its `biber` + dependency has been lagging behind the one in the nixpkgs `texlive` bundle. + See: + + https://github.com/tectonic-typesetting/tectonic/discussions/1122 + + It is now feasible to track the biber dependency in nixpkgs, as the + version bump is not very frequent, and it would provide a more complete + user experience of tectonic in nixpkgs. +*/ + +{ lib +, fetchFromGitHub +, fetchpatch +, biber +}: + +let version = "2.17"; in ( + biber.override { + /* + It is necessary to first override the `version` data here, which is + passed to `buildPerlModule`, and then to `mkDerivation`. + + If we simply do `biber.overrideAttrs` the resulting package `name` + would be incorrect, since it has already been preprocessed by + `buildPerlModule`. + */ + texlive.pkgs.biber.texsource = { + inherit version; + inherit (biber) pname meta; + }; + } +).overrideAttrs (prevAttrs: { + src = fetchFromGitHub { + owner = "plk"; + repo = "biber"; + rev = "v${version}"; + hash = "sha256-Tt2sN2b2NGxcWyZDj5uXNGC8phJwFRiyH72n3yhFCi0="; + }; + patches = [ + # Perl>=5.36.0 compatibility + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/plk/biber/pull/411.patch"; + hash = "sha256-osgldRVfe3jnMSOMnAMQSB0Ymc1s7J6KtM2ig3c93SE="; + }) + ]; + meta = prevAttrs.meta // { + maintainers = with lib.maintainers; [ doronbehar bryango ]; + }; +}) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 607e71cfbb449..6b98a5db63438 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,3 +1,11 @@ +/* + This file provides the `tectonic-unwrapped` package. On the other hand, + the `tectonic` package is defined in `./wrapper.nix`, by wrapping + - [`tectonic-unwrapped`](./default.nix) i.e. this package, and + - [`biber-for-tectonic`](./biber.nix), + which provides a compatible version of `biber`. +*/ + { lib , stdenv , fetchFromGitHub @@ -25,7 +33,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1WjZbmZFPB1+QYpjqq5Y+fDkMZNmWJYIxmMFWg7Tiac="; - nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ icu fontconfig harfbuzz openssl ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); @@ -33,13 +41,14 @@ rustPlatform.buildRustPackage rec { # workaround for https://github.com/NixOS/nixpkgs/issues/166205 NIX_LDFLAGS = lib.optionalString (stdenv.cc.isClang && stdenv.cc.libcxx != null) " -l${stdenv.cc.libcxx.cxxabi.libName}"; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = '' + # Makes it possible to automatically use the V2 CLI API + ln -s $out/bin/tectonic $out/bin/nextonic + '' + lib.optionalString stdenv.isLinux '' substituteInPlace dist/appimage/tectonic.desktop \ --replace Exec=tectonic Exec=$out/bin/tectonic install -D dist/appimage/tectonic.desktop -t $out/share/applications/ install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ - - ln -s $out/bin/tectonic $out/bin/nextonic ''; doCheck = true; @@ -50,6 +59,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/tectonic-typesetting/tectonic/blob/tectonic@${version}/CHANGELOG.md"; license = with licenses; [ mit ]; mainProgram = "tectonic"; - maintainers = with maintainers; [ lluchs doronbehar ]; + maintainers = with maintainers; [ lluchs doronbehar bryango ]; }; } diff --git a/pkgs/tools/typesetting/tectonic/wrapper.nix b/pkgs/tools/typesetting/tectonic/wrapper.nix new file mode 100644 index 0000000000000..5a4dc47e37a29 --- /dev/null +++ b/pkgs/tools/typesetting/tectonic/wrapper.nix @@ -0,0 +1,56 @@ +{ lib +, symlinkJoin +, tectonic-unwrapped +, biber-for-tectonic +, makeWrapper +}: + +symlinkJoin { + name = "${tectonic-unwrapped.pname}-wrapped-${tectonic-unwrapped.version}"; + paths = [ tectonic-unwrapped ]; + + nativeBuildInputs = [ makeWrapper ]; + + passthru = { + unwrapped = tectonic-unwrapped; + biber = biber-for-tectonic; + }; + + # Replace the unwrapped tectonic with the one wrapping it with biber + postBuild = '' + rm $out/bin/{tectonic,nextonic} + '' + # Ideally, we would have liked to also pin the version of the online TeX + # bundle that Tectonic's developer distribute, so that the `biber` version + # and the `biblatex` version distributed from there are compatible. + # However, that is not currently possible, due to lack of upstream support + # for specifying this in runtime, there were 2 suggestions sent upstream + # that suggested a way of improving the situation: + # + # - https://github.com/tectonic-typesetting/tectonic/pull/1132 + # - https://github.com/tectonic-typesetting/tectonic/pull/1131 + # + # The 1st suggestion seems more promising as it'd allow us to simply use + # makeWrapper's --add-flags option. However, the PR linked above is not + # complete, and as of currently, upstream hasn't even reviewed it, or + # commented on the idea. + # + # Note also that upstream has announced that they will put less time and + # energy for the project: + # + # https://github.com/tectonic-typesetting/tectonic/discussions/1122 + # + # Hence, we can be rather confident that for the near future, the online + # TeX bundle won't be updated and hence the biblatex distributed there + # won't require a higher version of biber. + + '' + makeWrapper ${lib.getBin tectonic-unwrapped}/bin/tectonic $out/bin/tectonic \ + --prefix PATH : "${lib.getBin biber-for-tectonic}/bin" + ln -s $out/bin/tectonic $out/bin/nextonic + ''; + + meta = tectonic-unwrapped.meta // { + description = "Tectonic TeX/LaTeX engine, wrapped with a compatible biber"; + maintainers = with lib.maintainers; [ doronbehar bryango ]; + }; +} diff --git a/pkgs/tools/typesetting/tex/catdvi/default.nix b/pkgs/tools/typesetting/tex/catdvi/default.nix index 924aa57ece996..1958a2f4c0734 100644 --- a/pkgs/tools/typesetting/tex/catdvi/default.nix +++ b/pkgs/tools/typesetting/tex/catdvi/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # fix implicit-int compile error in test code used in configure script + postPatch = '' + sed -i 's/^main()/int main()/' configure + ''; + hardeningDisable = [ "format" ]; outputs = [ "out" ] ++ lib.optional (with stdenv; buildPlatform.canExecute hostPlatform) "dev"; diff --git a/pkgs/tools/typesetting/typstfmt/Cargo.lock b/pkgs/tools/typesetting/typstfmt/Cargo.lock index 8f560ac59e5de..ecfb8d4030f54 100644 --- a/pkgs/tools/typesetting/typstfmt/Cargo.lock +++ b/pkgs/tools/typesetting/typstfmt/Cargo.lock @@ -18,6 +18,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] name = "bstr" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -30,9 +36,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -46,9 +52,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "comemo" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" +checksum = "bf5705468fa80602ee6a5f9318306e6c428bffd53e43209a78bc05e6e667c6f4" dependencies = [ "comemo-macros", "siphasher", @@ -56,13 +62,13 @@ dependencies = [ [[package]] name = "comemo-macros" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168cc09917f6a014a4cf6ed166d1b541a20a768c60f9cc348f25203ee8312940" +checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -137,16 +143,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -166,28 +166,28 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", - "bstr 1.7.0", - "fnv", + "bstr 1.8.0", "log", - "regex", + "regex-automata 0.4.3", + "regex-syntax", ] [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown", @@ -229,9 +229,20 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] [[package]] name = "linked-hash-map" @@ -281,9 +292,9 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -299,21 +310,21 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall", + "libredox", "thiserror", ] @@ -363,29 +374,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.189" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -421,32 +432,21 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" [[package]] name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "syn" -version = "1.0.109" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -470,7 +470,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn", ] [[package]] @@ -506,9 +506,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -545,7 +545,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn", ] [[package]] @@ -560,20 +560,20 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -601,7 +601,7 @@ dependencies = [ [[package]] name = "typstfmt" -version = "0.2.6" +version = "0.2.7" dependencies = [ "confy", "lexopt", @@ -610,7 +610,7 @@ dependencies = [ [[package]] name = "typstfmt_lib" -version = "0.2.6" +version = "0.2.7" dependencies = [ "globmatch", "insta", @@ -770,9 +770,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" dependencies = [ "memchr", ] diff --git a/pkgs/tools/typesetting/typstfmt/default.nix b/pkgs/tools/typesetting/typstfmt/default.nix index cec70394e4f97..2305998e94a20 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.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "astrale-sharp"; repo = "typstfmt"; rev = version; - hash = "sha256-UUVbnxIj7kQVpZvSbbB11i6wAvdTnXVk5cNSNoGBeRM="; + hash = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI="; }; cargoLock = { diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index 5e796c82ec6b0..54e5a22cc67d5 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { pname = "bento4"; - version = "1.6.0-640"; + version = "1.6.0-641"; src = fetchFromGitHub { owner = "axiomatic-systems"; repo = "Bento4"; rev = "v${version}"; - hash = "sha256-VhlFfNYw3xpAIyWqDyhgXIv3JtpFJH0BL97dFX8diRY="; + hash = "sha256-Qy8D3cbCVHmLAaXtiF64rL2oRurXNCtd5Dsgt0W7WdY="; }; patches = [ diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index c93534bf1a20b..8e6d0baf7e725 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -14,11 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxslt freetype libpng libxml2 ]; + # fatal error: 'libxml/xpath.h' file not found + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libxml2.dev}/include/libxml2"; + meta = { description = "An xml2swf and swf2xml processor with import functionalities"; homepage = "http://swfmill.org"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; mainProgram = "swfmill"; }; } diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index b57ce3abb1683..70991742e789d 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-inw4bPeObMlwtgFLR/8+tqRKTkcViZeEFZ1MOm0HYI4="; + sha256 = "sha256-64vjN0tm6P+nXjrNPeTviXOQdibuH7YbQm/LjYLxatM="; }; vendorHash = null; diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index e6b867139165d..da2f1a9091565 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -60,7 +60,7 @@ buildGoModule rec { description = "System container image builder for LXC and LXD"; homepage = "https://github.com/lxc/distrobuilder"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ megheaiulian adamcstephens ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; mainProgram = "distrobuilder"; }; diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/tools/virtualization/mininet/default.nix index c33389861dd0a..3d7339bf56b63 100644 --- a/pkgs/tools/virtualization/mininet/default.nix +++ b/pkgs/tools/virtualization/mininet/default.nix @@ -1,11 +1,38 @@ { stdenv, lib, fetchFromGitHub +, runCommand , which , python3 , help2man +, makeWrapper +, ethtool +, inetutils +, iperf +, iproute2 +, nettools +, socat }: let pyEnv = python3.withPackages(ps: [ ps.setuptools ]); + + telnet = runCommand "inetutils-telnet" + { } + '' + mkdir -p "$out/bin" + ln -s "${inetutils}"/bin/telnet "$out/bin" + ''; + + generatedPath = lib.makeSearchPath "bin" [ + iperf + ethtool + iproute2 + socat + # mn errors out without a telnet binary + # pkgs.inetutils brings an undesired ifconfig into PATH see #43105 + nettools + telnet + ]; + in stdenv.mkDerivation rec { pname = "mininet"; @@ -24,7 +51,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; pythonPath = [ python3.pkgs.setuptools ]; - nativeBuildInputs = [ help2man ]; + nativeBuildInputs = [ help2man makeWrapper python3.pkgs.wrapPython ]; propagatedBuildInputs = [ python3 which ]; @@ -33,7 +60,18 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out $py # without --root, install fails - ${pyEnv.interpreter} setup.py install --root="/" --prefix=$py + "${pyEnv.interpreter}" setup.py install \ + --root="/" \ + --prefix="$py" \ + --install-scripts="$out/bin" + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/bin" "$py $pythonPath" + wrapProgram "$out/bin/mnexec" \ + --prefix PATH : "${generatedPath}" + wrapProgram "$out/bin/mn" \ + --prefix PATH : "${generatedPath}" ''; doCheck = false; diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix index 38ffb1cd4838f..bb823b5169777 100644 --- a/pkgs/tools/virtualization/mkosi/default.nix +++ b/pkgs/tools/virtualization/mkosi/default.nix @@ -6,6 +6,10 @@ , bubblewrap , systemd , pandoc +, kmod +, gnutar +, util-linux +, cpio # Python packages , setuptools @@ -30,21 +34,11 @@ let 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="; - }) # repart: make sure rewinddir() is called before readdir() when performing rm -rf. Remove when upgrading to systemd 255. (fetchpatch { url = "https://github.com/systemd/systemd/commit/6bbb893b90e2dcb05fb310ba4608f9c9dc587845.patch"; hash = "sha256-A6cF2QAeYHGc0u0V1JMxIcV5shzf5x3Q6K+blZOWSn4="; }) - # Set timezone to UTC when invoking mcopy. Remove when upgrading to systemd 255. - (fetchpatch { - url = "https://github.com/systemd/systemd/commit/b2942c76adc5bb6a3e073aa5cee57834ee3a9813.patch"; - hash = "sha256-phGln3Gs9p8CsEe+1laGrm9xcUJWVbNBW0W8oR9/7YU="; - }) ]; })).override { withRepart = true; @@ -94,8 +88,12 @@ buildPythonApplication rec { ]; propagatedBuildInputs = [ - systemdForMkosi bubblewrap + cpio + gnutar + kmod + systemdForMkosi + util-linux ] ++ lib.optional withQemu [ qemu ]; diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index e78b36c9f84f9..cea1553e0bc6f 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -6,16 +6,17 @@ buildGoModule rec { pname = "xe-guest-utilities"; - version = "7.30.0"; + version = "8.3.1"; src = fetchFromGitHub { owner = "xenserver"; repo = "xe-guest-utilities"; rev = "v${version}"; - hash = "sha256-gMb8QIUg8t0SiTtUzqeh4XM5hHgCXuf5KlV3OeoU0LI="; + hash = "sha256-d0WdezcT44ExeHSnoJ3Dn0u/IRlhWreOZPSVw6Q1h/w="; }; - vendorHash = "sha256-zhpDvo8iujE426/gxJY+Pqfv99vLNKHqyMQbbXIKodY="; + deleteVendor = true; + vendorHash = "sha256-X/BI+ZhoqCGCmJfccyEBVgZc70aRTp3rL5j+rBWG5fE="; postPatch = '' substituteInPlace mk/xen-vcpu-hotplug.rules \ diff --git a/pkgs/tools/virtualization/xen-guest-agent/default.nix b/pkgs/tools/virtualization/xen-guest-agent/default.nix new file mode 100644 index 0000000000000..52924b2b624f6 --- /dev/null +++ b/pkgs/tools/virtualization/xen-guest-agent/default.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitLab, + rustPlatform, + llvmPackages, + xen-light, +}: +rustPlatform.buildRustPackage rec { + pname = "xen-guest-agent"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "xen-project"; + repo = pname; + rev = version; + hash = "sha256-Csio24ofj+p0j/R0av/28P/KCNXhmcF+r8xGJEfoHjQ="; + }; + + cargoHash = "sha256-XWDDzSu88zCIwMuvkFjCb98DzXHvW2IP9u3EbpAMIgw="; + + env = { + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + BINDGEN_EXTRA_CLANG_ARGS = "-isystem ${xen-light}/include"; + RUSTFLAGS = "-L ${xen-light}/lib"; + }; + + nativeBuildInputs = [llvmPackages.clang xen-light]; + + postFixup = '' + patchelf $out/bin/xen-guest-agent --add-rpath ${xen-light}/lib + ''; + + meta = with lib; { + description = "Xen agent running in Linux/BSDs (POSIX) VMs"; + homepage = "https://gitlab.com/xen-project/xen-guest-agent"; + license = licenses.agpl3; + platforms = platforms.unix; + maintainers = with maintainers; [matdibu]; + }; +} diff --git a/pkgs/tools/wayland/hyprland-per-window-layout/default.nix b/pkgs/tools/wayland/hyprland-per-window-layout/default.nix index e8c0d543d6e75..02795f7318a2b 100644 --- a/pkgs/tools/wayland/hyprland-per-window-layout/default.nix +++ b/pkgs/tools/wayland/hyprland-per-window-layout/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-per-window-layout"; - version = "2.3.1"; + version = "2.4"; src = fetchFromGitHub { owner = "coffebar"; repo = pname; rev = version; - hash = "sha256-zH0N7m8cvc47MM7+DAIgg/S6onpIwoB9CfcAmRqhtGA="; + hash = "sha256-2nc72fP/fw053tCJLqXzEecOoiF28wosJbw81kCilYA="; }; - cargoHash = "sha256-rYTptEB+2Adlb1y7oXO+noqNylwiHBAb49ufZdPL9Qc="; + cargoHash = "sha256-6cZ9aRrUOUoc9vDyGh9PUiuWnXrGxw/ZyECkh0XwBi0="; meta = with lib; { description = "Per window keyboard layout (language) for Hyprland wayland compositor"; diff --git a/pkgs/tools/wayland/kanshi/default.nix b/pkgs/tools/wayland/kanshi/default.nix index c0884acfeadb5..6d2d1a4b1a981 100644 --- a/pkgs/tools/wayland/kanshi/default.nix +++ b/pkgs/tools/wayland/kanshi/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "kanshi"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "kanshi"; rev = "v${version}"; - sha256 = "sha256-5dIBQBA3OMlmaSYswwggFuedsb3i4uy9bcTZahIS2gQ="; + sha256 = "sha256-vxysZWFcfYwOgFMcRuPzYpWmFOFMiwc62DqI+nTQ4MI="; }; strictDeps = true; diff --git a/pkgs/tools/wayland/mpvpaper/default.nix b/pkgs/tools/wayland/mpvpaper/default.nix index 51edcc0ea3a2f..91ec1e80267ff 100644 --- a/pkgs/tools/wayland/mpvpaper/default.nix +++ b/pkgs/tools/wayland/mpvpaper/default.nix @@ -2,7 +2,6 @@ , lib , meson , ninja -, wlroots , wayland , wayland-protocols , wayland-scanner @@ -17,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mpvpaper"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "GhostNaN"; repo = pname; rev = version; - sha256 = "sha256-0LjIwOY2hBUb0nziD3HLP2Ek5+8v3ntssRFD9eQgWkc="; + sha256 = "sha256-pJPoI47KKazVT6RfqyftZe+lPe6Kn2cllRSfq0twUpQ="; }; strictDeps = true; @@ -37,7 +36,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wlroots wayland wayland-protocols egl-wayland diff --git a/pkgs/tools/wayland/slurp/default.nix b/pkgs/tools/wayland/slurp/default.nix index 327cc7e91d1ff..e8be0deae6c27 100644 --- a/pkgs/tools/wayland/slurp/default.nix +++ b/pkgs/tools/wayland/slurp/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "slurp"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; rev = "v${finalAttrs.version}"; - hash = "sha256-jUuY2wuN00libHDaJEmrvQAb1o989Ly3nLyKHV0jz8Q="; + hash = "sha256-2M8f3kN6tihwKlUCp2Qowv5xD6Ufb71AURXqwQShlXI="; }; depsBuildBuild = [ @@ -53,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/emersion/slurp"; license = licenses.mit; mainProgram = "slurp"; - maintainers = with maintainers; [ buffet ]; + maintainers = with maintainers; [ buffet nickcao ]; }; }) diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/tools/wayland/swaysome/default.nix index 4acf4115a0480..308592e450f94 100644 --- a/pkgs/tools/wayland/swaysome/default.nix +++ b/pkgs/tools/wayland/swaysome/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swaysome"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitLab { owner = "hyask"; repo = pname; rev = version; - sha256 = "sha256-KmGAp0EPnnM+hPRpUGsbt+NU2v5mcPaRUqo0pqUr1L8="; + sha256 = "sha256-U5W/9VL1t1/R4ADPxseBV6CMKx04I4vbp7sFmSqRZXk="; }; - cargoHash = "sha256-9sOR99CaTyMQoGMKP2Cag6YNxmgEqNPE/kiJPziqB9U="; + cargoHash = "sha256-QA3EQsYgjwx8QX50yaxiJyAPDlpYYqiqLiXco1kJmw0="; meta = with lib; { description = "Helper to make sway behave more like awesomewm"; diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 4e829d1e0b66a..5520a79a2f3d1 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -8,13 +8,13 @@ ocamlPackages.buildDunePackage rec { pname = "wayland-proxy-virtwl"; - version = "unstable-2023-10-27"; + version = "unstable-2023-11-28"; src = fetchFromGitHub { owner = "talex5"; repo = pname; - rev = "cc9548c4980ff33f86d5645ce337a79bf95d6139"; - sha256 = "sha256-aAqbPslTu+RLQPKPJQH2iYjcI8/De2WPk5nHULdfocU="; + rev = "1135a2781c37decce9bc5c566a54d8fbffe8aa73"; + sha256 = "sha256-I3lHB1Y7z/6oNmL2vO/AWaOnpcks7WmqGOdaYtYdxn4="; }; minimalOCamlVersion = "5.0"; diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix index 67f7904192f92..f51ae7dc76570 100644 --- a/pkgs/tools/wayland/wob/default.nix +++ b/pkgs/tools/wayland/wob/default.nix @@ -5,6 +5,7 @@ , meson , ninja , pkg-config +, cmocka , scdoc , wayland-scanner , wayland @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.14.2"; + version = "0.15.1"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "sha256-u4jLVLGcMTgDEgN8jW5d59m3GorJX7Z6+qKhzvbON3k="; + sha256 = "sha256-9LFAEo17w861ldMJU+t1oLAKoM6gJc4Em4tSwQDXbKU="; }; strictDeps = true; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ inih wayland wayland-protocols ] + buildInputs = [ cmocka inih wayland wayland-protocols ] ++ lib.optional stdenv.isLinux libseccomp; mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; diff --git a/pkgs/tools/wayland/xwaylandvideobridge/default.nix b/pkgs/tools/wayland/xwaylandvideobridge/default.nix index 83b2186c8ab1e..5614ef40d5374 100644 --- a/pkgs/tools/wayland/xwaylandvideobridge/default.nix +++ b/pkgs/tools/wayland/xwaylandvideobridge/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitLab +, fetchurl , cmake , extra-cmake-modules , pkg-config @@ -14,14 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xwaylandvideobridge"; - version = "0.2"; + version = "0.4.0"; - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "system"; - repo = "xwaylandvideobridge"; - rev = "v${finalAttrs.version}"; - hash = "sha256-79Z4BH7C85ZF+1Zivs3bTey7IdUnaDKhvZxzL6sDqUs="; + src = fetchurl { + url = "mirror://kde/stable/xwaylandvideobridge/xwaylandvideobridge-${finalAttrs.version}.tar.xz"; + hash = "sha256-6nKseypnV46ZlNywYZYC6tMJekb7kzZmHaIA5jkn6+Y="; }; nativeBuildInputs = [ @@ -42,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Utility to allow streaming Wayland windows to X applications"; homepage = "https://invent.kde.org/system/xwaylandvideobridge"; - license = lib.licenses.gpl2Plus; + license = with lib.licenses; [ bsd3 cc0 gpl2Plus ]; maintainers = with lib.maintainers; [ stepbrobd ]; platforms = lib.platforms.linux; mainProgram = "xwaylandvideobridge"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e655c34c7e824..300b15940cdfe 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -69,7 +69,9 @@ mapAliases ({ alsaUtils = alsa-utils; # Added 2021-06-10 angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 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 + apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 antimicroX = antimicrox; # Added 2021-10-31 + arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 aseprite-unfree = aseprite; # Added 2023-08-26 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 @@ -149,11 +151,12 @@ mapAliases ({ composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 + cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 clash = throw "'clash' has been removed, upstream gone. Consider using 'clash-meta' instead."; # added 2023-11-10 clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = claws-mail; # Added 2021-07-10 + clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09 cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09 - code-server = throw "'code-server' has been removed from nixpkgs, as it was depending on EOL Node.js and is unmaintained."; # Added 2023-10-30 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 @@ -164,7 +167,7 @@ mapAliases ({ # these are for convenience, not for backward compat and shouldn't expire clang6Stdenv = lowPrio llvmPackages_6.stdenv; - clang7Stdenv = lowPrio llvmPackages_7.stdenv; + clang7Stdenv = throw "clang7Stdenv has been removed from nixpkgs"; # Added 2023-11-19 clang8Stdenv = lowPrio llvmPackages_8.stdenv; clang9Stdenv = lowPrio llvmPackages_9.stdenv; clang10Stdenv = lowPrio llvmPackages_10.stdenv; @@ -174,18 +177,24 @@ mapAliases ({ clang14Stdenv = lowPrio llvmPackages_14.stdenv; clang15Stdenv = lowPrio llvmPackages_15.stdenv; clang16Stdenv = lowPrio llvmPackages_16.stdenv; + clang17Stdenv = lowPrio llvmPackages_17.stdenv; + + clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19 + clang_7 = throw "clang_7 has been removed from nixpkgs"; # Added 2023-11-19 ### D ### dagger = throw "'dagger' has been removed from nixpkgs, as the trademark policy of the upstream project is incompatible"; # Added 2023-10-16 dart_stable = dart; # Added 2020-01-15 dat = nodePackages.dat; + deadcode = throw "'deadcode' has been removed, as upstream is abandoned since 2019-04-27. Use the official deadcode from 'gotools' package."; # Added 2023-12-28 deadpixi-sam = deadpixi-sam-unstable; debugedit-unstable = debugedit; # Added 2021-11-22 deltachat-electron = deltachat-desktop; # added 2021-07-18 demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 + dep = throw "'dep' has been removed, because it is deprecated and archived in favor of Go modules"; # Added 2023-12-26 devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dnnl = oneDNN; # Added 2020-04-22 @@ -265,6 +274,7 @@ mapAliases ({ 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 fractal-next = fractal; # added 2023-11-25 + framework-system-tools = framework-tool; # added 2023-12-09 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 @@ -282,6 +292,7 @@ mapAliases ({ geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 + gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // { @@ -295,6 +306,7 @@ mapAliases ({ }; # Added 2021-01-14 gitter = throw "gitter has been removed since the client has been abandoned by upstream with the backend migration to Matrix"; # Added 2023-09-18 + glide = throw "'glide' has been removed as it is unmaintained, please use Go modules instead"; # Added 2023-12-26 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 gnatboot11 = gnat-bootstrap11; @@ -321,6 +333,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 + go2nix = throw "'go2nix' has been removed as it was archived upstream"; # Added 2023-12-27 gobby5 = gobby; # Added 2021-02-01 #godot @@ -333,6 +346,7 @@ mapAliases ({ google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 go-thumbnailer = thud; # Added 2023-09-21 + govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26 gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 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 @@ -364,6 +378,7 @@ mapAliases ({ hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 hip = throw "'hip' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 hipcc = throw "'hipcc' has been replaced with 'rocmPackages.hipcc'"; # Added 2023-10-08 + hipchat = throw "'hipchat' has been discontinued since 2019; upstream recommends Slack."; # Added 2023-12-02 hipify = throw "'hipify' has been replaced with 'rocmPackages.hipify'"; # Added 2023-10-08 hipcub = throw "'hipcub' has been replaced with 'rocmPackages.hipcub'"; # Added 2023-10-08 hipsparse = throw "'hipsparse' has been replaced with 'rocmPackages.hipsparse'"; # Added 2023-10-08 @@ -387,6 +402,7 @@ mapAliases ({ 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 + indigenous-desktop = throw "'indigenous-desktop' has been renamed to/replaced by 'indiepass-desktop'"; # Added 2023-11-08 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 index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17 @@ -559,6 +575,10 @@ mapAliases ({ ''; linux_latest_hardened = linuxPackages_latest_hardened; + lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 + lldb_7 = throw "lldb_7 has been removed from nixpkgs"; # Added 2023-11-19 + llvmPackages_7 = throw "llvmPackages_7 has been removed from nixpkgs"; # Added 2023-11-19 + llvm_7 = throw "llvm_7 has been removed from nixpkgs"; # Added 2023-11-19 lobster-two = google-fonts; # Added 2021-07-22 luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 @@ -575,6 +595,7 @@ mapAliases ({ 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 + mbox = throw "'mbox' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 mcomix3 = mcomix; # Added 2022-06-05 meme = meme-image-generator; # Added 2021-04-21 mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 @@ -585,6 +606,8 @@ mapAliases ({ miopen-hip = throw "'miopen-hip' has been replaced with 'rocmPackages.miopen-hip'"; # Added 2023-10-08 miopen-opencl = throw "'miopen-opencl' has been replaced with 'rocmPackages.miopen-opencl'"; # Added 2023-10-08 mime-types = mailcap; # Added 2022-01-21 + minetestclient_5 = minetestclient; # Added 2023-12-11 + minetestserver_5 = minetestserver; # Added 2023-12-11 minizip2 = pkgs.minizip-ng; # Added 2022-12-28 mirage-im = throw "'mirage-im' has been removed, as it was broken and unmaintained"; # Added 2023-11-26 monero = monero-cli; # Added 2021-11-28 @@ -617,6 +640,7 @@ mapAliases ({ 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 + nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained" ; # Added 2023-11-20 nixFlakes = nixVersions.stable; # Added 2021-05-21 nixStable = nixVersions.stable; # Added 2022-01-24 nixUnstable = nixVersions.unstable; # Added 2022-01-26 @@ -644,6 +668,7 @@ mapAliases ({ 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 + nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated; use cudaPackages.cuda_cccl"; ### O ### @@ -674,6 +699,7 @@ mapAliases ({ orchis = orchis-theme; # Added 2021-06-09 oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 osxfuse = macfuse-stubs; # Added 2021-03-20 + oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09 ### P ### @@ -684,6 +710,7 @@ mapAliases ({ paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03 parity = openethereum; # Added 2020-08-01 pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 + pcsctools = pcsc-tools; # Added 2023-12-07 pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 @@ -768,6 +795,7 @@ mapAliases ({ qt6ct = qt6Packages.qt6ct; # Added 2023-03-07 qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12 + quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23 qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19 quvi = throw "'quvi' has been removed, as it was broken and unmaintained"; # Added 2023-11-25 @@ -832,9 +860,17 @@ mapAliases ({ s2n = s2n-tls; # Added 2021-03-03 sane-backends-git = sane-backends; # Added 2021-02-19 scantailor = scantailor-advanced; # Added 2022-05-26 + schildichat-web = throw '' + schildichat has been removed as it is severely lacking behind the Element upstream and does not receive regular security fixes. + Please participate in upstream discussion on getting out new releases: + https://github.com/SchildiChat/schildichat-desktop/issues/212 + https://github.com/SchildiChat/schildichat-desktop/issues/215''; # Added 2023-12-05 + schildichat-desktop = schildichat-web; + schildichat-desktop-wayland = schildichat-web; sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03 session-desktop-appimage = session-desktop; + setupcfg2nix = throw "'setupcfg2nix' has been removed. Please switch to buildPythonPackage"; # Added 2023-12-12 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 @@ -889,10 +925,12 @@ mapAliases ({ spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = spring-boot-cli; # added 2020-04-24 squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 + ssb = throw "'ssb' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 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 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 + supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22 swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swtpm-tpm2 = swtpm; # Added 2021-02-26 syncthing-cli = syncthing; # Added 2021-04-06 @@ -935,6 +973,7 @@ mapAliases ({ unifi-poller = unpoller; # Added 2022-11-24 unifiStable = unifi6; # Added 2020-12-28 untrunc = untrunc-anthwlock; # Added 2021-02-01 + urlview = throw "'urlview' has been dropped because it's unmaintained. Consider switching to an alternative such as `pkgs.extract_url` or `pkgs.urlscan`."; # Added 2023-12-14 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 urxvt_font_size = rxvt-unicode-plugins.font-size; # Added 2020-02-02 @@ -964,12 +1003,14 @@ mapAliases ({ virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25 vkBasalt = vkbasalt; # Added 2022-11-22 + vsmtp = throw "'vsmtp' has been removed, upstream gone"; # Added 2023-12-18 vte_290 = throw "'vte_290' has been renamed to/replaced by 'vte'"; # Added 2023-01-05 varnish72 = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 varnish73 = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 varnish72Packages = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 varnish73Packages = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09 inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 + volatility = throw "'volatility' has been removed, as it was broken and unmaintained"; # Added 2023-12-10 ### W ### waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 @@ -998,6 +1039,8 @@ mapAliases ({ ### X ### xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19 + xcbuild6Hook = throw "'xcbuild6Hook has been renamed to/replaced by 'xcbuildHook'"; # Added 2023-12-10 + xcodebuild6 = throw "'xcodebuild6' has been renamed to/replaced by 'xcodebuild'"; # Added 2023-12-10 xdg_utils = xdg-utils; # Added 2021-02-01 xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 @@ -1036,7 +1079,7 @@ mapAliases ({ inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09 # LLVM packages for (integration) testing that should not be used inside Nixpkgs: - llvmPackages_latest = llvmPackages_16; + llvmPackages_latest = llvmPackages_17; llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_git.tools; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6679e1dee8e4c..5f0a1da70966b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -61,7 +61,7 @@ with pkgs; }; stdenvNoLibs = - if stdenv.hostPlatform != stdenv.buildPlatform && (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isDarwin.useLLVM or false) + if stdenv.hostPlatform != stdenv.buildPlatform && (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.useLLVM or false) then # We cannot touch binutils or cc themselves, because that will cause # infinite recursion. So instead, we just choose a libc based on the @@ -104,10 +104,10 @@ with pkgs; ### Evaluating the entire Nixpkgs naively will fail, make failure fast AAAAAASomeThingsFailToEvaluate = throw '' - Please be informed that this pseudo-package is not the only part of - Nixpkgs that fails to evaluate. You should not evaluate entire Nixpkgs - without some special measures to handle failing packages, like those taken - by Hydra. + Please be informed that this pseudo-package is not the only part + of Nixpkgs that fails to evaluate. You should not evaluate + entire Nixpkgs without some special measures to handle failing + packages, like using pkgs/top-level/release-attrpaths.nix. ''; tests = callPackages ../test { }; @@ -116,7 +116,7 @@ with pkgs; # We don't want nix-env -q to enter this, because all of these are aliases. dontRecurseIntoAttrs ( import ./pkg-config/defaultPkgConfigPackages.nix pkgs - ); + ) // { __attrsFailEvaluation = true; }; ### Nixpkgs maintainer tools @@ -159,6 +159,7 @@ with pkgs; system = stdenv.hostPlatform.system; callTest = config: config.test.driver; }; + __attrsFailEvaluation = true; }; ### BUILD SUPPORT @@ -429,6 +430,8 @@ with pkgs; camunda-modeler = callPackage ../applications/misc/camunda-modeler { }; + checkpointBuildTools = callPackage ../build-support/checkpoint-build.nix {}; + caroline = callPackage ../development/libraries/caroline { }; cartridges = callPackage ../applications/misc/cartridges { }; @@ -517,6 +520,8 @@ with pkgs; cm256cc = callPackage ../development/libraries/cm256cc { }; + cnquery = callPackage ../tools/security/cnquery { }; + cocogitto = callPackage ../development/tools/cocogitto { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -585,8 +590,6 @@ with pkgs; crow-translate = libsForQt5.callPackage ../applications/misc/crow-translate { }; - cryptowatch-desktop = callPackage ../applications/finance/cryptowatch { }; - dae = callPackage ../tools/networking/dae { }; darling = callPackage ../applications/emulators/darling { }; @@ -611,12 +614,14 @@ with pkgs; djhtml = python3Packages.callPackage ../development/tools/djhtml { }; - deadcode = callPackage ../development/tools/deadcode { }; - deadnix = callPackage ../development/tools/deadnix { }; dec-decode = callPackage ../development/tools/dec-decode { }; + dnf-plugins-core = with python3Packages; toPythonApplication dnf-plugins-core; + + dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { }; + dnf5 = callPackage ../tools/package-management/dnf5 { }; documenso = callPackage ../applications/office/documenso { }; @@ -729,7 +734,7 @@ with pkgs; hwatch = callPackage ../tools/misc/hwatch { }; - hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; }; + hobbes = callPackage ../development/tools/hobbes { }; honeycomb-refinery = callPackage ../servers/tracing/honeycomb/refinery { }; @@ -820,6 +825,10 @@ with pkgs; sea-orm-cli = callPackage ../development/tools/sea-orm-cli { }; + vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix { + fmt = fmt_10; + }; + r3ctl = qt5.callPackage ../tools/misc/r3ctl { }; ptouch-print = callPackage ../misc/ptouch-print { }; @@ -840,6 +849,14 @@ with pkgs; oauth2c = callPackage ../tools/security/oauth2c { }; + octodns = python3Packages.callPackage ../tools/networking/octodns { }; + + octodns-providers = recurseIntoAttrs { + bind = python3Packages.callPackage ../tools/networking/octodns/providers/bind { }; + hetzner = python3Packages.callPackage ../tools/networking/octodns/providers/hetzner { }; + powerdns = python3Packages.callPackage ../tools/networking/octodns/providers/powerdns { }; + }; + octosuite = callPackage ../tools/security/octosuite { }; octosql = callPackage ../tools/misc/octosql { }; @@ -888,7 +905,7 @@ with pkgs; dockerTools = callPackage ../build-support/docker { writePython3 = buildPackages.writers.writePython3; - }; + } // { __attrsFailEvaluation = true; }; fakeNss = callPackage ../build-support/fake-nss { }; @@ -1071,8 +1088,6 @@ with pkgs; packr = callPackage ../development/libraries/packr { }; - pacproxy = callPackage ../tools/networking/pacproxy { }; - pacup = callPackage ../tools/package-management/pacup { }; patcher9x = callPackage ../development/tools/patcher9x { }; @@ -1568,7 +1583,10 @@ with pkgs; }; akkoma-frontends = recurseIntoAttrs { akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { }; - admin-fe = callPackage ../servers/akkoma/admin-fe { }; + admin-fe = callPackage ../servers/akkoma/admin-fe { + nodejs = nodejs_18; + yarn = yarn.override { nodejs = nodejs_18; }; + }; }; akkoma-emoji = recurseIntoAttrs { blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { }; @@ -1902,6 +1920,8 @@ with pkgs; hyperpotamus = callPackage ../tools/misc/hyperpotamus { }; + igir = callPackage ../tools/games/igir { }; + immich-cli = callPackage ../tools/misc/immich-cli { }; inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service; @@ -2141,7 +2161,7 @@ with pkgs; vrrtest = callPackage ../tools/video/vrrtest { }; winbox = callPackage ../tools/admin/winbox { - wine = wineWowPackages.staging; + wine = wineWowPackages.stable; }; wtwitch = callPackage ../tools/video/wtwitch { }; @@ -3019,12 +3039,8 @@ with pkgs; fox = fox_1_6; }; - xplr = callPackage ../applications/file-managers/xplr { }; - xplorer = callPackage ../applications/file-managers/xplorer { }; - ytree = callPackage ../applications/file-managers/ytree { }; - johnny-reborn-engine = callPackage ../applications/misc/johnny-reborn { }; johnny-reborn = callPackage ../applications/misc/johnny-reborn/with-data.nix { }; @@ -3230,6 +3246,27 @@ with pkgs; anewer = callPackage ../tools/text/anewer { }; + angie = callPackage ../servers/http/angie { + zlib = zlib-ng.override { withZlibCompat = true; }; + withPerl = false; + # We don't use `with` statement here on purpose! + # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334 + modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; + }; + + angieQuic = callPackage ../servers/http/angie { + zlib = zlib-ng.override { withZlibCompat = true; }; + withPerl = false; + withQuic = true; + # We don't use `with` statement here on purpose! + # See https://github.com/NixOS/nixpkgs/pull/10474#discussion_r42369334 + modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; + # Use latest quictls to allow http3 support + openssl = quictls; + }; + + angie-console-light = callPackage ../servers/http/angie/console-light.nix { }; + angle-grinder = callPackage ../tools/text/angle-grinder { }; ansifilter = callPackage ../tools/text/ansifilter { }; @@ -3591,9 +3628,7 @@ with pkgs; bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; - bonnie = callPackage ../tools/filesystems/bonnie { - stdenv = gcc10StdenvCompat; - }; + bonnie = callPackage ../tools/filesystems/bonnie { }; boron = callPackage ../development/interpreters/boron { }; @@ -3749,7 +3784,7 @@ with pkgs; dfmt = callPackage ../tools/text/dfmt { }; - diopser = callPackage ../applications/audio/diopser { stdenv = gcc10StdenvCompat; }; + diopser = callPackage ../applications/audio/diopser { }; diskonaut = callPackage ../tools/misc/diskonaut { }; @@ -3825,6 +3860,8 @@ with pkgs; flood = callPackage ../applications/networking/p2p/flood { }; + flood-for-transmission = callPackage ../applications/networking/p2p/flood-for-transmission { }; + font-config-info = callPackage ../tools/misc/font-config-info { }; foxdot = with python3Packages; toPythonApplication foxdot; @@ -3912,8 +3949,6 @@ with pkgs; goperf = callPackage ../development/tools/goperf { }; - gotktrix = callPackage ../applications/networking/instant-messengers/gotktrix { }; - graphite-cli = nodePackages.graphite-cli; gucci = callPackage ../tools/text/gucci { }; @@ -4011,8 +4046,8 @@ with pkgs; lesspass-cli = callPackage ../tools/security/lesspass-cli { }; livebook = callPackage ../servers/web-apps/livebook { - elixir = elixir_1_15; - beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_15; }); + elixir = elixir_1_16; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_16; }); }; lsix = callPackage ../tools/graphics/lsix { }; @@ -4487,7 +4522,7 @@ with pkgs; }; broot = callPackage ../tools/misc/broot { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Foundation Security; }; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; @@ -4810,8 +4845,6 @@ with pkgs; swaysome = callPackage ../tools/wayland/swaysome { }; - swayimg = callPackage ../tools/wayland/swayimg { }; - swaytools = python3Packages.callPackage ../tools/wayland/swaytools { }; swww = callPackage ../tools/wayland/swww { }; @@ -4908,7 +4941,6 @@ with pkgs; contacts = callPackage ../tools/misc/contacts { inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; - xcbuildHook = xcbuild6Hook; }; colorls = callPackage ../tools/system/colorls { }; @@ -5063,8 +5095,6 @@ with pkgs; dibbler = callPackage ../tools/networking/dibbler { }; - didder = callPackage ../tools/graphics/didder { }; - dieharder = callPackage ../tools/security/dieharder { }; diesel-cli = callPackage ../development/tools/diesel-cli { @@ -5235,7 +5265,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_26; + electron = electron_27; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh @@ -5293,8 +5323,6 @@ with pkgs; esptool = callPackage ../tools/misc/esptool { }; - esptool_3 = callPackage ../tools/misc/esptool/3.nix { }; - esptool-ck = callPackage ../tools/misc/esptool-ck { }; ephemeralpg = callPackage ../development/tools/database/ephemeralpg { }; @@ -5567,8 +5595,6 @@ with pkgs; gllvm = callPackage ../development/tools/gllvm { }; - glide = callPackage ../development/tools/glide { }; - globalarrays = callPackage ../development/libraries/globalarrays { }; glock = callPackage ../development/tools/glock { }; @@ -5716,6 +5742,8 @@ with pkgs; hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { }; + hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland/plugins.nix { }); + hysteria = callPackage ../tools/networking/hysteria { }; hyx = callPackage ../tools/text/hyx { }; @@ -5877,6 +5905,8 @@ with pkgs; libnvme = callPackage ../os-specific/linux/libnvme { }; + libnvidia-container = callPackage ../applications/virtualization/libnvidia-container { }; + librenms = callPackage ../servers/monitoring/librenms { }; libxnd = callPackage ../development/libraries/libxnd { }; @@ -6107,8 +6137,6 @@ with pkgs; nfstrace = callPackage ../tools/networking/nfstrace { }; - nix-direnv = callPackage ../tools/misc/nix-direnv { }; - nixel = callPackage ../tools/nix/nixel { }; nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; @@ -6324,6 +6352,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + rblake3sum = callPackage ../tools/security/rblake3sum { + inherit (darwin.apple_sdk.frameworks) Security; + }; + reg = callPackage ../tools/virtualization/reg { }; retool = callPackage ../applications/misc/retool { }; @@ -6676,6 +6708,8 @@ with pkgs; biber = callPackage ../tools/typesetting/biber { }; + biber-for-tectonic = callPackage ../tools/typesetting/tectonic/biber.nix { }; + biber-ms = callPackage ../tools/typesetting/biber-ms { }; biblatex-check = callPackage ../tools/typesetting/biblatex-check { }; @@ -6880,8 +6914,9 @@ with pkgs; citrix_workspace_23_02_0 citrix_workspace_23_07_0 citrix_workspace_23_09_0 + citrix_workspace_23_11_0 ; - citrix_workspace = citrix_workspace_23_09_0; + citrix_workspace = citrix_workspace_23_11_0; clima = callPackage ../tools/text/clima { }; @@ -7098,7 +7133,7 @@ with pkgs; ibus-theme-tools = callPackage ../tools/misc/ibus-theme-tools { }; interception-tools = callPackage ../tools/inputmethods/interception-tools { }; - interception-tools-plugins = { + interception-tools-plugins = recurseIntoAttrs { caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; dual-function-keys = callPackage ../tools/inputmethods/interception-tools/dual-function-keys.nix { }; }; @@ -7236,7 +7271,7 @@ with pkgs; compass = callPackage ../development/tools/compass { }; cone = callPackage ../development/compilers/cone { - llvmPackages = llvmPackages_7; + llvmPackages = llvmPackages_13; }; conda = callPackage ../tools/package-management/conda { }; @@ -7285,9 +7320,7 @@ with pkgs; cringify = callPackage ../tools/text/cringify { }; - cromfs = callPackage ../tools/archivers/cromfs { - stdenv = gcc10StdenvCompat; - }; + cromfs = callPackage ../tools/archivers/cromfs { }; cron = callPackage ../tools/system/cron { }; @@ -7300,7 +7333,7 @@ with pkgs; cudaPackages_10_0 = callPackage ./cuda-packages.nix { cudaVersion = "10.0"; }; cudaPackages_10_1 = callPackage ./cuda-packages.nix { cudaVersion = "10.1"; }; cudaPackages_10_2 = callPackage ./cuda-packages.nix { cudaVersion = "10.2"; }; - cudaPackages_10 = cudaPackages_10_2; + cudaPackages_10 = recurseIntoAttrs cudaPackages_10_2; cudaPackages_11_0 = callPackage ./cuda-packages.nix { cudaVersion = "11.0"; }; cudaPackages_11_1 = callPackage ./cuda-packages.nix { cudaVersion = "11.1"; }; @@ -7311,16 +7344,21 @@ with pkgs; cudaPackages_11_6 = callPackage ./cuda-packages.nix { cudaVersion = "11.6"; }; cudaPackages_11_7 = callPackage ./cuda-packages.nix { cudaVersion = "11.7"; }; cudaPackages_11_8 = callPackage ./cuda-packages.nix { cudaVersion = "11.8"; }; - cudaPackages_11 = cudaPackages_11_8; + cudaPackages_11 = recurseIntoAttrs cudaPackages_11_8; cudaPackages_12_0 = callPackage ./cuda-packages.nix { cudaVersion = "12.0"; }; cudaPackages_12_1 = callPackage ./cuda-packages.nix { cudaVersion = "12.1"; }; cudaPackages_12_2 = callPackage ./cuda-packages.nix { cudaVersion = "12.2"; }; - cudaPackages_12 = cudaPackages_12_0; + cudaPackages_12_3 = callPackage ./cuda-packages.nix { cudaVersion = "12.3"; }; + cudaPackages_12 = recurseIntoAttrs cudaPackages_12_0; + + # Use the older cudaPackages for tensorflow and jax, as determined by cudnn + # compatibility: https://www.tensorflow.org/install/source#gpu + cudaPackagesGoogle = cudaPackages_11; # TODO: try upgrading once there is a cuDNN release supporting CUDA 12. No # such cuDNN release as of 2023-01-10. - cudaPackages = recurseIntoAttrs cudaPackages_11; + cudaPackages = cudaPackages_11; # TODO: move to alias cudatoolkit = cudaPackages.cudatoolkit; @@ -7803,19 +7841,6 @@ with pkgs; strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; - schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix { - inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_25; - }; - schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' - #!/bin/sh - NIXOS_OZONE_WL=1 exec ${schildichat-desktop}/bin/schildichat-desktop "$@" - ''; - - schildichat-web = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-web.nix { - conf = config.schildichat-web.conf or { }; - }; - schleuder = callPackage ../tools/security/schleuder { }; schleuder-cli = callPackage ../tools/security/schleuder/cli { }; @@ -7939,7 +7964,7 @@ with pkgs; easeprobe = callPackage ../tools/misc/easeprobe { }; emscripten = callPackage ../development/compilers/emscripten { - llvmPackages = llvmPackages_16; + llvmPackages = llvmPackages_17; }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); @@ -7999,7 +8024,7 @@ with pkgs; eris-go = callPackage ../servers/eris-go { }; - ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; }; + ericw-tools = callPackage ../applications/misc/ericw-tools { }; cryfs = callPackage ../tools/filesystems/cryfs { }; @@ -8105,6 +8130,8 @@ with pkgs; fcitx5-with-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/with-addons.nix { }; + fcitx5-bamboo = callPackage ../tools/inputmethods/fcitx5/fcitx5-bamboo.nix { }; + fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { @@ -8322,8 +8349,6 @@ with pkgs; fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix { }; - footswitch = callPackage ../tools/inputmethods/footswitch { }; - foremost = callPackage ../tools/system/foremost { }; forktty = callPackage ../os-specific/linux/forktty { }; @@ -8663,6 +8688,8 @@ with pkgs; gnome-randr = callPackage ../tools/wayland/gnome-randr { }; + gnome-resources = callPackage ../tools/system/gnome-resources { }; + gnuapl = callPackage ../development/interpreters/gnu-apl { }; gnu-shepherd = callPackage ../misc/gnu-shepherd { }; @@ -8972,7 +8999,7 @@ with pkgs; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; gsmlib = callPackage ../development/libraries/gsmlib - { stdenv = gcc10StdenvCompat; autoreconfHook = buildPackages.autoreconfHook269; }; + { autoreconfHook = buildPackages.autoreconfHook269; }; gssdp = callPackage ../development/libraries/gssdp { }; @@ -9028,6 +9055,10 @@ with pkgs; gvproxy = callPackage ../tools/networking/gvproxy { }; + gyroflow = qt6Packages.callPackage ../applications/video/gyroflow { + ffmpeg = ffmpeg_6; + }; + gzip = callPackage ../tools/compression/gzip { }; gzrt = callPackage ../tools/compression/gzrt { }; @@ -9129,10 +9160,6 @@ with pkgs; llvmPackages = llvmPackages_16; }; - hare = callPackage ../development/compilers/hare { }; - - harec = callPackage ../development/compilers/harec { }; - hareThirdParty = recurseIntoAttrs (callPackage ./hare-third-party.nix { }); ham = pkgs.perlPackages.ham; @@ -9894,8 +9921,6 @@ with pkgs; kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { }; - kubo = callPackage ../applications/networking/kubo { }; - kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { }; kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { }; kubo-migrator = callPackage ../applications/networking/kubo-migrator { }; @@ -10039,6 +10064,8 @@ with pkgs; lua = lua5_2_compat; }; + lttoolbox = callPackage ../applications/misc/lttoolbox { }; + ltwheelconf = callPackage ../applications/misc/ltwheelconf { }; lunatask = callPackage ../applications/misc/lunatask { }; @@ -10089,6 +10116,7 @@ with pkgs; matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack { matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3; + nodejs = nodejs_18; }; matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { @@ -10312,9 +10340,9 @@ with pkgs; nodenv = callPackage ../development/tools/nodenv { }; - nodejs = hiPrio nodejs_18; - nodejs-slim = nodejs-slim_18; - corepack = hiPrio corepack_18; + nodejs = hiPrio nodejs_20; + nodejs-slim = nodejs-slim_20; + corepack = hiPrio corepack_20; nodejs_18 = callPackage ../development/web/nodejs/v18.nix { }; nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; }; @@ -10340,9 +10368,9 @@ with pkgs; inherit (callPackages ../build-support/node/fetch-npm-deps { }) fetchNpmDeps prefetch-npm-deps; - nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs; + nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs // { __attrsFailEvaluation = true; }; - nodePackages = dontRecurseIntoAttrs nodejs.pkgs; + nodePackages = dontRecurseIntoAttrs nodejs.pkgs // { __attrsFailEvaluation = true; }; node2nix = nodePackages.node2nix; @@ -10669,7 +10697,7 @@ with pkgs; lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { }; - loki = callPackage ../development/libraries/loki { stdenv = gcc10StdenvCompat; }; + loki = callPackage ../development/libraries/loki { }; longview = callPackage ../servers/monitoring/longview { }; @@ -10701,9 +10729,7 @@ with pkgs; lwc = callPackage ../tools/misc/lwc { }; - lxc = callPackage ../os-specific/linux/lxc { - autoreconfHook = buildPackages.autoreconfHook269; - }; + lxc = callPackage ../os-specific/linux/lxc { }; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd/wrapper.nix { }; @@ -10810,8 +10836,6 @@ with pkgs; mb2md = callPackage ../tools/text/mb2md { }; - mbox = callPackage ../tools/security/mbox { }; - mbuffer = callPackage ../tools/misc/mbuffer { }; mdsh = callPackage ../development/tools/documentation/mdsh { }; @@ -10926,7 +10950,7 @@ with pkgs; mkclean = callPackage ../applications/video/mkclean { }; - mkcue = callPackage ../tools/cd-dvd/mkcue { stdenv = gcc10StdenvCompat; }; + mkcue = callPackage ../tools/cd-dvd/mkcue { }; mkp224o = callPackage ../tools/security/mkp224o { }; @@ -11205,7 +11229,7 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud25 nextcloud26 nextcloud27; + nextcloud25 nextcloud26 nextcloud27 nextcloud28; nextcloud25Packages = throw "Nextcloud25 is EOL!"; nextcloud26Packages = callPackage ../servers/nextcloud/packages { @@ -11214,6 +11238,9 @@ with pkgs; nextcloud27Packages = callPackage ../servers/nextcloud/packages { apps = lib.importJSON ../servers/nextcloud/packages/27.json; }; + nextcloud28Packages = callPackage ../servers/nextcloud/packages { + apps = lib.importJSON ../servers/nextcloud/packages/28.json; + }; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -11240,6 +11267,7 @@ with pkgs; nomad_1_4 nomad_1_5 nomad_1_6 + nomad_1_7 ; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; @@ -11272,16 +11300,6 @@ with pkgs; nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher; - nvidia-thrust = callPackage ../development/libraries/nvidia-thrust { }; - - nvidia-thrust-intel = callPackage ../development/libraries/nvidia-thrust { - hostSystem = "TBB"; - deviceSystem = if config.cudaSupport then "CUDA" else "TBB"; - }; - - nvidia-thrust-cuda = callPackage ../development/libraries/nvidia-thrust { - deviceSystem = "CUDA"; - }; miller = callPackage ../tools/text/miller { }; @@ -11567,9 +11585,7 @@ with pkgs; onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; }; - ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { - buildGoModule = buildGo120Module; - }; + ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; }; @@ -11582,7 +11598,7 @@ with pkgs; opencryptoki = callPackage ../tools/security/opencryptoki { }; - opendbx = callPackage ../development/libraries/opendbx { stdenv = gcc10StdenvCompat; }; + opendbx = callPackage ../development/libraries/opendbx { }; opendht = callPackage ../development/libraries/opendht { inherit (darwin.apple_sdk.frameworks) Security; @@ -11732,6 +11748,8 @@ with pkgs; openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { }; + ovn-lts = callPackage ../by-name/ov/ovn/lts.nix { }; + optifinePackages = callPackage ../tools/games/minecraft/optifine { }; optifine = optifinePackages.optifine-latest; @@ -11769,7 +11787,9 @@ with pkgs; osqp = callPackage ../development/libraries/science/math/osqp { }; - ossec = callPackage ../tools/security/ossec { }; + ossec-agent = callPackage ../tools/security/ossec/agent.nix { }; + + ossec-server = callPackage ../tools/security/ossec/server.nix { }; osslsigncode = callPackage ../development/tools/osslsigncode { }; @@ -11978,13 +11998,16 @@ with pkgs; polkitSupport = true; }; - pcsctools = callPackage ../tools/security/pcsctools { }; - pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { }; pcsc-safenet = callPackage ../tools/security/pcsc-safenet { }; pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { }; + + pcsc-tools = callPackage ../tools/security/pcsc-tools { + inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; + }; + ifdnfc = callPackage ../tools/security/ifdnfc { }; pdd = python3Packages.callPackage ../tools/misc/pdd { }; @@ -12174,9 +12197,7 @@ with pkgs; python = null; }; - ploticus = callPackage ../tools/graphics/ploticus { - libpng = libpng12; - }; + ploticus = callPackage ../tools/graphics/ploticus { }; plotinus = callPackage ../tools/misc/plotinus { }; @@ -12186,8 +12207,6 @@ with pkgs; plowshare = callPackage ../tools/misc/plowshare { }; - pls = callPackage ../tools/misc/pls { }; - pm2 = nodePackages.pm2; pmenu = callPackage ../tools/X11/pmenu { }; @@ -12200,9 +12219,7 @@ with pkgs; pngoptimizer = callPackage ../tools/graphics/pngoptimizer { }; - pngtoico = callPackage ../tools/graphics/pngtoico { - libpng = libpng12; - }; + pngtoico = callPackage ../tools/graphics/pngtoico { }; pngpaste = callPackage ../os-specific/darwin/pngpaste { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; @@ -12775,7 +12792,7 @@ with pkgs; restool = callPackage ../os-specific/linux/restool { }; - reuse = callPackage ../tools/package-management/reuse { }; + reuse = with python3.pkgs; toPythonApplication reuse; reveal-md = callPackage ../tools/text/reveal-md { }; @@ -13211,7 +13228,8 @@ with pkgs; sigil = libsForQt5.callPackage ../applications/editors/sigil { }; - signalbackup-tools = callPackage ../applications/networking/instant-messengers/signalbackup-tools { }; + signalbackup-tools = darwin.apple_sdk_11_0.callPackage + ../applications/networking/instant-messengers/signalbackup-tools { }; signald = callPackage ../applications/networking/instant-messengers/signald { }; @@ -13348,9 +13366,7 @@ with pkgs; snet = callPackage ../tools/networking/snet { }; - sng = callPackage ../tools/graphics/sng { - libpng = libpng12; - }; + sng = callPackage ../tools/graphics/sng { }; snmpcheck = callPackage ../tools/networking/snmpcheck { }; @@ -13385,6 +13401,8 @@ with pkgs; spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { }; + sqlboiler = callPackage ../development/tools/sqlboiler { }; + ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; sshed = callPackage ../tools/networking/sshed { }; @@ -13562,16 +13580,12 @@ with pkgs; supertag = callPackage ../tools/filesystems/supertag { }; - supertux-editor = callPackage ../applications/editors/supertux-editor { }; - svgbob = callPackage ../tools/graphics/svgbob { }; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; svu = callPackage ../tools/misc/svu { }; - ssb = callPackage ../tools/security/ssb { }; - ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; ssdeep = callPackage ../tools/security/ssdeep { }; @@ -13594,6 +13608,8 @@ with pkgs; ssocr = callPackage ../applications/misc/ssocr { }; + sss-cli = callPackage ../tools/security/sss-cli { }; + ssss = callPackage ../tools/security/ssss { }; stabber = callPackage ../misc/stabber { }; @@ -14071,7 +14087,7 @@ with pkgs; trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; trunk = callPackage ../development/tools/trunk { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; + inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; }; trunk-io = callPackage ../development/tools/trunk-io { }; @@ -14092,7 +14108,7 @@ with pkgs; traceroute = callPackage ../tools/networking/traceroute { }; - tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; }; + tracebox = callPackage ../tools/networking/tracebox { }; tracee = callPackage ../tools/security/tracee { clang = clang_14; @@ -14108,6 +14124,8 @@ with pkgs; translatelocally = callPackage ../applications/misc/translatelocally { }; + translatelocally-models = recurseIntoAttrs (callPackages ../misc/translatelocally-models { }); + translate-shell = callPackage ../applications/misc/translate-shell { }; translatepy = with python3.pkgs; toPythonApplication translatepy; @@ -14242,8 +14260,6 @@ with pkgs; typos = callPackage ../development/tools/typos { }; - typst = callPackage ../tools/typesetting/typst { }; - typstfmt = callPackage ../tools/typesetting/typstfmt { }; typst-live = callPackage ../tools/typesetting/typst-live { }; @@ -14350,8 +14366,6 @@ with pkgs; urlscan = callPackage ../applications/misc/urlscan { }; - urlview = callPackage ../applications/misc/urlview { }; - url-parser = callPackage ../tools/misc/url-parser { }; urn-timer = callPackage ../tools/misc/urn-timer { }; @@ -14398,8 +14412,6 @@ with pkgs; vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger { }; - volatility = callPackage ../tools/security/volatility { }; - volatility3 = callPackage ../tools/security/volatility3 { }; vbetool = callPackage ../tools/system/vbetool { }; @@ -14965,6 +14977,10 @@ with pkgs; whsniff = callPackage ../applications/networking/sniffers/whsniff { }; + wio = callPackage ../by-name/wi/wio/package.nix { + wlroots = wlroots_0_17; + }; + wiiuse = callPackage ../development/libraries/wiiuse { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; @@ -15060,6 +15076,8 @@ with pkgs; xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { }; + xen-guest-agent = callPackage ../tools/virtualization/xen-guest-agent { }; + xflux = callPackage ../tools/misc/xflux { }; xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { }; @@ -15640,7 +15658,6 @@ with pkgs; clang = llvmPackages.clang; clang_6 = llvmPackages_6.clang; - clang_7 = llvmPackages_7.clang; clang_8 = llvmPackages_8.clang; clang_9 = llvmPackages_9.clang; clang_10 = llvmPackages_10.clang; @@ -15650,19 +15667,14 @@ with pkgs; clang_14 = llvmPackages_14.clang; clang_15 = llvmPackages_15.clang; clang_16 = llvmPackages_16.clang; + clang_17 = llvmPackages_17.clang; - clang-tools = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_14; - }; + clang-tools = callPackage ../development/tools/clang-tools { }; clang-tools_6 = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_6; }; - clang-tools_7 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_7; - }; - clang-tools_8 = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_8; }; @@ -15699,6 +15711,10 @@ with pkgs; llvmPackages = llvmPackages_16; }; + clang-tools_17 = callPackage ../development/tools/clang-tools { + llvmPackages = llvmPackages_17; + }; + clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { llvmPackages = llvmPackages_14; inherit (llvmPackages_14) clang; @@ -15757,6 +15773,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + critcl = callPackage ../development/compilers/critcl { + tcllib = tcllib.override { withCritcl = false; }; + }; + inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { }) crystal_1_2 crystal_1_7 @@ -16207,6 +16227,7 @@ with pkgs; ghdl-llvm = callPackage ../development/compilers/ghdl { backend = "llvm"; + inherit (llvmPackages_15) llvm; }; gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; @@ -16253,7 +16274,8 @@ with pkgs; # Prefer native-bignum to avoid linking issues with gmp else if stdenv.hostPlatform.isStatic then haskell.packages.native-bignum.ghc94 - else haskell.packages.ghc94); + else haskell.packages.ghc94) + // { __recurseIntoDerivationForReleaseJobs = true; }; # haskellPackages.ghc is build->host (it exposes the compiler used to build the # set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more @@ -16522,17 +16544,17 @@ with pkgs; juniper = callPackage ../development/compilers/juniper { }; + inherit (callPackage ../development/compilers/julia { }) + julia_16-bin + julia_18-bin + julia_19-bin + julia_18 + julia_19; + julia-lts = julia_16-bin; julia-stable = julia_19; julia = julia-stable; - julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; - julia_18-bin = callPackage ../development/compilers/julia/1.8-bin.nix { }; - julia_19-bin = callPackage ../development/compilers/julia/1.9-bin.nix { }; - - julia_18 = callPackage ../development/compilers/julia/1.8.nix { }; - julia_19 = callPackage ../development/compilers/julia/1.9.nix { }; - julia-lts-bin = julia_16-bin; julia-stable-bin = julia_19-bin; julia-bin = julia-stable-bin; @@ -16592,7 +16614,6 @@ with pkgs; lld = llvmPackages.lld; lld_6 = llvmPackages_6.lld; - lld_7 = llvmPackages_7.lld; lld_8 = llvmPackages_8.lld; lld_9 = llvmPackages_9.lld; lld_10 = llvmPackages_10.lld; @@ -16602,10 +16623,10 @@ with pkgs; lld_14 = llvmPackages_14.lld; lld_15 = llvmPackages_15.lld; lld_16 = llvmPackages_16.lld; + lld_17 = llvmPackages_17.lld; lldb = lldb_14; lldb_6 = llvmPackages_6.lldb; - lldb_7 = llvmPackages_7.lldb; lldb_8 = llvmPackages_8.lldb; lldb_9 = llvmPackages_9.lldb; lldb_10 = llvmPackages_10.lldb; @@ -16615,10 +16636,10 @@ with pkgs; lldb_14 = llvmPackages_14.lldb; lldb_15 = llvmPackages_15.lldb; lldb_16 = llvmPackages_16.lldb; + lldb_17 = llvmPackages_17.lldb; llvm = llvmPackages.llvm; llvm_6 = llvmPackages_6.llvm; - llvm_7 = llvmPackages_7.llvm; llvm_8 = llvmPackages_8.llvm; llvm_9 = llvmPackages_9.llvm; llvm_10 = llvmPackages_10.llvm; @@ -16628,6 +16649,7 @@ with pkgs; llvm_14 = llvmPackages_14.llvm; llvm_15 = llvmPackages_15.llvm; llvm_16 = llvmPackages_16.llvm; + llvm_17 = llvmPackages_17.llvm; libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; @@ -16656,13 +16678,6 @@ with pkgs; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries or llvmPackages_6.libraries; }); - llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 { - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_7.tools; - targetLlvm = targetPackages.llvmPackages_7.llvm or llvmPackages_7.llvm; - targetLlvmLibraries = targetPackages.llvmPackages_7.libraries or llvmPackages_7.libraries; - }); - llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_8.tools; @@ -16726,6 +16741,13 @@ with pkgs; targetLlvm = targetPackages.llvmPackages_16.llvm or llvmPackages_16.llvm; })); + llvmPackages_17 = recurseIntoAttrs (callPackage ../development/compilers/llvm/17 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_17.tools; + targetLlvmLibraries = targetPackages.llvmPackages_17.libraries or llvmPackages_17.libraries; + targetLlvm = targetPackages.llvmPackages_17.llvm or llvmPackages_17.llvm; + })); + lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -16834,7 +16856,7 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - ocaml-ng = callPackage ./ocaml-packages.nix { }; + ocaml-ng = callPackage ./ocaml-packages.nix { } // { __attrsFailEvaluation = true; }; ocaml = ocamlPackages.ocaml; ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages; @@ -16912,11 +16934,14 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_73 = callPackage ../development/compilers/rust/1_73.nix { + wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args; + wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; + + rust_1_74 = callPackage ../development/compilers/rust/1_74.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_16 = llvmPackages_16.libllvm; }; - rust = rust_1_73; + rust = rust_1_74; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -16924,23 +16949,23 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_73 = rust_1_73.packages.stable; - rustPackages = rustPackages_1_73; + rustPackages_1_74 = rust_1_74.packages.stable; + rustPackages = rustPackages_1_74; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; # https://github.com/NixOS/nixpkgs/issues/89426 - rustc-wasm32 = (rustc.override { + rustc-wasm32 = wrapRustc ((rustc.unwrapped.override { stdenv = stdenv.override { targetPlatform = lib.systems.elaborate { # lib.systems.elaborate won't recognize "unknown" as the last component. config = "wasm32-unknown-wasi"; - rust.config = "wasm32-unknown-unknown"; + rust.rustcTarget = "wasm32-unknown-unknown"; }; }; }).overrideAttrs (old: { configureFlags = old.configureFlags ++ ["--set=build.docs=false"]; - }); + })); makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { }; @@ -17561,7 +17586,7 @@ with pkgs; clojure = callPackage ../development/interpreters/clojure { # set this to an LTS version of java - jdk = jdk17; + jdk = jdk21; }; clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { }; @@ -17607,7 +17632,7 @@ with pkgs; inherit (beam.interpreters) erlang erlang_26 erlang_25 erlang_24 erlang_odbc erlang_javac erlang_odbc_javac - elixir elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 + elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls; erlang_nox = beam_nox.interpreters.erlang; @@ -17615,8 +17640,9 @@ with pkgs; inherit (beam.packages.erlang) erlang-ls erlfmt elvis-erlang rebar rebar3 rebar3WithPlugins - fetchHex beamPackages + fetchHex lfe lfe_2_1; + beamPackages = beam.packages.erlang // { __attrsFailEvaluation = true; }; expr = callPackage ../development/interpreters/expr { }; @@ -17741,9 +17767,7 @@ with pkgs; ### End of CuboCore - maude = callPackage ../development/interpreters/maude { - stdenv = if stdenv.cc.isClang then llvmPackages_7.stdenv else stdenv; - }; + maude = callPackage ../development/interpreters/maude { }; me_cleaner = callPackage ../tools/misc/me_cleaner { }; @@ -17900,19 +17924,19 @@ with pkgs; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; # Python package sets. - python27Packages = python27.pkgs; - python38Packages = python38.pkgs; - python39Packages = python39.pkgs; - python310Packages = recurseIntoAttrs python310.pkgs; - python311Packages = recurseIntoAttrs python311.pkgs; - python312Packages = python312.pkgs; - python313Packages = python313.pkgs; - pypyPackages = pypy.pkgs; - pypy2Packages = pypy2.pkgs; - pypy27Packages = pypy27.pkgs; - pypy3Packages = pypy3.pkgs; - pypy39Packages = pypy39.pkgs; - pypy310Packages = pypy310.pkgs; + python27Packages = python27.pkgs // { __attrsFailEvaluation = true; }; + python38Packages = python38.pkgs // { __attrsFailEvaluation = true; }; + python39Packages = python39.pkgs // { __attrsFailEvaluation = true; }; + python310Packages = recurseIntoAttrs python310.pkgs // { pythonPackages = python310.pkgs // { __attrsFailEvaluation = true; }; }; + python311Packages = recurseIntoAttrs python311.pkgs // { pythonPackages = python311.pkgs // { __attrsFailEvaluation = true; }; }; + python312Packages = python312.pkgs // { __attrsFailEvaluation = true; }; + python313Packages = python313.pkgs // { __attrsFailEvaluation = true; }; + pypyPackages = pypy.pkgs // { __attrsFailEvaluation = true; }; + pypy2Packages = pypy2.pkgs // { __attrsFailEvaluation = true; }; + pypy27Packages = pypy27.pkgs // { __attrsFailEvaluation = true; }; + pypy3Packages = pypy3.pkgs // { __attrsFailEvaluation = true; }; + pypy39Packages = pypy39.pkgs // { __attrsFailEvaluation = true; }; + pypy310Packages = pypy310.pkgs // { __attrsFailEvaluation = true; }; py3c = callPackage ../development/libraries/py3c { }; @@ -17931,8 +17955,6 @@ with pkgs; pypi-mirror = callPackage ../development/tools/pypi-mirror { }; - setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix { }; - svg2tikz = with python3.pkgs; toPythonApplication svg2tikz; svg2pdf = callPackage ../tools/graphics/svg2pdf { }; @@ -17990,8 +18012,6 @@ with pkgs; regextester = callPackage ../applications/misc/regextester { }; - regina = callPackage ../development/interpreters/regina { }; - inherit (ocamlPackages) reason; buildRubyGem = callPackage ../development/ruby-modules/gem { @@ -18052,8 +18072,8 @@ with pkgs; smiley-sans = callPackage ../data/fonts/smiley-sans { }; inherit (callPackages ../applications/networking/cluster/spark { }) - spark_3_4 spark_3_3 spark_3_2; - spark3 = spark_3_4; + spark_3_5 spark_3_4 spark_3_3; + spark3 = spark_3_5; spark = spark3; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; @@ -18125,7 +18145,7 @@ with pkgs; ### DEVELOPMENT / MISC - inherit (callPackage ../development/misc/h3 { }) h3_3 h3_4; + inherit (callPackages ../development/misc/h3 { }) h3_3 h3_4; h3 = h3_3; @@ -18427,7 +18447,6 @@ with pkgs; antlr = antlr4; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; - apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; apacheKafka = apacheKafka_3_5; @@ -18480,7 +18499,8 @@ with pkgs; electron_24-bin electron_25-bin electron_26-bin - electron_27-bin; + electron_27-bin + electron_28-bin; electron_10 = electron_10-bin; electron_11 = electron_11-bin; @@ -18497,10 +18517,11 @@ with pkgs; electron_22 = electron_22-bin; electron_23 = electron_23-bin; electron_24 = electron_24-bin; - electron_25 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_25 then electron-source.electron_25 else electron_25-bin; + electron_25 = 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_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin; - electron = electron_27; + electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin; + electron = electron_28; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -18924,7 +18945,7 @@ with pkgs; credstash = with python3Packages; toPythonApplication credstash; creduce = callPackage ../development/tools/misc/creduce { - inherit (llvmPackages_8) llvm libclang; + inherit (llvmPackages_16) llvm libclang; }; cscope = callPackage ../development/tools/misc/cscope { }; @@ -19182,9 +19203,7 @@ with pkgs; fprettify = callPackage ../development/tools/fprettify { }; - framac = callPackage ../development/tools/analysis/frama-c { - why3 = pkgs.why3.override { version = "1.6.0"; }; - }; + framac = callPackage ../development/tools/analysis/frama-c { }; frame = callPackage ../development/libraries/frame { }; @@ -19309,7 +19328,7 @@ with pkgs; gqlint = callPackage ../development/tools/gqlint { }; gradle-packages = import ../development/tools/build-managers/gradle { - inherit jdk8 jdk11 jdk17; + inherit jdk11 jdk17 jdk21; }; gradleGen = gradle-packages.gen; gradle_6 = callPackage gradle-packages.gradle_6 { }; @@ -19391,7 +19410,7 @@ with pkgs; img = callPackage ../development/tools/img { }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_17; }; indent = callPackage ../development/tools/misc/indent { }; @@ -19969,7 +19988,7 @@ with pkgs; rye = darwin.apple_sdk_11_0.callPackage ../development/tools/rye { inherit (darwin.apple_sdk_11_0) Libsystem; - inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration; + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices SystemConfiguration; }; samurai = callPackage ../development/tools/build-managers/samurai { }; @@ -20200,7 +20219,7 @@ with pkgs; c3c = callPackage ../development/compilers/c3c { }; - swfmill = callPackage ../tools/video/swfmill { stdenv = gcc10StdenvCompat; }; + swfmill = callPackage ../tools/video/swfmill { }; swftools = callPackage ../tools/video/swftools { stdenv = gccStdenv; @@ -20382,7 +20401,7 @@ with pkgs; lua = lua5_4; }; - xc3sprog = callPackage ../development/embedded/xc3sprog { stdenv = gcc10StdenvCompat; }; + xc3sprog = callPackage ../development/embedded/xc3sprog { }; xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; @@ -20391,19 +20410,12 @@ with pkgs; xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; - xcodebuild6 = xcodebuild.override { stdenv = llvmPackages_6.stdenv; }; xcbuild = xcodebuild; xcbuildHook = makeSetupHook { name = "xcbuild-hook"; propagatedBuildInputs = [ xcbuild ]; } ../development/tools/xcbuild/setup-hook.sh ; - # xcbuild with llvm 6 - xcbuild6Hook = makeSetupHook { - name = "xcbuild6-hook"; - propagatedBuildInputs = [ xcodebuild6 ]; - } ../development/tools/xcbuild/setup-hook.sh ; - xcpretty = callPackage ../development/tools/xcpretty { }; xeus = callPackage ../development/libraries/xeus { }; @@ -20663,9 +20675,7 @@ with pkgs; belr = callPackage ../development/libraries/belr { }; - bencode = callPackage ../development/libraries/bencode { - stdenv = gcc10StdenvCompat; - }; + bencode = callPackage ../development/libraries/bencode { }; bencodetools = callPackage ../development/libraries/bencodetools { }; @@ -20713,8 +20723,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - # may add CoreServices and Security again, when MacOS uses Clang 14.0+ by default. - botan3 = callPackage ../development/libraries/botan/3.0.nix { }; + botan3 = callPackage ../development/libraries/botan/3.0.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; box2d = callPackage ../development/libraries/box2d { }; @@ -20772,6 +20783,9 @@ with pkgs; # catboost requires clang 12+ for build # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. inherit (llvmPackages_12) stdenv; + + # https://github.com/catboost/catboost/issues/2540 + cudaPackages = cudaPackages_11; }; ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; @@ -20825,7 +20839,7 @@ with pkgs; # CGAL 5 has API changes cgal_4 = callPackage ../development/libraries/CGAL/4.nix { }; cgal_5 = callPackage ../development/libraries/CGAL { }; - cgal = cgal_4; + cgal = cgal_5; cgui = callPackage ../development/libraries/cgui { }; @@ -20861,11 +20875,7 @@ with pkgs; clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; - clucene_core_1 = callPackage ../development/libraries/clucene-core { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }; - - clucene_core = clucene_core_1; + clucene_core = clucene_core_2; clutter = callPackage ../development/libraries/clutter { }; @@ -20947,11 +20957,11 @@ with pkgs; ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; }; - ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; }; + ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; additional_buildInputs = [ openssl ]; }; ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { ssl_implementation = mbedtls_2; }; - uri = callPackage ../development/libraries/uri { stdenv = gcc10StdenvCompat; }; + uri = callPackage ../development/libraries/uri { }; cppcms = callPackage ../development/libraries/cppcms { }; @@ -20985,7 +20995,7 @@ with pkgs; cutee = callPackage ../development/libraries/cutee { }; - cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; }; + cxxtools = callPackage ../development/libraries/cxxtools { }; cwiid = callPackage ../development/libraries/cwiid { }; @@ -21462,7 +21472,9 @@ with pkgs; stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_14.stdenv else stdenv; }; - geos39 = callPackage ../development/libraries/geos/3.9.nix { }; + geos_3_9 = callPackage ../development/libraries/geos/3.9.nix { }; + + geos_3_11 = callPackage ../development/libraries/geos/3.11.nix { }; getdata = callPackage ../development/libraries/getdata { }; @@ -22083,7 +22095,7 @@ with pkgs; hwloc = callPackage ../development/libraries/hwloc { }; - hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_18; }; + hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_19; }; hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; @@ -22411,7 +22423,7 @@ with pkgs; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; libao = callPackage ../development/libraries/libao { - usePulseAudio = config.pulseaudio or stdenv.isLinux; + usePulseAudio = config.pulseaudio or (lib.meta.availableOn stdenv.hostPlatform libpulseaudio); inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; }; @@ -22593,6 +22605,8 @@ with pkgs; libcollectdclient = callPackage ../development/libraries/libcollectdclient { }; + libcomps = callPackage ../tools/package-management/libcomps { python = python3; }; + libcpr = callPackage ../development/libraries/libcpr { }; libcredis = callPackage ../development/libraries/libcredis { }; @@ -22665,6 +22679,8 @@ with pkgs; libdex = callPackage ../development/libraries/libdex { }; + libdicom = callPackage ../development/libraries/libdicom { }; + libdigidocpp = callPackage ../development/libraries/libdigidocpp { }; libdiscid = callPackage ../development/libraries/libdiscid { }; @@ -22681,7 +22697,7 @@ with pkgs; libdnet = callPackage ../development/libraries/libdnet { }; - libdnf = callPackage ../tools/package-management/libdnf { }; + libdnf = callPackage ../tools/package-management/libdnf { python = python3; }; libdovi = callPackage ../development/libraries/libdovi { }; @@ -23640,9 +23656,7 @@ with pkgs; else if stdenv.hostPlatform.system == "riscv32-linux" then llvmPackages_14.libunwind else callPackage ../development/libraries/libunwind { }; - libuv = callPackage ../development/libraries/libuv { - inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - }; + libuv = darwin.apple_sdk_11_0.callPackage ../development/libraries/libuv { }; libuvc = callPackage ../development/libraries/libuvc { }; @@ -23998,6 +24012,8 @@ with pkgs; markdown-anki-decks = callPackage ../tools/misc/markdown-anki-decks { }; + mdk-sdk = callPackage ../development/libraries/mdk-sdk { }; + mdslides = callPackage ../tools/misc/mdslides { }; micropython = callPackage ../development/interpreters/micropython { }; @@ -24016,7 +24032,7 @@ with pkgs; minizip-ng = callPackage ../development/libraries/minizip-ng { }; - mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { + mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; @@ -24179,7 +24195,7 @@ with pkgs; nntp-proxy = callPackage ../applications/networking/nntp-proxy { }; - non = callPackage ../applications/audio/non { stdenv = gcc10StdenvCompat; }; + non = callPackage ../applications/audio/non { }; ntl = callPackage ../development/libraries/ntl { }; @@ -24213,9 +24229,8 @@ with pkgs; mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: let nvidia-container-toolkit = callPackage ../applications/virtualization/nvidia-container-toolkit { - inherit containerRuntimePath configTemplate libnvidia-container; + inherit containerRuntimePath configTemplate; }; - libnvidia-container =(callPackage ../applications/virtualization/libnvidia-container { }); in symlinkJoin { inherit name; paths = [ @@ -24347,7 +24362,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; pythonPackages = python3Packages; - ffmpeg = ffmpeg_4; }; opencv4WithoutCuda = opencv4.override { @@ -24433,7 +24447,7 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3 - openssl_3_1; + openssl_3_2; opensubdiv = callPackage ../development/libraries/opensubdiv { }; @@ -24484,7 +24498,8 @@ with pkgs; pcg_c = callPackage ../development/libraries/pcg-c { }; pcl = libsForQt5.callPackage ../development/libraries/pcl { - inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL; }; pcre = callPackage ../development/libraries/pcre { }; @@ -24592,6 +24607,9 @@ with pkgs; protobuf = protobuf_24; + protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { + abseil-cpp = abseil-cpp_202308; + }; protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { }; protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { }; protobuf_21 = callPackage ../development/libraries/protobuf/21.nix { @@ -24665,9 +24683,9 @@ with pkgs; stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; }); - libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix { + libsForQt5 = (recurseIntoAttrs (import ./qt5-packages.nix { inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget; - }); + })) // { __recurseIntoDerivationForReleaseJobs = true; }; # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop plasma5Packages = libsForQt5; @@ -25115,8 +25133,6 @@ with pkgs; socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; - soco-cli = callPackage ../tools/audio/soco-cli { }; - sofia_sip = callPackage ../development/libraries/sofia-sip { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; @@ -25180,8 +25196,6 @@ with pkgs; spice-up = callPackage ../applications/office/spice-up { }; - spicetify-cli = callPackage ../applications/misc/spicetify-cli { }; - spirv-cross = callPackage ../tools/graphics/spirv-cross { }; splat = callPackage ../applications/radio/splat { }; @@ -25324,7 +25338,9 @@ with pkgs; tecla = callPackage ../development/libraries/tecla { }; - tectonic = callPackage ../tools/typesetting/tectonic { + tectonic = callPackage ../tools/typesetting/tectonic/wrapper.nix { }; + + tectonic-unwrapped = callPackage ../tools/typesetting/tectonic { harfbuzz = harfbuzzFull; }; @@ -25523,8 +25539,6 @@ with pkgs; vrpn = callPackage ../development/libraries/vrpn { }; - vsmtp = callPackage ../servers/mail/vsmtp { }; - vsqlite = callPackage ../development/libraries/vsqlite { }; vte = callPackage ../development/libraries/vte { }; @@ -25759,7 +25773,7 @@ with pkgs; zlib-ng = callPackage ../development/libraries/zlib-ng { }; - libdynd = callPackage ../development/libraries/libdynd { stdenv = gcc10StdenvCompat; }; + libdynd = callPackage ../development/libraries/libdynd { }; zlog = callPackage ../development/libraries/zlog { }; @@ -25946,8 +25960,6 @@ with pkgs; go = buildPackages.go_1_21; }; - go2nix = callPackage ../development/tools/go2nix { }; - leaps = callPackage ../development/tools/leaps { }; ### DEVELOPMENT / JAVA MODULES @@ -25984,11 +25996,11 @@ with pkgs; }; lispPackages = quicklispPackages // - (lispPackagesFor (wrapLisp_old sbcl)); + (lispPackagesFor (wrapLisp_old sbcl)) // { __attrsFailEvaluation = true; }; quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules-obsolete/quicklisp-to-nix.nix { inherit clwrapper; - }; + } // { __attrsFailEvaluation = true; }; quicklispPackagesClisp = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old clisp)); quicklispPackagesSBCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old sbcl)); quicklispPackagesECL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old ecl)); @@ -25998,7 +26010,8 @@ with pkgs; quicklispPackages = quicklispPackagesSBCL; # Alternative lisp-modules implementation - lispPackages_new = callPackage ../development/lisp-modules-new-obsolete/lisp-packages.nix {}; + lispPackages_new = callPackage ../development/lisp-modules-new-obsolete/lisp-packages.nix {} + // { __attrsFailEvaluation = true; }; ## End of DEPRECATED @@ -26144,9 +26157,9 @@ with pkgs; rstudioServerWrapper = rstudioWrapper.override { rstudio = rstudio-server; }; - rPackages = dontRecurseIntoAttrs (callPackage ../development/r-modules { + rPackages = (dontRecurseIntoAttrs (callPackage ../development/r-modules { overrides = (config.rPackageOverrides or (_: {})) pkgs; - }); + })) // { __attrsFailEvaluation = true; }; ### SERVERS @@ -26581,6 +26594,8 @@ with pkgs; jitsi-excalidraw = callPackage ../servers/jitsi-excalidraw { }; + jigasi = callPackage ../servers/jigasi { }; + jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { }; jitsi-meet-prosody = callPackage ../misc/jitsi-meet-prosody { }; @@ -27080,17 +27095,13 @@ with pkgs; OVMF = callPackage ../applications/virtualization/OVMF { }; OVMFFull = callPackage ../applications/virtualization/OVMF { secureBoot = true; - # CSM support is a BIOS emulation mechanism, - # SeaBIOS is only available on x86. - csmSupport = stdenv.hostPlatform.isx86; httpSupport = true; tpmSupport = true; + tlsSupport = true; }; ops = callPackage ../applications/virtualization/ops { }; - seabios = callPackage ../applications/virtualization/seabios { }; - vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { }; patroni = callPackage ../servers/sql/patroni { pythonPackages = python3Packages; }; @@ -27154,6 +27165,7 @@ with pkgs; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { }; + prometheus-atlas-exporter = callPackage ../servers/monitoring/prometheus/atlas-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-bird-exporter = callPackage ../servers/monitoring/prometheus/bird-exporter.nix { }; @@ -27516,7 +27528,7 @@ with pkgs; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; - xqilla = callPackage ../development/tools/xqilla { stdenv = gcc10StdenvCompat; }; + xqilla = callPackage ../development/tools/xqilla { }; xquartz = callPackage ../servers/x11/xquartz { }; @@ -27839,10 +27851,6 @@ with pkgs; fwts = callPackage ../os-specific/linux/fwts { }; - gasket = callPackage ../os-specific/linux/gasket { - inherit (linuxPackages) kernel; - }; - gobi_loader = callPackage ../os-specific/linux/gobi_loader { }; libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; @@ -28047,9 +28055,7 @@ with pkgs; libdatachannel = callPackage ../development/libraries/libdatachannel { }; - libkrun = callPackage ../development/libraries/libkrun { - inherit (darwin.apple_sdk.frameworks) Hypervisor; - }; + libkrun = callPackage ../development/libraries/libkrun { }; libkrun-sev = libkrun.override { sevVariant = true; }; @@ -28175,6 +28181,8 @@ with pkgs; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; linuxPackages_6_5_hardened = linuxKernel.packages.linux_6_5_hardened; linux_6_5_hardened = linuxKernel.kernels.linux_6_5_hardened; + linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened; + linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened; # GNU Linux-libre kernels linuxPackages-libre = linuxKernel.packages.linux_libre; @@ -28383,8 +28391,6 @@ with pkgs; delve = callPackage ../development/tools/delve { }; - dep = callPackage ../development/tools/dep { }; - dep2nix = callPackage ../development/tools/dep2nix { }; easyjson = callPackage ../development/tools/easyjson { }; @@ -28457,8 +28463,6 @@ with pkgs; govers = callPackage ../development/tools/govers { }; - govendor = callPackage ../development/tools/govendor { }; - goverview = callPackage ../tools/security/goverview { }; go-tools = callPackage ../development/tools/go-tools { }; @@ -28652,8 +28656,6 @@ with pkgs; raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi { }; raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { }; - raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom { }; - raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix { }; reap = callPackage ../os-specific/linux/reap { }; @@ -28977,8 +28979,6 @@ with pkgs; vdo = callPackage ../os-specific/linux/vdo { }; - windmill = callPackage ../servers/windmill {}; - windows = callPackages ../os-specific/windows {}; wirelesstools = callPackage ../os-specific/linux/wireless-tools { }; @@ -29746,16 +29746,22 @@ with pkgs; nordzy-icon-theme = callPackage ../data/icons/nordzy-icon-theme { }; - inherit (callPackages ../data/fonts/noto-fonts {}) - mkNoto - noto-fonts - noto-fonts-lgc-plus - noto-fonts-cjk-sans - noto-fonts-cjk-serif - noto-fonts-color-emoji - noto-fonts-emoji-blob-bin - noto-fonts-monochrome-emoji - ; + noto-fonts-lgc-plus = callPackage ../by-name/no/noto-fonts/package.nix { + suffix = "-lgc-plus"; + variants = [ + "Noto Sans" + "Noto Serif" + "Noto Sans Mono" + "Noto Music" + "Noto Sans Symbols" + "Noto Sans Symbols 2" + "Noto Sans Math" + ]; + longDescription = '' + This package provides the Noto Fonts, but only for latin, greek + and cyrillic scripts, as well as some extra fonts. + ''; + }; nuclear = callPackage ../applications/audio/nuclear { }; @@ -29988,9 +29994,7 @@ with pkgs; stdmanpages = callPackage ../data/documentation/std-man-pages { }; - star-history = callPackage ../tools/misc/star-history { - inherit (darwin.apple_sdk.frameworks) Security; - }; + star-history = callPackage ../tools/misc/star-history { }; starfetch = callPackage ../tools/misc/starfetch { }; @@ -30442,8 +30446,6 @@ with pkgs; anytone-emu = callPackage ../applications/radio/anytone-emu { }; - anytype = callPackage ../applications/misc/anytype { }; - ao = libfive; apache-directory-studio = callPackage ../applications/networking/apache-directory-studio { }; @@ -31238,9 +31240,7 @@ with pkgs; droopy = python3Packages.callPackage ../applications/networking/droopy { }; - drumgizmo = callPackage ../applications/audio/drumgizmo { - stdenv = gcc10StdenvCompat; - }; + drumgizmo = callPackage ../applications/audio/drumgizmo { }; dsf2flac = callPackage ../applications/audio/dsf2flac { }; @@ -31274,7 +31274,7 @@ with pkgs; dyff = callPackage ../development/tools/dyff { }; dwl = callPackage ../applications/window-managers/dwl { - wlroots = wlroots_0_16; + wlroots = wlroots_0_17; }; dwm = callPackage ../applications/window-managers/dwm { @@ -31365,10 +31365,10 @@ with pkgs; emacs29-macport ; - emacs-macport = emacs28-macport; - emacs = emacs28; - emacs-gtk = emacs28-gtk3; - emacs-nox = emacs28-nox; + emacs-macport = emacs29-macport; + emacs = emacs29; + emacs-gtk = emacs29-gtk3; + emacs-nox = emacs29-nox; emacsPackagesFor = emacs: import ./emacs-packages.nix { inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs; @@ -31378,7 +31378,7 @@ with pkgs; # This alias should live in aliases.nix but that would cause Hydra not to evaluate/build the packages. # If you turn this into "real" alias again, please add it to pkgs/top-level/packages-config.nix again too - emacsPackages = emacs.pkgs; + emacsPackages = emacs.pkgs // { __recurseIntoDerivationForReleaseJobs = true; }; emptty = callPackage ../applications/display-managers/emptty { }; @@ -31590,9 +31590,9 @@ with pkgs; flrig = callPackage ../applications/radio/flrig { }; - fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; }; + fluxus = callPackage ../applications/graphics/fluxus { }; - flwrap = callPackage ../applications/radio/flwrap { stdenv = gcc10StdenvCompat; }; + flwrap = callPackage ../applications/radio/flwrap { }; fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AppKit AudioUnit CoreAudio CoreMIDI CoreServices; @@ -31602,7 +31602,7 @@ with pkgs; fmsynth = callPackage ../applications/audio/fmsynth { }; - fnc = callPackage ../applications/version-management/fnc { }; + fnc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/fnc { }; focus = callPackage ../tools/X11/focus { }; @@ -31971,8 +31971,6 @@ with pkgs; firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; - fmtoy = callPackage ../tools/audio/fmtoy { }; - flac = callPackage ../applications/audio/flac { }; redoflacs = callPackage ../applications/audio/redoflacs { }; @@ -32140,6 +32138,7 @@ with pkgs; vmopts = config.jetbrains.vmopts or null; jdk = jetbrains.jdk; }) // { + jdk-no-jcef = callPackage ../development/compilers/jetbrains-jdk { withJcef = false; }; jdk = callPackage ../development/compilers/jetbrains-jdk { }; jcef = callPackage ../development/compilers/jetbrains-jdk/jcef.nix { }; }); @@ -32299,8 +32298,6 @@ with pkgs; gostatic = callPackage ../applications/misc/gostatic { }; - gosmore = callPackage ../applications/misc/gosmore { stdenv = gcc10StdenvCompat; }; - gossa = callPackage ../applications/networking/gossa { }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { }; @@ -32408,8 +32405,6 @@ with pkgs; himalaya = callPackage ../applications/networking/mailreaders/himalaya { }; - hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; - hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { }; hydrogen-web = callPackage ../applications/networking/instant-messengers/hydrogen-web/wrapper.nix { @@ -32474,8 +32469,6 @@ with pkgs; huggle = libsForQt5.callPackage ../applications/misc/huggle { }; - hugo = callPackage ../applications/misc/hugo { }; - ghosttohugo = callPackage ../applications/misc/ghosttohugo {}; gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { }; @@ -32512,7 +32505,9 @@ with pkgs; hypnotix = callPackage ../applications/video/hypnotix { }; - indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { }; + indiepass-desktop = callPackage ../by-name/in/indiepass-desktop/package.nix { + electron = electron_19; + }; jackline = callPackage ../applications/networking/instant-messengers/jackline { }; @@ -32645,35 +32640,15 @@ with pkgs; inherit (callPackages ../development/libraries/wlroots {}) wlroots_0_15 wlroots_0_16 + wlroots_0_17 wlroots; - sway-unwrapped = callPackage ../applications/window-managers/sway { - wlroots = wlroots_0_16; - }; - sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; - swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; - swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; - swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; - swayosd = callPackage ../applications/window-managers/sway/osd.nix { }; - swayws = callPackage ../applications/window-managers/sway/ws.nix { }; - swaywsr = callPackage ../applications/window-managers/sway/wsr.nix { }; - sway-assign-cgroups = callPackage ../applications/window-managers/sway/assign-cgroups.nix { }; - sway-contrib = recurseIntoAttrs (callPackages ../applications/window-managers/sway/contrib.nix { }); - - swaycons = callPackage ../applications/window-managers/sway/swaycons.nix { }; - - swayfx = callPackage ../applications/window-managers/sway/fx.nix { }; - - swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { }; - - swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; + sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { }); swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { }; swaynag-battery = callPackage ../applications/misc/swaynag-battery { }; - swayest-workstyle = callPackage ../applications/window-managers/sway/swayest-workstyle { }; - tiramisu = callPackage ../applications/misc/tiramisu { }; rlaunch = callPackage ../applications/misc/rlaunch { }; @@ -32682,9 +32657,7 @@ with pkgs; rootbar = callPackage ../applications/misc/rootbar { }; - waybar = callPackage ../applications/misc/waybar { - wlroots = wlroots_0_15; - }; + waybar = callPackage ../applications/misc/waybar { }; waycorner = callPackage ../applications/misc/waycorner { }; @@ -32765,7 +32738,7 @@ with pkgs; kitti3 = python3.pkgs.callPackage ../applications/window-managers/i3/kitti3.nix { }; waybox = callPackage ../by-name/wa/waybox/package.nix { - wlroots = wlroots_0_15; + wlroots = wlroots_0_17; }; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; @@ -32968,6 +32941,8 @@ with pkgs; jack_oscrolloscope = callPackage ../applications/audio/jack-oscrolloscope { }; + jack-passthrough = callPackage ../applications/audio/jack-passthrough { }; + jack_rack = callPackage ../applications/audio/jack-rack { }; jackmeter = callPackage ../applications/audio/jackmeter { }; @@ -32999,8 +32974,6 @@ with pkgs; jgmenu = callPackage ../applications/misc/jgmenu { }; - jigdo = callPackage ../applications/misc/jigdo { stdenv = gcc10StdenvCompat; }; - jitsi = callPackage ../applications/networking/instant-messengers/jitsi { }; joe = callPackage ../applications/editors/joe { }; @@ -33442,8 +33415,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - ledger = callPackage ../applications/office/ledger { }; - ledger-autosync = callPackage ../applications/office/ledger-autosync { }; ledger-web = callPackage ../applications/office/ledger-web { }; @@ -33816,9 +33787,9 @@ with pkgs; mop = callPackage ../applications/misc/mop { }; - mopidyPackages = callPackages ../applications/audio/mopidy { + mopidyPackages = (callPackages ../applications/audio/mopidy { python = python3; - }; + }) // { __attrsFailEvaluation = true; }; inherit (mopidyPackages) mopidy @@ -33980,9 +33951,7 @@ with pkgs; wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { }; mpv = wrapMpv mpv-unwrapped { }; - mpvpaper = callPackage ../tools/wayland/mpvpaper { - wlroots = wlroots_0_15; - }; + mpvpaper = callPackage ../tools/wayland/mpvpaper { }; mpvScripts = callPackage ../applications/video/mpv/scripts { }; @@ -34124,8 +34093,7 @@ with pkgs; open-policy-agent = callPackage ../development/tools/open-policy-agent { }; openmm = callPackage ../development/libraries/science/chemistry/openmm { - stdenv = gcc11Stdenv; - gfortran = gfortran11; + swig = swig4; }; openshift = callPackage ../applications/networking/cluster/openshift { }; @@ -34234,7 +34202,7 @@ with pkgs; shod = callPackage ../applications/window-managers/shod { }; - shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; + shotcut = qt6Packages.callPackage ../applications/video/shotcut { }; shogun = callPackage ../applications/science/machine-learning/shogun { protobuf = protobuf_21; @@ -34621,9 +34589,7 @@ with pkgs; enableDbusUi = false; }; - parsec-bin = callPackage ../applications/misc/parsec/bin.nix { - ffmpeg = ffmpeg_4; - }; + parsec-bin = callPackage ../applications/misc/parsec/bin.nix { }; pavucontrol = callPackage ../applications/audio/pavucontrol { }; @@ -34700,7 +34666,7 @@ with pkgs; phantomsocks = callPackage ../tools/networking/phantomsocks { }; - photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { }; + photoqt = qt6Packages.callPackage ../applications/graphics/photoqt { }; photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; @@ -34728,7 +34694,10 @@ with pkgs; picosnitch = callPackage ../tools/networking/picosnitch { }; - pidginPackages = recurseIntoAttrs (callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { }); + pidginPackages = + let pidgin-plugins = + recurseIntoAttrs (callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { }); + in pidgin-plugins // { pidginPackages = pidgin-plugins.pidginPackages // { __attrsFailEvaluation = true; }; }; inherit (pidginPackages) pidgin; @@ -34837,6 +34806,7 @@ with pkgs; protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { }; protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { }; + protonvpn-gui_legacy = python3Packages.callPackage ../applications/networking/protonvpn-gui/legacy.nix { }; ps2client = callPackage ../applications/networking/ps2client { }; @@ -35115,6 +35085,8 @@ with pkgs; retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; + revanced-cli = callPackage ../applications/misc/revanced-cli { }; + rgp = libsForQt5.callPackage ../development/tools/rgp { }; ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { @@ -35465,6 +35437,20 @@ with pkgs; super-slicer-latest = super-slicer.latest; + bambu-studio = callPackage ../applications/misc/bambu-studio { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; + + glew = glew-egl; + + wxGTK31 = wxGTK31.override { + withCurl = true; + withPrivateFonts = true; + withWebKit = true; + }; + }; + + orca-slicer = callPackage ../applications/misc/bambu-studio/orca-slicer.nix {}; + snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; @@ -35473,9 +35459,7 @@ with pkgs; skrooge = libsForQt5.callPackage ../applications/office/skrooge { }; - smartgithg = callPackage ../applications/version-management/smartgithg { - jre = openjdk11; - }; + smartgithg = callPackage ../applications/version-management/smartgithg { }; smartdeblur = libsForQt5.callPackage ../applications/graphics/smartdeblur { }; @@ -35677,9 +35661,7 @@ with pkgs; taizen = callPackage ../applications/misc/taizen { }; - talosctl = callPackage ../applications/networking/cluster/talosctl { - buildGoModule = buildGo120Module; - }; + talosctl = callPackage ../applications/networking/cluster/talosctl { }; talentedhack = callPackage ../applications/audio/talentedhack { }; @@ -35692,7 +35674,7 @@ with pkgs; teams = callPackage ../applications/networking/instant-messengers/teams { }; teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { - electron = electron_27; + electron = electron_28; }; teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; @@ -36019,6 +36001,12 @@ with pkgs; tut = callPackage ../applications/misc/tut { }; + tuxclocker = libsForQt5.callPackage ../applications/misc/tuxclocker { + tuxclocker-plugins = tuxclocker-plugins-with-unfree; + }; + + tuxclocker-without-unfree = libsForQt5.callPackage ../applications/misc/tuxclocker { }; + tuxedo-rs = callPackage ../os-specific/linux/tuxedo-rs { }; tuxguitar = callPackage ../applications/editors/music/tuxguitar { @@ -36344,6 +36332,13 @@ with pkgs; inherit (nodePackages) node-gyp; }; + code-server = callPackage ../servers/code-server { + nodejs = nodejs_18; + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security; + inherit (darwin) cctools; + inherit (nodePackages) node-gyp; + }; + vue = callPackage ../applications/misc/vue { }; vuze = callPackage ../applications/networking/p2p/vuze { @@ -36962,6 +36957,8 @@ with pkgs; zotero = callPackage ../applications/office/zotero { }; + zotero_7 = callPackage ../applications/office/zotero/zotero_7.nix { }; + zscroll = callPackage ../applications/misc/zscroll { }; zsteg = callPackage ../tools/security/zsteg { }; @@ -37164,9 +37161,6 @@ with pkgs; monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { }; - oxen = callPackage ../applications/blockchains/oxen - { stdenv = gcc10StdenvCompat; boost = boost179; }; - masari = callPackage ../applications/blockchains/masari { }; napari = with python3Packages; toPythonApplication napari; @@ -37309,8 +37303,6 @@ with pkgs; _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; - aaaaxy = callPackage ../games/aaaaxy { }; - ace-of-penguins = callPackage ../games/ace-of-penguins { }; among-sus = callPackage ../games/among-sus { }; @@ -37513,21 +37505,6 @@ with pkgs; airstrike = callPackage ../games/airstrike { }; - alephone = callPackage ../games/alephone { }; - alephone-apotheosis-x = callPackage ../games/alephone/apotheosis-x { }; - alephone-durandal = callPackage ../games/alephone/durandal { }; - alephone-eternal = callPackage ../games/alephone/eternal { }; - alephone-evil = callPackage ../games/alephone/evil { }; - alephone-infinity = callPackage ../games/alephone/infinity { }; - alephone-marathon = callPackage ../games/alephone/marathon { }; - alephone-pheonix = callPackage ../games/alephone/pheonix { }; - alephone-red = callPackage ../games/alephone/red { }; - alephone-rubicon-x = callPackage ../games/alephone/rubicon-x { }; - alephone-pathways-into-darkness = - callPackage ../games/alephone/pathways-into-darkness { }; - alephone-yuge = - callPackage ../games/alephone/yuge { }; - alienarena = callPackage ../games/alienarena { }; amoeba = callPackage ../games/amoeba { }; @@ -37673,20 +37650,13 @@ with pkgs; darkplaces = callPackage ../games/darkplaces { }; deliantra-server = callPackage ../games/deliantra/server.nix { - stdenv = gcc10StdenvCompat; # perl538 defines 'struct object' in sv.h. many conflicts result perl = perl536; perlPackages = perl536Packages; }; - deliantra-arch = callPackage ../games/deliantra/arch.nix { - stdenv = gcc10StdenvCompat; - }; - deliantra-maps = callPackage ../games/deliantra/maps.nix { - stdenv = gcc10StdenvCompat; - }; - deliantra-data = callPackage ../games/deliantra/data.nix { - stdenv = gcc10StdenvCompat; - }; + deliantra-arch = callPackage ../games/deliantra/arch.nix { }; + deliantra-maps = callPackage ../games/deliantra/maps.nix { }; + deliantra-data = callPackage ../games/deliantra/data.nix { }; ddnet = callPackage ../games/ddnet { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL Security; @@ -37744,9 +37714,7 @@ with pkgs; endless-sky = callPackage ../games/endless-sky { }; - extremetuxracer = callPackage ../games/extremetuxracer { - libpng = libpng12; - }; + extremetuxracer = callPackage ../games/extremetuxracer { }; exult = callPackage ../games/exult { }; @@ -37943,6 +37911,7 @@ with pkgs; katagoWithCuda = katago.override { backend = "cuda"; + cudaPackages = cudaPackages_12; }; katagoCPU = katago.override { @@ -37951,6 +37920,7 @@ with pkgs; katagoTensorRT = katago.override { backend = "tensorrt"; + cudaPackages = cudaPackages_12; }; klavaro = callPackage ../games/klavaro { }; @@ -38052,14 +38022,12 @@ with pkgs; moon-buggy = callPackage ../games/moon-buggy { }; - inherit (callPackages ../games/minetest { + minetest = callPackage ../games/minetest { inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; - }) - minetestclient_5 minetestserver_5; - - minetest = minetestclient; - minetestclient = minetestclient_5; - minetestserver = minetestserver_5; + }; + minetestclient = minetest.override { buildServer = false; }; + minetest-touch = minetest.override { buildServer = false; withTouchSupport = true; }; + minetestserver = minetest.override { buildClient = false; }; mnemosyne = callPackage ../games/mnemosyne { python = python3; @@ -38125,7 +38093,7 @@ with pkgs; openlierox = callPackage ../games/openlierox { }; - openclonk = callPackage ../games/openclonk { stdenv = gcc10StdenvCompat; }; + openclonk = callPackage ../games/openclonk { }; openjk = callPackage ../games/openjk { }; @@ -38272,10 +38240,7 @@ with pkgs; r2mod_cli = callPackage ../games/r2mod_cli { }; - r2modman = callPackage ../games/r2modman { - # Electron 26 has regressions making applications unusable. - electron = electron_25; - }; + r2modman = callPackage ../games/r2modman { }; racer = callPackage ../games/racer { }; @@ -38571,9 +38536,7 @@ with pkgs; vms-empire = callPackage ../games/vms-empire { }; - voxelands = callPackage ../games/voxelands { - libpng = libpng12; - }; + voxelands = callPackage ../games/voxelands { }; vvvvvv = callPackage ../games/vvvvvv { inherit (darwin.apple_sdk.frameworks) Foundation IOKit; @@ -38692,7 +38655,28 @@ with pkgs; ### DESKTOP ENVIRONMENTS - arcanPackages = recurseIntoAttrs (callPackage ../desktops/arcan { }); + arcan-wrapped = arcan.wrapper.override { }; + arcan-all-wrapped = arcan.wrapper.override { + name = "arcan-all-wrapped"; + appls = [ cat9 durden pipeworld ]; + + }; + cat9-wrapped = arcan.wrapper.override { + name = "cat9-wrapped"; + appls = [ cat9 ]; + }; + durden-wrapped = arcan.wrapper.override { + name = "durden-wrapped"; + appls = [ durden ]; + }; + pipeworld-wrapped = arcan.wrapper.override { + name = "pipeworld-wrapped"; + appls = [ pipeworld ]; + }; + prio-wrapped = arcan.wrapper.override { + name = "prio-wrapped"; + appls = [ prio ]; + }; budgie = recurseIntoAttrs (callPackage ../desktops/budgie { }); budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { }); @@ -38852,9 +38836,9 @@ with pkgs; pymol = callPackage ../applications/science/chemistry/pymol { }; - quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso { }; - - quantum-espresso-mpi = callPackage ../applications/science/chemistry/quantum-espresso { useMpi = true; }; + quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso { + hdf5 = hdf5-fortran; + }; siesta = callPackage ../applications/science/chemistry/siesta { }; @@ -38911,25 +38895,15 @@ with pkgs; blast-bin = callPackage ../applications/science/biology/blast/bin.nix { }; - bpp-core = callPackage ../development/libraries/science/biology/bpp-core { - stdenv = gcc10StdenvCompat; - }; + bpp-core = callPackage ../development/libraries/science/biology/bpp-core { }; - bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl { - stdenv = gcc10StdenvCompat; - }; + bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl { }; - bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen { - stdenv = gcc10StdenvCompat; - }; + bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen { }; - bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq { - stdenv = gcc10StdenvCompat; - }; + bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq { }; - bppsuite = callPackage ../applications/science/biology/bppsuite { - stdenv = gcc10StdenvCompat; - }; + bppsuite = callPackage ../applications/science/biology/bppsuite { }; cd-hit = callPackage ../applications/science/biology/cd-hit { inherit (llvmPackages) openmp; @@ -39116,7 +39090,7 @@ with pkgs; star = callPackage ../applications/science/biology/star { }; - strelka = callPackage ../applications/science/biology/strelka { stdenv = gcc10StdenvCompat; }; + strelka = callPackage ../applications/science/biology/strelka { }; inherit (callPackages ../applications/science/biology/sumatools {}) sumalibs @@ -39211,7 +39185,7 @@ with pkgs; flintqs = callPackage ../development/libraries/science/math/flintqs { }; - getdp = callPackage ../applications/science/math/getdp { stdenv = gcc10StdenvCompat; }; + getdp = callPackage ../applications/science/math/getdp { }; gurobi = callPackage ../applications/science/math/gurobi { }; @@ -39324,6 +39298,7 @@ with pkgs; osi = callPackage ../development/libraries/science/math/osi { }; or-tools = callPackage ../development/libraries/science/math/or-tools { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; protobuf = protobuf_21; # or-tools builds with -std=c++20, so abseil-cpp must @@ -39396,7 +39371,7 @@ with pkgs; ### SCIENCE/MOLECULAR-DYNAMICS - dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { stdenv = gcc10StdenvCompat; }; + dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { }; lammps = callPackage ../applications/science/molecular-dynamics/lammps { fftw = fftw; @@ -39440,7 +39415,6 @@ with pkgs; singlePrec = true; enableMpi = true; enableCuda = true; - cudatoolkit = cudatoolkit_11; fftw = fftwSinglePrec; }); @@ -39534,6 +39508,7 @@ with pkgs; coqPackages_8_16 coq_8_16 coqPackages_8_17 coq_8_17 coqPackages_8_18 coq_8_18 + coqPackages_8_19 coq_8_19 coqPackages coq ; @@ -39602,14 +39577,14 @@ with pkgs; isabelle = callPackage ../applications/science/logic/isabelle { polyml = polyml.overrideAttrs { pname = "polyml-for-isabelle"; - version = "2022"; + version = "2023"; configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; buildFlags = [ "compiler" ]; src = fetchFromGitHub { owner = "polyml"; repo = "polyml"; - rev = "bafe319bc3a65bf63bd98a4721a6f4dd9e0eabd6"; - hash = "sha256-gmMQp/J5qGP4HhyW5tnSp3dKxNLEYcRewCwi/H8C+vk="; + rev = "219e0a248f705b770d45699755d00f05b82a9391"; + hash = "sha256-HtT3MGtHrqVhynmx73L7NC12AW9N7gkkOi7MKbF4k6Y="; }; }; @@ -39982,7 +39957,6 @@ with pkgs; faissWithCuda = faiss.override { cudaSupport = true; - nvidia-thrust = nvidia-thrust-cuda; }; fityk = callPackage ../applications/science/misc/fityk { }; @@ -40024,7 +39998,6 @@ with pkgs; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; - stdenv = if stdenv.cc.isClang then llvmPackages_7.stdenv else stdenv; }); rinetd = callPackage ../servers/rinetd { }; @@ -40441,21 +40414,17 @@ with pkgs; }; vector = callPackage ../tools/misc/vector { - inherit (darwin.apple_sdk.frameworks) Security CoreServices; + inherit (darwin.apple_sdk.frameworks) Security CoreServices SystemConfiguration; }; hjson = with python3Packages; toPythonApplication hjson; - hjson-go = callPackage ../development/tools/hjson-go { }; - epkowa = callPackage ../misc/drivers/epkowa { }; utsushi = callPackage ../misc/drivers/utsushi { }; utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { }; - idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; }; - colima = callPackage ../applications/virtualization/colima { }; lima = callPackage ../applications/virtualization/lima { @@ -40720,7 +40689,7 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_18; + nix = nixVersions.nix_2_19; }; nix-doc = callPackage ../tools/package-management/nix-doc { }; @@ -40779,8 +40748,6 @@ with pkgs; nix-script = callPackage ../tools/nix/nix-script { }; - nix-template-rpm = callPackage ../build-support/templaterpm { inherit (python2Packages) python toposort; }; - nix-top = callPackage ../tools/package-management/nix-top { }; nix-tree = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-tree); @@ -40953,7 +40920,12 @@ with pkgs; gtk2 = gtk2-x11; }; - qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { }; + qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { }; + + qMasterPassword-wayland = qt6Packages.callPackage ../applications/misc/qMasterPassword { + x11Support = false; + waylandSupport = true; + }; qmake2cmake = python3Packages.callPackage ../tools/misc/qmake2cmake { }; @@ -41394,14 +41366,16 @@ with pkgs; wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; - wamr = callPackage ../development/interpreters/wamr { }; + wamr = darwin.apple_sdk_11_0.callPackage ../development/interpreters/wamr { }; wasmer = callPackage ../development/interpreters/wasmer { - llvmPackages = llvmPackages_14; + llvmPackages = llvmPackages_15; inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration Security; }; - wavm = callPackage ../development/interpreters/wavm { }; + wavm = callPackage ../development/interpreters/wavm { + llvmPackages = llvmPackages_12; + }; yabasic = callPackage ../development/interpreters/yabasic { }; @@ -41714,7 +41688,7 @@ with pkgs; xrq = callPackage ../applications/misc/xrq { }; - pynitrokey = python3Packages.callPackage ../tools/security/pynitrokey { }; + pynitrokey = with python3Packages; toPythonApplication pynitrokey; nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; @@ -41966,7 +41940,6 @@ with pkgs; btcdeb = callPackage ../applications/blockchains/btcdeb { }; jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami { - fmt = fmt_9; # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; jack = libjack2; @@ -41999,7 +41972,7 @@ with pkgs; bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { }; cagebreak = callPackage ../applications/window-managers/cagebreak { - wlroots = wlroots_0_16; + wlroots = wlroots_0_17; }; psftools = callPackage ../os-specific/linux/psftools { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index ff9d1f62ab1f3..06015d614e208 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -13,7 +13,7 @@ let self = beam; # Aliases added 2023-03-21 - versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "26" "25" "24" "23" ]; + versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "26" "25" "24" ]; interpretersAliases = versionLoop (version: { "erlangR${version}" = self.interpreters."erlang_${version}"; @@ -85,7 +85,7 @@ in # access for example elixir built with different version of Erlang, use # `beam.packages.erlang_24.elixir`. inherit (self.packages.erlang) - elixir elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls lfe lfe_2_1; + elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls lfe lfe_2_1; } // interpretersAliases; # Helper function to generate package set with a specific Erlang version. @@ -101,4 +101,6 @@ in erlang_25 = self.packagesWith self.interpreters.erlang_25; erlang_24 = self.packagesWith self.interpreters.erlang_24; } // packagesAliases; + + __attrsFailEvaluation = true; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index cf3817a3d7e46..64d4bef121320 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -8,7 +8,7 @@ let mkCoqPackages' = self: coq: let callPackage = self.callPackage; in { inherit coq lib; - coqPackages = self; + coqPackages = self // { coqPackages = self.coqPackages // { recurseForDerivations = false; }; }; metaFetch = import ../build-support/coq/meta-fetch/default.nix {inherit lib stdenv fetchzip; }; @@ -189,22 +189,26 @@ in rec { coq_8_16 = mkCoq "8.16"; coq_8_17 = mkCoq "8.17"; coq_8_18 = mkCoq "8.18"; + coq_8_19 = mkCoq "8.19"; - coqPackages_8_5 = mkCoqPackages coq_8_5; - coqPackages_8_6 = mkCoqPackages coq_8_6; - coqPackages_8_7 = mkCoqPackages coq_8_7; - coqPackages_8_8 = mkCoqPackages coq_8_8; - coqPackages_8_9 = mkCoqPackages coq_8_9; - coqPackages_8_10 = mkCoqPackages coq_8_10; - coqPackages_8_11 = mkCoqPackages coq_8_11; - coqPackages_8_12 = mkCoqPackages coq_8_12; - coqPackages_8_13 = mkCoqPackages coq_8_13; - coqPackages_8_14 = mkCoqPackages coq_8_14; - coqPackages_8_15 = mkCoqPackages coq_8_15; - coqPackages_8_16 = mkCoqPackages coq_8_16; - coqPackages_8_17 = mkCoqPackages coq_8_17; - coqPackages_8_18 = mkCoqPackages coq_8_18; - coqPackages = recurseIntoAttrs coqPackages_8_18; + coqPackages_8_5 = mkCoqPackages coq_8_5 // { __attrsFailEvaluation = true; }; + coqPackages_8_6 = mkCoqPackages coq_8_6 // { __attrsFailEvaluation = true; }; + coqPackages_8_7 = mkCoqPackages coq_8_7 // { __attrsFailEvaluation = true; }; + coqPackages_8_8 = mkCoqPackages coq_8_8 // { __attrsFailEvaluation = true; }; + coqPackages_8_9 = mkCoqPackages coq_8_9 // { __attrsFailEvaluation = true; }; + coqPackages_8_10 = mkCoqPackages coq_8_10 // { __attrsFailEvaluation = true; }; + coqPackages_8_11 = mkCoqPackages coq_8_11 // { __attrsFailEvaluation = true; }; + coqPackages_8_12 = mkCoqPackages coq_8_12 // { __attrsFailEvaluation = true; }; + coqPackages_8_13 = mkCoqPackages coq_8_13 // { __attrsFailEvaluation = true; }; + coqPackages_8_14 = mkCoqPackages coq_8_14 // { __attrsFailEvaluation = true; }; + coqPackages_8_15 = mkCoqPackages coq_8_15 // { __attrsFailEvaluation = true; }; + coqPackages_8_16 = mkCoqPackages coq_8_16 // { __attrsFailEvaluation = true; }; + coqPackages_8_17 = mkCoqPackages coq_8_17 // { __attrsFailEvaluation = true; }; + coqPackages_8_18 = mkCoqPackages coq_8_18 // { __attrsFailEvaluation = true; }; + coqPackages_8_19 = mkCoqPackages coq_8_19 // { __attrsFailEvaluation = true; }; + coqPackages = + let cp = recurseIntoAttrs coqPackages_8_18; + in cp // { coqPackages = cp.coqPackages // { __attrsFailEvaluation = true; }; } // { __recurseIntoDerivationForReleaseJobs = true; }; coq = coqPackages.coq; } diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index a2f49a98ccd53..d474cf852e55f 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -1,75 +1,122 @@ -{ lib -, pkgs -, cudaVersion +# Notes: +# +# Silvan (Tweag) covered some things on recursive attribute sets in the Nix Hour: +# https://www.youtube.com/watch?v=BgnUFtd1Ivs +# +# I (@connorbaker) highly recommend watching it. +# +# Most helpful comment regarding recursive attribute sets: +# +# https://github.com/NixOS/nixpkgs/pull/256324#issuecomment-1749935979 +# +# To summarize: +# +# - `prev` should only be used to access attributes which are going to be overriden. +# - `final` should only be used to access `callPackage` to build new packages. +# - Attribute names should be computable without relying on `final`. +# - Extensions should take arguments to build attribute names before relying on `final`. +# +# Silvan's recommendation then is to explicitly use `callPackage` to provide everything our extensions need +# to compute the attribute names, without relying on `final`. +# +# I've (@connorbaker) attempted to do that, though I'm unsure of how this will interact with overrides. +{ + callPackage, + cudaVersion, + lib, + newScope, + pkgs, + __attrsFailEvaluation ? true, }: - -with lib; - let - - scope = makeScope pkgs.newScope (final: { - # Here we put package set configuration and utility functions. - inherit cudaVersion; - cudaMajorVersion = versions.major final.cudaVersion; - cudaMajorMinorVersion = lib.versions.majorMinor final.cudaVersion; - inherit lib pkgs; - - addBuildInputs = drv: buildInputs: drv.overrideAttrs (oldAttrs: { - buildInputs = (oldAttrs.buildInputs or []) ++ buildInputs; - }); - }); - - cutensorExtension = final: prev: let - ### CuTensor - - buildCuTensorPackage = final.callPackage ../development/libraries/science/math/cutensor/generic.nix; - - cuTensorVersions = { - "1.2.2.5" = { - hash = "sha256-lU7iK4DWuC/U3s1Ct/rq2Gr3w4F2U7RYYgpmF05bibY="; - }; - "1.5.0.3" = { - hash = "sha256-T96+lPC6OTOkIs/z3QWg73oYVSyidN0SVkBWmT9VRx0="; - }; - }; - - inherit (final) cudaMajorMinorVersion cudaMajorVersion; - - cutensor = buildCuTensorPackage rec { - version = if cudaMajorMinorVersion == "10.1" then "1.2.2.5" else "1.5.0.3"; - inherit (cuTensorVersions.${version}) hash; - # This can go into generic.nix - libPath = "lib/${if cudaMajorVersion == "10" then cudaMajorMinorVersion else cudaMajorVersion}"; - }; - in { inherit cutensor; }; - - extraPackagesExtension = final: prev: { - - nccl = final.callPackage ../development/libraries/science/math/nccl { }; - - nccl-tests = final.callPackage ../development/libraries/science/math/nccl/tests.nix { }; - - autoAddOpenGLRunpathHook = final.callPackage ( { makeSetupHook, addOpenGLRunpath }: - makeSetupHook { - name = "auto-add-opengl-runpath-hook"; - propagatedBuildInputs = [ - addOpenGLRunpath - ]; - } ../development/compilers/cudatoolkit/auto-add-opengl-runpath-hook.sh - ) {}; - - }; - - composedExtension = composeManyExtensions ([ - extraPackagesExtension - (import ../development/compilers/cudatoolkit/extension.nix) - (import ../development/compilers/cudatoolkit/redist/extension.nix) - (import ../development/compilers/cudatoolkit/redist/overrides.nix) - (import ../development/libraries/science/math/cudnn/extension.nix) - (import ../development/libraries/science/math/tensorrt/extension.nix) - (import ../test/cuda/cuda-samples/extension.nix) - (import ../test/cuda/cuda-library-samples/extension.nix) - cutensorExtension - ]); - -in (scope.overrideScope composedExtension) + inherit (lib) + attrsets + customisation + fixedPoints + strings + versions + ; + # Backbone + gpus = builtins.import ../development/cuda-modules/gpus.nix; + nvccCompatibilities = builtins.import ../development/cuda-modules/nvcc-compatibilities.nix; + flags = callPackage ../development/cuda-modules/flags.nix {inherit cudaVersion gpus;}; + passthruFunction = + final: + ( + { + inherit cudaVersion lib pkgs; + inherit gpus nvccCompatibilities flags; + cudaMajorVersion = versions.major cudaVersion; + cudaMajorMinorVersion = versions.majorMinor cudaVersion; + + # Maintain a reference to the final cudaPackages. + # Without this, if we use `final.callPackage` and a package accepts `cudaPackages` as an argument, + # it's provided with `cudaPackages` from the top-level scope, which is not what we want. We want to + # provide the `cudaPackages` from the final scope -- that is, the *current* scope. + cudaPackages = final; + + # TODO(@connorbaker): `cudaFlags` is an alias for `flags` which should be removed in the future. + cudaFlags = flags; + + # Exposed as cudaPackages.backendStdenv. + # This is what nvcc uses as a backend, + # and it has to be an officially supported one (e.g. gcc11 for cuda11). + # + # It, however, propagates current stdenv's libstdc++ to avoid "GLIBCXX_* not found errors" + # when linked with other C++ libraries. + # E.g. for cudaPackages_11_8 we use gcc11 with gcc12's libstdc++ + # Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context + backendStdenv = final.callPackage ../development/cuda-modules/backend-stdenv.nix {}; + + # Loose packages + cudatoolkit = final.callPackage ../development/cuda-modules/cudatoolkit {}; + # SaxPy is only available after 11.4 because it requires redistributable versions of CUDA libraries. + saxpy = attrsets.optionalAttrs (strings.versionAtLeast cudaVersion "11.4") ( + final.callPackage ../development/cuda-modules/saxpy {} + ); + } + # NCCL is not supported on Jetson, because it does not use NVLink or PCI-e for inter-GPU communication. + # https://forums.developer.nvidia.com/t/can-jetson-orin-support-nccl/232845/9 + // attrsets.optionalAttrs (!flags.isJetsonBuild) { + nccl = final.callPackage ../development/cuda-modules/nccl {}; + nccl-tests = final.callPackage ../development/cuda-modules/nccl-tests {}; + } + ); + + mkVersionedPackageName = + name: version: + strings.concatStringsSep "_" [ + name + (strings.replaceStrings ["."] ["_"] (versions.majorMinor version)) + ]; + + composedExtension = fixedPoints.composeManyExtensions [ + (import ../development/cuda-modules/setup-hooks/extension.nix) + (callPackage ../development/cuda-modules/cuda/extension.nix {inherit cudaVersion;}) + (callPackage ../development/cuda-modules/cuda/overrides.nix {inherit cudaVersion;}) + (callPackage ../development/cuda-modules/generic-builders/multiplex.nix { + inherit cudaVersion flags mkVersionedPackageName; + pname = "cudnn"; + releasesModule = ../development/cuda-modules/cudnn/releases.nix; + shimsFn = ../development/cuda-modules/cudnn/shims.nix; + fixupFn = ../development/cuda-modules/cudnn/fixup.nix; + }) + (callPackage ../development/cuda-modules/cutensor/extension.nix { + inherit cudaVersion flags mkVersionedPackageName; + }) + (callPackage ../development/cuda-modules/generic-builders/multiplex.nix { + inherit cudaVersion flags mkVersionedPackageName; + pname = "tensorrt"; + releasesModule = ../development/cuda-modules/tensorrt/releases.nix; + shimsFn = ../development/cuda-modules/tensorrt/shims.nix; + fixupFn = ../development/cuda-modules/tensorrt/fixup.nix; + }) + (callPackage ../test/cuda/cuda-samples/extension.nix {inherit cudaVersion;}) + (callPackage ../test/cuda/cuda-library-samples/extension.nix {}) + ]; + + cudaPackages = customisation.makeScope newScope ( + fixedPoints.extends composedExtension passthruFunction + ); +in +cudaPackages // { inherit __attrsFailEvaluation; } diff --git a/pkgs/top-level/hare-third-party.nix b/pkgs/top-level/hare-third-party.nix index 084e749c676cc..ae3cbafda23f4 100644 --- a/pkgs/top-level/hare-third-party.nix +++ b/pkgs/top-level/hare-third-party.nix @@ -5,5 +5,8 @@ let inherit (self) callPackage; in { - hare-json = callPackage ../development/hare-packages/hare-json { }; + + hare-compress = callPackage ../development/hare-third-party/hare-compress { }; + hare-ev = callPackage ../development/hare-third-party/hare-ev { }; + hare-json = callPackage ../development/hare-third-party/hare-json { }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b8f11100d39cd..44ff6a6dd59ef 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -65,7 +65,8 @@ in { compiler = { ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { - llvmPackages = pkgs.llvmPackages_6; + # Should be llvmPackages_6 which has been removed from nixpkgs + llvmPackages = null; }; ghc8102Binary = callPackage ../development/compilers/ghc/8.10.2-binary.nix { @@ -80,20 +81,6 @@ in { llvmPackages = pkgs.llvmPackages_12; }; - ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { - bootPkgs = - # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - # 8.10.2 is needed as using 8.10.7 is broken due to RTS-incompatibilities - # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them - if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isMusl then - packages.ghc8102Binary - else - packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7; - llvmPackages = pkgs.llvmPackages_7; - }; - ghc88 = compiler.ghc884; ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix { bootPkgs = # the oldest ghc with aarch64-darwin support is 8.10.5 @@ -484,12 +471,6 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc884 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc884; - ghc = bh.compiler.ghc884; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; - }; - ghc88 = packages.ghc884; ghc8107 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc8107; ghc = bh.compiler.ghc8107; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 88c95457afee6..f2c725bfb4c2f 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -35,6 +35,7 @@ in { else package-darwin; in { inherit package-linux package-darwin; + __attrsFailEvaluation = true; jdk-hotspot = callPackage package.jdk-hotspot {}; jre-hotspot = callPackage package.jre-hotspot {}; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index efd25b37fa60e..c8cd917c15108 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -255,6 +255,7 @@ in { linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; linux_6_5_hardened = hardenedKernelFor kernels.linux_6_5 { }; + linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { }; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; @@ -343,8 +344,12 @@ in { fanout = callPackage ../os-specific/linux/fanout { }; + framework-laptop-kmod = callPackage ../os-specific/linux/framework-laptop-kmod { }; + fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { }; + gasket = callPackage ../os-specific/linux/gasket { }; + gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; @@ -395,7 +400,8 @@ in { nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })); + nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })) + // { __attrsFailEvaluation = true; }; nvidia_x11 = nvidiaPackages.stable; nvidia_x11_beta = nvidiaPackages.beta; @@ -406,6 +412,7 @@ in { nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; nvidia_dc = nvidiaPackages.dc; nvidia_dc_520 = nvidiaPackages.dc_520; + nvidia_dc_535 = nvidiaPackages.dc_535; # this is not a replacement for nvidia_x11* # only the opensource kernel driver exposed for hydra to build @@ -586,6 +593,7 @@ in { linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); + __attrsFailEvaluation = true; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 @@ -603,6 +611,7 @@ in { linux_rt_5_10 = packagesFor kernels.linux_rt_5_10; linux_rt_5_15 = packagesFor kernels.linux_rt_5_15; linux_rt_6_1 = packagesFor kernels.linux_rt_6_1; + __attrsFailEvaluation = true; }; rpiPackages = { @@ -610,6 +619,7 @@ in { linux_rpi2 = packagesFor kernels.linux_rpi2; linux_rpi3 = packagesFor kernels.linux_rpi3; linux_rpi4 = packagesFor kernels.linux_rpi4; + __attrsFailEvaluation = true; }; packages = recurseIntoAttrs (vanillaPackages // rtPackages // rpiPackages // { @@ -627,6 +637,7 @@ in { linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_6_5_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_5_hardened); + linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); @@ -637,6 +648,7 @@ in { linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre); linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre); + __recurseIntoDerivationForReleaseJobs = true; } // lib.optionalAttrs config.allowAliases { linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; @@ -651,7 +663,7 @@ in { linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_6_1; - }; + } // { __attrsFailEvaluation = true; }; manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix {}; diff --git a/pkgs/top-level/nim-overrides.nix b/pkgs/top-level/nim-overrides.nix index 910f5c8bcae41..34db79a6a4ead 100644 --- a/pkgs/top-level/nim-overrides.nix +++ b/pkgs/top-level/nim-overrides.nix @@ -32,6 +32,14 @@ buildInputs = buildInputs ++ [ getdns ]; }; + hashlib = lockAttrs: + lib.trivial.warnIf + (lockAttrs.rev == "84e0247555e4488594975900401baaf5bbbfb531") + "the selected version of the hashlib Nim library is hardware specific" + # https://github.com/khchen/hashlib/pull/4 + # remove when fixed upstream + (_: _: { }); + nimraylib_now = lockAttrs: finalAttrs: { buildInputs ? [ ], ... }: { buildInputs = buildInputs ++ [ raylib ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e788578d669f6..bc4499dac9df9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -593,6 +593,7 @@ let github-unix = callPackage ../development/ocaml-modules/github/unix.nix { }; gluten = callPackage ../development/ocaml-modules/gluten { }; + gluten-eio = callPackage ../development/ocaml-modules/gluten/eio.nix { }; gluten-lwt = callPackage ../development/ocaml-modules/gluten/lwt.nix { }; gluten-lwt-unix = callPackage ../development/ocaml-modules/gluten/lwt-unix.nix { }; @@ -890,6 +891,8 @@ let kicadsch = callPackage ../development/ocaml-modules/kicadsch { }; + kqueue = callPackage ../development/ocaml-modules/kqueue { }; + ### L ### lablgl = callPackage ../development/ocaml-modules/lablgl { }; @@ -1073,6 +1076,8 @@ let minisat = callPackage ../development/ocaml-modules/minisat { }; + minttea = callPackage ../development/ocaml-modules/minttea { }; + mirage = callPackage ../development/ocaml-modules/mirage { }; mirage-block = callPackage ../development/ocaml-modules/mirage-block { }; @@ -1438,6 +1443,8 @@ let inherit (pkgs) coreutils imagemagick; }; + poll = callPackage ../development/ocaml-modules/poll { }; + polynomial = callPackage ../development/ocaml-modules/polynomial { }; portaudio = callPackage ../development/ocaml-modules/portaudio { @@ -1732,6 +1739,8 @@ let telegraml = callPackage ../development/ocaml-modules/telegraml { }; + telemetry = callPackage ../development/ocaml-modules/telemetry { }; + terminal = callPackage ../development/ocaml-modules/terminal { }; terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; @@ -1780,6 +1789,8 @@ let tsort = callPackage ../development/ocaml-modules/tsort { }; + tty = callPackage ../development/ocaml-modules/tty { }; + tuntap = callPackage ../development/ocaml-modules/tuntap { }; twt = callPackage ../development/ocaml-modules/twt { }; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index b1c436d1ccf2b..c18360e94a4bf 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -12,6 +12,7 @@ fdbPackages fusePackages gns3Packages + haskellPackages idrisPackages nodePackages nodePackages_latest @@ -29,15 +30,6 @@ zeroadPackages ; - haskellPackages = super.haskellPackages // { - # mesos, which this depends on, has been removed from nixpkgs. We are keeping - # the error message for now, so users will get an error message they can make - # sense of, but need to work around it here. - # TODO(@sternenseemann): remove this after branch-off of 22.05, along with the - # override in configuration-nix.nix - hs-mesos = null; - }; - # Make sure haskell.compiler is included, so alternative GHC versions show up, # but don't add haskell.packages.* since they contain the same packages (at # least by name) as haskellPackages. diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 91135d86429a8..0c2464cb071c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -23,7 +23,7 @@ in with self; { inherit perl; - perlPackages = self; + perlPackages = self // { perlPackages = self.perlPackages // { __attrsFailEvaluation = true; }; }; # Check whether a derivation provides a perl module. hasPerlModule = drv: drv ? perlModule ; @@ -1294,16 +1294,17 @@ with self; { AudioScan = buildPerlPackage { pname = "Audio-Scan"; - version = "1.01"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/Audio-Scan-1.01.tar.gz"; - hash = "sha256-gxJyAnHHrdxLvuwzEs3divS5kKxjYgSllsB5M61sY0o="; + url = "https://github.com/Logitech/slimserver-vendor/raw/public/8.3/CPAN/Audio-Scan-1.05.tar.gz"; + hash = "sha256-9YXC8GHPRWKlV8emmTke7RB0HhiCbALmZQqtQFLcBi4="; }; buildInputs = [ pkgs.zlib TestWarn ]; env.NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz"; meta = { - description = "Fast C metadata and tag reader for all common audio file formats"; + description = "Fast C metadata and tag reader for all common audio file formats, slimserver fork"; + homepage = "https://github.com/Logitech/slimserver-vendor"; license = with lib.licenses; [ gpl2Plus ]; }; }; @@ -3296,6 +3297,32 @@ with self; { }; }; + ChipcardPCSC = buildPerlPackage { + pname = "Chipcard-PCSC"; + version = "1.4.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WH/WHOM/Chipcard-PCSC-v1.4.16.tar.gz"; + hash = "sha256-O14p1jRDXxQm7Nzfebo1G04mWPNsPCK+N7HTHjbKj6k="; + }; + buildInputs = [ pkgs.pcsclite ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + env.NIX_CFLAGS_COMPILE = toString ([ + "-I${pkgs.pcsclite.dev}/include/PCSC" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-int" + "-Wno-error=int-conversion" + ]); + NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.pcsclite}/lib -lpcsclite"; + # tests fail; look unfinished + doCheck = false; + meta = { + description = "Communicate with a smart card using PC/SC"; + homepage = "https://pcsc-perl.apdu.fr/"; + license = with lib.licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ abbradar anthonyroussel ]; + }; + }; + CiscoIPPhone = buildPerlPackage { pname = "Cisco-IPPhone"; version = "0.05"; @@ -20198,27 +20225,6 @@ with self; { }; }; - pcscperl = buildPerlPackage { - pname = "pcsc-perl"; - version = "1.4.14"; - src = fetchurl { - url = "mirror://cpan/authors/id/W/WH/WHOM/pcsc-perl-1.4.14.tar.bz2"; - hash = "sha256-JyK35VQ+T687oexrKaff7G2Svh7ewJ0KMZGZLU2Ixp0="; - }; - buildInputs = [ pkgs.pcsclite ]; - nativeBuildInputs = [ pkgs.pkg-config ]; - NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.pcsclite}/lib -lpcsclite"; - # tests fail; look unfinished - doCheck = false; - meta = { - description = "Communicate with a smart card using PC/SC"; - homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"; - license = with lib.licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ abbradar ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.pcscperl.x86_64-darwin - }; - }; - PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; version = "2.045"; @@ -22687,10 +22693,10 @@ with self; { SpreadsheetParseExcel = buildPerlPackage { pname = "Spreadsheet-ParseExcel"; - version = "0.65"; + version = "0.66"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz"; - hash = "sha256-bsTLQpvVjYFkD+EhFvQ1xG9R/xBAxo8JzIt2gcFnW+w="; + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-ParseExcel-0.66.tar.gz"; + hash = "sha256-v9dqz7qYhgHcBRvac7S7JfaDmgBt2WC2p0AcJJJF9ls="; }; propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOStringy OLEStorage_Lite ]; meta = { @@ -23884,12 +23890,12 @@ with self; { SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "9.7.0"; + version = "9.8.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; rev = "v${version}"; - hash = "sha256-tXXB6Gj27oFZv9WD4dXWdY55jDDLrGYbud4qoyjNe5A="; + hash = "sha256-xLrqD1fFbDYS4HH85vYCeaKZeNwXQpjPXfGpJCFumg8="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; @@ -29327,4 +29333,5 @@ with self; { version = self.Version; Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15 + pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07 } diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cda91b8c627b4..c424226f76b91 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -227,10 +227,6 @@ lib.makeScope pkgs.newScope (self: with self; { # 2. The contrib extensions available # 3. The core extensions extensions = - # Contrib conditional extensions - lib.optionalAttrs (!(lib.versionAtLeast php.version "8.3")) { - blackfire = callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; }; - } // # Contrib extensions { amqp = callPackage ../development/php-packages/amqp { }; @@ -239,6 +235,8 @@ lib.makeScope pkgs.newScope (self: with self; { ast = callPackage ../development/php-packages/ast { }; + blackfire = callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; }; + couchbase = callPackage ../development/php-packages/couchbase { }; datadog_trace = callPackage ../development/php-packages/datadog_trace { @@ -312,8 +310,6 @@ lib.makeScope pkgs.newScope (self: with self; { phalcon = callPackage ../development/php-packages/phalcon { }; - php-spx = callPackage ../development/php-packages/php-spx { }; - pinba = callPackage ../development/php-packages/pinba { }; protobuf = callPackage ../development/php-packages/protobuf { }; @@ -332,6 +328,8 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) darwin; }; + spx = callPackage ../development/php-packages/spx { }; + sqlsrv = callPackage ../development/php-packages/sqlsrv { }; ssh2 = callPackage ../development/php-packages/ssh2 { }; @@ -345,6 +343,8 @@ lib.makeScope pkgs.newScope (self: with self; { xdebug = callPackage ../development/php-packages/xdebug { }; yaml = callPackage ../development/php-packages/yaml { }; + } // lib.optionalAttrs config.allowAliases { + php-spx = throw "php-spx is deprecated, use spx instead"; } // ( # Core extensions let @@ -476,6 +476,7 @@ lib.makeScope pkgs.newScope (self: with self; { lib.optional (!stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind) valgrind.dev; + configureFlags = lib.optional php.ztsSupport "--disable-opcache-jit"; zendExtension = true; postPatch = lib.optionalString stdenv.isDarwin '' # Tests are flaky on darwin diff --git a/pkgs/top-level/pkg-config/tests.nix b/pkgs/top-level/pkg-config/tests.nix index ec1d445c5903b..786e2ecc534b8 100644 --- a/pkgs/top-level/pkg-config/tests.nix +++ b/pkgs/top-level/pkg-config/tests.nix @@ -17,5 +17,5 @@ let }; in lib.recurseIntoAttrs { - defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { }; + defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { } // { __recurseIntoDerivationForReleaseJobs = true; }; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 39ba30a93b7dd..5fe0e98b9a2d3 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -76,6 +76,7 @@ mapAliases ({ buildbot-pkg = throw "buildbot-pkg has been removed, it's only internally used in buildbot"; # added 2022-04-07 bt_proximity = bt-proximity; # added 2021-07-02 BTrees = btrees; # added 2023-02-19 + cacheyou = throw "cacheyou has been removed, as it was no longer used for the only consumer pdm"; # added 2023-12-21 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 cchardet = faust-cchardet; # added 2023-03-02 class-registry = phx-class-registry; # added 2021-10-05 @@ -225,6 +226,8 @@ mapAliases ({ lazy_imports = lazy-imports; # added 2023-10-13 lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01 line_profiler = line-profiler; # added 2023-11-04 + livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14 + livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 @@ -310,6 +313,7 @@ mapAliases ({ pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 PyMVGLive = pymvglive; # added 2023-02-19 pymyq = python-myq; # added 2023-10-20 + python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07 pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09 pyramid_beaker = pyramid-beaker; # added 2023-08-23 pyramid_chameleon = pyramid-chameleon; # added 2023-08-23 @@ -462,6 +466,7 @@ mapAliases ({ xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 XlsxWriter = xlsxwriter; # added 2023-02-19 Yapsy = yapsy; # added 2023-02-19 + z3 = z3-solver; # added 2023-12-03 zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20 zc-buildout221 = zc-buildout; # added 2021-07-21 zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebf97327f53fc..db4076b7e53bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -218,6 +218,8 @@ self: super: with self; { aiogram = callPackage ../development/python-modules/aiogram { }; + aiohappyeyeballs = callPackage ../development/python-modules/aiohappyeyeballs { }; + aioharmony = callPackage ../development/python-modules/aioharmony { }; aiohomekit = callPackage ../development/python-modules/aiohomekit { }; @@ -250,6 +252,8 @@ self: super: with self; { aiohttp-wsgi = callPackage ../development/python-modules/aiohttp-wsgi { }; + aiohttp-zlib-ng = callPackage ../development/python-modules/aiohttp-zlib-ng { }; + aioitertools = callPackage ../development/python-modules/aioitertools { }; aiobiketrax = callPackage ../development/python-modules/aiobiketrax { }; @@ -550,6 +554,8 @@ self: super: with self; { anonip = callPackage ../development/python-modules/anonip { }; + anova-wifi = callPackage ../development/python-modules/anova-wifi { }; + ansi2html = callPackage ../development/python-modules/ansi2html { }; ansi2image = callPackage ../development/python-modules/ansi2image { }; @@ -746,6 +752,8 @@ self: super: with self; { asgi-csrf = callPackage ../development/python-modules/asgi-csrf { }; + asgi-logger = callPackage ../development/python-modules/asgi-logger { }; + asgineer = callPackage ../development/python-modules/asgineer { }; asgiref = callPackage ../development/python-modules/asgiref { }; @@ -953,6 +961,8 @@ self: super: with self; { avea = callPackage ../development/python-modules/avea { }; + avidtools = callPackage ../development/python-modules/avidtools { }; + avion = callPackage ../development/python-modules/avion { }; avro3k = callPackage ../development/python-modules/avro3k { }; @@ -1378,6 +1388,8 @@ self: super: with self; { else callPackage ../development/python-modules/bcrypt { }; + bdffont = callPackage ../development/python-modules/bdffont { }; + beaker = callPackage ../development/python-modules/beaker { }; before-after = callPackage ../development/python-modules/before-after { }; @@ -1444,6 +1456,8 @@ self: super: with self; { binary = callPackage ../development/python-modules/binary { }; + binary2strings = callPackage ../development/python-modules/binary2strings { }; + binaryornot = callPackage ../development/python-modules/binaryornot { }; bincopy = callPackage ../development/python-modules/bincopy { }; @@ -1506,6 +1520,8 @@ self: super: with self; { bleak = callPackage ../development/python-modules/bleak { }; + bleak-esphome = callPackage ../development/python-modules/bleak-esphome { }; + bleak-retry-connector = callPackage ../development/python-modules/bleak-retry-connector { }; blebox-uniapi = callPackage ../development/python-modules/blebox-uniapi { }; @@ -1591,6 +1607,8 @@ self: super: with self; { enablePython = true; }); + borb = callPackage ../development/python-modules/borb { }; + bork = callPackage ../development/python-modules/bork { }; boschshcpy = callPackage ../development/python-modules/boschshcpy { }; @@ -1735,6 +1753,8 @@ self: super: with self; { cachecontrol = callPackage ../development/python-modules/cachecontrol { }; + cached-ipaddress = callPackage ../development/python-modules/cached-ipaddress { }; + cached-property = callPackage ../development/python-modules/cached-property { }; cachelib = callPackage ../development/python-modules/cachelib { }; @@ -1743,8 +1763,6 @@ self: super: with self; { cachey = callPackage ../development/python-modules/cachey { }; - cacheyou = callPackage ../development/python-modules/cacheyou { }; - cachier = callPackage ../development/python-modules/cachier { }; cachy = callPackage ../development/python-modules/cachy { }; @@ -1962,6 +1980,8 @@ self: super: with self; { characteristic = callPackage ../development/python-modules/characteristic { }; + character-encoding-utils = callPackage ../development/python-modules/character-encoding-utils { }; + chardet = callPackage ../development/python-modules/chardet { }; charset-normalizer = callPackage ../development/python-modules/charset-normalizer { }; @@ -1982,6 +2002,8 @@ self: super: with self; { cherrypy = callPackage ../development/python-modules/cherrypy { }; + cherrypy-cors = callPackage ../development/python-modules/cherrypy-cors { }; + chess = callPackage ../development/python-modules/chess { }; chevron = callPackage ../development/python-modules/chevron { }; @@ -2360,6 +2382,8 @@ self: super: with self; { cppy = callPackage ../development/python-modules/cppy { }; + cpufeature = callPackage ../development/python-modules/cpufeature { }; + cpyparsing = callPackage ../development/python-modules/cpyparsing { }; cram = callPackage ../development/python-modules/cram { }; @@ -2467,7 +2491,8 @@ self: super: with self; { cufflinks = callPackage ../development/python-modules/cufflinks { }; - cupy = callPackage ../development/python-modules/cupy { }; + # cupy 12.2.0 possibly incompatible with cutensor 2.0 that comes with cudaPackages_12 + cupy = callPackage ../development/python-modules/cupy { cudaPackages = pkgs.cudaPackages_11; }; curio = callPackage ../development/python-modules/curio { }; @@ -2784,6 +2809,8 @@ self: super: with self; { detectron2 = callPackage ../development/python-modules/detectron2 { }; + devialet = callPackage ../development/python-modules/devialet { }; + devito = callPackage ../development/python-modules/devito { }; devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { }; @@ -2822,6 +2849,8 @@ self: super: with self; { diffsync = callPackage ../development/python-modules/diffsync { }; + diffusers = callPackage ../development/python-modules/diffusers { }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; digi-xbee = callPackage ../development/python-modules/digi-xbee { }; @@ -3058,6 +3087,8 @@ self: super: with self; { django-markup = callPackage ../development/python-modules/django-markup { }; + django-markdownx = callPackage ../development/python-modules/django-markdownx { }; + django-model-utils = callPackage ../development/python-modules/django-model-utils { }; django-modelcluster = callPackage ../development/python-modules/django-modelcluster { }; @@ -3066,6 +3097,8 @@ self: super: with self; { django-maintenance-mode = callPackage ../development/python-modules/django-maintenance-mode { }; + django-mdeditor = callPackage ../development/python-modules/django-mdeditor { }; + django-mptt = callPackage ../development/python-modules/django-mptt { }; django-mysql = callPackage ../development/python-modules/django-mysql { }; @@ -3236,6 +3269,10 @@ self: super: with self; { dnachisel = callPackage ../development/python-modules/dnachisel { }; + dnf-plugins-core = callPackage ../development/python-modules/dnf-plugins-core { }; + + dnf4 = callPackage ../development/python-modules/dnf4 { }; + dnfile = callPackage ../development/python-modules/dnfile { }; dnslib = callPackage ../development/python-modules/dnslib { }; @@ -3438,6 +3475,8 @@ self: super: with self; { dynalite-devices = callPackage ../development/python-modules/dynalite-devices { }; + dynalite-panel = callPackage ../development/python-modules/dynalite-panel { }; + dynd = callPackage ../development/python-modules/dynd { }; e3-core = callPackage ../development/python-modules/e3-core { }; @@ -3800,6 +3839,8 @@ self: super: with self; { face-recognition = callPackage ../development/python-modules/face-recognition { }; + facenet-pytorch = callPackage ../development/python-modules/facenet-pytorch { }; + face-recognition-models = callPackage ../development/python-modules/face-recognition/models.nix { }; factory-boy = callPackage ../development/python-modules/factory-boy { }; @@ -3921,6 +3962,8 @@ self: super: with self; { ffmpy = callPackage ../development/python-modules/ffmpy { }; + fhir-py = callPackage ../development/python-modules/fhir-py { }; + fiblary3-fork = callPackage ../development/python-modules/fiblary3-fork { }; fido2 = callPackage ../development/python-modules/fido2 { }; @@ -3965,6 +4008,8 @@ self: super: with self; { fire = callPackage ../development/python-modules/fire { }; + firebase-messaging = callPackage ../development/python-modules/firebase-messaging { }; + fireflyalgorithm = callPackage ../development/python-modules/fireflyalgorithm { }; firetv = callPackage ../development/python-modules/firetv { }; @@ -4137,6 +4182,8 @@ self: super: with self; { flet-core = callPackage ../development/python-modules/flet-core { }; + flet-runtime = callPackage ../development/python-modules/flet-runtime { }; + flexmock = callPackage ../development/python-modules/flexmock { }; flickrapi = callPackage ../development/python-modules/flickrapi { }; @@ -4252,6 +4299,8 @@ self: super: with self; { fpdf = callPackage ../development/python-modules/fpdf { }; + fpdf2 = callPackage ../development/python-modules/fpdf2 { }; + fpylll = callPackage ../development/python-modules/fpylll { }; fpyutils = callPackage ../development/python-modules/fpyutils { }; @@ -4724,12 +4773,16 @@ self: super: with self; { googletrans = callPackage ../development/python-modules/googletrans { }; + gotailwind = callPackage ../development/python-modules/gotailwind { }; + gotenberg-client = callPackage ../development/python-modules/gotenberg-client { }; gorilla = callPackage ../development/python-modules/gorilla { }; govee-ble = callPackage ../development/python-modules/govee-ble { }; + govee-led-wez = callPackage ../development/python-modules/govee-led-wez { }; + goveelights = callPackage ../development/python-modules/goveelights { }; gpapi = callPackage ../development/python-modules/gpapi { }; @@ -4783,6 +4836,8 @@ self: super: with self; { gradio-client = callPackage ../development/python-modules/gradio/client.nix { }; + grafanalib = callPackage ../development/python-modules/grafanalib/default.nix { }; + grammalecte = callPackage ../development/python-modules/grammalecte { }; grandalf = callPackage ../development/python-modules/grandalf { }; @@ -4951,6 +5006,8 @@ self: super: with self; { habanero = callPackage ../development/python-modules/habanero { }; + habluetooth = callPackage ../development/python-modules/habluetooth { }; + habitipy = callPackage ../development/python-modules/habitipy { }; hachoir = callPackage ../development/python-modules/hachoir { }; @@ -5230,6 +5287,8 @@ self: super: with self; { humanize = callPackage ../development/python-modules/humanize { }; + human-readable = callPackage ../development/python-modules/human-readable { }; + humblewx = callPackage ../development/python-modules/humblewx { }; hupper = callPackage ../development/python-modules/hupper { }; @@ -5310,6 +5369,8 @@ self: super: with self; { icalendar = callPackage ../development/python-modules/icalendar { }; + icalevents = callPackage ../development/python-modules/icalevents { }; + icecream = callPackage ../development/python-modules/icecream { }; iceportal = callPackage ../development/python-modules/iceportal { }; @@ -5390,6 +5451,8 @@ self: super: with self; { imgtool = callPackage ../development/python-modules/imgtool { }; + imia = callPackage ../development/python-modules/imia { }; + iminuit = callPackage ../development/python-modules/iminuit { }; immutabledict = callPackage ../development/python-modules/immutabledict { }; @@ -6146,6 +6209,8 @@ self: super: with self; { lc7001 = callPackage ../development/python-modules/lc7001 { }; + lcd-i2c = callPackage ../development/python-modules/lcd-i2c { }; + lcgit = callPackage ../development/python-modules/lcgit { }; lcov_cobertura = callPackage ../development/python-modules/lcov_cobertura { }; @@ -6221,8 +6286,22 @@ self: super: with self; { libcloud = callPackage ../development/python-modules/libcloud { }; + libcomps = lib.pipe pkgs.libcomps [ + toPythonModule + (p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; })) + (p: p.override { inherit python; }) + (p: p.py) + ]; + libcst = callPackage ../development/python-modules/libcst { }; + libdnf = lib.pipe pkgs.libdnf [ + toPythonModule + (p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; })) + (p: p.override { inherit python; }) + (p: p.py) + ]; + libevdev = callPackage ../development/python-modules/libevdev { }; libfdt = toPythonModule (pkgs.dtc.override { @@ -6422,6 +6501,10 @@ self: super: with self; { lingua = callPackage ../development/python-modules/lingua { }; + linien-client = callPackage ../development/python-modules/linien-client { }; + + linien-common = callPackage ../development/python-modules/linien-common { }; + linkify-it-py = callPackage ../development/python-modules/linkify-it-py { }; linknlink = callPackage ../development/python-modules/linknlink { }; @@ -6452,10 +6535,6 @@ self: super: with self; { livereload = callPackage ../development/python-modules/livereload { }; - livestreamer = callPackage ../development/python-modules/livestreamer { }; - - livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; - lizard = callPackage ../development/python-modules/lizard { }; llfuse = callPackage ../development/python-modules/llfuse { @@ -6757,6 +6836,8 @@ self: super: with self; { inherit (self) buildPythonPackage pythonOlder pythonAtLeast pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5; }; + mayim = callPackage ../development/python-modules/mayim { }; + mbddns = callPackage ../development/python-modules/mbddns { }; mbstrdecoder = callPackage ../development/python-modules/mbstrdecoder { }; @@ -6807,6 +6888,8 @@ self: super: with self; { mediafile = callPackage ../development/python-modules/mediafile { }; + mediafire-dl = callPackage ../development/python-modules/mediafire-dl { }; + mediapy = callPackage ../development/python-modules/mediapy { }; meeko = callPackage ../development/python-modules/meeko { }; @@ -7093,6 +7176,8 @@ self: super: with self; { mongoquery = callPackage ../development/python-modules/mongoquery { }; + monitorcontrol = callPackage ../development/python-modules/monitorcontrol { }; + monkeyhex = callPackage ../development/python-modules/monkeyhex { }; monosat = pkgs.monosat.python { @@ -8325,7 +8410,7 @@ self: super: with self; { inherit (pkgs) notmuch; }; - nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; + nototools = callPackage ../development/python-modules/nototools { }; notus-scanner = callPackage ../development/python-modules/notus-scanner { }; @@ -8381,6 +8466,8 @@ self: super: with self; { nvchecker = callPackage ../development/python-modules/nvchecker { }; + nvdlib = callPackage ../development/python-modules/nvdlib { }; + nvidia-ml-py = callPackage ../development/python-modules/nvidia-ml-py { }; nsz = callPackage ../development/python-modules/nsz { }; @@ -8527,13 +8614,15 @@ self: super: with self; { opcua-widgets = callPackage ../development/python-modules/opcua-widgets { }; + open-clip-torch = callPackage ../development/python-modules/open-clip-torch { }; + open-garage = callPackage ../development/python-modules/open-garage { }; open-meteo = callPackage ../development/python-modules/open-meteo { }; openai-triton = callPackage ../development/python-modules/openai-triton { llvm = pkgs.openai-triton-llvm; - cudaPackages = pkgs.cudaPackages_12_0; + cudaPackages = pkgs.cudaPackages_12_1; }; openai-triton-cuda = self.openai-triton.override { @@ -8695,6 +8784,8 @@ self: super: with self; { orange-widget-base = callPackage ../development/python-modules/orange-widget-base { }; + oras = callPackage ../development/python-modules/oras { }; + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; ordered-set = callPackage ../development/python-modules/ordered-set { }; @@ -9214,6 +9305,8 @@ self: super: with self; { pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + pixel-font-builder = callPackage ../development/python-modules/pixel-font-builder { }; + pixel-ring = callPackage ../development/python-modules/pixel-ring { }; pjsua2 = (toPythonModule (pkgs.pjsip.override { @@ -9268,6 +9361,10 @@ self: super: with self; { pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { }; + pycrdt = callPackage ../development/python-modules/pycrdt { }; + + pycrdt-websocket = callPackage ../development/python-modules/pycrdt-websocket { }; + pyfibaro = callPackage ../development/python-modules/pyfibaro { }; pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { }; @@ -9278,6 +9375,8 @@ self: super: with self; { pyfluidsynth = callPackage ../development/python-modules/pyfluidsynth { }; + pyformlang = callPackage ../development/python-modules/pyformlang { }; + pyfreedompro = callPackage ../development/python-modules/pyfreedompro { }; pygments-style-github = callPackage ../development/python-modules/pygments-style-github { }; @@ -9310,6 +9409,8 @@ self: super: with self; { pyngrok = callPackage ../development/python-modules/pyngrok { }; + pynitrokey = callPackage ../development/python-modules/pynitrokey { }; + pynndescent = callPackage ../development/python-modules/pynndescent { }; pynobo = callPackage ../development/python-modules/pynobo { }; @@ -9390,6 +9491,8 @@ self: super: with self; { python-csxcad = callPackage ../development/python-modules/python-csxcad { }; + python-djvulibre = callPackage ../development/python-modules/python-djvulibre { }; + python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { }; python-flirt = callPackage ../development/python-modules/python-flirt { }; @@ -9702,6 +9805,28 @@ self: super: with self; { proton-client = callPackage ../development/python-modules/proton-client { }; + proton-core = callPackage ../development/python-modules/proton-core { }; + + proton-keyring-linux = callPackage ../development/python-modules/proton-keyring-linux { }; + + proton-keyring-linux-secretservice = callPackage ../development/python-modules/proton-keyring-linux-secretservice { }; + + proton-vpn-api-core = callPackage ../development/python-modules/proton-vpn-api-core { }; + + proton-vpn-connection = callPackage ../development/python-modules/proton-vpn-connection { }; + + proton-vpn-killswitch = callPackage ../development/python-modules/proton-vpn-killswitch { }; + + proton-vpn-killswitch-network-manager = callPackage ../development/python-modules/proton-vpn-killswitch-network-manager { }; + + proton-vpn-logger = callPackage ../development/python-modules/proton-vpn-logger { }; + + proton-vpn-network-manager = callPackage ../development/python-modules/proton-vpn-network-manager { }; + + proton-vpn-network-manager-openvpn = callPackage ../development/python-modules/proton-vpn-network-manager-openvpn { }; + + proton-vpn-session = callPackage ../development/python-modules/proton-vpn-session { }; + protonup-ng = callPackage ../development/python-modules/protonup-ng { }; protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib { @@ -9891,6 +10016,8 @@ self: super: with self; { pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { }; + pyasuswrt = callPackage ../development/python-modules/pyasuswrt { }; + pyathena = callPackage ../development/python-modules/pyathena { }; pyatmo = callPackage ../development/python-modules/pyatmo { }; @@ -10399,6 +10526,8 @@ self: super: with self; { pyipp = callPackage ../development/python-modules/pyipp { }; + pyipv8 = callPackage ../development/python-modules/pyipv8 { }; + pyiqvia = callPackage ../development/python-modules/pyiqvia { }; pyisbn = callPackage ../development/python-modules/pyisbn { }; @@ -10479,6 +10608,8 @@ self: super: with self; { inherit (pkgs) libusb1; }; + pylibjpeg = callPackage ../development/python-modules/pylibjpeg { }; + pylibjpeg-libjpeg = callPackage ../development/python-modules/pylibjpeg-libjpeg { }; pyliblo = callPackage ../development/python-modules/pyliblo { }; @@ -10591,6 +10722,8 @@ self: super: with self; { pymicrobot = callPackage ../development/python-modules/pymicrobot { }; + pymiele = callPackage ../development/python-modules/pymiele { }; + pymilter = callPackage ../development/python-modules/pymilter { }; pymilvus = callPackage ../development/python-modules/pymilvus { }; @@ -10641,8 +10774,6 @@ self: super: with self; { pymvglive = callPackage ../development/python-modules/pymvglive { }; - python-myq = callPackage ../development/python-modules/python-myq { }; - pymysensors = callPackage ../development/python-modules/pymysensors { }; pymysql = callPackage ../development/python-modules/pymysql { }; @@ -12289,6 +12420,8 @@ self: super: with self; { rencode = callPackage ../development/python-modules/rencode { }; + renson-endura-delta = callPackage ../development/python-modules/renson-endura-delta { }; + reorder-python-imports = callPackage ../development/python-modules/reorder-python-imports { }; reolink = callPackage ../development/python-modules/reolink { }; @@ -12395,6 +12528,8 @@ self: super: with self; { returns = callPackage ../development/python-modules/returns { }; + reuse = callPackage ../development/python-modules/reuse { }; + rfc3339 = callPackage ../development/python-modules/rfc3339 { }; rfc3339-validator = callPackage ../development/python-modules/rfc3339-validator { }; @@ -12931,6 +13066,8 @@ self: super: with self; { shapely = callPackage ../development/python-modules/shapely { }; + shapely_1_8 = callPackage ../development/python-modules/shapely/1.8.nix { }; + shaperglot = callPackage ../development/python-modules/shaperglot { }; sharedmem = callPackage ../development/python-modules/sharedmem { }; @@ -12993,6 +13130,8 @@ self: super: with self; { simber = callPackage ../development/python-modules/simber { }; + simple-term-menu = callPackage ../development/python-modules/simple-term-menu { }; + simpleaudio = callPackage ../development/python-modules/simpleaudio { }; simplebayes = callPackage ../development/python-modules/simplebayes { }; @@ -13159,6 +13298,8 @@ self: super: with self; { smpp_pdu = callPackage ../development/python-modules/smpp.pdu { }; + smtpdfix = callPackage ../development/python-modules/smtpdfix { }; + snack = toPythonModule (pkgs.newt.override { inherit (self) python; }); @@ -13563,6 +13704,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; }; + starlette-wtf = callPackage ../development/python-modules/starlette-wtf { }; + starkbank-ecdsa = callPackage ../development/python-modules/starkbank-ecdsa { }; starline = callPackage ../development/python-modules/starline { }; @@ -13687,6 +13830,18 @@ self: super: with self; { succulent = callPackage ../development/python-modules/succulent { }; + sudachidict-core = callPackage ../development/python-modules/sudachidict { }; + + sudachidict-full = callPackage ../development/python-modules/sudachidict { + sudachidict = pkgs.sudachidict.override { dict-type = "full"; }; + }; + + sudachidict-small = callPackage ../development/python-modules/sudachidict { + sudachidict = pkgs.sudachidict.override { dict-type = "small"; }; + }; + + sudachipy = callPackage ../development/python-modules/sudachipy { }; + sumo = callPackage ../development/python-modules/sumo { }; sumtypes = callPackage ../development/python-modules/sumtypes { }; @@ -13924,7 +14079,6 @@ self: super: with self; { callPackage ../development/python-modules/tensorflow { inherit (pkgs.darwin) cctools; inherit (pkgs.config) cudaSupport; - inherit (self.tensorflow-bin) cudaPackages; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; flatbuffers-core = pkgs.flatbuffers; flatbuffers-python = self.flatbuffers; @@ -13957,7 +14111,7 @@ self: super: with self; { tensorly = callPackage ../development/python-modules/tensorly { }; - tensorrt = callPackage ../development/python-modules/tensorrt { }; + tensorrt = callPackage ../development/python-modules/tensorrt { cudaPackages = pkgs.cudaPackages_11; }; tensorstore = callPackage ../development/python-modules/tensorstore { }; @@ -13991,6 +14145,8 @@ self: super: with self; { testfixtures = callPackage ../development/python-modules/testfixtures { }; + texsoup = callPackage ../development/python-modules/texsoup { }; + textfsm = callPackage ../development/python-modules/textfsm { }; textile = callPackage ../development/python-modules/textile { }; @@ -14343,6 +14499,8 @@ self: super: with self; { translationstring = callPackage ../development/python-modules/translationstring { }; + translitcodec = callPackage ../development/python-modules/translitcodec { }; + transmission-rpc = callPackage ../development/python-modules/transmission-rpc { }; transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; @@ -15379,6 +15537,8 @@ self: super: with self; { unicodedata2 = callPackage ../development/python-modules/unicodedata2 { }; + unicode-rbnf = callPackage ../development/python-modules/unicode-rbnf { }; + unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; unicorn = callPackage ../development/python-modules/unicorn { @@ -15389,6 +15549,8 @@ self: super: with self; { unicrypto = callPackage ../development/python-modules/unicrypto { }; + unidata-blocks = callPackage ../development/python-modules/unidata-blocks { }; + unidecode = callPackage ../development/python-modules/unidecode { }; unidic = callPackage ../development/python-modules/unidic { }; @@ -15417,6 +15579,8 @@ self: super: with self; { universal-silabs-flasher = callPackage ../development/python-modules/universal-silabs-flasher { }; + unix-ar = callPackage ../development/python-modules/unix-ar { }; + unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; unrardll = callPackage ../development/python-modules/unrardll { }; @@ -15601,6 +15765,8 @@ self: super: with self; { vine = callPackage ../development/python-modules/vine { }; + virt-firmware = callPackage ../development/python-modules/virt-firmware { }; + virtkey = callPackage ../development/python-modules/virtkey { }; virtualenv = callPackage ../development/python-modules/virtualenv { }; @@ -15765,6 +15931,8 @@ self: super: with self; { webcolors = callPackage ../development/python-modules/webcolors { }; + webdataset = callPackage ../development/python-modules/webdataset { }; + webdav4 = callPackage ../development/python-modules/webdav4 { }; webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; @@ -15909,6 +16077,8 @@ self: super: with self; { wtforms = callPackage ../development/python-modules/wtforms { }; + wtforms-bootstrap5 = callPackage ../development/python-modules/wtforms-bootstrap5 { }; + wtf-peewee = callPackage ../development/python-modules/wtf-peewee { }; wurlitzer = callPackage ../development/python-modules/wurlitzer { }; @@ -16087,7 +16257,7 @@ self: super: with self; { yarg = callPackage ../development/python-modules/yarg { }; - yagry = callPackage ../development/python-modules/yargy { }; + yargy = callPackage ../development/python-modules/yargy { }; yark = callPackage ../development/python-modules/yark { }; @@ -16121,6 +16291,8 @@ self: super: with self; { youseedee = callPackage ../development/python-modules/youseedee { }; + youtokentome = callPackage ../development/python-modules/youtokentome { }; + youtube-dl = callPackage ../tools/misc/youtube-dl { }; youtube-dl-light = callPackage ../tools/misc/youtube-dl { @@ -16163,9 +16335,11 @@ self: super: with self; { z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; - z3 = (toPythonModule (pkgs.z3.override { + z3-solver = (toPythonModule ((pkgs.z3.override { inherit python; - })).python; + }).overrideAttrs (_: { + pname = "z3-solver"; + }))).python; zadnegoale = callPackage ../development/python-modules/zadnegoale { }; @@ -16241,6 +16415,10 @@ self: super: with self; { zipstream-ng = callPackage ../development/python-modules/zipstream-ng { }; + zlib-ng = callPackage ../development/python-modules/zlib-ng { + inherit (pkgs) zlib-ng; + }; + zm-py = callPackage ../development/python-modules/zm-py { }; zodb = callPackage ../development/python-modules/zodb { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 2a068d5afd719..f38a4c1c49078 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -69,7 +69,9 @@ makeScopeWithSplicing' { }; in (lib.makeOverridable mkMaui attrs); - noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideScope'" "overrideDerivation" ]; + noExtraAttrs = set: + lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideScope'" "overrideDerivation" ] + // { __attrsFailEvaluation = true; }; in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // { @@ -142,13 +144,13 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP liblastfm = callPackage ../development/libraries/liblastfm { }; - libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { + libopenshot = callPackage ../development/libraries/libopenshot { stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; }; packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; - libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { + libopenshot-audio = callPackage ../development/libraries/libopenshot-audio { inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AGL Cocoa Foundation; }; diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix new file mode 100644 index 0000000000000..673b63a5ac34f --- /dev/null +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -0,0 +1,192 @@ +# This expression will, as efficiently as possible, dump a +# *superset* of all attrpaths of derivations which might be +# part of a release on *any* platform. +# +# Both this expression and what ofborg uses (release-outpaths.nix) +# are essentially single-threaded (under the current cppnix +# implementation). +# +# This expression runs much, much, much faster and uses much, much +# less memory than the ofborg script by skipping the +# platform-relevance checks. The ofborg outpaths.nix script takes +# half an hour on a 3ghz core and peaks at 60gbytes of memory; this +# expression runs on the same machine in 44 seconds with peak memory +# usage of 5gbytes. +# +# Once you have the list of attrnames you can split it up into +# $NUM_CORES batches and run the platform checks separately for each +# batch, in parallel. +# +# To dump the attrnames: +# +# nix-instantiate --eval --strict --json pkgs/top-level/release-attrpaths-superset.nix -A names +# +{ lib ? import (path + "/lib") +, trace ? false +, enableWarnings ? true +, checkMeta ? true +, path ? ./../.. +}: +let + + # No release package attrpath may have any of these attrnames as + # its initial component. + # + # If you can find a way to remove any of these entries without + # causing CI to fail, please do so. + # + excluded-toplevel-attrs = { + # spliced packagesets + __splicedPackages = true; + pkgsBuildBuild = true; + pkgsBuildHost = true; + pkgsBuildTarget = true; + pkgsHostHost = true; + pkgsHostTarget = true; + pkgsTargetTarget = true; + buildPackages = true; + targetPackages = true; + + # cross packagesets + pkgsLLVM = true; + pkgsMusl = true; + pkgsStatic = true; + pkgsCross = true; + pkgsi686Linux = true; + }; + + # No release package attrname may have any of these at a component + # anywhere in its attrpath. These are the names of gigantic + # top-level attrsets that have leaked into so many sub-packagesets + # that it's easier to simply exclude them entirely. + # + # If you can find a way to remove any of these entries without + # causing CI to fail, please do so. + # + excluded-attrnames-at-any-depth = { + lib = true; + override = true; + __functor = true; + __functionArgs = true; + newScope = true; + scope = true; + pkgs = true; + + buildHaskellPackages = true; + buildPackages = true; + generateOptparseApplicativeCompletions = true; + + callPackage = true; + mkDerivation = true; + overrideDerivation = true; + overrideScope = true; + overrideScope' = true; + + # Special case: lib/types.nix leaks into a lot of nixos-related + # derivations, and does not eval deeply. + type = true; + }; + + # __attrsFailEvaluation is a temporary workaround to get top-level + # eval to succeed (under builtins.tryEval) for the entire + # packageset, without deep invasve changes into individual + # packages. + # + # Now that CI has been added, ensuring that top-level eval will + # not be broken by any new commits, you should not add any new + # occurrences of __attrsFailEvaluation, and should remove them + # wherever you are able to (doing so will likely require deep + # adjustments within packages). Once all of the uses of + # __attrsFailEvaluation are removed, it will be deleted from the + # routine below. In the meantime, + # + # The intended semantics are that an attrpath rooted at pkgs is + # part of the (unfiltered) release jobset iff all of the following + # are true: + # + # 1. The first component of the attrpath is not in + # `excluded-toplevel-attrs` + # + # 2. No attrname in the attrpath belongs to the list of forbidden + # attrnames `excluded-attrnames-at-any-depth` + # + # 3. The attrpath leads to a value for which lib.isDerivation is true + # + # 4. No proper prefix of the attrpath has __attrsFailEvaluation=true + # + # 5. Any proper prefix of the attrpath at which lib.isDerivation + # is true also has __recurseIntoDerivationForReleaseJobs=true. + # + # The last condition is unfortunately necessary because there are + # Hydra release jobnames which have proper prefixes which are + # attrnames of derivations (!). We should probably restructure + # the job tree so that this is not the case. + # + justAttrNames = path: value: + let + attempt = + if lib.isDerivation value && + # in some places we have *derivations* with jobsets as subattributes, ugh + !(value.__recurseIntoDerivationForReleaseJobs or false) then + [ path ] + + # Even wackier case: we have meta.broken==true jobs with + # !meta.broken jobs as subattributes with license=unfree, and + # check-meta.nix won't throw an "unfree" failure because the + # enclosing derivation is marked broken. Yeah. Bonkers. + # We should just forbid jobsets enclosed by derivations. + else if lib.isDerivation value && + !value.meta.available then [] + + else if !(lib.isAttrs value) then [] + else if (value.__attrsFailEvaluation or false) then [] + else lib.pipe value [ + (builtins.mapAttrs + (name: value: + if excluded-attrnames-at-any-depth.${name} or false then [] else + (justAttrNames (path ++ [name]) value))) + builtins.attrValues + builtins.concatLists + ]; + + seq = builtins.deepSeq attempt attempt; + tried = builtins.tryEval seq; + + result = + if tried.success + then tried.value + else if enableWarnings && path != [ "AAAAAASomeThingsFailToEvaluate" ] + then lib.warn "tryEval failed at: ${lib.concatStringsSep "." path}" [] + else []; + in + if !trace + then result + else lib.trace "** ${lib.concatStringsSep "." path}" result; + + unfiltered = import ./release-outpaths.nix { + inherit checkMeta; + attrNamesOnly = true; + inherit path; + }; + + filtered = lib.pipe unfiltered [ + (pkgs: builtins.removeAttrs pkgs (builtins.attrNames excluded-toplevel-attrs)) + ]; + + paths = + [ + # I am not entirely sure why these three packages end up in + # the Hydra jobset. But they do, and they don't meet the + # criteria above, so at the moment they are special-cased. + [ "pkgsLLVM" "stdenv" ] + [ "pkgsStatic" "stdenv" ] + [ "pkgsMusl" "stdenv" ] + ] ++ justAttrNames [] filtered; + + names = + map (path: (lib.concatStringsSep "." path)) paths; + +in +{ + inherit paths names; +} diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 39ea843bcea28..f1b5645e52b6c 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -60,7 +60,6 @@ let # list of all compilers to test specific packages on released = with compilerNames; [ - ghc884 ghc8107 ghc902 ghc924 @@ -390,10 +389,6 @@ let ghcjs = {}; ghcjs810 = {}; - - # Can't be built with musl, see meta.broken comment in the drv - integer-simple.ghc884 = {}; - integer-simple.ghc88 = {}; }; # Get some cache going for MUSL-enabled GHC. @@ -501,8 +496,6 @@ let ] released; funcmp = released; haskell-language-server = lib.subtractLists [ - # Support ceased as of 1.9.0.0 - compilerNames.ghc884 # Support ceased as of 2.3.0.0 compilerNames.ghc8107 # Not yet supported @@ -534,12 +527,10 @@ let compilerNames.ghc981 ] released; ghc-api-compat = [ - compilerNames.ghc884 compilerNames.ghc8107 compilerNames.ghc902 ]; ghc-bignum = [ - compilerNames.ghc884 compilerNames.ghc8107 ]; ghc-lib = lib.subtractLists [ @@ -554,13 +545,11 @@ let ghc-source-gen = [ # Feel free to remove these as they break, # ghc-source-gen currently doesn't support GHC 9.4 - compilerNames.ghc884 compilerNames.ghc8107 compilerNames.ghc902 compilerNames.ghc928 ]; ghc-tags = lib.subtractLists [ - compilerNames.ghc884 compilerNames.ghc981 ] released; hashable = lib.subtractLists [ @@ -653,7 +642,6 @@ let constituents = accumulateDerivations [ jobs.pkgsMusl.haskell.compiler.ghc8102Binary jobs.pkgsMusl.haskell.compiler.ghc8107Binary - jobs.pkgsMusl.haskell.compiler.ghc884 jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc902 jobs.pkgsMusl.haskell.compiler.ghc924 diff --git a/pkgs/top-level/release-outpaths.nix b/pkgs/top-level/release-outpaths.nix new file mode 100644 index 0000000000000..5c433fa542e0c --- /dev/null +++ b/pkgs/top-level/release-outpaths.nix @@ -0,0 +1,87 @@ +#!/usr/bin/env nix-shell +# When using as a callable script, passing `--argstr path some/path` overrides $PWD. +#!nix-shell -p nix -i "nix-env -qaP --no-name --out-path --arg checkMeta true -f pkgs/top-level/release-outpaths.nix" + +# Vendored from: +# https://raw.githubusercontent.com/NixOS/ofborg/74f38efa7ef6f0e8e71ec3bfc675ae4fb57d7491/ofborg/src/outpaths.nix +{ checkMeta +, includeBroken ? true # set this to false to exclude meta.broken packages from the output +, path ? ./../.. + +# used by pkgs/top-level/release-attrnames-superset.nix +, attrNamesOnly ? false + +# Set this to `null` to build for builtins.currentSystem only +, systems ? [ + "aarch64-linux" + "aarch64-darwin" + #"i686-linux" # !!! + "x86_64-linux" + "x86_64-darwin" + ] +}: +let + lib = import (path + "/lib"); + hydraJobs = import (path + "/pkgs/top-level/release.nix") + # Compromise: accuracy vs. resources needed for evaluation. + { + inherit attrNamesOnly; + supportedSystems = + if systems == null + then [ builtins.currentSystem ] + else systems; + nixpkgsArgs = { + config = { + allowAliases = false; + allowBroken = includeBroken; + allowUnfree = false; + allowInsecurePredicate = x: true; + checkMeta = checkMeta; + + handleEvalIssue = reason: errormsg: + let + fatalErrors = [ + "unknown-meta" + "broken-outputs" + ]; + in + if builtins.elem reason fatalErrors + then abort errormsg + # hydra does not build unfree packages, so tons of them are broken yet not marked meta.broken. + else if !includeBroken && builtins.elem reason [ "broken" "unfree" ] + then throw "broken" + else if builtins.elem reason [ "unsupported" ] + then throw "unsupported" + else true; + + inHydra = true; + }; + }; + }; + recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; }; + + # hydraJobs leaves recurseForDerivations as empty attrmaps; + # that would break nix-env and we also need to recurse everywhere. + tweak = lib.mapAttrs + (name: val: + if name == "recurseForDerivations" then true + else if lib.isAttrs val && val.type or null != "derivation" + then recurseIntoAttrs (tweak val) + else val + ); + + # Some of these contain explicit references to platform(s) we want to avoid; + # some even (transitively) depend on ~/.nixpkgs/config.nix (!) + blacklist = [ + "tarball" + "metrics" + "manual" + "darwin-tested" + "unstable" + "stdenvBootstrapTools" + "moduleSystem" + "lib-tests" # these just confuse the output + ]; + +in +tweak (builtins.removeAttrs hydraJobs blacklist) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 33080d5620f07..bc54860d45f6e 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -9,7 +9,16 @@ "x86_64-linux" ] , # Attributes passed to nixpkgs. Don't build packages marked as unfree. - nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } + nixpkgsArgs ? { config = { + allowUnfree = false; + inHydra = true; + permittedInsecurePackages = [ + # Keep evaluating home-assistant, which is transitively affected + # by home-assistant-chip-core consuming OpenSSL 1.1. Affects roughly + # 800 jobs. + "openssl-1.1.1w" + ]; + }; } }: with import ./release-lib.nix {inherit supportedSystems nixpkgsArgs; }; @@ -20,7 +29,7 @@ let let res = builtins.tryEval ( if isDerivation value then value.meta.isBuildPythonPackage or [] - else if value.recurseForDerivations or false || value.recurseForRelease or false then + else if value.recurseForDerivations or false || value.recurseForRelease or false || value.__recurseIntoDerivationForReleaseJobs or false then packagePython value else []); diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 9b5c601415202..f2b38b4a89645 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -37,9 +37,23 @@ "openssl-1.1.1w" ]; }; } + + # This flag, if set to true, will inhibit the use of `mapTestOn` + # and `release-lib.packagePlatforms`. Generally, it causes the + # resulting tree of attributes to *not* have a ".${system}" + # suffixed upon every job name like Hydra expects. + # + # This flag exists mainly for use by + # pkgs/top-level/release-attrnames-superset.nix; see that file for + # full details. The exact behavior of this flag may change; it + # should be considered an internal implementation detail of + # pkgs/top-level/. + # +, attrNamesOnly ? false }: -with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; +let release-lib = import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; in +with release-lib; let @@ -239,9 +253,9 @@ let # 'nonPackageAttrs' and jobs pulled in from 'pkgs'. # Conflicts usually cause silent job drops like in # https://github.com/NixOS/nixpkgs/pull/182058 - jobs = lib.attrsets.unionOfDisjoint - nonPackageJobs - (mapTestOn ((packagePlatforms pkgs) // { + jobs = let + packagePlatforms = if attrNamesOnly then lib.id else release-lib.packagePlatforms; + packageJobs = { haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; # Build selected packages (HLS) for multiple Haskell compilers to rebuild @@ -275,6 +289,14 @@ let darwin = packagePlatforms pkgs.darwin // { xcode = {}; }; - } )); + }; + mapTestOn-packages = + if attrNamesOnly + then pkgs // packageJobs + else mapTestOn ((packagePlatforms pkgs) // packageJobs); + in + lib.attrsets.unionOfDisjoint + nonPackageJobs + mapTestOn-packages; in jobs diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 54e70b1936de7..7d4d220e23a8b 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.6"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -238,10 +238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07y615s8yldk3k13lmkhpk1k190lcqvmxmnjwgh4bzjan9xrc36y"; + sha256 = "1b1gqa90amazwnll9590m5ighywh9sacsmpyd5ihljivmvjswksk"; type = "gem"; }; - version = "3.1.4"; + version = "3.1.5"; }; bindata = { groups = ["default"]; @@ -279,10 +279,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sm8wnvxz4r9iq79s295jsrvznvjpd0pagnh1pz3xfmc9qffi7yi"; + sha256 = "1a85gisjb2n236bpay7cjqlxq07m4swc8mqnwy8c5rkxfhil194c"; type = "gem"; }; - version = "1.17.12"; + version = "1.17.13"; }; cairo-gobject = { dependencies = ["cairo" "glib2"]; @@ -965,10 +965,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hr6q367ngnjjlclhjx8gma98dndmk04bj1pap5p5sqarn8ic01x"; + sha256 = "1vsqmx8pslcg1zca7hfc89vfnbcfvgyfbbxpdk2xm4cidl80zmv9"; type = "gem"; }; - version = "0.4.3"; + version = "0.6.0"; }; erubi = { groups = ["default"]; @@ -1016,10 +1016,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "138gi8b95nqv8m83dynpsszz11a6c5si1pym6y0b6bfb01r33pyi"; + sha256 = "1q9yz7x36mpzpz04bg6hdyrzzk4bri9jg3h2ygw26bf6v3axq53q"; type = "gem"; }; - version = "0.105.0"; + version = "0.108.0"; }; execjs = { groups = ["default"]; @@ -1037,10 +1037,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19w1lzipnxs6vy3y0pw1mf956f768ppzgfrnlpwgrpnjjv9xqf7d"; + sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8"; type = "gem"; }; - version = "2.7.12"; + version = "2.8.1"; }; faraday-net_http = { groups = ["default"]; @@ -1324,10 +1324,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i6xmglna30galqdsq7iq0pwxxwyrs57ymwmxhash4jhnsk7wk7z"; + sha256 = "15yxph91zswbnfy7szpdcfbdfqqn595ff290hm4f6fcnhryvhvlf"; type = "gem"; }; - version = "6.2.3"; + version = "6.3.0"; }; hashie = { groups = ["default"]; @@ -1509,10 +1509,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff"; + sha256 = "1fmwbcapyhla84xhwj3gfws6rb4lw3928ybz6g3lr372dgxakzx5"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.1"; }; irb = { dependencies = ["rdoc" "reline"]; @@ -1520,10 +1520,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0appka5sbafafn4f8d285skxw3qkhbap28vn9ms0pf7pbp7s2449"; + sha256 = "0phrzmmxbwqmkh4dzld3pc82yml996nzfdzjipniv8wwrxwbgb3r"; type = "gem"; }; - version = "1.9.1"; + version = "1.11.0"; }; jaro_winkler = { groups = ["default"]; @@ -2010,20 +2010,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wi7g6c8q0v1kahwp38mv8d526p1n2ddsr79ajx84idvih0c601i"; + sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; json_pure = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ilnxmppz9dcwp61dbciv6nk4qsggc6l20gsxdb1flffik6q90z9"; + sha256 = "09w7f7xlcas9irlaavhz0rnh17cjvjmmqm07drgghx5gwjcrar31"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; jsonpath = { dependencies = ["multi_json"]; @@ -2105,10 +2105,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0317sr3nrl51sp844bps71smkrwim3fjn47wdfpbycixnbxspivm"; + sha256 = "0kd4d5x9sxsbpbsk4xp66rxbmj2x3iglwirqws56wp7dzf7cd978"; type = "gem"; }; - version = "8.4.255.0"; + version = "8.4.255.0.1"; }; libxml-ruby = { groups = ["default"]; @@ -2125,10 +2125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rc5mzk017rgi56xzy93f80v1jdcpph1ihgdhm4qq4mibfh26f27"; + sha256 = "1wp8sdrv5j89gbb68zvxlyd84q4ddyz726db76sn76bbmm9621mc"; type = "gem"; }; - version = "5.0.0"; + version = "5.1.0"; }; liquid = { groups = ["default"]; @@ -2221,10 +2221,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j4jc31ycydbkh5h3q6zwidzpavg3g5mbb5lqyaczd3jrq78rd7i"; + sha256 = "0da76p1gvfabm49a0g0pppxgcdackw8f3qhljalqykd4d5mb828j"; type = "gem"; }; - version = "0.9.0"; + version = "0.9.3"; }; matrix = { groups = ["default"]; @@ -2272,10 +2272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yjv0apysnrhbc70ralinfpcqn9382lxr643swp7a5sdwpa9cyqg"; + sha256 = "08ja4k3yjczzz7n6rp1f3qvz4v45bc6fy04clnvdxbq3kfr7jk4c"; type = "gem"; }; - version = "3.2023.1003"; + version = "3.2023.1205"; }; mini_magick = { groups = ["default"]; @@ -2414,10 +2414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004wx9xhcam92g1d4ybvrl1yqablm2svalyck9sq4igy9nwkz9nb"; + sha256 = "0bvr9q7qwbmg9jfg85r1i5l7d0yxlgp0l2jg62j921vm49mipd7v"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; ncursesw = { groups = ["default"]; @@ -2435,10 +2435,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0541lfqaz46h8s3fks11vsd1iqzmgjjw3c0jp9agg92zblwj0axs"; + sha256 = "1izifdsinnfi34v2x3yavc0kxcmi1cwph11akqf949rf00sckkcp"; type = "gem"; }; - version = "0.4.7"; + version = "0.4.9"; }; net-pop = { dependencies = ["net-protocol"]; @@ -2489,10 +2489,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jyj6j7w9zpj2zhp4dyhdjiwsn9rqwksj7s7fzpnn7rx2xvz2a1a"; + sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; type = "gem"; }; - version = "7.2.0"; + version = "7.2.1"; }; netrc = { groups = ["default"]; @@ -2627,10 +2627,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; + sha256 = "15wkxrg1sj3n1h2g8jcrn7gcapwcgxr659ypjf75z1ipkgxqxwsv"; type = "gem"; }; - version = "1.23.0"; + version = "1.24.0"; }; parser = { dependencies = ["ast" "racc"]; @@ -2731,10 +2731,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hzd04pzq97rjb1a148gm0wgfb2nr89axbd16d2h6kp666fg4i00"; + sha256 = "1iavhgs7iahjz28sks5kkml9gr43fx5rpq5l0ql81pkmfv3i0cbi"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; prettier_print = { groups = ["default"]; @@ -2751,10 +2751,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "172qxf1zyrhxzwbn4c7gz12zdyb1jkdqrqvb2c7863lmxp53rrxs"; + sha256 = "0qiv9irrca2la1awqgvzsg7a17z2nydqyq43w4fhapdkq2l7xwa7"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -2795,10 +2795,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wjzrkssjfjpynij5dpycyflhqbjvi1gc2j73xgq3b196s1d3c24"; + sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; type = "gem"; }; - version = "5.1.1.1"; + version = "5.1.2"; }; public_suffix = { groups = ["default"]; @@ -2869,10 +2869,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11w6yd60n8ng1ncs1ajlv42dg08yks09drlsgriydgpcjwz21d40"; + sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; rack-test = { dependencies = ["rack"]; @@ -3028,10 +3028,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnkgnk2vli1y8bbc25qbgv6z2al44dlgcm2mx3ssm34j7xz7gqh"; + sha256 = "14wnrpd1kl43ynk1wwwgv9avsw84d1lrvlfyrjy3d4h7h7ndnqzp"; type = "gem"; }; - version = "6.6.0"; + version = "6.6.2"; }; re2 = { dependencies = ["mini_portile2"]; @@ -3039,10 +3039,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bbh1lddqffsck99ivynjyf9n39s9as6cn9dn17xsx9vid5ysf2b"; + sha256 = "0ih6igmfcb4b9a8hd46ggn85zfyclz9h828d0xafy2pq5qlz9fs2"; type = "gem"; }; - version = "2.4.3"; + version = "2.5.0"; }; red-colors = { dependencies = ["matrix"]; @@ -3082,21 +3082,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "013p2968vqrr282yvxp3pyy5vn0nrgdppzqywbwbfjq2kkwx2fx9"; + sha256 = "1afyfxg5kxmrxsbsvqvk9zmqdi85wa0v164a3x3dwb3x03plp06y"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.1"; }; redis-rack = { - dependencies = ["rack" "redis-store"]; + dependencies = ["rack-session" "redis-store"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k3pn706wnf7lb24l6hwsi00c8rx693hvgfnccw3qj1y635ywwh8"; + sha256 = "10438w0y1jbgr205zndvmz6md0mrqazh2j9fr88lvb8hms10pddb"; type = "gem"; }; - version = "2.1.4"; + version = "3.0.0"; }; redis-store = { dependencies = ["redis"]; @@ -3114,10 +3114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d9a5s3qrjdy50ll2s32gg3qmf10ryp3v2nr5k718kvfadp50ray"; + sha256 = "1xrghj2vka7girycp1m88kvl4qxkm4mj4djz4w1jzywb4v97fclm"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.3"; }; reline = { dependencies = ["io-console"]; @@ -3253,10 +3253,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06qnp5zs233j4f59yyqrg8al6hr9n4a7vcdg3p31v0np8bz9srwg"; + sha256 = "0hzwl0ak1i455fp3hzhdn8z14jzgwbsv04f7imz7fzz89j3lpkq9"; type = "gem"; }; - version = "1.57.2"; + version = "1.59.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -3275,10 +3275,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pzsrnjmrachdjxzl9jpw47cydicn3408vgdg3a4bss4v5r42rjj"; + sha256 = "0rfg3p6bblx9gv934fdgaji0wg0xl1drhrnlifqdgkw8wbiaw0jg"; type = "gem"; }; - version = "1.19.1"; + version = "1.20.1"; }; ruby-graphviz = { dependencies = ["rexml"]; @@ -3318,10 +3318,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13snp4q09vv3g7nskaza9xm50shxrdc2xxdyz6gp4vgzbvp4ihc0"; + sha256 = "1g1vdas991rv6lrjppjxjbfyzif4jxbncrcg9shgzrmibzilbnwr"; type = "gem"; }; - version = "0.13.0"; + version = "0.13.2"; }; ruby-lxc = { groups = ["default"]; @@ -3507,10 +3507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p5i06vygm601822vydxniad2rhxg6xkl97r9f6pgk6pnz7spq38"; + sha256 = "148cmk9bdj6y2ax06rd5q5i322lmzn49qd1cal616hys6qd04bm1"; type = "gem"; }; - version = "0.20.1"; + version = "0.21.0"; }; sequel = { dependencies = ["bigdecimal"]; @@ -3518,10 +3518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zj66n0m1la1anxjjdb8a35frzabym112rf9ssyxq42mq05ln4m2"; + sha256 = "1b2ypz0sgivfjzsr4igh6cm46fifzkanmz0fw8p0yq5xr4isv722"; type = "gem"; }; - version = "5.74.0"; + version = "5.75.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -3644,20 +3644,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18wpma2mgw82qzf1jwjalmz7nwdvn87b22wd5yy16jb67fqgrq78"; + sha256 = "0qbjgsrlrwvbywzi0shf3nmfhb52y5fmp9al9nk7c4qqwxyhz397"; type = "gem"; }; - version = "0.49.0"; + version = "0.50.0"; }; sorbet-runtime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18280l1wgdmr9xhr4mzxr4ycskwbgjzd91vmdzx0dlp6xp2dydnb"; + sha256 = "0xm54yjrdz200iahvily91n0nlv9xr2yp1rjz077fq1z2pi1kadg"; type = "gem"; }; - version = "0.5.11144"; + version = "0.5.11164"; }; sqlite3 = { dependencies = ["mini_portile2"]; @@ -3788,10 +3788,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06fa5xpw5zrnhg0ds246l8sq49k22hpplqa1msxylnqibbsnb2y9"; + sha256 = "1fqzm5a7wf7r9jl7pxs7g6m3qpvyzpia0pid0blzc0b34n0nrb35"; type = "gem"; }; - version = "2.1.5"; + version = "2.1.6"; }; treetop = { dependencies = ["polyglot"]; |